From 0e8cf5d952c231b1769141c808a743c0e43d67fb Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Sun, 16 Feb 2025 18:01:54 -0300 Subject: [PATCH 001/254] option 1 --- option1/backend.ts | 31 ++++++ option1/example1.ts | 237 ++++++++++++++++++++++++++++++++++++++++++ option1/frontend.ts | 80 ++++++++++++++ option1/security.ts | 51 +++++++++ option1/storage.ts | 18 ++++ option1/tsconfig.json | 6 ++ option1/utils.ts | 5 + 7 files changed, 428 insertions(+) create mode 100644 option1/backend.ts create mode 100644 option1/example1.ts create mode 100644 option1/frontend.ts create mode 100644 option1/security.ts create mode 100644 option1/storage.ts create mode 100644 option1/tsconfig.json create mode 100644 option1/utils.ts diff --git a/option1/backend.ts b/option1/backend.ts new file mode 100644 index 0000000..00fa40b --- /dev/null +++ b/option1/backend.ts @@ -0,0 +1,31 @@ +export interface FieldRequired { + type: 'always' | 'never' | 'conditional', + condition?: (data: any) => boolean +} + +type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; + +export interface TextFieldTypeSettings { + minLengh?: number, + maxLength?: number, + regex?: string +} + +export interface FieldDefinition { + type: FieldType, + itemType?: FieldType, + required?: FieldRequired, + defaultValue?: (data: any) => any, + calculation?: (data: any) => any, +} + + +export interface DataDefinition { + fields: { + [K in keyof T]: FieldDefinition + } +} + +export interface MongoQuery { + +} \ No newline at end of file diff --git a/option1/example1.ts b/option1/example1.ts new file mode 100644 index 0000000..3e5ace4 --- /dev/null +++ b/option1/example1.ts @@ -0,0 +1,237 @@ +import { DataDefinition } from './backend'; +import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; +import { + GridView, SimpleRecordView, + Menu, MenuView, AppLayout, + DataUISettings +} from './frontend'; +import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; +import { formatDateTime } from './utils'; + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Model +/////////////////////////////////////////////////////////////////////////////////////////////////// + +// User + +interface User { + firstName: string, + lastName: string, + fullName: string, + email: string +} + +const UserDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'fullName', + fields: { + firstName: { + type: 'text', + required: {type: 'always'}, + }, + lastName: { + type: 'text', + required: {type: 'always'} + }, + fullName: { + type: 'text', + calculation: (user: User) => `${user.firstName} ${user.lastName}` + }, + email: { + type: 'email', + required: {type: 'always'} + } + } +}; + +// TaskNote + +interface TaskNote { + label: string, + note: string, + timestamp: number, + addedBy: string, + addedByFullName: string +} + +const TaskNoteDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + label: { + type: 'text', + required: {type: 'always'}, + calculation: calculateTaskNoteLabel + }, + note: { + type: 'text', + required: {type: 'always'} + }, + timestamp: { + type: 'datetime', + required: {type: 'always'}, + defaultValue: () => new Date().getTime() + }, + addedBy: { + type: 'relationship', + required: {type: 'always'}, + }, + addedByFullName: { + type: 'text', + calculation: (taskNote: TaskNote) => { + const user = findById(taskNote.addedBy); + return user.fullName; + } + } + } +} + +function calculateTaskNoteLabel(taskNote: TaskNote) : string { + return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; +} + +// Task + +interface Task { + id: string, + label: string, + number: number, + title: string, + notes: TaskNote[] +} + +const TaskDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + id: { + type: 'id' + }, + label: { + type: 'text', + required: {type: 'always'}, + calculation: (task: Task) => `#${task.number}. ${task.title}` + }, + number: { + type: 'auto-incremental' + }, + title: { + type: 'text', + required: {type: 'always'} + }, + notes: { + type: 'array', + itemType: 'relationship' + } + } +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Views +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const CreateTaskView: SimpleRecordView = { + name: 'Create Task', + mode: 'create', + managed: true +}; + +const EditTaskView: SimpleRecordView = { + name: 'Edit Task', + mode: 'edit', + managed: true +}; + +const TasksGridView: GridView = { + name: 'Tasks', + columns: [ + 'number', + 'title' + ], + create: { + enabled: true, + view: CreateTaskView + }, + detail: { + enabled: true, + view: EditTaskView + } +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Layout +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const LeftMenu: Menu = { + items: [ + { + name: 'Tasks', + view: TasksGridView + } as MenuView + ] +} + +const TaskManagerAppLayout: AppLayout = { + leftMenu: LeftMenu +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Permissions +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const FullPermissionsOnTasks: PersistentDataPermissions = { + create: {type: 'always'}, + edit: {type: 'always'}, + access: {type: 'always'}, + delete: {type: 'always'}, + auditLogs: {type: 'always'}, + fields: { + id: {read: {type: 'always'}, write: {type: 'always'}}, + label: {read: {type: 'always'}, write: {type: 'always'}}, + number: {read: {type: 'always'}, write: {type: 'always'}}, + title: {read: {type: 'always'}, write: {type: 'always'}}, + notes: {read: {type: 'always'}, write: {type: 'always'}}, + } +} + +const DefaultPermissionsOnTaskNotes: DataPermissions = { + fields: { + label: {read: {type: 'always'}, write: {type: 'never'}}, + note: {read: {type: 'always'}, write: {type: 'always'}}, + timestamp: {read: {type: 'always'}, write: {type: 'never'}}, + addedBy: {read: {type: 'always'}, write: {type: 'never'}}, + addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} + } +} + +const ManageTasksRole: Role = { + dataPermissions: [ + FullPermissionsOnTasks, + DefaultPermissionsOnTaskNotes + ], + viewPermissions: [ + { view: CreateTaskView, access: {type: 'always'} }, + { view: EditTaskView, access: {type: 'always'} }, + { view: TasksGridView, access: {type: 'always'} } + ] +} + +const AdminsGroup: Group = { + roles: [ManageTasksRole] +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Storage +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const MainDatabase: DatabaseSettings = { + name: 'example1', + uri: '' +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Init +/////////////////////////////////////////////////////////////////////////////////////////////////// + +registerDatabase(MainDatabase); +registerPersistentData(MainDatabase, UserDefinition); +registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option1/frontend.ts b/option1/frontend.ts new file mode 100644 index 0000000..fca785a --- /dev/null +++ b/option1/frontend.ts @@ -0,0 +1,80 @@ +export interface ItemVisibility { + type: 'display' | 'hidden' | 'conditional', + condition?: (data: any) => boolean +} + +export interface FieldUISettings { + uiSettings: { + visibility?: ItemVisibility + } +} + +export interface TextFieldUISettings extends FieldUISettings { + uiSettings: { + visibility?: ItemVisibility + edit: { + widget: 'text' | 'textarea' | 'rich-text' + }, + readonly: { + renderAs: 'plain-text' | 'html' | 'markdown' + } + } +} + +export interface ArrayUISettingsDefinition { + order: 'natural' | 'reverse', + pagination: { + type: 'more' | 'pages', + pageSize: number + } +} + +export interface DataUISettings { + defaultLabel: keyof T +} + +export interface View { + name: string +} + +export interface RecordView extends View { + mode: 'readOnly' | 'edit' | 'create' +} + +export interface SimpleRecordView extends RecordView { + managed: boolean, + fields?: Array +} + +export interface GridView extends View { + columns: Array, + create: { + enabled: boolean, + view?: View + }, + detail: { + enabled: boolean, + view?: View + } +} + +export interface MenuItem { + name: string +} + +export interface MenuGroup extends MenuItem { + items: MenuItem[] +} + +export interface MenuView extends MenuItem { + view: View +} + +export interface Menu { + items: MenuItem[] +} + +export interface AppLayout { + leftMenu?: Menu, + headerMenu?: Menu +} \ No newline at end of file diff --git a/option1/security.ts b/option1/security.ts new file mode 100644 index 0000000..44a8a41 --- /dev/null +++ b/option1/security.ts @@ -0,0 +1,51 @@ +import { MongoQuery } from "./backend"; +import { View } from "./frontend"; + +export interface OperationPermissions { + type: 'always' | 'never' | 'conditional' +} + +export interface DataOperationPermissions extends OperationPermissions { + condition?: (data: any) => boolean +} + +export interface QueryOperationPermissions extends OperationPermissions { + condition?: MongoQuery +} + +export interface ContextPermissions extends OperationPermissions { + condition?: (context: any) => boolean +} + +export interface FieldPermissions { + read: OperationPermissions, + write: OperationPermissions +} + +export interface DataPermissions { + fields: { + [K in keyof T]: FieldPermissions + } +} + +export interface PersistentDataPermissions extends DataPermissions { + create: DataOperationPermissions, + access: QueryOperationPermissions, + edit: DataOperationPermissions, + delete: DataOperationPermissions, + auditLogs: DataOperationPermissions +} + +export interface ViewPermissions { + view: View, + access: ContextPermissions +} + +export interface Role { + dataPermissions: DataPermissions[], + viewPermissions: ViewPermissions[] +} + +export interface Group { + roles: Role[] +} \ No newline at end of file diff --git a/option1/storage.ts b/option1/storage.ts new file mode 100644 index 0000000..60241cf --- /dev/null +++ b/option1/storage.ts @@ -0,0 +1,18 @@ +import { DataDefinition } from "./backend"; + +export interface DatabaseSettings { + name: string, + uri: string +} + +export function registerDatabase(dbSettings: DatabaseSettings): void { + // TODO +} + +export function registerPersistentData(db: DatabaseSettings, dataDefinition: DataDefinition): void { + // TODO +} + +export function findById(id: string): T { + return null; +} \ No newline at end of file diff --git a/option1/tsconfig.json b/option1/tsconfig.json new file mode 100644 index 0000000..7b22614 --- /dev/null +++ b/option1/tsconfig.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "target": "ES5", + "experimentalDecorators": true + } + } \ No newline at end of file diff --git a/option1/utils.ts b/option1/utils.ts new file mode 100644 index 0000000..3147995 --- /dev/null +++ b/option1/utils.ts @@ -0,0 +1,5 @@ +export function formatDateTime(dateTime: Date, format: string) { + // Format the given date using the pattern in `format` + // TODO + return format; +} \ No newline at end of file From 38ae8c13807a1a2ecefb4e55390160f8324f83a3 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Sun, 16 Feb 2025 18:52:19 -0300 Subject: [PATCH 002/254] option with classes --- option-classes/.gitignore | 1 + option-classes/backend.ts | 33 +++ option-classes/example1.ts | 267 +++++++++++++++++++ option-classes/libs/context.ts | 11 + option-classes/package-lock.json | 19 ++ option-classes/package.json | 5 + option-classes/storage.ts | 8 + option-classes/tsconfig.json | 6 + {option1 => option-interfaces}/backend.ts | 0 {option1 => option-interfaces}/example1.ts | 0 {option1 => option-interfaces}/frontend.ts | 0 {option1 => option-interfaces}/security.ts | 0 {option1 => option-interfaces}/storage.ts | 0 {option1 => option-interfaces}/tsconfig.json | 0 {option1 => option-interfaces}/utils.ts | 0 15 files changed, 350 insertions(+) create mode 100644 option-classes/.gitignore create mode 100644 option-classes/backend.ts create mode 100644 option-classes/example1.ts create mode 100644 option-classes/libs/context.ts create mode 100644 option-classes/package-lock.json create mode 100644 option-classes/package.json create mode 100644 option-classes/storage.ts create mode 100644 option-classes/tsconfig.json rename {option1 => option-interfaces}/backend.ts (100%) rename {option1 => option-interfaces}/example1.ts (100%) rename {option1 => option-interfaces}/frontend.ts (100%) rename {option1 => option-interfaces}/security.ts (100%) rename {option1 => option-interfaces}/storage.ts (100%) rename {option1 => option-interfaces}/tsconfig.json (100%) rename {option1 => option-interfaces}/utils.ts (100%) diff --git a/option-classes/.gitignore b/option-classes/.gitignore new file mode 100644 index 0000000..40b878d --- /dev/null +++ b/option-classes/.gitignore @@ -0,0 +1 @@ +node_modules/ \ No newline at end of file diff --git a/option-classes/backend.ts b/option-classes/backend.ts new file mode 100644 index 0000000..5ae46c0 --- /dev/null +++ b/option-classes/backend.ts @@ -0,0 +1,33 @@ +import 'reflect-metadata'; + +interface DataModelConfig { +} + +export function DataModel(config: DataModelConfig): ClassDecorator { + return function (constructor: T) { + Reflect.defineMetadata('dataModelConfig', config, constructor); + return constructor; + }; +} + +interface FieldRequired { + type: 'always' | 'never' | 'conditional', + condition?: (data: any) => boolean +} + +type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; + +interface FieldConfig { + type?: FieldType, + itemType?: FieldType, + required?: FieldRequired, + defaultValue?: (data: any) => any, + calculation?: (data: any) => any, +} + +export function Field(config: FieldConfig): PropertyDecorator { + return function (target: Object, propertyKey: string | symbol) { + Reflect.defineMetadata('fieldConfig', config, target, propertyKey); + }; + } + \ No newline at end of file diff --git a/option-classes/example1.ts b/option-classes/example1.ts new file mode 100644 index 0000000..96353bf --- /dev/null +++ b/option-classes/example1.ts @@ -0,0 +1,267 @@ +import { DataModel, Field } from './backend'; +import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; +import { + GridView, SimpleRecordView, + Menu, MenuView, AppLayout, + DataUISettings +} from './frontend'; +import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; +import { formatDateTime } from './utils'; +import { MongoRecord } from './storage'; +import * as context from './libs/context'; + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Model +/////////////////////////////////////////////////////////////////////////////////////////////////// + +// User + +@DataModel() +class User extends MongoRecord { + @Field({ + required: {type: 'always'}, + }) + firstName: string; + + @Field({ + required: {type: 'always'} + }) + lastName: string; + + @Field({ + calculation: (user: User) => `${user.firstName} ${user.lastName}` + }) + fullName: string; + + @Field({ + required: {type: 'always'} + }) + email: string; +} + +// TaskNote + +@DataModel() +class TaskNote { + @Field({ + calculation: calculateTaskNoteLabel + }) + label: string; + + @Field({ + required: {type: 'always'} + }) + note: string; + + @Field({ + required: {type: 'always'}, + defaultValue: () => new Date().getTime() + }) + timestamp: number; + + @Field({ + required: {type: 'always'}, + defaultValue: () => context.getCurrentUser().id + }) + addedBy: string; + + @CopiedField({ + + }) + addedByFullName: string; +} + + + +/* +interface TaskNote { + label: string, + note: string, + timestamp: number, + addedBy: string, + addedByFullName: string +} + +const TaskNoteDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + label: { + type: 'text', + required: {type: 'always'}, + calculation: calculateTaskNoteLabel + }, + note: { + type: 'text', + required: {type: 'always'} + }, + timestamp: { + type: 'datetime', + required: {type: 'always'}, + defaultValue: () => new Date().getTime() + }, + addedBy: { + type: 'relationship', + required: {type: 'always'}, + }, + addedByFullName: { + type: 'text', + calculation: (taskNote: TaskNote) => { + const user = findById(taskNote.addedBy); + return user.fullName; + } + } + } +} +*/ + +function calculateTaskNoteLabel(taskNote: TaskNote) : string { + return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; +} + +// Task + +interface Task { + id: string, + label: string, + number: number, + title: string, + notes: TaskNote[] +} + +const TaskDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + id: { + type: 'id' + }, + label: { + type: 'text', + required: {type: 'always'}, + calculation: (task: Task) => `#${task.number}. ${task.title}` + }, + number: { + type: 'auto-incremental' + }, + title: { + type: 'text', + required: {type: 'always'} + }, + notes: { + type: 'array', + itemType: 'relationship' + } + } +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Views +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const CreateTaskView: SimpleRecordView = { + name: 'Create Task', + mode: 'create', + managed: true +}; + +const EditTaskView: SimpleRecordView = { + name: 'Edit Task', + mode: 'edit', + managed: true +}; + +const TasksGridView: GridView = { + name: 'Tasks', + columns: [ + 'number', + 'title' + ], + create: { + enabled: true, + view: CreateTaskView + }, + detail: { + enabled: true, + view: EditTaskView + } +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Layout +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const LeftMenu: Menu = { + items: [ + { + name: 'Tasks', + view: TasksGridView + } as MenuView + ] +} + +const TaskManagerAppLayout: AppLayout = { + leftMenu: LeftMenu +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Permissions +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const FullPermissionsOnTasks: PersistentDataPermissions = { + create: {type: 'always'}, + edit: {type: 'always'}, + access: {type: 'always'}, + delete: {type: 'always'}, + auditLogs: {type: 'always'}, + fields: { + id: {read: {type: 'always'}, write: {type: 'always'}}, + label: {read: {type: 'always'}, write: {type: 'always'}}, + number: {read: {type: 'always'}, write: {type: 'always'}}, + title: {read: {type: 'always'}, write: {type: 'always'}}, + notes: {read: {type: 'always'}, write: {type: 'always'}}, + } +} + +const DefaultPermissionsOnTaskNotes: DataPermissions = { + fields: { + label: {read: {type: 'always'}, write: {type: 'never'}}, + note: {read: {type: 'always'}, write: {type: 'always'}}, + timestamp: {read: {type: 'always'}, write: {type: 'never'}}, + addedBy: {read: {type: 'always'}, write: {type: 'never'}}, + addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} + } +} + +const ManageTasksRole: Role = { + dataPermissions: [ + FullPermissionsOnTasks, + DefaultPermissionsOnTaskNotes + ], + viewPermissions: [ + { view: CreateTaskView, access: {type: 'always'} }, + { view: EditTaskView, access: {type: 'always'} }, + { view: TasksGridView, access: {type: 'always'} } + ] +} + +const AdminsGroup: Group = { + roles: [ManageTasksRole] +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Storage +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const MainDatabase: DatabaseSettings = { + name: 'example1', + uri: '' +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Init +/////////////////////////////////////////////////////////////////////////////////////////////////// + +registerDatabase(MainDatabase); +registerPersistentData(MainDatabase, UserDefinition); +registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option-classes/libs/context.ts b/option-classes/libs/context.ts new file mode 100644 index 0000000..f40ddda --- /dev/null +++ b/option-classes/libs/context.ts @@ -0,0 +1,11 @@ +declare class User { + firstName: string; + lastName: string; + fullName: string; + email: string; +}; + +export function getCurrentUser(): User { + // TODO + return null; +} \ No newline at end of file diff --git a/option-classes/package-lock.json b/option-classes/package-lock.json new file mode 100644 index 0000000..bff7766 --- /dev/null +++ b/option-classes/package-lock.json @@ -0,0 +1,19 @@ +{ + "name": "option-classes", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "reflect-metadata": "^0.2.2" + } + }, + "node_modules/reflect-metadata": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "dev": true, + "license": "Apache-2.0" + } + } +} diff --git a/option-classes/package.json b/option-classes/package.json new file mode 100644 index 0000000..ecd1bfe --- /dev/null +++ b/option-classes/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "reflect-metadata": "^0.2.2" + } +} diff --git a/option-classes/storage.ts b/option-classes/storage.ts new file mode 100644 index 0000000..0ecbe25 --- /dev/null +++ b/option-classes/storage.ts @@ -0,0 +1,8 @@ +import { Field } from "./backend"; + +export class MongoRecord { + @Field({ + type: 'id' + }) + id: string; +} \ No newline at end of file diff --git a/option-classes/tsconfig.json b/option-classes/tsconfig.json new file mode 100644 index 0000000..a46661c --- /dev/null +++ b/option-classes/tsconfig.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "target": "ES2024", + "experimentalDecorators": true + } + } \ No newline at end of file diff --git a/option1/backend.ts b/option-interfaces/backend.ts similarity index 100% rename from option1/backend.ts rename to option-interfaces/backend.ts diff --git a/option1/example1.ts b/option-interfaces/example1.ts similarity index 100% rename from option1/example1.ts rename to option-interfaces/example1.ts diff --git a/option1/frontend.ts b/option-interfaces/frontend.ts similarity index 100% rename from option1/frontend.ts rename to option-interfaces/frontend.ts diff --git a/option1/security.ts b/option-interfaces/security.ts similarity index 100% rename from option1/security.ts rename to option-interfaces/security.ts diff --git a/option1/storage.ts b/option-interfaces/storage.ts similarity index 100% rename from option1/storage.ts rename to option-interfaces/storage.ts diff --git a/option1/tsconfig.json b/option-interfaces/tsconfig.json similarity index 100% rename from option1/tsconfig.json rename to option-interfaces/tsconfig.json diff --git a/option1/utils.ts b/option-interfaces/utils.ts similarity index 100% rename from option1/utils.ts rename to option-interfaces/utils.ts From 6e4d7ae363310e6634636289eb9fc686ebefa940 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Sun, 16 Feb 2025 19:14:06 -0300 Subject: [PATCH 003/254] classes option --- option-classes/example1.ts | 84 ++++++++++++++-------------------- option-classes/frontend.ts | 10 ++++ option-classes/libs/context.ts | 1 + option-classes/storage.ts | 13 +++++- option-classes/tsconfig.json | 4 +- 5 files changed, 61 insertions(+), 51 deletions(-) create mode 100644 option-classes/frontend.ts diff --git a/option-classes/example1.ts b/option-classes/example1.ts index 96353bf..a96999e 100644 --- a/option-classes/example1.ts +++ b/option-classes/example1.ts @@ -1,13 +1,11 @@ import { DataModel, Field } from './backend'; import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; import { - GridView, SimpleRecordView, - Menu, MenuView, AppLayout, - DataUISettings + DataModelUISettings } from './frontend'; import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; import { formatDateTime } from './utils'; -import { MongoRecord } from './storage'; +import { MongoRecord, CopiedField } from './storage'; import * as context from './libs/context'; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -65,61 +63,48 @@ class TaskNote { }) addedBy: string; - @CopiedField({ - + @CopiedField({ + relationshipField: 'addedBy', + copiedField: 'fullName' }) addedByFullName: string; } - - -/* -interface TaskNote { - label: string, - note: string, - timestamp: number, - addedBy: string, - addedByFullName: string -} - -const TaskNoteDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - label: { - type: 'text', - required: {type: 'always'}, - calculation: calculateTaskNoteLabel - }, - note: { - type: 'text', - required: {type: 'always'} - }, - timestamp: { - type: 'datetime', - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }, - addedBy: { - type: 'relationship', - required: {type: 'always'}, - }, - addedByFullName: { - type: 'text', - calculation: (taskNote: TaskNote) => { - const user = findById(taskNote.addedBy); - return user.fullName; - } - } - } -} -*/ - function calculateTaskNoteLabel(taskNote: TaskNote) : string { return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; } // Task +@DataModel() +@DataModelUISettings({ + defaultLabel: 'label' +}) +class Task extends MongoRecord { + @Field({ + required: {type: 'always'}, + calculation: (task: Task) => `#${task.number}. ${task.title}` + }) + label: string; + + @Field({ + type: 'auto-incremental' + }) + number: number; + + @Field({ + required: {type: 'always'} + }) + title: string; + + @Field({ + type: 'array', + itemType: 'relationship' + }) + notes: TaskNote[]; +} + +/* interface Task { id: string, label: string, @@ -152,6 +137,7 @@ const TaskDefinition: DataDefinition & DataUISettings = { } } } +*/ /////////////////////////////////////////////////////////////////////////////////////////////////// // Views diff --git a/option-classes/frontend.ts b/option-classes/frontend.ts new file mode 100644 index 0000000..29f8250 --- /dev/null +++ b/option-classes/frontend.ts @@ -0,0 +1,10 @@ +interface DataModelUISettingsConfig { + defaultLabel: keyof T +} + +export function DataModelUISettings(config: DataModelUISettingsConfig): PropertyDecorator { + return function (target: Object, propertyKey: string | symbol) { + Reflect.defineMetadata('dataModelUISettingsConfig', config, target, propertyKey); + }; +} + diff --git a/option-classes/libs/context.ts b/option-classes/libs/context.ts index f40ddda..ca769fc 100644 --- a/option-classes/libs/context.ts +++ b/option-classes/libs/context.ts @@ -1,4 +1,5 @@ declare class User { + id: string; firstName: string; lastName: string; fullName: string; diff --git a/option-classes/storage.ts b/option-classes/storage.ts index 0ecbe25..a773888 100644 --- a/option-classes/storage.ts +++ b/option-classes/storage.ts @@ -5,4 +5,15 @@ export class MongoRecord { type: 'id' }) id: string; -} \ No newline at end of file +} + +interface CopiedFieldConfig { + relationshipField: keyof Source, + copiedField: keyof Target +} + +export function CopiedField(config: CopiedFieldConfig): PropertyDecorator { + return function (target: Object, propertyKey: string | symbol) { + Reflect.defineMetadata('copiedFieldConfig', config, target, propertyKey); + }; +} diff --git a/option-classes/tsconfig.json b/option-classes/tsconfig.json index a46661c..b0b94c5 100644 --- a/option-classes/tsconfig.json +++ b/option-classes/tsconfig.json @@ -1,6 +1,8 @@ { "compilerOptions": { "target": "ES2024", - "experimentalDecorators": true + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "moduleResolution": "node" } } \ No newline at end of file From 88aaceae5633493ec4324b0fcf8f289eadfee3af Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Mon, 17 Feb 2025 11:45:29 -0300 Subject: [PATCH 004/254] classes option --- option-classes/example1.ts | 45 ++++++-------------------------------- option-classes/frontend.ts | 6 ++--- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/option-classes/example1.ts b/option-classes/example1.ts index a96999e..9a6523d 100644 --- a/option-classes/example1.ts +++ b/option-classes/example1.ts @@ -1,8 +1,6 @@ import { DataModel, Field } from './backend'; import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { - DataModelUISettings -} from './frontend'; +import { DataModelUISettings } from './frontend'; import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; import { formatDateTime } from './utils'; import { MongoRecord, CopiedField } from './storage'; @@ -15,6 +13,9 @@ import * as context from './libs/context'; // User @DataModel() +@DataModelUISettings({ + defaultLabel: 'fullName' +}) class User extends MongoRecord { @Field({ required: {type: 'always'}, @@ -40,6 +41,9 @@ class User extends MongoRecord { // TaskNote @DataModel() +@DataModelUISettings({ + defaultLabel: 'label' +}) class TaskNote { @Field({ calculation: calculateTaskNoteLabel @@ -104,41 +108,6 @@ class Task extends MongoRecord { notes: TaskNote[]; } -/* -interface Task { - id: string, - label: string, - number: number, - title: string, - notes: TaskNote[] -} - -const TaskDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - id: { - type: 'id' - }, - label: { - type: 'text', - required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }, - number: { - type: 'auto-incremental' - }, - title: { - type: 'text', - required: {type: 'always'} - }, - notes: { - type: 'array', - itemType: 'relationship' - } - } -} -*/ - /////////////////////////////////////////////////////////////////////////////////////////////////// // Views /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/option-classes/frontend.ts b/option-classes/frontend.ts index 29f8250..759a9fe 100644 --- a/option-classes/frontend.ts +++ b/option-classes/frontend.ts @@ -2,9 +2,9 @@ interface DataModelUISettingsConfig { defaultLabel: keyof T } -export function DataModelUISettings(config: DataModelUISettingsConfig): PropertyDecorator { - return function (target: Object, propertyKey: string | symbol) { - Reflect.defineMetadata('dataModelUISettingsConfig', config, target, propertyKey); +export function DataModelUISettings(config: DataModelUISettingsConfig): ClassDecorator { + return function (target: Object) { + Reflect.defineMetadata('dataModelUISettingsConfig', config, target); }; } From e917e6583392ee4fb87ce7372b9cc1aab9610c6a Mon Sep 17 00:00:00 2001 From: smoyano Date: Wed, 19 Feb 2025 17:29:06 -0300 Subject: [PATCH 005/254] interfaces/references option --- .../framework/metadata/entity.ts | 7 +++++++ .../framework/metadata/field.ts | 10 ++++++++++ .../framework/metadata/formField.ts | 7 +++++++ .../framework/metadata/formView.ts | 10 ++++++++++ .../framework/metadata/menu.ts | 11 +++++++++++ .../sample-app/model/entities/contacts.ts | 14 ++++++++++++++ .../sample-app/ui/navigation/mainMenu.ts | 0 .../sample-app/ui/views/createContact.ts | 10 ++++++++++ 8 files changed, 69 insertions(+) create mode 100644 option-interfaces-references/framework/metadata/entity.ts create mode 100644 option-interfaces-references/framework/metadata/field.ts create mode 100644 option-interfaces-references/framework/metadata/formField.ts create mode 100644 option-interfaces-references/framework/metadata/formView.ts create mode 100644 option-interfaces-references/framework/metadata/menu.ts create mode 100644 option-interfaces-references/sample-app/model/entities/contacts.ts create mode 100644 option-interfaces-references/sample-app/ui/navigation/mainMenu.ts create mode 100644 option-interfaces-references/sample-app/ui/views/createContact.ts diff --git a/option-interfaces-references/framework/metadata/entity.ts b/option-interfaces-references/framework/metadata/entity.ts new file mode 100644 index 0000000..e82c4ec --- /dev/null +++ b/option-interfaces-references/framework/metadata/entity.ts @@ -0,0 +1,7 @@ +import { Field } from "./field"; + +export interface Entity { + label: string; + name: string; + fields: Field[]; +} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/field.ts b/option-interfaces-references/framework/metadata/field.ts new file mode 100644 index 0000000..9c8e60e --- /dev/null +++ b/option-interfaces-references/framework/metadata/field.ts @@ -0,0 +1,10 @@ + +export interface Field { + label: string; + name: string; + type: 'text' | 'number' | 'date'; + required?: boolean; + unique?: boolean; + defaultValue?: any; + calculation?: () => any; +} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formField.ts b/option-interfaces-references/framework/metadata/formField.ts new file mode 100644 index 0000000..162729f --- /dev/null +++ b/option-interfaces-references/framework/metadata/formField.ts @@ -0,0 +1,7 @@ +import { Field } from "./field"; + +export interface FormField { + field: Field; + readOnly?: boolean; + hidden?: boolean; +} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formView.ts b/option-interfaces-references/framework/metadata/formView.ts new file mode 100644 index 0000000..9a29ac5 --- /dev/null +++ b/option-interfaces-references/framework/metadata/formView.ts @@ -0,0 +1,10 @@ +import { Entity } from "./entity"; +import { FormField } from "./formField"; + +export interface FormView { + label: string; + name: string; + entity: Entity; + managed?: boolean; + fields: FormField[]; +} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/menu.ts b/option-interfaces-references/framework/metadata/menu.ts new file mode 100644 index 0000000..6d08932 --- /dev/null +++ b/option-interfaces-references/framework/metadata/menu.ts @@ -0,0 +1,11 @@ +import { FormView } from "./formView"; + +interface MenuItem { + label: string; + name: string; + view: FormView; +} + +interface Menu { + items: MenuItem[]; +} \ No newline at end of file diff --git a/option-interfaces-references/sample-app/model/entities/contacts.ts b/option-interfaces-references/sample-app/model/entities/contacts.ts new file mode 100644 index 0000000..7658a29 --- /dev/null +++ b/option-interfaces-references/sample-app/model/entities/contacts.ts @@ -0,0 +1,14 @@ +import { Entity } from "../../../framework/metadata/entity"; +import { Field } from "../../../framework/metadata/field"; + +export const firstNameField: Field = { label: 'First Name', name: 'firstName', type: 'text' }; +export const lastNameField: Field = { label: 'Last Name', name: 'lastName', type: 'text' }; +export const fullNameField: Field = { label: 'Full Name', name: 'fullName', type: 'text', calculation: () => 'return null;' }; +export const emailField: Field = { label: 'Email', name: 'email', type: 'text' }; +export const phoneNumberField: Field = { label: 'Phone Number', name: 'phoneNumber', type: 'text' }; + +export const ContactsEntity: Entity = { + label: 'Contacts', + name: 'contacts', + fields: [firstNameField, lastNameField, fullNameField, emailField, phoneNumberField] +}; \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts b/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-references/sample-app/ui/views/createContact.ts b/option-interfaces-references/sample-app/ui/views/createContact.ts new file mode 100644 index 0000000..12a5a08 --- /dev/null +++ b/option-interfaces-references/sample-app/ui/views/createContact.ts @@ -0,0 +1,10 @@ +import { FormView } from "../../../framework/metadata/formView"; +import { ContactsEntity as contactsEntity, emailField, firstNameField, fullNameField, lastNameField } from "../../model/entities/contacts"; + +export const createContactView: FormView = { + label: 'Create contact', + name: 'createContact', + entity: contactsEntity, + managed: false, + fields: [{ field: firstNameField }, { field: lastNameField }, { field: fullNameField, readOnly: true }, { field: emailField }] +}; \ No newline at end of file From 7b8e736297d6747f4f5305a25632320e958817b3 Mon Sep 17 00:00:00 2001 From: smoyano Date: Tue, 25 Feb 2025 10:40:22 -0300 Subject: [PATCH 006/254] Factory methods for field types. --- .../framework/metadata/menu.ts | 2 +- .../sample-app/ui/navigation/mainMenu.ts | 12 ++++++ .../framework/baseRules.ts | 37 ++++++++++++++++ .../framework/entity.ts | 7 +++ .../framework/types.ts | 43 +++++++++++++++++++ .../sample-app/model/entities/contacts.ts | 34 +++++++++++++++ 6 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 option-interfaces-types-factory/framework/baseRules.ts create mode 100644 option-interfaces-types-factory/framework/entity.ts create mode 100644 option-interfaces-types-factory/framework/types.ts create mode 100644 option-interfaces-types-factory/sample-app/model/entities/contacts.ts diff --git a/option-interfaces-references/framework/metadata/menu.ts b/option-interfaces-references/framework/metadata/menu.ts index 6d08932..5e9e310 100644 --- a/option-interfaces-references/framework/metadata/menu.ts +++ b/option-interfaces-references/framework/metadata/menu.ts @@ -6,6 +6,6 @@ interface MenuItem { view: FormView; } -interface Menu { +export interface Menu { items: MenuItem[]; } \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts b/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts index e69de29..e3c9bc2 100644 --- a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts +++ b/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts @@ -0,0 +1,12 @@ +import { Menu } from "../../../framework/metadata/menu"; +import { createContactView } from "../views/createContact"; + +export const mainMenu: Menu = { + items: [ + { + label: 'Create contact', + name: 'createContact', + view: createContactView + } + ] +}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/baseRules.ts b/option-interfaces-types-factory/framework/baseRules.ts new file mode 100644 index 0000000..805e47c --- /dev/null +++ b/option-interfaces-types-factory/framework/baseRules.ts @@ -0,0 +1,37 @@ + +interface FieldRules { + required?: boolean; +} + +interface BaseField { + label: string; + name: string; + type: string; + multiplicity?: 'one' | 'many'; + rules?: FieldRules; +} + +interface TextRules extends FieldRules { + maxLength?: number; +} + +interface NumberRules extends FieldRules { + maxDecimals?: number; +} + +export interface TextField extends BaseField { + type: 'text'; + rules?: TextRules; +} + +export interface NumberField extends BaseField { + type: 'number'; + rules?: NumberRules; +} + +export interface RelationshipField extends BaseField { + type: 'relationship'; + entity: string; +} + +export type Field = TextField | NumberField | RelationshipField; diff --git a/option-interfaces-types-factory/framework/entity.ts b/option-interfaces-types-factory/framework/entity.ts new file mode 100644 index 0000000..126e2e5 --- /dev/null +++ b/option-interfaces-types-factory/framework/entity.ts @@ -0,0 +1,7 @@ +import {Field} from "./baseRules"; + +export interface Entity { + label: string; + name: string; + fields: Record; +} diff --git a/option-interfaces-types-factory/framework/types.ts b/option-interfaces-types-factory/framework/types.ts new file mode 100644 index 0000000..4efa784 --- /dev/null +++ b/option-interfaces-types-factory/framework/types.ts @@ -0,0 +1,43 @@ +import { NumberField, RelationshipField, TextField } from "./baseRules"; + + +export const text = (config: Partial): TextField => { + if (config.rules?.maxLength && config.rules.maxLength <= 0) { + throw new Error('maxLength must be greater than 0'); + } + return { + type: 'text', + label: config.label || 'Text Field', + name: config.name || 'textField', + multiplicity: config.multiplicity || 'one', + rules: config.rules || {}, + }; +}; + +export const numberField = (config: Partial): NumberField => { + if (config.rules?.maxDecimals && config.rules.maxDecimals < 0) { + throw new Error('maxDecimals cannot be negative'); + } + return { + type: 'number', + label: config.label || 'Number Field', + name: config.name || 'numberField', + multiplicity: config.multiplicity || 'one', + rules: config.rules || {}, + }; +}; + +export const relationship = (config: Partial): RelationshipField => { + if (!config.entity) { + throw new Error('Relationship field must have a "entity" to another entity'); + } + return { + type: 'relationship', + label: config.label || 'Relationship Field', + name: config.name || 'relationshipField', + multiplicity: config.multiplicity || 'one', + entity: config.entity, + rules: config.rules || {}, + }; +}; + diff --git a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts new file mode 100644 index 0000000..5e3a454 --- /dev/null +++ b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts @@ -0,0 +1,34 @@ +import { Entity } from "../../../framework/entity"; +import { relationship, text } from "../../../framework/types"; + +const contactEntity: Entity = { + label: 'Contact', + name: 'contact', + fields: { + firstName: text({ + label: 'First Name', + name: 'firstName', + rules: { required: true, maxLength: 50 } + }), + lastName: text({ + label: 'Last Name', + name: 'lastName', + rules: { required: true, maxLength: 50 } + }), + email: text({ + label: 'Email', + name: 'email', + rules: { required: true, maxLength: 100 } + }), + phoneNumbers: text({ + label: 'Phone Numbers', + name: 'phoneNumbers', + multiplicity: 'many' + }), + company: relationship({ + label: 'Company', + name: 'company', + entity: 'company' + }) + } +}; From e24e9a8fbb1bddfb92e827920d22d1f6d725e014 Mon Sep 17 00:00:00 2001 From: smoyano Date: Tue, 25 Feb 2025 16:51:41 -0300 Subject: [PATCH 007/254] - grid view metadata - grid view factory - grid view columns factory - added app metadata to register metadata --- .../framework/app.ts | 7 ++++++ .../framework/entity.ts | 4 ++-- .../{baseRules.ts => entityField.ts} | 2 +- .../framework/gridView.ts | 15 ++++++++++++ .../framework/{types.ts => typesFactory.ts} | 2 +- .../framework/viewFactory.ts | 24 +++++++++++++++++++ .../sample-app/app.ts | 12 ++++++++++ .../sample-app/model/entities/contacts.ts | 9 +++++-- .../sample-app/ui/views/contactsGrid.ts | 12 ++++++++++ 9 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 option-interfaces-types-factory/framework/app.ts rename option-interfaces-types-factory/framework/{baseRules.ts => entityField.ts} (89%) create mode 100644 option-interfaces-types-factory/framework/gridView.ts rename option-interfaces-types-factory/framework/{types.ts => typesFactory.ts} (94%) create mode 100644 option-interfaces-types-factory/framework/viewFactory.ts create mode 100644 option-interfaces-types-factory/sample-app/app.ts create mode 100644 option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts diff --git a/option-interfaces-types-factory/framework/app.ts b/option-interfaces-types-factory/framework/app.ts new file mode 100644 index 0000000..2e7c93b --- /dev/null +++ b/option-interfaces-types-factory/framework/app.ts @@ -0,0 +1,7 @@ +import { Entity } from "./entity"; +import { GridView } from "./gridView"; + +export interface App { + entities: Record; + views: Record; +} diff --git a/option-interfaces-types-factory/framework/entity.ts b/option-interfaces-types-factory/framework/entity.ts index 126e2e5..81b3cea 100644 --- a/option-interfaces-types-factory/framework/entity.ts +++ b/option-interfaces-types-factory/framework/entity.ts @@ -1,7 +1,7 @@ -import {Field} from "./baseRules"; +import {EntityField} from "./entityField"; export interface Entity { label: string; name: string; - fields: Record; + fields: Record; } diff --git a/option-interfaces-types-factory/framework/baseRules.ts b/option-interfaces-types-factory/framework/entityField.ts similarity index 89% rename from option-interfaces-types-factory/framework/baseRules.ts rename to option-interfaces-types-factory/framework/entityField.ts index 805e47c..2fa2324 100644 --- a/option-interfaces-types-factory/framework/baseRules.ts +++ b/option-interfaces-types-factory/framework/entityField.ts @@ -34,4 +34,4 @@ export interface RelationshipField extends BaseField { entity: string; } -export type Field = TextField | NumberField | RelationshipField; +export type EntityField = TextField | NumberField | RelationshipField; diff --git a/option-interfaces-types-factory/framework/gridView.ts b/option-interfaces-types-factory/framework/gridView.ts new file mode 100644 index 0000000..42c9147 --- /dev/null +++ b/option-interfaces-types-factory/framework/gridView.ts @@ -0,0 +1,15 @@ +import { Entity } from "./entity"; +import { EntityField } from "./entityField"; + +export interface GridColumn { + field: EntityField; + uiOptions?: { + readOnly?: boolean; + hidden?: boolean; + }; +} + +export interface GridView { + entity: Entity; + columns: { [key: string]: GridColumn } +} \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/types.ts b/option-interfaces-types-factory/framework/typesFactory.ts similarity index 94% rename from option-interfaces-types-factory/framework/types.ts rename to option-interfaces-types-factory/framework/typesFactory.ts index 4efa784..e9b19e9 100644 --- a/option-interfaces-types-factory/framework/types.ts +++ b/option-interfaces-types-factory/framework/typesFactory.ts @@ -1,4 +1,4 @@ -import { NumberField, RelationshipField, TextField } from "./baseRules"; +import { NumberField, RelationshipField, TextField } from "./entityField"; export const text = (config: Partial): TextField => { diff --git a/option-interfaces-types-factory/framework/viewFactory.ts b/option-interfaces-types-factory/framework/viewFactory.ts new file mode 100644 index 0000000..0880f21 --- /dev/null +++ b/option-interfaces-types-factory/framework/viewFactory.ts @@ -0,0 +1,24 @@ +import { GridColumn, GridView } from "./gridView"; + +export const gridColumn = (config: Partial): GridColumn => { + if (!config.field) { + throw new Error('Grid column must have a field'); + } + return { + field: config.field, + uiOptions: config.uiOptions || {}, + }; +} + +export const gridView = (config: Partial): GridView => { + if (!config.entity) { + throw new Error('Grid view must have an entity'); + } + if (!config.columns) { + throw new Error('Grid view must have at least one column'); + } + return { + entity: config.entity, + columns: config.columns, + }; +}; diff --git a/option-interfaces-types-factory/sample-app/app.ts b/option-interfaces-types-factory/sample-app/app.ts new file mode 100644 index 0000000..5d1a239 --- /dev/null +++ b/option-interfaces-types-factory/sample-app/app.ts @@ -0,0 +1,12 @@ +import { App } from "../framework/app"; +import { contactEntity } from "./model/entities/contacts"; +import { contactGridView } from "./ui/views/contactsGrid"; + +export const app: App = { + entities: { + contact: contactEntity + }, + views: { + contactsGrid: contactGridView + } +} \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts index 5e3a454..d0326d6 100644 --- a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts +++ b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts @@ -1,7 +1,7 @@ import { Entity } from "../../../framework/entity"; -import { relationship, text } from "../../../framework/types"; +import { relationship, text } from "../../../framework/typesFactory"; -const contactEntity: Entity = { +export const contactEntity: Entity = { label: 'Contact', name: 'contact', fields: { @@ -15,6 +15,11 @@ const contactEntity: Entity = { name: 'lastName', rules: { required: true, maxLength: 50 } }), + fullName: text({ + label: 'Last Name', + name: 'lastName', + + }), email: text({ label: 'Email', name: 'email', diff --git a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts new file mode 100644 index 0000000..5bc456c --- /dev/null +++ b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts @@ -0,0 +1,12 @@ +import { gridColumn, gridView } from "../../../framework/viewFactory"; +import { contactEntity } from "../../model/entities/contacts"; + +export const contactGridView = gridView({ + entity: contactEntity, + columns: { + firstName: gridColumn({ field: contactEntity.fields.firstName }), + lastName: gridColumn({ field: contactEntity.fields.lastName }), + email: gridColumn({ field: contactEntity.fields.email }), + company: gridColumn({ field: contactEntity.fields.company }) + } +}) From 433c231f0662449e79b4ebe0d7dd218f89472f38 Mon Sep 17 00:00:00 2001 From: smoyano Date: Tue, 25 Feb 2025 19:49:43 -0300 Subject: [PATCH 008/254] - grid view metadata - grid view factory - grid view columns factory - added app metadata to register metadata --- .gitignore | 1 + .../framework/entityField.ts | 1 + .../framework/factories/entityFactory.ts | 18 +++++++ .../framework/{ => factories}/typesFactory.ts | 4 +- .../framework/{ => factories}/viewFactory.ts | 2 +- .../sample-app/model/entities/contacts.ts | 47 +++++-------------- .../sample-app/ui/views/contactsGrid.ts | 14 +++--- 7 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 .gitignore create mode 100644 option-interfaces-types-factory/framework/factories/entityFactory.ts rename option-interfaces-types-factory/framework/{ => factories}/typesFactory.ts (89%) rename option-interfaces-types-factory/framework/{ => factories}/viewFactory.ts (92%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..85e7c1d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/ diff --git a/option-interfaces-types-factory/framework/entityField.ts b/option-interfaces-types-factory/framework/entityField.ts index 2fa2324..4024415 100644 --- a/option-interfaces-types-factory/framework/entityField.ts +++ b/option-interfaces-types-factory/framework/entityField.ts @@ -9,6 +9,7 @@ interface BaseField { type: string; multiplicity?: 'one' | 'many'; rules?: FieldRules; + } interface TextRules extends FieldRules { diff --git a/option-interfaces-types-factory/framework/factories/entityFactory.ts b/option-interfaces-types-factory/framework/factories/entityFactory.ts new file mode 100644 index 0000000..9fa41ce --- /dev/null +++ b/option-interfaces-types-factory/framework/factories/entityFactory.ts @@ -0,0 +1,18 @@ +import { Entity } from "../entity"; + +export const entity = (config: Partial): Entity => { + if (!config.name) { + throw new Error('Name is required'); + } + if (!config.label) { + throw new Error('Label is required'); + } + if (!config.fields || Object.keys(config.fields).length === 0) { + throw new Error('Fields are required'); + } + return { + label: config.label, + name: config.name, + fields: config.fields + }; +}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/typesFactory.ts b/option-interfaces-types-factory/framework/factories/typesFactory.ts similarity index 89% rename from option-interfaces-types-factory/framework/typesFactory.ts rename to option-interfaces-types-factory/framework/factories/typesFactory.ts index e9b19e9..070bf00 100644 --- a/option-interfaces-types-factory/framework/typesFactory.ts +++ b/option-interfaces-types-factory/framework/factories/typesFactory.ts @@ -1,4 +1,4 @@ -import { NumberField, RelationshipField, TextField } from "./entityField"; +import { NumberField, RelationshipField, TextField } from "../entityField"; export const text = (config: Partial): TextField => { @@ -14,7 +14,7 @@ export const text = (config: Partial): TextField => { }; }; -export const numberField = (config: Partial): NumberField => { +export const number = (config: Partial): NumberField => { if (config.rules?.maxDecimals && config.rules.maxDecimals < 0) { throw new Error('maxDecimals cannot be negative'); } diff --git a/option-interfaces-types-factory/framework/viewFactory.ts b/option-interfaces-types-factory/framework/factories/viewFactory.ts similarity index 92% rename from option-interfaces-types-factory/framework/viewFactory.ts rename to option-interfaces-types-factory/framework/factories/viewFactory.ts index 0880f21..1837f63 100644 --- a/option-interfaces-types-factory/framework/viewFactory.ts +++ b/option-interfaces-types-factory/framework/factories/viewFactory.ts @@ -1,4 +1,4 @@ -import { GridColumn, GridView } from "./gridView"; +import { GridColumn, GridView } from "../gridView"; export const gridColumn = (config: Partial): GridColumn => { if (!config.field) { diff --git a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts index d0326d6..2240cff 100644 --- a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts +++ b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts @@ -1,39 +1,14 @@ -import { Entity } from "../../../framework/entity"; -import { relationship, text } from "../../../framework/typesFactory"; +import { entity } from "../../../framework/factories/entityFactory"; +import { relationship, text } from "../../../framework/factories/typesFactory"; -export const contactEntity: Entity = { - label: 'Contact', - name: 'contact', + +export const contactsEntity = entity({ + label: 'Contacts', + name: 'contacts', fields: { - firstName: text({ - label: 'First Name', - name: 'firstName', - rules: { required: true, maxLength: 50 } - }), - lastName: text({ - label: 'Last Name', - name: 'lastName', - rules: { required: true, maxLength: 50 } - }), - fullName: text({ - label: 'Last Name', - name: 'lastName', - - }), - email: text({ - label: 'Email', - name: 'email', - rules: { required: true, maxLength: 100 } - }), - phoneNumbers: text({ - label: 'Phone Numbers', - name: 'phoneNumbers', - multiplicity: 'many' - }), - company: relationship({ - label: 'Company', - name: 'company', - entity: 'company' - }) + firstName: text({ label: 'First Name', name: 'firstName', rules: { required: true } }), + lastName: text({ label: 'Last Name', name: 'lastName', rules: { required: true } }), + email: text({ label: 'Email', name: 'email', rules: { required: true } }), + company: relationship({ label: 'Company', name: 'company', entity: 'companies' }) } -}; +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts index 5bc456c..1ac5c23 100644 --- a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts +++ b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts @@ -1,12 +1,12 @@ -import { gridColumn, gridView } from "../../../framework/viewFactory"; -import { contactEntity } from "../../model/entities/contacts"; +import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; +import { contactsEntity } from "../../model/entities/contacts"; export const contactGridView = gridView({ - entity: contactEntity, + entity: contactsEntity, columns: { - firstName: gridColumn({ field: contactEntity.fields.firstName }), - lastName: gridColumn({ field: contactEntity.fields.lastName }), - email: gridColumn({ field: contactEntity.fields.email }), - company: gridColumn({ field: contactEntity.fields.company }) + firstName: gridColumn({ field: contactsEntity.fields.firstName }), + lastName: gridColumn({ field: contactsEntity.fields.lastName }), + email: gridColumn({ field: contactsEntity.fields.email }), + company: gridColumn({ field: contactsEntity.fields.company }) } }) From 01c415b71fdf3b870d68f5307345824a84ec36e9 Mon Sep 17 00:00:00 2001 From: smoyano Date: Tue, 25 Feb 2025 21:56:26 -0300 Subject: [PATCH 009/254] Task manager sample autogenerated by copilot. --- option-interfaces-types-factory/sample-app/app.ts | 4 ++-- option-interfaces-types-factory/task-manager-app/app.ts | 0 .../task-manager-app/model/entities/projects.ts | 0 .../task-manager-app/model/entities/tasks.ts | 0 .../task-manager-app/model/entities/timeLogs.ts | 0 .../task-manager-app/ui/views/projectsGrid.ts | 0 .../task-manager-app/ui/views/tasksGrid.ts | 0 .../task-manager-app/ui/views/timeLogsGrid.ts | 0 8 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 option-interfaces-types-factory/task-manager-app/app.ts create mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/projects.ts create mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts create mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts create mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts create mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts create mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts diff --git a/option-interfaces-types-factory/sample-app/app.ts b/option-interfaces-types-factory/sample-app/app.ts index 5d1a239..4404ff0 100644 --- a/option-interfaces-types-factory/sample-app/app.ts +++ b/option-interfaces-types-factory/sample-app/app.ts @@ -1,10 +1,10 @@ import { App } from "../framework/app"; -import { contactEntity } from "./model/entities/contacts"; +import { contactsEntity } from "./model/entities/contacts"; import { contactGridView } from "./ui/views/contactsGrid"; export const app: App = { entities: { - contact: contactEntity + contact: contactsEntity }, views: { contactsGrid: contactGridView diff --git a/option-interfaces-types-factory/task-manager-app/app.ts b/option-interfaces-types-factory/task-manager-app/app.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts b/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts b/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts b/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts new file mode 100644 index 0000000..e69de29 diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts new file mode 100644 index 0000000..e69de29 From dbeedc678053b45acf4c2f15e33dd798667c1ec0 Mon Sep 17 00:00:00 2001 From: smoyano Date: Tue, 25 Feb 2025 21:57:13 -0300 Subject: [PATCH 010/254] Task manager sample autogenerated by copilot. --- .../task-manager-app/app.ts | 20 +++++++++++++++++++ .../model/entities/projects.ts | 11 ++++++++++ .../task-manager-app/model/entities/tasks.ts | 12 +++++++++++ .../model/entities/timeLogs.ts | 12 +++++++++++ .../task-manager-app/ui/views/projectsGrid.ts | 10 ++++++++++ .../task-manager-app/ui/views/tasksGrid.ts | 11 ++++++++++ .../task-manager-app/ui/views/timeLogsGrid.ts | 11 ++++++++++ 7 files changed, 87 insertions(+) diff --git a/option-interfaces-types-factory/task-manager-app/app.ts b/option-interfaces-types-factory/task-manager-app/app.ts index e69de29..d6cc713 100644 --- a/option-interfaces-types-factory/task-manager-app/app.ts +++ b/option-interfaces-types-factory/task-manager-app/app.ts @@ -0,0 +1,20 @@ +import { App } from "../framework/app"; +import { projectsEntity } from "./model/entities/projects"; +import { tasksEntity } from "./model/entities/tasks"; +import { timeLogsEntity } from "./model/entities/timeLogs"; +import { projectsGridView } from "./ui/views/projectsGrid"; +import { tasksGridView } from "./ui/views/tasksGrid"; +import { timeLogsGridView } from "./ui/views/timeLogsGrid"; + +export const app: App = { + entities: { + projects: projectsEntity, + tasks: tasksEntity, + timeLogs: timeLogsEntity + }, + views: { + projectsGrid: projectsGridView, + tasksGrid: tasksGridView, + timeLogsGrid: timeLogsGridView + } +}; \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts b/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts index e69de29..c8d552f 100644 --- a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts +++ b/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts @@ -0,0 +1,11 @@ +import { entity } from "../../../framework/factories/entityFactory"; +import { text } from "../../../framework/factories/typesFactory"; + +export const projectsEntity = entity({ + label: 'Projects', + name: 'projects', + fields: { + name: text({ label: 'Name', name: 'name', rules: { required: true } }), + description: text({ label: 'Description', name: 'description' }) + } +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts b/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts index e69de29..d446713 100644 --- a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts +++ b/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts @@ -0,0 +1,12 @@ +import { entity } from "../../../framework/factories/entityFactory"; +import { text, relationship } from "../../../framework/factories/typesFactory"; + +export const tasksEntity = entity({ + label: 'Tasks', + name: 'tasks', + fields: { + title: text({ label: 'Title', name: 'title', rules: { required: true } }), + description: text({ label: 'Description', name: 'description' }), + project: relationship({ label: 'Project', name: 'project', entity: 'projects' }) + } +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts b/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts index e69de29..6d8ae5e 100644 --- a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts +++ b/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts @@ -0,0 +1,12 @@ +import { entity } from "../../../framework/factories/entityFactory"; +import { text, number, relationship } from "../../../framework/factories/typesFactory"; + +export const timeLogsEntity = entity({ + label: 'Time Logs', + name: 'timeLogs', + fields: { + description: text({ label: 'Description', name: 'description' }), + hours: number({ label: 'Hours', name: 'hours', rules: { required: true } }), + task: relationship({ label: 'Task', name: 'task', entity: 'tasks' }) + } +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts index e69de29..7054bc8 100644 --- a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts +++ b/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts @@ -0,0 +1,10 @@ +import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; +import { projectsEntity } from "../../model/entities/projects"; + +export const projectsGridView = gridView({ + entity: projectsEntity, + columns: { + name: gridColumn({ field: projectsEntity.fields.name }), + description: gridColumn({ field: projectsEntity.fields.description }) + } +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts index e69de29..840bd56 100644 --- a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts +++ b/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts @@ -0,0 +1,11 @@ +import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; +import { tasksEntity } from "../../model/entities/tasks"; + +export const tasksGridView = gridView({ + entity: tasksEntity, + columns: { + title: gridColumn({ field: tasksEntity.fields.title }), + description: gridColumn({ field: tasksEntity.fields.description }), + project: gridColumn({ field: tasksEntity.fields.project }) + } +}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts index e69de29..5d2a0a4 100644 --- a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts +++ b/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts @@ -0,0 +1,11 @@ +import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; +import { timeLogsEntity } from "../../model/entities/timeLogs"; + +export const timeLogsGridView = gridView({ + entity: timeLogsEntity, + columns: { + description: gridColumn({ field: timeLogsEntity.fields.description }), + hours: gridColumn({ field: timeLogsEntity.fields.hours }), + task: gridColumn({ field: timeLogsEntity.fields.task }) + } +}); \ No newline at end of file From 7694def9935d8425973dcdd4d0e26ec494ad7221 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Wed, 26 Feb 2025 11:55:46 -0300 Subject: [PATCH 011/254] views --- option-classes/backend.ts | 2 +- option-classes/example1.ts | 2 +- option-interfaces/frontend.ts | 31 ++++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/option-classes/backend.ts b/option-classes/backend.ts index 5ae46c0..97eae61 100644 --- a/option-classes/backend.ts +++ b/option-classes/backend.ts @@ -3,7 +3,7 @@ import 'reflect-metadata'; interface DataModelConfig { } -export function DataModel(config: DataModelConfig): ClassDecorator { +export function DataModel(config?: DataModelConfig): ClassDecorator { return function (constructor: T) { Reflect.defineMetadata('dataModelConfig', config, constructor); return constructor; diff --git a/option-classes/example1.ts b/option-classes/example1.ts index 9a6523d..6eeb25b 100644 --- a/option-classes/example1.ts +++ b/option-classes/example1.ts @@ -1,5 +1,5 @@ import { DataModel, Field } from './backend'; -import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; +// import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; import { DataModelUISettings } from './frontend'; import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; import { formatDateTime } from './utils'; diff --git a/option-interfaces/frontend.ts b/option-interfaces/frontend.ts index fca785a..d356b26 100644 --- a/option-interfaces/frontend.ts +++ b/option-interfaces/frontend.ts @@ -33,8 +33,37 @@ export interface DataUISettings { defaultLabel: keyof T } +export interface Widget { + +} + +export interface DataWidget extends Widget { + +} + +export interface TextWidget extends DataWidget { + +} + +export interface FormFieldWidget extends Widget { + label: string, + data: DataWidget +} + +export interface ViewModel { + +} + +export type LayoutType = 'vertical' | 'horizontal'; + +export interface Layout { + type: LayoutType, + widgets: Widget[] +} + export interface View { - name: string + name: string, + model?: ViewModel } export interface RecordView extends View { From 5f1ce2c3a772162e66c380e552dccb74f0fb6d35 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 27 Feb 2025 12:29:33 -0300 Subject: [PATCH 012/254] example 2 with interfaces and factories --- option-interfaces/example2.ts | 277 ++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 option-interfaces/example2.ts diff --git a/option-interfaces/example2.ts b/option-interfaces/example2.ts new file mode 100644 index 0000000..6374ad3 --- /dev/null +++ b/option-interfaces/example2.ts @@ -0,0 +1,277 @@ +import { DataDefinition } from './backend'; +import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; +import { + GridView, SimpleRecordView, + Menu, MenuView, AppLayout, + DataUISettings +} from './frontend'; +import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; +import { formatDateTime } from './utils'; + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Model +/////////////////////////////////////////////////////////////////////////////////////////////////// + +// User + +interface User { + firstName: string, + lastName: string, + fullName: string, + email: string +} + +const userModel = model({ + fields: { + firstName: textField({required: {type: 'always'}}), + lastName: textField({required: {type: 'always'}}), + fullName: textField({ + calculation: (user: User) => { + return `${user.firstName} ${user.lastName}`; + }), + }), + email: textField({ + required: {type: 'always'}, + validation: emailValidation, + ui: { + readOnly: emailLabelWidget(), + edit: textInputWidget() + } + }) + }, + ui: modelUi({ + defaultLabel: 'fullName' + }), + dataSource: modelDataSource({ + database: mainDb, + indexes: [ + regularIndex(['fullName']), + regularIndex(['email']) + ] + }) +}); + +const backend = defineBackend([userModel]); + +const users = backend.dataSources.mainDb.getCollection('users'); +let user = users.findById('...'); +users.save(user); +users.remove(user); +let cursor = users.find({}); +cursor = users.find({email: {$in: [email1, email2]}}); +let result = users.aggregate([]); + +const UserDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'fullName', + fields: { + firstName: { + type: 'text', + required: {type: 'always'}, + }, + lastName: { + type: 'text', + required: {type: 'always'} + }, + fullName: { + type: 'text', + calculation: (user: User) => `${user.firstName} ${user.lastName}` + }, + email: { + type: 'email', + required: {type: 'always'} + } + } +}; + +// TaskNote + +interface TaskNote { + label: string, + note: string, + timestamp: number, + addedBy: string, + addedByFullName: string +} + +const TaskNoteDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + label: { + type: 'text', + required: {type: 'always'}, + calculation: calculateTaskNoteLabel + }, + note: { + type: 'text', + required: {type: 'always'} + }, + timestamp: { + type: 'datetime', + required: {type: 'always'}, + defaultValue: () => new Date().getTime() + }, + addedBy: { + type: 'relationship', + required: {type: 'always'}, + }, + addedByFullName: { + type: 'text', + calculation: (taskNote: TaskNote) => { + const user = findById(taskNote.addedBy); + return user.fullName; + } + } + } +} + +function calculateTaskNoteLabel(taskNote: TaskNote) : string { + return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; +} + +// Task + +interface Task { + id: string, + label: string, + number: number, + title: string, + notes: TaskNote[] +} + +const TaskDefinition: DataDefinition & DataUISettings = { + defaultLabel: 'label', + fields: { + id: { + type: 'id' + }, + label: { + type: 'text', + required: {type: 'always'}, + calculation: (task: Task) => `#${task.number}. ${task.title}` + }, + number: { + type: 'auto-incremental' + }, + title: { + type: 'text', + required: {type: 'always'} + }, + notes: { + type: 'array', + itemType: 'relationship' + } + } +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Views +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const CreateTaskView: SimpleRecordView = { + name: 'Create Task', + mode: 'create', + managed: true +}; + +const EditTaskView: SimpleRecordView = { + name: 'Edit Task', + mode: 'edit', + managed: true +}; + +const TasksGridView: GridView = { + name: 'Tasks', + columns: [ + 'number', + 'title' + ], + create: { + enabled: true, + view: CreateTaskView + }, + detail: { + enabled: true, + view: EditTaskView + } +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Layout +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const LeftMenu: Menu = { + items: [ + { + name: 'Tasks', + view: TasksGridView + } as MenuView + ] +} + +const TaskManagerAppLayout: AppLayout = { + leftMenu: LeftMenu +} + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Permissions +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const FullPermissionsOnTasks: PersistentDataPermissions = { + create: {type: 'always'}, + edit: {type: 'always'}, + access: {type: 'always'}, + delete: {type: 'always'}, + auditLogs: {type: 'always'}, + fields: { + id: {read: {type: 'always'}, write: {type: 'always'}}, + label: {read: {type: 'always'}, write: {type: 'always'}}, + number: {read: {type: 'always'}, write: {type: 'always'}}, + title: {read: {type: 'always'}, write: {type: 'always'}}, + notes: {read: {type: 'always'}, write: {type: 'always'}}, + } +} + +const DefaultPermissionsOnTaskNotes: DataPermissions = { + fields: { + label: {read: {type: 'always'}, write: {type: 'never'}}, + note: {read: {type: 'always'}, write: {type: 'always'}}, + timestamp: {read: {type: 'always'}, write: {type: 'never'}}, + addedBy: {read: {type: 'always'}, write: {type: 'never'}}, + addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} + } +} + +const ManageTasksRole: Role = { + dataPermissions: [ + FullPermissionsOnTasks, + DefaultPermissionsOnTaskNotes + ], + viewPermissions: [ + { view: CreateTaskView, access: {type: 'always'} }, + { view: EditTaskView, access: {type: 'always'} }, + { view: TasksGridView, access: {type: 'always'} } + ] +} + +const AdminsGroup: Group = { + roles: [ManageTasksRole] +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Storage +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const MainDatabase: DatabaseSettings = { + name: 'example1', + uri: '' +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// App Init +/////////////////////////////////////////////////////////////////////////////////////////////////// + +registerDatabase(MainDatabase); +registerPersistentData(MainDatabase, UserDefinition); +registerPersistentData(MainDatabase, TaskDefinition); From 8d9f04ac4122e601a2759ae027cc5878a443a115 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 27 Feb 2025 18:32:46 -0300 Subject: [PATCH 013/254] more details in example 2 --- option-interfaces/example2.ts | 265 ++++++++++++++++++++++------------ 1 file changed, 171 insertions(+), 94 deletions(-) diff --git a/option-interfaces/example2.ts b/option-interfaces/example2.ts index 6374ad3..04fecc0 100644 --- a/option-interfaces/example2.ts +++ b/option-interfaces/example2.ts @@ -14,34 +14,70 @@ import { formatDateTime } from './utils'; // User +type UserStatus = 'active' | 'inactive' | 'blocked'; + + interface User { firstName: string, lastName: string, fullName: string, - email: string + email: string, + status: UserStatus, + department: string } const userModel = model({ fields: { - firstName: textField({required: {type: 'always'}}), - lastName: textField({required: {type: 'always'}}), + firstName: textField({ + required: {type: 'always'}, + ui: { + label: 'First Name' + } + }), + lastName: textField({ + required: {type: 'always'}, + ui: { + label: 'Last Name' + } + }), fullName: textField({ calculation: (user: User) => { return `${user.firstName} ${user.lastName}`; - }), + }, + ui: { + label: 'Full Name' + } }), email: textField({ required: {type: 'always'}, validation: emailValidation, ui: { + label: 'Email', readOnly: emailLabelWidget(), - edit: textInputWidget() + edit: textInputWidget() } - }) + }), + status: choiceField({ + required: required.ALWAYS, + defaultValue: 'active', + ui: { + label: 'Status', + optionLabels: { + active: 'Active', + inactive: 'Inactive', + blocked: 'Blocked' + } + } + }), + department: textField({required: {type: 'always'}}) + }, + ui: { + recordLabelField: 'fullName', + sorting: { + fields: 'fullName', + direction: 'asc' + } }, - ui: modelUi({ - defaultLabel: 'fullName' - }), dataSource: modelDataSource({ database: mainDb, indexes: [ @@ -51,38 +87,6 @@ const userModel = model({ }) }); -const backend = defineBackend([userModel]); - -const users = backend.dataSources.mainDb.getCollection('users'); -let user = users.findById('...'); -users.save(user); -users.remove(user); -let cursor = users.find({}); -cursor = users.find({email: {$in: [email1, email2]}}); -let result = users.aggregate([]); - -const UserDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'fullName', - fields: { - firstName: { - type: 'text', - required: {type: 'always'}, - }, - lastName: { - type: 'text', - required: {type: 'always'} - }, - fullName: { - type: 'text', - calculation: (user: User) => `${user.firstName} ${user.lastName}` - }, - email: { - type: 'email', - required: {type: 'always'} - } - } -}; - // TaskNote interface TaskNote { @@ -93,36 +97,52 @@ interface TaskNote { addedByFullName: string } -const TaskNoteDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', +const taskNoteModel = model({ fields: { - label: { - type: 'text', + label: textField({ required: {type: 'always'}, calculation: calculateTaskNoteLabel - }, - note: { - type: 'text', - required: {type: 'always'} - }, - timestamp: { - type: 'datetime', - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }, - addedBy: { - type: 'relationship', + }), + note: longTextField({ required: {type: 'always'}, - }, - addedByFullName: { - type: 'text', - calculation: (taskNote: TaskNote) => { - const user = findById(taskNote.addedBy); - return user.fullName; + ui: { + readOnly: markdownWidget(), + editor: markdownEditor() } - } + }), + timestamp: datetimeField({ + required: required.ALWAYS, + defaultValue: () => new Date().getTime(), + ui: { + readOnly: datatimeFormatWidget({format: 'MM/dd yy HH:mm'}) + } + }), + addedBy: relationshipField({ + required: required.ALWAYS, + target: userModel, + filter: () => { + const users = backend.dataSources.mainDb.users(); + return users.query({status: 'active'}); + }, + ui: { + label: 'Added By (ID)', + visibility: visibility.NEVER + } + }), + addedByFullName: textField({ + copiedField: copiedField({ + from: 'addedBy', + field: 'fullName' + }), + ui: { + label: 'Added By' + } + }) + }, + ui: { + recordLabelField: 'label' } -} +}); function calculateTaskNoteLabel(taskNote: TaskNote) : string { return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; @@ -138,48 +158,66 @@ interface Task { notes: TaskNote[] } -const TaskDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', +const taskModel = model({ fields: { - id: { - type: 'id' - }, - label: { - type: 'text', + label: textField({ required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }, - number: { - type: 'auto-incremental' - }, - title: { - type: 'text', - required: {type: 'always'} - }, - notes: { - type: 'array', - itemType: 'relationship' + ui: { + label: 'Label' + } + }), + number: autoIncrementalField({ + ui: { + label: 'Number' + } + }), + title: textField({ + required: {type: 'always'}, + ui: { + label: 'Title' + } + }), + notes: arrayField({ + itemType: taskNoteModel, + ui: { + label: 'Notes', + sorting: 'natural' + } + }) + }, + ui: { + label: 'label', + sorting: { + field: 'createAt', + direction: 'desc' } - } -} + }, + dataSource: modelDataSource({ + database: mainDb, + indexes: [ + regularIndex(['number']), + regularIndex(['title']) + ] + }) +}); /////////////////////////////////////////////////////////////////////////////////////////////////// // Views /////////////////////////////////////////////////////////////////////////////////////////////////// -const CreateTaskView: SimpleRecordView = { +const CreateTaskView = simpleRecordView({ name: 'Create Task', mode: 'create', managed: true -}; +}); -const EditTaskView: SimpleRecordView = { +const EditTaskView = simpleRecordView({ name: 'Edit Task', mode: 'edit', managed: true -}; +}); -const TasksGridView: GridView = { +const TasksGridView = gridView({ name: 'Tasks', columns: [ 'number', @@ -193,8 +231,35 @@ const TasksGridView: GridView = { enabled: true, view: EditTaskView } +}); + +interface DashboardModel { + project: Relationship, + tasks: Relationship[] } +const DashboardView = flexView({ + model: { + project: relationshipField({ + target: projectModel, + ui: { + label: 'Project' + } + }) + }, + layout: { + + }, + events: { + onShow: () => { + + }, + onChange: (model, view) => { + model.widgets.taskTable.filters. + } + } +}) + /////////////////////////////////////////////////////////////////////////////////////////////////// // App Layout @@ -268,10 +333,22 @@ const MainDatabase: DatabaseSettings = { uri: '' } +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Libs +/////////////////////////////////////////////////////////////////////////////////////////////////// + +function test() { + const users = dataSources.mainDb.users; + let user = users.findById('...'); + users.save(user); + users.remove(user); + let cursor = users.find({}); + cursor = users.find({email: {$in: [email1, email2]}}); + let result = users.aggregate([]); +} + /////////////////////////////////////////////////////////////////////////////////////////////////// // App Init /////////////////////////////////////////////////////////////////////////////////////////////////// -registerDatabase(MainDatabase); -registerPersistentData(MainDatabase, UserDefinition); -registerPersistentData(MainDatabase, TaskDefinition); +initApp(); From 07b2794008f31cfdba2b81213970ea5e57102fd7 Mon Sep 17 00:00:00 2001 From: smoyano Date: Wed, 5 Mar 2025 09:20:08 -0300 Subject: [PATCH 014/254] Lifecycle hooks option --- option-lifecycle-hooks/entity.ts | 49 ++++++++++++++++++++ option-lifecycle-hooks/userEntity.ts | 67 ++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 option-lifecycle-hooks/entity.ts create mode 100644 option-lifecycle-hooks/userEntity.ts diff --git a/option-lifecycle-hooks/entity.ts b/option-lifecycle-hooks/entity.ts new file mode 100644 index 0000000..c184b5f --- /dev/null +++ b/option-lifecycle-hooks/entity.ts @@ -0,0 +1,49 @@ +abstract class AbstractEntity { + id?: string; + createdAt?: Date; + updatedAt?: Date; + + constructor() { + this.createdAt = new Date(); + } + + // lifecycle hooks + protected abstract beforeSave(): Promise | void; + protected abstract afterSave(): Promise | void; + protected abstract beforeRead(): Promise | void; + protected abstract afterRead(): Promise | void; + protected abstract beforeDelete(): Promise | void; + protected abstract afterDelete(): Promise | void; + protected abstract beforeValidate(): Promise | void; + protected abstract afterValidate(): Promise | void; + + async save() { + await this.beforeSave(); + if (!this.id) { + this.id = Math.random().toString(36).substr(2, 9); // Simulate ID generation + } else { + this.updatedAt = new Date(); + } + // save logic + await this.afterSave(); + } + + async delete() { + await this.beforeDelete(); + // delete logic + await this.afterDelete(); + } + + async validate() { + await this.beforeValidate(); + // validate logic + await this.afterValidate(); + } + + async read() { + await this.beforeRead(); + // read logic + await this.afterRead(); + } + } + \ No newline at end of file diff --git a/option-lifecycle-hooks/userEntity.ts b/option-lifecycle-hooks/userEntity.ts new file mode 100644 index 0000000..13fe1fc --- /dev/null +++ b/option-lifecycle-hooks/userEntity.ts @@ -0,0 +1,67 @@ +class UserEntity extends AbstractEntity { + name: string; + email: string; + age: number; + role: 'admin' | 'user'; + + constructor(name: string, email: string, age: number, role: 'admin' | 'user') { + super(); + this.name = name; + this.email = email; + this.age = age; + this.role = role; + } + + async beforeCreate() { + console.log('Before create: Initializing entity...'); + } + + async afterCreate() { + console.log('After create: Entity created.'); + } + + async beforeUpdate() { + console.log(`Before update: Updating user ${this.name}`); + } + + async afterUpdate() { + console.log(`After update: User ${this.name} updated.`); + } + + async beforeDelete() { + console.log(`Before delete: Checking permissions for ${this.name}`); + } + + async afterDelete() { + console.log(`After delete: User ${this.name} deleted.`); + } + + async beforeSave() { + console.log('Before save: Validating and preparing data...'); + } + + async afterSave() { + console.log('After save: Changes saved successfully.'); + } + + async beforeValidate() { + console.log('Before validate: Checking data integrity...'); + if (!this.email.includes('@')) throw new Error('Invalid email address.'); + if (this.age < 18) throw new Error('User must be at least 18 years old.'); + } + + async afterValidate() { + console.log('After validate: Entity data is valid.'); + } + + async beforeRead() { + console.log('Before read: Checking visibility rules...'); + if (this.role !== 'admin') { + this.email = '[HIDDEN]'; // Hide sensitive data + } + } + + async afterRead() { + console.log('After read: Data successfully retrieved.'); + } +} From c6d5b2078acb050b61efc48180a938f7a674666f Mon Sep 17 00:00:00 2001 From: smoyano Date: Wed, 5 Mar 2025 09:48:05 -0300 Subject: [PATCH 015/254] Lifecycle hooks. --- option-lifecycle-hooks/entity.ts | 59 +++++++++++++--------------- option-lifecycle-hooks/userEntity.ts | 10 ++--- 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/option-lifecycle-hooks/entity.ts b/option-lifecycle-hooks/entity.ts index c184b5f..4a510bc 100644 --- a/option-lifecycle-hooks/entity.ts +++ b/option-lifecycle-hooks/entity.ts @@ -2,11 +2,11 @@ abstract class AbstractEntity { id?: string; createdAt?: Date; updatedAt?: Date; - + constructor() { - this.createdAt = new Date(); + this.createdAt = new Date(); } - + // lifecycle hooks protected abstract beforeSave(): Promise | void; protected abstract afterSave(): Promise | void; @@ -14,36 +14,31 @@ abstract class AbstractEntity { protected abstract afterRead(): Promise | void; protected abstract beforeDelete(): Promise | void; protected abstract afterDelete(): Promise | void; - protected abstract beforeValidate(): Promise | void; - protected abstract afterValidate(): Promise | void; - + protected abstract validate(): Promise | void; + protected abstract onChange(): Promise | void; + async save() { - await this.beforeSave(); - if (!this.id) { - this.id = Math.random().toString(36).substr(2, 9); // Simulate ID generation - } else { - this.updatedAt = new Date(); - } - // save logic - await this.afterSave(); + await this.beforeSave(); + if (!this.id) { + this.id = Math.random().toString(36).substr(2, 9); // Simulate ID generation + } else { + this.updatedAt = new Date(); + } + // save logic + await this.afterSave(); } - - async delete() { - await this.beforeDelete(); - // delete logic - await this.afterDelete(); - } - - async validate() { - await this.beforeValidate(); - // validate logic - await this.afterValidate(); - } - + async read() { - await this.beforeRead(); - // read logic - await this.afterRead(); + await this.beforeRead(); + // read logic + await this.afterRead(); + } + + async delete() { + await this.beforeDelete(); + // delete logic + await this.afterDelete(); } - } - \ No newline at end of file + + +} diff --git a/option-lifecycle-hooks/userEntity.ts b/option-lifecycle-hooks/userEntity.ts index 13fe1fc..3d843f8 100644 --- a/option-lifecycle-hooks/userEntity.ts +++ b/option-lifecycle-hooks/userEntity.ts @@ -1,4 +1,5 @@ class UserEntity extends AbstractEntity { + name: string; email: string; age: number; @@ -44,14 +45,13 @@ class UserEntity extends AbstractEntity { console.log('After save: Changes saved successfully.'); } - async beforeValidate() { - console.log('Before validate: Checking data integrity...'); + async validate() { if (!this.email.includes('@')) throw new Error('Invalid email address.'); if (this.age < 18) throw new Error('User must be at least 18 years old.'); } - - async afterValidate() { - console.log('After validate: Entity data is valid.'); + + async onChange() { + console.log('On change: User data has been modified.'); } async beforeRead() { From 8e4845f84b58ac71f96ecd8de26ffb648f6fa26b Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 6 Mar 2025 12:28:29 -0300 Subject: [PATCH 016/254] another option using zod and separating layers --- option-interfaces/frontend.ts | 5 +- option-reuse/model/user/compactDetailsView.ts | 30 +++++ option-reuse/model/user/editView.ts | 12 ++ option-reuse/model/user/resetPassword.ts | 30 +++++ option-reuse/model/user/user.ts | 103 ++++++++++++++++++ 5 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 option-reuse/model/user/compactDetailsView.ts create mode 100644 option-reuse/model/user/editView.ts create mode 100644 option-reuse/model/user/resetPassword.ts create mode 100644 option-reuse/model/user/user.ts diff --git a/option-interfaces/frontend.ts b/option-interfaces/frontend.ts index d356b26..0abe5de 100644 --- a/option-interfaces/frontend.ts +++ b/option-interfaces/frontend.ts @@ -63,9 +63,12 @@ export interface Layout { export interface View { name: string, - model?: ViewModel + model?: ViewModel, + layout?: Layout } + + export interface RecordView extends View { mode: 'readOnly' | 'edit' | 'create' } diff --git a/option-reuse/model/user/compactDetailsView.ts b/option-reuse/model/user/compactDetailsView.ts new file mode 100644 index 0000000..74eac38 --- /dev/null +++ b/option-reuse/model/user/compactDetailsView.ts @@ -0,0 +1,30 @@ +import { z } from 'zod'; +import { userSchema } from 'user'; +import { widgets as w, model as m, ui, db, api } from 'slingr'; +import { resetPasswordAction } from './resetPassword'; + +const userCompactDetailsModel = z.object({ + picture: z.string(), + user: userSchema +}); + +type UserCompactDetailsModel = z.infer; + +const userCompactDetailsView = ui.viewForObject({ + name: 'User Details', + model: userCompactDetailsModel, + layout: { + type: 'vertical', + widgets: [ + w.columns([ + //w.formField().field('picture').label('Picture').widget(w.imageWidget()), + w.imageWidget((model: UserCompactDetailsModel) => model.picture), + w.defaultWidget().field('user').field('fullName'), + ]), + w.defaultWidget().field('user').field('email'), + w.defaultWidget().field('user').field('notes'), + w.toolbarWidget().action(resetPasswordAction) + ] + }, + toolbar: {} +}); diff --git a/option-reuse/model/user/editView.ts b/option-reuse/model/user/editView.ts new file mode 100644 index 0000000..d08fc45 --- /dev/null +++ b/option-reuse/model/user/editView.ts @@ -0,0 +1,12 @@ +import { z } from 'zod'; +import { User, userSchema } from 'user'; +import { widgets as w, model as m, ui, db, api } from 'slingr'; + +const userCompactDetailsView = ui.simpleViewForObject({ + name: 'User Edit', + model: userSchema, + managed: true, + toolbar: { + actionsToInclude: 'all' + } +}); diff --git a/option-reuse/model/user/resetPassword.ts b/option-reuse/model/user/resetPassword.ts new file mode 100644 index 0000000..eeb26ad --- /dev/null +++ b/option-reuse/model/user/resetPassword.ts @@ -0,0 +1,30 @@ +import { z } from 'zod'; +import {User} from 'user'; +import { widgets as w, model as m, ui, db, api } from 'slingr'; + +const resetPasswordSchema = z.object({ + newPassword: z.string(), + confirmNewPassword: z.string() +}).refine((data) => data.newPassword === data.confirmNewPassword, { + message: "Passwords don't match", + path: ["confirmNewPassword"] +}); + +type ResetPassword = z.infer; + +const resetPasswordRepresentation = ui.defaultUiForObject({ + newPassword: { + label: 'New Password', + dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] + }, + confirmNewPassword: { + label: 'Confirm New Password', + dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] + } +}); + +export const resetPasswordAction = m.recordAction({ + script: (record: User, params: ResetPassword) => { + // do something + } +}); \ No newline at end of file diff --git a/option-reuse/model/user/user.ts b/option-reuse/model/user/user.ts new file mode 100644 index 0000000..8d944e8 --- /dev/null +++ b/option-reuse/model/user/user.ts @@ -0,0 +1,103 @@ +import { z } from 'zod'; +import { widgets as w, ui, db, api } from 'slingr'; + +export const userSchema = z.object({ + firstName: z.string(), + lastName: z.string(), + fullName: z.string(), + email: z.string().email(), + age: z.number().int().positive(), + password: z.string().min(8).max(16), + notes: z.string().optional() +}); + +export type User = z.infer; + +const userRepresentation = ui.defaultUiForObject({ + label: 'Users', + recordLabelField: 'fullName', + sorting: { + field: 'fullName', + direction: 'asc' + }, + fields: { + firstName: { + label: 'First Name', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + lastName: { + label: 'Last Name', + visibility: {type: 'always'}, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + fullName: { + label: 'Last Name', + dataWidget: [{ + context: ui.context.all, + widget: w.textWidget() + }] + }, + email: { + label: 'Email', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.emailWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + age: { + label: 'Age', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + password: { + label: 'Password', + visibility: ui.visibility.never + }, + notes: { + label: 'Notes', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.textAreaWidget() + }] + } + } +}); + +const userRepository = db.repositoryForObject({ + collectionName: 'users', + schema: userSchema, + indexes: [ + db.regularIndex(['email']), + db.regulatIndex(['fullName']) + ], + encrypt: ['password'] +}); + + +const userApi = api.dataApiForObject({ + repository: userRepository +}); From 2fe5dd55b19f447a00e1fab64f067d03e21045cb Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 6 Mar 2025 13:56:41 -0300 Subject: [PATCH 017/254] ui --- option-interfaces/example2.ts | 129 +++++++++++++++++++++++++++++++--- option-interfaces/frontend.ts | 6 +- 2 files changed, 124 insertions(+), 11 deletions(-) diff --git a/option-interfaces/example2.ts b/option-interfaces/example2.ts index 04fecc0..49947ed 100644 --- a/option-interfaces/example2.ts +++ b/option-interfaces/example2.ts @@ -201,6 +201,56 @@ const taskModel = model({ }) }); +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Agents +/////////////////////////////////////////////////////////////////////////////////////////////////// + +const visitSummarizationAgent = agent({ + modelSettings: { + model: 'gemini-2.0-flash' + }, + inputs: [ + { + name: 'text', + type: 'string' + } + ], + instructions: ` + You are a doctor and need to summarize the medical record in no more than 100. + `, + prompt: ` + Please, summarize the following text: {text} + ` +}); + +const expressionSolver = tool({ + name: 'expressionSolver', + description: 'Solves a math expression and returns the result', + params: { + expression: textField({}) + }, + script: (params: object) => { + // do something + } +}) + +const mathSolverAgent = agent({ + modelSettings: { + model: 'gpt-3.5-turbo' + }, + inputs: { + question: textField({}) + } + instructions: ` + You need to solve a mathematical expression and provide the result. + `, + prompt: ` + Please, solve the following mathematical expression: {question} + `, + tools: [ expressionSolver ] +}); + + /////////////////////////////////////////////////////////////////////////////////////////////////// // Views /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -233,29 +283,88 @@ const TasksGridView = gridView({ } }); -interface DashboardModel { - project: Relationship, - tasks: Relationship[] +interface TaskRelationship { + task: string, + number: number, + title: string +} + +interface DashboardModel extends ViewModel { + project: string, + tasks: TaskRelationship[] } -const DashboardView = flexView({ - model: { +const DashboardView = flexView({ + fields: { project: relationshipField({ target: projectModel, ui: { label: 'Project' } + }), + tasks: arrayField({ + fields: { + task: relationshipField({ + target: taskModel, + ui: { + label: 'Task' + } + }), + number: textField({ + copiedField: copiedField({ + from: 'task', + field: 'number' + }), + ui: { + label: 'Number' + } + }), + title: textField({ + copiedField: copiedField({ + from: 'task', + field: 'title' + }), + ui: { + label: 'Title' + } + }) + }, + ui: { + label: 'Tasks' + } }) }, layout: { - + rows: [ + { + columns: [ + { + widgets: [ + dataFormFieldWidget({ + name: 'projectField', + field: 'project' + }), + dynamicTableWidget({ + name: 'tasksTable', + data: (model: DashboardModel) => { + return model.tasks; + } + }), + ] + } + ] + } + ] }, events: { - onShow: () => { - + onShow: (model: DashboardModel) => { + model.project = dataSources.mainDb.projects.findById('...'); }, - onChange: (model, view) => { - model.widgets.taskTable.filters. + onChange: (model: DashboardModel) => { + if (model.project) { + const table = model.widgets['tasksTable']; + table.refresh(); + } } } }) diff --git a/option-interfaces/frontend.ts b/option-interfaces/frontend.ts index d356b26..88666fa 100644 --- a/option-interfaces/frontend.ts +++ b/option-interfaces/frontend.ts @@ -50,8 +50,12 @@ export interface FormFieldWidget extends Widget { data: DataWidget } -export interface ViewModel { +export interface WidgetModel { + +} +export interface ViewModel { + widgets: { [key: string]: WidgetModel } } export type LayoutType = 'vertical' | 'horizontal'; From 10d3f7196cb123a51ba1b6d0c2fa7c60bf0810ee Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 6 Mar 2025 18:51:23 -0300 Subject: [PATCH 018/254] task manager --- task-manager/model/user/resetPassword.ts | 53 ++++++++++ task-manager/model/user/user.ts | 120 +++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 task-manager/model/user/resetPassword.ts create mode 100644 task-manager/model/user/user.ts diff --git a/task-manager/model/user/resetPassword.ts b/task-manager/model/user/resetPassword.ts new file mode 100644 index 0000000..8daad24 --- /dev/null +++ b/task-manager/model/user/resetPassword.ts @@ -0,0 +1,53 @@ +import { User } from './user'; +import { + model as m, + types as t, + validators as v, + widgets as w, + ui, mongo, api, } from 'slingr'; + +const resetPasswordSchema = m.schema({ + newPassword: t.text({ + required: m.required.always + }), + confirmNewPassword: t.text({ + required: m.required.always + }) +}).validate((data: ResetPassword) => { + if (data.newPassword != data.confirmNewPassword) { + return { + message: "Passwords don't match", + path: ['confirmNewPassword'] + } + } +}); + +type ResetPassword = m.infer; + +ui.defaultUiForSchema({ + newPassword: { + label: 'New Password', + dataWidget: [{ + context: ui.context.all, + widget: w.passwordWidget() + }] + }, + confirmNewPassword: { + label: 'Confirm New Password', + dataWidget: [{ + context: ui.context.all, + widget: w.passwordWidget() + }] + } +}); + +export const resetPasswordAction = m.recordAction({ + precondition: (record: User) => { + return record.status == 'active'; + }, + script: (record: User, params: ResetPassword) => { + // do something + } +}); + +api.addAction(resetPasswordAction); \ No newline at end of file diff --git a/task-manager/model/user/user.ts b/task-manager/model/user/user.ts new file mode 100644 index 0000000..e77b8fa --- /dev/null +++ b/task-manager/model/user/user.ts @@ -0,0 +1,120 @@ +import { + model as m, + types as t, + validators as v, + widgets as w, + ui, mongo, api, } from 'slingr'; + +export const userSchema = m.schema({ + firstName: t.text({ + required: m.required.always + }), + lastName: t.text({ + required: m.required.always + }), + fullName: t.text({ + calculation: (user: User) => { + return `${user.firstName} ${user.lastName}`; + } + }), + email: t.email({ + required: m.required.always, + validators: [v.email()] + }), + age: t.number({ + validators: [v.integer(), v.positive(), v.lessThan(150)] + }), + password: t.text({ + required: m.required.always, + validators: [v.minLength(8), v.maxLength(16)] + }), + notes: t.longText() +}); + +export type User = m.infer; + +ui.defaultUiForSchema({ + label: 'Users', + recordLabelField: 'fullName', + sorting: { + field: 'fullName', + direction: 'asc' + }, + fields: { + firstName: { + label: 'First Name', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + lastName: { + label: 'Last Name', + visibility: {type: 'always'}, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + fullName: { + label: 'Last Name', + dataWidget: [{ + context: ui.context.all, + widget: w.textWidget() + }] + }, + email: { + label: 'Email', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.emailWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + age: { + label: 'Age', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + password: { + label: 'Password', + visibility: ui.visibility.never + }, + notes: { + label: 'Notes', + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.textAreaWidget() + }] + } + } +}); + +export const userRepository = mongo.repositoryForSchema({ + collectionName: 'users', + managed: true, + indexes: [ + mongo.regularIndex(['email']), + mongo.regulatIndex(['fullName']) + ], + encrypt: ['password'] +}); + +api.addSchema(userSchema, userRepository); \ No newline at end of file From dc2a65509bcd6bcee6d025795c2585a66e0541b3 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Fri, 7 Mar 2025 15:31:24 -0300 Subject: [PATCH 019/254] task manager --- .../model/user/compactDetailsView.ts | 0 .../model/user/editView.ts | 0 .../model/user/resetPassword.ts | 0 .../model/user/user.ts | 0 task-manager-slingr/model/task/startTask.ts | 42 +++++ task-manager-slingr/model/task/task.ts | 173 ++++++++++++++++++ .../model/user/resetPassword.ts | 0 .../model/user/user.ts | 12 ++ 8 files changed, 227 insertions(+) rename {option-reuse => task-manager-reuse}/model/user/compactDetailsView.ts (100%) rename {option-reuse => task-manager-reuse}/model/user/editView.ts (100%) rename {option-reuse => task-manager-reuse}/model/user/resetPassword.ts (100%) rename {option-reuse => task-manager-reuse}/model/user/user.ts (100%) create mode 100644 task-manager-slingr/model/task/startTask.ts create mode 100644 task-manager-slingr/model/task/task.ts rename {task-manager => task-manager-slingr}/model/user/resetPassword.ts (100%) rename {task-manager => task-manager-slingr}/model/user/user.ts (91%) diff --git a/option-reuse/model/user/compactDetailsView.ts b/task-manager-reuse/model/user/compactDetailsView.ts similarity index 100% rename from option-reuse/model/user/compactDetailsView.ts rename to task-manager-reuse/model/user/compactDetailsView.ts diff --git a/option-reuse/model/user/editView.ts b/task-manager-reuse/model/user/editView.ts similarity index 100% rename from option-reuse/model/user/editView.ts rename to task-manager-reuse/model/user/editView.ts diff --git a/option-reuse/model/user/resetPassword.ts b/task-manager-reuse/model/user/resetPassword.ts similarity index 100% rename from option-reuse/model/user/resetPassword.ts rename to task-manager-reuse/model/user/resetPassword.ts diff --git a/option-reuse/model/user/user.ts b/task-manager-reuse/model/user/user.ts similarity index 100% rename from option-reuse/model/user/user.ts rename to task-manager-reuse/model/user/user.ts diff --git a/task-manager-slingr/model/task/startTask.ts b/task-manager-slingr/model/task/startTask.ts new file mode 100644 index 0000000..d22ec16 --- /dev/null +++ b/task-manager-slingr/model/task/startTask.ts @@ -0,0 +1,42 @@ +import { defaultUserRelationshipWidgets, userSchema } from '../user/user'; +import { Task } from './task'; +import { + model as m, + types as t, + validators as v, + widgets as w, + ui, mongo, api, concurrency} from 'slingr'; + +export const startTaskSchema = m.schema({ + assignee: t.relationship({ + target: userSchema, + required: m.required.always, + defaultValue: (task: Task, startTask: StartTask) => { + return task.assignee; + } + }) +}); + +type StartTask = m.infer; + +ui.defaultUiForSchema({ + assignee: { + label: 'Assignee', + dataWidget: defaultUserRelationshipWidgets + } +}); + +export const startTaskAction = m.recordAction({ + precondition: (record: Task) => { + return record.status == 'open'; + }, + script: (record: Task, params: StartTask) => { + concurrency.lock(record).then((record: Task) => { + record.status = 'inProgress'; + record.assignee = params.assignee; + mongo.save(record); + }); + } +}); + +api.addAction(startTaskAction); diff --git a/task-manager-slingr/model/task/task.ts b/task-manager-slingr/model/task/task.ts new file mode 100644 index 0000000..1e54815 --- /dev/null +++ b/task-manager-slingr/model/task/task.ts @@ -0,0 +1,173 @@ +import { + model as m, + types as t, + validators as v, + widgets as w, + context as ctx, + ui, mongo, api, } from 'slingr'; +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { format } from 'date-fns'; + +export const taskNoteSchema = m.model({ + label: t.text({ + calculation: (taskNote: TaskNote) => { + return `${taskNote.addedByFullName} wrote on ${format(taskNote.timestamp, 'ddd MMM, yyyy')} at ${format(taskNote.timestamp, 'HH:mm')})}`; + } + }), + note: t.longText({ + required: m.required.always + }), + addedBy: t.relationship({ + target: userSchema, + required: m.required.always, + defaultValue: (taskNote: TaskNote) => { + const currentUser = ctx.getCurrentUser(); + return currentUser.id; + } + }), + addedByFullName: t.text(), + timestamp: t.datetime({ + defaultValue: () => new Date() + }) +}); + +ui.defaultUiForSchema({ + label: 'Task Notes', + recordLabelField: 'label', + fields: { + note: { + label: 'Note', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.textAreaWidget() + }] + }, + addedBy: { + label: 'Added By', + visibility: ui.visibility.always, + dataWidget: defaultUserRelationshipWidgets + }, + timestamp: { + label: 'Timestamp', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.datetimeWidget() + }, { + context: ui.context.edit, + widget: w.datetimePickerWidget() + }] + } + } +}); + +export const taskSchema = m.schema({ + title: t.text({ + required: m.required.always + }), + status: t.enum({ + required: m.required.always, + values: ['open', 'inProgress', 'closed'], + defaultValue: 'open' + }), + assignee: t.relationship({ + target: userSchema, + required: m.required.always + }), + description: t.longText(), + notes: t.array({ + items: taskNoteSchema + }) +}); + +export type Task = m.infer; + +ui.defaultUiForSchema({ + label: 'Tasks', + recordLabelField: 'title', + sorting: { + field: 'title', + direction: 'asc' + }, + fields: { + title: { + label: 'Title', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.textWidget() + }, { + context: ui.context.edit, + widget: w.inputWidget() + }] + }, + description: { + label: 'Description', + visibility: ui.visibility.always, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.htmlWidget() + }, { + context: ui.context.edit, + widget: w.htmlEditorWidget() + }] + }, + status: { + label: 'Status', + visibility: ui.visibility.always, + values: { + open: { + label: 'Open', + color: 'blue' + }, + inProgress: { + label: 'In Progress', + color: 'orange' + }, + closed: { + label: 'Closed', + color: 'green' + } + }, + dataWidget: [{ + context: ui.context.readOnly, + widget: w.chipWidget() + }, { + context: ui.context.edit, + widget: w.dropDownWidget() + }] + }, + assignee: { + label: 'Assignee', + visibility: ui.visibility.always, + dataWidget: defaultUserRelationshipWidgets + }, + notes: { + label: 'Notes', + visibility: ui.visibility.always, + } + } +}); + +export const taskRepository = mongo.repositoryForSchema({ + collectionName: 'tasks', + managed: true, + indexes: [ + mongo.regularIndex(['title']), + mongo.regularIndex(['status']), + mongo.regulatIndex(['assignee']) + ], + copiedFields: [ + mongo.copiedField({ + source: userSchema, + sourceField: 'fullName', + targetField: 'notes.assigneeFullName' + }) + ] +}); + +export type TaskNote = t.TypeOf; \ No newline at end of file diff --git a/task-manager/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts similarity index 100% rename from task-manager/model/user/resetPassword.ts rename to task-manager-slingr/model/user/resetPassword.ts diff --git a/task-manager/model/user/user.ts b/task-manager-slingr/model/user/user.ts similarity index 91% rename from task-manager/model/user/user.ts rename to task-manager-slingr/model/user/user.ts index e77b8fa..3068202 100644 --- a/task-manager/model/user/user.ts +++ b/task-manager-slingr/model/user/user.ts @@ -107,6 +107,18 @@ ui.defaultUiForSchema({ } }); +export const defaultUserRelationshipWidgets = [{ + context: ui.context.readOnly, + widget: w.relationshipLabelWidget({ + labelField: 'fullName' + }) +}, { + context: ui.context.edit, + widget: w.relationshipDropDownWidget({ + labelField: 'fullName' + }) +}]; + export const userRepository = mongo.repositoryForSchema({ collectionName: 'users', managed: true, From 1573390792d76dfdbaedb8a00977cf9583cfef7e Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Mon, 10 Mar 2025 12:30:23 -0300 Subject: [PATCH 020/254] task manager - working on fraemwork --- .../framework/backend/schemas.ts | 167 +++++++++++++++++ task-manager-slingr/framework/frontend/ui.ts | 50 +++++ .../framework/frontend/widgets.ts | 25 +++ task-manager-slingr/model/tags/tag.ts | 35 ++++ task-manager-slingr/model/task/startTask.ts | 42 ----- .../model/task/task.actions.ts | 42 +++++ task-manager-slingr/model/task/task.schema.ts | 89 +++++++++ task-manager-slingr/model/task/task.ts | 173 ------------------ task-manager-slingr/model/task/task.ui.ts | 104 +++++++++++ task-manager-slingr/model/user/user.ts | 68 +++---- 10 files changed, 548 insertions(+), 247 deletions(-) create mode 100644 task-manager-slingr/framework/backend/schemas.ts create mode 100644 task-manager-slingr/framework/frontend/ui.ts create mode 100644 task-manager-slingr/framework/frontend/widgets.ts create mode 100644 task-manager-slingr/model/tags/tag.ts delete mode 100644 task-manager-slingr/model/task/startTask.ts create mode 100644 task-manager-slingr/model/task/task.actions.ts create mode 100644 task-manager-slingr/model/task/task.schema.ts delete mode 100644 task-manager-slingr/model/task/task.ts create mode 100644 task-manager-slingr/model/task/task.ui.ts diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts new file mode 100644 index 0000000..5aee86e --- /dev/null +++ b/task-manager-slingr/framework/backend/schemas.ts @@ -0,0 +1,167 @@ +export type FieldType = 'string' | 'number' | 'boolean' | 'datatime' | 'enum' | 'object' | 'array' | 'relationship'; +export type Required = boolean | ((data: any) => boolean); +export type Available = boolean | ((data: any) => boolean); +export type Calculation = (data: any) => any; +export type DefaultValue = (data: any) => any; +export type FieldValidator = (data: any) => {valid: boolean, message?: string}; + +export interface Schema { + [key: string]: FieldDefinition +} + +export function schema(def: Schema) { + return def; +} + +// Utility type to infer the TypeScript type from a TypeDefinition +export type InferType = + TypeDef extends StringFieldDefinition ? string : + TypeDef extends NumberFieldDefinition ? number : + TypeDef extends BooleanFieldDefinition ? boolean : + TypeDef extends LongTextTypeDefinition ? string : + any; // Default to 'any' if the type is not recognized (should ideally be more robust) + + +// Utility type to infer the schema type from a SchemaDefinition +export type InferSchemaType> = { + [Key in keyof SchemaDef]: InferFieldType; +}; + +// Helper type to determine if a field is optional based on 'required' property +type InferFieldType = + TypeDef extends { required: RequiredDefinition } + ? TypeDef['required'] extends typeof required.always + ? InferType + : InferType | undefined // If not always required, make it optional (add undefined) + : InferType | undefined; // If 'required' is not specified, default to optional + +export interface FieldDefinition { + type: FieldType; + required: Required; + available: Available; + defaultValue?: DefaultValue; + calculation?: Calculation; + validators: FieldValidator[]; +} + +export interface StringFieldDefinition extends FieldDefinition { + type: 'string'; + min?: number; + max?: number; + pattern?: string; +} + +export interface NumberFieldDefinition extends FieldDefinition { + integer?: boolean; + min?: number; + max?: number; +} + +export interface EnumFieldDefinition extends FieldDefinition { + values: string[]; +} + +export interface ObjectFieldDefinition extends FieldDefinition { + schema: Schema +} + +export interface ArrayFieldDefinition extends FieldDefinition { + items: FieldDefinition +} + +export interface RelationshipFieldDefinition extends FieldDefinition { + targetSchema: Schema +} + +export function string(def?: Partial) : StringFieldDefinition { + let field = { + type: 'string', + required: false, + available: true, + ...def + } as StringFieldDefinition; + return field; +} + +export function email(def?: Partial) : StringFieldDefinition { + let field = { + type: 'string', + required: false, + available: true, + pattern: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$', + ...def + } as StringFieldDefinition; + return field; +} + +export function number(def?: Partial) : NumberFieldDefinition { + let field = { + type: 'number', + required: false, + available: true, + ...def + } as NumberFieldDefinition; + return field; +} + +export function boolean(def?: Partial) : FieldDefinition { + let field = { + type: 'boolean', + required: false, + available: true, + ...def + } as FieldDefinition; + return field; +} + +export function datatime(def?: Partial) : FieldDefinition { + let field = { + type: 'datatime', + required: false, + available: true, + ...def + } as FieldDefinition; + return field; +} + +export function enumType(def?: Partial) : FieldDefinition { + let field = { + type: 'enum', + required: false, + available: true, + ...def + } as FieldDefinition; + return field; +} + +export function object(def?: Partial) : ObjectFieldDefinition { + let field = { + type: 'object', + schema: null, //schemaOf(), + required: false, + available: true, + ...def + } as ObjectFieldDefinition; + return field; +} + +export function array(def?: Partial) : ArrayFieldDefinition { + let field = { + type: 'array', + required: false, + available: true, + ...def + } as ArrayFieldDefinition; + return field; +} + +export function relationship(def?: Partial) : RelationshipFieldDefinition { + let field = { + type: 'relationship', + schema: null, //schemaOf(), + required: false, + available: true, + ...def + } as RelationshipFieldDefinition; + return field; +} diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts new file mode 100644 index 0000000..c91b6fc --- /dev/null +++ b/task-manager-slingr/framework/frontend/ui.ts @@ -0,0 +1,50 @@ +import { Schema } from "../backend/schemas"; +import { Widget } from "./widgets"; + +type Visible = boolean | ((data: any) => boolean); +type ContextMatcher = (ctx: any) => boolean; +type Context = 'edit' | 'readOnly' | 'table' | 'mobile' | 'desktop' | 'developer' | ContextMatcher +type ContextDefinition = { + type: 'or' | 'and', + contexts: Context[] +} + +export let context = { + or: (contexts: Context[]) => { + return { + type: 'or', + contexts + } as ContextDefinition + }, + and: (contexts: Context[]) => { + return { + type: 'and', + contexts + } as ContextDefinition + } +} + +export interface UIFieldDefinition { + label: string, + visible: Visible, + dataWidgets: { + context: ContextDefinition, + wdiget: Widget + } +} + +export interface DefaultUiForSchema { + label: string, + recordLabelField: keyof T, + sorting: { + field: keyof T, + direction: 'asc' | 'desc' + }, + fields: { + [key in keyof T]: UIFieldDefinition + } +} + +export function defaultUiForSchema(def: DefaultUiForSchema): DefaultUiForSchema { + return def; +} \ No newline at end of file diff --git a/task-manager-slingr/framework/frontend/widgets.ts b/task-manager-slingr/framework/frontend/widgets.ts new file mode 100644 index 0000000..b58853e --- /dev/null +++ b/task-manager-slingr/framework/frontend/widgets.ts @@ -0,0 +1,25 @@ +export interface Widget { + type: string +} + +export interface TextWidget extends Widget { + type: 'text' +} + +export interface InputWidget extends Widget { + type: 'input' +} + +export function text(def: Partial): TextWidget { + return { + type: 'text', + ...def + } as TextWidget; +} + +export function input(def: Partial): InputWidget { + return { + type: 'input', + ...def + } as InputWidget; +} \ No newline at end of file diff --git a/task-manager-slingr/model/tags/tag.ts b/task-manager-slingr/model/tags/tag.ts new file mode 100644 index 0000000..ad90d67 --- /dev/null +++ b/task-manager-slingr/model/tags/tag.ts @@ -0,0 +1,35 @@ +import { model as m, types as t, widgets as w, ui, mongo } from 'slingr'; + +export const tagSchema = m.schema({ + name: t.text({ + required: true + }), + description: t.longText() +}); + +export type Tag = m.infer; + +ui.defaultUiForSchema({ + label: 'Tags', + instanceLabelField: 'name', + sorting: { + field: 'name', + direction: 'asc' + }, + fields: { + name: ui.fields.text({ + label: 'Name', + }), + description: ui.fields.textArea({ + label: 'Description' + }) + } +}); + +export const tagRepository = mongo.repositoryForSchema({ + collectionName: 'tags', + managed: true, + indexes: [ + mongo.regularIndex(['name']) + ] +}); diff --git a/task-manager-slingr/model/task/startTask.ts b/task-manager-slingr/model/task/startTask.ts deleted file mode 100644 index d22ec16..0000000 --- a/task-manager-slingr/model/task/startTask.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { defaultUserRelationshipWidgets, userSchema } from '../user/user'; -import { Task } from './task'; -import { - model as m, - types as t, - validators as v, - widgets as w, - ui, mongo, api, concurrency} from 'slingr'; - -export const startTaskSchema = m.schema({ - assignee: t.relationship({ - target: userSchema, - required: m.required.always, - defaultValue: (task: Task, startTask: StartTask) => { - return task.assignee; - } - }) -}); - -type StartTask = m.infer; - -ui.defaultUiForSchema({ - assignee: { - label: 'Assignee', - dataWidget: defaultUserRelationshipWidgets - } -}); - -export const startTaskAction = m.recordAction({ - precondition: (record: Task) => { - return record.status == 'open'; - }, - script: (record: Task, params: StartTask) => { - concurrency.lock(record).then((record: Task) => { - record.status = 'inProgress'; - record.assignee = params.assignee; - mongo.save(record); - }); - } -}); - -api.addAction(startTaskAction); diff --git a/task-manager-slingr/model/task/task.actions.ts b/task-manager-slingr/model/task/task.actions.ts new file mode 100644 index 0000000..10027b5 --- /dev/null +++ b/task-manager-slingr/model/task/task.actions.ts @@ -0,0 +1,42 @@ +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { Task } from './task.schema'; +import { + model as m, + types as t, + validators as v, + widgets as w, + ui, mongo, api, concurrency} from 'slingr'; + +export const startTaskSchema = m.schema({ + assignees: t.array({ + required: true, + items: t.relationship({ + defaultValue: (task: Task, startTask: StartTask) => { + return task.assignees; + } + }) + }) +}); + +type StartTask = m.infer; + +ui.defaultUiForSchema({ + assignees: ui.fields.relationshipArray({ + label: 'Assignees' + }) +}); + +export const startTaskAction = m.recordAction({ + precondition: (task: Task) => { + return task.status == 'open'; + }, + script: (task: Task, params: StartTask) => { + userRepository.lock(task).then((task: Task) => { + task.status = 'inProgress'; + task.assignees = params.assignees; + userRepository.save(task); + }); + } +}); + +api.addAction(startTaskAction); diff --git a/task-manager-slingr/model/task/task.schema.ts b/task-manager-slingr/model/task/task.schema.ts new file mode 100644 index 0000000..ef6228e --- /dev/null +++ b/task-manager-slingr/model/task/task.schema.ts @@ -0,0 +1,89 @@ +import { + model as m, + types as t, + validators as v, + widgets as w, + context as ctx, + ui, mongo, api, } from 'slingr'; +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { format } from 'date-fns'; +import { Tag, tagSchema } from '../tags/tag'; + +export const taskNoteSchema = m.schema({ + label: t.text({ + calculation: (taskNote: TaskNote) => { + return `${taskNote.addedByFullName} wrote on ${format(taskNote.timestamp, 'ddd MMM, yyyy')} at ${format(taskNote.timestamp, 'HH:mm')})}`; + } + }), + note: t.longText({ + required: true + }), + addedBy: t.relationship({ + required: true, + defaultValue: (taskNote: TaskNote) => { + const currentUser = ctx.getCurrentUser(); + return currentUser.id; + } + }), + timestamp: t.datetime({ + defaultValue: () => new Date() + }) +}); + +export type TaskNote = t.TypeOf; + +export type TaskStatus = 'open' | 'inProgress' | 'completed' | 'archived'; + +export const taskSchema = mongo.documentSchema.extend({ + number: t.number({ + validators: [v.integer()] + }), + title: t.text({ + required: true + }), + status: t.enum({ + required: true, + defaultValue: 'open' + }), + tags: t.array({ + items: t.relationship() + }), + createdAt: t.datetime({ + required: true, + defaultValue: () => new Date() + }), + createdBy: t.relationship({ + required: true, + defaultValue: (task: Task) => { + const currentUser = ctx.getCurrentUser(); + return currentUser.id; + } + }), + closedAt: t.datetime({ + availability: (task: Task) => { + return task.status === 'completed'; + } + }), + assignees: t.array({ + items: t.relationship() + }), + description: t.longText(), + notes: t.array({ + items: taskNoteSchema + }) +}); + +export type Task = m.infer; + +export const taskRepository = mongo.repositoryForSchema({ + collectionName: 'tasks', + managed: true, + autoIncrement: [ + mongo.autoIncrementField('number', 1) + ], + indexes: [ + mongo.regularIndex(['title']), + mongo.regularIndex(['status']), + mongo.regularIndex(['assignees']) + ] +}); diff --git a/task-manager-slingr/model/task/task.ts b/task-manager-slingr/model/task/task.ts deleted file mode 100644 index 1e54815..0000000 --- a/task-manager-slingr/model/task/task.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { - model as m, - types as t, - validators as v, - widgets as w, - context as ctx, - ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; -import { format } from 'date-fns'; - -export const taskNoteSchema = m.model({ - label: t.text({ - calculation: (taskNote: TaskNote) => { - return `${taskNote.addedByFullName} wrote on ${format(taskNote.timestamp, 'ddd MMM, yyyy')} at ${format(taskNote.timestamp, 'HH:mm')})}`; - } - }), - note: t.longText({ - required: m.required.always - }), - addedBy: t.relationship({ - target: userSchema, - required: m.required.always, - defaultValue: (taskNote: TaskNote) => { - const currentUser = ctx.getCurrentUser(); - return currentUser.id; - } - }), - addedByFullName: t.text(), - timestamp: t.datetime({ - defaultValue: () => new Date() - }) -}); - -ui.defaultUiForSchema({ - label: 'Task Notes', - recordLabelField: 'label', - fields: { - note: { - label: 'Note', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.textAreaWidget() - }] - }, - addedBy: { - label: 'Added By', - visibility: ui.visibility.always, - dataWidget: defaultUserRelationshipWidgets - }, - timestamp: { - label: 'Timestamp', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.datetimeWidget() - }, { - context: ui.context.edit, - widget: w.datetimePickerWidget() - }] - } - } -}); - -export const taskSchema = m.schema({ - title: t.text({ - required: m.required.always - }), - status: t.enum({ - required: m.required.always, - values: ['open', 'inProgress', 'closed'], - defaultValue: 'open' - }), - assignee: t.relationship({ - target: userSchema, - required: m.required.always - }), - description: t.longText(), - notes: t.array({ - items: taskNoteSchema - }) -}); - -export type Task = m.infer; - -ui.defaultUiForSchema({ - label: 'Tasks', - recordLabelField: 'title', - sorting: { - field: 'title', - direction: 'asc' - }, - fields: { - title: { - label: 'Title', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - description: { - label: 'Description', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.htmlWidget() - }, { - context: ui.context.edit, - widget: w.htmlEditorWidget() - }] - }, - status: { - label: 'Status', - visibility: ui.visibility.always, - values: { - open: { - label: 'Open', - color: 'blue' - }, - inProgress: { - label: 'In Progress', - color: 'orange' - }, - closed: { - label: 'Closed', - color: 'green' - } - }, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.chipWidget() - }, { - context: ui.context.edit, - widget: w.dropDownWidget() - }] - }, - assignee: { - label: 'Assignee', - visibility: ui.visibility.always, - dataWidget: defaultUserRelationshipWidgets - }, - notes: { - label: 'Notes', - visibility: ui.visibility.always, - } - } -}); - -export const taskRepository = mongo.repositoryForSchema({ - collectionName: 'tasks', - managed: true, - indexes: [ - mongo.regularIndex(['title']), - mongo.regularIndex(['status']), - mongo.regulatIndex(['assignee']) - ], - copiedFields: [ - mongo.copiedField({ - source: userSchema, - sourceField: 'fullName', - targetField: 'notes.assigneeFullName' - }) - ] -}); - -export type TaskNote = t.TypeOf; \ No newline at end of file diff --git a/task-manager-slingr/model/task/task.ui.ts b/task-manager-slingr/model/task/task.ui.ts new file mode 100644 index 0000000..5c23bc0 --- /dev/null +++ b/task-manager-slingr/model/task/task.ui.ts @@ -0,0 +1,104 @@ +import { + model as m, + types as t, + validators as v, + widgets as w, + context as ctx, + ui, mongo, api, } from 'slingr'; +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { format } from 'date-fns'; +import { Tag, tagSchema } from '../tags/tag'; +import { Task, TaskNote, TaskStatus } from './task.schema'; + +ui.defaultUiForSchema({ + label: 'Task Notes', + recordLabelField: 'label', + fields: { + note: { + label: 'Note', + visible: true, + dataWidget: [{ + context: 'readOnly', + widget: w.textWidget() + }, { + context: 'edit', + widget: w.textAreaWidget() + }] + }, + addedBy: { + label: 'Added By', + visible: true, + dataWidget: defaultUserRelationshipWidgets + }, + timestamp: { + label: 'Timestamp', + visible: true, + dataWidget: [{ + context: 'readOnly', + widget: w.datetimeWidget() + }, { + context: 'edit', + widget: w.datetimePickerWidget() + }] + } + } +}); + +ui.defaultUiForSchema({ + label: 'Tasks', + instanceLabelField: 'title', + sorting: { + field: 'title', + direction: 'asc' + }, + fields: { + number: ui.fields.autoIncrement({ + label: 'Number' + }), + title: ui.fields.text({ + label: 'Title' + }), + description: ui.fields.htmlText({ + label: 'Description' + }), + status: ui.fields.enum({ + label: 'Status', + values: { + open: { + label: 'Open', + color: 'blue' + }, + inProgress: { + label: 'In Progress', + color: 'orange' + }, + completed: { + label: 'Completed', + color: 'green' + }, + archived: { + label: 'Archived', + color: 'gray' + } + } + }), + tags: ui.fields.relationshipArray({ + label: 'Tags' + }), + createdAt: ui.fields.datetime({ + label: 'Created At' + }), + createdBy: ui.fields.relationship({ + label: 'Created By' + }), + closedAt: ui.fields.datetime({ + label: 'Closed At' + }), + assignees: ui.fields.relationshipArray({ + label: 'Assignees' + }), + notes: ui.fields.objectArray({ + label: 'Notes' + }) + } +}); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts index 3068202..b1611ef 100644 --- a/task-manager-slingr/model/user/user.ts +++ b/task-manager-slingr/model/user/user.ts @@ -1,37 +1,41 @@ +import * as s from '../../framework/backend/schemas'; +import * as ui from '../../framework/frontend/ui'; +import * as w from '../../framework/frontend/widgets'; import { model as m, types as t, validators as v, - widgets as w, - ui, mongo, api, } from 'slingr'; + mongo, api, } from 'slingr'; -export const userSchema = m.schema({ - firstName: t.text({ - required: m.required.always +export const userSchema = s.schema({ + firstName: s.string({ + required: true }), - lastName: t.text({ - required: m.required.always + lastName: s.string({ + required: true }), - fullName: t.text({ + fullName: s.string({ calculation: (user: User) => { return `${user.firstName} ${user.lastName}`; } }), - email: t.email({ - required: m.required.always, - validators: [v.email()] + email: s.email({ + required: true }), - age: t.number({ - validators: [v.integer(), v.positive(), v.lessThan(150)] + age: s.number({ + integer: true, + min: 0, + max: 150 }), - password: t.text({ - required: m.required.always, - validators: [v.minLength(8), v.maxLength(16)] + password: s.string({ + required: true, + min: 8, + max: 16 }), - notes: t.longText() + notes: s.string({}) }); -export type User = m.infer; +export type User = s.infer; ui.defaultUiForSchema({ label: 'Users', @@ -43,64 +47,64 @@ ui.defaultUiForSchema({ fields: { firstName: { label: 'First Name', - visibility: ui.visibility.always, + visibility: 'always', dataWidget: [{ - context: ui.context.readOnly, + context: 'readOnly', widget: w.textWidget() }, { - context: ui.context.edit, + context: 'edit', widget: w.inputWidget() }] }, lastName: { label: 'Last Name', - visibility: {type: 'always'}, + visibility: 'always', dataWidget: [{ - context: ui.context.readOnly, + context: 'readOnly', widget: w.textWidget() }, { - context: ui.context.edit, + context: 'edit', widget: w.inputWidget() }] }, fullName: { label: 'Last Name', dataWidget: [{ - context: ui.context.all, + context: 'all', widget: w.textWidget() }] }, email: { label: 'Email', dataWidget: [{ - context: ui.context.readOnly, + context: 'readOnly', widget: w.emailWidget() }, { - context: ui.context.edit, + context: 'edit', widget: w.inputWidget() }] }, age: { label: 'Age', dataWidget: [{ - context: ui.context.readOnly, + context: 'readOnly', widget: w.textWidget() }, { - context: ui.context.edit, + context: 'edit', widget: w.inputWidget() }] }, password: { label: 'Password', - visibility: ui.visibility.never + visibility: 'never' }, notes: { label: 'Notes', dataWidget: [{ - context: ui.context.readOnly, + context: 'readOnly', widget: w.textWidget() }, { - context: ui.context.edit, + context: 'edit', widget: w.textAreaWidget() }] } From 76c9be3becae225995ed2c1fb414fa584fc2ee66 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Mon, 10 Mar 2025 17:26:06 -0300 Subject: [PATCH 021/254] task manager - adding more pieces of the framework --- task-manager-slingr/framework/backend/api.ts | 6 + task-manager-slingr/framework/backend/db.ts | 11 ++ .../framework/backend/mongo.ts | 19 +++ .../framework/backend/schemas.ts | 39 ++--- task-manager-slingr/framework/frontend/ui.ts | 73 ++++++++-- .../framework/frontend/widgets.ts | 36 ++++- task-manager-slingr/model/task/task.schema.ts | 2 +- task-manager-slingr/model/task/task.ui.ts | 2 +- task-manager-slingr/model/user/user.db.ts | 15 ++ task-manager-slingr/model/user/user.schema.ts | 31 ++++ task-manager-slingr/model/user/user.ts | 136 ------------------ task-manager-slingr/model/user/user.ui.ts | 23 +++ 12 files changed, 220 insertions(+), 173 deletions(-) create mode 100644 task-manager-slingr/framework/backend/api.ts create mode 100644 task-manager-slingr/framework/backend/db.ts create mode 100644 task-manager-slingr/framework/backend/mongo.ts create mode 100644 task-manager-slingr/model/user/user.db.ts create mode 100644 task-manager-slingr/model/user/user.schema.ts delete mode 100644 task-manager-slingr/model/user/user.ts create mode 100644 task-manager-slingr/model/user/user.ui.ts diff --git a/task-manager-slingr/framework/backend/api.ts b/task-manager-slingr/framework/backend/api.ts new file mode 100644 index 0000000..4107ac9 --- /dev/null +++ b/task-manager-slingr/framework/backend/api.ts @@ -0,0 +1,6 @@ +import { Repository } from "./db"; +import { Schema } from "./schemas"; + +export function addSchema(schema: Schema, repository: Repository) { + +} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/db.ts b/task-manager-slingr/framework/backend/db.ts new file mode 100644 index 0000000..a860f8e --- /dev/null +++ b/task-manager-slingr/framework/backend/db.ts @@ -0,0 +1,11 @@ +export interface Repository { + name: string; + managed: boolean; + indexes: Index[]; + encrypt: (keyof T)[]; +} + +export interface Index { + type: 'regular' | 'unique' | 'fulltext' | 'vector', + fields: (keyof T)[] +} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/mongo.ts b/task-manager-slingr/framework/backend/mongo.ts new file mode 100644 index 0000000..bed2f69 --- /dev/null +++ b/task-manager-slingr/framework/backend/mongo.ts @@ -0,0 +1,19 @@ +import { Index, Repository } from "./db"; + +export interface MongoRepository extends Repository { +} + +export function repositoryForSchema(def: MongoRepository): MongoRepository { + return def; +} + +function regular(fields: (keyof T)[]): Index { + return { + type: 'regular', + fields + } as Index; +}; + +export let indexes = { + regular: regular +}; \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts index 5aee86e..63c7838 100644 --- a/task-manager-slingr/framework/backend/schemas.ts +++ b/task-manager-slingr/framework/backend/schemas.ts @@ -13,27 +13,25 @@ export function schema(def: Schema) { return def; } -// Utility type to infer the TypeScript type from a TypeDefinition -export type InferType = - TypeDef extends StringFieldDefinition ? string : - TypeDef extends NumberFieldDefinition ? number : - TypeDef extends BooleanFieldDefinition ? boolean : - TypeDef extends LongTextTypeDefinition ? string : - any; // Default to 'any' if the type is not recognized (should ideally be more robust) - - -// Utility type to infer the schema type from a SchemaDefinition -export type InferSchemaType> = { - [Key in keyof SchemaDef]: InferFieldType; +// Helper type to determine if a field is required +type IsRequired = T['required'] extends true ? true : T['required'] extends false ? false : boolean; + +// Main type inference utility +export type InferType = { + [K in keyof T as IsRequired extends false ? never : K]: InferFieldType; +} & { + [K in keyof T as IsRequired extends true ? never : K]?: InferFieldType; }; -// Helper type to determine if a field is optional based on 'required' property -type InferFieldType = - TypeDef extends { required: RequiredDefinition } - ? TypeDef['required'] extends typeof required.always - ? InferType - : InferType | undefined // If not always required, make it optional (add undefined) - : InferType | undefined; // If 'required' is not specified, default to optional +type InferFieldType = + F extends StringFieldDefinition ? string : + F extends NumberFieldDefinition ? number : + F extends BooleanFieldDefinition ? boolean : + F extends EnumFieldDefinition ? F['values'][number] : + F extends ObjectFieldDefinition ? InferType : + F extends ArrayFieldDefinition ? InferFieldType[] : + F extends RelationshipFieldDefinition ? InferType : + any; // Fallback, ideally should be never or handle more cases export interface FieldDefinition { type: FieldType; @@ -57,6 +55,9 @@ export interface NumberFieldDefinition extends FieldDefinition { max?: number; } +export interface BooleanFieldDefinition extends FieldDefinition { +} + export interface EnumFieldDefinition extends FieldDefinition { values: string[]; } diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts index c91b6fc..b49b1b8 100644 --- a/task-manager-slingr/framework/frontend/ui.ts +++ b/task-manager-slingr/framework/frontend/ui.ts @@ -1,5 +1,5 @@ import { Schema } from "../backend/schemas"; -import { Widget } from "./widgets"; +import * as w from "./widgets"; type Visible = boolean | ((data: any) => boolean); type ContextMatcher = (ctx: any) => boolean; @@ -7,7 +7,7 @@ type Context = 'edit' | 'readOnly' | 'table' | 'mobile' | 'desktop' | 'developer type ContextDefinition = { type: 'or' | 'and', contexts: Context[] -} +} | Context; export let context = { or: (contexts: Context[]) => { @@ -20,19 +20,74 @@ export let context = { return { type: 'and', contexts - } as ContextDefinition + } as ContextDefinition } } -export interface UIFieldDefinition { +export interface UiFieldDefinition { label: string, visible: Visible, - dataWidgets: { - context: ContextDefinition, - wdiget: Widget - } + dataWidgets: {context: ContextDefinition, widget: w.Widget}[] +} + +export interface TextUiFieldDefinition extends UiFieldDefinition { +} + +function text(def: Partial): UiFieldDefinition { + return { + visible: true, + dataWidgets: [{ + context: 'readOnly', + widget: w.text() + }, { + context: 'edit', + widget: w.input() + }], + ...def + } as UiFieldDefinition; +} + +export interface NumberUiFieldDefinition extends UiFieldDefinition { } +function number(def: Partial): UiFieldDefinition { + return { + visible: true, + dataWidgets: [{ + context: 'readOnly', + widget: w.text() + }, { + context: 'edit', + widget: w.input() + }], + ...def + } as UiFieldDefinition; +} + +export interface PasswordUiFieldDefinition extends UiFieldDefinition { +} + +function password(def: Partial): UiFieldDefinition { + return { + visible: true, + dataWidgets: [{ + context: 'readOnly', + widget: w.password() + }, { + context: 'edit', + widget: w.passwordInput() + }], + ...def + } as UiFieldDefinition; +} + + +export let fields = { + text: text, + number: number, + password: password +}; + export interface DefaultUiForSchema { label: string, recordLabelField: keyof T, @@ -41,7 +96,7 @@ export interface DefaultUiForSchema { direction: 'asc' | 'desc' }, fields: { - [key in keyof T]: UIFieldDefinition + [key in keyof T]: UiFieldDefinition } } diff --git a/task-manager-slingr/framework/frontend/widgets.ts b/task-manager-slingr/framework/frontend/widgets.ts index b58853e..54418e5 100644 --- a/task-manager-slingr/framework/frontend/widgets.ts +++ b/task-manager-slingr/framework/frontend/widgets.ts @@ -6,20 +6,42 @@ export interface TextWidget extends Widget { type: 'text' } -export interface InputWidget extends Widget { - type: 'input' -} - -export function text(def: Partial): TextWidget { +export function text(def?: Partial): TextWidget { return { type: 'text', ...def } as TextWidget; } -export function input(def: Partial): InputWidget { +export interface InputWidget extends Widget { + type: 'input' +} + +export function input(def?: Partial): InputWidget { return { type: 'input', ...def } as InputWidget; -} \ No newline at end of file +} + +export interface PasswordWidget extends Widget { + type: 'password' +} + +export function password(def?: Partial): PasswordWidget { + return { + type: 'password', + ...def + } as PasswordWidget; +} + +export interface PasswordInputWidget extends Widget { + type: 'passwordInput' +} + +export function passwordInput(def?: Partial): PasswordInputWidget { + return { + type: 'passwordInput', + ...def + } as PasswordInputWidget; +} diff --git a/task-manager-slingr/model/task/task.schema.ts b/task-manager-slingr/model/task/task.schema.ts index ef6228e..8878b31 100644 --- a/task-manager-slingr/model/task/task.schema.ts +++ b/task-manager-slingr/model/task/task.schema.ts @@ -5,7 +5,7 @@ import { widgets as w, context as ctx, ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; import { format } from 'date-fns'; import { Tag, tagSchema } from '../tags/tag'; diff --git a/task-manager-slingr/model/task/task.ui.ts b/task-manager-slingr/model/task/task.ui.ts index 5c23bc0..94146d6 100644 --- a/task-manager-slingr/model/task/task.ui.ts +++ b/task-manager-slingr/model/task/task.ui.ts @@ -5,7 +5,7 @@ import { widgets as w, context as ctx, ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; +import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; import { format } from 'date-fns'; import { Tag, tagSchema } from '../tags/tag'; import { Task, TaskNote, TaskStatus } from './task.schema'; diff --git a/task-manager-slingr/model/user/user.db.ts b/task-manager-slingr/model/user/user.db.ts new file mode 100644 index 0000000..4983899 --- /dev/null +++ b/task-manager-slingr/model/user/user.db.ts @@ -0,0 +1,15 @@ +import { User, userSchema } from "./user.schema"; +import * as mongo from '../../framework/backend/mongo'; +import * as api from '../../framework/backend/api'; + +export const userRepository = mongo.repositoryForSchema({ + name: 'users', + managed: true, + indexes: [ + mongo.indexes.regular(['email']), + mongo.indexes.regular(['fullName']) + ], + encrypt: ['password'] +}); + +api.addSchema(userSchema, userRepository); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.schema.ts b/task-manager-slingr/model/user/user.schema.ts new file mode 100644 index 0000000..d0608e4 --- /dev/null +++ b/task-manager-slingr/model/user/user.schema.ts @@ -0,0 +1,31 @@ +import * as s from '../../framework/backend/schemas'; + +export const userSchema = s.schema({ + firstName: s.string({ + required: true + }), + lastName: s.string({ + required: true + }), + fullName: s.string({ + calculation: (user: User) => { + return `${user.firstName} ${user.lastName}`; + } + }), + email: s.email({ + required: true + }), + age: s.number({ + integer: true, + min: 0, + max: 150 + }), + password: s.string({ + required: true, + min: 8, + max: 16 + }), + notes: s.string({}) +}); + +export type User = s.InferType; \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts deleted file mode 100644 index b1611ef..0000000 --- a/task-manager-slingr/model/user/user.ts +++ /dev/null @@ -1,136 +0,0 @@ -import * as s from '../../framework/backend/schemas'; -import * as ui from '../../framework/frontend/ui'; -import * as w from '../../framework/frontend/widgets'; -import { - model as m, - types as t, - validators as v, - mongo, api, } from 'slingr'; - -export const userSchema = s.schema({ - firstName: s.string({ - required: true - }), - lastName: s.string({ - required: true - }), - fullName: s.string({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - } - }), - email: s.email({ - required: true - }), - age: s.number({ - integer: true, - min: 0, - max: 150 - }), - password: s.string({ - required: true, - min: 8, - max: 16 - }), - notes: s.string({}) -}); - -export type User = s.infer; - -ui.defaultUiForSchema({ - label: 'Users', - recordLabelField: 'fullName', - sorting: { - field: 'fullName', - direction: 'asc' - }, - fields: { - firstName: { - label: 'First Name', - visibility: 'always', - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.inputWidget() - }] - }, - lastName: { - label: 'Last Name', - visibility: 'always', - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.inputWidget() - }] - }, - fullName: { - label: 'Last Name', - dataWidget: [{ - context: 'all', - widget: w.textWidget() - }] - }, - email: { - label: 'Email', - dataWidget: [{ - context: 'readOnly', - widget: w.emailWidget() - }, { - context: 'edit', - widget: w.inputWidget() - }] - }, - age: { - label: 'Age', - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.inputWidget() - }] - }, - password: { - label: 'Password', - visibility: 'never' - }, - notes: { - label: 'Notes', - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.textAreaWidget() - }] - } - } -}); - -export const defaultUserRelationshipWidgets = [{ - context: ui.context.readOnly, - widget: w.relationshipLabelWidget({ - labelField: 'fullName' - }) -}, { - context: ui.context.edit, - widget: w.relationshipDropDownWidget({ - labelField: 'fullName' - }) -}]; - -export const userRepository = mongo.repositoryForSchema({ - collectionName: 'users', - managed: true, - indexes: [ - mongo.regularIndex(['email']), - mongo.regulatIndex(['fullName']) - ], - encrypt: ['password'] -}); - -api.addSchema(userSchema, userRepository); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ui.ts b/task-manager-slingr/model/user/user.ui.ts new file mode 100644 index 0000000..25f0b75 --- /dev/null +++ b/task-manager-slingr/model/user/user.ui.ts @@ -0,0 +1,23 @@ +import { User } from "./user.schema"; +import * as ui from '../../framework/frontend/ui'; + +ui.defaultUiForSchema({ + label: 'Users', + recordLabelField: 'fullName', + sorting: { + field: 'fullName', + direction: 'asc' + }, + fields: { + firstName: ui.fields.text({label: 'First Name'}), + lastName: ui.fields.text({label: 'Last Name'}), + fullName: ui.fields.text({label: 'Full Name'}), + email: ui.fields.text({label: 'Email'}), + age: ui.fields.number({label: 'Age'}), + password: ui.fields.password({ + label: 'Password', + visible: false + }), + notes: ui.fields.text({label: 'Notes'}) + } +}); From ffbcccaf16409668c33b789abe6d0481e03079f1 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Mon, 10 Mar 2025 17:38:07 -0300 Subject: [PATCH 022/254] task manager - polishing user --- .../model/user/resetPassword.ts | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/task-manager-slingr/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts index 8daad24..c990d56 100644 --- a/task-manager-slingr/model/user/resetPassword.ts +++ b/task-manager-slingr/model/user/resetPassword.ts @@ -1,28 +1,23 @@ -import { User } from './user'; -import { - model as m, - types as t, - validators as v, - widgets as w, - ui, mongo, api, } from 'slingr'; +import { User } from './user.schema'; +import * as s from '../../framework/backend/schemas'; -const resetPasswordSchema = m.schema({ - newPassword: t.text({ - required: m.required.always +const resetPasswordSchema = s.schema({ + newPassword: s.string({ + required: true }), - confirmNewPassword: t.text({ - required: m.required.always + confirmNewPassword: s.string({ + required: true }) }).validate((data: ResetPassword) => { if (data.newPassword != data.confirmNewPassword) { - return { + return [{ message: "Passwords don't match", - path: ['confirmNewPassword'] - } + path: 'confirmNewPassword' + }]; } }); -type ResetPassword = m.infer; +type ResetPassword = s.InferType; ui.defaultUiForSchema({ newPassword: { From a033d2a8f276e654c2d4eedd7aa9cbc08750336e Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Tue, 11 Mar 2025 22:04:53 -0300 Subject: [PATCH 023/254] task manager - frameowrk --- .../framework/backend/actions.ts | 13 +++++++++ .../framework/backend/schemas.ts | 4 +-- task-manager-slingr/framework/frontend/ui.ts | 6 ++--- .../model/user/resetPassword.ts | 27 +++++++------------ task-manager-slingr/model/user/user.schema.ts | 5 ++++ 5 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 task-manager-slingr/framework/backend/actions.ts diff --git a/task-manager-slingr/framework/backend/actions.ts b/task-manager-slingr/framework/backend/actions.ts new file mode 100644 index 0000000..50c2c9e --- /dev/null +++ b/task-manager-slingr/framework/backend/actions.ts @@ -0,0 +1,13 @@ +interface Action { + +} + +interface RecordActionDefinition { + name?: string; + precondition?: (data: S) => boolean; + script: (data: S, params: P) => any; +} + +export function recordAction(def: RecordActionDefinition): Action { + return {} as Action; +} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts index 63c7838..293cb5a 100644 --- a/task-manager-slingr/framework/backend/schemas.ts +++ b/task-manager-slingr/framework/backend/schemas.ts @@ -9,7 +9,7 @@ export interface Schema { [key: string]: FieldDefinition } -export function schema(def: Schema) { +export function schema(def: Schema, validator?: (data: any) => {path: string, message: string}[]) { return def; } @@ -125,7 +125,7 @@ export function datatime(def?: Partial) : FieldDefinition { return field; } -export function enumType(def?: Partial) : FieldDefinition { +export function enumeration(def?: Partial) : FieldDefinition { let field = { type: 'enum', required: false, diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts index b49b1b8..626ea4f 100644 --- a/task-manager-slingr/framework/frontend/ui.ts +++ b/task-manager-slingr/framework/frontend/ui.ts @@ -89,9 +89,9 @@ export let fields = { }; export interface DefaultUiForSchema { - label: string, - recordLabelField: keyof T, - sorting: { + label?: string, + recordLabelField?: keyof T, + sorting?: { field: keyof T, direction: 'asc' | 'desc' }, diff --git a/task-manager-slingr/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts index c990d56..35a27a0 100644 --- a/task-manager-slingr/model/user/resetPassword.ts +++ b/task-manager-slingr/model/user/resetPassword.ts @@ -1,5 +1,7 @@ import { User } from './user.schema'; import * as s from '../../framework/backend/schemas'; +import * as a from '../../framework/backend/actions'; +import * as ui from '../../framework/frontend/ui'; const resetPasswordSchema = s.schema({ newPassword: s.string({ @@ -8,37 +10,28 @@ const resetPasswordSchema = s.schema({ confirmNewPassword: s.string({ required: true }) -}).validate((data: ResetPassword) => { +}, (data: ResetPassword) => { if (data.newPassword != data.confirmNewPassword) { return [{ message: "Passwords don't match", path: 'confirmNewPassword' }]; } + return []; }); type ResetPassword = s.InferType; ui.defaultUiForSchema({ - newPassword: { - label: 'New Password', - dataWidget: [{ - context: ui.context.all, - widget: w.passwordWidget() - }] - }, - confirmNewPassword: { - label: 'Confirm New Password', - dataWidget: [{ - context: ui.context.all, - widget: w.passwordWidget() - }] + fields: { + newPassword: ui.fields.password({label: 'New Password'}), + confirmNewPassword: ui.fields.password({label: 'Confirm New Password'}) } }); -export const resetPasswordAction = m.recordAction({ - precondition: (record: User) => { - return record.status == 'active'; +export const resetPasswordAction = a.recordAction({ + precondition: (data: User) => { + return data.status == 'active'; }, script: (record: User, params: ResetPassword) => { // do something diff --git a/task-manager-slingr/model/user/user.schema.ts b/task-manager-slingr/model/user/user.schema.ts index d0608e4..1a3e9c2 100644 --- a/task-manager-slingr/model/user/user.schema.ts +++ b/task-manager-slingr/model/user/user.schema.ts @@ -15,6 +15,11 @@ export const userSchema = s.schema({ email: s.email({ required: true }), + status: s.enumeration({ + required: true, + defaultValue: (data: User) => 'active', + values: ['active', 'inactive'], + }), age: s.number({ integer: true, min: 0, From 10218bfe2672e6954c7b82a4caa592a92d66501d Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Wed, 12 Mar 2025 12:33:33 -0300 Subject: [PATCH 024/254] task manager - improvements on framework --- .../framework/backend/actions.ts | 4 +- task-manager-slingr/framework/backend/api.ts | 5 +++ .../framework/backend/schemas.ts | 10 ++++- task-manager-slingr/framework/frontend/ui.ts | 32 ++++++++++++++- .../framework/helpers/models.ts | 39 +++++++++++++++++++ .../model/user/resetPassword.ts | 5 ++- task-manager-slingr/model/user/user.ts | 39 +++++++++++++++++++ task-manager-slingr/model/user/user.ui.ts | 2 +- 8 files changed, 127 insertions(+), 9 deletions(-) create mode 100644 task-manager-slingr/framework/helpers/models.ts create mode 100644 task-manager-slingr/model/user/user.ts diff --git a/task-manager-slingr/framework/backend/actions.ts b/task-manager-slingr/framework/backend/actions.ts index 50c2c9e..4de1207 100644 --- a/task-manager-slingr/framework/backend/actions.ts +++ b/task-manager-slingr/framework/backend/actions.ts @@ -2,12 +2,12 @@ interface Action { } -interface RecordActionDefinition { +export interface ObjectActionDefinition { name?: string; precondition?: (data: S) => boolean; script: (data: S, params: P) => any; } -export function recordAction(def: RecordActionDefinition): Action { +export function objectAction(def: ObjectActionDefinition): Action { return {} as Action; } \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/api.ts b/task-manager-slingr/framework/backend/api.ts index 4107ac9..fd4453c 100644 --- a/task-manager-slingr/framework/backend/api.ts +++ b/task-manager-slingr/framework/backend/api.ts @@ -1,6 +1,11 @@ import { Repository } from "./db"; import { Schema } from "./schemas"; +import { ObjectActionDefinition } from "./actions"; export function addSchema(schema: Schema, repository: Repository) { +} + +export function addAction(action: ObjectActionDefinition) { + } \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts index 293cb5a..696eb9f 100644 --- a/task-manager-slingr/framework/backend/schemas.ts +++ b/task-manager-slingr/framework/backend/schemas.ts @@ -50,27 +50,33 @@ export interface StringFieldDefinition extends FieldDefinition { } export interface NumberFieldDefinition extends FieldDefinition { + type: 'number'; integer?: boolean; min?: number; max?: number; } export interface BooleanFieldDefinition extends FieldDefinition { + type: 'boolean'; } export interface EnumFieldDefinition extends FieldDefinition { + type: 'enum'; values: string[]; } export interface ObjectFieldDefinition extends FieldDefinition { + type: 'object'; schema: Schema } export interface ArrayFieldDefinition extends FieldDefinition { + type: 'array'; items: FieldDefinition } export interface RelationshipFieldDefinition extends FieldDefinition { + type: 'relationship'; targetSchema: Schema } @@ -125,13 +131,13 @@ export function datatime(def?: Partial) : FieldDefinition { return field; } -export function enumeration(def?: Partial) : FieldDefinition { +export function enumeration(def?: Partial) : EnumFieldDefinition { let field = { type: 'enum', required: false, available: true, ...def - } as FieldDefinition; + } as EnumFieldDefinition; return field; } diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts index 626ea4f..c578ff7 100644 --- a/task-manager-slingr/framework/frontend/ui.ts +++ b/task-manager-slingr/framework/frontend/ui.ts @@ -1,5 +1,6 @@ import { Schema } from "../backend/schemas"; import * as w from "./widgets"; +import { Widget } from "./widgets"; type Visible = boolean | ((data: any) => boolean); type ContextMatcher = (ctx: any) => boolean; @@ -90,7 +91,7 @@ export let fields = { export interface DefaultUiForSchema { label?: string, - recordLabelField?: keyof T, + objectLabelField?: keyof T, sorting?: { field: keyof T, direction: 'asc' | 'desc' @@ -102,4 +103,31 @@ export interface DefaultUiForSchema { export function defaultUiForSchema(def: DefaultUiForSchema): DefaultUiForSchema { return def; -} \ No newline at end of file +} + +export interface View { + name: string, + model?: ViewModel, + layout?: Layout +} + + +export interface ViewModel { + widgets: { [key: string]: Widget } +} + +export type LayoutType = 'vertical' | 'horizontal'; + +export interface Layout { + type: LayoutType, + widgets: Widget[] +} + +export interface DataView extends View { + mode: 'readOnly' | 'edit' | 'create' +} + +export interface SimpleDataView extends DataView { + managed: boolean, + fields?: Array +} diff --git a/task-manager-slingr/framework/helpers/models.ts b/task-manager-slingr/framework/helpers/models.ts new file mode 100644 index 0000000..8163866 --- /dev/null +++ b/task-manager-slingr/framework/helpers/models.ts @@ -0,0 +1,39 @@ +import { Repository } from "../backend/db"; +import * as s from "../backend/schemas"; +import * as ui from "../frontend/ui"; + +export interface ModelFieldDefinition extends s.FieldDefinition { + defaultUi?: ui.UiFieldDefinition; +} + +export interface ModelDefinition { + fields: { + [key: string]: ModelFieldDefinition + }, + db?: Repository; + ui?: { + label: string; + objectLabelField: string; + } +} + +export function model(def: ModelDefinition): s.Schema { + // register schema + let schema = s.schema(def.fields); + type SchemaType = s.InferType; + // register default ui + ui.defaultUiForSchema({ + label: def.ui?.label, + objectLabelField: def.ui?.objectLabelField, + fields: { + // go thorugh each field and add the default ui + ...Object.keys(def.fields).reduce((acc, key) => { + let field = def.fields[key]; + acc[key] = field.defaultUi; + return acc; + }, {}) + } + }); + // TODO register repository + return schema; +} \ No newline at end of file diff --git a/task-manager-slingr/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts index 35a27a0..60c3d20 100644 --- a/task-manager-slingr/model/user/resetPassword.ts +++ b/task-manager-slingr/model/user/resetPassword.ts @@ -2,6 +2,7 @@ import { User } from './user.schema'; import * as s from '../../framework/backend/schemas'; import * as a from '../../framework/backend/actions'; import * as ui from '../../framework/frontend/ui'; +import * as api from '../../framework/backend/api'; const resetPasswordSchema = s.schema({ newPassword: s.string({ @@ -29,7 +30,7 @@ ui.defaultUiForSchema({ } }); -export const resetPasswordAction = a.recordAction({ +export const resetPasswordAction = a.objectAction({ precondition: (data: User) => { return data.status == 'active'; }, @@ -38,4 +39,4 @@ export const resetPasswordAction = a.recordAction({ } }); -api.addAction(resetPasswordAction); \ No newline at end of file +api.addAction<(resetPasswordAction); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts new file mode 100644 index 0000000..c78f109 --- /dev/null +++ b/task-manager-slingr/model/user/user.ts @@ -0,0 +1,39 @@ +import * as s from '../../framework/backend/schemas'; +import * as m from '../../framework/helpers/models'; + +export const userSchema = m.model({ + fields: { + firstName: s.string({ + required: true + }), + lastName: s.string({ + required: true + }), + fullName: s.string({ + calculation: (user: User) => { + return `${user.firstName} ${user.lastName}`; + } + }), + email: s.email({ + required: true + }), + status: s.enumeration({ + required: true, + defaultValue: (data: User) => 'active', + values: ['active', 'inactive'], + }), + age: s.number({ + integer: true, + min: 0, + max: 150 + }), + password: s.string({ + required: true, + min: 8, + max: 16 + }), + notes: s.string({}) + } +}); + +export type User = s.InferType; diff --git a/task-manager-slingr/model/user/user.ui.ts b/task-manager-slingr/model/user/user.ui.ts index 25f0b75..80c94ce 100644 --- a/task-manager-slingr/model/user/user.ui.ts +++ b/task-manager-slingr/model/user/user.ui.ts @@ -3,7 +3,7 @@ import * as ui from '../../framework/frontend/ui'; ui.defaultUiForSchema({ label: 'Users', - recordLabelField: 'fullName', + objectLabelField: 'fullName', sorting: { field: 'fullName', direction: 'asc' From 261a3ddc903e2d4e3d2113eba137a7d9e43edf9b Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Wed, 12 Mar 2025 14:57:09 -0300 Subject: [PATCH 025/254] task manager - improvements on framework --- task-manager-slingr/framework/frontend/ui.ts | 47 +++++++++++++++- .../framework/frontend/widgets.ts | 54 +++++++++++++++++++ .../framework/helpers/models.ts | 4 +- task-manager-slingr/model/user/user.schema.ts | 2 +- task-manager-slingr/model/user/user.ts | 49 ++++++++++++----- task-manager-slingr/model/user/user.ui.ts | 14 +++++ 6 files changed, 153 insertions(+), 17 deletions(-) diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts index c578ff7..90ef259 100644 --- a/task-manager-slingr/framework/frontend/ui.ts +++ b/task-manager-slingr/framework/frontend/ui.ts @@ -48,6 +48,23 @@ function text(def: Partial): UiFieldDefinition { } as UiFieldDefinition; } +export interface EmailUiFieldDefinition extends UiFieldDefinition { +} + +function email(def: Partial): UiFieldDefinition { + return { + visible: true, + dataWidgets: [{ + context: 'readOnly', + widget: w.email() + }, { + context: 'edit', + widget: w.input() + }], + ...def + } as UiFieldDefinition; +} + export interface NumberUiFieldDefinition extends UiFieldDefinition { } @@ -83,10 +100,38 @@ function password(def: Partial): UiFieldDefinition { } +export interface EnumerationChipUiFieldDefinition extends UiFieldDefinition { + options: { + value: T, + label: string, + color?: string + }[] +} + +function enumeration(def: Partial>): UiFieldDefinition { + return { + visible: true, + dataWidgets: [{ + context: 'readOnly', + widget: w.enumerationChip({ + options: def.options + }) + }, { + context: 'edit', + widget: w.dropDown({ + options: def.options + }) + }], + ...def + } as UiFieldDefinition; +} + export let fields = { text: text, + email: email, number: number, - password: password + password: password, + enumeration: enumeration }; export interface DefaultUiForSchema { diff --git a/task-manager-slingr/framework/frontend/widgets.ts b/task-manager-slingr/framework/frontend/widgets.ts index 54418e5..b5c3717 100644 --- a/task-manager-slingr/framework/frontend/widgets.ts +++ b/task-manager-slingr/framework/frontend/widgets.ts @@ -13,6 +13,17 @@ export function text(def?: Partial): TextWidget { } as TextWidget; } +export interface EmailWidget extends Widget { + type: 'email' +} + +export function email(def?: Partial): EmailWidget { + return { + type: 'email', + ...def + } as EmailWidget; +} + export interface InputWidget extends Widget { type: 'input' } @@ -45,3 +56,46 @@ export function passwordInput(def?: Partial): PasswordInput ...def } as PasswordInputWidget; } + +export interface DropDownWidget extends Widget { + type: 'dropDown', + options: { + value: T, + label: string + }[] +} + +export function dropDown(def?: Partial>): DropDownWidget { + return { + type: 'dropDown', + ...def + } as DropDownWidget; +} + +export interface ChipWidget extends Widget { + type: 'chip', + color: string +} + +export function chip(def?: Partial): ChipWidget { + return { + type: 'chip', + ...def + } as ChipWidget; +} + + +export interface EnumerationChipWidget extends Widget { + type: 'enumeration', + options: { + value: T, + label: string + }[] +} + +export function enumerationChip(def?: Partial>): EnumerationChipWidget { + return { + type: 'enumerationChip', + ...def + } as EnumerationChipWidget; +} \ No newline at end of file diff --git a/task-manager-slingr/framework/helpers/models.ts b/task-manager-slingr/framework/helpers/models.ts index 8163866..5e4947a 100644 --- a/task-manager-slingr/framework/helpers/models.ts +++ b/task-manager-slingr/framework/helpers/models.ts @@ -36,4 +36,6 @@ export function model(def: ModelDefinition): s.Schema { }); // TODO register repository return schema; -} \ No newline at end of file +} + + diff --git a/task-manager-slingr/model/user/user.schema.ts b/task-manager-slingr/model/user/user.schema.ts index 1a3e9c2..0d5c33b 100644 --- a/task-manager-slingr/model/user/user.schema.ts +++ b/task-manager-slingr/model/user/user.schema.ts @@ -15,7 +15,7 @@ export const userSchema = s.schema({ email: s.email({ required: true }), - status: s.enumeration({ + status: s.enumeration({ required: true, defaultValue: (data: User) => 'active', values: ['active', 'inactive'], diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts index c78f109..b8863f7 100644 --- a/task-manager-slingr/model/user/user.ts +++ b/task-manager-slingr/model/user/user.ts @@ -1,38 +1,59 @@ import * as s from '../../framework/backend/schemas'; import * as m from '../../framework/helpers/models'; +import * as ui from '../../framework/frontend/ui'; export const userSchema = m.model({ fields: { - firstName: s.string({ - required: true + firstName: m.fields.string({ + required: true, + defaultUi: ui.fields.text({label: 'First Name'}) }), - lastName: s.string({ - required: true + lastName: m.fields.string({ + required: true, + defaultUi: ui.fields.text({label: 'Last Name'}) }), - fullName: s.string({ + fullName: m.fields.string({ calculation: (user: User) => { return `${user.firstName} ${user.lastName}`; - } + }, + defaultUi: ui.fields.text({label: 'Full Name'}) }), - email: s.email({ - required: true + email: m.fields.email({ + required: true, + defaultUi: ui.fields.email({label: 'Email'}) }), - status: s.enumeration({ + status: m.fields.enumeration({ required: true, defaultValue: (data: User) => 'active', values: ['active', 'inactive'], + defaultUi: ui.fields.enumeration({ + options: [ + { + value: 'active', + label: 'Active', + color: 'green' + }, + { + value: 'inactive', + label: 'Inactive', + color: 'red' + } + ] + }) }), - age: s.number({ + age: m.fields.number({ integer: true, min: 0, - max: 150 + max: 150, + defaultUi: ui.fields.number({label: 'Age'}) }), - password: s.string({ + password: m.fields.text({ required: true, min: 8, - max: 16 + max: 16, + defaultUi: ui.fields.password({label: 'Password'}) }), - notes: s.string({}) + notes: m.fields.html({}) } }); diff --git a/task-manager-slingr/model/user/user.ui.ts b/task-manager-slingr/model/user/user.ui.ts index 80c94ce..7cfc45f 100644 --- a/task-manager-slingr/model/user/user.ui.ts +++ b/task-manager-slingr/model/user/user.ui.ts @@ -13,6 +13,20 @@ ui.defaultUiForSchema({ lastName: ui.fields.text({label: 'Last Name'}), fullName: ui.fields.text({label: 'Full Name'}), email: ui.fields.text({label: 'Email'}), + status: ui.fields.enumeration({ + options: [ + { + value: 'active', + label: 'Active', + color: 'green' + }, + { + value: 'inactive', + label: 'Inactive', + color: 'red' + } + ] + }), age: ui.fields.number({label: 'Age'}), password: ui.fields.password({ label: 'Password', From 82f2f57682f04ff458e3adcbe2b5c8fa64e021c5 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 7 Aug 2025 18:42:29 -0300 Subject: [PATCH 026/254] task manager - add comprehensive models documentation --- docs/Models.md | 229 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) create mode 100644 docs/Models.md diff --git a/docs/Models.md b/docs/Models.md new file mode 100644 index 0000000..884069d --- /dev/null +++ b/docs/Models.md @@ -0,0 +1,229 @@ +# Models + +Models are a way to define a rich data structure. By "rich" we mean it holds more information than just the fields and the data type. For example, a model can contain information about how a field is calculated, database settings, display options, validation rules, etc. Slingr is a model-driven development framework and for that reason a lot of the information is going to sit in this layer. + +A generic model needs to be able to support the following features: + +- Data structure +- Types + - Specifc rules for the types +- Validations +- Default values +- Calculated values +- Availability +- Relationships (one-to-one, one-to-many, many-to-many) + +# Defining a model + +This is a simple model: + +```ts +@Model() +class Person { + @Field() + firstName: string; + + @Field() + lastName: string; + + @Field() + email: string; +} +``` + +In this case, Typescipt types will be mapped to default data types. Also, the decorator `Field` is not mandatory. We put it in the example to make it explicit, but it is not needed if you don't want to specify settings. + +## Required fields + +You can define a field is required like this: + +```ts +@Model() +class Person { + @Field({ + required: true + }) + firstName: string; + + @Field({ + required: true + }) + lastName: string; + + @Field({ + required: true + }) + email: string; +} +``` + +It is possible that a field is required based on a condition: + +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type; + + @Field({ + required: (task: Task) => { + return task.type == Type.Story; + } + }) + priority: Priority; +} +``` + +In this case, the field `priority` is only required if the `type` is `Story`. + +## Default values + +Default values can be specified by initializing the field: + +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type = Type.Story; +} +``` + +Sometimes, default values can be more complex and are based on a script. In these cases, you should provide a script like this: + +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type; + + constructor() { + if (someCondition()) { + type = Type.Release; + } else { + type = Type.Story; + } + } +} +``` + +## Calculated fields + +TBD: Think more about this + +Sometimes you want some fields to be calculated. This means you will never want to set these values but instead they are calculated. The most simple scenario is for a field that is always calculated on the fly when requested: + +```ts +@Model() +class LineItem { + @Field() + price: number; + + @Field() + quantity: number; + + @Field() + get total(): number { + return this.price * this.quantity; + } +} +``` + +In this case, the field will be calculated every time you ask for it. + +However, in some situations you don't want to recalculate it all the time. Instead, you want to calculate it on specific events. In this case, you will define the calculation in a different way: + +```ts +@Model() +class LineItem { + @Field() + price: number; + + @Field() + quantity: number; + + @Field({ + calculation: (lineItem: LineItem) => { + return lineItem.price * lineItem.quantity; + } + }) + total: number; +} +``` + +In this case, the system will determine when it has to be calculated. It will try to recalculate it only when something changes in the model that will impact it. Later, the calculated value will be stored and you can access it normally. + +The first way is used when the calculation is very simple and you want to make sure it is always up-to-date. The second option is better when the calculation is expensive and you are going to call it many times to know the value without changing the dependencies. + +## Validations + +TBD + +# Data types + +The following data types will be supported in the framework (at least initially): + +- Text (string) + - LongText + - Email + - Phone + - HTML + - URL + - MaskedText + - Date + - Time +- Number (number) + - Integer + - TimeDuration + - PrecisionNumber + - Money + - Percentage +- Date/Time (Date) +- DateRange (DateRange) +- Boolean (boolean) +- Choice (Enum) +- DynamicChoice (NameValuePair) + +You can see there is a hierarchy of types. This is because one type builds on top of the other one. For example, the `Email` type is a `Text` type where there is a regex to validate it is an email. + +Also, you can see there are non-standard data types in some cases, like `DateRange` or `NameValuePair`. These are classes that will be inside the model. + +We want to make it easier to add new types, so it is extensible. New types will add more information in the model that could be useful for other layers, even if they are very similar to other ones. + +## Explicit definition of data types in models + +You can explicitly indicate the data type in the model: + +```ts +@Model() +class Person { + @Text() + firstName: string; + + @Text() + lastName: string; + + @Email() + email: string; +} +``` \ No newline at end of file From e6d1cd650ea050283d70c6d55ebb52c2a39be185 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Thu, 7 Aug 2025 23:43:30 -0300 Subject: [PATCH 027/254] removing docs from main --- docs/Models.md | 229 ------------------------------------------------- 1 file changed, 229 deletions(-) delete mode 100644 docs/Models.md diff --git a/docs/Models.md b/docs/Models.md deleted file mode 100644 index 884069d..0000000 --- a/docs/Models.md +++ /dev/null @@ -1,229 +0,0 @@ -# Models - -Models are a way to define a rich data structure. By "rich" we mean it holds more information than just the fields and the data type. For example, a model can contain information about how a field is calculated, database settings, display options, validation rules, etc. Slingr is a model-driven development framework and for that reason a lot of the information is going to sit in this layer. - -A generic model needs to be able to support the following features: - -- Data structure -- Types - - Specifc rules for the types -- Validations -- Default values -- Calculated values -- Availability -- Relationships (one-to-one, one-to-many, many-to-many) - -# Defining a model - -This is a simple model: - -```ts -@Model() -class Person { - @Field() - firstName: string; - - @Field() - lastName: string; - - @Field() - email: string; -} -``` - -In this case, Typescipt types will be mapped to default data types. Also, the decorator `Field` is not mandatory. We put it in the example to make it explicit, but it is not needed if you don't want to specify settings. - -## Required fields - -You can define a field is required like this: - -```ts -@Model() -class Person { - @Field({ - required: true - }) - firstName: string; - - @Field({ - required: true - }) - lastName: string; - - @Field({ - required: true - }) - email: string; -} -``` - -It is possible that a field is required based on a condition: - -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type; - - @Field({ - required: (task: Task) => { - return task.type == Type.Story; - } - }) - priority: Priority; -} -``` - -In this case, the field `priority` is only required if the `type` is `Story`. - -## Default values - -Default values can be specified by initializing the field: - -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type = Type.Story; -} -``` - -Sometimes, default values can be more complex and are based on a script. In these cases, you should provide a script like this: - -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type; - - constructor() { - if (someCondition()) { - type = Type.Release; - } else { - type = Type.Story; - } - } -} -``` - -## Calculated fields - -TBD: Think more about this - -Sometimes you want some fields to be calculated. This means you will never want to set these values but instead they are calculated. The most simple scenario is for a field that is always calculated on the fly when requested: - -```ts -@Model() -class LineItem { - @Field() - price: number; - - @Field() - quantity: number; - - @Field() - get total(): number { - return this.price * this.quantity; - } -} -``` - -In this case, the field will be calculated every time you ask for it. - -However, in some situations you don't want to recalculate it all the time. Instead, you want to calculate it on specific events. In this case, you will define the calculation in a different way: - -```ts -@Model() -class LineItem { - @Field() - price: number; - - @Field() - quantity: number; - - @Field({ - calculation: (lineItem: LineItem) => { - return lineItem.price * lineItem.quantity; - } - }) - total: number; -} -``` - -In this case, the system will determine when it has to be calculated. It will try to recalculate it only when something changes in the model that will impact it. Later, the calculated value will be stored and you can access it normally. - -The first way is used when the calculation is very simple and you want to make sure it is always up-to-date. The second option is better when the calculation is expensive and you are going to call it many times to know the value without changing the dependencies. - -## Validations - -TBD - -# Data types - -The following data types will be supported in the framework (at least initially): - -- Text (string) - - LongText - - Email - - Phone - - HTML - - URL - - MaskedText - - Date - - Time -- Number (number) - - Integer - - TimeDuration - - PrecisionNumber - - Money - - Percentage -- Date/Time (Date) -- DateRange (DateRange) -- Boolean (boolean) -- Choice (Enum) -- DynamicChoice (NameValuePair) - -You can see there is a hierarchy of types. This is because one type builds on top of the other one. For example, the `Email` type is a `Text` type where there is a regex to validate it is an email. - -Also, you can see there are non-standard data types in some cases, like `DateRange` or `NameValuePair`. These are classes that will be inside the model. - -We want to make it easier to add new types, so it is extensible. New types will add more information in the model that could be useful for other layers, even if they are very similar to other ones. - -## Explicit definition of data types in models - -You can explicitly indicate the data type in the model: - -```ts -@Model() -class Person { - @Text() - firstName: string; - - @Text() - lastName: string; - - @Email() - email: string; -} -``` \ No newline at end of file From 919c49ed6ab427436f9f12a8b96de0d2970b04b1 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Fri, 8 Aug 2025 00:00:10 -0300 Subject: [PATCH 028/254] documentation for models --- reference/models.md | 434 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 434 insertions(+) create mode 100644 reference/models.md diff --git a/reference/models.md b/reference/models.md new file mode 100644 index 0000000..c9a9e09 --- /dev/null +++ b/reference/models.md @@ -0,0 +1,434 @@ +# Models + +Models are a way to define a rich data structure. By "rich" we mean it holds more information than just the fields and the data type. For example, a model can contain information about how a field is calculated, database settings, display options, validation rules, etc. Slingr is a model-driven development framework and for that reason a lot of the information is going to sit in this layer. + +A generic model needs to be able to support the following features: + +- Data structure +- Types + - Specifc rules for the types +- Validations +- Default values +- Calculated values +- Access +- Relationships (one-to-one, one-to-many, many-to-many) + +## Defining a model + +This is a simple model: + +```ts +@Model() +class Person { + @Field() + firstName: string; + + @Field() + lastName: string; + + @Field() + email: string; +} +``` + +In this case, Typescript types will be mapped to default data types. Also, the decorator `Field` is not mandatory. We put it in the example to make it explicit, but it is not needed if you don't want to specify settings. + +## Default label for instances + +Models can have instances and it is good to have a way to identify these instances. They can be used when logging information or when the UI needs to show something. + +OPTION 1: In this case, we have a property in the model settings to indicate a field or a calculation. I think this approach has some problems like the lack of type safety (maybe we can achieve validation using some complex types definition) and it will also need a new field that doesn't exist, which is what happens today in the platform. +```ts +@Model({ + instanceLabel: (person: Person) => { `${person.firstName} ${person.lastName} <${person.email}>` } +}) +class Person { + @Field({ + required: true + }) + firstName: string; + + @Field({ + required: true + }) + lastName: string; + + @Field({ + required: true + }) + email: string; +} +``` + +OPTION 2: The benefit in this approach is you explicitly define the label field (you can name however you want or use another field that is not calculated). It is simple for developers and AI. The downside is that you use another decorator and you have to validate it. The problem of the additional validator could be solved by adding it as a setting of the field, but could be confusing as well. +```ts +@Model() +class Person { + @Field({ + calculation: (person: Person) => { `${person.firstName} ${person.lastName} <${person.email}>` } + }) + @InstanceLabel() + label: string; + + @Field({ + required: true + }) + firstName: string; + + @Field({ + required: true + }) + lastName: string; + + @Field({ + required: true + }) + email: string; +} +``` + +OPTION 3: In this case we use the default `toString()`. It has the advantage that is a known things in Typescript and will work when you are logging the value, for example. The problem is that we should create a field that is not visible if we want to persist it, and we are calculating it all the time. +```ts +@Model() +class Person { + @Field({ + required: true + }) + firstName: string; + + @Field({ + required: true + }) + lastName: string; + + @Field({ + required: true + }) + email: string; + + toString(): string { + return `${this.firstName} ${this.lastName} <${this.email}>`; + } +} +``` + +COMMENTS: Probably we can use option #2 and automatically implement #3 so we get the benefit of it. + +## Required fields + +You can define a field is required like this: + +```ts +@Model() +class Person { + @Field({ + required: true + }) + firstName: string; + + @Field({ + required: true + }) + lastName: string; + + @Field({ + required: true + }) + email: string; +} +``` + +It is possible that a field is required based on a condition: + +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type; + + @Field({ + required: (task: Task) => { task.type == Type.Story } + }) + priority: Priority; +} +``` + +In this case, the field `priority` is only required if the `type` is `Story`. + +## Default values + +Default values can be specified by initializing the field: + +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type = Type.Story; +} +``` + +Sometimes, default values can be more complex and are based on a script. In these cases, you should provide a script like this: + +OPTION 1: This has less "magic", but it is intuitive for developers and AI. The problem is that you get the default value separated from the field declaration. +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type; + + constructor() { + if (someCondition()) { + type = Type.Release; + } else { + type = Type.Story; + } + } +} +``` + +OPTION 2: Here you define an anonymous function. It is trickier but OK for more experienced developers and AI. You can reference `this` but it will be executed in the order the object is initialized. I think it will be a problem if we have to +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true + }) + type: Type = (() =? { + if (someCondition()) { + return Type.Release; + } else { + return Type.Story; + } + })(); +} +``` + +OPTION 3: In this case, we define how the default value has to be handled. It doesn't follow what would be intuitive for any Typescript developer or AI, however, it has the advantage that we can control when to call it. For example, we might want to do some initialization of the instance before calling the default value (maybe setting some realtionships or something like that). +```ts +@Model() +class Task { + @Field({ + required: true + }) + title: string; + + @Field({ + required: true, + defaultValue: (task: Task) => { + if (someCondition()) { + return Type.Release; + } else { + return Type.Story; + } + } + }) + type: Type; +} +``` + +COMMENTS: IF we go with option 3, probably we also want to define default values this way even when it is a value so we can control when to call it and be more consistent. + +## Calculated fields + +COMMENTS: I put a different options here. I think it would be useful to define if we want a field to be calculated every time you call it or if you want to calculate it once and then just return the value. The problem in the second approach is that you need to define when you are going to calculate it again. Today, in our platoform, we do it when you save the record. + +OPTION 1: In this case, the calculated field is always calculated when you ask for its value. It is simple and uses languages' features, but it might be inefficient if the calcultion is expensive. +```ts +@Model() +class LineItem { + @Field() + price: number; + + @Field() + quantity: number; + + @Field() + get total(): number { + return this.price * this.quantity; + } +} +``` + +OPTION 2: In this case, we define how to calculate it, but we can have more control on when we want to call it. Maybe the developer wants to call it manually in some cases, the UI can refresh it when needed, when we detect changes in other fields, etc. It might be tricky for the developer to understand when it is going to be calculated. +```ts +@Model() +class LineItem { + @Field() + price: number; + + @Field() + quantity: number; + + @Field({ + calculation: (lineItem: LineItem) => { + return lineItem.price * lineItem.quantity; + } + }) + total: number; +} +``` + +## Validations + +Apart from common validations defined in the `Field` decorator or in type-specific decorators (like `maxLength` in the `Text` decorator), you might have custom validations in a field. + +```ts +@Model() +class LineItem { + @Field() + product: Product; + + @Field() + price: number; + + @Field({ + validation: (value: number, lineItem: LineItem) => { + let errors = []; + if (lineItem.product?.limited && value > 5) { + erros.push({code: 'overLimit', message: `The maximum quantity for limited products is 5`}); + } + return errors; + } + }) + quantity: number; + + @Field({ + calculation: (lineItem: LineItem) => { + return lineItem.price * lineItem.quantity; + } + }) + total: number; +} +``` + +Also, you might have a validation that is global for the whole model: + +COMMENTS: I think here we shouldn't allow setting a field because we should use it only for case where the validation error is global to the model. This will avoid setting a string in the `field` field, which breaks type safety. Maybe I'm missing use cases, but let's talk about it. + +```ts +@Model({ + validation: (passwordChange: PasswordChange) => { + let errors = []; + if (passwordChange.newPassword != passwordChange.confirmNewPassword) { + errors.push({code: 'doesNotMatch', message: 'New password and the confirmation do not match'}); + } + return errors; + } +}) +class PasswordChange { + @Field() + oldPassword: string; + + @Field() + newPassword: string; + + @Field() + confirmNewPassword: string; +} +``` + +## Access + +TODO: At the model level, this doesn't seem to make much sense. I mean, we can set a field is read-only, but you can go ahead and set it in the model, nothing will prevent it from happening. Maybe, in the serialization is where we can take this into account. For example, we you do `JSON.stringify(instance)`, then you will get the version without the fields that shouldn't be there, or a custom method like `clean()` that takes out things that aren't available. I'm not sure. I see this feature makes sense when we add an API or persisntance, but it doesn't seem to make much sense at the model level. + +## Serialization + +TODO: We might think about overriding `toJSON()` and take into account the access settings and maybe some other things like permissiosn in the future. + +# Data types + +The following data types will be supported in the framework: + +- Text (string) + - LongText * + - Email + - Phone * + - HTML + - URL * + - MaskedText * + - Date * + - Time * +- Number (number) + - Integer + - TimeDuration * + - PrecisionNumber * + - Money + - Percentage * +- Date/Time (Date) +- DateRange (DateRange) * +- Boolean (boolean) +- Choice (Enum) +- DynamicChoice (NameValuePair) + +* We put them here for reference, but won't be implemented initially. + +You can see there is a hierarchy of types. This is because one type builds on top of the other one. For example, the `Email` type is a `Text` type where there is a regex to validate it is an email. + +Also, you can see there are non-standard data types in some cases, like `DateRange` or `NameValuePair`. These are classes that will be inside the model. + +We want to make it easier to add new types, so it is extensible. New types will add more information in the model that could be useful for other layers, even if they are very similar to other ones. + +## Explicit definition of data types in models + +You can explicitly indicate the data type in the model and set type-specific settings: + +```ts +@Model() +class Person { + @Field() + @Text({ + maxLength: 30 + }) + firstName: string; + + @Field() + @Text({ + maxLength: 30 + }) + lastName: string; + + @Field() + @Email() + email: string; +} +``` + +As you can see, a new decorator is used to define the type. This is because defining the type inside the `Field` decorator was going to cause that we had to add all the type-specific options there, making it too big and also won't be align with the goal of making types easily extensible. + +# Multi-valued fields + +TODO + +# Relationships + +TODO + +# Implementation notes + +TODO: Put some notes about that implementation that will be useful for the implementation team. \ No newline at end of file From 6077fed8c70b1a16b5d42a135f0dde2bb19467eb Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Fri, 8 Aug 2025 00:01:18 -0300 Subject: [PATCH 029/254] removing old things in the repo --- option-classes/.gitignore | 1 - option-classes/backend.ts | 33 -- option-classes/example1.ts | 222 --------- option-classes/frontend.ts | 10 - option-classes/libs/context.ts | 12 - option-classes/package-lock.json | 19 - option-classes/package.json | 5 - option-classes/storage.ts | 19 - option-classes/tsconfig.json | 8 - .../framework/metadata/entity.ts | 7 - .../framework/metadata/field.ts | 10 - .../framework/metadata/formField.ts | 7 - .../framework/metadata/formView.ts | 10 - .../framework/metadata/menu.ts | 11 - .../sample-app/model/entities/contacts.ts | 14 - .../sample-app/ui/navigation/mainMenu.ts | 12 - .../sample-app/ui/views/createContact.ts | 10 - .../framework/app.ts | 7 - .../framework/entity.ts | 7 - .../framework/entityField.ts | 38 -- .../framework/factories/entityFactory.ts | 18 - .../framework/factories/typesFactory.ts | 43 -- .../framework/factories/viewFactory.ts | 24 - .../framework/gridView.ts | 15 - .../sample-app/app.ts | 12 - .../sample-app/model/entities/contacts.ts | 14 - .../sample-app/ui/views/contactsGrid.ts | 12 - .../task-manager-app/app.ts | 20 - .../model/entities/projects.ts | 11 - .../task-manager-app/model/entities/tasks.ts | 12 - .../model/entities/timeLogs.ts | 12 - .../task-manager-app/ui/views/projectsGrid.ts | 10 - .../task-manager-app/ui/views/tasksGrid.ts | 11 - .../task-manager-app/ui/views/timeLogsGrid.ts | 11 - option-interfaces/backend.ts | 31 -- option-interfaces/example1.ts | 237 --------- option-interfaces/example2.ts | 463 ------------------ option-interfaces/frontend.ts | 116 ----- option-interfaces/security.ts | 51 -- option-interfaces/storage.ts | 18 - option-interfaces/tsconfig.json | 6 - option-interfaces/utils.ts | 5 - option-lifecycle-hooks/entity.ts | 44 -- option-lifecycle-hooks/userEntity.ts | 67 --- .../model/user/compactDetailsView.ts | 30 -- task-manager-reuse/model/user/editView.ts | 12 - .../model/user/resetPassword.ts | 30 -- task-manager-reuse/model/user/user.ts | 103 ---- .../framework/backend/actions.ts | 13 - task-manager-slingr/framework/backend/api.ts | 11 - task-manager-slingr/framework/backend/db.ts | 11 - .../framework/backend/mongo.ts | 19 - .../framework/backend/schemas.ts | 174 ------- task-manager-slingr/framework/frontend/ui.ts | 178 ------- .../framework/frontend/widgets.ts | 101 ---- .../framework/helpers/models.ts | 41 -- task-manager-slingr/model/tags/tag.ts | 35 -- .../model/task/task.actions.ts | 42 -- task-manager-slingr/model/task/task.schema.ts | 89 ---- task-manager-slingr/model/task/task.ui.ts | 104 ---- .../model/user/resetPassword.ts | 42 -- task-manager-slingr/model/user/user.db.ts | 15 - task-manager-slingr/model/user/user.schema.ts | 36 -- task-manager-slingr/model/user/user.ts | 60 --- task-manager-slingr/model/user/user.ui.ts | 37 -- 65 files changed, 2908 deletions(-) delete mode 100644 option-classes/.gitignore delete mode 100644 option-classes/backend.ts delete mode 100644 option-classes/example1.ts delete mode 100644 option-classes/frontend.ts delete mode 100644 option-classes/libs/context.ts delete mode 100644 option-classes/package-lock.json delete mode 100644 option-classes/package.json delete mode 100644 option-classes/storage.ts delete mode 100644 option-classes/tsconfig.json delete mode 100644 option-interfaces-references/framework/metadata/entity.ts delete mode 100644 option-interfaces-references/framework/metadata/field.ts delete mode 100644 option-interfaces-references/framework/metadata/formField.ts delete mode 100644 option-interfaces-references/framework/metadata/formView.ts delete mode 100644 option-interfaces-references/framework/metadata/menu.ts delete mode 100644 option-interfaces-references/sample-app/model/entities/contacts.ts delete mode 100644 option-interfaces-references/sample-app/ui/navigation/mainMenu.ts delete mode 100644 option-interfaces-references/sample-app/ui/views/createContact.ts delete mode 100644 option-interfaces-types-factory/framework/app.ts delete mode 100644 option-interfaces-types-factory/framework/entity.ts delete mode 100644 option-interfaces-types-factory/framework/entityField.ts delete mode 100644 option-interfaces-types-factory/framework/factories/entityFactory.ts delete mode 100644 option-interfaces-types-factory/framework/factories/typesFactory.ts delete mode 100644 option-interfaces-types-factory/framework/factories/viewFactory.ts delete mode 100644 option-interfaces-types-factory/framework/gridView.ts delete mode 100644 option-interfaces-types-factory/sample-app/app.ts delete mode 100644 option-interfaces-types-factory/sample-app/model/entities/contacts.ts delete mode 100644 option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/app.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/projects.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts delete mode 100644 option-interfaces/backend.ts delete mode 100644 option-interfaces/example1.ts delete mode 100644 option-interfaces/example2.ts delete mode 100644 option-interfaces/frontend.ts delete mode 100644 option-interfaces/security.ts delete mode 100644 option-interfaces/storage.ts delete mode 100644 option-interfaces/tsconfig.json delete mode 100644 option-interfaces/utils.ts delete mode 100644 option-lifecycle-hooks/entity.ts delete mode 100644 option-lifecycle-hooks/userEntity.ts delete mode 100644 task-manager-reuse/model/user/compactDetailsView.ts delete mode 100644 task-manager-reuse/model/user/editView.ts delete mode 100644 task-manager-reuse/model/user/resetPassword.ts delete mode 100644 task-manager-reuse/model/user/user.ts delete mode 100644 task-manager-slingr/framework/backend/actions.ts delete mode 100644 task-manager-slingr/framework/backend/api.ts delete mode 100644 task-manager-slingr/framework/backend/db.ts delete mode 100644 task-manager-slingr/framework/backend/mongo.ts delete mode 100644 task-manager-slingr/framework/backend/schemas.ts delete mode 100644 task-manager-slingr/framework/frontend/ui.ts delete mode 100644 task-manager-slingr/framework/frontend/widgets.ts delete mode 100644 task-manager-slingr/framework/helpers/models.ts delete mode 100644 task-manager-slingr/model/tags/tag.ts delete mode 100644 task-manager-slingr/model/task/task.actions.ts delete mode 100644 task-manager-slingr/model/task/task.schema.ts delete mode 100644 task-manager-slingr/model/task/task.ui.ts delete mode 100644 task-manager-slingr/model/user/resetPassword.ts delete mode 100644 task-manager-slingr/model/user/user.db.ts delete mode 100644 task-manager-slingr/model/user/user.schema.ts delete mode 100644 task-manager-slingr/model/user/user.ts delete mode 100644 task-manager-slingr/model/user/user.ui.ts diff --git a/option-classes/.gitignore b/option-classes/.gitignore deleted file mode 100644 index 40b878d..0000000 --- a/option-classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules/ \ No newline at end of file diff --git a/option-classes/backend.ts b/option-classes/backend.ts deleted file mode 100644 index 97eae61..0000000 --- a/option-classes/backend.ts +++ /dev/null @@ -1,33 +0,0 @@ -import 'reflect-metadata'; - -interface DataModelConfig { -} - -export function DataModel(config?: DataModelConfig): ClassDecorator { - return function (constructor: T) { - Reflect.defineMetadata('dataModelConfig', config, constructor); - return constructor; - }; -} - -interface FieldRequired { - type: 'always' | 'never' | 'conditional', - condition?: (data: any) => boolean -} - -type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; - -interface FieldConfig { - type?: FieldType, - itemType?: FieldType, - required?: FieldRequired, - defaultValue?: (data: any) => any, - calculation?: (data: any) => any, -} - -export function Field(config: FieldConfig): PropertyDecorator { - return function (target: Object, propertyKey: string | symbol) { - Reflect.defineMetadata('fieldConfig', config, target, propertyKey); - }; - } - \ No newline at end of file diff --git a/option-classes/example1.ts b/option-classes/example1.ts deleted file mode 100644 index 6eeb25b..0000000 --- a/option-classes/example1.ts +++ /dev/null @@ -1,222 +0,0 @@ -import { DataModel, Field } from './backend'; -// import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { DataModelUISettings } from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; -import { MongoRecord, CopiedField } from './storage'; -import * as context from './libs/context'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'fullName' -}) -class User extends MongoRecord { - @Field({ - required: {type: 'always'}, - }) - firstName: string; - - @Field({ - required: {type: 'always'} - }) - lastName: string; - - @Field({ - calculation: (user: User) => `${user.firstName} ${user.lastName}` - }) - fullName: string; - - @Field({ - required: {type: 'always'} - }) - email: string; -} - -// TaskNote - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'label' -}) -class TaskNote { - @Field({ - calculation: calculateTaskNoteLabel - }) - label: string; - - @Field({ - required: {type: 'always'} - }) - note: string; - - @Field({ - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }) - timestamp: number; - - @Field({ - required: {type: 'always'}, - defaultValue: () => context.getCurrentUser().id - }) - addedBy: string; - - @CopiedField({ - relationshipField: 'addedBy', - copiedField: 'fullName' - }) - addedByFullName: string; -} - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'label' -}) -class Task extends MongoRecord { - @Field({ - required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }) - label: string; - - @Field({ - type: 'auto-incremental' - }) - number: number; - - @Field({ - required: {type: 'always'} - }) - title: string; - - @Field({ - type: 'array', - itemType: 'relationship' - }) - notes: TaskNote[]; -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView: SimpleRecordView = { - name: 'Create Task', - mode: 'create', - managed: true -}; - -const EditTaskView: SimpleRecordView = { - name: 'Edit Task', - mode: 'edit', - managed: true -}; - -const TasksGridView: GridView = { - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -registerDatabase(MainDatabase); -registerPersistentData(MainDatabase, UserDefinition); -registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option-classes/frontend.ts b/option-classes/frontend.ts deleted file mode 100644 index 759a9fe..0000000 --- a/option-classes/frontend.ts +++ /dev/null @@ -1,10 +0,0 @@ -interface DataModelUISettingsConfig { - defaultLabel: keyof T -} - -export function DataModelUISettings(config: DataModelUISettingsConfig): ClassDecorator { - return function (target: Object) { - Reflect.defineMetadata('dataModelUISettingsConfig', config, target); - }; -} - diff --git a/option-classes/libs/context.ts b/option-classes/libs/context.ts deleted file mode 100644 index ca769fc..0000000 --- a/option-classes/libs/context.ts +++ /dev/null @@ -1,12 +0,0 @@ -declare class User { - id: string; - firstName: string; - lastName: string; - fullName: string; - email: string; -}; - -export function getCurrentUser(): User { - // TODO - return null; -} \ No newline at end of file diff --git a/option-classes/package-lock.json b/option-classes/package-lock.json deleted file mode 100644 index bff7766..0000000 --- a/option-classes/package-lock.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "option-classes", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "devDependencies": { - "reflect-metadata": "^0.2.2" - } - }, - "node_modules/reflect-metadata": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", - "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", - "dev": true, - "license": "Apache-2.0" - } - } -} diff --git a/option-classes/package.json b/option-classes/package.json deleted file mode 100644 index ecd1bfe..0000000 --- a/option-classes/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "devDependencies": { - "reflect-metadata": "^0.2.2" - } -} diff --git a/option-classes/storage.ts b/option-classes/storage.ts deleted file mode 100644 index a773888..0000000 --- a/option-classes/storage.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Field } from "./backend"; - -export class MongoRecord { - @Field({ - type: 'id' - }) - id: string; -} - -interface CopiedFieldConfig { - relationshipField: keyof Source, - copiedField: keyof Target -} - -export function CopiedField(config: CopiedFieldConfig): PropertyDecorator { - return function (target: Object, propertyKey: string | symbol) { - Reflect.defineMetadata('copiedFieldConfig', config, target, propertyKey); - }; -} diff --git a/option-classes/tsconfig.json b/option-classes/tsconfig.json deleted file mode 100644 index b0b94c5..0000000 --- a/option-classes/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2024", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "moduleResolution": "node" - } - } \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/entity.ts b/option-interfaces-references/framework/metadata/entity.ts deleted file mode 100644 index e82c4ec..0000000 --- a/option-interfaces-references/framework/metadata/entity.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Field } from "./field"; - -export interface Entity { - label: string; - name: string; - fields: Field[]; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/field.ts b/option-interfaces-references/framework/metadata/field.ts deleted file mode 100644 index 9c8e60e..0000000 --- a/option-interfaces-references/framework/metadata/field.ts +++ /dev/null @@ -1,10 +0,0 @@ - -export interface Field { - label: string; - name: string; - type: 'text' | 'number' | 'date'; - required?: boolean; - unique?: boolean; - defaultValue?: any; - calculation?: () => any; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formField.ts b/option-interfaces-references/framework/metadata/formField.ts deleted file mode 100644 index 162729f..0000000 --- a/option-interfaces-references/framework/metadata/formField.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Field } from "./field"; - -export interface FormField { - field: Field; - readOnly?: boolean; - hidden?: boolean; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formView.ts b/option-interfaces-references/framework/metadata/formView.ts deleted file mode 100644 index 9a29ac5..0000000 --- a/option-interfaces-references/framework/metadata/formView.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Entity } from "./entity"; -import { FormField } from "./formField"; - -export interface FormView { - label: string; - name: string; - entity: Entity; - managed?: boolean; - fields: FormField[]; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/menu.ts b/option-interfaces-references/framework/metadata/menu.ts deleted file mode 100644 index 5e9e310..0000000 --- a/option-interfaces-references/framework/metadata/menu.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { FormView } from "./formView"; - -interface MenuItem { - label: string; - name: string; - view: FormView; -} - -export interface Menu { - items: MenuItem[]; -} \ No newline at end of file diff --git a/option-interfaces-references/sample-app/model/entities/contacts.ts b/option-interfaces-references/sample-app/model/entities/contacts.ts deleted file mode 100644 index 7658a29..0000000 --- a/option-interfaces-references/sample-app/model/entities/contacts.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Entity } from "../../../framework/metadata/entity"; -import { Field } from "../../../framework/metadata/field"; - -export const firstNameField: Field = { label: 'First Name', name: 'firstName', type: 'text' }; -export const lastNameField: Field = { label: 'Last Name', name: 'lastName', type: 'text' }; -export const fullNameField: Field = { label: 'Full Name', name: 'fullName', type: 'text', calculation: () => 'return null;' }; -export const emailField: Field = { label: 'Email', name: 'email', type: 'text' }; -export const phoneNumberField: Field = { label: 'Phone Number', name: 'phoneNumber', type: 'text' }; - -export const ContactsEntity: Entity = { - label: 'Contacts', - name: 'contacts', - fields: [firstNameField, lastNameField, fullNameField, emailField, phoneNumberField] -}; \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts b/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts deleted file mode 100644 index e3c9bc2..0000000 --- a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Menu } from "../../../framework/metadata/menu"; -import { createContactView } from "../views/createContact"; - -export const mainMenu: Menu = { - items: [ - { - label: 'Create contact', - name: 'createContact', - view: createContactView - } - ] -}; \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/views/createContact.ts b/option-interfaces-references/sample-app/ui/views/createContact.ts deleted file mode 100644 index 12a5a08..0000000 --- a/option-interfaces-references/sample-app/ui/views/createContact.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { FormView } from "../../../framework/metadata/formView"; -import { ContactsEntity as contactsEntity, emailField, firstNameField, fullNameField, lastNameField } from "../../model/entities/contacts"; - -export const createContactView: FormView = { - label: 'Create contact', - name: 'createContact', - entity: contactsEntity, - managed: false, - fields: [{ field: firstNameField }, { field: lastNameField }, { field: fullNameField, readOnly: true }, { field: emailField }] -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/app.ts b/option-interfaces-types-factory/framework/app.ts deleted file mode 100644 index 2e7c93b..0000000 --- a/option-interfaces-types-factory/framework/app.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Entity } from "./entity"; -import { GridView } from "./gridView"; - -export interface App { - entities: Record; - views: Record; -} diff --git a/option-interfaces-types-factory/framework/entity.ts b/option-interfaces-types-factory/framework/entity.ts deleted file mode 100644 index 81b3cea..0000000 --- a/option-interfaces-types-factory/framework/entity.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {EntityField} from "./entityField"; - -export interface Entity { - label: string; - name: string; - fields: Record; -} diff --git a/option-interfaces-types-factory/framework/entityField.ts b/option-interfaces-types-factory/framework/entityField.ts deleted file mode 100644 index 4024415..0000000 --- a/option-interfaces-types-factory/framework/entityField.ts +++ /dev/null @@ -1,38 +0,0 @@ - -interface FieldRules { - required?: boolean; -} - -interface BaseField { - label: string; - name: string; - type: string; - multiplicity?: 'one' | 'many'; - rules?: FieldRules; - -} - -interface TextRules extends FieldRules { - maxLength?: number; -} - -interface NumberRules extends FieldRules { - maxDecimals?: number; -} - -export interface TextField extends BaseField { - type: 'text'; - rules?: TextRules; -} - -export interface NumberField extends BaseField { - type: 'number'; - rules?: NumberRules; -} - -export interface RelationshipField extends BaseField { - type: 'relationship'; - entity: string; -} - -export type EntityField = TextField | NumberField | RelationshipField; diff --git a/option-interfaces-types-factory/framework/factories/entityFactory.ts b/option-interfaces-types-factory/framework/factories/entityFactory.ts deleted file mode 100644 index 9fa41ce..0000000 --- a/option-interfaces-types-factory/framework/factories/entityFactory.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Entity } from "../entity"; - -export const entity = (config: Partial): Entity => { - if (!config.name) { - throw new Error('Name is required'); - } - if (!config.label) { - throw new Error('Label is required'); - } - if (!config.fields || Object.keys(config.fields).length === 0) { - throw new Error('Fields are required'); - } - return { - label: config.label, - name: config.name, - fields: config.fields - }; -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/factories/typesFactory.ts b/option-interfaces-types-factory/framework/factories/typesFactory.ts deleted file mode 100644 index 070bf00..0000000 --- a/option-interfaces-types-factory/framework/factories/typesFactory.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NumberField, RelationshipField, TextField } from "../entityField"; - - -export const text = (config: Partial): TextField => { - if (config.rules?.maxLength && config.rules.maxLength <= 0) { - throw new Error('maxLength must be greater than 0'); - } - return { - type: 'text', - label: config.label || 'Text Field', - name: config.name || 'textField', - multiplicity: config.multiplicity || 'one', - rules: config.rules || {}, - }; -}; - -export const number = (config: Partial): NumberField => { - if (config.rules?.maxDecimals && config.rules.maxDecimals < 0) { - throw new Error('maxDecimals cannot be negative'); - } - return { - type: 'number', - label: config.label || 'Number Field', - name: config.name || 'numberField', - multiplicity: config.multiplicity || 'one', - rules: config.rules || {}, - }; -}; - -export const relationship = (config: Partial): RelationshipField => { - if (!config.entity) { - throw new Error('Relationship field must have a "entity" to another entity'); - } - return { - type: 'relationship', - label: config.label || 'Relationship Field', - name: config.name || 'relationshipField', - multiplicity: config.multiplicity || 'one', - entity: config.entity, - rules: config.rules || {}, - }; -}; - diff --git a/option-interfaces-types-factory/framework/factories/viewFactory.ts b/option-interfaces-types-factory/framework/factories/viewFactory.ts deleted file mode 100644 index 1837f63..0000000 --- a/option-interfaces-types-factory/framework/factories/viewFactory.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { GridColumn, GridView } from "../gridView"; - -export const gridColumn = (config: Partial): GridColumn => { - if (!config.field) { - throw new Error('Grid column must have a field'); - } - return { - field: config.field, - uiOptions: config.uiOptions || {}, - }; -} - -export const gridView = (config: Partial): GridView => { - if (!config.entity) { - throw new Error('Grid view must have an entity'); - } - if (!config.columns) { - throw new Error('Grid view must have at least one column'); - } - return { - entity: config.entity, - columns: config.columns, - }; -}; diff --git a/option-interfaces-types-factory/framework/gridView.ts b/option-interfaces-types-factory/framework/gridView.ts deleted file mode 100644 index 42c9147..0000000 --- a/option-interfaces-types-factory/framework/gridView.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Entity } from "./entity"; -import { EntityField } from "./entityField"; - -export interface GridColumn { - field: EntityField; - uiOptions?: { - readOnly?: boolean; - hidden?: boolean; - }; -} - -export interface GridView { - entity: Entity; - columns: { [key: string]: GridColumn } -} \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/app.ts b/option-interfaces-types-factory/sample-app/app.ts deleted file mode 100644 index 4404ff0..0000000 --- a/option-interfaces-types-factory/sample-app/app.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { App } from "../framework/app"; -import { contactsEntity } from "./model/entities/contacts"; -import { contactGridView } from "./ui/views/contactsGrid"; - -export const app: App = { - entities: { - contact: contactsEntity - }, - views: { - contactsGrid: contactGridView - } -} \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts deleted file mode 100644 index 2240cff..0000000 --- a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { relationship, text } from "../../../framework/factories/typesFactory"; - - -export const contactsEntity = entity({ - label: 'Contacts', - name: 'contacts', - fields: { - firstName: text({ label: 'First Name', name: 'firstName', rules: { required: true } }), - lastName: text({ label: 'Last Name', name: 'lastName', rules: { required: true } }), - email: text({ label: 'Email', name: 'email', rules: { required: true } }), - company: relationship({ label: 'Company', name: 'company', entity: 'companies' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts deleted file mode 100644 index 1ac5c23..0000000 --- a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { contactsEntity } from "../../model/entities/contacts"; - -export const contactGridView = gridView({ - entity: contactsEntity, - columns: { - firstName: gridColumn({ field: contactsEntity.fields.firstName }), - lastName: gridColumn({ field: contactsEntity.fields.lastName }), - email: gridColumn({ field: contactsEntity.fields.email }), - company: gridColumn({ field: contactsEntity.fields.company }) - } -}) diff --git a/option-interfaces-types-factory/task-manager-app/app.ts b/option-interfaces-types-factory/task-manager-app/app.ts deleted file mode 100644 index d6cc713..0000000 --- a/option-interfaces-types-factory/task-manager-app/app.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { App } from "../framework/app"; -import { projectsEntity } from "./model/entities/projects"; -import { tasksEntity } from "./model/entities/tasks"; -import { timeLogsEntity } from "./model/entities/timeLogs"; -import { projectsGridView } from "./ui/views/projectsGrid"; -import { tasksGridView } from "./ui/views/tasksGrid"; -import { timeLogsGridView } from "./ui/views/timeLogsGrid"; - -export const app: App = { - entities: { - projects: projectsEntity, - tasks: tasksEntity, - timeLogs: timeLogsEntity - }, - views: { - projectsGrid: projectsGridView, - tasksGrid: tasksGridView, - timeLogsGrid: timeLogsGridView - } -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts b/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts deleted file mode 100644 index c8d552f..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text } from "../../../framework/factories/typesFactory"; - -export const projectsEntity = entity({ - label: 'Projects', - name: 'projects', - fields: { - name: text({ label: 'Name', name: 'name', rules: { required: true } }), - description: text({ label: 'Description', name: 'description' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts b/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts deleted file mode 100644 index d446713..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text, relationship } from "../../../framework/factories/typesFactory"; - -export const tasksEntity = entity({ - label: 'Tasks', - name: 'tasks', - fields: { - title: text({ label: 'Title', name: 'title', rules: { required: true } }), - description: text({ label: 'Description', name: 'description' }), - project: relationship({ label: 'Project', name: 'project', entity: 'projects' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts b/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts deleted file mode 100644 index 6d8ae5e..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text, number, relationship } from "../../../framework/factories/typesFactory"; - -export const timeLogsEntity = entity({ - label: 'Time Logs', - name: 'timeLogs', - fields: { - description: text({ label: 'Description', name: 'description' }), - hours: number({ label: 'Hours', name: 'hours', rules: { required: true } }), - task: relationship({ label: 'Task', name: 'task', entity: 'tasks' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts deleted file mode 100644 index 7054bc8..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { projectsEntity } from "../../model/entities/projects"; - -export const projectsGridView = gridView({ - entity: projectsEntity, - columns: { - name: gridColumn({ field: projectsEntity.fields.name }), - description: gridColumn({ field: projectsEntity.fields.description }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts deleted file mode 100644 index 840bd56..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { tasksEntity } from "../../model/entities/tasks"; - -export const tasksGridView = gridView({ - entity: tasksEntity, - columns: { - title: gridColumn({ field: tasksEntity.fields.title }), - description: gridColumn({ field: tasksEntity.fields.description }), - project: gridColumn({ field: tasksEntity.fields.project }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts deleted file mode 100644 index 5d2a0a4..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { timeLogsEntity } from "../../model/entities/timeLogs"; - -export const timeLogsGridView = gridView({ - entity: timeLogsEntity, - columns: { - description: gridColumn({ field: timeLogsEntity.fields.description }), - hours: gridColumn({ field: timeLogsEntity.fields.hours }), - task: gridColumn({ field: timeLogsEntity.fields.task }) - } -}); \ No newline at end of file diff --git a/option-interfaces/backend.ts b/option-interfaces/backend.ts deleted file mode 100644 index 00fa40b..0000000 --- a/option-interfaces/backend.ts +++ /dev/null @@ -1,31 +0,0 @@ -export interface FieldRequired { - type: 'always' | 'never' | 'conditional', - condition?: (data: any) => boolean -} - -type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; - -export interface TextFieldTypeSettings { - minLengh?: number, - maxLength?: number, - regex?: string -} - -export interface FieldDefinition { - type: FieldType, - itemType?: FieldType, - required?: FieldRequired, - defaultValue?: (data: any) => any, - calculation?: (data: any) => any, -} - - -export interface DataDefinition { - fields: { - [K in keyof T]: FieldDefinition - } -} - -export interface MongoQuery { - -} \ No newline at end of file diff --git a/option-interfaces/example1.ts b/option-interfaces/example1.ts deleted file mode 100644 index 3e5ace4..0000000 --- a/option-interfaces/example1.ts +++ /dev/null @@ -1,237 +0,0 @@ -import { DataDefinition } from './backend'; -import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { - GridView, SimpleRecordView, - Menu, MenuView, AppLayout, - DataUISettings -} from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -interface User { - firstName: string, - lastName: string, - fullName: string, - email: string -} - -const UserDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'fullName', - fields: { - firstName: { - type: 'text', - required: {type: 'always'}, - }, - lastName: { - type: 'text', - required: {type: 'always'} - }, - fullName: { - type: 'text', - calculation: (user: User) => `${user.firstName} ${user.lastName}` - }, - email: { - type: 'email', - required: {type: 'always'} - } - } -}; - -// TaskNote - -interface TaskNote { - label: string, - note: string, - timestamp: number, - addedBy: string, - addedByFullName: string -} - -const TaskNoteDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - label: { - type: 'text', - required: {type: 'always'}, - calculation: calculateTaskNoteLabel - }, - note: { - type: 'text', - required: {type: 'always'} - }, - timestamp: { - type: 'datetime', - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }, - addedBy: { - type: 'relationship', - required: {type: 'always'}, - }, - addedByFullName: { - type: 'text', - calculation: (taskNote: TaskNote) => { - const user = findById(taskNote.addedBy); - return user.fullName; - } - } - } -} - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -interface Task { - id: string, - label: string, - number: number, - title: string, - notes: TaskNote[] -} - -const TaskDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - id: { - type: 'id' - }, - label: { - type: 'text', - required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }, - number: { - type: 'auto-incremental' - }, - title: { - type: 'text', - required: {type: 'always'} - }, - notes: { - type: 'array', - itemType: 'relationship' - } - } -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView: SimpleRecordView = { - name: 'Create Task', - mode: 'create', - managed: true -}; - -const EditTaskView: SimpleRecordView = { - name: 'Edit Task', - mode: 'edit', - managed: true -}; - -const TasksGridView: GridView = { - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -registerDatabase(MainDatabase); -registerPersistentData(MainDatabase, UserDefinition); -registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option-interfaces/example2.ts b/option-interfaces/example2.ts deleted file mode 100644 index 49947ed..0000000 --- a/option-interfaces/example2.ts +++ /dev/null @@ -1,463 +0,0 @@ -import { DataDefinition } from './backend'; -import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { - GridView, SimpleRecordView, - Menu, MenuView, AppLayout, - DataUISettings -} from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -type UserStatus = 'active' | 'inactive' | 'blocked'; - - -interface User { - firstName: string, - lastName: string, - fullName: string, - email: string, - status: UserStatus, - department: string -} - -const userModel = model({ - fields: { - firstName: textField({ - required: {type: 'always'}, - ui: { - label: 'First Name' - } - }), - lastName: textField({ - required: {type: 'always'}, - ui: { - label: 'Last Name' - } - }), - fullName: textField({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - }, - ui: { - label: 'Full Name' - } - }), - email: textField({ - required: {type: 'always'}, - validation: emailValidation, - ui: { - label: 'Email', - readOnly: emailLabelWidget(), - edit: textInputWidget() - } - }), - status: choiceField({ - required: required.ALWAYS, - defaultValue: 'active', - ui: { - label: 'Status', - optionLabels: { - active: 'Active', - inactive: 'Inactive', - blocked: 'Blocked' - } - } - }), - department: textField({required: {type: 'always'}}) - }, - ui: { - recordLabelField: 'fullName', - sorting: { - fields: 'fullName', - direction: 'asc' - } - }, - dataSource: modelDataSource({ - database: mainDb, - indexes: [ - regularIndex(['fullName']), - regularIndex(['email']) - ] - }) -}); - -// TaskNote - -interface TaskNote { - label: string, - note: string, - timestamp: number, - addedBy: string, - addedByFullName: string -} - -const taskNoteModel = model({ - fields: { - label: textField({ - required: {type: 'always'}, - calculation: calculateTaskNoteLabel - }), - note: longTextField({ - required: {type: 'always'}, - ui: { - readOnly: markdownWidget(), - editor: markdownEditor() - } - }), - timestamp: datetimeField({ - required: required.ALWAYS, - defaultValue: () => new Date().getTime(), - ui: { - readOnly: datatimeFormatWidget({format: 'MM/dd yy HH:mm'}) - } - }), - addedBy: relationshipField({ - required: required.ALWAYS, - target: userModel, - filter: () => { - const users = backend.dataSources.mainDb.users(); - return users.query({status: 'active'}); - }, - ui: { - label: 'Added By (ID)', - visibility: visibility.NEVER - } - }), - addedByFullName: textField({ - copiedField: copiedField({ - from: 'addedBy', - field: 'fullName' - }), - ui: { - label: 'Added By' - } - }) - }, - ui: { - recordLabelField: 'label' - } -}); - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -interface Task { - id: string, - label: string, - number: number, - title: string, - notes: TaskNote[] -} - -const taskModel = model({ - fields: { - label: textField({ - required: {type: 'always'}, - ui: { - label: 'Label' - } - }), - number: autoIncrementalField({ - ui: { - label: 'Number' - } - }), - title: textField({ - required: {type: 'always'}, - ui: { - label: 'Title' - } - }), - notes: arrayField({ - itemType: taskNoteModel, - ui: { - label: 'Notes', - sorting: 'natural' - } - }) - }, - ui: { - label: 'label', - sorting: { - field: 'createAt', - direction: 'desc' - } - }, - dataSource: modelDataSource({ - database: mainDb, - indexes: [ - regularIndex(['number']), - regularIndex(['title']) - ] - }) -}); - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Agents -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const visitSummarizationAgent = agent({ - modelSettings: { - model: 'gemini-2.0-flash' - }, - inputs: [ - { - name: 'text', - type: 'string' - } - ], - instructions: ` - You are a doctor and need to summarize the medical record in no more than 100. - `, - prompt: ` - Please, summarize the following text: {text} - ` -}); - -const expressionSolver = tool({ - name: 'expressionSolver', - description: 'Solves a math expression and returns the result', - params: { - expression: textField({}) - }, - script: (params: object) => { - // do something - } -}) - -const mathSolverAgent = agent({ - modelSettings: { - model: 'gpt-3.5-turbo' - }, - inputs: { - question: textField({}) - } - instructions: ` - You need to solve a mathematical expression and provide the result. - `, - prompt: ` - Please, solve the following mathematical expression: {question} - `, - tools: [ expressionSolver ] -}); - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView = simpleRecordView({ - name: 'Create Task', - mode: 'create', - managed: true -}); - -const EditTaskView = simpleRecordView({ - name: 'Edit Task', - mode: 'edit', - managed: true -}); - -const TasksGridView = gridView({ - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -}); - -interface TaskRelationship { - task: string, - number: number, - title: string -} - -interface DashboardModel extends ViewModel { - project: string, - tasks: TaskRelationship[] -} - -const DashboardView = flexView({ - fields: { - project: relationshipField({ - target: projectModel, - ui: { - label: 'Project' - } - }), - tasks: arrayField({ - fields: { - task: relationshipField({ - target: taskModel, - ui: { - label: 'Task' - } - }), - number: textField({ - copiedField: copiedField({ - from: 'task', - field: 'number' - }), - ui: { - label: 'Number' - } - }), - title: textField({ - copiedField: copiedField({ - from: 'task', - field: 'title' - }), - ui: { - label: 'Title' - } - }) - }, - ui: { - label: 'Tasks' - } - }) - }, - layout: { - rows: [ - { - columns: [ - { - widgets: [ - dataFormFieldWidget({ - name: 'projectField', - field: 'project' - }), - dynamicTableWidget({ - name: 'tasksTable', - data: (model: DashboardModel) => { - return model.tasks; - } - }), - ] - } - ] - } - ] - }, - events: { - onShow: (model: DashboardModel) => { - model.project = dataSources.mainDb.projects.findById('...'); - }, - onChange: (model: DashboardModel) => { - if (model.project) { - const table = model.widgets['tasksTable']; - table.refresh(); - } - } - } -}) - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Libs -/////////////////////////////////////////////////////////////////////////////////////////////////// - -function test() { - const users = dataSources.mainDb.users; - let user = users.findById('...'); - users.save(user); - users.remove(user); - let cursor = users.find({}); - cursor = users.find({email: {$in: [email1, email2]}}); - let result = users.aggregate([]); -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -initApp(); diff --git a/option-interfaces/frontend.ts b/option-interfaces/frontend.ts deleted file mode 100644 index fe43314..0000000 --- a/option-interfaces/frontend.ts +++ /dev/null @@ -1,116 +0,0 @@ -export interface ItemVisibility { - type: 'display' | 'hidden' | 'conditional', - condition?: (data: any) => boolean -} - -export interface FieldUISettings { - uiSettings: { - visibility?: ItemVisibility - } -} - -export interface TextFieldUISettings extends FieldUISettings { - uiSettings: { - visibility?: ItemVisibility - edit: { - widget: 'text' | 'textarea' | 'rich-text' - }, - readonly: { - renderAs: 'plain-text' | 'html' | 'markdown' - } - } -} - -export interface ArrayUISettingsDefinition { - order: 'natural' | 'reverse', - pagination: { - type: 'more' | 'pages', - pageSize: number - } -} - -export interface DataUISettings { - defaultLabel: keyof T -} - -export interface Widget { - -} - -export interface DataWidget extends Widget { - -} - -export interface TextWidget extends DataWidget { - -} - -export interface FormFieldWidget extends Widget { - label: string, - data: DataWidget -} - -export interface WidgetModel { - -} - -export interface ViewModel { - widgets: { [key: string]: WidgetModel } -} - -export type LayoutType = 'vertical' | 'horizontal'; - -export interface Layout { - type: LayoutType, - widgets: Widget[] -} - -export interface View { - name: string, - model?: ViewModel, - layout?: Layout -} - - - -export interface RecordView extends View { - mode: 'readOnly' | 'edit' | 'create' -} - -export interface SimpleRecordView extends RecordView { - managed: boolean, - fields?: Array -} - -export interface GridView extends View { - columns: Array, - create: { - enabled: boolean, - view?: View - }, - detail: { - enabled: boolean, - view?: View - } -} - -export interface MenuItem { - name: string -} - -export interface MenuGroup extends MenuItem { - items: MenuItem[] -} - -export interface MenuView extends MenuItem { - view: View -} - -export interface Menu { - items: MenuItem[] -} - -export interface AppLayout { - leftMenu?: Menu, - headerMenu?: Menu -} \ No newline at end of file diff --git a/option-interfaces/security.ts b/option-interfaces/security.ts deleted file mode 100644 index 44a8a41..0000000 --- a/option-interfaces/security.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { MongoQuery } from "./backend"; -import { View } from "./frontend"; - -export interface OperationPermissions { - type: 'always' | 'never' | 'conditional' -} - -export interface DataOperationPermissions extends OperationPermissions { - condition?: (data: any) => boolean -} - -export interface QueryOperationPermissions extends OperationPermissions { - condition?: MongoQuery -} - -export interface ContextPermissions extends OperationPermissions { - condition?: (context: any) => boolean -} - -export interface FieldPermissions { - read: OperationPermissions, - write: OperationPermissions -} - -export interface DataPermissions { - fields: { - [K in keyof T]: FieldPermissions - } -} - -export interface PersistentDataPermissions extends DataPermissions { - create: DataOperationPermissions, - access: QueryOperationPermissions, - edit: DataOperationPermissions, - delete: DataOperationPermissions, - auditLogs: DataOperationPermissions -} - -export interface ViewPermissions { - view: View, - access: ContextPermissions -} - -export interface Role { - dataPermissions: DataPermissions[], - viewPermissions: ViewPermissions[] -} - -export interface Group { - roles: Role[] -} \ No newline at end of file diff --git a/option-interfaces/storage.ts b/option-interfaces/storage.ts deleted file mode 100644 index 60241cf..0000000 --- a/option-interfaces/storage.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DataDefinition } from "./backend"; - -export interface DatabaseSettings { - name: string, - uri: string -} - -export function registerDatabase(dbSettings: DatabaseSettings): void { - // TODO -} - -export function registerPersistentData(db: DatabaseSettings, dataDefinition: DataDefinition): void { - // TODO -} - -export function findById(id: string): T { - return null; -} \ No newline at end of file diff --git a/option-interfaces/tsconfig.json b/option-interfaces/tsconfig.json deleted file mode 100644 index 7b22614..0000000 --- a/option-interfaces/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "target": "ES5", - "experimentalDecorators": true - } - } \ No newline at end of file diff --git a/option-interfaces/utils.ts b/option-interfaces/utils.ts deleted file mode 100644 index 3147995..0000000 --- a/option-interfaces/utils.ts +++ /dev/null @@ -1,5 +0,0 @@ -export function formatDateTime(dateTime: Date, format: string) { - // Format the given date using the pattern in `format` - // TODO - return format; -} \ No newline at end of file diff --git a/option-lifecycle-hooks/entity.ts b/option-lifecycle-hooks/entity.ts deleted file mode 100644 index 4a510bc..0000000 --- a/option-lifecycle-hooks/entity.ts +++ /dev/null @@ -1,44 +0,0 @@ -abstract class AbstractEntity { - id?: string; - createdAt?: Date; - updatedAt?: Date; - - constructor() { - this.createdAt = new Date(); - } - - // lifecycle hooks - protected abstract beforeSave(): Promise | void; - protected abstract afterSave(): Promise | void; - protected abstract beforeRead(): Promise | void; - protected abstract afterRead(): Promise | void; - protected abstract beforeDelete(): Promise | void; - protected abstract afterDelete(): Promise | void; - protected abstract validate(): Promise | void; - protected abstract onChange(): Promise | void; - - async save() { - await this.beforeSave(); - if (!this.id) { - this.id = Math.random().toString(36).substr(2, 9); // Simulate ID generation - } else { - this.updatedAt = new Date(); - } - // save logic - await this.afterSave(); - } - - async read() { - await this.beforeRead(); - // read logic - await this.afterRead(); - } - - async delete() { - await this.beforeDelete(); - // delete logic - await this.afterDelete(); - } - - -} diff --git a/option-lifecycle-hooks/userEntity.ts b/option-lifecycle-hooks/userEntity.ts deleted file mode 100644 index 3d843f8..0000000 --- a/option-lifecycle-hooks/userEntity.ts +++ /dev/null @@ -1,67 +0,0 @@ -class UserEntity extends AbstractEntity { - - name: string; - email: string; - age: number; - role: 'admin' | 'user'; - - constructor(name: string, email: string, age: number, role: 'admin' | 'user') { - super(); - this.name = name; - this.email = email; - this.age = age; - this.role = role; - } - - async beforeCreate() { - console.log('Before create: Initializing entity...'); - } - - async afterCreate() { - console.log('After create: Entity created.'); - } - - async beforeUpdate() { - console.log(`Before update: Updating user ${this.name}`); - } - - async afterUpdate() { - console.log(`After update: User ${this.name} updated.`); - } - - async beforeDelete() { - console.log(`Before delete: Checking permissions for ${this.name}`); - } - - async afterDelete() { - console.log(`After delete: User ${this.name} deleted.`); - } - - async beforeSave() { - console.log('Before save: Validating and preparing data...'); - } - - async afterSave() { - console.log('After save: Changes saved successfully.'); - } - - async validate() { - if (!this.email.includes('@')) throw new Error('Invalid email address.'); - if (this.age < 18) throw new Error('User must be at least 18 years old.'); - } - - async onChange() { - console.log('On change: User data has been modified.'); - } - - async beforeRead() { - console.log('Before read: Checking visibility rules...'); - if (this.role !== 'admin') { - this.email = '[HIDDEN]'; // Hide sensitive data - } - } - - async afterRead() { - console.log('After read: Data successfully retrieved.'); - } -} diff --git a/task-manager-reuse/model/user/compactDetailsView.ts b/task-manager-reuse/model/user/compactDetailsView.ts deleted file mode 100644 index 74eac38..0000000 --- a/task-manager-reuse/model/user/compactDetailsView.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { z } from 'zod'; -import { userSchema } from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; -import { resetPasswordAction } from './resetPassword'; - -const userCompactDetailsModel = z.object({ - picture: z.string(), - user: userSchema -}); - -type UserCompactDetailsModel = z.infer; - -const userCompactDetailsView = ui.viewForObject({ - name: 'User Details', - model: userCompactDetailsModel, - layout: { - type: 'vertical', - widgets: [ - w.columns([ - //w.formField().field('picture').label('Picture').widget(w.imageWidget()), - w.imageWidget((model: UserCompactDetailsModel) => model.picture), - w.defaultWidget().field('user').field('fullName'), - ]), - w.defaultWidget().field('user').field('email'), - w.defaultWidget().field('user').field('notes'), - w.toolbarWidget().action(resetPasswordAction) - ] - }, - toolbar: {} -}); diff --git a/task-manager-reuse/model/user/editView.ts b/task-manager-reuse/model/user/editView.ts deleted file mode 100644 index d08fc45..0000000 --- a/task-manager-reuse/model/user/editView.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { z } from 'zod'; -import { User, userSchema } from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; - -const userCompactDetailsView = ui.simpleViewForObject({ - name: 'User Edit', - model: userSchema, - managed: true, - toolbar: { - actionsToInclude: 'all' - } -}); diff --git a/task-manager-reuse/model/user/resetPassword.ts b/task-manager-reuse/model/user/resetPassword.ts deleted file mode 100644 index eeb26ad..0000000 --- a/task-manager-reuse/model/user/resetPassword.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { z } from 'zod'; -import {User} from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; - -const resetPasswordSchema = z.object({ - newPassword: z.string(), - confirmNewPassword: z.string() -}).refine((data) => data.newPassword === data.confirmNewPassword, { - message: "Passwords don't match", - path: ["confirmNewPassword"] -}); - -type ResetPassword = z.infer; - -const resetPasswordRepresentation = ui.defaultUiForObject({ - newPassword: { - label: 'New Password', - dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] - }, - confirmNewPassword: { - label: 'Confirm New Password', - dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] - } -}); - -export const resetPasswordAction = m.recordAction({ - script: (record: User, params: ResetPassword) => { - // do something - } -}); \ No newline at end of file diff --git a/task-manager-reuse/model/user/user.ts b/task-manager-reuse/model/user/user.ts deleted file mode 100644 index 8d944e8..0000000 --- a/task-manager-reuse/model/user/user.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { z } from 'zod'; -import { widgets as w, ui, db, api } from 'slingr'; - -export const userSchema = z.object({ - firstName: z.string(), - lastName: z.string(), - fullName: z.string(), - email: z.string().email(), - age: z.number().int().positive(), - password: z.string().min(8).max(16), - notes: z.string().optional() -}); - -export type User = z.infer; - -const userRepresentation = ui.defaultUiForObject({ - label: 'Users', - recordLabelField: 'fullName', - sorting: { - field: 'fullName', - direction: 'asc' - }, - fields: { - firstName: { - label: 'First Name', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - lastName: { - label: 'Last Name', - visibility: {type: 'always'}, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - fullName: { - label: 'Last Name', - dataWidget: [{ - context: ui.context.all, - widget: w.textWidget() - }] - }, - email: { - label: 'Email', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.emailWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - age: { - label: 'Age', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - password: { - label: 'Password', - visibility: ui.visibility.never - }, - notes: { - label: 'Notes', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.textAreaWidget() - }] - } - } -}); - -const userRepository = db.repositoryForObject({ - collectionName: 'users', - schema: userSchema, - indexes: [ - db.regularIndex(['email']), - db.regulatIndex(['fullName']) - ], - encrypt: ['password'] -}); - - -const userApi = api.dataApiForObject({ - repository: userRepository -}); diff --git a/task-manager-slingr/framework/backend/actions.ts b/task-manager-slingr/framework/backend/actions.ts deleted file mode 100644 index 4de1207..0000000 --- a/task-manager-slingr/framework/backend/actions.ts +++ /dev/null @@ -1,13 +0,0 @@ -interface Action { - -} - -export interface ObjectActionDefinition { - name?: string; - precondition?: (data: S) => boolean; - script: (data: S, params: P) => any; -} - -export function objectAction(def: ObjectActionDefinition): Action { - return {} as Action; -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/api.ts b/task-manager-slingr/framework/backend/api.ts deleted file mode 100644 index fd4453c..0000000 --- a/task-manager-slingr/framework/backend/api.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Repository } from "./db"; -import { Schema } from "./schemas"; -import { ObjectActionDefinition } from "./actions"; - -export function addSchema(schema: Schema, repository: Repository) { - -} - -export function addAction(action: ObjectActionDefinition) { - -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/db.ts b/task-manager-slingr/framework/backend/db.ts deleted file mode 100644 index a860f8e..0000000 --- a/task-manager-slingr/framework/backend/db.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface Repository { - name: string; - managed: boolean; - indexes: Index[]; - encrypt: (keyof T)[]; -} - -export interface Index { - type: 'regular' | 'unique' | 'fulltext' | 'vector', - fields: (keyof T)[] -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/mongo.ts b/task-manager-slingr/framework/backend/mongo.ts deleted file mode 100644 index bed2f69..0000000 --- a/task-manager-slingr/framework/backend/mongo.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Index, Repository } from "./db"; - -export interface MongoRepository extends Repository { -} - -export function repositoryForSchema(def: MongoRepository): MongoRepository { - return def; -} - -function regular(fields: (keyof T)[]): Index { - return { - type: 'regular', - fields - } as Index; -}; - -export let indexes = { - regular: regular -}; \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts deleted file mode 100644 index 696eb9f..0000000 --- a/task-manager-slingr/framework/backend/schemas.ts +++ /dev/null @@ -1,174 +0,0 @@ -export type FieldType = 'string' | 'number' | 'boolean' | 'datatime' | 'enum' | 'object' | 'array' | 'relationship'; -export type Required = boolean | ((data: any) => boolean); -export type Available = boolean | ((data: any) => boolean); -export type Calculation = (data: any) => any; -export type DefaultValue = (data: any) => any; -export type FieldValidator = (data: any) => {valid: boolean, message?: string}; - -export interface Schema { - [key: string]: FieldDefinition -} - -export function schema(def: Schema, validator?: (data: any) => {path: string, message: string}[]) { - return def; -} - -// Helper type to determine if a field is required -type IsRequired = T['required'] extends true ? true : T['required'] extends false ? false : boolean; - -// Main type inference utility -export type InferType = { - [K in keyof T as IsRequired extends false ? never : K]: InferFieldType; -} & { - [K in keyof T as IsRequired extends true ? never : K]?: InferFieldType; -}; - -type InferFieldType = - F extends StringFieldDefinition ? string : - F extends NumberFieldDefinition ? number : - F extends BooleanFieldDefinition ? boolean : - F extends EnumFieldDefinition ? F['values'][number] : - F extends ObjectFieldDefinition ? InferType : - F extends ArrayFieldDefinition ? InferFieldType[] : - F extends RelationshipFieldDefinition ? InferType : - any; // Fallback, ideally should be never or handle more cases - -export interface FieldDefinition { - type: FieldType; - required: Required; - available: Available; - defaultValue?: DefaultValue; - calculation?: Calculation; - validators: FieldValidator[]; -} - -export interface StringFieldDefinition extends FieldDefinition { - type: 'string'; - min?: number; - max?: number; - pattern?: string; -} - -export interface NumberFieldDefinition extends FieldDefinition { - type: 'number'; - integer?: boolean; - min?: number; - max?: number; -} - -export interface BooleanFieldDefinition extends FieldDefinition { - type: 'boolean'; -} - -export interface EnumFieldDefinition extends FieldDefinition { - type: 'enum'; - values: string[]; -} - -export interface ObjectFieldDefinition extends FieldDefinition { - type: 'object'; - schema: Schema -} - -export interface ArrayFieldDefinition extends FieldDefinition { - type: 'array'; - items: FieldDefinition -} - -export interface RelationshipFieldDefinition extends FieldDefinition { - type: 'relationship'; - targetSchema: Schema -} - -export function string(def?: Partial) : StringFieldDefinition { - let field = { - type: 'string', - required: false, - available: true, - ...def - } as StringFieldDefinition; - return field; -} - -export function email(def?: Partial) : StringFieldDefinition { - let field = { - type: 'string', - required: false, - available: true, - pattern: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$', - ...def - } as StringFieldDefinition; - return field; -} - -export function number(def?: Partial) : NumberFieldDefinition { - let field = { - type: 'number', - required: false, - available: true, - ...def - } as NumberFieldDefinition; - return field; -} - -export function boolean(def?: Partial) : FieldDefinition { - let field = { - type: 'boolean', - required: false, - available: true, - ...def - } as FieldDefinition; - return field; -} - -export function datatime(def?: Partial) : FieldDefinition { - let field = { - type: 'datatime', - required: false, - available: true, - ...def - } as FieldDefinition; - return field; -} - -export function enumeration(def?: Partial) : EnumFieldDefinition { - let field = { - type: 'enum', - required: false, - available: true, - ...def - } as EnumFieldDefinition; - return field; -} - -export function object(def?: Partial) : ObjectFieldDefinition { - let field = { - type: 'object', - schema: null, //schemaOf(), - required: false, - available: true, - ...def - } as ObjectFieldDefinition; - return field; -} - -export function array(def?: Partial) : ArrayFieldDefinition { - let field = { - type: 'array', - required: false, - available: true, - ...def - } as ArrayFieldDefinition; - return field; -} - -export function relationship(def?: Partial) : RelationshipFieldDefinition { - let field = { - type: 'relationship', - schema: null, //schemaOf(), - required: false, - available: true, - ...def - } as RelationshipFieldDefinition; - return field; -} diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts deleted file mode 100644 index 90ef259..0000000 --- a/task-manager-slingr/framework/frontend/ui.ts +++ /dev/null @@ -1,178 +0,0 @@ -import { Schema } from "../backend/schemas"; -import * as w from "./widgets"; -import { Widget } from "./widgets"; - -type Visible = boolean | ((data: any) => boolean); -type ContextMatcher = (ctx: any) => boolean; -type Context = 'edit' | 'readOnly' | 'table' | 'mobile' | 'desktop' | 'developer' | ContextMatcher -type ContextDefinition = { - type: 'or' | 'and', - contexts: Context[] -} | Context; - -export let context = { - or: (contexts: Context[]) => { - return { - type: 'or', - contexts - } as ContextDefinition - }, - and: (contexts: Context[]) => { - return { - type: 'and', - contexts - } as ContextDefinition - } -} - -export interface UiFieldDefinition { - label: string, - visible: Visible, - dataWidgets: {context: ContextDefinition, widget: w.Widget}[] -} - -export interface TextUiFieldDefinition extends UiFieldDefinition { -} - -function text(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.text() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface EmailUiFieldDefinition extends UiFieldDefinition { -} - -function email(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.email() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface NumberUiFieldDefinition extends UiFieldDefinition { -} - -function number(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.text() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface PasswordUiFieldDefinition extends UiFieldDefinition { -} - -function password(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.password() - }, { - context: 'edit', - widget: w.passwordInput() - }], - ...def - } as UiFieldDefinition; -} - - -export interface EnumerationChipUiFieldDefinition extends UiFieldDefinition { - options: { - value: T, - label: string, - color?: string - }[] -} - -function enumeration(def: Partial>): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.enumerationChip({ - options: def.options - }) - }, { - context: 'edit', - widget: w.dropDown({ - options: def.options - }) - }], - ...def - } as UiFieldDefinition; -} - -export let fields = { - text: text, - email: email, - number: number, - password: password, - enumeration: enumeration -}; - -export interface DefaultUiForSchema { - label?: string, - objectLabelField?: keyof T, - sorting?: { - field: keyof T, - direction: 'asc' | 'desc' - }, - fields: { - [key in keyof T]: UiFieldDefinition - } -} - -export function defaultUiForSchema(def: DefaultUiForSchema): DefaultUiForSchema { - return def; -} - -export interface View { - name: string, - model?: ViewModel, - layout?: Layout -} - - -export interface ViewModel { - widgets: { [key: string]: Widget } -} - -export type LayoutType = 'vertical' | 'horizontal'; - -export interface Layout { - type: LayoutType, - widgets: Widget[] -} - -export interface DataView extends View { - mode: 'readOnly' | 'edit' | 'create' -} - -export interface SimpleDataView extends DataView { - managed: boolean, - fields?: Array -} diff --git a/task-manager-slingr/framework/frontend/widgets.ts b/task-manager-slingr/framework/frontend/widgets.ts deleted file mode 100644 index b5c3717..0000000 --- a/task-manager-slingr/framework/frontend/widgets.ts +++ /dev/null @@ -1,101 +0,0 @@ -export interface Widget { - type: string -} - -export interface TextWidget extends Widget { - type: 'text' -} - -export function text(def?: Partial): TextWidget { - return { - type: 'text', - ...def - } as TextWidget; -} - -export interface EmailWidget extends Widget { - type: 'email' -} - -export function email(def?: Partial): EmailWidget { - return { - type: 'email', - ...def - } as EmailWidget; -} - -export interface InputWidget extends Widget { - type: 'input' -} - -export function input(def?: Partial): InputWidget { - return { - type: 'input', - ...def - } as InputWidget; -} - -export interface PasswordWidget extends Widget { - type: 'password' -} - -export function password(def?: Partial): PasswordWidget { - return { - type: 'password', - ...def - } as PasswordWidget; -} - -export interface PasswordInputWidget extends Widget { - type: 'passwordInput' -} - -export function passwordInput(def?: Partial): PasswordInputWidget { - return { - type: 'passwordInput', - ...def - } as PasswordInputWidget; -} - -export interface DropDownWidget extends Widget { - type: 'dropDown', - options: { - value: T, - label: string - }[] -} - -export function dropDown(def?: Partial>): DropDownWidget { - return { - type: 'dropDown', - ...def - } as DropDownWidget; -} - -export interface ChipWidget extends Widget { - type: 'chip', - color: string -} - -export function chip(def?: Partial): ChipWidget { - return { - type: 'chip', - ...def - } as ChipWidget; -} - - -export interface EnumerationChipWidget extends Widget { - type: 'enumeration', - options: { - value: T, - label: string - }[] -} - -export function enumerationChip(def?: Partial>): EnumerationChipWidget { - return { - type: 'enumerationChip', - ...def - } as EnumerationChipWidget; -} \ No newline at end of file diff --git a/task-manager-slingr/framework/helpers/models.ts b/task-manager-slingr/framework/helpers/models.ts deleted file mode 100644 index 5e4947a..0000000 --- a/task-manager-slingr/framework/helpers/models.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Repository } from "../backend/db"; -import * as s from "../backend/schemas"; -import * as ui from "../frontend/ui"; - -export interface ModelFieldDefinition extends s.FieldDefinition { - defaultUi?: ui.UiFieldDefinition; -} - -export interface ModelDefinition { - fields: { - [key: string]: ModelFieldDefinition - }, - db?: Repository; - ui?: { - label: string; - objectLabelField: string; - } -} - -export function model(def: ModelDefinition): s.Schema { - // register schema - let schema = s.schema(def.fields); - type SchemaType = s.InferType; - // register default ui - ui.defaultUiForSchema({ - label: def.ui?.label, - objectLabelField: def.ui?.objectLabelField, - fields: { - // go thorugh each field and add the default ui - ...Object.keys(def.fields).reduce((acc, key) => { - let field = def.fields[key]; - acc[key] = field.defaultUi; - return acc; - }, {}) - } - }); - // TODO register repository - return schema; -} - - diff --git a/task-manager-slingr/model/tags/tag.ts b/task-manager-slingr/model/tags/tag.ts deleted file mode 100644 index ad90d67..0000000 --- a/task-manager-slingr/model/tags/tag.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { model as m, types as t, widgets as w, ui, mongo } from 'slingr'; - -export const tagSchema = m.schema({ - name: t.text({ - required: true - }), - description: t.longText() -}); - -export type Tag = m.infer; - -ui.defaultUiForSchema({ - label: 'Tags', - instanceLabelField: 'name', - sorting: { - field: 'name', - direction: 'asc' - }, - fields: { - name: ui.fields.text({ - label: 'Name', - }), - description: ui.fields.textArea({ - label: 'Description' - }) - } -}); - -export const tagRepository = mongo.repositoryForSchema({ - collectionName: 'tags', - managed: true, - indexes: [ - mongo.regularIndex(['name']) - ] -}); diff --git a/task-manager-slingr/model/task/task.actions.ts b/task-manager-slingr/model/task/task.actions.ts deleted file mode 100644 index 10027b5..0000000 --- a/task-manager-slingr/model/task/task.actions.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; -import { Task } from './task.schema'; -import { - model as m, - types as t, - validators as v, - widgets as w, - ui, mongo, api, concurrency} from 'slingr'; - -export const startTaskSchema = m.schema({ - assignees: t.array({ - required: true, - items: t.relationship({ - defaultValue: (task: Task, startTask: StartTask) => { - return task.assignees; - } - }) - }) -}); - -type StartTask = m.infer; - -ui.defaultUiForSchema({ - assignees: ui.fields.relationshipArray({ - label: 'Assignees' - }) -}); - -export const startTaskAction = m.recordAction({ - precondition: (task: Task) => { - return task.status == 'open'; - }, - script: (task: Task, params: StartTask) => { - userRepository.lock(task).then((task: Task) => { - task.status = 'inProgress'; - task.assignees = params.assignees; - userRepository.save(task); - }); - } -}); - -api.addAction(startTaskAction); diff --git a/task-manager-slingr/model/task/task.schema.ts b/task-manager-slingr/model/task/task.schema.ts deleted file mode 100644 index 8878b31..0000000 --- a/task-manager-slingr/model/task/task.schema.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { - model as m, - types as t, - validators as v, - widgets as w, - context as ctx, - ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; -import { format } from 'date-fns'; -import { Tag, tagSchema } from '../tags/tag'; - -export const taskNoteSchema = m.schema({ - label: t.text({ - calculation: (taskNote: TaskNote) => { - return `${taskNote.addedByFullName} wrote on ${format(taskNote.timestamp, 'ddd MMM, yyyy')} at ${format(taskNote.timestamp, 'HH:mm')})}`; - } - }), - note: t.longText({ - required: true - }), - addedBy: t.relationship({ - required: true, - defaultValue: (taskNote: TaskNote) => { - const currentUser = ctx.getCurrentUser(); - return currentUser.id; - } - }), - timestamp: t.datetime({ - defaultValue: () => new Date() - }) -}); - -export type TaskNote = t.TypeOf; - -export type TaskStatus = 'open' | 'inProgress' | 'completed' | 'archived'; - -export const taskSchema = mongo.documentSchema.extend({ - number: t.number({ - validators: [v.integer()] - }), - title: t.text({ - required: true - }), - status: t.enum({ - required: true, - defaultValue: 'open' - }), - tags: t.array({ - items: t.relationship() - }), - createdAt: t.datetime({ - required: true, - defaultValue: () => new Date() - }), - createdBy: t.relationship({ - required: true, - defaultValue: (task: Task) => { - const currentUser = ctx.getCurrentUser(); - return currentUser.id; - } - }), - closedAt: t.datetime({ - availability: (task: Task) => { - return task.status === 'completed'; - } - }), - assignees: t.array({ - items: t.relationship() - }), - description: t.longText(), - notes: t.array({ - items: taskNoteSchema - }) -}); - -export type Task = m.infer; - -export const taskRepository = mongo.repositoryForSchema({ - collectionName: 'tasks', - managed: true, - autoIncrement: [ - mongo.autoIncrementField('number', 1) - ], - indexes: [ - mongo.regularIndex(['title']), - mongo.regularIndex(['status']), - mongo.regularIndex(['assignees']) - ] -}); diff --git a/task-manager-slingr/model/task/task.ui.ts b/task-manager-slingr/model/task/task.ui.ts deleted file mode 100644 index 94146d6..0000000 --- a/task-manager-slingr/model/task/task.ui.ts +++ /dev/null @@ -1,104 +0,0 @@ -import { - model as m, - types as t, - validators as v, - widgets as w, - context as ctx, - ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; -import { format } from 'date-fns'; -import { Tag, tagSchema } from '../tags/tag'; -import { Task, TaskNote, TaskStatus } from './task.schema'; - -ui.defaultUiForSchema({ - label: 'Task Notes', - recordLabelField: 'label', - fields: { - note: { - label: 'Note', - visible: true, - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.textAreaWidget() - }] - }, - addedBy: { - label: 'Added By', - visible: true, - dataWidget: defaultUserRelationshipWidgets - }, - timestamp: { - label: 'Timestamp', - visible: true, - dataWidget: [{ - context: 'readOnly', - widget: w.datetimeWidget() - }, { - context: 'edit', - widget: w.datetimePickerWidget() - }] - } - } -}); - -ui.defaultUiForSchema({ - label: 'Tasks', - instanceLabelField: 'title', - sorting: { - field: 'title', - direction: 'asc' - }, - fields: { - number: ui.fields.autoIncrement({ - label: 'Number' - }), - title: ui.fields.text({ - label: 'Title' - }), - description: ui.fields.htmlText({ - label: 'Description' - }), - status: ui.fields.enum({ - label: 'Status', - values: { - open: { - label: 'Open', - color: 'blue' - }, - inProgress: { - label: 'In Progress', - color: 'orange' - }, - completed: { - label: 'Completed', - color: 'green' - }, - archived: { - label: 'Archived', - color: 'gray' - } - } - }), - tags: ui.fields.relationshipArray({ - label: 'Tags' - }), - createdAt: ui.fields.datetime({ - label: 'Created At' - }), - createdBy: ui.fields.relationship({ - label: 'Created By' - }), - closedAt: ui.fields.datetime({ - label: 'Closed At' - }), - assignees: ui.fields.relationshipArray({ - label: 'Assignees' - }), - notes: ui.fields.objectArray({ - label: 'Notes' - }) - } -}); \ No newline at end of file diff --git a/task-manager-slingr/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts deleted file mode 100644 index 60c3d20..0000000 --- a/task-manager-slingr/model/user/resetPassword.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { User } from './user.schema'; -import * as s from '../../framework/backend/schemas'; -import * as a from '../../framework/backend/actions'; -import * as ui from '../../framework/frontend/ui'; -import * as api from '../../framework/backend/api'; - -const resetPasswordSchema = s.schema({ - newPassword: s.string({ - required: true - }), - confirmNewPassword: s.string({ - required: true - }) -}, (data: ResetPassword) => { - if (data.newPassword != data.confirmNewPassword) { - return [{ - message: "Passwords don't match", - path: 'confirmNewPassword' - }]; - } - return []; -}); - -type ResetPassword = s.InferType; - -ui.defaultUiForSchema({ - fields: { - newPassword: ui.fields.password({label: 'New Password'}), - confirmNewPassword: ui.fields.password({label: 'Confirm New Password'}) - } -}); - -export const resetPasswordAction = a.objectAction({ - precondition: (data: User) => { - return data.status == 'active'; - }, - script: (record: User, params: ResetPassword) => { - // do something - } -}); - -api.addAction<(resetPasswordAction); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.db.ts b/task-manager-slingr/model/user/user.db.ts deleted file mode 100644 index 4983899..0000000 --- a/task-manager-slingr/model/user/user.db.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { User, userSchema } from "./user.schema"; -import * as mongo from '../../framework/backend/mongo'; -import * as api from '../../framework/backend/api'; - -export const userRepository = mongo.repositoryForSchema({ - name: 'users', - managed: true, - indexes: [ - mongo.indexes.regular(['email']), - mongo.indexes.regular(['fullName']) - ], - encrypt: ['password'] -}); - -api.addSchema(userSchema, userRepository); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.schema.ts b/task-manager-slingr/model/user/user.schema.ts deleted file mode 100644 index 0d5c33b..0000000 --- a/task-manager-slingr/model/user/user.schema.ts +++ /dev/null @@ -1,36 +0,0 @@ -import * as s from '../../framework/backend/schemas'; - -export const userSchema = s.schema({ - firstName: s.string({ - required: true - }), - lastName: s.string({ - required: true - }), - fullName: s.string({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - } - }), - email: s.email({ - required: true - }), - status: s.enumeration({ - required: true, - defaultValue: (data: User) => 'active', - values: ['active', 'inactive'], - }), - age: s.number({ - integer: true, - min: 0, - max: 150 - }), - password: s.string({ - required: true, - min: 8, - max: 16 - }), - notes: s.string({}) -}); - -export type User = s.InferType; \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts deleted file mode 100644 index b8863f7..0000000 --- a/task-manager-slingr/model/user/user.ts +++ /dev/null @@ -1,60 +0,0 @@ -import * as s from '../../framework/backend/schemas'; -import * as m from '../../framework/helpers/models'; -import * as ui from '../../framework/frontend/ui'; - -export const userSchema = m.model({ - fields: { - firstName: m.fields.string({ - required: true, - defaultUi: ui.fields.text({label: 'First Name'}) - }), - lastName: m.fields.string({ - required: true, - defaultUi: ui.fields.text({label: 'Last Name'}) - }), - fullName: m.fields.string({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - }, - defaultUi: ui.fields.text({label: 'Full Name'}) - }), - email: m.fields.email({ - required: true, - defaultUi: ui.fields.email({label: 'Email'}) - }), - status: m.fields.enumeration({ - required: true, - defaultValue: (data: User) => 'active', - values: ['active', 'inactive'], - defaultUi: ui.fields.enumeration({ - options: [ - { - value: 'active', - label: 'Active', - color: 'green' - }, - { - value: 'inactive', - label: 'Inactive', - color: 'red' - } - ] - }) - }), - age: m.fields.number({ - integer: true, - min: 0, - max: 150, - defaultUi: ui.fields.number({label: 'Age'}) - }), - password: m.fields.text({ - required: true, - min: 8, - max: 16, - defaultUi: ui.fields.password({label: 'Password'}) - }), - notes: m.fields.html({}) - } -}); - -export type User = s.InferType; diff --git a/task-manager-slingr/model/user/user.ui.ts b/task-manager-slingr/model/user/user.ui.ts deleted file mode 100644 index 7cfc45f..0000000 --- a/task-manager-slingr/model/user/user.ui.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { User } from "./user.schema"; -import * as ui from '../../framework/frontend/ui'; - -ui.defaultUiForSchema({ - label: 'Users', - objectLabelField: 'fullName', - sorting: { - field: 'fullName', - direction: 'asc' - }, - fields: { - firstName: ui.fields.text({label: 'First Name'}), - lastName: ui.fields.text({label: 'Last Name'}), - fullName: ui.fields.text({label: 'Full Name'}), - email: ui.fields.text({label: 'Email'}), - status: ui.fields.enumeration({ - options: [ - { - value: 'active', - label: 'Active', - color: 'green' - }, - { - value: 'inactive', - label: 'Inactive', - color: 'red' - } - ] - }), - age: ui.fields.number({label: 'Age'}), - password: ui.fields.password({ - label: 'Password', - visible: false - }), - notes: ui.fields.text({label: 'Notes'}) - } -}); From ec785bf3178ae3865e181e4d7790dc94db407e02 Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Fri, 8 Aug 2025 00:01:18 -0300 Subject: [PATCH 030/254] removing old things in the repo --- option-classes/.gitignore | 1 - option-classes/backend.ts | 33 -- option-classes/example1.ts | 222 --------- option-classes/frontend.ts | 10 - option-classes/libs/context.ts | 12 - option-classes/package-lock.json | 19 - option-classes/package.json | 5 - option-classes/storage.ts | 19 - option-classes/tsconfig.json | 8 - .../framework/metadata/entity.ts | 7 - .../framework/metadata/field.ts | 10 - .../framework/metadata/formField.ts | 7 - .../framework/metadata/formView.ts | 10 - .../framework/metadata/menu.ts | 11 - .../sample-app/model/entities/contacts.ts | 14 - .../sample-app/ui/navigation/mainMenu.ts | 12 - .../sample-app/ui/views/createContact.ts | 10 - .../framework/app.ts | 7 - .../framework/entity.ts | 7 - .../framework/entityField.ts | 38 -- .../framework/factories/entityFactory.ts | 18 - .../framework/factories/typesFactory.ts | 43 -- .../framework/factories/viewFactory.ts | 24 - .../framework/gridView.ts | 15 - .../sample-app/app.ts | 12 - .../sample-app/model/entities/contacts.ts | 14 - .../sample-app/ui/views/contactsGrid.ts | 12 - .../task-manager-app/app.ts | 20 - .../model/entities/projects.ts | 11 - .../task-manager-app/model/entities/tasks.ts | 12 - .../model/entities/timeLogs.ts | 12 - .../task-manager-app/ui/views/projectsGrid.ts | 10 - .../task-manager-app/ui/views/tasksGrid.ts | 11 - .../task-manager-app/ui/views/timeLogsGrid.ts | 11 - option-interfaces/backend.ts | 31 -- option-interfaces/example1.ts | 237 --------- option-interfaces/example2.ts | 463 ------------------ option-interfaces/frontend.ts | 116 ----- option-interfaces/security.ts | 51 -- option-interfaces/storage.ts | 18 - option-interfaces/tsconfig.json | 6 - option-interfaces/utils.ts | 5 - option-lifecycle-hooks/entity.ts | 44 -- option-lifecycle-hooks/userEntity.ts | 67 --- .../model/user/compactDetailsView.ts | 30 -- task-manager-reuse/model/user/editView.ts | 12 - .../model/user/resetPassword.ts | 30 -- task-manager-reuse/model/user/user.ts | 103 ---- .../framework/backend/actions.ts | 13 - task-manager-slingr/framework/backend/api.ts | 11 - task-manager-slingr/framework/backend/db.ts | 11 - .../framework/backend/mongo.ts | 19 - .../framework/backend/schemas.ts | 174 ------- task-manager-slingr/framework/frontend/ui.ts | 178 ------- .../framework/frontend/widgets.ts | 101 ---- .../framework/helpers/models.ts | 41 -- task-manager-slingr/model/tags/tag.ts | 35 -- .../model/task/task.actions.ts | 42 -- task-manager-slingr/model/task/task.schema.ts | 89 ---- task-manager-slingr/model/task/task.ui.ts | 104 ---- .../model/user/resetPassword.ts | 42 -- task-manager-slingr/model/user/user.db.ts | 15 - task-manager-slingr/model/user/user.schema.ts | 36 -- task-manager-slingr/model/user/user.ts | 60 --- task-manager-slingr/model/user/user.ui.ts | 37 -- 65 files changed, 2908 deletions(-) delete mode 100644 option-classes/.gitignore delete mode 100644 option-classes/backend.ts delete mode 100644 option-classes/example1.ts delete mode 100644 option-classes/frontend.ts delete mode 100644 option-classes/libs/context.ts delete mode 100644 option-classes/package-lock.json delete mode 100644 option-classes/package.json delete mode 100644 option-classes/storage.ts delete mode 100644 option-classes/tsconfig.json delete mode 100644 option-interfaces-references/framework/metadata/entity.ts delete mode 100644 option-interfaces-references/framework/metadata/field.ts delete mode 100644 option-interfaces-references/framework/metadata/formField.ts delete mode 100644 option-interfaces-references/framework/metadata/formView.ts delete mode 100644 option-interfaces-references/framework/metadata/menu.ts delete mode 100644 option-interfaces-references/sample-app/model/entities/contacts.ts delete mode 100644 option-interfaces-references/sample-app/ui/navigation/mainMenu.ts delete mode 100644 option-interfaces-references/sample-app/ui/views/createContact.ts delete mode 100644 option-interfaces-types-factory/framework/app.ts delete mode 100644 option-interfaces-types-factory/framework/entity.ts delete mode 100644 option-interfaces-types-factory/framework/entityField.ts delete mode 100644 option-interfaces-types-factory/framework/factories/entityFactory.ts delete mode 100644 option-interfaces-types-factory/framework/factories/typesFactory.ts delete mode 100644 option-interfaces-types-factory/framework/factories/viewFactory.ts delete mode 100644 option-interfaces-types-factory/framework/gridView.ts delete mode 100644 option-interfaces-types-factory/sample-app/app.ts delete mode 100644 option-interfaces-types-factory/sample-app/model/entities/contacts.ts delete mode 100644 option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/app.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/projects.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts delete mode 100644 option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts delete mode 100644 option-interfaces/backend.ts delete mode 100644 option-interfaces/example1.ts delete mode 100644 option-interfaces/example2.ts delete mode 100644 option-interfaces/frontend.ts delete mode 100644 option-interfaces/security.ts delete mode 100644 option-interfaces/storage.ts delete mode 100644 option-interfaces/tsconfig.json delete mode 100644 option-interfaces/utils.ts delete mode 100644 option-lifecycle-hooks/entity.ts delete mode 100644 option-lifecycle-hooks/userEntity.ts delete mode 100644 task-manager-reuse/model/user/compactDetailsView.ts delete mode 100644 task-manager-reuse/model/user/editView.ts delete mode 100644 task-manager-reuse/model/user/resetPassword.ts delete mode 100644 task-manager-reuse/model/user/user.ts delete mode 100644 task-manager-slingr/framework/backend/actions.ts delete mode 100644 task-manager-slingr/framework/backend/api.ts delete mode 100644 task-manager-slingr/framework/backend/db.ts delete mode 100644 task-manager-slingr/framework/backend/mongo.ts delete mode 100644 task-manager-slingr/framework/backend/schemas.ts delete mode 100644 task-manager-slingr/framework/frontend/ui.ts delete mode 100644 task-manager-slingr/framework/frontend/widgets.ts delete mode 100644 task-manager-slingr/framework/helpers/models.ts delete mode 100644 task-manager-slingr/model/tags/tag.ts delete mode 100644 task-manager-slingr/model/task/task.actions.ts delete mode 100644 task-manager-slingr/model/task/task.schema.ts delete mode 100644 task-manager-slingr/model/task/task.ui.ts delete mode 100644 task-manager-slingr/model/user/resetPassword.ts delete mode 100644 task-manager-slingr/model/user/user.db.ts delete mode 100644 task-manager-slingr/model/user/user.schema.ts delete mode 100644 task-manager-slingr/model/user/user.ts delete mode 100644 task-manager-slingr/model/user/user.ui.ts diff --git a/option-classes/.gitignore b/option-classes/.gitignore deleted file mode 100644 index 40b878d..0000000 --- a/option-classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules/ \ No newline at end of file diff --git a/option-classes/backend.ts b/option-classes/backend.ts deleted file mode 100644 index 97eae61..0000000 --- a/option-classes/backend.ts +++ /dev/null @@ -1,33 +0,0 @@ -import 'reflect-metadata'; - -interface DataModelConfig { -} - -export function DataModel(config?: DataModelConfig): ClassDecorator { - return function (constructor: T) { - Reflect.defineMetadata('dataModelConfig', config, constructor); - return constructor; - }; -} - -interface FieldRequired { - type: 'always' | 'never' | 'conditional', - condition?: (data: any) => boolean -} - -type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; - -interface FieldConfig { - type?: FieldType, - itemType?: FieldType, - required?: FieldRequired, - defaultValue?: (data: any) => any, - calculation?: (data: any) => any, -} - -export function Field(config: FieldConfig): PropertyDecorator { - return function (target: Object, propertyKey: string | symbol) { - Reflect.defineMetadata('fieldConfig', config, target, propertyKey); - }; - } - \ No newline at end of file diff --git a/option-classes/example1.ts b/option-classes/example1.ts deleted file mode 100644 index 6eeb25b..0000000 --- a/option-classes/example1.ts +++ /dev/null @@ -1,222 +0,0 @@ -import { DataModel, Field } from './backend'; -// import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { DataModelUISettings } from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; -import { MongoRecord, CopiedField } from './storage'; -import * as context from './libs/context'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'fullName' -}) -class User extends MongoRecord { - @Field({ - required: {type: 'always'}, - }) - firstName: string; - - @Field({ - required: {type: 'always'} - }) - lastName: string; - - @Field({ - calculation: (user: User) => `${user.firstName} ${user.lastName}` - }) - fullName: string; - - @Field({ - required: {type: 'always'} - }) - email: string; -} - -// TaskNote - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'label' -}) -class TaskNote { - @Field({ - calculation: calculateTaskNoteLabel - }) - label: string; - - @Field({ - required: {type: 'always'} - }) - note: string; - - @Field({ - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }) - timestamp: number; - - @Field({ - required: {type: 'always'}, - defaultValue: () => context.getCurrentUser().id - }) - addedBy: string; - - @CopiedField({ - relationshipField: 'addedBy', - copiedField: 'fullName' - }) - addedByFullName: string; -} - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -@DataModel() -@DataModelUISettings({ - defaultLabel: 'label' -}) -class Task extends MongoRecord { - @Field({ - required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }) - label: string; - - @Field({ - type: 'auto-incremental' - }) - number: number; - - @Field({ - required: {type: 'always'} - }) - title: string; - - @Field({ - type: 'array', - itemType: 'relationship' - }) - notes: TaskNote[]; -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView: SimpleRecordView = { - name: 'Create Task', - mode: 'create', - managed: true -}; - -const EditTaskView: SimpleRecordView = { - name: 'Edit Task', - mode: 'edit', - managed: true -}; - -const TasksGridView: GridView = { - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -registerDatabase(MainDatabase); -registerPersistentData(MainDatabase, UserDefinition); -registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option-classes/frontend.ts b/option-classes/frontend.ts deleted file mode 100644 index 759a9fe..0000000 --- a/option-classes/frontend.ts +++ /dev/null @@ -1,10 +0,0 @@ -interface DataModelUISettingsConfig { - defaultLabel: keyof T -} - -export function DataModelUISettings(config: DataModelUISettingsConfig): ClassDecorator { - return function (target: Object) { - Reflect.defineMetadata('dataModelUISettingsConfig', config, target); - }; -} - diff --git a/option-classes/libs/context.ts b/option-classes/libs/context.ts deleted file mode 100644 index ca769fc..0000000 --- a/option-classes/libs/context.ts +++ /dev/null @@ -1,12 +0,0 @@ -declare class User { - id: string; - firstName: string; - lastName: string; - fullName: string; - email: string; -}; - -export function getCurrentUser(): User { - // TODO - return null; -} \ No newline at end of file diff --git a/option-classes/package-lock.json b/option-classes/package-lock.json deleted file mode 100644 index bff7766..0000000 --- a/option-classes/package-lock.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "option-classes", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "devDependencies": { - "reflect-metadata": "^0.2.2" - } - }, - "node_modules/reflect-metadata": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", - "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", - "dev": true, - "license": "Apache-2.0" - } - } -} diff --git a/option-classes/package.json b/option-classes/package.json deleted file mode 100644 index ecd1bfe..0000000 --- a/option-classes/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "devDependencies": { - "reflect-metadata": "^0.2.2" - } -} diff --git a/option-classes/storage.ts b/option-classes/storage.ts deleted file mode 100644 index a773888..0000000 --- a/option-classes/storage.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Field } from "./backend"; - -export class MongoRecord { - @Field({ - type: 'id' - }) - id: string; -} - -interface CopiedFieldConfig { - relationshipField: keyof Source, - copiedField: keyof Target -} - -export function CopiedField(config: CopiedFieldConfig): PropertyDecorator { - return function (target: Object, propertyKey: string | symbol) { - Reflect.defineMetadata('copiedFieldConfig', config, target, propertyKey); - }; -} diff --git a/option-classes/tsconfig.json b/option-classes/tsconfig.json deleted file mode 100644 index b0b94c5..0000000 --- a/option-classes/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2024", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "moduleResolution": "node" - } - } \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/entity.ts b/option-interfaces-references/framework/metadata/entity.ts deleted file mode 100644 index e82c4ec..0000000 --- a/option-interfaces-references/framework/metadata/entity.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Field } from "./field"; - -export interface Entity { - label: string; - name: string; - fields: Field[]; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/field.ts b/option-interfaces-references/framework/metadata/field.ts deleted file mode 100644 index 9c8e60e..0000000 --- a/option-interfaces-references/framework/metadata/field.ts +++ /dev/null @@ -1,10 +0,0 @@ - -export interface Field { - label: string; - name: string; - type: 'text' | 'number' | 'date'; - required?: boolean; - unique?: boolean; - defaultValue?: any; - calculation?: () => any; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formField.ts b/option-interfaces-references/framework/metadata/formField.ts deleted file mode 100644 index 162729f..0000000 --- a/option-interfaces-references/framework/metadata/formField.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Field } from "./field"; - -export interface FormField { - field: Field; - readOnly?: boolean; - hidden?: boolean; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/formView.ts b/option-interfaces-references/framework/metadata/formView.ts deleted file mode 100644 index 9a29ac5..0000000 --- a/option-interfaces-references/framework/metadata/formView.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Entity } from "./entity"; -import { FormField } from "./formField"; - -export interface FormView { - label: string; - name: string; - entity: Entity; - managed?: boolean; - fields: FormField[]; -} \ No newline at end of file diff --git a/option-interfaces-references/framework/metadata/menu.ts b/option-interfaces-references/framework/metadata/menu.ts deleted file mode 100644 index 5e9e310..0000000 --- a/option-interfaces-references/framework/metadata/menu.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { FormView } from "./formView"; - -interface MenuItem { - label: string; - name: string; - view: FormView; -} - -export interface Menu { - items: MenuItem[]; -} \ No newline at end of file diff --git a/option-interfaces-references/sample-app/model/entities/contacts.ts b/option-interfaces-references/sample-app/model/entities/contacts.ts deleted file mode 100644 index 7658a29..0000000 --- a/option-interfaces-references/sample-app/model/entities/contacts.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Entity } from "../../../framework/metadata/entity"; -import { Field } from "../../../framework/metadata/field"; - -export const firstNameField: Field = { label: 'First Name', name: 'firstName', type: 'text' }; -export const lastNameField: Field = { label: 'Last Name', name: 'lastName', type: 'text' }; -export const fullNameField: Field = { label: 'Full Name', name: 'fullName', type: 'text', calculation: () => 'return null;' }; -export const emailField: Field = { label: 'Email', name: 'email', type: 'text' }; -export const phoneNumberField: Field = { label: 'Phone Number', name: 'phoneNumber', type: 'text' }; - -export const ContactsEntity: Entity = { - label: 'Contacts', - name: 'contacts', - fields: [firstNameField, lastNameField, fullNameField, emailField, phoneNumberField] -}; \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts b/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts deleted file mode 100644 index e3c9bc2..0000000 --- a/option-interfaces-references/sample-app/ui/navigation/mainMenu.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Menu } from "../../../framework/metadata/menu"; -import { createContactView } from "../views/createContact"; - -export const mainMenu: Menu = { - items: [ - { - label: 'Create contact', - name: 'createContact', - view: createContactView - } - ] -}; \ No newline at end of file diff --git a/option-interfaces-references/sample-app/ui/views/createContact.ts b/option-interfaces-references/sample-app/ui/views/createContact.ts deleted file mode 100644 index 12a5a08..0000000 --- a/option-interfaces-references/sample-app/ui/views/createContact.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { FormView } from "../../../framework/metadata/formView"; -import { ContactsEntity as contactsEntity, emailField, firstNameField, fullNameField, lastNameField } from "../../model/entities/contacts"; - -export const createContactView: FormView = { - label: 'Create contact', - name: 'createContact', - entity: contactsEntity, - managed: false, - fields: [{ field: firstNameField }, { field: lastNameField }, { field: fullNameField, readOnly: true }, { field: emailField }] -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/app.ts b/option-interfaces-types-factory/framework/app.ts deleted file mode 100644 index 2e7c93b..0000000 --- a/option-interfaces-types-factory/framework/app.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Entity } from "./entity"; -import { GridView } from "./gridView"; - -export interface App { - entities: Record; - views: Record; -} diff --git a/option-interfaces-types-factory/framework/entity.ts b/option-interfaces-types-factory/framework/entity.ts deleted file mode 100644 index 81b3cea..0000000 --- a/option-interfaces-types-factory/framework/entity.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {EntityField} from "./entityField"; - -export interface Entity { - label: string; - name: string; - fields: Record; -} diff --git a/option-interfaces-types-factory/framework/entityField.ts b/option-interfaces-types-factory/framework/entityField.ts deleted file mode 100644 index 4024415..0000000 --- a/option-interfaces-types-factory/framework/entityField.ts +++ /dev/null @@ -1,38 +0,0 @@ - -interface FieldRules { - required?: boolean; -} - -interface BaseField { - label: string; - name: string; - type: string; - multiplicity?: 'one' | 'many'; - rules?: FieldRules; - -} - -interface TextRules extends FieldRules { - maxLength?: number; -} - -interface NumberRules extends FieldRules { - maxDecimals?: number; -} - -export interface TextField extends BaseField { - type: 'text'; - rules?: TextRules; -} - -export interface NumberField extends BaseField { - type: 'number'; - rules?: NumberRules; -} - -export interface RelationshipField extends BaseField { - type: 'relationship'; - entity: string; -} - -export type EntityField = TextField | NumberField | RelationshipField; diff --git a/option-interfaces-types-factory/framework/factories/entityFactory.ts b/option-interfaces-types-factory/framework/factories/entityFactory.ts deleted file mode 100644 index 9fa41ce..0000000 --- a/option-interfaces-types-factory/framework/factories/entityFactory.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Entity } from "../entity"; - -export const entity = (config: Partial): Entity => { - if (!config.name) { - throw new Error('Name is required'); - } - if (!config.label) { - throw new Error('Label is required'); - } - if (!config.fields || Object.keys(config.fields).length === 0) { - throw new Error('Fields are required'); - } - return { - label: config.label, - name: config.name, - fields: config.fields - }; -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/framework/factories/typesFactory.ts b/option-interfaces-types-factory/framework/factories/typesFactory.ts deleted file mode 100644 index 070bf00..0000000 --- a/option-interfaces-types-factory/framework/factories/typesFactory.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NumberField, RelationshipField, TextField } from "../entityField"; - - -export const text = (config: Partial): TextField => { - if (config.rules?.maxLength && config.rules.maxLength <= 0) { - throw new Error('maxLength must be greater than 0'); - } - return { - type: 'text', - label: config.label || 'Text Field', - name: config.name || 'textField', - multiplicity: config.multiplicity || 'one', - rules: config.rules || {}, - }; -}; - -export const number = (config: Partial): NumberField => { - if (config.rules?.maxDecimals && config.rules.maxDecimals < 0) { - throw new Error('maxDecimals cannot be negative'); - } - return { - type: 'number', - label: config.label || 'Number Field', - name: config.name || 'numberField', - multiplicity: config.multiplicity || 'one', - rules: config.rules || {}, - }; -}; - -export const relationship = (config: Partial): RelationshipField => { - if (!config.entity) { - throw new Error('Relationship field must have a "entity" to another entity'); - } - return { - type: 'relationship', - label: config.label || 'Relationship Field', - name: config.name || 'relationshipField', - multiplicity: config.multiplicity || 'one', - entity: config.entity, - rules: config.rules || {}, - }; -}; - diff --git a/option-interfaces-types-factory/framework/factories/viewFactory.ts b/option-interfaces-types-factory/framework/factories/viewFactory.ts deleted file mode 100644 index 1837f63..0000000 --- a/option-interfaces-types-factory/framework/factories/viewFactory.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { GridColumn, GridView } from "../gridView"; - -export const gridColumn = (config: Partial): GridColumn => { - if (!config.field) { - throw new Error('Grid column must have a field'); - } - return { - field: config.field, - uiOptions: config.uiOptions || {}, - }; -} - -export const gridView = (config: Partial): GridView => { - if (!config.entity) { - throw new Error('Grid view must have an entity'); - } - if (!config.columns) { - throw new Error('Grid view must have at least one column'); - } - return { - entity: config.entity, - columns: config.columns, - }; -}; diff --git a/option-interfaces-types-factory/framework/gridView.ts b/option-interfaces-types-factory/framework/gridView.ts deleted file mode 100644 index 42c9147..0000000 --- a/option-interfaces-types-factory/framework/gridView.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Entity } from "./entity"; -import { EntityField } from "./entityField"; - -export interface GridColumn { - field: EntityField; - uiOptions?: { - readOnly?: boolean; - hidden?: boolean; - }; -} - -export interface GridView { - entity: Entity; - columns: { [key: string]: GridColumn } -} \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/app.ts b/option-interfaces-types-factory/sample-app/app.ts deleted file mode 100644 index 4404ff0..0000000 --- a/option-interfaces-types-factory/sample-app/app.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { App } from "../framework/app"; -import { contactsEntity } from "./model/entities/contacts"; -import { contactGridView } from "./ui/views/contactsGrid"; - -export const app: App = { - entities: { - contact: contactsEntity - }, - views: { - contactsGrid: contactGridView - } -} \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts b/option-interfaces-types-factory/sample-app/model/entities/contacts.ts deleted file mode 100644 index 2240cff..0000000 --- a/option-interfaces-types-factory/sample-app/model/entities/contacts.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { relationship, text } from "../../../framework/factories/typesFactory"; - - -export const contactsEntity = entity({ - label: 'Contacts', - name: 'contacts', - fields: { - firstName: text({ label: 'First Name', name: 'firstName', rules: { required: true } }), - lastName: text({ label: 'Last Name', name: 'lastName', rules: { required: true } }), - email: text({ label: 'Email', name: 'email', rules: { required: true } }), - company: relationship({ label: 'Company', name: 'company', entity: 'companies' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts b/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts deleted file mode 100644 index 1ac5c23..0000000 --- a/option-interfaces-types-factory/sample-app/ui/views/contactsGrid.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { contactsEntity } from "../../model/entities/contacts"; - -export const contactGridView = gridView({ - entity: contactsEntity, - columns: { - firstName: gridColumn({ field: contactsEntity.fields.firstName }), - lastName: gridColumn({ field: contactsEntity.fields.lastName }), - email: gridColumn({ field: contactsEntity.fields.email }), - company: gridColumn({ field: contactsEntity.fields.company }) - } -}) diff --git a/option-interfaces-types-factory/task-manager-app/app.ts b/option-interfaces-types-factory/task-manager-app/app.ts deleted file mode 100644 index d6cc713..0000000 --- a/option-interfaces-types-factory/task-manager-app/app.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { App } from "../framework/app"; -import { projectsEntity } from "./model/entities/projects"; -import { tasksEntity } from "./model/entities/tasks"; -import { timeLogsEntity } from "./model/entities/timeLogs"; -import { projectsGridView } from "./ui/views/projectsGrid"; -import { tasksGridView } from "./ui/views/tasksGrid"; -import { timeLogsGridView } from "./ui/views/timeLogsGrid"; - -export const app: App = { - entities: { - projects: projectsEntity, - tasks: tasksEntity, - timeLogs: timeLogsEntity - }, - views: { - projectsGrid: projectsGridView, - tasksGrid: tasksGridView, - timeLogsGrid: timeLogsGridView - } -}; \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts b/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts deleted file mode 100644 index c8d552f..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/projects.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text } from "../../../framework/factories/typesFactory"; - -export const projectsEntity = entity({ - label: 'Projects', - name: 'projects', - fields: { - name: text({ label: 'Name', name: 'name', rules: { required: true } }), - description: text({ label: 'Description', name: 'description' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts b/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts deleted file mode 100644 index d446713..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/tasks.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text, relationship } from "../../../framework/factories/typesFactory"; - -export const tasksEntity = entity({ - label: 'Tasks', - name: 'tasks', - fields: { - title: text({ label: 'Title', name: 'title', rules: { required: true } }), - description: text({ label: 'Description', name: 'description' }), - project: relationship({ label: 'Project', name: 'project', entity: 'projects' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts b/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts deleted file mode 100644 index 6d8ae5e..0000000 --- a/option-interfaces-types-factory/task-manager-app/model/entities/timeLogs.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { entity } from "../../../framework/factories/entityFactory"; -import { text, number, relationship } from "../../../framework/factories/typesFactory"; - -export const timeLogsEntity = entity({ - label: 'Time Logs', - name: 'timeLogs', - fields: { - description: text({ label: 'Description', name: 'description' }), - hours: number({ label: 'Hours', name: 'hours', rules: { required: true } }), - task: relationship({ label: 'Task', name: 'task', entity: 'tasks' }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts deleted file mode 100644 index 7054bc8..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/projectsGrid.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { projectsEntity } from "../../model/entities/projects"; - -export const projectsGridView = gridView({ - entity: projectsEntity, - columns: { - name: gridColumn({ field: projectsEntity.fields.name }), - description: gridColumn({ field: projectsEntity.fields.description }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts deleted file mode 100644 index 840bd56..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/tasksGrid.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { tasksEntity } from "../../model/entities/tasks"; - -export const tasksGridView = gridView({ - entity: tasksEntity, - columns: { - title: gridColumn({ field: tasksEntity.fields.title }), - description: gridColumn({ field: tasksEntity.fields.description }), - project: gridColumn({ field: tasksEntity.fields.project }) - } -}); \ No newline at end of file diff --git a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts b/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts deleted file mode 100644 index 5d2a0a4..0000000 --- a/option-interfaces-types-factory/task-manager-app/ui/views/timeLogsGrid.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { gridColumn, gridView } from "../../../framework/factories/viewFactory"; -import { timeLogsEntity } from "../../model/entities/timeLogs"; - -export const timeLogsGridView = gridView({ - entity: timeLogsEntity, - columns: { - description: gridColumn({ field: timeLogsEntity.fields.description }), - hours: gridColumn({ field: timeLogsEntity.fields.hours }), - task: gridColumn({ field: timeLogsEntity.fields.task }) - } -}); \ No newline at end of file diff --git a/option-interfaces/backend.ts b/option-interfaces/backend.ts deleted file mode 100644 index 00fa40b..0000000 --- a/option-interfaces/backend.ts +++ /dev/null @@ -1,31 +0,0 @@ -export interface FieldRequired { - type: 'always' | 'never' | 'conditional', - condition?: (data: any) => boolean -} - -type FieldType = 'array' | 'id' | 'relationship' | 'text' | 'number' | 'email' | 'datetime' | 'auto-incremental'; - -export interface TextFieldTypeSettings { - minLengh?: number, - maxLength?: number, - regex?: string -} - -export interface FieldDefinition { - type: FieldType, - itemType?: FieldType, - required?: FieldRequired, - defaultValue?: (data: any) => any, - calculation?: (data: any) => any, -} - - -export interface DataDefinition { - fields: { - [K in keyof T]: FieldDefinition - } -} - -export interface MongoQuery { - -} \ No newline at end of file diff --git a/option-interfaces/example1.ts b/option-interfaces/example1.ts deleted file mode 100644 index 3e5ace4..0000000 --- a/option-interfaces/example1.ts +++ /dev/null @@ -1,237 +0,0 @@ -import { DataDefinition } from './backend'; -import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { - GridView, SimpleRecordView, - Menu, MenuView, AppLayout, - DataUISettings -} from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -interface User { - firstName: string, - lastName: string, - fullName: string, - email: string -} - -const UserDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'fullName', - fields: { - firstName: { - type: 'text', - required: {type: 'always'}, - }, - lastName: { - type: 'text', - required: {type: 'always'} - }, - fullName: { - type: 'text', - calculation: (user: User) => `${user.firstName} ${user.lastName}` - }, - email: { - type: 'email', - required: {type: 'always'} - } - } -}; - -// TaskNote - -interface TaskNote { - label: string, - note: string, - timestamp: number, - addedBy: string, - addedByFullName: string -} - -const TaskNoteDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - label: { - type: 'text', - required: {type: 'always'}, - calculation: calculateTaskNoteLabel - }, - note: { - type: 'text', - required: {type: 'always'} - }, - timestamp: { - type: 'datetime', - required: {type: 'always'}, - defaultValue: () => new Date().getTime() - }, - addedBy: { - type: 'relationship', - required: {type: 'always'}, - }, - addedByFullName: { - type: 'text', - calculation: (taskNote: TaskNote) => { - const user = findById(taskNote.addedBy); - return user.fullName; - } - } - } -} - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -interface Task { - id: string, - label: string, - number: number, - title: string, - notes: TaskNote[] -} - -const TaskDefinition: DataDefinition & DataUISettings = { - defaultLabel: 'label', - fields: { - id: { - type: 'id' - }, - label: { - type: 'text', - required: {type: 'always'}, - calculation: (task: Task) => `#${task.number}. ${task.title}` - }, - number: { - type: 'auto-incremental' - }, - title: { - type: 'text', - required: {type: 'always'} - }, - notes: { - type: 'array', - itemType: 'relationship' - } - } -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView: SimpleRecordView = { - name: 'Create Task', - mode: 'create', - managed: true -}; - -const EditTaskView: SimpleRecordView = { - name: 'Edit Task', - mode: 'edit', - managed: true -}; - -const TasksGridView: GridView = { - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -registerDatabase(MainDatabase); -registerPersistentData(MainDatabase, UserDefinition); -registerPersistentData(MainDatabase, TaskDefinition); diff --git a/option-interfaces/example2.ts b/option-interfaces/example2.ts deleted file mode 100644 index 49947ed..0000000 --- a/option-interfaces/example2.ts +++ /dev/null @@ -1,463 +0,0 @@ -import { DataDefinition } from './backend'; -import { DatabaseSettings, findById, registerDatabase, registerPersistentData } from './storage'; -import { - GridView, SimpleRecordView, - Menu, MenuView, AppLayout, - DataUISettings -} from './frontend'; -import { PersistentDataPermissions, DataPermissions, Role, Group } from './security'; -import { formatDateTime } from './utils'; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Model -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// User - -type UserStatus = 'active' | 'inactive' | 'blocked'; - - -interface User { - firstName: string, - lastName: string, - fullName: string, - email: string, - status: UserStatus, - department: string -} - -const userModel = model({ - fields: { - firstName: textField({ - required: {type: 'always'}, - ui: { - label: 'First Name' - } - }), - lastName: textField({ - required: {type: 'always'}, - ui: { - label: 'Last Name' - } - }), - fullName: textField({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - }, - ui: { - label: 'Full Name' - } - }), - email: textField({ - required: {type: 'always'}, - validation: emailValidation, - ui: { - label: 'Email', - readOnly: emailLabelWidget(), - edit: textInputWidget() - } - }), - status: choiceField({ - required: required.ALWAYS, - defaultValue: 'active', - ui: { - label: 'Status', - optionLabels: { - active: 'Active', - inactive: 'Inactive', - blocked: 'Blocked' - } - } - }), - department: textField({required: {type: 'always'}}) - }, - ui: { - recordLabelField: 'fullName', - sorting: { - fields: 'fullName', - direction: 'asc' - } - }, - dataSource: modelDataSource({ - database: mainDb, - indexes: [ - regularIndex(['fullName']), - regularIndex(['email']) - ] - }) -}); - -// TaskNote - -interface TaskNote { - label: string, - note: string, - timestamp: number, - addedBy: string, - addedByFullName: string -} - -const taskNoteModel = model({ - fields: { - label: textField({ - required: {type: 'always'}, - calculation: calculateTaskNoteLabel - }), - note: longTextField({ - required: {type: 'always'}, - ui: { - readOnly: markdownWidget(), - editor: markdownEditor() - } - }), - timestamp: datetimeField({ - required: required.ALWAYS, - defaultValue: () => new Date().getTime(), - ui: { - readOnly: datatimeFormatWidget({format: 'MM/dd yy HH:mm'}) - } - }), - addedBy: relationshipField({ - required: required.ALWAYS, - target: userModel, - filter: () => { - const users = backend.dataSources.mainDb.users(); - return users.query({status: 'active'}); - }, - ui: { - label: 'Added By (ID)', - visibility: visibility.NEVER - } - }), - addedByFullName: textField({ - copiedField: copiedField({ - from: 'addedBy', - field: 'fullName' - }), - ui: { - label: 'Added By' - } - }) - }, - ui: { - recordLabelField: 'label' - } -}); - -function calculateTaskNoteLabel(taskNote: TaskNote) : string { - return `${taskNote.addedBy} wrote on ${formatDateTime(new Date(taskNote.timestamp), 'MM/dd yy')} at ${formatDateTime(new Date(taskNote.timestamp), 'HH:mm')}`; -} - -// Task - -interface Task { - id: string, - label: string, - number: number, - title: string, - notes: TaskNote[] -} - -const taskModel = model({ - fields: { - label: textField({ - required: {type: 'always'}, - ui: { - label: 'Label' - } - }), - number: autoIncrementalField({ - ui: { - label: 'Number' - } - }), - title: textField({ - required: {type: 'always'}, - ui: { - label: 'Title' - } - }), - notes: arrayField({ - itemType: taskNoteModel, - ui: { - label: 'Notes', - sorting: 'natural' - } - }) - }, - ui: { - label: 'label', - sorting: { - field: 'createAt', - direction: 'desc' - } - }, - dataSource: modelDataSource({ - database: mainDb, - indexes: [ - regularIndex(['number']), - regularIndex(['title']) - ] - }) -}); - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Agents -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const visitSummarizationAgent = agent({ - modelSettings: { - model: 'gemini-2.0-flash' - }, - inputs: [ - { - name: 'text', - type: 'string' - } - ], - instructions: ` - You are a doctor and need to summarize the medical record in no more than 100. - `, - prompt: ` - Please, summarize the following text: {text} - ` -}); - -const expressionSolver = tool({ - name: 'expressionSolver', - description: 'Solves a math expression and returns the result', - params: { - expression: textField({}) - }, - script: (params: object) => { - // do something - } -}) - -const mathSolverAgent = agent({ - modelSettings: { - model: 'gpt-3.5-turbo' - }, - inputs: { - question: textField({}) - } - instructions: ` - You need to solve a mathematical expression and provide the result. - `, - prompt: ` - Please, solve the following mathematical expression: {question} - `, - tools: [ expressionSolver ] -}); - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Views -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const CreateTaskView = simpleRecordView({ - name: 'Create Task', - mode: 'create', - managed: true -}); - -const EditTaskView = simpleRecordView({ - name: 'Edit Task', - mode: 'edit', - managed: true -}); - -const TasksGridView = gridView({ - name: 'Tasks', - columns: [ - 'number', - 'title' - ], - create: { - enabled: true, - view: CreateTaskView - }, - detail: { - enabled: true, - view: EditTaskView - } -}); - -interface TaskRelationship { - task: string, - number: number, - title: string -} - -interface DashboardModel extends ViewModel { - project: string, - tasks: TaskRelationship[] -} - -const DashboardView = flexView({ - fields: { - project: relationshipField({ - target: projectModel, - ui: { - label: 'Project' - } - }), - tasks: arrayField({ - fields: { - task: relationshipField({ - target: taskModel, - ui: { - label: 'Task' - } - }), - number: textField({ - copiedField: copiedField({ - from: 'task', - field: 'number' - }), - ui: { - label: 'Number' - } - }), - title: textField({ - copiedField: copiedField({ - from: 'task', - field: 'title' - }), - ui: { - label: 'Title' - } - }) - }, - ui: { - label: 'Tasks' - } - }) - }, - layout: { - rows: [ - { - columns: [ - { - widgets: [ - dataFormFieldWidget({ - name: 'projectField', - field: 'project' - }), - dynamicTableWidget({ - name: 'tasksTable', - data: (model: DashboardModel) => { - return model.tasks; - } - }), - ] - } - ] - } - ] - }, - events: { - onShow: (model: DashboardModel) => { - model.project = dataSources.mainDb.projects.findById('...'); - }, - onChange: (model: DashboardModel) => { - if (model.project) { - const table = model.widgets['tasksTable']; - table.refresh(); - } - } - } -}) - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Layout -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const LeftMenu: Menu = { - items: [ - { - name: 'Tasks', - view: TasksGridView - } as MenuView - ] -} - -const TaskManagerAppLayout: AppLayout = { - leftMenu: LeftMenu -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Permissions -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const FullPermissionsOnTasks: PersistentDataPermissions = { - create: {type: 'always'}, - edit: {type: 'always'}, - access: {type: 'always'}, - delete: {type: 'always'}, - auditLogs: {type: 'always'}, - fields: { - id: {read: {type: 'always'}, write: {type: 'always'}}, - label: {read: {type: 'always'}, write: {type: 'always'}}, - number: {read: {type: 'always'}, write: {type: 'always'}}, - title: {read: {type: 'always'}, write: {type: 'always'}}, - notes: {read: {type: 'always'}, write: {type: 'always'}}, - } -} - -const DefaultPermissionsOnTaskNotes: DataPermissions = { - fields: { - label: {read: {type: 'always'}, write: {type: 'never'}}, - note: {read: {type: 'always'}, write: {type: 'always'}}, - timestamp: {read: {type: 'always'}, write: {type: 'never'}}, - addedBy: {read: {type: 'always'}, write: {type: 'never'}}, - addedByFullName: {read: {type: 'always'}, write: {type: 'never'}} - } -} - -const ManageTasksRole: Role = { - dataPermissions: [ - FullPermissionsOnTasks, - DefaultPermissionsOnTaskNotes - ], - viewPermissions: [ - { view: CreateTaskView, access: {type: 'always'} }, - { view: EditTaskView, access: {type: 'always'} }, - { view: TasksGridView, access: {type: 'always'} } - ] -} - -const AdminsGroup: Group = { - roles: [ManageTasksRole] -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Storage -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const MainDatabase: DatabaseSettings = { - name: 'example1', - uri: '' -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Libs -/////////////////////////////////////////////////////////////////////////////////////////////////// - -function test() { - const users = dataSources.mainDb.users; - let user = users.findById('...'); - users.save(user); - users.remove(user); - let cursor = users.find({}); - cursor = users.find({email: {$in: [email1, email2]}}); - let result = users.aggregate([]); -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// App Init -/////////////////////////////////////////////////////////////////////////////////////////////////// - -initApp(); diff --git a/option-interfaces/frontend.ts b/option-interfaces/frontend.ts deleted file mode 100644 index fe43314..0000000 --- a/option-interfaces/frontend.ts +++ /dev/null @@ -1,116 +0,0 @@ -export interface ItemVisibility { - type: 'display' | 'hidden' | 'conditional', - condition?: (data: any) => boolean -} - -export interface FieldUISettings { - uiSettings: { - visibility?: ItemVisibility - } -} - -export interface TextFieldUISettings extends FieldUISettings { - uiSettings: { - visibility?: ItemVisibility - edit: { - widget: 'text' | 'textarea' | 'rich-text' - }, - readonly: { - renderAs: 'plain-text' | 'html' | 'markdown' - } - } -} - -export interface ArrayUISettingsDefinition { - order: 'natural' | 'reverse', - pagination: { - type: 'more' | 'pages', - pageSize: number - } -} - -export interface DataUISettings { - defaultLabel: keyof T -} - -export interface Widget { - -} - -export interface DataWidget extends Widget { - -} - -export interface TextWidget extends DataWidget { - -} - -export interface FormFieldWidget extends Widget { - label: string, - data: DataWidget -} - -export interface WidgetModel { - -} - -export interface ViewModel { - widgets: { [key: string]: WidgetModel } -} - -export type LayoutType = 'vertical' | 'horizontal'; - -export interface Layout { - type: LayoutType, - widgets: Widget[] -} - -export interface View { - name: string, - model?: ViewModel, - layout?: Layout -} - - - -export interface RecordView extends View { - mode: 'readOnly' | 'edit' | 'create' -} - -export interface SimpleRecordView extends RecordView { - managed: boolean, - fields?: Array -} - -export interface GridView extends View { - columns: Array, - create: { - enabled: boolean, - view?: View - }, - detail: { - enabled: boolean, - view?: View - } -} - -export interface MenuItem { - name: string -} - -export interface MenuGroup extends MenuItem { - items: MenuItem[] -} - -export interface MenuView extends MenuItem { - view: View -} - -export interface Menu { - items: MenuItem[] -} - -export interface AppLayout { - leftMenu?: Menu, - headerMenu?: Menu -} \ No newline at end of file diff --git a/option-interfaces/security.ts b/option-interfaces/security.ts deleted file mode 100644 index 44a8a41..0000000 --- a/option-interfaces/security.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { MongoQuery } from "./backend"; -import { View } from "./frontend"; - -export interface OperationPermissions { - type: 'always' | 'never' | 'conditional' -} - -export interface DataOperationPermissions extends OperationPermissions { - condition?: (data: any) => boolean -} - -export interface QueryOperationPermissions extends OperationPermissions { - condition?: MongoQuery -} - -export interface ContextPermissions extends OperationPermissions { - condition?: (context: any) => boolean -} - -export interface FieldPermissions { - read: OperationPermissions, - write: OperationPermissions -} - -export interface DataPermissions { - fields: { - [K in keyof T]: FieldPermissions - } -} - -export interface PersistentDataPermissions extends DataPermissions { - create: DataOperationPermissions, - access: QueryOperationPermissions, - edit: DataOperationPermissions, - delete: DataOperationPermissions, - auditLogs: DataOperationPermissions -} - -export interface ViewPermissions { - view: View, - access: ContextPermissions -} - -export interface Role { - dataPermissions: DataPermissions[], - viewPermissions: ViewPermissions[] -} - -export interface Group { - roles: Role[] -} \ No newline at end of file diff --git a/option-interfaces/storage.ts b/option-interfaces/storage.ts deleted file mode 100644 index 60241cf..0000000 --- a/option-interfaces/storage.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DataDefinition } from "./backend"; - -export interface DatabaseSettings { - name: string, - uri: string -} - -export function registerDatabase(dbSettings: DatabaseSettings): void { - // TODO -} - -export function registerPersistentData(db: DatabaseSettings, dataDefinition: DataDefinition): void { - // TODO -} - -export function findById(id: string): T { - return null; -} \ No newline at end of file diff --git a/option-interfaces/tsconfig.json b/option-interfaces/tsconfig.json deleted file mode 100644 index 7b22614..0000000 --- a/option-interfaces/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "target": "ES5", - "experimentalDecorators": true - } - } \ No newline at end of file diff --git a/option-interfaces/utils.ts b/option-interfaces/utils.ts deleted file mode 100644 index 3147995..0000000 --- a/option-interfaces/utils.ts +++ /dev/null @@ -1,5 +0,0 @@ -export function formatDateTime(dateTime: Date, format: string) { - // Format the given date using the pattern in `format` - // TODO - return format; -} \ No newline at end of file diff --git a/option-lifecycle-hooks/entity.ts b/option-lifecycle-hooks/entity.ts deleted file mode 100644 index 4a510bc..0000000 --- a/option-lifecycle-hooks/entity.ts +++ /dev/null @@ -1,44 +0,0 @@ -abstract class AbstractEntity { - id?: string; - createdAt?: Date; - updatedAt?: Date; - - constructor() { - this.createdAt = new Date(); - } - - // lifecycle hooks - protected abstract beforeSave(): Promise | void; - protected abstract afterSave(): Promise | void; - protected abstract beforeRead(): Promise | void; - protected abstract afterRead(): Promise | void; - protected abstract beforeDelete(): Promise | void; - protected abstract afterDelete(): Promise | void; - protected abstract validate(): Promise | void; - protected abstract onChange(): Promise | void; - - async save() { - await this.beforeSave(); - if (!this.id) { - this.id = Math.random().toString(36).substr(2, 9); // Simulate ID generation - } else { - this.updatedAt = new Date(); - } - // save logic - await this.afterSave(); - } - - async read() { - await this.beforeRead(); - // read logic - await this.afterRead(); - } - - async delete() { - await this.beforeDelete(); - // delete logic - await this.afterDelete(); - } - - -} diff --git a/option-lifecycle-hooks/userEntity.ts b/option-lifecycle-hooks/userEntity.ts deleted file mode 100644 index 3d843f8..0000000 --- a/option-lifecycle-hooks/userEntity.ts +++ /dev/null @@ -1,67 +0,0 @@ -class UserEntity extends AbstractEntity { - - name: string; - email: string; - age: number; - role: 'admin' | 'user'; - - constructor(name: string, email: string, age: number, role: 'admin' | 'user') { - super(); - this.name = name; - this.email = email; - this.age = age; - this.role = role; - } - - async beforeCreate() { - console.log('Before create: Initializing entity...'); - } - - async afterCreate() { - console.log('After create: Entity created.'); - } - - async beforeUpdate() { - console.log(`Before update: Updating user ${this.name}`); - } - - async afterUpdate() { - console.log(`After update: User ${this.name} updated.`); - } - - async beforeDelete() { - console.log(`Before delete: Checking permissions for ${this.name}`); - } - - async afterDelete() { - console.log(`After delete: User ${this.name} deleted.`); - } - - async beforeSave() { - console.log('Before save: Validating and preparing data...'); - } - - async afterSave() { - console.log('After save: Changes saved successfully.'); - } - - async validate() { - if (!this.email.includes('@')) throw new Error('Invalid email address.'); - if (this.age < 18) throw new Error('User must be at least 18 years old.'); - } - - async onChange() { - console.log('On change: User data has been modified.'); - } - - async beforeRead() { - console.log('Before read: Checking visibility rules...'); - if (this.role !== 'admin') { - this.email = '[HIDDEN]'; // Hide sensitive data - } - } - - async afterRead() { - console.log('After read: Data successfully retrieved.'); - } -} diff --git a/task-manager-reuse/model/user/compactDetailsView.ts b/task-manager-reuse/model/user/compactDetailsView.ts deleted file mode 100644 index 74eac38..0000000 --- a/task-manager-reuse/model/user/compactDetailsView.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { z } from 'zod'; -import { userSchema } from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; -import { resetPasswordAction } from './resetPassword'; - -const userCompactDetailsModel = z.object({ - picture: z.string(), - user: userSchema -}); - -type UserCompactDetailsModel = z.infer; - -const userCompactDetailsView = ui.viewForObject({ - name: 'User Details', - model: userCompactDetailsModel, - layout: { - type: 'vertical', - widgets: [ - w.columns([ - //w.formField().field('picture').label('Picture').widget(w.imageWidget()), - w.imageWidget((model: UserCompactDetailsModel) => model.picture), - w.defaultWidget().field('user').field('fullName'), - ]), - w.defaultWidget().field('user').field('email'), - w.defaultWidget().field('user').field('notes'), - w.toolbarWidget().action(resetPasswordAction) - ] - }, - toolbar: {} -}); diff --git a/task-manager-reuse/model/user/editView.ts b/task-manager-reuse/model/user/editView.ts deleted file mode 100644 index d08fc45..0000000 --- a/task-manager-reuse/model/user/editView.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { z } from 'zod'; -import { User, userSchema } from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; - -const userCompactDetailsView = ui.simpleViewForObject({ - name: 'User Edit', - model: userSchema, - managed: true, - toolbar: { - actionsToInclude: 'all' - } -}); diff --git a/task-manager-reuse/model/user/resetPassword.ts b/task-manager-reuse/model/user/resetPassword.ts deleted file mode 100644 index eeb26ad..0000000 --- a/task-manager-reuse/model/user/resetPassword.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { z } from 'zod'; -import {User} from 'user'; -import { widgets as w, model as m, ui, db, api } from 'slingr'; - -const resetPasswordSchema = z.object({ - newPassword: z.string(), - confirmNewPassword: z.string() -}).refine((data) => data.newPassword === data.confirmNewPassword, { - message: "Passwords don't match", - path: ["confirmNewPassword"] -}); - -type ResetPassword = z.infer; - -const resetPasswordRepresentation = ui.defaultUiForObject({ - newPassword: { - label: 'New Password', - dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] - }, - confirmNewPassword: { - label: 'Confirm New Password', - dataWidget: [{context: ui.context.edit, widget: w.passwordWidget()}] - } -}); - -export const resetPasswordAction = m.recordAction({ - script: (record: User, params: ResetPassword) => { - // do something - } -}); \ No newline at end of file diff --git a/task-manager-reuse/model/user/user.ts b/task-manager-reuse/model/user/user.ts deleted file mode 100644 index 8d944e8..0000000 --- a/task-manager-reuse/model/user/user.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { z } from 'zod'; -import { widgets as w, ui, db, api } from 'slingr'; - -export const userSchema = z.object({ - firstName: z.string(), - lastName: z.string(), - fullName: z.string(), - email: z.string().email(), - age: z.number().int().positive(), - password: z.string().min(8).max(16), - notes: z.string().optional() -}); - -export type User = z.infer; - -const userRepresentation = ui.defaultUiForObject({ - label: 'Users', - recordLabelField: 'fullName', - sorting: { - field: 'fullName', - direction: 'asc' - }, - fields: { - firstName: { - label: 'First Name', - visibility: ui.visibility.always, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - lastName: { - label: 'Last Name', - visibility: {type: 'always'}, - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - fullName: { - label: 'Last Name', - dataWidget: [{ - context: ui.context.all, - widget: w.textWidget() - }] - }, - email: { - label: 'Email', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.emailWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - age: { - label: 'Age', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.inputWidget() - }] - }, - password: { - label: 'Password', - visibility: ui.visibility.never - }, - notes: { - label: 'Notes', - dataWidget: [{ - context: ui.context.readOnly, - widget: w.textWidget() - }, { - context: ui.context.edit, - widget: w.textAreaWidget() - }] - } - } -}); - -const userRepository = db.repositoryForObject({ - collectionName: 'users', - schema: userSchema, - indexes: [ - db.regularIndex(['email']), - db.regulatIndex(['fullName']) - ], - encrypt: ['password'] -}); - - -const userApi = api.dataApiForObject({ - repository: userRepository -}); diff --git a/task-manager-slingr/framework/backend/actions.ts b/task-manager-slingr/framework/backend/actions.ts deleted file mode 100644 index 4de1207..0000000 --- a/task-manager-slingr/framework/backend/actions.ts +++ /dev/null @@ -1,13 +0,0 @@ -interface Action { - -} - -export interface ObjectActionDefinition { - name?: string; - precondition?: (data: S) => boolean; - script: (data: S, params: P) => any; -} - -export function objectAction(def: ObjectActionDefinition): Action { - return {} as Action; -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/api.ts b/task-manager-slingr/framework/backend/api.ts deleted file mode 100644 index fd4453c..0000000 --- a/task-manager-slingr/framework/backend/api.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Repository } from "./db"; -import { Schema } from "./schemas"; -import { ObjectActionDefinition } from "./actions"; - -export function addSchema(schema: Schema, repository: Repository) { - -} - -export function addAction(action: ObjectActionDefinition) { - -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/db.ts b/task-manager-slingr/framework/backend/db.ts deleted file mode 100644 index a860f8e..0000000 --- a/task-manager-slingr/framework/backend/db.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface Repository { - name: string; - managed: boolean; - indexes: Index[]; - encrypt: (keyof T)[]; -} - -export interface Index { - type: 'regular' | 'unique' | 'fulltext' | 'vector', - fields: (keyof T)[] -} \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/mongo.ts b/task-manager-slingr/framework/backend/mongo.ts deleted file mode 100644 index bed2f69..0000000 --- a/task-manager-slingr/framework/backend/mongo.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Index, Repository } from "./db"; - -export interface MongoRepository extends Repository { -} - -export function repositoryForSchema(def: MongoRepository): MongoRepository { - return def; -} - -function regular(fields: (keyof T)[]): Index { - return { - type: 'regular', - fields - } as Index; -}; - -export let indexes = { - regular: regular -}; \ No newline at end of file diff --git a/task-manager-slingr/framework/backend/schemas.ts b/task-manager-slingr/framework/backend/schemas.ts deleted file mode 100644 index 696eb9f..0000000 --- a/task-manager-slingr/framework/backend/schemas.ts +++ /dev/null @@ -1,174 +0,0 @@ -export type FieldType = 'string' | 'number' | 'boolean' | 'datatime' | 'enum' | 'object' | 'array' | 'relationship'; -export type Required = boolean | ((data: any) => boolean); -export type Available = boolean | ((data: any) => boolean); -export type Calculation = (data: any) => any; -export type DefaultValue = (data: any) => any; -export type FieldValidator = (data: any) => {valid: boolean, message?: string}; - -export interface Schema { - [key: string]: FieldDefinition -} - -export function schema(def: Schema, validator?: (data: any) => {path: string, message: string}[]) { - return def; -} - -// Helper type to determine if a field is required -type IsRequired = T['required'] extends true ? true : T['required'] extends false ? false : boolean; - -// Main type inference utility -export type InferType = { - [K in keyof T as IsRequired extends false ? never : K]: InferFieldType; -} & { - [K in keyof T as IsRequired extends true ? never : K]?: InferFieldType; -}; - -type InferFieldType = - F extends StringFieldDefinition ? string : - F extends NumberFieldDefinition ? number : - F extends BooleanFieldDefinition ? boolean : - F extends EnumFieldDefinition ? F['values'][number] : - F extends ObjectFieldDefinition ? InferType : - F extends ArrayFieldDefinition ? InferFieldType[] : - F extends RelationshipFieldDefinition ? InferType : - any; // Fallback, ideally should be never or handle more cases - -export interface FieldDefinition { - type: FieldType; - required: Required; - available: Available; - defaultValue?: DefaultValue; - calculation?: Calculation; - validators: FieldValidator[]; -} - -export interface StringFieldDefinition extends FieldDefinition { - type: 'string'; - min?: number; - max?: number; - pattern?: string; -} - -export interface NumberFieldDefinition extends FieldDefinition { - type: 'number'; - integer?: boolean; - min?: number; - max?: number; -} - -export interface BooleanFieldDefinition extends FieldDefinition { - type: 'boolean'; -} - -export interface EnumFieldDefinition extends FieldDefinition { - type: 'enum'; - values: string[]; -} - -export interface ObjectFieldDefinition extends FieldDefinition { - type: 'object'; - schema: Schema -} - -export interface ArrayFieldDefinition extends FieldDefinition { - type: 'array'; - items: FieldDefinition -} - -export interface RelationshipFieldDefinition extends FieldDefinition { - type: 'relationship'; - targetSchema: Schema -} - -export function string(def?: Partial) : StringFieldDefinition { - let field = { - type: 'string', - required: false, - available: true, - ...def - } as StringFieldDefinition; - return field; -} - -export function email(def?: Partial) : StringFieldDefinition { - let field = { - type: 'string', - required: false, - available: true, - pattern: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$', - ...def - } as StringFieldDefinition; - return field; -} - -export function number(def?: Partial) : NumberFieldDefinition { - let field = { - type: 'number', - required: false, - available: true, - ...def - } as NumberFieldDefinition; - return field; -} - -export function boolean(def?: Partial) : FieldDefinition { - let field = { - type: 'boolean', - required: false, - available: true, - ...def - } as FieldDefinition; - return field; -} - -export function datatime(def?: Partial) : FieldDefinition { - let field = { - type: 'datatime', - required: false, - available: true, - ...def - } as FieldDefinition; - return field; -} - -export function enumeration(def?: Partial) : EnumFieldDefinition { - let field = { - type: 'enum', - required: false, - available: true, - ...def - } as EnumFieldDefinition; - return field; -} - -export function object(def?: Partial) : ObjectFieldDefinition { - let field = { - type: 'object', - schema: null, //schemaOf(), - required: false, - available: true, - ...def - } as ObjectFieldDefinition; - return field; -} - -export function array(def?: Partial) : ArrayFieldDefinition { - let field = { - type: 'array', - required: false, - available: true, - ...def - } as ArrayFieldDefinition; - return field; -} - -export function relationship(def?: Partial) : RelationshipFieldDefinition { - let field = { - type: 'relationship', - schema: null, //schemaOf(), - required: false, - available: true, - ...def - } as RelationshipFieldDefinition; - return field; -} diff --git a/task-manager-slingr/framework/frontend/ui.ts b/task-manager-slingr/framework/frontend/ui.ts deleted file mode 100644 index 90ef259..0000000 --- a/task-manager-slingr/framework/frontend/ui.ts +++ /dev/null @@ -1,178 +0,0 @@ -import { Schema } from "../backend/schemas"; -import * as w from "./widgets"; -import { Widget } from "./widgets"; - -type Visible = boolean | ((data: any) => boolean); -type ContextMatcher = (ctx: any) => boolean; -type Context = 'edit' | 'readOnly' | 'table' | 'mobile' | 'desktop' | 'developer' | ContextMatcher -type ContextDefinition = { - type: 'or' | 'and', - contexts: Context[] -} | Context; - -export let context = { - or: (contexts: Context[]) => { - return { - type: 'or', - contexts - } as ContextDefinition - }, - and: (contexts: Context[]) => { - return { - type: 'and', - contexts - } as ContextDefinition - } -} - -export interface UiFieldDefinition { - label: string, - visible: Visible, - dataWidgets: {context: ContextDefinition, widget: w.Widget}[] -} - -export interface TextUiFieldDefinition extends UiFieldDefinition { -} - -function text(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.text() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface EmailUiFieldDefinition extends UiFieldDefinition { -} - -function email(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.email() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface NumberUiFieldDefinition extends UiFieldDefinition { -} - -function number(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.text() - }, { - context: 'edit', - widget: w.input() - }], - ...def - } as UiFieldDefinition; -} - -export interface PasswordUiFieldDefinition extends UiFieldDefinition { -} - -function password(def: Partial): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.password() - }, { - context: 'edit', - widget: w.passwordInput() - }], - ...def - } as UiFieldDefinition; -} - - -export interface EnumerationChipUiFieldDefinition extends UiFieldDefinition { - options: { - value: T, - label: string, - color?: string - }[] -} - -function enumeration(def: Partial>): UiFieldDefinition { - return { - visible: true, - dataWidgets: [{ - context: 'readOnly', - widget: w.enumerationChip({ - options: def.options - }) - }, { - context: 'edit', - widget: w.dropDown({ - options: def.options - }) - }], - ...def - } as UiFieldDefinition; -} - -export let fields = { - text: text, - email: email, - number: number, - password: password, - enumeration: enumeration -}; - -export interface DefaultUiForSchema { - label?: string, - objectLabelField?: keyof T, - sorting?: { - field: keyof T, - direction: 'asc' | 'desc' - }, - fields: { - [key in keyof T]: UiFieldDefinition - } -} - -export function defaultUiForSchema(def: DefaultUiForSchema): DefaultUiForSchema { - return def; -} - -export interface View { - name: string, - model?: ViewModel, - layout?: Layout -} - - -export interface ViewModel { - widgets: { [key: string]: Widget } -} - -export type LayoutType = 'vertical' | 'horizontal'; - -export interface Layout { - type: LayoutType, - widgets: Widget[] -} - -export interface DataView extends View { - mode: 'readOnly' | 'edit' | 'create' -} - -export interface SimpleDataView extends DataView { - managed: boolean, - fields?: Array -} diff --git a/task-manager-slingr/framework/frontend/widgets.ts b/task-manager-slingr/framework/frontend/widgets.ts deleted file mode 100644 index b5c3717..0000000 --- a/task-manager-slingr/framework/frontend/widgets.ts +++ /dev/null @@ -1,101 +0,0 @@ -export interface Widget { - type: string -} - -export interface TextWidget extends Widget { - type: 'text' -} - -export function text(def?: Partial): TextWidget { - return { - type: 'text', - ...def - } as TextWidget; -} - -export interface EmailWidget extends Widget { - type: 'email' -} - -export function email(def?: Partial): EmailWidget { - return { - type: 'email', - ...def - } as EmailWidget; -} - -export interface InputWidget extends Widget { - type: 'input' -} - -export function input(def?: Partial): InputWidget { - return { - type: 'input', - ...def - } as InputWidget; -} - -export interface PasswordWidget extends Widget { - type: 'password' -} - -export function password(def?: Partial): PasswordWidget { - return { - type: 'password', - ...def - } as PasswordWidget; -} - -export interface PasswordInputWidget extends Widget { - type: 'passwordInput' -} - -export function passwordInput(def?: Partial): PasswordInputWidget { - return { - type: 'passwordInput', - ...def - } as PasswordInputWidget; -} - -export interface DropDownWidget extends Widget { - type: 'dropDown', - options: { - value: T, - label: string - }[] -} - -export function dropDown(def?: Partial>): DropDownWidget { - return { - type: 'dropDown', - ...def - } as DropDownWidget; -} - -export interface ChipWidget extends Widget { - type: 'chip', - color: string -} - -export function chip(def?: Partial): ChipWidget { - return { - type: 'chip', - ...def - } as ChipWidget; -} - - -export interface EnumerationChipWidget extends Widget { - type: 'enumeration', - options: { - value: T, - label: string - }[] -} - -export function enumerationChip(def?: Partial>): EnumerationChipWidget { - return { - type: 'enumerationChip', - ...def - } as EnumerationChipWidget; -} \ No newline at end of file diff --git a/task-manager-slingr/framework/helpers/models.ts b/task-manager-slingr/framework/helpers/models.ts deleted file mode 100644 index 5e4947a..0000000 --- a/task-manager-slingr/framework/helpers/models.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Repository } from "../backend/db"; -import * as s from "../backend/schemas"; -import * as ui from "../frontend/ui"; - -export interface ModelFieldDefinition extends s.FieldDefinition { - defaultUi?: ui.UiFieldDefinition; -} - -export interface ModelDefinition { - fields: { - [key: string]: ModelFieldDefinition - }, - db?: Repository; - ui?: { - label: string; - objectLabelField: string; - } -} - -export function model(def: ModelDefinition): s.Schema { - // register schema - let schema = s.schema(def.fields); - type SchemaType = s.InferType; - // register default ui - ui.defaultUiForSchema({ - label: def.ui?.label, - objectLabelField: def.ui?.objectLabelField, - fields: { - // go thorugh each field and add the default ui - ...Object.keys(def.fields).reduce((acc, key) => { - let field = def.fields[key]; - acc[key] = field.defaultUi; - return acc; - }, {}) - } - }); - // TODO register repository - return schema; -} - - diff --git a/task-manager-slingr/model/tags/tag.ts b/task-manager-slingr/model/tags/tag.ts deleted file mode 100644 index ad90d67..0000000 --- a/task-manager-slingr/model/tags/tag.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { model as m, types as t, widgets as w, ui, mongo } from 'slingr'; - -export const tagSchema = m.schema({ - name: t.text({ - required: true - }), - description: t.longText() -}); - -export type Tag = m.infer; - -ui.defaultUiForSchema({ - label: 'Tags', - instanceLabelField: 'name', - sorting: { - field: 'name', - direction: 'asc' - }, - fields: { - name: ui.fields.text({ - label: 'Name', - }), - description: ui.fields.textArea({ - label: 'Description' - }) - } -}); - -export const tagRepository = mongo.repositoryForSchema({ - collectionName: 'tags', - managed: true, - indexes: [ - mongo.regularIndex(['name']) - ] -}); diff --git a/task-manager-slingr/model/task/task.actions.ts b/task-manager-slingr/model/task/task.actions.ts deleted file mode 100644 index 10027b5..0000000 --- a/task-manager-slingr/model/task/task.actions.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user'; -import { Task } from './task.schema'; -import { - model as m, - types as t, - validators as v, - widgets as w, - ui, mongo, api, concurrency} from 'slingr'; - -export const startTaskSchema = m.schema({ - assignees: t.array({ - required: true, - items: t.relationship({ - defaultValue: (task: Task, startTask: StartTask) => { - return task.assignees; - } - }) - }) -}); - -type StartTask = m.infer; - -ui.defaultUiForSchema({ - assignees: ui.fields.relationshipArray({ - label: 'Assignees' - }) -}); - -export const startTaskAction = m.recordAction({ - precondition: (task: Task) => { - return task.status == 'open'; - }, - script: (task: Task, params: StartTask) => { - userRepository.lock(task).then((task: Task) => { - task.status = 'inProgress'; - task.assignees = params.assignees; - userRepository.save(task); - }); - } -}); - -api.addAction(startTaskAction); diff --git a/task-manager-slingr/model/task/task.schema.ts b/task-manager-slingr/model/task/task.schema.ts deleted file mode 100644 index 8878b31..0000000 --- a/task-manager-slingr/model/task/task.schema.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { - model as m, - types as t, - validators as v, - widgets as w, - context as ctx, - ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; -import { format } from 'date-fns'; -import { Tag, tagSchema } from '../tags/tag'; - -export const taskNoteSchema = m.schema({ - label: t.text({ - calculation: (taskNote: TaskNote) => { - return `${taskNote.addedByFullName} wrote on ${format(taskNote.timestamp, 'ddd MMM, yyyy')} at ${format(taskNote.timestamp, 'HH:mm')})}`; - } - }), - note: t.longText({ - required: true - }), - addedBy: t.relationship({ - required: true, - defaultValue: (taskNote: TaskNote) => { - const currentUser = ctx.getCurrentUser(); - return currentUser.id; - } - }), - timestamp: t.datetime({ - defaultValue: () => new Date() - }) -}); - -export type TaskNote = t.TypeOf; - -export type TaskStatus = 'open' | 'inProgress' | 'completed' | 'archived'; - -export const taskSchema = mongo.documentSchema.extend({ - number: t.number({ - validators: [v.integer()] - }), - title: t.text({ - required: true - }), - status: t.enum({ - required: true, - defaultValue: 'open' - }), - tags: t.array({ - items: t.relationship() - }), - createdAt: t.datetime({ - required: true, - defaultValue: () => new Date() - }), - createdBy: t.relationship({ - required: true, - defaultValue: (task: Task) => { - const currentUser = ctx.getCurrentUser(); - return currentUser.id; - } - }), - closedAt: t.datetime({ - availability: (task: Task) => { - return task.status === 'completed'; - } - }), - assignees: t.array({ - items: t.relationship() - }), - description: t.longText(), - notes: t.array({ - items: taskNoteSchema - }) -}); - -export type Task = m.infer; - -export const taskRepository = mongo.repositoryForSchema({ - collectionName: 'tasks', - managed: true, - autoIncrement: [ - mongo.autoIncrementField('number', 1) - ], - indexes: [ - mongo.regularIndex(['title']), - mongo.regularIndex(['status']), - mongo.regularIndex(['assignees']) - ] -}); diff --git a/task-manager-slingr/model/task/task.ui.ts b/task-manager-slingr/model/task/task.ui.ts deleted file mode 100644 index 94146d6..0000000 --- a/task-manager-slingr/model/task/task.ui.ts +++ /dev/null @@ -1,104 +0,0 @@ -import { - model as m, - types as t, - validators as v, - widgets as w, - context as ctx, - ui, mongo, api, } from 'slingr'; -import { defaultUserRelationshipWidgets, User, userRepository, userSchema } from '../user/user.schema'; -import { format } from 'date-fns'; -import { Tag, tagSchema } from '../tags/tag'; -import { Task, TaskNote, TaskStatus } from './task.schema'; - -ui.defaultUiForSchema({ - label: 'Task Notes', - recordLabelField: 'label', - fields: { - note: { - label: 'Note', - visible: true, - dataWidget: [{ - context: 'readOnly', - widget: w.textWidget() - }, { - context: 'edit', - widget: w.textAreaWidget() - }] - }, - addedBy: { - label: 'Added By', - visible: true, - dataWidget: defaultUserRelationshipWidgets - }, - timestamp: { - label: 'Timestamp', - visible: true, - dataWidget: [{ - context: 'readOnly', - widget: w.datetimeWidget() - }, { - context: 'edit', - widget: w.datetimePickerWidget() - }] - } - } -}); - -ui.defaultUiForSchema({ - label: 'Tasks', - instanceLabelField: 'title', - sorting: { - field: 'title', - direction: 'asc' - }, - fields: { - number: ui.fields.autoIncrement({ - label: 'Number' - }), - title: ui.fields.text({ - label: 'Title' - }), - description: ui.fields.htmlText({ - label: 'Description' - }), - status: ui.fields.enum({ - label: 'Status', - values: { - open: { - label: 'Open', - color: 'blue' - }, - inProgress: { - label: 'In Progress', - color: 'orange' - }, - completed: { - label: 'Completed', - color: 'green' - }, - archived: { - label: 'Archived', - color: 'gray' - } - } - }), - tags: ui.fields.relationshipArray({ - label: 'Tags' - }), - createdAt: ui.fields.datetime({ - label: 'Created At' - }), - createdBy: ui.fields.relationship({ - label: 'Created By' - }), - closedAt: ui.fields.datetime({ - label: 'Closed At' - }), - assignees: ui.fields.relationshipArray({ - label: 'Assignees' - }), - notes: ui.fields.objectArray({ - label: 'Notes' - }) - } -}); \ No newline at end of file diff --git a/task-manager-slingr/model/user/resetPassword.ts b/task-manager-slingr/model/user/resetPassword.ts deleted file mode 100644 index 60c3d20..0000000 --- a/task-manager-slingr/model/user/resetPassword.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { User } from './user.schema'; -import * as s from '../../framework/backend/schemas'; -import * as a from '../../framework/backend/actions'; -import * as ui from '../../framework/frontend/ui'; -import * as api from '../../framework/backend/api'; - -const resetPasswordSchema = s.schema({ - newPassword: s.string({ - required: true - }), - confirmNewPassword: s.string({ - required: true - }) -}, (data: ResetPassword) => { - if (data.newPassword != data.confirmNewPassword) { - return [{ - message: "Passwords don't match", - path: 'confirmNewPassword' - }]; - } - return []; -}); - -type ResetPassword = s.InferType; - -ui.defaultUiForSchema({ - fields: { - newPassword: ui.fields.password({label: 'New Password'}), - confirmNewPassword: ui.fields.password({label: 'Confirm New Password'}) - } -}); - -export const resetPasswordAction = a.objectAction({ - precondition: (data: User) => { - return data.status == 'active'; - }, - script: (record: User, params: ResetPassword) => { - // do something - } -}); - -api.addAction<(resetPasswordAction); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.db.ts b/task-manager-slingr/model/user/user.db.ts deleted file mode 100644 index 4983899..0000000 --- a/task-manager-slingr/model/user/user.db.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { User, userSchema } from "./user.schema"; -import * as mongo from '../../framework/backend/mongo'; -import * as api from '../../framework/backend/api'; - -export const userRepository = mongo.repositoryForSchema({ - name: 'users', - managed: true, - indexes: [ - mongo.indexes.regular(['email']), - mongo.indexes.regular(['fullName']) - ], - encrypt: ['password'] -}); - -api.addSchema(userSchema, userRepository); \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.schema.ts b/task-manager-slingr/model/user/user.schema.ts deleted file mode 100644 index 0d5c33b..0000000 --- a/task-manager-slingr/model/user/user.schema.ts +++ /dev/null @@ -1,36 +0,0 @@ -import * as s from '../../framework/backend/schemas'; - -export const userSchema = s.schema({ - firstName: s.string({ - required: true - }), - lastName: s.string({ - required: true - }), - fullName: s.string({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - } - }), - email: s.email({ - required: true - }), - status: s.enumeration({ - required: true, - defaultValue: (data: User) => 'active', - values: ['active', 'inactive'], - }), - age: s.number({ - integer: true, - min: 0, - max: 150 - }), - password: s.string({ - required: true, - min: 8, - max: 16 - }), - notes: s.string({}) -}); - -export type User = s.InferType; \ No newline at end of file diff --git a/task-manager-slingr/model/user/user.ts b/task-manager-slingr/model/user/user.ts deleted file mode 100644 index b8863f7..0000000 --- a/task-manager-slingr/model/user/user.ts +++ /dev/null @@ -1,60 +0,0 @@ -import * as s from '../../framework/backend/schemas'; -import * as m from '../../framework/helpers/models'; -import * as ui from '../../framework/frontend/ui'; - -export const userSchema = m.model({ - fields: { - firstName: m.fields.string({ - required: true, - defaultUi: ui.fields.text({label: 'First Name'}) - }), - lastName: m.fields.string({ - required: true, - defaultUi: ui.fields.text({label: 'Last Name'}) - }), - fullName: m.fields.string({ - calculation: (user: User) => { - return `${user.firstName} ${user.lastName}`; - }, - defaultUi: ui.fields.text({label: 'Full Name'}) - }), - email: m.fields.email({ - required: true, - defaultUi: ui.fields.email({label: 'Email'}) - }), - status: m.fields.enumeration({ - required: true, - defaultValue: (data: User) => 'active', - values: ['active', 'inactive'], - defaultUi: ui.fields.enumeration({ - options: [ - { - value: 'active', - label: 'Active', - color: 'green' - }, - { - value: 'inactive', - label: 'Inactive', - color: 'red' - } - ] - }) - }), - age: m.fields.number({ - integer: true, - min: 0, - max: 150, - defaultUi: ui.fields.number({label: 'Age'}) - }), - password: m.fields.text({ - required: true, - min: 8, - max: 16, - defaultUi: ui.fields.password({label: 'Password'}) - }), - notes: m.fields.html({}) - } -}); - -export type User = s.InferType; diff --git a/task-manager-slingr/model/user/user.ui.ts b/task-manager-slingr/model/user/user.ui.ts deleted file mode 100644 index 7cfc45f..0000000 --- a/task-manager-slingr/model/user/user.ui.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { User } from "./user.schema"; -import * as ui from '../../framework/frontend/ui'; - -ui.defaultUiForSchema({ - label: 'Users', - objectLabelField: 'fullName', - sorting: { - field: 'fullName', - direction: 'asc' - }, - fields: { - firstName: ui.fields.text({label: 'First Name'}), - lastName: ui.fields.text({label: 'Last Name'}), - fullName: ui.fields.text({label: 'Full Name'}), - email: ui.fields.text({label: 'Email'}), - status: ui.fields.enumeration({ - options: [ - { - value: 'active', - label: 'Active', - color: 'green' - }, - { - value: 'inactive', - label: 'Inactive', - color: 'red' - } - ] - }), - age: ui.fields.number({label: 'Age'}), - password: ui.fields.password({ - label: 'Password', - visible: false - }), - notes: ui.fields.text({label: 'Notes'}) - } -}); From 57fd3f2ae5f28943bd486ecfe429435415bdfb9e Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Fri, 8 Aug 2025 00:10:11 -0300 Subject: [PATCH 031/254] removing models for now --- reference/models.md | 434 -------------------------------------------- 1 file changed, 434 deletions(-) delete mode 100644 reference/models.md diff --git a/reference/models.md b/reference/models.md deleted file mode 100644 index c9a9e09..0000000 --- a/reference/models.md +++ /dev/null @@ -1,434 +0,0 @@ -# Models - -Models are a way to define a rich data structure. By "rich" we mean it holds more information than just the fields and the data type. For example, a model can contain information about how a field is calculated, database settings, display options, validation rules, etc. Slingr is a model-driven development framework and for that reason a lot of the information is going to sit in this layer. - -A generic model needs to be able to support the following features: - -- Data structure -- Types - - Specifc rules for the types -- Validations -- Default values -- Calculated values -- Access -- Relationships (one-to-one, one-to-many, many-to-many) - -## Defining a model - -This is a simple model: - -```ts -@Model() -class Person { - @Field() - firstName: string; - - @Field() - lastName: string; - - @Field() - email: string; -} -``` - -In this case, Typescript types will be mapped to default data types. Also, the decorator `Field` is not mandatory. We put it in the example to make it explicit, but it is not needed if you don't want to specify settings. - -## Default label for instances - -Models can have instances and it is good to have a way to identify these instances. They can be used when logging information or when the UI needs to show something. - -OPTION 1: In this case, we have a property in the model settings to indicate a field or a calculation. I think this approach has some problems like the lack of type safety (maybe we can achieve validation using some complex types definition) and it will also need a new field that doesn't exist, which is what happens today in the platform. -```ts -@Model({ - instanceLabel: (person: Person) => { `${person.firstName} ${person.lastName} <${person.email}>` } -}) -class Person { - @Field({ - required: true - }) - firstName: string; - - @Field({ - required: true - }) - lastName: string; - - @Field({ - required: true - }) - email: string; -} -``` - -OPTION 2: The benefit in this approach is you explicitly define the label field (you can name however you want or use another field that is not calculated). It is simple for developers and AI. The downside is that you use another decorator and you have to validate it. The problem of the additional validator could be solved by adding it as a setting of the field, but could be confusing as well. -```ts -@Model() -class Person { - @Field({ - calculation: (person: Person) => { `${person.firstName} ${person.lastName} <${person.email}>` } - }) - @InstanceLabel() - label: string; - - @Field({ - required: true - }) - firstName: string; - - @Field({ - required: true - }) - lastName: string; - - @Field({ - required: true - }) - email: string; -} -``` - -OPTION 3: In this case we use the default `toString()`. It has the advantage that is a known things in Typescript and will work when you are logging the value, for example. The problem is that we should create a field that is not visible if we want to persist it, and we are calculating it all the time. -```ts -@Model() -class Person { - @Field({ - required: true - }) - firstName: string; - - @Field({ - required: true - }) - lastName: string; - - @Field({ - required: true - }) - email: string; - - toString(): string { - return `${this.firstName} ${this.lastName} <${this.email}>`; - } -} -``` - -COMMENTS: Probably we can use option #2 and automatically implement #3 so we get the benefit of it. - -## Required fields - -You can define a field is required like this: - -```ts -@Model() -class Person { - @Field({ - required: true - }) - firstName: string; - - @Field({ - required: true - }) - lastName: string; - - @Field({ - required: true - }) - email: string; -} -``` - -It is possible that a field is required based on a condition: - -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type; - - @Field({ - required: (task: Task) => { task.type == Type.Story } - }) - priority: Priority; -} -``` - -In this case, the field `priority` is only required if the `type` is `Story`. - -## Default values - -Default values can be specified by initializing the field: - -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type = Type.Story; -} -``` - -Sometimes, default values can be more complex and are based on a script. In these cases, you should provide a script like this: - -OPTION 1: This has less "magic", but it is intuitive for developers and AI. The problem is that you get the default value separated from the field declaration. -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type; - - constructor() { - if (someCondition()) { - type = Type.Release; - } else { - type = Type.Story; - } - } -} -``` - -OPTION 2: Here you define an anonymous function. It is trickier but OK for more experienced developers and AI. You can reference `this` but it will be executed in the order the object is initialized. I think it will be a problem if we have to -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true - }) - type: Type = (() =? { - if (someCondition()) { - return Type.Release; - } else { - return Type.Story; - } - })(); -} -``` - -OPTION 3: In this case, we define how the default value has to be handled. It doesn't follow what would be intuitive for any Typescript developer or AI, however, it has the advantage that we can control when to call it. For example, we might want to do some initialization of the instance before calling the default value (maybe setting some realtionships or something like that). -```ts -@Model() -class Task { - @Field({ - required: true - }) - title: string; - - @Field({ - required: true, - defaultValue: (task: Task) => { - if (someCondition()) { - return Type.Release; - } else { - return Type.Story; - } - } - }) - type: Type; -} -``` - -COMMENTS: IF we go with option 3, probably we also want to define default values this way even when it is a value so we can control when to call it and be more consistent. - -## Calculated fields - -COMMENTS: I put a different options here. I think it would be useful to define if we want a field to be calculated every time you call it or if you want to calculate it once and then just return the value. The problem in the second approach is that you need to define when you are going to calculate it again. Today, in our platoform, we do it when you save the record. - -OPTION 1: In this case, the calculated field is always calculated when you ask for its value. It is simple and uses languages' features, but it might be inefficient if the calcultion is expensive. -```ts -@Model() -class LineItem { - @Field() - price: number; - - @Field() - quantity: number; - - @Field() - get total(): number { - return this.price * this.quantity; - } -} -``` - -OPTION 2: In this case, we define how to calculate it, but we can have more control on when we want to call it. Maybe the developer wants to call it manually in some cases, the UI can refresh it when needed, when we detect changes in other fields, etc. It might be tricky for the developer to understand when it is going to be calculated. -```ts -@Model() -class LineItem { - @Field() - price: number; - - @Field() - quantity: number; - - @Field({ - calculation: (lineItem: LineItem) => { - return lineItem.price * lineItem.quantity; - } - }) - total: number; -} -``` - -## Validations - -Apart from common validations defined in the `Field` decorator or in type-specific decorators (like `maxLength` in the `Text` decorator), you might have custom validations in a field. - -```ts -@Model() -class LineItem { - @Field() - product: Product; - - @Field() - price: number; - - @Field({ - validation: (value: number, lineItem: LineItem) => { - let errors = []; - if (lineItem.product?.limited && value > 5) { - erros.push({code: 'overLimit', message: `The maximum quantity for limited products is 5`}); - } - return errors; - } - }) - quantity: number; - - @Field({ - calculation: (lineItem: LineItem) => { - return lineItem.price * lineItem.quantity; - } - }) - total: number; -} -``` - -Also, you might have a validation that is global for the whole model: - -COMMENTS: I think here we shouldn't allow setting a field because we should use it only for case where the validation error is global to the model. This will avoid setting a string in the `field` field, which breaks type safety. Maybe I'm missing use cases, but let's talk about it. - -```ts -@Model({ - validation: (passwordChange: PasswordChange) => { - let errors = []; - if (passwordChange.newPassword != passwordChange.confirmNewPassword) { - errors.push({code: 'doesNotMatch', message: 'New password and the confirmation do not match'}); - } - return errors; - } -}) -class PasswordChange { - @Field() - oldPassword: string; - - @Field() - newPassword: string; - - @Field() - confirmNewPassword: string; -} -``` - -## Access - -TODO: At the model level, this doesn't seem to make much sense. I mean, we can set a field is read-only, but you can go ahead and set it in the model, nothing will prevent it from happening. Maybe, in the serialization is where we can take this into account. For example, we you do `JSON.stringify(instance)`, then you will get the version without the fields that shouldn't be there, or a custom method like `clean()` that takes out things that aren't available. I'm not sure. I see this feature makes sense when we add an API or persisntance, but it doesn't seem to make much sense at the model level. - -## Serialization - -TODO: We might think about overriding `toJSON()` and take into account the access settings and maybe some other things like permissiosn in the future. - -# Data types - -The following data types will be supported in the framework: - -- Text (string) - - LongText * - - Email - - Phone * - - HTML - - URL * - - MaskedText * - - Date * - - Time * -- Number (number) - - Integer - - TimeDuration * - - PrecisionNumber * - - Money - - Percentage * -- Date/Time (Date) -- DateRange (DateRange) * -- Boolean (boolean) -- Choice (Enum) -- DynamicChoice (NameValuePair) - -* We put them here for reference, but won't be implemented initially. - -You can see there is a hierarchy of types. This is because one type builds on top of the other one. For example, the `Email` type is a `Text` type where there is a regex to validate it is an email. - -Also, you can see there are non-standard data types in some cases, like `DateRange` or `NameValuePair`. These are classes that will be inside the model. - -We want to make it easier to add new types, so it is extensible. New types will add more information in the model that could be useful for other layers, even if they are very similar to other ones. - -## Explicit definition of data types in models - -You can explicitly indicate the data type in the model and set type-specific settings: - -```ts -@Model() -class Person { - @Field() - @Text({ - maxLength: 30 - }) - firstName: string; - - @Field() - @Text({ - maxLength: 30 - }) - lastName: string; - - @Field() - @Email() - email: string; -} -``` - -As you can see, a new decorator is used to define the type. This is because defining the type inside the `Field` decorator was going to cause that we had to add all the type-specific options there, making it too big and also won't be align with the goal of making types easily extensible. - -# Multi-valued fields - -TODO - -# Relationships - -TODO - -# Implementation notes - -TODO: Put some notes about that implementation that will be useful for the implementation team. \ No newline at end of file From 4ac5d57fb6a97acaba37909c3c1867f8f6b74546 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 18 Aug 2025 12:43:12 -0300 Subject: [PATCH 032/254] initialize TypeScript project with sum function and tests --- .gitignore | 1 + jest.config.js | 6 + package-lock.json | 4840 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 30 + src/sum.test.ts | 5 + src/sum.ts | 4 + tsconfig.json | 46 + 7 files changed, 4932 insertions(+) create mode 100644 jest.config.js create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 src/sum.test.ts create mode 100644 src/sum.ts create mode 100644 tsconfig.json diff --git a/.gitignore b/.gitignore index 85e7c1d..856f4ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /.idea/ +node_modules/ diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..a8e0635 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,6 @@ +/** @type {import('ts-jest').JestConfigWithTsJest} */ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + transform: { "^.+\\.tsx?$": ["ts-jest", {"rootDir": "."}] } +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..1dbb478 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,4840 @@ +{ + "name": "framework", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "framework", + "version": "1.0.0", + "license": "ISC", + "devDependencies": { + "@types/jest": "^30.0.0", + "@types/node": "^24.3.0", + "jest-circus": "^30.0.5", + "reflect-metadata": "^0.2.2", + "ts-jest": "^29.4.1", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz", + "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz", + "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.3", + "@babel/parser": "^7.28.3", + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.3", + "@babel/types": "^7.28.2", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", + "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.27.2", + "@babel/helper-validator-option": "^7.27.1", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-globals": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", + "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", + "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.28.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", + "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", + "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz", + "integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", + "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.2" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", + "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", + "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", + "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz", + "integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.28.3", + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.2", + "debug": "^4.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.28.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", + "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@emnapi/core": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz", + "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.0.4", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz", + "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz", + "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.0.5.tgz", + "integrity": "sha512-xY6b0XiL0Nav3ReresUarwl2oIz1gTnxGbGpho9/rbUWsLH0f1OD/VT84xs8c7VmH7MChnLb0pag6PhZhAdDiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "@types/node": "*", + "chalk": "^4.1.2", + "jest-message-util": "30.0.5", + "jest-util": "30.0.5", + "slash": "^3.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/core": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.0.5.tgz", + "integrity": "sha512-fKD0OulvRsXF1hmaFgHhVJzczWzA1RXMMo9LTPuFXo9q/alDbME3JIyWYqovWsUBWSoBcsHaGPSLF9rz4l9Qeg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/console": "30.0.5", + "@jest/pattern": "30.0.1", + "@jest/reporters": "30.0.5", + "@jest/test-result": "30.0.5", + "@jest/transform": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "ansi-escapes": "^4.3.2", + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "exit-x": "^0.2.2", + "graceful-fs": "^4.2.11", + "jest-changed-files": "30.0.5", + "jest-config": "30.0.5", + "jest-haste-map": "30.0.5", + "jest-message-util": "30.0.5", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.0.5", + "jest-resolve-dependencies": "30.0.5", + "jest-runner": "30.0.5", + "jest-runtime": "30.0.5", + "jest-snapshot": "30.0.5", + "jest-util": "30.0.5", + "jest-validate": "30.0.5", + "jest-watcher": "30.0.5", + "micromatch": "^4.0.8", + "pretty-format": "30.0.5", + "slash": "^3.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/diff-sequences": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz", + "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/environment": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.0.5.tgz", + "integrity": "sha512-aRX7WoaWx1oaOkDQvCWImVQ8XNtdv5sEWgk4gxR6NXb7WBUnL5sRak4WRzIQRZ1VTWPvV4VI4mgGjNL9TeKMYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/fake-timers": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "jest-mock": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.0.5.tgz", + "integrity": "sha512-6udac8KKrtTtC+AXZ2iUN/R7dp7Ydry+Fo6FPFnDG54wjVMnb6vW/XNlf7Xj8UDjAE3aAVAsR4KFyKk3TCXmTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "30.0.5", + "jest-snapshot": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.0.5.tgz", + "integrity": "sha512-F3lmTT7CXWYywoVUGTCmom0vXq3HTTkaZyTAzIy+bXSBizB7o5qzlC9VCtq0arOa8GqmNsbg/cE9C6HLn7Szew==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/get-type": "30.0.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.0.5.tgz", + "integrity": "sha512-ZO5DHfNV+kgEAeP3gK3XlpJLL4U3Sz6ebl/n68Uwt64qFFs5bv4bfEEjyRGK5uM0C90ewooNgFuKMdkbEoMEXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "@sinonjs/fake-timers": "^13.0.0", + "@types/node": "*", + "jest-message-util": "30.0.5", + "jest-mock": "30.0.5", + "jest-util": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/get-type": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.0.1.tgz", + "integrity": "sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.0.5.tgz", + "integrity": "sha512-7oEJT19WW4oe6HR7oLRvHxwlJk2gev0U9px3ufs8sX9PoD1Eza68KF0/tlN7X0dq/WVsBScXQGgCldA1V9Y/jA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "30.0.5", + "@jest/expect": "30.0.5", + "@jest/types": "30.0.5", + "jest-mock": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/pattern": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", + "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "jest-regex-util": "30.0.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.0.5.tgz", + "integrity": "sha512-mafft7VBX4jzED1FwGC1o/9QUM2xebzavImZMeqnsklgcyxBto8mV4HzNSzUrryJ+8R9MFOM3HgYuDradWR+4g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "30.0.5", + "@jest/test-result": "30.0.5", + "@jest/transform": "30.0.5", + "@jest/types": "30.0.5", + "@jridgewell/trace-mapping": "^0.3.25", + "@types/node": "*", + "chalk": "^4.1.2", + "collect-v8-coverage": "^1.0.2", + "exit-x": "^0.2.2", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^5.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "30.0.5", + "jest-util": "30.0.5", + "jest-worker": "30.0.5", + "slash": "^3.0.0", + "string-length": "^4.0.2", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/schemas": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", + "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.34.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/snapshot-utils": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.0.5.tgz", + "integrity": "sha512-XcCQ5qWHLvi29UUrowgDFvV4t7ETxX91CbDczMnoqXPOIcZOxyNdSjm6kV5XMc8+HkxfRegU/MUmnTbJRzGrUQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "natural-compare": "^1.4.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz", + "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.25", + "callsites": "^3.1.0", + "graceful-fs": "^4.2.11" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.0.5.tgz", + "integrity": "sha512-wPyztnK0gbDMQAJZ43tdMro+qblDHH1Ru/ylzUo21TBKqt88ZqnKKK2m30LKmLLoKtR2lxdpCC/P3g1vfKcawQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "30.0.5", + "@jest/types": "30.0.5", + "@types/istanbul-lib-coverage": "^2.0.6", + "collect-v8-coverage": "^1.0.2" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.0.5.tgz", + "integrity": "sha512-Aea/G1egWoIIozmDD7PBXUOxkekXl7ueGzrsGGi1SbeKgQqCYCIf+wfbflEbf2LiPxL8j2JZGLyrzZagjvW4YQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/test-result": "30.0.5", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.0.5", + "slash": "^3.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.0.5.tgz", + "integrity": "sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.27.4", + "@jest/types": "30.0.5", + "@jridgewell/trace-mapping": "^0.3.25", + "babel-plugin-istanbul": "^7.0.0", + "chalk": "^4.1.2", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.0.5", + "jest-regex-util": "30.0.1", + "jest-util": "30.0.5", + "micromatch": "^4.0.8", + "pirates": "^4.0.7", + "slash": "^3.0.0", + "write-file-atomic": "^5.0.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/types": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz", + "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/pattern": "30.0.1", + "@jest/schemas": "30.0.5", + "@types/istanbul-lib-coverage": "^2.0.6", + "@types/istanbul-reports": "^3.0.4", + "@types/node": "*", + "@types/yargs": "^17.0.33", + "chalk": "^4.1.2" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.30", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", + "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", + "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.4.3", + "@emnapi/runtime": "^1.4.3", + "@tybys/wasm-util": "^0.10.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@pkgr/core": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz", + "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/pkgr" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.34.40", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz", + "integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tybys/wasm-util": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz", + "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", + "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/types": "^7.28.2" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "30.0.0", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz", + "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^30.0.0", + "pretty-format": "^30.0.0" + } + }, + "node_modules/@types/node": { + "version": "24.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz", + "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.10.0" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/yargs": { + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/@unrs/resolver-binding-android-arm-eabi": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz", + "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@unrs/resolver-binding-android-arm64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz", + "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@unrs/resolver-binding-darwin-arm64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz", + "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@unrs/resolver-binding-darwin-x64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz", + "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@unrs/resolver-binding-freebsd-x64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz", + "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz", + "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz", + "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz", + "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz", + "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz", + "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz", + "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-riscv64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz", + "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz", + "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-x64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz", + "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-x64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz", + "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-wasm32-wasi": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz", + "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@napi-rs/wasm-runtime": "^0.2.11" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz", + "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz", + "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@unrs/resolver-binding-win32-x64-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz", + "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/babel-jest": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.5.tgz", + "integrity": "sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/transform": "30.0.5", + "@types/babel__core": "^7.20.5", + "babel-plugin-istanbul": "^7.0.0", + "babel-preset-jest": "30.0.1", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "slash": "^3.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz", + "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-instrument": "^6.0.2", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz", + "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/template": "^7.27.2", + "@babel/types": "^7.27.3", + "@types/babel__core": "^7.20.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", + "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + }, + "peerDependencies": { + "@babel/core": "^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/babel-preset-jest": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz", + "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "babel-plugin-jest-hoist": "30.0.1", + "babel-preset-current-node-syntax": "^1.1.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.25.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", + "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001733", + "electron-to-chromium": "^1.5.199", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001735", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz", + "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", + "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz", + "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/dedent": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", + "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.5.203", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz", + "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==", + "dev": true, + "license": "ISC" + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execa/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/exit-x": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz", + "integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/expect/-/expect-30.0.5.tgz", + "integrity": "sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "30.0.5", + "@jest/get-type": "30.0.1", + "jest-matcher-utils": "30.0.5", + "jest-message-util": "30.0.5", + "jest-mock": "30.0.5", + "jest-util": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "peer": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", + "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.23", + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jest": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest/-/jest-30.0.5.tgz", + "integrity": "sha512-y2mfcJywuTUkvLm2Lp1/pFX8kTgMO5yyQGq/Sk/n2mN7XWYp4JsCZ/QXW34M8YScgk8bPZlREH04f6blPnoHnQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/core": "30.0.5", + "@jest/types": "30.0.5", + "import-local": "^3.2.0", + "jest-cli": "30.0.5" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz", + "integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "execa": "^5.1.1", + "jest-util": "30.0.5", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-circus": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.0.5.tgz", + "integrity": "sha512-h/sjXEs4GS+NFFfqBDYT7y5Msfxh04EwWLhQi0F8kuWpe+J/7tICSlswU8qvBqumR3kFgHbfu7vU6qruWWBPug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "30.0.5", + "@jest/expect": "30.0.5", + "@jest/test-result": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "chalk": "^4.1.2", + "co": "^4.6.0", + "dedent": "^1.6.0", + "is-generator-fn": "^2.1.0", + "jest-each": "30.0.5", + "jest-matcher-utils": "30.0.5", + "jest-message-util": "30.0.5", + "jest-runtime": "30.0.5", + "jest-snapshot": "30.0.5", + "jest-util": "30.0.5", + "p-limit": "^3.1.0", + "pretty-format": "30.0.5", + "pure-rand": "^7.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.6" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-cli": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.0.5.tgz", + "integrity": "sha512-Sa45PGMkBZzF94HMrlX4kUyPOwUpdZasaliKN3mifvDmkhLYqLLg8HQTzn6gq7vJGahFYMQjXgyJWfYImKZzOw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/core": "30.0.5", + "@jest/test-result": "30.0.5", + "@jest/types": "30.0.5", + "chalk": "^4.1.2", + "exit-x": "^0.2.2", + "import-local": "^3.2.0", + "jest-config": "30.0.5", + "jest-util": "30.0.5", + "jest-validate": "30.0.5", + "yargs": "^17.7.2" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.0.5.tgz", + "integrity": "sha512-aIVh+JNOOpzUgzUnPn5FLtyVnqc3TQHVMupYtyeURSb//iLColiMIR8TxCIDKyx9ZgjKnXGucuW68hCxgbrwmA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/core": "^7.27.4", + "@jest/get-type": "30.0.1", + "@jest/pattern": "30.0.1", + "@jest/test-sequencer": "30.0.5", + "@jest/types": "30.0.5", + "babel-jest": "30.0.5", + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "deepmerge": "^4.3.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", + "jest-circus": "30.0.5", + "jest-docblock": "30.0.1", + "jest-environment-node": "30.0.5", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.0.5", + "jest-runner": "30.0.5", + "jest-util": "30.0.5", + "jest-validate": "30.0.5", + "micromatch": "^4.0.8", + "parse-json": "^5.2.0", + "pretty-format": "30.0.5", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "esbuild-register": ">=3.4.0", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "esbuild-register": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.0.5.tgz", + "integrity": "sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/diff-sequences": "30.0.1", + "@jest/get-type": "30.0.1", + "chalk": "^4.1.2", + "pretty-format": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz", + "integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "detect-newline": "^3.1.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-each": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.0.5.tgz", + "integrity": "sha512-dKjRsx1uZ96TVyejD3/aAWcNKy6ajMaN531CwWIsrazIqIoXI9TnnpPlkrEYku/8rkS3dh2rbH+kMOyiEIv0xQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/get-type": "30.0.1", + "@jest/types": "30.0.5", + "chalk": "^4.1.2", + "jest-util": "30.0.5", + "pretty-format": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-environment-node": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.0.5.tgz", + "integrity": "sha512-ppYizXdLMSvciGsRsMEnv/5EFpvOdXBaXRBzFUDPWrsfmog4kYrOGWXarLllz6AXan6ZAA/kYokgDWuos1IKDA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/environment": "30.0.5", + "@jest/fake-timers": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "jest-mock": "30.0.5", + "jest-util": "30.0.5", + "jest-validate": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.0.5.tgz", + "integrity": "sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "@types/node": "*", + "anymatch": "^3.1.3", + "fb-watchman": "^2.0.2", + "graceful-fs": "^4.2.11", + "jest-regex-util": "30.0.1", + "jest-util": "30.0.5", + "jest-worker": "30.0.5", + "micromatch": "^4.0.8", + "walker": "^1.0.8" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.3" + } + }, + "node_modules/jest-leak-detector": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.0.5.tgz", + "integrity": "sha512-3Uxr5uP8jmHMcsOtYMRB/zf1gXN3yUIc+iPorhNETG54gErFIiUhLvyY/OggYpSMOEYqsmRxmuU4ZOoX5jpRFg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/get-type": "30.0.1", + "pretty-format": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.0.5.tgz", + "integrity": "sha512-uQgGWt7GOrRLP1P7IwNWwK1WAQbq+m//ZY0yXygyfWp0rJlksMSLQAA4wYQC3b6wl3zfnchyTx+k3HZ5aPtCbQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/get-type": "30.0.1", + "chalk": "^4.1.2", + "jest-diff": "30.0.5", + "pretty-format": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.0.5.tgz", + "integrity": "sha512-NAiDOhsK3V7RU0Aa/HnrQo+E4JlbarbmI3q6Pi4KcxicdtjV82gcIUrejOtczChtVQR4kddu1E1EJlW6EN9IyA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@jest/types": "30.0.5", + "@types/stack-utils": "^2.0.3", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "micromatch": "^4.0.8", + "pretty-format": "30.0.5", + "slash": "^3.0.0", + "stack-utils": "^2.0.6" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-mock": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz", + "integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "@types/node": "*", + "jest-util": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", + "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.0.5.tgz", + "integrity": "sha512-d+DjBQ1tIhdz91B79mywH5yYu76bZuE96sSbxj8MkjWVx5WNdt1deEFRONVL4UkKLSrAbMkdhb24XN691yDRHg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.0.5", + "jest-pnp-resolver": "^1.2.3", + "jest-util": "30.0.5", + "jest-validate": "30.0.5", + "slash": "^3.0.0", + "unrs-resolver": "^1.7.11" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.0.5.tgz", + "integrity": "sha512-/xMvBR4MpwkrHW4ikZIWRttBBRZgWK4d6xt3xW1iRDSKt4tXzYkMkyPfBnSCgv96cpkrctfXs6gexeqMYqdEpw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "jest-regex-util": "30.0.1", + "jest-snapshot": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-runner": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.0.5.tgz", + "integrity": "sha512-JcCOucZmgp+YuGgLAXHNy7ualBx4wYSgJVWrYMRBnb79j9PD0Jxh0EHvR5Cx/r0Ce+ZBC4hCdz2AzFFLl9hCiw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/console": "30.0.5", + "@jest/environment": "30.0.5", + "@jest/test-result": "30.0.5", + "@jest/transform": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "chalk": "^4.1.2", + "emittery": "^0.13.1", + "exit-x": "^0.2.2", + "graceful-fs": "^4.2.11", + "jest-docblock": "30.0.1", + "jest-environment-node": "30.0.5", + "jest-haste-map": "30.0.5", + "jest-leak-detector": "30.0.5", + "jest-message-util": "30.0.5", + "jest-resolve": "30.0.5", + "jest-runtime": "30.0.5", + "jest-util": "30.0.5", + "jest-watcher": "30.0.5", + "jest-worker": "30.0.5", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.0.5.tgz", + "integrity": "sha512-7oySNDkqpe4xpX5PPiJTe5vEa+Ak/NnNz2bGYZrA1ftG3RL3EFlHaUkA1Cjx+R8IhK0Vg43RML5mJedGTPNz3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "30.0.5", + "@jest/fake-timers": "30.0.5", + "@jest/globals": "30.0.5", + "@jest/source-map": "30.0.1", + "@jest/test-result": "30.0.5", + "@jest/transform": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "chalk": "^4.1.2", + "cjs-module-lexer": "^2.1.0", + "collect-v8-coverage": "^1.0.2", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.0.5", + "jest-message-util": "30.0.5", + "jest-mock": "30.0.5", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.0.5", + "jest-snapshot": "30.0.5", + "jest-util": "30.0.5", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.0.5.tgz", + "integrity": "sha512-T00dWU/Ek3LqTp4+DcW6PraVxjk28WY5Ua/s+3zUKSERZSNyxTqhDXCWKG5p2HAJ+crVQ3WJ2P9YVHpj1tkW+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.27.4", + "@babel/generator": "^7.27.5", + "@babel/plugin-syntax-jsx": "^7.27.1", + "@babel/plugin-syntax-typescript": "^7.27.1", + "@babel/types": "^7.27.3", + "@jest/expect-utils": "30.0.5", + "@jest/get-type": "30.0.1", + "@jest/snapshot-utils": "30.0.5", + "@jest/transform": "30.0.5", + "@jest/types": "30.0.5", + "babel-preset-current-node-syntax": "^1.1.0", + "chalk": "^4.1.2", + "expect": "30.0.5", + "graceful-fs": "^4.2.11", + "jest-diff": "30.0.5", + "jest-matcher-utils": "30.0.5", + "jest-message-util": "30.0.5", + "jest-util": "30.0.5", + "pretty-format": "30.0.5", + "semver": "^7.7.2", + "synckit": "^0.11.8" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz", + "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.5", + "@types/node": "*", + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "graceful-fs": "^4.2.11", + "picomatch": "^4.0.2" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-util/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/jest-validate": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.0.5.tgz", + "integrity": "sha512-ouTm6VFHaS2boyl+k4u+Qip4TSH7Uld5tyD8psQ8abGgt2uYYB8VwVfAHWHjHc0NWmGGbwO5h0sCPOGHHevefw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/get-type": "30.0.1", + "@jest/types": "30.0.5", + "camelcase": "^6.3.0", + "chalk": "^4.1.2", + "leven": "^3.1.0", + "pretty-format": "30.0.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.0.5.tgz", + "integrity": "sha512-z9slj/0vOwBDBjN3L4z4ZYaA+pG56d6p3kTUhFRYGvXbXMWhXmb/FIxREZCD06DYUwDKKnj2T80+Pb71CQ0KEg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/test-result": "30.0.5", + "@jest/types": "30.0.5", + "@types/node": "*", + "ansi-escapes": "^4.3.2", + "chalk": "^4.1.2", + "emittery": "^0.13.1", + "jest-util": "30.0.5", + "string-length": "^4.0.2" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-worker": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.0.5.tgz", + "integrity": "sha512-ojRXsWzEP16NdUuBw/4H/zkZdHOa7MMYCk4E430l+8fELeLg/mqmMlRhjL7UNZvQrDmnovWZV4DxX03fZF48fQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@ungap/structured-clone": "^1.3.0", + "jest-util": "30.0.5", + "merge-stream": "^2.0.0", + "supports-color": "^8.1.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "peer": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC" + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/napi-postinstall": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", + "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", + "dev": true, + "license": "MIT", + "bin": { + "napi-postinstall": "lib/cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/napi-postinstall" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "dev": true, + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pirates": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pretty-format": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz", + "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "30.0.5", + "ansi-styles": "^5.2.0", + "react-is": "^18.3.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/pure-rand": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz", + "integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT" + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true, + "license": "MIT" + }, + "node_modules/reflect-metadata": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-length/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-length/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/synckit": { + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", + "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@pkgr/core": "^0.2.9" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/synckit" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-jest": { + "version": "29.4.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz", + "integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "fast-json-stable-stringify": "^2.1.0", + "handlebars": "^4.7.8", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.2", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jest-util": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD", + "optional": true + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/undici-types": { + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", + "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/unrs-resolver": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", + "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "napi-postinstall": "^0.3.0" + }, + "funding": { + "url": "https://opencollective.com/unrs-resolver" + }, + "optionalDependencies": { + "@unrs/resolver-binding-android-arm-eabi": "1.11.1", + "@unrs/resolver-binding-android-arm64": "1.11.1", + "@unrs/resolver-binding-darwin-arm64": "1.11.1", + "@unrs/resolver-binding-darwin-x64": "1.11.1", + "@unrs/resolver-binding-freebsd-x64": "1.11.1", + "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1", + "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1", + "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-arm64-musl": "1.11.1", + "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1", + "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1", + "@unrs/resolver-binding-linux-x64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-x64-musl": "1.11.1", + "@unrs/resolver-binding-wasm32-wasi": "1.11.1", + "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1", + "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1", + "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "peer": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..52dad3b --- /dev/null +++ b/package.json @@ -0,0 +1,30 @@ +{ + "name": "framework", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "jest" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/slingr-stack/framework.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "type": "commonjs", + "bugs": { + "url": "https://github.com/slingr-stack/framework/issues" + }, + "homepage": "https://github.com/slingr-stack/framework#readme", + "devDependencies": { + "@types/jest": "^30.0.0", + "@types/node": "^24.3.0", + "jest-circus": "^30.0.5", + "reflect-metadata": "^0.2.2", + "ts-jest": "^29.4.1", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + } +} diff --git a/src/sum.test.ts b/src/sum.test.ts new file mode 100644 index 0000000..df0dd09 --- /dev/null +++ b/src/sum.test.ts @@ -0,0 +1,5 @@ +const sum = require('./sum'); + +test('adds 1 + 2 to equal 3', () => { + expect(sum(1, 2)).toBe(3); +}); \ No newline at end of file diff --git a/src/sum.ts b/src/sum.ts new file mode 100644 index 0000000..4f3863c --- /dev/null +++ b/src/sum.ts @@ -0,0 +1,4 @@ +function sum(a: any, b: any) { + return a + b; +} +module.exports = sum; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..95c61da --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,46 @@ +{ + // Visit https://aka.ms/tsconfig to read more about this file + "compilerOptions": { + // File Layout + // "rootDir": "./src", + // "outDir": "./dist", + + // Environment Settings + // See also https://aka.ms/tsconfig/module + "module": "nodenext", + "target": "esnext", + "types": ["node", "jest"], + // For nodejs: + // "lib": ["esnext"], + // "types": ["node"], + // and npm install -D @types/node + + // Other Outputs + "sourceMap": true, + "declaration": true, + "declarationMap": true, + + // Stricter Typechecking Options + "noUncheckedIndexedAccess": true, + "exactOptionalPropertyTypes": true, + + // Style Options + // "noImplicitReturns": true, + // "noImplicitOverride": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // "noFallthroughCasesInSwitch": true, + // "noPropertyAccessFromIndexSignature": true, + + // Recommended Options + "strict": true, + "jsx": "react-jsx", + "verbatimModuleSyntax": true, + "isolatedModules": true, + "noUncheckedSideEffectImports": true, + "moduleDetection": "force", + "skipLibCheck": true, + "experimentalDecorators": true + }, + "include": ["**/*"] +} From ce43419135ece6c81353edc0b9c2738471655977 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 18 Aug 2025 13:03:30 -0300 Subject: [PATCH 033/254] update dependencies and configuration for Jest and TypeScript --- jest.config.js | 6 - jest.config.ts | 24 + package-lock.json | 6338 +++++++++++++++++++++++++++++---------------- package.json | 7 +- tsconfig.json | 3 +- 5 files changed, 4180 insertions(+), 2198 deletions(-) delete mode 100644 jest.config.js create mode 100644 jest.config.ts diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index a8e0635..0000000 --- a/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @type {import('ts-jest').JestConfigWithTsJest} */ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - transform: { "^.+\\.tsx?$": ["ts-jest", {"rootDir": "."}] } -}; \ No newline at end of file diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 0000000..b021033 --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,24 @@ +import type { Config } from 'jest'; + +const config: Config = { + // Add this line + preset: 'ts-jest', + testEnvironment: 'node', + // Use recommended transform-based ts-jest config (replaces deprecated globals) + transform: { + '^.+\\.(ts|tsx)$': [ + 'ts-jest', + { + tsconfig: { + module: 'commonjs', + }, + }, + ], + }, + + // ... rest of your configuration + coverageProvider: "v8", + // ... +}; + +module.exports = config; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1dbb478..e90452e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,12 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "@types/jest": "^30.0.0", + "@types/jest": "^29.5.12", "@types/node": "^24.3.0", - "jest-circus": "^30.0.5", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", - "ts-jest": "^29.4.1", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.9.2" } @@ -526,8 +527,7 @@ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", @@ -553,142 +553,161 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@emnapi/core": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz", - "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==", + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, - "license": "MIT", - "optional": true, + "license": "ISC", "dependencies": { - "@emnapi/wasi-threads": "1.0.4", - "tslib": "^2.4.0" + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/@emnapi/runtime": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz", - "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==", + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" + "engines": { + "node": ">=8" } }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz", - "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==", + "node_modules/@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "license": "MIT", - "optional": true, "dependencies": { - "tslib": "^2.4.0" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "node_modules/@jest/console/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": ">=12" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "node_modules/@jest/console/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "node_modules/@jest/console/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/console/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/@jest/console": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.0.5.tgz", - "integrity": "sha512-xY6b0XiL0Nav3ReresUarwl2oIz1gTnxGbGpho9/rbUWsLH0f1OD/VT84xs8c7VmH7MChnLb0pag6PhZhAdDiA==", + "node_modules/@jest/console/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.0.5", + "@jest/types": "^29.6.3", "@types/node": "*", - "chalk": "^4.1.2", - "jest-message-util": "30.0.5", - "jest-util": "30.0.5", - "slash": "^3.0.0" + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/core": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.0.5.tgz", - "integrity": "sha512-fKD0OulvRsXF1hmaFgHhVJzczWzA1RXMMo9LTPuFXo9q/alDbME3JIyWYqovWsUBWSoBcsHaGPSLF9rz4l9Qeg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/console": "30.0.5", - "@jest/pattern": "30.0.1", - "@jest/reporters": "30.0.5", - "@jest/test-result": "30.0.5", - "@jest/transform": "30.0.5", - "@jest/types": "30.0.5", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "ansi-escapes": "^4.3.2", - "chalk": "^4.1.2", - "ci-info": "^4.2.0", - "exit-x": "^0.2.2", - "graceful-fs": "^4.2.11", - "jest-changed-files": "30.0.5", - "jest-config": "30.0.5", - "jest-haste-map": "30.0.5", - "jest-message-util": "30.0.5", - "jest-regex-util": "30.0.1", - "jest-resolve": "30.0.5", - "jest-resolve-dependencies": "30.0.5", - "jest-runner": "30.0.5", - "jest-runtime": "30.0.5", - "jest-snapshot": "30.0.5", - "jest-util": "30.0.5", - "jest-validate": "30.0.5", - "jest-watcher": "30.0.5", - "micromatch": "^4.0.8", - "pretty-format": "30.0.5", - "slash": "^3.0.0" + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -699,1194 +718,3032 @@ } } }, - "node_modules/@jest/diff-sequences": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz", - "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==", + "node_modules/@jest/core/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/environment": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.0.5.tgz", - "integrity": "sha512-aRX7WoaWx1oaOkDQvCWImVQ8XNtdv5sEWgk4gxR6NXb7WBUnL5sRak4WRzIQRZ1VTWPvV4VI4mgGjNL9TeKMYA==", + "node_modules/@jest/core/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/fake-timers": "30.0.5", - "@jest/types": "30.0.5", - "@types/node": "*", - "jest-mock": "30.0.5" + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/expect": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.0.5.tgz", - "integrity": "sha512-6udac8KKrtTtC+AXZ2iUN/R7dp7Ydry+Fo6FPFnDG54wjVMnb6vW/XNlf7Xj8UDjAE3aAVAsR4KFyKk3TCXmTA==", + "node_modules/@jest/core/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "expect": "30.0.5", - "jest-snapshot": "30.0.5" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/expect-utils": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.0.5.tgz", - "integrity": "sha512-F3lmTT7CXWYywoVUGTCmom0vXq3HTTkaZyTAzIy+bXSBizB7o5qzlC9VCtq0arOa8GqmNsbg/cE9C6HLn7Szew==", + "node_modules/@jest/core/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/core/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/core/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/core/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "@jest/get-type": "30.0.1" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": ">=8" } }, - "node_modules/@jest/fake-timers": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.0.5.tgz", - "integrity": "sha512-ZO5DHfNV+kgEAeP3gK3XlpJLL4U3Sz6ebl/n68Uwt64qFFs5bv4bfEEjyRGK5uM0C90ewooNgFuKMdkbEoMEXw==", + "node_modules/@jest/core/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.0.5", - "@sinonjs/fake-timers": "^13.0.0", + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", "@types/node": "*", - "jest-message-util": "30.0.5", - "jest-mock": "30.0.5", - "jest-util": "30.0.5" + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/@jest/get-type": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.0.1.tgz", - "integrity": "sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw==", + "node_modules/@jest/core/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/globals": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.0.5.tgz", - "integrity": "sha512-7oEJT19WW4oe6HR7oLRvHxwlJk2gev0U9px3ufs8sX9PoD1Eza68KF0/tlN7X0dq/WVsBScXQGgCldA1V9Y/jA==", + "node_modules/@jest/core/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.0.5", - "@jest/expect": "30.0.5", - "@jest/types": "30.0.5", - "jest-mock": "30.0.5" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/pattern": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", - "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", + "node_modules/@jest/core/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", - "jest-regex-util": "30.0.1" + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/reporters": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.0.5.tgz", - "integrity": "sha512-mafft7VBX4jzED1FwGC1o/9QUM2xebzavImZMeqnsklgcyxBto8mV4HzNSzUrryJ+8R9MFOM3HgYuDradWR+4g==", + "node_modules/@jest/core/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/@jest/core/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "30.0.5", - "@jest/test-result": "30.0.5", - "@jest/transform": "30.0.5", - "@jest/types": "30.0.5", - "@jridgewell/trace-mapping": "^0.3.25", - "@types/node": "*", - "chalk": "^4.1.2", - "collect-v8-coverage": "^1.0.2", - "exit-x": "^0.2.2", - "glob": "^10.3.10", - "graceful-fs": "^4.2.11", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^5.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "30.0.5", - "jest-util": "30.0.5", - "jest-worker": "30.0.5", - "slash": "^3.0.0", - "string-length": "^4.0.2", - "v8-to-istanbul": "^9.0.1" + "has-flag": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + "node": ">=10" }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/@jest/schemas": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", - "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", + "node_modules/@jest/core/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "@sinclair/typebox": "^0.34.0" + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@jest/snapshot-utils": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.0.5.tgz", - "integrity": "sha512-XcCQ5qWHLvi29UUrowgDFvV4t7ETxX91CbDczMnoqXPOIcZOxyNdSjm6kV5XMc8+HkxfRegU/MUmnTbJRzGrUQ==", + "node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.0.5", - "chalk": "^4.1.2", - "graceful-fs": "^4.2.11", - "natural-compare": "^1.4.0" + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/source-map": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz", - "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==", + "node_modules/@jest/environment/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "callsites": "^3.1.0", - "graceful-fs": "^4.2.11" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/test-result": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.0.5.tgz", - "integrity": "sha512-wPyztnK0gbDMQAJZ43tdMro+qblDHH1Ru/ylzUo21TBKqt88ZqnKKK2m30LKmLLoKtR2lxdpCC/P3g1vfKcawQ==", + "node_modules/@jest/environment/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "30.0.5", - "@jest/types": "30.0.5", - "@types/istanbul-lib-coverage": "^2.0.6", - "collect-v8-coverage": "^1.0.2" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/test-sequencer": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.0.5.tgz", - "integrity": "sha512-Aea/G1egWoIIozmDD7PBXUOxkekXl7ueGzrsGGi1SbeKgQqCYCIf+wfbflEbf2LiPxL8j2JZGLyrzZagjvW4YQ==", + "node_modules/@jest/environment/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/test-result": "30.0.5", - "graceful-fs": "^4.2.11", - "jest-haste-map": "30.0.5", - "slash": "^3.0.0" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/transform": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.0.5.tgz", - "integrity": "sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==", + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.27.4", - "@jest/types": "30.0.5", - "@jridgewell/trace-mapping": "^0.3.25", - "babel-plugin-istanbul": "^7.0.0", - "chalk": "^4.1.2", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.11", - "jest-haste-map": "30.0.5", - "jest-regex-util": "30.0.1", - "jest-util": "30.0.5", - "micromatch": "^4.0.8", - "pirates": "^4.0.7", - "slash": "^3.0.0", - "write-file-atomic": "^5.0.1" + "jest-get-type": "^29.6.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/types": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz", - "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==", + "node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/pattern": "30.0.1", - "@jest/schemas": "30.0.5", - "@types/istanbul-lib-coverage": "^2.0.6", - "@types/istanbul-reports": "^3.0.4", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "@types/yargs": "^17.0.33", - "chalk": "^4.1.2" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "node_modules/@jest/fake-timers/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "node_modules/@jest/fake-timers/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, "engines": { - "node": ">=6.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, "license": "MIT" }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.30", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", - "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "node_modules/@jest/fake-timers/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" + "engines": { + "node": ">=8" } }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", - "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==", + "node_modules/@jest/fake-timers/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", - "optional": true, "dependencies": { - "@emnapi/core": "^1.4.3", - "@emnapi/runtime": "^1.4.3", - "@tybys/wasm-util": "^0.10.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, "engines": { - "node": ">=14" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@pkgr/core": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz", - "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", + "node_modules/@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, - "funding": { - "url": "https://opencollective.com/pkgr" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@sinclair/typebox": { - "version": "0.34.40", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz", - "integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "node_modules/@jest/globals/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "type-detect": "4.0.8" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "node_modules/@jest/globals/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@sinonjs/commons": "^3.0.1" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "node_modules/@jest/globals/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, "license": "MIT" }, - "node_modules/@tybys/wasm-util": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz", - "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==", + "node_modules/@jest/pattern": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", + "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { - "tslib": "^2.4.0" + "@types/node": "*", + "jest-regex-util": "30.0.1" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "node_modules/@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } } }, - "node_modules/@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "node_modules/@jest/reporters/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/types": "^7.0.0" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "node_modules/@jest/reporters/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@types/babel__traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", - "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "node_modules/@jest/reporters/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/types": "^7.28.2" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "node_modules/@jest/reporters/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, "license": "MIT" }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "node_modules/@jest/reporters/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, - "license": "MIT", + "license": "BSD-3-Clause", "dependencies": { - "@types/istanbul-lib-coverage": "*" + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "node_modules/@jest/reporters/node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, - "license": "MIT", + "license": "BSD-3-Clause", "dependencies": { - "@types/istanbul-lib-report": "*" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/@types/jest": { - "version": "30.0.0", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz", - "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==", + "node_modules/@jest/reporters/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", - "dependencies": { - "expect": "^30.0.0", - "pretty-format": "^30.0.0" + "engines": { + "node": ">=8" } }, - "node_modules/@types/node": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz", - "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==", + "node_modules/@jest/reporters/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.10.0" + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "node_modules/@jest/reporters/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/@types/yargs": { - "version": "17.0.33", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", - "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "node_modules/@jest/reporters/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@types/yargs-parser": "*" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC" - }, - "node_modules/@unrs/resolver-binding-android-arm-eabi": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz", - "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==", - "cpu": [ - "arm" - ], + "node_modules/@jest/reporters/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@unrs/resolver-binding-android-arm64": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz", - "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@unrs/resolver-binding-darwin-arm64": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz", - "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@unrs/resolver-binding-darwin-x64": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz", - "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@unrs/resolver-binding-freebsd-x64": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz", - "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==", - "cpu": [ - "x64" - ], + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/reporters/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz", - "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==", - "cpu": [ - "arm" - ], + "license": "ISC" + }, + "node_modules/@jest/reporters/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz", - "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==", - "cpu": [ - "arm" - ], + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/@jest/reporters/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz", - "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==", - "cpu": [ - "arm64" - ], + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@jest/schemas": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", + "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm64-musl": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz", - "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==", - "cpu": [ - "arm64" - ], + "peer": true, + "dependencies": { + "@sinclair/typebox": "^0.34.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz", - "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==", - "cpu": [ - "ppc64" - ], + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz", - "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==", - "cpu": [ - "riscv64" - ], + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-riscv64-musl": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz", - "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==", - "cpu": [ - "riscv64" - ], + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz", - "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==", - "cpu": [ - "s390x" - ], + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-x64-gnu": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz", - "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==", - "cpu": [ - "x64" - ], + "license": "MIT" + }, + "node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-x64-musl": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz", - "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==", - "cpu": [ - "x64" - ], + "dependencies": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-wasm32-wasi": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz", - "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==", - "cpu": [ - "wasm32" - ], + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "optional": true, "dependencies": { - "@napi-rs/wasm-runtime": "^0.2.11" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": ">=14.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz", - "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==", - "cpu": [ - "arm64" - ], + "node_modules/@jest/test-sequencer/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz", - "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==", - "cpu": [ - "ia32" - ], + "license": "MIT" + }, + "node_modules/@jest/test-sequencer/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@unrs/resolver-binding-win32-x64-msvc": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz", - "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==", - "cpu": [ - "x64" + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } ], - "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "engines": { + "node": ">=8" + } }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "node_modules/@jest/test-sequencer/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", - "bin": { - "acorn": "bin/acorn" + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": ">=0.4.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "node_modules/@jest/test-sequencer/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, "engines": { - "node": ">=0.4.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "node_modules/@jest/test-sequencer/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "type-fest": "^0.21.3" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "node_modules/@jest/test-sequencer/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", - "engines": { - "node": ">=12" + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/@jest/test-sequencer/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "node_modules/@jest/transform": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.0.5.tgz", + "integrity": "sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==", "dev": true, - "license": "ISC", + "license": "MIT", + "optional": true, + "peer": true, "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "@babel/core": "^7.27.4", + "@jest/types": "30.0.5", + "@jridgewell/trace-mapping": "^0.3.25", + "babel-plugin-istanbul": "^7.0.0", + "chalk": "^4.1.2", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.0.5", + "jest-regex-util": "30.0.1", + "jest-util": "30.0.5", + "micromatch": "^4.0.8", + "pirates": "^4.0.7", + "slash": "^3.0.0", + "write-file-atomic": "^5.0.1" }, "engines": { - "node": ">= 8" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "node_modules/@jest/types": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz", + "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==", "dev": true, - "license": "MIT" - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@jest/pattern": "30.0.1", + "@jest/schemas": "30.0.5", + "@types/istanbul-lib-coverage": "^2.0.6", + "@types/istanbul-reports": "^3.0.4", + "@types/node": "*", + "@types/yargs": "^17.0.33", + "chalk": "^4.1.2" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.30", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", + "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.34.40", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz", + "integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", + "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.2" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "29.5.14", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz", + "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "node_modules/@types/node": { + "version": "24.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz", + "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.10.0" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/yargs": { + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC", + "optional": true, + "peer": true + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/babel-jest": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.5.tgz", + "integrity": "sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@jest/transform": "30.0.5", + "@types/babel__core": "^7.20.5", + "babel-plugin-istanbul": "^7.0.0", + "babel-preset-jest": "30.0.1", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "slash": "^3.0.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz", + "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==", + "dev": true, + "license": "BSD-3-Clause", + "optional": true, + "peer": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-instrument": "^6.0.2", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz", + "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@babel/template": "^7.27.2", + "@babel/types": "^7.27.3", + "@types/babel__core": "^7.20.5" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", + "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + }, + "peerDependencies": { + "@babel/core": "^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/babel-preset-jest": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz", + "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "babel-plugin-jest-hoist": "30.0.1", + "babel-preset-current-node-syntax": "^1.1.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.25.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", + "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001733", + "electron-to-chromium": "^1.5.199", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001735", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz", + "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", + "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/create-jest/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/create-jest/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/dedent": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", + "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.203", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz", + "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==", + "dev": true, + "license": "ISC" + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execa/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/expect/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/expect/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-changed-files/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-changed-files/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-changed-files/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-changed-files/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-changed-files/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "sprintf-js": "~1.0.2" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/babel-jest": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.5.tgz", - "integrity": "sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==", + "node_modules/jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/transform": "30.0.5", - "@types/babel__core": "^7.20.5", - "babel-plugin-istanbul": "^7.0.0", - "babel-preset-jest": "30.0.1", - "chalk": "^4.1.2", - "graceful-fs": "^4.2.11", - "slash": "^3.0.0" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.11.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/babel-plugin-istanbul": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz", - "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==", + "node_modules/jest-circus/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-instrument": "^6.0.2", - "test-exclude": "^6.0.0" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": ">=12" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/babel-plugin-jest-hoist": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz", - "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==", + "node_modules/jest-circus/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/template": "^7.27.2", - "@babel/types": "^7.27.3", - "@types/babel__core": "^7.20.5" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/babel-preset-current-node-syntax": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", - "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", + "node_modules/jest-circus/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-circus/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-circus/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, - "peerDependencies": { - "@babel/core": "^7.0.0 || ^8.0.0-0" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/babel-preset-jest": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz", - "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==", + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "babel-plugin-jest-hoist": "30.0.1", - "babel-preset-current-node-syntax": "^1.1.0" + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { - "@babel/core": "^7.11.0" + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } } }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "node_modules/jest-cli/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "node_modules/jest-cli/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "fill-range": "^7.1.1" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/browserslist": { - "version": "4.25.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", - "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", + "node_modules/jest-cli/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-cli/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, { "type": "github", - "url": "https://github.com/sponsors/ai" + "url": "https://github.com/sponsors/sibiraj-s" } ], "license": "MIT", - "dependencies": { - "caniuse-lite": "^1.0.30001733", - "electron-to-chromium": "^1.5.199", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.3" - }, - "bin": { - "browserslist": "cli.js" - }, "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + "node": ">=8" } }, - "node_modules/bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "node_modules/jest-cli/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "fast-json-stable-stringify": "2.x" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "node_modules/jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-config/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "Apache-2.0", + "license": "MIT", "dependencies": { - "node-int64": "^0.4.0" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "node_modules/jest-config/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", - "peer": true + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "node_modules/jest-config/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "node_modules/jest-config/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-config/node_modules/babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "license": "MIT", + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" } }, - "node_modules/caniuse-lite": { - "version": "1.0.30001735", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz", - "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==", + "node_modules/jest-config/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/jest-config/node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "node_modules/jest-config/node_modules/babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "license": "MIT", - "peer": true, + "dependencies": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/ci-info": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", - "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", + "node_modules/jest-config/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, "funding": [ { @@ -1899,1282 +3756,1502 @@ "node": ">=8" } }, - "node_modules/cjs-module-lexer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz", - "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==", - "dev": true, - "license": "MIT" - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "node_modules/jest-config/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, - "license": "ISC", - "peer": true, + "license": "BSD-3-Clause", "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/jest-config/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", - "peer": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/cliui/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "node_modules/jest-config/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", - "peer": true + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/jest-config/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/jest-config/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "ansi-regex": "^5.0.1" + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/jest-config/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/jest-config/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "node_modules/jest-config/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "MIT", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=7.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "node_modules/jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "license": "MIT", "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "detect-newline": "^3.0.0" }, "engines": { - "node": ">= 8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "node_modules/jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "license": "MIT", "dependencies": { - "ms": "^2.1.3" + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/dedent": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", - "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "node_modules/jest-each/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" + "dependencies": { + "@sinclair/typebox": "^0.27.8" }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "node_modules/jest-each/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "peer": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, "engines": { - "node": ">=0.10.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "node_modules/jest-each/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, + "license": "MIT" + }, + "node_modules/jest-each/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", - "peer": true, "engines": { "node": ">=8" } }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "node_modules/jest-each/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, "engines": { - "node": ">=0.3.1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/electron-to-chromium": { - "version": "1.5.203", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz", - "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==", + "node_modules/jest-environment-node/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "ISC" + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "node_modules/jest-environment-node/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, - "funding": { - "url": "https://github.com/sindresorhus/emittery?sponsor=1" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "node_modules/jest-environment-node/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, "license": "MIT" }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "node_modules/jest-environment-node/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-node/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "is-arrayish": "^0.2.1" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "license": "MIT", "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "node_modules/jest-haste-map": { + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.0.5.tgz", + "integrity": "sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@jest/types": "30.0.5", + "@types/node": "*", + "anymatch": "^3.1.3", + "fb-watchman": "^2.0.2", + "graceful-fs": "^4.2.11", + "jest-regex-util": "30.0.1", + "jest-util": "30.0.5", + "jest-worker": "30.0.5", + "micromatch": "^4.0.8", + "walker": "^1.0.8" + }, "engines": { - "node": ">=8" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.3" } }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, - "license": "BSD-2-Clause", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=4" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, - "license": "ISC", - "peer": true + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/exit-x": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz", - "integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==", + "node_modules/jest-message-util/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "peer": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, "engines": { - "node": ">= 0.8.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/expect": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/expect/-/expect-30.0.5.tgz", - "integrity": "sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==", + "node_modules/jest-message-util/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/expect-utils": "30.0.5", - "@jest/get-type": "30.0.1", - "jest-matcher-utils": "30.0.5", - "jest-message-util": "30.0.5", - "jest-mock": "30.0.5", - "jest-util": "30.0.5" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "node_modules/jest-message-util/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, "license": "MIT" }, - "node_modules/fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, - "license": "Apache-2.0", + "license": "MIT", "dependencies": { - "bser": "2.1.1" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "node_modules/jest-mock/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", "dependencies": { - "to-regex-range": "^5.0.1" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "node_modules/jest-mock/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-mock/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-mock/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "node_modules/jest-mock/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, - "license": "ISC" + "license": "MIT", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "node_modules/jest-regex-util": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", + "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", "dev": true, - "hasInstallScript": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "peer": true, "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "node_modules/jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, "engines": { - "node": ">=6.9.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, - "license": "ISC", - "peer": true, + "license": "MIT", + "dependencies": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + }, "engines": { - "node": "6.* || 8.* || >= 10.*" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "node_modules/jest-resolve/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "peer": true, - "engines": { - "node": ">=10" + "dependencies": { + "@sinclair/typebox": "^0.27.8" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "node_modules/jest-resolve/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "node_modules/jest-resolve/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "ISC" + "license": "MIT" }, - "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "node_modules/jest-resolve/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-resolve/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": ">=0.4.7" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { - "uglify-js": "^3.1.4" + "fsevents": "^2.3.2" } }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/jest-resolve/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "node_modules/jest-resolve/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", - "peer": true + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "node_modules/jest-resolve/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, - "license": "Apache-2.0", - "peer": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, "engines": { - "node": ">=10.17.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/import-local": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", - "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "node_modules/jest-resolve/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "node_modules/jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, "engines": { - "node": ">=0.8.19" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "node_modules/jest-runner/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "once": "^1.3.0", - "wrappy": "1" + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "node_modules/jest-runner/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "node_modules/jest-runner/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "node_modules/jest-runner/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "MIT", + "license": "MIT" + }, + "node_modules/jest-runner/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, "engines": { - "node": ">=0.12.0" + "node": ">=8" } }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "node_modules/jest-runner/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", - "peer": true, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "node_modules/jest-runner/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, "engines": { "node": ">=8" } }, - "node_modules/istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "node_modules/jest-runner/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "node_modules/jest-runner/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runner/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "node_modules/jest-runner/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, - "license": "BSD-3-Clause", - "peer": true, + "license": "MIT", "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/istanbul-lib-source-maps": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", - "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", + "node_modules/jest-runner/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, - "license": "BSD-3-Clause", - "peer": true, + "license": "ISC" + }, + "node_modules/jest-runner/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.23", - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/istanbul-reports": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", - "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "node_modules/jest-runner/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "BSD-3-Clause", - "peer": true, + "license": "ISC", "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" }, "engines": { - "node": ">=8" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "node_modules/jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest/-/jest-30.0.5.tgz", - "integrity": "sha512-y2mfcJywuTUkvLm2Lp1/pFX8kTgMO5yyQGq/Sk/n2mN7XWYp4JsCZ/QXW34M8YScgk8bPZlREH04f6blPnoHnQ==", + "node_modules/jest-runtime/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/core": "30.0.5", - "@jest/types": "30.0.5", - "import-local": "^3.2.0", - "jest-cli": "30.0.5" - }, - "bin": { - "jest": "bin/jest.js" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-changed-files": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz", - "integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==", + "node_modules/jest-runtime/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "execa": "^5.1.1", - "jest-util": "30.0.5", - "p-limit": "^3.1.0" + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-circus": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.0.5.tgz", - "integrity": "sha512-h/sjXEs4GS+NFFfqBDYT7y5Msfxh04EwWLhQi0F8kuWpe+J/7tICSlswU8qvBqumR3kFgHbfu7vU6qruWWBPug==", + "node_modules/jest-runtime/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.0.5", - "@jest/expect": "30.0.5", - "@jest/test-result": "30.0.5", - "@jest/types": "30.0.5", + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", "@types/node": "*", - "chalk": "^4.1.2", - "co": "^4.6.0", - "dedent": "^1.6.0", - "is-generator-fn": "^2.1.0", - "jest-each": "30.0.5", - "jest-matcher-utils": "30.0.5", - "jest-message-util": "30.0.5", - "jest-runtime": "30.0.5", - "jest-snapshot": "30.0.5", - "jest-util": "30.0.5", - "p-limit": "^3.1.0", - "pretty-format": "30.0.5", - "pure-rand": "^7.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.6" + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-cli": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.0.5.tgz", - "integrity": "sha512-Sa45PGMkBZzF94HMrlX4kUyPOwUpdZasaliKN3mifvDmkhLYqLLg8HQTzn6gq7vJGahFYMQjXgyJWfYImKZzOw==", + "node_modules/jest-runtime/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "MIT", - "peer": true, + "license": "MIT" + }, + "node_modules/jest-runtime/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "@jest/core": "30.0.5", - "@jest/test-result": "30.0.5", - "@jest/types": "30.0.5", - "chalk": "^4.1.2", - "exit-x": "^0.2.2", - "import-local": "^3.2.0", - "jest-config": "30.0.5", - "jest-util": "30.0.5", - "jest-validate": "30.0.5", - "yargs": "^17.7.2" - }, - "bin": { - "jest": "bin/jest.js" + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } + "node": ">=8" } }, - "node_modules/jest-config": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.0.5.tgz", - "integrity": "sha512-aIVh+JNOOpzUgzUnPn5FLtyVnqc3TQHVMupYtyeURSb//iLColiMIR8TxCIDKyx9ZgjKnXGucuW68hCxgbrwmA==", + "node_modules/jest-runtime/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", - "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runtime/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "@babel/core": "^7.27.4", - "@jest/get-type": "30.0.1", - "@jest/pattern": "30.0.1", - "@jest/test-sequencer": "30.0.5", - "@jest/types": "30.0.5", - "babel-jest": "30.0.5", - "chalk": "^4.1.2", - "ci-info": "^4.2.0", - "deepmerge": "^4.3.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.11", - "jest-circus": "30.0.5", - "jest-docblock": "30.0.1", - "jest-environment-node": "30.0.5", - "jest-regex-util": "30.0.1", - "jest-resolve": "30.0.5", - "jest-runner": "30.0.5", - "jest-util": "30.0.5", - "jest-validate": "30.0.5", - "micromatch": "^4.0.8", - "parse-json": "^5.2.0", - "pretty-format": "30.0.5", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "@types/node": "*", - "esbuild-register": ">=3.4.0", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "esbuild-register": { - "optional": true - }, - "ts-node": { - "optional": true - } + "node": ">=8" } }, - "node_modules/jest-diff": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.0.5.tgz", - "integrity": "sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==", + "node_modules/jest-runtime/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/diff-sequences": "30.0.1", - "@jest/get-type": "30.0.1", - "chalk": "^4.1.2", - "pretty-format": "30.0.5" + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/jest-docblock": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz", - "integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==", + "node_modules/jest-runtime/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "license": "MIT", - "peer": true, - "dependencies": { - "detect-newline": "^3.1.0" - }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-each": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.0.5.tgz", - "integrity": "sha512-dKjRsx1uZ96TVyejD3/aAWcNKy6ajMaN531CwWIsrazIqIoXI9TnnpPlkrEYku/8rkS3dh2rbH+kMOyiEIv0xQ==", + "node_modules/jest-runtime/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/get-type": "30.0.1", - "@jest/types": "30.0.5", - "chalk": "^4.1.2", - "jest-util": "30.0.5", - "pretty-format": "30.0.5" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-environment-node": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.0.5.tgz", - "integrity": "sha512-ppYizXdLMSvciGsRsMEnv/5EFpvOdXBaXRBzFUDPWrsfmog4kYrOGWXarLllz6AXan6ZAA/kYokgDWuos1IKDA==", + "node_modules/jest-runtime/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/environment": "30.0.5", - "@jest/fake-timers": "30.0.5", - "@jest/types": "30.0.5", "@types/node": "*", - "jest-mock": "30.0.5", - "jest-util": "30.0.5", - "jest-validate": "30.0.5" + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-haste-map": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.0.5.tgz", - "integrity": "sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==", + "node_modules/jest-runtime/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/jest-runtime/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.0.5", - "@types/node": "*", - "anymatch": "^3.1.3", - "fb-watchman": "^2.0.2", - "graceful-fs": "^4.2.11", - "jest-regex-util": "30.0.1", - "jest-util": "30.0.5", - "jest-worker": "30.0.5", - "micromatch": "^4.0.8", - "walker": "^1.0.8" + "has-flag": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": ">=10" }, - "optionalDependencies": { - "fsevents": "^2.3.3" + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jest-leak-detector": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.0.5.tgz", - "integrity": "sha512-3Uxr5uP8jmHMcsOtYMRB/zf1gXN3yUIc+iPorhNETG54gErFIiUhLvyY/OggYpSMOEYqsmRxmuU4ZOoX5jpRFg==", + "node_modules/jest-runtime/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "MIT", - "peer": true, + "license": "ISC", "dependencies": { - "@jest/get-type": "30.0.1", - "pretty-format": "30.0.5" + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/jest-matcher-utils": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.0.5.tgz", - "integrity": "sha512-uQgGWt7GOrRLP1P7IwNWwK1WAQbq+m//ZY0yXygyfWp0rJlksMSLQAA4wYQC3b6wl3zfnchyTx+k3HZ5aPtCbQ==", + "node_modules/jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/get-type": "30.0.1", - "chalk": "^4.1.2", - "jest-diff": "30.0.5", - "pretty-format": "30.0.5" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-message-util": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.0.5.tgz", - "integrity": "sha512-NAiDOhsK3V7RU0Aa/HnrQo+E4JlbarbmI3q6Pi4KcxicdtjV82gcIUrejOtczChtVQR4kddu1E1EJlW6EN9IyA==", + "node_modules/jest-snapshot/node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@jest/types": "30.0.5", - "@types/stack-utils": "^2.0.3", - "chalk": "^4.1.2", - "graceful-fs": "^4.2.11", - "micromatch": "^4.0.8", - "pretty-format": "30.0.5", + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", "slash": "^3.0.0", - "stack-utils": "^2.0.6" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-mock": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz", - "integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==", + "node_modules/jest-snapshot/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.0.5", + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", "@types/node": "*", - "jest-util": "30.0.5" + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "node_modules/jest-snapshot/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "jest-resolve": "*" + "license": "MIT" + }, + "node_modules/jest-snapshot/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" }, - "peerDependenciesMeta": { - "jest-resolve": { - "optional": true - } + "engines": { + "node": ">=8" } }, - "node_modules/jest-regex-util": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", - "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", + "node_modules/jest-snapshot/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": ">=8" } }, - "node_modules/jest-resolve": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.0.5.tgz", - "integrity": "sha512-d+DjBQ1tIhdz91B79mywH5yYu76bZuE96sSbxj8MkjWVx5WNdt1deEFRONVL4UkKLSrAbMkdhb24XN691yDRHg==", + "node_modules/jest-snapshot/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, - "license": "MIT", + "license": "BSD-3-Clause", "dependencies": { - "chalk": "^4.1.2", - "graceful-fs": "^4.2.11", - "jest-haste-map": "30.0.5", - "jest-pnp-resolver": "^1.2.3", - "jest-util": "30.0.5", - "jest-validate": "30.0.5", - "slash": "^3.0.0", - "unrs-resolver": "^1.7.11" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": ">=8" } }, - "node_modules/jest-resolve-dependencies": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.0.5.tgz", - "integrity": "sha512-/xMvBR4MpwkrHW4ikZIWRttBBRZgWK4d6xt3xW1iRDSKt4tXzYkMkyPfBnSCgv96cpkrctfXs6gexeqMYqdEpw==", + "node_modules/jest-snapshot/node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "jest-regex-util": "30.0.1", - "jest-snapshot": "30.0.5" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/jest-runner": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.0.5.tgz", - "integrity": "sha512-JcCOucZmgp+YuGgLAXHNy7ualBx4wYSgJVWrYMRBnb79j9PD0Jxh0EHvR5Cx/r0Ce+ZBC4hCdz2AzFFLl9hCiw==", + "node_modules/jest-snapshot/node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/console": "30.0.5", - "@jest/environment": "30.0.5", - "@jest/test-result": "30.0.5", - "@jest/transform": "30.0.5", - "@jest/types": "30.0.5", + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", "@types/node": "*", - "chalk": "^4.1.2", - "emittery": "^0.13.1", - "exit-x": "^0.2.2", - "graceful-fs": "^4.2.11", - "jest-docblock": "30.0.1", - "jest-environment-node": "30.0.5", - "jest-haste-map": "30.0.5", - "jest-leak-detector": "30.0.5", - "jest-message-util": "30.0.5", - "jest-resolve": "30.0.5", - "jest-runtime": "30.0.5", - "jest-util": "30.0.5", - "jest-watcher": "30.0.5", - "jest-worker": "30.0.5", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-snapshot/node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true, + "license": "MIT", "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.0.5.tgz", - "integrity": "sha512-7oySNDkqpe4xpX5PPiJTe5vEa+Ak/NnNz2bGYZrA1ftG3RL3EFlHaUkA1Cjx+R8IhK0Vg43RML5mJedGTPNz3A==", + "node_modules/jest-snapshot/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.0.5", - "@jest/fake-timers": "30.0.5", - "@jest/globals": "30.0.5", - "@jest/source-map": "30.0.1", - "@jest/test-result": "30.0.5", - "@jest/transform": "30.0.5", - "@jest/types": "30.0.5", + "@jest/types": "^29.6.3", "@types/node": "*", - "chalk": "^4.1.2", - "cjs-module-lexer": "^2.1.0", - "collect-v8-coverage": "^1.0.2", - "glob": "^10.3.10", - "graceful-fs": "^4.2.11", - "jest-haste-map": "30.0.5", - "jest-message-util": "30.0.5", - "jest-mock": "30.0.5", - "jest-regex-util": "30.0.1", - "jest-resolve": "30.0.5", - "jest-snapshot": "30.0.5", - "jest-util": "30.0.5", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.0.5.tgz", - "integrity": "sha512-T00dWU/Ek3LqTp4+DcW6PraVxjk28WY5Ua/s+3zUKSERZSNyxTqhDXCWKG5p2HAJ+crVQ3WJ2P9YVHpj1tkW+g==", + "node_modules/jest-snapshot/node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.27.4", - "@babel/generator": "^7.27.5", - "@babel/plugin-syntax-jsx": "^7.27.1", - "@babel/plugin-syntax-typescript": "^7.27.1", - "@babel/types": "^7.27.3", - "@jest/expect-utils": "30.0.5", - "@jest/get-type": "30.0.1", - "@jest/snapshot-utils": "30.0.5", - "@jest/transform": "30.0.5", - "@jest/types": "30.0.5", - "babel-preset-current-node-syntax": "^1.1.0", - "chalk": "^4.1.2", - "expect": "30.0.5", - "graceful-fs": "^4.2.11", - "jest-diff": "30.0.5", - "jest-matcher-utils": "30.0.5", - "jest-message-util": "30.0.5", - "jest-util": "30.0.5", - "pretty-format": "30.0.5", - "semver": "^7.7.2", - "synckit": "^0.11.8" + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot/node_modules/semver": { @@ -3190,12 +5267,51 @@ "node": ">=10" } }, + "node_modules/jest-snapshot/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/jest-snapshot/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/jest-util": { "version": "30.0.5", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz", "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "@jest/types": "30.0.5", "@types/node": "*", @@ -3214,6 +5330,8 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, "engines": { "node": ">=12" }, @@ -3222,23 +5340,61 @@ } }, "node_modules/jest-validate": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.0.5.tgz", - "integrity": "sha512-ouTm6VFHaS2boyl+k4u+Qip4TSH7Uld5tyD8psQ8abGgt2uYYB8VwVfAHWHjHc0NWmGGbwO5h0sCPOGHHevefw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/get-type": "30.0.1", - "@jest/types": "30.0.5", - "camelcase": "^6.3.0", - "chalk": "^4.1.2", + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "30.0.5" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-validate/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -3253,24 +5409,95 @@ } }, "node_modules/jest-watcher": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.0.5.tgz", - "integrity": "sha512-z9slj/0vOwBDBjN3L4z4ZYaA+pG56d6p3kTUhFRYGvXbXMWhXmb/FIxREZCD06DYUwDKKnj2T80+Pb71CQ0KEg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@jest/test-result": "30.0.5", - "@jest/types": "30.0.5", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "ansi-escapes": "^4.3.2", - "chalk": "^4.1.2", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", "emittery": "^0.13.1", - "jest-util": "30.0.5", - "string-length": "^4.0.2" + "jest-util": "^29.7.0", + "string-length": "^4.0.1" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-watcher/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-watcher/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-watcher/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-watcher/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watcher/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker": { @@ -3279,6 +5506,8 @@ "integrity": "sha512-ojRXsWzEP16NdUuBw/4H/zkZdHOa7MMYCk4E430l+8fELeLg/mqmMlRhjL7UNZvQrDmnovWZV4DxX03fZF48fQ==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "@types/node": "*", "@ungap/structured-clone": "^1.3.0", @@ -3296,6 +5525,8 @@ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -3306,6 +5537,44 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jest/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3345,8 +5614,7 @@ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", @@ -3361,6 +5629,16 @@ "node": ">=6" } }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -3376,8 +5654,7 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/locate-path": { "version": "5.0.0", @@ -3415,7 +5692,6 @@ "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "semver": "^7.5.3" }, @@ -3432,7 +5708,6 @@ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", - "peer": true, "bin": { "semver": "bin/semver.js" }, @@ -3484,25 +5759,21 @@ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=6" } }, "node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": "*" } }, "node_modules/minimist": { @@ -3515,16 +5786,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -3532,22 +5793,6 @@ "dev": true, "license": "MIT" }, - "node_modules/napi-postinstall": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", - "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", - "dev": true, - "license": "MIT", - "bin": { - "napi-postinstall": "lib/cli.js" - }, - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/napi-postinstall" - } - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -3592,7 +5837,6 @@ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "path-key": "^3.0.0" }, @@ -3616,7 +5860,6 @@ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -3682,20 +5925,12 @@ "node": ">=6" } }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -3739,29 +5974,12 @@ "node": ">=8" } }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true, - "license": "ISC" + "license": "MIT" }, "node_modules/picocolors": { "version": "1.1.1", @@ -3799,7 +6017,6 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "find-up": "^4.0.0" }, @@ -3808,20 +6025,40 @@ } }, "node_modules/pretty-format": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz", - "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/schemas": "30.0.5", - "ansi-styles": "^5.2.0", - "react-is": "^18.3.1" + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" }, "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/pretty-format/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, "node_modules/pretty-format/node_modules/ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", @@ -3835,10 +6072,24 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/pure-rand": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz", - "integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", "dev": true, "funding": [ { @@ -3872,18 +6123,37 @@ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/resolve-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "resolve-from": "^5.0.0" }, @@ -3901,6 +6171,16 @@ "node": ">=8" } }, + "node_modules/resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -3940,6 +6220,8 @@ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, "license": "ISC", + "optional": true, + "peer": true, "engines": { "node": ">=14" }, @@ -3947,6 +6229,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT" + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -3973,7 +6262,6 @@ "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -4005,7 +6293,6 @@ "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "char-regex": "^1.0.2", "strip-ansi": "^6.0.0" @@ -4014,51 +6301,7 @@ "node": ">=10" } }, - "node_modules/string-length/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-length/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", @@ -4073,54 +6316,7 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", @@ -4133,16 +6329,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -4159,7 +6345,6 @@ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=6" } @@ -4170,7 +6355,6 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=8" }, @@ -4191,20 +6375,17 @@ "node": ">=8" } }, - "node_modules/synckit": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", - "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, "license": "MIT", - "dependencies": { - "@pkgr/core": "^0.2.9" - }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": ">= 0.4" }, "funding": { - "url": "https://opencollective.com/synckit" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/test-exclude": { @@ -4222,52 +6403,6 @@ "node": ">=8" } }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/test-exclude/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -4411,14 +6546,6 @@ } } }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, - "license": "0BSD", - "optional": true - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -4435,7 +6562,6 @@ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, "license": "(MIT OR CC0-1.0)", - "peer": true, "engines": { "node": ">=10" }, @@ -4478,41 +6604,6 @@ "dev": true, "license": "MIT" }, - "node_modules/unrs-resolver": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", - "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "napi-postinstall": "^0.3.0" - }, - "funding": { - "url": "https://opencollective.com/unrs-resolver" - }, - "optionalDependencies": { - "@unrs/resolver-binding-android-arm-eabi": "1.11.1", - "@unrs/resolver-binding-android-arm64": "1.11.1", - "@unrs/resolver-binding-darwin-arm64": "1.11.1", - "@unrs/resolver-binding-darwin-x64": "1.11.1", - "@unrs/resolver-binding-freebsd-x64": "1.11.1", - "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1", - "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1", - "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1", - "@unrs/resolver-binding-linux-arm64-musl": "1.11.1", - "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1", - "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1", - "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1", - "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1", - "@unrs/resolver-binding-linux-x64-gnu": "1.11.1", - "@unrs/resolver-binding-linux-x64-musl": "1.11.1", - "@unrs/resolver-binding-wasm32-wasi": "1.11.1", - "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1", - "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1", - "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" - } - }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -4557,7 +6648,6 @@ "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", "dev": true, "license": "ISC", - "peer": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", @@ -4601,25 +6691,6 @@ "license": "MIT" }, "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", @@ -4637,64 +6708,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -4708,6 +6721,8 @@ "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", "dev": true, "license": "ISC", + "optional": true, + "peer": true, "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^4.0.1" @@ -4722,7 +6737,6 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, "license": "ISC", - "peer": true, "engines": { "node": ">=10" } @@ -4740,7 +6754,6 @@ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -4764,55 +6777,6 @@ "node": ">=12" } }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/package.json b/package.json index 52dad3b..a4db718 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,12 @@ }, "homepage": "https://github.com/slingr-stack/framework#readme", "devDependencies": { - "@types/jest": "^30.0.0", + "@types/jest": "^29.5.12", "@types/node": "^24.3.0", - "jest-circus": "^30.0.5", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", - "ts-jest": "^29.4.1", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.9.2" } diff --git a/tsconfig.json b/tsconfig.json index 95c61da..1d6be61 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -41,6 +41,5 @@ "moduleDetection": "force", "skipLibCheck": true, "experimentalDecorators": true - }, - "include": ["**/*"] + } } From a2978919e2c0a2d1e5f69463a94392ec2a7b7a2f Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Tue, 19 Aug 2025 12:02:25 -0300 Subject: [PATCH 034/254] Basic modelling and validation features --- .gitignore | 2 + .vscode/launch.json | 28 ++++++++++++ package-lock.json | 31 ++++++++++++++ package.json | 11 +++-- src/framework/decorators/FieldDecorator.ts | 36 ++++++++++++++++ src/framework/decorators/ModelDecorator.ts | 11 +++++ src/framework/model/Field.ts | 10 +++++ src/framework/model/Model.ts | 50 ++++++++++++++++++++++ src/model/Person.ts | 36 ++++++++++++++++ src/test/person.test.ts | 46 ++++++++++++++++++++ tsconfig.json | 37 ++++------------ 11 files changed, 265 insertions(+), 33 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 src/framework/decorators/FieldDecorator.ts create mode 100644 src/framework/decorators/ModelDecorator.ts create mode 100644 src/framework/model/Field.ts create mode 100644 src/framework/model/Model.ts create mode 100644 src/model/Person.ts create mode 100644 src/test/person.test.ts diff --git a/.gitignore b/.gitignore index 856f4ee..f42befc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /.idea/ node_modules/ + +dist/ \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..f064113 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Debug Jest Tests", + "program": "${workspaceFolder}/node_modules/jest/bin/jest.js", + "args": ["--runInBand"], + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "skipFiles": ["/**", "node_modules/**"], + "env": { + "NODE_ENV": "test" + } + }, + { + "type": "node", + "request": "launch", + "name": "Debug Current File", + "program": "${file}", + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "skipFiles": ["/**", "node_modules/**"] + } + ] +} diff --git a/package-lock.json b/package-lock.json index e90452e..c4b29f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "framework", "version": "1.0.0", "license": "ISC", + "dependencies": { + "class-validator": "^0.14.2" + }, "devDependencies": { "@types/jest": "^29.5.12", "@types/node": "^24.3.0", @@ -1943,6 +1946,11 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/validator": { + "version": "13.15.2", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.2.tgz", + "integrity": "sha512-y7pa/oEJJ4iGYBxOpfAKn5b9+xuihvzDVnC/OSvlVnGxVg0pOqmjiMafiJ1KVNQEaPZf9HsEp5icEwGg8uIe5Q==" + }, "node_modules/@types/yargs": { "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", @@ -2361,6 +2369,16 @@ "dev": true, "license": "MIT" }, + "node_modules/class-validator": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.2.tgz", + "integrity": "sha512-3kMVRF2io8N8pY1IFIXlho9r8IPUUIfHe2hYVtiebvAzU2XeQFXTv+XI4WX+TnXmtwXMDcjngcpkiPM0O9PvLw==", + "dependencies": { + "@types/validator": "^13.11.8", + "libphonenumber-js": "^1.11.1", + "validator": "^13.9.0" + } + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -5649,6 +5667,11 @@ "node": ">=6" } }, + "node_modules/libphonenumber-js": { + "version": "1.12.12", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.12.tgz", + "integrity": "sha512-aWVR6xXYYRvnK0v/uIwkf5Lthq9Jpn0N8TISW/oDTWlYB2sOimuiLn9Q26aUw4KxkJoiT8ACdiw44Y8VwKFIfQ==" + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -6657,6 +6680,14 @@ "node": ">=10.12.0" } }, + "node_modules/validator": { + "version": "13.15.15", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz", + "integrity": "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", diff --git a/package.json b/package.json index a4db718..c156057 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,16 @@ }, "homepage": "https://github.com/slingr-stack/framework#readme", "devDependencies": { - "@types/jest": "^29.5.12", + "@types/jest": "^29.5.12", "@types/node": "^24.3.0", - "jest": "^29.7.0", - "jest-circus": "^29.7.0", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", - "ts-jest": "^29.2.5", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.9.2" + }, + "dependencies": { + "class-validator": "^0.14.2" } } diff --git a/src/framework/decorators/FieldDecorator.ts b/src/framework/decorators/FieldDecorator.ts new file mode 100644 index 0000000..2d78b40 --- /dev/null +++ b/src/framework/decorators/FieldDecorator.ts @@ -0,0 +1,36 @@ +import { IsNotEmpty } from 'class-validator'; + +import type { Field } from "../model/Field"; + +export interface FieldOptions extends Field{} + +export function Field(options: FieldOptions) { + return function (target: any, propertyKey: string) { + // Store metadata for the field's documentation + if (options?.docs) { + Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); + } + + // Apply IsNotEmpty decorator if the field is required + if (options?.required) { + const isRequired = typeof options.required === 'function' + ? options.required(target) + : options.required; + + if (isRequired) { + IsNotEmpty()(target, propertyKey); + } + } + + // Handle validation option + if (options?.validation) { + if (typeof options.validation === 'function' && options.validation.length > 1) { + // This is our custom validation function for a field + Reflect.defineMetadata('custom:validation', options.validation, target, propertyKey); + } else { + // This is a class-validator decorator + (options.validation as PropertyDecorator)(target, propertyKey); + } + } + }; +} diff --git a/src/framework/decorators/ModelDecorator.ts b/src/framework/decorators/ModelDecorator.ts new file mode 100644 index 0000000..cb0e110 --- /dev/null +++ b/src/framework/decorators/ModelDecorator.ts @@ -0,0 +1,11 @@ +import "reflect-metadata"; +import type { Model } from "../model/Model"; + + +export interface ModelOptions extends Model {} + +export function Model(options?: ModelOptions) { + return function (constructor: Function) { + Reflect.defineMetadata("model:docs", options?.docs, constructor); + }; +} diff --git a/src/framework/model/Field.ts b/src/framework/model/Field.ts new file mode 100644 index 0000000..4820ac4 --- /dev/null +++ b/src/framework/model/Field.ts @@ -0,0 +1,10 @@ +type CustomValidationFunction = ( + value: any, + object: any +) => { code: string; message: string }[]; + +export interface Field { + required?: boolean | ((obj: any) => boolean); + docs?: string; + validation?: PropertyDecorator | CustomValidationFunction; +} diff --git a/src/framework/model/Model.ts b/src/framework/model/Model.ts new file mode 100644 index 0000000..aa81ee5 --- /dev/null +++ b/src/framework/model/Model.ts @@ -0,0 +1,50 @@ +import { validate, ValidationError } from "class-validator"; +import "reflect-metadata"; + +export abstract class BaseModel { + /** + * Validates the class instance using the rules defined by the @Field decorators. + * @returns A promise that resolves to an array of validation errors. The array is empty if validation succeeds. + */ + public async validate(): Promise { + // 1. Run standard class-validator validations + const classValidatorErrors = await validate(this); + + // 2. Run custom validations + const customErrors: ValidationError[] = []; + const properties = Object.keys(this); + + for (const property of properties) { + const customValidationFn = Reflect.getMetadata( + "custom:validation", + this, + property + ); + + if (typeof customValidationFn === "function") { + const value = (this as any)[property]; + const validationResults = customValidationFn(value, this); + + if (validationResults && validationResults.length > 0) { + // Convert custom errors to the ValidationError format + validationResults.forEach((error: any) => { + const validationError = new ValidationError(); + validationError.property = property; + validationError.value = value; + validationError.constraints = { + [error.code]: error.message, + }; + customErrors.push(validationError); + }); + } + } + } + + // 3. Combine both types of errors + return [...classValidatorErrors, ...customErrors]; + } +} + +export interface Model { + docs?: string; +} diff --git a/src/model/Person.ts b/src/model/Person.ts new file mode 100644 index 0000000..cc7e17f --- /dev/null +++ b/src/model/Person.ts @@ -0,0 +1,36 @@ +import { Field } from "../framework/decorators/FieldDecorator"; +import { Model } from "../framework/decorators/ModelDecorator"; +import { BaseModel } from "../framework/model/Model"; + +@Model({ + docs: "Represents a person", +}) +export class Person extends BaseModel { + @Field({ + required: true, + }) + firstName!: string; + + @Field({ + required: true, + }) + lastName!: string; + + @Field({}) + email!: string; + + @Field({ + validation: (_: number, person: Person) => { + let errors = []; + if (person.age < 0 || person.age > 120) { + errors.push({ + code: "invalidAge", + message: "Age must be between 0 and 120", + }); + } + return errors; + }, + required: true, + }) + age!: number; +} diff --git a/src/test/person.test.ts b/src/test/person.test.ts new file mode 100644 index 0000000..3f4b6e8 --- /dev/null +++ b/src/test/person.test.ts @@ -0,0 +1,46 @@ +import { Person } from "../model/Person"; + +describe("Person Model Validation", () => { + it("should pass validation for a valid person", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 30; + + const errors = await validUser.validate(); + expect(errors.length).toBe(0); + }); + + it("should fail validation when required fields are missing", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + // Missing lastName, and email + + const errors = await invalidUser.validate(); + expect(errors.length).toBeGreaterThan(0); + }); + + it("should not fail validation when mail is missing", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.age = 30; + // Missing email + + const errors = await validUser.validate(); + expect(errors.length).toBe(0); + }); + + it("should fail validation for invalid age", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 130; // Invalid age + + const errors = await invalidUser.validate(); + expect(errors.length).toBeGreaterThan(0); + }); + +}); diff --git a/tsconfig.json b/tsconfig.json index 1d6be61..4bb33c9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,45 +1,24 @@ { - // Visit https://aka.ms/tsconfig to read more about this file "compilerOptions": { - // File Layout - // "rootDir": "./src", - // "outDir": "./dist", - - // Environment Settings - // See also https://aka.ms/tsconfig/module - "module": "nodenext", + "module": "commonjs", "target": "esnext", "types": ["node", "jest"], - // For nodejs: - // "lib": ["esnext"], - // "types": ["node"], - // and npm install -D @types/node - - // Other Outputs "sourceMap": true, "declaration": true, "declarationMap": true, - - // Stricter Typechecking Options "noUncheckedIndexedAccess": true, "exactOptionalPropertyTypes": true, - - // Style Options - // "noImplicitReturns": true, - // "noImplicitOverride": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - // "noFallthroughCasesInSwitch": true, - // "noPropertyAccessFromIndexSignature": true, - - // Recommended Options "strict": true, "jsx": "react-jsx", - "verbatimModuleSyntax": true, + "verbatimModuleSyntax": false, "isolatedModules": true, "noUncheckedSideEffectImports": true, "moduleDetection": "force", "skipLibCheck": true, - "experimentalDecorators": true - } + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "outDir": "./dist", + "rootDir": "./src" + }, + "include": ["src/**/*"] } From d820bda655c400d85c759d82d9adbe6dd8ae0501 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 19 Aug 2025 20:16:41 -0300 Subject: [PATCH 035/254] standardize validation metadata key from 'custom:validation' to 'field:validation' --- src/framework/decorators/FieldDecorator.ts | 2 +- src/framework/model/Model.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/framework/decorators/FieldDecorator.ts b/src/framework/decorators/FieldDecorator.ts index 2d78b40..eee0374 100644 --- a/src/framework/decorators/FieldDecorator.ts +++ b/src/framework/decorators/FieldDecorator.ts @@ -26,7 +26,7 @@ export function Field(options: FieldOptions) { if (options?.validation) { if (typeof options.validation === 'function' && options.validation.length > 1) { // This is our custom validation function for a field - Reflect.defineMetadata('custom:validation', options.validation, target, propertyKey); + Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); } else { // This is a class-validator decorator (options.validation as PropertyDecorator)(target, propertyKey); diff --git a/src/framework/model/Model.ts b/src/framework/model/Model.ts index aa81ee5..8564e05 100644 --- a/src/framework/model/Model.ts +++ b/src/framework/model/Model.ts @@ -16,7 +16,7 @@ export abstract class BaseModel { for (const property of properties) { const customValidationFn = Reflect.getMetadata( - "custom:validation", + "field:validation", this, property ); From bfeace58f2c21b57e6804b778481e41190dc9916 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 19 Aug 2025 20:24:51 -0300 Subject: [PATCH 036/254] add test case for for defining required with a function --- src/model/Person.ts | 14 ++++++++++++++ src/test/person.test.ts | 24 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/model/Person.ts b/src/model/Person.ts index cc7e17f..ac7c467 100644 --- a/src/model/Person.ts +++ b/src/model/Person.ts @@ -33,4 +33,18 @@ export class Person extends BaseModel { required: true, }) age!: number; + + @Field({ + validation: (value: string, person: Person) => { + const errors = []; + if (person.age < 18 && (!value || value.trim() === "")) { + errors.push({ + code: "requiredParentEmail", + message: "Parent email is required if age is under 18", + }); + } + return errors; + }, + }) + parentEmail!: string; } diff --git a/src/test/person.test.ts b/src/test/person.test.ts index 3f4b6e8..dad09bc 100644 --- a/src/test/person.test.ts +++ b/src/test/person.test.ts @@ -43,4 +43,28 @@ describe("Person Model Validation", () => { expect(errors.length).toBeGreaterThan(0); }); + it("should pass validation without parent email", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 18; // Valid age + // Missing parent email + + const errors = await validUser.validate(); + expect(errors.length).toBe(0); + }); + + it("should fail validation without parent email", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 17; // Invalid age + // Missing parent email + + const errors = await invalidUser.validate(); + expect(errors.length).toBeGreaterThan(0); + }); + }); From af1429e9fec67ef3719dd67f4e250d0eba5de820 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 19 Aug 2025 20:54:33 -0300 Subject: [PATCH 037/254] add an assertion for the exact error output --- src/test/person.test.ts | 47 ++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/test/person.test.ts b/src/test/person.test.ts index dad09bc..3102df5 100644 --- a/src/test/person.test.ts +++ b/src/test/person.test.ts @@ -1,5 +1,19 @@ import { Person } from "../model/Person"; +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {any[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: any[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + describe("Person Model Validation", () => { it("should pass validation for a valid person", async () => { const validUser = new Person(); @@ -9,7 +23,7 @@ describe("Person Model Validation", () => { validUser.age = 30; const errors = await validUser.validate(); - expect(errors.length).toBe(0); + expect(errors).toStrictEqual([]); }); it("should fail validation when required fields are missing", async () => { @@ -18,7 +32,12 @@ describe("Person Model Validation", () => { // Missing lastName, and email const errors = await invalidUser.validate(); - expect(errors.length).toBeGreaterThan(0); + const summary = summarizeErrors(errors); + const expected = [ + { field: "lastName", codes: ["isNotEmpty"], messages: ["lastName should not be empty"] }, + { field: "age", codes: ["isNotEmpty"], messages: ["age should not be empty"] }, + ]; + expect(summary).toStrictEqual(expected); }); it("should not fail validation when mail is missing", async () => { @@ -28,8 +47,8 @@ describe("Person Model Validation", () => { validUser.age = 30; // Missing email - const errors = await validUser.validate(); - expect(errors.length).toBe(0); + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); }); it("should fail validation for invalid age", async () => { @@ -40,7 +59,11 @@ describe("Person Model Validation", () => { invalidUser.age = 130; // Invalid age const errors = await invalidUser.validate(); - expect(errors.length).toBeGreaterThan(0); + const summary = summarizeErrors(errors); + const expected = [ + { field: "age", codes: ["invalidAge"], messages: ["Age must be between 0 and 120"] }, + ]; + expect(summary).toStrictEqual(expected); }); it("should pass validation without parent email", async () => { @@ -51,8 +74,8 @@ describe("Person Model Validation", () => { validUser.age = 18; // Valid age // Missing parent email - const errors = await validUser.validate(); - expect(errors.length).toBe(0); + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); }); it("should fail validation without parent email", async () => { @@ -64,7 +87,15 @@ describe("Person Model Validation", () => { // Missing parent email const errors = await invalidUser.validate(); - expect(errors.length).toBeGreaterThan(0); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "parentEmail", + codes: ["requiredParentEmail"], + messages: ["Parent email is required if age is under 18"], + }, + ]; + expect(summary).toStrictEqual(expected); }); }); From b3edb96a7991a9e9d778d3bcb8e67ca43796a539 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 09:29:21 -0300 Subject: [PATCH 038/254] add initial README.md with project overview and setup instructions --- README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..968f2d2 --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +# Slingr Framework + +The Slingr Framework is a powerful tool for building web applications. It provides a robust set of features and tools to help developers create high-quality applications quickly and efficiently. + +## Features + +-- + +## Getting Started + +To get started with the Slingr Framework, follow these steps: + +1. **Clone the Repository**: Clone the Slingr Framework repository from GitHub. + + ```bash + # Clone the repo + https://github.com/slingr-stack/framework.git + + # Navigate to directory + cd framework + ``` + +2. **Install Dependencies**: Run the following command to install the required dependencies: + + ```bash + # Install dependencies + npm install + ``` + +3. **Run Tests**: To run the tests, use the following command: + + ```bash + # Run tests + npm test + ``` + +## Documentation + +-- + +## Contributing + +-- + +## License + +-- \ No newline at end of file From 23457fd413eb3f75f6d42d2d1a72558caad7bb52 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 09:40:00 -0300 Subject: [PATCH 039/254] update README, package.json, and tsconfig.json; add LICENSE file --- LICENSE.txt | 202 ++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- jest.config.ts | 5 -- package-lock.json | 2 +- package.json | 21 +++-- tsconfig.json | 25 ------ 6 files changed, 214 insertions(+), 43 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 968f2d2..e7d2e58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Slingr Framework -The Slingr Framework is a powerful tool for building web applications. It provides a robust set of features and tools to help developers create high-quality applications quickly and efficiently. +The Slingr Framework is a powerful tool for building smart business applications. It provides a robust set of features and tools to help developers create high-quality applications quickly and efficiently. ## Features diff --git a/jest.config.ts b/jest.config.ts index b021033..ec6224f 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,10 +1,8 @@ import type { Config } from 'jest'; const config: Config = { - // Add this line preset: 'ts-jest', testEnvironment: 'node', - // Use recommended transform-based ts-jest config (replaces deprecated globals) transform: { '^.+\\.(ts|tsx)$': [ 'ts-jest', @@ -15,10 +13,7 @@ const config: Config = { }, ], }, - - // ... rest of your configuration coverageProvider: "v8", - // ... }; module.exports = config; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e90452e..f2b5758 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6801,4 +6801,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index a4db718..438e703 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "framework", + "name": "slingr-framework", "version": "1.0.0", - "description": "", + "description": "Slingr Framework - Smart Business Apps", "main": "index.js", "scripts": { "test": "jest" @@ -10,22 +10,21 @@ "type": "git", "url": "git+https://github.com/slingr-stack/framework.git" }, - "keywords": [], - "author": "", - "license": "ISC", - "type": "commonjs", + "author": "Slingr", + "license": "Apache-2.0", + "type": "module", "bugs": { "url": "https://github.com/slingr-stack/framework/issues" }, "homepage": "https://github.com/slingr-stack/framework#readme", "devDependencies": { - "@types/jest": "^29.5.12", + "@types/jest": "^29.5.12", "@types/node": "^24.3.0", - "jest": "^29.7.0", - "jest-circus": "^29.7.0", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", - "ts-jest": "^29.2.5", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.9.2" } -} +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 1d6be61..7658c63 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,38 +1,13 @@ { - // Visit https://aka.ms/tsconfig to read more about this file "compilerOptions": { - // File Layout - // "rootDir": "./src", - // "outDir": "./dist", - - // Environment Settings - // See also https://aka.ms/tsconfig/module "module": "nodenext", "target": "esnext", "types": ["node", "jest"], - // For nodejs: - // "lib": ["esnext"], - // "types": ["node"], - // and npm install -D @types/node - - // Other Outputs "sourceMap": true, "declaration": true, "declarationMap": true, - - // Stricter Typechecking Options "noUncheckedIndexedAccess": true, "exactOptionalPropertyTypes": true, - - // Style Options - // "noImplicitReturns": true, - // "noImplicitOverride": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - // "noFallthroughCasesInSwitch": true, - // "noPropertyAccessFromIndexSignature": true, - - // Recommended Options "strict": true, "jsx": "react-jsx", "verbatimModuleSyntax": true, From 479511e440748d2ef6fe4eb15e51c716d33d24f2 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 10:02:46 -0300 Subject: [PATCH 040/254] add function execution for required field option --- src/framework/decorators/FieldDecorator.ts | 64 +++++++++++++++------- src/framework/model/Field.ts | 6 +- src/model/Person.ts | 11 +--- src/test/person.test.ts | 18 ++---- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/framework/decorators/FieldDecorator.ts b/src/framework/decorators/FieldDecorator.ts index eee0374..45b61f9 100644 --- a/src/framework/decorators/FieldDecorator.ts +++ b/src/framework/decorators/FieldDecorator.ts @@ -1,36 +1,58 @@ -import { IsNotEmpty } from 'class-validator'; +import { IsNotEmpty, ValidateIf } from 'class-validator'; import type { Field } from "../model/Field"; -export interface FieldOptions extends Field{} +export interface FieldOptions extends Field { } -export function Field(options: FieldOptions) { - return function (target: any, propertyKey: string) { - // Store metadata for the field's documentation + +/** + * Decorator for model fields that applies validation, documentation, and metadata based on provided options. + * + * - Adds documentation metadata if `docs` is present in options. + * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. + * - Applies custom validation if `validation` is provided, supporting both function and decorator types. + * + * @param {FieldOptions} options - Configuration options for the field, including validation, documentation, and required logic. + * @returns {PropertyDecorator} The property decorator function. + * + * @example + * ```typescript + * class Person { + * @Field({ required: true, docs: 'The name of the person.' }) + * name: string; + * } + * ``` + */ +export function Field(options: FieldOptions) { + return function (target: any, propertyKey: string) { if (options?.docs) { - Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); + Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } - // Apply IsNotEmpty decorator if the field is required - if (options?.required) { - const isRequired = typeof options.required === 'function' - ? options.required(target) - : options.required; - - if (isRequired) { + if (options?.required !== undefined) { + if (typeof options.required === 'function') { + ValidateIf((object: any) => { + try { + const reqFn = options.required as (object: any) => boolean; + return !!reqFn(object); + } + catch { + return false; + } + })(target, propertyKey); + IsNotEmpty()(target, propertyKey); + } else if (options.required) { + // Simple boolean required IsNotEmpty()(target, propertyKey); } } - // Handle validation option if (options?.validation) { - if (typeof options.validation === 'function' && options.validation.length > 1) { - // This is our custom validation function for a field - Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); - } else { - // This is a class-validator decorator - (options.validation as PropertyDecorator)(target, propertyKey); - } + if (typeof options.validation === 'function' && options.validation.length > 1) { + Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); + } else { + (options.validation as PropertyDecorator)(target, propertyKey); + } } }; } diff --git a/src/framework/model/Field.ts b/src/framework/model/Field.ts index 4820ac4..0e51f16 100644 --- a/src/framework/model/Field.ts +++ b/src/framework/model/Field.ts @@ -3,8 +3,12 @@ type CustomValidationFunction = ( object: any ) => { code: string; message: string }[]; +type CustomRequiredFunction = ( + object: any +) => Boolean; + export interface Field { - required?: boolean | ((obj: any) => boolean); + required?: boolean | CustomRequiredFunction; docs?: string; validation?: PropertyDecorator | CustomValidationFunction; } diff --git a/src/model/Person.ts b/src/model/Person.ts index ac7c467..ca0cf1a 100644 --- a/src/model/Person.ts +++ b/src/model/Person.ts @@ -35,15 +35,8 @@ export class Person extends BaseModel { age!: number; @Field({ - validation: (value: string, person: Person) => { - const errors = []; - if (person.age < 18 && (!value || value.trim() === "")) { - errors.push({ - code: "requiredParentEmail", - message: "Parent email is required if age is under 18", - }); - } - return errors; + required: (person: Person) => { + return (person.age < 18); }, }) parentEmail!: string; diff --git a/src/test/person.test.ts b/src/test/person.test.ts index 3102df5..0cdea47 100644 --- a/src/test/person.test.ts +++ b/src/test/person.test.ts @@ -47,8 +47,8 @@ describe("Person Model Validation", () => { validUser.age = 30; // Missing email - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); }); it("should fail validation for invalid age", async () => { @@ -74,8 +74,8 @@ describe("Person Model Validation", () => { validUser.age = 18; // Valid age // Missing parent email - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); }); it("should fail validation without parent email", async () => { @@ -87,15 +87,7 @@ describe("Person Model Validation", () => { // Missing parent email const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { - field: "parentEmail", - codes: ["requiredParentEmail"], - messages: ["Parent email is required if age is under 18"], - }, - ]; - expect(summary).toStrictEqual(expected); + expect(errors.length).toBeGreaterThan(0); }); }); From e86a7ac476ba8cd2c8d8878ab8e50263b2ab14a6 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 10:17:10 -0300 Subject: [PATCH 041/254] restructured project --- src/framework/decorators/FieldDecorator.ts | 58 --------------- src/framework/model/Field.ts | 14 ---- .../model/Model.ts => model/BaseModel.ts} | 9 +-- src/model/Field.ts | 71 +++++++++++++++++++ .../ModelDecorator.ts => model/Model.ts} | 8 ++- src/sum.test.ts | 5 -- src/sum.ts | 4 -- src/test/{person.test.ts => Field.test.ts} | 2 +- src/{ => test}/model/Person.ts | 6 +- 9 files changed, 83 insertions(+), 94 deletions(-) delete mode 100644 src/framework/model/Field.ts rename src/{framework/model/Model.ts => model/BaseModel.ts} (91%) create mode 100644 src/model/Field.ts rename src/{framework/decorators/ModelDecorator.ts => model/Model.ts} (63%) delete mode 100644 src/sum.test.ts delete mode 100644 src/sum.ts rename src/test/{person.test.ts => Field.test.ts} (98%) rename src/{ => test}/model/Person.ts (78%) diff --git a/src/framework/decorators/FieldDecorator.ts b/src/framework/decorators/FieldDecorator.ts index 45b61f9..e69de29 100644 --- a/src/framework/decorators/FieldDecorator.ts +++ b/src/framework/decorators/FieldDecorator.ts @@ -1,58 +0,0 @@ -import { IsNotEmpty, ValidateIf } from 'class-validator'; - -import type { Field } from "../model/Field"; - -export interface FieldOptions extends Field { } - - -/** - * Decorator for model fields that applies validation, documentation, and metadata based on provided options. - * - * - Adds documentation metadata if `docs` is present in options. - * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. - * - Applies custom validation if `validation` is provided, supporting both function and decorator types. - * - * @param {FieldOptions} options - Configuration options for the field, including validation, documentation, and required logic. - * @returns {PropertyDecorator} The property decorator function. - * - * @example - * ```typescript - * class Person { - * @Field({ required: true, docs: 'The name of the person.' }) - * name: string; - * } - * ``` - */ -export function Field(options: FieldOptions) { - return function (target: any, propertyKey: string) { - if (options?.docs) { - Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); - } - - if (options?.required !== undefined) { - if (typeof options.required === 'function') { - ValidateIf((object: any) => { - try { - const reqFn = options.required as (object: any) => boolean; - return !!reqFn(object); - } - catch { - return false; - } - })(target, propertyKey); - IsNotEmpty()(target, propertyKey); - } else if (options.required) { - // Simple boolean required - IsNotEmpty()(target, propertyKey); - } - } - - if (options?.validation) { - if (typeof options.validation === 'function' && options.validation.length > 1) { - Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); - } else { - (options.validation as PropertyDecorator)(target, propertyKey); - } - } - }; -} diff --git a/src/framework/model/Field.ts b/src/framework/model/Field.ts deleted file mode 100644 index 0e51f16..0000000 --- a/src/framework/model/Field.ts +++ /dev/null @@ -1,14 +0,0 @@ -type CustomValidationFunction = ( - value: any, - object: any -) => { code: string; message: string }[]; - -type CustomRequiredFunction = ( - object: any -) => Boolean; - -export interface Field { - required?: boolean | CustomRequiredFunction; - docs?: string; - validation?: PropertyDecorator | CustomValidationFunction; -} diff --git a/src/framework/model/Model.ts b/src/model/BaseModel.ts similarity index 91% rename from src/framework/model/Model.ts rename to src/model/BaseModel.ts index 8564e05..b499eb1 100644 --- a/src/framework/model/Model.ts +++ b/src/model/BaseModel.ts @@ -1,5 +1,4 @@ -import { validate, ValidationError } from "class-validator"; -import "reflect-metadata"; +import { ValidationError, validate } from "class-validator"; export abstract class BaseModel { /** @@ -43,8 +42,4 @@ export abstract class BaseModel { // 3. Combine both types of errors return [...classValidatorErrors, ...customErrors]; } -} - -export interface Model { - docs?: string; -} +} \ No newline at end of file diff --git a/src/model/Field.ts b/src/model/Field.ts new file mode 100644 index 0000000..0465dfb --- /dev/null +++ b/src/model/Field.ts @@ -0,0 +1,71 @@ +import { IsNotEmpty, ValidateIf } from 'class-validator'; + +type CustomValidationFunction = ( + value: any, + object: any +) => { code: string; message: string }[]; + +type CustomRequiredFunction = ( + object: any +) => Boolean; + +export interface FieldOptions { + required?: boolean | CustomRequiredFunction; + docs?: string; + validation?: PropertyDecorator | CustomValidationFunction; +} + +/** + * Decorator for model fields that applies validation, documentation, and metadata based on provided options. + * + * - Adds documentation metadata if `docs` is present in options. + * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. + * - Applies custom validation if `validation` is provided, supporting both function and decorator types. + * + * @param {FieldOptions} options - Configuration options for the field, including validation, documentation, and required logic. + * @returns {PropertyDecorator} The property decorator function. + * + * @example + * ```typescript + * class Person { + * @Field({ required: true, docs: 'The name of the person.' }) + * name: string; + * } + * ``` + */ +export function Field(options: FieldOptions) { + return function (target: any, propertyKey: string) { + if (options?.docs) { + Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); + } + + if (options?.required !== undefined) { + if (typeof options.required === 'function') { + ValidateIf((object: any) => { + try { + const reqFn = options.required as (object: any) => boolean; + return !!reqFn(object); + } + catch { + return false; + } + })(target, propertyKey); + IsNotEmpty()(target, propertyKey); + } else if (options.required) { + // Simple boolean required + IsNotEmpty()(target, propertyKey); + } + } + + if (options?.validation) { + if (typeof options.validation === 'function' && options.validation.length > 1) { + Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); + } else { + (options.validation as PropertyDecorator)(target, propertyKey); + } + } + }; +} + + + diff --git a/src/framework/decorators/ModelDecorator.ts b/src/model/Model.ts similarity index 63% rename from src/framework/decorators/ModelDecorator.ts rename to src/model/Model.ts index cb0e110..f4da013 100644 --- a/src/framework/decorators/ModelDecorator.ts +++ b/src/model/Model.ts @@ -1,8 +1,12 @@ +import { validate, ValidationError } from "class-validator"; import "reflect-metadata"; -import type { Model } from "../model/Model"; + +export interface ModelOptions { + docs?: string; +} + -export interface ModelOptions extends Model {} export function Model(options?: ModelOptions) { return function (constructor: Function) { diff --git a/src/sum.test.ts b/src/sum.test.ts deleted file mode 100644 index df0dd09..0000000 --- a/src/sum.test.ts +++ /dev/null @@ -1,5 +0,0 @@ -const sum = require('./sum'); - -test('adds 1 + 2 to equal 3', () => { - expect(sum(1, 2)).toBe(3); -}); \ No newline at end of file diff --git a/src/sum.ts b/src/sum.ts deleted file mode 100644 index 4f3863c..0000000 --- a/src/sum.ts +++ /dev/null @@ -1,4 +0,0 @@ -function sum(a: any, b: any) { - return a + b; -} -module.exports = sum; \ No newline at end of file diff --git a/src/test/person.test.ts b/src/test/Field.test.ts similarity index 98% rename from src/test/person.test.ts rename to src/test/Field.test.ts index 0cdea47..f94d988 100644 --- a/src/test/person.test.ts +++ b/src/test/Field.test.ts @@ -1,4 +1,4 @@ -import { Person } from "../model/Person"; +import { Person } from "./model/Person"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. diff --git a/src/model/Person.ts b/src/test/model/Person.ts similarity index 78% rename from src/model/Person.ts rename to src/test/model/Person.ts index ca0cf1a..9e39524 100644 --- a/src/model/Person.ts +++ b/src/test/model/Person.ts @@ -1,6 +1,6 @@ -import { Field } from "../framework/decorators/FieldDecorator"; -import { Model } from "../framework/decorators/ModelDecorator"; -import { BaseModel } from "../framework/model/Model"; +import { Field } from "../../model/Field"; +import { Model } from "../../model/Model"; +import { BaseModel } from "../../model/BaseModel"; @Model({ docs: "Represents a person", From 2e162168359692f5aa3e43d8cbdaa4f7f64f55e4 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 10:30:23 -0300 Subject: [PATCH 042/254] remove unused FieldDecorator file --- src/framework/decorators/FieldDecorator.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/framework/decorators/FieldDecorator.ts diff --git a/src/framework/decorators/FieldDecorator.ts b/src/framework/decorators/FieldDecorator.ts deleted file mode 100644 index e69de29..0000000 From ac0c2becf239e93fbb9cab381dc28a6d4e6245eb Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 11:04:21 -0300 Subject: [PATCH 043/254] enhance validation framework with custom validation decorator and improved error handling --- src/model/BaseModel.ts | 124 +++++++++++++------ src/model/Field.ts | 107 +++++++++++++++- src/validators/CustomValidationConstraint.ts | 46 +++++++ 3 files changed, 238 insertions(+), 39 deletions(-) create mode 100644 src/validators/CustomValidationConstraint.ts diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index b499eb1..b6e27be 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,45 +1,99 @@ import { ValidationError, validate } from "class-validator"; +/** + * Abstract base class for all model classes in the framework. + * + * This class provides common functionality for model validation and should be extended + * by all model classes that use the ``@Field`` decorator for validation. + * + * @abstract + * + * @example + * ```typescript + * class Person extends BaseModel { + * Field({ required: true, docs: 'Person\'s full name' }) + * name: string; + * + * Field({ validation: IsEmail() }) + * email: string; + * } + * + * const person = new Person(); + * person.name = 'John Doe'; + * person.email = 'john@example.com'; + * + * const errors = await person.validate(); + * if (errors.length === 0) { + * console.log('Person is valid'); + * } + * ``` + */ export abstract class BaseModel { /** - * Validates the class instance using the rules defined by the @Field decorators. - * @returns A promise that resolves to an array of validation errors. The array is empty if validation succeeds. + * Validates the current model instance using class-validator and custom validation rules. + * + * This method runs all validation rules defined by @Field decorators on the model properties. + * It supports both built-in class-validator decorators and custom validation functions. + * + * For custom validations, the method preserves original error codes and messages from + * the custom validation functions, ensuring meaningful error reporting. + * + * @returns A Promise that resolves to an array of ValidationError objects. + * - Empty array: validation passed, no errors found + * - Non-empty array: validation failed, contains detailed error information + * + * @example + * ```typescript + * const person = new Person(); + * person.name = ''; // Invalid: required field + * person.email = 'invalid-email'; // Invalid: not a valid email + * + * const errors = await person.validate(); + * console.log(`Found ${errors.length} validation errors`); + * + * errors.forEach(error => { + * console.log(`Property: ${error.property}`); + * console.log(`Constraints:`, error.constraints); + * }); + * ``` + * + * @throws {Error} May throw if reflection metadata is corrupted or validation setup is invalid */ public async validate(): Promise { - // 1. Run standard class-validator validations - const classValidatorErrors = await validate(this); - - // 2. Run custom validations - const customErrors: ValidationError[] = []; - const properties = Object.keys(this); - - for (const property of properties) { - const customValidationFn = Reflect.getMetadata( - "field:validation", - this, - property - ); - - if (typeof customValidationFn === "function") { - const value = (this as any)[property]; - const validationResults = customValidationFn(value, this); - - if (validationResults && validationResults.length > 0) { - // Convert custom errors to the ValidationError format - validationResults.forEach((error: any) => { - const validationError = new ValidationError(); - validationError.property = property; - validationError.value = value; - validationError.constraints = { - [error.code]: error.message, - }; - customErrors.push(validationError); - }); + const errors = await validate(this); + + // Transform constraint names for custom validations to preserve original error codes + errors.forEach(error => { + if (error.constraints) { + const constraintKeys = Object.keys(error.constraints); + + // Check if this is a custom validation error (contains "customValidation") + const customConstraint = constraintKeys.find(key => key.includes('customValidation')); + + if (customConstraint) { + // Get the custom validation function to extract error codes + const customValidationFn = Reflect.getMetadata( + "field:validation", + this, + error.property + ); + + if (typeof customValidationFn === "function") { + const validationResults = customValidationFn(error.value, this); + + if (validationResults && validationResults.length > 0) { + // Replace constraints with original error codes + const newConstraints: any = {}; + validationResults.forEach((result: any) => { + newConstraints[result.code] = result.message; + }); + error.constraints = newConstraints; + } + } } } - } - - // 3. Combine both types of errors - return [...classValidatorErrors, ...customErrors]; + }); + + return errors; } } \ No newline at end of file diff --git a/src/model/Field.ts b/src/model/Field.ts index 0465dfb..18d4541 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,17 +1,112 @@ import { IsNotEmpty, ValidateIf } from 'class-validator'; +import { CustomValidate } from '../validators/CustomValidationConstraint'; +/** + * Custom validation function type for field validation. + * + * @param value - The value of the field being validated + * @param object - The entire object containing the field being validated + * @returns Array of validation error objects, each containing a code and message. Return empty array if validation passes. + * + * @example + * ```typescript + * const validateAge: CustomValidationFunction = (value, object) => { + * if (value < 0) { + * return [{ code: 'INVALID_AGE', message: 'Age cannot be negative' }]; + * } + * return []; + * }; + * ``` + */ type CustomValidationFunction = ( value: any, object: any ) => { code: string; message: string }[]; +/** + * Custom required function type for conditional field requirements. + * + * @param object - The entire object containing the field being evaluated + * @returns Boolean indicating whether the field is required (``true``) or optional (``false``) + * + * @example + * ```typescript + * const isRequiredIfAdult: CustomRequiredFunction = (object) => { + * return object.age >= 18; + * }; + * ``` + */ type CustomRequiredFunction = ( object: any ) => Boolean; +/** + * Configuration options for the Field decorator. + * + * This interface defines all available options that can be passed to the ``@Field`` decorator + * to configure validation, documentation, and field behavior. + */ export interface FieldOptions { + /** + * Specifies whether the field is required. + * + * - `true`: Field is always required and cannot be empty + * - `false`: Field is optional + * - `CustomRequiredFunction`: Field requirement is determined dynamically based on the function's return value + * + * @example + * ```typescript + * // Always required + * @Field({ required: true }) + * name: string; + * + * // Conditionally required + * @Field({ required: (obj) => obj.isAdult }) + * guardianName: string; + * ``` + */ required?: boolean | CustomRequiredFunction; + + /** + * Documentation string for the field. + * + * This string will be stored as metadata and can be used for generating + * documentation, API schemas, or providing contextual help. + * + * @example + * ```typescript + * // Simple documentation + * @Field({ docs: 'The full name of the person' }) + * name: string; + * ``` + */ docs?: string; + + /** + * Validation configuration for the field. + * + * Can be either: + * - A `PropertyDecorator` from class-validator (e.g., ``@IsEmail``, ``@Length``, etc.) + * - A `CustomValidationFunction` that returns validation errors + * + * @example + * ```typescript + * // Using class-validator decorator + * Field({ validation: IsEmail() }) + * email: string; + * + * // Using custom validation function + * Field({ + * validation: (value) => { + * if (value.length < 3) { + * return [{ code: 'TOO_SHORT', message: 'Name must be at least 3 characters' }]; + * } + * return []; + * } + * }) + * name: string; + * ``` + */ validation?: PropertyDecorator | CustomValidationFunction; } @@ -22,13 +117,13 @@ export interface FieldOptions { * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. * - Applies custom validation if `validation` is provided, supporting both function and decorator types. * - * @param {FieldOptions} options - Configuration options for the field, including validation, documentation, and required logic. - * @returns {PropertyDecorator} The property decorator function. + * @param options - Configuration options for the field, including validation, documentation, and required logic. + * @returns The property decorator function. * * @example * ```typescript * class Person { - * @Field({ required: true, docs: 'The name of the person.' }) + * Field({ required: true, docs: 'The name of the person.' }) * name: string; * } * ``` @@ -45,7 +140,7 @@ export function Field(options: FieldOptions) { try { const reqFn = options.required as (object: any) => boolean; return !!reqFn(object); - } + } catch { return false; } @@ -59,8 +154,12 @@ export function Field(options: FieldOptions) { if (options?.validation) { if (typeof options.validation === 'function' && options.validation.length > 1) { + // Store the custom validation function in metadata Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); + // Apply the custom validator decorator to integrate with class-validator + CustomValidate()(target, propertyKey); } else { + // Apply decorator directly if it's already a decorator (options.validation as PropertyDecorator)(target, propertyKey); } } diff --git a/src/validators/CustomValidationConstraint.ts b/src/validators/CustomValidationConstraint.ts new file mode 100644 index 0000000..a94a7fb --- /dev/null +++ b/src/validators/CustomValidationConstraint.ts @@ -0,0 +1,46 @@ +import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator'; + +/** + * Creates a custom validation decorator that integrates with class-validator + * and preserves the original error codes from custom validation functions. + */ +export function CustomValidate(validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + registerDecorator({ + target: object.constructor, + propertyName: propertyName, + options: validationOptions || {}, + constraints: [], + validator: { + validate(value: any, args: ValidationArguments) { + const customValidationFn = Reflect.getMetadata( + "field:validation", + args.object, + args.property + ); + + if (typeof customValidationFn === "function") { + const validationResults = customValidationFn(value, args.object); + return !validationResults || validationResults.length === 0; + } + return true; + }, + defaultMessage(args: ValidationArguments) { + const customValidationFn = Reflect.getMetadata( + "field:validation", + args.object, + args.property + ); + + if (typeof customValidationFn === "function") { + const validationResults = customValidationFn(args.value, args.object); + if (validationResults && validationResults.length > 0) { + return validationResults[0].message; + } + } + return 'Custom validation failed'; + } + } + }); + }; +} From 714d39ccb40e8073df54c2f0765db9a1837ac1dd Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 11:22:55 -0300 Subject: [PATCH 044/254] add docs and update documentation formatting --- src/model/BaseModel.ts | 2 +- src/model/Model.ts | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index b6e27be..192064d 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -32,7 +32,7 @@ export abstract class BaseModel { /** * Validates the current model instance using class-validator and custom validation rules. * - * This method runs all validation rules defined by @Field decorators on the model properties. + * This method runs all validation rules defined by ``@Field`` decorators on the model properties. * It supports both built-in class-validator decorators and custom validation functions. * * For custom validations, the method preserves original error codes and messages from diff --git a/src/model/Model.ts b/src/model/Model.ts index f4da013..e4deba8 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -1,13 +1,29 @@ import { validate, ValidationError } from "class-validator"; import "reflect-metadata"; +/** + * Configuration options for the Model decorator. + */ export interface ModelOptions { + /** Optional documentation string for the model. */ docs?: string; } - - - +/** + * Decorator that marks a class as a model and stores metadata. + * + * @param options - Optional configuration for the model + * @returns A class decorator function + * + * @example + * ```typescript + * // User model representing application users + * @Model({ docs: "User model representing application users" }) + * class User { + * // class implementation + * } + * ``` + */ export function Model(options?: ModelOptions) { return function (constructor: Function) { Reflect.defineMetadata("model:docs", options?.docs, constructor); From 5d9021d65f6a28c9af3ecd4c41a8c65b5480bfb2 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Wed, 20 Aug 2025 11:49:34 -0300 Subject: [PATCH 045/254] Calculated Fields implementation --- jest.config.ts | 20 ++++---- src/model/BaseModel.ts | 99 ++++++++++++++++++++++++++++++--------- src/model/Field.ts | 40 +++++++++++++++- src/test/Field.test.ts | 61 ++++++++++++++++++++++-- src/test/model/Product.ts | 50 ++++++++++++++++++++ 5 files changed, 232 insertions(+), 38 deletions(-) create mode 100644 src/test/model/Product.ts diff --git a/jest.config.ts b/jest.config.ts index b021033..387063c 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,24 +1,20 @@ -import type { Config } from 'jest'; +import type { Config } from "jest"; const config: Config = { - // Add this line - preset: 'ts-jest', - testEnvironment: 'node', - // Use recommended transform-based ts-jest config (replaces deprecated globals) + preset: "ts-jest", + testEnvironment: "node", transform: { - '^.+\\.(ts|tsx)$': [ - 'ts-jest', + "^.+\\.(ts|tsx)$": [ + "ts-jest", { tsconfig: { - module: 'commonjs', + module: "commonjs", }, }, ], }, - - // ... rest of your configuration + testMatch: ["/src/test/**/*.test.ts"], coverageProvider: "v8", - // ... }; -module.exports = config; \ No newline at end of file +module.exports = config; diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index b6e27be..fc2bb3e 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -2,26 +2,26 @@ import { ValidationError, validate } from "class-validator"; /** * Abstract base class for all model classes in the framework. - * + * * This class provides common functionality for model validation and should be extended * by all model classes that use the ``@Field`` decorator for validation. - * + * * @abstract - * + * * @example * ```typescript * class Person extends BaseModel { * Field({ required: true, docs: 'Person\'s full name' }) * name: string; - * + * * Field({ validation: IsEmail() }) * email: string; * } - * + * * const person = new Person(); * person.name = 'John Doe'; * person.email = 'john@example.com'; - * + * * const errors = await person.validate(); * if (errors.length === 0) { * console.log('Person is valid'); @@ -31,45 +31,47 @@ import { ValidationError, validate } from "class-validator"; export abstract class BaseModel { /** * Validates the current model instance using class-validator and custom validation rules. - * + * * This method runs all validation rules defined by @Field decorators on the model properties. * It supports both built-in class-validator decorators and custom validation functions. - * + * * For custom validations, the method preserves original error codes and messages from * the custom validation functions, ensuring meaningful error reporting. - * + * * @returns A Promise that resolves to an array of ValidationError objects. * - Empty array: validation passed, no errors found * - Non-empty array: validation failed, contains detailed error information - * + * * @example * ```typescript * const person = new Person(); * person.name = ''; // Invalid: required field * person.email = 'invalid-email'; // Invalid: not a valid email - * + * * const errors = await person.validate(); * console.log(`Found ${errors.length} validation errors`); - * + * * errors.forEach(error => { * console.log(`Property: ${error.property}`); * console.log(`Constraints:`, error.constraints); * }); * ``` - * + * * @throws {Error} May throw if reflection metadata is corrupted or validation setup is invalid */ public async validate(): Promise { const errors = await validate(this); - + // Transform constraint names for custom validations to preserve original error codes - errors.forEach(error => { + errors.forEach((error) => { if (error.constraints) { const constraintKeys = Object.keys(error.constraints); - + // Check if this is a custom validation error (contains "customValidation") - const customConstraint = constraintKeys.find(key => key.includes('customValidation')); - + const customConstraint = constraintKeys.find((key) => + key.includes("customValidation") + ); + if (customConstraint) { // Get the custom validation function to extract error codes const customValidationFn = Reflect.getMetadata( @@ -77,10 +79,10 @@ export abstract class BaseModel { this, error.property ); - + if (typeof customValidationFn === "function") { const validationResults = customValidationFn(error.value, this); - + if (validationResults && validationResults.length > 0) { // Replace constraints with original error codes const newConstraints: any = {}; @@ -93,7 +95,60 @@ export abstract class BaseModel { } } }); - + return errors; } -} \ No newline at end of file + + /** + * Executes the calculation for all fields marked with `calculation: 'manual'`. + * * It iterates multiple times to resolve dependencies where one calculated field + * depends on another. The calculated value is then memoized (cached) on the instance + * until this method is called again. + * * @param {number} [maxIterations=10] - The maximum number of loops to prevent infinite recursion in case of circular dependencies. + * @returns {Promise} + * * @example + * ```typescript + * const invoice = new Invoice(); + * invoice.price = 10; + * invoice.quantity = 5; + * * await invoice.calculate(); // invoice.total is now 50 + * * invoice.price = 20; + * console.log(invoice.total); // Still 50, because it's memoized + * * await invoice.calculate(); // Recalculates, invoice.total is now 100 + * ``` + */ + public async calculate(maxIterations: number = 10): Promise { + const calculatedFields = Object.getOwnPropertyNames( + Object.getPrototypeOf(this) + ).filter((key) => Reflect.hasMetadata("custom:calculation", this, key)); + + if (calculatedFields.length === 0) { + return; + } + + // Iterate to resolve dependencies. A field calculated in one pass + // may be used by another field in the next pass. + for (let i = 0; i < maxIterations; i++) { + let hasChanged = false; + for (const key of calculatedFields) { + const originalGetter = Reflect.getMetadata( + "custom:calculation", + this, + key + ); + const oldValue = (this as any)[key]; + const newValue = originalGetter.call(this); + + if (oldValue !== newValue) { + (this as any)[key] = newValue; // Triggers the replaced setter to memoize the value + hasChanged = true; + } + } + + // If no fields changed their value in a full pass, we can safely exit + if (!hasChanged) { + break; + } + } + } +} diff --git a/src/model/Field.ts b/src/model/Field.ts index 18d4541..81dfeb0 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -108,6 +108,21 @@ export interface FieldOptions { * ``` */ validation?: PropertyDecorator | CustomValidationFunction; + + /** + * Defines the calculation strategy for a getter field. + * * - `undefined` (default): The getter works as a standard TypeScript getter. + * - `'manual'`: The getter's calculation is only executed when the `calculate()` method is called on the model instance. The result is then memoized (cached) until the next `calculate()` call. + * * @example + * ```typescript + * // This getter is only recalculated when `instance.calculate()` is called. + * @Field({ calculation: 'manual' }) + * get total(): number { + * return this.price * this.quantity; + * } + * ``` + */ + calculation?: 'manual'; } /** @@ -129,7 +144,7 @@ export interface FieldOptions { * ``` */ export function Field(options: FieldOptions) { - return function (target: any, propertyKey: string) { + return function (target: any, propertyKey: string, descriptor?: PropertyDescriptor) { if (options?.docs) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } @@ -163,6 +178,29 @@ export function Field(options: FieldOptions) { (options.validation as PropertyDecorator)(target, propertyKey); } } + + if (options?.calculation === 'manual') { + // This feature can only be applied to getters + if (!descriptor || typeof descriptor.get !== 'function') { + throw new Error(`@Field({ calculation: 'manual' }) can only be applied to a getter, but it was used on '${propertyKey}'.`); + } + + const originalGetter = descriptor.get; + const memoizedSymbol = Symbol(`_memoized_${propertyKey}`); // Use a Symbol to avoid property collisions + + // Store the original calculation function in metadata so `calculate()` can find it + Reflect.defineMetadata('custom:calculation', originalGetter, target, propertyKey); + + // Replace the original getter with one that returns the memoized value + descriptor.get = function() { + return (this as any)[memoizedSymbol]; + }; + + // Also define a setter so the `calculate()` method can store the result + descriptor.set = function(value: any) { + (this as any)[memoizedSymbol] = value; + }; + } }; } diff --git a/src/test/Field.test.ts b/src/test/Field.test.ts index f94d988..bb12c40 100644 --- a/src/test/Field.test.ts +++ b/src/test/Field.test.ts @@ -1,4 +1,5 @@ import { Person } from "./model/Person"; +import { Product } from "./model/Product"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. @@ -34,8 +35,16 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); const summary = summarizeErrors(errors); const expected = [ - { field: "lastName", codes: ["isNotEmpty"], messages: ["lastName should not be empty"] }, - { field: "age", codes: ["isNotEmpty"], messages: ["age should not be empty"] }, + { + field: "lastName", + codes: ["isNotEmpty"], + messages: ["lastName should not be empty"], + }, + { + field: "age", + codes: ["isNotEmpty"], + messages: ["age should not be empty"], + }, ]; expect(summary).toStrictEqual(expected); }); @@ -61,7 +70,11 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); const summary = summarizeErrors(errors); const expected = [ - { field: "age", codes: ["invalidAge"], messages: ["Age must be between 0 and 120"] }, + { + field: "age", + codes: ["invalidAge"], + messages: ["Age must be between 0 and 120"], + }, ]; expect(summary).toStrictEqual(expected); }); @@ -89,5 +102,47 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); expect(errors.length).toBeGreaterThan(0); }); +}); + +describe("Product Model Validation", () => { + it("should not calculate total if calculation is not called", async () => { + const product = new Product(); + product.name = "Test Product"; + product.price = 100; + product.quantity = 2; + + const total = product.total; + expect(total).toBe(undefined); + }); + + it("should calculate total when calculation is called", async () => { + const product = new Product(); + product.name = "Test Product"; + product.price = 100; + product.quantity = 2; + + product.calculate(); + const total = product.total; + expect(total).toBe(200); + }); + + it("should output double the price when requested", async () => { + const product = new Product(); + product.name = "Test Product"; + product.price = 100; + product.quantity = 2; + + const doublePrice = product.doublePrice; + expect(doublePrice).toBe(200); + }); + + it("should output the stringified double when requested", async () => { + const product = new Product(); + product.name = "Test Product"; + product.price = 100; + product.quantity = 2; + const stringifyDoublePrice = product.stringifyDoublePrice; + expect(stringifyDoublePrice).toBe(JSON.stringify({ double: 200 })); + }); }); diff --git a/src/test/model/Product.ts b/src/test/model/Product.ts new file mode 100644 index 0000000..5c0eb24 --- /dev/null +++ b/src/test/model/Product.ts @@ -0,0 +1,50 @@ +import { Field } from "../../model/Field"; +import { Model } from "../../model/Model"; +import { BaseModel } from "../../model/BaseModel"; + +@Model({ + docs: "Represents a product", +}) +export class Product extends BaseModel { + @Field({ + required: true, + }) + name!: string; + + @Field({ + required: true, + }) + description!: string; + + @Field({ + required: true, + }) + price!: number; + + @Field({ + required: true, + }) + quantity!: number; + + @Field({ + required: true, + calculation: "manual", + }) + get total(): number { + return this.quantity * this.price; + } + + @Field({ + required: true, + }) + get stringifyDoublePrice(): string { + return JSON.stringify({ double: this.doublePrice }); + } + + @Field({ + required: true, + }) + get doublePrice(): number { + return this.price * 2; + } +} From a1966ccf8f0908544bda4f4894e033ded0ad86e6 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 20 Aug 2025 12:09:05 -0300 Subject: [PATCH 046/254] add models conversion and tests to check conversions --- package-lock.json | 8 ++ package.json | 3 +- src/model/BaseModel.ts | 83 ++++++++++- src/model/Field.ts | 31 +++++ src/test/JsonConversion.test.ts | 235 ++++++++++++++++++++++++++++++++ src/test/model/Person.ts | 6 + 6 files changed, 361 insertions(+), 5 deletions(-) create mode 100644 src/test/JsonConversion.test.ts diff --git a/package-lock.json b/package-lock.json index c4b29f2..d20dcf6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "devDependencies": { "@types/jest": "^29.5.12", "@types/node": "^24.3.0", + "class-transformer": "^0.5.1", "jest": "^29.7.0", "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", @@ -2369,6 +2370,13 @@ "dev": true, "license": "MIT" }, + "node_modules/class-transformer": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", + "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==", + "dev": true, + "license": "MIT" + }, "node_modules/class-validator": { "version": "0.14.2", "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.2.tgz", diff --git a/package.json b/package.json index c156057..e04e3d3 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "test": "jest" + "test": "jest --verbose" }, "repository": { "type": "git", @@ -29,6 +29,7 @@ "typescript": "^5.9.2" }, "dependencies": { + "class-transformer": "^0.5.1", "class-validator": "^0.14.2" } } diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 192064d..c11c72c 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,31 +1,45 @@ import { ValidationError, validate } from "class-validator"; +import { instanceToPlain, plainToInstance, Transform } from "class-transformer"; /** * Abstract base class for all model classes in the framework. * - * This class provides common functionality for model validation and should be extended - * by all model classes that use the ``@Field`` decorator for validation. + * This class provides common functionality for model validation and JSON serialization/deserialization. + * It should be extended by all model classes that use the ``@Field`` decorator for validation. + * + * The class integrates with both ``class-validator`` for validation and ``class-transformer`` for + * JSON conversion operations, providing a complete solution for model data handling. * * @abstract * * @example * ```typescript * class Person extends BaseModel { - * Field({ required: true, docs: 'Person\'s full name' }) + * @Field({ required: true, docs: 'Person\'s full name' }) * name: string; * - * Field({ validation: IsEmail() }) + * @Field({ validation: IsEmail() }) * email: string; + * + * @Field({ available: false }) // Excluded from JSON operations + * internalId: string; * } * * const person = new Person(); * person.name = 'John Doe'; * person.email = 'john@example.com'; * + * // Validation * const errors = await person.validate(); * if (errors.length === 0) { * console.log('Person is valid'); * } + * + * // JSON serialization + * const json = person.toJSON(); // { name: 'John Doe', email: 'john@example.com' } + * + * // JSON deserialization + * const restored = Person.fromJSON(json); * ``` */ export abstract class BaseModel { @@ -96,4 +110,65 @@ export abstract class BaseModel { return errors; } + + /** + * Converts the current model instance to a JSON object. + * + * This method uses class-transformer to serialize the object, respecting the `@Field` decorator's + * `available` property to include or exclude fields from the JSON output. Fields marked with + * `available: false` will be excluded from the resulting JSON. + * + * @returns A plain JavaScript object representation of the model instance + * + * @example + * ```typescript + * const person = new Person(); + * person.name = 'John Doe'; + * person.email = 'john@example.com'; + * + * const json = person.toJSON(); + * console.log(json); // { name: 'John Doe', email: 'john@example.com' } + * ``` + */ + public toJSON(): Record { + return instanceToPlain(this, { + excludeExtraneousValues: true, + }); + } + + /** + * Creates and populates a model instance from a JSON object. + * + * This static method uses class-transformer to deserialize JSON data into a properly + * typed model instance. It respects the `@Field` decorator's `available` property to + * include or exclude fields during deserialization. The method also enables + * transformation and coercion when possible to convert string values to appropriate types. + * + * @param this - The constructor of the target model class + * @param json - The JSON object to convert into a model instance + * @returns A new instance of the model class populated with data from the JSON + * + * @example + * ```typescript + * const jsonData = { + * name: 'John Doe', + * email: 'john@example.com', + * age: '25' // String will be coerced to number if the field is typed as number + * }; + * + * const person = Person.fromJSON(jsonData); + * console.log(person instanceof Person); // true + * console.log(person.name); // 'John Doe' + * console.log(typeof person.age); // 'number' (coerced from string) + * ``` + */ + public static fromJSON( + this: new () => T, + json: Record + ): T { + return plainToInstance(this, json, { + excludeExtraneousValues: true, + enableImplicitConversion: true, // Enable coercion when possible + }); + } } \ No newline at end of file diff --git a/src/model/Field.ts b/src/model/Field.ts index 18d4541..8a2dba5 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,4 +1,5 @@ import { IsNotEmpty, ValidateIf } from 'class-validator'; +import { Exclude, Expose } from 'class-transformer'; import { CustomValidate } from '../validators/CustomValidationConstraint'; /** @@ -108,6 +109,27 @@ export interface FieldOptions { * ``` */ validation?: PropertyDecorator | CustomValidationFunction; + + /** + * Indicates whether the field should be available for JSON serialization and deserialization. + * + * When set to `false`, the field will be excluded from JSON conversion operations. + * When set to `true` or not specified, the field will be included in JSON operations. + * + * @default true + * + * @example + * ```typescript + * // Field available for JSON operations (default behavior) + * @Field({ available: true }) + * name: string; + * + * // Field excluded from JSON operations + * @Field({ available: false }) + * internalId: string; + * ``` + */ + available?: boolean; } /** @@ -116,6 +138,7 @@ export interface FieldOptions { * - Adds documentation metadata if `docs` is present in options. * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. * - Applies custom validation if `validation` is provided, supporting both function and decorator types. + * - Controls field availability for JSON serialization using `class-transformer` decorators. * * @param options - Configuration options for the field, including validation, documentation, and required logic. * @returns The property decorator function. @@ -134,6 +157,14 @@ export function Field(options: FieldOptions) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } + // Handle field availability for JSON serialization/deserialization + if (options?.available === false) { + Exclude()(target, propertyKey); + } else { + // Default behavior is to expose the field (available: true or undefined) + Expose()(target, propertyKey); + } + if (options?.required !== undefined) { if (typeof options.required === 'function') { ValidateIf((object: any) => { diff --git a/src/test/JsonConversion.test.ts b/src/test/JsonConversion.test.ts new file mode 100644 index 0000000..4dd1b09 --- /dev/null +++ b/src/test/JsonConversion.test.ts @@ -0,0 +1,235 @@ +import { Person } from "./model/Person"; + +describe("BaseModel JSON Conversion", () => { + describe("toJSON", () => { + it("should convert a model instance to JSON", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.internalId = "secret-123"; + + const json = person.toJSON(); + + expect(json).toEqual({ + firstName: "John", + lastName: "Doe", + email: "john.doe@example.com", + age: 30, + // internalId should be excluded because available: false + }); + + // Verify that internalId is not in the JSON + expect(json).not.toHaveProperty("internalId"); + }); + + it("should handle undefined and null values", () => { + const person = new Person(); + person.firstName = "Jane"; + person.lastName = "Smith"; + person.age = 25; + // email and parentEmail are not set + + const json = person.toJSON(); + + expect(json).toEqual({ + firstName: "Jane", + lastName: "Smith", + age: 25, + }); + }); + + it("should include parent email when set", () => { + const person = new Person(); + person.firstName = "Young"; + person.lastName = "Person"; + person.age = 16; + person.parentEmail = "parent@example.com"; + + const json = person.toJSON(); + + expect(json).toEqual({ + firstName: "Young", + lastName: "Person", + age: 16, + parentEmail: "parent@example.com", + }); + }); + }); + + describe("fromJSON", () => { + it("should create a model instance from JSON", () => { + const jsonData = { + firstName: "Alice", + lastName: "Johnson", + email: "alice@example.com", + age: 28, + }; + + const person = Person.fromJSON(jsonData); + + expect(person).toBeInstanceOf(Person); + expect(person.firstName).toBe("Alice"); + expect(person.lastName).toBe("Johnson"); + expect(person.email).toBe("alice@example.com"); + expect(person.age).toBe(28); + }); + + it("should enable type coercion for compatible values", () => { + const jsonData = { + firstName: "Bob", + lastName: "Wilson", + email: "bob@example.com", + age: "35", // String that should be converted to number + }; + + const person = Person.fromJSON(jsonData); + + expect(person).toBeInstanceOf(Person); + expect(person.firstName).toBe("Bob"); + expect(person.lastName).toBe("Wilson"); + expect(person.email).toBe("bob@example.com"); + expect(person.age).toBe(35); // Should be converted to number + expect(typeof person.age).toBe("number"); + }); + + it("should ignore fields marked as unavailable", () => { + const jsonData = { + firstName: "Charlie", + lastName: "Brown", + email: "charlie@example.com", + age: 22, + internalId: "should-be-ignored", // This should be ignored + }; + + const person = Person.fromJSON(jsonData); + + expect(person).toBeInstanceOf(Person); + expect(person.firstName).toBe("Charlie"); + expect(person.lastName).toBe("Brown"); + expect(person.email).toBe("charlie@example.com"); + expect(person.age).toBe(22); + + // internalId should not be set from JSON + expect(person.internalId).toBeUndefined(); + }); + + it("should handle missing optional fields", () => { + const jsonData = { + firstName: "David", + lastName: "Miller", + age: 40, + // email and parentEmail are missing + }; + + const person = Person.fromJSON(jsonData); + + expect(person).toBeInstanceOf(Person); + expect(person.firstName).toBe("David"); + expect(person.lastName).toBe("Miller"); + expect(person.age).toBe(40); + expect(person.email).toBeUndefined(); + expect(person.parentEmail).toBeUndefined(); + }); + + it("should handle extra fields not defined in the model", () => { + const jsonData = { + firstName: "Eve", + lastName: "Davis", + age: 33, + extraField: "should-be-ignored", + anotherExtra: 123, + }; + + const person = Person.fromJSON(jsonData); + + expect(person).toBeInstanceOf(Person); + expect(person.firstName).toBe("Eve"); + expect(person.lastName).toBe("Davis"); + expect(person.age).toBe(33); + + // Extra fields should be ignored + expect((person as any).extraField).toBeUndefined(); + expect((person as any).anotherExtra).toBeUndefined(); + }); + }); + + describe("round-trip conversion", () => { + it("should maintain data integrity through toJSON and fromJSON", () => { + // Create original instance + const original = new Person(); + original.firstName = "Test"; + original.lastName = "User"; + original.email = "test@example.com"; + original.age = 29; + original.parentEmail = "parent@example.com"; + original.internalId = "internal-secret"; + + // Convert to JSON + const json = original.toJSON(); + + // Convert back to instance + const restored = Person.fromJSON(json); + + // Check that all available fields are preserved + expect(restored.firstName).toBe(original.firstName); + expect(restored.lastName).toBe(original.lastName); + expect(restored.email).toBe(original.email); + expect(restored.age).toBe(original.age); + expect(restored.parentEmail).toBe(original.parentEmail); + + // Check that unavailable fields are not restored + expect(restored.internalId).toBeUndefined(); + + // Verify it's a proper instance + expect(restored).toBeInstanceOf(Person); + }); + }); + + describe("validation after JSON conversion", () => { + it("should validate correctly after fromJSON", async () => { + const jsonData = { + firstName: "Valid", + lastName: "Person", + email: "valid@example.com", + age: 25, + }; + + const person = Person.fromJSON(jsonData); + const errors = await person.validate(); + + expect(errors).toStrictEqual([]); + }); + + it("should fail validation if required fields are missing after fromJSON", async () => { + const jsonData = { + firstName: "Incomplete", + // lastName is missing + email: "incomplete@example.com", + age: 25, + }; + + const person = Person.fromJSON(jsonData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + expect(errors.some(e => e.property === "lastName")).toBe(true); + }); + + it("should fail validation with invalid data after fromJSON", async () => { + const jsonData = { + firstName: "Invalid", + lastName: "Person", + email: "invalid@example.com", + age: 150, // Invalid age + }; + + const person = Person.fromJSON(jsonData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + expect(errors.some(e => e.property === "age")).toBe(true); + }); + }); +}); diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index 9e39524..d205e4b 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -40,4 +40,10 @@ export class Person extends BaseModel { }, }) parentEmail!: string; + + @Field({ + available: false, // This field should be excluded from JSON operations + docs: "Internal identifier not exposed in JSON" + }) + internalId!: string; } From bca29111fb5763400b8de77bdaa161dff3d64521 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 21 Aug 2025 09:17:40 -0300 Subject: [PATCH 047/254] update metadata keys for calculated fields in BaseModel and Field --- src/model/BaseModel.ts | 4 ++-- src/model/Field.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index fc2bb3e..6b07eff 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -120,7 +120,7 @@ export abstract class BaseModel { public async calculate(maxIterations: number = 10): Promise { const calculatedFields = Object.getOwnPropertyNames( Object.getPrototypeOf(this) - ).filter((key) => Reflect.hasMetadata("custom:calculation", this, key)); + ).filter((key) => Reflect.hasMetadata("field:calculation", this, key)); if (calculatedFields.length === 0) { return; @@ -132,7 +132,7 @@ export abstract class BaseModel { let hasChanged = false; for (const key of calculatedFields) { const originalGetter = Reflect.getMetadata( - "custom:calculation", + "field:calculation", this, key ); diff --git a/src/model/Field.ts b/src/model/Field.ts index 81dfeb0..e02cecb 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -189,7 +189,7 @@ export function Field(options: FieldOptions) { const memoizedSymbol = Symbol(`_memoized_${propertyKey}`); // Use a Symbol to avoid property collisions // Store the original calculation function in metadata so `calculate()` can find it - Reflect.defineMetadata('custom:calculation', originalGetter, target, propertyKey); + Reflect.defineMetadata('field:calculation', originalGetter, target, propertyKey); // Replace the original getter with one that returns the memoized value descriptor.get = function() { From eedfba87202062b46dc7f2975aae6dc48fc0481a Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 21 Aug 2025 09:46:52 -0300 Subject: [PATCH 048/254] add TODO for analyzing dependency resolution in calculated fields --- src/model/BaseModel.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 6b07eff..284a7d0 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -126,8 +126,9 @@ export abstract class BaseModel { return; } - // Iterate to resolve dependencies. A field calculated in one pass - // may be used by another field in the next pass. + // TODO: Analyze this approach for resolving dependencies between calculated fields. + // Iterate to resolve dependencies. A field calculated in one pass + // may be used by another field in the next pass. for (let i = 0; i < maxIterations; i++) { let hasChanged = false; for (const key of calculatedFields) { From fb31e0c69817db7a765548090dcbbe915880fe3d Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 21 Aug 2025 10:37:06 -0300 Subject: [PATCH 049/254] improve type safety in validation and field handling --- src/model/BaseModel.ts | 5 +-- src/model/Field.ts | 32 +++++++++++--------- src/test/Field.test.ts | 5 +-- src/validators/CustomValidationConstraint.ts | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 192064d..2a1ce13 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,4 +1,5 @@ import { ValidationError, validate } from "class-validator"; +import type { ValidationIssue } from "./Field"; /** * Abstract base class for all model classes in the framework. @@ -83,8 +84,8 @@ export abstract class BaseModel { if (validationResults && validationResults.length > 0) { // Replace constraints with original error codes - const newConstraints: any = {}; - validationResults.forEach((result: any) => { + const newConstraints: Record = {}; + (validationResults as ValidationIssue[]).forEach((result) => { newConstraints[result.code] = result.message; }); error.constraints = newConstraints; diff --git a/src/model/Field.ts b/src/model/Field.ts index 18d4541..d41a7ca 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -18,10 +18,12 @@ import { CustomValidate } from '../validators/CustomValidationConstraint'; * }; * ``` */ -type CustomValidationFunction = ( - value: any, - object: any -) => { code: string; message: string }[]; +export type ValidationIssue = { code: string; message: string }; + +// Bivariant function type to allow narrower or wider parameter types in callbacks (e.g., Person) +type BivariantValidationFunction = { + bivarianceHack(value: TValue, object: TObject): ValidationIssue[]; +}["bivarianceHack"]; /** * Custom required function type for conditional field requirements. @@ -36,9 +38,9 @@ type CustomValidationFunction = ( * }; * ``` */ -type CustomRequiredFunction = ( - object: any -) => Boolean; +type BivariantRequiredFunction = { + bivarianceHack(object: TObject): boolean; +}["bivarianceHack"]; /** * Configuration options for the Field decorator. @@ -46,7 +48,7 @@ type CustomRequiredFunction = ( * This interface defines all available options that can be passed to the ``@Field`` decorator * to configure validation, documentation, and field behavior. */ -export interface FieldOptions { +export interface FieldOptions { /** * Specifies whether the field is required. * @@ -65,7 +67,7 @@ export interface FieldOptions { * guardianName: string; * ``` */ - required?: boolean | CustomRequiredFunction; + required?: boolean | BivariantRequiredFunction; /** * Documentation string for the field. @@ -107,7 +109,7 @@ export interface FieldOptions { * name: string; * ``` */ - validation?: PropertyDecorator | CustomValidationFunction; + validation?: PropertyDecorator | BivariantValidationFunction; } /** @@ -128,18 +130,18 @@ export interface FieldOptions { * } * ``` */ -export function Field(options: FieldOptions) { - return function (target: any, propertyKey: string) { +export function Field(options: FieldOptions) { + return function (target: Object, propertyKey: string) { if (options?.docs) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } if (options?.required !== undefined) { if (typeof options.required === 'function') { - ValidateIf((object: any) => { + ValidateIf((object: unknown) => { try { - const reqFn = options.required as (object: any) => boolean; - return !!reqFn(object); + const reqFn = options.required as BivariantRequiredFunction; + return !!reqFn(object as TObject); } catch { return false; diff --git a/src/test/Field.test.ts b/src/test/Field.test.ts index f94d988..d1ed835 100644 --- a/src/test/Field.test.ts +++ b/src/test/Field.test.ts @@ -1,12 +1,13 @@ import { Person } from "./model/Person"; +import type { ValidationError } from "class-validator"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. * - * @param {any[]} errors - Array of ValidationError objects from class-validator. + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. */ -function summarizeErrors(errors: any[]) { +function summarizeErrors(errors: ValidationError[]) { return errors.map((e) => ({ field: e.property, codes: e.constraints ? Object.keys(e.constraints) : [], diff --git a/src/validators/CustomValidationConstraint.ts b/src/validators/CustomValidationConstraint.ts index a94a7fb..8150ccf 100644 --- a/src/validators/CustomValidationConstraint.ts +++ b/src/validators/CustomValidationConstraint.ts @@ -12,7 +12,7 @@ export function CustomValidate(validationOptions?: ValidationOptions) { options: validationOptions || {}, constraints: [], validator: { - validate(value: any, args: ValidationArguments) { + validate(value: unknown, args: ValidationArguments) { const customValidationFn = Reflect.getMetadata( "field:validation", args.object, From edbd6fa18ce0632f38608e9a31ca3e3a0d1de620 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 21 Aug 2025 11:45:49 -0300 Subject: [PATCH 050/254] add package-lock.json to .gitignore --- .gitignore | 2 +- package-lock.json | 6835 --------------------------------------------- 2 files changed, 1 insertion(+), 6836 deletions(-) delete mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore index f42befc..1f10941 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /.idea/ node_modules/ - +package-lock.json dist/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index c4b29f2..0000000 --- a/package-lock.json +++ /dev/null @@ -1,6835 +0,0 @@ -{ - "name": "framework", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "framework", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "class-validator": "^0.14.2" - }, - "devDependencies": { - "@types/jest": "^29.5.12", - "@types/node": "^24.3.0", - "jest": "^29.7.0", - "jest-circus": "^29.7.0", - "reflect-metadata": "^0.2.2", - "ts-jest": "^29.2.5", - "ts-node": "^10.9.2", - "typescript": "^5.9.2" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", - "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz", - "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz", - "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.3", - "@babel/helper-compilation-targets": "^7.27.2", - "@babel/helper-module-transforms": "^7.28.3", - "@babel/helpers": "^7.28.3", - "@babel/parser": "^7.28.3", - "@babel/template": "^7.27.2", - "@babel/traverse": "^7.28.3", - "@babel/types": "^7.28.2", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/generator": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", - "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.28.3", - "@babel/types": "^7.28.2", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "jsesc": "^3.0.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", - "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.27.2", - "@babel/helper-validator-option": "^7.27.1", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", - "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", - "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-module-imports": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.28.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", - "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz", - "integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", - "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.28.2" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", - "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", - "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", - "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/template": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/parser": "^7.27.2", - "@babel/types": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz", - "integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.3", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.3", - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.2", - "debug": "^4.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/console/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/console/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/console/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/console/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/console/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/@jest/core/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/core/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/core/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/core/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/core/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/@jest/core/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/@jest/core/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@jest/core/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/environment/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/environment/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/environment/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "jest-get-type": "^29.6.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", - "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/fake-timers/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/fake-timers/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/globals/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/globals/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/globals/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/pattern": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", - "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/node": "*", - "jest-regex-util": "30.0.1" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/@jest/reporters/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/reporters/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/reporters/node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/reporters/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/reporters/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/@jest/reporters/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/@jest/reporters/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@jest/reporters/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@jest/schemas": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", - "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@sinclair/typebox": "^0.34.0" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-result/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-result/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-result/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jest/test-sequencer/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/test-sequencer/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/@jest/test-sequencer/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@jest/transform": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.0.5.tgz", - "integrity": "sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/core": "^7.27.4", - "@jest/types": "30.0.5", - "@jridgewell/trace-mapping": "^0.3.25", - "babel-plugin-istanbul": "^7.0.0", - "chalk": "^4.1.2", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.11", - "jest-haste-map": "30.0.5", - "jest-regex-util": "30.0.1", - "jest-util": "30.0.5", - "micromatch": "^4.0.8", - "pirates": "^4.0.7", - "slash": "^3.0.0", - "write-file-atomic": "^5.0.1" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/@jest/types": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz", - "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jest/pattern": "30.0.1", - "@jest/schemas": "30.0.5", - "@types/istanbul-lib-coverage": "^2.0.6", - "@types/istanbul-reports": "^3.0.4", - "@types/node": "*", - "@types/yargs": "^17.0.33", - "chalk": "^4.1.2" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.30", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", - "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@sinclair/typebox": { - "version": "0.34.40", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz", - "integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, - "node_modules/@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.0" - } - }, - "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "node_modules/@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", - "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.28.2" - } - }, - "node_modules/@types/graceful-fs": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", - "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/@types/jest": { - "version": "29.5.14", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz", - "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "expect": "^29.0.0", - "pretty-format": "^29.0.0" - } - }, - "node_modules/@types/node": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz", - "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~7.10.0" - } - }, - "node_modules/@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/validator": { - "version": "13.15.2", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.2.tgz", - "integrity": "sha512-y7pa/oEJJ4iGYBxOpfAKn5b9+xuihvzDVnC/OSvlVnGxVg0pOqmjiMafiJ1KVNQEaPZf9HsEp5icEwGg8uIe5Q==" - }, - "node_modules/@types/yargs": { - "version": "17.0.33", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", - "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC", - "optional": true, - "peer": true - }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "license": "MIT" - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/babel-jest": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.5.tgz", - "integrity": "sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jest/transform": "30.0.5", - "@types/babel__core": "^7.20.5", - "babel-plugin-istanbul": "^7.0.0", - "babel-preset-jest": "30.0.1", - "chalk": "^4.1.2", - "graceful-fs": "^4.2.11", - "slash": "^3.0.0" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.11.0" - } - }, - "node_modules/babel-plugin-istanbul": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz", - "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "peer": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-instrument": "^6.0.2", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/babel-plugin-jest-hoist": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz", - "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/template": "^7.27.2", - "@babel/types": "^7.27.3", - "@types/babel__core": "^7.20.5" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/babel-preset-current-node-syntax": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", - "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5" - }, - "peerDependencies": { - "@babel/core": "^7.0.0 || ^8.0.0-0" - } - }, - "node_modules/babel-preset-jest": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz", - "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "babel-plugin-jest-hoist": "30.0.1", - "babel-preset-current-node-syntax": "^1.1.0" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.11.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.25.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", - "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "caniuse-lite": "^1.0.30001733", - "electron-to-chromium": "^1.5.199", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.3" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-json-stable-stringify": "2.x" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "node-int64": "^0.4.0" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001735", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz", - "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", - "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cjs-module-lexer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", - "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/class-validator": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.2.tgz", - "integrity": "sha512-3kMVRF2io8N8pY1IFIXlho9r8IPUUIfHe2hYVtiebvAzU2XeQFXTv+XI4WX+TnXmtwXMDcjngcpkiPM0O9PvLw==", - "dependencies": { - "@types/validator": "^13.11.8", - "libphonenumber-js": "^1.11.1", - "validator": "^13.9.0" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" - } - }, - "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - }, - "bin": { - "create-jest": "bin/create-jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/create-jest/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/create-jest/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/create-jest/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/create-jest/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/create-jest/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/dedent": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", - "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.5.203", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz", - "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==", - "dev": true, - "license": "ISC" - }, - "node_modules/emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sindresorhus/emittery?sponsor=1" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "license": "BSD-2-Clause", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/expect/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/expect/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/expect/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/expect/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/expect/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "bser": "2.1.1" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true, - "license": "MIT" - }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/import-local": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", - "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "license": "MIT", - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-reports": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", - "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-changed-files/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-changed-files/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-changed-files/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-changed-files/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-changed-files/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-circus/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-circus/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-circus/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-circus/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-circus/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/jest-cli/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-cli/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-cli/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-cli/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-cli/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@types/node": "*", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, - "node_modules/jest-config/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-config/node_modules/babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.8.0" - } - }, - "node_modules/jest-config/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-config/node_modules/babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", - "dev": true, - "license": "MIT", - "dependencies": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/jest-config/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-config/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-config/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-config/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-config/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jest-config/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-config/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "detect-newline": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-each/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-each/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-each/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-each/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-each/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-environment-node/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-environment-node/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-environment-node/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-environment-node/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-environment-node/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-haste-map": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.0.5.tgz", - "integrity": "sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jest/types": "30.0.5", - "@types/node": "*", - "anymatch": "^3.1.3", - "fb-watchman": "^2.0.2", - "graceful-fs": "^4.2.11", - "jest-regex-util": "30.0.1", - "jest-util": "30.0.5", - "jest-worker": "30.0.5", - "micromatch": "^4.0.8", - "walker": "^1.0.8" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.3" - } - }, - "node_modules/jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", - "dev": true, - "license": "MIT", - "dependencies": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-mock/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-mock/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-mock/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-mock/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-mock/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "jest-resolve": "*" - }, - "peerDependenciesMeta": { - "jest-resolve": { - "optional": true - } - } - }, - "node_modules/jest-regex-util": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", - "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", - "dev": true, - "license": "MIT", - "dependencies": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-resolve/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-resolve/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-resolve/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-runner/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runner/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runner/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runner/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-runner/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jest-runner/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-runner/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-runtime/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runtime/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runtime/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runtime/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-runtime/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jest-runtime/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-snapshot/node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-snapshot/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-snapshot/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-snapshot/node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/jest-snapshot/node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-snapshot/node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jest-snapshot/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jest-snapshot/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-snapshot/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/jest-util": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz", - "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jest/types": "30.0.5", - "@types/node": "*", - "chalk": "^4.1.2", - "ci-info": "^4.2.0", - "graceful-fs": "^4.2.11", - "picomatch": "^4.0.2" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/jest-util/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "leven": "^3.1.0", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-validate/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-validate/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-validate/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-validate/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-watcher/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-watcher/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-watcher/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jest-watcher/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-watcher/node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-worker": { - "version": "30.0.5", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.0.5.tgz", - "integrity": "sha512-ojRXsWzEP16NdUuBw/4H/zkZdHOa7MMYCk4E430l+8fELeLg/mqmMlRhjL7UNZvQrDmnovWZV4DxX03fZF48fQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/node": "*", - "@ungap/structured-clone": "^1.3.0", - "jest-util": "30.0.5", - "merge-stream": "^2.0.0", - "supports-color": "^8.1.1" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest/node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsesc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/libphonenumber-js": { - "version": "1.12.12", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.12.tgz", - "integrity": "sha512-aWVR6xXYYRvnK0v/uIwkf5Lthq9Jpn0N8TISW/oDTWlYB2sOimuiLn9Q26aUw4KxkJoiT8ACdiw44Y8VwKFIfQ==" - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, - "license": "MIT" - }, - "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true, - "license": "ISC" - }, - "node_modules/makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "tmpl": "1.0.5" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT" - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true, - "license": "MIT" - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-locate/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pirates": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/dubzzz" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fast-check" - } - ], - "license": "MIT" - }, - "node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, - "node_modules/reflect-metadata": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", - "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve.exports": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", - "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "optional": true, - "peer": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "license": "ISC", - "dependencies": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/ts-jest": { - "version": "29.4.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz", - "integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==", - "dev": true, - "license": "MIT", - "dependencies": { - "bs-logger": "^0.2.6", - "fast-json-stable-stringify": "^2.1.0", - "handlebars": "^4.7.8", - "json5": "^2.2.3", - "lodash.memoize": "^4.1.2", - "make-error": "^1.3.6", - "semver": "^7.7.2", - "type-fest": "^4.41.0", - "yargs-parser": "^21.1.1" - }, - "bin": { - "ts-jest": "cli.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" - }, - "peerDependencies": { - "@babel/core": ">=7.0.0-beta.0 <8", - "@jest/transform": "^29.0.0 || ^30.0.0", - "@jest/types": "^29.0.0 || ^30.0.0", - "babel-jest": "^29.0.0 || ^30.0.0", - "jest": "^29.0.0 || ^30.0.0", - "jest-util": "^29.0.0 || ^30.0.0", - "typescript": ">=4.3 <6" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "@jest/transform": { - "optional": true - }, - "@jest/types": { - "optional": true - }, - "babel-jest": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "jest-util": { - "optional": true - } - } - }, - "node_modules/ts-jest/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-jest/node_modules/type-fest": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", - "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/uglify-js": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", - "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", - "dev": true, - "license": "BSD-2-Clause", - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/undici-types": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", - "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "license": "MIT" - }, - "node_modules/v8-to-istanbul": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/validator": { - "version": "13.15.15", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz", - "integrity": "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "makeerror": "1.0.12" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "license": "ISC", - "optional": true, - "peer": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} From d15fa14f552c2706756dbdb7fd125ddcc59e270e Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 21 Aug 2025 12:50:46 -0300 Subject: [PATCH 051/254] add validation tests for Person model and implement Text, Email, and HTML decorators --- src/model/types/Text.ts | 226 +++++++++++++++++++++++++++++++++++++++ src/test/Field.test.ts | 117 ++++++++++++++++++++ src/test/model/Person.ts | 20 ++++ 3 files changed, 363 insertions(+) create mode 100644 src/model/types/Text.ts diff --git a/src/model/types/Text.ts b/src/model/types/Text.ts new file mode 100644 index 0000000..aeaa8d4 --- /dev/null +++ b/src/model/types/Text.ts @@ -0,0 +1,226 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; + +/** + * Options for the Text decorator. + */ +export interface TextOptions { + /** Minimum allowed length for the string. */ + minLength?: number; + /** Maximum allowed length for the string. */ + maxLength?: number; + /** Regular expression to validate the value. */ + regex?: RegExp; + /** Message to show if the regex fails. Required when `regex` is provided. */ + regexMessage?: string; +} + +/** + * Text type decorator. + * - Can only be applied to properties of type `string`. + * - Applies class-validator decorators based on provided options. + * - Stores basic metadata that could be used by other layers (e.g., DB mapping). + */ +// Custom key types for clearer IntelliSense errors +type TextKey = T[K] extends string + ? K + : `Text: requires string field`; +type EmailKey = T[K] extends string + ? K + : `Email: requires string field`; +type HtmlKey = T[K] extends string + ? K + : `HTML: requires string field`; + + +/** + * Validates that a property is of string type at runtime. + * @param proto - The prototype object + * @param propertyKey - The property name + * @throws {Error} When the property is not of string type + */ +function validateStringType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== String) { + throw new Error(`@Text can only be applied to 'string' properties: ${propertyKey}`); + } +} + +/** + * Stores metadata for the text field that can be consumed by other layers. + * @param proto - The prototype object + * @param propName - The property name + * @param options - Text options to store + */ +function storeTextMetadata(proto: Object, propName: string, options?: TextOptions): void { + Reflect.defineMetadata('field:type', 'text', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Creates a helper function to add optional validators that only run when value is present. + * @param proto - The prototype object + * @param propName - The property name + * @returns A function to add optional validators + */ +function createOptionalValidatorAdder(proto: Object, propName: string) { + return ( + name: string, + validate: (value: unknown) => boolean, + defaultMessage: string + ) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + if (value === undefined || value === null || value === '') return true; // skip when empty + return validate(value); + }, + defaultMessage() { + return defaultMessage; + }, + }, + }); + }; +} + +/** + * Applies validation rules based on the provided text options. + * @param addOptionalValidator - Function to add optional validators + * @param propName - The property name for error messages + * @param options - Text validation options + */ +function applyTextValidations( + addOptionalValidator: ReturnType, + propName: string, + options?: TextOptions +): void { + // Type check + addOptionalValidator('isString', (v) => typeof v === 'string', `${propName} must be a string`); + + // Min length validation + if (typeof options?.minLength === 'number') { + const min = options.minLength; + addOptionalValidator( + 'minLength', + (v) => typeof v === 'string' && v.length >= min, + `${propName} must be longer than or equal to ${min} characters` + ); + } + + // Max length validation + if (typeof options?.maxLength === 'number') { + const max = options.maxLength; + addOptionalValidator( + 'maxLength', + (v) => typeof v === 'string' && v.length <= max, + `${propName} must be shorter than or equal to ${max} characters` + ); + } + + // Regex validation + if (options?.regex) { + if (!options.regexMessage) { + throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); + } + const rx = options.regex; + const message = options.regexMessage; + addOptionalValidator('matches', (v) => typeof v === 'string' && rx.test(v), message); + } +} + +/** + * Text type decorator for string properties. + * + * This decorator can only be applied to properties of type `string` and provides + * validation capabilities through class-validator decorators. It also stores + * metadata that can be consumed by other layers such as database mapping or + * documentation generation. + * + * @example + * ```typescript + * class User { + * @Text({ minLength: 2, maxLength: 50 }) + * name: string; + * + * @Text({ regex: /^[A-Z]+$/, regexMessage: 'Must be uppercase letters only' }) + * code: string; + * } + * ``` + * + * @param options - Configuration options for text validation and behavior + * @param options.minLength - Minimum allowed length for the string value + * @param options.maxLength - Maximum allowed length for the string value + * @param options.regex - Regular expression pattern to validate the string against + * @param options.regexMessage - Error message to display when regex validation fails (required when regex is provided) + * + * @returns A property decorator function that applies validation and stores metadata + * + * @throws {Error} When applied to non-string properties + * @throws {Error} When regex is provided without regexMessage + * + * @remarks + * - All validators are optional and only execute when the value is present (not null, undefined, or empty string) + * - This allows the decorator to work alongside other validation decorators like @Required + * - Metadata is stored under 'field:type' (always 'text') and 'field:type:options' keys + * - The decorator uses reflection to verify the property type at runtime + */ +export function Text(options?: TextOptions) { + return function ( + target: T, + propertyKey: TextKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + // Validate that the property is of string type + validateStringType(proto, propName); + + // Store metadata for potential consumers + storeTextMetadata(proto, propName, options); + + // Create validator helper and apply validations + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyTextValidations(addOptionalValidator, propName, options); + }; +} + +/** + * Email type decorator. + * - Must be used on `string` fields. + * - Internally uses `Text` with a reasonable email regex. + * - No options. + */ +export function Email() { + const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + return function ( + target: T, + propertyKey: EmailKey + ) { + const propName = propertyKey as unknown as string; + // Mark logical type for potential consumers + Reflect.defineMetadata('field:logicalType', 'email', target as unknown as Object, propName); + // Delegate to Text with regex + Text({ regex: EMAIL_REGEX, regexMessage: 'must be a valid email' })(target as any, propName as any); + }; +} + +/** + * HTML type decorator. + * - Must be used on `string` fields. + * - Currently identical to `Text()` without extra options. + */ +export function HTML() { + return function ( + target: T, + propertyKey: HtmlKey + ) { + const propName = propertyKey as unknown as string; + Reflect.defineMetadata('field:logicalType', 'html', target as unknown as Object, propName); + Text()(target as any, propName as any); + }; +} diff --git a/src/test/Field.test.ts b/src/test/Field.test.ts index d1ed835..7bae378 100644 --- a/src/test/Field.test.ts +++ b/src/test/Field.test.ts @@ -91,4 +91,121 @@ describe("Person Model Validation", () => { expect(errors.length).toBeGreaterThan(0); }); + it("should fail validation with incorrect email format", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "email", codes: ["matches"], messages: ["must be a valid email"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with too short first name", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "J"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["minLength"], messages: ["firstName must be longer than or equal to 2 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with too short last name", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "D"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "lastName", codes: ["minLength"], messages: ["lastName must be longer than or equal to 2 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with too long first name", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "A".repeat(31); // Too long + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["maxLength"], messages: ["firstName must be shorter than or equal to 30 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with too long last name", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "D".repeat(31); // Too long + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "lastName", codes: ["maxLength"], messages: ["lastName must be shorter than or equal to 30 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with invalid first name characters", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John123"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["matches"], messages: ["firstName must contain only letters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with invalid last name characters", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe123"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "lastName", codes: ["matches"], messages: ["lastName must contain only letters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should pass with valid HTML", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 30; + validUser.additionalInfo = "

This is a valid HTML string.

"; + + const errors = await validUser.validate(); + const summary = summarizeErrors(errors); + expect(summary).toStrictEqual([]); + }); }); diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index 9e39524..2783020 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -1,6 +1,7 @@ import { Field } from "../../model/Field"; import { Model } from "../../model/Model"; import { BaseModel } from "../../model/BaseModel"; +import { Text, Email, HTML } from "../../model/types/Text"; @Model({ docs: "Represents a person", @@ -9,14 +10,27 @@ export class Person extends BaseModel { @Field({ required: true, }) + @Text({ + minLength: 2, + maxLength: 30, + regex: /^[a-zA-Z]+$/, + regexMessage: "firstName must contain only letters", + }) firstName!: string; @Field({ required: true, }) + @Text({ + minLength: 2, + maxLength: 30, + regex: /^[a-zA-Z]+$/, + regexMessage: "lastName must contain only letters", + }) lastName!: string; @Field({}) + @Email() email!: string; @Field({ @@ -39,5 +53,11 @@ export class Person extends BaseModel { return (person.age < 18); }, }) + @Email() parentEmail!: string; + + @Field({}) + @HTML() + additionalInfo!: string; + } From 959680be99bd10b88a1d7c6dc43b6580213b368b Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Fri, 22 Aug 2025 11:26:40 -0300 Subject: [PATCH 052/254] Validation and required typing using generics --- src/model/Field.ts | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index d41a7ca..17b3309 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -20,27 +20,12 @@ import { CustomValidate } from '../validators/CustomValidationConstraint'; */ export type ValidationIssue = { code: string; message: string }; -// Bivariant function type to allow narrower or wider parameter types in callbacks (e.g., Person) -type BivariantValidationFunction = { - bivarianceHack(value: TValue, object: TObject): ValidationIssue[]; -}["bivarianceHack"]; +type CustomValidationFunction = ( + value: TValue, + object: TObject +) => ValidationIssue[]; -/** - * Custom required function type for conditional field requirements. - * - * @param object - The entire object containing the field being evaluated - * @returns Boolean indicating whether the field is required (``true``) or optional (``false``) - * - * @example - * ```typescript - * const isRequiredIfAdult: CustomRequiredFunction = (object) => { - * return object.age >= 18; - * }; - * ``` - */ -type BivariantRequiredFunction = { - bivarianceHack(object: TObject): boolean; -}["bivarianceHack"]; +type CustomRequiredFunction = (object: TObject) => boolean; /** * Configuration options for the Field decorator. @@ -67,7 +52,7 @@ export interface FieldOptions * guardianName: string; * ``` */ - required?: boolean | BivariantRequiredFunction; + required?: boolean | CustomRequiredFunction; /** * Documentation string for the field. @@ -109,7 +94,7 @@ export interface FieldOptions * name: string; * ``` */ - validation?: PropertyDecorator | BivariantValidationFunction; + validation?: CustomValidationFunction; } /** @@ -140,7 +125,7 @@ export function Field(options if (typeof options.required === 'function') { ValidateIf((object: unknown) => { try { - const reqFn = options.required as BivariantRequiredFunction; + const reqFn = options.required as CustomRequiredFunction; return !!reqFn(object as TObject); } catch { @@ -155,15 +140,10 @@ export function Field(options } if (options?.validation) { - if (typeof options.validation === 'function' && options.validation.length > 1) { - // Store the custom validation function in metadata - Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); - // Apply the custom validator decorator to integrate with class-validator - CustomValidate()(target, propertyKey); - } else { - // Apply decorator directly if it's already a decorator - (options.validation as PropertyDecorator)(target, propertyKey); - } + // Store the custom validation function in metadata + Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); + // Apply the custom validator decorator to integrate with class-validator + CustomValidate()(target, propertyKey); } }; } From 41c662a82f6173381fedccf68641462e83095d4d Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Fri, 22 Aug 2025 11:47:25 -0300 Subject: [PATCH 053/254] Skip validation on empty non-required fields --- src/model/Field.ts | 6 ++++-- src/test/model/Person.ts | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index 17b3309..1ba018b 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,4 +1,4 @@ -import { IsNotEmpty, ValidateIf } from 'class-validator'; +import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { CustomValidate } from '../validators/CustomValidationConstraint'; /** @@ -120,7 +120,9 @@ export function Field(options if (options?.docs) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } - + if (!options.required) { + IsOptional()(target, propertyKey); + } if (options?.required !== undefined) { if (typeof options.required === 'function') { ValidateIf((object: unknown) => { diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index 9e39524..1e8d7de 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -1,6 +1,7 @@ import { Field } from "../../model/Field"; import { Model } from "../../model/Model"; import { BaseModel } from "../../model/BaseModel"; +import { IsEmail } from "class-validator"; @Model({ docs: "Represents a person", @@ -17,6 +18,7 @@ export class Person extends BaseModel { lastName!: string; @Field({}) + @IsEmail() email!: string; @Field({ From c51ce385496eb82f6ff462fa46b7609514ef0355 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 22 Aug 2025 12:00:24 -0300 Subject: [PATCH 054/254] enhance JSON serialization by conditionally excluding fields based on availability logic; add tests for age-based phone number inclusion. --- src/model/BaseModel.ts | 12 ++++++++++- src/model/Field.ts | 28 ++++++++++++++++++++++-- src/test/JsonConversion.test.ts | 38 +++++++++++++++++++++++++++++++++ src/test/model/Person.ts | 8 +++++++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 051ef22..61f5318 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -132,9 +132,19 @@ export abstract class BaseModel { * ``` */ public toJSON(): Record { - return instanceToPlain(this, { + const plainObject = instanceToPlain(this, { excludeExtraneousValues: true, }); + + // Remove properties with undefined values (which indicates field should not be available) + const result: Record = {}; + for (const [key, value] of Object.entries(plainObject)) { + if (value !== undefined) { + result[key] = value; + } + } + + return result; } /** diff --git a/src/model/Field.ts b/src/model/Field.ts index 136087b..222d49b 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,5 +1,5 @@ import { IsNotEmpty, ValidateIf } from 'class-validator'; -import { Exclude, Expose } from 'class-transformer'; +import { Exclude, Expose, Transform } from 'class-transformer'; import { CustomValidate } from '../validators/CustomValidationConstraint'; /** @@ -28,6 +28,8 @@ type CustomValidationFunction = ( type CustomRequiredFunction = (object: TObject) => boolean; +type CustomAvailableFunction = (object: TObject) => boolean; + /** * Configuration options for the Field decorator. * @@ -116,7 +118,7 @@ export interface FieldOptions * internalId: string; * ``` */ - available?: boolean; + available?: boolean | CustomAvailableFunction; } /** @@ -147,6 +149,28 @@ export function Field(options // Handle field availability for JSON serialization/deserialization if (options?.available === false) { Exclude()(target, propertyKey); + } else if (typeof options?.available === 'function') { + // For function-based availability, we need to use Transform to conditionally include/exclude + const availableFn = options.available as CustomAvailableFunction; + + // Store the availability function in metadata for potential future use + Reflect.defineMetadata('field:available', availableFn, target, propertyKey); + + // Use Transform to control the field's presence in JSON + Transform(({ obj, key }) => { + try { + const shouldBeAvailable = availableFn(obj as TObject); + // If the field should not be available, return undefined (which excludes it from JSON) + // If it should be available, return the actual value + return shouldBeAvailable ? obj[key] : undefined; + } catch { + // If there's an error evaluating the function, default to excluding the field + return undefined; + } + }, { toPlainOnly: true })(target, propertyKey); + + // Also expose the field by default for cases where the function returns true + Expose()(target, propertyKey); } else { // Default behavior is to expose the field (available: true or undefined) Expose()(target, propertyKey); diff --git a/src/test/JsonConversion.test.ts b/src/test/JsonConversion.test.ts index 4dd1b09..c1d3998 100644 --- a/src/test/JsonConversion.test.ts +++ b/src/test/JsonConversion.test.ts @@ -24,6 +24,43 @@ describe("BaseModel JSON Conversion", () => { expect(json).not.toHaveProperty("internalId"); }); + it("should exclude phoneNumber when age is under 18", () => { + const person = new Person(); + person.firstName = "Young"; + person.lastName = "Person"; + person.age = 16; + person.phoneNumber = "123-456-7890"; + + const json = person.toJSON(); + + expect(json).toEqual({ + firstName: "Young", + lastName: "Person", + age: 16, + // phoneNumber should be excluded because available: (person: Person) => person.age >= 18 + }); + + // Verify that phoneNumber is not in the JSON + expect(json).not.toHaveProperty("phoneNumber"); + }); + + it("should include phoneNumber when age is 18 or older", () => { + const person = new Person(); + person.firstName = "Adult"; + person.lastName = "Person"; + person.age = 18; + person.phoneNumber = "123-456-7890"; + + const json = person.toJSON(); + + expect(json).toEqual({ + firstName: "Adult", + lastName: "Person", + age: 18, + phoneNumber: "123-456-7890", + }); + }); + it("should handle undefined and null values", () => { const person = new Person(); person.firstName = "Jane"; @@ -231,5 +268,6 @@ describe("BaseModel JSON Conversion", () => { expect(errors.length).toBeGreaterThan(0); expect(errors.some(e => e.property === "age")).toBe(true); }); + }); }); diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index d205e4b..502af21 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -46,4 +46,12 @@ export class Person extends BaseModel { docs: "Internal identifier not exposed in JSON" }) internalId!: string; + + @Field({ + required: false, + available: (person: Person) => { + return person.age >= 18; + }, + }) + phoneNumber!: string; } From 3109d46ff74784f3cf948ba42a51c93192f34115 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Fri, 22 Aug 2025 12:05:58 -0300 Subject: [PATCH 055/254] Automatic option added in calculation field --- src/model/Field.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index 96f1deb..d34174e 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -96,8 +96,12 @@ export interface FieldOptions */ validation?: CustomValidationFunction; - - calculation?: 'manual'; + /** + * Defines the calculation strategy for a getter field. + * - `'automatic'` (default): The getter works as a standard TypeScript getter, calculated on every access. + * - `'manual'`: The getter's calculation is only executed when the `calculate()` method is called on the model instance. The result is then memoized (cached). + */ + calculation?: 'manual' | 'automatic'; } /** @@ -139,7 +143,7 @@ export function Field(options })(target, propertyKey); IsNotEmpty()(target, propertyKey); } else if (options.required) { - // Simple boolean required + // Simple boolean required IsNotEmpty()(target, propertyKey); } } @@ -151,6 +155,8 @@ export function Field(options CustomValidate()(target, propertyKey); } + // If calculation is manual apply memoization + // If is automatic, no special handling is needed if (options?.calculation === 'manual') { // This feature can only be applied to getters if (!descriptor || typeof descriptor.get !== 'function') { From b33e6b5bd21f5d2316a3446e7ea7e46ad2074f41 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Fri, 22 Aug 2025 13:09:26 -0300 Subject: [PATCH 056/254] WIP: Number decorator implementation --- src/model/BaseModel.ts | 14 +-- src/model/Field.ts | 7 +- src/model/types/Number.ts | 177 +++++++++++++++++++++++++++++++++ src/model/types/SharedTypes.ts | 22 ++++ src/test/Field.test.ts | 32 ++++++ src/test/model/Person.ts | 14 +++ 6 files changed, 253 insertions(+), 13 deletions(-) create mode 100644 src/model/types/Number.ts create mode 100644 src/model/types/SharedTypes.ts diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 2a1ce13..b2a416d 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,5 +1,5 @@ import { ValidationError, validate } from "class-validator"; -import type { ValidationIssue } from "./Field"; +import type { ValidationIssue } from "./types/SharedTypes"; /** * Abstract base class for all model classes in the framework. @@ -62,15 +62,15 @@ export abstract class BaseModel { */ public async validate(): Promise { const errors = await validate(this); - + // Transform constraint names for custom validations to preserve original error codes errors.forEach(error => { if (error.constraints) { const constraintKeys = Object.keys(error.constraints); - + // Check if this is a custom validation error (contains "customValidation") const customConstraint = constraintKeys.find(key => key.includes('customValidation')); - + if (customConstraint) { // Get the custom validation function to extract error codes const customValidationFn = Reflect.getMetadata( @@ -78,10 +78,10 @@ export abstract class BaseModel { this, error.property ); - + if (typeof customValidationFn === "function") { const validationResults = customValidationFn(error.value, this); - + if (validationResults && validationResults.length > 0) { // Replace constraints with original error codes const newConstraints: Record = {}; @@ -94,7 +94,7 @@ export abstract class BaseModel { } } }); - + return errors; } } \ No newline at end of file diff --git a/src/model/Field.ts b/src/model/Field.ts index 1ba018b..764f639 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,5 +1,6 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { CustomValidate } from '../validators/CustomValidationConstraint'; +import type { CustomRequiredFunction, CustomValidationFunction } from './types/SharedTypes'; /** * Custom validation function type for field validation. @@ -18,14 +19,8 @@ import { CustomValidate } from '../validators/CustomValidationConstraint'; * }; * ``` */ -export type ValidationIssue = { code: string; message: string }; -type CustomValidationFunction = ( - value: TValue, - object: TObject -) => ValidationIssue[]; -type CustomRequiredFunction = (object: TObject) => boolean; /** * Configuration options for the Field decorator. diff --git a/src/model/types/Number.ts b/src/model/types/Number.ts new file mode 100644 index 0000000..5b342b9 --- /dev/null +++ b/src/model/types/Number.ts @@ -0,0 +1,177 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; + +/** + * Options for the Number decorator. + */ +export interface NumberOptions { + /** The minimum allowed value. Optional. */ + min?: number; + /** The maximum allowed value. Optional. */ + max?: number; + /** Boolean indicating the value must be positive (> 0). Optional. */ + positive?: boolean; + /** Boolean indicating the value must be negative (< 0). Optional. */ + negative?: boolean; +} + +/** + * A type-safe key for the Number decorator. + * Ensures that the decorator is only applied to properties of type 'number'. + * Provides a clear error message in IntelliSense if used on a different type. + */ +type NumberKey = T[K] extends number + ? K + : `Number: requires number field`; + +/** + * Validates that a property is of number type at runtime. + * @param proto - The prototype of the class. + * @param propertyKey - The name of the property. + * @throws {Error} When the property is not of type 'number'. + */ +function validateNumberType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== Number) { + throw new Error(`@Number can only be applied to 'number' properties, but it was used on '${propertyKey}'.`); + } +} + +/** + * Stores metadata for the number field that can be consumed by other layers. + * @param proto - The prototype of the class. + * @param propName - The name of the property. + * @param options - The NumberOptions to store. + */ +function storeNumberMetadata(proto: Object, propName: string, options?: NumberOptions): void { + Reflect.defineMetadata('field:type', 'number', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Creates a helper function to add optional validators that only run when a value is present. + * @param proto - The prototype of the class. + * @param propName - The name of the property. + * @returns A function to add optional validators. + */ +function createOptionalValidatorAdder(proto: Object, propName: string) { + return ( + name: string, + validate: (value: unknown) => boolean, + defaultMessage: string + ) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + // Skip validation for empty values (null, undefined). + // This allows @Number to work alongside @Required. + if (value === undefined || value === null) return true; + return validate(value); + }, + defaultMessage() { + return defaultMessage; + }, + }, + }); + }; +} + +/** + * Applies validation rules based on the provided number options. + * @param addOptionalValidator - Function to add optional validators. + * @param propName - The property name for error messages. + * @param options - The NumberOptions for validation. + */ +function applyNumberValidations( + addOptionalValidator: ReturnType, + propName: string, + options?: NumberOptions +): void { + // Basic type check + addOptionalValidator('isNumber', (v) => typeof v === 'number', `${propName} must be a number`); + + // Min value validation + if (typeof options?.min === 'number') { + const min = options.min; + addOptionalValidator( + 'min', + (v) => typeof v === 'number' && v >= min, + `${propName} must not be less than ${min}` + ); + } + + // Max value validation + if (typeof options?.max === 'number') { + const max = options.max; + addOptionalValidator( + 'max', + (v) => typeof v === 'number' && v <= max, + `${propName} must not be greater than ${max}` + ); + } + + // Positive value validation + if (options?.positive === true) { + addOptionalValidator( + 'isPositive', + (v) => typeof v === 'number' && v > 0, + `${propName} must be a positive number` + ); + } + + // Negative value validation + if (options?.negative === true) { + addOptionalValidator( + 'isNegative', + (v) => typeof v === 'number' && v < 0, + `${propName} must be a negative number` + ); + } +} + +/** + * Number type decorator for number properties. + * + * This decorator can only be applied to properties of type `number` and provides + * validation capabilities. It also stores metadata that can be consumed by other + * layers such as database mapping or documentation generation. + * + * @example + * ```typescript + * class Product { + * @Number({ min: 0, max: 100 }) + * stock: number; + * + * @Number({ positive: true }) + * price: number; + * } + * ``` + * + * @param options - Configuration options for number validation. + * @returns A property decorator function that applies validation and stores metadata. + * @throws {Error} When applied to non-number properties. + */ +export function Number(options?: NumberOptions) { + return function ( + target: T, + propertyKey: NumberKey + ) { + const propName = propertyKey as string; + const proto = target as Object; + + // 1. Validate that the property is of number type at runtime + validateNumberType(proto, propName); + + // 2. Store metadata for potential consumers + storeNumberMetadata(proto, propName, options); + + // 3. Create validator helper and apply all specified validations + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyNumberValidations(addOptionalValidator, propName, options); + }; +} diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts new file mode 100644 index 0000000..331d3e3 --- /dev/null +++ b/src/model/types/SharedTypes.ts @@ -0,0 +1,22 @@ +/** + * Represents a single validation error from a custom validation function. + */ +export type ValidationIssue = { code: string; message: string }; + +/** + * A function that performs custom validation on a field's value. + * @param TValue The type of the field's value. + * @param TObject The type of the object being validated. + * @returns An array of ValidationIssue objects. Returns an empty array if validation passes. + */ +export type CustomValidationFunction = ( + value: TValue, + object: TObject +) => ValidationIssue[]; + +/** + * A function that conditionally determines if a field is required. + * @param TObject The type of the object being validated. + * @returns `true` if the field is required, `false` otherwise. + */ +export type CustomRequiredFunction = (object: TObject) => boolean; diff --git a/src/test/Field.test.ts b/src/test/Field.test.ts index d1ed835..6481135 100644 --- a/src/test/Field.test.ts +++ b/src/test/Field.test.ts @@ -91,4 +91,36 @@ describe("Person Model Validation", () => { expect(errors.length).toBeGreaterThan(0); }); + it("should fail validation for invalid height", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + invalidUser.height = -1; // Invalid height + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "height", codes: ["isPositive"], messages: ["height must be a positive number"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail for invalid birth year", async () => { + const invalidUser = new Person(); + invalidUser.firstName = "John"; + invalidUser.lastName = "Doe"; + invalidUser.email = "john.doe@example.com"; + invalidUser.age = 30; + invalidUser.height = 180; + invalidUser.birthYear = 1800; // Invalid birth year + + const errors = await invalidUser.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "birthYear", codes: ["min"], messages: ["birthYear must be greater than or equal to 1900"] }, + ]; + expect(summary).toStrictEqual(expected); + }); }); diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index 1e8d7de..ebf3b5e 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -2,6 +2,7 @@ import { Field } from "../../model/Field"; import { Model } from "../../model/Model"; import { BaseModel } from "../../model/BaseModel"; import { IsEmail } from "class-validator"; +import { Number, NumberOptions } from "../../model/types/Number"; @Model({ docs: "Represents a person", @@ -36,10 +37,23 @@ export class Person extends BaseModel { }) age!: number; + @Field({}) + @Number({ + min: 1900, + max: new Date().getFullYear(), + }) + birthYear!: number; + @Field({ required: (person: Person) => { return (person.age < 18); }, }) parentEmail!: string; + + @Field({}) + @Number({ + positive: true, + }) + height!: number; } From a09d1764c09cdc0f306ad921a68a2c128d386221 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 10:30:24 -0300 Subject: [PATCH 057/254] Error code changed to constraint --- src/model/BaseModel.ts | 14 +++++++------- src/model/Field.ts | 2 +- src/test/model/Person.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 2a1ce13..2723876 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -62,15 +62,15 @@ export abstract class BaseModel { */ public async validate(): Promise { const errors = await validate(this); - + // Transform constraint names for custom validations to preserve original error codes errors.forEach(error => { if (error.constraints) { const constraintKeys = Object.keys(error.constraints); - + // Check if this is a custom validation error (contains "customValidation") const customConstraint = constraintKeys.find(key => key.includes('customValidation')); - + if (customConstraint) { // Get the custom validation function to extract error codes const customValidationFn = Reflect.getMetadata( @@ -78,15 +78,15 @@ export abstract class BaseModel { this, error.property ); - + if (typeof customValidationFn === "function") { const validationResults = customValidationFn(error.value, this); - + if (validationResults && validationResults.length > 0) { // Replace constraints with original error codes const newConstraints: Record = {}; (validationResults as ValidationIssue[]).forEach((result) => { - newConstraints[result.code] = result.message; + newConstraints[result.constraint] = result.message; }); error.constraints = newConstraints; } @@ -94,7 +94,7 @@ export abstract class BaseModel { } } }); - + return errors; } } \ No newline at end of file diff --git a/src/model/Field.ts b/src/model/Field.ts index 1ba018b..ea16dd3 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -18,7 +18,7 @@ import { CustomValidate } from '../validators/CustomValidationConstraint'; * }; * ``` */ -export type ValidationIssue = { code: string; message: string }; +export type ValidationIssue = { constraint: string; message: string }; type CustomValidationFunction = ( value: TValue, diff --git a/src/test/model/Person.ts b/src/test/model/Person.ts index 1e8d7de..3173975 100644 --- a/src/test/model/Person.ts +++ b/src/test/model/Person.ts @@ -26,7 +26,7 @@ export class Person extends BaseModel { let errors = []; if (person.age < 0 || person.age > 120) { errors.push({ - code: "invalidAge", + constraint: "invalidAge", message: "Age must be between 0 and 120", }); } From df6164782ad0dc5f425eb8ee0a16184f161f1c22 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 10:43:03 -0300 Subject: [PATCH 058/254] Enhanced comparison between objects in iterative calculation --- src/model/BaseModel.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 227c852..1d0b596 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -141,7 +141,13 @@ export abstract class BaseModel { const oldValue = (this as any)[key]; const newValue = originalGetter.call(this); - if (oldValue !== newValue) { + // Compares the contents of objects, not references + const valuesAreDifferent = + (typeof oldValue === 'object' && oldValue !== null) + ? JSON.stringify(oldValue) !== JSON.stringify(newValue) + : oldValue !== newValue; + + if (valuesAreDifferent) { (this as any)[key] = newValue; // Triggers the replaced setter to memoize the value hasChanged = true; } From a95b3b5ef45e26ff15e64d63149b4263f6ffdc91 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 10:48:07 -0300 Subject: [PATCH 059/254] Unused importations removed --- src/model/Model.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/model/Model.ts b/src/model/Model.ts index e4deba8..ab2b6b6 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -1,4 +1,3 @@ -import { validate, ValidationError } from "class-validator"; import "reflect-metadata"; /** From 328277e41c15730693fa91d972510e67cc86608e Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 10:56:42 -0300 Subject: [PATCH 060/254] Test folder restructured --- {src/test => test}/Field.test.ts | 3 ++- {src/test => test}/model/Person.ts | 6 +++--- tsconfig.json | 7 +++++-- 3 files changed, 10 insertions(+), 6 deletions(-) rename {src/test => test}/Field.test.ts (99%) rename {src/test => test}/model/Person.ts (83%) diff --git a/src/test/Field.test.ts b/test/Field.test.ts similarity index 99% rename from src/test/Field.test.ts rename to test/Field.test.ts index d1ed835..657b9a9 100644 --- a/src/test/Field.test.ts +++ b/test/Field.test.ts @@ -1,5 +1,6 @@ -import { Person } from "./model/Person"; + import type { ValidationError } from "class-validator"; +import { Person } from "./model/Person"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. diff --git a/src/test/model/Person.ts b/test/model/Person.ts similarity index 83% rename from src/test/model/Person.ts rename to test/model/Person.ts index 3173975..394e326 100644 --- a/src/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,6 +1,6 @@ -import { Field } from "../../model/Field"; -import { Model } from "../../model/Model"; -import { BaseModel } from "../../model/BaseModel"; +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { BaseModel } from "../../src/model/BaseModel"; import { IsEmail } from "class-validator"; @Model({ diff --git a/tsconfig.json b/tsconfig.json index 4bb33c9..cc5ff17 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,10 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "outDir": "./dist", - "rootDir": "./src" + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + } }, - "include": ["src/**/*"] + "include": ["src/**/*", "test/**/*"] } From b16942eb1208dc20e95a69d98bb4996012929ce8 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 25 Aug 2025 11:19:23 -0300 Subject: [PATCH 061/254] update text types to use decorators, and evaluate them if they are not empty --- src/model/Field.ts | 45 +++++--- src/model/types/Text.ts | 223 ++++++++++++++++++++++++---------------- src/test/Field.test.ts | 2 +- 3 files changed, 163 insertions(+), 107 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index ea16dd3..bb13f4a 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -20,11 +20,22 @@ import { CustomValidate } from '../validators/CustomValidationConstraint'; */ export type ValidationIssue = { constraint: string; message: string }; +/** + * Type for a custom validation function. + * @param value - The value of the field being validated. + * @param object - The entire object containing the field. + * @returns An array of validation issues, or an empty array if valid. + */ type CustomValidationFunction = ( value: TValue, object: TObject ) => ValidationIssue[]; +/** + * Type for a function that dynamically determines if a field is required. + * @param object - The entire object containing the field. + * @returns `true` if the field is required, otherwise `false`. + */ type CustomRequiredFunction = (object: TObject) => boolean; /** @@ -117,38 +128,38 @@ export interface FieldOptions */ export function Field(options: FieldOptions) { return function (target: Object, propertyKey: string) { - if (options?.docs) { + // Add documentation metadata if provided + if (options.docs) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } - if (!options.required) { - IsOptional()(target, propertyKey); - } - if (options?.required !== undefined) { + + // Handle required validation + if (options.required) { if (typeof options.required === 'function') { - ValidateIf((object: unknown) => { + // Conditionally require the field based on the provided function + ValidateIf((object: TObject) => { try { - const reqFn = options.required as CustomRequiredFunction; - return !!reqFn(object as TObject); - } - catch { + return (options.required as CustomRequiredFunction)(object); + } catch { return false; } })(target, propertyKey); IsNotEmpty()(target, propertyKey); - } else if (options.required) { - // Simple boolean required + } else { + // Always require the field IsNotEmpty()(target, propertyKey); } + } else { + // If not required, the field is optional + IsOptional()(target, propertyKey); } - if (options?.validation) { + // Handle custom validation logic + if (options.validation) { // Store the custom validation function in metadata Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); // Apply the custom validator decorator to integrate with class-validator CustomValidate()(target, propertyKey); } }; -} - - - +} \ No newline at end of file diff --git a/src/model/types/Text.ts b/src/model/types/Text.ts index aeaa8d4..b434419 100644 --- a/src/model/types/Text.ts +++ b/src/model/types/Text.ts @@ -1,5 +1,13 @@ import 'reflect-metadata'; -import { registerDecorator } from 'class-validator'; +import { + ValidationArguments, + registerDecorator, + ValidationOptions, + minLength, + maxLength, + matches, + isEmail, +} from 'class-validator'; /** * Options for the Text decorator. @@ -35,9 +43,6 @@ type HtmlKey = T[K] extends string /** * Validates that a property is of string type at runtime. - * @param proto - The prototype object - * @param propertyKey - The property name - * @throws {Error} When the property is not of string type */ function validateStringType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); @@ -60,110 +65,142 @@ function storeTextMetadata(proto: Object, propName: string, options?: TextOption } /** - * Creates a helper function to add optional validators that only run when value is present. - * @param proto - The prototype object - * @param propName - The property name - * @returns A function to add optional validators + * Custom MinLength validator that only validates non-empty values + */ +function MinLengthIfNotEmpty(min: number, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + const decoratorOptions: any = { + name: 'minLength', + target: object.constructor, + propertyName: propertyName, + constraints: [min], + validator: { + validate(value: any, args: ValidationArguments) { + if (value == null || value === '') { + return true; + } + return minLength(value, args.constraints[0]); + }, + defaultMessage(args: ValidationArguments) { + return `${args.property} must be longer than or equal to ${args.constraints[0]} characters`; + } + }, + }; + if (validationOptions) { + decoratorOptions.options = validationOptions; + } + registerDecorator(decoratorOptions); + }; +} + +/** + * Custom MaxLength validator that only validates non-empty values + */ +function MaxLengthIfNotEmpty(max: number, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + const decoratorOptions: any = { + name: 'maxLength', + target: object.constructor, + propertyName: propertyName, + constraints: [max], + validator: { + validate(value: any, args: ValidationArguments) { + if (value == null || value === '') { + return true; + } + return maxLength(value, args.constraints[0]); + }, + defaultMessage(args: ValidationArguments) { + return `${args.property} must be shorter than or equal to ${args.constraints[0]} characters`; + } + }, + }; + if (validationOptions) { + decoratorOptions.options = validationOptions; + } + registerDecorator(decoratorOptions); + }; +} + +/** + * Custom Matches validator that only validates non-empty values */ -function createOptionalValidatorAdder(proto: Object, propName: string) { - return ( - name: string, - validate: (value: unknown) => boolean, - defaultMessage: string - ) => { +function MatchesIfNotEmpty(pattern: RegExp, message: string, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { registerDecorator({ - name, - target: (proto as any).constructor, - propertyName: propName, + name: 'matches', + target: object.constructor, + propertyName: propertyName, + constraints: [pattern], + options: { ...(validationOptions || {}), message }, validator: { - validate(value: unknown) { - if (value === undefined || value === null || value === '') return true; // skip when empty - return validate(value); + validate(value: any, args: ValidationArguments) { + if (value == null || value === '') { + return true; + } + return matches(value, args.constraints[0]); }, defaultMessage() { - return defaultMessage; - }, + return message; + } }, }); }; } /** - * Applies validation rules based on the provided text options. - * @param addOptionalValidator - Function to add optional validators - * @param propName - The property name for error messages - * @param options - Text validation options + * Custom Email validator that only validates non-empty values */ -function applyTextValidations( - addOptionalValidator: ReturnType, - propName: string, - options?: TextOptions -): void { - // Type check - addOptionalValidator('isString', (v) => typeof v === 'string', `${propName} must be a string`); - - // Min length validation - if (typeof options?.minLength === 'number') { - const min = options.minLength; - addOptionalValidator( - 'minLength', - (v) => typeof v === 'string' && v.length >= min, - `${propName} must be longer than or equal to ${min} characters` - ); - } - - // Max length validation - if (typeof options?.maxLength === 'number') { - const max = options.maxLength; - addOptionalValidator( - 'maxLength', - (v) => typeof v === 'string' && v.length <= max, - `${propName} must be shorter than or equal to ${max} characters` - ); - } - - // Regex validation - if (options?.regex) { - if (!options.regexMessage) { - throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); +function IsEmailIfNotEmpty(validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + const decoratorOptions: any = { + name: 'isEmail', + target: object.constructor, + propertyName: propertyName, + validator: { + validate(value: any) { + if (value == null || value === '') { + return true; + } + return isEmail(value); + }, + defaultMessage(args: ValidationArguments) { + return `${args.property} must be an email`; + } + }, + }; + if (validationOptions !== undefined) { + decoratorOptions.options = validationOptions; } - const rx = options.regex; - const message = options.regexMessage; - addOptionalValidator('matches', (v) => typeof v === 'string' && rx.test(v), message); - } + registerDecorator(decoratorOptions); + }; } /** * Text type decorator for string properties. - * + * * This decorator can only be applied to properties of type `string` and provides * validation capabilities through class-validator decorators. It also stores * metadata that can be consumed by other layers such as database mapping or * documentation generation. - * - * @example + * * @example * ```typescript * class User { - * @Text({ minLength: 2, maxLength: 50 }) - * name: string; - * - * @Text({ regex: /^[A-Z]+$/, regexMessage: 'Must be uppercase letters only' }) - * code: string; + * @Text({ minLength: 2, maxLength: 50 }) + * name: string; + * * @Text({ regex: /^[A-Z]+$/, regexMessage: 'Must be uppercase letters only' }) + * code: string; * } * ``` - * - * @param options - Configuration options for text validation and behavior + * * @param options - Configuration options for text validation and behavior * @param options.minLength - Minimum allowed length for the string value * @param options.maxLength - Maximum allowed length for the string value * @param options.regex - Regular expression pattern to validate the string against * @param options.regexMessage - Error message to display when regex validation fails (required when regex is provided) - * - * @returns A property decorator function that applies validation and stores metadata - * - * @throws {Error} When applied to non-string properties + * * @returns A property decorator function that applies validation and stores metadata + * * @throws {Error} When applied to non-string properties * @throws {Error} When regex is provided without regexMessage - * - * @remarks + * * @remarks * - All validators are optional and only execute when the value is present (not null, undefined, or empty string) * - This allows the decorator to work alongside other validation decorators like @Required * - Metadata is stored under 'field:type' (always 'text') and 'field:type:options' keys @@ -177,15 +214,24 @@ export function Text(options?: TextOptions) { const propName = propertyKey as unknown as string; const proto = target as unknown as Object; - // Validate that the property is of string type validateStringType(proto, propName); - - // Store metadata for potential consumers storeTextMetadata(proto, propName, options); - // Create validator helper and apply validations - const addOptionalValidator = createOptionalValidatorAdder(proto, propName); - applyTextValidations(addOptionalValidator, propName, options); + // Use custom validators that skip validation for empty values + if (options?.minLength !== undefined) { + MinLengthIfNotEmpty(options.minLength)(target as any, propName); + } + + if (options?.maxLength !== undefined) { + MaxLengthIfNotEmpty(options.maxLength)(target as any, propName); + } + + if (options?.regex) { + if (!options.regexMessage) { + throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); + } + MatchesIfNotEmpty(options.regex, options.regexMessage)(target as any, propName); + } }; } @@ -196,16 +242,15 @@ export function Text(options?: TextOptions) { * - No options. */ export function Email() { - const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; return function ( target: T, propertyKey: EmailKey ) { const propName = propertyKey as unknown as string; - // Mark logical type for potential consumers Reflect.defineMetadata('field:logicalType', 'email', target as unknown as Object, propName); - // Delegate to Text with regex - Text({ regex: EMAIL_REGEX, regexMessage: 'must be a valid email' })(target as any, propName as any); + + // Use custom email validator that skips validation for empty strings + IsEmailIfNotEmpty()(target as any, propName); }; } @@ -223,4 +268,4 @@ export function HTML() { Reflect.defineMetadata('field:logicalType', 'html', target as unknown as Object, propName); Text()(target as any, propName as any); }; -} +} \ No newline at end of file diff --git a/src/test/Field.test.ts b/src/test/Field.test.ts index 7bae378..217483a 100644 --- a/src/test/Field.test.ts +++ b/src/test/Field.test.ts @@ -101,7 +101,7 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); const summary = summarizeErrors(errors); const expected = [ - { field: "email", codes: ["matches"], messages: ["must be a valid email"] }, + { field: "email", codes: ["isEmail"], messages: ["email must be an email"] }, ]; expect(summary).toStrictEqual(expected); }); From efea54592e6e791632511338bdbbb25b1a245c09 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 25 Aug 2025 11:33:26 -0300 Subject: [PATCH 062/254] add comprehensive tests for @Exclude and @Expose decorators --- src/model/Field.ts | 59 ++++++++- src/test/JsonConversion.test.ts | 220 ++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+), 6 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index 222d49b..4ccc3c8 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -102,20 +102,35 @@ export interface FieldOptions /** * Indicates whether the field should be available for JSON serialization and deserialization. * - * When set to `false`, the field will be excluded from JSON conversion operations. - * When set to `true` or not specified, the field will be included in JSON operations. + * - When set to `false`, the field will be excluded from JSON conversion operations (applies `@Exclude()`). + * - When set to `true` or not specified, the field will be included in JSON operations (applies `@Expose()`). + * - When set to a function, the field availability is determined dynamically (applies `@Transform()` and `@Expose()`). * * @default true * * @example * ```typescript - * // Field available for JSON operations (default behavior) + * // Field available for JSON operations (default behavior) - uses Expose() * @Field({ available: true }) * name: string; * - * // Field excluded from JSON operations + * // Field excluded from JSON operations - uses Exclude() * @Field({ available: false }) * internalId: string; + * + * // Field conditionally available based on object state - uses Transform()+Expose() + * @Field({ + * available: (obj) => obj.isPublic, + * docs: 'Phone number only available for public profiles' + * }) + * phoneNumber: string; + * + * // Complex conditional availability example + * @Field({ + * available: (person) => person.age >= 18 && person.hasConsent, + * docs: 'Sensitive data only for adults with consent' + * }) + * sensitiveData: string; * ``` */ available?: boolean | CustomAvailableFunction; @@ -127,7 +142,10 @@ export interface FieldOptions * - Adds documentation metadata if `docs` is present in options. * - Applies required validation using `IsNotEmpty` and optionally `ValidateIf` if `required` is a function. * - Applies custom validation if `validation` is provided, supporting both function and decorator types. - * - Controls field availability for JSON serialization using `class-transformer` decorators. + * - Controls field availability for JSON serialization using `class-transformer` decorators: + * - `@Exclude()` when `available: false` + * - `@Expose()` when `available: true` or undefined + * - `@Transform()` + `@Expose()` when `available` is a function * * @param options - Configuration options for the field, including validation, documentation, and required logic. * @returns The property decorator function. @@ -135,8 +153,37 @@ export interface FieldOptions * @example * ```typescript * class Person { - * Field({ required: true, docs: 'The name of the person.' }) + * // Basic required field with documentation + * @Field({ required: true, docs: 'The name of the person.' }) * name: string; + * + * // Field excluded from JSON serialization (@Exclude applied) + * @Field({ available: false, docs: 'Internal ID not exposed in API' }) + * internalId: string; + * + * // Field included in JSON serialization (@Expose applied - default behavior) + * @Field({ available: true }) + * email: string; + * + * // Conditionally available field (@Transform+@Expose applied) + * @Field({ + * available: (person) => person.age >= 18, + * docs: 'Phone number only available for adults' + * }) + * phoneNumber: string; + * + * // Complex example: Admin-only field with custom validation + * @Field({ + * available: (user) => user.role === 'admin', + * validation: (value) => { + * if (value && value.length < 8) { + * return [{ code: 'WEAK_TOKEN', message: 'Admin token too short' }]; + * } + * return []; + * }, + * docs: 'Administrative access token (admin users only)' + * }) + * adminToken?: string; * } * ``` */ diff --git a/src/test/JsonConversion.test.ts b/src/test/JsonConversion.test.ts index c1d3998..d16857e 100644 --- a/src/test/JsonConversion.test.ts +++ b/src/test/JsonConversion.test.ts @@ -270,4 +270,224 @@ describe("BaseModel JSON Conversion", () => { }); }); + + describe("@Exclude and @Expose behavior", () => { + it("should exclude fields marked with available: false (@Exclude applied)", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john@example.com"; + person.age = 30; + person.internalId = "secret-internal-123"; + + const json = person.toJSON(); + + // Should include exposed fields + expect(json).toHaveProperty("firstName", "John"); + expect(json).toHaveProperty("lastName", "Doe"); + expect(json).toHaveProperty("email", "john@example.com"); + expect(json).toHaveProperty("age", 30); + + // Should exclude field marked with available: false + expect(json).not.toHaveProperty("internalId"); + expect(Object.keys(json)).not.toContain("internalId"); + }); + + it("should expose fields marked with available: true (@Expose applied)", () => { + const person = new Person(); + person.firstName = "Jane"; + person.lastName = "Smith"; + person.email = "jane@example.com"; + person.age = 25; + + const json = person.toJSON(); + + // All these fields should be exposed (available: true or default) + expect(json).toHaveProperty("firstName", "Jane"); + expect(json).toHaveProperty("lastName", "Smith"); + expect(json).toHaveProperty("email", "jane@example.com"); + expect(json).toHaveProperty("age", 25); + }); + + it("should conditionally expose fields based on function (@Transform + @Expose applied)", () => { + // Test case 1: Adult should have phoneNumber exposed + const adult = new Person(); + adult.firstName = "Adult"; + adult.lastName = "Person"; + adult.email = "adult@example.com"; + adult.age = 25; // >= 18 + adult.phoneNumber = "555-1234"; + + const adultJson = adult.toJSON(); + expect(adultJson).toHaveProperty("phoneNumber", "555-1234"); + + // Test case 2: Minor should NOT have phoneNumber exposed + const minor = new Person(); + minor.firstName = "Young"; + minor.lastName = "Person"; + minor.email = "young@example.com"; + minor.age = 16; // < 18 + minor.phoneNumber = "555-5678"; + + const minorJson = minor.toJSON(); + expect(minorJson).not.toHaveProperty("phoneNumber"); + expect(Object.keys(minorJson)).not.toContain("phoneNumber"); + }); + + it("should handle multiple conditional fields correctly", () => { + // Test with adult (phoneNumber should be available) + const adult = new Person(); + adult.firstName = "Test"; + adult.lastName = "Adult"; + adult.age = 20; + adult.phoneNumber = "555-0000"; + adult.internalId = "should-never-appear"; + + const adultJson = adult.toJSON(); + + expect(adultJson).toEqual({ + firstName: "Test", + lastName: "Adult", + age: 20, + phoneNumber: "555-0000" + }); + + // Test with minor (phoneNumber should NOT be available) + const minor = new Person(); + minor.firstName = "Test"; + minor.lastName = "Minor"; + minor.age = 15; + minor.phoneNumber = "555-1111"; + minor.internalId = "should-never-appear"; + + const minorJson = minor.toJSON(); + + expect(minorJson).toEqual({ + firstName: "Test", + lastName: "Minor", + age: 15 + }); + }); + + it("should handle edge cases in conditional availability", () => { + // Test exactly at the boundary (age = 18) + const eighteenYearOld = new Person(); + eighteenYearOld.firstName = "Boundary"; + eighteenYearOld.lastName = "Case"; + eighteenYearOld.age = 18; // exactly 18 + eighteenYearOld.phoneNumber = "555-1818"; + + const json = eighteenYearOld.toJSON(); + + // phoneNumber should be available since age >= 18 + expect(json).toHaveProperty("phoneNumber", "555-1818"); + }); + + it("should handle undefined values in conditionally available fields", () => { + const person = new Person(); + person.firstName = "Test"; + person.lastName = "Person"; + person.age = 25; + // phoneNumber is undefined but person is adult + + const json = person.toJSON(); + + // phoneNumber should NOT be in the JSON if it's undefined, + // even though the condition allows it (this is the expected behavior) + expect(json).not.toHaveProperty("phoneNumber"); + expect(json).toEqual({ + firstName: "Test", + lastName: "Person", + age: 25 + }); + }); + }); + + describe("fromJSON with @Exclude and @Expose behavior", () => { + it("should ignore excluded fields in fromJSON input", () => { + const jsonData = { + firstName: "Test", + lastName: "User", + age: 30, + internalId: "this-should-be-ignored", // Field marked with available: false + email: "test@example.com" + }; + + const person = Person.fromJSON(jsonData); + + expect(person.firstName).toBe("Test"); + expect(person.lastName).toBe("User"); + expect(person.age).toBe(30); + expect(person.email).toBe("test@example.com"); + + // internalId should be ignored during deserialization + expect(person.internalId).toBeUndefined(); + }); + + it("should properly handle conditional fields in fromJSON", () => { + const jsonData = { + firstName: "Test", + lastName: "User", + age: 25, + phoneNumber: "555-9999", + email: "test@example.com" + }; + + const person = Person.fromJSON(jsonData); + + expect(person.firstName).toBe("Test"); + expect(person.lastName).toBe("User"); + expect(person.age).toBe(25); + expect(person.email).toBe("test@example.com"); + + // phoneNumber should be set since it's provided in JSON + expect(person.phoneNumber).toBe("555-9999"); + }); + }); + + describe("metadata and decorator application", () => { + it("should store availability function in metadata for conditional fields", () => { + const person = new Person(); + + // Check that the availability function metadata is stored + const availabilityFn = Reflect.getMetadata('field:available', person, 'phoneNumber'); + expect(typeof availabilityFn).toBe('function'); + + // Test the function with different ages + const youngPerson = { age: 16 } as Person; + const adultPerson = { age: 25 } as Person; + + expect(availabilityFn(youngPerson)).toBe(false); + expect(availabilityFn(adultPerson)).toBe(true); + }); + + it("should verify that @Exclude is applied to fields with available: false", () => { + const person = new Person(); + person.internalId = "test-id"; + + // The field should be excluded from JSON serialization + const json = person.toJSON(); + expect(json).not.toHaveProperty("internalId"); + + // But the field should still exist on the instance + expect(person.internalId).toBe("test-id"); + }); + + it("should verify that @Expose is applied by default and to available: true fields", () => { + const person = new Person(); + person.firstName = "Test"; + person.lastName = "User"; + person.email = "test@example.com"; + person.age = 30; + + const json = person.toJSON(); + + // All these fields should be exposed + expect(json).toHaveProperty("firstName", "Test"); + expect(json).toHaveProperty("lastName", "User"); + expect(json).toHaveProperty("email", "test@example.com"); + expect(json).toHaveProperty("age", 30); + }); + }); + }); From 07d319d8077e52ae4068db70c3896f993af75016 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 11:58:08 -0300 Subject: [PATCH 063/254] Number decorator fix WIP --- jest.config.ts | 12 ++++++------ src/model/types/SharedTypes.ts | 2 +- test/model/Person.ts | 8 ++++---- test/setup.ts | 1 + tsconfig.json | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 test/setup.ts diff --git a/jest.config.ts b/jest.config.ts index ec6224f..e1ea88a 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,6 +1,5 @@ -import type { Config } from 'jest'; - -const config: Config = { +/** @type {import('ts-jest').JestConfigWithTsJest} */ +module.exports = { preset: 'ts-jest', testEnvironment: 'node', transform: { @@ -13,7 +12,8 @@ const config: Config = { }, ], }, - coverageProvider: "v8", + setupFiles: ['/test/setup.ts'], + moduleNameMapper: { + '^@/(.*)$': '/src/$1', + }, }; - -module.exports = config; \ No newline at end of file diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts index 331d3e3..92eb458 100644 --- a/src/model/types/SharedTypes.ts +++ b/src/model/types/SharedTypes.ts @@ -1,7 +1,7 @@ /** * Represents a single validation error from a custom validation function. */ -export type ValidationIssue = { code: string; message: string }; +export type ValidationIssue = { constraint: string; message: string }; /** * A function that performs custom validation on a field's value. diff --git a/test/model/Person.ts b/test/model/Person.ts index 056cc06..b3a4be5 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,8 +1,8 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; import { IsEmail } from "class-validator"; -import { Number, NumberOptions } from "../../model/types/Number"; +import { Number } from "@/model/types/Number"; @Model({ docs: "Represents a person", diff --git a/test/setup.ts b/test/setup.ts new file mode 100644 index 0000000..bdd42c1 --- /dev/null +++ b/test/setup.ts @@ -0,0 +1 @@ +import "reflect-metadata" \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index cc5ff17..e7ee8c9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,5 +23,5 @@ "@/*": ["src/*"] } }, - "include": ["src/**/*", "test/**/*"] + "include": ["src/**/*", "test/**/*", "jest.config.js"] } From 493df1c8d2c032b7deb5993ae8536c62d8f6ee1e Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 25 Aug 2025 12:03:09 -0300 Subject: [PATCH 064/254] Update Jest configuration: correct testMatch path and add moduleNameMapper --- jest.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jest.config.ts b/jest.config.ts index 387063c..57764ff 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -13,8 +13,11 @@ const config: Config = { }, ], }, - testMatch: ["/src/test/**/*.test.ts"], + testMatch: ["/test/**/*.test.ts"], coverageProvider: "v8", + moduleNameMapper: { + "^@/(.*)$": "/src/$1", + }, }; module.exports = config; From 965aa981fcb24e25c9e0295e31c1940f7a012f0b Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 12:11:50 -0300 Subject: [PATCH 065/254] Fix: number decorator detected correctly --- jest.config.ts | 1 - src/model/types/Number.ts | 2 +- test/Field.test.ts | 2 +- test/setup.ts | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 test/setup.ts diff --git a/jest.config.ts b/jest.config.ts index e1ea88a..6eab8f9 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -12,7 +12,6 @@ module.exports = { }, ], }, - setupFiles: ['/test/setup.ts'], moduleNameMapper: { '^@/(.*)$': '/src/$1', }, diff --git a/src/model/types/Number.ts b/src/model/types/Number.ts index 5b342b9..5a59ed9 100644 --- a/src/model/types/Number.ts +++ b/src/model/types/Number.ts @@ -32,7 +32,7 @@ type NumberKey = T[K] extends number */ function validateNumberType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== Number) { + if (designType !== Number && designType?.name !== 'Number') { throw new Error(`@Number can only be applied to 'number' properties, but it was used on '${propertyKey}'.`); } } diff --git a/test/Field.test.ts b/test/Field.test.ts index 1ac6286..e99f051 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -120,7 +120,7 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); const summary = summarizeErrors(errors); const expected = [ - { field: "birthYear", codes: ["min"], messages: ["birthYear must be greater than or equal to 1900"] }, + { field: "birthYear", codes: ["min"], messages: ["birthYear must not be less than 1900"] }, ]; expect(summary).toStrictEqual(expected); }); diff --git a/test/setup.ts b/test/setup.ts deleted file mode 100644 index bdd42c1..0000000 --- a/test/setup.ts +++ /dev/null @@ -1 +0,0 @@ -import "reflect-metadata" \ No newline at end of file From c0a35e23a9cb1a1cffc82e2f13227e49ccd45592 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 25 Aug 2025 12:43:42 -0300 Subject: [PATCH 066/254] Add Date Time and Date Time Types with examples and tests --- package.json | 2 +- src/model/types/DateTime.ts | 301 ++++++++++++++++++++++++++++++++ test/Project.test.ts | 339 ++++++++++++++++++++++++++++++++++++ test/model/Person.ts | 2 +- test/model/Project.ts | 65 +++++++ 5 files changed, 707 insertions(+), 2 deletions(-) create mode 100644 src/model/types/DateTime.ts create mode 100644 test/Project.test.ts create mode 100644 test/model/Project.ts diff --git a/package.json b/package.json index 05988a8..2aed778 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Slingr Framework - Smart Business Apps", "main": "index.js", "scripts": { - "test": "jest" + "test": "jest --verbose" }, "repository": { "type": "git", diff --git a/src/model/types/DateTime.ts b/src/model/types/DateTime.ts new file mode 100644 index 0000000..8c1641c --- /dev/null +++ b/src/model/types/DateTime.ts @@ -0,0 +1,301 @@ +import 'reflect-metadata'; +import { + ValidationArguments, + registerDecorator, + ValidationOptions, + ValidateNested, + IsOptional} from 'class-validator'; +import { Type } from 'class-transformer'; + +/** + * Options for the DateTime decorator. + */ +export interface DateTimeOptions { + /** Minimum allowed date (ISO 8601 string or Date object). */ + min?: Date | string; + /** Maximum allowed date (ISO 8601 string or Date object). */ + max?: Date | string; +} + +/** + * Options for the DateTimeRange decorator. + */ +export interface DateTimeRangeOptions { + /** If set to true, the 'from' field can be empty (open start). */ + openStart?: boolean; + /** If set to true, the 'to' field can be empty (open end). */ + openEnd?: boolean; +} + +// Custom key types for clearer IntelliSense errors +type DateTimeKey = T[K] extends Date | undefined + ? K + : `DateTime: requires Date field`; + +type DateTimeRangeKey = T[K] extends DateTimeRangeClass | undefined + ? K + : `DateTimeRange: requires DateTimeRange field`; + +/** + * Validates that a property is of Date type at runtime. + */ +function validateDateType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== Date) { + throw new Error(`@DateTime can only be applied to 'Date' properties: ${propertyKey}`); + } +} + +/** + * Validates that a property is of DateTimeRange type at runtime. + */ +function validateDateTimeRangeType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== DateTimeRangeClass) { + throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' properties: ${propertyKey}`); + } +} + +/** + * Stores metadata for the datetime field that can be consumed by other layers. + */ +function storeDateTimeMetadata(proto: Object, propName: string, options?: DateTimeOptions): void { + Reflect.defineMetadata('field:type', 'datetime', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Stores metadata for the datetime range field that can be consumed by other layers. + */ +function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { + Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Custom Date validator that only validates non-null values and supports min/max dates + */ +function IsDateWithRange(min?: Date | string, max?: Date | string, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'isDateWithRange', + target: object.constructor, + propertyName: propertyName, + constraints: [min, max], + options: validationOptions || {}, + validator: { + validate(value: any, args: ValidationArguments) { + if (value == null) { + return true; // Allow null/undefined values - required validation handles this + } + + // Check if it's a valid date + const date = value instanceof Date ? value : new Date(value); + if (isNaN(date.getTime())) { + return false; + } + + // Check min constraint + if (args.constraints[0]) { + const minDate = args.constraints[0] instanceof Date ? + args.constraints[0] : new Date(args.constraints[0]); + if (date < minDate) { + return false; + } + } + + // Check max constraint + if (args.constraints[1]) { + const maxDate = args.constraints[1] instanceof Date ? + args.constraints[1] : new Date(args.constraints[1]); + if (date > maxDate) { + return false; + } + } + + return true; + }, + defaultMessage(args: ValidationArguments) { + const [min, max] = args.constraints; + if (min && max) { + return `${args.property} must be a valid date between ${min} and ${max}`; + } else if (min) { + return `${args.property} must be a valid date after ${min}`; + } else if (max) { + return `${args.property} must be a valid date before ${max}`; + } + return `${args.property} must be a valid date`; + } + }, + }); + }; +} + +/** + * DateTime type decorator for Date properties. + * + * This decorator can only be applied to properties of type `Date` and provides + * validation capabilities for dates with optional min/max constraints. + * It uses ISO 8601 format for JSON serialization/deserialization. + * + * @example + * ```typescript + * class Event { + * @DateTime({ min: new Date('2024-01-01'), max: new Date('2024-12-31') }) + * eventDate: Date; + * + * @DateTime() + * createdAt: Date; + * } + * ``` + * + * @param options - Configuration options for datetime validation + * @param options.min - Minimum allowed date (ISO 8601 string or Date object) + * @param options.max - Maximum allowed date (ISO 8601 string or Date object) + * + * @returns A property decorator function that applies validation and stores metadata + * + * @throws {Error} When applied to non-Date properties + * + * @remarks + * - Validators are optional and only execute when the value is present (not null or undefined) + * - This allows the decorator to work alongside other validation decorators like @Required + * - Metadata is stored under 'field:type' ('datetime') and 'field:type:options' keys + * - Uses ISO 8601 format for consistent date handling + */ +export function DateTime(options?: DateTimeOptions) { + return function ( + target: T, + propertyKey: DateTimeKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateDateType(proto, propName); + storeDateTimeMetadata(proto, propName, options); + + // Apply date validation with optional min/max constraints + IsDateWithRange(options?.min, options?.max)(target as any, propName); + + // Add JSON transformation metadata for ISO 8601 handling + Type(() => Date)(target as any, propName); + }; +} + +/** + * DateTimeRange class that represents a range between two dates. + * Used as a nested object in models that need date ranges. + */ +export class DateTimeRangeClass { + @IsOptional() + @Type(() => Date) + from?: Date; + + @IsOptional() + @Type(() => Date) + to?: Date; +} + +/** + * Custom DateTimeRange validator that validates range constraints + */ +function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'isValidDateTimeRange', + target: object.constructor, + propertyName: propertyName, + constraints: [options], + options: validationOptions || {}, + validator: { + validate(value: any, args: ValidationArguments) { + if (value == null) { + return true; // Allow null/undefined values + } + + if (!(value instanceof DateTimeRangeClass)) { + return false; + } + + const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; + + // Check if from is required (when openStart is false or undefined) + if (!rangeOptions?.openStart && !value.from) { + return false; + } + + // Check if to is required (when openEnd is false or undefined) + if (!rangeOptions?.openEnd && !value.to) { + return false; + } + + // If both dates are present, validate that from is before to + if (value.from && value.to) { + if (value.from >= value.to) { + return false; + } + } + + return true; + }, + defaultMessage(args: ValidationArguments) { + return `${args.property} must be a valid date range where 'from' is before 'to'`; + } + }, + }); + }; +} + +/** + * DateTimeRange type decorator for DateTimeRange properties. + * + * This decorator can only be applied to properties of type `DateTimeRange` and provides + * validation for date ranges with optional open start/end capabilities. + * + * @example + * ```typescript + * class Reservation { + * @DateTimeRange({ openStart: false, openEnd: false }) + * dateRange: DateTimeRange; + * + * @DateTimeRange({ openStart: true, openEnd: true }) + * flexibleRange: DateTimeRange; + * } + * ``` + * + * @param options - Configuration options for datetime range validation + * @param options.openStart - If true, 'from' field can be empty (open start) + * @param options.openEnd - If true, 'to' field can be empty (open end) + * + * @returns A property decorator function that applies validation and stores metadata + * + * @throws {Error} When applied to non-DateTimeRange properties + * + * @remarks + * - Validates that 'from' date is before 'to' date when both are present + * - Supports open-ended ranges when openStart or openEnd options are enabled + * - Metadata is stored under 'field:type' ('datetimerange') and 'field:type:options' keys + */ +export function DateTimeRange(options?: DateTimeRangeOptions) { + return function ( + target: T, + propertyKey: DateTimeRangeKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateDateTimeRangeType(proto, propName); + storeDateTimeRangeMetadata(proto, propName, options); + + // Apply nested validation for DateTimeRange + ValidateNested()(target as any, propName); + Type(() => DateTimeRangeClass)(target as any, propName); + + // Apply custom range validation + IsValidDateTimeRange(options)(target as any, propName); + }; +} diff --git a/test/Project.test.ts b/test/Project.test.ts new file mode 100644 index 0000000..57b6b4e --- /dev/null +++ b/test/Project.test.ts @@ -0,0 +1,339 @@ +import type { ValidationError } from "class-validator"; +import { Project } from "./model/Project"; +import { DateTimeRangeClass } from "../src/model/types/DateTime"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("Project Model DateTime Validation", () => { + + describe("Valid Project Creation", () => { + it("should pass validation for a valid project with all required fields", async () => { + const validProject = new Project(); + validProject.name = "Test Project"; + validProject.startDate = new Date('2024-06-15'); + validProject.endDate = new Date('2024-12-31'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + flexibleRange.from = new Date('2024-01-01'); + flexibleRange.to = new Date('2024-12-31'); + validProject.flexibleRange = flexibleRange; + + validProject.description = "A test project"; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with minimum required fields only", async () => { + const validProject = new Project(); + validProject.name = "Minimal Project"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("Required Field Validation", () => { + it("should fail validation when required fields are missing", async () => { + const invalidProject = new Project(); + // Missing name, startDate, and activeRange + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + expect(summary.some(error => error.field === "name")).toBe(true); + expect(summary.some(error => error.field === "startDate")).toBe(true); + expect(summary.some(error => error.field === "activeRange")).toBe(true); + }); + + it("should pass validation when optional fields are missing", async () => { + const validProject = new Project(); + validProject.name = "Optional Fields Test"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + // endDate, flexibleRange, and description are optional + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("DateTime Min/Max Validation", () => { + it("should fail validation when startDate is before minimum allowed date", async () => { + const invalidProject = new Project(); + invalidProject.name = "Date Test"; + invalidProject.startDate = new Date('2019-12-31'); // Before 2020-01-01 minimum + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + + it("should fail validation when startDate is after maximum allowed date", async () => { + const invalidProject = new Project(); + invalidProject.name = "Date Test"; + invalidProject.startDate = new Date('2031-01-01'); // After 2030-12-31 maximum + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + + it("should pass validation with startDate within allowed range", async () => { + const validProject = new Project(); + validProject.name = "Date Test"; + validProject.startDate = new Date('2024-06-15'); // Within 2020-2030 range + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for endDate without min/max constraints", async () => { + const validProject = new Project(); + validProject.name = "End Date Test"; + validProject.startDate = new Date('2024-06-15'); + validProject.endDate = new Date('1990-01-01'); // No constraints on endDate + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("DateTimeRange Validation", () => { + it("should fail validation when activeRange is missing both from and to dates", async () => { + const invalidProject = new Project(); + invalidProject.name = "Range Test"; + invalidProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + // Both from and to are undefined, but openStart and openEnd are false + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const rangeError = summary.find(error => error.field === "activeRange"); + expect(rangeError).toBeDefined(); + expect(rangeError?.codes).toContain("isValidDateTimeRange"); + }); + + it("should fail validation when activeRange has from date after to date", async () => { + const invalidProject = new Project(); + invalidProject.name = "Range Test"; + invalidProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-09-15'); // After 'to' date + activeRange.to = new Date('2024-06-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const rangeError = summary.find(error => error.field === "activeRange"); + expect(rangeError).toBeDefined(); + expect(rangeError?.codes).toContain("isValidDateTimeRange"); + }); + + it("should pass validation for activeRange with valid from and to dates", async () => { + const validProject = new Project(); + validProject.name = "Range Test"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for flexibleRange with only from date (openEnd=true)", async () => { + const validProject = new Project(); + validProject.name = "Flexible Range Test"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + flexibleRange.from = new Date('2024-01-01'); + // to is undefined, but openEnd is true + validProject.flexibleRange = flexibleRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for flexibleRange with only to date (openStart=true)", async () => { + const validProject = new Project(); + validProject.name = "Flexible Range Test"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + // from is undefined, but openStart is true + flexibleRange.to = new Date('2024-12-31'); + validProject.flexibleRange = flexibleRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for flexibleRange with neither date (both open)", async () => { + const validProject = new Project(); + validProject.name = "Flexible Range Test"; + validProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + validProject.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + // Both from and to are undefined, but both openStart and openEnd are true + validProject.flexibleRange = flexibleRange; + + const errors = await validProject.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("Invalid Date Validation", () => { + it("should fail validation with invalid date string", async () => { + const invalidProject = new Project(); + invalidProject.name = "Invalid Date Test"; + invalidProject.startDate = new Date('invalid-date'); // Invalid date + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + }); + + describe("Text Field Validation", () => { + it("should fail validation when name is too short", async () => { + const invalidProject = new Project(); + invalidProject.name = "A"; // Too short (minLength is 2) + invalidProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const nameError = summary.find(error => error.field === "name"); + expect(nameError).toBeDefined(); + expect(nameError?.codes).toContain("minLength"); + }); + + it("should fail validation when name is too long", async () => { + const invalidProject = new Project(); + invalidProject.name = "A".repeat(101); // Too long (maxLength is 100) + invalidProject.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const nameError = summary.find(error => error.field === "name"); + expect(nameError).toBeDefined(); + expect(nameError?.codes).toContain("maxLength"); + }); + + it("should fail validation when description is too long", async () => { + const invalidProject = new Project(); + invalidProject.name = "Description Test"; + invalidProject.startDate = new Date('2024-06-15'); + invalidProject.description = "A".repeat(501); // Too long (maxLength is 500) + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + invalidProject.activeRange = activeRange; + + const errors = await invalidProject.validate(); + const summary = summarizeErrors(errors); + + const descError = summary.find(error => error.field === "description"); + expect(descError).toBeDefined(); + expect(descError?.codes).toContain("maxLength"); + }); + }); +}); diff --git a/test/model/Person.ts b/test/model/Person.ts index b84e7ed..22d933a 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -2,7 +2,7 @@ import { Field } from "../../src/model/Field"; import { Model } from "../../src/model/Model"; import { BaseModel } from "../../src/model/BaseModel"; import { IsEmail } from "class-validator"; -import { Text, Email, HTML } from "@/model/types/Text"; +import { Text, Email, HTML } from "../../src/model/types/Text"; @Model({ docs: "Represents a person", diff --git a/test/model/Project.ts b/test/model/Project.ts new file mode 100644 index 0000000..d20fa29 --- /dev/null +++ b/test/model/Project.ts @@ -0,0 +1,65 @@ +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { BaseModel } from "../../src/model/BaseModel"; +import { Text } from "../../src/model/types/Text"; +import { DateTime, DateTimeRange, DateTimeRangeClass } from "../../src/model/types/DateTime"; + +@Model({ + docs: "Represents a project with date-related fields", +}) +export class Project extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 100, + }) + name!: string; + + + @Field({ + required: true, + }) + @DateTime({ + min: new Date('2020-01-01'), + max: new Date('2030-12-31'), + }) + startDate!: Date; + + + @Field({ + required: false, + }) + @DateTime() + endDate?: Date; + + + @Field({ + required: true, + }) + @DateTimeRange({ + openStart: false, + openEnd: false, + }) + activeRange!: DateTimeRangeClass; + + + @Field({ + required: false, + }) + @DateTimeRange({ + openStart: true, + openEnd: true, + }) + flexibleRange?: DateTimeRangeClass; + + + @Field({ + required: false, + }) + @Text({ + maxLength: 500, + }) + description!: string; +} From a4c871b135be9fbbb8dc65053088a6aa402bb369 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 25 Aug 2025 13:01:23 -0300 Subject: [PATCH 067/254] Enhance DateTime serialization and deserialization with ISO 8601 support and comprehensive tests --- src/model/types/DateTime.ts | 87 +++++++++++- test/Project.test.ts | 262 ++++++++++++++++++++++++++++++++++++ 2 files changed, 344 insertions(+), 5 deletions(-) diff --git a/src/model/types/DateTime.ts b/src/model/types/DateTime.ts index 8c1641c..8125103 100644 --- a/src/model/types/DateTime.ts +++ b/src/model/types/DateTime.ts @@ -5,7 +5,7 @@ import { ValidationOptions, ValidateNested, IsOptional} from 'class-validator'; -import { Type } from 'class-transformer'; +import { Type, Transform, TransformationType, Expose } from 'class-transformer'; /** * Options for the DateTime decorator. @@ -27,6 +27,54 @@ export interface DateTimeRangeOptions { openEnd?: boolean; } +/** + * Transforms Date objects to ISO 8601 strings for JSON serialization. + * @param value - The Date value to transform + * @returns ISO 8601 string or undefined if value is null/undefined + */ +function dateToISO8601(value: Date | undefined | null): string | undefined { + if (value == null) { + return undefined; + } + if (!(value instanceof Date)) { + return undefined; + } + return value.toISOString(); +} + +/** + * Transforms ISO 8601 strings or milliseconds to Date objects for JSON deserialization. + * Supports both ISO 8601 strings and milliseconds for backwards compatibility. + * @param value - The value to transform (ISO 8601 string, milliseconds number, or Date) + * @returns Date object or undefined if value is null/undefined + */ +function dateFromJSON(value: any): Date | undefined { + if (value == null) { + return undefined; + } + + // If it's already a Date object, return it + if (value instanceof Date) { + return value; + } + + // If it's a number, treat it as milliseconds (backwards compatibility) + if (typeof value === 'number') { + return new Date(value); + } + + // If it's a string, try to parse as ISO 8601 + if (typeof value === 'string') { + const date = new Date(value); + // Check if the date is valid + if (!isNaN(date.getTime())) { + return date; + } + } + + return undefined; +} + // Custom key types for clearer IntelliSense errors type DateTimeKey = T[K] extends Date | undefined ? K @@ -181,8 +229,17 @@ export function DateTime(options?: DateTimeOptions) { // Apply date validation with optional min/max constraints IsDateWithRange(options?.min, options?.max)(target as any, propName); - // Add JSON transformation metadata for ISO 8601 handling - Type(() => Date)(target as any, propName); + // Custom transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: Date -> ISO 8601 string + return dateToISO8601(value); + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: string/number -> Date + return dateFromJSON(value); + } + return value; + })(target as any, propName); }; } @@ -192,11 +249,31 @@ export function DateTime(options?: DateTimeOptions) { */ export class DateTimeRangeClass { @IsOptional() - @Type(() => Date) + @Expose() + @Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: Date -> ISO 8601 string + return dateToISO8601(value); + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: string/number -> Date + return dateFromJSON(value); + } + return value; + }) from?: Date; @IsOptional() - @Type(() => Date) + @Expose() + @Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: Date -> ISO 8601 string + return dateToISO8601(value); + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: string/number -> Date + return dateFromJSON(value); + } + return value; + }) to?: Date; } diff --git a/test/Project.test.ts b/test/Project.test.ts index 57b6b4e..ff035e7 100644 --- a/test/Project.test.ts +++ b/test/Project.test.ts @@ -336,4 +336,266 @@ describe("Project Model DateTime Validation", () => { expect(descError?.codes).toContain("maxLength"); }); }); + + describe("JSON Conversion", () => { + describe("toJSON", () => { + it("should convert DateTime fields to ISO 8601 strings", async () => { + const project = new Project(); + project.name = "JSON Test Project"; + project.startDate = new Date('2024-06-15T10:30:45.123Z'); + project.endDate = new Date('2024-12-31T23:59:59.999Z'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15T08:00:00.000Z'); + activeRange.to = new Date('2024-09-15T17:00:00.000Z'); + project.activeRange = activeRange; + + const json = project.toJSON(); + + expect(json.name).toBe("JSON Test Project"); + expect(json.startDate).toBe("2024-06-15T10:30:45.123Z"); + expect(json.endDate).toBe("2024-12-31T23:59:59.999Z"); + expect(json.activeRange).toEqual({ + from: "2024-06-15T08:00:00.000Z", + to: "2024-09-15T17:00:00.000Z" + }); + }); + + it("should handle undefined optional fields in JSON output", async () => { + const project = new Project(); + project.name = "Minimal JSON Project"; + project.startDate = new Date('2024-06-15T10:30:45.123Z'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15T08:00:00.000Z'); + activeRange.to = new Date('2024-09-15T17:00:00.000Z'); + project.activeRange = activeRange; + + const json = project.toJSON(); + + expect(json.name).toBe("Minimal JSON Project"); + expect(json.startDate).toBe("2024-06-15T10:30:45.123Z"); + expect(json.endDate).toBeUndefined(); + expect(json.flexibleRange).toBeUndefined(); + expect(json.activeRange).toEqual({ + from: "2024-06-15T08:00:00.000Z", + to: "2024-09-15T17:00:00.000Z" + }); + }); + + it("should handle DateTimeRange with partial dates", async () => { + const project = new Project(); + project.name = "Partial Range Project"; + project.startDate = new Date('2024-06-15T10:30:45.123Z'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15T08:00:00.000Z'); + activeRange.to = new Date('2024-09-15T17:00:00.000Z'); + project.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); + // to is undefined (open end) + project.flexibleRange = flexibleRange; + + const json = project.toJSON(); + + expect(json.flexibleRange).toEqual({ + from: "2024-01-01T00:00:00.000Z", + to: undefined + }); + }); + }); + + describe("fromJSON", () => { + it("should convert ISO 8601 strings back to Date objects", async () => { + const jsonData = { + name: "Restored Project", + startDate: "2024-06-15T10:30:45.123Z", + endDate: "2024-12-31T23:59:59.999Z", + activeRange: { + from: "2024-06-15T08:00:00.000Z", + to: "2024-09-15T17:00:00.000Z" + }, + flexibleRange: { + from: "2024-01-01T00:00:00.000Z", + to: "2024-12-31T23:59:59.999Z" + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.name).toBe("Restored Project"); + expect(project.startDate).toBeInstanceOf(Date); + expect(project.startDate.toISOString()).toBe("2024-06-15T10:30:45.123Z"); + expect(project.endDate).toBeInstanceOf(Date); + expect(project.endDate!.toISOString()).toBe("2024-12-31T23:59:59.999Z"); + + expect(project.activeRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.activeRange.from).toBeInstanceOf(Date); + expect(project.activeRange.from!.toISOString()).toBe("2024-06-15T08:00:00.000Z"); + expect(project.activeRange.to).toBeInstanceOf(Date); + expect(project.activeRange.to!.toISOString()).toBe("2024-09-15T17:00:00.000Z"); + + expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.flexibleRange!.from).toBeInstanceOf(Date); + expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); + expect(project.flexibleRange!.to).toBeInstanceOf(Date); + expect(project.flexibleRange!.to!.toISOString()).toBe("2024-12-31T23:59:59.999Z"); + }); + + it("should support milliseconds for backwards compatibility", async () => { + const jsonData = { + name: "Legacy Project", + startDate: 1718448645123, // milliseconds + endDate: 1735689599999, // milliseconds + activeRange: { + from: 1718434800000, // milliseconds + to: 1726423200000 // milliseconds + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.startDate).toBeInstanceOf(Date); + expect(project.startDate.getTime()).toBe(1718448645123); + expect(project.endDate).toBeInstanceOf(Date); + expect(project.endDate!.getTime()).toBe(1735689599999); + + expect(project.activeRange.from).toBeInstanceOf(Date); + expect(project.activeRange.from!.getTime()).toBe(1718434800000); + expect(project.activeRange.to).toBeInstanceOf(Date); + expect(project.activeRange.to!.getTime()).toBe(1726423200000); + }); + + it("should handle mixed ISO 8601 and milliseconds", async () => { + const jsonData = { + name: "Mixed Format Project", + startDate: "2024-06-15T10:30:45.123Z", // ISO 8601 + endDate: 1735689599999, // milliseconds + activeRange: { + from: 1718434800000, // milliseconds + to: "2024-09-15T17:00:00.000Z" // ISO 8601 + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.startDate).toBeInstanceOf(Date); + expect(project.startDate.toISOString()).toBe("2024-06-15T10:30:45.123Z"); + expect(project.endDate).toBeInstanceOf(Date); + expect(project.endDate!.getTime()).toBe(1735689599999); + + expect(project.activeRange.from).toBeInstanceOf(Date); + expect(project.activeRange.from!.getTime()).toBe(1718434800000); + expect(project.activeRange.to).toBeInstanceOf(Date); + expect(project.activeRange.to!.toISOString()).toBe("2024-09-15T17:00:00.000Z"); + }); + + it("should handle undefined fields in JSON input", async () => { + const jsonData = { + name: "Minimal JSON Input", + startDate: "2024-06-15T10:30:45.123Z", + activeRange: { + from: "2024-06-15T08:00:00.000Z", + to: "2024-09-15T17:00:00.000Z" + } + // endDate and flexibleRange are undefined + }; + + const project = Project.fromJSON(jsonData); + + expect(project.name).toBe("Minimal JSON Input"); + expect(project.startDate).toBeInstanceOf(Date); + expect(project.endDate).toBeUndefined(); + expect(project.flexibleRange).toBeUndefined(); + expect(project.activeRange).toBeInstanceOf(DateTimeRangeClass); + }); + + it("should handle partial DateTimeRange in JSON input", async () => { + const jsonData = { + name: "Partial Range JSON", + startDate: "2024-06-15T10:30:45.123Z", + activeRange: { + from: "2024-06-15T08:00:00.000Z", + to: "2024-09-15T17:00:00.000Z" + }, + flexibleRange: { + from: "2024-01-01T00:00:00.000Z" + // to is undefined (open end) + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.flexibleRange!.from).toBeInstanceOf(Date); + expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); + expect(project.flexibleRange!.to).toBeUndefined(); + }); + }); + + describe("Round-trip conversion", () => { + it("should maintain data integrity through toJSON/fromJSON cycle", async () => { + const originalProject = new Project(); + originalProject.name = "Round-trip Project"; + originalProject.startDate = new Date('2024-06-15T10:30:45.123Z'); + originalProject.endDate = new Date('2024-12-31T23:59:59.999Z'); + originalProject.description = "Test description"; + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2024-06-15T08:00:00.000Z'); + activeRange.to = new Date('2024-09-15T17:00:00.000Z'); + originalProject.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeClass(); + flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); + flexibleRange.to = new Date('2024-12-31T23:59:59.999Z'); + originalProject.flexibleRange = flexibleRange; + + // Convert to JSON and back + const json = originalProject.toJSON(); + const restoredProject = Project.fromJSON(json); + + // Verify all fields match + expect(restoredProject.name).toBe(originalProject.name); + expect(restoredProject.startDate.getTime()).toBe(originalProject.startDate.getTime()); + expect(restoredProject.endDate!.getTime()).toBe(originalProject.endDate!.getTime()); + expect(restoredProject.description).toBe(originalProject.description); + + expect(restoredProject.activeRange.from!.getTime()).toBe(originalProject.activeRange.from!.getTime()); + expect(restoredProject.activeRange.to!.getTime()).toBe(originalProject.activeRange.to!.getTime()); + + expect(restoredProject.flexibleRange!.from!.getTime()).toBe(originalProject.flexibleRange!.from!.getTime()); + expect(restoredProject.flexibleRange!.to!.getTime()).toBe(originalProject.flexibleRange!.to!.getTime()); + + // Verify the restored object can still be validated + const errors = await restoredProject.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should produce consistent JSON format as specified", async () => { + const project = new Project(); + project.name = "Hotel Reservation System"; + project.startDate = new Date('2025-08-21T13:42:24.123Z'); + + const activeRange = new DateTimeRangeClass(); + activeRange.from = new Date('2025-08-21T13:42:24.123Z'); + activeRange.to = new Date('2025-08-23T13:42:24.123Z'); + project.activeRange = activeRange; + + const json = project.toJSON(); + + // Verify the JSON structure matches the specification + expect(json).toEqual({ + name: "Hotel Reservation System", + startDate: "2025-08-21T13:42:24.123Z", + activeRange: { + from: "2025-08-21T13:42:24.123Z", + to: "2025-08-23T13:42:24.123Z" + } + }); + }); + }); + }); }); From fbac5fa89c8948ee6fde32aa716dca7737d3389e Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Mon, 25 Aug 2025 13:02:28 -0300 Subject: [PATCH 068/254] Money decorator development WIP --- package.json | 3 +- src/model/types/Money.ts | 117 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 src/model/types/Money.ts diff --git a/package.json b/package.json index 05988a8..ec6f7c2 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "typescript": "^5.9.2" }, "dependencies": { + "bigint-money": "^2.0.0", "class-validator": "^0.14.2" } -} \ No newline at end of file +} diff --git a/src/model/types/Money.ts b/src/model/types/Money.ts new file mode 100644 index 0000000..fbabfd5 --- /dev/null +++ b/src/model/types/Money.ts @@ -0,0 +1,117 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; +import { Money as BigintMoney } from 'bigint-money'; +import RoundingMode from 'bigint-money' +/** + * Options for the Money decorator. + */ +export interface MoneyOptions { + /** The exact number of decimals the value must have. */ + decimals: number; + /** The rounding mode to apply when converting from a string with more decimals. */ + roundingType?: keyof typeof RoundingMode; + /** Boolean indicating the value must be positive (> 0). Optional. */ + positive?: boolean; +} + +/** + * A type-safe key to ensure the decorator is applied to a Money property. + */ +type MoneyKey = T[K] extends BigintMoney + ? K + : `Money: requires a property of type 'Money'`; + +/** + * Validates that a property is of type Money at runtime. + */ +function validateMoneyType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + // The reflected type for a class is its constructor function. + if (designType !== BigintMoney) { + throw new Error(`@Money can only be applied to properties of type 'Money', but it was used on '${propertyKey}'.`); + } +} + +/** + * Stores metadata for the money field. + */ +function storeMoneyMetadata(proto: Object, propName: string, options: MoneyOptions): void { + Reflect.defineMetadata('field:type', 'money', proto, propName); + Reflect.defineMetadata('field:type:options', options, proto, propName); +} + +/** + * Creates a helper to register custom validators that only run when a value is present. + */ +function createOptionalValidatorAdder(proto: Object, propName: string) { + return ( + name: string, + validate: (value: unknown) => boolean, + defaultMessage: string + ) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + if (value === undefined || value === null) return true; // Skip if empty + return validate(value); + }, + defaultMessage() { return defaultMessage; }, + }, + }); + }; +} + +/** + * Applies all validation rules based on the MoneyOptions. + */ +function applyMoneyValidations( + addOptionalValidator: ReturnType, + propName: string, + options: MoneyOptions +): void { + // Check if the value is a valid Money object + addOptionalValidator('isMoney', (v) => v instanceof BigintMoney, `${propName} must be a Money object`); + + // Check if the number of decimals is correct + addOptionalValidator( + 'hasCorrectDecimals', + (v) => v instanceof BigintMoney && v.getDecimals() === options.decimals, + `${propName} must have exactly ${options.decimals} decimals` + ); + + // Check if the value is positive, if required + if (options.positive) { + addOptionalValidator( + 'isPositive', + (v) => v instanceof BigintMoney && v.isPositive(), + `${propName} must be a positive amount` + ); + } +} + +/** + * Money type decorator for properties of type Money. + * + * Provides validation for decimals and positivity, and enables automatic conversion + * from strings/numbers in the `fromJSON` method of BaseModel. + * + * @param options Configuration options for money validation and rounding. + */ +export function Money(options: MoneyOptions) { + return function ( + target: T, + propertyKey: MoneyKey + ) { + const propName = propertyKey as string; + const proto = target as Object; + + validateMoneyType(proto, propName); + storeMoneyMetadata(proto, propName, options); + + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyMoneyValidations(addOptionalValidator, propName, options); + }; +} From 81e3a29d453f0887006e746c59a0384009e6d64c Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 26 Aug 2025 09:33:39 -0300 Subject: [PATCH 069/254] Refactor DateTimeRangeClass to DateTimeRangeType in model and tests for consistency --- src/model/types/DateTime.ts | 10 +++--- test/Project.test.ts | 66 ++++++++++++++++++------------------- test/model/Project.ts | 6 ++-- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/model/types/DateTime.ts b/src/model/types/DateTime.ts index 8125103..9ce7d51 100644 --- a/src/model/types/DateTime.ts +++ b/src/model/types/DateTime.ts @@ -80,7 +80,7 @@ type DateTimeKey = T[K] extends Date | undefined ? K : `DateTime: requires Date field`; -type DateTimeRangeKey = T[K] extends DateTimeRangeClass | undefined +type DateTimeRangeKey = T[K] extends DateTimeRangeType | undefined ? K : `DateTimeRange: requires DateTimeRange field`; @@ -99,7 +99,7 @@ function validateDateType(proto: Object, propertyKey: string): void { */ function validateDateTimeRangeType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== DateTimeRangeClass) { + if (designType !== DateTimeRangeType) { throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' properties: ${propertyKey}`); } } @@ -247,7 +247,7 @@ export function DateTime(options?: DateTimeOptions) { * DateTimeRange class that represents a range between two dates. * Used as a nested object in models that need date ranges. */ -export class DateTimeRangeClass { +export class DateTimeRangeType { @IsOptional() @Expose() @Transform(({ value, type }) => { @@ -294,7 +294,7 @@ function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions? return true; // Allow null/undefined values } - if (!(value instanceof DateTimeRangeClass)) { + if (!(value instanceof DateTimeRangeType)) { return false; } @@ -370,7 +370,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { // Apply nested validation for DateTimeRange ValidateNested()(target as any, propName); - Type(() => DateTimeRangeClass)(target as any, propName); + Type(() => DateTimeRangeType)(target as any, propName); // Apply custom range validation IsValidDateTimeRange(options)(target as any, propName); diff --git a/test/Project.test.ts b/test/Project.test.ts index ff035e7..aecedb5 100644 --- a/test/Project.test.ts +++ b/test/Project.test.ts @@ -1,6 +1,6 @@ import type { ValidationError } from "class-validator"; import { Project } from "./model/Project"; -import { DateTimeRangeClass } from "../src/model/types/DateTime"; +import { DateTimeRangeType } from "../src/model/types/DateTime"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. @@ -25,12 +25,12 @@ describe("Project Model DateTime Validation", () => { validProject.startDate = new Date('2024-06-15'); validProject.endDate = new Date('2024-12-31'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); flexibleRange.from = new Date('2024-01-01'); flexibleRange.to = new Date('2024-12-31'); validProject.flexibleRange = flexibleRange; @@ -46,7 +46,7 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Minimal Project"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; @@ -74,7 +74,7 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Optional Fields Test"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; @@ -92,7 +92,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "Date Test"; invalidProject.startDate = new Date('2019-12-31'); // Before 2020-01-01 minimum - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -110,7 +110,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "Date Test"; invalidProject.startDate = new Date('2031-01-01'); // After 2030-12-31 maximum - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -128,7 +128,7 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Date Test"; validProject.startDate = new Date('2024-06-15'); // Within 2020-2030 range - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; @@ -143,7 +143,7 @@ describe("Project Model DateTime Validation", () => { validProject.startDate = new Date('2024-06-15'); validProject.endDate = new Date('1990-01-01'); // No constraints on endDate - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; @@ -159,7 +159,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "Range Test"; invalidProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); // Both from and to are undefined, but openStart and openEnd are false invalidProject.activeRange = activeRange; @@ -176,7 +176,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "Range Test"; invalidProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-09-15'); // After 'to' date activeRange.to = new Date('2024-06-15'); invalidProject.activeRange = activeRange; @@ -194,7 +194,7 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Range Test"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; @@ -208,12 +208,12 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Flexible Range Test"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); flexibleRange.from = new Date('2024-01-01'); // to is undefined, but openEnd is true validProject.flexibleRange = flexibleRange; @@ -227,12 +227,12 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Flexible Range Test"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); // from is undefined, but openStart is true flexibleRange.to = new Date('2024-12-31'); validProject.flexibleRange = flexibleRange; @@ -246,12 +246,12 @@ describe("Project Model DateTime Validation", () => { validProject.name = "Flexible Range Test"; validProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); validProject.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); // Both from and to are undefined, but both openStart and openEnd are true validProject.flexibleRange = flexibleRange; @@ -266,7 +266,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "Invalid Date Test"; invalidProject.startDate = new Date('invalid-date'); // Invalid date - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -286,7 +286,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "A"; // Too short (minLength is 2) invalidProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -304,7 +304,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.name = "A".repeat(101); // Too long (maxLength is 100) invalidProject.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -323,7 +323,7 @@ describe("Project Model DateTime Validation", () => { invalidProject.startDate = new Date('2024-06-15'); invalidProject.description = "A".repeat(501); // Too long (maxLength is 500) - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); invalidProject.activeRange = activeRange; @@ -345,7 +345,7 @@ describe("Project Model DateTime Validation", () => { project.startDate = new Date('2024-06-15T10:30:45.123Z'); project.endDate = new Date('2024-12-31T23:59:59.999Z'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15T08:00:00.000Z'); activeRange.to = new Date('2024-09-15T17:00:00.000Z'); project.activeRange = activeRange; @@ -366,7 +366,7 @@ describe("Project Model DateTime Validation", () => { project.name = "Minimal JSON Project"; project.startDate = new Date('2024-06-15T10:30:45.123Z'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15T08:00:00.000Z'); activeRange.to = new Date('2024-09-15T17:00:00.000Z'); project.activeRange = activeRange; @@ -388,12 +388,12 @@ describe("Project Model DateTime Validation", () => { project.name = "Partial Range Project"; project.startDate = new Date('2024-06-15T10:30:45.123Z'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15T08:00:00.000Z'); activeRange.to = new Date('2024-09-15T17:00:00.000Z'); project.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); // to is undefined (open end) project.flexibleRange = flexibleRange; @@ -431,13 +431,13 @@ describe("Project Model DateTime Validation", () => { expect(project.endDate).toBeInstanceOf(Date); expect(project.endDate!.toISOString()).toBe("2024-12-31T23:59:59.999Z"); - expect(project.activeRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); expect(project.activeRange.from).toBeInstanceOf(Date); expect(project.activeRange.from!.toISOString()).toBe("2024-06-15T08:00:00.000Z"); expect(project.activeRange.to).toBeInstanceOf(Date); expect(project.activeRange.to!.toISOString()).toBe("2024-09-15T17:00:00.000Z"); - expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeType); expect(project.flexibleRange!.from).toBeInstanceOf(Date); expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); expect(project.flexibleRange!.to).toBeInstanceOf(Date); @@ -509,7 +509,7 @@ describe("Project Model DateTime Validation", () => { expect(project.startDate).toBeInstanceOf(Date); expect(project.endDate).toBeUndefined(); expect(project.flexibleRange).toBeUndefined(); - expect(project.activeRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); }); it("should handle partial DateTimeRange in JSON input", async () => { @@ -528,7 +528,7 @@ describe("Project Model DateTime Validation", () => { const project = Project.fromJSON(jsonData); - expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeClass); + expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeType); expect(project.flexibleRange!.from).toBeInstanceOf(Date); expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); expect(project.flexibleRange!.to).toBeUndefined(); @@ -543,12 +543,12 @@ describe("Project Model DateTime Validation", () => { originalProject.endDate = new Date('2024-12-31T23:59:59.999Z'); originalProject.description = "Test description"; - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2024-06-15T08:00:00.000Z'); activeRange.to = new Date('2024-09-15T17:00:00.000Z'); originalProject.activeRange = activeRange; - const flexibleRange = new DateTimeRangeClass(); + const flexibleRange = new DateTimeRangeType(); flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); flexibleRange.to = new Date('2024-12-31T23:59:59.999Z'); originalProject.flexibleRange = flexibleRange; @@ -579,7 +579,7 @@ describe("Project Model DateTime Validation", () => { project.name = "Hotel Reservation System"; project.startDate = new Date('2025-08-21T13:42:24.123Z'); - const activeRange = new DateTimeRangeClass(); + const activeRange = new DateTimeRangeType(); activeRange.from = new Date('2025-08-21T13:42:24.123Z'); activeRange.to = new Date('2025-08-23T13:42:24.123Z'); project.activeRange = activeRange; diff --git a/test/model/Project.ts b/test/model/Project.ts index d20fa29..7d9db6f 100644 --- a/test/model/Project.ts +++ b/test/model/Project.ts @@ -2,7 +2,7 @@ import { Field } from "../../src/model/Field"; import { Model } from "../../src/model/Model"; import { BaseModel } from "../../src/model/BaseModel"; import { Text } from "../../src/model/types/Text"; -import { DateTime, DateTimeRange, DateTimeRangeClass } from "../../src/model/types/DateTime"; +import { DateTime, DateTimeRange, DateTimeRangeType } from "../../src/model/types/DateTime"; @Model({ docs: "Represents a project with date-related fields", @@ -42,7 +42,7 @@ export class Project extends BaseModel { openStart: false, openEnd: false, }) - activeRange!: DateTimeRangeClass; + activeRange!: DateTimeRangeType; @Field({ @@ -52,7 +52,7 @@ export class Project extends BaseModel { openStart: true, openEnd: true, }) - flexibleRange?: DateTimeRangeClass; + flexibleRange?: DateTimeRangeType; @Field({ From 606143c066ce73e26b3d027cfb1bf1b6d9ceb1a5 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Tue, 26 Aug 2025 11:34:48 -0300 Subject: [PATCH 070/254] Decimal decorator validation WIP --- jest.config.ts | 7 +- package.json | 1 + src/model/types/Decimal.ts | 145 +++++++++++++++++++++++++++++++++++ src/model/types/Money.ts | 117 ---------------------------- test/DecimalAndMoney.test.ts | 89 +++++++++++++++++++++ test/model/Product.ts | 32 ++++++++ 6 files changed, 272 insertions(+), 119 deletions(-) create mode 100644 src/model/types/Decimal.ts delete mode 100644 src/model/types/Money.ts create mode 100644 test/DecimalAndMoney.test.ts create mode 100644 test/model/Product.ts diff --git a/jest.config.ts b/jest.config.ts index 6eab8f9..1c82948 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -3,15 +3,18 @@ module.exports = { preset: 'ts-jest', testEnvironment: 'node', transform: { - '^.+\\.(ts|tsx)$': [ + '^.+\\.(ts|tsx|js|jsx)$': [ 'ts-jest', { tsconfig: { - module: 'commonjs', + allowJs: true, }, }, ], }, + transformIgnorePatterns: [ + '/node_modules/(?!bigint-money|class-transformer)', + ], moduleNameMapper: { '^@/(.*)$': '/src/$1', }, diff --git a/package.json b/package.json index ec6f7c2..a874734 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ }, "dependencies": { "bigint-money": "^2.0.0", + "class-transformer": "^0.5.1", "class-validator": "^0.14.2" } } diff --git a/src/model/types/Decimal.ts b/src/model/types/Decimal.ts new file mode 100644 index 0000000..16854f7 --- /dev/null +++ b/src/model/types/Decimal.ts @@ -0,0 +1,145 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; +import { Money, Round } from 'bigint-money'; +import { Transform } from 'class-transformer'; + +export type Decimal = Money; + +export interface DecimalOptions { + decimals: number; + roundingType: 'truncate' | 'roundHalfToEven' | 'roundAwayFromZero' | 'roundHalfTowardsZero' | 'Error'; + min?: string; + max?: string; + positive?: boolean; + negative?: boolean; +} + +/** + * Mapea nuestro string de roundingType a la enumeración de la librería bigint-money. + */ +function getRoundingMode(roundingType: DecimalOptions['roundingType']): Round | undefined { + switch (roundingType) { + case 'truncate': + return Round.TRUNCATE; + case 'roundHalfToEven': + return Round.BANKERS; + //case 'roundAwayFromZero': + // return Round.AWAY_FROM_0; + case 'roundHalfTowardsZero': + return Round.HALF_TOWARDS_0; + default: + return undefined; // Para 'Error' u otros casos + } +} + +// El alias `DecimalKey` asegura que el decorador solo se aplique a propiedades del tipo `Decimal`. +type DecimalKey = T[K] extends Decimal | undefined | null ? K : `Decimal: requires a property of type 'Decimal'`; + +function validateDecimalType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType && designType !== Object && designType.name !== 'Decimal') { + throw new Error(`@Decimal can only be applied to properties of type 'Decimal', but it was used on '${propertyKey}' which is of type '${designType?.name}'.`); + } +} + +function storeDecimalMetadata(proto: Object, propName: string, options: DecimalOptions): void { + Reflect.defineMetadata('field:type', 'decimal', proto, propName); + Reflect.defineMetadata('field:type:options', options, proto, propName); +} + +function createOptionalValidatorAdder(proto: Object, propName: string) { + return (name: string, validate: (value: unknown) => boolean, defaultMessage: string) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + if (value === undefined || value === null) return true; + return validate(value); + }, + defaultMessage() { return defaultMessage; }, + }, + }); + }; +} + +function applyDecimalValidations( + addOptionalValidator: ReturnType, + propName: string, + options: DecimalOptions +): void { + addOptionalValidator('isDecimal', (v) => v instanceof Money, `${propName} must be a Decimal object`); + + if (options.positive) { + addOptionalValidator('isPositive', (v) => v instanceof Money && v.isGreaterThan('0'), `${propName} must be a positive amount`); + } + if (options.negative) { + addOptionalValidator('isNegative', (v) => v instanceof Money && v.isLesserThan('0'), `${propName} must be a negative amount`); + } + if (options.min) { + addOptionalValidator('min', (v) => v instanceof Money && v.isGreaterThanOrEqual(options.min!), `${propName} must not be less than ${options.min}`); + } + if (options.max) { + addOptionalValidator('max', (v) => v instanceof Money && v.isLesserThanOrEqual(options.max!), `${propName} must not be greater than ${options.max}`); + } +} + +export function Decimal(options: DecimalOptions) { + return function (target: T, propertyKey: DecimalKey) { + const propName = propertyKey as string; + const proto = target as Object; + + validateDecimalType(proto, propName); + storeDecimalMetadata(proto, propName, options); + + Transform(({ value, key, obj, type }) => { + const opts = Reflect.getMetadata('field:type:options', obj, key) as DecimalOptions; + if (!opts) return value; + + // --- Deserialización: plainToClass (fromJSON) --- + if (type === 1) { + if (typeof value !== 'string' && typeof value !== 'number') { + return value; + } + + const stringValue = String(value); + + // Validación para roundingType: 'Error' + if (opts.roundingType === 'Error') { + const decimalPart = stringValue.split('.')[1] || ''; + if (decimalPart.length > opts.decimals) { + // Devuelve un valor inválido para que la validación 'isDecimal' falle + return `Invalid decimal places for ${key}. Expected ${opts.decimals}, but got ${decimalPart.length}.`; + } + } + + try { + // Creamos el objeto Money. La librería maneja el parseo. + // El redondeo se aplica en el constructor si se especifica. + const roundingMode = getRoundingMode(opts.roundingType); + const moneyValue = new Money(stringValue, 'XXX', roundingMode); + + // La librería trabaja con alta precisión interna. El formateo final se hace en toFixed. + // Aquí solo nos aseguramos de que el objeto se cree correctamente. + return moneyValue; + } catch (error) { + return value; // Dejar que la validación falle si hay un error de parseo + } + } + + // --- Serialización: classToPlain (toJSON) --- + if (type === 0) { + if (value instanceof Money) { + // Usamos toFixed() para formatear la salida con la precisión correcta + return value.toFixed(opts.decimals); + } + } + + return value; + })(target, propName); + + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyDecimalValidations(addOptionalValidator, propName, options); + }; +} \ No newline at end of file diff --git a/src/model/types/Money.ts b/src/model/types/Money.ts deleted file mode 100644 index fbabfd5..0000000 --- a/src/model/types/Money.ts +++ /dev/null @@ -1,117 +0,0 @@ -import 'reflect-metadata'; -import { registerDecorator } from 'class-validator'; -import { Money as BigintMoney } from 'bigint-money'; -import RoundingMode from 'bigint-money' -/** - * Options for the Money decorator. - */ -export interface MoneyOptions { - /** The exact number of decimals the value must have. */ - decimals: number; - /** The rounding mode to apply when converting from a string with more decimals. */ - roundingType?: keyof typeof RoundingMode; - /** Boolean indicating the value must be positive (> 0). Optional. */ - positive?: boolean; -} - -/** - * A type-safe key to ensure the decorator is applied to a Money property. - */ -type MoneyKey = T[K] extends BigintMoney - ? K - : `Money: requires a property of type 'Money'`; - -/** - * Validates that a property is of type Money at runtime. - */ -function validateMoneyType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); - // The reflected type for a class is its constructor function. - if (designType !== BigintMoney) { - throw new Error(`@Money can only be applied to properties of type 'Money', but it was used on '${propertyKey}'.`); - } -} - -/** - * Stores metadata for the money field. - */ -function storeMoneyMetadata(proto: Object, propName: string, options: MoneyOptions): void { - Reflect.defineMetadata('field:type', 'money', proto, propName); - Reflect.defineMetadata('field:type:options', options, proto, propName); -} - -/** - * Creates a helper to register custom validators that only run when a value is present. - */ -function createOptionalValidatorAdder(proto: Object, propName: string) { - return ( - name: string, - validate: (value: unknown) => boolean, - defaultMessage: string - ) => { - registerDecorator({ - name, - target: (proto as any).constructor, - propertyName: propName, - validator: { - validate(value: unknown) { - if (value === undefined || value === null) return true; // Skip if empty - return validate(value); - }, - defaultMessage() { return defaultMessage; }, - }, - }); - }; -} - -/** - * Applies all validation rules based on the MoneyOptions. - */ -function applyMoneyValidations( - addOptionalValidator: ReturnType, - propName: string, - options: MoneyOptions -): void { - // Check if the value is a valid Money object - addOptionalValidator('isMoney', (v) => v instanceof BigintMoney, `${propName} must be a Money object`); - - // Check if the number of decimals is correct - addOptionalValidator( - 'hasCorrectDecimals', - (v) => v instanceof BigintMoney && v.getDecimals() === options.decimals, - `${propName} must have exactly ${options.decimals} decimals` - ); - - // Check if the value is positive, if required - if (options.positive) { - addOptionalValidator( - 'isPositive', - (v) => v instanceof BigintMoney && v.isPositive(), - `${propName} must be a positive amount` - ); - } -} - -/** - * Money type decorator for properties of type Money. - * - * Provides validation for decimals and positivity, and enables automatic conversion - * from strings/numbers in the `fromJSON` method of BaseModel. - * - * @param options Configuration options for money validation and rounding. - */ -export function Money(options: MoneyOptions) { - return function ( - target: T, - propertyKey: MoneyKey - ) { - const propName = propertyKey as string; - const proto = target as Object; - - validateMoneyType(proto, propName); - storeMoneyMetadata(proto, propName, options); - - const addOptionalValidator = createOptionalValidatorAdder(proto, propName); - applyMoneyValidations(addOptionalValidator, propName, options); - }; -} diff --git a/test/DecimalAndMoney.test.ts b/test/DecimalAndMoney.test.ts new file mode 100644 index 0000000..bd08f00 --- /dev/null +++ b/test/DecimalAndMoney.test.ts @@ -0,0 +1,89 @@ +import 'reflect-metadata'; +import { plainToClass, classToPlain, instanceToPlain } from 'class-transformer'; +import { Money } from 'bigint-money'; +import { Product } from './model/Product'; + + +describe('Decimal Decorator and Type', () => { + + describe('JSON Serialization (toJSON)', () => { + it('should serialize a Decimal value to a string with correct decimal places', () => { + const product = new Product(); + product.name = 'Test'; + product.price = new Money('123.456', 'XXX'); // Internamente tiene más decimales + + const json = JSON.stringify(product); + expect(json).toEqual('{"name":"Test","price":"123.46"}'); + }); + }); + + describe('JSON Deserialization (fromJSON)', () => { + it('should deserialize a valid string to a Money object', async () => { + const json = { name: 'Mortgage', price: '99.99', interestRate: '0.1234' }; + const product = new Product() + product. + }); + + it('should apply rounding correctly (roundHalfToEven)', () => { + // 4.255 se redondea a 4.26 (par) + const json1 = { name: 'Product 1', price: '4.255' }; + const product1 = plainToClass(Product, json1); + expect(product1.price.toFixed(2)).toBe('4.26'); + + // 4.245 se redondea a 4.24 (par) + const json2 = { name: 'Product 2', price: '4.245' }; + const product2 = plainToClass(Product, json2); + expect(product2.price.toFixed(2)).toBe('4.24'); + }); + + it('should fail validation if roundingType is "Error" and decimals are more than allowed', async () => { + const json = { name: 'Mortgage', interestRate: '0.12345' }; // 5 decimales, se esperan 4 + const product = plainToClass(Product, json); + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('interestRate'); + expect(errors[0]?.constraints).toHaveProperty('isDecimal'); + }); + + it('should pass validation if roundingType is "Error" and decimals match or are less', async () => { + const json = { name: 'Mortgage', interestRate: '0.1234' }; // 4 decimales + const product = plainToClass(Product, json); + + const errors = await product.validate(); + expect(errors).toHaveLength(0); + }); + }); + + describe('Validations', () => { + it('should fail if value is less than min', async () => { + const json = { name: 'Test', price: '0.00' }; + const product = plainToClass(Product, json); + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.constraints).toHaveProperty('min'); + }); + + it('should fail if value is greater than max', async () => { + const json = { name: 'Test', price: '1000.01' }; + const product = plainToClass(Product, json); + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.constraints).toHaveProperty('max'); + }); + + it('should fail if value is not positive', async () => { + const json = { name: 'Test', price: '0' }; + const product = plainToClass(Product, json); + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.constraints).toHaveProperty('isPositive'); + }); + }); +}); \ No newline at end of file diff --git a/test/model/Product.ts b/test/model/Product.ts new file mode 100644 index 0000000..2aea797 --- /dev/null +++ b/test/model/Product.ts @@ -0,0 +1,32 @@ +import { BaseModel } from "@/model/BaseModel"; +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { Decimal } from "@/model/types/Decimal"; + +@Model( + { + docs: 'Represents a product for testing' + } +) +@Model() +export class Product extends BaseModel { + @Field({ required: true }) + name!: string; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'roundHalfToEven', // "Bankers Rounding" + positive: true, + min: '0.01', + max: '1000.00' + }) + price!: Decimal; + + @Field({}) + @Decimal({ + decimals: 4, + roundingType: 'Error' + }) + interestRate!: Decimal; +} \ No newline at end of file From 4959f6c25ecaafc3becbf5ccf9230b0c7f96fcae Mon Sep 17 00:00:00 2001 From: Luciano Date: Tue, 26 Aug 2025 12:35:05 -0300 Subject: [PATCH 071/254] test config --- package.json | 10 ++++++++-- src/index.ts | 5 +++++ src/model/BaseModel.ts | 2 +- src/model/Field.ts | 2 +- tsconfig.json | 37 +++++++++++++++++-------------------- 5 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 src/index.ts diff --git a/package.json b/package.json index b6f6238..a06e081 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,15 @@ "name": "slingr-framework", "version": "1.0.0", "description": "Slingr Framework - Smart Business Apps", - "main": "index.js", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "files": [ + "dist" + ], "scripts": { - "test": "jest --verbose" + "test": "jest --verbose", + "watch": "tsc --watch", + "build": "tsc" }, "repository": { "type": "git", diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 0000000..7a62aa5 --- /dev/null +++ b/src/index.ts @@ -0,0 +1,5 @@ +// Export all the core components of the framework +export { BaseModel } from './model/BaseModel.js'; +export { Field, FieldOptions, ValidationIssue } from './model/Field.js'; +export { Model, ModelOptions } from './model/Model.js'; +export { CustomValidate } from './validators/CustomValidationConstraint.js'; \ No newline at end of file diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 85ce380..c9c7dc0 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,5 +1,5 @@ import { ValidationError, validate } from "class-validator"; -import type { ValidationIssue } from "./Field"; +import type { ValidationIssue } from "./Field.js"; import { instanceToPlain, plainToInstance, Transform } from "class-transformer"; /** diff --git a/src/model/Field.ts b/src/model/Field.ts index bb7e268..878f36b 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,6 +1,6 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { Exclude, Expose, Transform } from 'class-transformer'; -import { CustomValidate } from '../validators/CustomValidationConstraint'; +import { CustomValidate } from '../validators/CustomValidationConstraint.js'; /** * Custom validation function type for field validation. diff --git a/tsconfig.json b/tsconfig.json index cc5ff17..ad0a0bb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,27 +1,24 @@ { "compilerOptions": { - "module": "commonjs", - "target": "esnext", - "types": ["node", "jest"], - "sourceMap": true, + /* Build Options */ + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "outDir": "./dist", "declaration": true, - "declarationMap": true, - "noUncheckedIndexedAccess": true, - "exactOptionalPropertyTypes": true, + "sourceMap": true, + "rootDir": "./src", + + /* Interop and Strictness */ + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, "strict": true, - "jsx": "react-jsx", - "verbatimModuleSyntax": false, - "isolatedModules": true, - "noUncheckedSideEffectImports": true, - "moduleDetection": "force", "skipLibCheck": true, + + /* Decorator Metadata */ "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "outDir": "./dist", - "baseUrl": "./", - "paths": { - "@/*": ["src/*"] - } + "emitDecoratorMetadata": true }, - "include": ["src/**/*", "test/**/*"] -} + "include": ["src/**/*"], + "exclude": ["node_modules", "dist", "test"] +} \ No newline at end of file From ab8a01dc953f5b28600723a6878cc1f38d49d59a Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Tue, 26 Aug 2025 13:13:24 -0300 Subject: [PATCH 072/254] Decimal conversion to JSON WIP --- src/model/BaseModel.ts | 2 +- test/DecimalAndMoney.test.ts | 90 +++++++++++++++++------------------- test/model/SimpleProduct.ts | 45 ++++++++++++++++++ 3 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 test/model/SimpleProduct.ts diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 973f656..b2ef157 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,6 +1,6 @@ import { ValidationError, validate } from "class-validator"; -import type { ValidationIssue } from "./Field"; import { instanceToPlain, plainToInstance, Transform } from "class-transformer"; +import { ValidationIssue } from "./types/SharedTypes"; /** * Abstract base class for all model classes in the framework. diff --git a/test/DecimalAndMoney.test.ts b/test/DecimalAndMoney.test.ts index bd08f00..ab11f4a 100644 --- a/test/DecimalAndMoney.test.ts +++ b/test/DecimalAndMoney.test.ts @@ -1,89 +1,83 @@ import 'reflect-metadata'; -import { plainToClass, classToPlain, instanceToPlain } from 'class-transformer'; +import { plainToClass } from 'class-transformer'; import { Money } from 'bigint-money'; -import { Product } from './model/Product'; +import { SimpleProduct } from './model/SimpleProduct'; describe('Decimal Decorator and Type', () => { describe('JSON Serialization (toJSON)', () => { - it('should serialize a Decimal value to a string with correct decimal places', () => { - const product = new Product(); + it('should serialize a Decimal value to a string with correct decimal places using Truncate', () => { + const product = new SimpleProduct(); product.name = 'Test'; - product.price = new Money('123.456', 'XXX'); // Internamente tiene más decimales + product.priceTruncate = new Money('123.456', 'XXX'); // Input with more decimals. - const json = JSON.stringify(product); - expect(json).toEqual('{"name":"Test","price":"123.46"}'); - }); - }); + product.toJSON(); + expect(product.toJSON()).toEqual({ + name: 'Test', + priceTruncate: '123.45' + }); - describe('JSON Deserialization (fromJSON)', () => { - it('should deserialize a valid string to a Money object', async () => { - const json = { name: 'Mortgage', price: '99.99', interestRate: '0.1234' }; - const product = new Product() - product. }); - it('should apply rounding correctly (roundHalfToEven)', () => { - // 4.255 se redondea a 4.26 (par) - const json1 = { name: 'Product 1', price: '4.255' }; - const product1 = plainToClass(Product, json1); - expect(product1.price.toFixed(2)).toBe('4.26'); - - // 4.245 se redondea a 4.24 (par) - const json2 = { name: 'Product 2', price: '4.245' }; - const product2 = plainToClass(Product, json2); - expect(product2.price.toFixed(2)).toBe('4.24'); - }); + it("should serialize a Decimal value to a string with correct decimal places using roundHalfToEven", () => { + const product = new SimpleProduct(); + product.name = 'Test'; + product.priceHalfToEven = new Money('123.456', 'XXX'); // Input with more decimals. - it('should fail validation if roundingType is "Error" and decimals are more than allowed', async () => { - const json = { name: 'Mortgage', interestRate: '0.12345' }; // 5 decimales, se esperan 4 - const product = plainToClass(Product, json); + // 1. Call the .toJSON() method directly from your BaseModel. + const jsonObject = product.toJSON(); - const errors = await product.validate(); - expect(errors.length).toBeGreaterThan(0); - expect(errors[0]?.property).toBe('interestRate'); - expect(errors[0]?.constraints).toHaveProperty('isDecimal'); + // 2. Compare the resulting object. + // 'roundHalfToEven' with 2 decimals on '123.456' should result in '123.46'. + expect(jsonObject).toEqual({ + name: 'Test', + priceHalfToEven: '123.46' + }); }); - it('should pass validation if roundingType is "Error" and decimals match or are less', async () => { - const json = { name: 'Mortgage', interestRate: '0.1234' }; // 4 decimales - const product = plainToClass(Product, json); - - const errors = await product.validate(); - expect(errors).toHaveLength(0); - }); }); describe('Validations', () => { it('should fail if value is less than min', async () => { - const json = { name: 'Test', price: '0.00' }; - const product = plainToClass(Product, json); + const json = { name: 'Test', priceTruncate: '0.00' }; + const product = plainToClass(SimpleProduct, json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); - expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.property).toBe('priceTruncate'); expect(errors[0]?.constraints).toHaveProperty('min'); }); it('should fail if value is greater than max', async () => { - const json = { name: 'Test', price: '1000.01' }; - const product = plainToClass(Product, json); + const json = { name: 'Test', priceTruncate: '1000.01' }; + const product = plainToClass(SimpleProduct, json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); - expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.property).toBe('priceTruncate'); expect(errors[0]?.constraints).toHaveProperty('max'); }); it('should fail if value is not positive', async () => { - const json = { name: 'Test', price: '0' }; - const product = plainToClass(Product, json); + const json = { name: 'Test', priceTruncate: '0' }; + const product = plainToClass(SimpleProduct, json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); - expect(errors[0]?.property).toBe('price'); + expect(errors[0]?.property).toBe('priceTruncate'); expect(errors[0]?.constraints).toHaveProperty('isPositive'); }); }); + + describe('Deserialization (from JSON)', () => { + it('should deserialize a JSON string to a Decimal value', () => { + const json = { name: 'Test', priceTruncate: '123.45' }; + const product = SimpleProduct.fromJSON(json); + product.validate(); + + }); + + + }); }); \ No newline at end of file diff --git a/test/model/SimpleProduct.ts b/test/model/SimpleProduct.ts new file mode 100644 index 0000000..5e8b7e1 --- /dev/null +++ b/test/model/SimpleProduct.ts @@ -0,0 +1,45 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Decimal } from "@/model/types/Decimal"; + +@Model({ + docs: "Represents a product", +}) +export class SimpleProduct extends BaseModel { + @Field({ + }) + name!: string; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'truncate', + min: '0.01', + max: '1000.00', + positive: true, + }) + priceTruncate!: Decimal; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'roundHalfToEven', + }) + priceHalfToEven!: Decimal; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'roundAwayFromZero', + }) + priceHalfToEvenRoundAwayFromZero!: Decimal; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'roundHalfTowardsZero', + }) + priceHalfToEvenRoundHalfTowardsZero!: Decimal; + +} From 552c8921ee7e240cc21f3207105c26fff9787c95 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 09:58:18 -0300 Subject: [PATCH 073/254] Delete custom validations and add tests to cover possible cases for required and not-required fields --- src/model/types/Text.ts | 139 ++++------------------------------------ test/Field.test.ts | 84 +++++++++++++++++++++++- test/model/App.ts | 56 ++++++++++++++++ 3 files changed, 150 insertions(+), 129 deletions(-) create mode 100644 test/model/App.ts diff --git a/src/model/types/Text.ts b/src/model/types/Text.ts index b434419..578ecb8 100644 --- a/src/model/types/Text.ts +++ b/src/model/types/Text.ts @@ -1,12 +1,10 @@ import 'reflect-metadata'; import { - ValidationArguments, - registerDecorator, + MinLength, + MaxLength, + Matches, + IsEmail, ValidationOptions, - minLength, - maxLength, - matches, - isEmail, } from 'class-validator'; /** @@ -64,118 +62,6 @@ function storeTextMetadata(proto: Object, propName: string, options?: TextOption } } -/** - * Custom MinLength validator that only validates non-empty values - */ -function MinLengthIfNotEmpty(min: number, validationOptions?: ValidationOptions) { - return function (object: Object, propertyName: string) { - const decoratorOptions: any = { - name: 'minLength', - target: object.constructor, - propertyName: propertyName, - constraints: [min], - validator: { - validate(value: any, args: ValidationArguments) { - if (value == null || value === '') { - return true; - } - return minLength(value, args.constraints[0]); - }, - defaultMessage(args: ValidationArguments) { - return `${args.property} must be longer than or equal to ${args.constraints[0]} characters`; - } - }, - }; - if (validationOptions) { - decoratorOptions.options = validationOptions; - } - registerDecorator(decoratorOptions); - }; -} - -/** - * Custom MaxLength validator that only validates non-empty values - */ -function MaxLengthIfNotEmpty(max: number, validationOptions?: ValidationOptions) { - return function (object: Object, propertyName: string) { - const decoratorOptions: any = { - name: 'maxLength', - target: object.constructor, - propertyName: propertyName, - constraints: [max], - validator: { - validate(value: any, args: ValidationArguments) { - if (value == null || value === '') { - return true; - } - return maxLength(value, args.constraints[0]); - }, - defaultMessage(args: ValidationArguments) { - return `${args.property} must be shorter than or equal to ${args.constraints[0]} characters`; - } - }, - }; - if (validationOptions) { - decoratorOptions.options = validationOptions; - } - registerDecorator(decoratorOptions); - }; -} - -/** - * Custom Matches validator that only validates non-empty values - */ -function MatchesIfNotEmpty(pattern: RegExp, message: string, validationOptions?: ValidationOptions) { - return function (object: Object, propertyName: string) { - registerDecorator({ - name: 'matches', - target: object.constructor, - propertyName: propertyName, - constraints: [pattern], - options: { ...(validationOptions || {}), message }, - validator: { - validate(value: any, args: ValidationArguments) { - if (value == null || value === '') { - return true; - } - return matches(value, args.constraints[0]); - }, - defaultMessage() { - return message; - } - }, - }); - }; -} - -/** - * Custom Email validator that only validates non-empty values - */ -function IsEmailIfNotEmpty(validationOptions?: ValidationOptions) { - return function (object: Object, propertyName: string) { - const decoratorOptions: any = { - name: 'isEmail', - target: object.constructor, - propertyName: propertyName, - validator: { - validate(value: any) { - if (value == null || value === '') { - return true; - } - return isEmail(value); - }, - defaultMessage(args: ValidationArguments) { - return `${args.property} must be an email`; - } - }, - }; - if (validationOptions !== undefined) { - decoratorOptions.options = validationOptions; - } - registerDecorator(decoratorOptions); - }; -} - /** * Text type decorator for string properties. * @@ -201,8 +87,7 @@ function IsEmailIfNotEmpty(validationOptions?: ValidationOptions) { * * @throws {Error} When applied to non-string properties * @throws {Error} When regex is provided without regexMessage * * @remarks - * - All validators are optional and only execute when the value is present (not null, undefined, or empty string) - * - This allows the decorator to work alongside other validation decorators like @Required + * - All validators will validate all values including empty strings if the field is required * - Metadata is stored under 'field:type' (always 'text') and 'field:type:options' keys * - The decorator uses reflection to verify the property type at runtime */ @@ -217,20 +102,20 @@ export function Text(options?: TextOptions) { validateStringType(proto, propName); storeTextMetadata(proto, propName, options); - // Use custom validators that skip validation for empty values + // Apply class-validator decorators directly if (options?.minLength !== undefined) { - MinLengthIfNotEmpty(options.minLength)(target as any, propName); + MinLength(options.minLength)(target as any, propName); } if (options?.maxLength !== undefined) { - MaxLengthIfNotEmpty(options.maxLength)(target as any, propName); + MaxLength(options.maxLength)(target as any, propName); } if (options?.regex) { if (!options.regexMessage) { throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); } - MatchesIfNotEmpty(options.regex, options.regexMessage)(target as any, propName); + Matches(options.regex, { message: options.regexMessage })(target as any, propName); } }; } @@ -238,7 +123,7 @@ export function Text(options?: TextOptions) { /** * Email type decorator. * - Must be used on `string` fields. - * - Internally uses `Text` with a reasonable email regex. + * - Uses standard class-validator email validation. * - No options. */ export function Email() { @@ -249,8 +134,8 @@ export function Email() { const propName = propertyKey as unknown as string; Reflect.defineMetadata('field:logicalType', 'email', target as unknown as Object, propName); - // Use custom email validator that skips validation for empty strings - IsEmailIfNotEmpty()(target as any, propName); + // Use standard class-validator email decorator + IsEmail()(target as any, propName); }; } diff --git a/test/Field.test.ts b/test/Field.test.ts index 904eb53..080a01c 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -1,3 +1,4 @@ +import { App } from "./model/App"; import { Person } from "./model/Person"; import { Product } from "./model/Product"; @@ -40,8 +41,13 @@ describe("Person Model Validation", () => { const expected = [ { field: "lastName", - codes: ["isNotEmpty"], - messages: ["lastName should not be empty"], + codes: ["minLength", "maxLength", "matches", "isNotEmpty"], + messages: [ + "lastName must be longer than or equal to 2 characters", + "lastName must be shorter than or equal to 30 characters", + "lastName must contain only letters", + "lastName should not be empty" + ], }, { field: "age", @@ -266,3 +272,77 @@ describe("Product Model Validation", () => { expect(summary).toStrictEqual([]); }); }); + +describe("App Model Validation", () => { + it("should return isNotEmpty and other errors for missing name", async () => { + const invalidApp = new App(); + invalidApp.version = "01.00.00"; + invalidApp.description = "A sample application"; + invalidApp.author = "JohnDoe"; + + const errors = await invalidApp.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "name", + codes: ["minLength", "maxLength", "matches", "isNotEmpty"], + messages: [ + "name must be longer than or equal to 4 characters", + "name must be shorter than or equal to 20 characters", + "Name must contain only letters and dots (no underscores, no consecutive dots, no dot at start/end)", + "name should not be empty" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should return errors for invalid version length and format", async () => { + const invalidApp = new App(); + invalidApp.name = "MyApp"; + invalidApp.version = "1.0"; // Invalid format + invalidApp.description = "A sample application"; + invalidApp.author = "JohnDoe"; + + const errors = await invalidApp.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "version", codes: ["minLength", "matches"], messages: [ + "version must be longer than or equal to 5 characters", + "Version must be in the format AA.BB.CC, where AA, BB, and CC are two-digit numbers" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should not return error for non-required but empty fields", async () => { + const validApp = new App(); + validApp.name = "MyApp"; + validApp.version = "01.00.00"; + validApp.description = "A sample application"; + // validApp.author = undefined; + + const errors = await validApp.validate(); + const summary = summarizeErrors(errors); + expect(summary).toStrictEqual([]); + }); + + it("should return errors for invalid author name", async () => { + const invalidApp = new App(); + invalidApp.name = "MyApp"; + invalidApp.version = "01.00.00"; + invalidApp.description = "A sample application"; + invalidApp.author = "JohnDoe123"; // Invalid author name + + const errors = await invalidApp.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "author", codes: ["matches"], messages: [ + "Author must contain only letters, numbers, dots, underscores, and hyphens" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); +}); \ No newline at end of file diff --git a/test/model/App.ts b/test/model/App.ts new file mode 100644 index 0000000..daff922 --- /dev/null +++ b/test/model/App.ts @@ -0,0 +1,56 @@ +import { BaseModel } from "@/model/BaseModel"; +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { Text } from "@/model/types/Text"; + + +@Model({ + docs: "Represents an application containing info", +}) +export class App extends BaseModel { + + @Field({ + docs: "The name of the application", + required: true + }) + @Text({ + minLength: 4, + maxLength: 20, + // Regex: allows letters, dots (not at start/end), no underscores, no consecutive dots + regex: /^(?!\.)([a-zA-Z]+(\.[a-zA-Z]+)*)?(? Date: Wed, 27 Aug 2025 10:09:54 -0300 Subject: [PATCH 074/254] Split types in different files, add index.ts to have a single import instance and add utils.ts to share validateStringType function --- src/model/types/Email.ts | 55 ++++++++++++++++++++++++++++++++++++++++ src/model/types/HTML.ts | 53 ++++++++++++++++++++++++++++++++++++++ src/model/types/Text.ts | 54 +-------------------------------------- src/model/types/index.ts | 4 +++ src/model/types/utils.ts | 11 ++++++++ test/model/Person.ts | 2 +- 6 files changed, 125 insertions(+), 54 deletions(-) create mode 100644 src/model/types/Email.ts create mode 100644 src/model/types/HTML.ts create mode 100644 src/model/types/index.ts create mode 100644 src/model/types/utils.ts diff --git a/src/model/types/Email.ts b/src/model/types/Email.ts new file mode 100644 index 0000000..8ffe0e9 --- /dev/null +++ b/src/model/types/Email.ts @@ -0,0 +1,55 @@ +import 'reflect-metadata'; +import { IsEmail } from 'class-validator'; +import { validateStringType } from './utils'; + +/** + * Email type decorator. + * - Must be used on `string` fields. + * - Uses standard class-validator email validation. + * - No options. + */ +// Custom key types for clearer IntelliSense errors +type EmailKey = T[K] extends string + ? K + : `Email: requires string field`; + +/** + * Email type decorator for string properties. + * + * This decorator can only be applied to properties of type `string` and provides + * email validation capabilities through class-validator decorators. It also stores + * metadata that can be consumed by other layers such as database mapping or + * documentation generation. + * + * @example + * ```typescript + * class User { + * @Email() + * email: string; + * } + * ``` + * + * @returns A property decorator function that applies email validation and stores metadata + * + * @throws {Error} When applied to non-string properties + * + * @remarks + * - Uses standard class-validator email validation + * - Metadata is stored under 'field:logicalType' key with value 'email' + * - The decorator uses reflection to verify the property type at runtime + */ +export function Email() { + return function ( + target: T, + propertyKey: EmailKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateStringType(proto, propName); + Reflect.defineMetadata('field:logicalType', 'email', proto, propName); + + // Use standard class-validator email decorator + IsEmail()(target as any, propName); + }; +} diff --git a/src/model/types/HTML.ts b/src/model/types/HTML.ts new file mode 100644 index 0000000..04c602c --- /dev/null +++ b/src/model/types/HTML.ts @@ -0,0 +1,53 @@ +import 'reflect-metadata'; +import { validateStringType } from './utils'; +import { Text } from './Text'; + +/** + * HTML type decorator. + * - Must be used on `string` fields. + * - Currently identical to `Text()` without extra options. + */ +// Custom key types for clearer IntelliSense errors +type HtmlKey = T[K] extends string + ? K + : `HTML: requires string field`; + +/** + * HTML type decorator for string properties. + * + * This decorator can only be applied to properties of type `string` and provides + * the same validation capabilities as the Text decorator. It also stores + * metadata that can be consumed by other layers such as database mapping or + * documentation generation to indicate this field contains HTML content. + * + * @example + * ```typescript + * class Article { + * @HTML() + * content: string; + * } + * ``` + * + * @returns A property decorator function that applies text validation and stores HTML metadata + * + * @throws {Error} When applied to non-string properties + * + * @remarks + * - Currently identical to Text() decorator in functionality + * - Metadata is stored under 'field:logicalType' key with value 'html' + * - The decorator uses reflection to verify the property type at runtime + * - Inherits all validation capabilities from the Text decorator + */ +export function HTML() { + return function ( + target: T, + propertyKey: HtmlKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateStringType(proto, propName); + Reflect.defineMetadata('field:logicalType', 'html', proto, propName); + Text()(target as any, propName as any); + }; +} diff --git a/src/model/types/Text.ts b/src/model/types/Text.ts index 578ecb8..cfe6d4f 100644 --- a/src/model/types/Text.ts +++ b/src/model/types/Text.ts @@ -3,9 +3,8 @@ import { MinLength, MaxLength, Matches, - IsEmail, - ValidationOptions, } from 'class-validator'; +import { validateStringType } from './utils'; /** * Options for the Text decorator. @@ -31,24 +30,8 @@ export interface TextOptions { type TextKey = T[K] extends string ? K : `Text: requires string field`; -type EmailKey = T[K] extends string - ? K - : `Email: requires string field`; -type HtmlKey = T[K] extends string - ? K - : `HTML: requires string field`; -/** - * Validates that a property is of string type at runtime. - */ -function validateStringType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== String) { - throw new Error(`@Text can only be applied to 'string' properties: ${propertyKey}`); - } -} - /** * Stores metadata for the text field that can be consumed by other layers. * @param proto - The prototype object @@ -118,39 +101,4 @@ export function Text(options?: TextOptions) { Matches(options.regex, { message: options.regexMessage })(target as any, propName); } }; -} - -/** - * Email type decorator. - * - Must be used on `string` fields. - * - Uses standard class-validator email validation. - * - No options. - */ -export function Email() { - return function ( - target: T, - propertyKey: EmailKey - ) { - const propName = propertyKey as unknown as string; - Reflect.defineMetadata('field:logicalType', 'email', target as unknown as Object, propName); - - // Use standard class-validator email decorator - IsEmail()(target as any, propName); - }; -} - -/** - * HTML type decorator. - * - Must be used on `string` fields. - * - Currently identical to `Text()` without extra options. - */ -export function HTML() { - return function ( - target: T, - propertyKey: HtmlKey - ) { - const propName = propertyKey as unknown as string; - Reflect.defineMetadata('field:logicalType', 'html', target as unknown as Object, propName); - Text()(target as any, propName as any); - }; } \ No newline at end of file diff --git a/src/model/types/index.ts b/src/model/types/index.ts new file mode 100644 index 0000000..f47c12a --- /dev/null +++ b/src/model/types/index.ts @@ -0,0 +1,4 @@ +export { Text } from './Text'; +export type { TextOptions } from './Text'; +export { Email } from './Email'; +export { HTML } from './HTML'; diff --git a/src/model/types/utils.ts b/src/model/types/utils.ts new file mode 100644 index 0000000..7d9a17c --- /dev/null +++ b/src/model/types/utils.ts @@ -0,0 +1,11 @@ +import 'reflect-metadata'; + +/** + * Validates that a property is of string type at runtime. + */ +export function validateStringType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== String) { + throw new Error(`Decorator can only be applied to 'string' properties: ${propertyKey}`); + } +} diff --git a/test/model/Person.ts b/test/model/Person.ts index 0cc9fb7..ec77ebd 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -2,7 +2,7 @@ import { Field } from "../../src/model/Field"; import { Model } from "../../src/model/Model"; import { BaseModel } from "../../src/model/BaseModel"; import { IsEmail } from "class-validator"; -import { Text, Email, HTML } from "@/model/types/Text"; +import { Text, Email, HTML } from "@/model/types"; @Model({ docs: "Represents a person", From 8fdea82e453a485448a84edeb9c51964110ab871 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 10:16:08 -0300 Subject: [PATCH 075/254] Update metadata key for Email and HTML decorators from 'field:logicalType' to 'field:type' --- src/model/types/Email.ts | 4 ++-- src/model/types/HTML.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/types/Email.ts b/src/model/types/Email.ts index 8ffe0e9..65b14e2 100644 --- a/src/model/types/Email.ts +++ b/src/model/types/Email.ts @@ -35,7 +35,7 @@ type EmailKey = T[K] extends string * * @remarks * - Uses standard class-validator email validation - * - Metadata is stored under 'field:logicalType' key with value 'email' + * - Metadata is stored under 'field:type' key with value 'email' * - The decorator uses reflection to verify the property type at runtime */ export function Email() { @@ -47,7 +47,7 @@ export function Email() { const proto = target as unknown as Object; validateStringType(proto, propName); - Reflect.defineMetadata('field:logicalType', 'email', proto, propName); + Reflect.defineMetadata('field:type', 'email', proto, propName); // Use standard class-validator email decorator IsEmail()(target as any, propName); diff --git a/src/model/types/HTML.ts b/src/model/types/HTML.ts index 04c602c..e5b5747 100644 --- a/src/model/types/HTML.ts +++ b/src/model/types/HTML.ts @@ -34,7 +34,7 @@ type HtmlKey = T[K] extends string * * @remarks * - Currently identical to Text() decorator in functionality - * - Metadata is stored under 'field:logicalType' key with value 'html' + * - Metadata is stored under 'field:type' key with value 'html' * - The decorator uses reflection to verify the property type at runtime * - Inherits all validation capabilities from the Text decorator */ @@ -47,7 +47,7 @@ export function HTML() { const proto = target as unknown as Object; validateStringType(proto, propName); - Reflect.defineMetadata('field:logicalType', 'html', proto, propName); + Reflect.defineMetadata('field:type', 'html', proto, propName); Text()(target as any, propName as any); }; } From c7e8ea0f60849572859b21cc9f74517b232a29c4 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 10:32:15 -0300 Subject: [PATCH 076/254] Update structure of Date Time types --- src/model/types/DateTime.ts | 234 +------------------------------ src/model/types/DateTimeRange.ts | 179 +++++++++++++++++++++++ src/model/types/index.ts | 4 + src/model/types/utils.ts | 58 ++++++++ test/Project.test.ts | 2 +- test/model/Person.ts | 7 +- test/model/Project.ts | 9 +- 7 files changed, 253 insertions(+), 240 deletions(-) create mode 100644 src/model/types/DateTimeRange.ts diff --git a/src/model/types/DateTime.ts b/src/model/types/DateTime.ts index 9ce7d51..5cb5164 100644 --- a/src/model/types/DateTime.ts +++ b/src/model/types/DateTime.ts @@ -3,9 +3,9 @@ import { ValidationArguments, registerDecorator, ValidationOptions, - ValidateNested, - IsOptional} from 'class-validator'; -import { Type, Transform, TransformationType, Expose } from 'class-transformer'; +} from 'class-validator'; +import { Transform, TransformationType } from 'class-transformer'; +import { validateDateType, dateToISO8601, dateFromJSON } from './utils'; /** * Options for the DateTime decorator. @@ -17,93 +17,11 @@ export interface DateTimeOptions { max?: Date | string; } -/** - * Options for the DateTimeRange decorator. - */ -export interface DateTimeRangeOptions { - /** If set to true, the 'from' field can be empty (open start). */ - openStart?: boolean; - /** If set to true, the 'to' field can be empty (open end). */ - openEnd?: boolean; -} - -/** - * Transforms Date objects to ISO 8601 strings for JSON serialization. - * @param value - The Date value to transform - * @returns ISO 8601 string or undefined if value is null/undefined - */ -function dateToISO8601(value: Date | undefined | null): string | undefined { - if (value == null) { - return undefined; - } - if (!(value instanceof Date)) { - return undefined; - } - return value.toISOString(); -} - -/** - * Transforms ISO 8601 strings or milliseconds to Date objects for JSON deserialization. - * Supports both ISO 8601 strings and milliseconds for backwards compatibility. - * @param value - The value to transform (ISO 8601 string, milliseconds number, or Date) - * @returns Date object or undefined if value is null/undefined - */ -function dateFromJSON(value: any): Date | undefined { - if (value == null) { - return undefined; - } - - // If it's already a Date object, return it - if (value instanceof Date) { - return value; - } - - // If it's a number, treat it as milliseconds (backwards compatibility) - if (typeof value === 'number') { - return new Date(value); - } - - // If it's a string, try to parse as ISO 8601 - if (typeof value === 'string') { - const date = new Date(value); - // Check if the date is valid - if (!isNaN(date.getTime())) { - return date; - } - } - - return undefined; -} - // Custom key types for clearer IntelliSense errors type DateTimeKey = T[K] extends Date | undefined ? K : `DateTime: requires Date field`; -type DateTimeRangeKey = T[K] extends DateTimeRangeType | undefined - ? K - : `DateTimeRange: requires DateTimeRange field`; - -/** - * Validates that a property is of Date type at runtime. - */ -function validateDateType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== Date) { - throw new Error(`@DateTime can only be applied to 'Date' properties: ${propertyKey}`); - } -} - -/** - * Validates that a property is of DateTimeRange type at runtime. - */ -function validateDateTimeRangeType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== DateTimeRangeType) { - throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' properties: ${propertyKey}`); - } -} - /** * Stores metadata for the datetime field that can be consumed by other layers. */ @@ -114,16 +32,6 @@ function storeDateTimeMetadata(proto: Object, propName: string, options?: DateTi } } -/** - * Stores metadata for the datetime range field that can be consumed by other layers. - */ -function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { - Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); - if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); - } -} - /** * Custom Date validator that only validates non-null values and supports min/max dates */ @@ -241,138 +149,4 @@ export function DateTime(options?: DateTimeOptions) { return value; })(target as any, propName); }; -} - -/** - * DateTimeRange class that represents a range between two dates. - * Used as a nested object in models that need date ranges. - */ -export class DateTimeRangeType { - @IsOptional() - @Expose() - @Transform(({ value, type }) => { - if (type === TransformationType.CLASS_TO_PLAIN) { - // Serialization: Date -> ISO 8601 string - return dateToISO8601(value); - } else if (type === TransformationType.PLAIN_TO_CLASS) { - // Deserialization: string/number -> Date - return dateFromJSON(value); - } - return value; - }) - from?: Date; - - @IsOptional() - @Expose() - @Transform(({ value, type }) => { - if (type === TransformationType.CLASS_TO_PLAIN) { - // Serialization: Date -> ISO 8601 string - return dateToISO8601(value); - } else if (type === TransformationType.PLAIN_TO_CLASS) { - // Deserialization: string/number -> Date - return dateFromJSON(value); - } - return value; - }) - to?: Date; -} - -/** - * Custom DateTimeRange validator that validates range constraints - */ -function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions?: ValidationOptions) { - return function (object: Object, propertyName: string) { - registerDecorator({ - name: 'isValidDateTimeRange', - target: object.constructor, - propertyName: propertyName, - constraints: [options], - options: validationOptions || {}, - validator: { - validate(value: any, args: ValidationArguments) { - if (value == null) { - return true; // Allow null/undefined values - } - - if (!(value instanceof DateTimeRangeType)) { - return false; - } - - const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; - - // Check if from is required (when openStart is false or undefined) - if (!rangeOptions?.openStart && !value.from) { - return false; - } - - // Check if to is required (when openEnd is false or undefined) - if (!rangeOptions?.openEnd && !value.to) { - return false; - } - - // If both dates are present, validate that from is before to - if (value.from && value.to) { - if (value.from >= value.to) { - return false; - } - } - - return true; - }, - defaultMessage(args: ValidationArguments) { - return `${args.property} must be a valid date range where 'from' is before 'to'`; - } - }, - }); - }; -} - -/** - * DateTimeRange type decorator for DateTimeRange properties. - * - * This decorator can only be applied to properties of type `DateTimeRange` and provides - * validation for date ranges with optional open start/end capabilities. - * - * @example - * ```typescript - * class Reservation { - * @DateTimeRange({ openStart: false, openEnd: false }) - * dateRange: DateTimeRange; - * - * @DateTimeRange({ openStart: true, openEnd: true }) - * flexibleRange: DateTimeRange; - * } - * ``` - * - * @param options - Configuration options for datetime range validation - * @param options.openStart - If true, 'from' field can be empty (open start) - * @param options.openEnd - If true, 'to' field can be empty (open end) - * - * @returns A property decorator function that applies validation and stores metadata - * - * @throws {Error} When applied to non-DateTimeRange properties - * - * @remarks - * - Validates that 'from' date is before 'to' date when both are present - * - Supports open-ended ranges when openStart or openEnd options are enabled - * - Metadata is stored under 'field:type' ('datetimerange') and 'field:type:options' keys - */ -export function DateTimeRange(options?: DateTimeRangeOptions) { - return function ( - target: T, - propertyKey: DateTimeRangeKey - ) { - const propName = propertyKey as unknown as string; - const proto = target as unknown as Object; - - validateDateTimeRangeType(proto, propName); - storeDateTimeRangeMetadata(proto, propName, options); - - // Apply nested validation for DateTimeRange - ValidateNested()(target as any, propName); - Type(() => DateTimeRangeType)(target as any, propName); - - // Apply custom range validation - IsValidDateTimeRange(options)(target as any, propName); - }; -} +} \ No newline at end of file diff --git a/src/model/types/DateTimeRange.ts b/src/model/types/DateTimeRange.ts new file mode 100644 index 0000000..d090a31 --- /dev/null +++ b/src/model/types/DateTimeRange.ts @@ -0,0 +1,179 @@ +import 'reflect-metadata'; +import { + ValidationArguments, + registerDecorator, + ValidationOptions, + ValidateNested, + IsOptional +} from 'class-validator'; +import { Type, Transform, TransformationType, Expose } from 'class-transformer'; +import { dateToISO8601, dateFromJSON } from './utils'; + +/** + * Options for the DateTimeRange decorator. + */ +export interface DateTimeRangeOptions { + /** If set to true, the 'from' field can be empty (open start). */ + openStart?: boolean; + /** If set to true, the 'to' field can be empty (open end). */ + openEnd?: boolean; +} + +/** + * DateTimeRange class that represents a range between two dates. + * Used as a nested object in models that need date ranges. + */ +export class DateTimeRangeType { + @IsOptional() + @Expose() + @Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: Date -> ISO 8601 string + return dateToISO8601(value); + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: string/number -> Date + return dateFromJSON(value); + } + return value; + }) + from?: Date; + + @IsOptional() + @Expose() + @Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: Date -> ISO 8601 string + return dateToISO8601(value); + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: string/number -> Date + return dateFromJSON(value); + } + return value; + }) + to?: Date; +} + +// Custom key types for clearer IntelliSense errors +type DateTimeRangeKey = T[K] extends DateTimeRangeType | undefined + ? K + : `DateTimeRange: requires DateTimeRange field`; + +/** + * Validates that a property is of DateTimeRange type at runtime. + */ +function validateDateTimeRangeType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== DateTimeRangeType) { + throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' properties: ${propertyKey}`); + } +} + +/** + * Stores metadata for the datetime range field that can be consumed by other layers. + */ +function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { + Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Custom DateTimeRange validator that validates range constraints + */ +function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions?: ValidationOptions) { + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'isValidDateTimeRange', + target: object.constructor, + propertyName: propertyName, + constraints: [options], + options: validationOptions || {}, + validator: { + validate(value: any, args: ValidationArguments) { + if (value == null) { + return true; // Allow null/undefined values + } + + if (!(value instanceof DateTimeRangeType)) { + return false; + } + + const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; + + // Check if from is required (when openStart is false or undefined) + if (!rangeOptions?.openStart && !value.from) { + return false; + } + + // Check if to is required (when openEnd is false or undefined) + if (!rangeOptions?.openEnd && !value.to) { + return false; + } + + // If both dates are present, validate that from is before to + if (value.from && value.to) { + if (value.from >= value.to) { + return false; + } + } + + return true; + }, + defaultMessage(args: ValidationArguments) { + return `${args.property} must be a valid date range where 'from' is before 'to'`; + } + }, + }); + }; +} + +/** + * DateTimeRange type decorator for DateTimeRange properties. + * + * This decorator can only be applied to properties of type `DateTimeRange` and provides + * validation for date ranges with optional open start/end capabilities. + * + * @example + * ```typescript + * class Reservation { + * @DateTimeRange({ openStart: false, openEnd: false }) + * dateRange: DateTimeRange; + * + * @DateTimeRange({ openStart: true, openEnd: true }) + * flexibleRange: DateTimeRange; + * } + * ``` + * + * @param options - Configuration options for datetime range validation + * @param options.openStart - If true, 'from' field can be empty (open start) + * @param options.openEnd - If true, 'to' field can be empty (open end) + * + * @returns A property decorator function that applies validation and stores metadata + * + * @throws {Error} When applied to non-DateTimeRange properties + * + * @remarks + * - Validates that 'from' date is before 'to' date when both are present + * - Supports open-ended ranges when openStart or openEnd options are enabled + * - Metadata is stored under 'field:type' ('datetimerange') and 'field:type:options' keys + */ +export function DateTimeRange(options?: DateTimeRangeOptions) { + return function ( + target: T, + propertyKey: DateTimeRangeKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateDateTimeRangeType(proto, propName); + storeDateTimeRangeMetadata(proto, propName, options); + + // Apply nested validation for DateTimeRange + ValidateNested()(target as any, propName); + Type(() => DateTimeRangeType)(target as any, propName); + + // Apply custom range validation + IsValidDateTimeRange(options)(target as any, propName); + }; +} diff --git a/src/model/types/index.ts b/src/model/types/index.ts index f47c12a..f9cbe43 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -2,3 +2,7 @@ export { Text } from './Text'; export type { TextOptions } from './Text'; export { Email } from './Email'; export { HTML } from './HTML'; +export { DateTime } from './DateTime'; +export type { DateTimeOptions } from './DateTime'; +export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; +export type { DateTimeRangeOptions } from './DateTimeRange'; diff --git a/src/model/types/utils.ts b/src/model/types/utils.ts index 7d9a17c..67fe62f 100644 --- a/src/model/types/utils.ts +++ b/src/model/types/utils.ts @@ -9,3 +9,61 @@ export function validateStringType(proto: Object, propertyKey: string): void { throw new Error(`Decorator can only be applied to 'string' properties: ${propertyKey}`); } } + +/** + * Validates that a property is of Date type at runtime. + */ +export function validateDateType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== Date) { + throw new Error(`@DateTime can only be applied to 'Date' properties: ${propertyKey}`); + } +} + +/** + * Transforms Date objects to ISO 8601 strings for JSON serialization. + * @param value - The Date value to transform + * @returns ISO 8601 string or undefined if value is null/undefined + */ +export function dateToISO8601(value: Date | undefined | null): string | undefined { + if (value == null) { + return undefined; + } + if (!(value instanceof Date)) { + return undefined; + } + return value.toISOString(); +} + +/** + * Transforms ISO 8601 strings or milliseconds to Date objects for JSON deserialization. + * Supports both ISO 8601 strings and milliseconds for backwards compatibility. + * @param value - The value to transform (ISO 8601 string, milliseconds number, or Date) + * @returns Date object or undefined if value is null/undefined + */ +export function dateFromJSON(value: any): Date | undefined { + if (value == null) { + return undefined; + } + + // If it's already a Date object, return it + if (value instanceof Date) { + return value; + } + + // If it's a number, treat it as milliseconds (backwards compatibility) + if (typeof value === 'number') { + return new Date(value); + } + + // If it's a string, try to parse as ISO 8601 + if (typeof value === 'string') { + const date = new Date(value); + // Check if the date is valid + if (!isNaN(date.getTime())) { + return date; + } + } + + return undefined; +} diff --git a/test/Project.test.ts b/test/Project.test.ts index aecedb5..328b5da 100644 --- a/test/Project.test.ts +++ b/test/Project.test.ts @@ -1,6 +1,6 @@ import type { ValidationError } from "class-validator"; import { Project } from "./model/Project"; -import { DateTimeRangeType } from "../src/model/types/DateTime"; +import { DateTimeRangeType } from "../src/model/types"; /** * Converts an array of class-validator ValidationError objects into a stable, plain summary. diff --git a/test/model/Person.ts b/test/model/Person.ts index ec77ebd..1b274f0 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,7 +1,6 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; -import { IsEmail } from "class-validator"; +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; import { Text, Email, HTML } from "@/model/types"; @Model({ diff --git a/test/model/Project.ts b/test/model/Project.ts index 7d9db6f..187aec2 100644 --- a/test/model/Project.ts +++ b/test/model/Project.ts @@ -1,8 +1,7 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; -import { Text } from "../../src/model/types/Text"; -import { DateTime, DateTimeRange, DateTimeRangeType } from "../../src/model/types/DateTime"; +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Text, DateTime, DateTimeRange, DateTimeRangeType } from "@/model/types"; @Model({ docs: "Represents a project with date-related fields", From 3c1ae2425366960583a29c28840f96905f68784a Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 10:43:38 -0300 Subject: [PATCH 077/254] Add new Boolean type --- src/model/types/Boolean.ts | 52 +++++++++++++++++++++++++++++++++ src/model/types/index.ts | 1 + src/model/types/utils.ts | 10 +++++++ test/Field.test.ts | 36 +++++++++++++++++++++++ test/JsonConversion.test.ts | 58 +++++++++++++++++++++++++++++++++++++ test/model/Person.ts | 8 ++++- 6 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 src/model/types/Boolean.ts diff --git a/src/model/types/Boolean.ts b/src/model/types/Boolean.ts new file mode 100644 index 0000000..82f0f53 --- /dev/null +++ b/src/model/types/Boolean.ts @@ -0,0 +1,52 @@ +import 'reflect-metadata'; +import { validateBooleanType } from './utils'; + +/** + * Boolean type decorator. + * - Must be used on `boolean` fields. + * - No options for now. + */ +// Custom key types for clearer IntelliSense errors +type BooleanKey = T[K] extends boolean + ? K + : `Boolean: requires boolean field`; + +/** + * Boolean type decorator for boolean properties. + * + * This decorator can only be applied to properties of type `boolean` and stores + * metadata that can be consumed by other layers such as database mapping or + * documentation generation. + * + * @example + * ```typescript + * class User { + * @Boolean() + * isActive: boolean; + * + * @Boolean() + * isVerified: boolean; + * } + * ``` + * + * @returns A property decorator function that stores metadata + * + * @throws {Error} When applied to non-boolean properties + * + * @remarks + * - This is a very simple type with no validation options + * - Metadata is stored under 'field:type' key with value 'boolean' + * - The decorator uses reflection to verify the property type at runtime + */ +export function Boolean() { + return function ( + target: T, + propertyKey: BooleanKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateBooleanType(proto, propName); + Reflect.defineMetadata('field:type', 'boolean', proto, propName); + }; +} diff --git a/src/model/types/index.ts b/src/model/types/index.ts index f9cbe43..827ed81 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -2,6 +2,7 @@ export { Text } from './Text'; export type { TextOptions } from './Text'; export { Email } from './Email'; export { HTML } from './HTML'; +export { Boolean } from './Boolean'; export { DateTime } from './DateTime'; export type { DateTimeOptions } from './DateTime'; export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; diff --git a/src/model/types/utils.ts b/src/model/types/utils.ts index 67fe62f..04aa223 100644 --- a/src/model/types/utils.ts +++ b/src/model/types/utils.ts @@ -20,6 +20,16 @@ export function validateDateType(proto: Object, propertyKey: string): void { } } +/** + * Validates that a property is of boolean type at runtime. + */ +export function validateBooleanType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== Boolean) { + throw new Error(`@Boolean can only be applied to 'boolean' properties: ${propertyKey}`); + } +} + /** * Transforms Date objects to ISO 8601 strings for JSON serialization. * @param value - The Date value to transform diff --git a/test/Field.test.ts b/test/Field.test.ts index 080a01c..70bc365 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -111,6 +111,42 @@ describe("Person Model Validation", () => { const errors = await invalidUser.validate(); expect(errors.length).toBeGreaterThan(0); }); + + it("should pass validation with Boolean field set to true", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 30; + validUser.isActive = true; + + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with Boolean field set to false", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 30; + validUser.isActive = false; + + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with Boolean field undefined (optional)", async () => { + const validUser = new Person(); + validUser.firstName = "John"; + validUser.lastName = "Doe"; + validUser.email = "john.doe@example.com"; + validUser.age = 30; + // isActive is undefined (optional field) + + const errors = await validUser.validate(); + expect(errors).toStrictEqual([]); + }); }); describe("Product Model Validation", () => { diff --git a/test/JsonConversion.test.ts b/test/JsonConversion.test.ts index d16857e..d1f6ea1 100644 --- a/test/JsonConversion.test.ts +++ b/test/JsonConversion.test.ts @@ -491,3 +491,61 @@ describe("BaseModel JSON Conversion", () => { }); }); + +describe("Boolean Type JSON Conversion", () => { + it("should include Boolean field in JSON output when set to true", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = true; + + const json = person.toJSON(); + expect(json.isActive).toBe(true); + }); + + it("should include Boolean field in JSON output when set to false", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = false; + + const json = person.toJSON(); + expect(json.isActive).toBe(false); + }); + + it("should create model instance from JSON with Boolean field", () => { + const jsonData = { + firstName: "Jane", + lastName: "Smith", + email: "jane.smith@example.com", + age: 25, + isActive: true + }; + + const person = Person.fromJSON(jsonData); + expect(person.isActive).toBe(true); + }); + + it("should handle Boolean field coercion from string", () => { + const jsonData = { + firstName: "Jane", + lastName: "Smith", + email: "jane.smith@example.com", + age: 25, + isActive: "true" // String that should be coerced to boolean + }; + + const person = Person.fromJSON(jsonData); + expect(person.isActive).toBe(true); + }); + + it("should store correct metadata for Boolean field", () => { + const person = new Person(); + const fieldType = Reflect.getMetadata('field:type', person, 'isActive'); + expect(fieldType).toBe('boolean'); + }); +}); diff --git a/test/model/Person.ts b/test/model/Person.ts index 1b274f0..9af3d70 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,7 +1,7 @@ import { Field } from "@/model/Field"; import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; -import { Text, Email, HTML } from "@/model/types"; +import { Text, Email, HTML, Boolean } from "@/model/types"; @Model({ docs: "Represents a person", @@ -74,4 +74,10 @@ export class Person extends BaseModel { @HTML() additionalInfo!: string; + @Field({ + required: false, + }) + @Boolean() + isActive!: boolean; + } From 67c42afc93802633350b266108a37f2ac8cd7961 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 10:59:58 -0300 Subject: [PATCH 078/254] Add new Choice type --- src/model/types/Choice.ts | 70 ++++++++++++++++++++++++ src/model/types/index.ts | 1 + src/model/types/utils.ts | 15 ++++++ test/Choice.test.ts | 109 ++++++++++++++++++++++++++++++++++++++ test/model/Task.ts | 38 +++++++++++++ 5 files changed, 233 insertions(+) create mode 100644 src/model/types/Choice.ts create mode 100644 test/Choice.test.ts create mode 100644 test/model/Task.ts diff --git a/src/model/types/Choice.ts b/src/model/types/Choice.ts new file mode 100644 index 0000000..be5a27d --- /dev/null +++ b/src/model/types/Choice.ts @@ -0,0 +1,70 @@ +import 'reflect-metadata'; +import { Transform, TransformationType } from 'class-transformer'; +import { validateEnumType } from './utils'; + +/** + * Choice type decorator. + * - Must be used on enum fields. + * - Handles serialization/deserialization of enum values. + * - For now, there are no options for choice fields. + */ + +/** + * Choice type decorator for enum properties. + * + * This decorator can only be applied to properties of enum types and handles + * the serialization and deserialization of enum values. It ensures that enum + * values are properly converted to their string representation in JSON and + * restored from JSON back to the appropriate enum value. + * + * @example + * ```typescript + * enum TaskStatus { + * ToDo = 'toDo', + * InProgress = 'inProgress', + * Done = 'done' + * } + * + * class Task extends BaseModel { + * @Field() + * @Choice() + * status: TaskStatus = TaskStatus.ToDo; + * } + * ``` + * + * @returns A property decorator function that handles enum transformation and stores metadata + * + * @throws {Error} When applied to non-enum properties + * + * @remarks + * - The decorator uses enum values (not keys) for JSON serialization + * - Metadata is stored under 'field:type' key with value 'choice' + * - The decorator uses reflection to verify the property type at runtime + * - Supports any enum type, including string and numeric enums + */ +export function Choice() { + return function ( + target: T, + propertyKey: K + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateEnumType(proto, propName); + Reflect.defineMetadata('field:type', 'choice', proto, propName); + + // Custom transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: enum value -> enum value (already the correct string/number) + return value; + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: JSON value -> enum value + // The value should already be the correct enum value since enums are + // typically stored as their actual values + return value; + } + return value; + })(target as any, propName); + }; +} diff --git a/src/model/types/index.ts b/src/model/types/index.ts index 827ed81..3399981 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -3,6 +3,7 @@ export type { TextOptions } from './Text'; export { Email } from './Email'; export { HTML } from './HTML'; export { Boolean } from './Boolean'; +export { Choice } from './Choice'; export { DateTime } from './DateTime'; export type { DateTimeOptions } from './DateTime'; export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; diff --git a/src/model/types/utils.ts b/src/model/types/utils.ts index 04aa223..8a33e98 100644 --- a/src/model/types/utils.ts +++ b/src/model/types/utils.ts @@ -30,6 +30,21 @@ export function validateBooleanType(proto: Object, propertyKey: string): void { } } +/** + * Validates that a property is of enum type at runtime. + * For enums, TypeScript emits Object as the design type, so we check if the property + * has been initialized with an enum value. + */ +export function validateEnumType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + // For enums, TypeScript emits Object as the design type + // We can't easily validate the enum type at runtime since enums are compiled to objects + // The validation will happen during actual usage when the enum values are checked + if (designType !== Object && designType !== String && designType !== Number) { + throw new Error(`@Choice can only be applied to enum properties: ${propertyKey}`); + } +} + /** * Transforms Date objects to ISO 8601 strings for JSON serialization. * @param value - The Date value to transform diff --git a/test/Choice.test.ts b/test/Choice.test.ts new file mode 100644 index 0000000..340c8b9 --- /dev/null +++ b/test/Choice.test.ts @@ -0,0 +1,109 @@ +import { Task, TaskStatus, Priority } from "./model/Task"; + +describe("Choice Type Tests", () => { + describe("Task Model with Choice fields", () => { + it("should pass validation for a valid task with default enum values", async () => { + const task = new Task(); + task.title = "Test Task"; + + const errors = await task.validate(); + expect(errors).toStrictEqual([]); + + // Check default values + expect(task.status).toBe(TaskStatus.ToDo); + expect(task.priority).toBe(Priority.Medium); + }); + + it("should pass validation when enum values are explicitly set", async () => { + const task = new Task(); + task.title = "Important Task"; + task.status = TaskStatus.InProgress; + task.priority = Priority.High; + + const errors = await task.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should serialize enum values correctly in toJSON", () => { + const task = new Task(); + task.title = "Test Task"; + task.status = TaskStatus.Done; + task.priority = Priority.Low; + + const json = task.toJSON(); + + expect(json).toEqual({ + title: "Test Task", + status: "done", // String enum value + priority: 1, // Numeric enum value + }); + }); + + it("should deserialize enum values correctly from JSON", () => { + const jsonData = { + title: "Restored Task", + status: "inProgress", + priority: 3, + }; + + const task = Task.fromJSON(jsonData); + + expect(task.title).toBe("Restored Task"); + expect(task.status).toBe(TaskStatus.InProgress); + expect(task.priority).toBe(Priority.High); + expect(task instanceof Task).toBe(true); + }); + + it("should handle round-trip JSON conversion", () => { + // Create original task + const originalTask = new Task(); + originalTask.title = "Round Trip Task"; + originalTask.status = TaskStatus.InProgress; + originalTask.priority = Priority.High; + + // Convert to JSON + const json = originalTask.toJSON(); + + // Convert back from JSON + const restoredTask = Task.fromJSON(json); + + // Verify everything matches + expect(restoredTask.title).toBe(originalTask.title); + expect(restoredTask.status).toBe(originalTask.status); + expect(restoredTask.priority).toBe(originalTask.priority); + expect(restoredTask instanceof Task).toBe(true); + }); + + it("should handle all enum values for TaskStatus", () => { + const task = new Task(); + task.title = "Status Test"; + + // Test all TaskStatus values + const statuses = [TaskStatus.ToDo, TaskStatus.InProgress, TaskStatus.Done]; + + for (const status of statuses) { + task.status = status; + const json = task.toJSON(); + const restored = Task.fromJSON(json); + + expect(restored.status).toBe(status); + } + }); + + it("should handle all enum values for Priority", () => { + const task = new Task(); + task.title = "Priority Test"; + + // Test all Priority values + const priorities = [Priority.Low, Priority.Medium, Priority.High]; + + for (const priority of priorities) { + task.priority = priority; + const json = task.toJSON(); + const restored = Task.fromJSON(json); + + expect(restored.priority).toBe(priority); + } + }); + }); +}); diff --git a/test/model/Task.ts b/test/model/Task.ts new file mode 100644 index 0000000..b28d7b9 --- /dev/null +++ b/test/model/Task.ts @@ -0,0 +1,38 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Choice, Text } from "@/model/types"; + +export enum TaskStatus { + ToDo = 'toDo', + InProgress = 'inProgress', + Done = 'done' +} + +export enum Priority { + Low = 1, + Medium = 2, + High = 3 +} + +@Model({ + docs: "Represents a task", +}) +export class Task extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 100, + }) + title!: string; + + @Field({}) + @Choice() + status: TaskStatus = TaskStatus.ToDo; + + @Field({}) + @Choice() + priority: Priority = Priority.Medium; +} From 5299ebe3841f6364e84d5acd851a56e8aacecec6 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 11:39:32 -0300 Subject: [PATCH 079/254] Refactor tests for easier readability and addition of new ones --- test/Boolean.test.ts | 113 +++++++ test/Choice.test.ts | 81 +++-- test/DateTime.test.ts | 191 ++++++++++++ test/DateTimeRange.test.ts | 222 +++++++++++++ test/Email.test.ts | 119 +++++++ test/Field.test.ts | 384 ----------------------- test/HTML.test.ts | 69 +++++ test/JsonConversion.test.ts | 551 --------------------------------- test/Number.test.ts | 197 ++++++++++++ test/Project.test.ts | 601 ------------------------------------ test/Text.test.ts | 237 ++++++++++++++ 11 files changed, 1195 insertions(+), 1570 deletions(-) create mode 100644 test/Boolean.test.ts create mode 100644 test/DateTime.test.ts create mode 100644 test/DateTimeRange.test.ts create mode 100644 test/Email.test.ts delete mode 100644 test/Field.test.ts create mode 100644 test/HTML.test.ts delete mode 100644 test/JsonConversion.test.ts create mode 100644 test/Number.test.ts delete mode 100644 test/Project.test.ts create mode 100644 test/Text.test.ts diff --git a/test/Boolean.test.ts b/test/Boolean.test.ts new file mode 100644 index 0000000..e907ffb --- /dev/null +++ b/test/Boolean.test.ts @@ -0,0 +1,113 @@ +import { Person } from "./model/Person"; + +describe("Boolean Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with Boolean field set to true", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = true; + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with Boolean field set to false", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = false; + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with Boolean field undefined (optional)", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + // isActive is undefined (optional field) + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("required-tests", () => { + it("should pass validation when optional Boolean field is missing", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + // isActive is optional + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should include Boolean field in JSON output when set to true", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = true; + + const json = person.toJSON(); + expect(json.isActive).toBe(true); + }); + + it("should include Boolean field in JSON output when set to false", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.isActive = false; + + const json = person.toJSON(); + expect(json.isActive).toBe(false); + }); + + it("should create model instance from JSON with Boolean field", () => { + const jsonData = { + firstName: "Jane", + lastName: "Smith", + email: "jane.smith@example.com", + age: 25, + isActive: true + }; + + const person = Person.fromJSON(jsonData); + expect(person.isActive).toBe(true); + }); + + it("should handle Boolean field coercion from string", () => { + const jsonData = { + firstName: "Jane", + lastName: "Smith", + email: "jane.smith@example.com", + age: 25, + isActive: "true" // String that should be coerced + }; + + const person = Person.fromJSON(jsonData); + expect(person.isActive).toBe(true); + }); + + it("should store correct metadata for Boolean field", () => { + const person = new Person(); + const fieldType = Reflect.getMetadata('field:type', person, 'isActive'); + expect(fieldType).toBe('boolean'); + }); + }); +}); diff --git a/test/Choice.test.ts b/test/Choice.test.ts index 340c8b9..32a20b4 100644 --- a/test/Choice.test.ts +++ b/test/Choice.test.ts @@ -1,7 +1,7 @@ import { Task, TaskStatus, Priority } from "./model/Task"; -describe("Choice Type Tests", () => { - describe("Task Model with Choice fields", () => { +describe("Choice Field Type", () => { + describe("validation-tests", () => { it("should pass validation for a valid task with default enum values", async () => { const task = new Task(); task.title = "Test Task"; @@ -24,6 +24,51 @@ describe("Choice Type Tests", () => { expect(errors).toStrictEqual([]); }); + it("should handle all enum values for TaskStatus", () => { + const task = new Task(); + task.title = "Status Test"; + + // Test all TaskStatus values + const statuses = [TaskStatus.ToDo, TaskStatus.InProgress, TaskStatus.Done]; + + for (const status of statuses) { + task.status = status; + const json = task.toJSON(); + const restored = Task.fromJSON(json); + + expect(restored.status).toBe(status); + } + }); + + it("should handle all enum values for Priority", () => { + const task = new Task(); + task.title = "Priority Test"; + + // Test all Priority values + const priorities = [Priority.Low, Priority.Medium, Priority.High]; + + for (const priority of priorities) { + task.priority = priority; + const json = task.toJSON(); + const restored = Task.fromJSON(json); + + expect(restored.priority).toBe(priority); + } + }); + }); + + describe("required-tests", () => { + it("should pass validation when optional choice fields have defaults", async () => { + const task = new Task(); + task.title = "Test Task"; + // status and priority have defaults + + const errors = await task.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { it("should serialize enum values correctly in toJSON", () => { const task = new Task(); task.title = "Test Task"; @@ -73,37 +118,5 @@ describe("Choice Type Tests", () => { expect(restoredTask.priority).toBe(originalTask.priority); expect(restoredTask instanceof Task).toBe(true); }); - - it("should handle all enum values for TaskStatus", () => { - const task = new Task(); - task.title = "Status Test"; - - // Test all TaskStatus values - const statuses = [TaskStatus.ToDo, TaskStatus.InProgress, TaskStatus.Done]; - - for (const status of statuses) { - task.status = status; - const json = task.toJSON(); - const restored = Task.fromJSON(json); - - expect(restored.status).toBe(status); - } - }); - - it("should handle all enum values for Priority", () => { - const task = new Task(); - task.title = "Priority Test"; - - // Test all Priority values - const priorities = [Priority.Low, Priority.Medium, Priority.High]; - - for (const priority of priorities) { - task.priority = priority; - const json = task.toJSON(); - const restored = Task.fromJSON(json); - - expect(restored.priority).toBe(priority); - } - }); }); }); diff --git a/test/DateTime.test.ts b/test/DateTime.test.ts new file mode 100644 index 0000000..b25d554 --- /dev/null +++ b/test/DateTime.test.ts @@ -0,0 +1,191 @@ +import { Project } from "./model/Project"; +import { DateTimeRangeType } from "@/model/types"; + +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("DateTime Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid dates within range", async () => { + const project = new Project(); + project.name = "Date Test"; + project.startDate = new Date('2024-06-15'); // Within 2020-2030 range + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation when date is before minimum allowed", async () => { + const project = new Project(); + project.name = "Date Test"; + project.startDate = new Date('2019-12-31'); // Before 2020-01-01 minimum + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + + it("should fail validation when date is after maximum allowed", async () => { + const project = new Project(); + project.name = "Date Test"; + project.startDate = new Date('2031-01-01'); // After 2030-12-31 maximum + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + + it("should fail validation with invalid date", async () => { + const project = new Project(); + project.name = "Invalid Date Test"; + project.startDate = new Date('invalid-date'); // Invalid date + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + const startDateError = summary.find(error => error.field === "startDate"); + expect(startDateError).toBeDefined(); + expect(startDateError?.codes).toContain("isDateWithRange"); + }); + + it("should pass validation for endDate without constraints", async () => { + const project = new Project(); + project.name = "End Date Test"; + project.startDate = new Date('2024-06-15'); + project.endDate = new Date('1990-01-01'); // No constraints on endDate + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("required-tests", () => { + it("should fail validation when required DateTime field is missing", async () => { + const project = new Project(); + project.name = "Date Test"; + // Missing startDate (required) + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + expect(summary.some(error => error.field === "startDate")).toBe(true); + }); + + it("should pass validation when optional DateTime field is missing", async () => { + const project = new Project(); + project.name = "Date Test"; + project.startDate = new Date('2024-06-15'); + // endDate is optional + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should convert DateTime fields to ISO 8601 strings in JSON", () => { + const project = new Project(); + project.name = "JSON Test Project"; + project.startDate = new Date('2024-06-15T10:00:00.000Z'); + project.endDate = new Date('2024-12-31T23:59:59.000Z'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15T10:00:00.000Z'); + activeRange.to = new Date('2024-09-15T10:00:00.000Z'); + project.activeRange = activeRange; + + const json = project.toJSON(); + + expect(json.startDate).toBe('2024-06-15T10:00:00.000Z'); + expect(json.endDate).toBe('2024-12-31T23:59:59.000Z'); + }); + + it("should convert ISO 8601 strings back to Date objects from JSON", () => { + const jsonData = { + name: "Restored Project", + startDate: '2024-06-15T10:00:00.000Z', + endDate: '2024-12-31T23:59:59.000Z', + activeRange: { + from: '2024-06-15T10:00:00.000Z', + to: '2024-09-15T10:00:00.000Z' + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.startDate).toBeInstanceOf(Date); + expect(project.endDate).toBeInstanceOf(Date); + expect(project.startDate.toISOString()).toBe('2024-06-15T10:00:00.000Z'); + expect(project.endDate?.toISOString()).toBe('2024-12-31T23:59:59.000Z'); + }); + + it("should handle undefined DateTime fields in JSON", () => { + const project = new Project(); + project.name = "Test Project"; + project.startDate = new Date('2024-06-15'); + // endDate is undefined + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const json = project.toJSON(); + expect(json).not.toHaveProperty("endDate"); + }); + }); +}); diff --git a/test/DateTimeRange.test.ts b/test/DateTimeRange.test.ts new file mode 100644 index 0000000..754ddb3 --- /dev/null +++ b/test/DateTimeRange.test.ts @@ -0,0 +1,222 @@ +import { Project } from "./model/Project"; +import { DateTimeRangeType } from "@/model/types"; + +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("DateTimeRange Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid DateTimeRange", async () => { + const project = new Project(); + project.name = "Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation when range has from date after to date", async () => { + const project = new Project(); + project.name = "Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-09-15'); // After 'to' date + activeRange.to = new Date('2024-06-15'); + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + const rangeError = summary.find(error => error.field === "activeRange"); + expect(rangeError).toBeDefined(); + expect(rangeError?.codes).toContain("isValidDateTimeRange"); + }); + + it("should fail validation when range is missing both dates (closed range)", async () => { + const project = new Project(); + project.name = "Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + // Both from and to are undefined, but openStart and openEnd are false + project.activeRange = activeRange; + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + const rangeError = summary.find(error => error.field === "activeRange"); + expect(rangeError).toBeDefined(); + expect(rangeError?.codes).toContain("isValidDateTimeRange"); + }); + + it("should pass validation for flexible range with only from date (openEnd=true)", async () => { + const project = new Project(); + project.name = "Flexible Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeType(); + flexibleRange.from = new Date('2024-01-01'); + // to is undefined, but openEnd is true + project.flexibleRange = flexibleRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for flexible range with only to date (openStart=true)", async () => { + const project = new Project(); + project.name = "Flexible Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeType(); + // from is undefined, but openStart is true + flexibleRange.to = new Date('2024-12-31'); + project.flexibleRange = flexibleRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation for flexible range with neither date (both open)", async () => { + const project = new Project(); + project.name = "Flexible Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeType(); + // Both from and to are undefined, but both openStart and openEnd are true + project.flexibleRange = flexibleRange; + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("required-tests", () => { + it("should fail validation when required DateTimeRange is missing", async () => { + const project = new Project(); + project.name = "Range Test"; + project.startDate = new Date('2024-06-15'); + // Missing activeRange (required) + + const errors = await project.validate(); + const summary = summarizeErrors(errors); + + expect(summary.some(error => error.field === "activeRange")).toBe(true); + }); + + it("should pass validation when optional DateTimeRange is missing", async () => { + const project = new Project(); + project.name = "Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + // flexibleRange is optional + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should convert DateTimeRange to nested object with ISO strings", () => { + const project = new Project(); + project.name = "Range JSON Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15T10:00:00.000Z'); + activeRange.to = new Date('2024-09-15T10:00:00.000Z'); + project.activeRange = activeRange; + + const json = project.toJSON(); + + expect(json.activeRange).toEqual({ + from: '2024-06-15T10:00:00.000Z', + to: '2024-09-15T10:00:00.000Z' + }); + }); + + it("should convert nested object back to DateTimeRange from JSON", () => { + const jsonData = { + name: "Range JSON Test", + startDate: '2024-06-15T10:00:00.000Z', + activeRange: { + from: '2024-06-15T10:00:00.000Z', + to: '2024-09-15T10:00:00.000Z' + } + }; + + const project = Project.fromJSON(jsonData); + + expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(project.activeRange.from).toBeInstanceOf(Date); + expect(project.activeRange.to).toBeInstanceOf(Date); + expect(project.activeRange.from?.toISOString()).toBe('2024-06-15T10:00:00.000Z'); + expect(project.activeRange.to?.toISOString()).toBe('2024-09-15T10:00:00.000Z'); + }); + + it("should handle partial DateTimeRange in JSON", () => { + const project = new Project(); + project.name = "Partial Range Test"; + project.startDate = new Date('2024-06-15'); + + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-06-15'); + activeRange.to = new Date('2024-09-15'); + project.activeRange = activeRange; + + const flexibleRange = new DateTimeRangeType(); + flexibleRange.from = new Date('2024-01-01'); + // to is undefined + project.flexibleRange = flexibleRange; + + const json = project.toJSON(); + + // The flexibleRange should have a from property and may or may not have a to property + expect(json.flexibleRange).toHaveProperty("from"); + expect(typeof json.flexibleRange.from).toBe("string"); + + // If to is included, it should be undefined/null, but the property may still exist + if (Object.hasOwnProperty.call(json.flexibleRange, "to")) { + expect(json.flexibleRange.to).toBeUndefined(); + } + }); + }); +}); diff --git a/test/Email.test.ts b/test/Email.test.ts new file mode 100644 index 0000000..711a7b0 --- /dev/null +++ b/test/Email.test.ts @@ -0,0 +1,119 @@ +import { Person } from "./model/Person"; + +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("Email Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid email format", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation with invalid email format", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example"; // Invalid email + person.age = 30; + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "email", codes: ["isEmail"], messages: ["email must be an email"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + }); + + describe("required-tests", () => { + it("should pass validation when optional email is missing", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.age = 30; + // Missing optional email + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should require parentEmail when age is under 18", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 17; // Under 18 + // Missing parentEmail + + const errors = await person.validate(); + expect(errors.length).toBeGreaterThan(0); + }); + + it("should not require parentEmail when age is 18 or over", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 18; // 18 or over + // Missing parentEmail + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should include email fields in JSON output", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const json = person.toJSON(); + expect(json.email).toBe("john.doe@example.com"); + }); + + it("should include parent email when set", () => { + const person = new Person(); + person.firstName = "Young"; + person.lastName = "Person"; + person.age = 16; + person.parentEmail = "parent@example.com"; + + const json = person.toJSON(); + expect(json.parentEmail).toBe("parent@example.com"); + }); + + it("should handle undefined email values", () => { + const person = new Person(); + person.firstName = "Jane"; + person.lastName = "Smith"; + person.age = 25; + // email not set + + const json = person.toJSON(); + expect(json).not.toHaveProperty("email"); + }); + }); +}); diff --git a/test/Field.test.ts b/test/Field.test.ts deleted file mode 100644 index 70bc365..0000000 --- a/test/Field.test.ts +++ /dev/null @@ -1,384 +0,0 @@ -import { App } from "./model/App"; -import { Person } from "./model/Person"; -import { Product } from "./model/Product"; - -import type { ValidationError } from "class-validator"; - - -/** - * Converts an array of class-validator ValidationError objects into a stable, plain summary. - * - * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. - * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. - */ -function summarizeErrors(errors: ValidationError[]) { - return errors.map((e) => ({ - field: e.property, - codes: e.constraints ? Object.keys(e.constraints) : [], - messages: e.constraints ? Object.values(e.constraints) : [], - })); -} - -describe("Person Model Validation", () => { - it("should pass validation for a valid person", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 30; - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should fail validation when required fields are missing", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - // Missing lastName, and email - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { - field: "lastName", - codes: ["minLength", "maxLength", "matches", "isNotEmpty"], - messages: [ - "lastName must be longer than or equal to 2 characters", - "lastName must be shorter than or equal to 30 characters", - "lastName must contain only letters", - "lastName should not be empty" - ], - }, - { - field: "age", - codes: ["isNotEmpty"], - messages: ["age should not be empty"], - }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should not fail validation when mail is missing", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.age = 30; - // Missing email - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should fail validation for invalid age", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 130; // Invalid age - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { - field: "age", - codes: ["invalidAge"], - messages: ["Age must be between 0 and 120"], - }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should pass validation without parent email", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 18; // Valid age - // Missing parent email - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should fail validation without parent email", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 17; // Invalid age - // Missing parent email - - const errors = await invalidUser.validate(); - expect(errors.length).toBeGreaterThan(0); - }); - - it("should pass validation with Boolean field set to true", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 30; - validUser.isActive = true; - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation with Boolean field set to false", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 30; - validUser.isActive = false; - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation with Boolean field undefined (optional)", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 30; - // isActive is undefined (optional field) - - const errors = await validUser.validate(); - expect(errors).toStrictEqual([]); - }); -}); - -describe("Product Model Validation", () => { - it("should not calculate total if calculation is not called", async () => { - const product = new Product(); - product.name = "Test Product"; - product.price = 100; - product.quantity = 2; - - const total = product.total; - expect(total).toBe(undefined); - }); - - it("should calculate total when calculation is called", async () => { - const product = new Product(); - product.name = "Test Product"; - product.price = 100; - product.quantity = 2; - - product.calculate(); - const total = product.total; - expect(total).toBe(200); - }); - - it("should output double the price when requested", async () => { - const product = new Product(); - product.name = "Test Product"; - product.price = 100; - product.quantity = 2; - - const doublePrice = product.doublePrice; - expect(doublePrice).toBe(200); - }); - - it("should output the stringified double when requested", async () => { - const product = new Product(); - product.name = "Test Product"; - product.price = 100; - product.quantity = 2; - - const stringifyDoublePrice = product.stringifyDoublePrice; - expect(stringifyDoublePrice).toBe(JSON.stringify({ double: 200 })); - }); - it("should fail validation with incorrect email format", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "email", codes: ["isEmail"], messages: ["email must be an email"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with too short first name", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "J"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "firstName", codes: ["minLength"], messages: ["firstName must be longer than or equal to 2 characters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with too short last name", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "D"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "lastName", codes: ["minLength"], messages: ["lastName must be longer than or equal to 2 characters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with too long first name", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "A".repeat(31); // Too long - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "firstName", codes: ["maxLength"], messages: ["firstName must be shorter than or equal to 30 characters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with too long last name", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "D".repeat(31); // Too long - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "lastName", codes: ["maxLength"], messages: ["lastName must be shorter than or equal to 30 characters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with invalid first name characters", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John123"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "firstName", codes: ["matches"], messages: ["firstName must contain only letters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should fail validation with invalid last name characters", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe123"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "lastName", codes: ["matches"], messages: ["lastName must contain only letters"] }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should pass with valid HTML", async () => { - const validUser = new Person(); - validUser.firstName = "John"; - validUser.lastName = "Doe"; - validUser.email = "john.doe@example.com"; - validUser.age = 30; - validUser.additionalInfo = "

This is a valid HTML string.

"; - - const errors = await validUser.validate(); - const summary = summarizeErrors(errors); - expect(summary).toStrictEqual([]); - }); -}); - -describe("App Model Validation", () => { - it("should return isNotEmpty and other errors for missing name", async () => { - const invalidApp = new App(); - invalidApp.version = "01.00.00"; - invalidApp.description = "A sample application"; - invalidApp.author = "JohnDoe"; - - const errors = await invalidApp.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { - field: "name", - codes: ["minLength", "maxLength", "matches", "isNotEmpty"], - messages: [ - "name must be longer than or equal to 4 characters", - "name must be shorter than or equal to 20 characters", - "Name must contain only letters and dots (no underscores, no consecutive dots, no dot at start/end)", - "name should not be empty" - ] - }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should return errors for invalid version length and format", async () => { - const invalidApp = new App(); - invalidApp.name = "MyApp"; - invalidApp.version = "1.0"; // Invalid format - invalidApp.description = "A sample application"; - invalidApp.author = "JohnDoe"; - - const errors = await invalidApp.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "version", codes: ["minLength", "matches"], messages: [ - "version must be longer than or equal to 5 characters", - "Version must be in the format AA.BB.CC, where AA, BB, and CC are two-digit numbers" - ] - }, - ]; - expect(summary).toStrictEqual(expected); - }); - - it("should not return error for non-required but empty fields", async () => { - const validApp = new App(); - validApp.name = "MyApp"; - validApp.version = "01.00.00"; - validApp.description = "A sample application"; - // validApp.author = undefined; - - const errors = await validApp.validate(); - const summary = summarizeErrors(errors); - expect(summary).toStrictEqual([]); - }); - - it("should return errors for invalid author name", async () => { - const invalidApp = new App(); - invalidApp.name = "MyApp"; - invalidApp.version = "01.00.00"; - invalidApp.description = "A sample application"; - invalidApp.author = "JohnDoe123"; // Invalid author name - - const errors = await invalidApp.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "author", codes: ["matches"], messages: [ - "Author must contain only letters, numbers, dots, underscores, and hyphens" - ] - }, - ]; - expect(summary).toStrictEqual(expected); - }); -}); \ No newline at end of file diff --git a/test/HTML.test.ts b/test/HTML.test.ts new file mode 100644 index 0000000..c934cb8 --- /dev/null +++ b/test/HTML.test.ts @@ -0,0 +1,69 @@ +import { Person } from "./model/Person"; + +describe("HTML Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid HTML content", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.additionalInfo = "

This is a valid HTML string.

"; + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should pass validation with undefined HTML content", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + // additionalInfo is undefined + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("required-tests", () => { + it("should pass validation when optional HTML field is missing", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + // additionalInfo is optional + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should include HTML field in JSON output when set", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + person.additionalInfo = "

HTML content

"; + + const json = person.toJSON(); + expect(json.additionalInfo).toBe("

HTML content

"); + }); + + it("should handle undefined HTML values in JSON", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + // additionalInfo not set + + const json = person.toJSON(); + expect(json).not.toHaveProperty("additionalInfo"); + }); + }); +}); diff --git a/test/JsonConversion.test.ts b/test/JsonConversion.test.ts deleted file mode 100644 index d1f6ea1..0000000 --- a/test/JsonConversion.test.ts +++ /dev/null @@ -1,551 +0,0 @@ -import { Person } from "./model/Person"; - -describe("BaseModel JSON Conversion", () => { - describe("toJSON", () => { - it("should convert a model instance to JSON", () => { - const person = new Person(); - person.firstName = "John"; - person.lastName = "Doe"; - person.email = "john.doe@example.com"; - person.age = 30; - person.internalId = "secret-123"; - - const json = person.toJSON(); - - expect(json).toEqual({ - firstName: "John", - lastName: "Doe", - email: "john.doe@example.com", - age: 30, - // internalId should be excluded because available: false - }); - - // Verify that internalId is not in the JSON - expect(json).not.toHaveProperty("internalId"); - }); - - it("should exclude phoneNumber when age is under 18", () => { - const person = new Person(); - person.firstName = "Young"; - person.lastName = "Person"; - person.age = 16; - person.phoneNumber = "123-456-7890"; - - const json = person.toJSON(); - - expect(json).toEqual({ - firstName: "Young", - lastName: "Person", - age: 16, - // phoneNumber should be excluded because available: (person: Person) => person.age >= 18 - }); - - // Verify that phoneNumber is not in the JSON - expect(json).not.toHaveProperty("phoneNumber"); - }); - - it("should include phoneNumber when age is 18 or older", () => { - const person = new Person(); - person.firstName = "Adult"; - person.lastName = "Person"; - person.age = 18; - person.phoneNumber = "123-456-7890"; - - const json = person.toJSON(); - - expect(json).toEqual({ - firstName: "Adult", - lastName: "Person", - age: 18, - phoneNumber: "123-456-7890", - }); - }); - - it("should handle undefined and null values", () => { - const person = new Person(); - person.firstName = "Jane"; - person.lastName = "Smith"; - person.age = 25; - // email and parentEmail are not set - - const json = person.toJSON(); - - expect(json).toEqual({ - firstName: "Jane", - lastName: "Smith", - age: 25, - }); - }); - - it("should include parent email when set", () => { - const person = new Person(); - person.firstName = "Young"; - person.lastName = "Person"; - person.age = 16; - person.parentEmail = "parent@example.com"; - - const json = person.toJSON(); - - expect(json).toEqual({ - firstName: "Young", - lastName: "Person", - age: 16, - parentEmail: "parent@example.com", - }); - }); - }); - - describe("fromJSON", () => { - it("should create a model instance from JSON", () => { - const jsonData = { - firstName: "Alice", - lastName: "Johnson", - email: "alice@example.com", - age: 28, - }; - - const person = Person.fromJSON(jsonData); - - expect(person).toBeInstanceOf(Person); - expect(person.firstName).toBe("Alice"); - expect(person.lastName).toBe("Johnson"); - expect(person.email).toBe("alice@example.com"); - expect(person.age).toBe(28); - }); - - it("should enable type coercion for compatible values", () => { - const jsonData = { - firstName: "Bob", - lastName: "Wilson", - email: "bob@example.com", - age: "35", // String that should be converted to number - }; - - const person = Person.fromJSON(jsonData); - - expect(person).toBeInstanceOf(Person); - expect(person.firstName).toBe("Bob"); - expect(person.lastName).toBe("Wilson"); - expect(person.email).toBe("bob@example.com"); - expect(person.age).toBe(35); // Should be converted to number - expect(typeof person.age).toBe("number"); - }); - - it("should ignore fields marked as unavailable", () => { - const jsonData = { - firstName: "Charlie", - lastName: "Brown", - email: "charlie@example.com", - age: 22, - internalId: "should-be-ignored", // This should be ignored - }; - - const person = Person.fromJSON(jsonData); - - expect(person).toBeInstanceOf(Person); - expect(person.firstName).toBe("Charlie"); - expect(person.lastName).toBe("Brown"); - expect(person.email).toBe("charlie@example.com"); - expect(person.age).toBe(22); - - // internalId should not be set from JSON - expect(person.internalId).toBeUndefined(); - }); - - it("should handle missing optional fields", () => { - const jsonData = { - firstName: "David", - lastName: "Miller", - age: 40, - // email and parentEmail are missing - }; - - const person = Person.fromJSON(jsonData); - - expect(person).toBeInstanceOf(Person); - expect(person.firstName).toBe("David"); - expect(person.lastName).toBe("Miller"); - expect(person.age).toBe(40); - expect(person.email).toBeUndefined(); - expect(person.parentEmail).toBeUndefined(); - }); - - it("should handle extra fields not defined in the model", () => { - const jsonData = { - firstName: "Eve", - lastName: "Davis", - age: 33, - extraField: "should-be-ignored", - anotherExtra: 123, - }; - - const person = Person.fromJSON(jsonData); - - expect(person).toBeInstanceOf(Person); - expect(person.firstName).toBe("Eve"); - expect(person.lastName).toBe("Davis"); - expect(person.age).toBe(33); - - // Extra fields should be ignored - expect((person as any).extraField).toBeUndefined(); - expect((person as any).anotherExtra).toBeUndefined(); - }); - }); - - describe("round-trip conversion", () => { - it("should maintain data integrity through toJSON and fromJSON", () => { - // Create original instance - const original = new Person(); - original.firstName = "Test"; - original.lastName = "User"; - original.email = "test@example.com"; - original.age = 29; - original.parentEmail = "parent@example.com"; - original.internalId = "internal-secret"; - - // Convert to JSON - const json = original.toJSON(); - - // Convert back to instance - const restored = Person.fromJSON(json); - - // Check that all available fields are preserved - expect(restored.firstName).toBe(original.firstName); - expect(restored.lastName).toBe(original.lastName); - expect(restored.email).toBe(original.email); - expect(restored.age).toBe(original.age); - expect(restored.parentEmail).toBe(original.parentEmail); - - // Check that unavailable fields are not restored - expect(restored.internalId).toBeUndefined(); - - // Verify it's a proper instance - expect(restored).toBeInstanceOf(Person); - }); - }); - - describe("validation after JSON conversion", () => { - it("should validate correctly after fromJSON", async () => { - const jsonData = { - firstName: "Valid", - lastName: "Person", - email: "valid@example.com", - age: 25, - }; - - const person = Person.fromJSON(jsonData); - const errors = await person.validate(); - - expect(errors).toStrictEqual([]); - }); - - it("should fail validation if required fields are missing after fromJSON", async () => { - const jsonData = { - firstName: "Incomplete", - // lastName is missing - email: "incomplete@example.com", - age: 25, - }; - - const person = Person.fromJSON(jsonData); - const errors = await person.validate(); - - expect(errors.length).toBeGreaterThan(0); - expect(errors.some(e => e.property === "lastName")).toBe(true); - }); - - it("should fail validation with invalid data after fromJSON", async () => { - const jsonData = { - firstName: "Invalid", - lastName: "Person", - email: "invalid@example.com", - age: 150, // Invalid age - }; - - const person = Person.fromJSON(jsonData); - const errors = await person.validate(); - - expect(errors.length).toBeGreaterThan(0); - expect(errors.some(e => e.property === "age")).toBe(true); - }); - - }); - - describe("@Exclude and @Expose behavior", () => { - it("should exclude fields marked with available: false (@Exclude applied)", () => { - const person = new Person(); - person.firstName = "John"; - person.lastName = "Doe"; - person.email = "john@example.com"; - person.age = 30; - person.internalId = "secret-internal-123"; - - const json = person.toJSON(); - - // Should include exposed fields - expect(json).toHaveProperty("firstName", "John"); - expect(json).toHaveProperty("lastName", "Doe"); - expect(json).toHaveProperty("email", "john@example.com"); - expect(json).toHaveProperty("age", 30); - - // Should exclude field marked with available: false - expect(json).not.toHaveProperty("internalId"); - expect(Object.keys(json)).not.toContain("internalId"); - }); - - it("should expose fields marked with available: true (@Expose applied)", () => { - const person = new Person(); - person.firstName = "Jane"; - person.lastName = "Smith"; - person.email = "jane@example.com"; - person.age = 25; - - const json = person.toJSON(); - - // All these fields should be exposed (available: true or default) - expect(json).toHaveProperty("firstName", "Jane"); - expect(json).toHaveProperty("lastName", "Smith"); - expect(json).toHaveProperty("email", "jane@example.com"); - expect(json).toHaveProperty("age", 25); - }); - - it("should conditionally expose fields based on function (@Transform + @Expose applied)", () => { - // Test case 1: Adult should have phoneNumber exposed - const adult = new Person(); - adult.firstName = "Adult"; - adult.lastName = "Person"; - adult.email = "adult@example.com"; - adult.age = 25; // >= 18 - adult.phoneNumber = "555-1234"; - - const adultJson = adult.toJSON(); - expect(adultJson).toHaveProperty("phoneNumber", "555-1234"); - - // Test case 2: Minor should NOT have phoneNumber exposed - const minor = new Person(); - minor.firstName = "Young"; - minor.lastName = "Person"; - minor.email = "young@example.com"; - minor.age = 16; // < 18 - minor.phoneNumber = "555-5678"; - - const minorJson = minor.toJSON(); - expect(minorJson).not.toHaveProperty("phoneNumber"); - expect(Object.keys(minorJson)).not.toContain("phoneNumber"); - }); - - it("should handle multiple conditional fields correctly", () => { - // Test with adult (phoneNumber should be available) - const adult = new Person(); - adult.firstName = "Test"; - adult.lastName = "Adult"; - adult.age = 20; - adult.phoneNumber = "555-0000"; - adult.internalId = "should-never-appear"; - - const adultJson = adult.toJSON(); - - expect(adultJson).toEqual({ - firstName: "Test", - lastName: "Adult", - age: 20, - phoneNumber: "555-0000" - }); - - // Test with minor (phoneNumber should NOT be available) - const minor = new Person(); - minor.firstName = "Test"; - minor.lastName = "Minor"; - minor.age = 15; - minor.phoneNumber = "555-1111"; - minor.internalId = "should-never-appear"; - - const minorJson = minor.toJSON(); - - expect(minorJson).toEqual({ - firstName: "Test", - lastName: "Minor", - age: 15 - }); - }); - - it("should handle edge cases in conditional availability", () => { - // Test exactly at the boundary (age = 18) - const eighteenYearOld = new Person(); - eighteenYearOld.firstName = "Boundary"; - eighteenYearOld.lastName = "Case"; - eighteenYearOld.age = 18; // exactly 18 - eighteenYearOld.phoneNumber = "555-1818"; - - const json = eighteenYearOld.toJSON(); - - // phoneNumber should be available since age >= 18 - expect(json).toHaveProperty("phoneNumber", "555-1818"); - }); - - it("should handle undefined values in conditionally available fields", () => { - const person = new Person(); - person.firstName = "Test"; - person.lastName = "Person"; - person.age = 25; - // phoneNumber is undefined but person is adult - - const json = person.toJSON(); - - // phoneNumber should NOT be in the JSON if it's undefined, - // even though the condition allows it (this is the expected behavior) - expect(json).not.toHaveProperty("phoneNumber"); - expect(json).toEqual({ - firstName: "Test", - lastName: "Person", - age: 25 - }); - }); - }); - - describe("fromJSON with @Exclude and @Expose behavior", () => { - it("should ignore excluded fields in fromJSON input", () => { - const jsonData = { - firstName: "Test", - lastName: "User", - age: 30, - internalId: "this-should-be-ignored", // Field marked with available: false - email: "test@example.com" - }; - - const person = Person.fromJSON(jsonData); - - expect(person.firstName).toBe("Test"); - expect(person.lastName).toBe("User"); - expect(person.age).toBe(30); - expect(person.email).toBe("test@example.com"); - - // internalId should be ignored during deserialization - expect(person.internalId).toBeUndefined(); - }); - - it("should properly handle conditional fields in fromJSON", () => { - const jsonData = { - firstName: "Test", - lastName: "User", - age: 25, - phoneNumber: "555-9999", - email: "test@example.com" - }; - - const person = Person.fromJSON(jsonData); - - expect(person.firstName).toBe("Test"); - expect(person.lastName).toBe("User"); - expect(person.age).toBe(25); - expect(person.email).toBe("test@example.com"); - - // phoneNumber should be set since it's provided in JSON - expect(person.phoneNumber).toBe("555-9999"); - }); - }); - - describe("metadata and decorator application", () => { - it("should store availability function in metadata for conditional fields", () => { - const person = new Person(); - - // Check that the availability function metadata is stored - const availabilityFn = Reflect.getMetadata('field:available', person, 'phoneNumber'); - expect(typeof availabilityFn).toBe('function'); - - // Test the function with different ages - const youngPerson = { age: 16 } as Person; - const adultPerson = { age: 25 } as Person; - - expect(availabilityFn(youngPerson)).toBe(false); - expect(availabilityFn(adultPerson)).toBe(true); - }); - - it("should verify that @Exclude is applied to fields with available: false", () => { - const person = new Person(); - person.internalId = "test-id"; - - // The field should be excluded from JSON serialization - const json = person.toJSON(); - expect(json).not.toHaveProperty("internalId"); - - // But the field should still exist on the instance - expect(person.internalId).toBe("test-id"); - }); - - it("should verify that @Expose is applied by default and to available: true fields", () => { - const person = new Person(); - person.firstName = "Test"; - person.lastName = "User"; - person.email = "test@example.com"; - person.age = 30; - - const json = person.toJSON(); - - // All these fields should be exposed - expect(json).toHaveProperty("firstName", "Test"); - expect(json).toHaveProperty("lastName", "User"); - expect(json).toHaveProperty("email", "test@example.com"); - expect(json).toHaveProperty("age", 30); - }); - }); - -}); - -describe("Boolean Type JSON Conversion", () => { - it("should include Boolean field in JSON output when set to true", () => { - const person = new Person(); - person.firstName = "John"; - person.lastName = "Doe"; - person.email = "john.doe@example.com"; - person.age = 30; - person.isActive = true; - - const json = person.toJSON(); - expect(json.isActive).toBe(true); - }); - - it("should include Boolean field in JSON output when set to false", () => { - const person = new Person(); - person.firstName = "John"; - person.lastName = "Doe"; - person.email = "john.doe@example.com"; - person.age = 30; - person.isActive = false; - - const json = person.toJSON(); - expect(json.isActive).toBe(false); - }); - - it("should create model instance from JSON with Boolean field", () => { - const jsonData = { - firstName: "Jane", - lastName: "Smith", - email: "jane.smith@example.com", - age: 25, - isActive: true - }; - - const person = Person.fromJSON(jsonData); - expect(person.isActive).toBe(true); - }); - - it("should handle Boolean field coercion from string", () => { - const jsonData = { - firstName: "Jane", - lastName: "Smith", - email: "jane.smith@example.com", - age: 25, - isActive: "true" // String that should be coerced to boolean - }; - - const person = Person.fromJSON(jsonData); - expect(person.isActive).toBe(true); - }); - - it("should store correct metadata for Boolean field", () => { - const person = new Person(); - const fieldType = Reflect.getMetadata('field:type', person, 'isActive'); - expect(fieldType).toBe('boolean'); - }); -}); diff --git a/test/Number.test.ts b/test/Number.test.ts new file mode 100644 index 0000000..d25f268 --- /dev/null +++ b/test/Number.test.ts @@ -0,0 +1,197 @@ +import { Person } from "./model/Person"; +import { Product } from "./model/Product"; + +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("Number Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid number values", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; // Valid number + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation with custom number validation", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 130; // Invalid age (over 120) + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "age", + codes: ["invalidAge"], + messages: ["Age must be between 0 and 120"], + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with negative age", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = -5; // Invalid negative age + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + + // Find the age-specific error + const ageError = summary.find(error => error.field === "age"); + expect(ageError).toBeDefined(); + expect(ageError?.codes).toContain("invalidAge"); + expect(ageError?.messages).toContain("Age must be between 0 and 120"); + }); + }); + + describe("required-tests", () => { + it("should fail validation when required number field is missing", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + // Missing age (required) + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "age", + codes: ["isNotEmpty"], + messages: ["age should not be empty"], + }, + ]; + expect(summary).toStrictEqual(expected); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should include number fields in JSON output", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const json = person.toJSON(); + expect(json.age).toBe(30); + expect(typeof json.age).toBe("number"); + }); + + it("should handle number type coercion from string in fromJSON", () => { + const jsonData = { + firstName: "Bob", + lastName: "Wilson", + email: "bob@example.com", + age: "35", // String that should be converted to number + }; + + const person = Person.fromJSON(jsonData); + expect(person.age).toBe(35); + expect(typeof person.age).toBe("number"); + }); + + it("should maintain number data integrity through round-trip conversion", () => { + const original = new Product(); + original.name = "Test Product"; + original.description = "Test Description"; + original.price = 100.50; + original.quantity = 3; + + const json = original.toJSON(); + const restored = Product.fromJSON(json); + + expect(restored.price).toBe(original.price); + expect(restored.quantity).toBe(original.quantity); + expect(typeof restored.price).toBe("number"); + expect(typeof restored.quantity).toBe("number"); + }); + }); + + describe("calculation-tests", () => { + it("should not calculate total if calculation is not called", () => { + const product = new Product(); + product.name = "Test Product"; + product.description = "Test Description"; + product.price = 100; + product.quantity = 2; + + const total = product.total; + expect(total).toBe(undefined); + }); + + it("should calculate total when calculation is called", () => { + const product = new Product(); + product.name = "Test Product"; + product.description = "Test Description"; + product.price = 100; + product.quantity = 2; + + product.calculate(); + const total = product.total; + expect(total).toBe(200); + }); + + it("should calculate double price correctly", () => { + const product = new Product(); + product.name = "Test Product"; + product.description = "Test Description"; + product.price = 100; + product.quantity = 2; + + const doublePrice = product.doublePrice; + expect(doublePrice).toBe(200); + }); + + it("should stringify double price correctly", () => { + const product = new Product(); + product.name = "Test Product"; + product.description = "Test Description"; + product.price = 100; + product.quantity = 2; + + const stringifyDoublePrice = product.stringifyDoublePrice; + expect(stringifyDoublePrice).toBe(JSON.stringify({ double: 200 })); + }); + + it("should handle calculated fields in JSON conversion", () => { + const product = new Product(); + product.name = "Test Product"; + product.description = "Test Description"; + product.price = 100; + product.quantity = 2; + + // Calculate the total + product.calculate(); + + const json = product.toJSON(); + + // Should include calculated field + expect(json.total).toBe(200); + expect(json.doublePrice).toBe(200); + expect(json.stringifyDoublePrice).toBe(JSON.stringify({ double: 200 })); + }); + }); +}); diff --git a/test/Project.test.ts b/test/Project.test.ts deleted file mode 100644 index 328b5da..0000000 --- a/test/Project.test.ts +++ /dev/null @@ -1,601 +0,0 @@ -import type { ValidationError } from "class-validator"; -import { Project } from "./model/Project"; -import { DateTimeRangeType } from "../src/model/types"; - -/** - * Converts an array of class-validator ValidationError objects into a stable, plain summary. - * - * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. - * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. - */ -function summarizeErrors(errors: ValidationError[]) { - return errors.map((e) => ({ - field: e.property, - codes: e.constraints ? Object.keys(e.constraints) : [], - messages: e.constraints ? Object.values(e.constraints) : [], - })); -} - -describe("Project Model DateTime Validation", () => { - - describe("Valid Project Creation", () => { - it("should pass validation for a valid project with all required fields", async () => { - const validProject = new Project(); - validProject.name = "Test Project"; - validProject.startDate = new Date('2024-06-15'); - validProject.endDate = new Date('2024-12-31'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - flexibleRange.from = new Date('2024-01-01'); - flexibleRange.to = new Date('2024-12-31'); - validProject.flexibleRange = flexibleRange; - - validProject.description = "A test project"; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation with minimum required fields only", async () => { - const validProject = new Project(); - validProject.name = "Minimal Project"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - }); - - describe("Required Field Validation", () => { - it("should fail validation when required fields are missing", async () => { - const invalidProject = new Project(); - // Missing name, startDate, and activeRange - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - expect(summary.some(error => error.field === "name")).toBe(true); - expect(summary.some(error => error.field === "startDate")).toBe(true); - expect(summary.some(error => error.field === "activeRange")).toBe(true); - }); - - it("should pass validation when optional fields are missing", async () => { - const validProject = new Project(); - validProject.name = "Optional Fields Test"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - // endDate, flexibleRange, and description are optional - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - }); - - describe("DateTime Min/Max Validation", () => { - it("should fail validation when startDate is before minimum allowed date", async () => { - const invalidProject = new Project(); - invalidProject.name = "Date Test"; - invalidProject.startDate = new Date('2019-12-31'); // Before 2020-01-01 minimum - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const startDateError = summary.find(error => error.field === "startDate"); - expect(startDateError).toBeDefined(); - expect(startDateError?.codes).toContain("isDateWithRange"); - }); - - it("should fail validation when startDate is after maximum allowed date", async () => { - const invalidProject = new Project(); - invalidProject.name = "Date Test"; - invalidProject.startDate = new Date('2031-01-01'); // After 2030-12-31 maximum - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const startDateError = summary.find(error => error.field === "startDate"); - expect(startDateError).toBeDefined(); - expect(startDateError?.codes).toContain("isDateWithRange"); - }); - - it("should pass validation with startDate within allowed range", async () => { - const validProject = new Project(); - validProject.name = "Date Test"; - validProject.startDate = new Date('2024-06-15'); // Within 2020-2030 range - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation for endDate without min/max constraints", async () => { - const validProject = new Project(); - validProject.name = "End Date Test"; - validProject.startDate = new Date('2024-06-15'); - validProject.endDate = new Date('1990-01-01'); // No constraints on endDate - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - }); - - describe("DateTimeRange Validation", () => { - it("should fail validation when activeRange is missing both from and to dates", async () => { - const invalidProject = new Project(); - invalidProject.name = "Range Test"; - invalidProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - // Both from and to are undefined, but openStart and openEnd are false - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const rangeError = summary.find(error => error.field === "activeRange"); - expect(rangeError).toBeDefined(); - expect(rangeError?.codes).toContain("isValidDateTimeRange"); - }); - - it("should fail validation when activeRange has from date after to date", async () => { - const invalidProject = new Project(); - invalidProject.name = "Range Test"; - invalidProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-09-15'); // After 'to' date - activeRange.to = new Date('2024-06-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const rangeError = summary.find(error => error.field === "activeRange"); - expect(rangeError).toBeDefined(); - expect(rangeError?.codes).toContain("isValidDateTimeRange"); - }); - - it("should pass validation for activeRange with valid from and to dates", async () => { - const validProject = new Project(); - validProject.name = "Range Test"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation for flexibleRange with only from date (openEnd=true)", async () => { - const validProject = new Project(); - validProject.name = "Flexible Range Test"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - flexibleRange.from = new Date('2024-01-01'); - // to is undefined, but openEnd is true - validProject.flexibleRange = flexibleRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation for flexibleRange with only to date (openStart=true)", async () => { - const validProject = new Project(); - validProject.name = "Flexible Range Test"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - // from is undefined, but openStart is true - flexibleRange.to = new Date('2024-12-31'); - validProject.flexibleRange = flexibleRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should pass validation for flexibleRange with neither date (both open)", async () => { - const validProject = new Project(); - validProject.name = "Flexible Range Test"; - validProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - validProject.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - // Both from and to are undefined, but both openStart and openEnd are true - validProject.flexibleRange = flexibleRange; - - const errors = await validProject.validate(); - expect(errors).toStrictEqual([]); - }); - }); - - describe("Invalid Date Validation", () => { - it("should fail validation with invalid date string", async () => { - const invalidProject = new Project(); - invalidProject.name = "Invalid Date Test"; - invalidProject.startDate = new Date('invalid-date'); // Invalid date - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const startDateError = summary.find(error => error.field === "startDate"); - expect(startDateError).toBeDefined(); - expect(startDateError?.codes).toContain("isDateWithRange"); - }); - }); - - describe("Text Field Validation", () => { - it("should fail validation when name is too short", async () => { - const invalidProject = new Project(); - invalidProject.name = "A"; // Too short (minLength is 2) - invalidProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const nameError = summary.find(error => error.field === "name"); - expect(nameError).toBeDefined(); - expect(nameError?.codes).toContain("minLength"); - }); - - it("should fail validation when name is too long", async () => { - const invalidProject = new Project(); - invalidProject.name = "A".repeat(101); // Too long (maxLength is 100) - invalidProject.startDate = new Date('2024-06-15'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const nameError = summary.find(error => error.field === "name"); - expect(nameError).toBeDefined(); - expect(nameError?.codes).toContain("maxLength"); - }); - - it("should fail validation when description is too long", async () => { - const invalidProject = new Project(); - invalidProject.name = "Description Test"; - invalidProject.startDate = new Date('2024-06-15'); - invalidProject.description = "A".repeat(501); // Too long (maxLength is 500) - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15'); - activeRange.to = new Date('2024-09-15'); - invalidProject.activeRange = activeRange; - - const errors = await invalidProject.validate(); - const summary = summarizeErrors(errors); - - const descError = summary.find(error => error.field === "description"); - expect(descError).toBeDefined(); - expect(descError?.codes).toContain("maxLength"); - }); - }); - - describe("JSON Conversion", () => { - describe("toJSON", () => { - it("should convert DateTime fields to ISO 8601 strings", async () => { - const project = new Project(); - project.name = "JSON Test Project"; - project.startDate = new Date('2024-06-15T10:30:45.123Z'); - project.endDate = new Date('2024-12-31T23:59:59.999Z'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15T08:00:00.000Z'); - activeRange.to = new Date('2024-09-15T17:00:00.000Z'); - project.activeRange = activeRange; - - const json = project.toJSON(); - - expect(json.name).toBe("JSON Test Project"); - expect(json.startDate).toBe("2024-06-15T10:30:45.123Z"); - expect(json.endDate).toBe("2024-12-31T23:59:59.999Z"); - expect(json.activeRange).toEqual({ - from: "2024-06-15T08:00:00.000Z", - to: "2024-09-15T17:00:00.000Z" - }); - }); - - it("should handle undefined optional fields in JSON output", async () => { - const project = new Project(); - project.name = "Minimal JSON Project"; - project.startDate = new Date('2024-06-15T10:30:45.123Z'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15T08:00:00.000Z'); - activeRange.to = new Date('2024-09-15T17:00:00.000Z'); - project.activeRange = activeRange; - - const json = project.toJSON(); - - expect(json.name).toBe("Minimal JSON Project"); - expect(json.startDate).toBe("2024-06-15T10:30:45.123Z"); - expect(json.endDate).toBeUndefined(); - expect(json.flexibleRange).toBeUndefined(); - expect(json.activeRange).toEqual({ - from: "2024-06-15T08:00:00.000Z", - to: "2024-09-15T17:00:00.000Z" - }); - }); - - it("should handle DateTimeRange with partial dates", async () => { - const project = new Project(); - project.name = "Partial Range Project"; - project.startDate = new Date('2024-06-15T10:30:45.123Z'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15T08:00:00.000Z'); - activeRange.to = new Date('2024-09-15T17:00:00.000Z'); - project.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); - // to is undefined (open end) - project.flexibleRange = flexibleRange; - - const json = project.toJSON(); - - expect(json.flexibleRange).toEqual({ - from: "2024-01-01T00:00:00.000Z", - to: undefined - }); - }); - }); - - describe("fromJSON", () => { - it("should convert ISO 8601 strings back to Date objects", async () => { - const jsonData = { - name: "Restored Project", - startDate: "2024-06-15T10:30:45.123Z", - endDate: "2024-12-31T23:59:59.999Z", - activeRange: { - from: "2024-06-15T08:00:00.000Z", - to: "2024-09-15T17:00:00.000Z" - }, - flexibleRange: { - from: "2024-01-01T00:00:00.000Z", - to: "2024-12-31T23:59:59.999Z" - } - }; - - const project = Project.fromJSON(jsonData); - - expect(project.name).toBe("Restored Project"); - expect(project.startDate).toBeInstanceOf(Date); - expect(project.startDate.toISOString()).toBe("2024-06-15T10:30:45.123Z"); - expect(project.endDate).toBeInstanceOf(Date); - expect(project.endDate!.toISOString()).toBe("2024-12-31T23:59:59.999Z"); - - expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); - expect(project.activeRange.from).toBeInstanceOf(Date); - expect(project.activeRange.from!.toISOString()).toBe("2024-06-15T08:00:00.000Z"); - expect(project.activeRange.to).toBeInstanceOf(Date); - expect(project.activeRange.to!.toISOString()).toBe("2024-09-15T17:00:00.000Z"); - - expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeType); - expect(project.flexibleRange!.from).toBeInstanceOf(Date); - expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); - expect(project.flexibleRange!.to).toBeInstanceOf(Date); - expect(project.flexibleRange!.to!.toISOString()).toBe("2024-12-31T23:59:59.999Z"); - }); - - it("should support milliseconds for backwards compatibility", async () => { - const jsonData = { - name: "Legacy Project", - startDate: 1718448645123, // milliseconds - endDate: 1735689599999, // milliseconds - activeRange: { - from: 1718434800000, // milliseconds - to: 1726423200000 // milliseconds - } - }; - - const project = Project.fromJSON(jsonData); - - expect(project.startDate).toBeInstanceOf(Date); - expect(project.startDate.getTime()).toBe(1718448645123); - expect(project.endDate).toBeInstanceOf(Date); - expect(project.endDate!.getTime()).toBe(1735689599999); - - expect(project.activeRange.from).toBeInstanceOf(Date); - expect(project.activeRange.from!.getTime()).toBe(1718434800000); - expect(project.activeRange.to).toBeInstanceOf(Date); - expect(project.activeRange.to!.getTime()).toBe(1726423200000); - }); - - it("should handle mixed ISO 8601 and milliseconds", async () => { - const jsonData = { - name: "Mixed Format Project", - startDate: "2024-06-15T10:30:45.123Z", // ISO 8601 - endDate: 1735689599999, // milliseconds - activeRange: { - from: 1718434800000, // milliseconds - to: "2024-09-15T17:00:00.000Z" // ISO 8601 - } - }; - - const project = Project.fromJSON(jsonData); - - expect(project.startDate).toBeInstanceOf(Date); - expect(project.startDate.toISOString()).toBe("2024-06-15T10:30:45.123Z"); - expect(project.endDate).toBeInstanceOf(Date); - expect(project.endDate!.getTime()).toBe(1735689599999); - - expect(project.activeRange.from).toBeInstanceOf(Date); - expect(project.activeRange.from!.getTime()).toBe(1718434800000); - expect(project.activeRange.to).toBeInstanceOf(Date); - expect(project.activeRange.to!.toISOString()).toBe("2024-09-15T17:00:00.000Z"); - }); - - it("should handle undefined fields in JSON input", async () => { - const jsonData = { - name: "Minimal JSON Input", - startDate: "2024-06-15T10:30:45.123Z", - activeRange: { - from: "2024-06-15T08:00:00.000Z", - to: "2024-09-15T17:00:00.000Z" - } - // endDate and flexibleRange are undefined - }; - - const project = Project.fromJSON(jsonData); - - expect(project.name).toBe("Minimal JSON Input"); - expect(project.startDate).toBeInstanceOf(Date); - expect(project.endDate).toBeUndefined(); - expect(project.flexibleRange).toBeUndefined(); - expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); - }); - - it("should handle partial DateTimeRange in JSON input", async () => { - const jsonData = { - name: "Partial Range JSON", - startDate: "2024-06-15T10:30:45.123Z", - activeRange: { - from: "2024-06-15T08:00:00.000Z", - to: "2024-09-15T17:00:00.000Z" - }, - flexibleRange: { - from: "2024-01-01T00:00:00.000Z" - // to is undefined (open end) - } - }; - - const project = Project.fromJSON(jsonData); - - expect(project.flexibleRange).toBeInstanceOf(DateTimeRangeType); - expect(project.flexibleRange!.from).toBeInstanceOf(Date); - expect(project.flexibleRange!.from!.toISOString()).toBe("2024-01-01T00:00:00.000Z"); - expect(project.flexibleRange!.to).toBeUndefined(); - }); - }); - - describe("Round-trip conversion", () => { - it("should maintain data integrity through toJSON/fromJSON cycle", async () => { - const originalProject = new Project(); - originalProject.name = "Round-trip Project"; - originalProject.startDate = new Date('2024-06-15T10:30:45.123Z'); - originalProject.endDate = new Date('2024-12-31T23:59:59.999Z'); - originalProject.description = "Test description"; - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2024-06-15T08:00:00.000Z'); - activeRange.to = new Date('2024-09-15T17:00:00.000Z'); - originalProject.activeRange = activeRange; - - const flexibleRange = new DateTimeRangeType(); - flexibleRange.from = new Date('2024-01-01T00:00:00.000Z'); - flexibleRange.to = new Date('2024-12-31T23:59:59.999Z'); - originalProject.flexibleRange = flexibleRange; - - // Convert to JSON and back - const json = originalProject.toJSON(); - const restoredProject = Project.fromJSON(json); - - // Verify all fields match - expect(restoredProject.name).toBe(originalProject.name); - expect(restoredProject.startDate.getTime()).toBe(originalProject.startDate.getTime()); - expect(restoredProject.endDate!.getTime()).toBe(originalProject.endDate!.getTime()); - expect(restoredProject.description).toBe(originalProject.description); - - expect(restoredProject.activeRange.from!.getTime()).toBe(originalProject.activeRange.from!.getTime()); - expect(restoredProject.activeRange.to!.getTime()).toBe(originalProject.activeRange.to!.getTime()); - - expect(restoredProject.flexibleRange!.from!.getTime()).toBe(originalProject.flexibleRange!.from!.getTime()); - expect(restoredProject.flexibleRange!.to!.getTime()).toBe(originalProject.flexibleRange!.to!.getTime()); - - // Verify the restored object can still be validated - const errors = await restoredProject.validate(); - expect(errors).toStrictEqual([]); - }); - - it("should produce consistent JSON format as specified", async () => { - const project = new Project(); - project.name = "Hotel Reservation System"; - project.startDate = new Date('2025-08-21T13:42:24.123Z'); - - const activeRange = new DateTimeRangeType(); - activeRange.from = new Date('2025-08-21T13:42:24.123Z'); - activeRange.to = new Date('2025-08-23T13:42:24.123Z'); - project.activeRange = activeRange; - - const json = project.toJSON(); - - // Verify the JSON structure matches the specification - expect(json).toEqual({ - name: "Hotel Reservation System", - startDate: "2025-08-21T13:42:24.123Z", - activeRange: { - from: "2025-08-21T13:42:24.123Z", - to: "2025-08-23T13:42:24.123Z" - } - }); - }); - }); - }); -}); diff --git a/test/Text.test.ts b/test/Text.test.ts new file mode 100644 index 0000000..4487405 --- /dev/null +++ b/test/Text.test.ts @@ -0,0 +1,237 @@ +import { App } from "./model/App"; +import { Person } from "./model/Person"; + +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * + * @param {ValidationError[]} errors - Array of ValidationError objects from class-validator. + * @returns {Array<{field: string, codes: string[], messages: string[]}>} An array of summary objects with field, codes, and messages. + */ +function summarizeErrors(errors: ValidationError[]) { + return errors.map((e) => ({ + field: e.property, + codes: e.constraints ? Object.keys(e.constraints) : [], + messages: e.constraints ? Object.values(e.constraints) : [], + })); +} + +describe("Text Field Type", () => { + describe("validation-tests", () => { + it("should pass validation with valid text values", async () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const errors = await person.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation with too short text", async () => { + const person = new Person(); + person.firstName = "J"; // Too short + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["minLength"], messages: ["firstName must be longer than or equal to 2 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with too long text", async () => { + const person = new Person(); + person.firstName = "A".repeat(31); // Too long + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["maxLength"], messages: ["firstName must be shorter than or equal to 30 characters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation with invalid regex pattern", async () => { + const person = new Person(); + person.firstName = "John123"; // Contains numbers + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "firstName", codes: ["matches"], messages: ["firstName must contain only letters"] }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should validate app name with complex regex", async () => { + const app = new App(); + app.name = "My.App"; // Valid format + app.version = "01.00.00"; + app.description = "A sample application"; + + const errors = await app.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation with invalid app name format", async () => { + const app = new App(); + app.name = ".InvalidApp"; // Starts with dot + app.version = "01.00.00"; + app.description = "A sample application"; + + const errors = await app.validate(); + const summary = summarizeErrors(errors); + expect(summary.some(error => error.field === "name" && error.codes.includes("matches"))).toBe(true); + }); + + it("should validate version format correctly", async () => { + const app = new App(); + app.name = "MyApp"; + app.version = "1.0"; // Invalid format + app.description = "A sample application"; + + const errors = await app.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "version", codes: ["minLength", "matches"], messages: [ + "version must be longer than or equal to 5 characters", + "Version must be in the format AA.BB.CC, where AA, BB, and CC are two-digit numbers" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should validate author format correctly", async () => { + const app = new App(); + app.name = "MyApp"; + app.version = "01.00.00"; + app.description = "A sample application"; + app.author = "JohnDoe123"; // Invalid characters + + const errors = await app.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { field: "author", codes: ["matches"], messages: [ + "Author must contain only letters, numbers, dots, underscores, and hyphens" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); + }); + + describe("required-tests", () => { + it("should fail validation when required text fields are missing", async () => { + const person = new Person(); + person.firstName = "John"; + // Missing lastName + person.age = 30; + + const errors = await person.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "lastName", + codes: ["minLength", "maxLength", "matches", "isNotEmpty"], + messages: [ + "lastName must be longer than or equal to 2 characters", + "lastName must be shorter than or equal to 30 characters", + "lastName must contain only letters", + "lastName should not be empty" + ], + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should fail validation for missing app name", async () => { + const app = new App(); + // Missing name + app.version = "01.00.00"; + app.description = "A sample application"; + + const errors = await app.validate(); + const summary = summarizeErrors(errors); + const expected = [ + { + field: "name", + codes: ["minLength", "maxLength", "matches", "isNotEmpty"], + messages: [ + "name must be longer than or equal to 4 characters", + "name must be shorter than or equal to 20 characters", + "Name must contain only letters and dots (no underscores, no consecutive dots, no dot at start/end)", + "name should not be empty" + ] + }, + ]; + expect(summary).toStrictEqual(expected); + }); + + it("should pass validation when optional text fields are missing", async () => { + const app = new App(); + app.name = "MyApp"; + app.version = "01.00.00"; + app.description = "A sample application"; + // author is optional + + const errors = await app.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("JSON-conversion-tests", () => { + it("should include text fields in JSON output", () => { + const person = new Person(); + person.firstName = "John"; + person.lastName = "Doe"; + person.email = "john.doe@example.com"; + person.age = 30; + + const json = person.toJSON(); + expect(json.firstName).toBe("John"); + expect(json.lastName).toBe("Doe"); + }); + + it("should create model from JSON with text fields", () => { + const jsonData = { + firstName: "Alice", + lastName: "Johnson", + email: "alice@example.com", + age: 28, + }; + + const person = Person.fromJSON(jsonData); + expect(person.firstName).toBe("Alice"); + expect(person.lastName).toBe("Johnson"); + expect(person instanceof Person).toBe(true); + }); + + it("should maintain text data integrity through round-trip conversion", () => { + const original = new Person(); + original.firstName = "Test"; + original.lastName = "User"; + original.email = "test@example.com"; + original.age = 29; + + const json = original.toJSON(); + const restored = Person.fromJSON(json); + + expect(restored.firstName).toBe(original.firstName); + expect(restored.lastName).toBe(original.lastName); + expect(restored instanceof Person).toBe(true); + }); + }); +}); From 2be7a5cde8e06c07be453517a5a96c338237d0a8 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Wed, 27 Aug 2025 11:40:16 -0300 Subject: [PATCH 080/254] Decimal decorator implementation using financial-number library --- package.json | 4 +- src/model/types/Decimal.ts | 137 ++++++++++++++++++++--------------- test/DecimalAndMoney.test.ts | 87 +++++++++++++++------- test/model/SimpleProduct.ts | 23 +++--- 4 files changed, 152 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 9efa037..434bf27 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "typescript": "^5.9.2" }, "dependencies": { - "bigint-money": "^2.0.0", "class-transformer": "^0.5.1", - "class-validator": "^0.14.2" + "class-validator": "^0.14.2", + "financial-number": "^4.0.4" } } diff --git a/src/model/types/Decimal.ts b/src/model/types/Decimal.ts index 16854f7..dd49b1d 100644 --- a/src/model/types/Decimal.ts +++ b/src/model/types/Decimal.ts @@ -1,43 +1,53 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; -import { Money, Round } from 'bigint-money'; -import { Transform } from 'class-transformer'; +import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; +import { Expose, Transform } from 'class-transformer'; -export type Decimal = Money; +/** + * Type alias for the `FinancialNumber` object. + * This should be used for all monetary or high-precision decimal values. + */ +export type Decimal = FinancialNumber; +/** + * Configuration options for the @Decimal decorator. + * Note: financial-number primarily supports 'trim' (truncate) and 'round' (round half up). + */ export interface DecimalOptions { + /** The number of decimal places to maintain. Required. */ decimals: number; - roundingType: 'truncate' | 'roundHalfToEven' | 'roundAwayFromZero' | 'roundHalfTowardsZero' | 'Error'; + /** Defines the rounding strategy when parsing data. */ + roundingType: 'truncate' | 'roundHalfToEven'; + /** The minimum allowed value as a string (e.g., "10.50"). Optional. */ min?: string; + /** The maximum allowed value as a string (e.g., "100.00"). Optional. */ max?: string; + /** If true, the value must be positive (> 0). Optional. */ positive?: boolean; + /** If true, the value must be negative (< 0). Optional. */ negative?: boolean; } /** - * Mapea nuestro string de roundingType a la enumeración de la librería bigint-money. + * Maps the decorator's roundingType string to the financial-number rounding strategy. + * @private */ -function getRoundingMode(roundingType: DecimalOptions['roundingType']): Round | undefined { +function getRoundingStrategy(roundingType: DecimalOptions['roundingType']): RoundingStrategy { switch (roundingType) { case 'truncate': - return Round.TRUNCATE; + return number.trim; case 'roundHalfToEven': - return Round.BANKERS; - //case 'roundAwayFromZero': - // return Round.AWAY_FROM_0; - case 'roundHalfTowardsZero': - return Round.HALF_TOWARDS_0; + return number.round; default: - return undefined; // Para 'Error' u otros casos + return number.trim; // Default to truncate } } -// El alias `DecimalKey` asegura que el decorador solo se aplique a propiedades del tipo `Decimal`. type DecimalKey = T[K] extends Decimal | undefined | null ? K : `Decimal: requires a property of type 'Decimal'`; function validateDecimalType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType && designType !== Object && designType.name !== 'Decimal') { + if (designType && designType !== Object && designType.name !== 'Decimal' && designType.name !== 'Object') { throw new Error(`@Decimal can only be applied to properties of type 'Decimal', but it was used on '${propertyKey}' which is of type '${designType?.name}'.`); } } @@ -69,19 +79,48 @@ function applyDecimalValidations( propName: string, options: DecimalOptions ): void { - addOptionalValidator('isDecimal', (v) => v instanceof Money, `${propName} must be a Decimal object`); + // financial-number objects don't have a specific class, so we check if it has the expected methods. + addOptionalValidator('isDecimal', (value: any) => { + if (!value || typeof value.toString !== 'function' || typeof value.plus !== 'function') { + return false; + } + const stringValue = value.toString(); + const parts = stringValue.split('.'); + const numDecimalPlaces = parts.length === 2 ? parts[1].length : 0; + return numDecimalPlaces === options.decimals; + }, `${propName} must have exactly ${options.decimals} decimal places.`); if (options.positive) { - addOptionalValidator('isPositive', (v) => v instanceof Money && v.isGreaterThan('0'), `${propName} must be a positive amount`); + addOptionalValidator('isPositive', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'gt' in value && typeof (value as FinancialNumber).gt === 'function') { + return (value as FinancialNumber).gt('0'); + } + return false; + }, `${propName} must be a positive amount`); } if (options.negative) { - addOptionalValidator('isNegative', (v) => v instanceof Money && v.isLesserThan('0'), `${propName} must be a negative amount`); + addOptionalValidator('isNegative', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'lt' in value && typeof (value as FinancialNumber).lt === 'function') { + return (value as FinancialNumber).lt('0'); + } + return false; + }, `${propName} must be a negative amount`); } if (options.min) { - addOptionalValidator('min', (v) => v instanceof Money && v.isGreaterThanOrEqual(options.min!), `${propName} must not be less than ${options.min}`); + addOptionalValidator('min', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'gte' in value && typeof (value as FinancialNumber).gte === 'function') { + return (value as FinancialNumber).gte(options.min!); + } + return false; + }, `${propName} must not be less than ${options.min}`); } if (options.max) { - addOptionalValidator('max', (v) => v instanceof Money && v.isLesserThanOrEqual(options.max!), `${propName} must not be greater than ${options.max}`); + addOptionalValidator('max', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'lte' in value && typeof (value as FinancialNumber).lte === 'function') { + return (value as FinancialNumber).lte(options.max!); + } + return false; + }, `${propName} must not be greater than ${options.max}`); } } @@ -93,51 +132,33 @@ export function Decimal(options: DecimalOptions) { validateDecimalType(proto, propName); storeDecimalMetadata(proto, propName, options); - Transform(({ value, key, obj, type }) => { - const opts = Reflect.getMetadata('field:type:options', obj, key) as DecimalOptions; - if (!opts) return value; - - // --- Deserialización: plainToClass (fromJSON) --- - if (type === 1) { - if (typeof value !== 'string' && typeof value !== 'number') { - return value; - } - const stringValue = String(value); + // Serialization (toJSON) + Transform(({ value }) => { + if (value && typeof value.toString === 'function') { + const roundingStrategy = getRoundingStrategy(options.roundingType); + return value.toString(options.decimals, roundingStrategy); + } + return value; + }, { toPlainOnly: true })(target, propertyKey); - // Validación para roundingType: 'Error' - if (opts.roundingType === 'Error') { - const decimalPart = stringValue.split('.')[1] || ''; - if (decimalPart.length > opts.decimals) { - // Devuelve un valor inválido para que la validación 'isDecimal' falle - return `Invalid decimal places for ${key}. Expected ${opts.decimals}, but got ${decimalPart.length}.`; - } - } + // Deserialization (fromJSON) + Transform(({ value }) => { + if (typeof value === 'string' || typeof value === 'number') { try { - // Creamos el objeto Money. La librería maneja el parseo. - // El redondeo se aplica en el constructor si se especifica. - const roundingMode = getRoundingMode(opts.roundingType); - const moneyValue = new Money(stringValue, 'XXX', roundingMode); - - // La librería trabaja con alta precisión interna. El formateo final se hace en toFixed. - // Aquí solo nos aseguramos de que el objeto se cree correctamente. - return moneyValue; - } catch (error) { - return value; // Dejar que la validación falle si hay un error de parseo - } - } - - // --- Serialización: classToPlain (toJSON) --- - if (type === 0) { - if (value instanceof Money) { - // Usamos toFixed() para formatear la salida con la precisión correcta - return value.toFixed(opts.decimals); + const roundingStrategy = getRoundingStrategy(options.roundingType); + const formattedValue = number(String(value)).toString(options.decimals, roundingStrategy); + return number(formattedValue); + } catch { + return value; } } - return value; - })(target, propName); + }, { toClassOnly: true })(target, propertyKey); + + // Expose the property for serialization/deserialization + Expose()(target, propertyKey); const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyDecimalValidations(addOptionalValidator, propName, options); diff --git a/test/DecimalAndMoney.test.ts b/test/DecimalAndMoney.test.ts index ab11f4a..7e4c82d 100644 --- a/test/DecimalAndMoney.test.ts +++ b/test/DecimalAndMoney.test.ts @@ -1,47 +1,71 @@ import 'reflect-metadata'; -import { plainToClass } from 'class-transformer'; -import { Money } from 'bigint-money'; +import number from 'financial-number'; import { SimpleProduct } from './model/SimpleProduct'; - -describe('Decimal Decorator and Type', () => { +describe('Decimal Decorator with financial-number', () => { describe('JSON Serialization (toJSON)', () => { - it('should serialize a Decimal value to a string with correct decimal places using Truncate', () => { + it('should serialize a Decimal value with truncate rounding', async () => { const product = new SimpleProduct(); product.name = 'Test'; - product.priceTruncate = new Money('123.456', 'XXX'); // Input with more decimals. + product.priceTruncate = number('123.456'); // Input with more decimals + + const jsonObject = product.toJSON(); - product.toJSON(); - expect(product.toJSON()).toEqual({ + expect(jsonObject).toEqual({ name: 'Test', - priceTruncate: '123.45' + priceTruncate: '123.45', // '123.456' truncated to 2 decimals }); - }); - it("should serialize a Decimal value to a string with correct decimal places using roundHalfToEven", () => { + it('should serialize a Decimal value with roundHalfToEven (round half up)', () => { const product = new SimpleProduct(); product.name = 'Test'; - product.priceHalfToEven = new Money('123.456', 'XXX'); // Input with more decimals. + product.priceRound = number('123.455'); - // 1. Call the .toJSON() method directly from your BaseModel. const jsonObject = product.toJSON(); - // 2. Compare the resulting object. - // 'roundHalfToEven' with 2 decimals on '123.456' should result in '123.46'. expect(jsonObject).toEqual({ name: 'Test', - priceHalfToEven: '123.46' + priceRound: '123.46' }); }); + }); + + describe('Deserialization (fromJSON)', () => { + it('should deserialize a JSON string to a Decimal value', async () => { + const json = { name: 'Test', priceTruncate: '123.45' }; + const product = SimpleProduct.fromJSON(json); + + const errors = await product.validate(); + expect(errors).toHaveLength(0); + + expect(product.priceTruncate.toString()).toBe('123.45'); + }); + + it('should round the value on deserialization and pass validation (Truncate) ', async () => { + const json = { name: 'Test', priceTruncate: '123.4563' }; + const product = SimpleProduct.fromJSON(json); // Should be truncated to 123.45 + + const errors = await product.validate(); + expect(errors).toHaveLength(0); // Validation should pass + expect(product.priceTruncate.toString()).toBe('123.45'); + }); + + it('should round the value on deserialization and pass validation (Round Half To Even)', async () => { + const json = { name: 'Test', priceRound: '123.455' }; + const product = SimpleProduct.fromJSON(json); // Should be rounded to 123.46 + const errors = await product.validate(); + expect(errors).toHaveLength(0); // Validation should pass + expect(product.priceRound.toString()).toBe('123.46'); + }); }); describe('Validations', () => { it('should fail if value is less than min', async () => { const json = { name: 'Test', priceTruncate: '0.00' }; - const product = plainToClass(SimpleProduct, json); + const product = SimpleProduct.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -51,7 +75,7 @@ describe('Decimal Decorator and Type', () => { it('should fail if value is greater than max', async () => { const json = { name: 'Test', priceTruncate: '1000.01' }; - const product = plainToClass(SimpleProduct, json); + const product = SimpleProduct.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -60,24 +84,35 @@ describe('Decimal Decorator and Type', () => { }); it('should fail if value is not positive', async () => { - const json = { name: 'Test', priceTruncate: '0' }; - const product = plainToClass(SimpleProduct, json); + const json = { name: 'Test', priceTruncate: '-5.00' }; + const product = SimpleProduct.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); expect(errors[0]?.property).toBe('priceTruncate'); expect(errors[0]?.constraints).toHaveProperty('isPositive'); }); - }); - describe('Deserialization (from JSON)', () => { - it('should deserialize a JSON string to a Decimal value', () => { - const json = { name: 'Test', priceTruncate: '123.45' }; + it('should fail if value is not negative', async () => { + const json = { name: 'Test', priceNegative: '2.00' }; const product = SimpleProduct.fromJSON(json); - product.validate(); - + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('priceNegative'); + expect(errors[0]?.constraints).toHaveProperty('isNegative'); }); + it("should fail if an incorrect number of decimals is set manually", async () => { + const product = new SimpleProduct(); + product.name = 'Test'; + product.priceTruncate = number('123.456'); // Set a value with more than 2 decimals + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('priceTruncate'); + expect(errors[0]?.constraints).toHaveProperty('isDecimal'); + }); }); + }); \ No newline at end of file diff --git a/test/model/SimpleProduct.ts b/test/model/SimpleProduct.ts index 5e8b7e1..21f3080 100644 --- a/test/model/SimpleProduct.ts +++ b/test/model/SimpleProduct.ts @@ -8,10 +8,12 @@ import { Decimal } from "@/model/types/Decimal"; }) export class SimpleProduct extends BaseModel { @Field({ + required: true, }) name!: string; - @Field({}) + @Field({ + }) @Decimal({ decimals: 2, roundingType: 'truncate', @@ -21,25 +23,20 @@ export class SimpleProduct extends BaseModel { }) priceTruncate!: Decimal; - @Field({}) - @Decimal({ - decimals: 2, - roundingType: 'roundHalfToEven', + @Field({ }) - priceHalfToEven!: Decimal; - - @Field({}) @Decimal({ decimals: 2, - roundingType: 'roundAwayFromZero', + roundingType: 'roundHalfToEven', }) - priceHalfToEvenRoundAwayFromZero!: Decimal; + priceRound!: Decimal; @Field({}) @Decimal({ decimals: 2, - roundingType: 'roundHalfTowardsZero', + roundingType: 'roundHalfToEven', + negative: true }) - priceHalfToEvenRoundHalfTowardsZero!: Decimal; + priceNegative!: Decimal; -} +} \ No newline at end of file From c3d28dbf79af2260134aba45f1c70950939d17e7 Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Wed, 27 Aug 2025 11:50:52 -0300 Subject: [PATCH 081/254] Money decorator implementation --- src/model/types/Decimal.ts | 1 - src/model/types/Money.ts | 158 +++++++++++++++++++++++++++++++++++ test/DecimalAndMoney.test.ts | 53 +++++++++++- test/model/SimpleProduct.ts | 10 +++ 4 files changed, 219 insertions(+), 3 deletions(-) create mode 100644 src/model/types/Money.ts diff --git a/src/model/types/Decimal.ts b/src/model/types/Decimal.ts index dd49b1d..4a6d0b4 100644 --- a/src/model/types/Decimal.ts +++ b/src/model/types/Decimal.ts @@ -79,7 +79,6 @@ function applyDecimalValidations( propName: string, options: DecimalOptions ): void { - // financial-number objects don't have a specific class, so we check if it has the expected methods. addOptionalValidator('isDecimal', (value: any) => { if (!value || typeof value.toString !== 'function' || typeof value.plus !== 'function') { return false; diff --git a/src/model/types/Money.ts b/src/model/types/Money.ts new file mode 100644 index 0000000..fc566a9 --- /dev/null +++ b/src/model/types/Money.ts @@ -0,0 +1,158 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; +import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; +import { Expose, Transform } from 'class-transformer'; + +/** + * Type alias for the `FinancialNumber` object, representing a monetary value. + */ +export type Money = FinancialNumber; + +/** + * Configuration options for the @Money decorator. + */ +export interface MoneyOptions { + /** The number of decimal places to maintain. Required. */ + decimals: number; + /** Defines the rounding strategy when parsing data. */ + roundingType: 'truncate' | 'roundHalfToEven'; + /** The minimum allowed value as a string (e.g., "10.50"). Optional. */ + min?: string; + /** The maximum allowed value as a string (e.g., "100.00"). Optional. */ + max?: string; + /** If true, the value must be positive (> 0). Optional. */ + positive?: boolean; + /** If true, the value must be negative (< 0). Optional. */ + negative?: boolean; +} + +/** + * Maps the decorator's roundingType string to the financial-number rounding strategy. + * @private + */ +function getRoundingStrategy(roundingType: MoneyOptions['roundingType']): RoundingStrategy { + switch (roundingType) { + case 'truncate': + return number.trim; + case 'roundHalfToEven': + return number.round; + default: + return number.trim; // Default to truncate + } +} + +type MoneyKey = T[K] extends Money | undefined | null ? K : `Money: requires a property of type 'Money'`; + +function validateMoneyType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType && designType !== Object && designType.name !== 'Money' && designType.name !== 'Object' && designType.name !== 'FinancialNumber') { + throw new Error(`@Money can only be applied to properties of type 'Money', but it was used on '${propertyKey}' which is of type '${designType?.name}'.`); + } +} + +function storeMoneyMetadata(proto: Object, propName: string, options: MoneyOptions): void { + Reflect.defineMetadata('field:type', 'money', proto, propName); + Reflect.defineMetadata('field:type:options', options, proto, propName); +} + +function createOptionalValidatorAdder(proto: Object, propName: string) { + return (name: string, validate: (value: unknown) => boolean, defaultMessage: string) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + if (value === undefined || value === null) return true; + return validate(value); + }, + defaultMessage() { return defaultMessage; }, + }, + }); + }; +} + +function applyMoneyValidations( + addOptionalValidator: ReturnType, + propName: string, + options: MoneyOptions +): void { + addOptionalValidator('isMoney', (value: any) => { + if (!value || typeof value.toString !== 'function' || typeof value.plus !== 'function') { + return false; + } + const stringValue = value.toString(); + const parts = stringValue.split('.'); + const numDecimalPlaces = parts.length === 2 ? parts[1].length : 0; + return numDecimalPlaces === options.decimals; + }, `${propName} must have exactly ${options.decimals} decimal places.`); + + if (options.positive) { + addOptionalValidator('isPositive', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'gt' in value && typeof (value as FinancialNumber).gt === 'function') { + return (value as FinancialNumber).gt('0'); + } + return false; + }, `${propName} must be a positive amount`); + } + if (options.negative) { + addOptionalValidator('isNegative', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'lt' in value && typeof (value as FinancialNumber).lt === 'function') { + return (value as FinancialNumber).lt('0'); + } + return false; + }, `${propName} must be a negative amount`); + } + if (options.min) { + addOptionalValidator('min', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'gte' in value && typeof (value as FinancialNumber).gte === 'function') { + return (value as FinancialNumber).gte(options.min!); + } + return false; + }, `${propName} must not be less than ${options.min}`); + } + if (options.max) { + addOptionalValidator('max', (value: unknown) => { + if (typeof value === 'object' && value !== null && 'lte' in value && typeof (value as FinancialNumber).lte === 'function') { + return (value as FinancialNumber).lte(options.max!); + } + return false; + }, `${propName} must not be greater than ${options.max}`); + } +} + +export function Money(options: MoneyOptions) { + return function (target: T, propertyKey: MoneyKey) { + const propName = propertyKey as string; + const proto = target as Object; + + validateMoneyType(proto, propName); + storeMoneyMetadata(proto, propName, options); + + Transform(({ value }) => { + if (value && typeof value.toString === 'function') { + const roundingStrategy = getRoundingStrategy(options.roundingType); + return value.toString(options.decimals, roundingStrategy); + } + return value; + }, { toPlainOnly: true })(target, propertyKey); + + Transform(({ value }) => { + if (typeof value === 'string' || typeof value === 'number') { + try { + const roundingStrategy = getRoundingStrategy(options.roundingType); + const formattedValue = number(String(value)).toString(options.decimals, roundingStrategy); + return number(formattedValue); + } catch { + return value; + } + } + return value; + }, { toClassOnly: true })(target, propertyKey); + + Expose()(target, propertyKey); + + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyMoneyValidations(addOptionalValidator, propName, options); + }; +} \ No newline at end of file diff --git a/test/DecimalAndMoney.test.ts b/test/DecimalAndMoney.test.ts index 7e4c82d..2b79e63 100644 --- a/test/DecimalAndMoney.test.ts +++ b/test/DecimalAndMoney.test.ts @@ -5,7 +5,7 @@ import { SimpleProduct } from './model/SimpleProduct'; describe('Decimal Decorator with financial-number', () => { describe('JSON Serialization (toJSON)', () => { - it('should serialize a Decimal value with truncate rounding', async () => { + it('should serialize a Decimal value with truncate rounding', () => { const product = new SimpleProduct(); product.name = 'Test'; product.priceTruncate = number('123.456'); // Input with more decimals @@ -27,7 +27,7 @@ describe('Decimal Decorator with financial-number', () => { expect(jsonObject).toEqual({ name: 'Test', - priceRound: '123.46' + priceRound: '123.46', }); }); }); @@ -115,4 +115,53 @@ describe('Decimal Decorator with financial-number', () => { }); }); +}); + +describe('Money Decorator with financial-number', () => { + describe('JSON Serialization and Deserialization', () => { + it('should correctly serialize and deserialize a Money value', async () => { + const product = new SimpleProduct(); + product.name = 'Ice Cream'; + product.priceMoney = number('1.25'); + + const jsonObject = product.toJSON(); + expect(jsonObject.priceMoney).toBe('1.25'); + + const newProduct = SimpleProduct.fromJSON(jsonObject); + const errors = await newProduct.validate(); + expect(errors).toHaveLength(0); + expect(newProduct.priceMoney.toString()).toBe('1.25'); + }); + + it('should round the value on deserialization and pass validation', async () => { + const json = { name: 'Ice Cream', priceMoney: '1.259' }; + const product = SimpleProduct.fromJSON(json); + + const errors = await product.validate(); + expect(errors).toHaveLength(0); + expect(product.priceMoney.toString()).toBe('1.26'); + }); + }); + + describe('Validations', () => { + it('should fail if an incorrect number of decimals is set manually', async () => { + const product = new SimpleProduct(); + product.name = 'Ice Cream'; + product.priceMoney = number('1.245'); + + const errors = await product.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors[0]?.property).toBe('priceMoney'); + expect(errors[0]?.constraints).toHaveProperty('isMoney'); + }); + + it('should pass validation when the correct number of decimals is set manually', async () => { + const product = new SimpleProduct(); + product.name = 'Ice Cream'; + product.priceMoney = number('1.25'); + + const errors = await product.validate(); + expect(errors).toHaveLength(0); + }); + }); }); \ No newline at end of file diff --git a/test/model/SimpleProduct.ts b/test/model/SimpleProduct.ts index 21f3080..c91dee1 100644 --- a/test/model/SimpleProduct.ts +++ b/test/model/SimpleProduct.ts @@ -2,6 +2,7 @@ import { Field } from "@/model/Field"; import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; import { Decimal } from "@/model/types/Decimal"; +import { Money } from "@/model/types/Money"; @Model({ docs: "Represents a product", @@ -39,4 +40,13 @@ export class SimpleProduct extends BaseModel { }) priceNegative!: Decimal; + @Field({}) + @Money({ + decimals: 2, + roundingType: 'roundHalfToEven', + positive: true, + min: '0.01', + max: '1000.00' + }) + priceMoney!: Money; } \ No newline at end of file From 41c9e1ffe056095bf9d4ef59cf163c6de815ab22 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 27 Aug 2025 11:56:39 -0300 Subject: [PATCH 082/254] Updated TypeScript settings and Jest configuration. - Updated jest.config.mjs for Jest to use ES modules. - Updated package.json scripts to specify the TypeScript project for build and watch. - Adjusted exports in index.ts to include types for Field and Model. - Modified import statements in test files to use .js extensions. - Added tsconfig.build.json for build-specific TypeScript configuration. - Enhanced tsconfig.json with additional compiler options for better type checking and module handling. --- jest.config.ts => jest.config.mjs | 20 +++++++++++--------- package.json | 4 ++-- src/index.ts | 6 ++++-- test/Field.test.ts | 4 ++-- test/JsonConversion.test.ts | 2 +- test/model/Person.ts | 6 +++--- test/model/Product.ts | 6 +++--- tsconfig.build.json | 8 ++++++++ tsconfig.json | 30 ++++++++++++++++-------------- 9 files changed, 50 insertions(+), 36 deletions(-) rename jest.config.ts => jest.config.mjs (54%) create mode 100644 tsconfig.build.json diff --git a/jest.config.ts b/jest.config.mjs similarity index 54% rename from jest.config.ts rename to jest.config.mjs index 57764ff..976eb9f 100644 --- a/jest.config.ts +++ b/jest.config.mjs @@ -1,23 +1,25 @@ -import type { Config } from "jest"; - -const config: Config = { - preset: "ts-jest", +/** @type {import('jest').Config} */ +const config = { + preset: "ts-jest/presets/default-esm", testEnvironment: "node", + extensionsToTreatAsEsm: ['.ts'], + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + "^@/(.*)$": "/src/$1", + }, transform: { "^.+\\.(ts|tsx)$": [ "ts-jest", { + useESM: true, tsconfig: { - module: "commonjs", + module: "ES2022", }, }, ], }, testMatch: ["/test/**/*.test.ts"], coverageProvider: "v8", - moduleNameMapper: { - "^@/(.*)$": "/src/$1", - }, }; -module.exports = config; +export default config; diff --git a/package.json b/package.json index a06e081..f0eca2d 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ ], "scripts": { "test": "jest --verbose", - "watch": "tsc --watch", - "build": "tsc" + "watch": "tsc --project tsconfig.build.json --watch", + "build": "tsc --project tsconfig.build.json" }, "repository": { "type": "git", diff --git a/src/index.ts b/src/index.ts index 7a62aa5..6240357 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,7 @@ // Export all the core components of the framework export { BaseModel } from './model/BaseModel.js'; -export { Field, FieldOptions, ValidationIssue } from './model/Field.js'; -export { Model, ModelOptions } from './model/Model.js'; +export { Field } from './model/Field.js'; +export type { FieldOptions, ValidationIssue } from './model/Field.js'; +export { Model } from './model/Model.js'; +export type { ModelOptions } from './model/Model.js'; export { CustomValidate } from './validators/CustomValidationConstraint.js'; \ No newline at end of file diff --git a/test/Field.test.ts b/test/Field.test.ts index 67f59d8..478deb4 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -1,5 +1,5 @@ -import { Person } from "./model/Person"; -import { Product } from "./model/Product"; +import { Person } from "./model/Person.js"; +import { Product } from "./model/Product.js"; import type { ValidationError } from "class-validator"; diff --git a/test/JsonConversion.test.ts b/test/JsonConversion.test.ts index d16857e..524a669 100644 --- a/test/JsonConversion.test.ts +++ b/test/JsonConversion.test.ts @@ -1,4 +1,4 @@ -import { Person } from "./model/Person"; +import { Person } from "./model/Person.js"; describe("BaseModel JSON Conversion", () => { describe("toJSON", () => { diff --git a/test/model/Person.ts b/test/model/Person.ts index 679137c..714b2a7 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,6 +1,6 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; +import { Field } from "../../src/model/Field.js"; +import { Model } from "../../src/model/Model.js"; +import { BaseModel } from "../../src/model/BaseModel.js"; import { IsEmail } from "class-validator"; @Model({ diff --git a/test/model/Product.ts b/test/model/Product.ts index 291b624..d506457 100644 --- a/test/model/Product.ts +++ b/test/model/Product.ts @@ -1,6 +1,6 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; +import { Field } from "../../src/model/Field.js"; +import { Model } from "../../src/model/Model.js"; +import { BaseModel } from "../../src/model/BaseModel.js"; @Model({ docs: "Represents a product", diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 0000000..6f26673 --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "rootDir": "./src" + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist", "test"] +} diff --git a/tsconfig.json b/tsconfig.json index ad0a0bb..cb4de72 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,24 +1,26 @@ { "compilerOptions": { - /* Build Options */ - "target": "ES2022", "module": "NodeNext", "moduleResolution": "NodeNext", - "outDir": "./dist", - "declaration": true, + "target": "esnext", + "types": ["node", "jest"], "sourceMap": true, - "rootDir": "./src", - - /* Interop and Strictness */ - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, + "declaration": true, + "declarationMap": true, + "noUncheckedIndexedAccess": true, + "exactOptionalPropertyTypes": true, "strict": true, + "jsx": "react-jsx", + "verbatimModuleSyntax": false, + "isolatedModules": true, + "noUncheckedSideEffectImports": true, + "moduleDetection": "force", "skipLibCheck": true, - - /* Decorator Metadata */ "experimentalDecorators": true, - "emitDecoratorMetadata": true + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "./dist" }, - "include": ["src/**/*"], - "exclude": ["node_modules", "dist", "test"] + "include": ["src/**/*", "test/**/*"], + "exclude": ["node_modules", "dist"] } \ No newline at end of file From 5e063bba7738f73a830bec50c169655151b9b290 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 27 Aug 2025 12:25:16 -0300 Subject: [PATCH 083/254] Reversed some `tsconfig.json` changes to default because the problem where in the `"paths"` option. Reestablished imports in tests and index to default. --- src/index.ts | 12 ++++++------ src/model/BaseModel.ts | 2 +- src/model/Field.ts | 2 +- test/Field.test.ts | 4 ++-- test/JsonConversion.test.ts | 2 +- test/model/Person.ts | 6 +++--- test/model/Product.ts | 6 +++--- tsconfig.json | 3 +-- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/index.ts b/src/index.ts index 6240357..7378a8c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,7 @@ // Export all the core components of the framework -export { BaseModel } from './model/BaseModel.js'; -export { Field } from './model/Field.js'; -export type { FieldOptions, ValidationIssue } from './model/Field.js'; -export { Model } from './model/Model.js'; -export type { ModelOptions } from './model/Model.js'; -export { CustomValidate } from './validators/CustomValidationConstraint.js'; \ No newline at end of file +export { BaseModel } from './model/BaseModel'; +export { Field } from './model/Field'; +export type { FieldOptions, ValidationIssue } from './model/Field'; +export { Model } from './model/Model'; +export type { ModelOptions } from './model/Model'; +export { CustomValidate } from './validators/CustomValidationConstraint'; \ No newline at end of file diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index c9c7dc0..85ce380 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,5 +1,5 @@ import { ValidationError, validate } from "class-validator"; -import type { ValidationIssue } from "./Field.js"; +import type { ValidationIssue } from "./Field"; import { instanceToPlain, plainToInstance, Transform } from "class-transformer"; /** diff --git a/src/model/Field.ts b/src/model/Field.ts index 878f36b..bb7e268 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,6 +1,6 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { Exclude, Expose, Transform } from 'class-transformer'; -import { CustomValidate } from '../validators/CustomValidationConstraint.js'; +import { CustomValidate } from '../validators/CustomValidationConstraint'; /** * Custom validation function type for field validation. diff --git a/test/Field.test.ts b/test/Field.test.ts index 478deb4..67f59d8 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -1,5 +1,5 @@ -import { Person } from "./model/Person.js"; -import { Product } from "./model/Product.js"; +import { Person } from "./model/Person"; +import { Product } from "./model/Product"; import type { ValidationError } from "class-validator"; diff --git a/test/JsonConversion.test.ts b/test/JsonConversion.test.ts index 524a669..d16857e 100644 --- a/test/JsonConversion.test.ts +++ b/test/JsonConversion.test.ts @@ -1,4 +1,4 @@ -import { Person } from "./model/Person.js"; +import { Person } from "./model/Person"; describe("BaseModel JSON Conversion", () => { describe("toJSON", () => { diff --git a/test/model/Person.ts b/test/model/Person.ts index 714b2a7..679137c 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,6 +1,6 @@ -import { Field } from "../../src/model/Field.js"; -import { Model } from "../../src/model/Model.js"; -import { BaseModel } from "../../src/model/BaseModel.js"; +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { BaseModel } from "../../src/model/BaseModel"; import { IsEmail } from "class-validator"; @Model({ diff --git a/test/model/Product.ts b/test/model/Product.ts index d506457..c199da0 100644 --- a/test/model/Product.ts +++ b/test/model/Product.ts @@ -1,6 +1,6 @@ -import { Field } from "../../src/model/Field.js"; -import { Model } from "../../src/model/Model.js"; -import { BaseModel } from "../../src/model/BaseModel.js"; +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { BaseModel } from "../../src/model/BaseModel"; @Model({ docs: "Represents a product", diff --git a/tsconfig.json b/tsconfig.json index cb4de72..541c7e5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,6 @@ { "compilerOptions": { - "module": "NodeNext", - "moduleResolution": "NodeNext", + "module": "commonjs", "target": "esnext", "types": ["node", "jest"], "sourceMap": true, From d481c4e403eba57276ac075f689a69b3073fbbbe Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Wed, 27 Aug 2025 12:49:16 -0300 Subject: [PATCH 084/254] Integer implementation and test reorganization --- src/model/types/Integer.ts | 138 ++++++++++++++++++ test/DecimalAndMoney.test.ts | 36 ++--- test/Field.test.ts | 32 +--- test/NumberInteger.test.ts | 98 +++++++++++++ ...{SimpleProduct.ts => DecimalMoneyModel.ts} | 5 +- test/model/NumberIntegerModel.ts | 48 ++++++ test/model/Person.ts | 11 -- test/model/Product.ts | 10 -- 8 files changed, 306 insertions(+), 72 deletions(-) create mode 100644 src/model/types/Integer.ts create mode 100644 test/NumberInteger.test.ts rename test/model/{SimpleProduct.ts => DecimalMoneyModel.ts} (87%) create mode 100644 test/model/NumberIntegerModel.ts diff --git a/src/model/types/Integer.ts b/src/model/types/Integer.ts new file mode 100644 index 0000000..8fec3dc --- /dev/null +++ b/src/model/types/Integer.ts @@ -0,0 +1,138 @@ +import 'reflect-metadata'; +import { registerDecorator } from 'class-validator'; + +/** + * Options for the Integer decorator. + */ +export interface IntegerOptions { + /** The minimum allowed value. Optional. */ + min?: number; + /** The maximum allowed value. Optional. */ + max?: number; + /** Boolean indicating the value must be positive (> 0). Optional. */ + positive?: boolean; + /** Boolean indicating the value must be negative (< 0). Optional. */ + negative?: boolean; +} + +/** + * A type-safe key for the Integer decorator. + * Ensures that the decorator is only applied to properties of type 'number'. + */ +type IntegerKey = T[K] extends number + ? K + : `Integer: requires number field`; + +/** + * Validates that a property is of number type at runtime. + */ +function validateIntegerType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== Number && designType?.name !== 'Number') { + throw new Error(`@Integer can only be applied to 'number' properties, but it was used on '${propertyKey}'.`); + } +} + +/** + * Stores metadata for the integer field. + */ +function storeIntegerMetadata(proto: Object, propName: string, options?: IntegerOptions): void { + Reflect.defineMetadata('field:type', 'integer', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Creates a helper function to add optional validators. + */ +function createOptionalValidatorAdder(proto: Object, propName: string) { + return ( + name: string, + validate: (value: unknown) => boolean, + defaultMessage: string + ) => { + registerDecorator({ + name, + target: (proto as any).constructor, + propertyName: propName, + validator: { + validate(value: unknown) { + if (value === undefined || value === null) return true; + return validate(value); + }, + defaultMessage() { + return defaultMessage; + }, + }, + }); + }; +} + +/** + * Applies validation rules based on the provided integer options. + */ +function applyIntegerValidations( + addOptionalValidator: ReturnType, + propName: string, + options?: IntegerOptions +): void { + // Basic type check + addOptionalValidator('isNumber', (v) => typeof v === 'number', `${propName} must be a number`); + addOptionalValidator('isInteger', (v) => Number.isInteger(v), `${propName} must be an integer`); + + if (typeof options?.min === 'number') { + const min = options.min; + addOptionalValidator( + 'min', + (v) => typeof v === 'number' && v >= min, + `${propName} must not be less than ${min}` + ); + } + + if (typeof options?.max === 'number') { + const max = options.max; + addOptionalValidator( + 'max', + (v) => typeof v === 'number' && v <= max, + `${propName} must not be greater than ${max}` + ); + } + + if (options?.positive === true) { + addOptionalValidator( + 'isPositive', + (v) => typeof v === 'number' && v > 0, + `${propName} must be a positive number` + ); + } + + if (options?.negative === true) { + addOptionalValidator( + 'isNegative', + (v) => typeof v === 'number' && v < 0, + `${propName} must be a negative number` + ); + } +} + +/** + * Integer type decorator for number properties that must be whole numbers. + * + * @param options - Configuration options for integer validation. + */ +export function Integer(options?: IntegerOptions) { + return function ( + target: T, + propertyKey: IntegerKey + ) { + const propName = propertyKey as string; + const proto = target as Object; + + validateIntegerType(proto, propName); + storeIntegerMetadata(proto, propName, options); + + const addOptionalValidator = createOptionalValidatorAdder(proto, propName); + applyIntegerValidations(addOptionalValidator, propName, options); + }; +} \ No newline at end of file diff --git a/test/DecimalAndMoney.test.ts b/test/DecimalAndMoney.test.ts index 2b79e63..c4501c1 100644 --- a/test/DecimalAndMoney.test.ts +++ b/test/DecimalAndMoney.test.ts @@ -1,12 +1,12 @@ import 'reflect-metadata'; import number from 'financial-number'; -import { SimpleProduct } from './model/SimpleProduct'; +import { DecimalMoneyModel } from './model/DecimalMoneyModel'; -describe('Decimal Decorator with financial-number', () => { +describe('@Decimal Decorator', () => { describe('JSON Serialization (toJSON)', () => { it('should serialize a Decimal value with truncate rounding', () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Test'; product.priceTruncate = number('123.456'); // Input with more decimals @@ -19,7 +19,7 @@ describe('Decimal Decorator with financial-number', () => { }); it('should serialize a Decimal value with roundHalfToEven (round half up)', () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Test'; product.priceRound = number('123.455'); @@ -35,7 +35,7 @@ describe('Decimal Decorator with financial-number', () => { describe('Deserialization (fromJSON)', () => { it('should deserialize a JSON string to a Decimal value', async () => { const json = { name: 'Test', priceTruncate: '123.45' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors).toHaveLength(0); @@ -45,7 +45,7 @@ describe('Decimal Decorator with financial-number', () => { it('should round the value on deserialization and pass validation (Truncate) ', async () => { const json = { name: 'Test', priceTruncate: '123.4563' }; - const product = SimpleProduct.fromJSON(json); // Should be truncated to 123.45 + const product = DecimalMoneyModel.fromJSON(json); // Should be truncated to 123.45 const errors = await product.validate(); expect(errors).toHaveLength(0); // Validation should pass @@ -54,7 +54,7 @@ describe('Decimal Decorator with financial-number', () => { it('should round the value on deserialization and pass validation (Round Half To Even)', async () => { const json = { name: 'Test', priceRound: '123.455' }; - const product = SimpleProduct.fromJSON(json); // Should be rounded to 123.46 + const product = DecimalMoneyModel.fromJSON(json); // Should be rounded to 123.46 const errors = await product.validate(); expect(errors).toHaveLength(0); // Validation should pass @@ -65,7 +65,7 @@ describe('Decimal Decorator with financial-number', () => { describe('Validations', () => { it('should fail if value is less than min', async () => { const json = { name: 'Test', priceTruncate: '0.00' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -75,7 +75,7 @@ describe('Decimal Decorator with financial-number', () => { it('should fail if value is greater than max', async () => { const json = { name: 'Test', priceTruncate: '1000.01' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -85,7 +85,7 @@ describe('Decimal Decorator with financial-number', () => { it('should fail if value is not positive', async () => { const json = { name: 'Test', priceTruncate: '-5.00' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -95,7 +95,7 @@ describe('Decimal Decorator with financial-number', () => { it('should fail if value is not negative', async () => { const json = { name: 'Test', priceNegative: '2.00' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -104,7 +104,7 @@ describe('Decimal Decorator with financial-number', () => { }); it("should fail if an incorrect number of decimals is set manually", async () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Test'; product.priceTruncate = number('123.456'); // Set a value with more than 2 decimals @@ -117,17 +117,17 @@ describe('Decimal Decorator with financial-number', () => { }); -describe('Money Decorator with financial-number', () => { +describe('@Money Decorator', () => { describe('JSON Serialization and Deserialization', () => { it('should correctly serialize and deserialize a Money value', async () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; product.priceMoney = number('1.25'); const jsonObject = product.toJSON(); expect(jsonObject.priceMoney).toBe('1.25'); - const newProduct = SimpleProduct.fromJSON(jsonObject); + const newProduct = DecimalMoneyModel.fromJSON(jsonObject); const errors = await newProduct.validate(); expect(errors).toHaveLength(0); expect(newProduct.priceMoney.toString()).toBe('1.25'); @@ -135,7 +135,7 @@ describe('Money Decorator with financial-number', () => { it('should round the value on deserialization and pass validation', async () => { const json = { name: 'Ice Cream', priceMoney: '1.259' }; - const product = SimpleProduct.fromJSON(json); + const product = DecimalMoneyModel.fromJSON(json); const errors = await product.validate(); expect(errors).toHaveLength(0); @@ -145,7 +145,7 @@ describe('Money Decorator with financial-number', () => { describe('Validations', () => { it('should fail if an incorrect number of decimals is set manually', async () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; product.priceMoney = number('1.245'); @@ -156,7 +156,7 @@ describe('Money Decorator with financial-number', () => { }); it('should pass validation when the correct number of decimals is set manually', async () => { - const product = new SimpleProduct(); + const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; product.priceMoney = number('1.25'); diff --git a/test/Field.test.ts b/test/Field.test.ts index 35dcb26..5492195 100644 --- a/test/Field.test.ts +++ b/test/Field.test.ts @@ -148,36 +148,6 @@ describe("Product Model Validation", () => { const stringifyDoublePrice = product.stringifyDoublePrice; expect(stringifyDoublePrice).toBe(JSON.stringify({ double: 200 })); }); - it("should fail validation for invalid height", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - invalidUser.height = -1; // Invalid height - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "height", codes: ["isPositive"], messages: ["height must be a positive number"] }, - ]; - expect(summary).toStrictEqual(expected); - }); + - it("should fail for invalid birth year", async () => { - const invalidUser = new Person(); - invalidUser.firstName = "John"; - invalidUser.lastName = "Doe"; - invalidUser.email = "john.doe@example.com"; - invalidUser.age = 30; - invalidUser.height = 180; - invalidUser.birthYear = 1800; // Invalid birth year - - const errors = await invalidUser.validate(); - const summary = summarizeErrors(errors); - const expected = [ - { field: "birthYear", codes: ["min"], messages: ["birthYear must not be less than 1900"] }, - ]; - expect(summary).toStrictEqual(expected); - }); }); diff --git a/test/NumberInteger.test.ts b/test/NumberInteger.test.ts new file mode 100644 index 0000000..85f636e --- /dev/null +++ b/test/NumberInteger.test.ts @@ -0,0 +1,98 @@ +import { NumberIntegerModel } from "./model/NumberIntegerModel"; + +describe('Number and Integer Decorators', () => { + + // Pruebas para el decorador @Number + describe('@Number Decorator', () => { + it('should pass validation for a valid number within range', async () => { + const model = new NumberIntegerModel(); + model.decimalNumber = 50.5; + const errors = await model.validate(); + const fieldErrors = errors.filter(e => e.property === 'decimalNumber'); + expect(fieldErrors).toHaveLength(0); + }); + + it('should fail if value is less than min', async () => { + const model = new NumberIntegerModel(); + model.decimalNumber = 10.4; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'decimalNumber'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('min'); + }); + + it('should fail if value is greater than max', async () => { + const model = new NumberIntegerModel(); + model.decimalNumber = 100.6; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'decimalNumber'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('max'); + }); + + it('should fail if a positive number is not positive', async () => { + const model = new NumberIntegerModel(); + model.positiveNumber = -5; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'positiveNumber'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('isPositive'); + }); + + it('should fail if a negative number is not negative', async () => { + const model = new NumberIntegerModel(); + model.negativeNumber = 5; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'negativeNumber'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('isNegative'); + }); + }); + + // Pruebas para el decorador @Integer + describe('@Integer Decorator', () => { + it('should pass validation for a valid integer', async () => { + const model = new NumberIntegerModel(); + model.quantity = 50; + const errors = await model.validate(); + const fieldErrors = errors.filter(e => e.property === 'quantity'); + expect(fieldErrors).toHaveLength(0); + }); + + it('should fail validation for a floating-point number', async () => { + const model = new NumberIntegerModel(); + model.quantity = 50.5; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'quantity'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('isInteger', 'quantity must be an integer'); + }); + + it('should fail if integer is less than min', async () => { + const model = new NumberIntegerModel(); + model.quantity = -1; + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'quantity'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('min'); + }); + + it('should fail if a positive integer is zero', async () => { + const model = new NumberIntegerModel(); + model.positiveInteger = 0; // positive requires > 0 + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'positiveInteger'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('isPositive'); + }); + + it('should fail if a negative integer is zero', async () => { + const model = new NumberIntegerModel(); + model.negativeInteger = 0; // negative requires < 0 + const errors = await model.validate(); + const fieldError = errors.find(e => e.property === 'negativeInteger'); + expect(fieldError).toBeDefined(); + expect(fieldError?.constraints).toHaveProperty('isNegative'); + }); + }); +}); \ No newline at end of file diff --git a/test/model/SimpleProduct.ts b/test/model/DecimalMoneyModel.ts similarity index 87% rename from test/model/SimpleProduct.ts rename to test/model/DecimalMoneyModel.ts index c91dee1..6ad2a99 100644 --- a/test/model/SimpleProduct.ts +++ b/test/model/DecimalMoneyModel.ts @@ -3,11 +3,12 @@ import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; import { Decimal } from "@/model/types/Decimal"; import { Money } from "@/model/types/Money"; +import { Integer } from "@/model/types/Integer"; @Model({ docs: "Represents a product", }) -export class SimpleProduct extends BaseModel { +export class DecimalMoneyModel extends BaseModel { @Field({ required: true, }) @@ -28,7 +29,7 @@ export class SimpleProduct extends BaseModel { }) @Decimal({ decimals: 2, - roundingType: 'roundHalfToEven', + roundingType: 'roundHalfToEven', }) priceRound!: Decimal; diff --git a/test/model/NumberIntegerModel.ts b/test/model/NumberIntegerModel.ts new file mode 100644 index 0000000..8c110ae --- /dev/null +++ b/test/model/NumberIntegerModel.ts @@ -0,0 +1,48 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Number } from "@/model/types/Number"; +import { Integer } from "@/model/types/Integer"; + +@Model({ + docs: "A model for testing number and integer validations", +}) +export class NumberIntegerModel extends BaseModel { + @Field({}) + @Number({ + min: 10.5, + max: 100.5, + }) + decimalNumber!: number; + + @Field({}) + @Number({ + positive: true, + }) + positiveNumber!: number; + + @Field({}) + @Number({ + negative: true, + }) + negativeNumber!: number; + + @Field({}) + @Integer({ + min: 0, + max: 100, + }) + quantity!: number; + + @Field({}) + @Integer({ + positive: true, + }) + positiveInteger!: number; + + @Field({}) + @Integer({ + negative: true, + }) + negativeInteger!: number; +} \ No newline at end of file diff --git a/test/model/Person.ts b/test/model/Person.ts index b299c9f..650b198 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -37,12 +37,6 @@ export class Person extends BaseModel { }) age!: number; - @Field({}) - @Number({ - min: 1900, - max: new Date().getFullYear(), - }) - birthYear!: number; @Field({ required: (person: Person) => { @@ -51,11 +45,6 @@ export class Person extends BaseModel { }) parentEmail!: string; - @Field({}) - @Number({ - positive: true, - }) - height!: number; @Field({ available: false, // This field should be excluded from JSON operations diff --git a/test/model/Product.ts b/test/model/Product.ts index 542d685..cb43e18 100644 --- a/test/model/Product.ts +++ b/test/model/Product.ts @@ -48,14 +48,4 @@ export class Product extends BaseModel { get doublePrice(): number { return this.price * 2; } - - @Field({}) - @Decimal({ - decimals: 2, - roundingType: 'roundHalfToEven', // "Bankers Rounding" - positive: true, - min: '0.01', - max: '1000.00' - }) - interestRate!: Decimal; } From 2a8dc4cc34f9c00756127338bdaeb45ec9fe834f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 27 Aug 2025 12:58:52 -0300 Subject: [PATCH 085/254] Add initial version of Relationship type --- src/model/types/Relationship.ts | 168 ++++++++++++++++ src/model/types/index.ts | 2 + test/Relationship.test.ts | 342 ++++++++++++++++++++++++++++++++ test/model/Customer.ts | 24 +++ test/model/LineItem.ts | 26 +++ test/model/Order.ts | 34 ++++ test/model/Task.ts | 15 +- 7 files changed, 608 insertions(+), 3 deletions(-) create mode 100644 src/model/types/Relationship.ts create mode 100644 test/Relationship.test.ts create mode 100644 test/model/Customer.ts create mode 100644 test/model/LineItem.ts create mode 100644 test/model/Order.ts diff --git a/src/model/types/Relationship.ts b/src/model/types/Relationship.ts new file mode 100644 index 0000000..2bae4a6 --- /dev/null +++ b/src/model/types/Relationship.ts @@ -0,0 +1,168 @@ +import 'reflect-metadata'; +import { Transform, TransformationType, Type } from 'class-transformer'; +import { BaseModel } from '../BaseModel'; + +/** + * Relationship type options. + */ +export interface RelationshipOptions { + /** + * The type of relationship between models. + * - 'reference': Independent models that are related (customer <-> order) + * - 'composition': One model cannot exist without the other (order -> line items) + */ + type: 'reference' | 'composition'; + + /** + * For array relationships, specify the element type explicitly. + * This is needed because TypeScript doesn't emit array element type metadata. + */ + elementType?: () => any; +} + +/** + * Validates that a property is a BaseModel or array of BaseModel at runtime. + */ +function validateRelationshipType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + + // Check if it's an Array (for arrays of models) + if (designType === Array) { + return; // Arrays are valid for relationships + } + + // Check if it's a class that extends BaseModel + if (typeof designType === 'function') { + // Check if the type is a BaseModel or extends from it + let currentType = designType; + while (currentType && currentType.prototype) { + if (currentType.prototype instanceof BaseModel || currentType === BaseModel) { + return; // Valid BaseModel type + } + currentType = Object.getPrototypeOf(currentType); + } + } + + throw new Error(`@Relationship can only be applied to BaseModel or BaseModel[] properties: ${propertyKey}`); +} + +/** + * Relationship type decorator for model relationships. + * + * This decorator can be applied to properties that reference other BaseModel instances + * or arrays of BaseModel instances. It handles the serialization and deserialization + * of related models based on the relationship type. + * + * @param options - Configuration options for the relationship + * @param options.type - The type of relationship ('reference' or 'composition') + * + * @example + * ```typescript + * @Model() + * class Task extends BaseModel { + * @Field() + * @Relationship({ type: 'reference' }) + * project: Project; + * + * @Field() + * title: string; + * } + * + * @Model() + * class Order extends BaseModel { + * @Field() + * @Relationship({ type: 'reference' }) + * customer: Customer; + * + * @Field() + * @Relationship({ type: 'composition' }) + * lineItems: LineItem[]; + * } + * ``` + * + * @returns A property decorator function that handles model relationship transformation + * + * @throws {Error} When applied to non-BaseModel properties + * + * @remarks + * - Reference relationships: Both models exist independently + * - Composition relationships: The child cannot exist without the parent + * - For composition, the child objects are fully serialized with the parent + * - For reference, only a minimal representation may be serialized (future enhancement) + * - The decorator uses reflection to verify the property type at runtime + */ +export function Relationship(options: RelationshipOptions) { + if (!options || !options.type) { + throw new Error('@Relationship decorator requires a type option'); + } + + return function ( + target: T, + propertyKey: K + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateRelationshipType(proto, propName); + + // Store metadata about the relationship + Reflect.defineMetadata('field:type', 'relationship', proto, propName); + Reflect.defineMetadata('field:relationship:type', options.type, proto, propName); + + const designType = Reflect.getMetadata('design:type', proto, propName); + + // Apply Type decorator for proper class-transformer handling + if (designType === Array) { + // For arrays, we need explicit element type + if (options.elementType) { + Type(options.elementType)(target as any, propName); + } else { + Type(() => Object)(target as any, propName); + } + } else if (designType && typeof designType === 'function') { + // For single relationships, use the design type directly + Type(() => designType)(target as any, propName); + } + + // Custom transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: model instance(s) -> JSON + if (value == null) { + return value; + } + + // For both composition and reference, let class-transformer handle the transformation + // instead of manually calling toJSON() + return value; + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: JSON -> model instance(s) + if (value == null) { + return value; + } + + if (designType === Array && Array.isArray(value)) { + // For arrays, convert each element if we have the element type + if (options.elementType) { + const ElementType = options.elementType(); + if (ElementType && typeof ElementType.fromJSON === 'function') { + return value.map(item => + typeof item === 'object' && item !== null + ? ElementType.fromJSON(item) + : item + ); + } + } + return value; + } else if (typeof value === 'object' && value !== null && designType && typeof designType.fromJSON === 'function') { + // For single relationships, convert using the model's fromJSON + return designType.fromJSON(value); + } + + return value; + } + + return value; + })(target as any, propName); + }; +} diff --git a/src/model/types/index.ts b/src/model/types/index.ts index 3399981..fe70787 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -8,3 +8,5 @@ export { DateTime } from './DateTime'; export type { DateTimeOptions } from './DateTime'; export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; export type { DateTimeRangeOptions } from './DateTimeRange'; +export { Relationship } from './Relationship'; +export type { RelationshipOptions } from './Relationship'; diff --git a/test/Relationship.test.ts b/test/Relationship.test.ts new file mode 100644 index 0000000..c669fcb --- /dev/null +++ b/test/Relationship.test.ts @@ -0,0 +1,342 @@ +import { Relationship } from '@/model/types'; +import { Field } from '@/model/Field'; +import { Model } from '@/model/Model'; +import { BaseModel } from '@/model/BaseModel'; +import { Customer } from './model/Customer'; +import { LineItem } from './model/LineItem'; +import { Order } from './model/Order'; +import { Project } from './model/Project'; +import { Task } from './model/Task'; +import { DateTimeRangeType } from '@/model/types/DateTimeRange'; + +// Additional test models for relationship validation +@Model() +class Author extends BaseModel { + @Field({ + required: true, + }) + name!: string; +} + +@Model() +class Book extends BaseModel { + @Field({ + required: true, + }) + title!: string; + + @Field({ + required: true, + }) + @Relationship({ + type: 'reference' + }) + author!: Author; +} + +@Model() +class Library extends BaseModel { + @Field({ + required: true, + }) + name!: string; + + @Field({ + required: false, + }) + @Relationship({ + type: 'composition', + elementType: () => Book + }) + books!: Book[]; +} + +describe('Relationship Type', () => { + describe('Decorator Application', () => { + it('should allow @Relationship on BaseModel properties', () => { + expect(() => { + @Model() + class TestModel extends BaseModel { + @Field({}) + @Relationship({ type: 'reference' }) + author!: Author; + } + }).not.toThrow(); + }); + + it('should allow @Relationship on arrays of BaseModel', () => { + expect(() => { + @Model() + class TestModel extends BaseModel { + @Field({}) + @Relationship({ + type: 'composition', + elementType: () => Book + }) + books!: Book[]; + } + }).not.toThrow(); + }); + + it('should throw error when applied to non-BaseModel properties', () => { + expect(() => { + @Model() + class TestModel extends BaseModel { + @Field({}) + @Relationship({ type: 'reference' }) + invalidField!: string; // This should fail + } + }).toThrow('@Relationship can only be applied to BaseModel or BaseModel[] properties'); + }); + + it('should require type option', () => { + expect(() => { + @Model() + class TestModel extends BaseModel { + @Field({}) + // @ts-expect-error - Missing required type option + @Relationship({}) + author!: Author; + } + }).toThrow(); + }); + }); + + describe('Reference Relationships', () => { + it('should create models with reference relationships', () => { + const customer = new Customer(); + customer.name = 'John Doe'; + customer.email = 'john@example.com'; + + const order = new Order(); + order.customer = customer; + order.date = new Date('2023-01-15'); + order.lineItems = []; + + expect(order.customer).toBe(customer); + expect(order.customer.name).toBe('John Doe'); + }); + + it('should serialize reference relationships to JSON', () => { + + const project = new Project(); + project.name = 'Test Project'; + project.startDate = new Date('2023-01-01'); + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2023-01-01'); + activeRange.to = new Date('2023-12-31'); + project.activeRange = activeRange; + + const task = new Task(); + task.title = 'Test Task'; + task.project = project; + + const json = task.toJSON(); + + expect(json.title).toBe('Test Task'); + expect(json.project).toBeDefined(); + expect(json.project.name).toBe('Test Project'); + expect(json.project.startDate).toBeDefined(); + }); + + it('should deserialize reference relationships from JSON', async () => { + const projectData = { + name: 'Deserialized Project', + startDate: '2023-02-01T00:00:00.000Z' + }; + + const taskData = { + title: 'Deserialized Task', + project: projectData + }; + + const task = Task.fromJSON(taskData); + + const errors = await task.validate(); + // Log errors if any + if (errors) { + console.log('Validation errors:', errors); + } + + expect(task.title).toBe('Deserialized Task'); + expect(task.project).toBeDefined(); + expect(task.project.name).toBe('Deserialized Project'); + expect(task.project instanceof Project).toBe(true); + }); + }); + + describe('Composition Relationships', () => { + it('should create models with composition relationships', () => { + const lineItem1 = new LineItem(); + lineItem1.price = 10.99; + lineItem1.quantity = 2; + + const lineItem2 = new LineItem(); + lineItem2.price = 5.50; + lineItem2.quantity = 1; + + const customer = new Customer(); + customer.name = 'Bob Johnson'; + customer.email = 'bob@example.com'; + + const order = new Order(); + order.customer = customer; + order.date = new Date('2023-03-10'); + order.lineItems = [lineItem1, lineItem2]; + + expect(order.lineItems).toHaveLength(2); + expect(order.lineItems[0]?.price).toBe(10.99); + expect(order.lineItems[1]?.quantity).toBe(1); + }); + + it('should serialize composition relationships to JSON', () => { + const lineItem = new LineItem(); + lineItem.price = 15.00; + lineItem.quantity = 3; + + const customer = new Customer(); + customer.name = 'Alice Brown'; + customer.email = 'alice@example.com'; + + const order = new Order(); + order.customer = customer; + order.date = new Date('2023-04-05'); + order.lineItems = [lineItem]; + + const json = order.toJSON(); + + expect(json.customer).toBeDefined(); + expect(json.customer.name).toBe('Alice Brown'); + expect(json.lineItems).toHaveLength(1); + expect(json.lineItems[0].price).toBe(15.00); + expect(json.lineItems[0].quantity).toBe(3); + }); + + it('should deserialize composition relationships from JSON', () => { + const orderData = { + customer: { + name: 'Charlie Wilson', + email: 'charlie@example.com' + }, + date: '2023-05-12T00:00:00.000Z', + lineItems: [ + { price: 8.99, quantity: 2 }, + { price: 12.50, quantity: 1 } + ] + }; + + const order = Order.fromJSON(orderData); + + expect(order.customer.name).toBe('Charlie Wilson'); + expect(order.customer instanceof Customer).toBe(true); + expect(order.lineItems).toHaveLength(2); + expect(order.lineItems[0] instanceof LineItem).toBe(true); + expect(order.lineItems[0]?.price).toBe(8.99); + expect(order.lineItems[1]?.quantity).toBe(1); + }); + + it('should handle calculated fields in composition relationships', async () => { + const lineItem = new LineItem(); + lineItem.price = 10.00; + lineItem.quantity = 5; + + await lineItem.calculate(); + expect(lineItem.total).toBe(50.00); + + const order = new Order(); + order.lineItems = [lineItem]; + + const json = order.toJSON(); + expect(json.lineItems[0].total).toBe(50.00); + }); + }); + + describe('Edge Cases', () => { + it('should handle null/undefined relationships', () => { + const task = new Task(); + task.title = 'Task without project'; + // project is undefined + + const json = task.toJSON(); + expect(json.project).toBeUndefined(); + }); + + it('should handle empty arrays in composition relationships', () => { + const order = new Order(); + order.lineItems = []; + + const json = order.toJSON(); + expect(json.lineItems).toEqual([]); + + const restored = Order.fromJSON(json); + expect(restored.lineItems).toEqual([]); + }); + + it('should preserve metadata for relationships', () => { + const fieldType = Reflect.getMetadata('field:type', Order.prototype, 'customer'); + const relationshipType = Reflect.getMetadata('field:relationship:type', Order.prototype, 'customer'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('reference'); + + const lineItemsFieldType = Reflect.getMetadata('field:type', Order.prototype, 'lineItems'); + const lineItemsRelType = Reflect.getMetadata('field:relationship:type', Order.prototype, 'lineItems'); + + expect(lineItemsFieldType).toBe('relationship'); + expect(lineItemsRelType).toBe('composition'); + }); + }); + + describe('Complex Nested Relationships', () => { + it('should handle nested composition and reference relationships', () => { + const author = new Author(); + author.name = 'Stephen King'; + + const book1 = new Book(); + book1.title = 'The Shining'; + book1.author = author; + + const book2 = new Book(); + book2.title = 'It'; + book2.author = author; + + const library = new Library(); + library.name = 'City Library'; + library.books = [book1, book2]; + + const json = library.toJSON(); + + expect(json.name).toBe('City Library'); + expect(json.books).toHaveLength(2); + expect(json.books[0].title).toBe('The Shining'); + expect(json.books[0].author.name).toBe('Stephen King'); + expect(json.books[1].title).toBe('It'); + expect(json.books[1].author.name).toBe('Stephen King'); + }); + + it('should deserialize complex nested relationships', () => { + const libraryData = { + name: 'University Library', + books: [ + { + title: 'Design Patterns', + author: { name: 'Gang of Four' } + }, + { + title: 'Clean Code', + author: { name: 'Robert Martin' } + } + ] + }; + + const library = Library.fromJSON(libraryData); + + expect(library.name).toBe('University Library'); + expect(library.books).toHaveLength(2); + expect(library.books[0] instanceof Book).toBe(true); + expect(library.books[0]?.author instanceof Author).toBe(true); + expect(library.books[0]?.author.name).toBe('Gang of Four'); + expect(library.books[1]?.title).toBe('Clean Code'); + }); + }); +}); diff --git a/test/model/Customer.ts b/test/model/Customer.ts new file mode 100644 index 0000000..4c55eac --- /dev/null +++ b/test/model/Customer.ts @@ -0,0 +1,24 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Text } from "@/model/types"; + +@Model({ + docs: "Represents a customer", +}) +export class Customer extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 100, + }) + name!: string; + + @Field({ + required: false, + }) + @Text() + email!: string; +} diff --git a/test/model/LineItem.ts b/test/model/LineItem.ts new file mode 100644 index 0000000..776b783 --- /dev/null +++ b/test/model/LineItem.ts @@ -0,0 +1,26 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; + +@Model({ + docs: "Represents a line item in an order", +}) +export class LineItem extends BaseModel { + @Field({ + required: true, + }) + price!: number; + + @Field({ + required: true, + }) + quantity!: number; + + @Field({ + required: false, + calculation: 'manual' + }) + get total(): number { + return this.price * this.quantity; + } +} diff --git a/test/model/Order.ts b/test/model/Order.ts new file mode 100644 index 0000000..4c580a1 --- /dev/null +++ b/test/model/Order.ts @@ -0,0 +1,34 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { DateTime, Relationship } from "@/model/types"; +import { Customer } from "./Customer"; +import { LineItem } from "./LineItem"; + +@Model({ + docs: "Represents an order with customer and line items", +}) +export class Order extends BaseModel { + @Field({ + required: true, + }) + @Relationship({ + type: 'reference' + }) + customer!: Customer; + + @Field({ + required: true, + }) + @DateTime() + date!: Date; + + @Field({ + required: false, + }) + @Relationship({ + type: 'composition', + elementType: () => LineItem + }) + lineItems!: LineItem[]; +} diff --git a/test/model/Task.ts b/test/model/Task.ts index b28d7b9..6b413ec 100644 --- a/test/model/Task.ts +++ b/test/model/Task.ts @@ -1,7 +1,8 @@ import { Field } from "@/model/Field"; import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; -import { Choice, Text } from "@/model/types"; +import { Choice, Text, Relationship } from "@/model/types"; +import { Project } from "./Project"; export enum TaskStatus { ToDo = 'toDo', @@ -28,11 +29,19 @@ export class Task extends BaseModel { }) title!: string; - @Field({}) + @Field({required: true}) @Choice() status: TaskStatus = TaskStatus.ToDo; - @Field({}) + @Field({required: true}) @Choice() priority: Priority = Priority.Medium; + + @Field({ + required: false, + }) + @Relationship({ + type: 'reference' + }) + project!: Project; } From 6c9e28315b3c933bb15fedaabae76063240998e9 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 28 Aug 2025 10:09:15 -0300 Subject: [PATCH 086/254] Modify fromJSON() to fill default and calculated values; add tests --- src/model/BaseModel.ts | 86 +++++++++++++++++- test/Relationship.test.ts | 9 +- test/fromJSON-defaults.test.ts | 161 +++++++++++++++++++++++++++++++++ 3 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 test/fromJSON-defaults.test.ts diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 85ce380..29ee030 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -155,6 +155,10 @@ export abstract class BaseModel { * include or exclude fields during deserialization. The method also enables * transformation and coercion when possible to convert string values to appropriate types. * + * Additionally, this method automatically fills empty values with: + * - Default values defined in the class declaration + * - Calculated values for fields marked with `calculation: 'manual'` + * * @param this - The constructor of the target model class * @param json - The JSON object to convert into a model instance * @returns A new instance of the model class populated with data from the JSON @@ -177,10 +181,90 @@ export abstract class BaseModel { this: new () => T, json: Record ): T { - return plainToInstance(this, json, { + // First, create the instance using class-transformer + const instance = plainToInstance(this, json, { excludeExtraneousValues: true, enableImplicitConversion: true, // Enable coercion when possible }); + + // Apply default values for fields that are undefined/null but have defaults + BaseModel.applyDefaultValues(instance); + + // Calculate manual calculation fields + instance.calculate(); + + return instance; + } + + /** + * Applies default values to fields that are undefined/null in the instance + * but have default values defined in the class. + * + * @param instance - The model instance to apply default values to + */ + private static applyDefaultValues(instance: T): void { + // Create a temporary instance to get the default values + const defaultInstance = new (instance.constructor as new () => T)(); + + // Get all property names from the prototype chain + const propertyNames = this.getAllPropertyNames(instance); + + for (const propertyName of propertyNames) { + // Check if this property has a Field decorator + if (Reflect.hasMetadata('field:docs', instance, propertyName) || + Reflect.hasMetadata('field:validation', instance, propertyName) || + this.hasFieldDecorator(instance, propertyName)) { + + // Skip calculated fields as they will be handled by calculate() + if (Reflect.hasMetadata('field:calculation', instance, propertyName)) { + continue; + } + + // If the property is undefined/null in the instance but has a default value + if ((instance as any)[propertyName] === undefined || (instance as any)[propertyName] === null) { + const defaultValue = (defaultInstance as any)[propertyName]; + if (defaultValue !== undefined && defaultValue !== null) { + (instance as any)[propertyName] = defaultValue; + } + } + } + } + } + + /** + * Gets all property names from the instance and its prototype chain + */ + private static getAllPropertyNames(instance: BaseModel): string[] { + const propertyNames = new Set(); + + // Get properties from the instance itself + Object.getOwnPropertyNames(instance).forEach(name => propertyNames.add(name)); + + // Get properties from the prototype chain + let prototype = Object.getPrototypeOf(instance); + while (prototype && prototype !== BaseModel.prototype && prototype !== Object.prototype) { + Object.getOwnPropertyNames(prototype).forEach(name => { + if (name !== 'constructor') { + propertyNames.add(name); + } + }); + prototype = Object.getPrototypeOf(prototype); + } + + return Array.from(propertyNames); + } + + /** + * Checks if a property has any Field-related metadata + */ + private static hasFieldDecorator(instance: BaseModel, propertyName: string): boolean { + // Check for any metadata that would indicate a Field decorator was applied + const metadataKeys = Reflect.getMetadataKeys(instance, propertyName) || []; + return metadataKeys.some(key => + typeof key === 'string' && key.startsWith('field:') + ) || metadataKeys.includes('custom:field') || + metadataKeys.includes('field') || + metadataKeys.includes('design:type'); } /** diff --git a/test/Relationship.test.ts b/test/Relationship.test.ts index c669fcb..e356967 100644 --- a/test/Relationship.test.ts +++ b/test/Relationship.test.ts @@ -153,15 +153,16 @@ describe('Relationship Type', () => { const task = Task.fromJSON(taskData); const errors = await task.validate(); - // Log errors if any - if (errors) { - console.log('Validation errors:', errors); - } + expect(errors).toHaveLength(0); // Should have no validation errors expect(task.title).toBe('Deserialized Task'); expect(task.project).toBeDefined(); expect(task.project.name).toBe('Deserialized Project'); expect(task.project instanceof Project).toBe(true); + + // Verify that default values were applied + expect(task.status).toBe('toDo'); + expect(task.priority).toBe(2); // Priority.Medium }); }); diff --git a/test/fromJSON-defaults.test.ts b/test/fromJSON-defaults.test.ts new file mode 100644 index 0000000..7047b8c --- /dev/null +++ b/test/fromJSON-defaults.test.ts @@ -0,0 +1,161 @@ +import { Task, TaskStatus, Priority } from './model/Task'; +import { Product } from './model/Product'; +import { Project } from './model/Project'; + +describe('fromJSON with Default and Calculated Values', () => { + describe('Default Values', () => { + it('should fill status and priority with default values when missing from JSON', () => { + const projectData = { + name: 'Deserialized Project', + startDate: '2023-02-01T00:00:00.000Z' + }; + + const taskData = { + title: 'Deserialized Task', + project: projectData + }; + + const task = Task.fromJSON(taskData); + + // Check that the task object was created correctly + expect(task.title).toBe('Deserialized Task'); + expect(task.project).toBeDefined(); + expect(task.project.name).toBe('Deserialized Project'); + + // Check that default values were applied for missing fields + expect(task.status).toBe(TaskStatus.ToDo); // 'toDo' + expect(task.priority).toBe(Priority.Medium); // 2 + + // Verify the task instance is valid + expect(task instanceof Task).toBe(true); + }); + + it('should not override explicitly provided values with defaults', () => { + const taskData = { + title: 'Custom Task', + status: TaskStatus.Done, + priority: Priority.High + }; + + const task = Task.fromJSON(taskData); + + expect(task.title).toBe('Custom Task'); + expect(task.status).toBe(TaskStatus.Done); + expect(task.priority).toBe(Priority.High); + }); + + it('should validate successfully when default values are applied', async () => { + const taskData = { + title: 'Valid Task' + }; + + const task = Task.fromJSON(taskData); + + // Should not have validation errors because defaults are applied + const errors = await task.validate(); + expect(errors).toHaveLength(0); + }); + }); + + describe('Calculated Values', () => { + it('should calculate total from quantity and price when creating from JSON', () => { + const productData = { + name: 'Test Product', + description: 'A test product', + quantity: 5, + price: 100 + }; + + const product = Product.fromJSON(productData); + + expect(product.name).toBe('Test Product'); + expect(product.quantity).toBe(5); + expect(product.price).toBe(100); + + // The total should be calculated automatically + expect(product.total).toBe(500); // 5 * 100 + }); + + it('should calculate all dependent calculated fields', () => { + const productData = { + name: 'Complex Product', + description: 'A complex product with calculations', + quantity: 3, + price: 25 + }; + + const product = Product.fromJSON(productData); + + expect(product.total).toBe(75); // 3 * 25 + expect(product.doublePrice).toBe(50); // 25 * 2 + expect(product.stringifyDoublePrice).toBe(JSON.stringify({ double: 50 })); + }); + + it('should handle products with zero values correctly', () => { + const productData = { + name: 'Free Product', + description: 'A free product', + quantity: 10, + price: 0 + }; + + const product = Product.fromJSON(productData); + + expect(product.total).toBe(0); // 10 * 0 + expect(product.doublePrice).toBe(0); // 0 * 2 + }); + }); + + describe('Combined Default and Calculated Values', () => { + it('should apply both defaults and calculations in the same operation', () => { + // Test a scenario where some fields have defaults and others are calculated + const taskData = { + title: 'Mixed Task' + // status and priority missing - should get defaults + }; + + const task = Task.fromJSON(taskData); + + // Defaults should be applied + expect(task.status).toBe(TaskStatus.ToDo); + expect(task.priority).toBe(Priority.Medium); + + // Should validate without errors + return task.validate().then(errors => { + expect(errors).toHaveLength(0); + }); + }); + }); + + describe('Edge Cases', () => { + it('should handle empty JSON object gracefully', () => { + const taskData = {}; + + const task = Task.fromJSON(taskData); + + // Should apply defaults for required fields with defaults + expect(task.status).toBe(TaskStatus.ToDo); + expect(task.priority).toBe(Priority.Medium); + + // Title is required but has no default, so validation should fail + return task.validate().then(errors => { + expect(errors.length).toBeGreaterThan(0); + expect(errors.some(error => error.property === 'title')).toBe(true); + }); + }); + + it('should handle null values in JSON by applying defaults', () => { + const taskData = { + title: 'Null Fields Task', + status: null, + priority: null + }; + + const task = Task.fromJSON(taskData); + + // Null values should be replaced with defaults + expect(task.status).toBe(TaskStatus.ToDo); + expect(task.priority).toBe(Priority.Medium); + }); + }); +}); From 0c79b9011a395425f46c7b215b5fd80cb176099f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 28 Aug 2025 10:48:16 -0300 Subject: [PATCH 087/254] Add ValidateNested from class-validator and add tests to check complex objects --- src/model/types/Relationship.ts | 4 + test/ComplexObjects.test.ts | 487 ++++++++++++++++++++++++++++++++ test/Relationship.test.ts | 6 +- 3 files changed, 496 insertions(+), 1 deletion(-) create mode 100644 test/ComplexObjects.test.ts diff --git a/src/model/types/Relationship.ts b/src/model/types/Relationship.ts index 2bae4a6..f48ba45 100644 --- a/src/model/types/Relationship.ts +++ b/src/model/types/Relationship.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; +import { ValidateNested } from 'class-validator'; import { BaseModel } from '../BaseModel'; /** @@ -111,6 +112,9 @@ export function Relationship(options: RelationshipOptions) { const designType = Reflect.getMetadata('design:type', proto, propName); + // Apply ValidateNested for nested validation of BaseModel instances + ValidateNested()(target as any, propName); + // Apply Type decorator for proper class-transformer handling if (designType === Array) { // For arrays, we need explicit element type diff --git a/test/ComplexObjects.test.ts b/test/ComplexObjects.test.ts new file mode 100644 index 0000000..bf2428e --- /dev/null +++ b/test/ComplexObjects.test.ts @@ -0,0 +1,487 @@ +import { Field } from "@/model/Field"; +import { Model } from "@/model/Model"; +import { BaseModel } from "@/model/BaseModel"; +import { Text, Email } from "@/model/types"; +import { Relationship } from "@/model/types"; +import type { ValidationError } from "class-validator"; + +/** + * Converts an array of class-validator ValidationError objects into a stable, plain summary. + * This version handles nested errors properly. + */ +function summarizeErrors(errors: ValidationError[]) { + const result: { field: string; codes: string[]; messages: string[] }[] = []; + + function processError(error: ValidationError, parentField: string = '') { + const fieldPath = parentField ? `${parentField}.${error.property}` : error.property; + + if (error.constraints) { + result.push({ + field: fieldPath, + codes: Object.keys(error.constraints), + messages: Object.values(error.constraints), + }); + } + + // Process nested errors (children) + if (error.children && error.children.length > 0) { + error.children.forEach(childError => { + processError(childError, fieldPath); + }); + } + } + + errors.forEach(error => processError(error)); + return result; +} + +// Test models for complex object validation + +@Model({ + docs: "Address model for testing nested validation", +}) +class Address extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 5, + maxLength: 100, + }) + street!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 50, + }) + city!: string; + + @Field({ + required: true, + }) + @Text({ + regex: /^\d{5}(-\d{4})?$/, + regexMessage: "zipCode must be in format 12345 or 12345-6789", + }) + zipCode!: string; +} + +@Model({ + docs: "Contact model for testing array validation", +}) +class Contact extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 50, + }) + name!: string; + + @Field({ + required: true, + }) + @Email() + email!: string; + + @Field({ + validation: (value: string) => { + const phoneRegex = /^\(\d{3}\) \d{3}-\d{4}$/; + if (!phoneRegex.test(value)) { + return [{ + constraint: "invalidPhoneFormat", + message: "Phone must be in format (123) 456-7890" + }]; + } + return []; + }, + }) + phone!: string; +} + +@Model({ + docs: "Company model for testing nested objects and arrays", +}) +class Company extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 100, + }) + name!: string; + + @Field({ + required: true, + }) + @Relationship({ + type: 'composition' + }) + address!: Address; + + @Field({ + required: false, + }) + @Relationship({ + type: 'composition', + elementType: () => Contact + }) + contacts!: Contact[]; + + @Field({ + required: false, + }) + @Relationship({ + type: 'composition', + elementType: () => Address + }) + branches!: Address[]; +} + +describe("Complex Objects Validation", () => { + describe("Nested Object Validation", () => { + it("should validate nested objects with Model decorator", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid address + const address = new Address(); + address.street = "123 Main Street"; + address.city = "Springfield"; + address.zipCode = "12345"; + company.address = address; + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation when nested object is invalid", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create an invalid address + const address = new Address(); + address.street = "123"; // Too short + address.city = "S"; // Too short + address.zipCode = "123"; // Invalid format + company.address = address; + + const errors = await company.validate(); + const summary = summarizeErrors(errors); + + // Should have validation errors for the nested address fields + expect(summary.length).toBeGreaterThan(0); + + // Check that we have errors for address properties + const addressErrors = summary.filter(err => err.field.startsWith('address')); + expect(addressErrors.length).toBeGreaterThan(0); + }); + + it("should fail validation when nested object is missing required field", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create address with missing required fields + const address = new Address(); + address.street = "123 Main Street"; + // Missing city and zipCode + company.address = address; + + const errors = await company.validate(); + const summary = summarizeErrors(errors); + + expect(summary.length).toBeGreaterThan(0); + + // Should have validation errors for missing required fields + const cityError = summary.find(err => err.field === 'address.city'); + const zipError = summary.find(err => err.field === 'address.zipCode'); + + expect(cityError).toBeDefined(); + expect(zipError).toBeDefined(); + expect(cityError?.codes).toContain('isNotEmpty'); + expect(zipError?.codes).toContain('isNotEmpty'); + }); + + it("should pass validation when nested object is optional and not provided", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a minimal address for the required field + const address = new Address(); + address.street = "123 Main Street"; + address.city = "Springfield"; + address.zipCode = "12345"; + company.address = address; + + // Don't set optional contacts array + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("Array Validation", () => { + it("should validate each item in an array", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid address + const address = new Address(); + address.street = "123 Main Street"; + address.city = "Springfield"; + address.zipCode = "12345"; + company.address = address; + + // Create valid contacts array + const contact1 = new Contact(); + contact1.name = "John Doe"; + contact1.email = "john@example.com"; + contact1.phone = "(555) 123-4567"; + + const contact2 = new Contact(); + contact2.name = "Jane Smith"; + contact2.email = "jane@example.com"; + contact2.phone = "(555) 987-6543"; + + company.contacts = [contact1, contact2]; + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation when array contains invalid items", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid address + const address = new Address(); + address.street = "123 Main Street"; + address.city = "Springfield"; + address.zipCode = "12345"; + company.address = address; + + // Create contacts array with invalid items + const contact1 = new Contact(); + contact1.name = ""; // Invalid: empty name + contact1.email = "invalid-email"; // Invalid: not a proper email + contact1.phone = "123-456"; // Invalid: wrong phone format + + const contact2 = new Contact(); + contact2.name = "Jane Smith"; + contact2.email = "jane@example.com"; + contact2.phone = "(555) 987-6543"; // Valid + + company.contacts = [contact1, contact2]; + + const errors = await company.validate(); + const summary = summarizeErrors(errors); + + expect(summary.length).toBeGreaterThan(0); + + // Should have validation errors for the invalid contact items + const contactErrors = summary.filter(err => err.field.includes('contacts')); + expect(contactErrors.length).toBeGreaterThan(0); + }); + + it("should validate multiple arrays of nested objects", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid main address + const mainAddress = new Address(); + mainAddress.street = "123 Main Street"; + mainAddress.city = "Springfield"; + mainAddress.zipCode = "12345"; + company.address = mainAddress; + + // Create valid branch addresses + const branch1 = new Address(); + branch1.street = "456 Oak Avenue"; + branch1.city = "Portland"; + branch1.zipCode = "97201"; + + const branch2 = new Address(); + branch2.street = "789 Pine Street"; + branch2.city = "Seattle"; + branch2.zipCode = "98101-1234"; // Extended zip format + + company.branches = [branch1, branch2]; + + // Create valid contacts + const contact = new Contact(); + contact.name = "Manager"; + contact.email = "manager@example.com"; + contact.phone = "(555) 000-0000"; + company.contacts = [contact]; + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should fail validation when multiple arrays contain invalid items", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid main address + const mainAddress = new Address(); + mainAddress.street = "123 Main Street"; + mainAddress.city = "Springfield"; + mainAddress.zipCode = "12345"; + company.address = mainAddress; + + // Create invalid branch addresses + const invalidBranch = new Address(); + invalidBranch.street = "Bad"; // Too short + invalidBranch.city = ""; // Empty + invalidBranch.zipCode = "invalid"; // Wrong format + + company.branches = [invalidBranch]; + + // Create invalid contacts + const invalidContact = new Contact(); + invalidContact.name = ""; // Empty name + invalidContact.email = "not-an-email"; // Invalid email + invalidContact.phone = "wrong"; // Invalid phone + + company.contacts = [invalidContact]; + + const errors = await company.validate(); + const summary = summarizeErrors(errors); + + expect(summary.length).toBeGreaterThan(0); + + // Should have validation errors for both arrays + const branchErrors = summary.filter(err => err.field.includes('branches')); + const contactErrors = summary.filter(err => err.field.includes('contacts')); + + expect(branchErrors.length).toBeGreaterThan(0); + expect(contactErrors.length).toBeGreaterThan(0); + }); + + it("should pass validation with empty arrays when arrays are optional", async () => { + const company = new Company(); + company.name = "Tech Corp"; + + // Create a valid main address + const address = new Address(); + address.street = "123 Main Street"; + address.city = "Springfield"; + address.zipCode = "12345"; + company.address = address; + + // Set empty arrays for optional fields + company.contacts = []; + company.branches = []; + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + }); + + describe("Combined Nested and Array Validation", () => { + it("should validate complex nested structures with arrays", async () => { + const company = new Company(); + company.name = "Global Tech Solutions"; + + // Main address + const mainAddress = new Address(); + mainAddress.street = "1000 Technology Drive"; + mainAddress.city = "San Francisco"; + mainAddress.zipCode = "94102"; + company.address = mainAddress; + + // Multiple branch offices + const branch1 = new Address(); + branch1.street = "2000 Innovation Blvd"; + branch1.city = "Austin"; + branch1.zipCode = "73301"; + + const branch2 = new Address(); + branch2.street = "3000 Research Way"; + branch2.city = "Boston"; + branch2.zipCode = "02101-5555"; + + company.branches = [branch1, branch2]; + + // Multiple contacts + const ceo = new Contact(); + ceo.name = "Alice Johnson"; + ceo.email = "alice.johnson@globaltech.com"; + ceo.phone = "(415) 555-0001"; + + const cto = new Contact(); + cto.name = "Bob Smith"; + cto.email = "bob.smith@globaltech.com"; + cto.phone = "(415) 555-0002"; + + const hr = new Contact(); + hr.name = "Carol Williams"; + hr.email = "carol.williams@globaltech.com"; + hr.phone = "(415) 555-0003"; + + company.contacts = [ceo, cto, hr]; + + const errors = await company.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should detect validation errors in complex nested structures", async () => { + const company = new Company(); + company.name = ""; // Invalid: empty name + + // Invalid main address + const mainAddress = new Address(); + mainAddress.street = "12"; // Too short + mainAddress.city = "SF"; // Valid but short + mainAddress.zipCode = "941"; // Invalid format + company.address = mainAddress; + + // Mix of valid and invalid branches + const validBranch = new Address(); + validBranch.street = "2000 Innovation Blvd"; + validBranch.city = "Austin"; + validBranch.zipCode = "73301"; + + const invalidBranch = new Address(); + invalidBranch.street = ""; // Empty + invalidBranch.city = ""; // Empty + invalidBranch.zipCode = ""; // Empty + + company.branches = [validBranch, invalidBranch]; + + // Mix of valid and invalid contacts + const validContact = new Contact(); + validContact.name = "Alice Johnson"; + validContact.email = "alice@company.com"; + validContact.phone = "(415) 555-0001"; + + const invalidContact = new Contact(); + invalidContact.name = ""; // Empty + invalidContact.email = "invalid"; // Invalid email + invalidContact.phone = "555"; // Invalid phone + + company.contacts = [validContact, invalidContact]; + + const errors = await company.validate(); + const summary = summarizeErrors(errors); + + expect(summary.length).toBeGreaterThan(0); + + // Should have errors from company name, address, branches, and contacts + const companyNameErrors = summary.filter(err => err.field === 'name'); + const addressErrors = summary.filter(err => err.field.includes('address')); + const branchErrors = summary.filter(err => err.field.includes('branches')); + const contactErrors = summary.filter(err => err.field.includes('contacts')); + + expect(companyNameErrors.length).toBeGreaterThan(0); + expect(addressErrors.length).toBeGreaterThan(0); + expect(branchErrors.length).toBeGreaterThan(0); + expect(contactErrors.length).toBeGreaterThan(0); + }); + }); +}); \ No newline at end of file diff --git a/test/Relationship.test.ts b/test/Relationship.test.ts index e356967..5a6b96d 100644 --- a/test/Relationship.test.ts +++ b/test/Relationship.test.ts @@ -142,7 +142,11 @@ describe('Relationship Type', () => { it('should deserialize reference relationships from JSON', async () => { const projectData = { name: 'Deserialized Project', - startDate: '2023-02-01T00:00:00.000Z' + startDate: '2023-02-01T00:00:00.000Z', + activeRange: { + from: '2023-02-01T00:00:00.000Z', + to: '2023-12-31T23:59:59.999Z' + } }; const taskData = { From c27f93fa21c317ef700c9d56f34aa2477a8df04d Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 29 Aug 2025 09:35:45 -0300 Subject: [PATCH 088/254] distinguish between undefined and null states during serialization and deserialization --- test/Relationship.test.ts | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/test/Relationship.test.ts b/test/Relationship.test.ts index e356967..bb05164 100644 --- a/test/Relationship.test.ts +++ b/test/Relationship.test.ts @@ -253,15 +253,42 @@ describe('Relationship Type', () => { }); describe('Edge Cases', () => { - it('should handle null/undefined relationships', () => { + it('should handle undefined relationships (not loaded)', () => { const task = new Task(); task.title = 'Task without project'; - // project is undefined + // project is undefined - relationship was never loaded/set const json = task.toJSON(); expect(json.project).toBeUndefined(); }); + it('should handle null relationships (loaded but empty)', () => { + const task = new Task(); + task.title = 'Task with no project'; + (task as any).project = null; // explicitly set to null - relationship was loaded but is empty + + const json = task.toJSON(); + expect(json.project).toBeNull(); + }); + + it('should preserve null/undefined distinction during deserialization', () => { + // Test undefined case + const taskDataUndefined = { + title: 'Task without project' + // project property is not included (undefined) + }; + const taskUndefined = Task.fromJSON(taskDataUndefined); + expect(taskUndefined.project).toBeUndefined(); + + // Test null case + const taskDataNull = { + title: 'Task with null project', + project: null // explicitly null + }; + const taskNull = Task.fromJSON(taskDataNull); + expect(taskNull.project).toBeNull(); + }); + it('should handle empty arrays in composition relationships', () => { const order = new Order(); order.lineItems = []; From 8a48fc67e80985b403c18e14ef956f87dab078ca Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 29 Aug 2025 09:55:25 -0300 Subject: [PATCH 089/254] Add exports to index.ts and remove unused code --- src/model/types/SharedTypes.ts | 22 ---------------------- src/model/types/index.ts | 4 ++++ test/model/DecimalMoneyModel.ts | 4 +--- test/model/NumberIntegerModel.ts | 3 +-- 4 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 src/model/types/SharedTypes.ts diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts deleted file mode 100644 index 92eb458..0000000 --- a/src/model/types/SharedTypes.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Represents a single validation error from a custom validation function. - */ -export type ValidationIssue = { constraint: string; message: string }; - -/** - * A function that performs custom validation on a field's value. - * @param TValue The type of the field's value. - * @param TObject The type of the object being validated. - * @returns An array of ValidationIssue objects. Returns an empty array if validation passes. - */ -export type CustomValidationFunction = ( - value: TValue, - object: TObject -) => ValidationIssue[]; - -/** - * A function that conditionally determines if a field is required. - * @param TObject The type of the object being validated. - * @returns `true` if the field is required, `false` otherwise. - */ -export type CustomRequiredFunction = (object: TObject) => boolean; diff --git a/src/model/types/index.ts b/src/model/types/index.ts index 3399981..22927c9 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -8,3 +8,7 @@ export { DateTime } from './DateTime'; export type { DateTimeOptions } from './DateTime'; export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; export type { DateTimeRangeOptions } from './DateTimeRange'; +export { Integer } from './Integer'; +export { Money } from './Money'; +export { Number } from './Number'; +export { Decimal } from './Decimal'; \ No newline at end of file diff --git a/test/model/DecimalMoneyModel.ts b/test/model/DecimalMoneyModel.ts index 6ad2a99..cb58f6a 100644 --- a/test/model/DecimalMoneyModel.ts +++ b/test/model/DecimalMoneyModel.ts @@ -1,9 +1,7 @@ import { Field } from "@/model/Field"; import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; -import { Decimal } from "@/model/types/Decimal"; -import { Money } from "@/model/types/Money"; -import { Integer } from "@/model/types/Integer"; +import { Decimal, Money } from "@/model/types"; @Model({ docs: "Represents a product", diff --git a/test/model/NumberIntegerModel.ts b/test/model/NumberIntegerModel.ts index 8c110ae..e6ee9e2 100644 --- a/test/model/NumberIntegerModel.ts +++ b/test/model/NumberIntegerModel.ts @@ -1,8 +1,7 @@ import { Field } from "@/model/Field"; import { Model } from "@/model/Model"; import { BaseModel } from "@/model/BaseModel"; -import { Number } from "@/model/types/Number"; -import { Integer } from "@/model/types/Integer"; +import { Number, Integer } from "@/model/types"; @Model({ docs: "A model for testing number and integer validations", From fffe0763cb76a329d3d5d4777d6b7365200749f2 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 29 Aug 2025 11:56:12 -0300 Subject: [PATCH 090/254] Add basic data source connection and initialization --- package.json | 5 +- src/datasources/DataSource.ts | 61 ++++++ src/datasources/index.ts | 5 + .../typeorm/TypeORMSqlDataSource.ts | 191 ++++++++++++++++++ src/model/Field.ts | 15 +- src/model/index.ts | 12 ++ src/model/types/SharedTypes.ts | 34 ++++ test/datasources/TypeORMConnection.test.ts | 147 ++++++++++++++ test/examples/TypeORMExample.test.ts | 55 +++++ 9 files changed, 515 insertions(+), 10 deletions(-) create mode 100644 src/datasources/DataSource.ts create mode 100644 src/datasources/index.ts create mode 100644 src/datasources/typeorm/TypeORMSqlDataSource.ts create mode 100644 src/model/index.ts create mode 100644 src/model/types/SharedTypes.ts create mode 100644 test/datasources/TypeORMConnection.test.ts create mode 100644 test/examples/TypeORMExample.test.ts diff --git a/package.json b/package.json index 434bf27..0f0fa8c 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,11 @@ "devDependencies": { "@types/jest": "^29.5.12", "@types/node": "^24.3.0", + "@types/sqlite3": "^3.1.11", "jest": "^29.7.0", "jest-circus": "^29.7.0", "reflect-metadata": "^0.2.2", + "sqlite3": "^5.1.7", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.9.2" @@ -30,6 +32,7 @@ "dependencies": { "class-transformer": "^0.5.1", "class-validator": "^0.14.2", - "financial-number": "^4.0.4" + "financial-number": "^4.0.4", + "typeorm": "^0.3.26" } } diff --git a/src/datasources/DataSource.ts b/src/datasources/DataSource.ts new file mode 100644 index 0000000..f434bdb --- /dev/null +++ b/src/datasources/DataSource.ts @@ -0,0 +1,61 @@ +import 'reflect-metadata'; + +/** + * Base configuration options for all data sources. + * All data source specific options should extend from this interface. + */ +export interface DataSourceOptions { + /** + * Indicates if schema migrations have to be managed by Slingr. + * When true, the framework will handle schema creation and updates automatically. + */ + managed: boolean; +} + +/** + * Abstract base class for all data sources. + * + * Data sources provide persistent storage capabilities for models. + * Each data source implementation should handle: + * - Connection management + * - Model configuration (adding framework-specific decorators) + * - Field configuration for persistence + * + * @abstract + */ +export abstract class DataSource { + protected options: DataSourceOptions; + protected isInitialized: boolean = false; + + constructor(options: DataSourceOptions) { + this.options = options; + } + + /** + * Initialize the data source with the provided options. + * This method should establish connections, set up the data source, + * and prepare it for use. + * + * @param options - Configuration options for the data source + * @returns Promise that resolves when initialization is complete + */ + abstract initialize(options: DataSourceOptions): Promise; + + /** + * Check if the data source has been initialized. + * + * @returns true if the data source is initialized, false otherwise + */ + public getInitializationStatus(): boolean { + return this.isInitialized; + } + + /** + * Get the current data source options. + * + * @returns The data source configuration options + */ + public getOptions(): DataSourceOptions { + return this.options; + } +} diff --git a/src/datasources/index.ts b/src/datasources/index.ts new file mode 100644 index 0000000..4f76ed6 --- /dev/null +++ b/src/datasources/index.ts @@ -0,0 +1,5 @@ +// Data Sources +export { DataSource } from './DataSource'; +export type { DataSourceOptions } from './DataSource'; +export { TypeORMSqlDataSource } from './typeorm/TypeORMSqlDataSource'; +export type { TypeORMSqlDataSourceOptions } from './typeorm/TypeORMSqlDataSource'; diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts new file mode 100644 index 0000000..c096d49 --- /dev/null +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -0,0 +1,191 @@ +import 'reflect-metadata'; +import { DataSource as TypeORMDataSource, DataSourceOptions as TypeORMDataSourceOptions } from 'typeorm'; +import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'; +import { DataSource, DataSourceOptions } from '../DataSource'; + +/** + * Configuration options for TypeORM SQL data source. + * Extends base DataSourceOptions with TypeORM-specific settings. + */ +export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { + /** Database type (postgres, mysql, sqlite, etc.) */ + type: 'postgres' | 'mysql' | 'mariadb' | 'sqlite' | 'mssql' | 'oracle'; + + /** Database host */ + host?: string; + + /** Database port */ + port?: number; + + /** Database username */ + username?: string; + + /** Database password */ + password?: string; + + /** Database name */ + database?: string; + + /** SQLite database file path (for SQLite only) */ + filename?: string; + + /** Enable logging of SQL queries */ + logging?: boolean; + + /** Synchronize schema automatically (for development) */ + synchronize?: boolean; + + /** Connection timeout in milliseconds */ + connectTimeout?: number; + + /** Maximum number of connections in pool */ + maxConnections?: number; + + /** Minimum number of connections in pool */ + minConnections?: number; +} + +/** + * TypeORM SQL data source implementation. + * + * Provides SQL database connectivity using TypeORM with support for + * multiple database types including PostgreSQL, MySQL, SQLite, and others. + * + * Features: + * - Automatic connection management with pooling + * - Schema synchronization for development + * - Model and field configuration for TypeORM entities + * - Transaction support + * - Migration management + * + * @example + * ```typescript + * const dataSource = new TypeORMSqlDataSource({ + * type: "postgres", + * managed: true, + * host: "localhost", + * port: 5432, + * username: "admin", + * password: "admin", + * database: "myapp" + * }); + * + * await dataSource.initialize(); + * ``` + */ +export class TypeORMSqlDataSource extends DataSource { + private typeormDataSource: TypeORMDataSource | null = null; + private registeredModels: Set = new Set(); + + constructor(options: TypeORMSqlDataSourceOptions) { + super(options); + } + + /** + * Initialize the TypeORM data source. + * Sets up the TypeORM DataSource, establishes database connection, + * and configures connection pooling. + * + * @param options - TypeORM-specific configuration options + * @returns Promise resolving to the initialized TypeORM DataSource + */ + async initialize(options: DataSourceOptions): Promise { + const typeormOptions = options as TypeORMSqlDataSourceOptions; + + // Build TypeORM DataSource configuration dynamically based on database type + let config: any = { + type: typeormOptions.type, + logging: typeormOptions.logging ?? false, + synchronize: typeormOptions.synchronize ?? typeormOptions.managed, + entities: [], // Will be populated as models are registered + }; + + // SQLite-specific configuration + if (typeormOptions.type === 'sqlite') { + config.database = typeormOptions.filename || ':memory:'; + } else { + // Configuration for other database types + if (typeormOptions.host) config.host = typeormOptions.host; + if (typeormOptions.port) config.port = typeormOptions.port; + if (typeormOptions.username) config.username = typeormOptions.username; + if (typeormOptions.password) config.password = typeormOptions.password; + if (typeormOptions.database) config.database = typeormOptions.database; + } + + // Connection pooling configuration + if (typeormOptions.maxConnections || typeormOptions.minConnections) { + config.pool = { + max: typeormOptions.maxConnections || 10, + min: typeormOptions.minConnections || 1, + }; + } + + // Connection timeout + if (typeormOptions.connectTimeout) { + config.connectTimeout = typeormOptions.connectTimeout; + } + + // Create and initialize TypeORM DataSource + this.typeormDataSource = new TypeORMDataSource(config as TypeORMDataSourceOptions); + + try { + await this.typeormDataSource.initialize(); + this.isInitialized = true; + console.log(`TypeORM DataSource initialized successfully for ${typeormOptions.type}`); + return this.typeormDataSource; + } catch (error) { + console.error('Failed to initialize TypeORM DataSource:', error); + throw new Error(`Failed to initialize TypeORM DataSource: ${error instanceof Error ? error.message : 'Unknown error'}`); + } + } + + /** + * Get the TypeORM DataSource instance. + * Useful for direct TypeORM operations. + * + * @returns The TypeORM DataSource instance + * @throws Error if not initialized + */ + getTypeORMDataSource(): TypeORMDataSource { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + return this.typeormDataSource; + } + + /** + * Gracefully disconnect from the database. + * Closes all connections and cleans up resources. + * + * @returns Promise resolving when disconnection is complete + */ + async disconnect(): Promise { + if (this.typeormDataSource && this.isInitialized) { + await this.typeormDataSource.destroy(); + this.isInitialized = false; + console.log('TypeORM DataSource disconnected successfully'); + } + } + + /** + * Check database connection status. + * + * @returns true if connected, false otherwise + */ + isConnected(): boolean { + return this.typeormDataSource?.isInitialized ?? false; + } + + /** + * Get connection statistics. + * Useful for monitoring connection pool usage. + * + * @returns Connection statistics object + */ + getConnectionStats(): { isConnected: boolean; hasActiveConnections: boolean } { + return { + isConnected: this.isConnected(), + hasActiveConnections: this.typeormDataSource?.isInitialized ?? false, + }; + } +} diff --git a/src/model/Field.ts b/src/model/Field.ts index 32d5610..a5ab600 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,7 +1,12 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { Exclude, Expose, Transform } from 'class-transformer'; import { CustomValidate } from '../validators/CustomValidationConstraint'; -import type { CustomRequiredFunction, CustomValidationFunction } from './types/SharedTypes'; +import type { + CustomRequiredFunction, + CustomValidationFunction, + CustomAvailableFunction, + ValidationIssue +} from "@/model/types/SharedTypes"; /** * Custom validation function type for field validation. @@ -28,14 +33,6 @@ import type { CustomRequiredFunction, CustomValidationFunction } from './types/S * @returns An array of validation issues, or an empty array if valid. */ -/** - * Type for a function that dynamically determines if a field is required. - * @param object - The entire object containing the field. - * @returns `true` if the field is required, otherwise `false`. - */ - -type CustomAvailableFunction = (object: TObject) => boolean; - /** * Configuration options for the Field decorator. * diff --git a/src/model/index.ts b/src/model/index.ts new file mode 100644 index 0000000..0df7831 --- /dev/null +++ b/src/model/index.ts @@ -0,0 +1,12 @@ +// Base Models +export { BaseModel } from './BaseModel'; +export { PersistentModel } from './PersistentModel'; + +// Decorators +export { Model } from './Model'; +export type { ModelOptions } from './Model'; +export { Field } from './Field'; +export type { FieldOptions } from './Field'; + +// Types +export * from './types'; diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts new file mode 100644 index 0000000..a6ac12e --- /dev/null +++ b/src/model/types/SharedTypes.ts @@ -0,0 +1,34 @@ +/** + * Validation issue interface for custom validation functions. + */ +export interface ValidationIssue { + /** Error code identifier */ + constraint: string; + /** Human-readable error message */ + message: string; +} + +/** + * Type for a custom validation function. + * @param value - The value of the field being validated. + * @param object - The entire object containing the field. + * @returns An array of validation issues, or an empty array if valid. + */ +export type CustomValidationFunction = ( + value: TValue, + object: TObject +) => ValidationIssue[]; + +/** + * Type for a function that dynamically determines if a field is required. + * @param object - The entire object containing the field. + * @returns `true` if the field is required, otherwise `false`. + */ +export type CustomRequiredFunction = (object: TObject) => boolean; + +/** + * Type for a function that dynamically determines if a field is available. + * @param object - The entire object containing the field. + * @returns `true` if the field is available, otherwise `false`. + */ +export type CustomAvailableFunction = (object: TObject) => boolean; diff --git a/test/datasources/TypeORMConnection.test.ts b/test/datasources/TypeORMConnection.test.ts new file mode 100644 index 0000000..f39ca2a --- /dev/null +++ b/test/datasources/TypeORMConnection.test.ts @@ -0,0 +1,147 @@ +import { TypeORMSqlDataSource } from '@/datasources/typeorm/TypeORMSqlDataSource'; + +describe('TypeORM SQL DataSource - Basic Connection Tests', () => { + describe('SQLite Connection', () => { + it('should connect to in-memory SQLite database', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + await dataSource.initialize(dataSource.getOptions()); + + expect(dataSource.isConnected()).toBe(true); + expect(dataSource.getInitializationStatus()).toBe(true); + + const stats = dataSource.getConnectionStats(); + expect(stats.isConnected).toBe(true); + + await dataSource.disconnect(); + expect(dataSource.isConnected()).toBe(false); + }); + + it('should connect to file-based SQLite database', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: './test-db.sqlite', + logging: false, + synchronize: true, + }); + + await dataSource.initialize(dataSource.getOptions()); + + expect(dataSource.isConnected()).toBe(true); + + // Clean up + await dataSource.disconnect(); + + // Clean up the file + const fs = require('fs'); + if (fs.existsSync('./test-db.sqlite')) { + fs.unlinkSync('./test-db.sqlite'); + } + }); + }); + + describe('Connection Configuration', () => { + it('should handle various connection options', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: true, + synchronize: false, + connectTimeout: 5000, + maxConnections: 15, + minConnections: 3, + }); + + const options = dataSource.getOptions(); + expect(options).toMatchObject({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: true, + synchronize: false, + connectTimeout: 5000, + maxConnections: 15, + minConnections: 3, + }); + + await dataSource.initialize(dataSource.getOptions()); + expect(dataSource.isConnected()).toBe(true); + + await dataSource.disconnect(); + }); + }); + + describe('Error Handling', () => { + it('should handle invalid database configuration gracefully', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'postgres', + managed: true, + host: 'nonexistent-host', + port: 9999, + username: 'invalid', + password: 'invalid', + database: 'invalid', + connectTimeout: 1000, + }); + + await expect(dataSource.initialize(dataSource.getOptions())) + .rejects + .toThrow(); + + expect(dataSource.isConnected()).toBe(false); + }); + + it('should prevent getTypeORMDataSource operation on disconnected datasource', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + }); + + expect(() => dataSource.getTypeORMDataSource()) + .toThrow('TypeORM DataSource not initialized'); + }); + }); + + describe('Multiple DataSource Management', () => { + it('should handle multiple independent data sources', async () => { + const dataSource1 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + + const dataSource2 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + + // Initialize both + await dataSource1.initialize(dataSource1.getOptions()); + await dataSource2.initialize(dataSource2.getOptions()); + + expect(dataSource1.isConnected()).toBe(true); + expect(dataSource2.isConnected()).toBe(true); + + // Disconnect one + await dataSource1.disconnect(); + expect(dataSource1.isConnected()).toBe(false); + expect(dataSource2.isConnected()).toBe(true); + + // Disconnect the other + await dataSource2.disconnect(); + expect(dataSource2.isConnected()).toBe(false); + }); + }); +}); diff --git a/test/examples/TypeORMExample.test.ts b/test/examples/TypeORMExample.test.ts new file mode 100644 index 0000000..7352f9f --- /dev/null +++ b/test/examples/TypeORMExample.test.ts @@ -0,0 +1,55 @@ +import { TypeORMSqlDataSource } from '@/datasources/typeorm/TypeORMSqlDataSource'; + +describe('TypeORM DataSource Example', () => { + it('should demonstrate basic usage', async () => { + // 1. Create the data source + const mainDataSource = new TypeORMSqlDataSource({ + type: "sqlite", + managed: true, + filename: ":memory:", + logging: false, + synchronize: true, + }); + + console.log('=== TypeORM DataSource Example ==='); + + // 2. Initialize the data source + console.log('Initializing data source...'); + await mainDataSource.initialize(mainDataSource.getOptions()); + console.log('✓ Data source initialized successfully'); + + // 3. Check configuration + const options = mainDataSource.getOptions() as any; + console.log('Configuration:'); + console.log('- Type:', options.type); + console.log('- Managed:', options.managed); + console.log('- Filename:', options.filename); + + // 4. Check connection status + console.log('\nConnection status:'); + console.log('- Connected:', mainDataSource.isConnected()); + console.log('- Initialized:', mainDataSource.getInitializationStatus()); + + const stats = mainDataSource.getConnectionStats(); + console.log('- Stats:', stats); + + // 5. Verify TypeORM instance is available + const typeormInstance = mainDataSource.getTypeORMDataSource(); + console.log('- TypeORM instance available:', !!typeormInstance); + console.log('- TypeORM initialized:', typeormInstance.isInitialized); + + // 6. Test that the instance is working + expect(mainDataSource.isConnected()).toBe(true); + expect(mainDataSource.getInitializationStatus()).toBe(true); + expect(typeormInstance).toBeDefined(); + expect(typeormInstance.isInitialized).toBe(true); + + // 7. Clean up + await mainDataSource.disconnect(); + console.log('✓ Data source disconnected'); + + expect(mainDataSource.isConnected()).toBe(false); + + console.log('\n=== Example completed successfully ==='); + }); +}); From 146f526573c1dcf056437149dc645a563e6b9d9d Mon Sep 17 00:00:00 2001 From: Diego Gaviola Date: Sun, 31 Aug 2025 18:28:48 -0300 Subject: [PATCH 091/254] I added two test to make sure undefined fields and null fields remain the same. I was just chaking it worked like that. --- test/Relationship.test.ts | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/test/Relationship.test.ts b/test/Relationship.test.ts index bb05164..e9f8bc5 100644 --- a/test/Relationship.test.ts +++ b/test/Relationship.test.ts @@ -32,6 +32,14 @@ class Book extends BaseModel { type: 'reference' }) author!: Author; + + @Field({ + required: false, + }) + @Relationship({ + type: 'reference' + }) + coauthor?: Author; } @Model() @@ -102,7 +110,7 @@ describe('Relationship Type', () => { }); }); - describe('Reference Relationships', () => { + describe('Reference Relationships', () => { it('should create models with reference relationships', () => { const customer = new Customer(); customer.name = 'John Doe'; @@ -166,6 +174,32 @@ describe('Relationship Type', () => { }); }); + describe('Test null vs undefined', () => { + it('a field not set should be undefined after serialization', () => { + const order = new Order(); + order.date = new Date('2023-01-15'); + order.lineItems = []; + + expect(order.customer).toBeUndefined(); + const json = order.toJSON(); + expect(json.customer).toBeUndefined(); + const restored = Order.fromJSON(json); + expect(restored.customer).toBeUndefined(); + }); + + it('a field set to null must remain null after serialization', () => { + const book = new Book(); + book.title = 'Some Book'; + book.coauthor = null as any; // explicitly set to null + + expect(book.coauthor).toBeNull(); + const json = book.toJSON(); + expect(json.coauthor).toBeNull(); + const restored = Book.fromJSON(json); + expect(restored.coauthor).toBeNull(); + }); + }); + describe('Composition Relationships', () => { it('should create models with composition relationships', () => { const lineItem1 = new LineItem(); From 71127c6c9486d7505d571e6b1eb48a6059e0c29b Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 1 Sep 2025 08:42:53 -0300 Subject: [PATCH 092/254] Updated index.ts --- src/index.ts | 18 ++++++++++++++++-- src/model/types/index.ts | 14 -------------- 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 src/model/types/index.ts diff --git a/src/index.ts b/src/index.ts index 7378a8c..e2e63e3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,21 @@ // Export all the core components of the framework export { BaseModel } from './model/BaseModel'; export { Field } from './model/Field'; -export type { FieldOptions, ValidationIssue } from './model/Field'; +export type { FieldOptions } from './model/Field'; export { Model } from './model/Model'; export type { ModelOptions } from './model/Model'; -export { CustomValidate } from './validators/CustomValidationConstraint'; \ No newline at end of file +export { CustomValidate } from './validators/CustomValidationConstraint'; +export { Text } from './model/types/Text'; +export type { TextOptions } from './model/types/Text'; +export { Email } from './model/types/Email'; +export { HTML } from './model/types/HTML'; +export { Boolean } from './model/types/Boolean'; +export { Choice } from './model/types/Choice'; +export { DateTime } from './model/types/DateTime'; +export type { DateTimeOptions } from './model/types/DateTime'; +export { DateTimeRange, DateTimeRangeType } from './model/types/DateTimeRange'; +export type { DateTimeRangeOptions } from './model/types/DateTimeRange'; +export { Integer } from './model/types/Integer'; +export { Money } from './model/types/Money'; +export { Number } from './model/types/Number'; +export { Decimal } from './model/types/Decimal'; diff --git a/src/model/types/index.ts b/src/model/types/index.ts deleted file mode 100644 index 22927c9..0000000 --- a/src/model/types/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -export { Text } from './Text'; -export type { TextOptions } from './Text'; -export { Email } from './Email'; -export { HTML } from './HTML'; -export { Boolean } from './Boolean'; -export { Choice } from './Choice'; -export { DateTime } from './DateTime'; -export type { DateTimeOptions } from './DateTime'; -export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; -export type { DateTimeRangeOptions } from './DateTimeRange'; -export { Integer } from './Integer'; -export { Money } from './Money'; -export { Number } from './Number'; -export { Decimal } from './Decimal'; \ No newline at end of file From 290834ed1f6797776cd1c04bd323236e1643ad24 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 1 Sep 2025 09:30:50 -0300 Subject: [PATCH 093/254] set exposeDefaultValue to true and change null values handling --- src/model/BaseModel.ts | 75 +--------------------------------- src/model/Field.ts | 2 +- src/model/types/SharedTypes.ts | 22 ++++++++++ test/fromJSON-defaults.test.ts | 7 ++-- 4 files changed, 27 insertions(+), 79 deletions(-) create mode 100644 src/model/types/SharedTypes.ts diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index ea0cbda..489f918 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -185,88 +185,15 @@ export abstract class BaseModel { const instance = plainToInstance(this, json, { excludeExtraneousValues: true, enableImplicitConversion: true, // Enable coercion when possible + exposeDefaultValues: true, }); - // Apply default values for fields that are undefined/null but have defaults - BaseModel.applyDefaultValues(instance); - // Calculate manual calculation fields instance.calculate(); return instance; } - /** - * Applies default values to fields that are undefined/null in the instance - * but have default values defined in the class. - * - * @param instance - The model instance to apply default values to - */ - private static applyDefaultValues(instance: T): void { - // Create a temporary instance to get the default values - const defaultInstance = new (instance.constructor as new () => T)(); - - // Get all property names from the prototype chain - const propertyNames = this.getAllPropertyNames(instance); - - for (const propertyName of propertyNames) { - // Check if this property has a Field decorator - if (Reflect.hasMetadata('field:docs', instance, propertyName) || - Reflect.hasMetadata('field:validation', instance, propertyName) || - this.hasFieldDecorator(instance, propertyName)) { - - // Skip calculated fields as they will be handled by calculate() - if (Reflect.hasMetadata('field:calculation', instance, propertyName)) { - continue; - } - - // If the property is undefined/null in the instance but has a default value - if ((instance as any)[propertyName] === undefined || (instance as any)[propertyName] === null) { - const defaultValue = (defaultInstance as any)[propertyName]; - if (defaultValue !== undefined && defaultValue !== null) { - (instance as any)[propertyName] = defaultValue; - } - } - } - } - } - - /** - * Gets all property names from the instance and its prototype chain - */ - private static getAllPropertyNames(instance: BaseModel): string[] { - const propertyNames = new Set(); - - // Get properties from the instance itself - Object.getOwnPropertyNames(instance).forEach(name => propertyNames.add(name)); - - // Get properties from the prototype chain - let prototype = Object.getPrototypeOf(instance); - while (prototype && prototype !== BaseModel.prototype && prototype !== Object.prototype) { - Object.getOwnPropertyNames(prototype).forEach(name => { - if (name !== 'constructor') { - propertyNames.add(name); - } - }); - prototype = Object.getPrototypeOf(prototype); - } - - return Array.from(propertyNames); - } - - /** - * Checks if a property has any Field-related metadata - */ - private static hasFieldDecorator(instance: BaseModel, propertyName: string): boolean { - // Check for any metadata that would indicate a Field decorator was applied - const metadataKeys = Reflect.getMetadataKeys(instance, propertyName) || []; - return metadataKeys.some(key => - typeof key === 'string' && key.startsWith('field:') - ) || metadataKeys.includes('custom:field') || - metadataKeys.includes('field') || - metadataKeys.includes('design:type'); - } - /** * Executes the calculation for all fields marked with `calculation: 'manual'`. * * It iterates multiple times to resolve dependencies where one calculated field diff --git a/src/model/Field.ts b/src/model/Field.ts index 32d5610..655a28f 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,7 +1,7 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { Exclude, Expose, Transform } from 'class-transformer'; import { CustomValidate } from '../validators/CustomValidationConstraint'; -import type { CustomRequiredFunction, CustomValidationFunction } from './types/SharedTypes'; +import type { CustomRequiredFunction, CustomValidationFunction} from './types/SharedTypes'; /** * Custom validation function type for field validation. diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts new file mode 100644 index 0000000..92eb458 --- /dev/null +++ b/src/model/types/SharedTypes.ts @@ -0,0 +1,22 @@ +/** + * Represents a single validation error from a custom validation function. + */ +export type ValidationIssue = { constraint: string; message: string }; + +/** + * A function that performs custom validation on a field's value. + * @param TValue The type of the field's value. + * @param TObject The type of the object being validated. + * @returns An array of ValidationIssue objects. Returns an empty array if validation passes. + */ +export type CustomValidationFunction = ( + value: TValue, + object: TObject +) => ValidationIssue[]; + +/** + * A function that conditionally determines if a field is required. + * @param TObject The type of the object being validated. + * @returns `true` if the field is required, `false` otherwise. + */ +export type CustomRequiredFunction = (object: TObject) => boolean; diff --git a/test/fromJSON-defaults.test.ts b/test/fromJSON-defaults.test.ts index 7047b8c..47ca21c 100644 --- a/test/fromJSON-defaults.test.ts +++ b/test/fromJSON-defaults.test.ts @@ -144,7 +144,7 @@ describe('fromJSON with Default and Calculated Values', () => { }); }); - it('should handle null values in JSON by applying defaults', () => { + it('should handle null values in JSON correctly', () => { const taskData = { title: 'Null Fields Task', status: null, @@ -153,9 +153,8 @@ describe('fromJSON with Default and Calculated Values', () => { const task = Task.fromJSON(taskData); - // Null values should be replaced with defaults - expect(task.status).toBe(TaskStatus.ToDo); - expect(task.priority).toBe(Priority.Medium); + expect(task.status).toBe(null); + expect(task.priority).toBe(null); }); }); }); From 04e2594330f90a5df4e1b56c8903d6b594b61724 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 1 Sep 2025 09:49:13 -0300 Subject: [PATCH 094/254] Fix import paths in DecimalMoneyModel and NumberIntegerModel for consistency --- test/model/DecimalMoneyModel.ts | 8 ++++---- test/model/NumberIntegerModel.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/model/DecimalMoneyModel.ts b/test/model/DecimalMoneyModel.ts index cb58f6a..508a806 100644 --- a/test/model/DecimalMoneyModel.ts +++ b/test/model/DecimalMoneyModel.ts @@ -1,7 +1,7 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Decimal, Money } from "@/model/types"; +import { Field } from "../../src"; +import { Model } from "../../src"; +import { BaseModel } from "../../src"; +import { Decimal, Money } from "../../src"; @Model({ docs: "Represents a product", diff --git a/test/model/NumberIntegerModel.ts b/test/model/NumberIntegerModel.ts index e6ee9e2..fa0b1a2 100644 --- a/test/model/NumberIntegerModel.ts +++ b/test/model/NumberIntegerModel.ts @@ -1,7 +1,7 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Number, Integer } from "@/model/types"; +import { Field } from "../../src"; +import { Model } from "../../src"; +import { BaseModel } from "../../src"; +import { Number, Integer } from "../../src"; @Model({ docs: "A model for testing number and integer validations", From 0cd149b8b9b60c8154042b9bbfc95dcc82a8ea12 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 1 Sep 2025 10:31:13 -0300 Subject: [PATCH 095/254] Changed index.ts location and updated package.json --- index.ts | 21 +++++++++++++++++++++ package.json | 8 +++----- src/index.ts | 21 --------------------- tsconfig.json | 2 +- 4 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 index.ts delete mode 100644 src/index.ts diff --git a/index.ts b/index.ts new file mode 100644 index 0000000..4de355c --- /dev/null +++ b/index.ts @@ -0,0 +1,21 @@ +// Export all the core components of the framework +export { BaseModel } from './src/model/BaseModel'; +export { Field } from './src/model/Field'; +export type { FieldOptions } from './src/model/Field'; +export { Model } from './src/model/Model'; +export type { ModelOptions } from './src/model/Model'; +export { CustomValidate } from './src/validators/CustomValidationConstraint'; +export { Text } from './src/model/types/Text'; +export type { TextOptions } from './src/model/types/Text'; +export { Email } from './src/model/types/Email'; +export { HTML } from './src/model/types/HTML'; +export { Boolean } from './src/model/types/Boolean'; +export { Choice } from './src/model/types/Choice'; +export { DateTime } from './src/model/types/DateTime'; +export type { DateTimeOptions } from './src/model/types/DateTime'; +export { DateTimeRange, DateTimeRangeType } from './src/model/types/DateTimeRange'; +export type { DateTimeRangeOptions } from './src/model/types/DateTimeRange'; +export { Integer } from './src/model/types/Integer'; +export { Money } from './src/model/types/Money'; +export { Number } from './src/model/types/Number'; +export { Decimal } from './src/model/types/Decimal'; diff --git a/package.json b/package.json index 131fc83..a69574c 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,9 @@ "name": "slingr-framework", "version": "1.0.0", "description": "Slingr Framework - Smart Business Apps", - "main": "dist/index.js", - "types": "dist/index.d.ts", - "files": [ - "dist" - ], + "exports": { + ".": "./index.js" + }, "scripts": { "test": "jest --verbose", "watch": "tsc --project tsconfig.build.json --watch", diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index e2e63e3..0000000 --- a/src/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Export all the core components of the framework -export { BaseModel } from './model/BaseModel'; -export { Field } from './model/Field'; -export type { FieldOptions } from './model/Field'; -export { Model } from './model/Model'; -export type { ModelOptions } from './model/Model'; -export { CustomValidate } from './validators/CustomValidationConstraint'; -export { Text } from './model/types/Text'; -export type { TextOptions } from './model/types/Text'; -export { Email } from './model/types/Email'; -export { HTML } from './model/types/HTML'; -export { Boolean } from './model/types/Boolean'; -export { Choice } from './model/types/Choice'; -export { DateTime } from './model/types/DateTime'; -export type { DateTimeOptions } from './model/types/DateTime'; -export { DateTimeRange, DateTimeRangeType } from './model/types/DateTimeRange'; -export type { DateTimeRangeOptions } from './model/types/DateTimeRange'; -export { Integer } from './model/types/Integer'; -export { Money } from './model/types/Money'; -export { Number } from './model/types/Number'; -export { Decimal } from './model/types/Decimal'; diff --git a/tsconfig.json b/tsconfig.json index 9d45556..bdfe4d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,6 +20,6 @@ "esModuleInterop": true, "outDir": "./dist" }, - "include": ["src/**/*", "test/**/*", "jest.config.js"], + "include": ["src/**/*", "test/**/*", "jest.config.js", "index.ts"], "exclude": ["node_modules", "dist"] } \ No newline at end of file From dcfab5c0cd9c3b08961ad53f919a6b84e723839e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:22:09 +0000 Subject: [PATCH 096/254] Initial plan From 164cd0d9137736cdd506c3086a65b7ba54cc44b3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:28:02 +0000 Subject: [PATCH 097/254] Create comprehensive Copilot instructions for Slingr Framework Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- src/model/types/SharedTypes.ts | 32 ++++++++++++++++++++++++++++++++ src/model/types/index.ts | 16 ++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/model/types/SharedTypes.ts create mode 100644 src/model/types/index.ts diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts new file mode 100644 index 0000000..ccc316c --- /dev/null +++ b/src/model/types/SharedTypes.ts @@ -0,0 +1,32 @@ +/** + * Represents a validation error from a custom validation function. + */ +export interface ValidationIssue { + /** + * The constraint code/identifier for this validation error. + */ + constraint: string; + + /** + * The human-readable error message. + */ + message: string; +} + +/** + * Type for a custom validation function. + * @param value - The value of the field being validated. + * @param object - The entire object containing the field. + * @returns An array of validation issues, or an empty array if valid. + */ +export type CustomValidationFunction = ( + value: TValue, + object: TObject +) => ValidationIssue[]; + +/** + * Type for a function that dynamically determines if a field is required. + * @param object - The entire object containing the field. + * @returns `true` if the field is required, otherwise `false`. + */ +export type CustomRequiredFunction = (object: TObject) => boolean; \ No newline at end of file diff --git a/src/model/types/index.ts b/src/model/types/index.ts new file mode 100644 index 0000000..2bc6f6a --- /dev/null +++ b/src/model/types/index.ts @@ -0,0 +1,16 @@ +// Export all type decorators and related utilities +export { Text } from './Text'; +export type { TextOptions } from './Text'; +export { Email } from './Email'; +export { HTML } from './HTML'; +export { Boolean } from './Boolean'; +export { Choice } from './Choice'; +export { DateTime } from './DateTime'; +export type { DateTimeOptions } from './DateTime'; +export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; +export type { DateTimeRangeOptions } from './DateTimeRange'; +export { Integer } from './Integer'; +export { Money } from './Money'; +export { Number } from './Number'; +export { Decimal } from './Decimal'; +export type { CustomValidationFunction, CustomRequiredFunction, ValidationIssue } from './SharedTypes'; \ No newline at end of file From 114be7d68acc41042ae867a6d5fd91b262ffc500 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:36:12 +0000 Subject: [PATCH 098/254] Complete comprehensive Copilot instructions with validation Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- .github/copilot-instructions.md | 169 ++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 .github/copilot-instructions.md diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 0000000..780c8b2 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,169 @@ +# Slingr Framework - TypeScript Business Model Framework + +The Slingr Framework is a TypeScript framework for building smart business applications with robust model validation, serialization, and field type decorators. It uses class-validator for validation and class-transformer for JSON serialization. + +**ALWAYS reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.** + +## Working Effectively + +**Bootstrap and validate the repository:** +- `npm install` -- installs dependencies in ~5-30 seconds (varies by system). NEVER CANCEL. Set timeout to 60+ minutes. +- `npm test` -- runs 101 comprehensive tests in ~4 seconds. NEVER CANCEL. Set timeout to 10+ minutes. +- `npm run build` -- **WILL FAIL** due to dependency issue in financial-arithmetic-functions. This is a known limitation. Focus on testing and development workflows instead. +- `npm run watch` -- runs TypeScript compiler in watch mode for development. **WILL FAIL** with same dependency issue. + +**CRITICAL BUILD LIMITATION**: The build command fails due to a TypeScript error in the financial-arithmetic-functions dependency. This does NOT affect testing or development workflows. All 101 tests pass successfully. + +## Validation and Testing Workflows + +**Always run the complete test suite when making changes:** +- `npm test` -- runs all 101 tests in ~4 seconds. NEVER CANCEL. Set timeout to 10+ minutes. +- ALWAYS test your changes by running the relevant test file: `npm test -- test/YourFile.test.ts` +- MANUALLY VALIDATE any new model definitions by creating test instances and calling `validate()` method + +**Manual validation steps for model changes:** +1. Create a test instance of your model +2. Set both valid and invalid field values +3. Call `await model.validate()` and verify error handling +4. Test JSON serialization with `model.toJSON()` and `Model.fromJSON(json)` +5. Verify field availability and conditional logic work correctly + +## Key Projects and Structure + +**Core Framework Components:** +- `src/model/BaseModel.ts` -- Abstract base class for all models with validation and JSON conversion +- `src/model/Field.ts` -- @Field decorator for validation, documentation, and JSON control +- `src/model/Model.ts` -- @Model decorator for class metadata +- `src/model/types/` -- Type decorators (@Text, @Email, @DateTime, @Money, etc.) +- `src/validators/` -- Custom validation constraint implementations + +**Test Structure:** +- `test/` -- Contains comprehensive test suites for each field type +- `test/model/` -- Test model definitions (Person, App, Project, etc.) +- Each test file covers validation, required fields, and JSON conversion scenarios + +**Entry Point:** +- `index.ts` -- Main export file exposing all framework components + +## Important Field Type Decorators + +**Always import types from the main module:** +```typescript +import { BaseModel, Field, Model, Text, Email, DateTime, Money } from './index'; +// OR for individual types: +import { Text, Email } from './src/model/types'; +``` + +**Common field patterns (reference existing test models):** +- `@Text({ minLength: 2, maxLength: 50, regex: /^[a-zA-Z]+$/ })` -- Text with validation +- `@Email()` -- Email validation +- `@DateTime({ min: new Date('2020-01-01') })` -- Date with constraints +- `@Money({ currency: 'USD', decimals: 2 })` -- Money with currency +- `@Choice({ values: ['option1', 'option2'] })` -- Enum-style choices + +## Development Commands + +**For development work:** +- `npm test -- --watch` -- run tests in watch mode +- `npm test -- --testNamePattern="your pattern"` -- run specific tests +- `npm test -- test/Text.test.ts` -- run single test file + +**DO NOT attempt to use npm run build or npm run watch** -- they will fail due to the known dependency issue. Focus on test-driven development instead. + +## Validation Scenarios + +**ALWAYS test these scenarios when creating new models:** + +1. **Basic Validation Test:** +```typescript +const model = new YourModel(); +model.requiredField = 'valid value'; +const errors = await model.validate(); +expect(errors).toHaveLength(0); +``` + +2. **Invalid Field Test:** +```typescript +const model = new YourModel(); +model.requiredField = ''; // or invalid value +const errors = await model.validate(); +expect(errors.length).toBeGreaterThan(0); +``` + +3. **JSON Round-trip Test:** +```typescript +const model = new YourModel(); +model.field = 'value'; +const json = model.toJSON(); +const restored = YourModel.fromJSON(json); +expect(restored.field).toBe('value'); +``` + +4. **Conditional Field Test (if using conditional required/available):** +```typescript +const model = new YourModel(); +model.age = 17; // Test conditional logic +model.parentEmail = 'parent@example.com'; +const errors = await model.validate(); +expect(errors).toHaveLength(0); +``` + +## Common Tasks + +**Repository Structure (ls -a):** +``` +.git/ +.gitignore +.vscode/ +LICENSE.txt +README.md +dist/ (created after build attempts) +index.ts (main export file) +jest.config.ts (Jest configuration) +node_modules/ (dependencies) +package-lock.json (dependency lock) +package.json (project config) +src/ (source code) + model/ (core model classes) + types/ (field type decorators) + BaseModel.ts (base class) + Field.ts (@Field decorator) + Model.ts (@Model decorator) + validators/ (custom validators) +test/ (test suites) + model/ (test model definitions) +tsconfig.json (TypeScript config) +tsconfig.build.json (Build-specific TypeScript config) +``` + +**Key package.json scripts:** +```json +{ + "test": "jest --verbose", + "watch": "tsc --project tsconfig.build.json --watch", + "build": "tsc --project tsconfig.build.json" +} +``` + +**Dependencies:** +- class-validator -- validation decorators and engine +- class-transformer -- JSON serialization/deserialization +- financial-number -- money/decimal calculations +- jest + ts-jest -- testing framework +- typescript -- TypeScript compiler + +## Expert Tips + +**Always check these when working with the framework:** +- Review existing test models in `test/model/` for patterns before creating new models +- Check field type options in `src/model/types/` for available validation parameters +- Use the `summarizeErrors()` helper from tests to examine validation failures +- Remember that `@Field({ available: false })` excludes fields from JSON operations +- Test conditional `required` and `available` functions thoroughly + +**For complex validation scenarios:** +- Use custom validation functions in `@Field({ validation: (value, obj) => [...] })` +- Leverage `calculation: 'manual'` for computed fields that need caching +- Check `BaseModel.calculate()` method for manual calculation triggers + +**NEVER attempt to fix the build error in financial-arithmetic-functions** -- it's a dependency issue outside this project's scope. Focus on the comprehensive test suite and development workflows that work perfectly. \ No newline at end of file From f412c76c307065cab55f32af9f6f26c57fe2ecc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Mon, 1 Sep 2025 11:50:44 -0300 Subject: [PATCH 099/254] Separate decimal and relationship exports with newline Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/model/types/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/model/types/index.ts b/src/model/types/index.ts index b803c45..e0fd89b 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -11,5 +11,6 @@ export type { DateTimeRangeOptions } from './DateTimeRange'; export { Integer } from './Integer'; export { Money } from './Money'; export { Number } from './Number'; -export { Decimal } from './Decimal';export { Relationship } from './Relationship'; +export { Decimal } from './Decimal'; +export { Relationship } from './Relationship'; export type { RelationshipOptions } from './Relationship'; From 2b1c8734245c1c330bedc038d822f5dde9ed4cb9 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 1 Sep 2025 11:56:34 -0300 Subject: [PATCH 100/254] Update single line imports --- test/model/DecimalMoneyModel.ts | 5 +---- test/model/NumberIntegerModel.ts | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/model/DecimalMoneyModel.ts b/test/model/DecimalMoneyModel.ts index 508a806..3e2422e 100644 --- a/test/model/DecimalMoneyModel.ts +++ b/test/model/DecimalMoneyModel.ts @@ -1,7 +1,4 @@ -import { Field } from "../../src"; -import { Model } from "../../src"; -import { BaseModel } from "../../src"; -import { Decimal, Money } from "../../src"; +import { Field, Model, BaseModel, Money, Decimal } from "../../src"; @Model({ docs: "Represents a product", diff --git a/test/model/NumberIntegerModel.ts b/test/model/NumberIntegerModel.ts index fa0b1a2..0203406 100644 --- a/test/model/NumberIntegerModel.ts +++ b/test/model/NumberIntegerModel.ts @@ -1,7 +1,4 @@ -import { Field } from "../../src"; -import { Model } from "../../src"; -import { BaseModel } from "../../src"; -import { Number, Integer } from "../../src"; +import { Field, Model, BaseModel, Number, Integer } from "../../src"; @Model({ docs: "A model for testing number and integer validations", From 2510fcd9934e8287267cd4602adc3a165bc52a44 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 1 Sep 2025 12:26:14 -0300 Subject: [PATCH 101/254] Fix import path for SharedTypes and format exports in index.ts --- src/model/Field.ts | 2 +- src/model/types/index.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/model/Field.ts b/src/model/Field.ts index a5ab600..4f9fe76 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -6,7 +6,7 @@ import type { CustomValidationFunction, CustomAvailableFunction, ValidationIssue -} from "@/model/types/SharedTypes"; +} from "./types/SharedTypes"; /** * Custom validation function type for field validation. diff --git a/src/model/types/index.ts b/src/model/types/index.ts index b803c45..e0fd89b 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -11,5 +11,6 @@ export type { DateTimeRangeOptions } from './DateTimeRange'; export { Integer } from './Integer'; export { Money } from './Money'; export { Number } from './Number'; -export { Decimal } from './Decimal';export { Relationship } from './Relationship'; +export { Decimal } from './Decimal'; +export { Relationship } from './Relationship'; export type { RelationshipOptions } from './Relationship'; From 2836b9c25da2a433161410f3719b2fbc54e46d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Moyano?= Date: Mon, 1 Sep 2025 12:29:53 -0300 Subject: [PATCH 102/254] Update .github/copilot-instructions.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/copilot-instructions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 780c8b2..11b7dc5 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -50,8 +50,8 @@ The Slingr Framework is a TypeScript framework for building smart business appli **Always import types from the main module:** ```typescript import { BaseModel, Field, Model, Text, Email, DateTime, Money } from './index'; -// OR for individual types: -import { Text, Email } from './src/model/types'; +// OR, for individual types, import from the main entry point: +import { Text, Email } from './index'; ``` **Common field patterns (reference existing test models):** From 473d90265e6e5995517e0efc4ddff0cc88a955f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Moyano?= Date: Mon, 1 Sep 2025 13:10:16 -0300 Subject: [PATCH 103/254] Update copilot-instructions.md --- .github/copilot-instructions.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 11b7dc5..76c99c1 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -2,6 +2,10 @@ The Slingr Framework is a TypeScript framework for building smart business applications with robust model validation, serialization, and field type decorators. It uses class-validator for validation and class-transformer for JSON serialization. +The goal of the Slingr Framework is to provide developers with the tools to create smart enterprise applications without having to think about infrastructure, and just working on solving the problem. We achieve this by providing the main features enterprise applications need, using the best frameworks and libraries, and filling the gaps to ensure that everything works well out of the box. This is a full-stack framework that covers all the layers, removing the need to cherrypick frameworks and libraries while ensuring that everything works smoothly in harmony. + +Additionally, we know that frameworks alone are not enough to provide a great developer experience. Tooling is key to making sure that developing with the Slingr Framework is a joy, and that’s why a big part of our focus will be on creating an application builder and CLI tools. + **ALWAYS reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.** ## Working Effectively @@ -166,4 +170,4 @@ tsconfig.build.json (Build-specific TypeScript config) - Leverage `calculation: 'manual'` for computed fields that need caching - Check `BaseModel.calculate()` method for manual calculation triggers -**NEVER attempt to fix the build error in financial-arithmetic-functions** -- it's a dependency issue outside this project's scope. Focus on the comprehensive test suite and development workflows that work perfectly. \ No newline at end of file +**NEVER attempt to fix the build error in financial-arithmetic-functions** -- it's a dependency issue outside this project's scope. Focus on the comprehensive test suite and development workflows that work perfectly. From 239f68815dc5367a8dfc3664cdd6ee2d335070a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Moyano?= Date: Mon, 1 Sep 2025 13:11:42 -0300 Subject: [PATCH 104/254] Delete src/model/types/SharedTypes.ts --- src/model/types/SharedTypes.ts | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/model/types/SharedTypes.ts diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts deleted file mode 100644 index ccc316c..0000000 --- a/src/model/types/SharedTypes.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Represents a validation error from a custom validation function. - */ -export interface ValidationIssue { - /** - * The constraint code/identifier for this validation error. - */ - constraint: string; - - /** - * The human-readable error message. - */ - message: string; -} - -/** - * Type for a custom validation function. - * @param value - The value of the field being validated. - * @param object - The entire object containing the field. - * @returns An array of validation issues, or an empty array if valid. - */ -export type CustomValidationFunction = ( - value: TValue, - object: TObject -) => ValidationIssue[]; - -/** - * Type for a function that dynamically determines if a field is required. - * @param object - The entire object containing the field. - * @returns `true` if the field is required, otherwise `false`. - */ -export type CustomRequiredFunction = (object: TObject) => boolean; \ No newline at end of file From d9831b3551f4f220dc80b26fad4e9c9737d4e91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Moyano?= Date: Mon, 1 Sep 2025 13:12:00 -0300 Subject: [PATCH 105/254] Delete src/model/types/index.ts --- src/model/types/index.ts | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 src/model/types/index.ts diff --git a/src/model/types/index.ts b/src/model/types/index.ts deleted file mode 100644 index 2bc6f6a..0000000 --- a/src/model/types/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Export all type decorators and related utilities -export { Text } from './Text'; -export type { TextOptions } from './Text'; -export { Email } from './Email'; -export { HTML } from './HTML'; -export { Boolean } from './Boolean'; -export { Choice } from './Choice'; -export { DateTime } from './DateTime'; -export type { DateTimeOptions } from './DateTime'; -export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; -export type { DateTimeRangeOptions } from './DateTimeRange'; -export { Integer } from './Integer'; -export { Money } from './Money'; -export { Number } from './Number'; -export { Decimal } from './Decimal'; -export type { CustomValidationFunction, CustomRequiredFunction, ValidationIssue } from './SharedTypes'; \ No newline at end of file From 1deff8970c9a219c839690bf761725e54e1c5a14 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 2 Sep 2025 10:57:37 -0300 Subject: [PATCH 106/254] Add Model and Fields Config for TypeORM --- index.ts | 4 + src/datasources/DataSource.ts | 43 +++ .../typeorm/TypeORMSqlDataSource.ts | 138 +++++++- src/model/Field.ts | 45 +-- src/model/Model.ts | 39 +++ src/model/PersistentModel.ts | 34 ++ test/datasources/DataSource.test.ts | 320 ++++++++++++++++++ test/datasources/TypeORMConnection.test.ts | 2 +- 8 files changed, 580 insertions(+), 45 deletions(-) create mode 100644 src/model/PersistentModel.ts create mode 100644 test/datasources/DataSource.test.ts diff --git a/index.ts b/index.ts index 4de355c..5fff608 100644 --- a/index.ts +++ b/index.ts @@ -1,3 +1,5 @@ +import { PersistentModel } from './src/model'; + // Export all the core components of the framework export { BaseModel } from './src/model/BaseModel'; export { Field } from './src/model/Field'; @@ -19,3 +21,5 @@ export { Integer } from './src/model/types/Integer'; export { Money } from './src/model/types/Money'; export { Number } from './src/model/types/Number'; export { Decimal } from './src/model/types/Decimal'; +export { PersistentModel } from './src/model'; +export { TypeORMSqlDataSource } from './src/datasources'; diff --git a/src/datasources/DataSource.ts b/src/datasources/DataSource.ts index f434bdb..27ef5b8 100644 --- a/src/datasources/DataSource.ts +++ b/src/datasources/DataSource.ts @@ -58,4 +58,47 @@ export abstract class DataSource { public getOptions(): DataSourceOptions { return this.options; } + + /** + * Configures a model class with the necessary decorators and metadata + * for the specific data source implementation. + * + * This method is called by the @Model decorator when a dataSource is specified + * in the model options. + * + * @param modelClass - The class constructor of the model to configure + * @param options - Additional configuration options for the model + * + * @example + * ```typescript + * // Called automatically by @Model decorator + * dataSource.configureModel(UserClass, { tableName: 'users' }); + * ``` + */ + abstract configureModel(modelClass: Function, options?: any): void; + + /** + * Configures a field with the necessary decorators and metadata + * for the specific data source implementation. + * + * This method is called by the @Field decorator when it detects + * that the field is part of a model that has a configured dataSource. + * + * @param target - The prototype of the class containing the field + * @param propertyKey - The name of the property/field being configured + * @param fieldType - The type of the field (e.g., 'text', 'datetime', 'integer') + * @param fieldOptions - Type-specific options for the field + * + * @example + * ```typescript + * // Called automatically by @Field decorator + * dataSource.configureField(userPrototype, 'name', 'text', { maxLength: 50 }); + * ``` + */ + abstract configureField( + target: any, + propertyKey: string, + fieldType: string, + fieldOptions?: any + ): void; } diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index c096d49..98146e5 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -10,37 +10,37 @@ import { DataSource, DataSourceOptions } from '../DataSource'; export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { /** Database type (postgres, mysql, sqlite, etc.) */ type: 'postgres' | 'mysql' | 'mariadb' | 'sqlite' | 'mssql' | 'oracle'; - + /** Database host */ host?: string; - + /** Database port */ port?: number; - + /** Database username */ username?: string; - + /** Database password */ password?: string; - + /** Database name */ database?: string; - + /** SQLite database file path (for SQLite only) */ filename?: string; - + /** Enable logging of SQL queries */ logging?: boolean; - + /** Synchronize schema automatically (for development) */ synchronize?: boolean; - + /** Connection timeout in milliseconds */ connectTimeout?: number; - + /** Maximum number of connections in pool */ maxConnections?: number; - + /** Minimum number of connections in pool */ minConnections?: number; } @@ -91,7 +91,7 @@ export class TypeORMSqlDataSource extends DataSource { */ async initialize(options: DataSourceOptions): Promise { const typeormOptions = options as TypeORMSqlDataSourceOptions; - + // Build TypeORM DataSource configuration dynamically based on database type let config: any = { type: typeormOptions.type, @@ -127,7 +127,7 @@ export class TypeORMSqlDataSource extends DataSource { // Create and initialize TypeORM DataSource this.typeormDataSource = new TypeORMDataSource(config as TypeORMDataSourceOptions); - + try { await this.typeormDataSource.initialize(); this.isInitialized = true; @@ -188,4 +188,116 @@ export class TypeORMSqlDataSource extends DataSource { hasActiveConnections: this.typeormDataSource?.isInitialized ?? false, }; } + + /** + * Configures a model class as a TypeORM Entity. + * + * @param modelClass - The model class to configure + * @param options - Additional configuration options (e.g., table name) + */ + configureModel(modelClass: Function, options?: any): void { + // For now, we'll use reflection to mark the class as needing TypeORM configuration + // In a real implementation, this would apply the @Entity() decorator + Reflect.defineMetadata('typeorm:entity', true, modelClass); + + if (options?.tableName) { + Reflect.defineMetadata('typeorm:table', options.tableName, modelClass); + } + + // Store that this model is configured for TypeORM + Reflect.defineMetadata('datasource:type', 'typeorm-sql', modelClass); + } + + /** + * Configures a field with appropriate TypeORM column decorators. + * + * @param target - The prototype of the class containing the field + * @param propertyKey - The name of the property/field + * @param fieldType - The framework field type + * @param fieldOptions - Field-specific options + */ + configureField( + target: any, + propertyKey: string, + fieldType: string, + fieldOptions?: any + ): void { + // Map framework field types to TypeORM column types + const typeMapping = this.getTypeOrmColumnType(fieldType, fieldOptions); + + // Store TypeORM column metadata + Reflect.defineMetadata('typeorm:column', typeMapping, target, propertyKey); + + // Store that this field is configured for TypeORM + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + } + + /** + * Maps framework field types to TypeORM column configurations. + * + * @param fieldType - The framework field type + * @param fieldOptions - Field-specific options + * @returns TypeORM column configuration + */ + private getTypeOrmColumnType(fieldType: string, fieldOptions?: any): any { + switch (fieldType) { + case 'text': + case 'email': + case 'html': + return { + type: fieldOptions?.maxLength && fieldOptions.maxLength <= 255 ? 'varchar' : 'text', + length: fieldOptions?.maxLength <= 255 ? fieldOptions.maxLength : undefined, + nullable: true // Will be overridden based on @Field required option + }; + + case 'integer': + return { + type: 'int', + nullable: true + }; + + case 'number': + case 'decimal': + return { + type: 'decimal', + precision: fieldOptions?.precision || 10, + scale: fieldOptions?.decimals || 2, + nullable: true + }; + + case 'boolean': + return { + type: 'boolean', + nullable: true + }; + + case 'datetime': + return { + type: 'timestamp', + nullable: true + }; + + case 'money': + return { + type: 'decimal', + precision: 19, + scale: fieldOptions?.decimals || 2, + nullable: true + }; + + case 'choice': + return { + type: 'varchar', + length: 50, + nullable: true + }; + + default: + // Default to text for unknown types + return { + type: 'text', + nullable: true + }; + } + } } diff --git a/src/model/Field.ts b/src/model/Field.ts index 4f9fe76..b0de942 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -1,38 +1,13 @@ import { IsNotEmpty, IsOptional, ValidateIf } from 'class-validator'; import { Exclude, Expose, Transform } from 'class-transformer'; import { CustomValidate } from '../validators/CustomValidationConstraint'; -import type { - CustomRequiredFunction, - CustomValidationFunction, +import type { + CustomRequiredFunction, + CustomValidationFunction, CustomAvailableFunction, ValidationIssue } from "./types/SharedTypes"; -/** - * Custom validation function type for field validation. - * - * @param value - The value of the field being validated - * @param object - The entire object containing the field being validated - * @returns Array of validation error objects, each containing a code and message. Return empty array if validation passes. - * - * @example - * ```typescript - * const validateAge: CustomValidationFunction = (value, object) => { - * if (value < 0) { - * return [{ code: 'INVALID_AGE', message: 'Age cannot be negative' }]; - * } - * return []; - * }; - * ``` - */ - -/** - * Type for a custom validation function. - * @param value - The value of the field being validated. - * @param object - The entire object containing the field. - * @returns An array of validation issues, or an empty array if valid. - */ - /** * Configuration options for the Field decorator. * @@ -199,6 +174,14 @@ export interface FieldOptions */ export function Field(options: FieldOptions) { return function (target: Object, propertyKey: string, descriptor?: PropertyDescriptor) { + + // Mark this property as a field + const existingFields = Reflect.getMetadata('model:fields', target.constructor) || []; + if (!existingFields.includes(propertyKey)) { + existingFields.push(propertyKey); + Reflect.defineMetadata('model:fields', existingFields, target.constructor); + } + // Add documentation metadata if provided if (options.docs) { Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); @@ -210,10 +193,10 @@ export function Field(options } else if (typeof options?.available === 'function') { // For function-based availability, we need to use Transform to conditionally include/exclude const availableFn = options.available as CustomAvailableFunction; - + // Store the availability function in metadata for potential future use Reflect.defineMetadata('field:available', availableFn, target, propertyKey); - + // Use Transform to control the field's presence in JSON Transform(({ obj, key }) => { try { @@ -226,7 +209,7 @@ export function Field(options return undefined; } }, { toPlainOnly: true })(target, propertyKey); - + // Also expose the field by default for cases where the function returns true Expose()(target, propertyKey); } else { diff --git a/src/model/Model.ts b/src/model/Model.ts index ab2b6b6..31e0a25 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -1,4 +1,5 @@ import "reflect-metadata"; +import { DataSource } from "../datasources"; /** * Configuration options for the Model decorator. @@ -6,25 +7,63 @@ import "reflect-metadata"; export interface ModelOptions { /** Optional documentation string for the model. */ docs?: string; + + /** Optional data source for persistence configuration. */ + dataSource?: DataSource; } /** * Decorator that marks a class as a model and stores metadata. * + * When a dataSource is provided, it will automatically configure the model + * with the necessary decorators and metadata for persistence. + * * @param options - Optional configuration for the model * @returns A class decorator function * * @example * ```typescript * // User model representing application users + * // Simple model without data source * @Model({ docs: "User model representing application users" }) * class User { * // class implementation * } + * + * // Persistent model with data source + * @Model({ + * docs: "User model with database persistence", + * dataSource: myTypeOrmDataSource + * }) + * class User extends PersistentModel { + * // class implementation + * } * ``` */ export function Model(options?: ModelOptions) { return function (constructor: Function) { Reflect.defineMetadata("model:docs", options?.docs, constructor); + + // If a data source is provided, configure the model for persistence + if (options?.dataSource) { + Reflect.defineMetadata("model:dataSource", options.dataSource, constructor); + + // Call configureModel on the data source + options.dataSource.configureModel(constructor, options); + + // Configure all fields with the data source + // Get the list of fields that have @Field decorators applied + const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', constructor.prototype, fieldName); + + if (fieldType) { + // Configure the field with the data source + options.dataSource!.configureField(constructor.prototype, fieldName, fieldType, fieldTypeOptions); + } + }); + } }; } diff --git a/src/model/PersistentModel.ts b/src/model/PersistentModel.ts new file mode 100644 index 0000000..3565c94 --- /dev/null +++ b/src/model/PersistentModel.ts @@ -0,0 +1,34 @@ +import { BaseModel } from './BaseModel'; +import { Model } from './Model'; +import { Field } from './Field'; +import { PrimaryGeneratedColumn } from 'typeorm'; + +/** + * Abstract base class for persistent models that need to be stored in a data source. + * + * Extends BaseModel with an `id` field that serves as the primary identifier + * for entities that will be persisted to a database or other storage system. + * + * @abstract + * + * @example + * ```typescript + * @Model({ + * dataSource: mainDataSource + * }) + * class User extends PersistentModel { + * @Field({ required: true }) + * @Text({ minLength: 2, maxLength: 50 }) + * name: string; + * } + * ``` + */ +@Model() +export abstract class PersistentModel extends BaseModel { + @Field({ + required: false, + docs: 'Unique identifier for the entity' + }) + @PrimaryGeneratedColumn('uuid') + id!: string +} \ No newline at end of file diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts new file mode 100644 index 0000000..7bb0106 --- /dev/null +++ b/test/datasources/DataSource.test.ts @@ -0,0 +1,320 @@ +import { + PersistentModel, + Model, + Field, + Text, + Email, + DateTime, + Integer, + TypeORMSqlDataSource +} from '../../index'; + +describe('Data Source Integration', () => { + + beforeEach(() => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + }); + + describe('PersistentModel', () => { + it('should extend BaseModel and include id field', () => { + @Model() + class TestPersistentModel extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + } + + const instance = new TestPersistentModel(); + instance.name = 'Test'; + instance.id = '123'; + + expect(instance.id).toBe('123'); + expect(instance.name).toBe('Test'); + expect(instance).toBeInstanceOf(PersistentModel); + }); + + it('should validate with id field optional', async () => { + @Model() + class TestPersistentModel extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + } + + const instance = new TestPersistentModel(); + instance.name = 'Test'; + // id is not set, but should still validate since it's optional + + const errors = await instance.validate(); + expect(errors).toHaveLength(0); + }); + + it('should include id in JSON serialization', () => { + @Model() + class TestPersistentModel extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + } + + const instance = new TestPersistentModel(); + instance.name = 'Test'; + instance.id = '123'; + + const json = instance.toJSON(); + expect(json).toEqual({ + id: '123', + name: 'Test' + }); + }); + }); + + describe('Model with DataSource', () => { + it('should configure model with TypeORM when dataSource is provided', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + @Model({ + dataSource: dataSource, + docs: 'Test user model' + }) + class User extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Email() + email!: string; + } + + // Check that the model has been configured with TypeORM metadata + const isEntity = Reflect.getMetadata('typeorm:entity', User); + const dataSourceType = Reflect.getMetadata('datasource:type', User); + const storedDataSource = Reflect.getMetadata('model:dataSource', User); + + expect(isEntity).toBe(true); + expect(dataSourceType).toBe('typeorm-sql'); + expect(storedDataSource).toBe(dataSource); + }); + + it('should configure fields with TypeORM column metadata', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + @Model({ + dataSource: dataSource + }) + class User extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Integer() + age!: number; + + @Field({ required: false }) + @DateTime() + createdAt?: Date; + } + + // Check field configurations + const nameColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'name'); + const ageColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'age'); + const createdAtColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'createdAt'); + + expect(nameColumn).toEqual({ + type: 'varchar', + length: 50, + nullable: true + }); + + expect(ageColumn).toEqual({ + type: 'int', + nullable: true + }); + + expect(createdAtColumn).toEqual({ + type: 'timestamp', + nullable: true + }); + }); + + it('should not configure fields when no dataSource is provided', () => { + @Model() + class User extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + } + + // Check that no TypeORM metadata was added + const isEntity = Reflect.getMetadata('typeorm:entity', User); + const nameColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'name'); + + expect(isEntity).toBeUndefined(); + expect(nameColumn).toBeUndefined(); + }); + }); + + describe('TypeOrmSqlDataSource', () => { + it('should map different field types to appropriate column types', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + @Model({ + dataSource: dataSource + }) + class TestEntity extends PersistentModel { + @Field({}) + @Text({ maxLength: 100 }) + shortText!: string; + + @Field({}) + @Text({ maxLength: 1000 }) + longText!: string; + + @Field({}) + @Integer() + count!: number; + + @Field({}) + @DateTime() + timestamp!: Date; + } + + const shortTextColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'shortText'); + const longTextColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'longText'); + const countColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'count'); + const timestampColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'timestamp'); + + expect(shortTextColumn.type).toBe('varchar'); + expect(shortTextColumn.length).toBe(100); + + expect(longTextColumn.type).toBe('text'); + expect(longTextColumn.length).toBeUndefined(); + + expect(countColumn.type).toBe('int'); + expect(timestampColumn.type).toBe('timestamp'); + }); + + it('should handle fields without type metadata gracefully', () => { + + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + // Create a field without any type decorator + @Model({ + dataSource: dataSource + }) + class TestEntity extends PersistentModel { + @Field({}) + plainField!: any; + } + + // The field should not have TypeORM column metadata since there's no type info + const plainFieldColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'plainField'); + expect(plainFieldColumn).toBeUndefined(); + }); + }); + + describe('Integration with existing functionality', () => { + it('should maintain validation functionality with data source', async () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + @Model({ + dataSource: dataSource + }) + class User extends PersistentModel { + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Email() + email!: string; + } + + const user = new User(); + + // Should fail validation without required name + let errors = await user.validate(); + expect(errors.length).toBeGreaterThan(0); + + // Should pass validation with valid data + user.name = 'John Doe'; + user.email = 'john@example.com'; + errors = await user.validate(); + expect(errors).toHaveLength(0); + }); + + it('should maintain JSON serialization with data source', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + @Model({ + dataSource: dataSource + }) + class User extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + + @Field({ available: false }) + @Text() + internalField!: string; + } + + const user = new User(); + user.id = '123'; + user.name = 'John'; + user.internalField = 'secret'; + + const json = user.toJSON(); + + // Should include id and name, but not internalField + expect(json).toEqual({ + id: '123', + name: 'John' + }); + expect(json.internalField).toBeUndefined(); + }); + }); +}); \ No newline at end of file diff --git a/test/datasources/TypeORMConnection.test.ts b/test/datasources/TypeORMConnection.test.ts index f39ca2a..e89a191 100644 --- a/test/datasources/TypeORMConnection.test.ts +++ b/test/datasources/TypeORMConnection.test.ts @@ -1,4 +1,4 @@ -import { TypeORMSqlDataSource } from '@/datasources/typeorm/TypeORMSqlDataSource'; +import { TypeORMSqlDataSource } from '../../index'; describe('TypeORM SQL DataSource - Basic Connection Tests', () => { describe('SQLite Connection', () => { From adc187af01242a1c48da1bb686045ab6f0e82ea2 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 2 Sep 2025 11:16:28 -0300 Subject: [PATCH 107/254] Add SQLite Database Operations --- .../typeorm/TypeORMSqlDataSource.ts | 113 ++++++- test/datasources/DataSource.test.ts | 309 +++++++++++++++++- 2 files changed, 414 insertions(+), 8 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 98146e5..bb5f6b8 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -97,7 +97,7 @@ export class TypeORMSqlDataSource extends DataSource { type: typeormOptions.type, logging: typeormOptions.logging ?? false, synchronize: typeormOptions.synchronize ?? typeormOptions.managed, - entities: [], // Will be populated as models are registered + entities: Array.from(this.registeredModels), // Include registered entities }; // SQLite-specific configuration @@ -196,16 +196,24 @@ export class TypeORMSqlDataSource extends DataSource { * @param options - Additional configuration options (e.g., table name) */ configureModel(modelClass: Function, options?: any): void { - // For now, we'll use reflection to mark the class as needing TypeORM configuration - // In a real implementation, this would apply the @Entity() decorator + // Register this model for inclusion in TypeORM entities + this.registeredModels.add(modelClass); + + // Apply the TypeORM @Entity decorator + const tableName = options?.tableName || modelClass.name.toLowerCase(); + Entity(tableName)(modelClass as any); + + // Store metadata for testing purposes Reflect.defineMetadata('typeorm:entity', true, modelClass); - if (options?.tableName) { Reflect.defineMetadata('typeorm:table', options.tableName, modelClass); } // Store that this model is configured for TypeORM Reflect.defineMetadata('datasource:type', 'typeorm-sql', modelClass); + + // Store the dataSource instance in the model metadata for later access + Reflect.defineMetadata('model:dataSource', this, modelClass); } /** @@ -222,10 +230,18 @@ export class TypeORMSqlDataSource extends DataSource { fieldType: string, fieldOptions?: any ): void { + // Skip the id field if it's already configured with @PrimaryGeneratedColumn + if (propertyKey === 'id') { + return; // PersistentModel already handles this with @PrimaryGeneratedColumn + } + // Map framework field types to TypeORM column types const typeMapping = this.getTypeOrmColumnType(fieldType, fieldOptions); - // Store TypeORM column metadata + // Apply the TypeORM @Column decorator + Column(typeMapping)(target, propertyKey); + + // Store TypeORM column metadata for testing purposes Reflect.defineMetadata('typeorm:column', typeMapping, target, propertyKey); // Store that this field is configured for TypeORM @@ -273,7 +289,7 @@ export class TypeORMSqlDataSource extends DataSource { case 'datetime': return { - type: 'timestamp', + type: 'datetime', nullable: true }; @@ -300,4 +316,89 @@ export class TypeORMSqlDataSource extends DataSource { }; } } + + /** + * Save an entity to the database. + * + * @param entity - The entity instance to save + * @returns Promise resolving to the saved entity with generated id + */ + async save(entity: T): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entity.constructor as any); + return await repository.save(entity as any) as T; + } + + /** + * Find entities by criteria. + * + * @param entityClass - The entity class to search for + * @param criteria - Search criteria (optional) + * @returns Promise resolving to array of found entities + */ + async find(entityClass: new() => T, criteria?: any): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + if (criteria) { + return await repository.find({ where: criteria }) as T[]; + } + return await repository.find() as T[]; + } + + /** + * Find a single entity by id. + * + * @param entityClass - The entity class to search for + * @param id - The id of the entity to find + * @returns Promise resolving to the found entity or null + */ + async findById(entityClass: new() => T, id: string): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.findOne({ where: { id } as any }) as T | null; + } + + /** + * Delete an entity by id. + * + * @param entityClass - The entity class + * @param id - The id of the entity to delete + * @returns Promise resolving to delete result + */ + async deleteById(entityClass: new() => T, id: string): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + await repository.delete(id); + } + + /** + * Count entities matching criteria. + * + * @param entityClass - The entity class to count + * @param criteria - Search criteria (optional) + * @returns Promise resolving to count of entities + */ + async count(entityClass: new() => T, criteria?: any): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + if (criteria) { + return await repository.count({ where: criteria }); + } + return await repository.count(); + } } diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts index 7bb0106..7d54f72 100644 --- a/test/datasources/DataSource.test.ts +++ b/test/datasources/DataSource.test.ts @@ -152,7 +152,7 @@ describe('Data Source Integration', () => { }); expect(createdAtColumn).toEqual({ - type: 'timestamp', + type: 'datetime', nullable: true }); }); @@ -217,7 +217,7 @@ describe('Data Source Integration', () => { expect(longTextColumn.length).toBeUndefined(); expect(countColumn.type).toBe('int'); - expect(timestampColumn.type).toBe('timestamp'); + expect(timestampColumn.type).toBe('datetime'); }); it('should handle fields without type metadata gracefully', () => { @@ -317,4 +317,309 @@ describe('Data Source Integration', () => { expect(json.internalField).toBeUndefined(); }); }); + + describe('SQLite Database Operations', () => { + let dataSource: TypeORMSqlDataSource; + + beforeEach(async () => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + }); + }); + + afterEach(async () => { + if (dataSource && dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + it('should save and retrieve a simple entity', async () => { + @Model({ + dataSource: dataSource + }) + class TestUser extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Email() + email!: string; + } + + // Initialize the data source after model is configured + await dataSource.initialize(dataSource.getOptions()); + + // Create and save a user + const user = new TestUser(); + user.name = 'John Doe'; + user.email = 'john@example.com'; + + // Validate before saving + const errors = await user.validate(); + expect(errors).toHaveLength(0); + + // Save the user + const savedUser = await dataSource.save(user); + expect(savedUser).toBeDefined(); + expect(savedUser.id).toBeDefined(); + expect(savedUser.name).toBe('John Doe'); + expect(savedUser.email).toBe('john@example.com'); + + // Find the user by id + const foundUser = await dataSource.findById(TestUser, savedUser.id); + expect(foundUser).toBeDefined(); + expect(foundUser!.name).toBe('John Doe'); + expect(foundUser!.email).toBe('john@example.com'); + }); + + it('should find all entities', async () => { + @Model({ + dataSource: dataSource + }) + class TestUser extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Integer() + age!: number; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Create and save multiple users + const user1 = new TestUser(); + user1.name = 'Alice'; + user1.age = 25; + + const user2 = new TestUser(); + user2.name = 'Bob'; + user2.age = 30; + + const savedUser1 = await dataSource.save(user1); + const savedUser2 = await dataSource.save(user2); + + // Find all users + const allUsers = await dataSource.find(TestUser); + expect(allUsers).toHaveLength(2); + + const names = allUsers.map(u => u.name).sort(); + expect(names).toEqual(['Alice', 'Bob']); + }); + + it('should find entities by criteria', async () => { + @Model({ + dataSource: dataSource + }) + class TestUser extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Integer() + age!: number; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Create and save users with different ages + const youngUser = new TestUser(); + youngUser.name = 'Alice'; + youngUser.age = 20; + + const oldUser = new TestUser(); + oldUser.name = 'Bob'; + oldUser.age = 50; + + await dataSource.save(youngUser); + await dataSource.save(oldUser); + + // Find users by age criteria + const youngUsers = await dataSource.find(TestUser, { age: 20 }); + expect(youngUsers).toHaveLength(1); + expect(youngUsers[0]).toBeDefined(); + expect(youngUsers[0]!.name).toBe('Alice'); + + const oldUsers = await dataSource.find(TestUser, { age: 50 }); + expect(oldUsers).toHaveLength(1); + expect(oldUsers[0]).toBeDefined(); + expect(oldUsers[0]!.name).toBe('Bob'); + }); + + it('should delete entities', async () => { + @Model({ + dataSource: dataSource + }) + class TestUser extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Create and save a user + const user = new TestUser(); + user.name = 'John Doe'; + const savedUser = await dataSource.save(user); + + // Verify user exists + let foundUser = await dataSource.findById(TestUser, savedUser.id); + expect(foundUser).toBeDefined(); + + // Delete the user + await dataSource.deleteById(TestUser, savedUser.id); + + // Verify user is deleted + foundUser = await dataSource.findById(TestUser, savedUser.id); + expect(foundUser).toBeNull(); + }); + + it('should count entities', async () => { + @Model({ + dataSource: dataSource + }) + class TestUser extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: false }) + @Text() + category!: string; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Create and save users with different categories + const user1 = new TestUser(); + user1.name = 'Alice'; + user1.category = 'admin'; + + const user2 = new TestUser(); + user2.name = 'Bob'; + user2.category = 'user'; + + const user3 = new TestUser(); + user3.name = 'Charlie'; + user3.category = 'admin'; + + await dataSource.save(user1); + await dataSource.save(user2); + await dataSource.save(user3); + + // Count all users + const totalCount = await dataSource.count(TestUser); + expect(totalCount).toBe(3); + + // Count admin users + const adminCount = await dataSource.count(TestUser, { category: 'admin' }); + expect(adminCount).toBe(2); + + // Count regular users + const userCount = await dataSource.count(TestUser, { category: 'user' }); + expect(userCount).toBe(1); + }); + + it('should handle complex models with different field types', async () => { + @Model({ + dataSource: dataSource + }) + class ComplexModel extends PersistentModel { + @Field({ required: true }) + @Text({ maxLength: 100 }) + title!: string; + + @Field({ required: false }) + @Integer() + count!: number; + + @Field({ required: false }) + @DateTime() + createdAt!: Date; + + @Field({ required: false }) + @Email() + contact!: string; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Create and save a complex model + const model = new ComplexModel(); + model.title = 'Test Record'; + model.count = 42; + model.createdAt = new Date('2023-01-15T10:30:00Z'); + model.contact = 'test@example.com'; + + // Validate and save + const errors = await model.validate(); + expect(errors).toHaveLength(0); + + const savedModel = await dataSource.save(model); + expect(savedModel.id).toBeDefined(); + + // Retrieve and verify + const foundModel = await dataSource.findById(ComplexModel, savedModel.id); + expect(foundModel).toBeDefined(); + expect(foundModel!.title).toBe('Test Record'); + expect(foundModel!.count).toBe(42); + expect(foundModel!.contact).toBe('test@example.com'); + + // Note: Date comparison might need special handling depending on how TypeORM handles dates + expect(foundModel!.createdAt).toBeInstanceOf(Date); + }); + + it('should maintain validation when working with the database', async () => { + @Model({ + dataSource: dataSource + }) + class ValidatedUser extends PersistentModel { + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + name!: string; + + @Field({ required: true }) + @Email() + email!: string; + + @Field({ required: false }) + @Integer() + age!: number; + } + + await dataSource.initialize(dataSource.getOptions()); + + // Try to save an invalid user + const invalidUser = new ValidatedUser(); + invalidUser.name = 'A'; // Too short + invalidUser.email = 'invalid-email'; // Invalid email format + + const errors = await invalidUser.validate(); + expect(errors.length).toBeGreaterThan(0); + + // Should not save invalid data - but this depends on framework validation + // For now, we'll test that valid data works correctly + + // Create a valid user + const validUser = new ValidatedUser(); + validUser.name = 'John Doe'; + validUser.email = 'john@example.com'; + validUser.age = 30; + + const validationErrors = await validUser.validate(); + expect(validationErrors).toHaveLength(0); + + const savedUser = await dataSource.save(validUser); + expect(savedUser.id).toBeDefined(); + expect(savedUser.name).toBe('John Doe'); + }); + }); }); \ No newline at end of file From a8fe1574dff3f9f7b786496161a4674bf0ea3f35 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 2 Sep 2025 11:42:40 -0300 Subject: [PATCH 108/254] Refactor ValidationIssue from interface to type --- src/model/types/SharedTypes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/types/SharedTypes.ts b/src/model/types/SharedTypes.ts index a6ac12e..ebbddec 100644 --- a/src/model/types/SharedTypes.ts +++ b/src/model/types/SharedTypes.ts @@ -1,7 +1,7 @@ /** * Validation issue interface for custom validation functions. */ -export interface ValidationIssue { +export type ValidationIssue = { /** Error code identifier */ constraint: string; /** Human-readable error message */ From 486e553575f81aff9b040ed52be62c7d109bb0b6 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 09:45:31 -0300 Subject: [PATCH 109/254] Fix file system import --- test/datasources/TypeORMConnection.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/datasources/TypeORMConnection.test.ts b/test/datasources/TypeORMConnection.test.ts index e89a191..2f4baf8 100644 --- a/test/datasources/TypeORMConnection.test.ts +++ b/test/datasources/TypeORMConnection.test.ts @@ -1,4 +1,5 @@ import { TypeORMSqlDataSource } from '../../index'; +import * as fs from 'fs'; describe('TypeORM SQL DataSource - Basic Connection Tests', () => { describe('SQLite Connection', () => { @@ -40,7 +41,6 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { await dataSource.disconnect(); // Clean up the file - const fs = require('fs'); if (fs.existsSync('./test-db.sqlite')) { fs.unlinkSync('./test-db.sqlite'); } From 7846f9c57d884fdb0912107646752f13a6721312 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 10:00:12 -0300 Subject: [PATCH 110/254] Set nullable to false if field is required --- .../typeorm/TypeORMSqlDataSource.ts | 20 +++++++++++-------- src/model/Field.ts | 5 +++++ src/model/Model.ts | 9 ++++++++- test/datasources/DataSource.test.ts | 6 +++--- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index bb5f6b8..ef2f17d 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -256,6 +256,10 @@ export class TypeORMSqlDataSource extends DataSource { * @returns TypeORM column configuration */ private getTypeOrmColumnType(fieldType: string, fieldOptions?: any): any { + // Determine if the field should be nullable based on the required option + const isRequired = fieldOptions?.required === true; + const nullable = !isRequired; + switch (fieldType) { case 'text': case 'email': @@ -263,13 +267,13 @@ export class TypeORMSqlDataSource extends DataSource { return { type: fieldOptions?.maxLength && fieldOptions.maxLength <= 255 ? 'varchar' : 'text', length: fieldOptions?.maxLength <= 255 ? fieldOptions.maxLength : undefined, - nullable: true // Will be overridden based on @Field required option + nullable: nullable }; case 'integer': return { type: 'int', - nullable: true + nullable: nullable }; case 'number': @@ -278,19 +282,19 @@ export class TypeORMSqlDataSource extends DataSource { type: 'decimal', precision: fieldOptions?.precision || 10, scale: fieldOptions?.decimals || 2, - nullable: true + nullable: nullable }; case 'boolean': return { type: 'boolean', - nullable: true + nullable: nullable }; case 'datetime': return { type: 'datetime', - nullable: true + nullable: nullable }; case 'money': @@ -298,21 +302,21 @@ export class TypeORMSqlDataSource extends DataSource { type: 'decimal', precision: 19, scale: fieldOptions?.decimals || 2, - nullable: true + nullable: nullable }; case 'choice': return { type: 'varchar', length: 50, - nullable: true + nullable: nullable }; default: // Default to text for unknown types return { type: 'text', - nullable: true + nullable: nullable }; } } diff --git a/src/model/Field.ts b/src/model/Field.ts index b0de942..dbd79c1 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -187,6 +187,11 @@ export function Field(options Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); } + // Store required metadata if provided + if (options.required !== undefined) { + Reflect.defineMetadata('field:required', options.required, target, propertyKey); + } + // Handle field availability for JSON serialization/deserialization if (options?.available === false) { Exclude()(target, propertyKey); diff --git a/src/model/Model.ts b/src/model/Model.ts index 31e0a25..e50d43c 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -58,10 +58,17 @@ export function Model(options?: ModelOptions) { fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', constructor.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', constructor.prototype, fieldName); if (fieldType) { + // Combine field options including required information + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + // Configure the field with the data source - options.dataSource!.configureField(constructor.prototype, fieldName, fieldType, fieldTypeOptions); + options.dataSource!.configureField(constructor.prototype, fieldName, fieldType, allFieldOptions); } }); } diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts index 7d54f72..85c4d73 100644 --- a/test/datasources/DataSource.test.ts +++ b/test/datasources/DataSource.test.ts @@ -143,17 +143,17 @@ describe('Data Source Integration', () => { expect(nameColumn).toEqual({ type: 'varchar', length: 50, - nullable: true + nullable: false // Required field should not be nullable }); expect(ageColumn).toEqual({ type: 'int', - nullable: true + nullable: true // Optional field should be nullable }); expect(createdAtColumn).toEqual({ type: 'datetime', - nullable: true + nullable: true // Optional field should be nullable }); }); From 3c53439890f30867111cf72b091c2f5614781bb2 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 10:27:17 -0300 Subject: [PATCH 111/254] Add support for HTML arrays --- src/model/types/HTML.ts | 78 ++++++++++++++++++---- test/HTMLArray.test.ts | 120 ++++++++++++++++++++++++++++++++++ test/TaskArraySupport.test.ts | 71 ++++++++++++++++++++ test/model/Task.ts | 14 ++-- 4 files changed, 265 insertions(+), 18 deletions(-) create mode 100644 test/HTMLArray.test.ts create mode 100644 test/TaskArraySupport.test.ts diff --git a/src/model/types/HTML.ts b/src/model/types/HTML.ts index e5b5747..d3369c4 100644 --- a/src/model/types/HTML.ts +++ b/src/model/types/HTML.ts @@ -1,22 +1,36 @@ import 'reflect-metadata'; import { validateStringType } from './utils'; import { Text } from './Text'; +import { IsArray, IsString } from 'class-validator'; +import { Transform, TransformationType } from 'class-transformer'; /** * HTML type decorator. - * - Must be used on `string` fields. - * - Currently identical to `Text()` without extra options. + * - Must be used on `string` or `string[]` fields. + * - For single strings: identical to `Text()` without extra options. + * - For string arrays: validates each element is a string. */ // Custom key types for clearer IntelliSense errors -type HtmlKey = T[K] extends string +type HtmlKey = T[K] extends string | string[] ? K - : `HTML: requires string field`; + : `HTML: requires string or string[] field`; /** - * HTML type decorator for string properties. + * Validates that a property is of string or string array type at runtime. + */ +function validateHtmlType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== String && designType !== Array) { + throw new Error(`@HTML can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); + } +} + +/** + * HTML type decorator for string or string array properties. * - * This decorator can only be applied to properties of type `string` and provides - * the same validation capabilities as the Text decorator. It also stores + * This decorator can be applied to properties of type `string` or `string[]` and provides + * validation capabilities. For single strings, it behaves identically to the Text decorator. + * For string arrays, it validates that each element is a string. It also stores * metadata that can be consumed by other layers such as database mapping or * documentation generation to indicate this field contains HTML content. * @@ -25,18 +39,22 @@ type HtmlKey = T[K] extends string * class Article { * @HTML() * content: string; + * + * @HTML() + * sections: string[]; * } * ``` * * @returns A property decorator function that applies text validation and stores HTML metadata * - * @throws {Error} When applied to non-string properties + * @throws {Error} When applied to non-string or non-string[] properties * * @remarks - * - Currently identical to Text() decorator in functionality - * - Metadata is stored under 'field:type' key with value 'html' + * - For strings: identical to Text() decorator in functionality + * - For arrays: validates each element is a string + * - Metadata is stored under 'field:type' key with value 'html' or 'array:html' * - The decorator uses reflection to verify the property type at runtime - * - Inherits all validation capabilities from the Text decorator + * - Inherits validation capabilities from the Text decorator for single strings */ export function HTML() { return function ( @@ -46,8 +64,40 @@ export function HTML() { const propName = propertyKey as unknown as string; const proto = target as unknown as Object; - validateStringType(proto, propName); - Reflect.defineMetadata('field:type', 'html', proto, propName); - Text()(target as any, propName as any); + validateHtmlType(proto, propName); + + const designType = Reflect.getMetadata('design:type', proto, propName); + + if (designType === Array) { + // Handle string array case + Reflect.defineMetadata('field:type', 'array:html', proto, propName); + + // Use built-in class-validator decorators for array validation + IsArray()(target as any, propName); + IsString({ each: true })(target as any, propName); + + // Apply transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: array -> JSON + if (value == null) return value; + if (!Array.isArray(value)) return value; + return value; + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: JSON -> array + if (value == null) return value; + if (!Array.isArray(value)) return value; + + // Ensure all elements are strings + return value.map(element => String(element)); + } + + return value; + })(target as any, propName); + } else { + // Handle single string case + Reflect.defineMetadata('field:type', 'html', proto, propName); + Text()(target as any, propName as any); + } }; } diff --git a/test/HTMLArray.test.ts b/test/HTMLArray.test.ts new file mode 100644 index 0000000..9ec4a73 --- /dev/null +++ b/test/HTMLArray.test.ts @@ -0,0 +1,120 @@ +import { Field, Model, BaseModel, HTML } from "../index"; + +@Model({ + docs: "Test model for HTML decorator with array support", +}) +class HTMLTestModel extends BaseModel { + @Field({}) + @HTML() + singleContent!: string; + + @Field({}) + @HTML() + contentArray!: string[]; + + @Field({ required: false }) + @HTML() + optionalContentArray!: string[]; +} + +describe("HTML Decorator with Array Support", () => { + it("should work with single string content", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Hello World

"; + model.contentArray = ["

First paragraph

", "

Second paragraph

"]; + + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it("should validate string arrays with HTML content", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = [ + "
Content 1
", + "Content 2", + "Plain text is also valid" + ]; + + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it("should fail validation when array contains non-string elements", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = [ + "
Valid content
", + 123 as any, // Invalid: number + null as any // Invalid: null + ]; + + const errors = await model.validate(); + expect(errors.length).toBeGreaterThan(0); + + const arrayError = errors.find(e => e.property === 'contentArray'); + expect(arrayError).toBeDefined(); + }); + + it("should fail validation when property is not an array", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = "not an array" as any; + + const errors = await model.validate(); + expect(errors.length).toBeGreaterThan(0); + + const arrayError = errors.find(e => e.property === 'contentArray'); + expect(arrayError).toBeDefined(); + expect(arrayError?.constraints).toHaveProperty('isArray'); + }); + + it("should handle empty arrays", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = []; + + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it("should handle optional arrays being undefined", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = ["

Content

"]; + // optionalContentArray is undefined + + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it("should serialize and deserialize arrays correctly", async () => { + const model = new HTMLTestModel(); + model.singleContent = "

Title

"; + model.contentArray = ["

Content 1

", "

Content 2

"]; + model.optionalContentArray = ["
Optional
"]; + + const json = model.toJSON(); + expect(json.contentArray).toEqual(["

Content 1

", "

Content 2

"]); + expect(json.optionalContentArray).toEqual(["
Optional
"]); + + const restored = HTMLTestModel.fromJSON(json); + expect(restored.contentArray).toEqual(["

Content 1

", "

Content 2

"]); + expect(restored.optionalContentArray).toEqual(["
Optional
"]); + }); + + it("should convert non-string elements to strings during deserialization", async () => { + const jsonData = { + singleContent: "

Title

", + contentArray: ["

String content

", 123, true], // Mixed types + optionalContentArray: ["
Optional
"] + }; + + const restored = HTMLTestModel.fromJSON(jsonData); + expect(restored.contentArray).toEqual(["

String content

", "123", "true"]); + + // Validation should pass after conversion + const errors = await restored.validate(); + expect(errors).toHaveLength(0); + }); +}); diff --git a/test/TaskArraySupport.test.ts b/test/TaskArraySupport.test.ts new file mode 100644 index 0000000..df96516 --- /dev/null +++ b/test/TaskArraySupport.test.ts @@ -0,0 +1,71 @@ +import { Task, TaskStatus, Priority } from "./model/Task"; + +describe("Task Model with HTML Array Support", () => { + it("should create and validate a task with HTML notes array", async () => { + const task = new Task(); + task.title = "Complete project documentation"; + task.status = TaskStatus.ToDo; + task.priority = Priority.High; + task.notes = [ + "

Requirements

Document all features

", + "

Timeline

Due by end of week

", + "Note: Include code examples" + ]; + + const errors = await task.validate(); + expect(errors).toHaveLength(0); + + const json = task.toJSON(); + expect(json.notes).toEqual([ + "

Requirements

Document all features

", + "

Timeline

Due by end of week

", + "Note: Include code examples" + ]); + + const restored = Task.fromJSON(json); + expect(restored.notes).toEqual([ + "

Requirements

Document all features

", + "

Timeline

Due by end of week

", + "Note: Include code examples" + ]); + }); + + it("should handle empty notes array", async () => { + const task = new Task(); + task.title = "Simple task"; + task.status = TaskStatus.InProgress; + task.priority = Priority.Low; + task.notes = []; + + const errors = await task.validate(); + expect(errors).toHaveLength(0); + }); + + it("should work without notes since it's optional", async () => { + const task = new Task(); + task.title = "Minimal task"; + task.status = TaskStatus.Done; + task.priority = Priority.Medium; + + const errors = await task.validate(); + expect(errors).toHaveLength(0); + }); + + it("should fail validation if notes array contains non-strings", async () => { + const task = new Task(); + task.title = "Task with invalid notes"; + task.status = TaskStatus.ToDo; + task.priority = Priority.Medium; + task.notes = [ + "

Valid HTML note

", + 123 as any, // Invalid: number + "

Another valid note

" + ]; + + const errors = await task.validate(); + expect(errors.length).toBeGreaterThan(0); + + const notesError = errors.find(e => e.property === 'notes'); + expect(notesError).toBeDefined(); + }); +}); diff --git a/test/model/Task.ts b/test/model/Task.ts index 6b413ec..71950ef 100644 --- a/test/model/Task.ts +++ b/test/model/Task.ts @@ -1,7 +1,7 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Choice, Text, Relationship } from "@/model/types"; +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { BaseModel } from "../../src/model/BaseModel"; +import { Choice, Text, Relationship, HTML } from "../../src/model/types"; import { Project } from "./Project"; export enum TaskStatus { @@ -44,4 +44,10 @@ export class Task extends BaseModel { type: 'reference' }) project!: Project; + + @Field({ + required: false + }) + @HTML() + notes!: string[]; } From 40a7527b52bf8b80f84447e7e7bab4a63ef49354 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 10:52:14 -0300 Subject: [PATCH 112/254] Add array suppor for text types and enhance project structure --- index.ts | 29 +-- src/model/types/Email.ts | 55 ------ src/model/types/Text.ts | 104 ---------- src/model/types/{ => boolean}/Boolean.ts | 2 +- src/model/types/{ => date_time}/DateTime.ts | 2 +- .../types/{ => date_time}/DateTimeRange.ts | 2 +- src/model/types/{ => enum}/Choice.ts | 2 +- src/model/types/index.ts | 32 ++-- src/model/types/{ => number}/Decimal.ts | 0 src/model/types/{ => number}/Integer.ts | 0 src/model/types/{ => number}/Money.ts | 0 src/model/types/{ => number}/Number.ts | 0 .../types/{ => relationship}/Relationship.ts | 2 +- src/model/types/string/Email.ts | 104 ++++++++++ src/model/types/{ => string}/HTML.ts | 2 +- src/model/types/string/Text.ts | 181 ++++++++++++++++++ test/model/App.ts | 5 +- test/model/Customer.ts | 5 +- test/model/DecimalMoneyModel.ts | 2 +- test/model/LineItem.ts | 4 +- test/model/Order.ts | 5 +- test/model/Person.ts | 5 +- test/model/Product.ts | 4 +- test/model/Project.ts | 5 +- test/model/Task.ts | 6 + test/{ => types_tests}/Boolean.test.ts | 2 +- test/{ => types_tests}/Choice.test.ts | 2 +- test/{ => types_tests}/ComplexObjects.test.ts | 6 +- test/{ => types_tests}/DateTime.test.ts | 4 +- test/{ => types_tests}/DateTimeRange.test.ts | 4 +- .../{ => types_tests}/DecimalAndMoney.test.ts | 2 +- test/{ => types_tests}/Email.test.ts | 2 +- test/{ => types_tests}/HTML.test.ts | 2 +- test/{ => types_tests}/HTMLArray.test.ts | 2 +- test/{ => types_tests}/Number.test.ts | 4 +- test/{ => types_tests}/NumberInteger.test.ts | 2 +- test/{ => types_tests}/Relationship.test.ts | 16 +- .../TaskArraySupport.test.ts | 2 +- test/{ => types_tests}/Text.test.ts | 4 +- 39 files changed, 359 insertions(+), 253 deletions(-) delete mode 100644 src/model/types/Email.ts delete mode 100644 src/model/types/Text.ts rename src/model/types/{ => boolean}/Boolean.ts (96%) rename src/model/types/{ => date_time}/DateTime.ts (99%) rename src/model/types/{ => date_time}/DateTimeRange.ts (99%) rename src/model/types/{ => enum}/Choice.ts (98%) rename src/model/types/{ => number}/Decimal.ts (100%) rename src/model/types/{ => number}/Integer.ts (100%) rename src/model/types/{ => number}/Money.ts (100%) rename src/model/types/{ => number}/Number.ts (100%) rename src/model/types/{ => relationship}/Relationship.ts (99%) create mode 100644 src/model/types/string/Email.ts rename src/model/types/{ => string}/HTML.ts (98%) create mode 100644 src/model/types/string/Text.ts rename test/{ => types_tests}/Boolean.test.ts (98%) rename test/{ => types_tests}/Choice.test.ts (98%) rename test/{ => types_tests}/ComplexObjects.test.ts (98%) rename test/{ => types_tests}/DateTime.test.ts (98%) rename test/{ => types_tests}/DateTimeRange.test.ts (98%) rename test/{ => types_tests}/DecimalAndMoney.test.ts (99%) rename test/{ => types_tests}/Email.test.ts (98%) rename test/{ => types_tests}/HTML.test.ts (98%) rename test/{ => types_tests}/HTMLArray.test.ts (98%) rename test/{ => types_tests}/Number.test.ts (98%) rename test/{ => types_tests}/NumberInteger.test.ts (98%) rename test/{ => types_tests}/Relationship.test.ts (96%) rename test/{ => types_tests}/TaskArraySupport.test.ts (97%) rename test/{ => types_tests}/Text.test.ts (99%) diff --git a/index.ts b/index.ts index 5fff608..b3974f9 100644 --- a/index.ts +++ b/index.ts @@ -7,19 +7,20 @@ export type { FieldOptions } from './src/model/Field'; export { Model } from './src/model/Model'; export type { ModelOptions } from './src/model/Model'; export { CustomValidate } from './src/validators/CustomValidationConstraint'; -export { Text } from './src/model/types/Text'; -export type { TextOptions } from './src/model/types/Text'; -export { Email } from './src/model/types/Email'; -export { HTML } from './src/model/types/HTML'; -export { Boolean } from './src/model/types/Boolean'; -export { Choice } from './src/model/types/Choice'; -export { DateTime } from './src/model/types/DateTime'; -export type { DateTimeOptions } from './src/model/types/DateTime'; -export { DateTimeRange, DateTimeRangeType } from './src/model/types/DateTimeRange'; -export type { DateTimeRangeOptions } from './src/model/types/DateTimeRange'; -export { Integer } from './src/model/types/Integer'; -export { Money } from './src/model/types/Money'; -export { Number } from './src/model/types/Number'; -export { Decimal } from './src/model/types/Decimal'; +export { Text } from './src/model/types/string/Text'; +export type { TextOptions } from './src/model/types/string/Text'; +export { Email } from './src/model/types/string/Email'; +export { HTML } from './src/model/types/string/HTML'; +export { Boolean } from './src/model/types/boolean/Boolean'; +export { Choice } from './src/model/types/'; +export { DateTime } from './src/model/types/'; +export type { DateTimeOptions } from './src/model/types/'; +export { DateTimeRange, DateTimeRangeType } from './src/model/types/'; +export type { DateTimeRangeOptions } from './src/model/types/'; +export { Integer } from './src/model/types/number/Integer'; +export { Money } from './src/model/types/number/Money'; +export { Number } from './src/model/types/number/Number'; +export { Decimal } from './src/model/types/number/Decimal'; export { PersistentModel } from './src/model'; export { TypeORMSqlDataSource } from './src/datasources'; +export { Relationship } from './src/model/types'; diff --git a/src/model/types/Email.ts b/src/model/types/Email.ts deleted file mode 100644 index 65b14e2..0000000 --- a/src/model/types/Email.ts +++ /dev/null @@ -1,55 +0,0 @@ -import 'reflect-metadata'; -import { IsEmail } from 'class-validator'; -import { validateStringType } from './utils'; - -/** - * Email type decorator. - * - Must be used on `string` fields. - * - Uses standard class-validator email validation. - * - No options. - */ -// Custom key types for clearer IntelliSense errors -type EmailKey = T[K] extends string - ? K - : `Email: requires string field`; - -/** - * Email type decorator for string properties. - * - * This decorator can only be applied to properties of type `string` and provides - * email validation capabilities through class-validator decorators. It also stores - * metadata that can be consumed by other layers such as database mapping or - * documentation generation. - * - * @example - * ```typescript - * class User { - * @Email() - * email: string; - * } - * ``` - * - * @returns A property decorator function that applies email validation and stores metadata - * - * @throws {Error} When applied to non-string properties - * - * @remarks - * - Uses standard class-validator email validation - * - Metadata is stored under 'field:type' key with value 'email' - * - The decorator uses reflection to verify the property type at runtime - */ -export function Email() { - return function ( - target: T, - propertyKey: EmailKey - ) { - const propName = propertyKey as unknown as string; - const proto = target as unknown as Object; - - validateStringType(proto, propName); - Reflect.defineMetadata('field:type', 'email', proto, propName); - - // Use standard class-validator email decorator - IsEmail()(target as any, propName); - }; -} diff --git a/src/model/types/Text.ts b/src/model/types/Text.ts deleted file mode 100644 index cfe6d4f..0000000 --- a/src/model/types/Text.ts +++ /dev/null @@ -1,104 +0,0 @@ -import 'reflect-metadata'; -import { - MinLength, - MaxLength, - Matches, -} from 'class-validator'; -import { validateStringType } from './utils'; - -/** - * Options for the Text decorator. - */ -export interface TextOptions { - /** Minimum allowed length for the string. */ - minLength?: number; - /** Maximum allowed length for the string. */ - maxLength?: number; - /** Regular expression to validate the value. */ - regex?: RegExp; - /** Message to show if the regex fails. Required when `regex` is provided. */ - regexMessage?: string; -} - -/** - * Text type decorator. - * - Can only be applied to properties of type `string`. - * - Applies class-validator decorators based on provided options. - * - Stores basic metadata that could be used by other layers (e.g., DB mapping). - */ -// Custom key types for clearer IntelliSense errors -type TextKey = T[K] extends string - ? K - : `Text: requires string field`; - - -/** - * Stores metadata for the text field that can be consumed by other layers. - * @param proto - The prototype object - * @param propName - The property name - * @param options - Text options to store - */ -function storeTextMetadata(proto: Object, propName: string, options?: TextOptions): void { - Reflect.defineMetadata('field:type', 'text', proto, propName); - if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); - } -} - -/** - * Text type decorator for string properties. - * - * This decorator can only be applied to properties of type `string` and provides - * validation capabilities through class-validator decorators. It also stores - * metadata that can be consumed by other layers such as database mapping or - * documentation generation. - * * @example - * ```typescript - * class User { - * @Text({ minLength: 2, maxLength: 50 }) - * name: string; - * * @Text({ regex: /^[A-Z]+$/, regexMessage: 'Must be uppercase letters only' }) - * code: string; - * } - * ``` - * * @param options - Configuration options for text validation and behavior - * @param options.minLength - Minimum allowed length for the string value - * @param options.maxLength - Maximum allowed length for the string value - * @param options.regex - Regular expression pattern to validate the string against - * @param options.regexMessage - Error message to display when regex validation fails (required when regex is provided) - * * @returns A property decorator function that applies validation and stores metadata - * * @throws {Error} When applied to non-string properties - * @throws {Error} When regex is provided without regexMessage - * * @remarks - * - All validators will validate all values including empty strings if the field is required - * - Metadata is stored under 'field:type' (always 'text') and 'field:type:options' keys - * - The decorator uses reflection to verify the property type at runtime - */ -export function Text(options?: TextOptions) { - return function ( - target: T, - propertyKey: TextKey - ) { - const propName = propertyKey as unknown as string; - const proto = target as unknown as Object; - - validateStringType(proto, propName); - storeTextMetadata(proto, propName, options); - - // Apply class-validator decorators directly - if (options?.minLength !== undefined) { - MinLength(options.minLength)(target as any, propName); - } - - if (options?.maxLength !== undefined) { - MaxLength(options.maxLength)(target as any, propName); - } - - if (options?.regex) { - if (!options.regexMessage) { - throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); - } - Matches(options.regex, { message: options.regexMessage })(target as any, propName); - } - }; -} \ No newline at end of file diff --git a/src/model/types/Boolean.ts b/src/model/types/boolean/Boolean.ts similarity index 96% rename from src/model/types/Boolean.ts rename to src/model/types/boolean/Boolean.ts index 82f0f53..802bd3e 100644 --- a/src/model/types/Boolean.ts +++ b/src/model/types/boolean/Boolean.ts @@ -1,5 +1,5 @@ import 'reflect-metadata'; -import { validateBooleanType } from './utils'; +import { validateBooleanType } from '../utils'; /** * Boolean type decorator. diff --git a/src/model/types/DateTime.ts b/src/model/types/date_time/DateTime.ts similarity index 99% rename from src/model/types/DateTime.ts rename to src/model/types/date_time/DateTime.ts index 5cb5164..988bb61 100644 --- a/src/model/types/DateTime.ts +++ b/src/model/types/date_time/DateTime.ts @@ -5,7 +5,7 @@ import { ValidationOptions, } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; -import { validateDateType, dateToISO8601, dateFromJSON } from './utils'; +import { validateDateType, dateToISO8601, dateFromJSON } from '../utils'; /** * Options for the DateTime decorator. diff --git a/src/model/types/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts similarity index 99% rename from src/model/types/DateTimeRange.ts rename to src/model/types/date_time/DateTimeRange.ts index d090a31..dc48d3c 100644 --- a/src/model/types/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -7,7 +7,7 @@ import { IsOptional } from 'class-validator'; import { Type, Transform, TransformationType, Expose } from 'class-transformer'; -import { dateToISO8601, dateFromJSON } from './utils'; +import { dateToISO8601, dateFromJSON } from '../utils'; /** * Options for the DateTimeRange decorator. diff --git a/src/model/types/Choice.ts b/src/model/types/enum/Choice.ts similarity index 98% rename from src/model/types/Choice.ts rename to src/model/types/enum/Choice.ts index be5a27d..05782b1 100644 --- a/src/model/types/Choice.ts +++ b/src/model/types/enum/Choice.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import { Transform, TransformationType } from 'class-transformer'; -import { validateEnumType } from './utils'; +import { validateEnumType } from '../utils'; /** * Choice type decorator. diff --git a/src/model/types/index.ts b/src/model/types/index.ts index e0fd89b..827d287 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -1,16 +1,16 @@ -export { Text } from './Text'; -export type { TextOptions } from './Text'; -export { Email } from './Email'; -export { HTML } from './HTML'; -export { Boolean } from './Boolean'; -export { Choice } from './Choice'; -export { DateTime } from './DateTime'; -export type { DateTimeOptions } from './DateTime'; -export { DateTimeRange, DateTimeRangeType } from './DateTimeRange'; -export type { DateTimeRangeOptions } from './DateTimeRange'; -export { Integer } from './Integer'; -export { Money } from './Money'; -export { Number } from './Number'; -export { Decimal } from './Decimal'; -export { Relationship } from './Relationship'; -export type { RelationshipOptions } from './Relationship'; +export { Text } from './string/Text'; +export type { TextOptions } from './string/Text'; +export { Email } from './string/Email'; +export { HTML } from './string/HTML'; +export { Boolean } from './boolean/Boolean'; +export { Choice } from './enum/Choice'; +export { DateTime } from './date_time/DateTime'; +export type { DateTimeOptions } from './date_time/DateTime'; +export { DateTimeRange, DateTimeRangeType } from './date_time/DateTimeRange'; +export type { DateTimeRangeOptions } from './date_time/DateTimeRange'; +export { Integer } from './number/Integer'; +export { Money } from './number/Money'; +export { Number } from './number/Number'; +export { Decimal } from './number/Decimal'; +export { Relationship } from './relationship/Relationship'; +export type { RelationshipOptions } from './relationship/Relationship'; diff --git a/src/model/types/Decimal.ts b/src/model/types/number/Decimal.ts similarity index 100% rename from src/model/types/Decimal.ts rename to src/model/types/number/Decimal.ts diff --git a/src/model/types/Integer.ts b/src/model/types/number/Integer.ts similarity index 100% rename from src/model/types/Integer.ts rename to src/model/types/number/Integer.ts diff --git a/src/model/types/Money.ts b/src/model/types/number/Money.ts similarity index 100% rename from src/model/types/Money.ts rename to src/model/types/number/Money.ts diff --git a/src/model/types/Number.ts b/src/model/types/number/Number.ts similarity index 100% rename from src/model/types/Number.ts rename to src/model/types/number/Number.ts diff --git a/src/model/types/Relationship.ts b/src/model/types/relationship/Relationship.ts similarity index 99% rename from src/model/types/Relationship.ts rename to src/model/types/relationship/Relationship.ts index f48ba45..78f4085 100644 --- a/src/model/types/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; import { ValidateNested } from 'class-validator'; -import { BaseModel } from '../BaseModel'; +import { BaseModel } from '../../index'; /** * Relationship type options. diff --git a/src/model/types/string/Email.ts b/src/model/types/string/Email.ts new file mode 100644 index 0000000..0f86cf2 --- /dev/null +++ b/src/model/types/string/Email.ts @@ -0,0 +1,104 @@ +import 'reflect-metadata'; +import { IsEmail, IsArray } from 'class-validator'; +import { Transform, TransformationType } from 'class-transformer'; +import { validateStringType } from '../utils'; + +/** + * Email type decorator. + * - Must be used on `string` or `string[]` fields. + * - For single strings: uses standard class-validator email validation. + * - For string arrays: validates each element as an email address. + * - No options. + */ +// Custom key types for clearer IntelliSense errors +type EmailKey = T[K] extends string | string[] + ? K + : `Email: requires string or string[] field`; + +/** + * Validates that a property is of string or string array type at runtime. + */ +function validateEmailType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== String && designType !== Array) { + throw new Error(`@Email can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); + } +} + +/** + * Email type decorator for string or string array properties. + * + * This decorator can be applied to properties of type `string` or `string[]` and provides + * email validation capabilities through class-validator decorators. For single strings, + * it validates email format. For string arrays, it validates that each element is a valid + * email address. It also stores metadata that can be consumed by other layers such as + * database mapping or documentation generation. + * + * @example + * ```typescript + * class User { + * @Email() + * email: string; + * + * @Email() + * alternativeEmails: string[]; + * } + * ``` + * + * @returns A property decorator function that applies email validation and stores metadata + * + * @throws {Error} When applied to non-string or non-string[] properties + * + * @remarks + * - For strings: uses standard class-validator email validation + * - For arrays: validates each element as an email address + * - Metadata is stored under 'field:type' key with value 'email' or 'array:email' + * - The decorator uses reflection to verify the property type at runtime + */ +export function Email() { + return function ( + target: T, + propertyKey: EmailKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateEmailType(proto, propName); + + const designType = Reflect.getMetadata('design:type', proto, propName); + + if (designType === Array) { + // Handle email array case + Reflect.defineMetadata('field:type', 'array:email', proto, propName); + + // Use built-in class-validator decorators for array validation + IsArray()(target as any, propName); + IsEmail({}, { each: true })(target as any, propName); + + // Apply transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: array -> JSON + if (value == null) return value; + if (!Array.isArray(value)) return value; + return value; + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: JSON -> array + if (value == null) return value; + if (!Array.isArray(value)) return value; + + // Ensure all elements are strings + return value.map(element => String(element)); + } + + return value; + })(target as any, propName); + } else { + // Handle single email case + Reflect.defineMetadata('field:type', 'email', proto, propName); + + // Use standard class-validator email decorator + IsEmail()(target as any, propName); + } + }; +} diff --git a/src/model/types/HTML.ts b/src/model/types/string/HTML.ts similarity index 98% rename from src/model/types/HTML.ts rename to src/model/types/string/HTML.ts index d3369c4..50980e0 100644 --- a/src/model/types/HTML.ts +++ b/src/model/types/string/HTML.ts @@ -1,5 +1,5 @@ import 'reflect-metadata'; -import { validateStringType } from './utils'; +import { validateStringType } from '../utils'; import { Text } from './Text'; import { IsArray, IsString } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; diff --git a/src/model/types/string/Text.ts b/src/model/types/string/Text.ts new file mode 100644 index 0000000..853c1ab --- /dev/null +++ b/src/model/types/string/Text.ts @@ -0,0 +1,181 @@ +import 'reflect-metadata'; +import { + MinLength, + MaxLength, + Matches, + IsArray, + IsString, + ArrayMinSize, + ArrayMaxSize, +} from 'class-validator'; +import { Transform, TransformationType } from 'class-transformer'; +import { validateStringType } from '../utils'; + +/** + * Options for the Text decorator. + */ +export interface TextOptions { + /** Minimum allowed length for the string. */ + minLength?: number; + /** Maximum allowed length for the string. */ + maxLength?: number; + /** Regular expression to validate the value. */ + regex?: RegExp; + /** Message to show if the regex fails. Required when `regex` is provided. */ + regexMessage?: string; +} + +/** + * Text type decorator. + * - Can be applied to properties of type `string` or `string[]`. + * - For single strings: applies class-validator decorators based on provided options. + * - For string arrays: validates each element as a string and applies array-level constraints. + * - Stores basic metadata that could be used by other layers (e.g., DB mapping). + */ +// Custom key types for clearer IntelliSense errors +type TextKey = T[K] extends string | string[] + ? K + : `Text: requires string or string[] field`; + +/** + * Validates that a property is of string or string array type at runtime. + */ +function validateTextType(proto: Object, propertyKey: string): void { + const designType = Reflect.getMetadata('design:type', proto, propertyKey); + if (designType !== String && designType !== Array) { + throw new Error(`@Text can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); + } +} + + +/** + * Stores metadata for the text field that can be consumed by other layers. + * @param proto - The prototype object + * @param propName - The property name + * @param options - Text options to store + */ +function storeTextMetadata(proto: Object, propName: string, options?: TextOptions): void { + Reflect.defineMetadata('field:type', 'text', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } +} + +/** + * Text type decorator for string or string array properties. + * + * This decorator can be applied to properties of type `string` or `string[]` and provides + * validation capabilities through class-validator decorators. For single strings, it applies + * length and regex validations. For string arrays, it validates each element as a string + * and can apply array-level length constraints. It also stores metadata that can be consumed + * by other layers such as database mapping or documentation generation. + * + * @example + * ```typescript + * class User { + * @Text({ minLength: 2, maxLength: 50 }) + * name: string; + * + * @Text({ regex: /^[A-Z]+$/, regexMessage: 'Must be uppercase letters only' }) + * code: string; + * + * @Text({ minLength: 1, maxLength: 5 }) + * tags: string[]; + * } + * ``` + * + * @param options - Configuration options for text validation and behavior + * @param options.minLength - For strings: minimum length. For arrays: minimum array size + * @param options.maxLength - For strings: maximum length. For arrays: maximum array size + * @param options.regex - Regular expression pattern (only for single strings) + * @param options.regexMessage - Error message for regex validation (required when regex is provided) + * + * @returns A property decorator function that applies validation and stores metadata + * + * @throws {Error} When applied to non-string or non-string[] properties + * @throws {Error} When regex is provided without regexMessage + * @throws {Error} When regex is used with array properties + * + * @remarks + * - For strings: validates length and regex patterns + * - For arrays: validates array length and ensures each element is a string + * - Metadata is stored under 'field:type' ('text' or 'array:text') and 'field:type:options' keys + * - The decorator uses reflection to verify the property type at runtime + */ +export function Text(options?: TextOptions) { + return function ( + target: T, + propertyKey: TextKey + ) { + const propName = propertyKey as unknown as string; + const proto = target as unknown as Object; + + validateTextType(proto, propName); + + const designType = Reflect.getMetadata('design:type', proto, propName); + + if (designType === Array) { + // Handle string array case + Reflect.defineMetadata('field:type', 'array:text', proto, propName); + if (options) { + Reflect.defineMetadata('field:type:options', options, proto, propName); + } + + // Validate that regex is not used with arrays + if (options?.regex) { + throw new Error(`@Text on '${propName}': regex validation is not supported for string arrays`); + } + + // Use built-in class-validator decorators for array validation + IsArray()(target as any, propName); + IsString({ each: true })(target as any, propName); + + // Apply array size constraints + if (options?.minLength !== undefined) { + ArrayMinSize(options.minLength)(target as any, propName); + } + + if (options?.maxLength !== undefined) { + ArrayMaxSize(options.maxLength)(target as any, propName); + } + + // Apply transformation for JSON serialization/deserialization + Transform(({ value, type }) => { + if (type === TransformationType.CLASS_TO_PLAIN) { + // Serialization: array -> JSON + if (value == null) return value; + if (!Array.isArray(value)) return value; + return value; + } else if (type === TransformationType.PLAIN_TO_CLASS) { + // Deserialization: JSON -> array + if (value == null) return value; + if (!Array.isArray(value)) return value; + + // Ensure all elements are strings + return value.map(element => String(element)); + } + + return value; + })(target as any, propName); + } else { + // Handle single string case + storeTextMetadata(proto, propName, options); + + // Apply class-validator decorators directly for single strings + if (options?.minLength !== undefined) { + MinLength(options.minLength)(target as any, propName); + } + + if (options?.maxLength !== undefined) { + MaxLength(options.maxLength)(target as any, propName); + } + + if (options?.regex) { + if (!options.regexMessage) { + throw new Error(`@Text on '${propName}' requires 'regexMessage' when 'regex' is provided`); + } + Matches(options.regex, { message: options.regexMessage })(target as any, propName); + } + } + }; +} \ No newline at end of file diff --git a/test/model/App.ts b/test/model/App.ts index daff922..65771c5 100644 --- a/test/model/App.ts +++ b/test/model/App.ts @@ -1,7 +1,4 @@ -import { BaseModel } from "@/model/BaseModel"; -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { Text } from "@/model/types/Text"; +import { BaseModel, Field, Model, Text } from "../../index"; @Model({ diff --git a/test/model/Customer.ts b/test/model/Customer.ts index 4c55eac..585c0fd 100644 --- a/test/model/Customer.ts +++ b/test/model/Customer.ts @@ -1,7 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Text } from "@/model/types"; +import { BaseModel, Field, Model, Text } from "../../index"; @Model({ docs: "Represents a customer", diff --git a/test/model/DecimalMoneyModel.ts b/test/model/DecimalMoneyModel.ts index 69e8ea1..c6cd11f 100644 --- a/test/model/DecimalMoneyModel.ts +++ b/test/model/DecimalMoneyModel.ts @@ -1,4 +1,4 @@ -import { Field, Model, BaseModel, Money, Decimal } from '../../index'; +import { BaseModel, Field, Model, Decimal, Money } from "../../index"; @Model({ docs: "Represents a product", diff --git a/test/model/LineItem.ts b/test/model/LineItem.ts index 776b783..bcdb1cd 100644 --- a/test/model/LineItem.ts +++ b/test/model/LineItem.ts @@ -1,6 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; +import { BaseModel, Field, Model } from "../../index"; @Model({ docs: "Represents a line item in an order", diff --git a/test/model/Order.ts b/test/model/Order.ts index 4c580a1..4135b40 100644 --- a/test/model/Order.ts +++ b/test/model/Order.ts @@ -1,7 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { DateTime, Relationship } from "@/model/types"; +import { BaseModel, Field, Model, Relationship, DateTime } from "../../index"; import { Customer } from "./Customer"; import { LineItem } from "./LineItem"; diff --git a/test/model/Person.ts b/test/model/Person.ts index c80ef47..37d2a4c 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -1,7 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Text, Email, HTML, Boolean } from "@/model/types"; +import { BaseModel, Field, Model, Text, Email, HTML, Boolean } from "../../index"; @Model({ docs: "Represents a person", diff --git a/test/model/Product.ts b/test/model/Product.ts index 77aa1bc..f8e6949 100644 --- a/test/model/Product.ts +++ b/test/model/Product.ts @@ -1,6 +1,4 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; +import { BaseModel, Field, Model } from "../../index"; @Model({ docs: "Represents a product", diff --git a/test/model/Project.ts b/test/model/Project.ts index 187aec2..182be1c 100644 --- a/test/model/Project.ts +++ b/test/model/Project.ts @@ -1,7 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Text, DateTime, DateTimeRange, DateTimeRangeType } from "@/model/types"; +import { BaseModel, Field, Model, Text, DateTime, DateTimeRange, DateTimeRangeType } from "../../index"; @Model({ docs: "Represents a project with date-related fields", diff --git a/test/model/Task.ts b/test/model/Task.ts index 71950ef..1b11d88 100644 --- a/test/model/Task.ts +++ b/test/model/Task.ts @@ -50,4 +50,10 @@ export class Task extends BaseModel { }) @HTML() notes!: string[]; + + @Field({ + required: false + }) + @Text() + sponsors!: string[]; } diff --git a/test/Boolean.test.ts b/test/types_tests/Boolean.test.ts similarity index 98% rename from test/Boolean.test.ts rename to test/types_tests/Boolean.test.ts index e907ffb..c040326 100644 --- a/test/Boolean.test.ts +++ b/test/types_tests/Boolean.test.ts @@ -1,4 +1,4 @@ -import { Person } from "./model/Person"; +import { Person } from "../model/Person"; describe("Boolean Field Type", () => { describe("validation-tests", () => { diff --git a/test/Choice.test.ts b/test/types_tests/Choice.test.ts similarity index 98% rename from test/Choice.test.ts rename to test/types_tests/Choice.test.ts index 32a20b4..fa1eec9 100644 --- a/test/Choice.test.ts +++ b/test/types_tests/Choice.test.ts @@ -1,4 +1,4 @@ -import { Task, TaskStatus, Priority } from "./model/Task"; +import { Task, TaskStatus, Priority } from "../model/Task"; describe("Choice Field Type", () => { describe("validation-tests", () => { diff --git a/test/ComplexObjects.test.ts b/test/types_tests/ComplexObjects.test.ts similarity index 98% rename from test/ComplexObjects.test.ts rename to test/types_tests/ComplexObjects.test.ts index bf2428e..3f12e7d 100644 --- a/test/ComplexObjects.test.ts +++ b/test/types_tests/ComplexObjects.test.ts @@ -1,8 +1,4 @@ -import { Field } from "@/model/Field"; -import { Model } from "@/model/Model"; -import { BaseModel } from "@/model/BaseModel"; -import { Text, Email } from "@/model/types"; -import { Relationship } from "@/model/types"; +import { BaseModel, Field, Model, Text, Email, Relationship } from "../../index"; import type { ValidationError } from "class-validator"; /** diff --git a/test/DateTime.test.ts b/test/types_tests/DateTime.test.ts similarity index 98% rename from test/DateTime.test.ts rename to test/types_tests/DateTime.test.ts index b25d554..5ce074e 100644 --- a/test/DateTime.test.ts +++ b/test/types_tests/DateTime.test.ts @@ -1,5 +1,5 @@ -import { Project } from "./model/Project"; -import { DateTimeRangeType } from "@/model/types"; +import { Project } from "../model/Project"; +import { DateTimeRangeType } from "../../index"; import type { ValidationError } from "class-validator"; diff --git a/test/DateTimeRange.test.ts b/test/types_tests/DateTimeRange.test.ts similarity index 98% rename from test/DateTimeRange.test.ts rename to test/types_tests/DateTimeRange.test.ts index 754ddb3..0cb736f 100644 --- a/test/DateTimeRange.test.ts +++ b/test/types_tests/DateTimeRange.test.ts @@ -1,5 +1,5 @@ -import { Project } from "./model/Project"; -import { DateTimeRangeType } from "@/model/types"; +import { Project } from "../model/Project"; +import { DateTimeRangeType } from "../../index"; import type { ValidationError } from "class-validator"; diff --git a/test/DecimalAndMoney.test.ts b/test/types_tests/DecimalAndMoney.test.ts similarity index 99% rename from test/DecimalAndMoney.test.ts rename to test/types_tests/DecimalAndMoney.test.ts index c4501c1..6ee741c 100644 --- a/test/DecimalAndMoney.test.ts +++ b/test/types_tests/DecimalAndMoney.test.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import number from 'financial-number'; -import { DecimalMoneyModel } from './model/DecimalMoneyModel'; +import { DecimalMoneyModel } from '../model/DecimalMoneyModel'; describe('@Decimal Decorator', () => { diff --git a/test/Email.test.ts b/test/types_tests/Email.test.ts similarity index 98% rename from test/Email.test.ts rename to test/types_tests/Email.test.ts index 711a7b0..5aa247a 100644 --- a/test/Email.test.ts +++ b/test/types_tests/Email.test.ts @@ -1,4 +1,4 @@ -import { Person } from "./model/Person"; +import { Person } from "../model/Person"; import type { ValidationError } from "class-validator"; diff --git a/test/HTML.test.ts b/test/types_tests/HTML.test.ts similarity index 98% rename from test/HTML.test.ts rename to test/types_tests/HTML.test.ts index c934cb8..b1f808d 100644 --- a/test/HTML.test.ts +++ b/test/types_tests/HTML.test.ts @@ -1,4 +1,4 @@ -import { Person } from "./model/Person"; +import { Person } from "../model/Person"; describe("HTML Field Type", () => { describe("validation-tests", () => { diff --git a/test/HTMLArray.test.ts b/test/types_tests/HTMLArray.test.ts similarity index 98% rename from test/HTMLArray.test.ts rename to test/types_tests/HTMLArray.test.ts index 9ec4a73..fa5db09 100644 --- a/test/HTMLArray.test.ts +++ b/test/types_tests/HTMLArray.test.ts @@ -1,4 +1,4 @@ -import { Field, Model, BaseModel, HTML } from "../index"; +import { Field, Model, BaseModel, HTML } from "../../index"; @Model({ docs: "Test model for HTML decorator with array support", diff --git a/test/Number.test.ts b/test/types_tests/Number.test.ts similarity index 98% rename from test/Number.test.ts rename to test/types_tests/Number.test.ts index d25f268..05833b2 100644 --- a/test/Number.test.ts +++ b/test/types_tests/Number.test.ts @@ -1,5 +1,5 @@ -import { Person } from "./model/Person"; -import { Product } from "./model/Product"; +import { Person } from "../model/Person"; +import { Product } from "../model/Product"; import type { ValidationError } from "class-validator"; diff --git a/test/NumberInteger.test.ts b/test/types_tests/NumberInteger.test.ts similarity index 98% rename from test/NumberInteger.test.ts rename to test/types_tests/NumberInteger.test.ts index 85f636e..314a3e3 100644 --- a/test/NumberInteger.test.ts +++ b/test/types_tests/NumberInteger.test.ts @@ -1,4 +1,4 @@ -import { NumberIntegerModel } from "./model/NumberIntegerModel"; +import { NumberIntegerModel } from "../model/NumberIntegerModel"; describe('Number and Integer Decorators', () => { diff --git a/test/Relationship.test.ts b/test/types_tests/Relationship.test.ts similarity index 96% rename from test/Relationship.test.ts rename to test/types_tests/Relationship.test.ts index 3c2358d..03f87de 100644 --- a/test/Relationship.test.ts +++ b/test/types_tests/Relationship.test.ts @@ -1,13 +1,9 @@ -import { Relationship } from '@/model/types'; -import { Field } from '@/model/Field'; -import { Model } from '@/model/Model'; -import { BaseModel } from '@/model/BaseModel'; -import { Customer } from './model/Customer'; -import { LineItem } from './model/LineItem'; -import { Order } from './model/Order'; -import { Project } from './model/Project'; -import { Task } from './model/Task'; -import { DateTimeRangeType } from '@/model/types/DateTimeRange'; +import { BaseModel, Field, Model, DateTimeRangeType, Relationship } from "../../index"; +import { Customer } from '../model/Customer'; +import { LineItem } from '../model/LineItem'; +import { Order } from '../model/Order'; +import { Project } from '../model/Project'; +import { Task } from '../model/Task'; // Additional test models for relationship validation @Model() diff --git a/test/TaskArraySupport.test.ts b/test/types_tests/TaskArraySupport.test.ts similarity index 97% rename from test/TaskArraySupport.test.ts rename to test/types_tests/TaskArraySupport.test.ts index df96516..3973efe 100644 --- a/test/TaskArraySupport.test.ts +++ b/test/types_tests/TaskArraySupport.test.ts @@ -1,4 +1,4 @@ -import { Task, TaskStatus, Priority } from "./model/Task"; +import { Task, TaskStatus, Priority } from "../model/Task"; describe("Task Model with HTML Array Support", () => { it("should create and validate a task with HTML notes array", async () => { diff --git a/test/Text.test.ts b/test/types_tests/Text.test.ts similarity index 99% rename from test/Text.test.ts rename to test/types_tests/Text.test.ts index 4487405..a7ba704 100644 --- a/test/Text.test.ts +++ b/test/types_tests/Text.test.ts @@ -1,5 +1,5 @@ -import { App } from "./model/App"; -import { Person } from "./model/Person"; +import { App } from "../model/App"; +import { Person } from "../model/Person"; import type { ValidationError } from "class-validator"; From f3d8dbe3a08d9735963deca5e717624602fbe3de Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 11:48:15 -0300 Subject: [PATCH 113/254] Implement array field support in TypeORM data source and enhance validation for Text decorator --- .gitignore | 3 +- .../typeorm/TypeORMSqlDataSource.ts | 357 +++++++++++++++++- src/model/types/string/Text.ts | 6 +- test/model/BlogPost.ts | 45 +++ test/types_tests/ArrayPersistence.test.ts | 314 +++++++++++++++ 5 files changed, 715 insertions(+), 10 deletions(-) create mode 100644 test/model/BlogPost.ts create mode 100644 test/types_tests/ArrayPersistence.test.ts diff --git a/.gitignore b/.gitignore index 1f10941..13f5af9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.idea/ node_modules/ package-lock.json -dist/ \ No newline at end of file +dist/ +prompts/ \ No newline at end of file diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index ef2f17d..78fc56d 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import { DataSource as TypeORMDataSource, DataSourceOptions as TypeORMDataSourceOptions } from 'typeorm'; -import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'; +import { Entity, PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm'; import { DataSource, DataSourceOptions } from '../DataSource'; /** @@ -76,6 +76,7 @@ export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { export class TypeORMSqlDataSource extends DataSource { private typeormDataSource: TypeORMDataSource | null = null; private registeredModels: Set = new Set(); + private arrayElementEntities: Map = new Map(); constructor(options: TypeORMSqlDataSourceOptions) { super(options); @@ -97,7 +98,7 @@ export class TypeORMSqlDataSource extends DataSource { type: typeormOptions.type, logging: typeormOptions.logging ?? false, synchronize: typeormOptions.synchronize ?? typeormOptions.managed, - entities: Array.from(this.registeredModels), // Include registered entities + entities: [...Array.from(this.registeredModels), ...Array.from(this.arrayElementEntities.values())], // Include registered entities and array entities }; // SQLite-specific configuration @@ -218,6 +219,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Configures a field with appropriate TypeORM column decorators. + * For array fields, creates a separate entity and sets up a one-to-many relationship. * * @param target - The prototype of the class containing the field * @param propertyKey - The name of the property/field @@ -235,6 +237,12 @@ export class TypeORMSqlDataSource extends DataSource { return; // PersistentModel already handles this with @PrimaryGeneratedColumn } + // Check if this is an array field + if (fieldType.startsWith('array:')) { + this.configureArrayField(target, propertyKey, fieldType, fieldOptions); + return; + } + // Map framework field types to TypeORM column types const typeMapping = this.getTypeOrmColumnType(fieldType, fieldOptions); @@ -248,6 +256,165 @@ export class TypeORMSqlDataSource extends DataSource { Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); } + /** + * Configures an array field by creating a separate entity and storing metadata. + * Note: We don't use TypeORM relationships for dynamically created array entities. + * + * @param target - The prototype of the class containing the field + * @param propertyKey - The name of the property/field + * @param fieldType - The framework field type (e.g., 'array:text', 'array:html') + * @param fieldOptions - Field-specific options + */ + private configureArrayField( + target: any, + propertyKey: string, + fieldType: string, + fieldOptions?: any + ): void { + const parentEntityName = target.constructor.name; + const baseFieldType = fieldType.replace('array:', ''); // e.g., 'text', 'html', 'email' + + // Create a unique key for this array field + const arrayEntityKey = `${parentEntityName}_${propertyKey}`; + + // Check if we've already created an entity for this array field + if (!this.arrayElementEntities.has(arrayEntityKey)) { + const arrayElementEntity = this.createArrayElementEntity( + parentEntityName, + propertyKey, + baseFieldType, + fieldOptions + ); + this.arrayElementEntities.set(arrayEntityKey, arrayElementEntity); + } + + // Store metadata about this array field without configuring TypeORM relationships + Reflect.defineMetadata('typeorm:array-field', { + elementEntityKey: arrayEntityKey, + baseFieldType: baseFieldType, + options: fieldOptions + }, target, propertyKey); + + // Store that this field is configured for TypeORM + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + } + + /** + * Creates a new entity class for array elements. + * + * @param parentEntityName - Name of the parent entity + * @param fieldName - Name of the array field + * @param baseFieldType - Base type of array elements (e.g., 'text', 'html') + * @param fieldOptions - Field-specific options + * @returns The created entity class + */ + private createArrayElementEntity( + parentEntityName: string, + fieldName: string, + baseFieldType: string, + fieldOptions?: any + ): Function { + const tableName = `${parentEntityName.toLowerCase()}_${fieldName}`; + const entityName = `${parentEntityName}_${fieldName}`; + + // Dynamically create the array element entity class + const ArrayElementEntity = class { + id!: string; + parentId!: string; + value!: string; + index!: number; + }; + + // Set the class name for better debugging + Object.defineProperty(ArrayElementEntity, 'name', { value: entityName }); + + // Apply TypeORM decorators + Entity(tableName)(ArrayElementEntity); + + // Configure the id field + PrimaryGeneratedColumn('uuid')(ArrayElementEntity.prototype, 'id'); + + // Configure the parentId field (foreign key) + Column({ type: 'uuid', name: 'parent_id' })(ArrayElementEntity.prototype, 'parentId'); + + // Configure the value field based on the base field type + const valueColumnConfig = this.getArrayElementColumnConfig(baseFieldType, fieldOptions); + Column(valueColumnConfig)(ArrayElementEntity.prototype, 'value'); + + // Configure the index field to preserve array order + Column({ type: 'int', name: 'array_index' })(ArrayElementEntity.prototype, 'index'); + + return ArrayElementEntity; + } + + /** + * Gets the column configuration for array element values based on the base field type. + * + * @param baseFieldType - The base field type (e.g., 'text', 'html', 'email') + * @param fieldOptions - Field-specific options + * @returns TypeORM column configuration + */ + private getArrayElementColumnConfig(baseFieldType: string, fieldOptions?: any): any { + switch (baseFieldType) { + case 'text': + case 'email': + case 'html': + return { + type: fieldOptions?.maxLength && fieldOptions.maxLength <= 255 ? 'varchar' : 'text', + length: fieldOptions?.maxLength <= 255 ? fieldOptions.maxLength : undefined, + nullable: false + }; + + case 'integer': + return { + type: 'int', + nullable: false + }; + + case 'number': + case 'decimal': + return { + type: 'decimal', + precision: fieldOptions?.precision || 10, + scale: fieldOptions?.decimals || 2, + nullable: false + }; + + case 'boolean': + return { + type: 'boolean', + nullable: false + }; + + case 'datetime': + return { + type: 'datetime', + nullable: false + }; + + case 'money': + return { + type: 'decimal', + precision: 19, + scale: fieldOptions?.decimals || 2, + nullable: false + }; + + case 'choice': + return { + type: 'varchar', + length: 50, + nullable: false + }; + + default: + return { + type: 'text', + nullable: false + }; + } + } + /** * Maps framework field types to TypeORM column configurations. * @@ -323,6 +490,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Save an entity to the database. + * Handles array field conversion before saving. * * @param entity - The entity instance to save * @returns Promise resolving to the saved entity with generated id @@ -333,11 +501,135 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entity.constructor as any); - return await repository.save(entity as any) as T; + + // If entity has an id, we need to handle updates differently + const isUpdate = !!(entity as any).id; + + if (isUpdate) { + // For updates, first handle array field deletion + await this.handleArrayFieldsForUpdate(entity); + } + + // Preserve array values before extracting main entity fields + const arrayValues = this.extractArrayValues(entity); + + // Save the main entity first (without arrays converted) + const mainEntityToSave = this.extractMainEntityFields(entity); + const savedMainEntity = await repository.save(mainEntityToSave as any) as T; + + // Now save array fields using the preserved values + await this.saveArrayFields(entity, arrayValues, savedMainEntity); + + // Return the entity with arrays loaded + const result = await this.findById(entity.constructor as any, (savedMainEntity as any).id); + return result as T; // We know it exists since we just saved it + } + + /** + * Handles array field updates by removing old array elements. + */ + private async handleArrayFieldsForUpdate(entity: T): Promise { + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); + // Delete existing array elements for this entity + await repository.delete({ parentId: (entity as any).id }); + } + } + } + } + + /** + * Extracts array values from an entity before processing. + */ + private extractArrayValues(entity: T): Record { + const arrayValues: Record = {}; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayValue = (entity as any)[fieldName]; + if (Array.isArray(arrayValue)) { + arrayValues[fieldName] = arrayValue; + } + } + } + + return arrayValues; + } + + /** + * Extracts main entity fields (excluding arrays) for saving. + */ + private extractMainEntityFields(entity: T): T { + const entityCopy = { ...entity }; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + // Remove array fields from the main entity + delete (entityCopy as any)[fieldName]; + } + } + + return entityCopy; + } + + /** + * Saves array fields as separate entities. + */ + private async saveArrayFields(originalEntity: T, arrayValues: Record, savedEntity: T): Promise { + const entityClass = originalEntity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayValue = arrayValues[fieldName]; + + if (Array.isArray(arrayValue) && arrayValue.length > 0) { + const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); + + // Create array element entities using the saved entity's ID + const elementEntities = arrayValue.map((value, index) => { + const elementEntity = new (ArrayElementEntity as any)(); + elementEntity.parentId = (savedEntity as any).id; + elementEntity.value = value; + elementEntity.index = index; + return elementEntity; + }); + + // Save all array elements + await repository.save(elementEntities); + } + } + } + } } /** * Find entities by criteria. + * Handles array field conversion after loading. * * @param entityClass - The entity class to search for * @param criteria - Search criteria (optional) @@ -349,14 +641,21 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); + let entities: T[]; + if (criteria) { - return await repository.find({ where: criteria }) as T[]; + entities = await repository.find({ where: criteria }) as T[]; + } else { + entities = await repository.find() as T[]; } - return await repository.find() as T[]; + + // Load array data for each entity + return await Promise.all(entities.map(entity => this.loadArrayFields(entity))); } /** * Find a single entity by id. + * Handles array field conversion after loading. * * @param entityClass - The entity class to search for * @param id - The id of the entity to find @@ -368,7 +667,14 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - return await repository.findOne({ where: { id } as any }) as T | null; + const entity = await repository.findOne({ where: { id } as any }) as T | null; + + if (!entity) { + return null; + } + + // Load array data for the entity + return await this.loadArrayFields(entity); } /** @@ -405,4 +711,43 @@ export class TypeORMSqlDataSource extends DataSource { } return await repository.count(); } + + /** + * Loads array fields for an entity by querying array element entities. + * + * @param entity - The entity to load array fields for + * @returns The entity with array fields populated + */ + private async loadArrayFields(entity: T): Promise { + const entityCopy = { ...entity }; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); + + // Load array elements for this entity, ordered by index + const elements = await repository.find({ + where: { parentId: (entity as any).id }, + order: { index: 'ASC' } + }); + + // Extract values into an array + (entityCopy as any)[fieldName] = elements.map(element => element.value); + } + } + } + + return entityCopy; + } + + + } diff --git a/src/model/types/string/Text.ts b/src/model/types/string/Text.ts index 853c1ab..249fb2e 100644 --- a/src/model/types/string/Text.ts +++ b/src/model/types/string/Text.ts @@ -130,13 +130,13 @@ export function Text(options?: TextOptions) { IsArray()(target as any, propName); IsString({ each: true })(target as any, propName); - // Apply array size constraints + // Apply element-level string length constraints if (options?.minLength !== undefined) { - ArrayMinSize(options.minLength)(target as any, propName); + MinLength(options.minLength, { each: true })(target as any, propName); } if (options?.maxLength !== undefined) { - ArrayMaxSize(options.maxLength)(target as any, propName); + MaxLength(options.maxLength, { each: true })(target as any, propName); } // Apply transformation for JSON serialization/deserialization diff --git a/test/model/BlogPost.ts b/test/model/BlogPost.ts new file mode 100644 index 0000000..4d005e2 --- /dev/null +++ b/test/model/BlogPost.ts @@ -0,0 +1,45 @@ +import { Field } from "../../src/model/Field"; +import { Model } from "../../src/model/Model"; +import { PersistentModel } from "../../src/model/PersistentModel"; +import { Text, HTML, Email } from "../../src/model/types"; + +@Model({ + docs: "Represents a blog post with array fields", +}) +export class BlogPost extends PersistentModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 200, + }) + title!: string; + + @Field({ + required: true, + }) + @HTML() + content!: string; + + @Field({ + required: false + }) + @Text({ + minLength: 1, + maxLength: 50 + }) + tags!: string[]; + + @Field({ + required: false + }) + @HTML() + notes!: string[]; + + @Field({ + required: false + }) + @Email() + collaboratorEmails!: string[]; +} diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts new file mode 100644 index 0000000..7264ba3 --- /dev/null +++ b/test/types_tests/ArrayPersistence.test.ts @@ -0,0 +1,314 @@ +import { BlogPost } from "../model/BlogPost"; +import { TypeORMSqlDataSource } from "../../src/datasources/typeorm/TypeORMSqlDataSource"; + +describe("Array Persistence in SQL Databases", () => { + let dataSource: TypeORMSqlDataSource; + let blogPost: BlogPost; + + beforeAll(async () => { + // Create a TypeORM data source with SQLite for testing + dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + filename: ":memory:", + managed: true, + synchronize: true, + logging: false + }); + + // Configure the BlogPost model with the data source + const modelOptions = { dataSource }; + Reflect.defineMetadata("model:dataSource", dataSource, BlogPost); + dataSource.configureModel(BlogPost, modelOptions); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', BlogPost) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', BlogPost.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(BlogPost.prototype, fieldName, fieldType, allFieldOptions); + } + }); + + // Initialize the data source + await dataSource.initialize(dataSource.getOptions()); + }); + + beforeEach(() => { + blogPost = new BlogPost(); + blogPost.title = "Sample Blog Post"; + blogPost.content = "

Hello World

This is a sample blog post.

"; + blogPost.tags = ["javascript", "typescript", "web-development"]; + blogPost.notes = [ + "

Note 1

Remember to add examples

", + "

Note 2

Include code snippets

" + ]; + blogPost.collaboratorEmails = [ + "john@example.com", + "jane@example.com", + "bob@example.com" + ]; + }); + + afterAll(async () => { + if (dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + describe("Array Creation and Persistence", () => { + it("should save a blog post with all array fields", async () => { + const errors = await blogPost.validate(); + expect(errors).toHaveLength(0); + + const savedPost = await dataSource.save(blogPost); + + expect(savedPost.id).toBeDefined(); + expect(savedPost.title).toBe("Sample Blog Post"); + expect(savedPost.tags).toEqual(["javascript", "typescript", "web-development"]); + expect(savedPost.notes).toHaveLength(2); + expect(savedPost.collaboratorEmails).toHaveLength(3); + }); + + it("should save a blog post with empty arrays", async () => { + blogPost.tags = []; + blogPost.notes = []; + blogPost.collaboratorEmails = []; + + const savedPost = await dataSource.save(blogPost); + + expect(savedPost.id).toBeDefined(); + expect(savedPost.tags).toEqual([]); + expect(savedPost.notes).toEqual([]); + expect(savedPost.collaboratorEmails).toEqual([]); + }); + + it("should save a blog post with undefined array fields", async () => { + delete (blogPost as any).tags; + delete (blogPost as any).notes; + delete (blogPost as any).collaboratorEmails; + + const savedPost = await dataSource.save(blogPost); + + expect(savedPost.id).toBeDefined(); + expect(savedPost.title).toBe("Sample Blog Post"); + }); + }); + + describe("Array Retrieval", () => { + let savedPost: BlogPost; + + beforeEach(async () => { + // Clean up any existing data + const allPosts = await dataSource.find(BlogPost); + for (const post of allPosts) { + await dataSource.deleteById(BlogPost, post.id); + } + + // Create a fresh blog post for testing + const freshPost = new BlogPost(); + freshPost.title = "Sample Blog Post"; + freshPost.content = "

Hello World

This is a sample blog post.

"; + freshPost.tags = ["javascript", "typescript", "web-development"]; + freshPost.notes = [ + "

Note 1

Remember to add examples

", + "

Note 2

Include code snippets

" + ]; + freshPost.collaboratorEmails = [ + "john@example.com", + "jane@example.com", + "bob@example.com" + ]; + + savedPost = await dataSource.save(freshPost); + }); + + it("should retrieve a blog post with all array fields intact", async () => { + const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + + expect(retrievedPost).not.toBeNull(); + expect(retrievedPost!.id).toBe(savedPost.id); + expect(retrievedPost!.title).toBe("Sample Blog Post"); + expect(retrievedPost!.tags).toEqual(["javascript", "typescript", "web-development"]); + expect(retrievedPost!.notes).toHaveLength(2); + expect(retrievedPost!.notes[0]).toContain("Note 1"); + expect(retrievedPost!.notes[1]).toContain("Note 2"); + expect(retrievedPost!.collaboratorEmails).toEqual([ + "john@example.com", + "jane@example.com", + "bob@example.com" + ]); + }); + + it("should preserve array order when retrieving", async () => { + const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + + expect(retrievedPost!.tags[0]).toBe("javascript"); + expect(retrievedPost!.tags[1]).toBe("typescript"); + expect(retrievedPost!.tags[2]).toBe("web-development"); + }); + + it("should find blog posts using the find method", async () => { + const posts = await dataSource.find(BlogPost); + + expect(posts).toHaveLength(1); + expect(posts[0]).toBeDefined(); + expect(posts[0]!.id).toBe(savedPost.id); + expect(posts[0]!.tags).toEqual(["javascript", "typescript", "web-development"]); + }); + }); + + describe("Array Updates", () => { + let savedPost: BlogPost; + + beforeEach(async () => { + // Clean up any existing data + const allPosts = await dataSource.find(BlogPost); + for (const post of allPosts) { + await dataSource.deleteById(BlogPost, post.id); + } + + // Create a fresh blog post for testing + const freshPost = new BlogPost(); + freshPost.title = "Sample Blog Post"; + freshPost.content = "

Hello World

This is a sample blog post.

"; + freshPost.tags = ["javascript", "typescript", "web-development"]; + freshPost.notes = [ + "

Note 1

Remember to add examples

", + "

Note 2

Include code snippets

" + ]; + freshPost.collaboratorEmails = [ + "john@example.com", + "jane@example.com", + "bob@example.com" + ]; + + savedPost = await dataSource.save(freshPost); + }); + + it("should update array fields correctly", async () => { + // Create a fresh entity with the same data to ensure proper class constructor + const entityToUpdate = new BlogPost(); + entityToUpdate.id = savedPost.id; + entityToUpdate.title = savedPost.title; + entityToUpdate.content = savedPost.content; + entityToUpdate.tags = ["react", "node.js"]; + entityToUpdate.notes = ["

Updated note

"]; + entityToUpdate.collaboratorEmails = ["new@example.com"]; + + const updatedPost = await dataSource.save(entityToUpdate); + + expect(updatedPost.tags).toEqual(["react", "node.js"]); + expect(updatedPost.notes).toEqual(["

Updated note

"]); + expect(updatedPost.collaboratorEmails).toEqual(["new@example.com"]); + + // Verify the update persisted + const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + expect(retrievedPost!.tags).toEqual(["react", "node.js"]); + expect(retrievedPost!.notes).toEqual(["

Updated note

"]); + expect(retrievedPost!.collaboratorEmails).toEqual(["new@example.com"]); + }); + + it("should handle array size changes", async () => { + // Start with 3 tags, reduce to 1 + const entityToUpdate = new BlogPost(); + entityToUpdate.id = savedPost.id; + entityToUpdate.title = savedPost.title; + entityToUpdate.content = savedPost.content; + entityToUpdate.tags = ["single-tag"]; + entityToUpdate.notes = savedPost.notes; + entityToUpdate.collaboratorEmails = savedPost.collaboratorEmails; + + const updatedPost = await dataSource.save(entityToUpdate); + + expect(updatedPost.tags).toEqual(["single-tag"]); + + // Verify the update persisted + const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + expect(retrievedPost!.tags).toEqual(["single-tag"]); + }); + }); + + describe("Array Deletion", () => { + let savedPost: BlogPost; + + beforeEach(async () => { + // Clean up any existing data + const allPosts = await dataSource.find(BlogPost); + for (const post of allPosts) { + await dataSource.deleteById(BlogPost, post.id); + } + + // Create a fresh blog post for testing + const freshPost = new BlogPost(); + freshPost.title = "Sample Blog Post"; + freshPost.content = "

Hello World

This is a sample blog post.

"; + freshPost.tags = ["javascript", "typescript", "web-development"]; + freshPost.notes = [ + "

Note 1

Remember to add examples

", + "

Note 2

Include code snippets

" + ]; + freshPost.collaboratorEmails = [ + "john@example.com", + "jane@example.com", + "bob@example.com" + ]; + + savedPost = await dataSource.save(freshPost); + }); + + it("should delete a blog post and cascade delete array elements", async () => { + await dataSource.deleteById(BlogPost, savedPost.id); + + const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + expect(retrievedPost).toBeNull(); + }); + }); + + describe("Validation with Arrays", () => { + it("should validate array fields correctly", async () => { + // Test with valid arrays + const errors = await blogPost.validate(); + expect(errors).toHaveLength(0); + }); + + it("should fail validation for invalid email arrays", async () => { + blogPost.collaboratorEmails = ["not-an-email", "john@example.com"]; + + const errors = await blogPost.validate(); + expect(errors.length).toBeGreaterThan(0); + + const emailError = errors.find(e => e.property === 'collaboratorEmails'); + expect(emailError).toBeDefined(); + }); + + it("should handle array size validation", async () => { + // Test with a tag that's too long + blogPost.tags = ["a".repeat(51)]; // Exceeds maxLength of 50 + + const errors = await blogPost.validate(); + expect(errors.length).toBeGreaterThan(0); + }); + }); + + describe("JSON Serialization with Arrays", () => { + it("should serialize and deserialize arrays correctly", async () => { + const json = blogPost.toJSON(); + + expect(json.tags).toEqual(["javascript", "typescript", "web-development"]); + expect(json.notes).toHaveLength(2); + expect(json.collaboratorEmails).toHaveLength(3); + + const restored = BlogPost.fromJSON(json); + expect(restored.tags).toEqual(["javascript", "typescript", "web-development"]); + expect(restored.notes).toEqual(blogPost.notes); + expect(restored.collaboratorEmails).toEqual(blogPost.collaboratorEmails); + }); + }); +}); From c0a64ce289dc0191c4a0aea9b99bed3cc2177966 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 12:13:21 -0300 Subject: [PATCH 114/254] Refactor TypeORM data source to split responsibilities and concerns --- src/datasources/typeorm/ArrayEntityFactory.ts | 110 +++++ src/datasources/typeorm/ArrayFieldManager.ts | 273 +++++++++++ .../typeorm/DatabaseConfigBuilder.ts | 86 ++++ .../typeorm/TypeORMSqlDataSource.ts | 451 ++---------------- src/datasources/typeorm/TypeORMTypeMapper.ts | 161 +++++++ src/datasources/typeorm/index.ts | 9 + 6 files changed, 669 insertions(+), 421 deletions(-) create mode 100644 src/datasources/typeorm/ArrayEntityFactory.ts create mode 100644 src/datasources/typeorm/ArrayFieldManager.ts create mode 100644 src/datasources/typeorm/DatabaseConfigBuilder.ts create mode 100644 src/datasources/typeorm/TypeORMTypeMapper.ts create mode 100644 src/datasources/typeorm/index.ts diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts new file mode 100644 index 0000000..1d0ab9f --- /dev/null +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -0,0 +1,110 @@ +import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'; +import { TypeORMTypeMapper } from './TypeORMTypeMapper'; + +/** + * Factory class for creating dynamic array element entities. + * + * This class handles the complexity of creating TypeORM entities for array fields + * and provides a clean interface for entity creation and management. + */ +export class ArrayEntityFactory { + + /** + * Creates a new entity class for array elements. + * + * @param parentEntityName - Name of the parent entity + * @param fieldName - Name of the array field + * @param baseFieldType - Base type of array elements (e.g., 'text', 'html') + * @param fieldOptions - Field-specific options + * @returns The created entity class + */ + static createArrayElementEntity( + parentEntityName: string, + fieldName: string, + baseFieldType: string, + fieldOptions?: any + ): Function { + const tableName = ArrayEntityFactory.generateTableName(parentEntityName, fieldName); + const entityName = ArrayEntityFactory.generateEntityName(parentEntityName, fieldName); + + // Dynamically create the array element entity class + const ArrayElementEntity = class { + id!: string; + parentId!: string; + value!: string; + index!: number; + }; + + // Set the class name for better debugging + Object.defineProperty(ArrayElementEntity, 'name', { value: entityName }); + + // Apply TypeORM decorators + ArrayEntityFactory.applyEntityDecorators(ArrayElementEntity, tableName, baseFieldType, fieldOptions); + + return ArrayElementEntity; + } + + /** + * Generates a table name for an array element entity. + * + * @param parentEntityName - Name of the parent entity + * @param fieldName - Name of the array field + * @returns Generated table name + */ + static generateTableName(parentEntityName: string, fieldName: string): string { + return `${parentEntityName.toLowerCase()}_${fieldName}`; + } + + /** + * Generates an entity name for an array element entity. + * + * @param parentEntityName - Name of the parent entity + * @param fieldName - Name of the array field + * @returns Generated entity name + */ + static generateEntityName(parentEntityName: string, fieldName: string): string { + return `${parentEntityName}_${fieldName}`; + } + + /** + * Generates a unique key for an array element entity. + * + * @param parentEntityName - Name of the parent entity + * @param fieldName - Name of the array field + * @returns Generated unique key + */ + static generateEntityKey(parentEntityName: string, fieldName: string): string { + return `${parentEntityName}_${fieldName}`; + } + + /** + * Applies TypeORM decorators to an array element entity. + * + * @param entityClass - The entity class to decorate + * @param tableName - Name of the database table + * @param baseFieldType - Base type of array elements + * @param fieldOptions - Field-specific options + */ + private static applyEntityDecorators( + entityClass: Function, + tableName: string, + baseFieldType: string, + fieldOptions?: any + ): void { + // Apply entity decorator + Entity(tableName)(entityClass); + + // Configure the id field + PrimaryGeneratedColumn('uuid')(entityClass.prototype, 'id'); + + // Configure the parentId field (foreign key) + Column({ type: 'uuid', name: 'parent_id' })(entityClass.prototype, 'parentId'); + + // Configure the value field based on the base field type + const valueColumnConfig = TypeORMTypeMapper.getArrayElementColumnConfig(baseFieldType, fieldOptions); + Column(valueColumnConfig)(entityClass.prototype, 'value'); + + // Configure the index field to preserve array order + Column({ type: 'int', name: 'array_index' })(entityClass.prototype, 'index'); + } +} diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts new file mode 100644 index 0000000..3578897 --- /dev/null +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -0,0 +1,273 @@ +import { DataSource as TypeORMDataSource } from 'typeorm'; +import { ArrayEntityFactory } from './ArrayEntityFactory'; + +/** + * Interface for array field metadata. + */ +export interface ArrayFieldMetadata { + elementEntityKey: string; + baseFieldType: string; + options?: any; +} + +/** + * Manager class for handling array field configuration and persistence operations. + * + * This class encapsulates all array-related logic, making it easier to maintain + * and test array field functionality separately from the main data source. + */ +export class ArrayFieldManager { + private arrayElementEntities: Map = new Map(); + + /** + * Gets all registered array element entities. + * + * @returns Array of entity classes + */ + getArrayElementEntities(): Function[] { + return Array.from(this.arrayElementEntities.values()); + } + + /** + * Configures an array field by creating a separate entity and storing metadata. + * + * @param target - The prototype of the class containing the field + * @param propertyKey - The name of the property/field + * @param fieldType - The framework field type (e.g., 'array:text', 'array:html') + * @param fieldOptions - Field-specific options + */ + configureArrayField( + target: any, + propertyKey: string, + fieldType: string, + fieldOptions?: any + ): void { + const parentEntityName = target.constructor.name; + const baseFieldType = fieldType.replace('array:', ''); + + // Create a unique key for this array field + const arrayEntityKey = ArrayEntityFactory.generateEntityKey(parentEntityName, propertyKey); + + // Check if we've already created an entity for this array field + if (!this.arrayElementEntities.has(arrayEntityKey)) { + const arrayElementEntity = ArrayEntityFactory.createArrayElementEntity( + parentEntityName, + propertyKey, + baseFieldType, + fieldOptions + ); + this.arrayElementEntities.set(arrayEntityKey, arrayElementEntity); + } + + // Store metadata about this array field + const metadata: ArrayFieldMetadata = { + elementEntityKey: arrayEntityKey, + baseFieldType: baseFieldType, + options: fieldOptions + }; + + Reflect.defineMetadata('typeorm:array-field', metadata, target, propertyKey); + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + } + + /** + * Extracts array values from an entity before processing. + * + * @param entity - The entity to extract array values from + * @returns Object containing array field names and their values + */ + extractArrayValues(entity: T): Record { + const arrayValues: Record = {}; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayValue = (entity as any)[fieldName]; + if (Array.isArray(arrayValue)) { + arrayValues[fieldName] = arrayValue; + } + } + } + + return arrayValues; + } + + /** + * Extracts main entity fields (excluding arrays) for saving. + * + * @param entity - The entity to extract main fields from + * @returns Entity copy without array fields + */ + extractMainEntityFields(entity: T): T { + const entityCopy = { ...entity }; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + // Remove array fields from the main entity + delete (entityCopy as any)[fieldName]; + } + } + + return entityCopy; + } + + /** + * Handles array field updates by removing old array elements. + * + * @param entity - The entity being updated + * @param typeormDataSource - TypeORM data source for database operations + */ + async handleArrayFieldsForUpdate( + entity: T, + typeormDataSource: TypeORMDataSource + ): Promise { + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = typeormDataSource.getRepository(ArrayElementEntity as any); + // Delete existing array elements for this entity + await repository.delete({ parentId: (entity as any).id }); + } + } + } + } + + /** + * Saves array fields as separate entities. + * + * @param originalEntity - The original entity with array values + * @param arrayValues - Pre-extracted array values + * @param savedEntity - The saved main entity (with generated ID) + * @param typeormDataSource - TypeORM data source for database operations + */ + async saveArrayFields( + originalEntity: T, + arrayValues: Record, + savedEntity: T, + typeormDataSource: TypeORMDataSource + ): Promise { + const entityClass = originalEntity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayValue = arrayValues[fieldName]; + + if (Array.isArray(arrayValue) && arrayValue.length > 0) { + await this.saveArrayField(fieldName, arrayValue, savedEntity, typeormDataSource, entityClass); + } + } + } + } + + /** + * Saves a single array field as separate entities. + * + * @param fieldName - Name of the array field + * @param arrayValue - Array values to save + * @param savedEntity - The saved main entity + * @param typeormDataSource - TypeORM data source for database operations + * @param entityClass - The entity class + */ + private async saveArrayField( + fieldName: string, + arrayValue: any[], + savedEntity: T, + typeormDataSource: TypeORMDataSource, + entityClass: Function + ): Promise { + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = typeormDataSource.getRepository(ArrayElementEntity as any); + + // Create array element entities using the saved entity's ID + const elementEntities = arrayValue.map((value, index) => { + const elementEntity = new (ArrayElementEntity as any)(); + elementEntity.parentId = (savedEntity as any).id; + elementEntity.value = value; + elementEntity.index = index; + return elementEntity; + }); + + // Save all array elements + await repository.save(elementEntities); + } + } + + /** + * Loads array fields for an entity by querying array element entities. + * + * @param entity - The entity to load array fields for + * @param typeormDataSource - TypeORM data source for database operations + * @returns The entity with array fields populated + */ + async loadArrayFields(entity: T, typeormDataSource: TypeORMDataSource): Promise { + const entityCopy = { ...entity }; + const entityClass = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; + + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType && fieldType.startsWith('array:')) { + const arrayValues = await this.loadArrayField(entity, fieldName, typeormDataSource, entityClass); + (entityCopy as any)[fieldName] = arrayValues; + } + } + + return entityCopy; + } + + /** + * Loads a single array field for an entity. + * + * @param entity - The entity to load array field for + * @param fieldName - Name of the array field + * @param typeormDataSource - TypeORM data source for database operations + * @param entityClass - The entity class + * @returns Array of values for the field + */ + private async loadArrayField( + entity: T, + fieldName: string, + typeormDataSource: TypeORMDataSource, + entityClass: Function + ): Promise { + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + + if (ArrayElementEntity) { + const repository = typeormDataSource.getRepository(ArrayElementEntity as any); + + // Load array elements for this entity, ordered by index + const elements = await repository.find({ + where: { parentId: (entity as any).id }, + order: { index: 'ASC' } + }); + + // Extract values into an array + return elements.map(element => element.value); + } + + return []; + } +} diff --git a/src/datasources/typeorm/DatabaseConfigBuilder.ts b/src/datasources/typeorm/DatabaseConfigBuilder.ts new file mode 100644 index 0000000..076404f --- /dev/null +++ b/src/datasources/typeorm/DatabaseConfigBuilder.ts @@ -0,0 +1,86 @@ +import { DataSourceOptions as TypeORMDataSourceOptions } from 'typeorm'; +import { TypeORMSqlDataSourceOptions } from './TypeORMSqlDataSource'; + +/** + * Builder class for creating TypeORM DataSource configurations. + * + * This class handles the complexity of building different database configurations + * and provides a clean separation between configuration logic and the main data source. + */ +export class DatabaseConfigBuilder { + + /** + * Builds a complete TypeORM DataSource configuration from framework options. + * + * @param options - Framework data source options + * @param entities - Array of entity classes to include + * @returns Complete TypeORM configuration object + */ + static buildConfig( + options: TypeORMSqlDataSourceOptions, + entities: Function[] + ): TypeORMDataSourceOptions { + const config: any = { + type: options.type, + logging: options.logging ?? false, + synchronize: options.synchronize ?? options.managed, + entities: entities, + }; + + // Database-specific configuration + if (options.type === 'sqlite') { + DatabaseConfigBuilder.configureSQLite(config, options); + } else { + DatabaseConfigBuilder.configureNetworkDatabase(config, options); + } + + // Connection pooling configuration + DatabaseConfigBuilder.configureConnectionPooling(config, options); + + // Connection timeout + if (options.connectTimeout) { + config.connectTimeout = options.connectTimeout; + } + + return config as TypeORMDataSourceOptions; + } + + /** + * Configures SQLite-specific options. + * + * @param config - Configuration object to modify + * @param options - Framework data source options + */ + private static configureSQLite(config: any, options: TypeORMSqlDataSourceOptions): void { + config.database = options.filename || ':memory:'; + } + + /** + * Configures network database options (PostgreSQL, MySQL, etc.). + * + * @param config - Configuration object to modify + * @param options - Framework data source options + */ + private static configureNetworkDatabase(config: any, options: TypeORMSqlDataSourceOptions): void { + if (options.host) config.host = options.host; + if (options.port) config.port = options.port; + if (options.username) config.username = options.username; + if (options.password) config.password = options.password; + if (options.database) config.database = options.database; + } + + /** + * Configures connection pooling options. + * + * @param config - Configuration object to modify + * @param options - Framework data source options + */ + private static configureConnectionPooling(config: any, options: TypeORMSqlDataSourceOptions): void { + if (options.maxConnections || options.minConnections) { + config.pool = { + max: options.maxConnections || 10, + min: options.minConnections || 1, + }; + } + } +} diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 78fc56d..fffd89f 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -2,6 +2,9 @@ import 'reflect-metadata'; import { DataSource as TypeORMDataSource, DataSourceOptions as TypeORMDataSourceOptions } from 'typeorm'; import { Entity, PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm'; import { DataSource, DataSourceOptions } from '../DataSource'; +import { TypeORMTypeMapper } from './TypeORMTypeMapper'; +import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; +import { ArrayFieldManager } from './ArrayFieldManager'; /** * Configuration options for TypeORM SQL data source. @@ -76,7 +79,7 @@ export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { export class TypeORMSqlDataSource extends DataSource { private typeormDataSource: TypeORMDataSource | null = null; private registeredModels: Set = new Set(); - private arrayElementEntities: Map = new Map(); + private arrayFieldManager: ArrayFieldManager = new ArrayFieldManager(); constructor(options: TypeORMSqlDataSourceOptions) { super(options); @@ -93,41 +96,17 @@ export class TypeORMSqlDataSource extends DataSource { async initialize(options: DataSourceOptions): Promise { const typeormOptions = options as TypeORMSqlDataSourceOptions; - // Build TypeORM DataSource configuration dynamically based on database type - let config: any = { - type: typeormOptions.type, - logging: typeormOptions.logging ?? false, - synchronize: typeormOptions.synchronize ?? typeormOptions.managed, - entities: [...Array.from(this.registeredModels), ...Array.from(this.arrayElementEntities.values())], // Include registered entities and array entities - }; - - // SQLite-specific configuration - if (typeormOptions.type === 'sqlite') { - config.database = typeormOptions.filename || ':memory:'; - } else { - // Configuration for other database types - if (typeormOptions.host) config.host = typeormOptions.host; - if (typeormOptions.port) config.port = typeormOptions.port; - if (typeormOptions.username) config.username = typeormOptions.username; - if (typeormOptions.password) config.password = typeormOptions.password; - if (typeormOptions.database) config.database = typeormOptions.database; - } - - // Connection pooling configuration - if (typeormOptions.maxConnections || typeormOptions.minConnections) { - config.pool = { - max: typeormOptions.maxConnections || 10, - min: typeormOptions.minConnections || 1, - }; - } + // Get all entities (models + array element entities) + const allEntities = [ + ...Array.from(this.registeredModels), + ...this.arrayFieldManager.getArrayElementEntities() + ]; - // Connection timeout - if (typeormOptions.connectTimeout) { - config.connectTimeout = typeormOptions.connectTimeout; - } + // Build TypeORM configuration using the dedicated builder + const config = DatabaseConfigBuilder.buildConfig(typeormOptions, allEntities); // Create and initialize TypeORM DataSource - this.typeormDataSource = new TypeORMDataSource(config as TypeORMDataSourceOptions); + this.typeormDataSource = new TypeORMDataSource(config); try { await this.typeormDataSource.initialize(); @@ -219,7 +198,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Configures a field with appropriate TypeORM column decorators. - * For array fields, creates a separate entity and sets up a one-to-many relationship. + * For array fields, delegates to the array field manager. * * @param target - The prototype of the class containing the field * @param propertyKey - The name of the property/field @@ -239,12 +218,12 @@ export class TypeORMSqlDataSource extends DataSource { // Check if this is an array field if (fieldType.startsWith('array:')) { - this.configureArrayField(target, propertyKey, fieldType, fieldOptions); + this.arrayFieldManager.configureArrayField(target, propertyKey, fieldType, fieldOptions); return; } - // Map framework field types to TypeORM column types - const typeMapping = this.getTypeOrmColumnType(fieldType, fieldOptions); + // Map framework field types to TypeORM column types using the type mapper + const typeMapping = TypeORMTypeMapper.getColumnType(fieldType, fieldOptions); // Apply the TypeORM @Column decorator Column(typeMapping)(target, propertyKey); @@ -256,241 +235,9 @@ export class TypeORMSqlDataSource extends DataSource { Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); } - /** - * Configures an array field by creating a separate entity and storing metadata. - * Note: We don't use TypeORM relationships for dynamically created array entities. - * - * @param target - The prototype of the class containing the field - * @param propertyKey - The name of the property/field - * @param fieldType - The framework field type (e.g., 'array:text', 'array:html') - * @param fieldOptions - Field-specific options - */ - private configureArrayField( - target: any, - propertyKey: string, - fieldType: string, - fieldOptions?: any - ): void { - const parentEntityName = target.constructor.name; - const baseFieldType = fieldType.replace('array:', ''); // e.g., 'text', 'html', 'email' - - // Create a unique key for this array field - const arrayEntityKey = `${parentEntityName}_${propertyKey}`; - - // Check if we've already created an entity for this array field - if (!this.arrayElementEntities.has(arrayEntityKey)) { - const arrayElementEntity = this.createArrayElementEntity( - parentEntityName, - propertyKey, - baseFieldType, - fieldOptions - ); - this.arrayElementEntities.set(arrayEntityKey, arrayElementEntity); - } - - // Store metadata about this array field without configuring TypeORM relationships - Reflect.defineMetadata('typeorm:array-field', { - elementEntityKey: arrayEntityKey, - baseFieldType: baseFieldType, - options: fieldOptions - }, target, propertyKey); - - // Store that this field is configured for TypeORM - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); - } - - /** - * Creates a new entity class for array elements. - * - * @param parentEntityName - Name of the parent entity - * @param fieldName - Name of the array field - * @param baseFieldType - Base type of array elements (e.g., 'text', 'html') - * @param fieldOptions - Field-specific options - * @returns The created entity class - */ - private createArrayElementEntity( - parentEntityName: string, - fieldName: string, - baseFieldType: string, - fieldOptions?: any - ): Function { - const tableName = `${parentEntityName.toLowerCase()}_${fieldName}`; - const entityName = `${parentEntityName}_${fieldName}`; - - // Dynamically create the array element entity class - const ArrayElementEntity = class { - id!: string; - parentId!: string; - value!: string; - index!: number; - }; - - // Set the class name for better debugging - Object.defineProperty(ArrayElementEntity, 'name', { value: entityName }); - - // Apply TypeORM decorators - Entity(tableName)(ArrayElementEntity); - - // Configure the id field - PrimaryGeneratedColumn('uuid')(ArrayElementEntity.prototype, 'id'); - - // Configure the parentId field (foreign key) - Column({ type: 'uuid', name: 'parent_id' })(ArrayElementEntity.prototype, 'parentId'); - - // Configure the value field based on the base field type - const valueColumnConfig = this.getArrayElementColumnConfig(baseFieldType, fieldOptions); - Column(valueColumnConfig)(ArrayElementEntity.prototype, 'value'); - - // Configure the index field to preserve array order - Column({ type: 'int', name: 'array_index' })(ArrayElementEntity.prototype, 'index'); - - return ArrayElementEntity; - } - - /** - * Gets the column configuration for array element values based on the base field type. - * - * @param baseFieldType - The base field type (e.g., 'text', 'html', 'email') - * @param fieldOptions - Field-specific options - * @returns TypeORM column configuration - */ - private getArrayElementColumnConfig(baseFieldType: string, fieldOptions?: any): any { - switch (baseFieldType) { - case 'text': - case 'email': - case 'html': - return { - type: fieldOptions?.maxLength && fieldOptions.maxLength <= 255 ? 'varchar' : 'text', - length: fieldOptions?.maxLength <= 255 ? fieldOptions.maxLength : undefined, - nullable: false - }; - - case 'integer': - return { - type: 'int', - nullable: false - }; - - case 'number': - case 'decimal': - return { - type: 'decimal', - precision: fieldOptions?.precision || 10, - scale: fieldOptions?.decimals || 2, - nullable: false - }; - - case 'boolean': - return { - type: 'boolean', - nullable: false - }; - - case 'datetime': - return { - type: 'datetime', - nullable: false - }; - - case 'money': - return { - type: 'decimal', - precision: 19, - scale: fieldOptions?.decimals || 2, - nullable: false - }; - - case 'choice': - return { - type: 'varchar', - length: 50, - nullable: false - }; - - default: - return { - type: 'text', - nullable: false - }; - } - } - - /** - * Maps framework field types to TypeORM column configurations. - * - * @param fieldType - The framework field type - * @param fieldOptions - Field-specific options - * @returns TypeORM column configuration - */ - private getTypeOrmColumnType(fieldType: string, fieldOptions?: any): any { - // Determine if the field should be nullable based on the required option - const isRequired = fieldOptions?.required === true; - const nullable = !isRequired; - - switch (fieldType) { - case 'text': - case 'email': - case 'html': - return { - type: fieldOptions?.maxLength && fieldOptions.maxLength <= 255 ? 'varchar' : 'text', - length: fieldOptions?.maxLength <= 255 ? fieldOptions.maxLength : undefined, - nullable: nullable - }; - - case 'integer': - return { - type: 'int', - nullable: nullable - }; - - case 'number': - case 'decimal': - return { - type: 'decimal', - precision: fieldOptions?.precision || 10, - scale: fieldOptions?.decimals || 2, - nullable: nullable - }; - - case 'boolean': - return { - type: 'boolean', - nullable: nullable - }; - - case 'datetime': - return { - type: 'datetime', - nullable: nullable - }; - - case 'money': - return { - type: 'decimal', - precision: 19, - scale: fieldOptions?.decimals || 2, - nullable: nullable - }; - - case 'choice': - return { - type: 'varchar', - length: 50, - nullable: nullable - }; - - default: - // Default to text for unknown types - return { - type: 'text', - nullable: nullable - }; - } - } - /** * Save an entity to the database. - * Handles array field conversion before saving. + * Handles array field conversion before saving using the array field manager. * * @param entity - The entity instance to save * @returns Promise resolving to the saved entity with generated id @@ -506,130 +253,28 @@ export class TypeORMSqlDataSource extends DataSource { const isUpdate = !!(entity as any).id; if (isUpdate) { - // For updates, first handle array field deletion - await this.handleArrayFieldsForUpdate(entity); + // For updates, first handle array field deletion using the array field manager + await this.arrayFieldManager.handleArrayFieldsForUpdate(entity, this.typeormDataSource); } // Preserve array values before extracting main entity fields - const arrayValues = this.extractArrayValues(entity); + const arrayValues = this.arrayFieldManager.extractArrayValues(entity); // Save the main entity first (without arrays converted) - const mainEntityToSave = this.extractMainEntityFields(entity); + const mainEntityToSave = this.arrayFieldManager.extractMainEntityFields(entity); const savedMainEntity = await repository.save(mainEntityToSave as any) as T; // Now save array fields using the preserved values - await this.saveArrayFields(entity, arrayValues, savedMainEntity); + await this.arrayFieldManager.saveArrayFields(entity, arrayValues, savedMainEntity, this.typeormDataSource); // Return the entity with arrays loaded const result = await this.findById(entity.constructor as any, (savedMainEntity as any).id); return result as T; // We know it exists since we just saved it } - /** - * Handles array field updates by removing old array elements. - */ - private async handleArrayFieldsForUpdate(entity: T): Promise { - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); - // Delete existing array elements for this entity - await repository.delete({ parentId: (entity as any).id }); - } - } - } - } - - /** - * Extracts array values from an entity before processing. - */ - private extractArrayValues(entity: T): Record { - const arrayValues: Record = {}; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayValue = (entity as any)[fieldName]; - if (Array.isArray(arrayValue)) { - arrayValues[fieldName] = arrayValue; - } - } - } - - return arrayValues; - } - - /** - * Extracts main entity fields (excluding arrays) for saving. - */ - private extractMainEntityFields(entity: T): T { - const entityCopy = { ...entity }; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - // Remove array fields from the main entity - delete (entityCopy as any)[fieldName]; - } - } - - return entityCopy; - } - - /** - * Saves array fields as separate entities. - */ - private async saveArrayFields(originalEntity: T, arrayValues: Record, savedEntity: T): Promise { - const entityClass = originalEntity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayValue = arrayValues[fieldName]; - - if (Array.isArray(arrayValue) && arrayValue.length > 0) { - const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); - - // Create array element entities using the saved entity's ID - const elementEntities = arrayValue.map((value, index) => { - const elementEntity = new (ArrayElementEntity as any)(); - elementEntity.parentId = (savedEntity as any).id; - elementEntity.value = value; - elementEntity.index = index; - return elementEntity; - }); - - // Save all array elements - await repository.save(elementEntities); - } - } - } - } - } - /** * Find entities by criteria. - * Handles array field conversion after loading. + * Handles array field conversion after loading using the array field manager. * * @param entityClass - The entity class to search for * @param criteria - Search criteria (optional) @@ -649,13 +294,15 @@ export class TypeORMSqlDataSource extends DataSource { entities = await repository.find() as T[]; } - // Load array data for each entity - return await Promise.all(entities.map(entity => this.loadArrayFields(entity))); + // Load array data for each entity using the array field manager + return await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); } /** * Find a single entity by id. - * Handles array field conversion after loading. + * Handles array field conversion after loading using the array field manager. * * @param entityClass - The entity class to search for * @param id - The id of the entity to find @@ -673,8 +320,8 @@ export class TypeORMSqlDataSource extends DataSource { return null; } - // Load array data for the entity - return await this.loadArrayFields(entity); + // Load array data for the entity using the array field manager + return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); } /** @@ -712,42 +359,4 @@ export class TypeORMSqlDataSource extends DataSource { return await repository.count(); } - /** - * Loads array fields for an entity by querying array element entities. - * - * @param entity - The entity to load array fields for - * @returns The entity with array fields populated - */ - private async loadArrayFields(entity: T): Promise { - const entityCopy = { ...entity }; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = this.typeormDataSource!.getRepository(ArrayElementEntity as any); - - // Load array elements for this entity, ordered by index - const elements = await repository.find({ - where: { parentId: (entity as any).id }, - order: { index: 'ASC' } - }); - - // Extract values into an array - (entityCopy as any)[fieldName] = elements.map(element => element.value); - } - } - } - - return entityCopy; - } - - - } diff --git a/src/datasources/typeorm/TypeORMTypeMapper.ts b/src/datasources/typeorm/TypeORMTypeMapper.ts new file mode 100644 index 0000000..02dd995 --- /dev/null +++ b/src/datasources/typeorm/TypeORMTypeMapper.ts @@ -0,0 +1,161 @@ +/** + * Utility class for mapping Slingr framework field types to TypeORM column configurations. + * + * This class centralizes all type mapping logic, making it easier to maintain + * and extend support for new field types. + */ +export class TypeORMTypeMapper { + + /** + * Maps framework field types to TypeORM column configurations. + * + * @param fieldType - The framework field type + * @param fieldOptions - Field-specific options + * @returns TypeORM column configuration + */ + static getColumnType(fieldType: string, fieldOptions?: any): any { + // Determine if the field should be nullable based on the required option + const isRequired = fieldOptions?.required === true; + const nullable = !isRequired; + + switch (fieldType) { + case 'text': + case 'email': + case 'html': + return TypeORMTypeMapper.getTextColumnConfig(fieldOptions, nullable); + + case 'integer': + return { + type: 'int', + nullable: nullable + }; + + case 'number': + case 'decimal': + return { + type: 'decimal', + precision: fieldOptions?.precision || 10, + scale: fieldOptions?.decimals || 2, + nullable: nullable + }; + + case 'boolean': + return { + type: 'boolean', + nullable: nullable + }; + + case 'datetime': + return { + type: 'datetime', + nullable: nullable + }; + + case 'money': + return { + type: 'decimal', + precision: 19, + scale: fieldOptions?.decimals || 2, + nullable: nullable + }; + + case 'choice': + return { + type: 'varchar', + length: 50, + nullable: nullable + }; + + default: + // Default to text for unknown types + return { + type: 'text', + nullable: nullable + }; + } + } + + /** + * Gets the column configuration for array element values based on the base field type. + * Array elements are always non-nullable since empty arrays are represented by no rows. + * + * @param baseFieldType - The base field type (e.g., 'text', 'html', 'email') + * @param fieldOptions - Field-specific options + * @returns TypeORM column configuration for array elements + */ + static getArrayElementColumnConfig(baseFieldType: string, fieldOptions?: any): any { + switch (baseFieldType) { + case 'text': + case 'email': + case 'html': + return TypeORMTypeMapper.getTextColumnConfig(fieldOptions, false); + + case 'integer': + return { + type: 'int', + nullable: false + }; + + case 'number': + case 'decimal': + return { + type: 'decimal', + precision: fieldOptions?.precision || 10, + scale: fieldOptions?.decimals || 2, + nullable: false + }; + + case 'boolean': + return { + type: 'boolean', + nullable: false + }; + + case 'datetime': + return { + type: 'datetime', + nullable: false + }; + + case 'money': + return { + type: 'decimal', + precision: 19, + scale: fieldOptions?.decimals || 2, + nullable: false + }; + + case 'choice': + return { + type: 'varchar', + length: 50, + nullable: false + }; + + default: + return { + type: 'text', + nullable: false + }; + } + } + + /** + * Helper method to get text column configuration. + * Centralizes the logic for determining varchar vs text based on length. + * + * @param fieldOptions - Field-specific options + * @param nullable - Whether the column should be nullable + * @returns TypeORM column configuration for text fields + */ + private static getTextColumnConfig(fieldOptions?: any, nullable: boolean = true): any { + const hasMaxLength = fieldOptions?.maxLength; + const useVarchar = hasMaxLength && fieldOptions.maxLength <= 255; + + return { + type: useVarchar ? 'varchar' : 'text', + length: useVarchar ? fieldOptions.maxLength : undefined, + nullable: nullable + }; + } +} diff --git a/src/datasources/typeorm/index.ts b/src/datasources/typeorm/index.ts new file mode 100644 index 0000000..0366371 --- /dev/null +++ b/src/datasources/typeorm/index.ts @@ -0,0 +1,9 @@ +// Export individual utility classes for advanced usage +export { TypeORMTypeMapper } from './TypeORMTypeMapper'; +export { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; +export { ArrayEntityFactory } from './ArrayEntityFactory'; +export { ArrayFieldManager } from './ArrayFieldManager'; + +// Export main data source class and types +export { TypeORMSqlDataSource } from './TypeORMSqlDataSource'; +export type { TypeORMSqlDataSourceOptions } from './TypeORMSqlDataSource'; From 63f5cb277b83796fdcbe3ea57db796f7ff1bea48 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 3 Sep 2025 12:44:11 -0300 Subject: [PATCH 115/254] Add support and tests for PostgreSQL and MySQL --- docs/MultiDatabaseSupport.md | 310 ++++++++++ package.json | 2 + .../MultiDatabaseOperations.test.ts | 540 ++++++++++++++++++ 3 files changed, 852 insertions(+) create mode 100644 docs/MultiDatabaseSupport.md create mode 100644 test/datasources/MultiDatabaseOperations.test.ts diff --git a/docs/MultiDatabaseSupport.md b/docs/MultiDatabaseSupport.md new file mode 100644 index 0000000..97d1e9c --- /dev/null +++ b/docs/MultiDatabaseSupport.md @@ -0,0 +1,310 @@ +# Multi-Database Support for Slingr Framework + +This document describes the multi-database support implementation for the Slingr Framework, including setup instructions and testing procedures. + +## Supported Databases + +The Slingr Framework's TypeORM data source supports the following SQL databases: + +### 1. SQLite +- **Type**: `sqlite` +- **Use Case**: Development, testing, lightweight applications +- **Setup**: No additional setup required +- **Connection**: File-based or in-memory + +### 2. PostgreSQL +- **Type**: `postgres` +- **Use Case**: Production applications, complex queries, ACID compliance +- **Setup**: Requires PostgreSQL server +- **Connection**: Network-based with connection pooling + +### 3. MySQL +- **Type**: `mysql` +- **Use Case**: Web applications, high-performance scenarios +- **Setup**: Requires MySQL server +- **Connection**: Network-based with connection pooling + +## Database Setup Instructions + +### PostgreSQL Setup + +#### Using Docker (Recommended for testing) +```bash +# Start PostgreSQL container +docker run --name postgres-test \ + -e POSTGRES_PASSWORD=postgres \ + -e POSTGRES_DB=slingr_test \ + -p 5432:5432 \ + -d postgres:15 + +# Connect to verify setup +docker exec -it postgres-test psql -U postgres -d slingr_test +``` + +#### Using Local Installation +1. Install PostgreSQL from [postgresql.org](https://www.postgresql.org/download/) +2. Create a test database: + ```sql + CREATE DATABASE slingr_test; + ``` + +### MySQL Setup + +#### Using Docker (Recommended for testing) +```bash +# Start MySQL container +docker run --name mysql-test \ + -e MYSQL_ROOT_PASSWORD=root \ + -e MYSQL_DATABASE=slingr_test \ + -p 3306:3306 \ + -d mysql:8.0 + +# Connect to verify setup +docker exec -it mysql-test mysql -u root -p slingr_test +``` + +#### Using Local Installation +1. Install MySQL from [mysql.com](https://dev.mysql.com/downloads/) +2. Create a test database: + ```sql + CREATE DATABASE slingr_test; + ``` + +## Environment Configuration + +You can configure database connections using environment variables: + +### PostgreSQL Environment Variables +```bash +export POSTGRES_HOST=localhost +export POSTGRES_PORT=5432 +export POSTGRES_USER=postgres +export POSTGRES_PASSWORD=postgres +export POSTGRES_DB=slingr_test +``` + +### MySQL Environment Variables +```bash +export MYSQL_HOST=localhost +export MYSQL_PORT=3306 +export MYSQL_USER=root +export MYSQL_PASSWORD=root +export MYSQL_DB=slingr_test +``` + +### Skipping Database Tests +To skip specific database tests during development: +```bash +export SKIP_POSTGRES=true +export SKIP_MYSQL=true +``` + +## Running Tests + +### Install Dependencies +```bash +npm install +``` + +The multi-database test will automatically install the required database drivers: +- `sqlite3` - SQLite driver (already included) +- `pg` - PostgreSQL driver +- `mysql2` - MySQL driver + +### Run All Database Tests +```bash +npm test -- test/datasources/MultiDatabaseOperations.test.ts +``` + +### Run with Specific Environment +```bash +# Test only SQLite +SKIP_POSTGRES=true SKIP_MYSQL=true npm test -- test/datasources/MultiDatabaseOperations.test.ts + +# Test PostgreSQL and SQLite only +SKIP_MYSQL=true npm test -- test/datasources/MultiDatabaseOperations.test.ts + +# Test with custom PostgreSQL connection +POSTGRES_HOST=myhost POSTGRES_PASSWORD=mypass npm test -- test/datasources/MultiDatabaseOperations.test.ts +``` + +## Test Coverage + +The multi-database test suite covers: + +1. **Basic Connection Tests** + - Connection establishment + - Connection pooling configuration + - Schema synchronization + +2. **Model Configuration Tests** + - Model registration with TypeORM + - Field configuration and mapping + - Metadata verification + +3. **CRUD Operations** + - Create (INSERT) + - Read (SELECT with various conditions) + - Update (UPDATE) + - Delete (DELETE) + +4. **Query Operations** + - Simple queries + - Complex queries with WHERE clauses + - Ordering and sorting + - Aggregate functions (COUNT) + - Custom QueryBuilder operations + +5. **Transaction Tests** + - Successful transactions + - Transaction rollback + - ACID compliance verification + +6. **Cross-Database Compatibility** + - Consistent behavior verification + - Data integrity across databases + - Performance comparison (future enhancement) + +## Data Source Configuration Examples + +### SQLite Configuration +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: './database.sqlite', // or ':memory:' for in-memory + synchronize: true, + logging: false +}); +``` + +### PostgreSQL Configuration +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: 'postgres', + managed: true, + host: 'localhost', + port: 5432, + username: 'postgres', + password: 'postgres', + database: 'myapp', + synchronize: true, + logging: false, + maxConnections: 10, + minConnections: 1, + connectTimeout: 5000 +}); +``` + +### MySQL Configuration +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: 'mysql', + managed: true, + host: 'localhost', + port: 3306, + username: 'root', + password: 'root', + database: 'myapp', + synchronize: true, + logging: false, + maxConnections: 10, + minConnections: 1, + connectTimeout: 5000 +}); +``` + +## Connection Pooling + +All network databases (PostgreSQL, MySQL) support connection pooling: + +- **maxConnections**: Maximum number of connections in the pool (default: 10) +- **minConnections**: Minimum number of connections to maintain (default: 1) +- **connectTimeout**: Connection timeout in milliseconds (default: none) + +## Schema Management + +The framework supports automatic schema synchronization: + +- **synchronize: true**: Automatically create/update database schema +- **synchronize: false**: Manual schema management required +- **managed: true**: Framework handles schema operations + +⚠️ **Warning**: Only use `synchronize: true` in development environments. For production, use migrations. + +## Troubleshooting + +### Common Issues + +#### PostgreSQL Connection Issues +``` +Error: connect ECONNREFUSED 127.0.0.1:5432 +``` +**Solution**: Ensure PostgreSQL is running and accessible on the specified host/port. + +#### MySQL Connection Issues +``` +Error: ER_ACCESS_DENIED_ERROR: Access denied for user +``` +**Solution**: Verify username, password, and database permissions. + +#### TypeORM Entity Issues +``` +Error: Entity metadata for "ModelName" was not found +``` +**Solution**: Ensure models are properly configured with the data source before initialization. + +### Debugging + +Enable logging to debug database operations: +```typescript +const dataSource = new TypeORMSqlDataSource({ + // ... other config + logging: true // Enable SQL query logging +}); +``` + +### Performance Testing + +For performance testing across databases, consider: +- Connection pool sizing +- Query optimization +- Index usage +- Transaction handling + +## Future Enhancements + +Planned improvements for multi-database support: + +1. **Additional Database Support** + - Microsoft SQL Server + - Oracle Database + - SQLite with better performance optimizations + +2. **Migration Support** + - Database-specific migration generation + - Cross-database migration compatibility + +3. **Performance Monitoring** + - Connection pool metrics + - Query performance comparison + - Database-specific optimizations + +4. **Advanced Features** + - Read/write splitting + - Database sharding support + - Backup and restore utilities + +## Contributing + +When adding support for new databases: + +1. Update `TypeORMSqlDataSourceOptions` interface +2. Add database-specific configuration in `DatabaseConfigBuilder` +3. Add test configuration in `DATABASE_CONFIGS` +4. Update this documentation +5. Add integration tests + +## License + +This multi-database support is part of the Slingr Framework and follows the same license terms. diff --git a/package.json b/package.json index 31b714d..6888633 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,8 @@ "@types/sqlite3": "^3.1.11", "jest": "^29.7.0", "jest-circus": "^29.7.0", + "mysql2": "^3.11.3", + "pg": "^8.12.0", "reflect-metadata": "^0.2.2", "sqlite3": "^5.1.7", "ts-jest": "^29.2.5", diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/test/datasources/MultiDatabaseOperations.test.ts new file mode 100644 index 0000000..a90c78b --- /dev/null +++ b/test/datasources/MultiDatabaseOperations.test.ts @@ -0,0 +1,540 @@ +import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../src/datasources/typeorm/TypeORMSqlDataSource'; +import { BlogPost } from '../model/BlogPost'; +import * as fs from 'fs'; + +/** + * Multi-Database Operations Test Suite + * + * This test suite evaluates the same set of operations across multiple database types: + * - SQLite (always available for testing) + * - PostgreSQL (requires running PostgreSQL instance) + * - MySQL (requires running MySQL instance) + * + * The tests are designed to verify database-agnostic functionality while + * ensuring consistent behavior across different SQL databases. + */ + +interface DatabaseConfig { + name: string; + config: TypeORMSqlDataSourceOptions; + skipCondition?: () => boolean; + setupInstructions?: string; +} + +// Database configurations for testing +const DATABASE_CONFIGS: DatabaseConfig[] = [ + { + name: 'SQLite (In-Memory)', + config: { + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, + } + }, + { + name: 'SQLite (File)', + config: { + type: 'sqlite', + managed: true, + filename: './test-multi-db.sqlite', + logging: false, + synchronize: true, + } + }, + { + name: 'PostgreSQL', + config: { + type: 'postgres', + managed: true, + host: process.env.POSTGRES_HOST || 'localhost', + port: parseInt(process.env.POSTGRES_PORT || '5432'), + username: process.env.POSTGRES_USER || 'postgres', + password: process.env.POSTGRES_PASSWORD || 'postgres', + database: process.env.POSTGRES_DB || 'slingr_test', + logging: false, + synchronize: true, + connectTimeout: 5000, + }, + skipCondition: () => process.env.SKIP_POSTGRES === 'true', + setupInstructions: ` +PostgreSQL Setup Instructions: +1. Install PostgreSQL locally or use Docker: + docker run --name postgres-test -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=slingr_test -p 5432:5432 -d postgres:15 + +2. Set environment variables (optional): + POSTGRES_HOST=localhost + POSTGRES_PORT=5432 + POSTGRES_USER=postgres + POSTGRES_PASSWORD=postgres + POSTGRES_DB=slingr_test + +3. To skip PostgreSQL tests, set: + SKIP_POSTGRES=true + ` + }, + { + name: 'MySQL', + config: { + type: 'mysql', + managed: true, + host: process.env.MYSQL_HOST || 'localhost', + port: parseInt(process.env.MYSQL_PORT || '3306'), + username: process.env.MYSQL_USER || 'root', + password: process.env.MYSQL_PASSWORD || 'root', + database: process.env.MYSQL_DB || 'slingr_test', + logging: false, + synchronize: true, + connectTimeout: 5000, + }, + skipCondition: () => process.env.SKIP_MYSQL === 'true', + setupInstructions: ` +MySQL Setup Instructions: +1. Install MySQL locally or use Docker: + docker run --name mysql-test -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=slingr_test -p 3306:3306 -d mysql:8.0 + +2. Set environment variables (optional): + MYSQL_HOST=localhost + MYSQL_PORT=3306 + MYSQL_USER=root + MYSQL_PASSWORD=root + MYSQL_DB=slingr_test + +3. To skip MySQL tests, set: + SKIP_MYSQL=true + ` + } +]; + +/** + * Helper function to configure a model with a data source + */ +function configureModelWithDataSource(modelClass: any, dataSource: TypeORMSqlDataSource): void { + // Set the model metadata for the data source + Reflect.defineMetadata("model:dataSource", dataSource, modelClass); + + // Configure the model with the data source + dataSource.configureModel(modelClass, {}); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(modelClass.prototype, fieldName, fieldType, allFieldOptions); + } + }); +} + +/** + * Shared test operations that will be executed on each database type + */ +class DatabaseTestOperations { + + static async testBasicConnection(dataSource: TypeORMSqlDataSource): Promise { + // Test connection establishment + expect(dataSource.isConnected()).toBe(true); + expect(dataSource.getInitializationStatus()).toBe(true); + + // Verify TypeORM instance is available + const typeormInstance = dataSource.getTypeORMDataSource(); + expect(typeormInstance).toBeDefined(); + expect(typeormInstance.isInitialized).toBe(true); + + // Check connection stats + const stats = dataSource.getConnectionStats(); + expect(stats.isConnected).toBe(true); + } + + static async testModelConfiguration(dataSource: TypeORMSqlDataSource): Promise { + // Verify the model is configured (it should already be configured in beforeAll) + const metadata = Reflect.getMetadata("model:dataSource", BlogPost); + expect(metadata).toBe(dataSource); + + const entityMetadata = Reflect.getMetadata('typeorm:entity', BlogPost); + expect(entityMetadata).toBe(true); + } + + static async testCRUDOperations(dataSource: TypeORMSqlDataSource): Promise { + const typeormInstance = dataSource.getTypeORMDataSource(); + const repository = typeormInstance.getRepository(BlogPost); + + // Create test data + const blogPost = new BlogPost(); + blogPost.title = 'Test Blog Post'; + blogPost.content = '

This is a test blog post content.

'; + blogPost.tags = ['test', 'blog']; + blogPost.notes = ['

Note 1

', '

Note 2

']; + blogPost.collaboratorEmails = ['test1@example.com', 'test2@example.com']; + + // Test CREATE operation using TypeORM repository directly + const savedPost = await repository.save(blogPost); + expect(savedPost).toBeDefined(); + expect(savedPost.id).toBeDefined(); + expect(savedPost.title).toBe('Test Blog Post'); + + // Test READ operation - find by ID + const foundPost = await repository.findOne({ where: { id: savedPost.id } }); + expect(foundPost).toBeDefined(); + expect(foundPost?.title).toBe('Test Blog Post'); + expect(foundPost?.content).toBe('

This is a test blog post content.

'); + + // Test READ operation - find all + const allPosts = await repository.find(); + expect(allPosts.length).toBeGreaterThanOrEqual(1); + + // Test UPDATE operation + if (foundPost) { + foundPost.title = 'Updated Blog Post'; + const updatedPost = await repository.save(foundPost); + expect(updatedPost.title).toBe('Updated Blog Post'); + } + + // Test DELETE operation + if (foundPost) { + await repository.remove(foundPost); + const deletedPost = await repository.findOne({ where: { id: foundPost.id } }); + expect(deletedPost).toBeNull(); + } + } + + static async testQueryOperations(dataSource: TypeORMSqlDataSource): Promise { + const typeormInstance = dataSource.getTypeORMDataSource(); + const repository = typeormInstance.getRepository(BlogPost); + + // Insert test data using repository directly + const posts = [ + { title: 'First Post', content: '

First content

', tags: ['first'], notes: [], collaboratorEmails: [] }, + { title: 'Second Post', content: '

Second content

', tags: ['second'], notes: [], collaboratorEmails: [] }, + { title: 'Third Post', content: '

Third content

', tags: ['third'], notes: [], collaboratorEmails: [] }, + ]; + + for (const postData of posts) { + const post = new BlogPost(); + Object.assign(post, postData); + await repository.save(post); + } + + // Test find all + const allPosts = await repository.find(); + expect(allPosts.length).toBe(3); + + // Test ordering + const sortedPosts = await repository.find({ + order: { title: 'ASC' } + }); + expect(sortedPosts.length).toBe(3); + if (sortedPosts.length > 0) { + expect(sortedPosts[0]?.title).toBe('First Post'); + } + + // Test count + const totalCount = await repository.count(); + expect(totalCount).toBe(3); + + // Test custom query + const specificPost = await repository + .createQueryBuilder('post') + .where('post.title = :title', { title: 'Second Post' }) + .getOne(); + expect(specificPost).toBeDefined(); + expect(specificPost?.title).toBe('Second Post'); + } + + static async testTransactions(dataSource: TypeORMSqlDataSource): Promise { + const typeormInstance = dataSource.getTypeORMDataSource(); + + // Test successful transaction + await typeormInstance.transaction(async (manager) => { + const post1 = new BlogPost(); + post1.title = 'Transaction Post 1'; + post1.content = '

Transaction content 1

'; + post1.tags = []; + post1.notes = []; + post1.collaboratorEmails = []; + + const post2 = new BlogPost(); + post2.title = 'Transaction Post 2'; + post2.content = '

Transaction content 2

'; + post2.tags = []; + post2.notes = []; + post2.collaboratorEmails = []; + + await manager.save(BlogPost, post1); + await manager.save(BlogPost, post2); + }); + + // Verify both records were saved + const repository = typeormInstance.getRepository(BlogPost); + const transactionPosts = await repository.find({ + where: [ + { title: 'Transaction Post 1' as any }, + { title: 'Transaction Post 2' as any } + ] + }); + expect(transactionPosts.length).toBe(2); + + // Test rollback transaction + const countBefore = await repository.count(); + + try { + await typeormInstance.transaction(async (manager) => { + const post = new BlogPost(); + post.title = 'Rollback Post'; + post.content = '

Rollback content

'; + post.tags = []; + post.notes = []; + post.collaboratorEmails = []; + + await manager.save(BlogPost, post); + + // Force an error to trigger rollback + throw new Error('Intentional rollback'); + }); + } catch (error) { + // Expected error + } + + // Verify rollback worked + const countAfter = await repository.count(); + expect(countAfter).toBe(countBefore); + } + + static async cleanupTestData(dataSource: TypeORMSqlDataSource): Promise { + const typeormInstance = dataSource.getTypeORMDataSource(); + + // Clean up all test data - only if the entity is registered + try { + const repository = typeormInstance.getRepository(BlogPost); + await repository.clear(); + } catch (error) { + // Entity might not be registered yet, which is fine during setup + console.debug('Could not clear BlogPost data (entity may not be configured yet)'); + } + } +} + +// Main test suite +describe('Multi-Database Operations Test Suite', () => { + + // Display setup instructions at the start + beforeAll(() => { + console.log('\n=== Multi-Database Operations Test Suite ===\n'); + + DATABASE_CONFIGS.forEach(config => { + if (config.setupInstructions && !config.skipCondition?.()) { + console.log(`${config.name}:${config.setupInstructions}\n`); + } + }); + }); + + // Test each database configuration + DATABASE_CONFIGS.forEach((dbConfig) => { + describe(`Database: ${dbConfig.name}`, () => { + let dataSource: TypeORMSqlDataSource; + + beforeAll(async () => { + // Skip tests if condition is met + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} tests as requested`); + return; + } + + dataSource = new TypeORMSqlDataSource(dbConfig.config); + + // Configure the BlogPost model with the data source before initializing + configureModelWithDataSource(BlogPost, dataSource); + + try { + console.log(`Initializing ${dbConfig.name}...`); + await dataSource.initialize(dataSource.getOptions()); + console.log(`✓ ${dbConfig.name} initialized successfully`); + } catch (error) { + console.error(`✗ Failed to initialize ${dbConfig.name}:`, error); + throw error; + } + }); + + afterAll(async () => { + if (dataSource) { + await dataSource.disconnect(); + console.log(`✓ ${dbConfig.name} disconnected`); + + // Clean up SQLite file if it was created + if (dbConfig.config.type === 'sqlite' && + dbConfig.config.filename && + dbConfig.config.filename !== ':memory:' && + fs.existsSync(dbConfig.config.filename)) { + fs.unlinkSync(dbConfig.config.filename); + } + } + }); + + beforeEach(async () => { + if (dbConfig.skipCondition?.()) { + return; // Just return early, don't try to use pending + } + + if (dataSource && dataSource.isConnected()) { + await DatabaseTestOperations.cleanupTestData(dataSource); + } + }); + + it('should establish basic connection', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} connection test`); + return; + } + await DatabaseTestOperations.testBasicConnection(dataSource); + }); + + it('should configure models correctly', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} model configuration test`); + return; + } + await DatabaseTestOperations.testModelConfiguration(dataSource); + }); + + it('should perform CRUD operations', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} CRUD test`); + return; + } + await DatabaseTestOperations.testCRUDOperations(dataSource); + }); + + it('should execute query operations', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} query test`); + return; + } + await DatabaseTestOperations.testQueryOperations(dataSource); + }); + + it('should handle transactions correctly', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} transaction test`); + return; + } + await DatabaseTestOperations.testTransactions(dataSource); + }); + + it('should handle connection pooling configuration', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} pooling test`); + return; + } + + // Test connection with custom pooling settings + const pooledConfig = { + ...dbConfig.config, + maxConnections: 5, + minConnections: 1, + }; + + const pooledDataSource = new TypeORMSqlDataSource(pooledConfig); + configureModelWithDataSource(BlogPost, pooledDataSource); + await pooledDataSource.initialize(pooledDataSource.getOptions()); + + expect(pooledDataSource.isConnected()).toBe(true); + + await pooledDataSource.disconnect(); + }); + + it('should handle schema synchronization', async () => { + if (dbConfig.skipCondition?.()) { + console.log(`Skipping ${dbConfig.name} schema test`); + return; + } + + // Verify schema synchronization works + const options = dataSource.getOptions() as TypeORMSqlDataSourceOptions; + expect(options.synchronize).toBe(true); + + // The fact that our models work means schema sync is working + const typeormInstance = dataSource.getTypeORMDataSource(); + const metadata = typeormInstance.entityMetadatas; + + // Should have metadata for our registered models + expect(metadata.length).toBeGreaterThan(0); + }); + }); + }); + + // Cross-database compatibility tests + describe('Cross-Database Compatibility', () => { + it('should produce consistent results across all available databases', async () => { + const availableConfigs = DATABASE_CONFIGS.filter(config => !config.skipCondition?.()); + + if (availableConfigs.length < 2) { + console.log('Skipping cross-database test - need at least 2 databases available'); + return; + } + + const results: any[] = []; + + // Run the same operations on each available database + for (const dbConfig of availableConfigs) { + const dataSource = new TypeORMSqlDataSource(dbConfig.config); + + try { + configureModelWithDataSource(BlogPost, dataSource); + await dataSource.initialize(dataSource.getOptions()); + + // Insert test data using repository directly + const typeormInstance = dataSource.getTypeORMDataSource(); + const repository = typeormInstance.getRepository(BlogPost); + const post = new BlogPost(); + post.title = 'Cross Database Test'; + post.content = '

Cross database content

'; + post.tags = ['cross', 'test']; + post.notes = []; + post.collaboratorEmails = []; + + const saved = await repository.save(post); + const found = await repository.findOne({ where: { id: saved.id } }); + + results.push({ + database: dbConfig.name, + savedId: saved.id, + foundTitle: found?.title, + foundTags: found?.tags, + }); + + await dataSource.disconnect(); + + // Clean up SQLite file + if (dbConfig.config.type === 'sqlite' && + dbConfig.config.filename && + dbConfig.config.filename !== ':memory:' && + fs.existsSync(dbConfig.config.filename)) { + fs.unlinkSync(dbConfig.config.filename); + } + + } catch (error) { + console.error(`Cross-database test failed for ${dbConfig.name}:`, error); + throw error; + } + } + + // Verify all databases produced consistent results + const firstResult = results[0]; + results.forEach(result => { + expect(result.foundTitle).toBe(firstResult.foundTitle); + expect(result.foundTags).toEqual(firstResult.foundTags); + }); + + console.log('Cross-database compatibility verified for:', + results.map(r => r.database).join(', ')); + }); + }); +}); From 11a97086c4dfdceb40b2e8ac6f0d3255af59df8b Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 4 Sep 2025 10:38:04 -0300 Subject: [PATCH 116/254] Add methods with same params as TypeORM's Repository --- .../typeorm/TypeORMSqlDataSource.ts | 419 +++++++++++++++-- test/datasources/DataSource.test.ts | 10 +- .../TypeORMRepositoryMethods.test.ts | 442 ++++++++++++++++++ test/types_tests/ArrayPersistence.test.ts | 18 +- 4 files changed, 845 insertions(+), 44 deletions(-) create mode 100644 test/datasources/TypeORMRepositoryMethods.test.ts diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index fffd89f..93ed0f4 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -1,6 +1,18 @@ import 'reflect-metadata'; -import { DataSource as TypeORMDataSource, DataSourceOptions as TypeORMDataSourceOptions } from 'typeorm'; +import { + FindOptionsWhere, + FindManyOptions, + FindOneOptions, + FindOptionsOrder, + DataSource as TypeORMDataSource, + DataSourceOptions as TypeORMDataSourceOptions, + UpdateResult, + DeleteResult, + InsertResult +} from 'typeorm'; import { Entity, PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm'; +import { Repository } from 'typeorm'; +import { ObjectId } from 'typeorm'; import { DataSource, DataSourceOptions } from '../DataSource'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; @@ -98,7 +110,7 @@ export class TypeORMSqlDataSource extends DataSource { // Get all entities (models + array element entities) const allEntities = [ - ...Array.from(this.registeredModels), + ...Array.from(this.registeredModels), ...this.arrayFieldManager.getArrayElementEntities() ]; @@ -178,7 +190,7 @@ export class TypeORMSqlDataSource extends DataSource { configureModel(modelClass: Function, options?: any): void { // Register this model for inclusion in TypeORM entities this.registeredModels.add(modelClass); - + // Apply the TypeORM @Entity decorator const tableName = options?.tableName || modelClass.name.toLowerCase(); Entity(tableName)(modelClass as any); @@ -191,7 +203,7 @@ export class TypeORMSqlDataSource extends DataSource { // Store that this model is configured for TypeORM Reflect.defineMetadata('datasource:type', 'typeorm-sql', modelClass); - + // Store the dataSource instance in the model metadata for later access Reflect.defineMetadata('model:dataSource', this, modelClass); } @@ -248,106 +260,453 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entity.constructor as any); - + // If entity has an id, we need to handle updates differently const isUpdate = !!(entity as any).id; - + if (isUpdate) { // For updates, first handle array field deletion using the array field manager await this.arrayFieldManager.handleArrayFieldsForUpdate(entity, this.typeormDataSource); } - + // Preserve array values before extracting main entity fields const arrayValues = this.arrayFieldManager.extractArrayValues(entity); - + // Save the main entity first (without arrays converted) const mainEntityToSave = this.arrayFieldManager.extractMainEntityFields(entity); const savedMainEntity = await repository.save(mainEntityToSave as any) as T; - + // Now save array fields using the preserved values await this.arrayFieldManager.saveArrayFields(entity, arrayValues, savedMainEntity, this.typeormDataSource); - + // Return the entity with arrays loaded - const result = await this.findById(entity.constructor as any, (savedMainEntity as any).id); + const result = await this.findOneById(entity.constructor as any, (savedMainEntity as any).id); return result as T; // We know it exists since we just saved it } /** - * Find entities by criteria. + * Find entities by simple criteria (deprecated in favor of findBy or findWithOptions). * Handles array field conversion after loading using the array field manager. * * @param entityClass - The entity class to search for * @param criteria - Search criteria (optional) * @returns Promise resolving to array of found entities + * @deprecated Use findBy() or findWithOptions() instead for better TypeORM compatibility */ - async find(entityClass: new() => T, criteria?: any): Promise { + async find(entityClass: new () => T, criteria?: any): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } const repository = this.typeormDataSource.getRepository(entityClass); let entities: T[]; - + if (criteria) { entities = await repository.find({ where: criteria }) as T[]; } else { entities = await repository.find() as T[]; } - + // Load array data for each entity using the array field manager - return await Promise.all(entities.map(entity => + return await Promise.all(entities.map(entity => this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) )); } /** - * Find a single entity by id. - * Handles array field conversion after loading using the array field manager. + * Find entities using TypeORM FindManyOptions. + * Supports all TypeORM find options including where, order, relations, pagination, etc. + * Handles array field conversion after loading. + * + * @param entityClass - The entity class to search for + * @param options - TypeORM FindManyOptions (where, order, relations, skip, take, etc.) + * @returns Promise resolving to array of found entities + */ + async findWithOptions(entityClass: new () => T, options?: FindManyOptions): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entities = await repository.find(options) as T[]; + + // Load array data for each entity using the array field manager + return await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); + } + + /** + * Find entities that match given WHERE conditions. + * This matches TypeORM Repository's findBy method signature. + * + * @param entityClass - The entity class to search for + * @param where - WHERE conditions + * @returns Promise resolving to array of found entities + */ + async findBy(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entities = await repository.findBy(where) as T[]; + + // Load array data for each entity using the array field manager + return await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); + } + + /** + * Find first entity that matches given WHERE conditions. + * Returns null if no entity found. + * + * @param entityClass - The entity class to search for + * @param where - WHERE conditions + * @returns Promise resolving to found entity or null + */ + async findOneBy(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entity = await repository.findOneBy(where) as T | null; + + if (!entity) { + return null; + } + + // Load array data for the entity using the array field manager + return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); + } + + /** + * Find first entity using TypeORM FindOneOptions. + * Returns null if no entity found. + * + * @param entityClass - The entity class to search for + * @param options - TypeORM FindOneOptions + * @returns Promise resolving to found entity or null + */ + async findOne(entityClass: new () => T, options: FindOneOptions): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entity = await repository.findOne(options) as T | null; + + if (!entity) { + return null; + } + + // Load array data for the entity using the array field manager + return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); + } + + /** + * Find first entity that matches given WHERE conditions. + * Throws error if no entity found. + * + * @param entityClass - The entity class to search for + * @param where - WHERE conditions + * @returns Promise resolving to found entity + * @throws Error if entity not found + */ + async findOneByOrFail(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entity = await repository.findOneByOrFail(where) as T; + + // Load array data for the entity using the array field manager + return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); + } + + /** + * Find first entity using TypeORM FindOneOptions. + * Throws error if no entity found. + * + * @param entityClass - The entity class to search for + * @param options - TypeORM FindOneOptions + * @returns Promise resolving to found entity + * @throws Error if entity not found + */ + async findOneOrFail(entityClass: new () => T, options: FindOneOptions): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const entity = await repository.findOneOrFail(options) as T; + + // Load array data for the entity using the array field manager + return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); + } + + /** + * Find entities and count matching the given options. + * Returns tuple of [entities, totalCount]. + * + * @param entityClass - The entity class to search for + * @param options - TypeORM FindManyOptions + * @returns Promise resolving to [entities, count] tuple + */ + async findAndCount(entityClass: new () => T, options?: FindManyOptions): Promise<[T[], number]> { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const [entities, count] = await repository.findAndCount(options) as [T[], number]; + + // Load array data for each entity using the array field manager + const entitiesWithArrays = await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); + + return [entitiesWithArrays, count]; + } + + /** + * Find entities and count matching the given WHERE conditions. + * Returns tuple of [entities, totalCount]. + * + * @param entityClass - The entity class to search for + * @param where - WHERE conditions + * @returns Promise resolving to [entities, count] tuple + */ + async findAndCountBy(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise<[T[], number]> { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + const [entities, count] = await repository.findAndCountBy(where) as [T[], number]; + + // Load array data for each entity using the array field manager + const entitiesWithArrays = await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); + + return [entitiesWithArrays, count]; + } + + /** + * Check if any entity exists that matches the given options. + * + * @param entityClass - The entity class to check + * @param options - TypeORM FindManyOptions + * @returns Promise resolving to true if entity exists, false otherwise + */ + async exists(entityClass: new () => T, options?: FindManyOptions): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.exists(options); + } + + /** + * Check if any entity exists that matches the given WHERE conditions. + * + * @param entityClass - The entity class to check + * @param where - WHERE conditions + * @returns Promise resolving to true if entity exists, false otherwise + */ + async existsBy(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.existsBy(where); + } + + /** + * Count entities matching the given options. + * + * @param entityClass - The entity class to count + * @param options - TypeORM FindManyOptions + * @returns Promise resolving to count of entities + */ + async countWithOptions(entityClass: new () => T, options?: FindManyOptions): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.count(options); + } + + /** + * Count entities matching the given WHERE conditions. + * + * @param entityClass - The entity class to count + * @param where - WHERE conditions + * @returns Promise resolving to count of entities + */ + async countBy(entityClass: new () => T, where: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.countBy(where); + } + + /** + * Update entities matching the given criteria. + * + * @param entityClass - The entity class to update + * @param criteria - Criteria to match entities for update + * @param partialEntity - Partial entity with fields to update + * @returns Promise resolving to UpdateResult + */ + async update( + entityClass: new () => T, + criteria: FindOptionsWhere | FindOptionsWhere[], + partialEntity: Partial + ): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.update(criteria as any, partialEntity as any); + } + + /** + * Delete entities matching the given criteria. + * + * @param entityClass - The entity class to delete + * @param criteria - Criteria to match entities for deletion (ID, IDs, or WHERE conditions) + * @returns Promise resolving to DeleteResult + */ + async delete( + entityClass: new () => T, + criteria: string | string[] | number | number[] | Date | Date[] | ObjectId | ObjectId[] | FindOptionsWhere | FindOptionsWhere[] + ): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.delete(criteria as any); + } + + /** + * Soft delete entities matching the given criteria. + * + * @param entityClass - The entity class to soft delete + * @param criteria - Criteria to match entities for soft deletion + * @returns Promise resolving to UpdateResult + */ + async softDelete(entityClass: new () => T, criteria: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.softDelete(criteria as any); + } + + /** + * Restore soft deleted entities matching the given criteria. + * + * @param entityClass - The entity class to restore + * @param criteria - Criteria to match entities for restoration + * @returns Promise resolving to UpdateResult + */ + async restore(entityClass: new () => T, criteria: FindOptionsWhere | FindOptionsWhere[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.restore(criteria as any); + } + + /** + * Insert a new entity or entities. + * + * @param entityClass - The entity class to insert + * @param entity - Entity or entities to insert + * @returns Promise resolving to InsertResult + */ + async insert(entityClass: new () => T, entity: Partial | Partial[]): Promise { + if (!this.typeormDataSource) { + throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); + } + + const repository = this.typeormDataSource.getRepository(entityClass); + return await repository.insert(entity as any); + } + /** + * Find first entity that matches given id. + * If entity was not found in the database - returns null. * * @param entityClass - The entity class to search for * @param id - The id of the entity to find * @returns Promise resolving to the found entity or null */ - async findById(entityClass: new() => T, id: string): Promise { + async findOneById(entityClass: new () => T, id: number | string | Date): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } const repository = this.typeormDataSource.getRepository(entityClass); - const entity = await repository.findOne({ where: { id } as any }) as T | null; - + const entity = await repository.findOneById(id as any) as T | null; + if (!entity) { return null; } - + // Load array data for the entity using the array field manager return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); } /** - * Delete an entity by id. + * Find entities with ids. + * Optionally find options or conditions can be applied. * - * @param entityClass - The entity class - * @param id - The id of the entity to delete - * @returns Promise resolving to delete result + * @param entityClass - The entity class to search for + * @param ids - Array of ids to find + * @returns Promise resolving to array of found entities + * @deprecated use `findBy` method instead in conjunction with `In` operator, for example: + * + * .findBy({ + * id: In([1, 2, 3]) + * }) */ - async deleteById(entityClass: new() => T, id: string): Promise { + async findByIds(entityClass: new () => T, ids: any[]): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } const repository = this.typeormDataSource.getRepository(entityClass); - await repository.delete(id); + const entities = await repository.findByIds(ids) as T[]; + + // Load array data for each entity using the array field manager + return await Promise.all(entities.map(entity => + this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) + )); } /** - * Count entities matching criteria. + * Count entities matching simple criteria (deprecated in favor of countBy or countWithOptions). * * @param entityClass - The entity class to count * @param criteria - Search criteria (optional) * @returns Promise resolving to count of entities + * @deprecated Use countBy() or countWithOptions() instead for better TypeORM compatibility */ - async count(entityClass: new() => T, criteria?: any): Promise { + async count(entityClass: new () => T, criteria?: any): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts index 85c4d73..838c780 100644 --- a/test/datasources/DataSource.test.ts +++ b/test/datasources/DataSource.test.ts @@ -371,7 +371,7 @@ describe('Data Source Integration', () => { expect(savedUser.email).toBe('john@example.com'); // Find the user by id - const foundUser = await dataSource.findById(TestUser, savedUser.id); + const foundUser = await dataSource.findOneById(TestUser, savedUser.id); expect(foundUser).toBeDefined(); expect(foundUser!.name).toBe('John Doe'); expect(foundUser!.email).toBe('john@example.com'); @@ -471,14 +471,14 @@ describe('Data Source Integration', () => { const savedUser = await dataSource.save(user); // Verify user exists - let foundUser = await dataSource.findById(TestUser, savedUser.id); + let foundUser = await dataSource.findOneById(TestUser, savedUser.id); expect(foundUser).toBeDefined(); // Delete the user - await dataSource.deleteById(TestUser, savedUser.id); + await dataSource.delete(TestUser, savedUser.id); // Verify user is deleted - foundUser = await dataSource.findById(TestUser, savedUser.id); + foundUser = await dataSource.findOneById(TestUser, savedUser.id); expect(foundUser).toBeNull(); }); @@ -567,7 +567,7 @@ describe('Data Source Integration', () => { expect(savedModel.id).toBeDefined(); // Retrieve and verify - const foundModel = await dataSource.findById(ComplexModel, savedModel.id); + const foundModel = await dataSource.findOneById(ComplexModel, savedModel.id); expect(foundModel).toBeDefined(); expect(foundModel!.title).toBe('Test Record'); expect(foundModel!.count).toBe(42); diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts new file mode 100644 index 0000000..6f7c732 --- /dev/null +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -0,0 +1,442 @@ +import { + TypeORMSqlDataSource, + TypeORMSqlDataSourceOptions +} from '../../src/datasources/typeorm/TypeORMSqlDataSource'; +import { BlogPost } from '../model/BlogPost'; +import { FindOptionsWhere, FindManyOptions, FindOneOptions } from 'typeorm'; + +/** + * Test suite demonstrating TypeORM Repository-style methods in TypeORMSqlDataSource. + * This test validates that the data source provides the same methods as TypeORM Repository + * with the same parameters and behavior. + */ +describe('TypeORM Repository-Style Methods', () => { + let dataSource: TypeORMSqlDataSource; + + beforeEach(async () => { + const options: TypeORMSqlDataSourceOptions = { + type: 'sqlite', + managed: true, + filename: ':memory:', + synchronize: true, + logging: false, + }; + + dataSource = new TypeORMSqlDataSource(options); + dataSource.configureModel(BlogPost); + + // Configure all fields with the data source (needed for array field handling) + const fieldNames = Reflect.getMetadata('model:fields', BlogPost) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', BlogPost.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(BlogPost.prototype, fieldName, fieldType, allFieldOptions); + } + }); + + await dataSource.initialize(options); + }); + + afterEach(async () => { + if (dataSource) { + await dataSource.disconnect(); + } + }); + + describe('Find Operations', () => { + beforeEach(async () => { + // Create test data + const post1 = new BlogPost(); + post1.title = 'First Blog Post'; + post1.content = 'This is the content of the first blog post.'; + post1.tags = ['javascript', 'programming']; + post1.collaboratorEmails = ['john.doe@example.com']; + await dataSource.save(post1); + + const post2 = new BlogPost(); + post2.title = 'Second Blog Post'; + post2.content = 'This is the content of the second blog post.'; + post2.tags = ['typescript', 'web']; + post2.collaboratorEmails = ['jane.smith@example.com']; + await dataSource.save(post2); + + const post3 = new BlogPost(); + post3.title = 'Third Blog Post'; + post3.content = 'This is the content of the third blog post.'; + post3.tags = ['react', 'frontend']; + post3.collaboratorEmails = ['bob.johnson@example.com']; + await dataSource.save(post3); + }); + + test('findWithOptions() should support all TypeORM FindManyOptions', async () => { + const options: FindManyOptions = { + where: { title: 'First Blog Post' }, + order: { title: 'ASC' }, + skip: 0, + take: 10, + select: ['title', 'content'] + }; + + const results = await dataSource.findWithOptions(BlogPost, options); + expect(results).toHaveLength(1); + expect(results.length).toBeGreaterThan(0); + if (results.length > 0) { + expect(results[0]?.title).toBe('First Blog Post'); + expect(results[0]?.content).toBe('This is the content of the first blog post.'); + } + }); + + test('findBy() should find entities by WHERE conditions', async () => { + const where: FindOptionsWhere = { title: 'Second Blog Post' }; + const results = await dataSource.findBy(BlogPost, where); + + expect(results).toHaveLength(1); + expect(results.length).toBeGreaterThan(0); + if (results.length > 0) { + expect(results[0]?.title).toBe('Second Blog Post'); + expect(results[0]?.content).toBe('This is the content of the second blog post.'); + } + }); + + test('findBy() should support array of WHERE conditions (OR logic)', async () => { + const where: FindOptionsWhere[] = [ + { title: 'First Blog Post' }, + { title: 'Second Blog Post' } + ]; + const results = await dataSource.findBy(BlogPost, where); + + expect(results).toHaveLength(2); + const titles = results.map(p => p.title); + expect(titles).toContain('First Blog Post'); + expect(titles).toContain('Second Blog Post'); + }); + + test('findOneBy() should find single entity by WHERE conditions', async () => { + const where: FindOptionsWhere = { title: 'Third Blog Post' }; + const result = await dataSource.findOneBy(BlogPost, where); + + expect(result).not.toBeNull(); + expect(result!.title).toBe('Third Blog Post'); + expect(result!.content).toBe('This is the content of the third blog post.'); + }); + + test('findOneBy() should return null when no entity found', async () => { + const where: FindOptionsWhere = { title: 'Nonexistent Post' }; + const result = await dataSource.findOneBy(BlogPost, where); + + expect(result).toBeNull(); + }); + + test('findOne() should support TypeORM FindOneOptions', async () => { + const options: FindOneOptions = { + where: { title: 'Second Blog Post' }, + select: ['title', 'content'] + }; + + const result = await dataSource.findOne(BlogPost, options); + + expect(result).not.toBeNull(); + expect(result!.title).toBe('Second Blog Post'); + expect(result!.content).toBe('This is the content of the second blog post.'); + }); + + test('findOneByOrFail() should return entity when found', async () => { + const where: FindOptionsWhere = { title: 'First Blog Post' }; + const result = await dataSource.findOneByOrFail(BlogPost, where); + + expect(result.title).toBe('First Blog Post'); + expect(result.content).toBe('This is the content of the first blog post.'); + }); + + test('findOneByOrFail() should throw error when entity not found', async () => { + const where: FindOptionsWhere = { title: 'Nonexistent Post' }; + + await expect(dataSource.findOneByOrFail(BlogPost, where)) + .rejects.toThrow(); + }); + + test('findOneOrFail() should throw error when entity not found', async () => { + const options: FindOneOptions = { + where: { title: 'Nonexistent Post' } + }; + + await expect(dataSource.findOneOrFail(BlogPost, options)) + .rejects.toThrow(); + }); + }); + + describe('Count and Existence Operations', () => { + beforeEach(async () => { + // Create test data + for (let i = 0; i < 5; i++) { + const post = new BlogPost(); + post.title = `Test Post ${i}`; + post.content = `Content for test post ${i}`; + post.tags = ['test', 'example']; + post.collaboratorEmails = ['test@example.com']; + await dataSource.save(post); + } + }); + + test('countWithOptions() should count entities with FindManyOptions', async () => { + const options: FindManyOptions = { + // Count all test posts (no specific where condition, so all 5 will match) + }; + + const count = await dataSource.countWithOptions(BlogPost, options); + expect(count).toBe(5); + }); + + test('countBy() should count entities by WHERE conditions', async () => { + const where: FindOptionsWhere = { title: 'Test Post 0' }; + const count = await dataSource.countBy(BlogPost, where); + + expect(count).toBe(1); + }); + + test('exists() should return true when entities exist', async () => { + const options: FindManyOptions = { + where: { title: 'Test Post 0' } + }; + + const exists = await dataSource.exists(BlogPost, options); + expect(exists).toBe(true); + }); + + test('exists() should return false when no entities exist', async () => { + const options: FindManyOptions = { + where: { title: 'Nonexistent Post' } + }; + + const exists = await dataSource.exists(BlogPost, options); + expect(exists).toBe(false); + }); + + test('existsBy() should return true when entities exist', async () => { + const where: FindOptionsWhere = { title: 'Test Post 1' }; + const exists = await dataSource.existsBy(BlogPost, where); + + expect(exists).toBe(true); + }); + + test('existsBy() should return false when no entities exist', async () => { + const where: FindOptionsWhere = { title: 'Nonexistent Post' }; + const exists = await dataSource.existsBy(BlogPost, where); + + expect(exists).toBe(false); + }); + }); + + describe('Find and Count Operations', () => { + beforeEach(async () => { + // Create test data with pagination scenario + for (let i = 0; i < 10; i++) { + const post = new BlogPost(); + post.title = `Pagination Post ${i}`; + post.content = `Content for pagination post ${i}`; + post.tags = ['pagination', 'test']; + post.collaboratorEmails = ['pagination@example.com']; + await dataSource.save(post); + } + }); + + test('findAndCount() should return entities and total count', async () => { + const options: FindManyOptions = { + order: { title: 'ASC' }, + skip: 2, + take: 3 + }; + + const [entities, count] = await dataSource.findAndCount(BlogPost, options); + + expect(entities).toHaveLength(3); + expect(count).toBe(10); // Total count ignores pagination + expect(entities.length).toBeGreaterThan(0); + if (entities.length >= 3) { + expect(entities[0]?.title).toBe('Pagination Post 2'); // Skip 2, so starts from post 2 + expect(entities[1]?.title).toBe('Pagination Post 3'); + expect(entities[2]?.title).toBe('Pagination Post 4'); + } + }); + + test('findAndCountBy() should return entities and total count by WHERE', async () => { + const where: FindOptionsWhere = { content: 'Content for pagination post 0' }; + const [entities, count] = await dataSource.findAndCountBy(BlogPost, where); + + expect(entities).toHaveLength(1); + expect(count).toBe(1); + }); + }); + + describe('Update and Delete Operations', () => { + let testPostId: string; + + beforeEach(async () => { + const post = new BlogPost(); + post.title = 'Update Test Post'; + post.content = 'Content for update test'; + post.tags = ['update', 'test']; + post.collaboratorEmails = ['update@example.com']; + const saved = await dataSource.save(post); + testPostId = saved.id!; + }); + + test('update() should update entities by criteria', async () => { + const criteria: FindOptionsWhere = { id: testPostId }; + const partialEntity: Partial = { + title: 'Updated Title', + content: 'Updated content' + }; + + const result = await dataSource.update(BlogPost, criteria, partialEntity); + expect(result.affected).toBe(1); + + // Verify the update + const updated = await dataSource.findOneById(BlogPost, testPostId); + expect(updated!.title).toBe('Updated Title'); + expect(updated!.content).toBe('Updated content'); + }); + + test('delete() should delete entities by criteria', async () => { + const criteria: FindOptionsWhere = { id: testPostId }; + + const result = await dataSource.delete(BlogPost, criteria); + expect(result.affected).toBe(1); + + // Verify the deletion + const deleted = await dataSource.findOneById(BlogPost, testPostId); + expect(deleted).toBeNull(); + }); + + test('insert() should insert new entities', async () => { + const newPost: Partial = { + title: 'Insert Test Post', + content: 'Content for insert test', + tags: ['insert', 'test'], + collaboratorEmails: ['insert@example.com'] + }; + + const result = await dataSource.insert(BlogPost, newPost); + expect(result.identifiers).toHaveLength(1); + expect(result.identifiers.length).toBeGreaterThan(0); + if (result.identifiers.length > 0) { + expect(result.identifiers[0]?.id).toBeDefined(); + } + }); + + test('insert() should insert multiple entities', async () => { + const newPosts: Partial[] = [ + { + title: 'Bulk Insert Post 1', + content: 'Content for bulk insert post 1', + tags: ['bulk', 'insert'], + collaboratorEmails: ['bulk1@example.com'] + }, + { + title: 'Bulk Insert Post 2', + content: 'Content for bulk insert post 2', + tags: ['bulk', 'insert'], + collaboratorEmails: ['bulk2@example.com'] + } + ]; + + const result = await dataSource.insert(BlogPost, newPosts); + expect(result.identifiers).toHaveLength(2); + }); + }); + + describe('Error Handling', () => { + test('should throw error when DataSource not initialized', async () => { + const uninitializedDataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + }); + + await expect(uninitializedDataSource.findBy(BlogPost, {})) + .rejects.toThrow('TypeORM DataSource not initialized'); + + await expect(uninitializedDataSource.countBy(BlogPost, {})) + .rejects.toThrow('TypeORM DataSource not initialized'); + + await expect(uninitializedDataSource.exists(BlogPost)) + .rejects.toThrow('TypeORM DataSource not initialized'); + }); + }); + + describe('Backward Compatibility', () => { + test('legacy find() method should still work', async () => { + const post = new BlogPost(); + post.title = 'Legacy Test Post'; + post.content = 'Content for legacy test'; + post.tags = ['legacy', 'test']; + post.collaboratorEmails = ['legacy@example.com']; + await dataSource.save(post); + + // Test legacy find method with valid BlogPost property + const results = await dataSource.find(BlogPost, { title: 'Legacy Test Post' }); + expect(results).toHaveLength(1); + expect(results.length).toBeGreaterThan(0); + if (results.length > 0) { + expect(results[0]?.title).toBe('Legacy Test Post'); + } + }); + + test('legacy count() method should still work', async () => { + const post = new BlogPost(); + post.title = 'Legacy Count Test Post'; + post.content = 'Content for legacy count test'; + post.tags = ['legacy', 'count']; + post.collaboratorEmails = ['legacycount@example.com']; + await dataSource.save(post); + + // Test legacy count method with valid BlogPost property + const count = await dataSource.count(BlogPost, { title: 'Legacy Count Test Post' }); + expect(count).toBe(1); + }); + + test('findOneById() should find entity by id (deprecated method)', async () => { + const post = new BlogPost(); + post.title = 'FindOneById Test Post'; + post.content = 'Content for findOneById test'; + post.tags = ['findOneById', 'test']; + post.collaboratorEmails = ['findonebyid@example.com']; + const saved = await dataSource.save(post); + + // Test findOneById method + const found = await dataSource.findOneById(BlogPost, saved.id); + expect(found).toBeDefined(); + expect(found!.title).toBe('FindOneById Test Post'); + expect(found!.content).toBe('Content for findOneById test'); + }); + + test('findByIds() should find entities by array of ids (deprecated method)', async () => { + const post1 = new BlogPost(); + post1.title = 'FindByIds Test Post 1'; + post1.content = 'Content for first post'; + post1.tags = ['findByIds', 'test1']; + post1.collaboratorEmails = ['findbyids1@example.com']; + const saved1 = await dataSource.save(post1); + + const post2 = new BlogPost(); + post2.title = 'FindByIds Test Post 2'; + post2.content = 'Content for second post'; + post2.tags = ['findByIds', 'test2']; + post2.collaboratorEmails = ['findbyids2@example.com']; + const saved2 = await dataSource.save(post2); + + // Test findByIds method + const found = await dataSource.findByIds(BlogPost, [saved1.id, saved2.id]); + expect(found).toHaveLength(2); + expect(found.map(p => p.title)).toContain('FindByIds Test Post 1'); + expect(found.map(p => p.title)).toContain('FindByIds Test Post 2'); + }); + }); +}); diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts index 7264ba3..7459033 100644 --- a/test/types_tests/ArrayPersistence.test.ts +++ b/test/types_tests/ArrayPersistence.test.ts @@ -108,7 +108,7 @@ describe("Array Persistence in SQL Databases", () => { // Clean up any existing data const allPosts = await dataSource.find(BlogPost); for (const post of allPosts) { - await dataSource.deleteById(BlogPost, post.id); + await dataSource.delete(BlogPost, post.id); } // Create a fresh blog post for testing @@ -130,7 +130,7 @@ describe("Array Persistence in SQL Databases", () => { }); it("should retrieve a blog post with all array fields intact", async () => { - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + const retrievedPost = await dataSource.findOneById(BlogPost, savedPost.id); expect(retrievedPost).not.toBeNull(); expect(retrievedPost!.id).toBe(savedPost.id); @@ -147,7 +147,7 @@ describe("Array Persistence in SQL Databases", () => { }); it("should preserve array order when retrieving", async () => { - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + const retrievedPost = await dataSource.findOneById(BlogPost, savedPost.id); expect(retrievedPost!.tags[0]).toBe("javascript"); expect(retrievedPost!.tags[1]).toBe("typescript"); @@ -171,7 +171,7 @@ describe("Array Persistence in SQL Databases", () => { // Clean up any existing data const allPosts = await dataSource.find(BlogPost); for (const post of allPosts) { - await dataSource.deleteById(BlogPost, post.id); + await dataSource.delete(BlogPost, post.id); } // Create a fresh blog post for testing @@ -209,7 +209,7 @@ describe("Array Persistence in SQL Databases", () => { expect(updatedPost.collaboratorEmails).toEqual(["new@example.com"]); // Verify the update persisted - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + const retrievedPost = await dataSource.findOneById(BlogPost, savedPost.id); expect(retrievedPost!.tags).toEqual(["react", "node.js"]); expect(retrievedPost!.notes).toEqual(["

Updated note

"]); expect(retrievedPost!.collaboratorEmails).toEqual(["new@example.com"]); @@ -230,7 +230,7 @@ describe("Array Persistence in SQL Databases", () => { expect(updatedPost.tags).toEqual(["single-tag"]); // Verify the update persisted - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + const retrievedPost = await dataSource.findOneById(BlogPost, savedPost.id); expect(retrievedPost!.tags).toEqual(["single-tag"]); }); }); @@ -242,7 +242,7 @@ describe("Array Persistence in SQL Databases", () => { // Clean up any existing data const allPosts = await dataSource.find(BlogPost); for (const post of allPosts) { - await dataSource.deleteById(BlogPost, post.id); + await dataSource.delete(BlogPost, post.id); } // Create a fresh blog post for testing @@ -264,9 +264,9 @@ describe("Array Persistence in SQL Databases", () => { }); it("should delete a blog post and cascade delete array elements", async () => { - await dataSource.deleteById(BlogPost, savedPost.id); + await dataSource.delete(BlogPost, savedPost.id); - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + const retrievedPost = await dataSource.findOneById(BlogPost, savedPost.id); expect(retrievedPost).toBeNull(); }); }); From 6899433e05606cb8ad83329b6c5501d38ce47833 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 4 Sep 2025 11:05:27 -0300 Subject: [PATCH 117/254] Implement field type configuration system for TypeORM mapping --- .../typeorm/TypeORMSqlDataSource.ts | 2 + src/datasources/typeorm/TypeORMTypeMapper.ts | 151 +++--------------- src/model/types/FieldTypeConfig.ts | 61 +++++++ src/model/types/TypeRegistry.ts | 20 +++ src/model/types/boolean/Boolean.ts | 20 +++ src/model/types/date_time/DateTime.ts | 22 ++- src/model/types/enum/Choice.ts | 21 +++ src/model/types/index.ts | 4 + src/model/types/number/Decimal.ts | 24 ++- src/model/types/number/Integer.ts | 22 ++- src/model/types/number/Money.ts | 24 ++- src/model/types/number/Number.ts | 22 +++ src/model/types/string/Email.ts | 22 +++ src/model/types/string/HTML.ts | 21 +++ src/model/types/string/Text.ts | 26 ++- 15 files changed, 332 insertions(+), 130 deletions(-) create mode 100644 src/model/types/FieldTypeConfig.ts create mode 100644 src/model/types/TypeRegistry.ts diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index fffd89f..90b495a 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -5,6 +5,8 @@ import { DataSource, DataSourceOptions } from '../DataSource'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; import { ArrayFieldManager } from './ArrayFieldManager'; +// Import to ensure field type registrations happen +import '../../model/types/TypeRegistry'; /** * Configuration options for TypeORM SQL data source. diff --git a/src/datasources/typeorm/TypeORMTypeMapper.ts b/src/datasources/typeorm/TypeORMTypeMapper.ts index 02dd995..6831e4f 100644 --- a/src/datasources/typeorm/TypeORMTypeMapper.ts +++ b/src/datasources/typeorm/TypeORMTypeMapper.ts @@ -1,8 +1,11 @@ +import { FieldTypeRegistry } from '../../model/types/TypeRegistry'; + /** * Utility class for mapping Slingr framework field types to TypeORM column configurations. * - * This class centralizes all type mapping logic, making it easier to maintain - * and extend support for new field types. + * This class now uses a registry-based approach instead of switch statements, + * making it easier to maintain and extend support for new field types. + * Each field type registers its own TypeORM configuration. */ export class TypeORMTypeMapper { @@ -18,61 +21,19 @@ export class TypeORMTypeMapper { const isRequired = fieldOptions?.required === true; const nullable = !isRequired; - switch (fieldType) { - case 'text': - case 'email': - case 'html': - return TypeORMTypeMapper.getTextColumnConfig(fieldOptions, nullable); - - case 'integer': - return { - type: 'int', - nullable: nullable - }; - - case 'number': - case 'decimal': - return { - type: 'decimal', - precision: fieldOptions?.precision || 10, - scale: fieldOptions?.decimals || 2, - nullable: nullable - }; - - case 'boolean': - return { - type: 'boolean', - nullable: nullable - }; - - case 'datetime': - return { - type: 'datetime', - nullable: nullable - }; - - case 'money': - return { - type: 'decimal', - precision: 19, - scale: fieldOptions?.decimals || 2, - nullable: nullable - }; - - case 'choice': - return { - type: 'varchar', - length: 50, - nullable: nullable - }; - - default: - // Default to text for unknown types - return { - type: 'text', - nullable: nullable - }; + // Get the configuration from the registry + const typeConfig = FieldTypeRegistry.get(fieldType); + + if (typeConfig) { + return typeConfig.getTypeORMColumnConfig(fieldOptions, nullable); } + + // Fallback for unknown types (should rarely happen) + console.warn(`Unknown field type '${fieldType}', using text as fallback`); + return { + type: 'text', + nullable: nullable + }; } /** @@ -84,78 +45,18 @@ export class TypeORMTypeMapper { * @returns TypeORM column configuration for array elements */ static getArrayElementColumnConfig(baseFieldType: string, fieldOptions?: any): any { - switch (baseFieldType) { - case 'text': - case 'email': - case 'html': - return TypeORMTypeMapper.getTextColumnConfig(fieldOptions, false); - - case 'integer': - return { - type: 'int', - nullable: false - }; - - case 'number': - case 'decimal': - return { - type: 'decimal', - precision: fieldOptions?.precision || 10, - scale: fieldOptions?.decimals || 2, - nullable: false - }; - - case 'boolean': - return { - type: 'boolean', - nullable: false - }; - - case 'datetime': - return { - type: 'datetime', - nullable: false - }; - - case 'money': - return { - type: 'decimal', - precision: 19, - scale: fieldOptions?.decimals || 2, - nullable: false - }; - - case 'choice': - return { - type: 'varchar', - length: 50, - nullable: false - }; - - default: - return { - type: 'text', - nullable: false - }; + // Get the configuration from the registry + const typeConfig = FieldTypeRegistry.get(baseFieldType); + + if (typeConfig) { + return typeConfig.getArrayElementColumnConfig(fieldOptions); } - } - /** - * Helper method to get text column configuration. - * Centralizes the logic for determining varchar vs text based on length. - * - * @param fieldOptions - Field-specific options - * @param nullable - Whether the column should be nullable - * @returns TypeORM column configuration for text fields - */ - private static getTextColumnConfig(fieldOptions?: any, nullable: boolean = true): any { - const hasMaxLength = fieldOptions?.maxLength; - const useVarchar = hasMaxLength && fieldOptions.maxLength <= 255; - + // Fallback for unknown types (should rarely happen) + console.warn(`Unknown field type '${baseFieldType}', using text as fallback for array elements`); return { - type: useVarchar ? 'varchar' : 'text', - length: useVarchar ? fieldOptions.maxLength : undefined, - nullable: nullable + type: 'text', + nullable: false }; } } diff --git a/src/model/types/FieldTypeConfig.ts b/src/model/types/FieldTypeConfig.ts new file mode 100644 index 0000000..09551d8 --- /dev/null +++ b/src/model/types/FieldTypeConfig.ts @@ -0,0 +1,61 @@ +/** + * Interface that field types must implement to provide TypeORM configuration. + * This allows the framework to get database column configurations without + * maintaining switch statements or duplicating logic. + */ +export interface FieldTypeConfig { + /** + * Returns the TypeORM column configuration for this field type. + * + * @param fieldOptions - Field-specific options from the decorator + * @param nullable - Whether the column should be nullable + * @returns TypeORM column configuration object + */ + getTypeORMColumnConfig(fieldOptions?: any, nullable?: boolean): any; + + /** + * Returns the TypeORM column configuration for array elements of this field type. + * Array elements are typically non-nullable since empty arrays are represented by no rows. + * + * @param fieldOptions - Field-specific options from the decorator + * @returns TypeORM column configuration object for array elements + */ + getArrayElementColumnConfig(fieldOptions?: any): any; +} + +/** + * Registry of field type configurations. + * Each field type should register itself here to be discoverable by the TypeORM mapper. + */ +export class FieldTypeRegistry { + private static configurations = new Map(); + + /** + * Registers a field type configuration. + * + * @param typeName - The name of the field type (e.g., 'text', 'integer') + * @param config - The configuration object implementing FieldTypeConfig + */ + static register(typeName: string, config: FieldTypeConfig): void { + this.configurations.set(typeName, config); + } + + /** + * Gets the configuration for a specific field type. + * + * @param typeName - The name of the field type + * @returns The configuration object or undefined if not found + */ + static get(typeName: string): FieldTypeConfig | undefined { + return this.configurations.get(typeName); + } + + /** + * Gets all registered field type names. + * + * @returns Array of registered field type names + */ + static getRegisteredTypes(): string[] { + return Array.from(this.configurations.keys()); + } +} diff --git a/src/model/types/TypeRegistry.ts b/src/model/types/TypeRegistry.ts new file mode 100644 index 0000000..330367b --- /dev/null +++ b/src/model/types/TypeRegistry.ts @@ -0,0 +1,20 @@ +/** + * This file imports all field types to ensure their configurations are registered + * with the FieldTypeRegistry. This must be imported before using the TypeORM mapper. + */ + +// Import all field types to trigger their registration +import './string/Text'; +import './string/Email'; +import './string/HTML'; +import './number/Integer'; +import './number/Number'; +import './number/Decimal'; +import './number/Money'; +import './boolean/Boolean'; +import './date_time/DateTime'; +import './enum/Choice'; + +// Export the registry for convenience +export { FieldTypeRegistry } from './FieldTypeConfig'; +export type { FieldTypeConfig } from './FieldTypeConfig'; diff --git a/src/model/types/boolean/Boolean.ts b/src/model/types/boolean/Boolean.ts index 802bd3e..124ca4f 100644 --- a/src/model/types/boolean/Boolean.ts +++ b/src/model/types/boolean/Boolean.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import { validateBooleanType } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Boolean type decorator. @@ -50,3 +51,22 @@ export function Boolean() { Reflect.defineMetadata('field:type', 'boolean', proto, propName); }; } + +/** + * Configuration object for Boolean field TypeORM mapping. + */ +export const BooleanTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: any, nullable: boolean = true): any { + return { + type: 'boolean', + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: any): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the boolean type configuration +FieldTypeRegistry.register('boolean', BooleanTypeConfig); diff --git a/src/model/types/date_time/DateTime.ts b/src/model/types/date_time/DateTime.ts index 988bb61..e04c8fe 100644 --- a/src/model/types/date_time/DateTime.ts +++ b/src/model/types/date_time/DateTime.ts @@ -6,6 +6,7 @@ import { } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { validateDateType, dateToISO8601, dateFromJSON } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Options for the DateTime decorator. @@ -149,4 +150,23 @@ export function DateTime(options?: DateTimeOptions) { return value; })(target as any, propName); }; -} \ No newline at end of file +} + +/** + * Configuration object for DateTime field TypeORM mapping. + */ +export const DateTimeTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: DateTimeOptions, nullable: boolean = true): any { + return { + type: 'datetime', + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: DateTimeOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the datetime type configuration +FieldTypeRegistry.register('datetime', DateTimeTypeConfig); \ No newline at end of file diff --git a/src/model/types/enum/Choice.ts b/src/model/types/enum/Choice.ts index 05782b1..3aae4fe 100644 --- a/src/model/types/enum/Choice.ts +++ b/src/model/types/enum/Choice.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import { Transform, TransformationType } from 'class-transformer'; import { validateEnumType } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Choice type decorator. @@ -68,3 +69,23 @@ export function Choice() { })(target as any, propName); }; } + +/** + * Configuration object for Choice field TypeORM mapping. + */ +export const ChoiceTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: any, nullable: boolean = true): any { + return { + type: 'varchar', + length: 50, + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: any): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the choice type configuration +FieldTypeRegistry.register('choice', ChoiceTypeConfig); diff --git a/src/model/types/index.ts b/src/model/types/index.ts index 827d287..e1a65c4 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -14,3 +14,7 @@ export { Number } from './number/Number'; export { Decimal } from './number/Decimal'; export { Relationship } from './relationship/Relationship'; export type { RelationshipOptions } from './relationship/Relationship'; + +// Export the field type configuration system +export { FieldTypeRegistry } from './FieldTypeConfig'; +export type { FieldTypeConfig } from './FieldTypeConfig'; diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index 4a6d0b4..f7b404b 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -2,6 +2,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Type alias for the `FinancialNumber` object. @@ -162,4 +163,25 @@ export function Decimal(options: DecimalOptions) { const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyDecimalValidations(addOptionalValidator, propName, options); }; -} \ No newline at end of file +} + +/** + * Configuration object for Decimal field TypeORM mapping. + */ +export const DecimalTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: DecimalOptions, nullable: boolean = true): any { + return { + type: 'decimal', + precision: 10, + scale: fieldOptions?.decimals || 2, + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: DecimalOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the decimal type configuration +FieldTypeRegistry.register('decimal', DecimalTypeConfig); \ No newline at end of file diff --git a/src/model/types/number/Integer.ts b/src/model/types/number/Integer.ts index 8fec3dc..5c9b577 100644 --- a/src/model/types/number/Integer.ts +++ b/src/model/types/number/Integer.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Options for the Integer decorator. @@ -135,4 +136,23 @@ export function Integer(options?: IntegerOptions) { const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyIntegerValidations(addOptionalValidator, propName, options); }; -} \ No newline at end of file +} + +/** + * Configuration object for Integer field TypeORM mapping. + */ +export const IntegerTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: IntegerOptions, nullable: boolean = true): any { + return { + type: 'int', + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: IntegerOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the integer type configuration +FieldTypeRegistry.register('integer', IntegerTypeConfig); \ No newline at end of file diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index fc566a9..8ed0628 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -2,6 +2,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Type alias for the `FinancialNumber` object, representing a monetary value. @@ -155,4 +156,25 @@ export function Money(options: MoneyOptions) { const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyMoneyValidations(addOptionalValidator, propName, options); }; -} \ No newline at end of file +} + +/** + * Configuration object for Money field TypeORM mapping. + */ +export const MoneyTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: MoneyOptions, nullable: boolean = true): any { + return { + type: 'decimal', + precision: 19, + scale: fieldOptions?.decimals || 2, + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: MoneyOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the money type configuration +FieldTypeRegistry.register('money', MoneyTypeConfig); \ No newline at end of file diff --git a/src/model/types/number/Number.ts b/src/model/types/number/Number.ts index 5a59ed9..bb76cda 100644 --- a/src/model/types/number/Number.ts +++ b/src/model/types/number/Number.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Options for the Number decorator. @@ -175,3 +176,24 @@ export function Number(options?: NumberOptions) { applyNumberValidations(addOptionalValidator, propName, options); }; } + +/** + * Configuration object for Number field TypeORM mapping. + */ +export const NumberTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: NumberOptions, nullable: boolean = true): any { + return { + type: 'decimal', + precision: 10, + scale: 2, + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: NumberOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the number type configuration +FieldTypeRegistry.register('number', NumberTypeConfig); diff --git a/src/model/types/string/Email.ts b/src/model/types/string/Email.ts index 0f86cf2..b8bff8d 100644 --- a/src/model/types/string/Email.ts +++ b/src/model/types/string/Email.ts @@ -2,6 +2,7 @@ import 'reflect-metadata'; import { IsEmail, IsArray } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Email type decorator. @@ -102,3 +103,24 @@ export function Email() { } }; } + +/** + * Configuration object for Email field TypeORM mapping. + * Email fields are essentially text fields with email validation. + */ +export const EmailTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: any, nullable: boolean = true): any { + return { + type: 'varchar', + length: 255, // Standard email length limit + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: any): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the email type configuration +FieldTypeRegistry.register('email', EmailTypeConfig); diff --git a/src/model/types/string/HTML.ts b/src/model/types/string/HTML.ts index 50980e0..112ffc4 100644 --- a/src/model/types/string/HTML.ts +++ b/src/model/types/string/HTML.ts @@ -3,6 +3,7 @@ import { validateStringType } from '../utils'; import { Text } from './Text'; import { IsArray, IsString } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * HTML type decorator. @@ -101,3 +102,23 @@ export function HTML() { } }; } + +/** + * Configuration object for HTML field TypeORM mapping. + * HTML fields typically contain longer content, so they use TEXT type. + */ +export const HTMLTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: any, nullable: boolean = true): any { + return { + type: 'text', + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: any): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the HTML type configuration +FieldTypeRegistry.register('html', HTMLTypeConfig); diff --git a/src/model/types/string/Text.ts b/src/model/types/string/Text.ts index 249fb2e..f41397b 100644 --- a/src/model/types/string/Text.ts +++ b/src/model/types/string/Text.ts @@ -10,6 +10,7 @@ import { } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Options for the Text decorator. @@ -178,4 +179,27 @@ export function Text(options?: TextOptions) { } } }; -} \ No newline at end of file +} + +/** + * Configuration object for Text field TypeORM mapping. + */ +export const TextTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: TextOptions, nullable: boolean = true): any { + const maxLength = fieldOptions?.maxLength; + const useVarchar = maxLength !== undefined && maxLength <= 255; + + return { + type: useVarchar ? 'varchar' : 'text', + length: useVarchar ? maxLength : undefined, + nullable: nullable + }; + }, + + getArrayElementColumnConfig(fieldOptions?: TextOptions): any { + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the text type configuration +FieldTypeRegistry.register('text', TextTypeConfig); \ No newline at end of file From c02195b06e2b896ae7cb57aedc9c717ab31a3647 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 4 Sep 2025 11:22:48 -0300 Subject: [PATCH 118/254] Add tests to understand the behavior of array querys --- test/types_tests/ArrayPersistence.test.ts | 192 +++++++++++++++++++--- 1 file changed, 166 insertions(+), 26 deletions(-) diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts index 7264ba3..250d117 100644 --- a/test/types_tests/ArrayPersistence.test.ts +++ b/test/types_tests/ArrayPersistence.test.ts @@ -102,7 +102,8 @@ describe("Array Persistence in SQL Databases", () => { }); describe("Array Retrieval", () => { - let savedPost: BlogPost; + let savedPost1: BlogPost; + let savedPost2: BlogPost; beforeEach(async () => { // Clean up any existing data @@ -111,56 +112,195 @@ describe("Array Persistence in SQL Databases", () => { await dataSource.deleteById(BlogPost, post.id); } - // Create a fresh blog post for testing - const freshPost = new BlogPost(); - freshPost.title = "Sample Blog Post"; - freshPost.content = "

Hello World

This is a sample blog post.

"; - freshPost.tags = ["javascript", "typescript", "web-development"]; - freshPost.notes = [ + // Create first blog post for testing + const freshPost1 = new BlogPost(); + freshPost1.title = "JavaScript Tutorial"; + freshPost1.content = "

Learn JavaScript

This is a JS tutorial.

"; + freshPost1.tags = ["javascript", "tutorial", "beginner"]; + freshPost1.notes = [ "

Note 1

Remember to add examples

", "

Note 2

Include code snippets

" ]; - freshPost.collaboratorEmails = [ + freshPost1.collaboratorEmails = [ "john@example.com", - "jane@example.com", - "bob@example.com" + "jane@example.com" ]; - savedPost = await dataSource.save(freshPost); + savedPost1 = await dataSource.save(freshPost1); + + // Create second blog post for testing queries + const freshPost2 = new BlogPost(); + freshPost2.title = "TypeScript Advanced"; + freshPost2.content = "

Advanced TypeScript

This is a TS tutorial.

"; + freshPost2.tags = ["typescript", "advanced", "generics"]; + freshPost2.notes = [ + "

TS Note 1

Generic constraints

", + "

TS Note 2

Conditional types

", + "

TS Note 3

Mapped types

" + ]; + freshPost2.collaboratorEmails = [ + "alice@example.com", + "bob@example.com", + "charlie@example.com" + ]; + + savedPost2 = await dataSource.save(freshPost2); }); - it("should retrieve a blog post with all array fields intact", async () => { - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + it("should retrieve a blog post with all array fields intact using findById", async () => { + const retrievedPost = await dataSource.findById(BlogPost, savedPost1.id); expect(retrievedPost).not.toBeNull(); - expect(retrievedPost!.id).toBe(savedPost.id); - expect(retrievedPost!.title).toBe("Sample Blog Post"); - expect(retrievedPost!.tags).toEqual(["javascript", "typescript", "web-development"]); + expect(retrievedPost!.id).toBe(savedPost1.id); + expect(retrievedPost!.title).toBe("JavaScript Tutorial"); + expect(retrievedPost!.tags).toEqual(["javascript", "tutorial", "beginner"]); expect(retrievedPost!.notes).toHaveLength(2); expect(retrievedPost!.notes[0]).toContain("Note 1"); expect(retrievedPost!.notes[1]).toContain("Note 2"); expect(retrievedPost!.collaboratorEmails).toEqual([ "john@example.com", - "jane@example.com", - "bob@example.com" + "jane@example.com" ]); }); - it("should preserve array order when retrieving", async () => { - const retrievedPost = await dataSource.findById(BlogPost, savedPost.id); + it("should preserve array order when retrieving by ID", async () => { + const retrievedPost = await dataSource.findById(BlogPost, savedPost1.id); expect(retrievedPost!.tags[0]).toBe("javascript"); - expect(retrievedPost!.tags[1]).toBe("typescript"); - expect(retrievedPost!.tags[2]).toBe("web-development"); + expect(retrievedPost!.tags[1]).toBe("tutorial"); + expect(retrievedPost!.tags[2]).toBe("beginner"); }); - it("should find blog posts using the find method", async () => { + it("should find all blog posts with arrays automatically loaded", async () => { const posts = await dataSource.find(BlogPost); + expect(posts).toHaveLength(2); + + // Verify first post arrays are loaded + const firstPost = posts.find(p => p.id === savedPost1.id); + expect(firstPost).toBeDefined(); + expect(firstPost!.tags).toEqual(["javascript", "tutorial", "beginner"]); + expect(firstPost!.notes).toHaveLength(2); + expect(firstPost!.collaboratorEmails).toHaveLength(2); + + // Verify second post arrays are loaded + const secondPost = posts.find(p => p.id === savedPost2.id); + expect(secondPost).toBeDefined(); + expect(secondPost!.tags).toEqual(["typescript", "advanced", "generics"]); + expect(secondPost!.notes).toHaveLength(3); + expect(secondPost!.collaboratorEmails).toHaveLength(3); + }); + + it("should find blog posts by criteria with arrays automatically loaded", async () => { + // Query by title - this should automatically load arrays like compositions + const posts = await dataSource.find(BlogPost, { title: "TypeScript Advanced" }); + expect(posts).toHaveLength(1); - expect(posts[0]).toBeDefined(); - expect(posts[0]!.id).toBe(savedPost.id); - expect(posts[0]!.tags).toEqual(["javascript", "typescript", "web-development"]); + const foundPost = posts[0]!; + expect(foundPost).toBeDefined(); + expect(foundPost.id).toBe(savedPost2.id); + expect(foundPost.title).toBe("TypeScript Advanced"); + + // Verify arrays are automatically loaded, not just empty or undefined + expect(foundPost.tags).toEqual(["typescript", "advanced", "generics"]); + expect(foundPost.notes).toHaveLength(3); + expect(foundPost.notes[0]).toContain("TS Note 1"); + expect(foundPost.notes[1]).toContain("TS Note 2"); + expect(foundPost.notes[2]).toContain("TS Note 3"); + expect(foundPost.collaboratorEmails).toEqual([ + "alice@example.com", + "bob@example.com", + "charlie@example.com" + ]); + }); + + it("should preserve array order in query results", async () => { + const posts = await dataSource.find(BlogPost, { title: "TypeScript Advanced" }); + + expect(posts).toHaveLength(1); + const post = posts[0]!; + expect(post).toBeDefined(); + + // Verify array order is preserved + expect(post.tags[0]).toBe("typescript"); + expect(post.tags[1]).toBe("advanced"); + expect(post.tags[2]).toBe("generics"); + + expect(post.collaboratorEmails[0]).toBe("alice@example.com"); + expect(post.collaboratorEmails[1]).toBe("bob@example.com"); + expect(post.collaboratorEmails[2]).toBe("charlie@example.com"); + }); + + it("should handle empty query results gracefully", async () => { + const posts = await dataSource.find(BlogPost, { title: "Non-existent Post" }); + + expect(posts).toHaveLength(0); + expect(Array.isArray(posts)).toBe(true); + }); + + it("should load arrays for multiple entities in a single query", async () => { + // Query without criteria to get all posts + const allPosts = await dataSource.find(BlogPost); + + expect(allPosts).toHaveLength(2); + + // Verify both posts have their arrays properly loaded + allPosts.forEach(post => { + expect(Array.isArray(post.tags)).toBe(true); + expect(post.tags.length).toBeGreaterThan(0); + expect(Array.isArray(post.notes)).toBe(true); + expect(post.notes.length).toBeGreaterThan(0); + expect(Array.isArray(post.collaboratorEmails)).toBe(true); + expect(post.collaboratorEmails.length).toBeGreaterThan(0); + }); + + // Verify specific content to ensure arrays aren't just empty arrays + const jsPost = allPosts.find(p => p.title === "JavaScript Tutorial"); + const tsPost = allPosts.find(p => p.title === "TypeScript Advanced"); + + expect(jsPost!.tags).toContain("javascript"); + expect(tsPost!.tags).toContain("typescript"); + }); + + it("should handle complex queries with automatic array loading", async () => { + // Test that arrays are automatically loaded even for more complex query scenarios + // First, let's create a third blog post with overlapping content + const freshPost3 = new BlogPost(); + freshPost3.title = "JavaScript Advanced"; + freshPost3.content = "

Advanced JavaScript

This is an advanced JS tutorial.

"; + freshPost3.tags = ["javascript", "advanced", "closures"]; + freshPost3.notes = [ + "

JS Advanced Note

Closures and scope

" + ]; + freshPost3.collaboratorEmails = [ + "advanced@example.com" + ]; + + const savedPost3 = await dataSource.save(freshPost3); + + // Now test that all posts are found and arrays are loaded + const allPosts = await dataSource.find(BlogPost); + expect(allPosts).toHaveLength(3); + + // Verify each post has its arrays properly loaded + for (const post of allPosts) { + expect(Array.isArray(post.tags)).toBe(true); + expect(Array.isArray(post.notes)).toBe(true); + expect(Array.isArray(post.collaboratorEmails)).toBe(true); + + // Verify arrays are not empty (all our test posts have content) + expect(post.tags.length).toBeGreaterThan(0); + expect(post.notes.length).toBeGreaterThan(0); + expect(post.collaboratorEmails.length).toBeGreaterThan(0); + } + + // Test querying by a field that doesn't exist - should return empty with proper arrays structure + const nonExistentPosts = await dataSource.find(BlogPost, { title: "Non-existent Title" }); + expect(nonExistentPosts).toHaveLength(0); + expect(Array.isArray(nonExistentPosts)).toBe(true); + + // Clean up the third post + await dataSource.deleteById(BlogPost, savedPost3.id); }); }); From 0fe3e7876268414f383b03ebb166a76455395a76 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 4 Sep 2025 12:17:04 -0300 Subject: [PATCH 119/254] Enhance ArrayFieldManager to improve array field handling and caching --- src/datasources/typeorm/ArrayFieldManager.ts | 191 +++++++++---------- 1 file changed, 92 insertions(+), 99 deletions(-) diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index 3578897..1809763 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -18,6 +18,7 @@ export interface ArrayFieldMetadata { */ export class ArrayFieldManager { private arrayElementEntities: Map = new Map(); + private arrayFieldNamesCache: WeakMap = new WeakMap(); /** * Gets all registered array element entities. @@ -44,10 +45,10 @@ export class ArrayFieldManager { ): void { const parentEntityName = target.constructor.name; const baseFieldType = fieldType.replace('array:', ''); - + // Create a unique key for this array field const arrayEntityKey = ArrayEntityFactory.generateEntityKey(parentEntityName, propertyKey); - + // Check if we've already created an entity for this array field if (!this.arrayElementEntities.has(arrayEntityKey)) { const arrayElementEntity = ArrayEntityFactory.createArrayElementEntity( @@ -58,16 +59,19 @@ export class ArrayFieldManager { ); this.arrayElementEntities.set(arrayEntityKey, arrayElementEntity); } - + // Store metadata about this array field const metadata: ArrayFieldMetadata = { elementEntityKey: arrayEntityKey, baseFieldType: baseFieldType, options: fieldOptions }; - + Reflect.defineMetadata('typeorm:array-field', metadata, target, propertyKey); Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + + // Invalidate cached array field names for this class so future calls recompute once + this.arrayFieldNamesCache.delete(target.constructor); } /** @@ -78,20 +82,18 @@ export class ArrayFieldManager { */ extractArrayValues(entity: T): Record { const arrayValues: Record = {}; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayValue = (entity as any)[fieldName]; - if (Array.isArray(arrayValue)) { - arrayValues[fieldName] = arrayValue; - } + const entityClass = entity.constructor as Function; + const arrayFieldNames = this.getArrayFieldNames(entityClass); + + for (const fieldName of arrayFieldNames) { + const value = (entity as any)[fieldName]; + if (Array.isArray(value)) { + arrayValues[fieldName] = value; + } else if (value == null) { + // Normalize missing arrays to empty arrays to simplify downstream logic + arrayValues[fieldName] = []; } } - return arrayValues; } @@ -102,20 +104,13 @@ export class ArrayFieldManager { * @returns Entity copy without array fields */ extractMainEntityFields(entity: T): T { - const entityCopy = { ...entity }; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - // Remove array fields from the main entity - delete (entityCopy as any)[fieldName]; - } + // Keep it simple: shallow clone and strip only array fields; leave everything else intact + const entityCopy: any = { ...(entity as any) }; + const entityClass = entity.constructor as Function; + for (const fieldName of this.getArrayFieldNames(entityClass)) { + delete entityCopy[fieldName]; } - - return entityCopy; + return entityCopy as T; } /** @@ -125,26 +120,10 @@ export class ArrayFieldManager { * @param typeormDataSource - TypeORM data source for database operations */ async handleArrayFieldsForUpdate( - entity: T, - typeormDataSource: TypeORMDataSource + _entity: T, + _typeormDataSource: TypeORMDataSource ): Promise { - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = typeormDataSource.getRepository(ArrayElementEntity as any); - // Delete existing array elements for this entity - await repository.delete({ parentId: (entity as any).id }); - } - } - } + // No-op: we now handle delete-and-replace in saveArrayFields to rely on TypeORM per-field operations. } /** @@ -156,25 +135,20 @@ export class ArrayFieldManager { * @param typeormDataSource - TypeORM data source for database operations */ async saveArrayFields( - originalEntity: T, - arrayValues: Record, + originalEntity: T, + arrayValues: Record, savedEntity: T, typeormDataSource: TypeORMDataSource ): Promise { - const entityClass = originalEntity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayValue = arrayValues[fieldName]; - - if (Array.isArray(arrayValue) && arrayValue.length > 0) { - await this.saveArrayField(fieldName, arrayValue, savedEntity, typeormDataSource, entityClass); - } - } - } + const entityClass = originalEntity.constructor as Function; + const fieldNames = this.getArrayFieldNames(entityClass); + + await Promise.all( + fieldNames.map(async (fieldName) => { + const values = arrayValues[fieldName] ?? []; + await this.persistArrayField(fieldName, values, savedEntity, typeormDataSource, entityClass); + }) + ); } /** @@ -186,31 +160,35 @@ export class ArrayFieldManager { * @param typeormDataSource - TypeORM data source for database operations * @param entityClass - The entity class */ - private async saveArrayField( + private async persistArrayField( fieldName: string, arrayValue: any[], savedEntity: T, typeormDataSource: TypeORMDataSource, entityClass: Function ): Promise { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata( + 'typeorm:array-field', + entityClass.prototype, + fieldName + ); const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = typeormDataSource.getRepository(ArrayElementEntity as any); - - // Create array element entities using the saved entity's ID - const elementEntities = arrayValue.map((value, index) => { - const elementEntity = new (ArrayElementEntity as any)(); - elementEntity.parentId = (savedEntity as any).id; - elementEntity.value = value; - elementEntity.index = index; - return elementEntity; - }); - - // Save all array elements - await repository.save(elementEntities); + + if (!ArrayElementEntity) return; + + const repository = typeormDataSource.getRepository(ArrayElementEntity as any); + + // Always remove previous elements for this field, then insert the new snapshot + await repository.delete({ parentId: (savedEntity as any).id }); + + if (!Array.isArray(arrayValue) || arrayValue.length === 0) { + return; // nothing to insert } + + const rows = arrayValue.map((value, index) => + repository.create({ parentId: (savedEntity as any).id, value, index }) + ); + await repository.insert(rows as any); } /** @@ -221,20 +199,19 @@ export class ArrayFieldManager { * @returns The entity with array fields populated */ async loadArrayFields(entity: T, typeormDataSource: TypeORMDataSource): Promise { - const entityCopy = { ...entity }; - const entityClass = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', entityClass) || []; - - for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - - if (fieldType && fieldType.startsWith('array:')) { - const arrayValues = await this.loadArrayField(entity, fieldName, typeormDataSource, entityClass); - (entityCopy as any)[fieldName] = arrayValues; - } - } - - return entityCopy; + const entityCopy: any = { ...(entity as any) }; + const entityClass = entity.constructor as Function; + const fieldNames = this.getArrayFieldNames(entityClass); + + const results = await Promise.all( + fieldNames.map((fieldName) => this.loadArrayField(entity, fieldName, typeormDataSource, entityClass)) + ); + + fieldNames.forEach((fieldName, idx) => { + entityCopy[fieldName] = results[idx]; + }); + + return entityCopy as T; } /** @@ -254,20 +231,36 @@ export class ArrayFieldManager { ): Promise { const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - + if (ArrayElementEntity) { const repository = typeormDataSource.getRepository(ArrayElementEntity as any); - + // Load array elements for this entity, ordered by index const elements = await repository.find({ where: { parentId: (entity as any).id }, order: { index: 'ASC' } }); - + // Extract values into an array return elements.map(element => element.value); } - + return []; } + + /** + * Gets the array field names for a given entity class, cached for reuse. + */ + private getArrayFieldNames(entityClass: Function): string[] { + const cached = this.arrayFieldNamesCache.get(entityClass); + if (cached) return cached; + + const fieldNames: string[] = Reflect.getMetadata('model:fields', entityClass) || []; + const arrayFields = fieldNames.filter((fieldName) => { + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + return typeof fieldType === 'string' && fieldType.startsWith('array:'); + }); + this.arrayFieldNamesCache.set(entityClass, arrayFields); + return arrayFields; + } } From 787cb546d022ee331c461cabbe93af6fdda922b8 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 4 Sep 2025 12:45:02 -0300 Subject: [PATCH 120/254] Enhance ArrayEntityFactory and ArrayFieldManager to support parent-child relationships in array elements --- src/datasources/typeorm/ArrayEntityFactory.ts | 39 +++++++++++++------ src/datasources/typeorm/ArrayFieldManager.ts | 4 +- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts index 1d0ab9f..2e9f94c 100644 --- a/src/datasources/typeorm/ArrayEntityFactory.ts +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -1,4 +1,4 @@ -import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'; +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Index } from 'typeorm'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; /** @@ -8,7 +8,7 @@ import { TypeORMTypeMapper } from './TypeORMTypeMapper'; * and provides a clean interface for entity creation and management. */ export class ArrayEntityFactory { - + /** * Creates a new entity class for array elements. * @@ -20,27 +20,30 @@ export class ArrayEntityFactory { */ static createArrayElementEntity( parentEntityName: string, + parentEntityClass: Function, fieldName: string, baseFieldType: string, fieldOptions?: any ): Function { const tableName = ArrayEntityFactory.generateTableName(parentEntityName, fieldName); const entityName = ArrayEntityFactory.generateEntityName(parentEntityName, fieldName); - + // Dynamically create the array element entity class const ArrayElementEntity = class { id!: string; parentId!: string; + // relation to parent for FK and cascade + parent!: any; value!: string; index!: number; }; - + // Set the class name for better debugging Object.defineProperty(ArrayElementEntity, 'name', { value: entityName }); - + // Apply TypeORM decorators - ArrayEntityFactory.applyEntityDecorators(ArrayElementEntity, tableName, baseFieldType, fieldOptions); - + ArrayEntityFactory.applyEntityDecorators(ArrayElementEntity, tableName, parentEntityClass, baseFieldType, fieldOptions); + return ArrayElementEntity; } @@ -88,22 +91,36 @@ export class ArrayEntityFactory { private static applyEntityDecorators( entityClass: Function, tableName: string, + parentEntityClass: Function, baseFieldType: string, fieldOptions?: any ): void { // Apply entity decorator Entity(tableName)(entityClass); - + // Configure the id field PrimaryGeneratedColumn('uuid')(entityClass.prototype, 'id'); - + // Configure the parentId field (foreign key) Column({ type: 'uuid', name: 'parent_id' })(entityClass.prototype, 'parentId'); - + // Add an index for faster lookups by parent + Index()(entityClass.prototype, 'parentId'); + // Ensure order uniqueness per parent and index (composite) + Index(`IDX_${tableName}_parent_index_unique`, ['parentId', 'index'], { unique: true })(entityClass); + + // Relation to parent with ON DELETE CASCADE + ManyToOne(() => parentEntityClass as any, { + onDelete: 'CASCADE', + onUpdate: 'NO ACTION', + eager: false, + nullable: false + })(entityClass.prototype, 'parent'); + JoinColumn({ name: 'parent_id' })(entityClass.prototype, 'parent'); + // Configure the value field based on the base field type const valueColumnConfig = TypeORMTypeMapper.getArrayElementColumnConfig(baseFieldType, fieldOptions); Column(valueColumnConfig)(entityClass.prototype, 'value'); - + // Configure the index field to preserve array order Column({ type: 'int', name: 'array_index' })(entityClass.prototype, 'index'); } diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index 1809763..a437e0c 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -43,7 +43,8 @@ export class ArrayFieldManager { fieldType: string, fieldOptions?: any ): void { - const parentEntityName = target.constructor.name; + const parentEntityName = target.constructor.name; + const parentEntityClass = target.constructor as Function; const baseFieldType = fieldType.replace('array:', ''); // Create a unique key for this array field @@ -53,6 +54,7 @@ export class ArrayFieldManager { if (!this.arrayElementEntities.has(arrayEntityKey)) { const arrayElementEntity = ArrayEntityFactory.createArrayElementEntity( parentEntityName, + parentEntityClass, propertyKey, baseFieldType, fieldOptions From 7001e7b2ff181e9581a19d34f0d4905962764739 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 5 Sep 2025 10:00:26 -0300 Subject: [PATCH 121/254] Enhance ArrayFieldManager and TypeORMSqlDataSource to support OneToMany relationships and automatic array field transformations --- src/datasources/typeorm/ArrayEntityFactory.ts | 2 +- src/datasources/typeorm/ArrayFieldManager.ts | 151 +++++++++--------- .../typeorm/TypeORMSqlDataSource.ts | 19 +-- 3 files changed, 82 insertions(+), 90 deletions(-) diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts index 2e9f94c..ccc483d 100644 --- a/src/datasources/typeorm/ArrayEntityFactory.ts +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -112,7 +112,7 @@ export class ArrayEntityFactory { ManyToOne(() => parentEntityClass as any, { onDelete: 'CASCADE', onUpdate: 'NO ACTION', - eager: false, + cascade: true, nullable: false })(entityClass.prototype, 'parent'); JoinColumn({ name: 'parent_id' })(entityClass.prototype, 'parent'); diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index a437e0c..08c0023 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -1,4 +1,5 @@ import { DataSource as TypeORMDataSource } from 'typeorm'; +import { OneToMany, AfterLoad } from 'typeorm'; import { ArrayEntityFactory } from './ArrayEntityFactory'; /** @@ -8,6 +9,7 @@ export interface ArrayFieldMetadata { elementEntityKey: string; baseFieldType: string; options?: any; + relationPropertyName?: string; } /** @@ -31,6 +33,7 @@ export class ArrayFieldManager { /** * Configures an array field by creating a separate entity and storing metadata. + * Also adds a OneToMany relationship to the parent entity for eager loading. * * @param target - The prototype of the class containing the field * @param propertyKey - The name of the property/field @@ -43,8 +46,8 @@ export class ArrayFieldManager { fieldType: string, fieldOptions?: any ): void { - const parentEntityName = target.constructor.name; - const parentEntityClass = target.constructor as Function; + const parentEntityName = target.constructor.name; + const parentEntityClass = target.constructor as Function; const baseFieldType = fieldType.replace('array:', ''); // Create a unique key for this array field @@ -62,11 +65,68 @@ export class ArrayFieldManager { this.arrayElementEntities.set(arrayEntityKey, arrayElementEntity); } + // Get the array element entity for the OneToMany relationship + const ArrayElementEntity = this.arrayElementEntities.get(arrayEntityKey); + + // Add OneToMany relationship to parent entity for eager loading + // Use a different property name to avoid conflicts with the original array field + const relationPropertyName = `_${propertyKey}_elements`; + + OneToMany(() => ArrayElementEntity as any, (element: any) => element.parent, { + eager: true, + cascade: ['insert', 'update'] // Only cascade insert/update, not remove (ManyToOne handles remove) + })(target, relationPropertyName); + + // Add @AfterLoad hook to automatically transform array element entities to arrays + const afterLoadMethodName = `_afterLoad_${propertyKey}`; + + // Create the afterLoad method if it doesn't exist + if (!target[afterLoadMethodName]) { + target[afterLoadMethodName] = function() { + this._transformArrayFields(); + }; + + // Apply @AfterLoad decorator to the method + AfterLoad()(target, afterLoadMethodName); + } + + // Add or update the main transformation method + if (!target._transformArrayFields) { + target._transformArrayFields = function() { + const entityClass = this.constructor as Function; + const arrayFieldNames = Reflect.getMetadata('array:field:names', entityClass) || []; + + for (const fieldName of arrayFieldNames) { + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + if (arrayMetadata?.relationPropertyName) { + const relationPropertyName = arrayMetadata.relationPropertyName; + const arrayElements = this[relationPropertyName]; + + if (Array.isArray(arrayElements)) { + // Sort by index and extract values + this[fieldName] = arrayElements + .sort((a, b) => a.index - b.index) + .map(element => element.value); + } else { + this[fieldName] = []; + } + } + } + }; + } + + // Keep track of array field names for this entity class + const existingArrayFields = Reflect.getMetadata('array:field:names', target.constructor) || []; + if (!existingArrayFields.includes(propertyKey)) { + Reflect.defineMetadata('array:field:names', [...existingArrayFields, propertyKey], target.constructor); + } + // Store metadata about this array field const metadata: ArrayFieldMetadata = { elementEntityKey: arrayEntityKey, baseFieldType: baseFieldType, - options: fieldOptions + options: fieldOptions, + relationPropertyName: relationPropertyName }; Reflect.defineMetadata('typeorm:array-field', metadata, target, propertyKey); @@ -100,34 +160,30 @@ export class ArrayFieldManager { } /** - * Extracts main entity fields (excluding arrays) for saving. + * Extracts main entity fields (excluding arrays and their relationships) for saving. * * @param entity - The entity to extract main fields from - * @returns Entity copy without array fields + * @returns Entity copy without array fields and relationship properties */ extractMainEntityFields(entity: T): T { - // Keep it simple: shallow clone and strip only array fields; leave everything else intact + // Keep it simple: shallow clone and strip only array fields and relationship properties const entityCopy: any = { ...(entity as any) }; const entityClass = entity.constructor as Function; + for (const fieldName of this.getArrayFieldNames(entityClass)) { + // Remove the array field delete entityCopy[fieldName]; + + // Remove the relationship property used for eager loading + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + if (arrayMetadata?.relationPropertyName) { + delete entityCopy[arrayMetadata.relationPropertyName]; + } } + return entityCopy as T; } - /** - * Handles array field updates by removing old array elements. - * - * @param entity - The entity being updated - * @param typeormDataSource - TypeORM data source for database operations - */ - async handleArrayFieldsForUpdate( - _entity: T, - _typeormDataSource: TypeORMDataSource - ): Promise { - // No-op: we now handle delete-and-replace in saveArrayFields to rely on TypeORM per-field operations. - } - /** * Saves array fields as separate entities. * @@ -193,63 +249,6 @@ export class ArrayFieldManager { await repository.insert(rows as any); } - /** - * Loads array fields for an entity by querying array element entities. - * - * @param entity - The entity to load array fields for - * @param typeormDataSource - TypeORM data source for database operations - * @returns The entity with array fields populated - */ - async loadArrayFields(entity: T, typeormDataSource: TypeORMDataSource): Promise { - const entityCopy: any = { ...(entity as any) }; - const entityClass = entity.constructor as Function; - const fieldNames = this.getArrayFieldNames(entityClass); - - const results = await Promise.all( - fieldNames.map((fieldName) => this.loadArrayField(entity, fieldName, typeormDataSource, entityClass)) - ); - - fieldNames.forEach((fieldName, idx) => { - entityCopy[fieldName] = results[idx]; - }); - - return entityCopy as T; - } - - /** - * Loads a single array field for an entity. - * - * @param entity - The entity to load array field for - * @param fieldName - Name of the array field - * @param typeormDataSource - TypeORM data source for database operations - * @param entityClass - The entity class - * @returns Array of values for the field - */ - private async loadArrayField( - entity: T, - fieldName: string, - typeormDataSource: TypeORMDataSource, - entityClass: Function - ): Promise { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); - - if (ArrayElementEntity) { - const repository = typeormDataSource.getRepository(ArrayElementEntity as any); - - // Load array elements for this entity, ordered by index - const elements = await repository.find({ - where: { parentId: (entity as any).id }, - order: { index: 'ASC' } - }); - - // Extract values into an array - return elements.map(element => element.value); - } - - return []; - } - /** * Gets the array field names for a given entity class, cached for reuse. */ diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 90b495a..10fd0d1 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -254,11 +254,6 @@ export class TypeORMSqlDataSource extends DataSource { // If entity has an id, we need to handle updates differently const isUpdate = !!(entity as any).id; - if (isUpdate) { - // For updates, first handle array field deletion using the array field manager - await this.arrayFieldManager.handleArrayFieldsForUpdate(entity, this.typeormDataSource); - } - // Preserve array values before extracting main entity fields const arrayValues = this.arrayFieldManager.extractArrayValues(entity); @@ -276,7 +271,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Find entities by criteria. - * Handles array field conversion after loading using the array field manager. + * Array fields are automatically transformed via @AfterLoad hooks. * * @param entityClass - The entity class to search for * @param criteria - Search criteria (optional) @@ -296,15 +291,13 @@ export class TypeORMSqlDataSource extends DataSource { entities = await repository.find() as T[]; } - // Load array data for each entity using the array field manager - return await Promise.all(entities.map(entity => - this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource!) - )); + // Array fields are automatically transformed via @AfterLoad hooks + return entities; } /** * Find a single entity by id. - * Handles array field conversion after loading using the array field manager. + * Array fields are automatically transformed via @AfterLoad hooks. * * @param entityClass - The entity class to search for * @param id - The id of the entity to find @@ -322,8 +315,8 @@ export class TypeORMSqlDataSource extends DataSource { return null; } - // Load array data for the entity using the array field manager - return await this.arrayFieldManager.loadArrayFields(entity, this.typeormDataSource); + // Array fields are automatically transformed via @AfterLoad hooks + return entity; } /** From c0391b63f2a60776457476a431ed5175c7d1594c Mon Sep 17 00:00:00 2001 From: Francisco Devaux Date: Fri, 5 Sep 2025 11:44:04 -0300 Subject: [PATCH 122/254] Added Pull Request template --- .github/pull_request_template.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..4bf7afb --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,32 @@ +### Pull Request Title Format +> **Format:** `[TYPE][ISSUE #issue] Description` +> - **TYPE:** FEAT/FIX/DOCS/REFACTOR +> - **issue:** Issue number (e.g., #123) +> - **Description:** Brief, clear title of the change +> +> Example: `[FEAT][ISSUE #45] Add PostgreSQL support` + + + +# Title of the Change + +**Closes:** +- #issue_number + +**Depends on:** _(Remove if not applicable)_ +- #dependency_issue_number + +## Dependencies _(Remove if not applicable)_ + +This implementation relies on the following core dependencies: +- **dependency-name** (^version) - Brief explanation of why it's needed +- **another-dependency** (^version) - Brief explanation of why it's needed + +## What? + +Brief description of what this PR implements or fixes. + +## How? + +Detailed technical explanation of the implementation approach, including key architectural decisions and any important implementation details that reviewers should be aware of. + From ba54187ad13b2f98a4e31500ac7634d54eb6b06f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 5 Sep 2025 11:47:06 -0300 Subject: [PATCH 123/254] Add DateTimeRange support and enhance financial number handling in TypeORM data source --- .github/pull_request_template.md | 32 ++ .../typeorm/DateTimeRangeFieldManager.ts | 150 ++++++ .../typeorm/TypeORMSqlDataSource.ts | 18 +- src/datasources/typeorm/ValueTransformers.ts | 79 +++ src/datasources/typeorm/index.ts | 2 + src/model/types/date_time/DateTimeRange.ts | 33 +- src/model/types/number/Decimal.ts | 9 +- src/model/types/number/Money.ts | 9 +- .../ComplexTypesPersistence.test.ts | 449 ++++++++++++++++++ 9 files changed, 775 insertions(+), 6 deletions(-) create mode 100644 .github/pull_request_template.md create mode 100644 src/datasources/typeorm/DateTimeRangeFieldManager.ts create mode 100644 src/datasources/typeorm/ValueTransformers.ts create mode 100644 test/types_tests/ComplexTypesPersistence.test.ts diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..4bf7afb --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,32 @@ +### Pull Request Title Format +> **Format:** `[TYPE][ISSUE #issue] Description` +> - **TYPE:** FEAT/FIX/DOCS/REFACTOR +> - **issue:** Issue number (e.g., #123) +> - **Description:** Brief, clear title of the change +> +> Example: `[FEAT][ISSUE #45] Add PostgreSQL support` + + + +# Title of the Change + +**Closes:** +- #issue_number + +**Depends on:** _(Remove if not applicable)_ +- #dependency_issue_number + +## Dependencies _(Remove if not applicable)_ + +This implementation relies on the following core dependencies: +- **dependency-name** (^version) - Brief explanation of why it's needed +- **another-dependency** (^version) - Brief explanation of why it's needed + +## What? + +Brief description of what this PR implements or fixes. + +## How? + +Detailed technical explanation of the implementation approach, including key architectural decisions and any important implementation details that reviewers should be aware of. + diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/src/datasources/typeorm/DateTimeRangeFieldManager.ts new file mode 100644 index 0000000..7778a62 --- /dev/null +++ b/src/datasources/typeorm/DateTimeRangeFieldManager.ts @@ -0,0 +1,150 @@ +import 'reflect-metadata'; +import { Column, AfterLoad } from 'typeorm'; +import { DateTimeRangeType } from '../../model/types/date_time/DateTimeRange'; + +/** + * Manages DateTimeRange field persistence using hidden columns approach. + * + * Since DateTimeRange is a complex object with 'from' and 'to' Date fields, + * we can't use a simple ValueTransformer. Instead, we create hidden columns + * for each Date component and use entity lifecycle hooks to sync them. + */ +export class DateTimeRangeFieldManager { + + /** + * Configures hidden columns for a DateTimeRange field. + * Creates two hidden columns: one for 'from' date and one for 'to' date. + * Also sets up AfterLoad hook to reconstruct DateTimeRange objects. + * + * @param target - The entity prototype + * @param propertyKey - The DateTimeRange field name + * @param fieldOptions - DateTimeRange options + */ + configureFieldColumns(target: any, propertyKey: string, fieldOptions?: any): void { + const fromColumnName = `${propertyKey}_from`; + const toColumnName = `${propertyKey}_to`; + + // Create hidden 'from' date column + Column({ + type: 'datetime', + nullable: true, + name: fromColumnName + })(target, fromColumnName); + + // Create hidden 'to' date column + Column({ + type: 'datetime', + nullable: true, + name: toColumnName + })(target, toColumnName); + + // Store metadata about which hidden columns belong to this DateTimeRange field + Reflect.defineMetadata('dateTimeRange:hiddenColumns', { + from: fromColumnName, + to: toColumnName + }, target, propertyKey); + + // Mark this field as using hidden columns approach + Reflect.defineMetadata('dateTimeRange:usesHiddenColumns', true, target, propertyKey); + + // Store this field name in the list of DateTimeRange fields for this entity + const existingFields = Reflect.getMetadata('dateTimeRange:fields', target) || []; + if (!existingFields.includes(propertyKey)) { + existingFields.push(propertyKey); + Reflect.defineMetadata('dateTimeRange:fields', existingFields, target); + } + + // Add single @AfterLoad hook to automatically reconstruct all DateTimeRange objects + if (!target['_afterLoadDateTimeRanges']) { + target['_afterLoadDateTimeRanges'] = function() { + // Create a single instance of the manager to handle reconstruction + const manager = new DateTimeRangeFieldManager(); + manager.reconstructDateTimeRangeValues(this); + }; + + // Apply @AfterLoad decorator to the method + AfterLoad()(target, '_afterLoadDateTimeRanges'); + } + } + + /** + * Extracts DateTimeRange values and populates hidden columns before save. + * This method should be called in a BeforeInsert/BeforeUpdate subscriber. + * + * @param entity - The entity being saved + */ + extractDateTimeRangeValues(entity: any): void { + const constructor = entity.constructor; + const fields = Reflect.getMetadata('model:fields', constructor) || []; + + for (const fieldName of fields) { + const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); + + if (fieldType === 'datetimerange') { + const hiddenColumns = Reflect.getMetadata('dateTimeRange:hiddenColumns', constructor.prototype, fieldName); + + if (hiddenColumns) { + const dateTimeRange = entity[fieldName] as DateTimeRangeType | undefined; + + if (dateTimeRange) { + // Extract from and to dates to hidden columns + entity[hiddenColumns.from] = dateTimeRange.from || null; + entity[hiddenColumns.to] = dateTimeRange.to || null; + } else { + // Clear hidden columns if DateTimeRange is null/undefined + entity[hiddenColumns.from] = null; + entity[hiddenColumns.to] = null; + } + } + } + } + } + + /** + * Reconstructs DateTimeRange objects from hidden columns after load. + * This method should be called in an AfterLoad subscriber. + * + * @param entity - The entity being loaded + */ + reconstructDateTimeRangeValues(entity: any): void { + const constructor = entity.constructor; + const dateTimeRangeFields = Reflect.getMetadata('dateTimeRange:fields', constructor.prototype) || []; + + for (const fieldName of dateTimeRangeFields) { + const hiddenColumns = Reflect.getMetadata('dateTimeRange:hiddenColumns', constructor.prototype, fieldName); + + if (hiddenColumns) { + const fromDate = entity[hiddenColumns.from]; + const toDate = entity[hiddenColumns.to]; + + // Only create DateTimeRange if at least one date is present and not null + if ((fromDate !== null && fromDate !== undefined) || (toDate !== null && toDate !== undefined)) { + const dateTimeRange = new DateTimeRangeType(); + // Convert null to undefined for consistency + dateTimeRange.from = fromDate === null ? undefined : fromDate; + dateTimeRange.to = toDate === null ? undefined : toDate; + entity[fieldName] = dateTimeRange; + } else { + entity[fieldName] = undefined; + } + + // Clean up hidden column values from the entity object + // so they don't appear in JSON serialization + delete entity[hiddenColumns.from]; + delete entity[hiddenColumns.to]; + } + } + } + + /** + * Gets the names of hidden columns for a DateTimeRange field. + * Useful for building custom queries that need to filter by date ranges. + * + * @param target - The entity class or prototype + * @param propertyKey - The DateTimeRange field name + * @returns Object with 'from' and 'to' column names, or null if not found + */ + getHiddenColumnNames(target: any, propertyKey: string): { from: string; to: string } | null { + return Reflect.getMetadata('dateTimeRange:hiddenColumns', target.prototype || target, propertyKey) || null; + } +} diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 0a013e4..b2fbd8f 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -17,6 +17,7 @@ import { DataSource, DataSourceOptions } from '../DataSource'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; import { ArrayFieldManager } from './ArrayFieldManager'; +import { DateTimeRangeFieldManager } from './DateTimeRangeFieldManager'; // Import to ensure field type registrations happen import '../../model/types/TypeRegistry'; @@ -94,6 +95,7 @@ export class TypeORMSqlDataSource extends DataSource { private typeormDataSource: TypeORMDataSource | null = null; private registeredModels: Set = new Set(); private arrayFieldManager: ArrayFieldManager = new ArrayFieldManager(); + private dateTimeRangeFieldManager: DateTimeRangeFieldManager = new DateTimeRangeFieldManager(); constructor(options: TypeORMSqlDataSourceOptions) { super(options); @@ -222,6 +224,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Configures a field with appropriate TypeORM column decorators. * For array fields, delegates to the array field manager. + * For DateTimeRange fields, delegates to the DateTimeRange field manager. * * @param target - The prototype of the class containing the field * @param propertyKey - The name of the property/field @@ -245,6 +248,14 @@ export class TypeORMSqlDataSource extends DataSource { return; } + // Check if this is a DateTimeRange field + if (fieldType === 'datetimerange') { + this.dateTimeRangeFieldManager.configureFieldColumns(target, propertyKey, fieldOptions); + // Store that this field is configured for TypeORM + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + return; + } + // Map framework field types to TypeORM column types using the type mapper const typeMapping = TypeORMTypeMapper.getColumnType(fieldType, fieldOptions); @@ -260,7 +271,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Save an entity to the database. - * Handles array field conversion before saving using the array field manager. + * Handles array field conversion and DateTimeRange field conversion before saving. * * @param entity - The entity instance to save * @returns Promise resolving to the saved entity with generated id @@ -278,6 +289,9 @@ export class TypeORMSqlDataSource extends DataSource { // Preserve array values before extracting main entity fields const arrayValues = this.arrayFieldManager.extractArrayValues(entity); + // Handle DateTimeRange fields - extract to hidden columns + this.dateTimeRangeFieldManager.extractDateTimeRangeValues(entity); + // Save the main entity first (without arrays converted) const mainEntityToSave = this.arrayFieldManager.extractMainEntityFields(entity); const savedMainEntity = await repository.save(mainEntityToSave as any) as T; @@ -720,7 +734,7 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - const entity = await repository.findOneById(id as any) as T | null; + const entity = await repository.findOneBy({ id: id as any } as any) as T | null; if (!entity) { return null; diff --git a/src/datasources/typeorm/ValueTransformers.ts b/src/datasources/typeorm/ValueTransformers.ts new file mode 100644 index 0000000..8cc0756 --- /dev/null +++ b/src/datasources/typeorm/ValueTransformers.ts @@ -0,0 +1,79 @@ +import { ValueTransformer } from 'typeorm'; +import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; + +/** + * TypeORM ValueTransformer for Decimal/Money types. + * Converts between FinancialNumber objects and database decimal strings. + */ +export class FinancialNumberTransformer implements ValueTransformer { + private decimals: number; + private roundingStrategy: RoundingStrategy; + + constructor(decimals: number = 2, roundingType: 'truncate' | 'roundHalfToEven' = 'truncate') { + this.decimals = decimals; + this.roundingStrategy = roundingType === 'truncate' ? number.trim : number.round; + } + + /** + * Transforms FinancialNumber to database value (string). + * @param value - FinancialNumber instance + * @returns String representation for database storage + */ + to(value: FinancialNumber | null | undefined): string | null { + if (value === null || value === undefined) { + return null; + } + + if (typeof value === 'object' && value !== null && 'toString' in value) { + return value.toString(this.decimals, this.roundingStrategy); + } + + // Fallback for edge cases - create a new FinancialNumber and format it + try { + const fn = number(String(value)); + return fn.toString(this.decimals, this.roundingStrategy); + } catch (error) { + return String(value); + } + } + + /** + * Transforms database value (string/number) to FinancialNumber. + * @param value - Database value (typically a string or number) + * @returns FinancialNumber instance or undefined + */ + from(value: string | number | null | undefined): FinancialNumber | undefined { + if (value === null || value === undefined) { + return undefined; + } + + try { + const fn = number(String(value)); + // Apply the configured precision and rounding + const formatted = fn.toString(this.decimals, this.roundingStrategy); + return number(formatted); + } catch (error) { + console.warn(`Failed to parse FinancialNumber from database value: ${value}`, error); + return undefined; + } + } +} + +/** + * Creates a FinancialNumber transformer with specific configuration. + * @param decimals - Number of decimal places + * @param roundingType - Rounding strategy + * @returns Configured transformer instance + */ +export function createFinancialNumberTransformer( + decimals: number = 2, + roundingType: 'truncate' | 'roundHalfToEven' = 'truncate' +): FinancialNumberTransformer { + return new FinancialNumberTransformer(decimals, roundingType); +} + +/** + * Default singleton instance of the FinancialNumber transformer. + * Uses 2 decimal places and truncate rounding. + */ +export const financialNumberTransformer = new FinancialNumberTransformer(); diff --git a/src/datasources/typeorm/index.ts b/src/datasources/typeorm/index.ts index 0366371..7684534 100644 --- a/src/datasources/typeorm/index.ts +++ b/src/datasources/typeorm/index.ts @@ -3,6 +3,8 @@ export { TypeORMTypeMapper } from './TypeORMTypeMapper'; export { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; export { ArrayEntityFactory } from './ArrayEntityFactory'; export { ArrayFieldManager } from './ArrayFieldManager'; +export { DateTimeRangeFieldManager } from './DateTimeRangeFieldManager'; +export { financialNumberTransformer } from './ValueTransformers'; // Export main data source class and types export { TypeORMSqlDataSource } from './TypeORMSqlDataSource'; diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index dc48d3c..bd5ba55 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -8,6 +8,7 @@ import { } from 'class-validator'; import { Type, Transform, TransformationType, Expose } from 'class-transformer'; import { dateToISO8601, dateFromJSON } from '../utils'; +import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; /** * Options for the DateTimeRange decorator. @@ -63,8 +64,10 @@ type DateTimeRangeKey = T[K] extends DateTimeRang */ function validateDateTimeRangeType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); - if (designType !== DateTimeRangeType) { - throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' properties: ${propertyKey}`); + // Be more flexible with type checking since TypeScript may not preserve exact type info + // We accept DateTimeRangeType, Object, or undefined types + if (designType && designType !== DateTimeRangeType && designType !== Object) { + console.warn(`@DateTimeRange applied to property '${propertyKey}' of type '${designType?.name}'. Ensure the property type is DateTimeRangeType.`); } } @@ -177,3 +180,29 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { IsValidDateTimeRange(options)(target as any, propName); }; } + +/** + * Configuration object for DateTimeRange field TypeORM mapping. + * Uses hidden columns approach since DateTimeRange is a complex object with multiple fields. + */ +export const DateTimeRangeTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { + // DateTimeRange fields are handled specially via hidden columns + // This returns a configuration that indicates special handling is needed + return { + type: 'datetime-range', + nullable: nullable, + options: fieldOptions, + // This special flag tells TypeORM data source to handle this field differently + isComplexType: true + }; + }, + + getArrayElementColumnConfig(fieldOptions?: DateTimeRangeOptions): any { + // Array elements for DateTimeRange would need special handling too + return this.getTypeORMColumnConfig(fieldOptions, false); + } +}; + +// Register the datetime range type configuration +FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index f7b404b..a32e9ef 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -3,6 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { createFinancialNumberTransformer } from '../../../datasources/typeorm/ValueTransformers'; /** * Type alias for the `FinancialNumber` object. @@ -170,11 +171,17 @@ export function Decimal(options: DecimalOptions) { */ export const DecimalTypeConfig: FieldTypeConfig = { getTypeORMColumnConfig(fieldOptions?: DecimalOptions, nullable: boolean = true): any { + const transformer = createFinancialNumberTransformer( + fieldOptions?.decimals || 2, + fieldOptions?.roundingType || 'truncate' + ); + return { type: 'decimal', precision: 10, scale: fieldOptions?.decimals || 2, - nullable: nullable + nullable: nullable, + transformer: transformer }; }, diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index 8ed0628..353e11b 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -3,6 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { createFinancialNumberTransformer } from '../../../datasources/typeorm/ValueTransformers'; /** * Type alias for the `FinancialNumber` object, representing a monetary value. @@ -163,11 +164,17 @@ export function Money(options: MoneyOptions) { */ export const MoneyTypeConfig: FieldTypeConfig = { getTypeORMColumnConfig(fieldOptions?: MoneyOptions, nullable: boolean = true): any { + const transformer = createFinancialNumberTransformer( + fieldOptions?.decimals || 2, + fieldOptions?.roundingType || 'truncate' + ); + return { type: 'decimal', precision: 19, scale: fieldOptions?.decimals || 2, - nullable: nullable + nullable: nullable, + transformer: transformer }; }, diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts new file mode 100644 index 0000000..3f1bad7 --- /dev/null +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -0,0 +1,449 @@ +import { + TypeORMSqlDataSource, + PersistentModel, + Field, + Model, + Decimal, + Money, + DateTimeRange, + DateTimeRangeType, + Text, + type Decimal as DecimalType, + type Money as MoneyType +} from "../../index"; +import { validateSync } from 'class-validator'; +import number from 'financial-number'; + +// Test model for complex type persistence +@Model({ + docs: "Test model for complex types: Decimal, Money, and DateTimeRange", +}) +class ComplexTypesModel extends PersistentModel { + @Field({ + required: true, + }) + @Text() + name!: string; + + @Field({}) + @Decimal({ + decimals: 2, + roundingType: 'truncate', + min: '0.01', + max: '1000.00', + }) + priceDecimal?: DecimalType | undefined; + + @Field({}) + @Money({ + decimals: 2, + roundingType: 'roundHalfToEven', + positive: true, + min: '0.01', + max: '10000.00' + }) + priceMoney?: MoneyType | undefined; + + @Field({ + required: true, + }) + @DateTimeRange({ + openStart: false, + openEnd: false, + }) + activeRange!: DateTimeRangeType; + + @Field({}) + @DateTimeRange({ + openStart: true, + openEnd: true, + }) + flexibleRange?: DateTimeRangeType | undefined; +} + +describe("Complex Types Persistence in SQL Databases", () => { + let dataSource: TypeORMSqlDataSource; + let testEntity: ComplexTypesModel; + + beforeAll(async () => { + // Create a TypeORM data source with SQLite for testing + dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + filename: ":memory:", + managed: true, + synchronize: true, + logging: false + }); + + // Configure the ComplexTypesModel with the data source + const modelOptions = { dataSource }; + Reflect.defineMetadata("model:dataSource", dataSource, ComplexTypesModel); + dataSource.configureModel(ComplexTypesModel, modelOptions); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', ComplexTypesModel) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', ComplexTypesModel.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', ComplexTypesModel.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', ComplexTypesModel.prototype, fieldName); + + if (fieldType) { + dataSource.configureField( + ComplexTypesModel.prototype, + fieldName, + fieldType, + { + ...fieldTypeOptions, + required: fieldRequired + } + ); + } + }); + + // Initialize the data source + await dataSource.initialize(dataSource.getOptions()); + }); + + beforeEach(() => { + testEntity = new ComplexTypesModel(); + testEntity.name = "Complex Types Test"; + + // Set up Decimal value + testEntity.priceDecimal = number("123.45"); + + // Set up Money value + testEntity.priceMoney = number("999.99"); + + // Set up required DateTimeRange + const activeRange = new DateTimeRangeType(); + activeRange.from = new Date('2024-01-01T00:00:00Z'); + activeRange.to = new Date('2024-12-31T23:59:59Z'); + testEntity.activeRange = activeRange; + + // Set up optional DateTimeRange + const flexibleRange = new DateTimeRangeType(); + flexibleRange.from = new Date('2024-06-01T00:00:00Z'); + flexibleRange.to = new Date('2024-08-31T23:59:59Z'); + testEntity.flexibleRange = flexibleRange; + }); + + afterAll(async () => { + if (dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + describe("Decimal Type Persistence", () => { + it("should save and retrieve Decimal values correctly", async () => { + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.id).toBeDefined(); + expect(savedEntity.priceDecimal).toBeDefined(); + expect(savedEntity.priceDecimal!.toString()).toBe("123.45"); + + // Verify the value is a FinancialNumber object + expect(typeof savedEntity.priceDecimal!.plus).toBe('function'); + expect(savedEntity.priceDecimal!.plus("1.00").toString()).toBe("124.45"); + }); + + it("should handle null Decimal values", async () => { + testEntity.priceDecimal = undefined; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.priceDecimal).toBeUndefined(); + }); + + it("should persist Decimal precision correctly", async () => { + testEntity.priceDecimal = number("123.456"); // Will be truncated to 2 decimals + + const savedEntity = await dataSource.save(testEntity); + + // Should be truncated based on decorator config + expect(savedEntity.priceDecimal!.toString()).toBe("123.45"); + }); + + it("should retrieve Decimal from database with proper type", async () => { + const savedEntity = await dataSource.save(testEntity); + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + + expect(retrievedEntity).not.toBeNull(); + expect(retrievedEntity!.priceDecimal).toBeDefined(); + expect(typeof retrievedEntity!.priceDecimal!.toString).toBe('function'); + expect(typeof retrievedEntity!.priceDecimal!.plus).toBe('function'); + expect(retrievedEntity!.priceDecimal!.toString()).toBe("123.45"); + }); + }); + + describe("Money Type Persistence", () => { + it("should save and retrieve Money values correctly", async () => { + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.id).toBeDefined(); + expect(savedEntity.priceMoney).toBeDefined(); + expect(savedEntity.priceMoney!.toString()).toBe("999.99"); + + // Verify the value is a FinancialNumber object + expect(typeof savedEntity.priceMoney!.plus).toBe('function'); + expect(savedEntity.priceMoney!.plus("0.01").toString()).toBe("1000.00"); + }); + + it("should handle null Money values", async () => { + testEntity.priceMoney = undefined; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.priceMoney).toBeUndefined(); + }); + + it("should persist Money with correct rounding", async () => { + testEntity.priceMoney = number("123.456"); // Will be rounded to 2 decimals + + const savedEntity = await dataSource.save(testEntity); + + // Should be rounded based on decorator config (roundHalfToEven) + expect(savedEntity.priceMoney!.toString()).toBe("123.46"); + }); + + it("should retrieve Money from database with proper type", async () => { + const savedEntity = await dataSource.save(testEntity); + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + + expect(retrievedEntity).not.toBeNull(); + expect(retrievedEntity!.priceMoney).toBeDefined(); + expect(typeof retrievedEntity!.priceMoney!.toString).toBe('function'); + expect(typeof retrievedEntity!.priceMoney!.plus).toBe('function'); + expect(retrievedEntity!.priceMoney!.toString()).toBe("999.99"); + }); + }); + + describe("DateTimeRange Type Persistence", () => { + it("should save and retrieve DateTimeRange values correctly", async () => { + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.id).toBeDefined(); + expect(savedEntity.activeRange).toBeDefined(); + expect(savedEntity.activeRange.from).toBeDefined(); + expect(savedEntity.activeRange.to).toBeDefined(); + + // Verify dates are preserved (use UTC methods for timezone-independent testing) + expect(savedEntity.activeRange.from!.getUTCFullYear()).toBe(2024); + expect(savedEntity.activeRange.from!.getUTCMonth()).toBe(0); // January + expect(savedEntity.activeRange.to!.getUTCFullYear()).toBe(2024); + expect(savedEntity.activeRange.to!.getUTCMonth()).toBe(11); // December + }); + + it("should handle optional DateTimeRange values", async () => { + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.flexibleRange).toBeDefined(); + expect(savedEntity.flexibleRange!.from).toBeDefined(); + expect(savedEntity.flexibleRange!.to).toBeDefined(); + expect(savedEntity.flexibleRange!.from!.getUTCMonth()).toBe(5); // June + expect(savedEntity.flexibleRange!.to!.getUTCMonth()).toBe(7); // August + }); + + it("should handle null DateTimeRange values", async () => { + testEntity.flexibleRange = undefined; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.flexibleRange).toBeUndefined(); + }); + + it("should handle partial DateTimeRange values (open ranges)", async () => { + // Create a range with only 'from' date + const partialRange = new DateTimeRangeType(); + partialRange.from = new Date('2024-01-01T00:00:00Z'); + // partialRange.to remains undefined + testEntity.flexibleRange = partialRange; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.flexibleRange).toBeDefined(); + expect(savedEntity.flexibleRange!.from).toBeDefined(); + expect(savedEntity.flexibleRange!.to).toBeUndefined(); + }); + + it("should retrieve DateTimeRange from database with proper type", async () => { + const savedEntity = await dataSource.save(testEntity); + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + + expect(retrievedEntity).not.toBeNull(); + expect(retrievedEntity!.activeRange).toBeDefined(); + expect(retrievedEntity!.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.activeRange.from).toBeInstanceOf(Date); + expect(retrievedEntity!.activeRange.to).toBeInstanceOf(Date); + + // Verify date values are correct + expect(retrievedEntity!.activeRange.from!.getTime()).toBe(new Date('2024-01-01T00:00:00Z').getTime()); + expect(retrievedEntity!.activeRange.to!.getTime()).toBe(new Date('2024-12-31T23:59:59Z').getTime()); + }); + }); + + describe("Complex Types in Queries", () => { + let savedEntity1: ComplexTypesModel; + let savedEntity2: ComplexTypesModel; + + beforeEach(async () => { + // Clean up any existing data + const allEntities = await dataSource.find(ComplexTypesModel); + for (const entity of allEntities) { + await dataSource.delete(ComplexTypesModel, entity.id); + } + + // Create first test entity + const entity1 = new ComplexTypesModel(); + entity1.name = "Entity 1"; + entity1.priceDecimal = number("100.00"); + entity1.priceMoney = number("200.00"); + + const range1 = new DateTimeRangeType(); + range1.from = new Date('2024-01-01T00:00:00Z'); + range1.to = new Date('2024-06-30T23:59:59Z'); + entity1.activeRange = range1; + + savedEntity1 = await dataSource.save(entity1); + + // Create second test entity + const entity2 = new ComplexTypesModel(); + entity2.name = "Entity 2"; + entity2.priceDecimal = number("150.00"); + entity2.priceMoney = number("300.00"); + + const range2 = new DateTimeRangeType(); + range2.from = new Date('2024-07-01T00:00:00Z'); + range2.to = new Date('2024-12-31T23:59:59Z'); + entity2.activeRange = range2; + + savedEntity2 = await dataSource.save(entity2); + }); + + it("should find all entities with complex types loaded", async () => { + const entities = await dataSource.find(ComplexTypesModel); + + expect(entities).toHaveLength(2); + + for (const entity of entities) { + expect(entity.priceDecimal).toBeDefined(); + expect(entity.priceMoney).toBeDefined(); + expect(entity.activeRange).toBeDefined(); + expect(entity.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(typeof entity.priceDecimal!.toString).toBe('function'); + expect(typeof entity.priceMoney!.toString).toBe('function'); + } + }); + + it("should find entities by criteria with complex types loaded", async () => { + const entities = await dataSource.find(ComplexTypesModel, { name: "Entity 1" }); + + expect(entities).toHaveLength(1); + const entity = entities[0]!; + expect(entity.name).toBe("Entity 1"); + expect(entity.priceDecimal!.toString()).toBe("100.00"); + expect(entity.priceMoney!.toString()).toBe("200.00"); + expect(entity.activeRange.from!.getUTCMonth()).toBe(0); // January + }); + }); + + describe("Complex Types Updates", () => { + let savedEntity: ComplexTypesModel; + + beforeEach(async () => { + savedEntity = await dataSource.save(testEntity); + }); + + it("should update Decimal values correctly", async () => { + savedEntity.priceDecimal = number("456.78"); + + const updatedEntity = await dataSource.save(savedEntity); + + expect(updatedEntity.priceDecimal!.toString()).toBe("456.78"); + + // Verify in database + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + expect(retrievedEntity!.priceDecimal!.toString()).toBe("456.78"); + }); + + it("should update Money values correctly", async () => { + savedEntity.priceMoney = number("555.55"); + + const updatedEntity = await dataSource.save(savedEntity); + + expect(updatedEntity.priceMoney!.toString()).toBe("555.55"); + + // Verify in database + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + expect(retrievedEntity!.priceMoney!.toString()).toBe("555.55"); + }); + + it("should update DateTimeRange values correctly", async () => { + const newRange = new DateTimeRangeType(); + newRange.from = new Date('2025-01-01T00:00:00Z'); + newRange.to = new Date('2025-12-31T23:59:59Z'); + savedEntity.activeRange = newRange; + + const updatedEntity = await dataSource.save(savedEntity); + + expect(updatedEntity.activeRange.from!.getUTCFullYear()).toBe(2025); + expect(updatedEntity.activeRange.to!.getUTCFullYear()).toBe(2025); + + // Verify in database + const retrievedEntity = await dataSource.findOneById(ComplexTypesModel, savedEntity.id); + expect(retrievedEntity!.activeRange.from!.getUTCFullYear()).toBe(2025); + expect(retrievedEntity!.activeRange.to!.getUTCFullYear()).toBe(2025); + }); + }); + + describe("Complex Types Validation", () => { + it("should validate Decimal constraints", async () => { + // Test minimum value constraint + testEntity.priceDecimal = number("0.001"); // Below minimum + + const errors = validateSync(testEntity); + const decimalErrors = errors.filter(e => e.property === 'priceDecimal'); + expect(decimalErrors.length).toBeGreaterThan(0); + }); + + it("should validate Money constraints", async () => { + // Test maximum value constraint + testEntity.priceMoney = number("20000.00"); // Above maximum + + const errors = validateSync(testEntity); + const moneyErrors = errors.filter(e => e.property === 'priceMoney'); + expect(moneyErrors.length).toBeGreaterThan(0); + }); + + it("should validate DateTimeRange constraints", async () => { + // Test invalid range (from > to) + const invalidRange = new DateTimeRangeType(); + invalidRange.from = new Date('2024-12-31T23:59:59Z'); + invalidRange.to = new Date('2024-01-01T00:00:00Z'); + testEntity.activeRange = invalidRange; + + const errors = validateSync(testEntity); + const rangeErrors = errors.filter(e => e.property === 'activeRange'); + expect(rangeErrors.length).toBeGreaterThan(0); + }); + }); + + describe("Complex Types JSON Serialization", () => { + it("should serialize and deserialize complex types correctly", async () => { + const savedEntity = await dataSource.save(testEntity); + + // Serialize to JSON + const jsonString = JSON.stringify(savedEntity); + expect(jsonString).toContain('"name":"Complex Types Test"'); + expect(jsonString).toContain('"123.45"'); // Decimal value + expect(jsonString).toContain('"999.99"'); // Money value + expect(jsonString).toContain('"2024-01-01T00:00:00.000Z"'); // DateTimeRange from + + // Parse back from JSON + const parsedData = JSON.parse(jsonString); + expect(parsedData.name).toBe("Complex Types Test"); + expect(parsedData.priceDecimal).toBe("123.45"); + expect(parsedData.priceMoney).toBe("999.99"); + expect(parsedData.activeRange.from).toBe("2024-01-01T00:00:00.000Z"); + }); + }); +}); From ba0f8abd3f5bfb77faac1c7364a045ad92c142e3 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 5 Sep 2025 13:02:01 -0300 Subject: [PATCH 124/254] Add relationship persistence and shortcuts for reference and composition --- index.ts | 4 +- .../typeorm/RelationshipFieldManager.ts | 262 ++++++++++++++ .../typeorm/TypeORMSqlDataSource.ts | 157 ++++++++- src/model/PersistentComponentModel.ts | 57 +++ src/model/index.ts | 1 + src/model/types/index.ts | 4 +- src/model/types/relationship/Relationship.ts | 210 +++++++++++- .../RelationshipPersistence.test.ts | 324 ++++++++++++++++++ .../SimpleRelationshipTest.test.ts | 105 ++++++ 9 files changed, 1116 insertions(+), 8 deletions(-) create mode 100644 src/datasources/typeorm/RelationshipFieldManager.ts create mode 100644 src/model/PersistentComponentModel.ts create mode 100644 test/types_tests/RelationshipPersistence.test.ts create mode 100644 test/types_tests/SimpleRelationshipTest.test.ts diff --git a/index.ts b/index.ts index b3974f9..2136890 100644 --- a/index.ts +++ b/index.ts @@ -21,6 +21,6 @@ export { Integer } from './src/model/types/number/Integer'; export { Money } from './src/model/types/number/Money'; export { Number } from './src/model/types/number/Number'; export { Decimal } from './src/model/types/number/Decimal'; -export { PersistentModel } from './src/model'; +export { PersistentModel, PersistentComponentModel } from './src/model'; export { TypeORMSqlDataSource } from './src/datasources'; -export { Relationship } from './src/model/types'; +export { Relationship, Reference, Composition, SharedComposition } from './src/model/types'; diff --git a/src/datasources/typeorm/RelationshipFieldManager.ts b/src/datasources/typeorm/RelationshipFieldManager.ts new file mode 100644 index 0000000..39b5cf2 --- /dev/null +++ b/src/datasources/typeorm/RelationshipFieldManager.ts @@ -0,0 +1,262 @@ +import { + OneToMany, + ManyToOne, + ManyToMany, + JoinColumn, + JoinTable +} from 'typeorm'; + +/** + * Manager class for handling relationship field configuration for TypeORM persistence. + * + * This class encapsulates all relationship-related logic, making it easier to maintain + * and test relationship functionality separately from the main data source. + */ +export class RelationshipFieldManager { + + /** + * Configures a relationship field with appropriate TypeORM decorators. + * + * @param target - The prototype of the class containing the field + * @param propertyKey - The name of the property/field + * @param relationshipType - The type of relationship ('reference', 'composition', 'sharedComposition', 'parent') + * @param load - Whether to eagerly load the relationship + * @param onDelete - What to do when referenced entity is deleted (for reference relationships) + * @param elementType - The element type for array relationships + */ + configureRelationshipField( + target: any, + propertyKey: string, + relationshipType: string, + load?: boolean, + onDelete?: string, + elementType?: () => any + ): void { + const designType = Reflect.getMetadata('design:type', target, propertyKey); + const isArray = designType === Array; + + switch (relationshipType) { + case 'reference': + this.configureReference(target, propertyKey, isArray, load, onDelete, elementType); + break; + + case 'composition': + this.configureComposition(target, propertyKey, isArray, load, elementType); + break; + + case 'sharedComposition': + this.configureSharedComposition(target, propertyKey, isArray, load, elementType); + break; + + case 'parent': + this.configureParent(target, propertyKey, load, onDelete); + break; + + default: + throw new Error(`Unknown relationship type: ${relationshipType}`); + } + + // Store metadata for testing purposes + Reflect.defineMetadata('typeorm:relationship', true, target, propertyKey); + Reflect.defineMetadata('typeorm:relationship:type', relationshipType, target, propertyKey); + } + + /** + * Configures a reference relationship. + * - Single: ManyToOne with JoinColumn + * - Array: ManyToMany with JoinTable + */ + private configureReference( + target: any, + propertyKey: string, + isArray: boolean, + load?: boolean, + onDelete?: string, + elementType?: () => any + ): void { + const eager = load ?? false; + + if (isArray) { + // Many-to-many relationship for array references + const relationOptions = { + eager, + cascade: false // References are independent + }; + + if (elementType) { + ManyToMany(elementType, undefined as any, relationOptions)(target, propertyKey); + } else { + // Fallback for cases where elementType is not provided + ManyToMany(() => Object, undefined as any, relationOptions)(target, propertyKey); + } + + // Add join table for many-to-many + JoinTable()(target, propertyKey); + } else { + // Many-to-one relationship for single references + const onDeleteOption = this.mapOnDeleteOption(onDelete); + const relationOptions: any = { + eager, + nullable: true // References can be null + }; + + if (onDeleteOption) { + relationOptions.onDelete = onDeleteOption; + } + + if (elementType) { + ManyToOne(elementType, undefined as any, relationOptions)(target, propertyKey); + } else { + // Use design type when elementType is not provided + const designType = Reflect.getMetadata('design:type', target, propertyKey); + if (designType && typeof designType === 'function') { + ManyToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); + } else { + ManyToOne(() => Object, undefined as any, relationOptions)(target, propertyKey); + } + } + + // Add join column for many-to-one with explicit column naming + JoinColumn({ name: `${propertyKey}Id` })(target, propertyKey); + } + } + + /** + * Configures a composition relationship. + * - Single: Not typically used (compositions are usually arrays) + * - Array: OneToMany with cascade and eager loading + */ + private configureComposition( + target: any, + propertyKey: string, + isArray: boolean, + load?: boolean, + elementType?: () => any + ): void { + const eager = load ?? true; + + if (isArray) { + // One-to-many relationship for composition arrays + const relationOptions: any = { + eager, + cascade: ['insert', 'update'], // Cascade save operations + orphanedRowAction: 'delete' // Delete orphaned children + }; + + if (elementType) { + OneToMany(elementType, (child: any) => child.owner, relationOptions)(target, propertyKey); + + // Record parent entity metadata on the child so we can configure the reverse ManyToOne + try { + const ChildClass = elementType(); + if (ChildClass && ChildClass.prototype) { + // Store the parent entity constructor on the child's owner property + Reflect.defineMetadata('relationship:parent:entity', target.constructor, ChildClass.prototype, 'owner'); + } + } catch { + // Non-fatal: if we can't resolve the element type now, parent mapping will fall back to manual handling + } + } else { + OneToMany(() => Object, (child: any) => child.owner, relationOptions)(target, propertyKey); + } + } else { + // Single composition - treat as reference with cascade + const relationOptions: any = { + eager, + cascade: ['insert', 'update'], + nullable: true + }; + + if (elementType) { + ManyToOne(elementType, undefined as any, relationOptions)(target, propertyKey); + } else { + const designType = Reflect.getMetadata('design:type', target, propertyKey); + if (designType && typeof designType === 'function') { + ManyToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); + } else { + ManyToOne(() => Object, undefined as any, relationOptions)(target, propertyKey); + } + } + + JoinColumn({ name: `${propertyKey}Id` })(target, propertyKey); + } + } + + /** + * Configures a shared composition relationship. + * - Always ManyToMany with JoinTable, cascade, and eager loading + */ + private configureSharedComposition( + target: any, + propertyKey: string, + isArray: boolean, + load?: boolean, + elementType?: () => any + ): void { + const eager = load ?? true; + + // Shared composition is always many-to-many + const relationOptions: any = { + eager, + cascade: ['insert', 'update'] // Cascade save operations + }; + + if (elementType) { + ManyToMany(elementType, undefined as any, relationOptions)(target, propertyKey); + } else { + ManyToMany(() => Object, undefined as any, relationOptions)(target, propertyKey); + } + + // Add join table for many-to-many + JoinTable()(target, propertyKey); + } + + /** + * Configures a parent relationship (used in PersistentComponentModel). + * - Always ManyToOne with eager loading and cascade delete + */ + private configureParent( + target: any, + propertyKey: string, + load?: boolean, + onDelete?: string + ): void { + const eager = false; // prevent circular eager loading with OneToMany side + + // Parent relationship is always many-to-one + const relationOptions: any = { + eager, + onDelete: 'CASCADE', // Delete child when parent is deleted + nullable: false // Parent is required + }; + + // Try to resolve the actual parent entity (set by configureComposition) + const parentEntity: Function | undefined = Reflect.getMetadata('relationship:parent:entity', target, propertyKey); + + if (parentEntity) { + ManyToOne(() => parentEntity as any, undefined as any, relationOptions)(target, propertyKey); + } else { + // Fallback: use Object to at least create a column; this won't enforce FK but will store ownerId + ManyToOne(() => Object as any, undefined as any, relationOptions)(target, propertyKey); + } + + // Add join column for the foreign key + JoinColumn({ name: `${propertyKey}Id` })(target, propertyKey); + } + + /** + * Maps Slingr onDelete options to TypeORM onDelete options. + */ + private mapOnDeleteOption(onDelete?: string): 'CASCADE' | 'SET NULL' | 'NO ACTION' | undefined { + switch (onDelete) { + case 'delete': + return 'CASCADE'; + case 'removeReference': + return 'SET NULL'; + case 'nothing': + return 'NO ACTION'; + default: + return 'SET NULL'; // Default behavior + } + } +} diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index b2fbd8f..987127d 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -18,6 +18,7 @@ import { TypeORMTypeMapper } from './TypeORMTypeMapper'; import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; import { ArrayFieldManager } from './ArrayFieldManager'; import { DateTimeRangeFieldManager } from './DateTimeRangeFieldManager'; +import { RelationshipFieldManager } from './RelationshipFieldManager'; // Import to ensure field type registrations happen import '../../model/types/TypeRegistry'; @@ -96,6 +97,7 @@ export class TypeORMSqlDataSource extends DataSource { private registeredModels: Set = new Set(); private arrayFieldManager: ArrayFieldManager = new ArrayFieldManager(); private dateTimeRangeFieldManager: DateTimeRangeFieldManager = new DateTimeRangeFieldManager(); + private relationshipFieldManager: RelationshipFieldManager = new RelationshipFieldManager(); constructor(options: TypeORMSqlDataSourceOptions) { super(options); @@ -128,6 +130,9 @@ export class TypeORMSqlDataSource extends DataSource { await this.typeormDataSource.initialize(); this.isInitialized = true; console.log(`TypeORM DataSource initialized successfully for ${typeormOptions.type}`); + + // Keep initialization logs concise in test runs + return this.typeormDataSource; } catch (error) { console.error('Failed to initialize TypeORM DataSource:', error); @@ -225,6 +230,7 @@ export class TypeORMSqlDataSource extends DataSource { * Configures a field with appropriate TypeORM column decorators. * For array fields, delegates to the array field manager. * For DateTimeRange fields, delegates to the DateTimeRange field manager. + * For relationship fields, delegates to the relationship field manager. * * @param target - The prototype of the class containing the field * @param propertyKey - The name of the property/field @@ -242,6 +248,29 @@ export class TypeORMSqlDataSource extends DataSource { return; // PersistentModel already handles this with @PrimaryGeneratedColumn } + // Check if this is a relationship field + if (fieldType === 'relationship') { + const relationshipType = Reflect.getMetadata('field:relationship:type', target, propertyKey); + const load = Reflect.getMetadata('field:relationship:load', target, propertyKey); + const onDelete = Reflect.getMetadata('field:relationship:onDelete', target, propertyKey); + + // Get elementType from field options if it exists (for array relationships) + const elementType = fieldOptions?.elementType; + + this.relationshipFieldManager.configureRelationshipField( + target, + propertyKey, + relationshipType, + load, + onDelete, + elementType + ); + + // Store that this field is configured for TypeORM + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + return; + } + // Check if this is an array field if (fieldType.startsWith('array:')) { this.arrayFieldManager.configureArrayField(target, propertyKey, fieldType, fieldOptions); @@ -734,16 +763,140 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - const entity = await repository.findOneBy({ id: id as any } as any) as T | null; + + // Get the table name for this entity + const metadata = this.typeormDataSource.getMetadata(entityClass); + const tableName = metadata.tableName; + + // Use raw query to get the basic entity data + const result = await this.typeormDataSource.query( + `SELECT * FROM ${tableName} WHERE id = ?`, + [id] + ); - if (!entity) { + if (!result || result.length === 0) { return null; } + // Create entity instance from raw data + const entity = repository.create(result[0]) as T; + + // Since we set eager: true in relationship configuration, TypeORM should load relationships automatically + // But our current query doesn't include joins. Let's use TypeORM's built-in findOne with relations + if (this.typeormDataSource) { + try { + const entityWithRelations = await repository.findOne({ + where: { id } as any, + loadEagerRelations: true // This will load all eager relationships + }); + + if (entityWithRelations) { + console.log(`Loaded entity with eager relations:`, Object.keys(entityWithRelations)); + return entityWithRelations; + } + } catch (error) { + console.warn('Failed to load with eager relations, falling back to manual loading:', error); + } + } + + // Fallback: manually load relationships that are marked as eager + await this.loadEagerRelationships(entity, entityClass, metadata); + // Array fields are automatically transformed via @AfterLoad hooks return entity; } + /** + * Manually load eager relationships for an entity to avoid TypeORM's broken join resolution + */ + private async loadEagerRelationships(entity: T, entityClass: new () => T, metadata: any): Promise { + if (!this.typeormDataSource) return; + + console.log(`Loading eager relationships for ${entityClass.name}`); + + // Get relationship fields from our field metadata + const relationshipFields = Reflect.getMetadata('model:fields', entityClass) || []; + console.log(`All fields for ${entityClass.name}:`, relationshipFields); + + for (const fieldName of relationshipFields) { + // Check if this field is a relationship + const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + + if (fieldType === 'relationship') { + console.log(`Found relationship field: ${fieldName}`); + + // Get relationship-specific metadata + const relationshipType = Reflect.getMetadata('field:relationship:type', entityClass.prototype, fieldName); + const relationshipLoad = Reflect.getMetadata('field:relationship:load', entityClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', entityClass.prototype, fieldName); + // Only load reference relationships that are eager (composition handles differently) + if (relationshipType === 'reference' && relationshipLoad !== false) { + console.log(`Loading reference relationship ${fieldName}`); + try { + const relationshipMetadata = { + type: relationshipType, + load: relationshipLoad, + elementType: fieldTypeOptions?.elementType + }; + await this.loadReferenceRelationship(entity, fieldName, relationshipMetadata); + } catch (error) { + console.warn(`Failed to load relationship ${fieldName}:`, error); + } + } else { + console.log(`Skipping relationship ${fieldName}: type=${relationshipType}, load=${relationshipLoad}`); + } + } + } + } + + /** + * Load a reference relationship using the foreign key + */ + private async loadReferenceRelationship(entity: T, fieldName: string, relationshipMetadata: any): Promise { + if (!this.typeormDataSource) return; + + // Get the foreign key value - TypeORM should use the explicit column name we specified + const foreignKeyName = `${fieldName}Id`; + const foreignKeyValue = (entity as any)[foreignKeyName]; + + console.log(`Available entity keys: ${Object.keys(entity)}`); + console.log(`Loading relationship ${fieldName}, foreign key: ${foreignKeyName} = ${foreignKeyValue}`); + + if (foreignKeyValue && foreignKeyName) { + // Get the target entity class - try elementType first, then fall back to design:type + let targetClass; + + if (relationshipMetadata.elementType && typeof relationshipMetadata.elementType === 'function') { + targetClass = relationshipMetadata.elementType(); + } else { + // Fall back to TypeScript's design:type metadata + const entityClass = entity.constructor; + targetClass = Reflect.getMetadata('design:type', entityClass.prototype, fieldName); + } + + console.log(`Target class for ${fieldName}:`, targetClass?.name); + + if (targetClass) { + try { + const targetRepository = this.typeormDataSource.getRepository(targetClass); + const relatedEntity = await targetRepository.findOneBy({ id: foreignKeyValue }); + + console.log(`Found related entity for ${fieldName}:`, relatedEntity); + + if (relatedEntity) { + (entity as any)[fieldName] = relatedEntity; + } + } catch (error) { + console.warn(`Error loading related entity for ${fieldName}:`, error); + } + } else { + console.warn(`Could not determine target class for relationship ${fieldName}`); + } + } else { + console.log(`No foreign key value for ${fieldName}`); + } + } + /** * Find entities with ids. * Optionally find options or conditions can be applied. diff --git a/src/model/PersistentComponentModel.ts b/src/model/PersistentComponentModel.ts new file mode 100644 index 0000000..db8a005 --- /dev/null +++ b/src/model/PersistentComponentModel.ts @@ -0,0 +1,57 @@ +import { PersistentModel } from './PersistentModel'; +import { Model } from './Model'; +import { Field } from './Field'; +import { Relationship } from './types/relationship/Relationship'; + +/** + * Abstract base class for component models used in composition relationships. + * + * Extends PersistentModel with an `owner` field that establishes a parent relationship + * to the owning entity. This is used for models that are part of a composition + * relationship and cannot exist independently. + * + * @template T The type of the owner/parent entity + * @abstract + * + * @example + * ```typescript + * @Model({ + * dataSource: mainDataSource + * }) + * class TaskNote extends PersistentComponentModel { + * @Field() + * @Reference() + * user: User; + * + * @Field() + * @DateTime() + * timestamp: Date; + * + * @Field() + * @HTML() + * note: string; + * } + * + * @Model({ + * dataSource: mainDataSource + * }) + * class Task extends PersistentModel { + * @Field() + * @Composition() + * notes: TaskNote[]; + * } + * ``` + */ +@Model() +export abstract class PersistentComponentModel extends PersistentModel { + @Field({ + required: true, + docs: 'Reference to the owning entity in the composition relationship' + }) + @Relationship({ + type: 'parent', + load: true, + onDelete: 'delete' + }) + owner!: T; +} diff --git a/src/model/index.ts b/src/model/index.ts index 0df7831..ca1da24 100644 --- a/src/model/index.ts +++ b/src/model/index.ts @@ -1,6 +1,7 @@ // Base Models export { BaseModel } from './BaseModel'; export { PersistentModel } from './PersistentModel'; +export { PersistentComponentModel } from './PersistentComponentModel'; // Decorators export { Model } from './Model'; diff --git a/src/model/types/index.ts b/src/model/types/index.ts index e1a65c4..169fe77 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -12,8 +12,8 @@ export { Integer } from './number/Integer'; export { Money } from './number/Money'; export { Number } from './number/Number'; export { Decimal } from './number/Decimal'; -export { Relationship } from './relationship/Relationship'; -export type { RelationshipOptions } from './relationship/Relationship'; +export { Relationship, Reference, Composition, SharedComposition } from './relationship/Relationship'; +export type { RelationshipOptions, ReferenceOptions, CompositionOptions, SharedCompositionOptions } from './relationship/Relationship'; // Export the field type configuration system export { FieldTypeRegistry } from './FieldTypeConfig'; diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 78f4085..357c86b 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -11,14 +11,40 @@ export interface RelationshipOptions { * The type of relationship between models. * - 'reference': Independent models that are related (customer <-> order) * - 'composition': One model cannot exist without the other (order -> line items) + * - 'sharedComposition': Composition that can be shared across models but treated as part of the whole + * - 'parent': Reverse side of composition relationship (used in component models) */ - type: 'reference' | 'composition'; + type: 'reference' | 'composition' | 'sharedComposition' | 'parent'; /** * For array relationships, specify the element type explicitly. * This is needed because TypeScript doesn't emit array element type metadata. */ elementType?: () => any; + + /** + * Whether to eagerly load the relationship data by default. + * - true: Data is loaded automatically when parent is loaded + * - false: Data is only loaded when explicitly requested + * + * Defaults: + * - reference: false + * - composition: true + * - sharedComposition: true + * - parent: true + */ + load?: boolean; + + /** + * For reference relationships, defines what happens when the referenced entity is deleted. + * - 'delete': Delete this entity when the referenced entity is deleted + * - 'removeReference': Set the reference to null when the referenced entity is deleted + * - 'nothing': Do nothing when the referenced entity is deleted + * + * Default: 'removeReference' + * Only applies to reference relationships. + */ + onDelete?: 'delete' | 'removeReference' | 'nothing'; } /** @@ -32,6 +58,11 @@ function validateRelationshipType(proto: Object, propertyKey: string): void { return; // Arrays are valid for relationships } + // For Object type (generic types), skip validation as we can't check at runtime + if (designType === Object) { + return; // Allow Object type (generics are often compiled to Object) + } + // Check if it's a class that extends BaseModel if (typeof designType === 'function') { // Check if the type is a BaseModel or extends from it @@ -104,11 +135,21 @@ export function Relationship(options: RelationshipOptions) { const propName = propertyKey as unknown as string; const proto = target as unknown as Object; - validateRelationshipType(proto, propName); + // Skip validation for parent relationships as they use generic types + if (options.type !== 'parent') { + validateRelationshipType(proto, propName); + } // Store metadata about the relationship Reflect.defineMetadata('field:type', 'relationship', proto, propName); Reflect.defineMetadata('field:relationship:type', options.type, proto, propName); + Reflect.defineMetadata('field:relationship:load', options.load, proto, propName); + Reflect.defineMetadata('field:relationship:onDelete', options.onDelete, proto, propName); + + // Store the elementType in field type options for access in the data source + if (options.elementType) { + Reflect.defineMetadata('field:type:options', { elementType: options.elementType }, proto, propName); + } const designType = Reflect.getMetadata('design:type', proto, propName); @@ -170,3 +211,168 @@ export function Relationship(options: RelationshipOptions) { })(target as any, propName); }; } + +/** + * Reference options for the @Reference decorator. + */ +export interface ReferenceOptions { + /** + * Whether to eagerly load the relationship data by default. + * Default: false + */ + load?: boolean; + + /** + * For reference relationships, defines what happens when the referenced entity is deleted. + * - 'delete': Delete this entity when the referenced entity is deleted + * - 'removeReference': Set the reference to null when the referenced entity is deleted + * - 'nothing': Do nothing when the referenced entity is deleted + * + * Default: 'removeReference' + */ + onDelete?: 'delete' | 'removeReference' | 'nothing'; + + /** + * For array relationships, specify the element type explicitly. + */ + elementType?: () => any; +} + +/** + * Composition options for the @Composition decorator. + */ +export interface CompositionOptions { + /** + * Whether to eagerly load the relationship data by default. + * Default: true + */ + load?: boolean; + + /** + * For array relationships, specify the element type explicitly. + */ + elementType?: () => any; +} + +/** + * SharedComposition options for the @SharedComposition decorator. + */ +export interface SharedCompositionOptions { + /** + * Whether to eagerly load the relationship data by default. + * Default: true + */ + load?: boolean; + + /** + * For array relationships, specify the element type explicitly. + */ + elementType?: () => any; +} + +/** + * Reference relationship decorator. + * + * A shortcut for @Relationship({ type: 'reference' }) with additional options. + * Use this for weak associations between independent models. + * + * @param options - Reference-specific options + * + * @example + * ```typescript + * @Model() + * class Task extends PersistentModel { + * @Field() + * @Reference({ onDelete: 'delete' }) + * project: Project; + * + * @Field() + * @Reference() + * assignees: User[]; + * } + * ``` + */ +export function Reference(options: ReferenceOptions = {}) { + const relationshipOptions: RelationshipOptions = { + type: 'reference', + load: options.load ?? true, // Default to true for eager loading + onDelete: options.onDelete ?? 'removeReference' + }; + + if (options.elementType) { + relationshipOptions.elementType = options.elementType; + } + + return Relationship(relationshipOptions); +} + +/** + * Composition relationship decorator. + * + * A shortcut for @Relationship({ type: 'composition' }) with additional options. + * Use this when the referenced record is part of the whole and cannot be separated. + * All operations are cascaded. + * + * @param options - Composition-specific options + * + * @example + * ```typescript + * @Model() + * class Task extends PersistentModel { + * @Field() + * @Composition() + * notes: TaskNote[]; + * } + * ``` + */ +export function Composition(options: CompositionOptions = {}) { + const relationshipOptions: RelationshipOptions = { + type: 'composition', + load: options.load ?? true + }; + + if (options.elementType) { + relationshipOptions.elementType = options.elementType; + } + + return Relationship(relationshipOptions); +} + +/** + * SharedComposition relationship decorator. + * + * A shortcut for @Relationship({ type: 'sharedComposition' }) with additional options. + * Use this for composition that is shared across several models but still treated + * as part of the whole. + * + * @param options - SharedComposition-specific options + * + * @example + * ```typescript + * @Model() + * class Epic extends PersistentModel { + * @Field() + * @SharedComposition() + * notes: Note[]; + * } + * + * @Model() + * class Story extends PersistentModel { + * @Field() + * @SharedComposition() + * notes: Note[]; + * } + * ``` + */ +export function SharedComposition(options: SharedCompositionOptions = {}) { + const relationshipOptions: RelationshipOptions = { + type: 'sharedComposition', + load: options.load ?? true + }; + + if (options.elementType) { + relationshipOptions.elementType = options.elementType; + } + + return Relationship(relationshipOptions); +} diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts new file mode 100644 index 0000000..3f7d2b7 --- /dev/null +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -0,0 +1,324 @@ +import { BaseModel, Field, Model, PersistentModel, PersistentComponentModel } from "../../index"; +import { Reference, Composition, SharedComposition } from "../../index"; +import { TypeORMSqlDataSource } from "../../src/datasources"; +import { Text, HTML, DateTime } from "../../index"; + +// Test models for relationship persistence +@Model() +class User extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + + @Field({ required: true }) + @Text() + email!: string; +} + +@Model() +class Project extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; +} + +@Model() +class TaskNote extends PersistentComponentModel { + @Field({ required: false }) + @Reference() + user!: User; + + @Field({ required: false }) + @DateTime() + timestamp!: Date; + + @Field({ required: false }) + @HTML() + note!: string; +} + +@Model() +class Task extends PersistentModel { + @Field({ required: false }) + @Reference({ onDelete: 'delete' }) + project!: Project; + + @Field({ required: true }) + @Text() + title!: string; + + @Field({ required: false }) + @Reference({ elementType: () => User }) + assignees!: User[]; + + @Field({ required: false }) + @HTML() + description!: string; + + @Field({ required: false }) + @Composition({ elementType: () => TaskNote }) + notes!: TaskNote[]; +} + +@Model() +class Note extends PersistentModel { + @Field({ required: false }) + @Reference() + user!: User; + + @Field({ required: false }) + @DateTime() + timestamp!: Date; + + @Field({ required: false }) + @HTML() + content!: string; +} + +@Model() +class Epic extends PersistentModel { + @Field({ required: true }) + @Text() + title!: string; + + @Field({ required: false }) + @SharedComposition({ elementType: () => Note }) + notes!: Note[]; +} + +@Model() +class Story extends PersistentModel { + @Field({ required: true }) + @Text() + title!: string; + + @Field({ required: false }) + @SharedComposition({ elementType: () => Note }) + notes!: Note[]; +} + +describe('Relationship Persistence', () => { + let dataSource: TypeORMSqlDataSource; + + beforeAll(() => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + }); + }); + + beforeEach(async () => { + // Configure models with the data source + const models = [User, Project, Task, TaskNote, Note, Epic, Story]; + for (const modelClass of models) { + dataSource.configureModel(modelClass); + + // Get all field names and configure them + const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(modelClass.prototype, fieldName, fieldType, allFieldOptions); + } + } + } + + await dataSource.initialize({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + } as any); + }); + + afterEach(async () => { + if (dataSource && dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + describe('Shortcut Decorators', () => { + it('should store relationship metadata for @Reference', () => { + const relationshipType = Reflect.getMetadata('field:relationship:type', Task.prototype, 'project'); + const fieldType = Reflect.getMetadata('field:type', Task.prototype, 'project'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('reference'); + }); + + it('should store relationship metadata for @Composition', () => { + const relationshipType = Reflect.getMetadata('field:relationship:type', Task.prototype, 'notes'); + const fieldType = Reflect.getMetadata('field:type', Task.prototype, 'notes'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('composition'); + }); + + it('should store relationship metadata for @SharedComposition', () => { + const relationshipType = Reflect.getMetadata('field:relationship:type', Epic.prototype, 'notes'); + const fieldType = Reflect.getMetadata('field:type', Epic.prototype, 'notes'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('sharedComposition'); + }); + + it('should store relationship metadata for parent relationship in PersistentComponentModel', () => { + const relationshipType = Reflect.getMetadata('field:relationship:type', TaskNote.prototype, 'owner'); + const fieldType = Reflect.getMetadata('field:type', TaskNote.prototype, 'owner'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('parent'); + }); + + it('should create TypeORM relationship metadata after configuration', () => { + // Configure the field first + dataSource.configureField( + Task.prototype, + 'project', + 'relationship', + { required: false } + ); + + const relationshipMetadata = Reflect.getMetadata('typeorm:relationship', Task.prototype, 'project'); + const relationshipType = Reflect.getMetadata('typeorm:relationship:type', Task.prototype, 'project'); + + expect(relationshipMetadata).toBe(true); + expect(relationshipType).toBe('reference'); + }); + }); + + describe('Basic Persistence', () => { + it('should persist reference relationships', async () => { + // Create and save a project + const project = new Project(); + project.name = 'Test Project'; + const savedProject = await dataSource.save(project); + + // Create and save a task with project reference + const task = new Task(); + task.title = 'Test Task'; + task.project = savedProject; + task.assignees = []; + task.notes = []; + + const savedTask = await dataSource.save(task); + + expect(savedTask.id).toBeDefined(); + expect(savedTask.project).toBeDefined(); + expect(savedTask.project.id).toBe(savedProject.id); + }); + + it('should persist composition relationships', async () => { + // Create a user for the note + const user = new User(); + user.name = 'Test User'; + user.email = 'test@example.com'; + const savedUser = await dataSource.save(user); + + // Create a task + const task = new Task(); + task.title = 'Test Task'; + task.assignees = []; + task.notes = []; + + // Save the task first to get an ID + const savedTask = await dataSource.save(task); + + // Create a note for the task + const note = new TaskNote(); + note.user = savedUser; + note.timestamp = new Date(); + note.note = 'Test note content'; + note.owner = savedTask; // Set the parent relationship + + // Update the task with the note + savedTask.notes = [note]; + const updatedTask = await dataSource.save(savedTask); + + expect(updatedTask.notes).toHaveLength(1); + expect(updatedTask.notes[0]!.note).toBe('Test note content'); + expect(updatedTask.notes[0]!.user.name).toBe('Test User'); + }); + }); + + describe('Array Relationships', () => { + it('should handle many-to-many reference relationships', async () => { + // Create users + const user1 = new User(); + user1.name = 'User 1'; + user1.email = 'user1@example.com'; + const savedUser1 = await dataSource.save(user1); + + const user2 = new User(); + user2.name = 'User 2'; + user2.email = 'user2@example.com'; + const savedUser2 = await dataSource.save(user2); + + // Create task with multiple assignees + const task = new Task(); + task.title = 'Multi-assignee Task'; + task.assignees = [savedUser1, savedUser2]; + task.notes = []; + + const savedTask = await dataSource.save(task); + + expect(savedTask.assignees).toHaveLength(2); + expect(savedTask.assignees.map(u => u.name)).toContain('User 1'); + expect(savedTask.assignees.map(u => u.name)).toContain('User 2'); + }); + }); + + describe('Complex Relationships', () => { + it('should handle nested composition and reference relationships', async () => { + // Create a user + const user = new User(); + user.name = 'Task Creator'; + user.email = 'creator@example.com'; + const savedUser = await dataSource.save(user); + + // Create a project + const project = new Project(); + project.name = 'Complex Project'; + const savedProject = await dataSource.save(project); + + // Create a task + const task = new Task(); + task.title = 'Complex Task'; + task.project = savedProject; + task.assignees = [savedUser]; + task.notes = []; + + // Save the task first + const savedTask = await dataSource.save(task); + + // Create a note + const note = new TaskNote(); + note.user = savedUser; + note.timestamp = new Date(); + note.note = 'Complex task note'; + note.owner = savedTask; + + // Update task with note + savedTask.notes = [note]; + const finalTask = await dataSource.save(savedTask); + + expect(finalTask.project.name).toBe('Complex Project'); + expect(finalTask.assignees).toHaveLength(1); + expect(finalTask.assignees[0]!.name).toBe('Task Creator'); + expect(finalTask.notes).toHaveLength(1); + expect(finalTask.notes[0]!.note).toBe('Complex task note'); + expect(finalTask.notes[0]!.user.name).toBe('Task Creator'); + }); + }); +}); diff --git a/test/types_tests/SimpleRelationshipTest.test.ts b/test/types_tests/SimpleRelationshipTest.test.ts new file mode 100644 index 0000000..5b802f0 --- /dev/null +++ b/test/types_tests/SimpleRelationshipTest.test.ts @@ -0,0 +1,105 @@ +import { PersistentModel, Field, Model, Reference, TypeORMSqlDataSource, Text } from "../../index"; + +// Simple test models +@Model() +class SimpleUser extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; +} + +@Model() +class SimpleTask extends PersistentModel { + @Field({ required: true }) + @Text() + title!: string; + + @Field({ required: false }) + @Reference({ load: true }) // Explicitly set load to true + assignedUser?: SimpleUser; +} + +describe('Simple Relationship Test', () => { + let dataSource: TypeORMSqlDataSource; + + beforeEach(async () => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: true, // Enable logging to see SQL + managed: true + }); + + // Configure models + const models = [SimpleUser, SimpleTask]; + for (const modelClass of models) { + dataSource.configureModel(modelClass); + + const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + console.log(`Configuring field ${modelClass.name}.${fieldName} with type ${fieldType}`, allFieldOptions); + dataSource.configureField(modelClass.prototype, fieldName, fieldType, allFieldOptions); + + // Check if it's a relationship field and log additional info + if (fieldType === 'relationship') { + const relationshipType = Reflect.getMetadata('field:relationship:type', modelClass.prototype, fieldName); + const load = Reflect.getMetadata('field:relationship:load', modelClass.prototype, fieldName); + console.log(` Relationship details: type=${relationshipType}, load=${load}`); + } + } + } + } + + await dataSource.initialize({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: true, + managed: true + } as any); + }); + + afterEach(async () => { + if (dataSource && dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + it('should persist and load a simple reference relationship', async () => { + // Create and save a user + const user = new SimpleUser(); + user.name = 'Test User'; + const savedUser = await dataSource.save(user); + console.log('Saved user:', savedUser); + + // Create and save a task with user reference + const task = new SimpleTask(); + task.title = 'Test Task'; + task.assignedUser = savedUser; + const savedTask = await dataSource.save(task); + console.log('Saved task:', savedTask); + + // Check if the relationship was persisted and loaded + expect(savedTask.id).toBeDefined(); + console.log('Task assignedUser:', savedTask.assignedUser); + + if (savedTask.assignedUser) { + expect(savedTask.assignedUser.name).toBe('Test User'); + } else { + // If not eagerly loaded, try to load it manually + const loadedTask = await dataSource.findOneById(SimpleTask, savedTask.id); + console.log('Manually loaded task:', loadedTask); + expect(loadedTask?.assignedUser?.name).toBe('Test User'); + } + }); +}); From 21340764e4e993b350bd2fbba7537cbdc5bd3b92 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 8 Sep 2025 10:01:36 -0300 Subject: [PATCH 125/254] Update save method and reduce ArrayFieldManager size --- src/datasources/typeorm/ArrayEntityFactory.ts | 16 +- src/datasources/typeorm/ArrayFieldManager.ts | 151 +++++------------- .../typeorm/TypeORMSqlDataSource.ts | 47 +++--- 3 files changed, 68 insertions(+), 146 deletions(-) diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts index ccc483d..67d29ab 100644 --- a/src/datasources/typeorm/ArrayEntityFactory.ts +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -31,7 +31,6 @@ export class ArrayEntityFactory { // Dynamically create the array element entity class const ArrayElementEntity = class { id!: string; - parentId!: string; // relation to parent for FK and cascade parent!: any; value!: string; @@ -101,22 +100,21 @@ export class ArrayEntityFactory { // Configure the id field PrimaryGeneratedColumn('uuid')(entityClass.prototype, 'id'); - // Configure the parentId field (foreign key) - Column({ type: 'uuid', name: 'parent_id' })(entityClass.prototype, 'parentId'); - // Add an index for faster lookups by parent - Index()(entityClass.prototype, 'parentId'); - // Ensure order uniqueness per parent and index (composite) - Index(`IDX_${tableName}_parent_index_unique`, ['parentId', 'index'], { unique: true })(entityClass); + // Relation to parent with ON DELETE CASCADE ManyToOne(() => parentEntityClass as any, { onDelete: 'CASCADE', onUpdate: 'NO ACTION', - cascade: true, - nullable: false + cascade: ['insert', 'update'], // allow setting FK on child inserts/updates + nullable: true // allow transient null during orphan removal })(entityClass.prototype, 'parent'); + // FK column created via the relation JoinColumn below JoinColumn({ name: 'parent_id' })(entityClass.prototype, 'parent'); + // Index on (parent_id, array_index) for ordering; reference relation column by name + Index(`IDX_${tableName}_parent_index`, ['parent', 'index'])(entityClass); + // Configure the value field based on the base field type const valueColumnConfig = TypeORMTypeMapper.getArrayElementColumnConfig(baseFieldType, fieldOptions); Column(valueColumnConfig)(entityClass.prototype, 'value'); diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index 08c0023..d275db5 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -71,37 +71,38 @@ export class ArrayFieldManager { // Add OneToMany relationship to parent entity for eager loading // Use a different property name to avoid conflicts with the original array field const relationPropertyName = `_${propertyKey}_elements`; - + OneToMany(() => ArrayElementEntity as any, (element: any) => element.parent, { eager: true, - cascade: ['insert', 'update'] // Only cascade insert/update, not remove (ManyToOne handles remove) + cascade: true, // insert/update/remove through parent + orphanedRowAction: 'delete' // remove missing children when saving parent })(target, relationPropertyName); // Add @AfterLoad hook to automatically transform array element entities to arrays const afterLoadMethodName = `_afterLoad_${propertyKey}`; - + // Create the afterLoad method if it doesn't exist if (!target[afterLoadMethodName]) { - target[afterLoadMethodName] = function() { + target[afterLoadMethodName] = function () { this._transformArrayFields(); }; - + // Apply @AfterLoad decorator to the method AfterLoad()(target, afterLoadMethodName); } // Add or update the main transformation method if (!target._transformArrayFields) { - target._transformArrayFields = function() { + target._transformArrayFields = function () { const entityClass = this.constructor as Function; const arrayFieldNames = Reflect.getMetadata('array:field:names', entityClass) || []; - + for (const fieldName of arrayFieldNames) { const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); if (arrayMetadata?.relationPropertyName) { const relationPropertyName = arrayMetadata.relationPropertyName; const arrayElements = this[relationPropertyName]; - + if (Array.isArray(arrayElements)) { // Sort by index and extract values this[fieldName] = arrayElements @@ -137,116 +138,46 @@ export class ArrayFieldManager { } /** - * Extracts array values from an entity before processing. - * - * @param entity - The entity to extract array values from - * @returns Object containing array field names and their values + * Populates OneToMany relation properties from primitive array fields so that + * TypeORM's repository.save() can cascade-insert/update/delete children. + * If an array field is undefined/null, we set the relation array to [] so + * orphaned children are deleted (via orphanedRowAction: 'delete'). */ - extractArrayValues(entity: T): Record { - const arrayValues: Record = {}; - const entityClass = entity.constructor as Function; - const arrayFieldNames = this.getArrayFieldNames(entityClass); - - for (const fieldName of arrayFieldNames) { - const value = (entity as any)[fieldName]; - if (Array.isArray(value)) { - arrayValues[fieldName] = value; - } else if (value == null) { - // Normalize missing arrays to empty arrays to simplify downstream logic - arrayValues[fieldName] = []; - } - } - return arrayValues; - } - - /** - * Extracts main entity fields (excluding arrays and their relationships) for saving. - * - * @param entity - The entity to extract main fields from - * @returns Entity copy without array fields and relationship properties - */ - extractMainEntityFields(entity: T): T { - // Keep it simple: shallow clone and strip only array fields and relationship properties - const entityCopy: any = { ...(entity as any) }; - const entityClass = entity.constructor as Function; - - for (const fieldName of this.getArrayFieldNames(entityClass)) { - // Remove the array field - delete entityCopy[fieldName]; - - // Remove the relationship property used for eager loading - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); - if (arrayMetadata?.relationPropertyName) { - delete entityCopy[arrayMetadata.relationPropertyName]; - } - } - - return entityCopy as T; - } - - /** - * Saves array fields as separate entities. - * - * @param originalEntity - The original entity with array values - * @param arrayValues - Pre-extracted array values - * @param savedEntity - The saved main entity (with generated ID) - * @param typeormDataSource - TypeORM data source for database operations - */ - async saveArrayFields( - originalEntity: T, - arrayValues: Record, - savedEntity: T, - typeormDataSource: TypeORMDataSource - ): Promise { - const entityClass = originalEntity.constructor as Function; + attachArrayRelations(entity: T): void { + const entityClass = (entity as any).constructor as Function; const fieldNames = this.getArrayFieldNames(entityClass); - await Promise.all( - fieldNames.map(async (fieldName) => { - const values = arrayValues[fieldName] ?? []; - await this.persistArrayField(fieldName, values, savedEntity, typeormDataSource, entityClass); - }) - ); - } - - /** - * Saves a single array field as separate entities. - * - * @param fieldName - Name of the array field - * @param arrayValue - Array values to save - * @param savedEntity - The saved main entity - * @param typeormDataSource - TypeORM data source for database operations - * @param entityClass - The entity class - */ - private async persistArrayField( - fieldName: string, - arrayValue: any[], - savedEntity: T, - typeormDataSource: TypeORMDataSource, - entityClass: Function - ): Promise { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata( - 'typeorm:array-field', - entityClass.prototype, - fieldName - ); - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey); + for (const fieldName of fieldNames) { + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata( + 'typeorm:array-field', + entityClass.prototype, + fieldName + ); + if (!arrayMetadata) continue; - if (!ArrayElementEntity) return; + const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey) as any; + const relationPropertyName = arrayMetadata.relationPropertyName as string; - const repository = typeormDataSource.getRepository(ArrayElementEntity as any); + const values = (entity as any)[fieldName]; - // Always remove previous elements for this field, then insert the new snapshot - await repository.delete({ parentId: (savedEntity as any).id }); + if (!Array.isArray(values)) { + // Ensure relation is an empty array to trigger orphan removal when needed + (entity as any)[relationPropertyName] = []; + continue; + } - if (!Array.isArray(arrayValue) || arrayValue.length === 0) { - return; // nothing to insert + // Map primitives to relation entity instances, preserving order/index + const children = values.map((value: any, index: number) => { + const child = new ArrayElementEntity(); + child.value = value; + child.index = index; + // Link back to parent; TypeORM will handle FK via JoinColumn + child.parent = entity; + return child; + }); + + (entity as any)[relationPropertyName] = children; } - - const rows = arrayValue.map((value, index) => - repository.create({ parentId: (savedEntity as any).id, value, index }) - ); - await repository.insert(rows as any); } /** diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 10fd0d1..17a52fb 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -100,7 +100,7 @@ export class TypeORMSqlDataSource extends DataSource { // Get all entities (models + array element entities) const allEntities = [ - ...Array.from(this.registeredModels), + ...Array.from(this.registeredModels), ...this.arrayFieldManager.getArrayElementEntities() ]; @@ -180,7 +180,7 @@ export class TypeORMSqlDataSource extends DataSource { configureModel(modelClass: Function, options?: any): void { // Register this model for inclusion in TypeORM entities this.registeredModels.add(modelClass); - + // Apply the TypeORM @Entity decorator const tableName = options?.tableName || modelClass.name.toLowerCase(); Entity(tableName)(modelClass as any); @@ -193,7 +193,7 @@ export class TypeORMSqlDataSource extends DataSource { // Store that this model is configured for TypeORM Reflect.defineMetadata('datasource:type', 'typeorm-sql', modelClass); - + // Store the dataSource instance in the model metadata for later access Reflect.defineMetadata('model:dataSource', this, modelClass); } @@ -250,22 +250,15 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entity.constructor as any); - - // If entity has an id, we need to handle updates differently - const isUpdate = !!(entity as any).id; - - // Preserve array values before extracting main entity fields - const arrayValues = this.arrayFieldManager.extractArrayValues(entity); - - // Save the main entity first (without arrays converted) - const mainEntityToSave = this.arrayFieldManager.extractMainEntityFields(entity); - const savedMainEntity = await repository.save(mainEntityToSave as any) as T; - - // Now save array fields using the preserved values - await this.arrayFieldManager.saveArrayFields(entity, arrayValues, savedMainEntity, this.typeormDataSource); - - // Return the entity with arrays loaded - const result = await this.findById(entity.constructor as any, (savedMainEntity as any).id); + + // Populate OneToMany relation arrays from primitive array fields so TypeORM can cascade + this.arrayFieldManager.attachArrayRelations(entity); + + // Single save with cascades will insert/update parent and children + const saved = await repository.save(entity as any) as T; + + // Reload to return entity with array primitives via @AfterLoad transformation + const result = await this.findById(entity.constructor as any, (saved as any).id); return result as T; // We know it exists since we just saved it } @@ -277,20 +270,20 @@ export class TypeORMSqlDataSource extends DataSource { * @param criteria - Search criteria (optional) * @returns Promise resolving to array of found entities */ - async find(entityClass: new() => T, criteria?: any): Promise { + async find(entityClass: new () => T, criteria?: any): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } const repository = this.typeormDataSource.getRepository(entityClass); let entities: T[]; - + if (criteria) { entities = await repository.find({ where: criteria }) as T[]; } else { entities = await repository.find() as T[]; } - + // Array fields are automatically transformed via @AfterLoad hooks return entities; } @@ -303,18 +296,18 @@ export class TypeORMSqlDataSource extends DataSource { * @param id - The id of the entity to find * @returns Promise resolving to the found entity or null */ - async findById(entityClass: new() => T, id: string): Promise { + async findById(entityClass: new () => T, id: string): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } const repository = this.typeormDataSource.getRepository(entityClass); const entity = await repository.findOne({ where: { id } as any }) as T | null; - + if (!entity) { return null; } - + // Array fields are automatically transformed via @AfterLoad hooks return entity; } @@ -326,7 +319,7 @@ export class TypeORMSqlDataSource extends DataSource { * @param id - The id of the entity to delete * @returns Promise resolving to delete result */ - async deleteById(entityClass: new() => T, id: string): Promise { + async deleteById(entityClass: new () => T, id: string): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } @@ -342,7 +335,7 @@ export class TypeORMSqlDataSource extends DataSource { * @param criteria - Search criteria (optional) * @returns Promise resolving to count of entities */ - async count(entityClass: new() => T, criteria?: any): Promise { + async count(entityClass: new () => T, criteria?: any): Promise { if (!this.typeormDataSource) { throw new Error('TypeORM DataSource not initialized. Call initialize() first.'); } From 06e2669cff07805eb7a458184b4980c0323c68c3 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 8 Sep 2025 12:46:30 -0300 Subject: [PATCH 126/254] Enhance ArrayFieldManager and TypeORMSqlDataSource to support automatic preparation of OneToMany relations before saving entities --- src/datasources/typeorm/ArrayFieldManager.ts | 117 ++++++++---------- .../typeorm/TypeORMSqlDataSource.ts | 16 ++- 2 files changed, 62 insertions(+), 71 deletions(-) diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index d275db5..82a5c13 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -1,5 +1,4 @@ -import { DataSource as TypeORMDataSource } from 'typeorm'; -import { OneToMany, AfterLoad } from 'typeorm'; +import { OneToMany, AfterLoad, BeforeInsert, BeforeUpdate } from 'typeorm'; import { ArrayEntityFactory } from './ArrayEntityFactory'; /** @@ -7,6 +6,7 @@ import { ArrayEntityFactory } from './ArrayEntityFactory'; */ export interface ArrayFieldMetadata { elementEntityKey: string; + elementEntityClass?: Function; baseFieldType: string; options?: any; relationPropertyName?: string; @@ -66,7 +66,7 @@ export class ArrayFieldManager { } // Get the array element entity for the OneToMany relationship - const ArrayElementEntity = this.arrayElementEntities.get(arrayEntityKey); + const ArrayElementEntity = this.arrayElementEntities.get(arrayEntityKey)!; // Add OneToMany relationship to parent entity for eager loading // Use a different property name to avoid conflicts with the original array field @@ -78,7 +78,7 @@ export class ArrayFieldManager { orphanedRowAction: 'delete' // remove missing children when saving parent })(target, relationPropertyName); - // Add @AfterLoad hook to automatically transform array element entities to arrays + // Add @AfterLoad hook to automatically transform array element entities to arrays const afterLoadMethodName = `_afterLoad_${propertyKey}`; // Create the afterLoad method if it doesn't exist @@ -116,6 +116,56 @@ export class ArrayFieldManager { }; } + // Add hooks to populate relation arrays from primitive arrays before insert/update + const beforeInsertMethodName = `_beforeInsert_${propertyKey}`; + const beforeUpdateMethodName = `_beforeUpdate_${propertyKey}`; + + if (!target[beforeInsertMethodName]) { + target[beforeInsertMethodName] = function () { + this._prepareArrayRelations(); + }; + BeforeInsert()(target, beforeInsertMethodName); + } + + if (!target[beforeUpdateMethodName]) { + target[beforeUpdateMethodName] = function () { + this._prepareArrayRelations(); + }; + BeforeUpdate()(target, beforeUpdateMethodName); + } + + // Main preparation method to build relation children from primitive arrays + if (!target._prepareArrayRelations) { + target._prepareArrayRelations = function () { + const entityClass = this.constructor as Function; + const arrayFieldNames: string[] = Reflect.getMetadata('array:field:names', entityClass) || []; + + for (const fieldName of arrayFieldNames) { + const meta: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + if (!meta || !meta.relationPropertyName) continue; + + const relationProp = meta.relationPropertyName as string; + const values = this[fieldName]; + + if (!Array.isArray(values)) { + this[relationProp] = []; + continue; + } + + const ElementClass = meta.elementEntityClass as any; + const children = values.map((value: any, index: number) => { + const child = new ElementClass(); + child.value = value; + child.index = index; + child.parent = this; + return child; + }); + + this[relationProp] = children; + } + }; + } + // Keep track of array field names for this entity class const existingArrayFields = Reflect.getMetadata('array:field:names', target.constructor) || []; if (!existingArrayFields.includes(propertyKey)) { @@ -125,6 +175,7 @@ export class ArrayFieldManager { // Store metadata about this array field const metadata: ArrayFieldMetadata = { elementEntityKey: arrayEntityKey, + elementEntityClass: ArrayElementEntity as Function, baseFieldType: baseFieldType, options: fieldOptions, relationPropertyName: relationPropertyName @@ -137,62 +188,4 @@ export class ArrayFieldManager { this.arrayFieldNamesCache.delete(target.constructor); } - /** - * Populates OneToMany relation properties from primitive array fields so that - * TypeORM's repository.save() can cascade-insert/update/delete children. - * If an array field is undefined/null, we set the relation array to [] so - * orphaned children are deleted (via orphanedRowAction: 'delete'). - */ - attachArrayRelations(entity: T): void { - const entityClass = (entity as any).constructor as Function; - const fieldNames = this.getArrayFieldNames(entityClass); - - for (const fieldName of fieldNames) { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata( - 'typeorm:array-field', - entityClass.prototype, - fieldName - ); - if (!arrayMetadata) continue; - - const ArrayElementEntity = this.arrayElementEntities.get(arrayMetadata.elementEntityKey) as any; - const relationPropertyName = arrayMetadata.relationPropertyName as string; - - const values = (entity as any)[fieldName]; - - if (!Array.isArray(values)) { - // Ensure relation is an empty array to trigger orphan removal when needed - (entity as any)[relationPropertyName] = []; - continue; - } - - // Map primitives to relation entity instances, preserving order/index - const children = values.map((value: any, index: number) => { - const child = new ArrayElementEntity(); - child.value = value; - child.index = index; - // Link back to parent; TypeORM will handle FK via JoinColumn - child.parent = entity; - return child; - }); - - (entity as any)[relationPropertyName] = children; - } - } - - /** - * Gets the array field names for a given entity class, cached for reuse. - */ - private getArrayFieldNames(entityClass: Function): string[] { - const cached = this.arrayFieldNamesCache.get(entityClass); - if (cached) return cached; - - const fieldNames: string[] = Reflect.getMetadata('model:fields', entityClass) || []; - const arrayFields = fieldNames.filter((fieldName) => { - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - return typeof fieldType === 'string' && fieldType.startsWith('array:'); - }); - this.arrayFieldNamesCache.set(entityClass, arrayFields); - return arrayFields; - } } diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 17a52fb..860b47e 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -251,15 +251,15 @@ export class TypeORMSqlDataSource extends DataSource { const repository = this.typeormDataSource.getRepository(entity.constructor as any); - // Populate OneToMany relation arrays from primitive array fields so TypeORM can cascade - this.arrayFieldManager.attachArrayRelations(entity); + // Ensure relation arrays are prepared before save so cascading can persist children + if (typeof (entity as any)._prepareArrayRelations === 'function') { + (entity as any)._prepareArrayRelations(); + } - // Single save with cascades will insert/update parent and children + // Single save with cascades will insert/update parent and children. const saved = await repository.save(entity as any) as T; - // Reload to return entity with array primitives via @AfterLoad transformation - const result = await this.findById(entity.constructor as any, (saved as any).id); - return result as T; // We know it exists since we just saved it + return saved as T; } /** @@ -283,8 +283,7 @@ export class TypeORMSqlDataSource extends DataSource { } else { entities = await repository.find() as T[]; } - - // Array fields are automatically transformed via @AfterLoad hooks + return entities; } @@ -308,7 +307,6 @@ export class TypeORMSqlDataSource extends DataSource { return null; } - // Array fields are automatically transformed via @AfterLoad hooks return entity; } From 3216bbb7b6583bfa5a72769236cf68ba5d6381f8 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 10:23:54 -0300 Subject: [PATCH 127/254] Update package.json and tsconfig files for improved module resolution and build configuration --- package.json | 4 ++-- tsconfig.build.json | 5 +++-- tsconfig.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a69574c..a4837b1 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,9 @@ "name": "slingr-framework", "version": "1.0.0", "description": "Slingr Framework - Smart Business Apps", + "main": "./dist/index.js", "exports": { - ".": "./index.js" + ".": "./dist/index.js" }, "scripts": { "test": "jest --verbose", @@ -16,7 +17,6 @@ }, "author": "Slingr", "license": "Apache-2.0", - "type": "module", "bugs": { "url": "https://github.com/slingr-stack/framework/issues" }, diff --git a/tsconfig.build.json b/tsconfig.build.json index 6f26673..f07362d 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,8 +1,9 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "rootDir": "./src" + "rootDir": ".", + "outDir": "./dist" }, - "include": ["src/**/*"], + "include": ["src/**/*", "index.ts"], "exclude": ["node_modules", "dist", "test"] } diff --git a/tsconfig.json b/tsconfig.json index bdfe4d7..6ef91de 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ "sourceMap": true, "declaration": true, "declarationMap": true, - "noUncheckedIndexedAccess": true, + "noUncheckedIndexedAccess": false, "exactOptionalPropertyTypes": true, "strict": true, "jsx": "react-jsx", From 0d078c9c607f6be3abf39bc7e167b69cc19b232f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 11:36:48 -0300 Subject: [PATCH 128/254] Refactor import statements in Task model for consistency --- test/model/Task.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/model/Task.ts b/test/model/Task.ts index 1b11d88..e9231e5 100644 --- a/test/model/Task.ts +++ b/test/model/Task.ts @@ -1,8 +1,5 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { BaseModel } from "../../src/model/BaseModel"; -import { Choice, Text, Relationship, HTML } from "../../src/model/types"; -import { Project } from "./Project"; +import { BaseModel, Field, Model, Choice, Text, Relationship, HTML } from '../../index'; +import { Project } from './Project'; export enum TaskStatus { ToDo = 'toDo', From 6588cd50e668dcdd484bae1bf13545b78a7c4e49 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 11:39:41 -0300 Subject: [PATCH 129/254] Refactor imports in test files and BlogPost model for consistency --- index.ts | 1 + test/datasources/MultiDatabaseOperations.test.ts | 2 +- test/datasources/TypeORMRepositoryMethods.test.ts | 2 +- test/model/BlogPost.ts | 5 +---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/index.ts b/index.ts index b3974f9..ccd5bab 100644 --- a/index.ts +++ b/index.ts @@ -23,4 +23,5 @@ export { Number } from './src/model/types/number/Number'; export { Decimal } from './src/model/types/number/Decimal'; export { PersistentModel } from './src/model'; export { TypeORMSqlDataSource } from './src/datasources'; +export type { TypeORMSqlDataSourceOptions } from './src/datasources'; export { Relationship } from './src/model/types'; diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/test/datasources/MultiDatabaseOperations.test.ts index 83432a1..9bd0164 100644 --- a/test/datasources/MultiDatabaseOperations.test.ts +++ b/test/datasources/MultiDatabaseOperations.test.ts @@ -1,4 +1,4 @@ -import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../src/datasources/typeorm/TypeORMSqlDataSource'; +import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../index'; import { BlogPost } from '../model/BlogPost'; import * as fs from 'fs'; diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index 6f7c732..720df51 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -1,7 +1,7 @@ import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions -} from '../../src/datasources/typeorm/TypeORMSqlDataSource'; +} from '../../index'; import { BlogPost } from '../model/BlogPost'; import { FindOptionsWhere, FindManyOptions, FindOneOptions } from 'typeorm'; diff --git a/test/model/BlogPost.ts b/test/model/BlogPost.ts index 4d005e2..23c1dae 100644 --- a/test/model/BlogPost.ts +++ b/test/model/BlogPost.ts @@ -1,7 +1,4 @@ -import { Field } from "../../src/model/Field"; -import { Model } from "../../src/model/Model"; -import { PersistentModel } from "../../src/model/PersistentModel"; -import { Text, HTML, Email } from "../../src/model/types"; +import { Field, Model, PersistentModel, Text, HTML, Email } from '../../index'; @Model({ docs: "Represents a blog post with array fields", From a0651e6e453ace90cdd796f6c85b02f56d874898 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 11:48:07 -0300 Subject: [PATCH 130/254] Update DecimalTypeConfig to dynamically set precision based on max value --- src/model/types/number/Decimal.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index a32e9ef..6dc164c 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -176,9 +176,16 @@ export const DecimalTypeConfig: FieldTypeConfig = { fieldOptions?.roundingType || 'truncate' ); + let precision = 10; + if (fieldOptions?.max) { + // Remove decimal point and count total digits + const maxDigits = fieldOptions.max.replace('.', '').length; + precision = maxDigits; + } + return { type: 'decimal', - precision: 10, + precision: precision, scale: fieldOptions?.decimals || 2, nullable: nullable, transformer: transformer From b99ab7a2abbe247bb7904544354ddf14d8d74478 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 11:50:24 -0300 Subject: [PATCH 131/254] Update MoneyTypeConfig to dynamically set precision based on max value --- src/model/types/number/Money.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index 353e11b..b4d67bb 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -169,9 +169,16 @@ export const MoneyTypeConfig: FieldTypeConfig = { fieldOptions?.roundingType || 'truncate' ); + let precision = 19; + if (fieldOptions?.max) { + // Remove decimal point and count total digits + const maxDigits = fieldOptions.max.replace('.', '').length; + precision = maxDigits; + } + return { type: 'decimal', - precision: 19, + precision: precision, scale: fieldOptions?.decimals || 2, nullable: nullable, transformer: transformer From 75945b7f0d2f9ca39761712b5d25e98c76f734de Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 9 Sep 2025 11:52:15 -0300 Subject: [PATCH 132/254] Enhance FinancialNumberTransformer to log conversion errors and improve fallback handling --- src/datasources/typeorm/ValueTransformers.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/datasources/typeorm/ValueTransformers.ts b/src/datasources/typeorm/ValueTransformers.ts index 8cc0756..03caf80 100644 --- a/src/datasources/typeorm/ValueTransformers.ts +++ b/src/datasources/typeorm/ValueTransformers.ts @@ -23,16 +23,17 @@ export class FinancialNumberTransformer implements ValueTransformer { if (value === null || value === undefined) { return null; } - + if (typeof value === 'object' && value !== null && 'toString' in value) { return value.toString(this.decimals, this.roundingStrategy); } - + // Fallback for edge cases - create a new FinancialNumber and format it try { const fn = number(String(value)); return fn.toString(this.decimals, this.roundingStrategy); } catch (error) { + console.warn(`Failed to convert FinancialNumber to string for value: ${value}`, error); return String(value); } } @@ -46,7 +47,7 @@ export class FinancialNumberTransformer implements ValueTransformer { if (value === null || value === undefined) { return undefined; } - + try { const fn = number(String(value)); // Apply the configured precision and rounding @@ -66,7 +67,7 @@ export class FinancialNumberTransformer implements ValueTransformer { * @returns Configured transformer instance */ export function createFinancialNumberTransformer( - decimals: number = 2, + decimals: number = 2, roundingType: 'truncate' | 'roundHalfToEven' = 'truncate' ): FinancialNumberTransformer { return new FinancialNumberTransformer(decimals, roundingType); From ba67543b01d56743b15fdb2cb8fa077e01c84831 Mon Sep 17 00:00:00 2001 From: Luciano Date: Tue, 9 Sep 2025 13:56:08 -0300 Subject: [PATCH 133/254] Adds addComposition command --- package.json | 14 ++ src/commands/commandRegistration.ts | 168 +++++++++++--- src/commands/fields/addField.ts | 1 + src/commands/models/addComposition.ts | 292 +++++++++++++++++++++++++ src/explorer/explorerProvider.ts | 153 +++++++------ src/services/projectAnalysisService.ts | 5 +- src/services/sourceCodeService.ts | 55 ++++- src/test/addComposition.test.ts | 248 +++++++++++++++++++++ 8 files changed, 835 insertions(+), 101 deletions(-) create mode 100644 src/commands/models/addComposition.ts create mode 100644 src/test/addComposition.test.ts diff --git a/package.json b/package.json index 5a56b4c..8b99e0c 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,10 @@ "command": "slingr-vscode-extension.addField", "title": "Add Field" }, + { + "command": "slingr-vscode-extension.addComposition", + "title": "Add Composition" + }, { "command": "slingr-vscode-extension.newFolder", "title": "New Folder" @@ -139,6 +143,11 @@ "when": "view == slingrExplorer && viewItem == 'model'", "group": "0_creation" }, + { + "command": "slingr-vscode-extension.addComposition", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "0_creation" + }, { "command": "slingr-vscode-extension.createTest", "when": "view == slingrExplorer && viewItem == 'model'", @@ -226,6 +235,11 @@ "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", "group": "1_field" }, + { + "command": "slingr-vscode-extension.addComposition", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_field" + }, { "command": "slingr-vscode-extension.createTest", "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index e38e7bf..e7c5c7f 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -1,5 +1,5 @@ import * as vscode from 'vscode'; -import { MetadataCache } from '../cache/cache'; +import { DecoratedClass, MetadataCache } from '../cache/cache'; import { ExplorerProvider } from '../explorer/explorerProvider'; import { NewModelTool } from './models/newModel'; import { DefineFieldsTool } from './fields/defineFields'; @@ -11,7 +11,9 @@ import { CreateTestTool } from './createTest'; import { AppTreeItem } from '../explorer/appTreeItem'; import { CreateModelFromDescriptionTool } from './models/createModelFromDesc'; import { ModifyModelTool } from './models/modifyModel'; +import { AddCompositionTool } from './models/addComposition'; import { AIService } from '../services/aiService'; +import { ProjectAnalysisService } from '../services/projectAnalysisService'; export function registerGeneralCommands( context: vscode.ExtensionContext, @@ -20,6 +22,7 @@ export function registerGeneralCommands( ): vscode.Disposable[] { const disposables: vscode.Disposable[] = []; const aiService = new AIService(); + const projectAnalysisService = new ProjectAnalysisService(); // Navigation command const navigateToCodeCommand = vscode.commands.registerCommand('slingr-vscode-extension.navigateToCode', (location: vscode.Location) => { @@ -54,30 +57,55 @@ export function registerGeneralCommands( // Define Fields Tool const defineFieldsTool = new DefineFieldsTool(); - const defineFieldsCommand = vscode.commands.registerCommand('slingr-vscode-extension.defineFields', async () => { - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please open a model file to define fields.'); + const defineFieldsCommand = vscode.commands.registerCommand('slingr-vscode-extension.defineFields', async (uri?: vscode.Uri | AppTreeItem) => { + let targetUri: vscode.Uri; + + if (uri) { + // URI provided from context menu (right-click on file in explorer) + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case - check if it's a model with metadata + if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + } else { + vscode.window.showErrorMessage('Please select a model file to define fields for.'); + return; + } + } + } else { + // Fallback to active editor if no URI provided + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please select a model file or open one in the editor to define fields.'); + return; + } + targetUri = activeEditor.document.uri; + } + + // Validate that it's a TypeScript file + if (!targetUri.fsPath.endsWith('.ts')) { + vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); return; } - const document = activeEditor.document; + // Open the document to extract model information + const document = await vscode.workspace.openTextDocument(targetUri); const content = document.getText(); // Check if this is a model file if (!content.includes('@Model')) { - vscode.window.showErrorMessage('The current file does not appear to be a model file.'); + vscode.window.showErrorMessage('The selected file does not appear to be a model file.'); return; } - // Extract model name from class declaration - const classMatch = content.match(/export\s+class\s+(\w+)\s+extends\s+BaseModel/); - if (!classMatch) { - vscode.window.showErrorMessage('Could not find model class definition.'); + const model = await projectAnalysisService.findModelClass(document, cache); + + if (!model) { + vscode.window.showErrorMessage('Could not identify a model class in the selected file.'); return; } - - const modelName = classMatch[1]; + const modelName = model?.name; // Get field descriptions from user const fieldsDescription = await vscode.window.showInputBox({ @@ -93,7 +121,7 @@ export function registerGeneralCommands( try { await defineFieldsTool.processFieldDescriptions( fieldsDescription, - document.uri, + targetUri, cache, modelName ); @@ -105,30 +133,88 @@ export function registerGeneralCommands( // Add Field Tool const addFieldTool = new AddFieldTool(); - const addFieldCommand = vscode.commands.registerCommand('slingr-vscode-extension.addField', async () => { - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please open a model file to add a field.'); - return; + const addFieldCommand = vscode.commands.registerCommand('slingr-vscode-extension.addField', async (uri?: vscode.Uri | AppTreeItem) => { + let targetUri: vscode.Uri; + + if (uri) { + // URI provided from context menu (right-click on file in explorer) + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case - check if it's a model with metadata + if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + } else { + vscode.window.showErrorMessage('Please select a model file to add a field to.'); + return; + } + } + } else { + // Fallback to active editor if no URI provided + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please select a model file or open one in the editor to add a field.'); + return; + } + targetUri = activeEditor.document.uri; } - const document = activeEditor.document; - const content = document.getText(); - - // Check if this is a model file - if (!content.includes('@Model')) { - vscode.window.showErrorMessage('The current file does not appear to be a model file.'); + // Validate that it's a TypeScript file + if (!targetUri.fsPath.endsWith('.ts')) { + vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); return; } try { - await addFieldTool.addField(document.uri, cache); + await addFieldTool.addField(targetUri, cache); } catch (error) { vscode.window.showErrorMessage(`Failed to add field: ${error}`); } }); disposables.push(addFieldCommand); + // Add Composition Tool + const addCompositionTool = new AddCompositionTool(); + const addCompositionCommand = vscode.commands.registerCommand('slingr-vscode-extension.addComposition', async (uri?: vscode.Uri | AppTreeItem) => { + let targetUri: vscode.Uri; + + if (uri) { + // URI provided from context menu (right-click on file in explorer) + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case - check if it's a model with metadata + if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + } else { + vscode.window.showErrorMessage('Please select a model file to add a composition to.'); + return; + } + } + } else { + // Fallback to active editor if no URI provided + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please select a model file or open one in the editor to add a composition.'); + return; + } + targetUri = activeEditor.document.uri; + } + + // Validate that it's a TypeScript file + if (!targetUri.fsPath.endsWith('.ts')) { + vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); + return; + } + + try { + await addCompositionTool.addComposition(targetUri, cache); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add composition: ${error}`); + } + }); + disposables.push(addCompositionCommand); + // New Folder Tool const newFolderTool = new NewFolderTool(); const newFolderCommand = vscode.commands.registerCommand('slingr-vscode-extension.newFolder', (uri?: vscode.Uri | AppTreeItem) => { @@ -152,18 +238,38 @@ export function registerGeneralCommands( // Create Test Tool const createTestTool = new CreateTestTool(aiService); - const createTestCommand = vscode.commands.registerCommand('slingr-vscode-extension.createTest', async (uri?: vscode.Uri) => { - let targetUri = uri; - - if (!targetUri) { + const createTestCommand = vscode.commands.registerCommand('slingr-vscode-extension.createTest', async (uri?: vscode.Uri | AppTreeItem) => { + let targetUri: vscode.Uri; + + if (uri) { + // URI provided from context menu (right-click on file in explorer) + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case - check if it's a model with metadata + if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + } else { + vscode.window.showErrorMessage('Please select a model file to create a test for.'); + return; + } + } + } else { + // Fallback to active editor if no URI provided const activeEditor = vscode.window.activeTextEditor; if (!activeEditor) { - vscode.window.showErrorMessage('Please open a model file or select a file to create a test.'); + vscode.window.showErrorMessage('Please select a model file or open one in the editor to create a test.'); return; } targetUri = activeEditor.document.uri; } + // Validate that it's a TypeScript file + if (!targetUri.fsPath.endsWith('.ts')) { + vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); + return; + } + try { await createTestTool.createTest(targetUri, cache); } catch (error) { diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index 8083aba..c6348bb 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -203,6 +203,7 @@ export class AddFieldTool implements AIEnhancedTool { } const modelClass = await this.projectAnalysisService.findModelClass(document, cache); + if (!modelClass) { throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); } diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts new file mode 100644 index 0000000..a2b4a0f --- /dev/null +++ b/src/commands/models/addComposition.ts @@ -0,0 +1,292 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass } from "../../cache/cache"; +import { AIEnhancedTool, FieldInfo, FieldTypeOption } from "../interfaces"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; + +/** + * Tool for adding composition relationships to existing Model classes. + * + * This tool creates a new inner model within the same file as the outer model + * and establishes a composition relationship between them. The inner model + * name is derived from the field name (converted to singular), and the field + * in the outer model is created as an array if the field name is plural. + * + * @example + * ```typescript + * // Adding field "addresses" creates: + * // 1. New Address model with backref to parent + * // 2. Field in outer model: addresses: Address[] + * + * @Field() + * @Relationship({ type: 'composition' }) + * addresses!: Address[]; + * ``` + */ +export class AddCompositionTool implements AIEnhancedTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + } + + /** + * Processes user input with AI enhancement for composition addition. + * @param userInput - Description of the composition to create + * @param targetUri - Target model file for the new composition + * @param cache - Metadata cache instance + * @param additionalContext - Additional context for composition creation + */ + async processWithAI( + userInput: string, + targetUri: vscode.Uri, + cache: MetadataCache, + additionalContext?: any + ): Promise { + // For now, delegate to the main method + await this.addComposition(targetUri, cache); + } + + /** + * Adds a composition relationship to an existing model file. + * + * @param targetUri - The URI of the model file where the composition should be added + * @param cache - The metadata cache for context about existing models + * @returns Promise that resolves when the composition is added + */ + public async addComposition(targetUri: vscode.Uri, cache: MetadataCache): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + + // Step 2: Get field name from user + const fieldName = await this.getCompositionFieldName(modelClass); + if (!fieldName) { + return; // User cancelled + } + + // Step 3: Determine inner model name and array status + const { innerModelName, isArray } = this.determineInnerModelInfo(fieldName); + + // Step 4: Check if inner model already exists + await this.validateInnerModelName(document, innerModelName); + + // Step 5: Create the inner model + await this.createInnerModel(document, innerModelName, modelClass.name); + + // Step 6: Add composition field to outer model + await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); + + // Step 7: Show success message + vscode.window.showInformationMessage( + `Composition relationship created successfully! Added ${innerModelName} model and ${fieldName} field.` + ); + + } catch (error) { + vscode.window.showErrorMessage(`Failed to add composition: ${error}`); + console.error("Error adding composition:", error); + } + } + + /** + * Validates the target file and prepares it for composition addition. + */ + private async validateAndPrepareTarget( + targetUri: vscode.Uri, + cache: MetadataCache + ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { + // Ensure the file is a TypeScript file + if (!targetUri.fsPath.endsWith(".ts")) { + throw new Error("Target file must be a TypeScript file (.ts)"); + } + + // Open the document + const document = await vscode.workspace.openTextDocument(targetUri); + + // Get model information from cache + const modelClass = await this.projectAnalysisService.findModelClass(document, cache); + if (!modelClass) { + throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); + } + + return { modelClass, document }; + } + + /** + * Gets the composition field name from the user. + */ + private async getCompositionFieldName(modelClass: DecoratedClass): Promise { + const fieldName = await vscode.window.showInputBox({ + prompt: "Enter the composition field name (camelCase)", + placeHolder: "e.g., addresses, phoneNumbers, tasks", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Field name is required"; + } + if (!/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Field name must be in camelCase (e.g., addresses, phoneNumbers)"; + } + + // Check if field already exists in the model + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(value.trim())) { + return `Field '${value.trim()}' already exists in this model`; + } + + return null; + }, + }); + + return fieldName?.trim() || null; + } + + /** + * Determines the inner model name and whether the field should be an array. + */ + private determineInnerModelInfo(fieldName: string): { innerModelName: string; isArray: boolean } { + const singularName = this.toSingular(fieldName); + const innerModelName = this.toPascalCase(singularName); + const isArray = fieldName !== singularName; // If we converted from plural to singular, it's an array + + return { innerModelName, isArray }; + } + + /** + * Converts a potentially plural field name to singular. + */ + private toSingular(fieldName: string): string { + // Handle common pluralization patterns + if (fieldName.endsWith("ies")) { + return fieldName.slice(0, -3) + "y"; + } else if (fieldName.endsWith("es")) { + // Check if it's a word that ends with s, x, ch, sh + const base = fieldName.slice(0, -1); + if (base.endsWith("s") || base.endsWith("x") || base.endsWith("ch") || base.endsWith("sh")) { + return base; + } + // Otherwise it might be a regular plural like "boxes" -> "box" + return fieldName.slice(0, -2); + } else if (fieldName.endsWith("s") && fieldName.length > 1) { + // Simple plural case + return fieldName.slice(0, -1); + } + + // If no plural pattern found, return as is + return fieldName; + } + + /** + * Converts camelCase to PascalCase. + */ + private toPascalCase(str: string): string { + return str.charAt(0).toUpperCase() + str.slice(1); + } + + /** + * Validates that the inner model name doesn't already exist. + */ + private async validateInnerModelName(document: vscode.TextDocument, innerModelName: string): Promise { + const content = document.getText(); + if (content.includes(`class ${innerModelName}`)) { + throw new Error(`A class named '${innerModelName}' already exists in this file`); + } + } + + /** + * Creates the inner model in the same file. + */ + private async createInnerModel( + document: vscode.TextDocument, + innerModelName: string, + outerModelName: string + ): Promise { + // Generate the inner model code + const innerModelCode = this.generateInnerModelCode(innerModelName, outerModelName); + + // Use the new insertModel method to insert after the outer model + await this.sourceCodeService.insertModel( + document, + innerModelCode, + outerModelName, // Insert after the outer model + new Set(["Model", "Field", "Relationship"]) // Ensure required decorators are imported + ); + } + + /** + * Generates the TypeScript code for the inner model. + */ + private generateInnerModelCode(innerModelName: string, outerModelName: string): string { + const lines: string[] = []; + + lines.push(`@Model()`); + lines.push(`class ${innerModelName} {`); + lines.push(``); + lines.push(`}`); + + return lines.join("\n"); + } + + /** + * Adds the composition field to the outer model. + */ + private async addCompositionField( + document: vscode.TextDocument, + outerModelName: string, + fieldName: string, + innerModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Create field info for the composition field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Relationship", + tsType: isArray ? `${innerModelName}[]` : innerModelName, + description: "Composition relationship" + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // Compositions are typically optional + additionalConfig: { + relationshipType: "composition", + targetModel: innerModelName, + targetModelPath: document.uri.fsPath + } + }; + + // Generate the field code + const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); + + // Insert the field + await this.sourceCodeService.insertField(document, outerModelName, fieldInfo, fieldCode, cache); + } + + /** + * Generates the TypeScript code for the composition field. + */ + private generateCompositionFieldCode(fieldInfo: FieldInfo, innerModelName: string, isArray: boolean): string { + const lines: string[] = []; + + // Add Field decorator + lines.push("@Field({})"); + + // Add Relationship decorator + lines.push("@Composition()"); + + // Add property declaration + const typeDeclaration = isArray ? `${innerModelName}[]` : innerModelName; + lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + + return lines.join("\n"); + } +} diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index 0527ca0..2dbf894 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -5,7 +5,6 @@ import { AppTreeItem } from "./appTreeItem"; import * as fs from "fs"; import * as path from "path"; - // Define custom MIME types for our drag-and-drop operations const FIELD_MIME_TYPE = "application/vnd.slingr-vscode-extension.field"; const MODEL_MIME_TYPE = "application/vnd.slingr-vscode-extension.model"; @@ -69,7 +68,11 @@ export class ExplorerProvider }) ); } - } else if (draggedItem.itemType === "model" && draggedItem.metadata && this.isDecoratedClass(draggedItem.metadata)) { + } else if ( + draggedItem.itemType === "model" && + draggedItem.metadata && + this.isDecoratedClass(draggedItem.metadata) + ) { // Check if this is a composition model (nested model within another model) if (draggedItem.parent && draggedItem.parent.itemType === "model") { // This is a composition model @@ -147,19 +150,19 @@ export class ExplorerProvider const modelTransferItem = dataTransfer.get(MODEL_MIME_TYPE); const folderTransferItem = dataTransfer.get(FOLDER_MIME_TYPE); - if (fieldTransferItem?.value !== '' && fieldTransferItem) { + if (fieldTransferItem?.value !== "" && fieldTransferItem) { await this.handleFieldDrop(target, fieldTransferItem); return; } // Handle model moving to folders - if (modelTransferItem?.value !== '' && modelTransferItem) { + if (modelTransferItem?.value !== "" && modelTransferItem) { await this.handleModelDrop(target, modelTransferItem); return; } // Handle folder moving to other folders - if (folderTransferItem?.value !== '' && folderTransferItem) { + if (folderTransferItem?.value !== "" && folderTransferItem) { await this.handleFolderDrop(target, folderTransferItem); return; } @@ -173,7 +176,9 @@ export class ExplorerProvider // Check if someone is trying to drop a composition model into a folder or data root if (target && (target.itemType === "folder" || target.itemType === "dataRoot" || target.itemType === "model")) { - vscode.window.showWarningMessage("Composition models cannot be moved to folders or models. They are part of their parent model structure."); + vscode.window.showWarningMessage( + "Composition models cannot be moved to folders or models. They are part of their parent model structure." + ); return; } @@ -281,7 +286,7 @@ export class ExplorerProvider return; } - const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + const srcDataPath = path.join(workspaceFolder.uri.fsPath, "src", "data"); const targetPath = target.itemType === "dataRoot" ? srcDataPath : path.join(srcDataPath, target.folderPath || ""); try { @@ -306,15 +311,15 @@ export class ExplorerProvider const workspaceEdit = new vscode.WorkspaceEdit(); const sourceUri = vscode.Uri.file(sourcePath); const targetUri = vscode.Uri.file(newPath); - + workspaceEdit.renameFile(sourceUri, targetUri); - + const success = await vscode.workspace.applyEdit(workspaceEdit); - + if (success) { // Force cache refresh after model move to ensure proper file path updates await this.cache.forceRefresh(); - + // Wait a bit longer and then refresh the tree to ensure cache is fully updated setTimeout(() => { this.refresh(); @@ -330,7 +335,10 @@ export class ExplorerProvider } } - private async handleFolderDrop(target: AppTreeItem | undefined, transferItem: vscode.DataTransferItem): Promise { + private async handleFolderDrop( + target: AppTreeItem | undefined, + transferItem: vscode.DataTransferItem + ): Promise { const draggedData = transferItem.value; // Folders can only be dropped into other folders or the data root @@ -344,7 +352,7 @@ export class ExplorerProvider // Normalize paths for cross-platform comparison const normalizedTargetPath = target.folderPath.replace(/[\/\\]/g, path.sep); const normalizedDraggedPath = draggedData.folderPath.replace(/[\/\\]/g, path.sep); - + if (normalizedTargetPath.startsWith(normalizedDraggedPath)) { vscode.window.showWarningMessage("Cannot move a folder into itself or its subfolder."); return; @@ -357,15 +365,18 @@ export class ExplorerProvider return; } - const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + const srcDataPath = path.join(workspaceFolder.uri.fsPath, "src", "data"); const sourcePath = path.join(srcDataPath, draggedData.folderPath); - const targetBasePath = target.itemType === "dataRoot" ? srcDataPath : path.join(srcDataPath, target.folderPath || ""); + const targetBasePath = + target.itemType === "dataRoot" ? srcDataPath : path.join(srcDataPath, target.folderPath || ""); const newPath = path.join(targetBasePath, draggedData.folderName); try { // Check if target folder already exists if (fs.existsSync(newPath)) { - vscode.window.showErrorMessage(`A folder named "${draggedData.folderName}" already exists in the target location.`); + vscode.window.showErrorMessage( + `A folder named "${draggedData.folderName}" already exists in the target location.` + ); return; } @@ -379,15 +390,15 @@ export class ExplorerProvider const workspaceEdit = new vscode.WorkspaceEdit(); const sourceUri = vscode.Uri.file(sourcePath); const targetUri = vscode.Uri.file(newPath); - + workspaceEdit.renameFile(sourceUri, targetUri); - + const success = await vscode.workspace.applyEdit(workspaceEdit); - + if (success) { // Force cache refresh after folder move to ensure proper file path updates await this.cache.forceRefresh(); - + // Wait a bit longer and then refresh the tree to ensure cache is fully updated setTimeout(() => { this.refresh(); @@ -487,7 +498,8 @@ export class ExplorerProvider (d) => d.name === "Relationship" && d.arguments.some((arg) => arg.type === "Composition" || arg.type === "composition") - ) + ) || + field.decorators.some((d) => d.name === "Composition") ) { const relationshipType = this.extractBaseTypeFromArrayType(field.type); const relatedModel = this.cache.getDataModelClasses().find((model) => model.name === relationshipType); @@ -500,7 +512,7 @@ export class ExplorerProvider relatedModel, element ); - + // Set command for click handling (single vs double-click detection) if (relatedModel) { compositionItem.command = { @@ -599,12 +611,12 @@ export class ExplorerProvider return; } - const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + const srcDataPath = path.join(workspaceFolder.uri.fsPath, "src", "data"); if (!fs.existsSync(srcDataPath)) { return; } - this.scanDirectoryRecursively(srcDataPath, root, ''); + this.scanDirectoryRecursively(srcDataPath, root, ""); } /** @@ -613,7 +625,7 @@ export class ExplorerProvider private scanDirectoryRecursively(dirPath: string, currentNode: FolderNode, relativePath: string): void { try { const entries = fs.readdirSync(dirPath, { withFileTypes: true }); - + for (const entry of entries) { if (entry.isDirectory()) { const folderName = entry.name; @@ -689,8 +701,14 @@ export class ExplorerProvider // Only show models that are NOT referenced by composition relationships if (!this.isModelReferencedByComposition(model)) { - const modelItem = new AppTreeItem(label, vscode.TreeItemCollapsibleState.Collapsed, "model", this.extensionUri, model); - + const modelItem = new AppTreeItem( + label, + vscode.TreeItemCollapsibleState.Collapsed, + "model", + this.extensionUri, + model + ); + // Set command for click handling (single vs double-click detection) modelItem.command = { command: "slingr-vscode-extension.handleTreeItemClick", @@ -742,50 +760,51 @@ export class ExplorerProvider } private isModelReferencedByComposition(item: DecoratedClass): boolean { - // Instead of relying on pre-computed references, scan all models in the cache - // to find composition relationships. This is more reliable after file moves. - const allModels = this.cache.getDataModelClasses(); - - for (const model of allModels) { - // Skip the model itself - if (model.name === item.name) { - continue; - } - - // Check all properties of this model - for (const property of Object.values(model.properties)) { - // Check if this property references our target model type - const baseType = this.extractBaseTypeFromArrayType(property.type); - - if (baseType === item.name) { - // Check if this property has a @Field decorator (indicating it's a field) - const hasFieldDecorator = property.decorators.some((d) => d.name === "Field"); - - if (hasFieldDecorator) { - // Check if this property has a @Relationship decorator with type: "Composition" - const relationshipDecorator = property.decorators.find((d) => d.name === "Relationship"); - - if (relationshipDecorator) { - // Check if the relationship decorator has type: "Composition" or "composition" - const hasCompositionType = relationshipDecorator.arguments.some( - (arg) => { - if (typeof arg === "object" && arg !== null) { - return arg.type === "Composition" || arg.type === "composition"; - } - return arg === "Composition" || arg === "composition"; - } - ); - - if (hasCompositionType) { - return true; - } - } - } + // Instead of relying on pre-computed references, scan all models in the cache + // to find composition relationships. This is more reliable after file moves. + const allModels = this.cache.getDataModelClasses(); + + for (const model of allModels) { + // Skip the model itself + if (model.name === item.name) { + continue; + } + + // Check all properties of this model + for (const property of Object.values(model.properties)) { + // Check if this property references our target model type + const baseType = this.extractBaseTypeFromArrayType(property.type); + + if (baseType === item.name) { + // Check if this property has a @Field decorator (indicating it's a field) + const hasFieldDecorator = property.decorators.some((d) => d.name === "Field"); + + if (hasFieldDecorator) { + // Check if this property has a @Relationship decorator with type: "Composition" + const relationshipDecorator = property.decorators.find((d) => d.name === "Relationship"); + const compositionDecorator = property.decorators.find((d) => d.name === "Composition"); + + if (relationshipDecorator) { + // Check if the relationship decorator has type: "Composition" or "composition" + const hasCompositionType = relationshipDecorator.arguments.some((arg) => { + if (typeof arg === "object" && arg !== null) { + return arg.type === "Composition" || arg.type === "composition"; + } + return arg === "Composition" || arg === "composition"; + }); + + if (hasCompositionType) { + return true; } + } else if (compositionDecorator) { + return true; + } } + } } + } - return false; + return false; } /** diff --git a/src/services/projectAnalysisService.ts b/src/services/projectAnalysisService.ts index ccbdbed..2b1ee78 100644 --- a/src/services/projectAnalysisService.ts +++ b/src/services/projectAnalysisService.ts @@ -31,7 +31,10 @@ export class ProjectAnalysisService { } if (modelClasses.length > 1) { - const selected = await vscode.window.showQuickPick(modelClasses.map((c) => c.name)); + const selected = await vscode.window.showQuickPick( + modelClasses.map((c) => c.name), + { placeHolder: 'Select a model class from this file' } + ); return modelClasses.find((c) => c.name === selected); } return undefined; diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 8b97c13..21301aa 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -26,8 +26,13 @@ export class SourceCodeService { await this.ensureSlingrFrameworkImports(document, edit, new Set(["Field", fieldInfo.type.decorator])); - if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.targetModel) { - await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); + if (fieldInfo.additionalConfig?.targetModelPath !== document.uri.fsPath) { + if ( + (fieldInfo.type.decorator === "Relationship" || fieldInfo.type.decorator === "Composition") && + fieldInfo.additionalConfig?.targetModel + ) { + await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); + } } const { classEndLine } = this.findClassBoundaries(lines, modelClassName); @@ -258,6 +263,52 @@ export class SourceCodeService { return newRelativePath.replace(/\\/g, "/"); // Normalize path separators for imports } + /** + * Inserts a new model class into a document at the appropriate location. + * + * @param document - The document to insert the model into + * @param modelCode - The complete model code to insert + * @param afterModelName - Optional name of existing model to insert after (defaults to end of file) + * @param requiredImports - Set of imports to ensure are present + */ + public async insertModel( + document: vscode.TextDocument, + modelCode: string, + afterModelName?: string, + requiredImports?: Set + ): Promise { + const edit = new vscode.WorkspaceEdit(); + const lines = document.getText().split("\n"); + + // Ensure required imports are present + if (requiredImports && requiredImports.size > 0) { + await this.ensureSlingrFrameworkImports(document, edit, requiredImports); + } + + // Determine insertion point + let insertionLine = lines.length; // Default to end of file + + if (afterModelName) { + try { + const { classEndLine } = this.findClassBoundaries(lines, afterModelName); + insertionLine = classEndLine + 1; + } catch (error) { + // If we can't find the specified model, fall back to end of file + console.warn(`Could not find model ${afterModelName}, inserting at end of file`); + } + } + + // Detect indentation from the file + const indentation = detectIndentation(lines, 0, lines.length); + const indentedModelCode = applyIndentation(modelCode, indentation); + + // Insert the model with appropriate spacing + const spacing = insertionLine < lines.length ? "\n\n" : "\n"; + edit.insert(document.uri, new vscode.Position(insertionLine, 0), `${spacing}${indentedModelCode}\n`); + + await vscode.workspace.applyEdit(edit); + } + /** * Finds the file path for a given model name in the cache. */ diff --git a/src/test/addComposition.test.ts b/src/test/addComposition.test.ts new file mode 100644 index 0000000..716fcac --- /dev/null +++ b/src/test/addComposition.test.ts @@ -0,0 +1,248 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { AddCompositionTool } from '../commands/models/addComposition'; +import { MetadataCache } from '../cache/cache'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('AddComposition Tool Tests', () => { + let testWorkspaceDir: string; + let testModelFile: string; + let mockCache: MetadataCache; + let addCompositionTool: AddCompositionTool; + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-addcomposition-test-')); + const testDataDir = path.join(testWorkspaceDir, 'src', 'data'); + + // Create the src/data directory structure + fs.mkdirSync(testDataDir, { recursive: true }); + + // Create a sample model file for testing + testModelFile = path.join(testDataDir, 'testModel.ts'); + const modelContent = `import { BaseModel, Field, Text, Model } from 'slingr-framework'; + +@Model() +export class TestModel extends BaseModel { + @Field() + @Text() + existingField!: string; +} +`; + fs.writeFileSync(testModelFile, modelContent); + + // Create mock cache + mockCache = { + getMetadataForFile: (filePath: string) => { + if (filePath === testModelFile) { + return { + classes: { + TestModel: { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + existingField: { + name: 'existingField', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ], + type: 'string' + } + }, + methods: {}, + extends: 'BaseModel' + } + } + }; + } + return { classes: {} }; + }, + getDataModelClasses: () => [ + { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + existingField: { + name: 'existingField', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ], + type: 'string' + } + }, + methods: {}, + extends: 'BaseModel', + filePath: testModelFile + } + ], + getModelPath: () => testDataDir, + isLoaded: () => true, + refresh: () => Promise.resolve(), + watchFile: () => {}, + unwatchFile: () => {} + } as unknown as MetadataCache; + + addCompositionTool = new AddCompositionTool(); + }); + + teardown(() => { + // Clean up temporary files + if (fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true }); + } + }); + + test('should convert plural field names to singular model names', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const determineInfo = (tool as any).determineInnerModelInfo.bind(tool); + + // Test plural to singular conversion + assert.deepStrictEqual(determineInfo('addresses'), { + innerModelName: 'Address', + isArray: true + }); + + assert.deepStrictEqual(determineInfo('phoneNumbers'), { + innerModelName: 'PhoneNumber', + isArray: true + }); + + assert.deepStrictEqual(determineInfo('categories'), { + innerModelName: 'Category', + isArray: true + }); + + assert.deepStrictEqual(determineInfo('boxes'), { + innerModelName: 'Box', + isArray: true + }); + + // Test singular field names (should not be array) + assert.deepStrictEqual(determineInfo('profile'), { + innerModelName: 'Profile', + isArray: false + }); + }); + + test('should correctly convert camelCase to PascalCase', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const toPascalCase = (tool as any).toPascalCase.bind(tool); + + assert.strictEqual(toPascalCase('address'), 'Address'); + assert.strictEqual(toPascalCase('phoneNumber'), 'PhoneNumber'); + assert.strictEqual(toPascalCase('userProfile'), 'UserProfile'); + }); + + test('should correctly convert plural to singular', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const toSingular = (tool as any).toSingular.bind(tool); + + // Test various pluralization patterns + assert.strictEqual(toSingular('addresses'), 'address'); + assert.strictEqual(toSingular('boxes'), 'box'); + assert.strictEqual(toSingular('categories'), 'category'); + assert.strictEqual(toSingular('phoneNumbers'), 'phoneNumber'); + assert.strictEqual(toSingular('companies'), 'company'); + + // Test singular words (should remain unchanged) + assert.strictEqual(toSingular('profile'), 'profile'); + assert.strictEqual(toSingular('user'), 'user'); + }); + + test('should generate correct inner model code', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const generateInnerModelCode = (tool as any).generateInnerModelCode.bind(tool); + + const result = generateInnerModelCode('Address', 'User'); + + const expected = `@Model() +export class Address { + + @Field() + @Relationship({ type: 'reference' }) + parent!: User; + +}`; + + assert.strictEqual(result, expected); + }); + + test('should generate correct composition field code for array', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const generateCompositionFieldCode = (tool as any).generateCompositionFieldCode.bind(tool); + + const fieldInfo = { + name: 'addresses', + type: { + label: 'Relationship', + decorator: 'Relationship', + tsType: 'Address[]', + description: 'Composition relationship' + }, + required: false, + additionalConfig: { + relationshipType: 'composition', + targetModel: 'Address' + } + }; + + const result = generateCompositionFieldCode(fieldInfo, 'Address', true); + + const expected = `@Field({}) +@Relationship({ + type: 'composition' +}) +addresses!: Address[];`; + + assert.strictEqual(result, expected); + }); + + test('should generate correct composition field code for single object', () => { + const tool = new AddCompositionTool(); + + // Access the private method via type assertion for testing + const generateCompositionFieldCode = (tool as any).generateCompositionFieldCode.bind(tool); + + const fieldInfo = { + name: 'profile', + type: { + label: 'Relationship', + decorator: 'Relationship', + tsType: 'Profile', + description: 'Composition relationship' + }, + required: false, + additionalConfig: { + relationshipType: 'composition', + targetModel: 'Profile' + } + }; + + const result = generateCompositionFieldCode(fieldInfo, 'Profile', false); + + const expected = `@Field({}) +@Relationship({ + type: 'composition' +}) +profile!: Profile;`; + + assert.strictEqual(result, expected); + }); + }); +} From ba5e696f64354070dac89fdc9677cd3d42f515b6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Sep 2025 18:28:52 +0000 Subject: [PATCH 134/254] Initial plan From c9e8c5c3261869fb0b1db780047cbae84fb7b84d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Sep 2025 18:36:02 +0000 Subject: [PATCH 135/254] Implement Field decorator without parameters support Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- src/model/Field.ts | 2 +- test/FieldDecorator.test.ts | 98 +++++++++++++++++++++++++++++++++++++ test/model/Person.ts | 2 +- 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 test/FieldDecorator.test.ts diff --git a/src/model/Field.ts b/src/model/Field.ts index dbd79c1..d09fdf4 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -172,7 +172,7 @@ export interface FieldOptions * } * ``` */ -export function Field(options: FieldOptions) { +export function Field(options: FieldOptions = {}) { return function (target: Object, propertyKey: string, descriptor?: PropertyDescriptor) { // Mark this property as a field diff --git a/test/FieldDecorator.test.ts b/test/FieldDecorator.test.ts new file mode 100644 index 0000000..a11228a --- /dev/null +++ b/test/FieldDecorator.test.ts @@ -0,0 +1,98 @@ +import 'reflect-metadata'; +import { BaseModel } from '@/model/BaseModel'; +import { Field } from '@/model/Field'; +import { Model } from '@/model/Model'; +import { Text } from '@/model/types/Text'; + +@Model({ + docs: "Test model for Field decorator without parameters" +}) +class TestFieldModel extends BaseModel { + + // Test @Field() without parameters (new functionality) + @Field() + @Text() + name!: string; + + // Test @Field({}) with empty object (existing functionality) + @Field({}) + @Text() + description!: string; + + // Test @Field with options (existing functionality) + @Field({ required: true }) + @Text() + requiredField!: string; +} + +describe('Field Decorator Without Parameters', () => { + + describe('Basic Usage Tests', () => { + + it('should allow @Field() without parameters', async () => { + const model = new TestFieldModel(); + model.name = 'Test Name'; + model.description = 'Test Description'; + model.requiredField = 'Required Value'; + + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it('should behave the same as @Field({}) with empty object', async () => { + const model = new TestFieldModel(); + model.requiredField = 'Required Value'; + + // Both name and description should behave the same (optional fields) + const errors = await model.validate(); + expect(errors).toHaveLength(0); + }); + + it('should still work with required fields', async () => { + const model = new TestFieldModel(); + // Not setting requiredField + + const errors = await model.validate(); + expect(errors.length).toBeGreaterThan(0); + expect(errors.some(error => error.property === 'requiredField')).toBe(true); + }); + }); + + describe('JSON Serialization Tests', () => { + + it('should serialize fields with @Field() correctly', () => { + const model = new TestFieldModel(); + model.name = 'Test Name'; + model.description = 'Test Description'; + model.requiredField = 'Required Value'; + + const json = model.toJSON(); + expect(json.name).toBe('Test Name'); + expect(json.description).toBe('Test Description'); + expect(json.requiredField).toBe('Required Value'); + }); + + it('should deserialize fields with @Field() correctly', () => { + const json = { + name: 'Test Name', + description: 'Test Description', + requiredField: 'Required Value' + }; + + const model = TestFieldModel.fromJSON(json); + expect(model.name).toBe('Test Name'); + expect(model.description).toBe('Test Description'); + expect(model.requiredField).toBe('Required Value'); + }); + }); + + describe('Metadata Tests', () => { + + it('should register fields with @Field() in metadata', () => { + const fields = Reflect.getMetadata('model:fields', TestFieldModel) || []; + expect(fields).toContain('name'); + expect(fields).toContain('description'); + expect(fields).toContain('requiredField'); + }); + }); +}); \ No newline at end of file diff --git a/test/model/Person.ts b/test/model/Person.ts index c80ef47..b882f29 100644 --- a/test/model/Person.ts +++ b/test/model/Person.ts @@ -29,7 +29,7 @@ export class Person extends BaseModel { }) lastName!: string; - @Field({}) + @Field() @Email() email!: string; From 237471cac36e66796040d1cbef3763966f1c0b0c Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 09:15:40 -0300 Subject: [PATCH 136/254] Refactor import statements in FieldDecorator tests for consistency --- test/FieldDecorator.test.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/FieldDecorator.test.ts b/test/FieldDecorator.test.ts index a11228a..eb1bae5 100644 --- a/test/FieldDecorator.test.ts +++ b/test/FieldDecorator.test.ts @@ -1,8 +1,5 @@ import 'reflect-metadata'; -import { BaseModel } from '@/model/BaseModel'; -import { Field } from '@/model/Field'; -import { Model } from '@/model/Model'; -import { Text } from '@/model/types/Text'; +import { BaseModel, Field, Model, Text } from '../index'; @Model({ docs: "Test model for Field decorator without parameters" From f283785cc7bb22b14af0b18e249f071679ba81b1 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 09:22:28 -0300 Subject: [PATCH 137/254] Refactor DateTimeRangeFieldManager to make hidden column properties non-enumerable for JSON serialization --- .../typeorm/DateTimeRangeFieldManager.ts | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/src/datasources/typeorm/DateTimeRangeFieldManager.ts index 7778a62..e57213e 100644 --- a/src/datasources/typeorm/DateTimeRangeFieldManager.ts +++ b/src/datasources/typeorm/DateTimeRangeFieldManager.ts @@ -128,10 +128,10 @@ export class DateTimeRangeFieldManager { entity[fieldName] = undefined; } - // Clean up hidden column values from the entity object - // so they don't appear in JSON serialization - delete entity[hiddenColumns.from]; - delete entity[hiddenColumns.to]; + // Make hidden column properties non-enumerable so they don't appear + // in JSON serialization while preserving them for TypeORM's use + this.makePropertyNonEnumerable(entity, hiddenColumns.from); + this.makePropertyNonEnumerable(entity, hiddenColumns.to); } } } @@ -147,4 +147,23 @@ export class DateTimeRangeFieldManager { getHiddenColumnNames(target: any, propertyKey: string): { from: string; to: string } | null { return Reflect.getMetadata('dateTimeRange:hiddenColumns', target.prototype || target, propertyKey) || null; } + + /** + * Makes a property non-enumerable to hide it from JSON serialization + * while preserving it for TypeORM operations. + * + * @param object - The object containing the property + * @param propertyName - The name of the property to make non-enumerable + */ + private makePropertyNonEnumerable(object: any, propertyName: string): void { + if (object.hasOwnProperty(propertyName)) { + const value = object[propertyName]; + Object.defineProperty(object, propertyName, { + value: value, + writable: true, + enumerable: false, + configurable: true + }); + } + } } From 5888734938f6904004c10ab33a1beecccdf8e50a Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 10:46:00 -0300 Subject: [PATCH 138/254] Implement embedded model support with Embedded decorator and update related models --- index.ts | 2 + .../typeorm/TypeORMSqlDataSource.ts | 244 ++++++++++++++---- src/model/Embedded.ts | 77 ++++++ src/model/Model.ts | 68 ++++- src/model/index.ts | 2 + test/model/Address.ts | 57 ++++ test/model/Contact.ts | 20 ++ test/model/CustomerWithAddress.ts | 21 ++ test/model/Employee.ts | 27 ++ test/model/PersonBase.ts | 31 +++ .../EmbeddingAndInheritance.test.ts | 228 ++++++++++++++++ 11 files changed, 725 insertions(+), 52 deletions(-) create mode 100644 src/model/Embedded.ts create mode 100644 test/model/Address.ts create mode 100644 test/model/Contact.ts create mode 100644 test/model/CustomerWithAddress.ts create mode 100644 test/model/Employee.ts create mode 100644 test/model/PersonBase.ts create mode 100644 test/types_tests/EmbeddingAndInheritance.test.ts diff --git a/index.ts b/index.ts index 5212b85..4455e7a 100644 --- a/index.ts +++ b/index.ts @@ -6,6 +6,8 @@ export { Field } from './src/model/Field'; export type { FieldOptions } from './src/model/Field'; export { Model } from './src/model/Model'; export type { ModelOptions } from './src/model/Model'; +export { Embedded } from './src/model/Embedded'; +export type { EmbeddedOptions } from './src/model/Embedded'; export { CustomValidate } from './src/validators/CustomValidationConstraint'; export { Text } from './src/model/types/string/Text'; export type { TextOptions } from './src/model/types/string/Text'; diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 8fec095..a58b624 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -1,10 +1,10 @@ import 'reflect-metadata'; -import { - FindOptionsWhere, - FindManyOptions, +import { + FindOptionsWhere, + FindManyOptions, FindOneOptions, FindOptionsOrder, - DataSource as TypeORMDataSource, + DataSource as TypeORMDataSource, DataSourceOptions as TypeORMDataSourceOptions, UpdateResult, DeleteResult, @@ -136,9 +136,9 @@ export class TypeORMSqlDataSource extends DataSource { await this.typeormDataSource.initialize(); this.isInitialized = true; console.log(`TypeORM DataSource initialized successfully for ${typeormOptions.type}`); - - // Keep initialization logs concise in test runs - + + // Keep initialization logs concise in test runs + return this.typeormDataSource; } catch (error) { console.error('Failed to initialize TypeORM DataSource:', error); @@ -254,24 +254,31 @@ export class TypeORMSqlDataSource extends DataSource { return; // PersistentModel already handles this with @PrimaryGeneratedColumn } + // Check if this is an embedded field + const isEmbedded = Reflect.getMetadata('field:embedded', target, propertyKey); + if (isEmbedded || fieldType === 'embedded') { + this.configureEmbeddedField(target, propertyKey); + return; + } + // Check if this is a relationship field if (fieldType === 'relationship') { const relationshipType = Reflect.getMetadata('field:relationship:type', target, propertyKey); const load = Reflect.getMetadata('field:relationship:load', target, propertyKey); const onDelete = Reflect.getMetadata('field:relationship:onDelete', target, propertyKey); - + // Get elementType from field options if it exists (for array relationships) const elementType = fieldOptions?.elementType; - + this.relationshipFieldManager.configureRelationshipField( - target, - propertyKey, - relationshipType, - load, - onDelete, + target, + propertyKey, + relationshipType, + load, + onDelete, elementType ); - + // Store that this field is configured for TypeORM Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); return; @@ -304,6 +311,139 @@ export class TypeORMSqlDataSource extends DataSource { Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); } + /** + * Configures an embedded field by flattening its properties into the parent entity. + * The embedded model's fields are added as columns to the parent table with a prefix. + * + * @param target - The prototype of the class containing the embedded field + * @param propertyKey - The name of the embedded property + */ + private configureEmbeddedField(target: any, propertyKey: string): void { + // Get the embedded type from metadata + const embeddedType = Reflect.getMetadata('field:embedded:type', target, propertyKey); + + if (!embeddedType) { + throw new Error(`Cannot determine type for embedded field ${propertyKey}`); + } + + // Get all fields from the embedded model + const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + + // For each field in the embedded model, create a column in the parent entity + for (const embeddedFieldName of embeddedFields) { + // Skip if this field is also embedded (nested embedding not supported yet) + const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + if (isNestedEmbedded) { + throw new Error(`Nested embedded fields are not yet supported: ${propertyKey}.${embeddedFieldName}`); + } + + // Get field type and options from the embedded model + const fieldType = Reflect.getMetadata('field:type', embeddedType.prototype, embeddedFieldName); + const fieldOptions = Reflect.getMetadata('field:type:options', embeddedType.prototype, embeddedFieldName); + + if (!fieldType) { + continue; // Skip fields without type information + } + + // Create a column name with prefix (propertyKey_fieldName) + const columnName = `${propertyKey}_${embeddedFieldName}`; + + // Map the embedded field type to TypeORM column type + const typeMapping = TypeORMTypeMapper.getColumnType(fieldType, fieldOptions); + + // Apply the TypeORM @Column decorator to the parent entity + // The column will be mapped to a property that doesn't exist on the parent class + // but will be used for database storage + Column({ ...typeMapping, name: columnName })(target, columnName); + + // Store metadata for the embedded field mapping + Reflect.defineMetadata(`embedded:${propertyKey}:${embeddedFieldName}`, { + columnName, + fieldType, + fieldOptions, + typeMapping + }, target); + } + + // Store that this embedded field is configured for TypeORM + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata('datasource:embedded:configured', true, target, propertyKey); + } + + /** + * Extracts embedded field values from an entity and sets them as flat properties. + * This converts nested objects to the flat column structure expected by TypeORM. + * + * @param entity - The entity instance to process + */ + private extractEmbeddedValues(entity: T): void { + const constructor = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + + for (const fieldName of fieldNames) { + const isEmbedded = Reflect.getMetadata('field:embedded', constructor.prototype, fieldName); + + if (isEmbedded) { + const embeddedValue = (entity as any)[fieldName]; + + if (embeddedValue && typeof embeddedValue === 'object') { + // Get the embedded type + const embeddedType = Reflect.getMetadata('field:embedded:type', constructor.prototype, fieldName); + const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + + // Extract each embedded field to its corresponding column + for (const embeddedFieldName of embeddedFields) { + const columnName = `${fieldName}_${embeddedFieldName}`; + const value = embeddedValue[embeddedFieldName]; + + // Set the flat column value on the entity + (entity as any)[columnName] = value; + } + } + } + } + } + + /** + * Restores embedded field values from flat columns back to nested objects. + * This converts the flat column structure from TypeORM back to nested objects. + * + * @param entity - The entity instance to process + */ + private restoreEmbeddedValues(entity: T): void { + const constructor = entity.constructor; + const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + + for (const fieldName of fieldNames) { + const isEmbedded = Reflect.getMetadata('field:embedded', constructor.prototype, fieldName); + + if (isEmbedded) { + // Get the embedded type and its fields + const embeddedType = Reflect.getMetadata('field:embedded:type', constructor.prototype, fieldName); + const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + + // Create a new instance of the embedded type + const embeddedInstance = new embeddedType(); + + // Restore each field from its column + for (const embeddedFieldName of embeddedFields) { + const columnName = `${fieldName}_${embeddedFieldName}`; + const value = (entity as any)[columnName]; + + if (value !== undefined) { + embeddedInstance[embeddedFieldName] = value; + } + + // Clean up the flat column property (optional) + delete (entity as any)[columnName]; + } + + // Set the restored embedded object + (entity as any)[fieldName] = embeddedInstance; + } + } + } + /** * Save an entity to the database. * Handles array field conversion and DateTimeRange field conversion before saving. @@ -325,6 +465,9 @@ export class TypeORMSqlDataSource extends DataSource { this.dateTimeRangeFieldManager.extractDateTimeRangeValues(entity); + // Extract embedded field values to flat columns + this.extractEmbeddedValues(entity); + // Single save with cascades will insert/update parent and children. const saved = await repository.save(entity as any) as T; @@ -334,6 +477,8 @@ export class TypeORMSqlDataSource extends DataSource { if ((saved as any).id) { const reloaded = await repository.findOneBy({ id: (saved as any).id } as any) as T | null; if (reloaded) { + // Restore embedded field values from flat columns + this.restoreEmbeddedValues(reloaded); return reloaded; } } @@ -363,7 +508,7 @@ export class TypeORMSqlDataSource extends DataSource { } else { entities = await repository.find() as T[]; } - + return entities; } @@ -382,12 +527,12 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - + // Handle SQLite select issue by using query builder when select is specified if (options?.select && (this.options as TypeORMSqlDataSourceOptions).type === 'sqlite') { return this.findWithSelectWorkaround(repository, options); } - + const entities = await repository.find(options) as T[]; // Load array data for each entity using the array field manager @@ -399,17 +544,17 @@ export class TypeORMSqlDataSource extends DataSource { * Uses query builder instead of repository.find() when select is specified. */ private async findWithSelectWorkaround( - repository: any, + repository: any, options: FindManyOptions ): Promise { const queryBuilder = repository.createQueryBuilder('entity'); - + // Apply select if (options.select) { const selectFields = Array.isArray(options.select) ? options.select : Object.keys(options.select); queryBuilder.select(selectFields.map(field => `entity.${String(field)}`)); } - + // Apply where conditions if (options.where) { if (Array.isArray(options.where)) { @@ -431,14 +576,14 @@ export class TypeORMSqlDataSource extends DataSource { }); } } - + // Apply order if (options.order) { Object.entries(options.order).forEach(([key, direction]) => { queryBuilder.addOrderBy(`entity.${key}`, direction as 'ASC' | 'DESC'); }); } - + // Apply pagination if (options.skip !== undefined) { queryBuilder.offset(options.skip); @@ -446,7 +591,7 @@ export class TypeORMSqlDataSource extends DataSource { if (options.take !== undefined) { queryBuilder.limit(options.take); } - + return await queryBuilder.getMany() as T[]; } @@ -466,6 +611,9 @@ export class TypeORMSqlDataSource extends DataSource { const repository = this.typeormDataSource.getRepository(entityClass); const entities = await repository.findBy(where) as T[]; + // Restore embedded field values from flat columns for each entity + entities.forEach(entity => this.restoreEmbeddedValues(entity)); + // Load array data for each entity using the array field manager return entities; } @@ -490,6 +638,9 @@ export class TypeORMSqlDataSource extends DataSource { return null; } + // Restore embedded field values from flat columns + this.restoreEmbeddedValues(entity); + // Load array data for the entity using the array field manager return entity; } @@ -508,13 +659,13 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - + // Handle SQLite select issue by using query builder when select is specified if (options?.select && (this.options as TypeORMSqlDataSourceOptions).type === 'sqlite') { const results = await this.findWithSelectWorkaround(repository, { ...options, take: 1 }); return results.length > 0 ? (results[0] as T) : null; } - + const entity = await repository.findOne(options) as T | null; if (!entity) { @@ -542,6 +693,9 @@ export class TypeORMSqlDataSource extends DataSource { const repository = this.typeormDataSource.getRepository(entityClass); const entity = await repository.findOneByOrFail(where) as T; + // Restore embedded field values from flat columns + this.restoreEmbeddedValues(entity); + // Load array data for the entity using the array field manager return entity; } @@ -678,8 +832,8 @@ export class TypeORMSqlDataSource extends DataSource { * @returns Promise resolving to UpdateResult */ async update( - entityClass: new () => T, - criteria: FindOptionsWhere | FindOptionsWhere[], + entityClass: new () => T, + criteria: FindOptionsWhere | FindOptionsWhere[], partialEntity: Partial ): Promise { if (!this.typeormDataSource) { @@ -698,7 +852,7 @@ export class TypeORMSqlDataSource extends DataSource { * @returns Promise resolving to DeleteResult */ async delete( - entityClass: new () => T, + entityClass: new () => T, criteria: string | string[] | number | number[] | Date | Date[] | ObjectId | ObjectId[] | FindOptionsWhere | FindOptionsWhere[] ): Promise { if (!this.typeormDataSource) { @@ -770,11 +924,11 @@ export class TypeORMSqlDataSource extends DataSource { } const repository = this.typeormDataSource.getRepository(entityClass); - + // Get the table name for this entity const metadata = this.typeormDataSource.getMetadata(entityClass); const tableName = metadata.tableName; - + // Use raw query to get the basic entity data const result = await this.typeormDataSource.query( `SELECT * FROM ${tableName} WHERE id = ?`, @@ -784,10 +938,10 @@ export class TypeORMSqlDataSource extends DataSource { if (!result || result.length === 0) { return null; } - + // Create entity instance from raw data const entity = repository.create(result[0]) as T; - + // Since we set eager: true in relationship configuration, TypeORM should load relationships automatically // But our current query doesn't include joins. Let's use TypeORM's built-in findOne with relations if (this.typeormDataSource) { @@ -796,7 +950,7 @@ export class TypeORMSqlDataSource extends DataSource { where: { id } as any, loadEagerRelations: true // This will load all eager relationships }); - + if (entityWithRelations) { console.log(`Loaded entity with eager relations:`, Object.keys(entityWithRelations)); return entityWithRelations; @@ -805,7 +959,7 @@ export class TypeORMSqlDataSource extends DataSource { console.warn('Failed to load with eager relations, falling back to manual loading:', error); } } - + // Fallback: manually load relationships that are marked as eager await this.loadEagerRelationships(entity, entityClass, metadata); @@ -823,14 +977,14 @@ export class TypeORMSqlDataSource extends DataSource { // Get relationship fields from our field metadata const relationshipFields = Reflect.getMetadata('model:fields', entityClass) || []; console.log(`All fields for ${entityClass.name}:`, relationshipFields); - + for (const fieldName of relationshipFields) { // Check if this field is a relationship const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); - + if (fieldType === 'relationship') { console.log(`Found relationship field: ${fieldName}`); - + // Get relationship-specific metadata const relationshipType = Reflect.getMetadata('field:relationship:type', entityClass.prototype, fieldName); const relationshipLoad = Reflect.getMetadata('field:relationship:load', entityClass.prototype, fieldName); @@ -864,14 +1018,14 @@ export class TypeORMSqlDataSource extends DataSource { // Get the foreign key value - TypeORM should use the explicit column name we specified const foreignKeyName = `${fieldName}Id`; const foreignKeyValue = (entity as any)[foreignKeyName]; - + console.log(`Available entity keys: ${Object.keys(entity)}`); console.log(`Loading relationship ${fieldName}, foreign key: ${foreignKeyName} = ${foreignKeyValue}`); - + if (foreignKeyValue && foreignKeyName) { // Get the target entity class - try elementType first, then fall back to design:type let targetClass; - + if (relationshipMetadata.elementType && typeof relationshipMetadata.elementType === 'function') { targetClass = relationshipMetadata.elementType(); } else { @@ -879,16 +1033,16 @@ export class TypeORMSqlDataSource extends DataSource { const entityClass = entity.constructor; targetClass = Reflect.getMetadata('design:type', entityClass.prototype, fieldName); } - + console.log(`Target class for ${fieldName}:`, targetClass?.name); - + if (targetClass) { try { const targetRepository = this.typeormDataSource.getRepository(targetClass); const relatedEntity = await targetRepository.findOneBy({ id: foreignKeyValue }); - + console.log(`Found related entity for ${fieldName}:`, relatedEntity); - + if (relatedEntity) { (entity as any)[fieldName] = relatedEntity; } diff --git a/src/model/Embedded.ts b/src/model/Embedded.ts new file mode 100644 index 0000000..6493c8e --- /dev/null +++ b/src/model/Embedded.ts @@ -0,0 +1,77 @@ +import "reflect-metadata"; + +/** + * Configuration options for the Embedded decorator. + */ +export interface EmbeddedOptions { + /** Optional documentation string for the embedded model. */ + docs?: string; +} + +/** + * Decorator that marks a field as an embedded model. + * + * This decorator is used to embed one model into another, where the embedded + * model extends BaseModel (not PersistentModel) and doesn't have a dataSource. + * The embedded model's fields will be included as columns in the parent entity's table. + * + * @param options - Optional configuration for the embedded field + * @returns A property decorator function + * + * @example + * ```typescript + * // Embedded model without data source + * @Model() + * class Address extends BaseModel { + * @Field() + * @Text() + * addressLine1: string; + * + * @Field() + * @Text() + * city: string; + * } + * + * // Parent model with embedded field + * @Model({ + * dataSource: mainDataSource + * }) + * class Customer extends PersistentModel { + * @Field() + * @Text() + * name: string; + * + * @Embedded() + * address: Address; + * } + * ``` + */ +export function Embedded(options?: EmbeddedOptions) { + return function (target: any, propertyKey: string) { + // Store metadata that this field is embedded + Reflect.defineMetadata("field:embedded", true, target, propertyKey); + + // Store embedded options + if (options) { + Reflect.defineMetadata("field:embedded:options", options, target, propertyKey); + } + + // Store documentation if provided + if (options?.docs) { + Reflect.defineMetadata("field:embedded:docs", options.docs, target, propertyKey); + } + + // Get the type of the property + const propertyType = Reflect.getMetadata("design:type", target, propertyKey); + if (propertyType) { + Reflect.defineMetadata("field:embedded:type", propertyType, target, propertyKey); + } + + // Register this field in the fields list for the containing class + const existingFields = Reflect.getMetadata('model:fields', target.constructor) || []; + if (!existingFields.includes(propertyKey)) { + existingFields.push(propertyKey); + Reflect.defineMetadata('model:fields', existingFields, target.constructor); + } + }; +} diff --git a/src/model/Model.ts b/src/model/Model.ts index e50d43c..883d49e 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -1,6 +1,32 @@ import "reflect-metadata"; import { DataSource } from "../datasources"; +/** + * Collects all field names from a class and its parent classes in the inheritance chain. + * This ensures that fields from base classes are included when configuring derived classes. + * + * @param constructor - The class constructor to analyze + * @returns Array of all field names from the inheritance chain + */ +function getAllFieldNames(constructor: Function): string[] { + const allFields = new Set(); + let currentClass = constructor; + + // Walk up the prototype chain to collect fields from all parent classes + while (currentClass && currentClass !== Object) { + // Check if the class has field metadata before trying to access it + if (Reflect.hasMetadata('model:fields', currentClass)) { + const fields = Reflect.getMetadata('model:fields', currentClass) || []; + fields.forEach((field: string) => allFields.add(field)); + } + + // Move to the parent class + currentClass = Object.getPrototypeOf(currentClass); + } + + return Array.from(allFields); +} + /** * Configuration options for the Model decorator. */ @@ -52,21 +78,49 @@ export function Model(options?: ModelOptions) { options.dataSource.configureModel(constructor, options); // Configure all fields with the data source - // Get the list of fields that have @Field decorators applied - const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + // Get the list of fields that have @Field decorators applied, including inherited fields + const fieldNames = getAllFieldNames(constructor); fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', constructor.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', constructor.prototype, fieldName); + // Look for field metadata in the current class and parent classes + let fieldType, fieldTypeOptions, fieldRequired, isEmbedded; + let currentClass = constructor; + + // Walk up the prototype chain to find the field metadata + while (currentClass && currentClass !== Object && currentClass.prototype) { + if (!fieldType && Reflect.hasMetadata('field:type', currentClass.prototype, fieldName)) { + fieldType = Reflect.getMetadata('field:type', currentClass.prototype, fieldName); + } + if (!fieldTypeOptions && Reflect.hasMetadata('field:type:options', currentClass.prototype, fieldName)) { + fieldTypeOptions = Reflect.getMetadata('field:type:options', currentClass.prototype, fieldName); + } + if (fieldRequired === undefined && Reflect.hasMetadata('field:required', currentClass.prototype, fieldName)) { + fieldRequired = Reflect.getMetadata('field:required', currentClass.prototype, fieldName); + } + if (!isEmbedded && Reflect.hasMetadata('field:embedded', currentClass.prototype, fieldName)) { + isEmbedded = Reflect.getMetadata('field:embedded', currentClass.prototype, fieldName); + } - if (fieldType) { + // Break early if we found all metadata + if (fieldType && fieldTypeOptions !== undefined && fieldRequired !== undefined && isEmbedded !== undefined) { + break; + } + + currentClass = Object.getPrototypeOf(currentClass); + } + + if (isEmbedded) { + // For embedded fields, pass a special type indicator + options.dataSource!.configureField(constructor.prototype, fieldName, 'embedded', { + required: fieldRequired + }); + } else if (fieldType) { // Combine field options including required information const allFieldOptions = { ...fieldTypeOptions, required: fieldRequired }; - + // Configure the field with the data source options.dataSource!.configureField(constructor.prototype, fieldName, fieldType, allFieldOptions); } diff --git a/src/model/index.ts b/src/model/index.ts index ca1da24..35fe182 100644 --- a/src/model/index.ts +++ b/src/model/index.ts @@ -8,6 +8,8 @@ export { Model } from './Model'; export type { ModelOptions } from './Model'; export { Field } from './Field'; export type { FieldOptions } from './Field'; +export { Embedded } from './Embedded'; +export type { EmbeddedOptions } from './Embedded'; // Types export * from './types'; diff --git a/test/model/Address.ts b/test/model/Address.ts new file mode 100644 index 0000000..36d2c46 --- /dev/null +++ b/test/model/Address.ts @@ -0,0 +1,57 @@ +import { BaseModel, Field, Model, Text, Embedded } from "../../index"; + +@Model({ + docs: "Represents an address", +}) +export class Address extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 100, + }) + addressLine1!: string; + + @Field() + @Text({ + maxLength: 100, + }) + addressLine2!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 1, + maxLength: 50, + }) + city!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 5, + maxLength: 10, + }) + zipCode!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 50, + }) + state!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 50, + }) + country!: string; +} diff --git a/test/model/Contact.ts b/test/model/Contact.ts new file mode 100644 index 0000000..de96729 --- /dev/null +++ b/test/model/Contact.ts @@ -0,0 +1,20 @@ +import { Field, Model, Text, Email } from "../../index"; +import { PersonBase } from "./PersonBase"; + +@Model({ + docs: "Contact person with email and phone", +}) +export class Contact extends PersonBase { + @Field({ + required: true, + }) + @Email() + email!: string; + + @Field() + @Text({ + minLength: 10, + maxLength: 20, + }) + phoneNumber!: string; +} diff --git a/test/model/CustomerWithAddress.ts b/test/model/CustomerWithAddress.ts new file mode 100644 index 0000000..b51ec01 --- /dev/null +++ b/test/model/CustomerWithAddress.ts @@ -0,0 +1,21 @@ +import { PersistentModel, Field, Model, Text, Embedded } from "../../index"; +import { Address } from "./Address"; + +@Model({ + docs: "Represents a customer with embedded address", +}) +export class CustomerWithAddress extends PersistentModel { + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 100, + }) + name!: string; + + @Embedded({ + docs: "Customer's address" + }) + address!: Address; +} diff --git a/test/model/Employee.ts b/test/model/Employee.ts new file mode 100644 index 0000000..2c7c378 --- /dev/null +++ b/test/model/Employee.ts @@ -0,0 +1,27 @@ +import { Field, Model, Text, Reference } from "../../index"; +import { PersonBase } from "./PersonBase"; + +// Placeholder for Department model - simplified for testing +class Department { + id!: string; + name!: string; +} + +@Model({ + docs: "Employee with SSN and department reference", +}) +export class Employee extends PersonBase { + @Field({ + required: true, + }) + @Text({ + minLength: 9, + maxLength: 11, + }) + ssn!: string; + + // Note: Reference decorator would be used here in full implementation + @Field() + @Text() + departmentId!: string; +} diff --git a/test/model/PersonBase.ts b/test/model/PersonBase.ts new file mode 100644 index 0000000..6d8d15c --- /dev/null +++ b/test/model/PersonBase.ts @@ -0,0 +1,31 @@ +import { PersistentModel, Field, Model, Text } from "../../index"; + +@Model({ + docs: "Abstract base class for person entities", +}) +export abstract class PersonBase extends PersistentModel { + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 50, + }) + firstName!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 50, + }) + lastName!: string; + + @Field() + @Text({ + minLength: 2, + maxLength: 100, + }) + fullName!: string; +} diff --git a/test/types_tests/EmbeddingAndInheritance.test.ts b/test/types_tests/EmbeddingAndInheritance.test.ts new file mode 100644 index 0000000..0c78eff --- /dev/null +++ b/test/types_tests/EmbeddingAndInheritance.test.ts @@ -0,0 +1,228 @@ +import { TypeORMSqlDataSource } from '../../src/datasources'; +import { Model } from '../../src/model'; +import { Address } from '../model/Address'; +import { CustomerWithAddress } from '../model/CustomerWithAddress'; +import { PersonBase } from '../model/PersonBase'; +import { Contact } from '../model/Contact'; +import { Employee } from '../model/Employee'; + +describe('Embedding and Inheritance', () => { + let dataSource: TypeORMSqlDataSource; + + beforeAll(async () => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + }); + + // Configure the CustomerWithAddress model with the data source + const modelOptions = { dataSource }; + Reflect.defineMetadata("model:dataSource", dataSource, CustomerWithAddress); + dataSource.configureModel(CustomerWithAddress, modelOptions); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', CustomerWithAddress) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', CustomerWithAddress.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', CustomerWithAddress.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', CustomerWithAddress.prototype, fieldName); + const isEmbedded = Reflect.getMetadata('field:embedded', CustomerWithAddress.prototype, fieldName); + + if (isEmbedded) { + // For embedded fields, pass a special type indicator + dataSource.configureField(CustomerWithAddress.prototype, fieldName, 'embedded', { + required: fieldRequired + }); + } else if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(CustomerWithAddress.prototype, fieldName, fieldType, allFieldOptions); + } + }); + + // Configure Contact and Employee models for inheritance testing + Reflect.defineMetadata("model:dataSource", dataSource, Contact); + dataSource.configureModel(Contact, modelOptions); + + Reflect.defineMetadata("model:dataSource", dataSource, Employee); + dataSource.configureModel(Employee, modelOptions); + + // Configure Contact fields + const contactFields = Reflect.getMetadata('model:fields', Contact) || []; + contactFields.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', Contact.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', Contact.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', Contact.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(Contact.prototype, fieldName, fieldType, allFieldOptions); + } + }); + + // Configure Employee fields + const employeeFields = Reflect.getMetadata('model:fields', Employee) || []; + employeeFields.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', Employee.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', Employee.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', Employee.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(Employee.prototype, fieldName, fieldType, allFieldOptions); + } + }); + + // Initialize the data source + await dataSource.initialize(dataSource.getOptions()); + }); + + afterAll(async () => { + if (dataSource) { + await dataSource.disconnect(); + } + }); + + describe('Embedded Fields', () => { + test('should store embedded model metadata correctly', () => { + // Check that the embedded field is marked as such + const isEmbedded = Reflect.getMetadata('field:embedded', CustomerWithAddress.prototype, 'address'); + expect(isEmbedded).toBe(true); + + // Check that the embedded type is stored + const embeddedType = Reflect.getMetadata('field:embedded:type', CustomerWithAddress.prototype, 'address'); + expect(embeddedType).toBe(Address); + + // Check that the Address model has its fields registered + const addressFields = Reflect.getMetadata('model:fields', Address); + expect(addressFields).toEqual(expect.arrayContaining(['addressLine1', 'addressLine2', 'city', 'zipCode', 'state', 'country'])); + }); + + test('should configure embedded fields correctly in TypeORM', () => { + // Check that the embedded field is marked as configured + const isConfigured = Reflect.getMetadata('datasource:embedded:configured', CustomerWithAddress.prototype, 'address'); + expect(isConfigured).toBe(true); + + // Check that column metadata exists for embedded fields + const addressFields = ['addressLine1', 'addressLine2', 'city', 'zipCode', 'state', 'country']; + + for (const fieldName of addressFields) { + const embeddedMetadata = Reflect.getMetadata(`embedded:address:${fieldName}`, CustomerWithAddress.prototype); + expect(embeddedMetadata).toBeDefined(); + expect(embeddedMetadata.columnName).toBe(`address_${fieldName}`); + } + }); + + // TODO: Add tests for persistence when data transformation is implemented + test('should save and load embedded objects correctly', async () => { + // Create a customer with an embedded address + const customer = new CustomerWithAddress(); + customer.name = "John Doe"; + + const address = new Address(); + address.addressLine1 = "123 Main St"; + address.addressLine2 = "Apt 4B"; + address.city = "New York"; + address.zipCode = "10001"; + address.state = "NY"; + address.country = "USA"; + + customer.address = address; + + // Save the customer + const savedCustomer = await dataSource.save(customer); + expect(savedCustomer.id).toBeDefined(); + + // Load the customer back from the database + const loadedCustomer = await dataSource.findOneBy(CustomerWithAddress, { id: savedCustomer.id }); + + expect(loadedCustomer).not.toBeNull(); + expect(loadedCustomer!.name).toBe("John Doe"); + expect(loadedCustomer!.address).toBeDefined(); + expect(loadedCustomer!.address.addressLine1).toBe("123 Main St"); + expect(loadedCustomer!.address.addressLine2).toBe("Apt 4B"); + expect(loadedCustomer!.address.city).toBe("New York"); + expect(loadedCustomer!.address.zipCode).toBe("10001"); + expect(loadedCustomer!.address.state).toBe("NY"); + expect(loadedCustomer!.address.country).toBe("USA"); + }); + }); + + describe('Inheritance', () => { + test('should create separate tables for inherited models', () => { + // Check that Contact has TypeORM entity metadata + const contactEntityMetadata = Reflect.getMetadata('typeorm:entity', Contact); + expect(contactEntityMetadata).toBe(true); + + // Check that Employee has TypeORM entity metadata + const employeeEntityMetadata = Reflect.getMetadata('typeorm:entity', Employee); + expect(employeeEntityMetadata).toBe(true); + + // The abstract PersonBase should not have entity metadata since it's not configured + const personBaseEntityMetadata = Reflect.getMetadata('typeorm:entity', PersonBase); + expect(personBaseEntityMetadata).toBeUndefined(); + }); + + test('should inherit fields from base class', () => { + // Check that Contact has inherited fields from PersonBase + const contactFields = Reflect.getMetadata('model:fields', Contact) || []; + expect(contactFields).toEqual(expect.arrayContaining(['firstName', 'lastName', 'fullName', 'email', 'phoneNumber'])); + + // Check that Employee has inherited fields from PersonBase + const employeeFields = Reflect.getMetadata('model:fields', Employee) || []; + expect(employeeFields).toEqual(expect.arrayContaining(['firstName', 'lastName', 'fullName', 'ssn', 'departmentId'])); + }); + + test('should save and load inherited models correctly', async () => { + // Create and save a Contact + const contact = new Contact(); + contact.firstName = "Jane"; + contact.lastName = "Smith"; + contact.fullName = "Jane Smith"; + contact.email = "jane.smith@example.com"; + contact.phoneNumber = "555-1234"; + + const savedContact = await dataSource.save(contact); + expect(savedContact.id).toBeDefined(); + + // Load the contact back + const loadedContact = await dataSource.findOneBy(Contact, { id: savedContact.id }); + expect(loadedContact).not.toBeNull(); + expect(loadedContact!.firstName).toBe("Jane"); + expect(loadedContact!.lastName).toBe("Smith"); + expect(loadedContact!.email).toBe("jane.smith@example.com"); + + // Create and save an Employee + const employee = new Employee(); + employee.firstName = "John"; + employee.lastName = "Doe"; + employee.fullName = "John Doe"; + employee.ssn = "123-45-6789"; + employee.departmentId = "IT"; + + const savedEmployee = await dataSource.save(employee); + expect(savedEmployee.id).toBeDefined(); + + // Load the employee back + const loadedEmployee = await dataSource.findOneBy(Employee, { id: savedEmployee.id }); + expect(loadedEmployee).not.toBeNull(); + expect(loadedEmployee!.firstName).toBe("John"); + expect(loadedEmployee!.lastName).toBe("Doe"); + expect(loadedEmployee!.ssn).toBe("123-45-6789"); + + // Verify that Contact and Employee have different IDs (separate tables) + expect(savedContact.id).not.toBe(savedEmployee.id); + }); + }); +}); From e488bfae8a29125337d15097cf72fec14642e8c6 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 11:18:13 -0300 Subject: [PATCH 139/254] Remove DateTimeRangeTypeConfig and its registration from the DateTimeRange module --- src/model/types/date_time/DateTimeRange.ts | 38 +++++++++------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index bd5ba55..98ef6c5 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -181,28 +181,20 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { }; } -/** - * Configuration object for DateTimeRange field TypeORM mapping. - * Uses hidden columns approach since DateTimeRange is a complex object with multiple fields. - */ -export const DateTimeRangeTypeConfig: FieldTypeConfig = { - getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { - // DateTimeRange fields are handled specially via hidden columns - // This returns a configuration that indicates special handling is needed - return { - type: 'datetime-range', - nullable: nullable, - options: fieldOptions, - // This special flag tells TypeORM data source to handle this field differently - isComplexType: true - }; - }, - - getArrayElementColumnConfig(fieldOptions?: DateTimeRangeOptions): any { - // Array elements for DateTimeRange would need special handling too - return this.getTypeORMColumnConfig(fieldOptions, false); - } -}; +// /** +// * DateTimeRange field is managed by the Field manager and does not require +// * any specific database column configuration. +// */ +// export const DateTimeRangeTypeConfig: FieldTypeConfig = { +// getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { +// return { +// }; +// }, + +// getArrayElementColumnConfig(fieldOptions?: DateTimeRangeOptions): any { +// return this.getTypeORMColumnConfig(fieldOptions, false); +// } +// }; // Register the datetime range type configuration -FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); +// FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); From dfd71c31f952d60f9f049bd498ae59156e009f49 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 11:37:56 -0300 Subject: [PATCH 140/254] Enhance DateTimeRangeKey type to support arrays and add tests for DateTimeRange with array support --- src/model/types/date_time/DateTimeRange.ts | 2 +- test/types_tests/DateTimeRangeArray.test.ts | 66 +++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 test/types_tests/DateTimeRangeArray.test.ts diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 98ef6c5..64c204d 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -55,7 +55,7 @@ export class DateTimeRangeType { } // Custom key types for clearer IntelliSense errors -type DateTimeRangeKey = T[K] extends DateTimeRangeType | undefined +type DateTimeRangeKey = T[K] extends DateTimeRangeType | DateTimeRangeType[] | undefined ? K : `DateTimeRange: requires DateTimeRange field`; diff --git a/test/types_tests/DateTimeRangeArray.test.ts b/test/types_tests/DateTimeRangeArray.test.ts new file mode 100644 index 0000000..6fa8686 --- /dev/null +++ b/test/types_tests/DateTimeRangeArray.test.ts @@ -0,0 +1,66 @@ +import { Field, Model, BaseModel, DateTimeRange, DateTimeRangeType } from "../../index"; + +@Model({ + docs: "Test model for DateTimeRange with array support checks", +}) +class DateTimeRangeArrayModel extends BaseModel { + @Field({}) + @DateTimeRange({ openStart: true, openEnd: true }) + dateRanges!: DateTimeRangeType[]; +} + +describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () => { + it("should fail validation for arrays (array of DateTimeRange is not currently supported)", async () => { + const m = new DateTimeRangeArrayModel(); + + const r1 = new DateTimeRangeType(); + r1.from = new Date("2024-01-01T00:00:00Z"); + r1.to = new Date("2024-01-31T23:59:59Z"); + + const r2 = new DateTimeRangeType(); + r2.from = new Date("2024-02-01T00:00:00Z"); + r2.to = new Date("2024-02-28T23:59:59Z"); + + m.dateRanges = [r1, r2]; + + const errors = await m.validate(); + // Expect at least one error because @DateTimeRange applies to a single value, + // not an array, so custom validation will flag it. + expect(errors.length).toBeGreaterThan(0); + const propError = errors.find((e) => e.property === "dateRanges"); + expect(propError).toBeDefined(); + }); + + it("should still serialize and deserialize array items to ISO strings and back to Date objects", async () => { + const m = new DateTimeRangeArrayModel(); + + const r1 = new DateTimeRangeType(); + r1.from = new Date("2024-03-01T00:00:00Z"); + r1.to = new Date("2024-03-31T23:59:59Z"); + + const r2 = new DateTimeRangeType(); + r2.from = new Date("2024-04-01T00:00:00Z"); + r2.to = new Date("2024-04-30T23:59:59Z"); + + m.dateRanges = [r1, r2]; + + // toJSON should include ISO strings for inner Date fields + const json = m.toJSON(); + expect(Array.isArray(json.dateRanges)).toBe(true); + expect(json.dateRanges[0].from).toBe("2024-03-01T00:00:00.000Z"); + expect(json.dateRanges[0].to).toBe("2024-03-31T23:59:59.000Z"); + expect(json.dateRanges[1].from).toBe("2024-04-01T00:00:00.000Z"); + expect(json.dateRanges[1].to).toBe("2024-04-30T23:59:59.000Z"); + + // fromJSON should rehydrate to DateTimeRangeType instances with Date fields + const restored = DateTimeRangeArrayModel.fromJSON(json); + expect(Array.isArray(restored.dateRanges)).toBe(true); + expect(restored.dateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(restored.dateRanges[0]!.from).toBeInstanceOf(Date); + expect(restored.dateRanges[0]!.to).toBeInstanceOf(Date); + expect(restored.dateRanges[1]).toBeInstanceOf(DateTimeRangeType); + expect(restored.dateRanges[1]!.from).toBeInstanceOf(Date); + expect(restored.dateRanges[1]!.to).toBeInstanceOf(Date); + }); +}); + From 8429034b336a53adf71d9b1185a259d0ff6a61ea Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 11:43:54 -0300 Subject: [PATCH 141/254] Restrict @DateTimeRange decorator to accept only DateTimeRange or DateTimeRange[] types --- src/model/types/date_time/DateTimeRange.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 64c204d..3a6672f 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -66,8 +66,13 @@ function validateDateTimeRangeType(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); // Be more flexible with type checking since TypeScript may not preserve exact type info // We accept DateTimeRangeType, Object, or undefined types - if (designType && designType !== DateTimeRangeType && designType !== Object) { - console.warn(`@DateTimeRange applied to property '${propertyKey}' of type '${designType?.name}'. Ensure the property type is DateTimeRangeType.`); + if ( + designType && + designType !== DateTimeRangeType && + designType !== Object && + designType !== Array + ) { + throw new Error(`@DateTimeRange can only be applied to 'DateTimeRange' or 'DateTimeRange[]' properties: ${propertyKey}`); } } From 591c988b14cd4952f1cb8af991843a31c4915407 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 11:49:41 -0300 Subject: [PATCH 142/254] Remove redundant Expose decorator from Decimal and Money --- src/model/types/number/Decimal.ts | 3 --- src/model/types/number/Money.ts | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index 6dc164c..d8016f9 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -158,9 +158,6 @@ export function Decimal(options: DecimalOptions) { return value; }, { toClassOnly: true })(target, propertyKey); - // Expose the property for serialization/deserialization - Expose()(target, propertyKey); - const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyDecimalValidations(addOptionalValidator, propName, options); }; diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index b4d67bb..b90ef79 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -152,8 +152,6 @@ export function Money(options: MoneyOptions) { return value; }, { toClassOnly: true })(target, propertyKey); - Expose()(target, propertyKey); - const addOptionalValidator = createOptionalValidatorAdder(proto, propName); applyMoneyValidations(addOptionalValidator, propName, options); }; From fe760cdeff809c0e14cad7f4cbedbf0407e80b75 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 10 Sep 2025 12:06:34 -0300 Subject: [PATCH 143/254] Added utility commands to cache --- src/cache/cache.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/cache/cache.ts b/src/cache/cache.ts index 9e7bf34..2bb5267 100644 --- a/src/cache/cache.ts +++ b/src/cache/cache.ts @@ -786,6 +786,12 @@ export class MetadataCache { return dataModels; } + public getModelByName(name: string): DecoratedClass | null { + const models = this.getDataModels(); + return models.find(m => m.name === name) || null; + } + + /** * Returns all @Model decorated classes that are stored in the src/data folder. * This is a more specific version of getDataModels() that only returns @@ -798,6 +804,10 @@ export class MetadataCache { ); } + public getModelDecoratorByName(name: string, model: DecoratedClass): DecoratorMetadata | null { + return model.decorators.find(decorator => decorator.name === name) || null; + } + /** * Utility to convert a ts-morph Node's position to a VS Code Range. * @param node The ts-morph Node. From 6882ac3b936293b35a52480a53de2a144a887c6f Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 10 Sep 2025 12:08:50 -0300 Subject: [PATCH 144/254] Updated the support for calling the addComposition command from the explorer when there are more than one models in the file. --- src/commands/commandRegistration.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index e7c5c7f..d7ccbf4 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -174,9 +174,10 @@ export function registerGeneralCommands( disposables.push(addFieldCommand); // Add Composition Tool - const addCompositionTool = new AddCompositionTool(); + const addCompositionTool = new AddCompositionTool(explorerProvider); const addCompositionCommand = vscode.commands.registerCommand('slingr-vscode-extension.addComposition', async (uri?: vscode.Uri | AppTreeItem) => { let targetUri: vscode.Uri; + let modelName: string | undefined; if (uri) { // URI provided from context menu (right-click on file in explorer) @@ -186,19 +187,14 @@ export function registerGeneralCommands( // AppTreeItem case - check if it's a model with metadata if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { targetUri = uri.metadata.declaration.uri; + modelName = uri.metadata?.name; } else { vscode.window.showErrorMessage('Please select a model file to add a composition to.'); return; } } } else { - // Fallback to active editor if no URI provided - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please select a model file or open one in the editor to add a composition.'); - return; - } - targetUri = activeEditor.document.uri; + throw new Error('URI must be provided to add a composition.'); } // Validate that it's a TypeScript file @@ -208,7 +204,13 @@ export function registerGeneralCommands( } try { - await addCompositionTool.addComposition(targetUri, cache); + if (modelName) { + await addCompositionTool.addComposition(cache, modelName); + } + else{ + vscode.window.showErrorMessage('Model name could not be determined.'); + } + } catch (error) { vscode.window.showErrorMessage(`Failed to add composition: ${error}`); } From aed9dd13368018f8ec16553de3f498fda0099275 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 10 Sep 2025 12:10:30 -0300 Subject: [PATCH 145/254] Adjustments in the addComposition command. --- src/commands/models/addComposition.ts | 512 +++++++++++++------------- src/services/sourceCodeService.ts | 6 +- 2 files changed, 257 insertions(+), 261 deletions(-) diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index a2b4a0f..3adbad7 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -5,288 +5,284 @@ import { UserInputService } from "../../services/userInputService"; import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; import { FileSystemService } from "../../services/fileSystemService"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; /** * Tool for adding composition relationships to existing Model classes. * - * This tool creates a new inner model within the same file as the outer model - * and establishes a composition relationship between them. The inner model - * name is derived from the field name (converted to singular), and the field - * in the outer model is created as an array if the field name is plural. - * - * @example - * ```typescript - * // Adding field "addresses" creates: - * // 1. New Address model with backref to parent - * // 2. Field in outer model: addresses: Address[] - * - * @Field() - * @Relationship({ type: 'composition' }) - * addresses!: Address[]; - * ``` */ -export class AddCompositionTool implements AIEnhancedTool { - private userInputService: UserInputService; - private projectAnalysisService: ProjectAnalysisService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; - - constructor() { - this.userInputService = new UserInputService(); - this.projectAnalysisService = new ProjectAnalysisService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); +export class AddCompositionTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private explorerProvider: ExplorerProvider; + + constructor(explorerProvider: ExplorerProvider) { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.explorerProvider = explorerProvider; + } + + /** + * Adds a composition relationship to an existing model file. + * + * @param cache - The metadata cache for context about existing models + * @param modelName - The name of the model to which the composition is being added + * @returns Promise that resolves when the composition is added + */ + public async addComposition(cache: MetadataCache, modelName: string): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(modelName, cache); + + // Step 2: Get field name from user + const fieldName = await this.getCompositionFieldName(modelClass); + if (!fieldName) { + return; // User cancelled + } + + // Step 3: Determine inner model name and array status + const { innerModelName, isArray } = this.determineInnerModelInfo(fieldName); + + // Step 4: Check if inner model already exists + await this.validateInnerModelName(cache, innerModelName); + + // Step 5: Create the inner model + await this.createInnerModel(document, innerModelName, modelClass.name, cache); + + // Step 6: Add composition field to outer model + await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); + + this.explorerProvider.refresh(); + + // Step 7: Show success message + vscode.window.showInformationMessage( + `Composition relationship created successfully! Added ${innerModelName} model and ${fieldName} field.` + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add composition: ${error}`); + console.error("Error adding composition:", error); } - - /** - * Processes user input with AI enhancement for composition addition. - * @param userInput - Description of the composition to create - * @param targetUri - Target model file for the new composition - * @param cache - Metadata cache instance - * @param additionalContext - Additional context for composition creation - */ - async processWithAI( - userInput: string, - targetUri: vscode.Uri, - cache: MetadataCache, - additionalContext?: any - ): Promise { - // For now, delegate to the main method - await this.addComposition(targetUri, cache); + } + + /** + * Validates the target file and prepares it for composition addition. + */ + private async validateAndPrepareTarget( + modelName: string, + cache: MetadataCache + ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { + // Get model information from cache + const modelClass = cache.getModelByName(modelName); + if (!modelClass) { + throw new Error(`Model '${modelName}' not found in the project`); } - /** - * Adds a composition relationship to an existing model file. - * - * @param targetUri - The URI of the model file where the composition should be added - * @param cache - The metadata cache for context about existing models - * @returns Promise that resolves when the composition is added - */ - public async addComposition(targetUri: vscode.Uri, cache: MetadataCache): Promise { - try { - // Step 1: Validate target file - const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); - - // Step 2: Get field name from user - const fieldName = await this.getCompositionFieldName(modelClass); - if (!fieldName) { - return; // User cancelled - } - - // Step 3: Determine inner model name and array status - const { innerModelName, isArray } = this.determineInnerModelInfo(fieldName); - - // Step 4: Check if inner model already exists - await this.validateInnerModelName(document, innerModelName); - - // Step 5: Create the inner model - await this.createInnerModel(document, innerModelName, modelClass.name); - - // Step 6: Add composition field to outer model - await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); - - // Step 7: Show success message - vscode.window.showInformationMessage( - `Composition relationship created successfully! Added ${innerModelName} model and ${fieldName} field.` - ); - - } catch (error) { - vscode.window.showErrorMessage(`Failed to add composition: ${error}`); - console.error("Error adding composition:", error); - } + const document = await vscode.workspace.openTextDocument(modelClass.declaration.uri); + if (!document) { + throw new Error(`Could not open document for model '${modelName}'`); } - /** - * Validates the target file and prepares it for composition addition. - */ - private async validateAndPrepareTarget( - targetUri: vscode.Uri, - cache: MetadataCache - ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { - // Ensure the file is a TypeScript file - if (!targetUri.fsPath.endsWith(".ts")) { - throw new Error("Target file must be a TypeScript file (.ts)"); + return { modelClass, document }; + } + + /** + * Gets the composition field name from the user. + */ + private async getCompositionFieldName(modelClass: DecoratedClass): Promise { + const fieldName = await vscode.window.showInputBox({ + prompt: "Enter the composition field name (camelCase)", + placeHolder: "e.g., addresses, phoneNumbers, tasks", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Field name is required"; } - - // Open the document - const document = await vscode.workspace.openTextDocument(targetUri); - - // Get model information from cache - const modelClass = await this.projectAnalysisService.findModelClass(document, cache); - if (!modelClass) { - throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); + if (!/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Field name must be in camelCase (e.g., addresses, phoneNumbers)"; } - return { modelClass, document }; - } - - /** - * Gets the composition field name from the user. - */ - private async getCompositionFieldName(modelClass: DecoratedClass): Promise { - const fieldName = await vscode.window.showInputBox({ - prompt: "Enter the composition field name (camelCase)", - placeHolder: "e.g., addresses, phoneNumbers, tasks", - validateInput: (value) => { - if (!value || value.trim().length === 0) { - return "Field name is required"; - } - if (!/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { - return "Field name must be in camelCase (e.g., addresses, phoneNumbers)"; - } - - // Check if field already exists in the model - const existingFields = Object.keys(modelClass.properties || {}); - if (existingFields.includes(value.trim())) { - return `Field '${value.trim()}' already exists in this model`; - } - - return null; - }, - }); - - return fieldName?.trim() || null; - } - - /** - * Determines the inner model name and whether the field should be an array. - */ - private determineInnerModelInfo(fieldName: string): { innerModelName: string; isArray: boolean } { - const singularName = this.toSingular(fieldName); - const innerModelName = this.toPascalCase(singularName); - const isArray = fieldName !== singularName; // If we converted from plural to singular, it's an array - - return { innerModelName, isArray }; - } - - /** - * Converts a potentially plural field name to singular. - */ - private toSingular(fieldName: string): string { - // Handle common pluralization patterns - if (fieldName.endsWith("ies")) { - return fieldName.slice(0, -3) + "y"; - } else if (fieldName.endsWith("es")) { - // Check if it's a word that ends with s, x, ch, sh - const base = fieldName.slice(0, -1); - if (base.endsWith("s") || base.endsWith("x") || base.endsWith("ch") || base.endsWith("sh")) { - return base; - } - // Otherwise it might be a regular plural like "boxes" -> "box" - return fieldName.slice(0, -2); - } else if (fieldName.endsWith("s") && fieldName.length > 1) { - // Simple plural case - return fieldName.slice(0, -1); + // Check if field already exists in the model + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(value.trim())) { + return `Field '${value.trim()}' already exists in this model`; } - - // If no plural pattern found, return as is - return fieldName; - } - /** - * Converts camelCase to PascalCase. - */ - private toPascalCase(str: string): string { - return str.charAt(0).toUpperCase() + str.slice(1); + return null; + }, + }); + + return fieldName?.trim() || null; + } + + /** + * Determines the inner model name and whether the field should be an array. + */ + private determineInnerModelInfo(fieldName: string): { innerModelName: string; isArray: boolean } { + const singularName = this.toSingular(fieldName); + const innerModelName = this.toPascalCase(singularName); + const isArray = fieldName !== singularName; // If we converted from plural to singular, it's an array + + return { innerModelName, isArray }; + } + + /** + * Converts a potentially plural field name to singular using basic rules. + * @param fieldName The plural string to convert. + * @returns The singular form of the string. + */ + private toSingular(fieldName: string): string { + if (!fieldName) { + return ""; } - /** - * Validates that the inner model name doesn't already exist. - */ - private async validateInnerModelName(document: vscode.TextDocument, innerModelName: string): Promise { - const content = document.getText(); - if (content.includes(`class ${innerModelName}`)) { - throw new Error(`A class named '${innerModelName}' already exists in this file`); - } + // Rule 1: Handle "...ies" -> "...y" (e.g., "cities" -> "city") + if (fieldName.toLowerCase().endsWith("ies")) { + return fieldName.slice(0, -3) + "y"; } - /** - * Creates the inner model in the same file. - */ - private async createInnerModel( - document: vscode.TextDocument, - innerModelName: string, - outerModelName: string - ): Promise { - // Generate the inner model code - const innerModelCode = this.generateInnerModelCode(innerModelName, outerModelName); - - // Use the new insertModel method to insert after the outer model - await this.sourceCodeService.insertModel( - document, - innerModelCode, - outerModelName, // Insert after the outer model - new Set(["Model", "Field", "Relationship"]) // Ensure required decorators are imported - ); + // Rule 2: Handle "...es" -> "..." (e.g., "boxes" -> "box", "wishes" -> "wish") + // This is more specific than a simple "s", so it should be checked first. + if (fieldName.toLowerCase().endsWith("es")) { + const base = fieldName.slice(0, -2); + // Check if the base word ends in s, x, z, ch, sh + if (["s", "x", "z"].some((char) => base.endsWith(char)) || ["ch", "sh"].some((pair) => base.endsWith(pair))) { + return base; + } } - /** - * Generates the TypeScript code for the inner model. - */ - private generateInnerModelCode(innerModelName: string, outerModelName: string): string { - const lines: string[] = []; - - lines.push(`@Model()`); - lines.push(`class ${innerModelName} {`); - lines.push(``); - lines.push(`}`); - - return lines.join("\n"); + // Rule 3: Handle simple "...s" -> "..." (e.g., "cats" -> "cat") + // Avoids changing words that end in "ss" (e.g., "address") + if (fieldName.toLowerCase().endsWith("s") && !fieldName.toLowerCase().endsWith("ss")) { + return fieldName.slice(0, -1); } - /** - * Adds the composition field to the outer model. - */ - private async addCompositionField( - document: vscode.TextDocument, - outerModelName: string, - fieldName: string, - innerModelName: string, - isArray: boolean, - cache: MetadataCache - ): Promise { - // Create field info for the composition field - const fieldType: FieldTypeOption = { - label: "Relationship", - decorator: "Relationship", - tsType: isArray ? `${innerModelName}[]` : innerModelName, - description: "Composition relationship" - }; - - const fieldInfo: FieldInfo = { - name: fieldName, - type: fieldType, - required: false, // Compositions are typically optional - additionalConfig: { - relationshipType: "composition", - targetModel: innerModelName, - targetModelPath: document.uri.fsPath - } - }; - - // Generate the field code - const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); - - // Insert the field - await this.sourceCodeService.insertField(document, outerModelName, fieldInfo, fieldCode, cache); + // If no plural pattern was found, return the original string + return fieldName; + } + + /** + * Converts camelCase to PascalCase. + */ + private toPascalCase(str: string): string { + return str.charAt(0).toUpperCase() + str.slice(1); + } + + /** + * Validates that the inner model name doesn't already exist. + */ + private async validateInnerModelName(cache: MetadataCache, innerModelName: string): Promise { + const existingModel = cache.getModelByName(innerModelName); + if (existingModel) { + throw new Error(`A model named '${innerModelName}' already exists in the project`); + } + } + + /** + * Creates the inner model in the same file. + */ + private async createInnerModel( + document: vscode.TextDocument, + innerModelName: string, + outerModelName: string, + cache: MetadataCache + ): Promise { + // Determine data source from outer model + const outerModelClass = cache.getModelByName(outerModelName); + if (!outerModelClass) { + throw new Error(`Could not find model metadata for '${outerModelName}'`); } - /** - * Generates the TypeScript code for the composition field. - */ - private generateCompositionFieldCode(fieldInfo: FieldInfo, innerModelName: string, isArray: boolean): string { - const lines: string[] = []; - - // Add Field decorator - lines.push("@Field({})"); - - // Add Relationship decorator - lines.push("@Composition()"); - - // Add property declaration - const typeDeclaration = isArray ? `${innerModelName}[]` : innerModelName; - lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); - - return lines.join("\n"); + const outerModelDecorator = cache.getModelDecoratorByName("Model", outerModelClass); + const dataSource = outerModelDecorator?.arguments?.[0]?.dataSource; + + // Generate the inner model code + const innerModelCode = this.generateInnerModelCode(innerModelName, outerModelName, dataSource); + + // Use the new insertModel method to insert after the outer model + await this.sourceCodeService.insertModel( + document, + innerModelCode, + outerModelName, // Insert after the outer model + new Set(["Model", "Field", "Relationship"]) // Ensure required decorators are imported + ); + } + + /** + * Generates the TypeScript code for the inner model. + */ + private generateInnerModelCode(innerModelName: string, outerModelName: string, dataSource: string): string { + const lines: string[] = []; + + if (dataSource) { + lines.push(`@Model({`); + lines.push(`\tdataSource: ${dataSource}`); + } else { + lines.push(`@Model()`); } + lines.push(`})`); + lines.push(`class ${innerModelName} extends PersistentComponentModel<${outerModelName}> {`); + lines.push(``); + lines.push(`}`); + + return lines.join("\n"); + } + + /** + * Adds the composition field to the outer model. + */ + private async addCompositionField( + document: vscode.TextDocument, + outerModelName: string, + fieldName: string, + innerModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Create field info for the composition field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Relationship", + tsType: isArray ? `${innerModelName}[]` : innerModelName, + description: "Composition relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // Compositions are typically optional + additionalConfig: { + relationshipType: "composition", + targetModel: innerModelName, + targetModelPath: document.uri.fsPath, + }, + }; + + // Generate the field code + const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); + + // Insert the field + await this.sourceCodeService.insertField(document, outerModelName, fieldInfo, fieldCode, cache); + } + + /** + * Generates the TypeScript code for the composition field. + */ + private generateCompositionFieldCode(fieldInfo: FieldInfo, innerModelName: string, isArray: boolean): string { + const lines: string[] = []; + + // Add Field decorator + lines.push("@Field({})"); + + // Add Relationship decorator + lines.push("@Composition()"); + + // Add property declaration + const typeDeclaration = isArray ? `${innerModelName}[]` : innerModelName; + lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + + return lines.join("\n"); + } } diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 21301aa..592f4d5 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -299,12 +299,12 @@ export class SourceCodeService { } // Detect indentation from the file - const indentation = detectIndentation(lines, 0, lines.length); - const indentedModelCode = applyIndentation(modelCode, indentation); + //const indentation = detectIndentation(lines, 0, lines.length); + //const indentedModelCode = applyIndentation(modelCode, indentation); // Insert the model with appropriate spacing const spacing = insertionLine < lines.length ? "\n\n" : "\n"; - edit.insert(document.uri, new vscode.Position(insertionLine, 0), `${spacing}${indentedModelCode}\n`); + edit.insert(document.uri, new vscode.Position(insertionLine, 0), `${spacing}${modelCode}\n`); await vscode.workspace.applyEdit(edit); } From ba876a907df29e6be2e7dd5bc3a830e8350f7abf Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 12:40:57 -0300 Subject: [PATCH 146/254] Implement DateTimeRange transformer and enhance validation for array support --- src/datasources/typeorm/ValueTransformers.ts | 67 +++ src/model/types/date_time/DateTimeRange.ts | 139 ++++-- test/types_tests/DateTimeRangeArray.test.ts | 9 +- .../DateTimeRangeArrayPersistence.test.ts | 396 ++++++++++++++++++ 4 files changed, 562 insertions(+), 49 deletions(-) create mode 100644 test/types_tests/DateTimeRangeArrayPersistence.test.ts diff --git a/src/datasources/typeorm/ValueTransformers.ts b/src/datasources/typeorm/ValueTransformers.ts index 03caf80..3c70443 100644 --- a/src/datasources/typeorm/ValueTransformers.ts +++ b/src/datasources/typeorm/ValueTransformers.ts @@ -1,5 +1,72 @@ import { ValueTransformer } from 'typeorm'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; +import { DateTimeRangeType } from '../../model/types/date_time/DateTimeRange'; + +/** + * TypeORM ValueTransformer for DateTimeRangeType objects. + * Converts between DateTimeRangeType objects and database JSON strings. + */ +export class DateTimeRangeTransformer implements ValueTransformer { + /** + * Transforms DateTimeRangeType to database value (JSON string). + * @param value - DateTimeRangeType instance + * @returns JSON string representation for database storage + */ + to(value: DateTimeRangeType | null | undefined): string | null { + if (value === null || value === undefined) { + return null; + } + + if (!(value instanceof DateTimeRangeType)) { + console.warn('DateTimeRangeTransformer.to() received non-DateTimeRangeType value:', value); + return null; + } + + try { + return JSON.stringify({ + from: value.from ? value.from.toISOString() : undefined, + to: value.to ? value.to.toISOString() : undefined + }); + } catch (error) { + console.warn('Failed to serialize DateTimeRangeType to JSON:', error); + return null; + } + } + + /** + * Transforms database value (JSON string) to DateTimeRangeType. + * @param value - Database JSON string value + * @returns DateTimeRangeType instance or undefined + */ + from(value: string | null | undefined): DateTimeRangeType | undefined { + if (value === null || value === undefined) { + return undefined; + } + + try { + const data = JSON.parse(value); + const range = new DateTimeRangeType(); + + if (data.from) { + range.from = new Date(data.from); + } + + if (data.to) { + range.to = new Date(data.to); + } + + return range; + } catch (error) { + console.warn(`Failed to parse DateTimeRangeType from database value: ${value}`, error); + return undefined; + } + } +} + +/** + * Default singleton instance of the DateTimeRange transformer. + */ +export const dateTimeRangeTransformer = new DateTimeRangeTransformer(); /** * TypeORM ValueTransformer for Decimal/Money types. diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 3a6672f..4982271 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -80,12 +80,55 @@ function validateDateTimeRangeType(proto: Object, propertyKey: string): void { * Stores metadata for the datetime range field that can be consumed by other layers. */ function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { - Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); + const designType = Reflect.getMetadata('design:type', proto, propName); + + if (designType === Array) { + // Handle DateTimeRange array case + Reflect.defineMetadata('field:type', 'array:datetimerange', proto, propName); + } else { + // Handle single DateTimeRange case + Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); + } + if (options) { Reflect.defineMetadata('field:type:options', options, proto, propName); } } +/** + * Helper function to validate a single DateTimeRange + */ +function validateSingleRange(value: any, args: ValidationArguments): boolean { + if (value == null) { + return true; // Allow null/undefined values in arrays + } + + if (!(value instanceof DateTimeRangeType)) { + return false; + } + + const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; + + // Check if from is required (when openStart is false or undefined) + if (!rangeOptions?.openStart && !value.from) { + return false; + } + + // Check if to is required (when openEnd is false or undefined) + if (!rangeOptions?.openEnd && !value.to) { + return false; + } + + // If both dates are present, validate that from is before to + if (value.from && value.to) { + if (value.from >= value.to) { + return false; + } + } + + return true; +} + /** * Custom DateTimeRange validator that validates range constraints */ @@ -103,30 +146,13 @@ function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions? return true; // Allow null/undefined values } - if (!(value instanceof DateTimeRangeType)) { - return false; - } - - const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; - - // Check if from is required (when openStart is false or undefined) - if (!rangeOptions?.openStart && !value.from) { - return false; - } - - // Check if to is required (when openEnd is false or undefined) - if (!rangeOptions?.openEnd && !value.to) { - return false; + // Handle arrays of DateTimeRangeType + if (Array.isArray(value)) { + return value.every(item => validateSingleRange(item, args)); } - // If both dates are present, validate that from is before to - if (value.from && value.to) { - if (value.from >= value.to) { - return false; - } - } - - return true; + // Handle single DateTimeRangeType + return validateSingleRange(value, args); }, defaultMessage(args: ValidationArguments) { return `${args.property} must be a valid date range where 'from' is before 'to'`; @@ -177,29 +203,56 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { validateDateTimeRangeType(proto, propName); storeDateTimeRangeMetadata(proto, propName, options); - // Apply nested validation for DateTimeRange - ValidateNested()(target as any, propName); - Type(() => DateTimeRangeType)(target as any, propName); + const designType = Reflect.getMetadata('design:type', proto, propName); + + if (designType === Array) { + // Handle DateTimeRange array case + const { IsArray } = require('class-validator'); + + // Apply array validation + IsArray()(target as any, propName); + + // Apply nested validation for each array element + ValidateNested({ each: true })(target as any, propName); + Type(() => DateTimeRangeType)(target as any, propName); + + // Apply custom range validation for each array element + IsValidDateTimeRange(options)(target as any, propName); + } else { + // Handle single DateTimeRange case + // Apply nested validation for DateTimeRange + ValidateNested()(target as any, propName); + Type(() => DateTimeRangeType)(target as any, propName); - // Apply custom range validation - IsValidDateTimeRange(options)(target as any, propName); + // Apply custom range validation + IsValidDateTimeRange(options)(target as any, propName); + } }; } -// /** -// * DateTimeRange field is managed by the Field manager and does not require -// * any specific database column configuration. -// */ -// export const DateTimeRangeTypeConfig: FieldTypeConfig = { -// getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { -// return { -// }; -// }, - -// getArrayElementColumnConfig(fieldOptions?: DateTimeRangeOptions): any { -// return this.getTypeORMColumnConfig(fieldOptions, false); -// } -// }; +/** + * DateTimeRange field configuration for TypeORM persistence. + * Uses JSON column type with custom transformer to store DateTimeRange objects. + */ +export const DateTimeRangeTypeConfig: FieldTypeConfig = { + getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { + const { dateTimeRangeTransformer } = require('../../../datasources/typeorm/ValueTransformers'); + return { + type: 'text', + nullable: nullable, + transformer: dateTimeRangeTransformer + }; + }, + + getArrayElementColumnConfig(fieldOptions?: DateTimeRangeOptions): any { + const { dateTimeRangeTransformer } = require('../../../datasources/typeorm/ValueTransformers'); + return { + type: 'text', + nullable: false, + transformer: dateTimeRangeTransformer + }; + } +}; // Register the datetime range type configuration -// FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); +FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); diff --git a/test/types_tests/DateTimeRangeArray.test.ts b/test/types_tests/DateTimeRangeArray.test.ts index 6fa8686..86c44b5 100644 --- a/test/types_tests/DateTimeRangeArray.test.ts +++ b/test/types_tests/DateTimeRangeArray.test.ts @@ -10,7 +10,7 @@ class DateTimeRangeArrayModel extends BaseModel { } describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () => { - it("should fail validation for arrays (array of DateTimeRange is not currently supported)", async () => { + it("should pass validation for arrays (array of DateTimeRange is now supported)", async () => { const m = new DateTimeRangeArrayModel(); const r1 = new DateTimeRangeType(); @@ -24,11 +24,8 @@ describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () = m.dateRanges = [r1, r2]; const errors = await m.validate(); - // Expect at least one error because @DateTimeRange applies to a single value, - // not an array, so custom validation will flag it. - expect(errors.length).toBeGreaterThan(0); - const propError = errors.find((e) => e.property === "dateRanges"); - expect(propError).toBeDefined(); + // Should pass validation now that array support is implemented + expect(errors.length).toBe(0); }); it("should still serialize and deserialize array items to ISO strings and back to Date objects", async () => { diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts new file mode 100644 index 0000000..f22815b --- /dev/null +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -0,0 +1,396 @@ +import { + TypeORMSqlDataSource, + PersistentModel, + Field, + Model, + DateTimeRange, + DateTimeRangeType, + Text +} from "../../index"; + +// Test model for DateTimeRange array persistence +@Model({ + docs: "Test model for DateTimeRange array persistence in SQL databases", +}) +class DateTimeRangeArrayPersistenceModel extends PersistentModel { + @Field({ + required: true, + }) + @Text({ minLength: 1, maxLength: 100 }) + name!: string; + + @Field({}) + @DateTimeRange({ openStart: true, openEnd: true }) + dateRanges?: DateTimeRangeType[]; + + @Field({ + required: true, + }) + @DateTimeRange({ openStart: false, openEnd: false }) + requiredDateRanges!: DateTimeRangeType[]; + + @Field({}) + @DateTimeRange({ openStart: true, openEnd: false }) + mixedDateRanges?: DateTimeRangeType[]; +} + +describe("DateTimeRange Array Persistence in SQL Databases", () => { + let dataSource: TypeORMSqlDataSource; + let testEntity: DateTimeRangeArrayPersistenceModel; + + beforeAll(async () => { + // Create a TypeORM data source with SQLite for testing + dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + filename: ":memory:", + managed: true, + synchronize: true, + logging: false + }); + + // Configure the DateTimeRangeArrayPersistenceModel with the data source + const modelOptions = { dataSource }; + Reflect.defineMetadata("model:dataSource", dataSource, DateTimeRangeArrayPersistenceModel); + dataSource.configureModel(DateTimeRangeArrayPersistenceModel, modelOptions); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', DateTimeRangeArrayPersistenceModel) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', DateTimeRangeArrayPersistenceModel.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', DateTimeRangeArrayPersistenceModel.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', DateTimeRangeArrayPersistenceModel.prototype, fieldName); + + if (fieldType) { + dataSource.configureField( + DateTimeRangeArrayPersistenceModel.prototype, + fieldName, + fieldType, + { + ...fieldTypeOptions, + required: fieldRequired + } + ); + } + }); + + // Initialize the data source + await dataSource.initialize(dataSource.getOptions()); + }); + + beforeEach(() => { + testEntity = new DateTimeRangeArrayPersistenceModel(); + testEntity.name = "DateTimeRange Array Test"; + + // Set up required DateTimeRange array + const range1 = new DateTimeRangeType(); + range1.from = new Date('2024-01-01T00:00:00Z'); + range1.to = new Date('2024-01-31T23:59:59Z'); + + const range2 = new DateTimeRangeType(); + range2.from = new Date('2024-02-01T00:00:00Z'); + range2.to = new Date('2024-02-28T23:59:59Z'); + + testEntity.requiredDateRanges = [range1, range2]; + + // Set up optional DateTimeRange array + const range3 = new DateTimeRangeType(); + range3.from = new Date('2024-03-01T00:00:00Z'); + range3.to = new Date('2024-03-31T23:59:59Z'); + + const range4 = new DateTimeRangeType(); + range4.from = new Date('2024-04-01T00:00:00Z'); + range4.to = new Date('2024-04-30T23:59:59Z'); + + testEntity.dateRanges = [range3, range4]; + + // Set up mixed DateTimeRange array (some with openStart) + const range5 = new DateTimeRangeType(); + // range5.from remains undefined for open start + range5.to = new Date('2024-05-31T23:59:59Z'); + + const range6 = new DateTimeRangeType(); + range6.from = new Date('2024-06-01T00:00:00Z'); + range6.to = new Date('2024-06-30T23:59:59Z'); + + testEntity.mixedDateRanges = [range5, range6]; + }); + + afterAll(async () => { + if (dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + describe("Basic Array Persistence", () => { + it("should save and retrieve DateTimeRange arrays correctly", async () => { + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.id).toBeDefined(); + expect(savedEntity.name).toBe("DateTimeRange Array Test"); + + // Check required array + expect(Array.isArray(savedEntity.requiredDateRanges)).toBe(true); + expect(savedEntity.requiredDateRanges).toHaveLength(2); + expect(savedEntity.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(savedEntity.requiredDateRanges[0]!.from).toBeInstanceOf(Date); + expect(savedEntity.requiredDateRanges[0]!.to).toBeInstanceOf(Date); + expect(savedEntity.requiredDateRanges[0]!.from!.toISOString()).toBe('2024-01-01T00:00:00.000Z'); + expect(savedEntity.requiredDateRanges[0]!.to!.toISOString()).toBe('2024-01-31T23:59:59.000Z'); + + expect(savedEntity.requiredDateRanges[1]!.from!.toISOString()).toBe('2024-02-01T00:00:00.000Z'); + expect(savedEntity.requiredDateRanges[1]!.to!.toISOString()).toBe('2024-02-28T23:59:59.000Z'); + + // Check optional array + expect(Array.isArray(savedEntity.dateRanges)).toBe(true); + expect(savedEntity.dateRanges).toHaveLength(2); + expect(savedEntity.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + expect(savedEntity.dateRanges![0]!.from!.toISOString()).toBe('2024-03-01T00:00:00.000Z'); + expect(savedEntity.dateRanges![0]!.to!.toISOString()).toBe('2024-03-31T23:59:59.000Z'); + + // Check mixed array (with open starts) + expect(Array.isArray(savedEntity.mixedDateRanges)).toBe(true); + expect(savedEntity.mixedDateRanges).toHaveLength(2); + expect(savedEntity.mixedDateRanges![0]!.from).toBeUndefined(); // open start + expect(savedEntity.mixedDateRanges![0]!.to!.toISOString()).toBe('2024-05-31T23:59:59.000Z'); + expect(savedEntity.mixedDateRanges![1]!.from!.toISOString()).toBe('2024-06-01T00:00:00.000Z'); + expect(savedEntity.mixedDateRanges![1]!.to!.toISOString()).toBe('2024-06-30T23:59:59.000Z'); + }); + + it("should retrieve saved entity by ID and maintain DateTimeRange array integrity", async () => { + const savedEntity = await dataSource.save(testEntity); + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + + expect(retrievedEntity).toBeDefined(); + expect(retrievedEntity!.id).toBe(savedEntity.id); + expect(retrievedEntity!.name).toBe("DateTimeRange Array Test"); + + // Verify required array integrity + expect(Array.isArray(retrievedEntity!.requiredDateRanges)).toBe(true); + expect(retrievedEntity!.requiredDateRanges).toHaveLength(2); + expect(retrievedEntity!.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.requiredDateRanges[0]!.from).toBeInstanceOf(Date); + expect(retrievedEntity!.requiredDateRanges[0]!.to).toBeInstanceOf(Date); + + // Verify optional array integrity + expect(Array.isArray(retrievedEntity!.dateRanges)).toBe(true); + expect(retrievedEntity!.dateRanges).toHaveLength(2); + expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + + // Verify mixed array integrity + expect(Array.isArray(retrievedEntity!.mixedDateRanges)).toBe(true); + expect(retrievedEntity!.mixedDateRanges).toHaveLength(2); + expect(retrievedEntity!.mixedDateRanges![0]!.from).toBeUndefined(); // open start preserved + expect(retrievedEntity!.mixedDateRanges![0]!.to).toBeInstanceOf(Date); + }); + }); + + describe("Edge Cases and Empty Arrays", () => { + it("should handle empty DateTimeRange arrays", async () => { + testEntity.dateRanges = []; + testEntity.requiredDateRanges = []; + testEntity.mixedDateRanges = []; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.dateRanges).toEqual([]); + expect(savedEntity.requiredDateRanges).toEqual([]); + expect(savedEntity.mixedDateRanges).toEqual([]); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + expect(retrievedEntity!.dateRanges).toEqual([]); + expect(retrievedEntity!.requiredDateRanges).toEqual([]); + expect(retrievedEntity!.mixedDateRanges).toEqual([]); + }); + + it("should handle undefined optional DateTimeRange arrays", async () => { + delete (testEntity as any).dateRanges; + delete (testEntity as any).mixedDateRanges; + + const savedEntity = await dataSource.save(testEntity); + + // When properties are deleted, they become empty arrays in the relational model + expect(savedEntity.dateRanges).toEqual([]); + expect(savedEntity.mixedDateRanges).toEqual([]); + expect(Array.isArray(savedEntity.requiredDateRanges)).toBe(true); + expect(savedEntity.requiredDateRanges).toHaveLength(2); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + expect(retrievedEntity!.dateRanges).toEqual([]); + expect(retrievedEntity!.mixedDateRanges).toEqual([]); + expect(Array.isArray(retrievedEntity!.requiredDateRanges)).toBe(true); + }); + + it("should handle arrays with single DateTimeRange element", async () => { + const singleRange = new DateTimeRangeType(); + singleRange.from = new Date('2024-07-01T00:00:00Z'); + singleRange.to = new Date('2024-07-31T23:59:59Z'); + + testEntity.dateRanges = [singleRange]; + testEntity.requiredDateRanges = [singleRange]; + testEntity.mixedDateRanges = [singleRange]; + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.dateRanges).toHaveLength(1); + expect(savedEntity.requiredDateRanges).toHaveLength(1); + expect(savedEntity.mixedDateRanges).toHaveLength(1); + + expect(savedEntity.dateRanges![0]!.from!.toISOString()).toBe('2024-07-01T00:00:00.000Z'); + expect(savedEntity.dateRanges![0]!.to!.toISOString()).toBe('2024-07-31T23:59:59.000Z'); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + expect(retrievedEntity!.dateRanges).toHaveLength(1); + expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.dateRanges![0]!.from).toBeInstanceOf(Date); + expect(retrievedEntity!.dateRanges![0]!.to).toBeInstanceOf(Date); + }); + }); + + describe("Complex Array Operations", () => { + it("should handle large DateTimeRange arrays", async () => { + const manyRanges: DateTimeRangeType[] = []; + + // Create 10 DateTimeRange objects + for (let i = 0; i < 10; i++) { + const range = new DateTimeRangeType(); + range.from = new Date(`2024-${String(i + 1).padStart(2, '0')}-01T00:00:00Z`); + range.to = new Date(`2024-${String(i + 1).padStart(2, '0')}-28T23:59:59Z`); + manyRanges.push(range); + } + + testEntity.dateRanges = manyRanges; + testEntity.requiredDateRanges = manyRanges.slice(0, 5); // First 5 for required + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.dateRanges).toHaveLength(10); + expect(savedEntity.requiredDateRanges).toHaveLength(5); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + expect(retrievedEntity!.dateRanges).toHaveLength(10); + expect(retrievedEntity!.requiredDateRanges).toHaveLength(5); + + // Verify first and last elements + expect(retrievedEntity!.dateRanges![0]!.from!.toISOString()).toBe('2024-01-01T00:00:00.000Z'); + expect(retrievedEntity!.dateRanges![9]!.from!.toISOString()).toBe('2024-10-01T00:00:00.000Z'); + }); + + it("should handle arrays with mixed open/closed DateTimeRanges", async () => { + const mixedRanges: DateTimeRangeType[] = []; + + // Fully closed range + const closedRange = new DateTimeRangeType(); + closedRange.from = new Date('2024-01-01T00:00:00Z'); + closedRange.to = new Date('2024-01-31T23:59:59Z'); + mixedRanges.push(closedRange); + + // Open start range + const openStartRange = new DateTimeRangeType(); + // openStartRange.from = undefined; + openStartRange.to = new Date('2024-02-28T23:59:59Z'); + mixedRanges.push(openStartRange); + + // Open end range + const openEndRange = new DateTimeRangeType(); + openEndRange.from = new Date('2024-03-01T00:00:00Z'); + // openEndRange.to = undefined; + mixedRanges.push(openEndRange); + + // Fully open range + const fullyOpenRange = new DateTimeRangeType(); + // fullyOpenRange.from = undefined; + // fullyOpenRange.to = undefined; + mixedRanges.push(fullyOpenRange); + + testEntity.dateRanges = mixedRanges; + testEntity.requiredDateRanges = [closedRange]; // Only use closed range for required field + + const savedEntity = await dataSource.save(testEntity); + + expect(savedEntity.dateRanges).toHaveLength(4); + + // Verify closed range + expect(savedEntity.dateRanges![0]!.from).toBeInstanceOf(Date); + expect(savedEntity.dateRanges![0]!.to).toBeInstanceOf(Date); + + // Verify open start range + expect(savedEntity.dateRanges![1]!.from).toBeUndefined(); + expect(savedEntity.dateRanges![1]!.to).toBeInstanceOf(Date); + + // Verify open end range + expect(savedEntity.dateRanges![2]!.from).toBeInstanceOf(Date); + expect(savedEntity.dateRanges![2]!.to).toBeUndefined(); + + // Verify fully open range + expect(savedEntity.dateRanges![3]!.from).toBeUndefined(); + expect(savedEntity.dateRanges![3]!.to).toBeUndefined(); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + + // Verify persistence maintained all the open/closed states + expect(retrievedEntity!.dateRanges![0]!.from).toBeInstanceOf(Date); + expect(retrievedEntity!.dateRanges![0]!.to).toBeInstanceOf(Date); + expect(retrievedEntity!.dateRanges![1]!.from).toBeUndefined(); + expect(retrievedEntity!.dateRanges![1]!.to).toBeInstanceOf(Date); + expect(retrievedEntity!.dateRanges![2]!.from).toBeInstanceOf(Date); + expect(retrievedEntity!.dateRanges![2]!.to).toBeUndefined(); + expect(retrievedEntity!.dateRanges![3]!.from).toBeUndefined(); + expect(retrievedEntity!.dateRanges![3]!.to).toBeUndefined(); + }); + }); + + describe("Update Operations", () => { + it("should update DateTimeRange arrays correctly", async () => { + // Save initial entity + const savedEntity = await dataSource.save(testEntity); + + // Update the arrays + const newRange1 = new DateTimeRangeType(); + newRange1.from = new Date('2024-08-01T00:00:00Z'); + newRange1.to = new Date('2024-08-31T23:59:59Z'); + + const newRange2 = new DateTimeRangeType(); + newRange2.from = new Date('2024-09-01T00:00:00Z'); + newRange2.to = new Date('2024-09-30T23:59:59Z'); + + savedEntity.dateRanges = [newRange1]; + savedEntity.requiredDateRanges = [newRange1, newRange2]; + savedEntity.mixedDateRanges = []; // Explicitly set to empty array + + const updatedEntity = await dataSource.save(savedEntity); + + expect(updatedEntity.dateRanges).toHaveLength(1); + expect(updatedEntity.requiredDateRanges).toHaveLength(2); + expect(updatedEntity.mixedDateRanges).toEqual([]); + + expect(updatedEntity.dateRanges![0]!.from!.toISOString()).toBe('2024-08-01T00:00:00.000Z'); + expect(updatedEntity.requiredDateRanges[1]!.from!.toISOString()).toBe('2024-09-01T00:00:00.000Z'); + + // Verify update persistence + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, updatedEntity.id!); + expect(retrievedEntity!.dateRanges).toHaveLength(1); + expect(retrievedEntity!.requiredDateRanges).toHaveLength(2); + expect(retrievedEntity!.mixedDateRanges).toEqual([]); + }); + }); + + describe("Validation with Persistence", () => { + it("should validate DateTimeRange arrays before persistence", async () => { + // Create an entity that should pass validation + const validEntity = new DateTimeRangeArrayPersistenceModel(); + validEntity.name = "Valid Entity"; + + const validRange = new DateTimeRangeType(); + validRange.from = new Date('2024-01-01T00:00:00Z'); + validRange.to = new Date('2024-01-31T23:59:59Z'); + + validEntity.requiredDateRanges = [validRange]; + + const errors = await validEntity.validate(); + expect(errors).toHaveLength(0); + + const savedEntity = await dataSource.save(validEntity); + expect(savedEntity.id).toBeDefined(); + }); + }); +}); From b2840ba1477cde966851402182238faf361a434b Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 10 Sep 2025 12:56:27 -0300 Subject: [PATCH 147/254] Implement OneToOne relationship for single composition in RelationshipFieldManager and add tests for validation and persistence --- .../typeorm/RelationshipFieldManager.ts | 12 +- test/types_tests/SimpleComposition.test.ts | 304 ++++++++++++++++++ 2 files changed, 311 insertions(+), 5 deletions(-) create mode 100644 test/types_tests/SimpleComposition.test.ts diff --git a/src/datasources/typeorm/RelationshipFieldManager.ts b/src/datasources/typeorm/RelationshipFieldManager.ts index 39b5cf2..d882d1c 100644 --- a/src/datasources/typeorm/RelationshipFieldManager.ts +++ b/src/datasources/typeorm/RelationshipFieldManager.ts @@ -2,6 +2,7 @@ import { OneToMany, ManyToOne, ManyToMany, + OneToOne, JoinColumn, JoinTable } from 'typeorm'; @@ -160,21 +161,22 @@ export class RelationshipFieldManager { OneToMany(() => Object, (child: any) => child.owner, relationOptions)(target, propertyKey); } } else { - // Single composition - treat as reference with cascade + // Single composition - model as OneToOne to enforce exclusive ownership const relationOptions: any = { eager, - cascade: ['insert', 'update'], + // Include remove to delete the composed entity when parent is removed via ORM + cascade: ['insert', 'update', 'remove'], nullable: true }; if (elementType) { - ManyToOne(elementType, undefined as any, relationOptions)(target, propertyKey); + OneToOne(elementType, undefined as any, relationOptions)(target, propertyKey); } else { const designType = Reflect.getMetadata('design:type', target, propertyKey); if (designType && typeof designType === 'function') { - ManyToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); + OneToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); } else { - ManyToOne(() => Object, undefined as any, relationOptions)(target, propertyKey); + OneToOne(() => Object, undefined as any, relationOptions)(target, propertyKey); } } diff --git a/test/types_tests/SimpleComposition.test.ts b/test/types_tests/SimpleComposition.test.ts new file mode 100644 index 0000000..ffbd116 --- /dev/null +++ b/test/types_tests/SimpleComposition.test.ts @@ -0,0 +1,304 @@ +import { BaseModel, Field, Model, PersistentModel } from "../../index"; +import { Composition } from "../../index"; +import { TypeORMSqlDataSource } from "../../src/datasources"; +import { Text, HTML } from "../../index"; + +// Test models for simple composition (single, not array) +@Model() +class Address extends PersistentModel { + @Field({ required: true }) + @Text() + street!: string; + + @Field({ required: true }) + @Text() + city!: string; + + @Field({ required: false }) + @Text() + zipCode!: string; +} + +@Model() +class Company extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + + @Field({ required: false }) + @Composition({ elementType: () => Address }) + headquarters!: Address; + + @Field({ required: false }) + @HTML() + description!: string; +} + +describe('Simple Composition (OneToOne)', () => { + let dataSource: TypeORMSqlDataSource; + + beforeAll(() => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + }); + }); + + beforeEach(async () => { + // Configure models with the data source + const models = [Address, Company]; + for (const modelClass of models) { + dataSource.configureModel(modelClass); + + // Get all field names and configure them + const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + for (const fieldName of fieldNames) { + const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + + if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(modelClass.prototype, fieldName, fieldType, allFieldOptions); + } + } + } + + await dataSource.initialize({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + } as any); + }); + + afterEach(async () => { + if (dataSource && dataSource.isConnected()) { + await dataSource.disconnect(); + } + }); + + describe('Metadata Configuration', () => { + it('should configure single composition as OneToOne relationship', () => { + // Check that the relationship metadata is stored correctly + const relationshipType = Reflect.getMetadata('field:relationship:type', Company.prototype, 'headquarters'); + const fieldType = Reflect.getMetadata('field:type', Company.prototype, 'headquarters'); + + expect(fieldType).toBe('relationship'); + expect(relationshipType).toBe('composition'); + }); + + it('should create TypeORM OneToOne metadata after configuration', () => { + // Configure the field first + dataSource.configureField( + Company.prototype, + 'headquarters', + 'relationship', + { required: false } + ); + + const relationshipMetadata = Reflect.getMetadata('typeorm:relationship', Company.prototype, 'headquarters'); + const relationshipType = Reflect.getMetadata('typeorm:relationship:type', Company.prototype, 'headquarters'); + + expect(relationshipMetadata).toBe(true); + expect(relationshipType).toBe('composition'); + }); + }); + + describe('Single Composition Persistence', () => { + it('should persist a company with a single composed address', async () => { + // Create an address + const address = new Address(); + address.street = '123 Main St'; + address.city = 'Anytown'; + address.zipCode = '12345'; + + // Create a company with the composed address + const company = new Company(); + company.name = 'Acme Corp'; + company.headquarters = address; + company.description = '

Leading provider of anvils

'; + + // Save the company (should cascade save the address) + const savedCompany = await dataSource.save(company); + + expect(savedCompany.id).toBeDefined(); + expect(savedCompany.headquarters).toBeDefined(); + expect(savedCompany.headquarters.id).toBeDefined(); + expect(savedCompany.headquarters.street).toBe('123 Main St'); + expect(savedCompany.headquarters.city).toBe('Anytown'); + expect(savedCompany.headquarters.zipCode).toBe('12345'); + }); + + it('should handle company without headquarters address', async () => { + // Create a company without headquarters + const company = new Company(); + company.name = 'Remote Corp'; + company.description = '

Fully remote company

'; + + const savedCompany = await dataSource.save(company); + + expect(savedCompany.id).toBeDefined(); + expect(savedCompany.headquarters).toBeNull(); + expect(savedCompany.name).toBe('Remote Corp'); + }); + + it('should retrieve company with composed address', async () => { + // Create and save a company with address + const address = new Address(); + address.street = '456 Oak Ave'; + address.city = 'Somewhere'; + address.zipCode = '67890'; + + const company = new Company(); + company.name = 'Tech Solutions'; + company.headquarters = address; + + const savedCompany = await dataSource.save(company); + + // Retrieve the company by ID + const retrievedCompany = await dataSource.findOneById(Company, savedCompany.id!); + + expect(retrievedCompany).toBeDefined(); + expect(retrievedCompany!.headquarters).toBeDefined(); + expect(retrievedCompany!.headquarters.street).toBe('456 Oak Ave'); + expect(retrievedCompany!.headquarters.city).toBe('Somewhere'); + expect(retrievedCompany!.headquarters.zipCode).toBe('67890'); + }); + + it('should update composed address when company is updated', async () => { + // Create and save a company with address + const address = new Address(); + address.street = '789 Pine St'; + address.city = 'Oldtown'; + address.zipCode = '11111'; + + const company = new Company(); + company.name = 'Evolving Corp'; + company.headquarters = address; + + const savedCompany = await dataSource.save(company); + + // Update the address + savedCompany.headquarters.street = '999 New Blvd'; + savedCompany.headquarters.city = 'Newtown'; + savedCompany.headquarters.zipCode = '22222'; + + const updatedCompany = await dataSource.save(savedCompany); + + expect(updatedCompany.headquarters.street).toBe('999 New Blvd'); + expect(updatedCompany.headquarters.city).toBe('Newtown'); + expect(updatedCompany.headquarters.zipCode).toBe('22222'); + + // Verify persistence by retrieving again + const retrievedCompany = await dataSource.findOneById(Company, updatedCompany.id!); + expect(retrievedCompany!.headquarters.street).toBe('999 New Blvd'); + expect(retrievedCompany!.headquarters.city).toBe('Newtown'); + }); + }); + + describe('Validation with Single Composition', () => { + it('should validate composed objects', async () => { + const address = new Address(); + address.street = ''; // Invalid - required field + address.city = 'Test City'; + + const company = new Company(); + company.name = 'Test Company'; + company.headquarters = address; + + const errors = await company.validate(); + + // Should have validation errors from the composed address + expect(errors.length).toBeGreaterThan(0); + + // Find the street validation error + const streetError = errors.find(error => + error.property === 'headquarters' && + error.children && + error.children.some(child => child.property === 'street') + ); + expect(streetError).toBeDefined(); + }); + + it('should pass validation with valid composed object', async () => { + const address = new Address(); + address.street = 'Valid Street'; + address.city = 'Valid City'; + address.zipCode = '12345'; + + const company = new Company(); + company.name = 'Valid Company'; + company.headquarters = address; + + const errors = await company.validate(); + expect(errors).toHaveLength(0); + }); + }); + + describe('JSON Serialization with Single Composition', () => { + it('should serialize composed object to JSON', () => { + const address = new Address(); + address.street = 'JSON Street'; + address.city = 'JSON City'; + address.zipCode = '98765'; + + const company = new Company(); + company.name = 'JSON Corp'; + company.headquarters = address; + + const json = company.toJSON(); + + expect(json.name).toBe('JSON Corp'); + expect(json.headquarters).toBeDefined(); + expect(json.headquarters.street).toBe('JSON Street'); + expect(json.headquarters.city).toBe('JSON City'); + expect(json.headquarters.zipCode).toBe('98765'); + }); + + it('should deserialize composed object from JSON', () => { + const json = { + name: 'Restored Corp', + description: '

From JSON

', + headquarters: { + street: 'Restored Street', + city: 'Restored City', + zipCode: '54321' + } + }; + + const company = Company.fromJSON(json); + + expect(company.name).toBe('Restored Corp'); + expect(company.headquarters).toBeDefined(); + expect(company.headquarters).toBeInstanceOf(Address); + expect(company.headquarters.street).toBe('Restored Street'); + expect(company.headquarters.city).toBe('Restored City'); + expect(company.headquarters.zipCode).toBe('54321'); + }); + + it('should handle round-trip JSON conversion', () => { + const address = new Address(); + address.street = 'Round Trip Street'; + address.city = 'Round Trip City'; + + const company = new Company(); + company.name = 'Round Trip Corp'; + company.headquarters = address; + + const json = company.toJSON(); + const restored = Company.fromJSON(json); + + expect(restored.name).toBe(company.name); + expect(restored.headquarters.street).toBe(company.headquarters.street); + expect(restored.headquarters.city).toBe(company.headquarters.city); + }); + }); +}); From dfc5a13e294061188af2b0760d43dfbed3098dfc Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 10 Sep 2025 13:14:57 -0300 Subject: [PATCH 148/254] Adds the addReference command --- package.json | 14 + src/cache/cache.ts | 20 ++ src/commands/commandRegistration.ts | 45 +++ src/commands/models/addReference.ts | 416 ++++++++++++++++++++++++++++ 4 files changed, 495 insertions(+) create mode 100644 src/commands/models/addReference.ts diff --git a/package.json b/package.json index 8b99e0c..2621b70 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,10 @@ "command": "slingr-vscode-extension.addComposition", "title": "Add Composition" }, + { + "command": "slingr-vscode-extension.addReference", + "title": "Add Reference" + }, { "command": "slingr-vscode-extension.newFolder", "title": "New Folder" @@ -148,6 +152,11 @@ "when": "view == slingrExplorer && viewItem == 'model'", "group": "0_creation" }, + { + "command": "slingr-vscode-extension.addReference", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "0_creation" + }, { "command": "slingr-vscode-extension.createTest", "when": "view == slingrExplorer && viewItem == 'model'", @@ -240,6 +249,11 @@ "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", "group": "1_field" }, + { + "command": "slingr-vscode-extension.addReference", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_field" + }, { "command": "slingr-vscode-extension.createTest", "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", diff --git a/src/cache/cache.ts b/src/cache/cache.ts index 2bb5267..e41dc56 100644 --- a/src/cache/cache.ts +++ b/src/cache/cache.ts @@ -808,6 +808,26 @@ export class MetadataCache { return model.decorators.find(decorator => decorator.name === name) || null; } + /** + * Returns all models that have the same datasource as the specified model. + * @param sourceModel - The model to compare datasources with + * @returns An array of DecoratedClass objects with the same datasource + */ + public getModelsByDataSource(sourceModel: DecoratedClass): DecoratedClass[] { + const sourceModelDecorator = this.getModelDecoratorByName("Model", sourceModel); + const sourceDataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; + + return this.getDataModelClasses().filter(model => { + if (model.name === sourceModel.name) { + return false; // Don't include the source model itself + } + + const modelDecorator = this.getModelDecoratorByName("Model", model); + const modelDataSource = modelDecorator?.arguments?.[0]?.dataSource; + return modelDataSource === sourceDataSource; + }); + } + /** * Utility to convert a ts-morph Node's position to a VS Code Range. * @param node The ts-morph Node. diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index d7ccbf4..3ba96b4 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -12,6 +12,7 @@ import { AppTreeItem } from '../explorer/appTreeItem'; import { CreateModelFromDescriptionTool } from './models/createModelFromDesc'; import { ModifyModelTool } from './models/modifyModel'; import { AddCompositionTool } from './models/addComposition'; +import { AddReferenceTool } from './models/addReference'; import { AIService } from '../services/aiService'; import { ProjectAnalysisService } from '../services/projectAnalysisService'; @@ -217,6 +218,50 @@ export function registerGeneralCommands( }); disposables.push(addCompositionCommand); + // Add Reference Tool + const addReferenceTool = new AddReferenceTool(explorerProvider); + const addReferenceCommand = vscode.commands.registerCommand('slingr-vscode-extension.addReference', async (uri?: vscode.Uri | AppTreeItem) => { + let targetUri: vscode.Uri; + let modelName: string | undefined; + + if (uri) { + // URI provided from context menu (right-click on file in explorer) + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case - check if it's a model with metadata + if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + modelName = uri.metadata?.name; + } else { + vscode.window.showErrorMessage('Please select a model file to add a reference to.'); + return; + } + } + } else { + throw new Error('URI must be provided to add a reference.'); + } + + // Validate that it's a TypeScript file + if (!targetUri.fsPath.endsWith('.ts')) { + vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); + return; + } + + try { + if (modelName) { + await addReferenceTool.addReference(cache, modelName); + } + else{ + vscode.window.showErrorMessage('Model name could not be determined.'); + } + + } catch (error) { + vscode.window.showErrorMessage(`Failed to add reference: ${error}`); + } + }); + disposables.push(addReferenceCommand); + // New Folder Tool const newFolderTool = new NewFolderTool(); const newFolderCommand = vscode.commands.registerCommand('slingr-vscode-extension.newFolder', (uri?: vscode.Uri | AppTreeItem) => { diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts new file mode 100644 index 0000000..1560f38 --- /dev/null +++ b/src/commands/models/addReference.ts @@ -0,0 +1,416 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass } from "../../cache/cache"; +import { AIEnhancedTool, FieldInfo, FieldTypeOption } from "../interfaces"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import * as path from "path"; + +/** + * Tool for adding reference relationships to existing Model classes. + * + * Allows users to create references to either existing models or new models. + * When referencing a new model, it creates the model in a new file with the same datasource. + */ +export class AddReferenceTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private explorerProvider: ExplorerProvider; + + constructor(explorerProvider: ExplorerProvider) { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.explorerProvider = explorerProvider; + } + + /** + * Adds a reference relationship to an existing model file. + * + * @param cache - The metadata cache for context about existing models + * @param modelName - The name of the model to which the reference is being added + * @returns Promise that resolves when the reference is added + */ + public async addReference(cache: MetadataCache, modelName: string): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(modelName, cache); + + // Step 2: Get field name from user + const fieldName = await this.getReferenceFieldName(modelClass); + if (!fieldName) { + return; // User cancelled + } + + // Step 3: Ask if reference is to existing or new model + const referenceType = await this.askReferenceType(); + if (!referenceType) { + return; // User cancelled + } + + let targetModelName: string; + let targetModelPath: string; + + if (referenceType === 'existing') { + // Step 4a: Let user pick existing model on same datasource + const selectedModel = await this.selectExistingModel(modelClass, cache, fieldName); + if (!selectedModel) { + return; // User cancelled + } + targetModelName = selectedModel.name; + targetModelPath = selectedModel.declaration.uri.fsPath; + } else { + // Step 4b: Create new model + const newModelInfo = await this.createNewReferencedModel(modelClass, fieldName, cache); + if (!newModelInfo) { + return; // User cancelled or failed + } + targetModelName = newModelInfo.name; + targetModelPath = newModelInfo.path; + } + + // Step 5: Add reference field to source model + await this.addReferenceField(document, modelClass.name, fieldName, targetModelName, targetModelPath, cache); + + this.explorerProvider.refresh(); + + // Step 6: Show success message + vscode.window.showInformationMessage( + `Reference relationship created successfully! Added ${fieldName} field referencing ${targetModelName}.` + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add reference: ${error}`); + console.error("Error adding reference:", error); + } + } + + /** + * Validates the target file and prepares it for reference addition. + */ + private async validateAndPrepareTarget( + modelName: string, + cache: MetadataCache + ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { + // Get model information from cache + const modelClass = cache.getModelByName(modelName); + if (!modelClass) { + throw new Error(`Model '${modelName}' not found in the project`); + } + + const document = await vscode.workspace.openTextDocument(modelClass.declaration.uri); + if (!document) { + throw new Error(`Could not open document for model '${modelName}'`); + } + + return { modelClass, document }; + } + + /** + * Gets the reference field name from the user. + */ + private async getReferenceFieldName(modelClass: DecoratedClass): Promise { + const fieldName = await vscode.window.showInputBox({ + prompt: "Enter the reference field name (camelCase)", + placeHolder: "e.g., user, category, parentTask", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Field name is required"; + } + if (!/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Field name must be in camelCase (e.g., user, category, parentTask)"; + } + + // Check if field already exists in the model + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(value.trim())) { + return `Field '${value.trim()}' already exists in this model`; + } + + return null; + }, + }); + + return fieldName?.trim() || null; + } + + /** + * Asks the user whether they want to reference an existing model or create a new one. + */ + private async askReferenceType(): Promise<'existing' | 'new' | null> { + const choice = await vscode.window.showQuickPick( + [ + { + label: "Reference existing model", + description: "Select from existing models in the same datasource", + value: 'existing' + }, + { + label: "Create new model", + description: "Create a new model file and reference it", + value: 'new' + } + ], + { + placeHolder: "Do you want to reference an existing model or create a new one?", + matchOnDescription: true + } + ); + + return choice?.value as 'existing' | 'new' | null; + } + + /** + * Lets the user select an existing model from the same datasource. + */ + private async selectExistingModel( + sourceModel: DecoratedClass, + cache: MetadataCache, + fieldName: string + ): Promise { + // Get all models with the same datasource + const sameDataSourceModels = cache.getModelsByDataSource(sourceModel); + + if (sameDataSourceModels.length === 0) { + vscode.window.showWarningMessage( + `No other models found with the same datasource as ${sourceModel.name}. Consider creating a new model instead.` + ); + return null; + } + + // Create suggestions based on field name + const suggestions = this.generateSuggestions(fieldName, sameDataSourceModels); + + // Create quick pick items + const quickPickItems = sameDataSourceModels.map(model => ({ + label: model.name, + description: this.getModelDescription(model, cache), + detail: suggestions.includes(model.name) ? "⭐ Suggested based on field name" : undefined, + model: model + })).sort((a, b) => { + // Sort suggestions first + const aIsSuggested = suggestions.includes(a.model.name); + const bIsSuggested = suggestions.includes(b.model.name); + + if (aIsSuggested && !bIsSuggested) { + return -1; + } + if (!aIsSuggested && bIsSuggested) { + return 1; + } + + // Then alphabetically + return a.label.localeCompare(b.label); + }); + + const selected = await vscode.window.showQuickPick(quickPickItems, { + placeHolder: `Select the model to reference from field '${fieldName}'`, + matchOnDescription: true, + matchOnDetail: true + }); + + return selected?.model || null; + } + + /** + * Generates model name suggestions based on the field name. + */ + private generateSuggestions(fieldName: string, availableModels: DecoratedClass[]): string[] { + const suggestions: string[] = []; + const fieldLower = fieldName.toLowerCase(); + + // Direct match (e.g., "user" -> "User") + const directMatch = this.toPascalCase(fieldName); + if (availableModels.some(m => m.name === directMatch)) { + suggestions.push(directMatch); + } + + // Partial matches (e.g., "parentTask" -> "Task") + availableModels.forEach(model => { + const modelLower = model.name.toLowerCase(); + if (fieldLower.includes(modelLower) || modelLower.includes(fieldLower)) { + if (!suggestions.includes(model.name)) { + suggestions.push(model.name); + } + } + }); + + return suggestions; + } + + /** + * Gets a description for a model based on its properties or decorators. + */ + private getModelDescription(model: DecoratedClass, cache: MetadataCache): string { + const modelDecorator = cache.getModelDecoratorByName("Model", model); + const dataSource = modelDecorator?.arguments?.[0]?.dataSource || "default"; + const fieldCount = Object.keys(model.properties || {}).length; + + return `${fieldCount} fields • datasource: ${dataSource}`; + } + + /** + * Creates a new model to be referenced. + */ + private async createNewReferencedModel( + sourceModel: DecoratedClass, + fieldName: string, + cache: MetadataCache + ): Promise<{ name: string; path: string } | null> { + // Suggest model name based on field name + const suggestedName = this.toPascalCase(fieldName); + + const modelName = await vscode.window.showInputBox({ + prompt: "Enter the name for the new model", + value: suggestedName, + placeHolder: "e.g., User, Category, Task", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Model name is required"; + } + if (!/^[A-Z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Model name must be in PascalCase (e.g., User, Category, Task)"; + } + + // Check if model already exists + const existingModel = cache.getModelByName(value.trim()); + if (existingModel) { + return `Model '${value.trim()}' already exists`; + } + + return null; + }, + }); + + if (!modelName?.trim()) { + return null; // User cancelled + } + + const finalModelName = modelName.trim(); + + // Get datasource from source model + const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); + const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; + + // Determine target directory (same as source model's directory or data folder) + const sourceModelDir = path.dirname(sourceModel.declaration.uri.fsPath); + const targetDir = sourceModelDir; + + // Generate model content + const modelContent = this.generateNewModelContent(finalModelName, dataSource); + + // Create the file + const fileName = `${finalModelName}.ts`; + const filePath = path.join(targetDir, fileName); + + try { + const targetFileUri = await this.fileSystemService.createFile(finalModelName, filePath, modelContent, false); + + // Open the new file + const document = await vscode.workspace.openTextDocument(targetFileUri); + await vscode.window.showTextDocument(document, { preview: false, viewColumn: vscode.ViewColumn.Beside }); + + return { + name: finalModelName, + path: targetFileUri.fsPath + }; + } catch (error) { + throw new Error(`Failed to create new model file: ${error}`); + } + } + + /** + * Generates the TypeScript code for a new referenced model. + */ + private generateNewModelContent(modelName: string, dataSource?: string): string { + const lines: string[] = []; + + // Add imports + lines.push(`import { Model, BaseModel, Field } from 'slingr-framework';`); + lines.push(``); + + // Add model decorator and class + if (dataSource) { + lines.push(`@Model({`); + lines.push(`\tdataSource: ${dataSource}`); + lines.push(`})`); + } else { + lines.push(`@Model()`); + } + lines.push(`export class ${modelName} extends PersistentModel {`); + lines.push(``); + lines.push(`\t@Field({})`); + lines.push(`\tname!: string;`); + lines.push(``); + lines.push(`}`); + lines.push(``); + + return lines.join("\n"); + } + + /** + * Adds the reference field to the source model. + */ + private async addReferenceField( + document: vscode.TextDocument, + sourceModelName: string, + fieldName: string, + targetModelName: string, + targetModelPath: string, + cache: MetadataCache + ): Promise { + // Create field info for the reference field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Relationship", + tsType: targetModelName, + description: "Reference relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // References are typically optional + additionalConfig: { + relationshipType: "reference", + targetModel: targetModelName, + targetModelPath: targetModelPath, + }, + }; + + // Generate the field code + const fieldCode = this.generateReferenceFieldCode(fieldInfo, targetModelName); + + // Insert the field + await this.sourceCodeService.insertField(document, sourceModelName, fieldInfo, fieldCode, cache); + } + + /** + * Generates the TypeScript code for the reference field. + */ + private generateReferenceFieldCode(fieldInfo: FieldInfo, targetModelName: string): string { + const lines: string[] = []; + + // Add Field decorator + lines.push("@Field({})"); + + // Add Relationship decorator for reference + lines.push("@Reference()"); + + // Add property declaration + lines.push(`${fieldInfo.name}!: ${targetModelName};`); + + return lines.join("\n"); + } + + /** + * Converts camelCase to PascalCase. + */ + private toPascalCase(str: string): string { + return str.charAt(0).toUpperCase() + str.slice(1); + } +} From 7ddb299c9c7748685712b04d04269e0d64772a0a Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 10 Sep 2025 14:40:01 -0300 Subject: [PATCH 149/254] Added logic to insert data source import correctly --- src/commands/models/addReference.ts | 23 ++++++++++-- src/services/sourceCodeService.ts | 58 ++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index 1560f38..71a3c39 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -301,7 +301,7 @@ export class AddReferenceTool { const targetDir = sourceModelDir; // Generate model content - const modelContent = this.generateNewModelContent(finalModelName, dataSource); + const modelContent = await this.generateNewModelContent(finalModelName, sourceModel, dataSource); // Create the file const fileName = `${finalModelName}.ts`; @@ -326,11 +326,24 @@ export class AddReferenceTool { /** * Generates the TypeScript code for a new referenced model. */ - private generateNewModelContent(modelName: string, dataSource?: string): string { + private async generateNewModelContent( + modelName: string, + sourceModel: DecoratedClass, + dataSource?: string + ): Promise { const lines: string[] = []; - // Add imports - lines.push(`import { Model, BaseModel, Field } from 'slingr-framework';`); + // Add basic framework imports + lines.push(`import { Model, PersistentModel, Field } from 'slingr-framework';`); + + // Add datasource import if needed + if (dataSource) { + const dataSourceImport = await this.sourceCodeService.extractImport(sourceModel, dataSource); + if (dataSourceImport) { + lines.push(dataSourceImport); + } + } + lines.push(``); // Add model decorator and class @@ -352,6 +365,8 @@ export class AddReferenceTool { return lines.join("\n"); } + + /** * Adds the reference field to the source model. */ diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 592f4d5..94a27e7 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -1,6 +1,6 @@ import * as vscode from "vscode"; import * as path from "path"; -import { MetadataCache } from "../cache/cache"; +import { DecoratedClass, MetadataCache } from "../cache/cache"; import { FieldInfo } from "../commands/interfaces"; import { detectIndentation, applyIndentation } from "../utils/detectIndentation"; import { FileSystemService } from "./fileSystemService"; @@ -328,4 +328,60 @@ export class SourceCodeService { return undefined; } + + /** + * Extracts the datasource import from the source model file. + */ + public async extractImport(sourceModel: DecoratedClass, importName: string): Promise { + try { + // Read the source model file to extract datasource imports + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + const content = document.getText(); + const lines = content.split("\n"); + + // Clean up the importName (remove quotes if it's a string literal) + const cleanImportName = importName.replace(/['"]/g, ""); + + // Look for import lines that might contain the datasource + for (const line of lines) { + if ( + line.includes("import") && + (line.includes(cleanImportName) || + line.includes(`'${cleanImportName}'`) || + line.includes(`"${cleanImportName}"`)) + ) { + return line; + } + } + + // Look for import lines from dataSources directory + for (const line of lines) { + if (line.includes("import") && line.includes("dataSources")) { + // Check if this import contains our datasource + if (line.includes(cleanImportName)) { + return line; + } + } + } + + // If no specific import found, create a generic datasource import + // Calculate relative path to dataSources directory + const sourceModelDir = path.dirname(sourceModel.declaration.uri.fsPath); + const workspaceRoot = vscode.workspace.getWorkspaceFolder(sourceModel.declaration.uri)?.uri.fsPath; + + if (workspaceRoot) { + const relativePath = path.relative(sourceModelDir, path.join(workspaceRoot, "src", "dataSources")); + const importPath = relativePath.replace(/\\/g, "/"); + return `import { ${cleanImportName} } from '${ + importPath.startsWith(".") ? importPath : "./" + importPath + }/${cleanImportName}';`; + } + + // Fallback + return `import { ${cleanImportName} } from '../dataSources/${cleanImportName}';`; + } catch (error) { + console.warn("Could not extract datasource import:", error); + return null; + } + } } From 73bdbe41c9ec039fe364f90b79665408ad060d52 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 11 Sep 2025 09:27:40 -0300 Subject: [PATCH 150/254] Rename (openStart, openEnd) to (from, to) --- src/model/types/date_time/DateTimeRange.ts | 8 ++++---- test/model/Project.ts | 8 ++++---- test/types_tests/ComplexTypesPersistence.test.ts | 8 ++++---- test/types_tests/DateTimeRangeArray.test.ts | 2 +- test/types_tests/DateTimeRangeArrayPersistence.test.ts | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 4982271..22031d4 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -15,9 +15,9 @@ import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; */ export interface DateTimeRangeOptions { /** If set to true, the 'from' field can be empty (open start). */ - openStart?: boolean; + from?: boolean; /** If set to true, the 'to' field can be empty (open end). */ - openEnd?: boolean; + to?: boolean; } /** @@ -110,12 +110,12 @@ function validateSingleRange(value: any, args: ValidationArguments): boolean { const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; // Check if from is required (when openStart is false or undefined) - if (!rangeOptions?.openStart && !value.from) { + if (!rangeOptions?.from && !value.from) { return false; } // Check if to is required (when openEnd is false or undefined) - if (!rangeOptions?.openEnd && !value.to) { + if (!rangeOptions?.to && !value.to) { return false; } diff --git a/test/model/Project.ts b/test/model/Project.ts index 182be1c..ab87346 100644 --- a/test/model/Project.ts +++ b/test/model/Project.ts @@ -35,8 +35,8 @@ export class Project extends BaseModel { required: true, }) @DateTimeRange({ - openStart: false, - openEnd: false, + from: false, + to: false, }) activeRange!: DateTimeRangeType; @@ -45,8 +45,8 @@ export class Project extends BaseModel { required: false, }) @DateTimeRange({ - openStart: true, - openEnd: true, + from: true, + to: true, }) flexibleRange?: DateTimeRangeType; diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 3f1bad7..932e85f 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -48,15 +48,15 @@ class ComplexTypesModel extends PersistentModel { required: true, }) @DateTimeRange({ - openStart: false, - openEnd: false, + from: false, + to: false, }) activeRange!: DateTimeRangeType; @Field({}) @DateTimeRange({ - openStart: true, - openEnd: true, + from: true, + to: true, }) flexibleRange?: DateTimeRangeType | undefined; } diff --git a/test/types_tests/DateTimeRangeArray.test.ts b/test/types_tests/DateTimeRangeArray.test.ts index 86c44b5..aff00b4 100644 --- a/test/types_tests/DateTimeRangeArray.test.ts +++ b/test/types_tests/DateTimeRangeArray.test.ts @@ -5,7 +5,7 @@ import { Field, Model, BaseModel, DateTimeRange, DateTimeRangeType } from "../.. }) class DateTimeRangeArrayModel extends BaseModel { @Field({}) - @DateTimeRange({ openStart: true, openEnd: true }) + @DateTimeRange({ from: true, to: true }) dateRanges!: DateTimeRangeType[]; } diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index f22815b..20f8d42 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -20,17 +20,17 @@ class DateTimeRangeArrayPersistenceModel extends PersistentModel { name!: string; @Field({}) - @DateTimeRange({ openStart: true, openEnd: true }) + @DateTimeRange({ from: true, to: true }) dateRanges?: DateTimeRangeType[]; @Field({ required: true, }) - @DateTimeRange({ openStart: false, openEnd: false }) + @DateTimeRange({ from: false, to: false }) requiredDateRanges!: DateTimeRangeType[]; @Field({}) - @DateTimeRange({ openStart: true, openEnd: false }) + @DateTimeRange({ from: true, to: false }) mixedDateRanges?: DateTimeRangeType[]; } From bcc8982c2aea45dff2ffd5a9926bb4d25ee3b537 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 11 Sep 2025 10:40:39 -0300 Subject: [PATCH 151/254] Rename DateTimeRangeType to DateTimeRangeValue across the codebase --- index.ts | 4 +- .../typeorm/DateTimeRangeFieldManager.ts | 6 +-- src/datasources/typeorm/ValueTransformers.ts | 28 +++++----- src/model/types/date_time/DateTimeRange.ts | 26 +++++----- src/model/types/index.ts | 2 +- test/model/Project.ts | 6 +-- .../ComplexTypesPersistence.test.ts | 32 ++++++------ test/types_tests/DateTime.test.ts | 20 +++---- test/types_tests/DateTimeRange.test.ts | 30 +++++------ test/types_tests/DateTimeRangeArray.test.ts | 20 +++---- .../DateTimeRangeArrayPersistence.test.ts | 52 +++++++++---------- test/types_tests/Relationship.test.ts | 4 +- 12 files changed, 116 insertions(+), 114 deletions(-) diff --git a/index.ts b/index.ts index ccd5bab..ac3058a 100644 --- a/index.ts +++ b/index.ts @@ -15,12 +15,14 @@ export { Boolean } from './src/model/types/boolean/Boolean'; export { Choice } from './src/model/types/'; export { DateTime } from './src/model/types/'; export type { DateTimeOptions } from './src/model/types/'; -export { DateTimeRange, DateTimeRangeType } from './src/model/types/'; +export { DateTimeRange, DateTimeRangeValue } from './src/model/types/'; export type { DateTimeRangeOptions } from './src/model/types/'; export { Integer } from './src/model/types/number/Integer'; export { Money } from './src/model/types/number/Money'; +export type { Money as MoneyNumber } from './src/model/types/number/Money'; export { Number } from './src/model/types/number/Number'; export { Decimal } from './src/model/types/number/Decimal'; +export type { Decimal as DecimalNumber } from './src/model/types/number/Decimal'; export { PersistentModel } from './src/model'; export { TypeORMSqlDataSource } from './src/datasources'; export type { TypeORMSqlDataSourceOptions } from './src/datasources'; diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/src/datasources/typeorm/DateTimeRangeFieldManager.ts index e57213e..5e62372 100644 --- a/src/datasources/typeorm/DateTimeRangeFieldManager.ts +++ b/src/datasources/typeorm/DateTimeRangeFieldManager.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import { Column, AfterLoad } from 'typeorm'; -import { DateTimeRangeType } from '../../model/types/date_time/DateTimeRange'; +import { DateTimeRangeValue } from '../../model/types/date_time/DateTimeRange'; /** * Manages DateTimeRange field persistence using hidden columns approach. @@ -84,7 +84,7 @@ export class DateTimeRangeFieldManager { const hiddenColumns = Reflect.getMetadata('dateTimeRange:hiddenColumns', constructor.prototype, fieldName); if (hiddenColumns) { - const dateTimeRange = entity[fieldName] as DateTimeRangeType | undefined; + const dateTimeRange = entity[fieldName] as DateTimeRangeValue | undefined; if (dateTimeRange) { // Extract from and to dates to hidden columns @@ -119,7 +119,7 @@ export class DateTimeRangeFieldManager { // Only create DateTimeRange if at least one date is present and not null if ((fromDate !== null && fromDate !== undefined) || (toDate !== null && toDate !== undefined)) { - const dateTimeRange = new DateTimeRangeType(); + const dateTimeRange = new DateTimeRangeValue(); // Convert null to undefined for consistency dateTimeRange.from = fromDate === null ? undefined : fromDate; dateTimeRange.to = toDate === null ? undefined : toDate; diff --git a/src/datasources/typeorm/ValueTransformers.ts b/src/datasources/typeorm/ValueTransformers.ts index 3c70443..b55b86c 100644 --- a/src/datasources/typeorm/ValueTransformers.ts +++ b/src/datasources/typeorm/ValueTransformers.ts @@ -1,24 +1,24 @@ import { ValueTransformer } from 'typeorm'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; -import { DateTimeRangeType } from '../../model/types/date_time/DateTimeRange'; +import { DateTimeRangeValue } from '../../model/types/date_time/DateTimeRange'; /** - * TypeORM ValueTransformer for DateTimeRangeType objects. - * Converts between DateTimeRangeType objects and database JSON strings. + * TypeORM ValueTransformer for DateTimeRangeValue objects. + * Converts between DateTimeRangeValue objects and database JSON strings. */ export class DateTimeRangeTransformer implements ValueTransformer { /** - * Transforms DateTimeRangeType to database value (JSON string). - * @param value - DateTimeRangeType instance + * Transforms DateTimeRangeValue to database value (JSON string). + * @param value - DateTimeRangeValue instance * @returns JSON string representation for database storage */ - to(value: DateTimeRangeType | null | undefined): string | null { + to(value: DateTimeRangeValue | null | undefined): string | null { if (value === null || value === undefined) { return null; } - if (!(value instanceof DateTimeRangeType)) { - console.warn('DateTimeRangeTransformer.to() received non-DateTimeRangeType value:', value); + if (!(value instanceof DateTimeRangeValue)) { + console.warn('DateTimeRangeTransformer.to() received non-DateTimeRangeValue value:', value); return null; } @@ -28,24 +28,24 @@ export class DateTimeRangeTransformer implements ValueTransformer { to: value.to ? value.to.toISOString() : undefined }); } catch (error) { - console.warn('Failed to serialize DateTimeRangeType to JSON:', error); + console.warn('Failed to serialize DateTimeRangeValue to JSON:', error); return null; } } /** - * Transforms database value (JSON string) to DateTimeRangeType. + * Transforms database value (JSON string) to DateTimeRangeValue. * @param value - Database JSON string value - * @returns DateTimeRangeType instance or undefined + * @returns DateTimeRangeValue instance or undefined */ - from(value: string | null | undefined): DateTimeRangeType | undefined { + from(value: string | null | undefined): DateTimeRangeValue | undefined { if (value === null || value === undefined) { return undefined; } try { const data = JSON.parse(value); - const range = new DateTimeRangeType(); + const range = new DateTimeRangeValue(); if (data.from) { range.from = new Date(data.from); @@ -57,7 +57,7 @@ export class DateTimeRangeTransformer implements ValueTransformer { return range; } catch (error) { - console.warn(`Failed to parse DateTimeRangeType from database value: ${value}`, error); + console.warn(`Failed to parse DateTimeRangeValue from database value: ${value}`, error); return undefined; } } diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 22031d4..6f19f27 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -24,7 +24,7 @@ export interface DateTimeRangeOptions { * DateTimeRange class that represents a range between two dates. * Used as a nested object in models that need date ranges. */ -export class DateTimeRangeType { +export class DateTimeRangeValue { @IsOptional() @Expose() @Transform(({ value, type }) => { @@ -55,20 +55,20 @@ export class DateTimeRangeType { } // Custom key types for clearer IntelliSense errors -type DateTimeRangeKey = T[K] extends DateTimeRangeType | DateTimeRangeType[] | undefined +type DateTimeRangeKey = T[K] extends DateTimeRangeValue | DateTimeRangeValue[] | undefined ? K : `DateTimeRange: requires DateTimeRange field`; /** * Validates that a property is of DateTimeRange type at runtime. */ -function validateDateTimeRangeType(proto: Object, propertyKey: string): void { +function validateDateTimeRangeValue(proto: Object, propertyKey: string): void { const designType = Reflect.getMetadata('design:type', proto, propertyKey); // Be more flexible with type checking since TypeScript may not preserve exact type info - // We accept DateTimeRangeType, Object, or undefined types + // We accept DateTimeRangeValue, Object, or undefined types if ( designType && - designType !== DateTimeRangeType && + designType !== DateTimeRangeValue && designType !== Object && designType !== Array ) { @@ -103,7 +103,7 @@ function validateSingleRange(value: any, args: ValidationArguments): boolean { return true; // Allow null/undefined values in arrays } - if (!(value instanceof DateTimeRangeType)) { + if (!(value instanceof DateTimeRangeValue)) { return false; } @@ -146,12 +146,12 @@ function IsValidDateTimeRange(options?: DateTimeRangeOptions, validationOptions? return true; // Allow null/undefined values } - // Handle arrays of DateTimeRangeType + // Handle arrays of DateTimeRangeValue if (Array.isArray(value)) { return value.every(item => validateSingleRange(item, args)); } - // Handle single DateTimeRangeType + // Handle single DateTimeRangeValue return validateSingleRange(value, args); }, defaultMessage(args: ValidationArguments) { @@ -200,7 +200,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { const propName = propertyKey as unknown as string; const proto = target as unknown as Object; - validateDateTimeRangeType(proto, propName); + validateDateTimeRangeValue(proto, propName); storeDateTimeRangeMetadata(proto, propName, options); const designType = Reflect.getMetadata('design:type', proto, propName); @@ -214,7 +214,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { // Apply nested validation for each array element ValidateNested({ each: true })(target as any, propName); - Type(() => DateTimeRangeType)(target as any, propName); + Type(() => DateTimeRangeValue)(target as any, propName); // Apply custom range validation for each array element IsValidDateTimeRange(options)(target as any, propName); @@ -222,7 +222,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { // Handle single DateTimeRange case // Apply nested validation for DateTimeRange ValidateNested()(target as any, propName); - Type(() => DateTimeRangeType)(target as any, propName); + Type(() => DateTimeRangeValue)(target as any, propName); // Apply custom range validation IsValidDateTimeRange(options)(target as any, propName); @@ -234,7 +234,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { * DateTimeRange field configuration for TypeORM persistence. * Uses JSON column type with custom transformer to store DateTimeRange objects. */ -export const DateTimeRangeTypeConfig: FieldTypeConfig = { +export const DateTimeRangeValueConfig: FieldTypeConfig = { getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { const { dateTimeRangeTransformer } = require('../../../datasources/typeorm/ValueTransformers'); return { @@ -255,4 +255,4 @@ export const DateTimeRangeTypeConfig: FieldTypeConfig = { }; // Register the datetime range type configuration -FieldTypeRegistry.register('datetimerange', DateTimeRangeTypeConfig); +FieldTypeRegistry.register('datetimerange', DateTimeRangeValueConfig); diff --git a/src/model/types/index.ts b/src/model/types/index.ts index e1a65c4..b686421 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -6,7 +6,7 @@ export { Boolean } from './boolean/Boolean'; export { Choice } from './enum/Choice'; export { DateTime } from './date_time/DateTime'; export type { DateTimeOptions } from './date_time/DateTime'; -export { DateTimeRange, DateTimeRangeType } from './date_time/DateTimeRange'; +export { DateTimeRange, DateTimeRangeValue } from './date_time/DateTimeRange'; export type { DateTimeRangeOptions } from './date_time/DateTimeRange'; export { Integer } from './number/Integer'; export { Money } from './number/Money'; diff --git a/test/model/Project.ts b/test/model/Project.ts index ab87346..a1eb897 100644 --- a/test/model/Project.ts +++ b/test/model/Project.ts @@ -1,4 +1,4 @@ -import { BaseModel, Field, Model, Text, DateTime, DateTimeRange, DateTimeRangeType } from "../../index"; +import { BaseModel, Field, Model, Text, DateTime, DateTimeRange, DateTimeRangeValue } from "../../index"; @Model({ docs: "Represents a project with date-related fields", @@ -38,7 +38,7 @@ export class Project extends BaseModel { from: false, to: false, }) - activeRange!: DateTimeRangeType; + activeRange!: DateTimeRangeValue; @Field({ @@ -48,7 +48,7 @@ export class Project extends BaseModel { from: true, to: true, }) - flexibleRange?: DateTimeRangeType; + flexibleRange?: DateTimeRangeValue; @Field({ diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 932e85f..d2f4eb3 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -6,10 +6,10 @@ import { Decimal, Money, DateTimeRange, - DateTimeRangeType, + DateTimeRangeValue, Text, - type Decimal as DecimalType, - type Money as MoneyType + DecimalNumber, + MoneyNumber } from "../../index"; import { validateSync } from 'class-validator'; import number from 'financial-number'; @@ -32,7 +32,7 @@ class ComplexTypesModel extends PersistentModel { min: '0.01', max: '1000.00', }) - priceDecimal?: DecimalType | undefined; + priceDecimal?: DecimalNumber | undefined; @Field({}) @Money({ @@ -42,7 +42,7 @@ class ComplexTypesModel extends PersistentModel { min: '0.01', max: '10000.00' }) - priceMoney?: MoneyType | undefined; + priceMoney?: MoneyNumber | undefined; @Field({ required: true, @@ -51,14 +51,14 @@ class ComplexTypesModel extends PersistentModel { from: false, to: false, }) - activeRange!: DateTimeRangeType; + activeRange!: DateTimeRangeValue; @Field({}) @DateTimeRange({ from: true, to: true, }) - flexibleRange?: DateTimeRangeType | undefined; + flexibleRange?: DateTimeRangeValue | undefined; } describe("Complex Types Persistence in SQL Databases", () => { @@ -115,13 +115,13 @@ describe("Complex Types Persistence in SQL Databases", () => { testEntity.priceMoney = number("999.99"); // Set up required DateTimeRange - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-01-01T00:00:00Z'); activeRange.to = new Date('2024-12-31T23:59:59Z'); testEntity.activeRange = activeRange; // Set up optional DateTimeRange - const flexibleRange = new DateTimeRangeType(); + const flexibleRange = new DateTimeRangeValue(); flexibleRange.from = new Date('2024-06-01T00:00:00Z'); flexibleRange.to = new Date('2024-08-31T23:59:59Z'); testEntity.flexibleRange = flexibleRange; @@ -253,7 +253,7 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should handle partial DateTimeRange values (open ranges)", async () => { // Create a range with only 'from' date - const partialRange = new DateTimeRangeType(); + const partialRange = new DateTimeRangeValue(); partialRange.from = new Date('2024-01-01T00:00:00Z'); // partialRange.to remains undefined testEntity.flexibleRange = partialRange; @@ -271,7 +271,7 @@ describe("Complex Types Persistence in SQL Databases", () => { expect(retrievedEntity).not.toBeNull(); expect(retrievedEntity!.activeRange).toBeDefined(); - expect(retrievedEntity!.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.activeRange).toBeInstanceOf(DateTimeRangeValue); expect(retrievedEntity!.activeRange.from).toBeInstanceOf(Date); expect(retrievedEntity!.activeRange.to).toBeInstanceOf(Date); @@ -298,7 +298,7 @@ describe("Complex Types Persistence in SQL Databases", () => { entity1.priceDecimal = number("100.00"); entity1.priceMoney = number("200.00"); - const range1 = new DateTimeRangeType(); + const range1 = new DateTimeRangeValue(); range1.from = new Date('2024-01-01T00:00:00Z'); range1.to = new Date('2024-06-30T23:59:59Z'); entity1.activeRange = range1; @@ -311,7 +311,7 @@ describe("Complex Types Persistence in SQL Databases", () => { entity2.priceDecimal = number("150.00"); entity2.priceMoney = number("300.00"); - const range2 = new DateTimeRangeType(); + const range2 = new DateTimeRangeValue(); range2.from = new Date('2024-07-01T00:00:00Z'); range2.to = new Date('2024-12-31T23:59:59Z'); entity2.activeRange = range2; @@ -328,7 +328,7 @@ describe("Complex Types Persistence in SQL Databases", () => { expect(entity.priceDecimal).toBeDefined(); expect(entity.priceMoney).toBeDefined(); expect(entity.activeRange).toBeDefined(); - expect(entity.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(entity.activeRange).toBeInstanceOf(DateTimeRangeValue); expect(typeof entity.priceDecimal!.toString).toBe('function'); expect(typeof entity.priceMoney!.toString).toBe('function'); } @@ -378,7 +378,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should update DateTimeRange values correctly", async () => { - const newRange = new DateTimeRangeType(); + const newRange = new DateTimeRangeValue(); newRange.from = new Date('2025-01-01T00:00:00Z'); newRange.to = new Date('2025-12-31T23:59:59Z'); savedEntity.activeRange = newRange; @@ -416,7 +416,7 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should validate DateTimeRange constraints", async () => { // Test invalid range (from > to) - const invalidRange = new DateTimeRangeType(); + const invalidRange = new DateTimeRangeValue(); invalidRange.from = new Date('2024-12-31T23:59:59Z'); invalidRange.to = new Date('2024-01-01T00:00:00Z'); testEntity.activeRange = invalidRange; diff --git a/test/types_tests/DateTime.test.ts b/test/types_tests/DateTime.test.ts index 5ce074e..fd511a8 100644 --- a/test/types_tests/DateTime.test.ts +++ b/test/types_tests/DateTime.test.ts @@ -1,5 +1,5 @@ import { Project } from "../model/Project"; -import { DateTimeRangeType } from "../../index"; +import { DateTimeRangeValue } from "../../index"; import type { ValidationError } from "class-validator"; @@ -24,7 +24,7 @@ describe("DateTime Field Type", () => { project.name = "Date Test"; project.startDate = new Date('2024-06-15'); // Within 2020-2030 range - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -38,7 +38,7 @@ describe("DateTime Field Type", () => { project.name = "Date Test"; project.startDate = new Date('2019-12-31'); // Before 2020-01-01 minimum - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -56,7 +56,7 @@ describe("DateTime Field Type", () => { project.name = "Date Test"; project.startDate = new Date('2031-01-01'); // After 2030-12-31 maximum - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -74,7 +74,7 @@ describe("DateTime Field Type", () => { project.name = "Invalid Date Test"; project.startDate = new Date('invalid-date'); // Invalid date - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -93,7 +93,7 @@ describe("DateTime Field Type", () => { project.startDate = new Date('2024-06-15'); project.endDate = new Date('1990-01-01'); // No constraints on endDate - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -109,7 +109,7 @@ describe("DateTime Field Type", () => { project.name = "Date Test"; // Missing startDate (required) - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -126,7 +126,7 @@ describe("DateTime Field Type", () => { project.startDate = new Date('2024-06-15'); // endDate is optional - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -143,7 +143,7 @@ describe("DateTime Field Type", () => { project.startDate = new Date('2024-06-15T10:00:00.000Z'); project.endDate = new Date('2024-12-31T23:59:59.000Z'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15T10:00:00.000Z'); activeRange.to = new Date('2024-09-15T10:00:00.000Z'); project.activeRange = activeRange; @@ -179,7 +179,7 @@ describe("DateTime Field Type", () => { project.startDate = new Date('2024-06-15'); // endDate is undefined - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; diff --git a/test/types_tests/DateTimeRange.test.ts b/test/types_tests/DateTimeRange.test.ts index 0cb736f..0c33e23 100644 --- a/test/types_tests/DateTimeRange.test.ts +++ b/test/types_tests/DateTimeRange.test.ts @@ -1,5 +1,5 @@ import { Project } from "../model/Project"; -import { DateTimeRangeType } from "../../index"; +import { DateTimeRangeValue } from "../../index"; import type { ValidationError } from "class-validator"; @@ -24,7 +24,7 @@ describe("DateTimeRange Field Type", () => { project.name = "Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -38,7 +38,7 @@ describe("DateTimeRange Field Type", () => { project.name = "Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-09-15'); // After 'to' date activeRange.to = new Date('2024-06-15'); project.activeRange = activeRange; @@ -56,7 +56,7 @@ describe("DateTimeRange Field Type", () => { project.name = "Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); // Both from and to are undefined, but openStart and openEnd are false project.activeRange = activeRange; @@ -73,12 +73,12 @@ describe("DateTimeRange Field Type", () => { project.name = "Flexible Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; - const flexibleRange = new DateTimeRangeType(); + const flexibleRange = new DateTimeRangeValue(); flexibleRange.from = new Date('2024-01-01'); // to is undefined, but openEnd is true project.flexibleRange = flexibleRange; @@ -92,12 +92,12 @@ describe("DateTimeRange Field Type", () => { project.name = "Flexible Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; - const flexibleRange = new DateTimeRangeType(); + const flexibleRange = new DateTimeRangeValue(); // from is undefined, but openStart is true flexibleRange.to = new Date('2024-12-31'); project.flexibleRange = flexibleRange; @@ -111,12 +111,12 @@ describe("DateTimeRange Field Type", () => { project.name = "Flexible Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; - const flexibleRange = new DateTimeRangeType(); + const flexibleRange = new DateTimeRangeValue(); // Both from and to are undefined, but both openStart and openEnd are true project.flexibleRange = flexibleRange; @@ -143,7 +143,7 @@ describe("DateTimeRange Field Type", () => { project.name = "Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; @@ -160,7 +160,7 @@ describe("DateTimeRange Field Type", () => { project.name = "Range JSON Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15T10:00:00.000Z'); activeRange.to = new Date('2024-09-15T10:00:00.000Z'); project.activeRange = activeRange; @@ -185,7 +185,7 @@ describe("DateTimeRange Field Type", () => { const project = Project.fromJSON(jsonData); - expect(project.activeRange).toBeInstanceOf(DateTimeRangeType); + expect(project.activeRange).toBeInstanceOf(DateTimeRangeValue); expect(project.activeRange.from).toBeInstanceOf(Date); expect(project.activeRange.to).toBeInstanceOf(Date); expect(project.activeRange.from?.toISOString()).toBe('2024-06-15T10:00:00.000Z'); @@ -197,12 +197,12 @@ describe("DateTimeRange Field Type", () => { project.name = "Partial Range Test"; project.startDate = new Date('2024-06-15'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2024-06-15'); activeRange.to = new Date('2024-09-15'); project.activeRange = activeRange; - const flexibleRange = new DateTimeRangeType(); + const flexibleRange = new DateTimeRangeValue(); flexibleRange.from = new Date('2024-01-01'); // to is undefined project.flexibleRange = flexibleRange; diff --git a/test/types_tests/DateTimeRangeArray.test.ts b/test/types_tests/DateTimeRangeArray.test.ts index aff00b4..1a294c9 100644 --- a/test/types_tests/DateTimeRangeArray.test.ts +++ b/test/types_tests/DateTimeRangeArray.test.ts @@ -1,4 +1,4 @@ -import { Field, Model, BaseModel, DateTimeRange, DateTimeRangeType } from "../../index"; +import { Field, Model, BaseModel, DateTimeRange, DateTimeRangeValue } from "../../index"; @Model({ docs: "Test model for DateTimeRange with array support checks", @@ -6,18 +6,18 @@ import { Field, Model, BaseModel, DateTimeRange, DateTimeRangeType } from "../.. class DateTimeRangeArrayModel extends BaseModel { @Field({}) @DateTimeRange({ from: true, to: true }) - dateRanges!: DateTimeRangeType[]; + dateRanges!: DateTimeRangeValue[]; } -describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () => { +describe("DateTimeRange decorator with array values (DateTimeRangeValue[])", () => { it("should pass validation for arrays (array of DateTimeRange is now supported)", async () => { const m = new DateTimeRangeArrayModel(); - const r1 = new DateTimeRangeType(); + const r1 = new DateTimeRangeValue(); r1.from = new Date("2024-01-01T00:00:00Z"); r1.to = new Date("2024-01-31T23:59:59Z"); - const r2 = new DateTimeRangeType(); + const r2 = new DateTimeRangeValue(); r2.from = new Date("2024-02-01T00:00:00Z"); r2.to = new Date("2024-02-28T23:59:59Z"); @@ -31,11 +31,11 @@ describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () = it("should still serialize and deserialize array items to ISO strings and back to Date objects", async () => { const m = new DateTimeRangeArrayModel(); - const r1 = new DateTimeRangeType(); + const r1 = new DateTimeRangeValue(); r1.from = new Date("2024-03-01T00:00:00Z"); r1.to = new Date("2024-03-31T23:59:59Z"); - const r2 = new DateTimeRangeType(); + const r2 = new DateTimeRangeValue(); r2.from = new Date("2024-04-01T00:00:00Z"); r2.to = new Date("2024-04-30T23:59:59Z"); @@ -49,13 +49,13 @@ describe("DateTimeRange decorator with array values (DateTimeRangeType[])", () = expect(json.dateRanges[1].from).toBe("2024-04-01T00:00:00.000Z"); expect(json.dateRanges[1].to).toBe("2024-04-30T23:59:59.000Z"); - // fromJSON should rehydrate to DateTimeRangeType instances with Date fields + // fromJSON should rehydrate to DateTimeRangeValue instances with Date fields const restored = DateTimeRangeArrayModel.fromJSON(json); expect(Array.isArray(restored.dateRanges)).toBe(true); - expect(restored.dateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(restored.dateRanges[0]).toBeInstanceOf(DateTimeRangeValue); expect(restored.dateRanges[0]!.from).toBeInstanceOf(Date); expect(restored.dateRanges[0]!.to).toBeInstanceOf(Date); - expect(restored.dateRanges[1]).toBeInstanceOf(DateTimeRangeType); + expect(restored.dateRanges[1]).toBeInstanceOf(DateTimeRangeValue); expect(restored.dateRanges[1]!.from).toBeInstanceOf(Date); expect(restored.dateRanges[1]!.to).toBeInstanceOf(Date); }); diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index 20f8d42..76e3932 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -4,7 +4,7 @@ import { Field, Model, DateTimeRange, - DateTimeRangeType, + DateTimeRangeValue, Text } from "../../index"; @@ -21,17 +21,17 @@ class DateTimeRangeArrayPersistenceModel extends PersistentModel { @Field({}) @DateTimeRange({ from: true, to: true }) - dateRanges?: DateTimeRangeType[]; + dateRanges?: DateTimeRangeValue[]; @Field({ required: true, }) @DateTimeRange({ from: false, to: false }) - requiredDateRanges!: DateTimeRangeType[]; + requiredDateRanges!: DateTimeRangeValue[]; @Field({}) @DateTimeRange({ from: true, to: false }) - mixedDateRanges?: DateTimeRangeType[]; + mixedDateRanges?: DateTimeRangeValue[]; } describe("DateTimeRange Array Persistence in SQL Databases", () => { @@ -82,33 +82,33 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { testEntity.name = "DateTimeRange Array Test"; // Set up required DateTimeRange array - const range1 = new DateTimeRangeType(); + const range1 = new DateTimeRangeValue(); range1.from = new Date('2024-01-01T00:00:00Z'); range1.to = new Date('2024-01-31T23:59:59Z'); - const range2 = new DateTimeRangeType(); + const range2 = new DateTimeRangeValue(); range2.from = new Date('2024-02-01T00:00:00Z'); range2.to = new Date('2024-02-28T23:59:59Z'); testEntity.requiredDateRanges = [range1, range2]; // Set up optional DateTimeRange array - const range3 = new DateTimeRangeType(); + const range3 = new DateTimeRangeValue(); range3.from = new Date('2024-03-01T00:00:00Z'); range3.to = new Date('2024-03-31T23:59:59Z'); - const range4 = new DateTimeRangeType(); + const range4 = new DateTimeRangeValue(); range4.from = new Date('2024-04-01T00:00:00Z'); range4.to = new Date('2024-04-30T23:59:59Z'); testEntity.dateRanges = [range3, range4]; // Set up mixed DateTimeRange array (some with openStart) - const range5 = new DateTimeRangeType(); + const range5 = new DateTimeRangeValue(); // range5.from remains undefined for open start range5.to = new Date('2024-05-31T23:59:59Z'); - const range6 = new DateTimeRangeType(); + const range6 = new DateTimeRangeValue(); range6.from = new Date('2024-06-01T00:00:00Z'); range6.to = new Date('2024-06-30T23:59:59Z'); @@ -131,7 +131,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { // Check required array expect(Array.isArray(savedEntity.requiredDateRanges)).toBe(true); expect(savedEntity.requiredDateRanges).toHaveLength(2); - expect(savedEntity.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(savedEntity.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeValue); expect(savedEntity.requiredDateRanges[0]!.from).toBeInstanceOf(Date); expect(savedEntity.requiredDateRanges[0]!.to).toBeInstanceOf(Date); expect(savedEntity.requiredDateRanges[0]!.from!.toISOString()).toBe('2024-01-01T00:00:00.000Z'); @@ -143,7 +143,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { // Check optional array expect(Array.isArray(savedEntity.dateRanges)).toBe(true); expect(savedEntity.dateRanges).toHaveLength(2); - expect(savedEntity.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + expect(savedEntity.dateRanges![0]).toBeInstanceOf(DateTimeRangeValue); expect(savedEntity.dateRanges![0]!.from!.toISOString()).toBe('2024-03-01T00:00:00.000Z'); expect(savedEntity.dateRanges![0]!.to!.toISOString()).toBe('2024-03-31T23:59:59.000Z'); @@ -167,14 +167,14 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { // Verify required array integrity expect(Array.isArray(retrievedEntity!.requiredDateRanges)).toBe(true); expect(retrievedEntity!.requiredDateRanges).toHaveLength(2); - expect(retrievedEntity!.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.requiredDateRanges[0]).toBeInstanceOf(DateTimeRangeValue); expect(retrievedEntity!.requiredDateRanges[0]!.from).toBeInstanceOf(Date); expect(retrievedEntity!.requiredDateRanges[0]!.to).toBeInstanceOf(Date); // Verify optional array integrity expect(Array.isArray(retrievedEntity!.dateRanges)).toBe(true); expect(retrievedEntity!.dateRanges).toHaveLength(2); - expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeValue); // Verify mixed array integrity expect(Array.isArray(retrievedEntity!.mixedDateRanges)).toBe(true); @@ -221,7 +221,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { }); it("should handle arrays with single DateTimeRange element", async () => { - const singleRange = new DateTimeRangeType(); + const singleRange = new DateTimeRangeValue(); singleRange.from = new Date('2024-07-01T00:00:00Z'); singleRange.to = new Date('2024-07-31T23:59:59Z'); @@ -240,7 +240,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); expect(retrievedEntity!.dateRanges).toHaveLength(1); - expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeType); + expect(retrievedEntity!.dateRanges![0]).toBeInstanceOf(DateTimeRangeValue); expect(retrievedEntity!.dateRanges![0]!.from).toBeInstanceOf(Date); expect(retrievedEntity!.dateRanges![0]!.to).toBeInstanceOf(Date); }); @@ -248,11 +248,11 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { describe("Complex Array Operations", () => { it("should handle large DateTimeRange arrays", async () => { - const manyRanges: DateTimeRangeType[] = []; + const manyRanges: DateTimeRangeValue[] = []; // Create 10 DateTimeRange objects for (let i = 0; i < 10; i++) { - const range = new DateTimeRangeType(); + const range = new DateTimeRangeValue(); range.from = new Date(`2024-${String(i + 1).padStart(2, '0')}-01T00:00:00Z`); range.to = new Date(`2024-${String(i + 1).padStart(2, '0')}-28T23:59:59Z`); manyRanges.push(range); @@ -276,28 +276,28 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { }); it("should handle arrays with mixed open/closed DateTimeRanges", async () => { - const mixedRanges: DateTimeRangeType[] = []; + const mixedRanges: DateTimeRangeValue[] = []; // Fully closed range - const closedRange = new DateTimeRangeType(); + const closedRange = new DateTimeRangeValue(); closedRange.from = new Date('2024-01-01T00:00:00Z'); closedRange.to = new Date('2024-01-31T23:59:59Z'); mixedRanges.push(closedRange); // Open start range - const openStartRange = new DateTimeRangeType(); + const openStartRange = new DateTimeRangeValue(); // openStartRange.from = undefined; openStartRange.to = new Date('2024-02-28T23:59:59Z'); mixedRanges.push(openStartRange); // Open end range - const openEndRange = new DateTimeRangeType(); + const openEndRange = new DateTimeRangeValue(); openEndRange.from = new Date('2024-03-01T00:00:00Z'); // openEndRange.to = undefined; mixedRanges.push(openEndRange); // Fully open range - const fullyOpenRange = new DateTimeRangeType(); + const fullyOpenRange = new DateTimeRangeValue(); // fullyOpenRange.from = undefined; // fullyOpenRange.to = undefined; mixedRanges.push(fullyOpenRange); @@ -345,11 +345,11 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { const savedEntity = await dataSource.save(testEntity); // Update the arrays - const newRange1 = new DateTimeRangeType(); + const newRange1 = new DateTimeRangeValue(); newRange1.from = new Date('2024-08-01T00:00:00Z'); newRange1.to = new Date('2024-08-31T23:59:59Z'); - const newRange2 = new DateTimeRangeType(); + const newRange2 = new DateTimeRangeValue(); newRange2.from = new Date('2024-09-01T00:00:00Z'); newRange2.to = new Date('2024-09-30T23:59:59Z'); @@ -380,7 +380,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { const validEntity = new DateTimeRangeArrayPersistenceModel(); validEntity.name = "Valid Entity"; - const validRange = new DateTimeRangeType(); + const validRange = new DateTimeRangeValue(); validRange.from = new Date('2024-01-01T00:00:00Z'); validRange.to = new Date('2024-01-31T23:59:59Z'); diff --git a/test/types_tests/Relationship.test.ts b/test/types_tests/Relationship.test.ts index 03f87de..2099d40 100644 --- a/test/types_tests/Relationship.test.ts +++ b/test/types_tests/Relationship.test.ts @@ -1,4 +1,4 @@ -import { BaseModel, Field, Model, DateTimeRangeType, Relationship } from "../../index"; +import { BaseModel, Field, Model, DateTimeRangeValue, Relationship } from "../../index"; import { Customer } from '../model/Customer'; import { LineItem } from '../model/LineItem'; import { Order } from '../model/Order'; @@ -126,7 +126,7 @@ describe('Relationship Type', () => { const project = new Project(); project.name = 'Test Project'; project.startDate = new Date('2023-01-01'); - const activeRange = new DateTimeRangeType(); + const activeRange = new DateTimeRangeValue(); activeRange.from = new Date('2023-01-01'); activeRange.to = new Date('2023-12-31'); project.activeRange = activeRange; From 0623128681614c5feeb6984eb9123796b5e28240 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 11 Sep 2025 10:50:35 -0300 Subject: [PATCH 152/254] Add dateTimeRange convenience function for DateTimeRangeValue creation --- index.ts | 2 +- src/model/types/date_time/DateTimeRange.ts | 33 +++++++ src/model/types/index.ts | 2 +- .../ComplexTypesPersistence.test.ts | 31 ++----- test/types_tests/DateTimeRange.test.ts | 93 ++++++++++++++++++- 5 files changed, 137 insertions(+), 24 deletions(-) diff --git a/index.ts b/index.ts index ac3058a..4168f5b 100644 --- a/index.ts +++ b/index.ts @@ -15,7 +15,7 @@ export { Boolean } from './src/model/types/boolean/Boolean'; export { Choice } from './src/model/types/'; export { DateTime } from './src/model/types/'; export type { DateTimeOptions } from './src/model/types/'; -export { DateTimeRange, DateTimeRangeValue } from './src/model/types/'; +export { DateTimeRange, DateTimeRangeValue, dateTimeRange } from './src/model/types/'; export type { DateTimeRangeOptions } from './src/model/types/'; export { Integer } from './src/model/types/number/Integer'; export { Money } from './src/model/types/number/Money'; diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 6f19f27..023e74c 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -54,6 +54,39 @@ export class DateTimeRangeValue { to?: Date; } +/** + * Convenience function to create a DateTimeRangeValue instance. + * + * @param from - The start date (can be a Date object, ISO string, or timestamp) + * @param to - The end date (can be a Date object, ISO string, or timestamp) + * @returns A new DateTimeRangeValue instance + * + * @example + * ```typescript + * // Using ISO strings + * const range1 = dateTimeRange('2024-01-01T00:00:00Z', '2024-12-31T23:59:59Z'); + * + * // Using Date objects + * const range2 = dateTimeRange(new Date('2024-01-01'), new Date('2024-12-31')); + * + * // Mixed types + * const range3 = dateTimeRange('2024-01-01', new Date('2024-12-31')); + * ``` + */ +export function dateTimeRange(from?: string | Date | number, to?: string | Date | number): DateTimeRangeValue { + const range = new DateTimeRangeValue(); + + if (from !== undefined) { + range.from = from instanceof Date ? from : new Date(from); + } + + if (to !== undefined) { + range.to = to instanceof Date ? to : new Date(to); + } + + return range; +} + // Custom key types for clearer IntelliSense errors type DateTimeRangeKey = T[K] extends DateTimeRangeValue | DateTimeRangeValue[] | undefined ? K diff --git a/src/model/types/index.ts b/src/model/types/index.ts index b686421..dd77638 100644 --- a/src/model/types/index.ts +++ b/src/model/types/index.ts @@ -6,7 +6,7 @@ export { Boolean } from './boolean/Boolean'; export { Choice } from './enum/Choice'; export { DateTime } from './date_time/DateTime'; export type { DateTimeOptions } from './date_time/DateTime'; -export { DateTimeRange, DateTimeRangeValue } from './date_time/DateTimeRange'; +export { DateTimeRange, DateTimeRangeValue, dateTimeRange } from './date_time/DateTimeRange'; export type { DateTimeRangeOptions } from './date_time/DateTimeRange'; export { Integer } from './number/Integer'; export { Money } from './number/Money'; diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index d2f4eb3..81a9b16 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -9,7 +9,8 @@ import { DateTimeRangeValue, Text, DecimalNumber, - MoneyNumber + MoneyNumber, + dateTimeRange } from "../../index"; import { validateSync } from 'class-validator'; import number from 'financial-number'; @@ -115,15 +116,11 @@ describe("Complex Types Persistence in SQL Databases", () => { testEntity.priceMoney = number("999.99"); // Set up required DateTimeRange - const activeRange = new DateTimeRangeValue(); - activeRange.from = new Date('2024-01-01T00:00:00Z'); - activeRange.to = new Date('2024-12-31T23:59:59Z'); + const activeRange = dateTimeRange('2024-01-01T00:00:00Z', '2024-12-31T23:59:59Z'); testEntity.activeRange = activeRange; // Set up optional DateTimeRange - const flexibleRange = new DateTimeRangeValue(); - flexibleRange.from = new Date('2024-06-01T00:00:00Z'); - flexibleRange.to = new Date('2024-08-31T23:59:59Z'); + const flexibleRange = dateTimeRange('2024-06-01T00:00:00Z', '2024-08-31T23:59:59Z'); testEntity.flexibleRange = flexibleRange; }); @@ -297,10 +294,8 @@ describe("Complex Types Persistence in SQL Databases", () => { entity1.name = "Entity 1"; entity1.priceDecimal = number("100.00"); entity1.priceMoney = number("200.00"); - - const range1 = new DateTimeRangeValue(); - range1.from = new Date('2024-01-01T00:00:00Z'); - range1.to = new Date('2024-06-30T23:59:59Z'); + + const range1 = dateTimeRange('2024-01-01T00:00:00Z', '2024-06-30T23:59:59Z'); entity1.activeRange = range1; savedEntity1 = await dataSource.save(entity1); @@ -310,10 +305,8 @@ describe("Complex Types Persistence in SQL Databases", () => { entity2.name = "Entity 2"; entity2.priceDecimal = number("150.00"); entity2.priceMoney = number("300.00"); - - const range2 = new DateTimeRangeValue(); - range2.from = new Date('2024-07-01T00:00:00Z'); - range2.to = new Date('2024-12-31T23:59:59Z'); + + const range2 = dateTimeRange('2024-07-01T00:00:00Z', '2024-12-31T23:59:59Z'); entity2.activeRange = range2; savedEntity2 = await dataSource.save(entity2); @@ -378,9 +371,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should update DateTimeRange values correctly", async () => { - const newRange = new DateTimeRangeValue(); - newRange.from = new Date('2025-01-01T00:00:00Z'); - newRange.to = new Date('2025-12-31T23:59:59Z'); + const newRange = dateTimeRange('2025-01-01T00:00:00Z', '2025-12-31T23:59:59Z'); savedEntity.activeRange = newRange; const updatedEntity = await dataSource.save(savedEntity); @@ -416,9 +407,7 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should validate DateTimeRange constraints", async () => { // Test invalid range (from > to) - const invalidRange = new DateTimeRangeValue(); - invalidRange.from = new Date('2024-12-31T23:59:59Z'); - invalidRange.to = new Date('2024-01-01T00:00:00Z'); + const invalidRange = dateTimeRange('2024-12-31T23:59:59Z', '2024-01-01T00:00:00Z'); testEntity.activeRange = invalidRange; const errors = validateSync(testEntity); diff --git a/test/types_tests/DateTimeRange.test.ts b/test/types_tests/DateTimeRange.test.ts index 0c33e23..9575d2a 100644 --- a/test/types_tests/DateTimeRange.test.ts +++ b/test/types_tests/DateTimeRange.test.ts @@ -1,5 +1,5 @@ import { Project } from "../model/Project"; -import { DateTimeRangeValue } from "../../index"; +import { DateTimeRangeValue, dateTimeRange } from "../../index"; import type { ValidationError } from "class-validator"; @@ -219,4 +219,95 @@ describe("DateTimeRange Field Type", () => { } }); }); + + describe("dateTimeRange convenience function", () => { + it("should create DateTimeRangeValue from ISO string dates", () => { + const range = dateTimeRange('2024-01-01T00:00:00Z', '2024-12-31T23:59:59Z'); + + expect(range).toBeInstanceOf(DateTimeRangeValue); + expect(range.from).toBeInstanceOf(Date); + expect(range.to).toBeInstanceOf(Date); + expect(range.from?.toISOString()).toBe('2024-01-01T00:00:00.000Z'); + expect(range.to?.toISOString()).toBe('2024-12-31T23:59:59.000Z'); + }); + + it("should create DateTimeRangeValue from Date objects", () => { + const fromDate = new Date('2024-06-15T10:00:00Z'); + const toDate = new Date('2024-09-15T18:30:00Z'); + const range = dateTimeRange(fromDate, toDate); + + expect(range).toBeInstanceOf(DateTimeRangeValue); + expect(range.from).toBe(fromDate); + expect(range.to).toBe(toDate); + }); + + it("should create DateTimeRangeValue from mixed types", () => { + const range = dateTimeRange('2024-01-01T00:00:00Z', new Date('2024-12-31T23:59:59Z')); + + expect(range).toBeInstanceOf(DateTimeRangeValue); + expect(range.from).toBeInstanceOf(Date); + expect(range.to).toBeInstanceOf(Date); + expect(range.from?.toISOString()).toBe('2024-01-01T00:00:00.000Z'); + expect(range.to?.toISOString()).toBe('2024-12-31T23:59:59.000Z'); + }); + + it("should create DateTimeRangeValue from timestamps", () => { + const fromTimestamp = new Date('2024-01-01T00:00:00Z').getTime(); + const toTimestamp = new Date('2024-12-31T23:59:59Z').getTime(); + const range = dateTimeRange(fromTimestamp, toTimestamp); + + expect(range).toBeInstanceOf(DateTimeRangeValue); + expect(range.from).toBeInstanceOf(Date); + expect(range.to).toBeInstanceOf(Date); + expect(range.from?.toISOString()).toBe('2024-01-01T00:00:00.000Z'); + expect(range.to?.toISOString()).toBe('2024-12-31T23:59:59.000Z'); + }); + + it("should handle optional parameters", () => { + const rangeFromOnly = dateTimeRange('2024-01-01T00:00:00Z'); + expect(rangeFromOnly.from).toBeInstanceOf(Date); + expect(rangeFromOnly.to).toBeUndefined(); + + const rangeToOnly = dateTimeRange(undefined, '2024-12-31T23:59:59Z'); + expect(rangeToOnly.from).toBeUndefined(); + expect(rangeToOnly.to).toBeInstanceOf(Date); + + const rangeEmpty = dateTimeRange(); + expect(rangeEmpty.from).toBeUndefined(); + expect(rangeEmpty.to).toBeUndefined(); + }); + + it("should work with model validation", async () => { + const project = new Project(); + project.name = "Convenience Test"; + project.startDate = new Date('2024-06-15'); + + // Use the convenience function + project.activeRange = dateTimeRange('2024-06-15T00:00:00Z', '2024-09-15T23:59:59Z'); + + const errors = await project.validate(); + expect(errors).toStrictEqual([]); + }); + + it("should work with JSON serialization", () => { + const project = new Project(); + project.name = "JSON Test"; + project.startDate = new Date('2024-06-15'); + + // Use the convenience function + project.activeRange = dateTimeRange('2024-06-15T00:00:00Z', '2024-09-15T23:59:59Z'); + + const json = project.toJSON(); + expect(json.activeRange).toHaveProperty("from"); + expect(json.activeRange).toHaveProperty("to"); + expect(json.activeRange.from).toBe('2024-06-15T00:00:00.000Z'); + expect(json.activeRange.to).toBe('2024-09-15T23:59:59.000Z'); + + // Test round-trip + const restored = Project.fromJSON(json); + expect(restored.activeRange).toBeInstanceOf(DateTimeRangeValue); + expect(restored.activeRange?.from).toBeInstanceOf(Date); + expect(restored.activeRange?.to).toBeInstanceOf(Date); + }); + }); }); From 3656fb7fe896373ebd8c51b4a0e4ca2c791673c8 Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Sep 2025 11:06:13 -0300 Subject: [PATCH 153/254] Added logic to focus on the newly created fields. Improved imports management. --- src/commands/models/addComposition.ts | 11 ++- src/commands/models/addReference.ts | 11 ++- src/services/sourceCodeService.ts | 107 +++++++++++++++++++++++--- 3 files changed, 110 insertions(+), 19 deletions(-) diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 3adbad7..6298c1d 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -58,7 +58,10 @@ export class AddCompositionTool { this.explorerProvider.refresh(); - // Step 7: Show success message + // Step 7: Focus on the newly created field + await this.sourceCodeService.focusOnElement(document, fieldName); + + // Step 8: Show success message vscode.window.showInformationMessage( `Composition relationship created successfully! Added ${innerModelName} model and ${fieldName} field.` ); @@ -244,7 +247,7 @@ export class AddCompositionTool { // Create field info for the composition field const fieldType: FieldTypeOption = { label: "Relationship", - decorator: "Relationship", + decorator: "Composition", tsType: isArray ? `${innerModelName}[]` : innerModelName, description: "Composition relationship", }; @@ -264,7 +267,7 @@ export class AddCompositionTool { const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); // Insert the field - await this.sourceCodeService.insertField(document, outerModelName, fieldInfo, fieldCode, cache); + await this.sourceCodeService.insertField(document, outerModelName, fieldInfo, fieldCode, cache, false); } /** @@ -285,4 +288,6 @@ export class AddCompositionTool { return lines.join("\n"); } + + } diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index 71a3c39..f228dd1 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -79,7 +79,10 @@ export class AddReferenceTool { this.explorerProvider.refresh(); - // Step 6: Show success message + // Step 6: Focus on the newly created field + await this.sourceCodeService.focusOnElement(document, fieldName); + + // Step 7: Show success message vscode.window.showInformationMessage( `Reference relationship created successfully! Added ${fieldName} field referencing ${targetModelName}.` ); @@ -309,10 +312,6 @@ export class AddReferenceTool { try { const targetFileUri = await this.fileSystemService.createFile(finalModelName, filePath, modelContent, false); - - // Open the new file - const document = await vscode.workspace.openTextDocument(targetFileUri); - await vscode.window.showTextDocument(document, { preview: false, viewColumn: vscode.ViewColumn.Beside }); return { name: finalModelName, @@ -381,7 +380,7 @@ export class AddReferenceTool { // Create field info for the reference field const fieldType: FieldTypeOption = { label: "Relationship", - decorator: "Relationship", + decorator: "Reference", tsType: targetModelName, description: "Reference relationship", }; diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 94a27e7..a2f4399 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -19,20 +19,20 @@ export class SourceCodeService { modelClassName: string, fieldInfo: FieldInfo, fieldCode: string, - cache?: MetadataCache + cache?: MetadataCache, + importModel: boolean = true ): Promise { const edit = new vscode.WorkspaceEdit(); const lines = document.getText().split("\n"); + const newImports = new Set(["Field", fieldInfo.type.decorator]); + if(fieldInfo.type.decorator === "Composition") { + newImports.add("PersistentComponentModel"); + } - await this.ensureSlingrFrameworkImports(document, edit, new Set(["Field", fieldInfo.type.decorator])); + await this.ensureSlingrFrameworkImports(document, edit, newImports); - if (fieldInfo.additionalConfig?.targetModelPath !== document.uri.fsPath) { - if ( - (fieldInfo.type.decorator === "Relationship" || fieldInfo.type.decorator === "Composition") && - fieldInfo.additionalConfig?.targetModel - ) { + if (importModel && fieldInfo.additionalConfig) { await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); - } } const { classEndLine } = this.findClassBoundaries(lines, modelClassName); @@ -60,8 +60,12 @@ export class SourceCodeService { inClass = true; } if (inClass) { - if (line.includes("{")) braceCount++; - if (line.includes("}")) braceCount--; + if (line.includes("{")) { + braceCount++; + } + if (line.includes("}")) { + braceCount--; + } if (braceCount === 0 && classStartLine !== -1) { classEndLine = i; break; @@ -384,4 +388,87 @@ export class SourceCodeService { return null; } } + + /** + * Focuses on an element in a document navigating to it and highlighting it. + * This method can find and focus on various types of elements including: + * - Class properties (fields with !: or :) + * - Method names + * - Class names + * - Variable declarations + */ + public async focusOnElement(document: vscode.TextDocument, elementName: string): Promise { + try { + // Ensure the document is visible and active + const editor = await vscode.window.showTextDocument(document, { preview: false }); + + // Find the line containing the element + const content = document.getText(); + const lines = content.split("\n"); + + let elementLine = -1; + let elementIndex = -1; + + // Look for different patterns in order of specificity + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Pattern 1: Property declarations (fieldName!: Type or fieldName: Type) + if (line.includes(`${elementName}!:`) || line.includes(`${elementName}:`)) { + elementLine = i; + elementIndex = line.indexOf(elementName); + break; + } + + // Pattern 2: Method declarations (methodName() or methodName( + if (line.includes(`${elementName}(`) && (line.includes('function') || line.includes('){') || line.includes(') {'))) { + elementLine = i; + elementIndex = line.indexOf(elementName); + break; + } + + // Pattern 3: Class declarations (class ClassName) + if (line.includes(`class ${elementName}`)) { + elementLine = i; + elementIndex = line.indexOf(elementName); + break; + } + + // Pattern 4: Variable declarations (const elementName, let elementName, var elementName) + if ((line.includes(`const ${elementName}`) || line.includes(`let ${elementName}`) || line.includes(`var ${elementName}`)) && + (line.includes('=') || line.includes(';'))) { + elementLine = i; + elementIndex = line.indexOf(elementName); + break; + } + + // Pattern 5: General word boundary match (as fallback) + const wordBoundaryRegex = new RegExp(`\\b${elementName}\\b`); + if (wordBoundaryRegex.test(line)) { + const match = line.match(wordBoundaryRegex); + if (match && match.index !== undefined) { + elementLine = i; + elementIndex = match.index; + break; + } + } + } + + if (elementLine !== -1 && elementIndex !== -1) { + // Position the cursor at the element name + const startPosition = new vscode.Position(elementLine, elementIndex); + const endPosition = new vscode.Position(elementLine, elementIndex + elementName.length); + + // Set selection to highlight the element name + editor.selection = new vscode.Selection(startPosition, endPosition); + + // Reveal the line in the center of the editor + editor.revealRange(new vscode.Range(startPosition, endPosition), vscode.TextEditorRevealType.InCenter); + } + } catch (error) { + console.warn("Could not focus on element:", error); + // Fallback: just make sure the document is visible + await vscode.window.showTextDocument(document, { preview: false }); + } + } } From a2b9255d0cc8c62a4563ca72f69f676c728775c2 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 11 Sep 2025 12:04:03 -0300 Subject: [PATCH 154/254] Add support for multiple embedded entities --- .../typeorm/TypeORMSqlDataSource.ts | 189 +++++--- src/model/Embedded.ts | 13 + test/model/NestedEmbeddingModels.ts | 99 +++++ .../MultipleNestedEmbedding.test.ts | 418 ++++++++++++++++++ 4 files changed, 665 insertions(+), 54 deletions(-) create mode 100644 test/model/NestedEmbeddingModels.ts create mode 100644 test/types_tests/MultipleNestedEmbedding.test.ts diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index a58b624..0d20c1b 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -314,11 +314,14 @@ export class TypeORMSqlDataSource extends DataSource { /** * Configures an embedded field by flattening its properties into the parent entity. * The embedded model's fields are added as columns to the parent table with a prefix. + * Supports nested embedded fields by flattening the entire hierarchy. * * @param target - The prototype of the class containing the embedded field * @param propertyKey - The name of the embedded property + * @param prefix - Optional prefix for column names (used for nested embedding) + * @param rootTarget - The root target where columns should be applied (used for nested embedding) */ - private configureEmbeddedField(target: any, propertyKey: string): void { + private configureEmbeddedField(target: any, propertyKey: string, prefix: string = '', rootTarget?: any): void { // Get the embedded type from metadata const embeddedType = Reflect.getMetadata('field:embedded:type', target, propertyKey); @@ -326,53 +329,68 @@ export class TypeORMSqlDataSource extends DataSource { throw new Error(`Cannot determine type for embedded field ${propertyKey}`); } + // Use the provided rootTarget or default to the current target + const columnTarget = rootTarget || target; + + // Create the full prefix for this level + const currentPrefix = prefix ? `${prefix}_${propertyKey}` : propertyKey; + // Get all fields from the embedded model const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; // For each field in the embedded model, create a column in the parent entity for (const embeddedFieldName of embeddedFields) { - // Skip if this field is also embedded (nested embedding not supported yet) + // Check if this field is also embedded (nested embedding) const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + if (isNestedEmbedded) { - throw new Error(`Nested embedded fields are not yet supported: ${propertyKey}.${embeddedFieldName}`); - } + // Recursively configure nested embedded field + // Use the embedded type's prototype as the target for metadata lookup, + // but keep the original root target for column application + this.configureEmbeddedField(embeddedType.prototype, embeddedFieldName, currentPrefix, columnTarget); + } else { + // Get field type and options from the embedded model + const fieldType = Reflect.getMetadata('field:type', embeddedType.prototype, embeddedFieldName); + const fieldOptions = Reflect.getMetadata('field:type:options', embeddedType.prototype, embeddedFieldName); - // Get field type and options from the embedded model - const fieldType = Reflect.getMetadata('field:type', embeddedType.prototype, embeddedFieldName); - const fieldOptions = Reflect.getMetadata('field:type:options', embeddedType.prototype, embeddedFieldName); + if (!fieldType) { + continue; // Skip fields without type information + } - if (!fieldType) { - continue; // Skip fields without type information + // Create a column name with full prefix hierarchy + const columnName = `${currentPrefix}_${embeddedFieldName}`; + + // Map the embedded field type to TypeORM column type + const typeMapping = TypeORMTypeMapper.getColumnType(fieldType, fieldOptions); + + // Apply the TypeORM @Column decorator to the root entity + // The column will be mapped to a property that doesn't exist on the parent class + // but will be used for database storage + Column({ ...typeMapping, name: columnName })(columnTarget, columnName); + + // Store metadata for the embedded field mapping on the root target + Reflect.defineMetadata(`embedded:${currentPrefix}:${embeddedFieldName}`, { + columnName, + fieldType, + fieldOptions, + typeMapping, + fullPath: `${currentPrefix}.${embeddedFieldName}` + }, columnTarget); } - - // Create a column name with prefix (propertyKey_fieldName) - const columnName = `${propertyKey}_${embeddedFieldName}`; - - // Map the embedded field type to TypeORM column type - const typeMapping = TypeORMTypeMapper.getColumnType(fieldType, fieldOptions); - - // Apply the TypeORM @Column decorator to the parent entity - // The column will be mapped to a property that doesn't exist on the parent class - // but will be used for database storage - Column({ ...typeMapping, name: columnName })(target, columnName); - - // Store metadata for the embedded field mapping - Reflect.defineMetadata(`embedded:${propertyKey}:${embeddedFieldName}`, { - columnName, - fieldType, - fieldOptions, - typeMapping - }, target); } // Store that this embedded field is configured for TypeORM - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); - Reflect.defineMetadata('datasource:embedded:configured', true, target, propertyKey); + // Only store this metadata on the original target (not for recursive calls) + if (!rootTarget) { + Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata('datasource:embedded:configured', true, target, propertyKey); + } } /** * Extracts embedded field values from an entity and sets them as flat properties. * This converts nested objects to the flat column structure expected by TypeORM. + * Supports nested embedded objects by recursively flattening the entire hierarchy. * * @param entity - The entity instance to process */ @@ -387,19 +405,47 @@ export class TypeORMSqlDataSource extends DataSource { const embeddedValue = (entity as any)[fieldName]; if (embeddedValue && typeof embeddedValue === 'object') { - // Get the embedded type - const embeddedType = Reflect.getMetadata('field:embedded:type', constructor.prototype, fieldName); - const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + this.extractEmbeddedValueRecursive(entity, fieldName, embeddedValue, fieldName); + } + } + } + } - // Extract each embedded field to its corresponding column - for (const embeddedFieldName of embeddedFields) { - const columnName = `${fieldName}_${embeddedFieldName}`; - const value = embeddedValue[embeddedFieldName]; + /** + * Recursively extracts embedded field values, handling nested embedded objects. + * + * @param entity - The root entity instance + * @param fieldName - The current field name being processed + * @param embeddedValue - The embedded object value + * @param prefix - The current prefix for column naming + */ + private extractEmbeddedValueRecursive( + entity: T, + fieldName: string, + embeddedValue: any, + prefix: string + ): void { + // Get the embedded type + const embeddedType = embeddedValue.constructor; + const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; - // Set the flat column value on the entity - (entity as any)[columnName] = value; - } + // Extract each embedded field to its corresponding column + for (const embeddedFieldName of embeddedFields) { + const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + + if (isNestedEmbedded) { + // Handle nested embedded field recursively + const nestedValue = embeddedValue[embeddedFieldName]; + if (nestedValue && typeof nestedValue === 'object') { + this.extractEmbeddedValueRecursive(entity, embeddedFieldName, nestedValue, `${prefix}_${embeddedFieldName}`); } + } else { + // Handle regular field + const columnName = `${prefix}_${embeddedFieldName}`; + const value = embeddedValue[embeddedFieldName]; + + // Set the flat column value on the entity + (entity as any)[columnName] = value; } } } @@ -407,6 +453,7 @@ export class TypeORMSqlDataSource extends DataSource { /** * Restores embedded field values from flat columns back to nested objects. * This converts the flat column structure from TypeORM back to nested objects. + * Supports nested embedded objects by recursively reconstructing the entire hierarchy. * * @param entity - The entity instance to process */ @@ -420,28 +467,62 @@ export class TypeORMSqlDataSource extends DataSource { if (isEmbedded) { // Get the embedded type and its fields const embeddedType = Reflect.getMetadata('field:embedded:type', constructor.prototype, fieldName); - const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + + // Recursively restore the embedded object + const embeddedInstance = this.restoreEmbeddedValueRecursive(entity, fieldName, embeddedType, fieldName); + + // Set the restored embedded object + (entity as any)[fieldName] = embeddedInstance; + } + } + } + + /** + * Recursively restores embedded field values from flat columns, handling nested embedded objects. + * + * @param entity - The root entity instance + * @param fieldName - The current field name being processed + * @param embeddedType - The type of the embedded object to create + * @param prefix - The current prefix for column naming + * @returns The restored embedded object instance + */ + private restoreEmbeddedValueRecursive( + entity: T, + fieldName: string, + embeddedType: any, + prefix: string + ): any { + const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; - // Create a new instance of the embedded type - const embeddedInstance = new embeddedType(); + // Create a new instance of the embedded type + const embeddedInstance = new embeddedType(); - // Restore each field from its column - for (const embeddedFieldName of embeddedFields) { - const columnName = `${fieldName}_${embeddedFieldName}`; - const value = (entity as any)[columnName]; + // Restore each field from its column + for (const embeddedFieldName of embeddedFields) { + const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); - if (value !== undefined) { - embeddedInstance[embeddedFieldName] = value; - } + if (isNestedEmbedded) { + // Handle nested embedded field recursively + const nestedEmbeddedType = Reflect.getMetadata('field:embedded:type', embeddedType.prototype, embeddedFieldName); + const nestedPrefix = `${prefix}_${embeddedFieldName}`; + + const nestedInstance = this.restoreEmbeddedValueRecursive(entity, embeddedFieldName, nestedEmbeddedType, nestedPrefix); + embeddedInstance[embeddedFieldName] = nestedInstance; + } else { + // Handle regular field + const columnName = `${prefix}_${embeddedFieldName}`; + const value = (entity as any)[columnName]; - // Clean up the flat column property (optional) - delete (entity as any)[columnName]; + if (value !== undefined) { + embeddedInstance[embeddedFieldName] = value; } - // Set the restored embedded object - (entity as any)[fieldName] = embeddedInstance; + // Clean up the flat column property + delete (entity as any)[columnName]; } } + + return embeddedInstance; } /** diff --git a/src/model/Embedded.ts b/src/model/Embedded.ts index 6493c8e..8788d5c 100644 --- a/src/model/Embedded.ts +++ b/src/model/Embedded.ts @@ -1,4 +1,6 @@ import "reflect-metadata"; +import { Expose, Type } from "class-transformer"; +import { ValidateNested } from "class-validator"; /** * Configuration options for the Embedded decorator. @@ -73,5 +75,16 @@ export function Embedded(options?: EmbeddedOptions) { existingFields.push(propertyKey); Reflect.defineMetadata('model:fields', existingFields, target.constructor); } + + // Make the embedded field available in JSON serialization + Expose()(target, propertyKey); + + // Enable nested validation for the embedded object + ValidateNested()(target, propertyKey); + + // Set the type for class-transformer to properly handle nested objects + if (propertyType) { + Type(() => propertyType)(target, propertyKey); + } }; } diff --git a/test/model/NestedEmbeddingModels.ts b/test/model/NestedEmbeddingModels.ts new file mode 100644 index 0000000..f94656c --- /dev/null +++ b/test/model/NestedEmbeddingModels.ts @@ -0,0 +1,99 @@ +import { BaseModel, Embedded, Field, Model, PersistentModel, Text } from '../../src/model'; + +@Model() +export class GeoLocation extends BaseModel { + @Field({ required: true }) + @Text() + lat!: string; + + @Field({ required: true }) + @Text() + lng!: string; +} + +@Model() +export class Address extends PersistentModel { + @Field({ required: true }) + @Text() + street!: string; + + @Field({ required: true }) + @Text() + city!: string; + + @Embedded() + geo!: GeoLocation; +} + +@Model() +export class Person extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + + @Embedded() + address!: Address; +} + +// More complex nested embedding models for testing + +@Model() +export class ContactInfo extends BaseModel { + @Field() + @Text() + email!: string; + + @Field() + @Text() + phone!: string; +} + +@Model() +export class Department extends BaseModel { + @Field() + @Text() + name!: string; + + @Field() + @Text() + code!: string; + + @Embedded() + location!: Address; // Nested: Department -> Address -> GeoLocation +} + +@Model() +export class Company extends BaseModel { + @Field() + @Text() + name!: string; + + @Embedded() + headquarters!: Address; // Nested: Company -> Address -> GeoLocation + + @Embedded() + contact!: ContactInfo; +} + +@Model() +export class Employee extends PersistentModel { + @Field() + @Text() + name!: string; + + @Field() + @Text() + employeeId!: string; + + @Embedded() + personalAddress!: Address; // Nested: Employee -> Address -> GeoLocation + + @Embedded() + department!: Department; // Nested: Employee -> Department -> Address -> GeoLocation + + @Embedded() + company!: Company; // Nested: Employee -> Company -> (Address, ContactInfo) -> GeoLocation + + @Embedded() + emergencyContact!: ContactInfo; +} \ No newline at end of file diff --git a/test/types_tests/MultipleNestedEmbedding.test.ts b/test/types_tests/MultipleNestedEmbedding.test.ts new file mode 100644 index 0000000..b6978e2 --- /dev/null +++ b/test/types_tests/MultipleNestedEmbedding.test.ts @@ -0,0 +1,418 @@ +import { TypeORMSqlDataSource } from '../../src/datasources'; +import { + Person, + Address, + GeoLocation, + Employee, + Department, + Company, + ContactInfo +} from '../model/NestedEmbeddingModels'; + +describe('Multiple Nested Embedded Models', () => { + let dataSource: TypeORMSqlDataSource; + + beforeAll(async () => { + dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + synchronize: true, + logging: false, + managed: true + }); + + // Configure all models with the data source + const models = [Person, Employee]; + + for (const ModelClass of models) { + const modelOptions = { dataSource }; + Reflect.defineMetadata("model:dataSource", dataSource, ModelClass); + dataSource.configureModel(ModelClass, modelOptions); + + // Configure all fields with the data source + const fieldNames = Reflect.getMetadata('model:fields', ModelClass) || []; + fieldNames.forEach((fieldName: string) => { + const fieldType = Reflect.getMetadata('field:type', ModelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata('field:type:options', ModelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata('field:required', ModelClass.prototype, fieldName); + const isEmbedded = Reflect.getMetadata('field:embedded', ModelClass.prototype, fieldName); + + if (isEmbedded) { + // For embedded fields, pass a special type indicator + dataSource.configureField(ModelClass.prototype, fieldName, 'embedded', { + required: fieldRequired + }); + } else if (fieldType) { + const allFieldOptions = { + ...fieldTypeOptions, + required: fieldRequired + }; + dataSource.configureField(ModelClass.prototype, fieldName, fieldType, allFieldOptions); + } + }); + } + + // Initialize the data source + await dataSource.initialize(dataSource.getOptions()); + }); + + afterAll(async () => { + if (dataSource) { + await dataSource.disconnect(); + } + }); + + describe('Simple Nested Embedding (Person -> Address -> GeoLocation)', () => { + test('should store nested embedded model metadata correctly', () => { + // Check Person -> Address embedding + const isPersonAddressEmbedded = Reflect.getMetadata('field:embedded', Person.prototype, 'address'); + expect(isPersonAddressEmbedded).toBe(true); + + const personAddressType = Reflect.getMetadata('field:embedded:type', Person.prototype, 'address'); + expect(personAddressType).toBe(Address); + + // Check Address -> GeoLocation embedding + const isAddressGeoEmbedded = Reflect.getMetadata('field:embedded', Address.prototype, 'geo'); + expect(isAddressGeoEmbedded).toBe(true); + + const addressGeoType = Reflect.getMetadata('field:embedded:type', Address.prototype, 'geo'); + expect(addressGeoType).toBe(GeoLocation); + }); + + test('should save and load simple nested objects correctly', async () => { + // Create nested objects + const geo = new GeoLocation(); + geo.lat = "40.7128"; + geo.lng = "-74.0060"; + + const address = new Address(); + address.street = "123 Broadway"; + address.city = "New York"; + address.geo = geo; + + const person = new Person(); + person.name = "John Doe"; + person.address = address; + + // Save the person + const savedPerson = await dataSource.save(person); + expect(savedPerson.id).toBeDefined(); + + // Load the person back from the database + const loadedPerson = await dataSource.findOneBy(Person, { id: savedPerson.id }); + + expect(loadedPerson).not.toBeNull(); + expect(loadedPerson!.name).toBe("John Doe"); + expect(loadedPerson!.address).toBeDefined(); + expect(loadedPerson!.address.street).toBe("123 Broadway"); + expect(loadedPerson!.address.city).toBe("New York"); + expect(loadedPerson!.address.geo).toBeDefined(); + expect(loadedPerson!.address.geo.lat).toBe("40.7128"); + expect(loadedPerson!.address.geo.lng).toBe("-74.0060"); + }); + }); + + describe('Complex Multiple Nested Embedding (Employee with Multiple Embedded Objects)', () => { + test('should store complex nested embedded model metadata correctly', () => { + // Check Employee -> PersonalAddress embedding + const isPersonalAddressEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'personalAddress'); + expect(isPersonalAddressEmbedded).toBe(true); + + // Check Employee -> Department embedding + const isDepartmentEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'department'); + expect(isDepartmentEmbedded).toBe(true); + + // Check Employee -> Company embedding + const isCompanyEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'company'); + expect(isCompanyEmbedded).toBe(true); + + // Check Employee -> EmergencyContact embedding + const isEmergencyContactEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'emergencyContact'); + expect(isEmergencyContactEmbedded).toBe(true); + + // Check Department -> Location (Address) embedding + const isDepartmentLocationEmbedded = Reflect.getMetadata('field:embedded', Department.prototype, 'location'); + expect(isDepartmentLocationEmbedded).toBe(true); + + // Check Company -> Headquarters (Address) embedding + const isCompanyHeadquartersEmbedded = Reflect.getMetadata('field:embedded', Company.prototype, 'headquarters'); + expect(isCompanyHeadquartersEmbedded).toBe(true); + + // Check Company -> Contact embedding + const isCompanyContactEmbedded = Reflect.getMetadata('field:embedded', Company.prototype, 'contact'); + expect(isCompanyContactEmbedded).toBe(true); + }); + + test('should save and load complex nested objects correctly', async () => { + // Create deeply nested objects + + // Personal address with geo location + const personalGeo = new GeoLocation(); + personalGeo.lat = "40.7589"; + personalGeo.lng = "-73.9851"; + + const personalAddress = new Address(); + personalAddress.street = "456 Park Ave"; + personalAddress.city = "New York"; + personalAddress.geo = personalGeo; + + // Department with location + const departmentGeo = new GeoLocation(); + departmentGeo.lat = "40.7505"; + departmentGeo.lng = "-73.9934"; + + const departmentAddress = new Address(); + departmentAddress.street = "789 Corporate Blvd"; + departmentAddress.city = "New York"; + departmentAddress.geo = departmentGeo; + + const department = new Department(); + department.name = "Engineering"; + department.code = "ENG"; + department.location = departmentAddress; + + // Company with headquarters and contact + const headquartersGeo = new GeoLocation(); + headquartersGeo.lat = "40.7614"; + headquartersGeo.lng = "-73.9776"; + + const headquarters = new Address(); + headquarters.street = "1 Corporate Plaza"; + headquarters.city = "New York"; + headquarters.geo = headquartersGeo; + + const companyContact = new ContactInfo(); + companyContact.email = "info@techcorp.com"; + companyContact.phone = "555-0100"; + + const company = new Company(); + company.name = "TechCorp Inc"; + company.headquarters = headquarters; + company.contact = companyContact; + + // Emergency contact + const emergencyContact = new ContactInfo(); + emergencyContact.email = "emergency@example.com"; + emergencyContact.phone = "555-0911"; + + // Employee with all nested objects + const employee = new Employee(); + employee.name = "Jane Smith"; + employee.employeeId = "EMP001"; + employee.personalAddress = personalAddress; + employee.department = department; + employee.company = company; + employee.emergencyContact = emergencyContact; + + // Save the employee + const savedEmployee = await dataSource.save(employee); + expect(savedEmployee.id).toBeDefined(); + + // Load the employee back from the database + const loadedEmployee = await dataSource.findOneBy(Employee, { id: savedEmployee.id }); + + expect(loadedEmployee).not.toBeNull(); + expect(loadedEmployee!.name).toBe("Jane Smith"); + expect(loadedEmployee!.employeeId).toBe("EMP001"); + + // Verify personal address nesting + expect(loadedEmployee!.personalAddress).toBeDefined(); + expect(loadedEmployee!.personalAddress.street).toBe("456 Park Ave"); + expect(loadedEmployee!.personalAddress.city).toBe("New York"); + expect(loadedEmployee!.personalAddress.geo).toBeDefined(); + expect(loadedEmployee!.personalAddress.geo.lat).toBe("40.7589"); + expect(loadedEmployee!.personalAddress.geo.lng).toBe("-73.9851"); + + // Verify department nesting (Department -> Address -> GeoLocation) + expect(loadedEmployee!.department).toBeDefined(); + expect(loadedEmployee!.department.name).toBe("Engineering"); + expect(loadedEmployee!.department.code).toBe("ENG"); + expect(loadedEmployee!.department.location).toBeDefined(); + expect(loadedEmployee!.department.location.street).toBe("789 Corporate Blvd"); + expect(loadedEmployee!.department.location.city).toBe("New York"); + expect(loadedEmployee!.department.location.geo).toBeDefined(); + expect(loadedEmployee!.department.location.geo.lat).toBe("40.7505"); + expect(loadedEmployee!.department.location.geo.lng).toBe("-73.9934"); + + // Verify company nesting (Company -> Address + ContactInfo -> GeoLocation) + expect(loadedEmployee!.company).toBeDefined(); + expect(loadedEmployee!.company.name).toBe("TechCorp Inc"); + expect(loadedEmployee!.company.headquarters).toBeDefined(); + expect(loadedEmployee!.company.headquarters.street).toBe("1 Corporate Plaza"); + expect(loadedEmployee!.company.headquarters.city).toBe("New York"); + expect(loadedEmployee!.company.headquarters.geo).toBeDefined(); + expect(loadedEmployee!.company.headquarters.geo.lat).toBe("40.7614"); + expect(loadedEmployee!.company.headquarters.geo.lng).toBe("-73.9776"); + expect(loadedEmployee!.company.contact).toBeDefined(); + expect(loadedEmployee!.company.contact.email).toBe("info@techcorp.com"); + expect(loadedEmployee!.company.contact.phone).toBe("555-0100"); + + // Verify emergency contact + expect(loadedEmployee!.emergencyContact).toBeDefined(); + expect(loadedEmployee!.emergencyContact.email).toBe("emergency@example.com"); + expect(loadedEmployee!.emergencyContact.phone).toBe("555-0911"); + }); + }); + + describe('JSON Serialization with Multiple Nested Embedded Objects', () => { + test('should serialize and deserialize complex nested objects correctly', () => { + // Create complex nested objects + const geo = new GeoLocation(); + geo.lat = "40.7128"; + geo.lng = "-74.0060"; + + const address = new Address(); + address.street = "123 Broadway"; + address.city = "New York"; + address.geo = geo; + + const person = new Person(); + person.name = "John Doe"; + person.address = address; + + // Test JSON serialization + const json = person.toJSON(); + expect(json.name).toBe("John Doe"); + expect(json.address).toBeDefined(); + expect(json.address.street).toBe("123 Broadway"); + expect(json.address.city).toBe("New York"); + expect(json.address.geo).toBeDefined(); + expect(json.address.geo.lat).toBe("40.7128"); + expect(json.address.geo.lng).toBe("-74.0060"); + + // Test JSON deserialization + const restored = Person.fromJSON(json); + expect(restored.name).toBe("John Doe"); + expect(restored.address).toBeDefined(); + expect(restored.address.street).toBe("123 Broadway"); + expect(restored.address.city).toBe("New York"); + expect(restored.address.geo).toBeDefined(); + expect(restored.address.geo.lat).toBe("40.7128"); + expect(restored.address.geo.lng).toBe("-74.0060"); + }); + + test('should serialize and deserialize employee with multiple nested objects', () => { + // Create complex employee object (similar to previous test but for JSON) + const personalGeo = new GeoLocation(); + personalGeo.lat = "40.7589"; + personalGeo.lng = "-73.9851"; + + const personalAddress = new Address(); + personalAddress.street = "456 Park Ave"; + personalAddress.city = "New York"; + personalAddress.geo = personalGeo; + + const departmentGeo = new GeoLocation(); + departmentGeo.lat = "40.7505"; + departmentGeo.lng = "-73.9934"; + + const departmentAddress = new Address(); + departmentAddress.street = "789 Corporate Blvd"; + departmentAddress.city = "New York"; + departmentAddress.geo = departmentGeo; + + const department = new Department(); + department.name = "Engineering"; + department.code = "ENG"; + department.location = departmentAddress; + + const emergencyContact = new ContactInfo(); + emergencyContact.email = "emergency@example.com"; + emergencyContact.phone = "555-0911"; + + const employee = new Employee(); + employee.name = "Jane Smith"; + employee.employeeId = "EMP001"; + employee.personalAddress = personalAddress; + employee.department = department; + employee.emergencyContact = emergencyContact; + + // Test JSON serialization + const json = employee.toJSON(); + expect(json.name).toBe("Jane Smith"); + expect(json.employeeId).toBe("EMP001"); + expect(json.personalAddress.street).toBe("456 Park Ave"); + expect(json.personalAddress.geo.lat).toBe("40.7589"); + expect(json.department.name).toBe("Engineering"); + expect(json.department.location.street).toBe("789 Corporate Blvd"); + expect(json.department.location.geo.lat).toBe("40.7505"); + expect(json.emergencyContact.email).toBe("emergency@example.com"); + + // Test JSON deserialization + const restored = Employee.fromJSON(json); + expect(restored.name).toBe("Jane Smith"); + expect(restored.employeeId).toBe("EMP001"); + expect(restored.personalAddress.street).toBe("456 Park Ave"); + expect(restored.personalAddress.geo.lat).toBe("40.7589"); + expect(restored.department.name).toBe("Engineering"); + expect(restored.department.location.street).toBe("789 Corporate Blvd"); + expect(restored.department.location.geo.lat).toBe("40.7505"); + expect(restored.emergencyContact.email).toBe("emergency@example.com"); + }); + }); + + describe('Validation with Multiple Nested Embedded Objects', () => { + test('should validate all nested embedded objects correctly', async () => { + const geo = new GeoLocation(); + geo.lat = "40.7128"; + geo.lng = "-74.0060"; + + const address = new Address(); + address.street = "123 Broadway"; + address.city = "New York"; + address.geo = geo; + + const person = new Person(); + person.name = "John Doe"; + person.address = address; + + const errors = await person.validate(); + expect(errors).toHaveLength(0); + }); + + test('should report validation errors in nested embedded objects', async () => { + const geo = new GeoLocation(); + geo.lat = ""; // Invalid - empty + geo.lng = "-74.0060"; + + const address = new Address(); + address.street = ""; // Invalid - empty + address.city = "New York"; + address.geo = geo; + + const person = new Person(); + person.name = ""; // Invalid - empty + person.address = address; + + const errors = await person.validate(); + expect(errors.length).toBeGreaterThan(0); + + // Should have errors for person.name and address (with nested errors) + const errorProperties = errors.map(error => error.property); + expect(errorProperties).toContain('name'); + expect(errorProperties).toContain('address'); + + // Check that the address error has nested children errors + const addressError = errors.find(error => error.property === 'address'); + expect(addressError).toBeDefined(); + if (addressError && addressError.children) { + expect(addressError.children.length).toBeGreaterThan(0); + + // Check that we have street validation error in address children + const streetError = addressError.children.find(child => child.property === 'street'); + expect(streetError).toBeDefined(); + + // Check that we have geo validation error in address children + const geoError = addressError.children.find(child => child.property === 'geo'); + expect(geoError).toBeDefined(); + + // Check that geo has its own nested children errors (for lat field) + if (geoError && geoError.children) { + expect(geoError.children.length).toBeGreaterThan(0); + const latError = geoError.children.find(child => child.property === 'lat'); + expect(latError).toBeDefined(); + } + } + }); + }); +}); From 60e68ad2e0ef1fc6170d05e613fe8e1fced6c2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:52:38 -0300 Subject: [PATCH 155/254] Update test/model/NestedEmbeddingModels.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- test/model/NestedEmbeddingModels.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/model/NestedEmbeddingModels.ts b/test/model/NestedEmbeddingModels.ts index f94656c..a8761eb 100644 --- a/test/model/NestedEmbeddingModels.ts +++ b/test/model/NestedEmbeddingModels.ts @@ -12,7 +12,7 @@ export class GeoLocation extends BaseModel { } @Model() -export class Address extends PersistentModel { +export class Address extends BaseModel { @Field({ required: true }) @Text() street!: string; From dd9c6a58d9969dfbaaba9c2bdfcbd0394ec06a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:54:49 -0300 Subject: [PATCH 156/254] Update src/datasources/typeorm/TypeORMSqlDataSource.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/datasources/typeorm/TypeORMSqlDataSource.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 0d20c1b..45cfc05 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -494,8 +494,8 @@ export class TypeORMSqlDataSource extends DataSource { ): any { const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; - // Create a new instance of the embedded type - const embeddedInstance = new embeddedType(); + // Create a new instance of the embedded type without calling its constructor + const embeddedInstance = Object.create(embeddedType.prototype); // Restore each field from its column for (const embeddedFieldName of embeddedFields) { From 288dd3b050cea33a746caa96c1719c0968d43338 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Thu, 11 Sep 2025 13:01:06 -0300 Subject: [PATCH 157/254] Refactor metadata retrieval in Model decorator for improved clarity and handling of undefined values --- src/model/Model.ts | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/model/Model.ts b/src/model/Model.ts index 883d49e..ec0ff3a 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -88,21 +88,36 @@ export function Model(options?: ModelOptions) { // Walk up the prototype chain to find the field metadata while (currentClass && currentClass !== Object && currentClass.prototype) { - if (!fieldType && Reflect.hasMetadata('field:type', currentClass.prototype, fieldName)) { - fieldType = Reflect.getMetadata('field:type', currentClass.prototype, fieldName); + if (fieldType === undefined) { + if (Reflect.hasMetadata('field:type', currentClass.prototype, fieldName)) { + fieldType = Reflect.getMetadata('field:type', currentClass.prototype, fieldName); + } else { + fieldType = null; + } } - if (!fieldTypeOptions && Reflect.hasMetadata('field:type:options', currentClass.prototype, fieldName)) { - fieldTypeOptions = Reflect.getMetadata('field:type:options', currentClass.prototype, fieldName); + if (fieldTypeOptions === undefined) { + if (Reflect.hasMetadata('field:type:options', currentClass.prototype, fieldName)) { + fieldTypeOptions = Reflect.getMetadata('field:type:options', currentClass.prototype, fieldName); + } else { + fieldTypeOptions = null; + } } - if (fieldRequired === undefined && Reflect.hasMetadata('field:required', currentClass.prototype, fieldName)) { - fieldRequired = Reflect.getMetadata('field:required', currentClass.prototype, fieldName); + if (fieldRequired === undefined) { + if (Reflect.hasMetadata('field:required', currentClass.prototype, fieldName)) { + fieldRequired = Reflect.getMetadata('field:required', currentClass.prototype, fieldName); + } else { + fieldRequired = null; + } } - if (!isEmbedded && Reflect.hasMetadata('field:embedded', currentClass.prototype, fieldName)) { - isEmbedded = Reflect.getMetadata('field:embedded', currentClass.prototype, fieldName); + if (isEmbedded === undefined) { + if (Reflect.hasMetadata('field:embedded', currentClass.prototype, fieldName)) { + isEmbedded = Reflect.getMetadata('field:embedded', currentClass.prototype, fieldName); + } else { + isEmbedded = null; + } } - - // Break early if we found all metadata - if (fieldType && fieldTypeOptions !== undefined && fieldRequired !== undefined && isEmbedded !== undefined) { + // Break early if we have checked all metadata (i.e., none are undefined) + if (fieldType !== undefined && fieldTypeOptions !== undefined && fieldRequired !== undefined && isEmbedded !== undefined) { break; } From ef5c46876b4277d5a0cbaa487a630f50d6ffb3a6 Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Sep 2025 13:20:39 -0300 Subject: [PATCH 158/254] Update on the cache change listener. --- src/cache/cache.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cache/cache.ts b/src/cache/cache.ts index e41dc56..6e1f29d 100644 --- a/src/cache/cache.ts +++ b/src/cache/cache.ts @@ -140,13 +140,13 @@ export class MetadataCache { * Sets up file system watchers to detect changes, creations, and deletions * of TypeScript files and folder structure changes in src/data. */ - private setupFileWatcher(): void { + private async setupFileWatcher(): Promise { // Watch for TypeScript file changes this.fileWatcher = vscode.workspace.createFileSystemWatcher('**/*.ts'); - this.fileWatcher.onDidCreate(uri => this.queueFileChange(uri, 'create')); - this.fileWatcher.onDidChange(uri => this.queueFileChange(uri, 'change')); - this.fileWatcher.onDidDelete(uri => this.queueFileChange(uri, 'delete')); + this.fileWatcher.onDidCreate(async uri => await this.queueFileChange(uri, 'create')); + this.fileWatcher.onDidChange(async uri => await this.queueFileChange(uri, 'change')); + this.fileWatcher.onDidDelete(async uri => await this.queueFileChange(uri, 'delete')); // Watch for folder structure changes in src/data directory // ignoreCreateEvents: false, ignoreChangeEvents: true, ignoreDeleteEvents: false @@ -162,12 +162,12 @@ export class MetadataCache { * @param uri The URI of the file that changed. * @param type The type of change (create, change, delete). */ - private queueFileChange(uri: vscode.Uri, type: FileChangeType): void { + private async queueFileChange(uri: vscode.Uri, type: FileChangeType): Promise { if (uri.path.includes('/node_modules/')) { return; } this.fileChangeQueue.push({ uri, type }); - this.processQueue(); + await this.processQueue(); } /** @@ -241,7 +241,7 @@ export class MetadataCache { return; } - this.isProcessingQueue = true; + //this.isProcessingQueue = true; const { uri, type } = this.fileChangeQueue.shift()!; const filePath = uri.fsPath.replace(/\\/g, '/'); try { @@ -297,7 +297,7 @@ export class MetadataCache { console.error(`Error processing file change for ${uri.fsPath}:`, error); } finally { this.isProcessingQueue = false; - this.processQueue(); + await this.processQueue(); } } From 94e57f15f787a815f998d4c4d3b496b50c51a4af Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Sep 2025 14:09:10 -0300 Subject: [PATCH 159/254] Adds the changeReferenceToComposition command. --- package.json | 21 +- src/commands/commandRegistration.ts | 1 + .../fields/changeReferenceToComposition.ts | 393 ++++++++++++++++++ src/explorer/appTreeItem.ts | 3 + src/explorer/explorerProvider.ts | 8 +- src/refactor/refactorDisposables.ts | 2 + src/refactor/refactorInterfaces.ts | 24 +- .../tools/changeReferenceToComposition.ts | 170 ++++++++ 8 files changed, 613 insertions(+), 9 deletions(-) create mode 100644 src/commands/fields/changeReferenceToComposition.ts create mode 100644 src/refactor/tools/changeReferenceToComposition.ts diff --git a/package.json b/package.json index 2621b70..89fe717 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,10 @@ "command": "slingr-vscode-extension.changeFieldType", "title": "Change Field Type" }, + { + "command": "slingr-vscode-extension.changeReferenceToComposition", + "title": "Change Reference to Composition" + }, { "command": "slingr-vscode-extension.newModel", "title": "New Model" @@ -184,17 +188,22 @@ }, { "command": "slingr-vscode-extension.renameField", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "1_modification" }, { "command": "slingr-vscode-extension.deleteField", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "2_modification" }, { "command": "slingr-vscode-extension.changeFieldType", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "3_modification" + }, + { + "command": "slingr-vscode-extension.changeReferenceToComposition", + "when": "view == slingrExplorer && viewItem == 'referenceField'", "group": "3_modification" }, { @@ -288,17 +297,17 @@ }, { "command": "slingr-vscode-extension.renameField", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "1_modification" }, { "command": "slingr-vscode-extension.deleteField", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "2_modification" }, { "command": "slingr-vscode-extension.changeFieldType", - "when": "view == slingrExplorer && viewItem == 'field'", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "3_modification" } ] diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index 3ba96b4..6747324 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -4,6 +4,7 @@ import { ExplorerProvider } from '../explorer/explorerProvider'; import { NewModelTool } from './models/newModel'; import { DefineFieldsTool } from './fields/defineFields'; import { AddFieldTool } from './fields/addField'; +import { ChangeReferenceToCompositionTool } from './fields/changeReferenceToComposition'; import { NewFolderTool } from './folders/newFolder'; import { DeleteFolderTool } from './folders/deleteFolder'; import { RenameFolderTool } from './folders/renameFolder'; diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts new file mode 100644 index 0000000..28da7c2 --- /dev/null +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -0,0 +1,393 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { FieldInfo, FieldTypeOption } from "../interfaces"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import * as path from "path"; + +/** + * Tool for converting reference relationships to composition relationships. + * + * This tool converts a @Reference field to a @Composition field by: + * 1. Checking if the referenced model is used elsewhere + * 2. Optionally deleting the referenced model file if not used elsewhere + * 3. Creating a new component model in the same file as the owner + * 4. Converting the field from @Reference to @Composition + */ +export class ChangeReferenceToCompositionTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private explorerProvider: ExplorerProvider; + + constructor(explorerProvider: ExplorerProvider) { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.explorerProvider = explorerProvider; + } + + /** + * Converts a reference field to a composition field. + * + * @param cache - The metadata cache for context about existing models + * @param sourceModelName - The name of the model containing the reference field + * @param fieldName - The name of the reference field to convert + * @returns Promise that resolves when the conversion is complete + */ + public async changeReferenceToComposition( + cache: MetadataCache, + sourceModelName: string, + fieldName: string + ): Promise { + try { + // Step 1: Validate the source model and reference field + const { sourceModel, document, referenceField, targetModel } = await this.validateReferenceField( + cache, + sourceModelName, + fieldName + ); + + // Step 2: Check if target model is referenced by other fields + const isReferencedElsewhere = this.isModelReferencedElsewhere(cache, targetModel.name, sourceModelName, fieldName); + + // Step 3: Inform user about the action and get confirmation + const shouldProceed = await this.confirmConversion(targetModel.name, isReferencedElsewhere); + if (!shouldProceed) { + return; // User cancelled + } + + // Step 4: Create the component model content based on the target model + const componentModelCode = await this.generateComponentModelCode(targetModel, sourceModel, cache); + + // Step 5: Remove the reference field decorators + await this.removeReferenceField(document, referenceField); + + // Step 6: Add the component model to the source file + await this.addComponentModel(document, componentModelCode, sourceModel.name, cache); + + // Step 7: Add the composition field + await this.addCompositionField(document, sourceModel.name, fieldName, targetModel.name, false, cache); + + // Step 8: Delete the target model file if not referenced elsewhere + if (!isReferencedElsewhere) { + await this.deleteTargetModelFile(targetModel); + } + + // Refresh the explorer to reflect changes + //this.explorerProvider.refresh(); + + // Step 9: Focus on the newly modified field + await this.sourceCodeService.focusOnElement(document, fieldName); + + // Step 10: Show success message + const message = isReferencedElsewhere + ? `Reference converted to composition! The original ${targetModel.name} model was kept as it's referenced elsewhere.` + : `Reference converted to composition! The original ${targetModel.name} model was deleted and recreated as a component.`; + + vscode.window.showInformationMessage(message); + } catch (error) { + vscode.window.showErrorMessage(`Failed to change reference to composition: ${error}`); + console.error("Error changing reference to composition:", error); + } + } + + /** + * Validates that the specified field is a valid reference field. + */ + private async validateReferenceField( + cache: MetadataCache, + sourceModelName: string, + fieldName: string + ): Promise<{ + sourceModel: DecoratedClass; + document: vscode.TextDocument; + referenceField: PropertyMetadata; + targetModel: DecoratedClass; + }> { + // Get source model + const sourceModel = cache.getModelByName(sourceModelName); + if (!sourceModel) { + throw new Error(`Source model '${sourceModelName}' not found in the project`); + } + + // Get field + const referenceField = sourceModel.properties[fieldName]; + if (!referenceField) { + throw new Error(`Field '${fieldName}' not found in model '${sourceModelName}'`); + } + + // Check if field has @Reference decorator + const hasReferenceDecorator = referenceField.decorators.some(d => d.name === "Reference"); + if (!hasReferenceDecorator) { + throw new Error(`Field '${fieldName}' is not a reference field`); + } + + // Extract target model name from the field type + const targetModelName = referenceField.type; + const targetModel = cache.getModelByName(targetModelName); + if (!targetModel) { + throw new Error(`Target model '${targetModelName}' not found in the project`); + } + + // Open source document + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + if (!document) { + throw new Error(`Could not open document for model '${sourceModelName}'`); + } + + return { sourceModel, document, referenceField, targetModel }; + } + + /** + * Checks if a model is referenced by other fields in other models. + */ + private isModelReferencedElsewhere( + cache: MetadataCache, + targetModelName: string, + excludeSourceModelName: string, + excludeFieldName: string + ): boolean { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + // Skip the source model when checking the specific field + if (model.name === excludeSourceModelName) { + // Check other fields in the same model + for (const [fieldName, field] of Object.entries(model.properties)) { + if (fieldName === excludeFieldName) { + continue; // Skip the field we're converting + } + + if (this.isFieldReferencingModel(field, targetModelName)) { + return true; + } + } + } else { + // Check all fields in other models + for (const field of Object.values(model.properties)) { + if (this.isFieldReferencingModel(field, targetModelName)) { + return true; + } + } + } + } + + return false; + } + + /** + * Checks if a field references a specific model. + */ + private isFieldReferencingModel(field: PropertyMetadata, targetModelName: string): boolean { + // Check if field has relationship decorators and the type matches + const hasRelationshipDecorator = field.decorators.some(d => + d.name === "Reference" || d.name === "Composition" || d.name === "Relationship" + ); + + if (hasRelationshipDecorator && field.type === targetModelName) { + return true; + } + + // Also check for array types like "TargetModel[]" + if (hasRelationshipDecorator && field.type === `${targetModelName}[]`) { + return true; + } + + return false; + } + + /** + * Asks user for confirmation before proceeding with the conversion. + */ + private async confirmConversion(targetModelName: string, isReferencedElsewhere: boolean): Promise { + const message = isReferencedElsewhere + ? `Convert reference to composition? The referenced model '${targetModelName}' is used elsewhere, so it will be kept and a new component model will be created.` + : `Convert reference to composition? The referenced model '${targetModelName}' is not used elsewhere, so it will be deleted and recreated as a component model.`; + + const choice = await vscode.window.showWarningMessage( + message, + { modal: true }, + "Convert", + "Cancel" + ); + + return choice === "Convert"; + } + + /** + * Generates the TypeScript code for the new component model. + */ + private async generateComponentModelCode( + targetModel: DecoratedClass, + sourceModel: DecoratedClass, + cache: MetadataCache + ): Promise { + const lines: string[] = []; + + // Get datasource from source model + const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); + const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; + + // Add model decorator + if (dataSource) { + lines.push(`@Model({`); + lines.push(`\tdataSource: ${dataSource}`); + lines.push(`})`); + } else { + lines.push(`@Model()`); + } + + // Add class declaration as component model + lines.push(`class ${targetModel.name} extends PersistentComponentModel<${sourceModel.name}> {`); + lines.push(``); + + // Copy fields from the original model (except decorators that might not be compatible) + for (const [fieldName, field] of Object.entries(targetModel.properties)) { + // Add field decorators (filter out any that might be problematic) + const validDecorators = field.decorators.filter(d => + d.name === "Field" || + d.name === "Text" || + d.name === "Integer" || + d.name === "Number" || + d.name === "Boolean" || + d.name === "Date" || + d.name === "Email" || + d.name === "LongText" || + d.name === "Html" + ); + + // If no Field decorator, add one + if (!validDecorators.some(d => d.name === "Field")) { + lines.push(`\t@Field({})`); + } + + // Add other decorators + for (const decorator of validDecorators) { + if (decorator.name !== "Field") { + lines.push(`\t@${decorator.name}()`); + } else { + lines.push(`\t@Field({})`); + } + } + + // Add property declaration + lines.push(`\t${fieldName}!: ${field.type};`); + lines.push(``); + } + + lines.push(`}`); + + return lines.join("\n"); + } + + /** + * Removes the @Reference and @Field decorators from the field. + */ + private async removeReferenceField(document: vscode.TextDocument, field: PropertyMetadata): Promise { + const edit = new vscode.WorkspaceEdit(); + + // Find and remove @Reference and @Field decorators + for (const decorator of field.decorators) { + if (decorator.name === "Reference" || decorator.name === "Field") { + const decoratorLine = document.lineAt(decorator.position.start.line); + edit.delete(document.uri, decoratorLine.rangeIncludingLineBreak); + } + } + + await vscode.workspace.applyEdit(edit); + } + + /** + * Adds the component model to the source file. + */ + private async addComponentModel( + document: vscode.TextDocument, + componentModelCode: string, + sourceModelName: string, + cache: MetadataCache + ): Promise { + const newImports = new Set(["Model", "PersistentComponentModel"]); + + await this.sourceCodeService.insertModel( + document, + componentModelCode, + sourceModelName, // Insert after the source model + newImports + ); + } + + /** + * Adds the composition field to the source model. + */ + private async addCompositionField( + document: vscode.TextDocument, + sourceModelName: string, + fieldName: string, + targetModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Create field info for the composition field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Composition", + tsType: isArray ? `${targetModelName}[]` : targetModelName, + description: "Composition relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // Compositions are typically optional + additionalConfig: { + relationshipType: "composition", + targetModel: targetModelName, + targetModelPath: document.uri.fsPath, + }, + }; + + // Generate the field code + const fieldCode = this.generateCompositionFieldCode(fieldInfo, targetModelName, isArray); + + // Insert the field + await this.sourceCodeService.insertField(document, sourceModelName, fieldInfo, fieldCode, cache, false); + } + + /** + * Generates the TypeScript code for the composition field. + */ + private generateCompositionFieldCode(fieldInfo: FieldInfo, targetModelName: string, isArray: boolean): string { + const lines: string[] = []; + + // Add Field decorator + lines.push("@Field({})"); + + // Add Composition decorator + lines.push("@Composition()"); + + // Add property declaration + const typeDeclaration = isArray ? `${targetModelName}[]` : targetModelName; + lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + + return lines.join("\n"); + } + + /** + * Deletes the target model file if it's safe to do so. + */ + private async deleteTargetModelFile(targetModel: DecoratedClass): Promise { + try { + await vscode.workspace.fs.delete(targetModel.declaration.uri); + console.log(`Deleted target model file: ${targetModel.declaration.uri.fsPath}`); + } catch (error) { + console.warn(`Could not delete target model file: ${error}`); + // Don't throw error here as the conversion was successful + } + } +} \ No newline at end of file diff --git a/src/explorer/appTreeItem.ts b/src/explorer/appTreeItem.ts index e593d9f..283eb68 100644 --- a/src/explorer/appTreeItem.ts +++ b/src/explorer/appTreeItem.ts @@ -42,6 +42,9 @@ export class AppTreeItem extends vscode.TreeItem { case "field": iconFileName = "field.svg"; break; + case "referenceField": + iconFileName = "field.svg"; // You could create a specific icon for reference fields + break; case "modelActionsFolder": iconFileName = "action.svg"; break; diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index 2dbf894..74e062b 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -726,10 +726,16 @@ export class ExplorerProvider private mapPropertyToTreeItem(propData: PropertyMetadata, itemType: string, parent?: AppTreeItem): AppTreeItem { const upperFieldName = propData.name.charAt(0).toUpperCase() + propData.name.slice(1); + // Check if this is a reference field and adjust the itemType accordingly + let actualItemType = itemType; + if (itemType === "field" && propData.decorators.some(d => d.name === "Reference")) { + actualItemType = "referenceField"; + } + const item = new AppTreeItem( upperFieldName, vscode.TreeItemCollapsibleState.None, - itemType, + actualItemType, this.extensionUri, propData, parent diff --git a/src/refactor/refactorDisposables.ts b/src/refactor/refactorDisposables.ts index 6a030f1..016f5bc 100644 --- a/src/refactor/refactorDisposables.ts +++ b/src/refactor/refactorDisposables.ts @@ -10,6 +10,7 @@ import { findNodeAtPosition } from '../utils/ast'; import { cache } from '../extension'; import { AppTreeItem } from '../explorer/appTreeItem'; import { AddDecoratorTool } from './tools/addDecorator'; +import { ChangeReferenceToCompositionRefactorTool } from './tools/changeReferenceToComposition'; import { isModelFile } from '../utils/metadata'; import { PropertyMetadata } from '../cache/cache'; import { fieldTypeConfig } from '../utils/fieldTypes'; @@ -36,6 +37,7 @@ export function getAllRefactorTools(): IRefactorTool[] { new DeleteFieldTool(), new ChangeFieldTypeTool(), new AddDecoratorTool(), + new ChangeReferenceToCompositionRefactorTool(), ]; } diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index 441041c..b6a7957 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -111,6 +111,24 @@ export interface AddDecoratorPayload { isManual: boolean; } +/** + * Payload interface for changing a reference field to a composition field. + * This involves removing the @Reference decorator and adding a @Composition decorator, + * potentially deleting the referenced model if it's not used elsewhere, + * and creating a component model in the same file. + * + * @property {string} sourceModelName - The name of the model containing the reference field + * @property {string} fieldName - The name of the reference field to be changed + * @property {PropertyMetadata} fieldMetadata - Metadata information about the reference field + * @property {boolean} isManual - Whether the change was initiated manually by the user + */ +export interface ChangeReferenceToCompositionPayload { + sourceModelName: string; + fieldName: string; + fieldMetadata: PropertyMetadata; + isManual: boolean; +} + /** * Represents the specific type of refactoring change being applied. @@ -122,8 +140,9 @@ export interface AddDecoratorPayload { * - `DELETE_FIELD`: A change that deletes a field from an model. * - `CHANGE_FIELD_TYPE`: A change that modifies the data type of a field. * - `ADD_DECORATOR`: A change that adds a decorator to a field. + * - `CHANGE_REFERENCE_TO_COMPOSITION`: A change that converts a reference field to a composition field. */ -export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR'; +export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR' | 'CHANGE_REFERENCE_TO_COMPOSITION'; /** * Represents a single, atomic change to be applied as part of a refactoring operation. @@ -145,7 +164,8 @@ export interface ChangeObject { | RenameFieldPayload | DeleteFieldPayload | ChangeFieldTypePayload - | AddDecoratorPayload; + | AddDecoratorPayload + | ChangeReferenceToCompositionPayload; } diff --git a/src/refactor/tools/changeReferenceToComposition.ts b/src/refactor/tools/changeReferenceToComposition.ts new file mode 100644 index 0000000..c6c80b5 --- /dev/null +++ b/src/refactor/tools/changeReferenceToComposition.ts @@ -0,0 +1,170 @@ +import * as vscode from "vscode"; +import { + IRefactorTool, + ChangeObject, + ManualRefactorContext, +} from "../refactorInterfaces"; +import { MetadataCache, PropertyMetadata, DecoratedClass } from "../../cache/cache"; +import { ChangeReferenceToCompositionTool } from "../../commands/fields/changeReferenceToComposition"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { isModelFile } from "../../utils/metadata"; + +/** + * Payload interface for changing a reference field to a composition field. + */ +export interface ChangeReferenceToCompositionPayload { + sourceModelName: string; + fieldName: string; + fieldMetadata: PropertyMetadata; + isManual: boolean; +} + +/** + * Refactor tool for converting reference fields to composition fields. + * + * This tool allows users to convert @Reference fields to @Composition fields + * through the VS Code refactor menu. It validates that the field is indeed + * a reference field before allowing the conversion. + */ +export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { + + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.changeReferenceToComposition"; + } + + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Change Reference to Composition"; + } + + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["CHANGE_REFERENCE_TO_COMPOSITION"]; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Only allows conversion if the field is a reference field. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; + } + + // Must have field metadata + if (!context.metadata || !('decorators' in context.metadata)) { + return false; + } + + const fieldMetadata = context.metadata as PropertyMetadata; + + // Check if this field has a @Reference decorator + const hasReferenceDecorator = fieldMetadata.decorators.some(d => d.name === "Reference"); + + return hasReferenceDecorator; + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by creating a change object. + */ + async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('decorators' in context.metadata)) { + return undefined; + } + + const fieldMetadata = context.metadata as PropertyMetadata; + + // Find the model that contains this field + const cache = context.cache; + const sourceModel = this.findSourceModel(cache, fieldMetadata); + + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find the model containing this field"); + return undefined; + } + + const payload: ChangeReferenceToCompositionPayload = { + sourceModelName: sourceModel.name, + fieldName: fieldMetadata.name, + fieldMetadata: fieldMetadata, + isManual: true, + }; + + return { + type: "CHANGE_REFERENCE_TO_COMPOSITION", + uri: context.uri, + description: `Change reference field '${fieldMetadata.name}' to composition in model '${sourceModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + * This delegates to the actual implementation tool. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ChangeReferenceToCompositionPayload; + + // We don't actually prepare the edit here since the command tool handles everything + // This is more of a trigger for the actual implementation + const workspaceEdit = new vscode.WorkspaceEdit(); + + // Execute the actual command + setTimeout(async () => { + try { + // Get the explorer provider from the extension context + // For now, we'll create a mock explorer provider + const explorerProvider = { + refresh: () => {} + } as any; + + const tool = new ChangeReferenceToCompositionTool(explorerProvider); + await tool.changeReferenceToComposition( + cache, + payload.sourceModelName, + payload.fieldName + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to change reference to composition: ${error}`); + } + }, 100); + + return workspaceEdit; + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModel(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + prop => prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } +} From 9af930a5bd795b797e30bd6fcd7db92deb524961 Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Sep 2025 14:35:22 -0300 Subject: [PATCH 160/254] Adds logic to remove imports when a model is inserted in anothers file. --- .../fields/changeReferenceToComposition.ts | 3 + src/services/fileSystemService.ts | 110 ++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index 28da7c2..c296d38 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -71,6 +71,9 @@ export class ChangeReferenceToCompositionTool { // Step 6: Add the component model to the source file await this.addComponentModel(document, componentModelCode, sourceModel.name, cache); + // Step 6.1: Remove the import for the target model since it's now defined in the same file + await this.fileSystemService.removeModelImport(document, targetModel.name); + // Step 7: Add the composition field await this.addCompositionField(document, sourceModel.name, fieldName, targetModel.name, false, cache); diff --git a/src/services/fileSystemService.ts b/src/services/fileSystemService.ts index 4b4ed4d..cfdad46 100644 --- a/src/services/fileSystemService.ts +++ b/src/services/fileSystemService.ts @@ -458,4 +458,114 @@ export class FileSystemService { } return true; } + + /** + * Removes import statements for a specific model from a document. + * This is useful when a model is moved from an external file to the same file, + * making the import unnecessary. + * + * @param document - The document to remove imports from + * @param modelName - The name of the model to remove imports for + * @returns Promise that resolves when the import is removed + */ + public async removeModelImport(document: vscode.TextDocument, modelName: string): Promise { + const edit = new vscode.WorkspaceEdit(); + const content = document.getText(); + const lines = content.split("\n"); + + // Find and remove import lines that contain the model name + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Check for import statements that import the specific model + if (this.isImportLineForModel(line, modelName)) { + // Check if this is a single import or multiple imports + if (this.isSingleModelImport(line, modelName)) { + // Remove the entire import line + const lineRange = new vscode.Range(i, 0, i + 1, 0); + edit.delete(document.uri, lineRange); + } else { + // Remove only the specific model from a multi-import line + const updatedLine = this.removeModelFromImportLine(line, modelName); + if (updatedLine !== line) { + const lineRange = new vscode.Range(i, 0, i, line.length); + edit.replace(document.uri, lineRange, updatedLine); + } + } + } + } + + if (edit.size > 0) { + await vscode.workspace.applyEdit(edit); + } + } + + /** + * Checks if a line is an import statement for a specific model. + */ + private isImportLineForModel(line: string, modelName: string): boolean { + // Must be an import line + if (!line.trim().startsWith('import')) { + return false; + } + + // Skip slingr-framework imports + if (line.includes('slingr-framework')) { + return false; + } + + // Check if the model name appears in the import + const importRegex = /import\s+\{([^}]+)\}\s+from/; + const match = line.match(importRegex); + + if (match) { + const importedItems = match[1].split(',').map(item => item.trim()); + return importedItems.includes(modelName); + } + + // Also check for default imports + const defaultImportRegex = new RegExp(`import\\s+${modelName}\\s+from`); + return defaultImportRegex.test(line); + } + + /** + * Checks if the import line only imports a single model. + */ + private isSingleModelImport(line: string, modelName: string): boolean { + const importRegex = /import\s+\{([^}]+)\}\s+from/; + const match = line.match(importRegex); + + if (match) { + const importedItems = match[1].split(',').map(item => item.trim()).filter(item => item.length > 0); + return importedItems.length === 1 && importedItems[0] === modelName; + } + + // For default imports, it's always a single import + const defaultImportRegex = new RegExp(`import\\s+${modelName}\\s+from`); + return defaultImportRegex.test(line); + } + + /** + * Removes a specific model from a multi-import line. + */ + private removeModelFromImportLine(line: string, modelName: string): string { + const importRegex = /import\s+\{([^}]+)\}\s+from(.+)/; + const match = line.match(importRegex); + + if (match) { + const importedItems = match[1] + .split(',') + .map(item => item.trim()) + .filter(item => item.length > 0 && item !== modelName); + + if (importedItems.length > 0) { + return `import { ${importedItems.join(', ')} } from${match[2]}`; + } else { + // If no items left, return empty string to indicate line should be removed + return ''; + } + } + + return line; + } } From c3228fe4deb458bfa87535100f44cb1da15036bb Mon Sep 17 00:00:00 2001 From: Luciano Date: Thu, 11 Sep 2025 14:37:15 -0300 Subject: [PATCH 161/254] Removed manual explorer refresh --- src/commands/models/addComposition.ts | 2 -- src/commands/models/addReference.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 6298c1d..3ddbdd3 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -56,8 +56,6 @@ export class AddCompositionTool { // Step 6: Add composition field to outer model await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); - this.explorerProvider.refresh(); - // Step 7: Focus on the newly created field await this.sourceCodeService.focusOnElement(document, fieldName); diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index f228dd1..a3e415f 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -77,8 +77,6 @@ export class AddReferenceTool { // Step 5: Add reference field to source model await this.addReferenceField(document, modelClass.name, fieldName, targetModelName, targetModelPath, cache); - this.explorerProvider.refresh(); - // Step 6: Focus on the newly created field await this.sourceCodeService.focusOnElement(document, fieldName); From 34c604b451fed20d9c247109b9dbceb2a2c334eb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 12:08:40 +0000 Subject: [PATCH 162/254] Initial plan From f0d5e960ee62ac66f009730ed640884224a9d83f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 12:18:56 +0000 Subject: [PATCH 163/254] Refactor core model and number field type metadata keys to use constants Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- src/model/Field.ts | 22 +++-- src/model/Model.ts | 20 ++-- src/model/metadata/MetadataKeys.ts | 151 +++++++++++++++++++++++++++++ src/model/metadata/index.ts | 5 + src/model/types/number/Decimal.ts | 5 +- src/model/types/number/Integer.ts | 5 +- src/model/types/number/Money.ts | 5 +- src/model/types/number/Number.ts | 5 +- 8 files changed, 197 insertions(+), 21 deletions(-) create mode 100644 src/model/metadata/MetadataKeys.ts create mode 100644 src/model/metadata/index.ts diff --git a/src/model/Field.ts b/src/model/Field.ts index d09fdf4..6885d42 100644 --- a/src/model/Field.ts +++ b/src/model/Field.ts @@ -7,6 +7,14 @@ import type { CustomAvailableFunction, ValidationIssue } from "./types/SharedTypes"; +import { + MODEL_FIELDS, + FIELD_DOCS, + FIELD_REQUIRED, + FIELD_AVAILABLE, + FIELD_VALIDATION, + FIELD_CALCULATION +} from './metadata/MetadataKeys'; /** * Configuration options for the Field decorator. @@ -176,20 +184,20 @@ export function Field(options return function (target: Object, propertyKey: string, descriptor?: PropertyDescriptor) { // Mark this property as a field - const existingFields = Reflect.getMetadata('model:fields', target.constructor) || []; + const existingFields = Reflect.getMetadata(MODEL_FIELDS, target.constructor) || []; if (!existingFields.includes(propertyKey)) { existingFields.push(propertyKey); - Reflect.defineMetadata('model:fields', existingFields, target.constructor); + Reflect.defineMetadata(MODEL_FIELDS, existingFields, target.constructor); } // Add documentation metadata if provided if (options.docs) { - Reflect.defineMetadata('field:docs', options.docs, target, propertyKey); + Reflect.defineMetadata(FIELD_DOCS, options.docs, target, propertyKey); } // Store required metadata if provided if (options.required !== undefined) { - Reflect.defineMetadata('field:required', options.required, target, propertyKey); + Reflect.defineMetadata(FIELD_REQUIRED, options.required, target, propertyKey); } // Handle field availability for JSON serialization/deserialization @@ -200,7 +208,7 @@ export function Field(options const availableFn = options.available as CustomAvailableFunction; // Store the availability function in metadata for potential future use - Reflect.defineMetadata('field:available', availableFn, target, propertyKey); + Reflect.defineMetadata(FIELD_AVAILABLE, availableFn, target, propertyKey); // Use Transform to control the field's presence in JSON Transform(({ obj, key }) => { @@ -247,7 +255,7 @@ export function Field(options // Handle custom validation logic if (options.validation) { // Store the custom validation function in metadata - Reflect.defineMetadata('field:validation', options.validation, target, propertyKey); + Reflect.defineMetadata(FIELD_VALIDATION, options.validation, target, propertyKey); // Apply the custom validator decorator to integrate with class-validator CustomValidate()(target, propertyKey); } @@ -264,7 +272,7 @@ export function Field(options const memoizedSymbol = Symbol(`_memoized_${propertyKey}`); // Use a Symbol to avoid property collisions // Store the original calculation function in metadata so `calculate()` can find it - Reflect.defineMetadata('field:calculation', originalGetter, target, propertyKey); + Reflect.defineMetadata(FIELD_CALCULATION, originalGetter, target, propertyKey); // Replace the original getter with one that returns the memoized value descriptor.get = function () { diff --git a/src/model/Model.ts b/src/model/Model.ts index e50d43c..cb604b6 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -1,5 +1,13 @@ import "reflect-metadata"; import { DataSource } from "../datasources"; +import { + MODEL_DOCS, + MODEL_DATASOURCE, + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED +} from './metadata/MetadataKeys'; /** * Configuration options for the Model decorator. @@ -42,23 +50,23 @@ export interface ModelOptions { */ export function Model(options?: ModelOptions) { return function (constructor: Function) { - Reflect.defineMetadata("model:docs", options?.docs, constructor); + Reflect.defineMetadata(MODEL_DOCS, options?.docs, constructor); // If a data source is provided, configure the model for persistence if (options?.dataSource) { - Reflect.defineMetadata("model:dataSource", options.dataSource, constructor); + Reflect.defineMetadata(MODEL_DATASOURCE, options.dataSource, constructor); // Call configureModel on the data source options.dataSource.configureModel(constructor, options); // Configure all fields with the data source // Get the list of fields that have @Field decorators applied - const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, constructor) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', constructor.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', constructor.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, constructor.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, constructor.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, constructor.prototype, fieldName); if (fieldType) { // Combine field options including required information diff --git a/src/model/metadata/MetadataKeys.ts b/src/model/metadata/MetadataKeys.ts new file mode 100644 index 0000000..a03d18e --- /dev/null +++ b/src/model/metadata/MetadataKeys.ts @@ -0,0 +1,151 @@ +/** + * Metadata keys used throughout the Slingr Framework. + * + * This file centralizes all metadata key constants to improve maintainability + * and readability of the codebase. Instead of using hardcoded strings throughout + * the framework, these constants should be used. + * + * @example + * ```typescript + * // Instead of: + * Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + * + * // Use: + * Reflect.getMetadata(FIELD_TYPE, entityClass.prototype, fieldName); + * ``` + */ + +// ============================================================================= +// Field-related metadata keys +// ============================================================================= + +/** Metadata key for storing field type information (e.g., 'money', 'text', 'email') */ +export const FIELD_TYPE = 'field:type'; + +/** Metadata key for storing field type options/configuration */ +export const FIELD_TYPE_OPTIONS = 'field:type:options'; + +/** Metadata key for storing field required configuration (boolean or function) */ +export const FIELD_REQUIRED = 'field:required'; + +/** Metadata key for storing field documentation */ +export const FIELD_DOCS = 'field:docs'; + +/** Metadata key for storing custom field validation functions */ +export const FIELD_VALIDATION = 'field:validation'; + +/** Metadata key for storing field calculation functions for manual calculation */ +export const FIELD_CALCULATION = 'field:calculation'; + +/** Metadata key for storing field availability functions for JSON serialization */ +export const FIELD_AVAILABLE = 'field:available'; + +/** Metadata key for storing field relationship type information */ +export const FIELD_RELATIONSHIP_TYPE = 'field:relationship:type'; + +// ============================================================================= +// Model-related metadata keys +// ============================================================================= + +/** Metadata key for storing the list of fields in a model */ +export const MODEL_FIELDS = 'model:fields'; + +/** Metadata key for storing model documentation */ +export const MODEL_DOCS = 'model:docs'; + +/** Metadata key for storing the data source associated with a model */ +export const MODEL_DATASOURCE = 'model:dataSource'; + +// ============================================================================= +// Datasource-related metadata keys +// ============================================================================= + +/** Metadata key for marking fields as configured by a datasource */ +export const DATASOURCE_FIELD_CONFIGURED = 'datasource:field:configured'; + +/** Metadata key for storing datasource type information */ +export const DATASOURCE_TYPE = 'datasource:type'; + +// ============================================================================= +// Array field-related metadata keys +// ============================================================================= + +/** Metadata key for storing array field names */ +export const ARRAY_FIELD_NAMES = 'array:field:names'; + +// ============================================================================= +// TypeORM-related metadata keys +// ============================================================================= + +/** Metadata key for TypeORM column configuration */ +export const TYPEORM_COLUMN = 'typeorm:column'; + +/** Metadata key for TypeORM entity configuration */ +export const TYPEORM_ENTITY = 'typeorm:entity'; + +/** Metadata key for TypeORM table configuration */ +export const TYPEORM_TABLE = 'typeorm:table'; + +/** Metadata key for TypeORM array field configuration */ +export const TYPEORM_ARRAY_FIELD = 'typeorm:array-field'; + +/** Metadata key for TypeORM array relation configuration */ +export const TYPEORM_ARRAY_RELATION_CONFIGURED = 'typeorm:array:relation:configured'; + +// ============================================================================= +// Field type constants for common field types +// ============================================================================= + +/** Field type constant for money fields */ +export const FIELD_TYPE_MONEY = 'money'; + +/** Field type constant for text fields */ +export const FIELD_TYPE_TEXT = 'text'; + +/** Field type constant for email fields */ +export const FIELD_TYPE_EMAIL = 'email'; + +/** Field type constant for number fields */ +export const FIELD_TYPE_NUMBER = 'number'; + +/** Field type constant for decimal fields */ +export const FIELD_TYPE_DECIMAL = 'decimal'; + +/** Field type constant for integer fields */ +export const FIELD_TYPE_INTEGER = 'integer'; + +/** Field type constant for boolean fields */ +export const FIELD_TYPE_BOOLEAN = 'boolean'; + +/** Field type constant for datetime fields */ +export const FIELD_TYPE_DATETIME = 'datetime'; + +/** Field type constant for choice fields */ +export const FIELD_TYPE_CHOICE = 'choice'; + +/** Field type constant for relationship fields */ +export const FIELD_TYPE_RELATIONSHIP = 'relationship'; + +/** Field type constant for array text fields */ +export const FIELD_TYPE_ARRAY_TEXT = 'array:text'; + +/** Field type constant for array email fields */ +export const FIELD_TYPE_ARRAY_EMAIL = 'array:email'; + +/** Field type constant for array html fields */ +export const FIELD_TYPE_ARRAY_HTML = 'array:html'; + +/** Field type constant for html fields */ +export const FIELD_TYPE_HTML = 'html'; + +/** Field type constant for longText fields */ +export const FIELD_TYPE_LONG_TEXT = 'longText'; + +/** Field type constant for shortText fields */ +export const FIELD_TYPE_SHORT_TEXT = 'shortText'; + +/** Field type constant for timestamp fields */ +export const FIELD_TYPE_TIMESTAMP = 'timestamp'; + +/** Field type constant for datetimerange fields */ +export const FIELD_TYPE_DATETIME_RANGE = 'datetimerange'; \ No newline at end of file diff --git a/src/model/metadata/index.ts b/src/model/metadata/index.ts new file mode 100644 index 0000000..1b5511d --- /dev/null +++ b/src/model/metadata/index.ts @@ -0,0 +1,5 @@ +/** + * Metadata utilities and constants for the Slingr Framework. + */ + +export * from './MetadataKeys'; \ No newline at end of file diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index f7b404b..4281cd9 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -3,6 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DECIMAL } from '../../metadata/MetadataKeys'; /** * Type alias for the `FinancialNumber` object. @@ -54,8 +55,8 @@ function validateDecimalType(proto: Object, propertyKey: string): void { } function storeDecimalMetadata(proto: Object, propName: string, options: DecimalOptions): void { - Reflect.defineMetadata('field:type', 'decimal', proto, propName); - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_DECIMAL, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } function createOptionalValidatorAdder(proto: Object, propName: string) { diff --git a/src/model/types/number/Integer.ts b/src/model/types/number/Integer.ts index 5c9b577..a9a4ec2 100644 --- a/src/model/types/number/Integer.ts +++ b/src/model/types/number/Integer.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_INTEGER } from '../../metadata/MetadataKeys'; /** * Options for the Integer decorator. @@ -38,9 +39,9 @@ function validateIntegerType(proto: Object, propertyKey: string): void { * Stores metadata for the integer field. */ function storeIntegerMetadata(proto: Object, propName: string, options?: IntegerOptions): void { - Reflect.defineMetadata('field:type', 'integer', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_INTEGER, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } } diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index 8ed0628..6a68771 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -3,6 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_MONEY } from '../../metadata/MetadataKeys'; /** * Type alias for the `FinancialNumber` object, representing a monetary value. @@ -52,8 +53,8 @@ function validateMoneyType(proto: Object, propertyKey: string): void { } function storeMoneyMetadata(proto: Object, propName: string, options: MoneyOptions): void { - Reflect.defineMetadata('field:type', 'money', proto, propName); - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_MONEY, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } function createOptionalValidatorAdder(proto: Object, propName: string) { diff --git a/src/model/types/number/Number.ts b/src/model/types/number/Number.ts index bb76cda..30493ab 100644 --- a/src/model/types/number/Number.ts +++ b/src/model/types/number/Number.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_NUMBER } from '../../metadata/MetadataKeys'; /** * Options for the Number decorator. @@ -45,9 +46,9 @@ function validateNumberType(proto: Object, propertyKey: string): void { * @param options - The NumberOptions to store. */ function storeNumberMetadata(proto: Object, propName: string, options?: NumberOptions): void { - Reflect.defineMetadata('field:type', 'number', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_NUMBER, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } } From 0962ce79a1a6721b7226ff8b477e75d91bd50336 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 12:24:50 +0000 Subject: [PATCH 164/254] Refactor all field type decorators to use metadata constants Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- src/model/types/boolean/Boolean.ts | 3 ++- src/model/types/date_time/DateTime.ts | 5 +++-- src/model/types/date_time/DateTimeRange.ts | 5 +++-- src/model/types/enum/Choice.ts | 3 ++- src/model/types/relationship/Relationship.ts | 5 +++-- src/model/types/string/Email.ts | 5 +++-- src/model/types/string/HTML.ts | 5 +++-- src/model/types/string/Text.ts | 9 +++++---- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/model/types/boolean/Boolean.ts b/src/model/types/boolean/Boolean.ts index 124ca4f..90cd112 100644 --- a/src/model/types/boolean/Boolean.ts +++ b/src/model/types/boolean/Boolean.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import { validateBooleanType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_BOOLEAN } from '../../metadata/MetadataKeys'; /** * Boolean type decorator. @@ -48,7 +49,7 @@ export function Boolean() { const proto = target as unknown as Object; validateBooleanType(proto, propName); - Reflect.defineMetadata('field:type', 'boolean', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_BOOLEAN, proto, propName); }; } diff --git a/src/model/types/date_time/DateTime.ts b/src/model/types/date_time/DateTime.ts index e04c8fe..2d59c23 100644 --- a/src/model/types/date_time/DateTime.ts +++ b/src/model/types/date_time/DateTime.ts @@ -7,6 +7,7 @@ import { import { Transform, TransformationType } from 'class-transformer'; import { validateDateType, dateToISO8601, dateFromJSON } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME } from '../../metadata/MetadataKeys'; /** * Options for the DateTime decorator. @@ -27,9 +28,9 @@ type DateTimeKey = T[K] extends Date | undefined * Stores metadata for the datetime field that can be consumed by other layers. */ function storeDateTimeMetadata(proto: Object, propName: string, options?: DateTimeOptions): void { - Reflect.defineMetadata('field:type', 'datetime', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_DATETIME, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } } diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index dc48d3c..46cf05b 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -8,6 +8,7 @@ import { } from 'class-validator'; import { Type, Transform, TransformationType, Expose } from 'class-transformer'; import { dateToISO8601, dateFromJSON } from '../utils'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME_RANGE } from '../../metadata/MetadataKeys'; /** * Options for the DateTimeRange decorator. @@ -72,9 +73,9 @@ function validateDateTimeRangeType(proto: Object, propertyKey: string): void { * Stores metadata for the datetime range field that can be consumed by other layers. */ function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { - Reflect.defineMetadata('field:type', 'datetimerange', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_DATETIME_RANGE, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } } diff --git a/src/model/types/enum/Choice.ts b/src/model/types/enum/Choice.ts index 3aae4fe..c9146ac 100644 --- a/src/model/types/enum/Choice.ts +++ b/src/model/types/enum/Choice.ts @@ -2,6 +2,7 @@ import 'reflect-metadata'; import { Transform, TransformationType } from 'class-transformer'; import { validateEnumType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_CHOICE } from '../../metadata/MetadataKeys'; /** * Choice type decorator. @@ -52,7 +53,7 @@ export function Choice() { const proto = target as unknown as Object; validateEnumType(proto, propName); - Reflect.defineMetadata('field:type', 'choice', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_CHOICE, proto, propName); // Custom transformation for JSON serialization/deserialization Transform(({ value, type }) => { diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 78f4085..02442f6 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -2,6 +2,7 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; import { ValidateNested } from 'class-validator'; import { BaseModel } from '../../index'; +import { FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, FIELD_RELATIONSHIP_TYPE } from '../../metadata/MetadataKeys'; /** * Relationship type options. @@ -107,8 +108,8 @@ export function Relationship(options: RelationshipOptions) { validateRelationshipType(proto, propName); // Store metadata about the relationship - Reflect.defineMetadata('field:type', 'relationship', proto, propName); - Reflect.defineMetadata('field:relationship:type', options.type, proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, proto, propName); + Reflect.defineMetadata(FIELD_RELATIONSHIP_TYPE, options.type, proto, propName); const designType = Reflect.getMetadata('design:type', proto, propName); diff --git a/src/model/types/string/Email.ts b/src/model/types/string/Email.ts index b8bff8d..46719b8 100644 --- a/src/model/types/string/Email.ts +++ b/src/model/types/string/Email.ts @@ -3,6 +3,7 @@ import { IsEmail, IsArray } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_EMAIL, FIELD_TYPE_ARRAY_EMAIL } from '../../metadata/MetadataKeys'; /** * Email type decorator. @@ -70,7 +71,7 @@ export function Email() { if (designType === Array) { // Handle email array case - Reflect.defineMetadata('field:type', 'array:email', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_ARRAY_EMAIL, proto, propName); // Use built-in class-validator decorators for array validation IsArray()(target as any, propName); @@ -96,7 +97,7 @@ export function Email() { })(target as any, propName); } else { // Handle single email case - Reflect.defineMetadata('field:type', 'email', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_EMAIL, proto, propName); // Use standard class-validator email decorator IsEmail()(target as any, propName); diff --git a/src/model/types/string/HTML.ts b/src/model/types/string/HTML.ts index 112ffc4..9d55070 100644 --- a/src/model/types/string/HTML.ts +++ b/src/model/types/string/HTML.ts @@ -4,6 +4,7 @@ import { Text } from './Text'; import { IsArray, IsString } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_HTML, FIELD_TYPE_ARRAY_HTML } from '../../metadata/MetadataKeys'; /** * HTML type decorator. @@ -71,7 +72,7 @@ export function HTML() { if (designType === Array) { // Handle string array case - Reflect.defineMetadata('field:type', 'array:html', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_ARRAY_HTML, proto, propName); // Use built-in class-validator decorators for array validation IsArray()(target as any, propName); @@ -97,7 +98,7 @@ export function HTML() { })(target as any, propName); } else { // Handle single string case - Reflect.defineMetadata('field:type', 'html', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_HTML, proto, propName); Text()(target as any, propName as any); } }; diff --git a/src/model/types/string/Text.ts b/src/model/types/string/Text.ts index f41397b..ee0fdb2 100644 --- a/src/model/types/string/Text.ts +++ b/src/model/types/string/Text.ts @@ -11,6 +11,7 @@ import { import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_TEXT, FIELD_TYPE_ARRAY_TEXT } from '../../metadata/MetadataKeys'; /** * Options for the Text decorator. @@ -56,9 +57,9 @@ function validateTextType(proto: Object, propertyKey: string): void { * @param options - Text options to store */ function storeTextMetadata(proto: Object, propName: string, options?: TextOptions): void { - Reflect.defineMetadata('field:type', 'text', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_TEXT, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } } @@ -117,9 +118,9 @@ export function Text(options?: TextOptions) { if (designType === Array) { // Handle string array case - Reflect.defineMetadata('field:type', 'array:text', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_ARRAY_TEXT, proto, propName); if (options) { - Reflect.defineMetadata('field:type:options', options, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, options, proto, propName); } // Validate that regex is not used with arrays From 13af59f31152387d0854fb2e4d980db1fc557ace Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 12:31:57 +0000 Subject: [PATCH 165/254] Complete metadata key refactoring for all datasource and utility files Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- src/datasources/typeorm/ArrayFieldManager.ts | 28 +++++++++++-------- .../typeorm/TypeORMSqlDataSource.ts | 20 +++++++++---- src/model/BaseModel.ts | 7 +++-- src/validators/CustomValidationConstraint.ts | 5 ++-- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index e33d274..4d7d1e4 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -1,5 +1,11 @@ import { OneToMany, AfterLoad, BeforeInsert, BeforeUpdate } from 'typeorm'; import { ArrayEntityFactory } from './ArrayEntityFactory'; +import { + ARRAY_FIELD_NAMES, + DATASOURCE_FIELD_CONFIGURED, + TYPEORM_ARRAY_RELATION_CONFIGURED, + TYPEORM_ARRAY_FIELD +} from '../../model/metadata/MetadataKeys'; /** * Interface for array field metadata. @@ -85,7 +91,7 @@ export class ArrayFieldManager { // Only configure the relation once per model class + property. Additional // data source instances should reuse the same relation metadata. - if (!Reflect.getMetadata('typeorm:array:relation:configured', target, relationPropertyName)) { + if (!Reflect.getMetadata(TYPEORM_ARRAY_RELATION_CONFIGURED, target, relationPropertyName)) { // Ensure TypeORM can discover the relation property type. Since the relation // property is added dynamically (not declared in the class), reflect-metadata // does not have a "design:type" entry for it. TypeORM relies on this metadata @@ -103,7 +109,7 @@ export class ArrayFieldManager { orphanedRowAction: 'delete' // remove missing children when saving parent })(target, relationPropertyName); - Reflect.defineMetadata('typeorm:array:relation:configured', true, target, relationPropertyName); + Reflect.defineMetadata(TYPEORM_ARRAY_RELATION_CONFIGURED, true, target, relationPropertyName); } // Add @AfterLoad hook to automatically transform array element entities to arrays @@ -123,10 +129,10 @@ export class ArrayFieldManager { if (!target._transformArrayFields) { target._transformArrayFields = function () { const entityClass = this.constructor as Function; - const arrayFieldNames = Reflect.getMetadata('array:field:names', entityClass) || []; + const arrayFieldNames = Reflect.getMetadata(ARRAY_FIELD_NAMES, entityClass) || []; for (const fieldName of arrayFieldNames) { - const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const arrayMetadata: ArrayFieldMetadata = Reflect.getMetadata(TYPEORM_ARRAY_FIELD, entityClass.prototype, fieldName); if (arrayMetadata?.relationPropertyName) { const relationPropertyName = arrayMetadata.relationPropertyName; const arrayElements = this[relationPropertyName]; @@ -166,10 +172,10 @@ export class ArrayFieldManager { if (!target._prepareArrayRelations) { target._prepareArrayRelations = function () { const entityClass = this.constructor as Function; - const arrayFieldNames: string[] = Reflect.getMetadata('array:field:names', entityClass) || []; + const arrayFieldNames: string[] = Reflect.getMetadata(ARRAY_FIELD_NAMES, entityClass) || []; for (const fieldName of arrayFieldNames) { - const meta: ArrayFieldMetadata = Reflect.getMetadata('typeorm:array-field', entityClass.prototype, fieldName); + const meta: ArrayFieldMetadata = Reflect.getMetadata(TYPEORM_ARRAY_FIELD, entityClass.prototype, fieldName); if (!meta || !meta.relationPropertyName) continue; const relationProp = meta.relationPropertyName as string; @@ -195,13 +201,13 @@ export class ArrayFieldManager { } // Keep track of array field names for this entity class - const existingArrayFields = Reflect.getMetadata('array:field:names', target.constructor) || []; + const existingArrayFields = Reflect.getMetadata(ARRAY_FIELD_NAMES, target.constructor) || []; if (!existingArrayFields.includes(propertyKey)) { - Reflect.defineMetadata('array:field:names', [...existingArrayFields, propertyKey], target.constructor); + Reflect.defineMetadata(ARRAY_FIELD_NAMES, [...existingArrayFields, propertyKey], target.constructor); } // Store metadata about this array field - const existingMeta: ArrayFieldMetadata | undefined = Reflect.getMetadata('typeorm:array-field', target, propertyKey); + const existingMeta: ArrayFieldMetadata | undefined = Reflect.getMetadata(TYPEORM_ARRAY_FIELD, target, propertyKey); const metadata: ArrayFieldMetadata = { elementEntityKey: arrayEntityKey, elementEntityClass: ArrayElementEntity as Function, @@ -211,9 +217,9 @@ export class ArrayFieldManager { }; // Overwrite / define fresh metadata ensuring elementEntityClass points to the globally cached class if (!existingMeta || existingMeta.elementEntityClass !== ArrayElementEntity) { - Reflect.defineMetadata('typeorm:array-field', metadata, target, propertyKey); + Reflect.defineMetadata(TYPEORM_ARRAY_FIELD, metadata, target, propertyKey); } - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_FIELD_CONFIGURED, true, target, propertyKey); // Invalidate cached array field names for this class so future calls recompute once this.arrayFieldNamesCache.delete(target.constructor); diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index b91a0c2..435a586 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -19,6 +19,14 @@ import { DatabaseConfigBuilder } from './DatabaseConfigBuilder'; import { ArrayFieldManager } from './ArrayFieldManager'; // Import to ensure field type registrations happen import '../../model/types/TypeRegistry'; +import { + DATASOURCE_TYPE, + MODEL_DATASOURCE, + DATASOURCE_FIELD_CONFIGURED, + TYPEORM_ENTITY, + TYPEORM_TABLE, + TYPEORM_COLUMN +} from '../../model/metadata/MetadataKeys'; /** * Configuration options for TypeORM SQL data source. @@ -213,16 +221,16 @@ export class TypeORMSqlDataSource extends DataSource { Entity(tableName)(modelClass as any); // Store metadata for testing purposes - Reflect.defineMetadata('typeorm:entity', true, modelClass); + Reflect.defineMetadata(TYPEORM_ENTITY, true, modelClass); if (options?.tableName) { - Reflect.defineMetadata('typeorm:table', options.tableName, modelClass); + Reflect.defineMetadata(TYPEORM_TABLE, options.tableName, modelClass); } // Store that this model is configured for TypeORM - Reflect.defineMetadata('datasource:type', 'typeorm-sql', modelClass); + Reflect.defineMetadata(DATASOURCE_TYPE, 'typeorm-sql', modelClass); // Store the dataSource instance in the model metadata for later access - Reflect.defineMetadata('model:dataSource', this, modelClass); + Reflect.defineMetadata(MODEL_DATASOURCE, this, modelClass); } /** @@ -258,10 +266,10 @@ export class TypeORMSqlDataSource extends DataSource { Column(typeMapping)(target, propertyKey); // Store TypeORM column metadata for testing purposes - Reflect.defineMetadata('typeorm:column', typeMapping, target, propertyKey); + Reflect.defineMetadata(TYPEORM_COLUMN, typeMapping, target, propertyKey); // Store that this field is configured for TypeORM - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_FIELD_CONFIGURED, true, target, propertyKey); } /** diff --git a/src/model/BaseModel.ts b/src/model/BaseModel.ts index 489f918..f7edf64 100644 --- a/src/model/BaseModel.ts +++ b/src/model/BaseModel.ts @@ -1,6 +1,7 @@ import { ValidationError, validate } from "class-validator"; import { instanceToPlain, plainToInstance, Transform } from "class-transformer"; import { ValidationIssue } from "./types/SharedTypes"; +import { FIELD_VALIDATION, FIELD_CALCULATION } from './metadata/MetadataKeys'; /** * Abstract base class for all model classes in the framework. @@ -88,7 +89,7 @@ export abstract class BaseModel { if (customConstraint) { // Get the custom validation function to extract error codes const customValidationFn = Reflect.getMetadata( - "field:validation", + FIELD_VALIDATION, this, error.property ); @@ -215,7 +216,7 @@ export abstract class BaseModel { public async calculate(maxIterations: number = 10): Promise { const calculatedFields = Object.getOwnPropertyNames( Object.getPrototypeOf(this) - ).filter((key) => Reflect.hasMetadata("field:calculation", this, key)); + ).filter((key) => Reflect.hasMetadata(FIELD_CALCULATION, this, key)); if (calculatedFields.length === 0) { return; @@ -228,7 +229,7 @@ export abstract class BaseModel { let hasChanged = false; for (const key of calculatedFields) { const originalGetter = Reflect.getMetadata( - "field:calculation", + FIELD_CALCULATION, this, key ); diff --git a/src/validators/CustomValidationConstraint.ts b/src/validators/CustomValidationConstraint.ts index 8150ccf..ee5b6d7 100644 --- a/src/validators/CustomValidationConstraint.ts +++ b/src/validators/CustomValidationConstraint.ts @@ -1,4 +1,5 @@ import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator'; +import { FIELD_VALIDATION } from '../model/metadata/MetadataKeys'; /** * Creates a custom validation decorator that integrates with class-validator @@ -14,7 +15,7 @@ export function CustomValidate(validationOptions?: ValidationOptions) { validator: { validate(value: unknown, args: ValidationArguments) { const customValidationFn = Reflect.getMetadata( - "field:validation", + FIELD_VALIDATION, args.object, args.property ); @@ -27,7 +28,7 @@ export function CustomValidate(validationOptions?: ValidationOptions) { }, defaultMessage(args: ValidationArguments) { const customValidationFn = Reflect.getMetadata( - "field:validation", + FIELD_VALIDATION, args.object, args.property ); From 44e839d9f46db0184dc00b009f57f304fcd2a0ed Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 10:12:19 -0300 Subject: [PATCH 166/254] Add financial-arithmetic-functions fork as dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 6888633..42f6847 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.14.2", "financial-number": "^4.0.4", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions", "typeorm": "^0.3.26" } } From 97dd9fd7fcdc21a8b605e24d73df458eec54ecff Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 11:27:57 -0300 Subject: [PATCH 167/254] Refactor metadata keys to use constants for design types and improve consistency across data models --- src/datasources/typeorm/ArrayFieldManager.ts | 7 +-- .../typeorm/DateTimeRangeFieldManager.ts | 21 +++++---- src/model/metadata/MetadataKeys.ts | 16 +++++++ src/model/types/date_time/DateTimeRange.ts | 43 ++----------------- src/model/types/number/Decimal.ts | 4 +- src/model/types/number/Integer.ts | 4 +- src/model/types/number/Money.ts | 4 +- src/model/types/number/Number.ts | 4 +- src/model/types/relationship/Relationship.ts | 6 +-- src/model/types/string/Email.ts | 6 +-- src/model/types/string/HTML.ts | 6 +-- src/model/types/string/Text.ts | 6 +-- src/model/types/utils.ts | 9 ++-- test/FieldDecorator.test.ts | 3 +- .../MultiDatabaseOperations.test.ts | 3 +- .../TypeORMRepositoryMethods.test.ts | 3 +- test/types_tests/ArrayPersistence.test.ts | 3 +- .../ComplexTypesPersistence.test.ts | 3 +- .../DateTimeRangeArrayPersistence.test.ts | 3 +- 19 files changed, 73 insertions(+), 81 deletions(-) diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/src/datasources/typeorm/ArrayFieldManager.ts index 4d7d1e4..04d51f9 100644 --- a/src/datasources/typeorm/ArrayFieldManager.ts +++ b/src/datasources/typeorm/ArrayFieldManager.ts @@ -4,7 +4,8 @@ import { ARRAY_FIELD_NAMES, DATASOURCE_FIELD_CONFIGURED, TYPEORM_ARRAY_RELATION_CONFIGURED, - TYPEORM_ARRAY_FIELD + TYPEORM_ARRAY_FIELD, + DESIGN_TYPE } from '../../model/metadata/MetadataKeys'; /** @@ -99,8 +100,8 @@ export class ArrayFieldManager { // Entity metadata for BlogPost#__elements was not found // We explicitly define the design type as Array which matches what a // OneToMany relation expects. - if (!Reflect.getMetadata('design:type', target, relationPropertyName)) { - Reflect.defineMetadata('design:type', Array, target, relationPropertyName); + if (!Reflect.getMetadata(DESIGN_TYPE, target, relationPropertyName)) { + Reflect.defineMetadata(DESIGN_TYPE, Array, target, relationPropertyName); } OneToMany(() => ArrayElementEntity as any, (element: any) => element.parent, { diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/src/datasources/typeorm/DateTimeRangeFieldManager.ts index 5e62372..609e880 100644 --- a/src/datasources/typeorm/DateTimeRangeFieldManager.ts +++ b/src/datasources/typeorm/DateTimeRangeFieldManager.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import { Column, AfterLoad } from 'typeorm'; import { DateTimeRangeValue } from '../../model/types/date_time/DateTimeRange'; +import { DATETIME_RANGE_HIDDEN_COLUMNS, MODEL_FIELDS } from '../../model/metadata'; /** * Manages DateTimeRange field persistence using hidden columns approach. @@ -39,7 +40,7 @@ export class DateTimeRangeFieldManager { })(target, toColumnName); // Store metadata about which hidden columns belong to this DateTimeRange field - Reflect.defineMetadata('dateTimeRange:hiddenColumns', { + Reflect.defineMetadata(DATETIME_RANGE_HIDDEN_COLUMNS, { from: fromColumnName, to: toColumnName }, target, propertyKey); @@ -48,10 +49,11 @@ export class DateTimeRangeFieldManager { Reflect.defineMetadata('dateTimeRange:usesHiddenColumns', true, target, propertyKey); // Store this field name in the list of DateTimeRange fields for this entity - const existingFields = Reflect.getMetadata('dateTimeRange:fields', target) || []; + const { DATETIME_RANGE_FIELDS } = require('../../model/metadata/MetadataKeys'); + const existingFields = Reflect.getMetadata(DATETIME_RANGE_FIELDS, target) || []; if (!existingFields.includes(propertyKey)) { existingFields.push(propertyKey); - Reflect.defineMetadata('dateTimeRange:fields', existingFields, target); + Reflect.defineMetadata(DATETIME_RANGE_FIELDS, existingFields, target); } // Add single @AfterLoad hook to automatically reconstruct all DateTimeRange objects @@ -75,13 +77,13 @@ export class DateTimeRangeFieldManager { */ extractDateTimeRangeValues(entity: any): void { const constructor = entity.constructor; - const fields = Reflect.getMetadata('model:fields', constructor) || []; + const fields = Reflect.getMetadata(MODEL_FIELDS, constructor) || []; for (const fieldName of fields) { const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); if (fieldType === 'datetimerange') { - const hiddenColumns = Reflect.getMetadata('dateTimeRange:hiddenColumns', constructor.prototype, fieldName); + const hiddenColumns = Reflect.getMetadata(DATETIME_RANGE_HIDDEN_COLUMNS, constructor.prototype, fieldName); if (hiddenColumns) { const dateTimeRange = entity[fieldName] as DateTimeRangeValue | undefined; @@ -107,11 +109,12 @@ export class DateTimeRangeFieldManager { * @param entity - The entity being loaded */ reconstructDateTimeRangeValues(entity: any): void { - const constructor = entity.constructor; - const dateTimeRangeFields = Reflect.getMetadata('dateTimeRange:fields', constructor.prototype) || []; + const constructor = entity.constructor; + const { DATETIME_RANGE_FIELDS } = require('../../model/metadata/MetadataKeys'); + const dateTimeRangeFields = Reflect.getMetadata(DATETIME_RANGE_FIELDS, constructor.prototype) || []; for (const fieldName of dateTimeRangeFields) { - const hiddenColumns = Reflect.getMetadata('dateTimeRange:hiddenColumns', constructor.prototype, fieldName); + const hiddenColumns = Reflect.getMetadata(DATETIME_RANGE_HIDDEN_COLUMNS, constructor.prototype, fieldName); if (hiddenColumns) { const fromDate = entity[hiddenColumns.from]; @@ -145,7 +148,7 @@ export class DateTimeRangeFieldManager { * @returns Object with 'from' and 'to' column names, or null if not found */ getHiddenColumnNames(target: any, propertyKey: string): { from: string; to: string } | null { - return Reflect.getMetadata('dateTimeRange:hiddenColumns', target.prototype || target, propertyKey) || null; + return Reflect.getMetadata(DATETIME_RANGE_HIDDEN_COLUMNS, target.prototype || target, propertyKey) || null; } /** diff --git a/src/model/metadata/MetadataKeys.ts b/src/model/metadata/MetadataKeys.ts index a03d18e..ae86c47 100644 --- a/src/model/metadata/MetadataKeys.ts +++ b/src/model/metadata/MetadataKeys.ts @@ -73,6 +73,22 @@ export const DATASOURCE_TYPE = 'datasource:type'; /** Metadata key for storing array field names */ export const ARRAY_FIELD_NAMES = 'array:field:names'; +// ============================================================================= +// Reflection/Type metadata keys +// ============================================================================= + +/** Metadata key for design type (used by reflect-metadata, e.g., for TypeORM relations) */ +export const DESIGN_TYPE = 'design:type'; + +// ============================================================================= +// DateTimeRange-related metadata keys +// ============================================================================= + +/** Metadata key for storing DateTimeRange field names */ +export const DATETIME_RANGE_FIELDS = 'datetimerange:fields'; + +export const DATETIME_RANGE_HIDDEN_COLUMNS = 'datetimerange:hiddenColumns'; + // ============================================================================= // TypeORM-related metadata keys // ============================================================================= diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 54666a3..150c5a0 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -9,7 +9,7 @@ import { import { Type, Transform, TransformationType, Expose } from 'class-transformer'; import { dateToISO8601, dateFromJSON } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME_RANGE } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME_RANGE, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Options for the DateTimeRange decorator. @@ -97,7 +97,7 @@ type DateTimeRangeKey = T[K] extends DateTimeRang * Validates that a property is of DateTimeRange type at runtime. */ function validateDateTimeRangeValue(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); // Be more flexible with type checking since TypeScript may not preserve exact type info // We accept DateTimeRangeValue, Object, or undefined types if ( @@ -114,7 +114,7 @@ function validateDateTimeRangeValue(proto: Object, propertyKey: string): void { * Stores metadata for the datetime range field that can be consumed by other layers. */ function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: DateTimeRangeOptions): void { - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); if (designType === Array) { // Handle DateTimeRange array case @@ -162,41 +162,6 @@ function validateSingleRange(value: any, args: ValidationArguments): boolean { return true; } - -/** - * Helper function to validate a single DateTimeRange - */ -function validateSingleRange(value: any, args: ValidationArguments): boolean { - if (value == null) { - return true; // Allow null/undefined values in arrays - } - - if (!(value instanceof DateTimeRangeValue)) { - return false; - } - - const rangeOptions = args.constraints[0] as DateTimeRangeOptions | undefined; - - // Check if from is required (when openStart is false or undefined) - if (!rangeOptions?.from && !value.from) { - return false; - } - - // Check if to is required (when openEnd is false or undefined) - if (!rangeOptions?.to && !value.to) { - return false; - } - - // If both dates are present, validate that from is before to - if (value.from && value.to) { - if (value.from >= value.to) { - return false; - } - } - - return true; -} - /** * Custom DateTimeRange validator that validates range constraints */ @@ -271,7 +236,7 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { validateDateTimeRangeValue(proto, propName); storeDateTimeRangeMetadata(proto, propName, options); - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); if (designType === Array) { // Handle DateTimeRange array case diff --git a/src/model/types/number/Decimal.ts b/src/model/types/number/Decimal.ts index 8c0387b..950b0d5 100644 --- a/src/model/types/number/Decimal.ts +++ b/src/model/types/number/Decimal.ts @@ -3,7 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DECIMAL } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DECIMAL, DESIGN_TYPE } from '../../metadata/MetadataKeys'; import { createFinancialNumberTransformer } from '../../../datasources/typeorm/ValueTransformers'; /** @@ -49,7 +49,7 @@ function getRoundingStrategy(roundingType: DecimalOptions['roundingType']): Roun type DecimalKey = T[K] extends Decimal | undefined | null ? K : `Decimal: requires a property of type 'Decimal'`; function validateDecimalType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType && designType !== Object && designType.name !== 'Decimal' && designType.name !== 'Object') { throw new Error(`@Decimal can only be applied to properties of type 'Decimal', but it was used on '${propertyKey}' which is of type '${designType?.name}'.`); } diff --git a/src/model/types/number/Integer.ts b/src/model/types/number/Integer.ts index a9a4ec2..13dc39a 100644 --- a/src/model/types/number/Integer.ts +++ b/src/model/types/number/Integer.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_INTEGER } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_INTEGER, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Options for the Integer decorator. @@ -29,7 +29,7 @@ type IntegerKey = T[K] extends number * Validates that a property is of number type at runtime. */ function validateIntegerType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== Number && designType?.name !== 'Number') { throw new Error(`@Integer can only be applied to 'number' properties, but it was used on '${propertyKey}'.`); } diff --git a/src/model/types/number/Money.ts b/src/model/types/number/Money.ts index 3c3e32e..4e7f3de 100644 --- a/src/model/types/number/Money.ts +++ b/src/model/types/number/Money.ts @@ -3,7 +3,7 @@ import { registerDecorator } from 'class-validator'; import number, { FinancialNumber, RoundingStrategy } from 'financial-number'; import { Expose, Transform } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_MONEY } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_MONEY, DESIGN_TYPE } from '../../metadata/MetadataKeys'; import { createFinancialNumberTransformer } from '../../../datasources/typeorm/ValueTransformers'; /** @@ -47,7 +47,7 @@ function getRoundingStrategy(roundingType: MoneyOptions['roundingType']): Roundi type MoneyKey = T[K] extends Money | undefined | null ? K : `Money: requires a property of type 'Money'`; function validateMoneyType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType && designType !== Object && designType.name !== 'Money' && designType.name !== 'Object' && designType.name !== 'FinancialNumber') { throw new Error(`@Money can only be applied to properties of type 'Money', but it was used on '${propertyKey}' which is of type '${designType?.name}'.`); } diff --git a/src/model/types/number/Number.ts b/src/model/types/number/Number.ts index 30493ab..dd123e3 100644 --- a/src/model/types/number/Number.ts +++ b/src/model/types/number/Number.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { registerDecorator } from 'class-validator'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_NUMBER } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_NUMBER, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Options for the Number decorator. @@ -33,7 +33,7 @@ type NumberKey = T[K] extends number * @throws {Error} When the property is not of type 'number'. */ function validateNumberType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== Number && designType?.name !== 'Number') { throw new Error(`@Number can only be applied to 'number' properties, but it was used on '${propertyKey}'.`); } diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 02442f6..0a574e9 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -2,7 +2,7 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; import { ValidateNested } from 'class-validator'; import { BaseModel } from '../../index'; -import { FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, FIELD_RELATIONSHIP_TYPE } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, FIELD_RELATIONSHIP_TYPE, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Relationship type options. @@ -26,7 +26,7 @@ export interface RelationshipOptions { * Validates that a property is a BaseModel or array of BaseModel at runtime. */ function validateRelationshipType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); // Check if it's an Array (for arrays of models) if (designType === Array) { @@ -111,7 +111,7 @@ export function Relationship(options: RelationshipOptions) { Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, proto, propName); Reflect.defineMetadata(FIELD_RELATIONSHIP_TYPE, options.type, proto, propName); - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); // Apply ValidateNested for nested validation of BaseModel instances ValidateNested()(target as any, propName); diff --git a/src/model/types/string/Email.ts b/src/model/types/string/Email.ts index 46719b8..1b02c62 100644 --- a/src/model/types/string/Email.ts +++ b/src/model/types/string/Email.ts @@ -3,7 +3,7 @@ import { IsEmail, IsArray } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_EMAIL, FIELD_TYPE_ARRAY_EMAIL } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_EMAIL, FIELD_TYPE_ARRAY_EMAIL, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Email type decorator. @@ -21,7 +21,7 @@ type EmailKey = T[K] extends string | string[] * Validates that a property is of string or string array type at runtime. */ function validateEmailType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== String && designType !== Array) { throw new Error(`@Email can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); } @@ -67,7 +67,7 @@ export function Email() { validateEmailType(proto, propName); - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); if (designType === Array) { // Handle email array case diff --git a/src/model/types/string/HTML.ts b/src/model/types/string/HTML.ts index 9d55070..aaf73f8 100644 --- a/src/model/types/string/HTML.ts +++ b/src/model/types/string/HTML.ts @@ -4,7 +4,7 @@ import { Text } from './Text'; import { IsArray, IsString } from 'class-validator'; import { Transform, TransformationType } from 'class-transformer'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_HTML, FIELD_TYPE_ARRAY_HTML } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_HTML, FIELD_TYPE_ARRAY_HTML, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * HTML type decorator. @@ -21,7 +21,7 @@ type HtmlKey = T[K] extends string | string[] * Validates that a property is of string or string array type at runtime. */ function validateHtmlType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== String && designType !== Array) { throw new Error(`@HTML can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); } @@ -68,7 +68,7 @@ export function HTML() { validateHtmlType(proto, propName); - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); if (designType === Array) { // Handle string array case diff --git a/src/model/types/string/Text.ts b/src/model/types/string/Text.ts index ee0fdb2..abd069a 100644 --- a/src/model/types/string/Text.ts +++ b/src/model/types/string/Text.ts @@ -11,7 +11,7 @@ import { import { Transform, TransformationType } from 'class-transformer'; import { validateStringType } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_TEXT, FIELD_TYPE_ARRAY_TEXT } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_TEXT, FIELD_TYPE_ARRAY_TEXT, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** * Options for the Text decorator. @@ -43,7 +43,7 @@ type TextKey = T[K] extends string | string[] * Validates that a property is of string or string array type at runtime. */ function validateTextType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== String && designType !== Array) { throw new Error(`@Text can only be applied to 'string' or 'string[]' properties: ${propertyKey}`); } @@ -114,7 +114,7 @@ export function Text(options?: TextOptions) { validateTextType(proto, propName); - const designType = Reflect.getMetadata('design:type', proto, propName); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); if (designType === Array) { // Handle string array case diff --git a/src/model/types/utils.ts b/src/model/types/utils.ts index 8a33e98..20ab66d 100644 --- a/src/model/types/utils.ts +++ b/src/model/types/utils.ts @@ -1,10 +1,11 @@ import 'reflect-metadata'; +import { DESIGN_TYPE } from '../metadata'; /** * Validates that a property is of string type at runtime. */ export function validateStringType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== String) { throw new Error(`Decorator can only be applied to 'string' properties: ${propertyKey}`); } @@ -14,7 +15,7 @@ export function validateStringType(proto: Object, propertyKey: string): void { * Validates that a property is of Date type at runtime. */ export function validateDateType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== Date) { throw new Error(`@DateTime can only be applied to 'Date' properties: ${propertyKey}`); } @@ -24,7 +25,7 @@ export function validateDateType(proto: Object, propertyKey: string): void { * Validates that a property is of boolean type at runtime. */ export function validateBooleanType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); if (designType !== Boolean) { throw new Error(`@Boolean can only be applied to 'boolean' properties: ${propertyKey}`); } @@ -36,7 +37,7 @@ export function validateBooleanType(proto: Object, propertyKey: string): void { * has been initialized with an enum value. */ export function validateEnumType(proto: Object, propertyKey: string): void { - const designType = Reflect.getMetadata('design:type', proto, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propertyKey); // For enums, TypeScript emits Object as the design type // We can't easily validate the enum type at runtime since enums are compiled to objects // The validation will happen during actual usage when the enum values are checked diff --git a/test/FieldDecorator.test.ts b/test/FieldDecorator.test.ts index eb1bae5..57d9a18 100644 --- a/test/FieldDecorator.test.ts +++ b/test/FieldDecorator.test.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import { BaseModel, Field, Model, Text } from '../index'; +import { MODEL_FIELDS } from '../src/model/metadata'; @Model({ docs: "Test model for Field decorator without parameters" @@ -86,7 +87,7 @@ describe('Field Decorator Without Parameters', () => { describe('Metadata Tests', () => { it('should register fields with @Field() in metadata', () => { - const fields = Reflect.getMetadata('model:fields', TestFieldModel) || []; + const fields = Reflect.getMetadata(MODEL_FIELDS, TestFieldModel) || []; expect(fields).toContain('name'); expect(fields).toContain('description'); expect(fields).toContain('requiredField'); diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/test/datasources/MultiDatabaseOperations.test.ts index aa7e31b..b123ed4 100644 --- a/test/datasources/MultiDatabaseOperations.test.ts +++ b/test/datasources/MultiDatabaseOperations.test.ts @@ -1,4 +1,5 @@ import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../index'; +import { MODEL_FIELDS } from '../../src/model/metadata'; import { BlogPost } from '../model/BlogPost'; import * as fs from 'fs'; @@ -119,7 +120,7 @@ function configureModelWithDataSource(modelClass: any, dataSource: TypeORMSqlDat dataSource.configureModel(modelClass, {}); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index 720df51..5b8a01b 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -2,6 +2,7 @@ import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../index'; +import { MODEL_FIELDS } from '../../src/model/metadata'; import { BlogPost } from '../model/BlogPost'; import { FindOptionsWhere, FindManyOptions, FindOneOptions } from 'typeorm'; @@ -26,7 +27,7 @@ describe('TypeORM Repository-Style Methods', () => { dataSource.configureModel(BlogPost); // Configure all fields with the data source (needed for array field handling) - const fieldNames = Reflect.getMetadata('model:fields', BlogPost) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, BlogPost) || []; fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts index 8f7e991..7d927ff 100644 --- a/test/types_tests/ArrayPersistence.test.ts +++ b/test/types_tests/ArrayPersistence.test.ts @@ -1,5 +1,6 @@ import { BlogPost } from "../model/BlogPost"; import { TypeORMSqlDataSource } from "../../src/datasources/typeorm/TypeORMSqlDataSource"; +import { MODEL_FIELDS } from "../../src/model/metadata"; describe("Array Persistence in SQL Databases", () => { let dataSource: TypeORMSqlDataSource; @@ -21,7 +22,7 @@ describe("Array Persistence in SQL Databases", () => { dataSource.configureModel(BlogPost, modelOptions); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', BlogPost) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, BlogPost) || []; fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 81a9b16..fab077b 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -14,6 +14,7 @@ import { } from "../../index"; import { validateSync } from 'class-validator'; import number from 'financial-number'; +import { MODEL_FIELDS } from "../../src/model/metadata"; // Test model for complex type persistence @Model({ @@ -82,7 +83,7 @@ describe("Complex Types Persistence in SQL Databases", () => { dataSource.configureModel(ComplexTypesModel, modelOptions); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', ComplexTypesModel) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, ComplexTypesModel) || []; fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', ComplexTypesModel.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', ComplexTypesModel.prototype, fieldName); diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index 76e3932..9e464bb 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -7,6 +7,7 @@ import { DateTimeRangeValue, Text } from "../../index"; +import { MODEL_FIELDS } from "../../src/model/metadata"; // Test model for DateTimeRange array persistence @Model({ @@ -54,7 +55,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { dataSource.configureModel(DateTimeRangeArrayPersistenceModel, modelOptions); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', DateTimeRangeArrayPersistenceModel) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, DateTimeRangeArrayPersistenceModel) || []; fieldNames.forEach((fieldName: string) => { const fieldType = Reflect.getMetadata('field:type', DateTimeRangeArrayPersistenceModel.prototype, fieldName); const fieldTypeOptions = Reflect.getMetadata('field:type:options', DateTimeRangeArrayPersistenceModel.prototype, fieldName); From 1cc84b48c6eba839dd8157e0568efc2d7987a44c Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 11:46:06 -0300 Subject: [PATCH 168/254] Refactor metadata keys to use constants for improved consistency across DateTimeRange and TypeORM implementations --- .../typeorm/DateTimeRangeFieldManager.ts | 6 ++--- .../typeorm/TypeORMSqlDataSource.ts | 2 +- src/model/metadata/MetadataKeys.ts | 6 +++++ src/model/types/date_time/DateTimeRange.ts | 4 +-- test/datasources/DataSource.test.ts | 27 ++++++++++--------- .../MultiDatabaseOperations.test.ts | 14 +++++----- .../TypeORMRepositoryMethods.test.ts | 8 +++--- test/types_tests/ArrayPersistence.test.ts | 10 +++---- test/types_tests/Boolean.test.ts | 3 ++- .../ComplexTypesPersistence.test.ts | 10 +++---- .../DateTimeRangeArrayPersistence.test.ts | 10 +++---- test/types_tests/Relationship.test.ts | 11 ++++---- 12 files changed, 60 insertions(+), 51 deletions(-) diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/src/datasources/typeorm/DateTimeRangeFieldManager.ts index 609e880..aefe663 100644 --- a/src/datasources/typeorm/DateTimeRangeFieldManager.ts +++ b/src/datasources/typeorm/DateTimeRangeFieldManager.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { Column, AfterLoad } from 'typeorm'; import { DateTimeRangeValue } from '../../model/types/date_time/DateTimeRange'; -import { DATETIME_RANGE_HIDDEN_COLUMNS, MODEL_FIELDS } from '../../model/metadata'; +import { DATETIME_RANGE_HIDDEN_COLUMNS, DATETIME_RANGE_USES_HIDDEN_COLUMNS, FIELD_TYPE, MODEL_FIELDS } from '../../model/metadata'; /** * Manages DateTimeRange field persistence using hidden columns approach. @@ -46,7 +46,7 @@ export class DateTimeRangeFieldManager { }, target, propertyKey); // Mark this field as using hidden columns approach - Reflect.defineMetadata('dateTimeRange:usesHiddenColumns', true, target, propertyKey); + Reflect.defineMetadata(DATETIME_RANGE_USES_HIDDEN_COLUMNS, true, target, propertyKey); // Store this field name in the list of DateTimeRange fields for this entity const { DATETIME_RANGE_FIELDS } = require('../../model/metadata/MetadataKeys'); @@ -80,7 +80,7 @@ export class DateTimeRangeFieldManager { const fields = Reflect.getMetadata(MODEL_FIELDS, constructor) || []; for (const fieldName of fields) { - const fieldType = Reflect.getMetadata('field:type', constructor.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, constructor.prototype, fieldName); if (fieldType === 'datetimerange') { const hiddenColumns = Reflect.getMetadata(DATETIME_RANGE_HIDDEN_COLUMNS, constructor.prototype, fieldName); diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 8c9d17b..1969f2a 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -266,7 +266,7 @@ export class TypeORMSqlDataSource extends DataSource { if (fieldType === 'datetimerange') { this.dateTimeRangeFieldManager.configureFieldColumns(target, propertyKey, fieldOptions); // Store that this field is configured for TypeORM - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_FIELD_CONFIGURED, true, target, propertyKey); return; } diff --git a/src/model/metadata/MetadataKeys.ts b/src/model/metadata/MetadataKeys.ts index ae86c47..fbe8a0c 100644 --- a/src/model/metadata/MetadataKeys.ts +++ b/src/model/metadata/MetadataKeys.ts @@ -87,8 +87,12 @@ export const DESIGN_TYPE = 'design:type'; /** Metadata key for storing DateTimeRange field names */ export const DATETIME_RANGE_FIELDS = 'datetimerange:fields'; +/** Metadata key for storing hidden column names for DateTimeRange fields */ export const DATETIME_RANGE_HIDDEN_COLUMNS = 'datetimerange:hiddenColumns'; +/** Metadata key for marking DateTimeRange fields as using hidden columns */ +export const DATETIME_RANGE_USES_HIDDEN_COLUMNS = 'datetimerange:usesHiddenColumns'; + // ============================================================================= // TypeORM-related metadata keys // ============================================================================= @@ -151,6 +155,8 @@ export const FIELD_TYPE_ARRAY_EMAIL = 'array:email'; /** Field type constant for array html fields */ export const FIELD_TYPE_ARRAY_HTML = 'array:html'; +export const FIELD_TYPE_ARRAY_DATETIME_RANGE = 'array:datetimerange'; + /** Field type constant for html fields */ export const FIELD_TYPE_HTML = 'html'; diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 150c5a0..95aec82 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -9,7 +9,7 @@ import { import { Type, Transform, TransformationType, Expose } from 'class-transformer'; import { dateToISO8601, dateFromJSON } from '../utils'; import { FieldTypeConfig, FieldTypeRegistry } from '../FieldTypeConfig'; -import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME_RANGE, DESIGN_TYPE } from '../../metadata/MetadataKeys'; +import { FIELD_TYPE, FIELD_TYPE_OPTIONS, FIELD_TYPE_DATETIME_RANGE, DESIGN_TYPE, FIELD_TYPE_ARRAY_DATETIME_RANGE } from '../../metadata/MetadataKeys'; /** * Options for the DateTimeRange decorator. @@ -118,7 +118,7 @@ function storeDateTimeRangeMetadata(proto: Object, propName: string, options?: D if (designType === Array) { // Handle DateTimeRange array case - Reflect.defineMetadata('field:type', 'array:datetimerange', proto, propName); + Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_ARRAY_DATETIME_RANGE, proto, propName); } else { // Handle single DateTimeRange case Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_DATETIME_RANGE, proto, propName); diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts index 838c780..e02ded0 100644 --- a/test/datasources/DataSource.test.ts +++ b/test/datasources/DataSource.test.ts @@ -8,6 +8,7 @@ import { Integer, TypeORMSqlDataSource } from '../../index'; +import { DATASOURCE_TYPE, MODEL_DATASOURCE, TYPEORM_COLUMN, TYPEORM_ENTITY } from '../../src/model/metadata'; describe('Data Source Integration', () => { @@ -100,9 +101,9 @@ describe('Data Source Integration', () => { } // Check that the model has been configured with TypeORM metadata - const isEntity = Reflect.getMetadata('typeorm:entity', User); - const dataSourceType = Reflect.getMetadata('datasource:type', User); - const storedDataSource = Reflect.getMetadata('model:dataSource', User); + const isEntity = Reflect.getMetadata(TYPEORM_ENTITY, User); + const dataSourceType = Reflect.getMetadata(DATASOURCE_TYPE, User); + const storedDataSource = Reflect.getMetadata(MODEL_DATASOURCE, User); expect(isEntity).toBe(true); expect(dataSourceType).toBe('typeorm-sql'); @@ -136,9 +137,9 @@ describe('Data Source Integration', () => { } // Check field configurations - const nameColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'name'); - const ageColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'age'); - const createdAtColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'createdAt'); + const nameColumn = Reflect.getMetadata(TYPEORM_COLUMN, User.prototype, 'name'); + const ageColumn = Reflect.getMetadata(TYPEORM_COLUMN, User.prototype, 'age'); + const createdAtColumn = Reflect.getMetadata(TYPEORM_COLUMN, User.prototype, 'createdAt'); expect(nameColumn).toEqual({ type: 'varchar', @@ -166,8 +167,8 @@ describe('Data Source Integration', () => { } // Check that no TypeORM metadata was added - const isEntity = Reflect.getMetadata('typeorm:entity', User); - const nameColumn = Reflect.getMetadata('typeorm:column', User.prototype, 'name'); + const isEntity = Reflect.getMetadata(TYPEORM_ENTITY, User); + const nameColumn = Reflect.getMetadata(TYPEORM_COLUMN, User.prototype, 'name'); expect(isEntity).toBeUndefined(); expect(nameColumn).toBeUndefined(); @@ -205,10 +206,10 @@ describe('Data Source Integration', () => { timestamp!: Date; } - const shortTextColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'shortText'); - const longTextColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'longText'); - const countColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'count'); - const timestampColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'timestamp'); + const shortTextColumn = Reflect.getMetadata(TYPEORM_COLUMN, TestEntity.prototype, 'shortText'); + const longTextColumn = Reflect.getMetadata(TYPEORM_COLUMN, TestEntity.prototype, 'longText'); + const countColumn = Reflect.getMetadata(TYPEORM_COLUMN, TestEntity.prototype, 'count'); + const timestampColumn = Reflect.getMetadata(TYPEORM_COLUMN, TestEntity.prototype, 'timestamp'); expect(shortTextColumn.type).toBe('varchar'); expect(shortTextColumn.length).toBe(100); @@ -239,7 +240,7 @@ describe('Data Source Integration', () => { } // The field should not have TypeORM column metadata since there's no type info - const plainFieldColumn = Reflect.getMetadata('typeorm:column', TestEntity.prototype, 'plainField'); + const plainFieldColumn = Reflect.getMetadata(TYPEORM_COLUMN, TestEntity.prototype, 'plainField'); expect(plainFieldColumn).toBeUndefined(); }); }); diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/test/datasources/MultiDatabaseOperations.test.ts index b123ed4..7179084 100644 --- a/test/datasources/MultiDatabaseOperations.test.ts +++ b/test/datasources/MultiDatabaseOperations.test.ts @@ -1,5 +1,5 @@ import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../index'; -import { MODEL_FIELDS } from '../../src/model/metadata'; +import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_DATASOURCE, MODEL_FIELDS, TYPEORM_ENTITY } from '../../src/model/metadata'; import { BlogPost } from '../model/BlogPost'; import * as fs from 'fs'; @@ -114,7 +114,7 @@ MySQL Setup Instructions: */ function configureModelWithDataSource(modelClass: any, dataSource: TypeORMSqlDataSource): void { // Set the model metadata for the data source - Reflect.defineMetadata("model:dataSource", dataSource, modelClass); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, modelClass); // Configure the model with the data source dataSource.configureModel(modelClass, {}); @@ -122,9 +122,9 @@ function configureModelWithDataSource(modelClass: any, dataSource: TypeORMSqlDat // Configure all fields with the data source const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, modelClass.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -158,10 +158,10 @@ class DatabaseTestOperations { static async testModelConfiguration(dataSource: TypeORMSqlDataSource): Promise { // Verify the model is configured (it should already be configured in beforeAll) - const metadata = Reflect.getMetadata("model:dataSource", BlogPost); + const metadata = Reflect.getMetadata(MODEL_DATASOURCE, BlogPost); expect(metadata).toBe(dataSource); - const entityMetadata = Reflect.getMetadata('typeorm:entity', BlogPost); + const entityMetadata = Reflect.getMetadata(TYPEORM_ENTITY, BlogPost); expect(entityMetadata).toBe(true); } diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index 5b8a01b..34d9eca 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -2,7 +2,7 @@ import { TypeORMSqlDataSource, TypeORMSqlDataSourceOptions } from '../../index'; -import { MODEL_FIELDS } from '../../src/model/metadata'; +import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_FIELDS } from '../../src/model/metadata'; import { BlogPost } from '../model/BlogPost'; import { FindOptionsWhere, FindManyOptions, FindOneOptions } from 'typeorm'; @@ -29,9 +29,9 @@ describe('TypeORM Repository-Style Methods', () => { // Configure all fields with the data source (needed for array field handling) const fieldNames = Reflect.getMetadata(MODEL_FIELDS, BlogPost) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', BlogPost.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, BlogPost.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, BlogPost.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, BlogPost.prototype, fieldName); if (fieldType) { const allFieldOptions = { diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts index 7d927ff..410865f 100644 --- a/test/types_tests/ArrayPersistence.test.ts +++ b/test/types_tests/ArrayPersistence.test.ts @@ -1,6 +1,6 @@ import { BlogPost } from "../model/BlogPost"; import { TypeORMSqlDataSource } from "../../src/datasources/typeorm/TypeORMSqlDataSource"; -import { MODEL_FIELDS } from "../../src/model/metadata"; +import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_DATASOURCE, MODEL_FIELDS } from "../../src/model/metadata"; describe("Array Persistence in SQL Databases", () => { let dataSource: TypeORMSqlDataSource; @@ -18,15 +18,15 @@ describe("Array Persistence in SQL Databases", () => { // Configure the BlogPost model with the data source const modelOptions = { dataSource }; - Reflect.defineMetadata("model:dataSource", dataSource, BlogPost); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, BlogPost); dataSource.configureModel(BlogPost, modelOptions); // Configure all fields with the data source const fieldNames = Reflect.getMetadata(MODEL_FIELDS, BlogPost) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', BlogPost.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', BlogPost.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', BlogPost.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, BlogPost.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, BlogPost.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, BlogPost.prototype, fieldName); if (fieldType) { const allFieldOptions = { diff --git a/test/types_tests/Boolean.test.ts b/test/types_tests/Boolean.test.ts index c040326..8feee9e 100644 --- a/test/types_tests/Boolean.test.ts +++ b/test/types_tests/Boolean.test.ts @@ -1,3 +1,4 @@ +import { FIELD_TYPE } from "../../src/model/metadata"; import { Person } from "../model/Person"; describe("Boolean Field Type", () => { @@ -106,7 +107,7 @@ describe("Boolean Field Type", () => { it("should store correct metadata for Boolean field", () => { const person = new Person(); - const fieldType = Reflect.getMetadata('field:type', person, 'isActive'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, person, 'isActive'); expect(fieldType).toBe('boolean'); }); }); diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index fab077b..92a636e 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -14,7 +14,7 @@ import { } from "../../index"; import { validateSync } from 'class-validator'; import number from 'financial-number'; -import { MODEL_FIELDS } from "../../src/model/metadata"; +import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_DATASOURCE, MODEL_FIELDS } from "../../src/model/metadata"; // Test model for complex type persistence @Model({ @@ -79,15 +79,15 @@ describe("Complex Types Persistence in SQL Databases", () => { // Configure the ComplexTypesModel with the data source const modelOptions = { dataSource }; - Reflect.defineMetadata("model:dataSource", dataSource, ComplexTypesModel); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, ComplexTypesModel); dataSource.configureModel(ComplexTypesModel, modelOptions); // Configure all fields with the data source const fieldNames = Reflect.getMetadata(MODEL_FIELDS, ComplexTypesModel) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', ComplexTypesModel.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', ComplexTypesModel.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', ComplexTypesModel.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, ComplexTypesModel.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, ComplexTypesModel.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, ComplexTypesModel.prototype, fieldName); if (fieldType) { dataSource.configureField( diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index 9e464bb..ef13448 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -7,7 +7,7 @@ import { DateTimeRangeValue, Text } from "../../index"; -import { MODEL_FIELDS } from "../../src/model/metadata"; +import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_DATASOURCE, MODEL_FIELDS } from "../../src/model/metadata"; // Test model for DateTimeRange array persistence @Model({ @@ -51,15 +51,15 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { // Configure the DateTimeRangeArrayPersistenceModel with the data source const modelOptions = { dataSource }; - Reflect.defineMetadata("model:dataSource", dataSource, DateTimeRangeArrayPersistenceModel); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, DateTimeRangeArrayPersistenceModel); dataSource.configureModel(DateTimeRangeArrayPersistenceModel, modelOptions); // Configure all fields with the data source const fieldNames = Reflect.getMetadata(MODEL_FIELDS, DateTimeRangeArrayPersistenceModel) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', DateTimeRangeArrayPersistenceModel.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', DateTimeRangeArrayPersistenceModel.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', DateTimeRangeArrayPersistenceModel.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, DateTimeRangeArrayPersistenceModel.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, DateTimeRangeArrayPersistenceModel.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, DateTimeRangeArrayPersistenceModel.prototype, fieldName); if (fieldType) { dataSource.configureField( diff --git a/test/types_tests/Relationship.test.ts b/test/types_tests/Relationship.test.ts index 2099d40..3c05303 100644 --- a/test/types_tests/Relationship.test.ts +++ b/test/types_tests/Relationship.test.ts @@ -1,4 +1,5 @@ import { BaseModel, Field, Model, DateTimeRangeValue, Relationship } from "../../index"; +import { FIELD_RELATIONSHIP_TYPE, FIELD_TYPE } from "../../src/model/metadata"; import { Customer } from '../model/Customer'; import { LineItem } from '../model/LineItem'; import { Order } from '../model/Order'; @@ -335,15 +336,15 @@ describe('Relationship Type', () => { }); it('should preserve metadata for relationships', () => { - const fieldType = Reflect.getMetadata('field:type', Order.prototype, 'customer'); - const relationshipType = Reflect.getMetadata('field:relationship:type', Order.prototype, 'customer'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Order.prototype, 'customer'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Order.prototype, 'customer'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('reference'); - const lineItemsFieldType = Reflect.getMetadata('field:type', Order.prototype, 'lineItems'); - const lineItemsRelType = Reflect.getMetadata('field:relationship:type', Order.prototype, 'lineItems'); - + const lineItemsFieldType = Reflect.getMetadata(FIELD_TYPE, Order.prototype, 'lineItems'); + const lineItemsRelType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Order.prototype, 'lineItems'); + expect(lineItemsFieldType).toBe('relationship'); expect(lineItemsRelType).toBe('composition'); }); From 40cf273c4d143ba9ac4a92deb333fdadb850a2f6 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Fri, 12 Sep 2025 11:53:49 -0300 Subject: [PATCH 169/254] fix quick infor preview for reference and composition --- src/quickInfoPanel/renderers/rendererRegistry.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quickInfoPanel/renderers/rendererRegistry.ts b/src/quickInfoPanel/renderers/rendererRegistry.ts index 25cd583..7e1917b 100644 --- a/src/quickInfoPanel/renderers/rendererRegistry.ts +++ b/src/quickInfoPanel/renderers/rendererRegistry.ts @@ -13,4 +13,6 @@ import { FieldRenderer } from './fieldRenderer'; export const rendererRegistry = new Map([ ['model', new ModelRenderer()], ['field', new FieldRenderer()], + ['referenceField', new FieldRenderer()], + ['compositionField', new FieldRenderer()], ]); \ No newline at end of file From 2a5bbcfeea272e5b8dce63d9ee715dc87bd1da7a Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 12:06:21 -0300 Subject: [PATCH 170/254] Add TODO comment to DateTimeRangeValueConfig for future database support --- src/model/types/date_time/DateTimeRange.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/model/types/date_time/DateTimeRange.ts b/src/model/types/date_time/DateTimeRange.ts index 95aec82..79cb4e5 100644 --- a/src/model/types/date_time/DateTimeRange.ts +++ b/src/model/types/date_time/DateTimeRange.ts @@ -268,6 +268,8 @@ export function DateTimeRange(options?: DateTimeRangeOptions) { * Uses JSON column type with custom transformer to store DateTimeRange objects. */ export const DateTimeRangeValueConfig: FieldTypeConfig = { + // TODO: Set type to 'datetimerange' when supported by more databases + // For now, we use 'text' with a transformer to store as JSON string getTypeORMColumnConfig(fieldOptions?: DateTimeRangeOptions, nullable: boolean = true): any { const { dateTimeRangeTransformer } = require('../../../datasources/typeorm/ValueTransformers'); return { From 754db5e678e6d5880a104e427ff52cc8c785bb11 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 12:16:49 -0300 Subject: [PATCH 171/254] Fix import path for BaseModel in Relationship.ts --- src/model/types/relationship/Relationship.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 1c22cca..5cc884a 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; import { ValidateNested } from 'class-validator'; -import { BaseModel } from '../../index'; +import { BaseModel } from '../../BaseModel'; import { FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, FIELD_RELATIONSHIP_TYPE, DESIGN_TYPE } from '../../metadata/MetadataKeys'; /** From 20dd79d5ba8d052da06a23e574e28b4c9ee3e73f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 12:34:06 -0300 Subject: [PATCH 172/254] Refactor metadata keys in TypeORM and relationship handling for improved consistency and clarity --- .../typeorm/RelationshipFieldManager.ts | 15 ++++---- .../typeorm/TypeORMSqlDataSource.ts | 29 +++++++++------ src/model/metadata/MetadataKeys.ts | 14 +++++++ src/model/types/relationship/Relationship.ts | 16 ++++++-- .../RelationshipPersistence.test.ts | 37 ++++++++++++------- test/types_tests/SimpleComposition.test.ts | 25 +++++++++---- .../SimpleRelationshipTest.test.ts | 20 +++++++--- 7 files changed, 106 insertions(+), 50 deletions(-) diff --git a/src/datasources/typeorm/RelationshipFieldManager.ts b/src/datasources/typeorm/RelationshipFieldManager.ts index d882d1c..109b9d5 100644 --- a/src/datasources/typeorm/RelationshipFieldManager.ts +++ b/src/datasources/typeorm/RelationshipFieldManager.ts @@ -6,6 +6,7 @@ import { JoinColumn, JoinTable } from 'typeorm'; +import { DESIGN_TYPE, TYPEORM_RELATIONSHIP, TYPEORM_RELATIONSHIP_TYPE, RELATIONSHIP_PARENT_ENTITY } from '../../model/metadata'; /** * Manager class for handling relationship field configuration for TypeORM persistence. @@ -33,7 +34,7 @@ export class RelationshipFieldManager { onDelete?: string, elementType?: () => any ): void { - const designType = Reflect.getMetadata('design:type', target, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, target, propertyKey); const isArray = designType === Array; switch (relationshipType) { @@ -58,8 +59,8 @@ export class RelationshipFieldManager { } // Store metadata for testing purposes - Reflect.defineMetadata('typeorm:relationship', true, target, propertyKey); - Reflect.defineMetadata('typeorm:relationship:type', relationshipType, target, propertyKey); + Reflect.defineMetadata(TYPEORM_RELATIONSHIP, true, target, propertyKey); + Reflect.defineMetadata(TYPEORM_RELATIONSHIP_TYPE, relationshipType, target, propertyKey); } /** @@ -109,7 +110,7 @@ export class RelationshipFieldManager { ManyToOne(elementType, undefined as any, relationOptions)(target, propertyKey); } else { // Use design type when elementType is not provided - const designType = Reflect.getMetadata('design:type', target, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, target, propertyKey); if (designType && typeof designType === 'function') { ManyToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); } else { @@ -152,7 +153,7 @@ export class RelationshipFieldManager { const ChildClass = elementType(); if (ChildClass && ChildClass.prototype) { // Store the parent entity constructor on the child's owner property - Reflect.defineMetadata('relationship:parent:entity', target.constructor, ChildClass.prototype, 'owner'); + Reflect.defineMetadata(RELATIONSHIP_PARENT_ENTITY, target.constructor, ChildClass.prototype, 'owner'); } } catch { // Non-fatal: if we can't resolve the element type now, parent mapping will fall back to manual handling @@ -172,7 +173,7 @@ export class RelationshipFieldManager { if (elementType) { OneToOne(elementType, undefined as any, relationOptions)(target, propertyKey); } else { - const designType = Reflect.getMetadata('design:type', target, propertyKey); + const designType = Reflect.getMetadata(DESIGN_TYPE, target, propertyKey); if (designType && typeof designType === 'function') { OneToOne(() => designType, undefined as any, relationOptions)(target, propertyKey); } else { @@ -233,7 +234,7 @@ export class RelationshipFieldManager { }; // Try to resolve the actual parent entity (set by configureComposition) - const parentEntity: Function | undefined = Reflect.getMetadata('relationship:parent:entity', target, propertyKey); + const parentEntity: Function | undefined = Reflect.getMetadata(RELATIONSHIP_PARENT_ENTITY, target, propertyKey); if (parentEntity) { ManyToOne(() => parentEntity as any, undefined as any, relationOptions)(target, propertyKey); diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 7fabce5..1f493b8 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -27,7 +27,14 @@ import { DATASOURCE_FIELD_CONFIGURED, TYPEORM_ENTITY, TYPEORM_TABLE, - TYPEORM_COLUMN + TYPEORM_COLUMN, + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_RELATIONSHIP_TYPE, + FIELD_RELATIONSHIP_LOAD, + FIELD_RELATIONSHIP_ON_DELETE, + DESIGN_TYPE } from '../../model/metadata/MetadataKeys'; /** @@ -264,9 +271,9 @@ export class TypeORMSqlDataSource extends DataSource { // Check if this is a relationship field if (fieldType === 'relationship') { - const relationshipType = Reflect.getMetadata('field:relationship:type', target, propertyKey); - const load = Reflect.getMetadata('field:relationship:load', target, propertyKey); - const onDelete = Reflect.getMetadata('field:relationship:onDelete', target, propertyKey); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, target, propertyKey); + const load = Reflect.getMetadata(FIELD_RELATIONSHIP_LOAD, target, propertyKey); + const onDelete = Reflect.getMetadata(FIELD_RELATIONSHIP_ON_DELETE, target, propertyKey); // Get elementType from field options if it exists (for array relationships) const elementType = fieldOptions?.elementType; @@ -281,7 +288,7 @@ export class TypeORMSqlDataSource extends DataSource { ); // Store that this field is configured for TypeORM - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_FIELD_CONFIGURED, true, target, propertyKey); return; } @@ -829,20 +836,20 @@ export class TypeORMSqlDataSource extends DataSource { console.log(`Loading eager relationships for ${entityClass.name}`); // Get relationship fields from our field metadata - const relationshipFields = Reflect.getMetadata('model:fields', entityClass) || []; + const relationshipFields = Reflect.getMetadata(MODEL_FIELDS, entityClass) || []; console.log(`All fields for ${entityClass.name}:`, relationshipFields); for (const fieldName of relationshipFields) { // Check if this field is a relationship - const fieldType = Reflect.getMetadata('field:type', entityClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, entityClass.prototype, fieldName); if (fieldType === 'relationship') { console.log(`Found relationship field: ${fieldName}`); // Get relationship-specific metadata - const relationshipType = Reflect.getMetadata('field:relationship:type', entityClass.prototype, fieldName); - const relationshipLoad = Reflect.getMetadata('field:relationship:load', entityClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', entityClass.prototype, fieldName); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, entityClass.prototype, fieldName); + const relationshipLoad = Reflect.getMetadata(FIELD_RELATIONSHIP_LOAD, entityClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, entityClass.prototype, fieldName); // Only load reference relationships that are eager (composition handles differently) if (relationshipType === 'reference' && relationshipLoad !== false) { console.log(`Loading reference relationship ${fieldName}`); @@ -885,7 +892,7 @@ export class TypeORMSqlDataSource extends DataSource { } else { // Fall back to TypeScript's design:type metadata const entityClass = entity.constructor; - targetClass = Reflect.getMetadata('design:type', entityClass.prototype, fieldName); + targetClass = Reflect.getMetadata(DESIGN_TYPE, entityClass.prototype, fieldName); } console.log(`Target class for ${fieldName}:`, targetClass?.name); diff --git a/src/model/metadata/MetadataKeys.ts b/src/model/metadata/MetadataKeys.ts index fbe8a0c..b852762 100644 --- a/src/model/metadata/MetadataKeys.ts +++ b/src/model/metadata/MetadataKeys.ts @@ -43,6 +43,15 @@ export const FIELD_AVAILABLE = 'field:available'; /** Metadata key for storing field relationship type information */ export const FIELD_RELATIONSHIP_TYPE = 'field:relationship:type'; +/** Metadata key for storing field relationship load configuration */ +export const FIELD_RELATIONSHIP_LOAD = 'field:relationship:load'; + +/** Metadata key for storing field relationship onDelete configuration */ +export const FIELD_RELATIONSHIP_ON_DELETE = 'field:relationship:onDelete'; + +/** Metadata key for storing parent entity relationship information */ +export const RELATIONSHIP_PARENT_ENTITY = 'relationship:parent:entity'; + // ============================================================================= // Model-related metadata keys // ============================================================================= @@ -106,6 +115,11 @@ export const TYPEORM_ENTITY = 'typeorm:entity'; /** Metadata key for TypeORM table configuration */ export const TYPEORM_TABLE = 'typeorm:table'; +export const TYPEORM_RELATIONSHIP = 'typeorm:relationship'; + +/** Metadata key for TypeORM relationship type configuration */ +export const TYPEORM_RELATIONSHIP_TYPE = 'typeorm:relationship:type'; + /** Metadata key for TypeORM array field configuration */ export const TYPEORM_ARRAY_FIELD = 'typeorm:array-field'; diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 5cc884a..4e95aa6 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -2,7 +2,15 @@ import 'reflect-metadata'; import { Transform, TransformationType, Type } from 'class-transformer'; import { ValidateNested } from 'class-validator'; import { BaseModel } from '../../BaseModel'; -import { FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, FIELD_RELATIONSHIP_TYPE, DESIGN_TYPE } from '../../metadata/MetadataKeys'; +import { + FIELD_TYPE, + FIELD_TYPE_RELATIONSHIP, + FIELD_TYPE_OPTIONS, + FIELD_RELATIONSHIP_TYPE, + FIELD_RELATIONSHIP_LOAD, + FIELD_RELATIONSHIP_ON_DELETE, + DESIGN_TYPE +} from '../../metadata/MetadataKeys'; /** * Relationship type options. @@ -144,12 +152,12 @@ export function Relationship(options: RelationshipOptions) { // Store metadata about the relationship Reflect.defineMetadata(FIELD_TYPE, FIELD_TYPE_RELATIONSHIP, proto, propName); Reflect.defineMetadata(FIELD_RELATIONSHIP_TYPE, options.type, proto, propName); - Reflect.defineMetadata('field:relationship:load', options.load, proto, propName); - Reflect.defineMetadata('field:relationship:onDelete', options.onDelete, proto, propName); + Reflect.defineMetadata(FIELD_RELATIONSHIP_LOAD, options.load, proto, propName); + Reflect.defineMetadata(FIELD_RELATIONSHIP_ON_DELETE, options.onDelete, proto, propName); // Store the elementType in field type options for access in the data source if (options.elementType) { - Reflect.defineMetadata('field:type:options', { elementType: options.elementType }, proto, propName); + Reflect.defineMetadata(FIELD_TYPE_OPTIONS, { elementType: options.elementType }, proto, propName); } const designType = Reflect.getMetadata(DESIGN_TYPE, proto, propName); diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 3f7d2b7..4011ce7 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -2,6 +2,15 @@ import { BaseModel, Field, Model, PersistentModel, PersistentComponentModel } fr import { Reference, Composition, SharedComposition } from "../../index"; import { TypeORMSqlDataSource } from "../../src/datasources"; import { Text, HTML, DateTime } from "../../index"; +import { + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, + FIELD_RELATIONSHIP_TYPE, + TYPEORM_RELATIONSHIP, + TYPEORM_RELATIONSHIP_TYPE +} from "../../src/model/metadata/MetadataKeys"; // Test models for relationship persistence @Model() @@ -117,11 +126,11 @@ describe('Relationship Persistence', () => { dataSource.configureModel(modelClass); // Get all field names and configure them - const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, modelClass.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -150,32 +159,32 @@ describe('Relationship Persistence', () => { describe('Shortcut Decorators', () => { it('should store relationship metadata for @Reference', () => { - const relationshipType = Reflect.getMetadata('field:relationship:type', Task.prototype, 'project'); - const fieldType = Reflect.getMetadata('field:type', Task.prototype, 'project'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Task.prototype, 'project'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Task.prototype, 'project'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('reference'); }); it('should store relationship metadata for @Composition', () => { - const relationshipType = Reflect.getMetadata('field:relationship:type', Task.prototype, 'notes'); - const fieldType = Reflect.getMetadata('field:type', Task.prototype, 'notes'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Task.prototype, 'notes'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Task.prototype, 'notes'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('composition'); }); it('should store relationship metadata for @SharedComposition', () => { - const relationshipType = Reflect.getMetadata('field:relationship:type', Epic.prototype, 'notes'); - const fieldType = Reflect.getMetadata('field:type', Epic.prototype, 'notes'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Epic.prototype, 'notes'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Epic.prototype, 'notes'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('sharedComposition'); }); it('should store relationship metadata for parent relationship in PersistentComponentModel', () => { - const relationshipType = Reflect.getMetadata('field:relationship:type', TaskNote.prototype, 'owner'); - const fieldType = Reflect.getMetadata('field:type', TaskNote.prototype, 'owner'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, TaskNote.prototype, 'owner'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, TaskNote.prototype, 'owner'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('parent'); @@ -190,8 +199,8 @@ describe('Relationship Persistence', () => { { required: false } ); - const relationshipMetadata = Reflect.getMetadata('typeorm:relationship', Task.prototype, 'project'); - const relationshipType = Reflect.getMetadata('typeorm:relationship:type', Task.prototype, 'project'); + const relationshipMetadata = Reflect.getMetadata(TYPEORM_RELATIONSHIP, Task.prototype, 'project'); + const relationshipType = Reflect.getMetadata(TYPEORM_RELATIONSHIP_TYPE, Task.prototype, 'project'); expect(relationshipMetadata).toBe(true); expect(relationshipType).toBe('reference'); diff --git a/test/types_tests/SimpleComposition.test.ts b/test/types_tests/SimpleComposition.test.ts index ffbd116..ad60094 100644 --- a/test/types_tests/SimpleComposition.test.ts +++ b/test/types_tests/SimpleComposition.test.ts @@ -2,6 +2,15 @@ import { BaseModel, Field, Model, PersistentModel } from "../../index"; import { Composition } from "../../index"; import { TypeORMSqlDataSource } from "../../src/datasources"; import { Text, HTML } from "../../index"; +import { + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, + FIELD_RELATIONSHIP_TYPE, + TYPEORM_RELATIONSHIP, + TYPEORM_RELATIONSHIP_TYPE +} from "../../src/model/metadata/MetadataKeys"; // Test models for simple composition (single, not array) @Model() @@ -54,11 +63,11 @@ describe('Simple Composition (OneToOne)', () => { dataSource.configureModel(modelClass); // Get all field names and configure them - const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, modelClass.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -88,8 +97,8 @@ describe('Simple Composition (OneToOne)', () => { describe('Metadata Configuration', () => { it('should configure single composition as OneToOne relationship', () => { // Check that the relationship metadata is stored correctly - const relationshipType = Reflect.getMetadata('field:relationship:type', Company.prototype, 'headquarters'); - const fieldType = Reflect.getMetadata('field:type', Company.prototype, 'headquarters'); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Company.prototype, 'headquarters'); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Company.prototype, 'headquarters'); expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('composition'); @@ -104,8 +113,8 @@ describe('Simple Composition (OneToOne)', () => { { required: false } ); - const relationshipMetadata = Reflect.getMetadata('typeorm:relationship', Company.prototype, 'headquarters'); - const relationshipType = Reflect.getMetadata('typeorm:relationship:type', Company.prototype, 'headquarters'); + const relationshipMetadata = Reflect.getMetadata(TYPEORM_RELATIONSHIP, Company.prototype, 'headquarters'); + const relationshipType = Reflect.getMetadata(TYPEORM_RELATIONSHIP_TYPE, Company.prototype, 'headquarters'); expect(relationshipMetadata).toBe(true); expect(relationshipType).toBe('composition'); diff --git a/test/types_tests/SimpleRelationshipTest.test.ts b/test/types_tests/SimpleRelationshipTest.test.ts index 5b802f0..3c34ad4 100644 --- a/test/types_tests/SimpleRelationshipTest.test.ts +++ b/test/types_tests/SimpleRelationshipTest.test.ts @@ -1,4 +1,12 @@ import { PersistentModel, Field, Model, Reference, TypeORMSqlDataSource, Text } from "../../index"; +import { + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, + FIELD_RELATIONSHIP_TYPE, + FIELD_RELATIONSHIP_LOAD +} from "../../src/model/metadata/MetadataKeys"; // Simple test models @Model() @@ -36,11 +44,11 @@ describe('Simple Relationship Test', () => { for (const modelClass of models) { dataSource.configureModel(modelClass); - const fieldNames = Reflect.getMetadata('model:fields', modelClass) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; for (const fieldName of fieldNames) { - const fieldType = Reflect.getMetadata('field:type', modelClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', modelClass.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', modelClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, modelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, modelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, modelClass.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -52,8 +60,8 @@ describe('Simple Relationship Test', () => { // Check if it's a relationship field and log additional info if (fieldType === 'relationship') { - const relationshipType = Reflect.getMetadata('field:relationship:type', modelClass.prototype, fieldName); - const load = Reflect.getMetadata('field:relationship:load', modelClass.prototype, fieldName); + const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, modelClass.prototype, fieldName); + const load = Reflect.getMetadata(FIELD_RELATIONSHIP_LOAD, modelClass.prototype, fieldName); console.log(` Relationship details: type=${relationshipType}, load=${load}`); } } From 084fd9d7e383e145396cf6f9cec03a6f6a1a1c6c Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Fri, 12 Sep 2025 12:39:20 -0300 Subject: [PATCH 173/254] Add financial-arithmetic-functions dependency and enable noUncheckedIndexedAccess in tsconfig --- package.json | 1 + tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a82eb63..c62716e 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.14.2", "financial-number": "^4.0.4", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions", "typeorm": "^0.3.26" } } diff --git a/tsconfig.json b/tsconfig.json index 6ef91de..bdfe4d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ "sourceMap": true, "declaration": true, "declarationMap": true, - "noUncheckedIndexedAccess": false, + "noUncheckedIndexedAccess": true, "exactOptionalPropertyTypes": true, "strict": true, "jsx": "react-jsx", From b1aa44fa20f30cd18a28b87615bb0e827459be14 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 09:31:02 -0300 Subject: [PATCH 174/254] Refactor some metadata keys for embedded fields in TypeORM to improve consistency and clarity --- .../typeorm/TypeORMSqlDataSource.ts | 33 ++++++++++--------- src/model/Embedded.ts | 22 +++++++++---- src/model/Model.ts | 7 ++-- src/model/metadata/MetadataKeys.ts | 15 +++++++++ .../MultipleNestedEmbedding.test.ts | 27 ++++++++++----- 5 files changed, 70 insertions(+), 34 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 87ccfcf..176d0ca 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -25,6 +25,7 @@ import { DATASOURCE_TYPE, MODEL_DATASOURCE, DATASOURCE_FIELD_CONFIGURED, + DATASOURCE_EMBEDDED_CONFIGURED, TYPEORM_ENTITY, TYPEORM_TABLE, TYPEORM_COLUMN, @@ -34,6 +35,8 @@ import { FIELD_RELATIONSHIP_TYPE, FIELD_RELATIONSHIP_LOAD, FIELD_RELATIONSHIP_ON_DELETE, + FIELD_EMBEDDED, + FIELD_EMBEDDED_TYPE, DESIGN_TYPE } from '../../model/metadata/MetadataKeys'; @@ -270,7 +273,7 @@ export class TypeORMSqlDataSource extends DataSource { } // Check if this is an embedded field - const isEmbedded = Reflect.getMetadata('field:embedded', target, propertyKey); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, target, propertyKey); if (isEmbedded || fieldType === 'embedded') { this.configureEmbeddedField(target, propertyKey); return; @@ -338,7 +341,7 @@ export class TypeORMSqlDataSource extends DataSource { */ private configureEmbeddedField(target: any, propertyKey: string, prefix: string = '', rootTarget?: any): void { // Get the embedded type from metadata - const embeddedType = Reflect.getMetadata('field:embedded:type', target, propertyKey); + const embeddedType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, target, propertyKey); if (!embeddedType) { throw new Error(`Cannot determine type for embedded field ${propertyKey}`); @@ -351,12 +354,12 @@ export class TypeORMSqlDataSource extends DataSource { const currentPrefix = prefix ? `${prefix}_${propertyKey}` : propertyKey; // Get all fields from the embedded model - const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + const embeddedFields = Reflect.getMetadata(MODEL_FIELDS, embeddedType) || []; // For each field in the embedded model, create a column in the parent entity for (const embeddedFieldName of embeddedFields) { // Check if this field is also embedded (nested embedding) - const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + const isNestedEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, embeddedType.prototype, embeddedFieldName); if (isNestedEmbedded) { // Recursively configure nested embedded field @@ -397,8 +400,8 @@ export class TypeORMSqlDataSource extends DataSource { // Store that this embedded field is configured for TypeORM // Only store this metadata on the original target (not for recursive calls) if (!rootTarget) { - Reflect.defineMetadata('datasource:field:configured', true, target, propertyKey); - Reflect.defineMetadata('datasource:embedded:configured', true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_FIELD_CONFIGURED, true, target, propertyKey); + Reflect.defineMetadata(DATASOURCE_EMBEDDED_CONFIGURED, true, target, propertyKey); } } @@ -411,10 +414,10 @@ export class TypeORMSqlDataSource extends DataSource { */ private extractEmbeddedValues(entity: T): void { const constructor = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, constructor) || []; for (const fieldName of fieldNames) { - const isEmbedded = Reflect.getMetadata('field:embedded', constructor.prototype, fieldName); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, constructor.prototype, fieldName); if (isEmbedded) { const embeddedValue = (entity as any)[fieldName]; @@ -442,11 +445,11 @@ export class TypeORMSqlDataSource extends DataSource { ): void { // Get the embedded type const embeddedType = embeddedValue.constructor; - const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + const embeddedFields = Reflect.getMetadata(MODEL_FIELDS, embeddedType) || []; // Extract each embedded field to its corresponding column for (const embeddedFieldName of embeddedFields) { - const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + const isNestedEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, embeddedType.prototype, embeddedFieldName); if (isNestedEmbedded) { // Handle nested embedded field recursively @@ -474,14 +477,14 @@ export class TypeORMSqlDataSource extends DataSource { */ private restoreEmbeddedValues(entity: T): void { const constructor = entity.constructor; - const fieldNames = Reflect.getMetadata('model:fields', constructor) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, constructor) || []; for (const fieldName of fieldNames) { - const isEmbedded = Reflect.getMetadata('field:embedded', constructor.prototype, fieldName); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, constructor.prototype, fieldName); if (isEmbedded) { // Get the embedded type and its fields - const embeddedType = Reflect.getMetadata('field:embedded:type', constructor.prototype, fieldName); + const embeddedType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, constructor.prototype, fieldName); // Recursively restore the embedded object const embeddedInstance = this.restoreEmbeddedValueRecursive(entity, fieldName, embeddedType, fieldName); @@ -514,11 +517,11 @@ export class TypeORMSqlDataSource extends DataSource { // Restore each field from its column for (const embeddedFieldName of embeddedFields) { - const isNestedEmbedded = Reflect.getMetadata('field:embedded', embeddedType.prototype, embeddedFieldName); + const isNestedEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, embeddedType.prototype, embeddedFieldName); if (isNestedEmbedded) { // Handle nested embedded field recursively - const nestedEmbeddedType = Reflect.getMetadata('field:embedded:type', embeddedType.prototype, embeddedFieldName); + const nestedEmbeddedType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, embeddedType.prototype, embeddedFieldName); const nestedPrefix = `${prefix}_${embeddedFieldName}`; const nestedInstance = this.restoreEmbeddedValueRecursive(entity, embeddedFieldName, nestedEmbeddedType, nestedPrefix); diff --git a/src/model/Embedded.ts b/src/model/Embedded.ts index 8788d5c..f3099c2 100644 --- a/src/model/Embedded.ts +++ b/src/model/Embedded.ts @@ -1,6 +1,14 @@ import "reflect-metadata"; import { Expose, Type } from "class-transformer"; import { ValidateNested } from "class-validator"; +import { + FIELD_EMBEDDED, + FIELD_EMBEDDED_TYPE, + FIELD_EMBEDDED_OPTIONS, + FIELD_EMBEDDED_DOCS, + MODEL_FIELDS, + DESIGN_TYPE +} from './metadata'; /** * Configuration options for the Embedded decorator. @@ -51,29 +59,29 @@ export interface EmbeddedOptions { export function Embedded(options?: EmbeddedOptions) { return function (target: any, propertyKey: string) { // Store metadata that this field is embedded - Reflect.defineMetadata("field:embedded", true, target, propertyKey); + Reflect.defineMetadata(FIELD_EMBEDDED, true, target, propertyKey); // Store embedded options if (options) { - Reflect.defineMetadata("field:embedded:options", options, target, propertyKey); + Reflect.defineMetadata(FIELD_EMBEDDED_OPTIONS, options, target, propertyKey); } // Store documentation if provided if (options?.docs) { - Reflect.defineMetadata("field:embedded:docs", options.docs, target, propertyKey); + Reflect.defineMetadata(FIELD_EMBEDDED_DOCS, options.docs, target, propertyKey); } // Get the type of the property - const propertyType = Reflect.getMetadata("design:type", target, propertyKey); + const propertyType = Reflect.getMetadata(DESIGN_TYPE, target, propertyKey); if (propertyType) { - Reflect.defineMetadata("field:embedded:type", propertyType, target, propertyKey); + Reflect.defineMetadata(FIELD_EMBEDDED_TYPE, propertyType, target, propertyKey); } // Register this field in the fields list for the containing class - const existingFields = Reflect.getMetadata('model:fields', target.constructor) || []; + const existingFields = Reflect.getMetadata(MODEL_FIELDS, target.constructor) || []; if (!existingFields.includes(propertyKey)) { existingFields.push(propertyKey); - Reflect.defineMetadata('model:fields', existingFields, target.constructor); + Reflect.defineMetadata(MODEL_FIELDS, existingFields, target.constructor); } // Make the embedded field available in JSON serialization diff --git a/src/model/Model.ts b/src/model/Model.ts index 6632dfb..fbe9def 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -6,7 +6,8 @@ import { MODEL_FIELDS, FIELD_TYPE, FIELD_TYPE_OPTIONS, - FIELD_REQUIRED + FIELD_REQUIRED, + FIELD_EMBEDDED } from './metadata/MetadataKeys'; /** @@ -118,8 +119,8 @@ export function Model(options?: ModelOptions) { } } if (isEmbedded === undefined) { - if (Reflect.hasMetadata('field:embedded', currentClass.prototype, fieldName)) { - isEmbedded = Reflect.getMetadata('field:embedded', currentClass.prototype, fieldName); + if (Reflect.hasMetadata(FIELD_EMBEDDED, currentClass.prototype, fieldName)) { + isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, currentClass.prototype, fieldName); } else { isEmbedded = null; } diff --git a/src/model/metadata/MetadataKeys.ts b/src/model/metadata/MetadataKeys.ts index b852762..1bc4802 100644 --- a/src/model/metadata/MetadataKeys.ts +++ b/src/model/metadata/MetadataKeys.ts @@ -52,6 +52,18 @@ export const FIELD_RELATIONSHIP_ON_DELETE = 'field:relationship:onDelete'; /** Metadata key for storing parent entity relationship information */ export const RELATIONSHIP_PARENT_ENTITY = 'relationship:parent:entity'; +/** Metadata key for marking a field as embedded */ +export const FIELD_EMBEDDED = 'field:embedded'; + +/** Metadata key for storing embedded field type information */ +export const FIELD_EMBEDDED_TYPE = 'field:embedded:type'; + +/** Metadata key for storing embedded field options/configuration */ +export const FIELD_EMBEDDED_OPTIONS = 'field:embedded:options'; + +/** Metadata key for storing embedded field documentation */ +export const FIELD_EMBEDDED_DOCS = 'field:embedded:docs'; + // ============================================================================= // Model-related metadata keys // ============================================================================= @@ -72,6 +84,9 @@ export const MODEL_DATASOURCE = 'model:dataSource'; /** Metadata key for marking fields as configured by a datasource */ export const DATASOURCE_FIELD_CONFIGURED = 'datasource:field:configured'; +/** Metadata key for marking embedded fields as configured by a datasource */ +export const DATASOURCE_EMBEDDED_CONFIGURED = 'datasource:embedded:configured'; + /** Metadata key for storing datasource type information */ export const DATASOURCE_TYPE = 'datasource:type'; diff --git a/test/types_tests/MultipleNestedEmbedding.test.ts b/test/types_tests/MultipleNestedEmbedding.test.ts index b6978e2..506400a 100644 --- a/test/types_tests/MultipleNestedEmbedding.test.ts +++ b/test/types_tests/MultipleNestedEmbedding.test.ts @@ -1,4 +1,13 @@ import { TypeORMSqlDataSource } from '../../src/datasources'; +import { + MODEL_FIELDS, + MODEL_DATASOURCE, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, + FIELD_EMBEDDED, + FIELD_EMBEDDED_TYPE +} from '../../src/model/metadata'; import { Person, Address, @@ -30,12 +39,12 @@ describe('Multiple Nested Embedded Models', () => { dataSource.configureModel(ModelClass, modelOptions); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', ModelClass) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, ModelClass) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', ModelClass.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', ModelClass.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', ModelClass.prototype, fieldName); - const isEmbedded = Reflect.getMetadata('field:embedded', ModelClass.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, ModelClass.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, ModelClass.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, ModelClass.prototype, fieldName); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, ModelClass.prototype, fieldName); if (isEmbedded) { // For embedded fields, pass a special type indicator @@ -65,17 +74,17 @@ describe('Multiple Nested Embedded Models', () => { describe('Simple Nested Embedding (Person -> Address -> GeoLocation)', () => { test('should store nested embedded model metadata correctly', () => { // Check Person -> Address embedding - const isPersonAddressEmbedded = Reflect.getMetadata('field:embedded', Person.prototype, 'address'); + const isPersonAddressEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Person.prototype, 'address'); expect(isPersonAddressEmbedded).toBe(true); - const personAddressType = Reflect.getMetadata('field:embedded:type', Person.prototype, 'address'); + const personAddressType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, Person.prototype, 'address'); expect(personAddressType).toBe(Address); // Check Address -> GeoLocation embedding - const isAddressGeoEmbedded = Reflect.getMetadata('field:embedded', Address.prototype, 'geo'); + const isAddressGeoEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Address.prototype, 'geo'); expect(isAddressGeoEmbedded).toBe(true); - const addressGeoType = Reflect.getMetadata('field:embedded:type', Address.prototype, 'geo'); + const addressGeoType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, Address.prototype, 'geo'); expect(addressGeoType).toBe(GeoLocation); }); From 884a1d34a6b47e2843ce22efd45936a3ed30ddb7 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 09:58:00 -0300 Subject: [PATCH 175/254] Enhance cascade options in RelationshipFieldManager to include 'remove' for improved relationship management --- .../typeorm/RelationshipFieldManager.ts | 2 +- .../RelationshipPersistence.test.ts | 618 ++++++++++++++++++ 2 files changed, 619 insertions(+), 1 deletion(-) diff --git a/src/datasources/typeorm/RelationshipFieldManager.ts b/src/datasources/typeorm/RelationshipFieldManager.ts index 109b9d5..880ed9d 100644 --- a/src/datasources/typeorm/RelationshipFieldManager.ts +++ b/src/datasources/typeorm/RelationshipFieldManager.ts @@ -141,7 +141,7 @@ export class RelationshipFieldManager { // One-to-many relationship for composition arrays const relationOptions: any = { eager, - cascade: ['insert', 'update'], // Cascade save operations + cascade: ['insert', 'update', 'remove'], // Cascade save and remove operations orphanedRowAction: 'delete' // Delete orphaned children }; diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 4011ce7..3c14055 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -330,4 +330,622 @@ describe('Relationship Persistence', () => { expect(finalTask.notes[0]!.user.name).toBe('Task Creator'); }); }); + + describe('Relationship Querying', () => { + let savedUser: User; + let savedProject: Project; + let savedTask: Task; + + beforeEach(async () => { + // Setup test data + const user = new User(); + user.name = 'Query Test User'; + user.email = 'query@example.com'; + savedUser = await dataSource.save(user); + + const project = new Project(); + project.name = 'Query Test Project'; + savedProject = await dataSource.save(project); + + const task = new Task(); + task.title = 'Query Test Task'; + task.project = savedProject; + task.assignees = [savedUser]; + task.notes = []; + savedTask = await dataSource.save(task); + + // Add a note to the task + const note = new TaskNote(); + note.user = savedUser; + note.timestamp = new Date(); + note.note = 'Query test note'; + note.owner = savedTask; + + savedTask.notes = [note]; + await dataSource.save(savedTask); + }); + + it('should find tasks by project reference', async () => { + const tasks = await dataSource.findBy(Task, { project: { id: savedProject.id } }); + + expect(tasks).toHaveLength(1); + expect(tasks[0]!.title).toBe('Query Test Task'); + expect(tasks[0]!.project.id).toBe(savedProject.id); + }); + + it('should find tasks by assignee reference', async () => { + const tasks = await dataSource.findWithOptions(Task, { + where: { assignees: { id: savedUser.id } } + }); + + expect(tasks).toHaveLength(1); + expect(tasks[0]!.title).toBe('Query Test Task'); + expect(tasks[0]!.assignees.some(u => u.id === savedUser.id)).toBe(true); + }); + + it('should find one task with relations loaded', async () => { + const task = await dataSource.findOneBy(Task, { id: savedTask.id }); + + expect(task).toBeDefined(); + expect(task!.title).toBe('Query Test Task'); + expect(task!.project).toBeDefined(); + expect(task!.project.name).toBe('Query Test Project'); + expect(task!.assignees).toHaveLength(1); + expect(task!.assignees[0]!.name).toBe('Query Test User'); + expect(task!.notes).toHaveLength(1); + expect(task!.notes[0]!.note).toBe('Query test note'); + }); + + it('should find tasks with complex where conditions', async () => { + const tasks = await dataSource.findWithOptions(Task, { + where: { + project: { name: 'Query Test Project' }, + assignees: { email: 'query@example.com' } + } + }); + + expect(tasks).toHaveLength(1); + expect(tasks[0]!.title).toBe('Query Test Task'); + }); + + it('should count tasks with relationships', async () => { + const count = await dataSource.countBy(Task, { + project: { id: savedProject.id } + }); + + expect(count).toBe(1); + }); + + it('should check existence of tasks with relationships', async () => { + const exists = await dataSource.existsBy(Task, { + assignees: { id: savedUser.id } + }); + + expect(exists).toBe(true); + }); + }); + + describe('Array Composition Operations', () => { + let savedTask: Task; + let savedUser1: User; + let savedUser2: User; + + beforeEach(async () => { + // Create users + const user1 = new User(); + user1.name = 'Note User 1'; + user1.email = 'user1@notes.com'; + savedUser1 = await dataSource.save(user1); + + const user2 = new User(); + user2.name = 'Note User 2'; + user2.email = 'user2@notes.com'; + savedUser2 = await dataSource.save(user2); + + // Create task + const task = new Task(); + task.title = 'Array Composition Test Task'; + task.assignees = []; + task.notes = []; + savedTask = await dataSource.save(task); + }); + + it('should add elements to composition array', async () => { + // Add first note + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date(); + note1.note = 'First note'; + note1.owner = savedTask; + + savedTask.notes = [note1]; + const updatedTask1 = await dataSource.save(savedTask); + + expect(updatedTask1.notes).toHaveLength(1); + expect(updatedTask1.notes[0]!.note).toBe('First note'); + + // Add second note + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date(); + note2.note = 'Second note'; + note2.owner = savedTask; + + updatedTask1.notes.push(note2); + const updatedTask2 = await dataSource.save(updatedTask1); + + expect(updatedTask2.notes).toHaveLength(2); + expect(updatedTask2.notes.map(n => n.note)).toContain('First note'); + expect(updatedTask2.notes.map(n => n.note)).toContain('Second note'); + }); + + it('should remove elements from composition array', async () => { + // Start with two notes + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date(); + note1.note = 'Note to keep'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date(); + note2.note = 'Note to remove'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + const taskWithTwoNotes = await dataSource.save(savedTask); + + expect(taskWithTwoNotes.notes).toHaveLength(2); + + // Get the note to remove and its ID + const noteToRemove = taskWithTwoNotes.notes.find(n => n.note === 'Note to remove'); + expect(noteToRemove).toBeDefined(); + const noteToRemoveId = noteToRemove!.id; + + // First, manually delete the composition element from the database + await dataSource.delete(TaskNote, noteToRemoveId!); + + // Then update the parent's array to reflect the removal + taskWithTwoNotes.notes = taskWithTwoNotes.notes.filter(n => n.note !== 'Note to remove'); + const taskWithOneNote = await dataSource.save(taskWithTwoNotes); + + expect(taskWithOneNote.notes).toHaveLength(1); + expect(taskWithOneNote.notes[0]!.note).toBe('Note to keep'); + + // Verify the removed note was actually deleted from the database + const deletedNote = await dataSource.findOneBy(TaskNote, { id: noteToRemoveId! }); + expect(deletedNote).toBeNull(); + }); + + it('should modify elements in composition array', async () => { + // Add a note + const note = new TaskNote(); + note.user = savedUser1; + note.timestamp = new Date(); + note.note = 'Original note content'; + note.owner = savedTask; + + savedTask.notes = [note]; + const taskWithNote = await dataSource.save(savedTask); + + expect(taskWithNote.notes[0]!.note).toBe('Original note content'); + + // Modify the note + taskWithNote.notes[0]!.note = 'Modified note content'; + const taskWithModifiedNote = await dataSource.save(taskWithNote); + + expect(taskWithModifiedNote.notes[0]!.note).toBe('Modified note content'); + }); + }); + + describe('Composition Reading and Loading', () => { + let taskId: string; + let userId: string; + + beforeEach(async () => { + // Create user + const user = new User(); + user.name = 'Composition Reader'; + user.email = 'reader@composition.com'; + const savedUser = await dataSource.save(user); + userId = savedUser.id!; + + // Create task with composition + const task = new Task(); + task.title = 'Task with Compositions'; + task.assignees = []; + task.notes = []; + const savedTask = await dataSource.save(task); + + // Add multiple notes + const note1 = new TaskNote(); + note1.user = savedUser; + note1.timestamp = new Date('2023-01-01'); + note1.note = 'First composition note'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser; + note2.timestamp = new Date('2023-01-02'); + note2.note = 'Second composition note'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + await dataSource.save(savedTask); + taskId = savedTask.id!; + }); + + it('should load task with all composition children', async () => { + const task = await dataSource.findOneBy(Task, { id: taskId }); + + expect(task).toBeDefined(); + expect(task!.notes).toHaveLength(2); + expect(task!.notes[0]!.note).toBeDefined(); + expect(task!.notes[0]!.user).toBeDefined(); + expect(task!.notes[0]!.user.name).toBe('Composition Reader'); + expect(task!.notes[0]!.timestamp).toBeDefined(); + }); + + it('should load compositions with nested references', async () => { + const task = await dataSource.findOneBy(Task, { id: taskId }); + + expect(task).toBeDefined(); + const firstNote = task!.notes[0]!; + + expect(firstNote.user).toBeDefined(); + expect(firstNote.user.id).toBe(userId); + expect(firstNote.user.name).toBe('Composition Reader'); + expect(firstNote.user.email).toBe('reader@composition.com'); + }); + + it('should find tasks by composition properties', async () => { + const tasks = await dataSource.findWithOptions(Task, { + where: { notes: { note: 'First composition note' } } + }); + + expect(tasks).toHaveLength(1); + expect(tasks[0]!.id).toBe(taskId); + }); + + it('should handle empty composition arrays', async () => { + const emptyTask = new Task(); + emptyTask.title = 'Empty Task'; + emptyTask.assignees = []; + emptyTask.notes = []; + const savedEmptyTask = await dataSource.save(emptyTask); + + const retrievedTask = await dataSource.findOneBy(Task, { id: savedEmptyTask.id }); + + expect(retrievedTask).toBeDefined(); + expect(retrievedTask!.notes).toHaveLength(0); + expect(retrievedTask!.assignees).toHaveLength(0); + }); + }); + + describe('Cascade Deletion', () => { + it('should delete composition children when parent is deleted', async () => { + // Create user + const user = new User(); + user.name = 'Deletion Test User'; + user.email = 'delete@test.com'; + const savedUser = await dataSource.save(user); + + // Create task with notes + const task = new Task(); + task.title = 'Task to Delete'; + task.assignees = []; + task.notes = []; + const savedTask = await dataSource.save(task); + + // Add notes + const note1 = new TaskNote(); + note1.user = savedUser; + note1.timestamp = new Date(); + note1.note = 'Note 1'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser; + note2.timestamp = new Date(); + note2.note = 'Note 2'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + await dataSource.save(savedTask); + + // Verify notes exist + const noteCount = await dataSource.countBy(TaskNote, { owner: { id: savedTask.id } }); + expect(noteCount).toBe(2); + + // Delete the task + await dataSource.delete(Task, savedTask.id!); + + // Verify task is deleted + const deletedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + expect(deletedTask).toBeNull(); + + // Verify composition notes are also deleted (cascade) + const remainingNotes = await dataSource.countBy(TaskNote, { owner: { id: savedTask.id } }); + expect(remainingNotes).toBe(0); + }); + + it('should handle onDelete cascade for reference relationships', async () => { + // Create project + const project = new Project(); + project.name = 'Project to Delete'; + const savedProject = await dataSource.save(project); + + // Create task with project reference (onDelete: 'delete') + const task = new Task(); + task.title = 'Task with Project Reference'; + task.project = savedProject; + task.assignees = []; + task.notes = []; + const savedTask = await dataSource.save(task); + + // Verify task exists + const taskExists = await dataSource.existsBy(Task, { id: savedTask.id }); + expect(taskExists).toBe(true); + + // Delete the project + await dataSource.delete(Project, savedProject.id!); + + // Verify task is also deleted due to onDelete: 'delete' + const deletedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + expect(deletedTask).toBeNull(); + }); + + it('should NOT delete referenced entities for many-to-many relationships', async () => { + // Create users + const user1 = new User(); + user1.name = 'User 1'; + user1.email = 'user1@ref.com'; + const savedUser1 = await dataSource.save(user1); + + const user2 = new User(); + user2.name = 'User 2'; + user2.email = 'user2@ref.com'; + const savedUser2 = await dataSource.save(user2); + + // Create task with user references + const task = new Task(); + task.title = 'Task with User References'; + task.assignees = [savedUser1, savedUser2]; + task.notes = []; + const savedTask = await dataSource.save(task); + + // Delete the task + await dataSource.delete(Task, savedTask.id!); + + // Verify users still exist (should NOT be deleted) + const user1Exists = await dataSource.existsBy(User, { id: savedUser1.id }); + const user2Exists = await dataSource.existsBy(User, { id: savedUser2.id }); + + expect(user1Exists).toBe(true); + expect(user2Exists).toBe(true); + }); + }); + + describe('Shared Composition Relationships', () => { + let sharedNote: Note; + let savedUser: User; + + beforeEach(async () => { + // Create user + const user = new User(); + user.name = 'Shared Note User'; + user.email = 'shared@note.com'; + savedUser = await dataSource.save(user); + + // Create shared note + const note = new Note(); + note.user = savedUser; + note.timestamp = new Date(); + note.content = 'This is a shared note'; + sharedNote = await dataSource.save(note); + }); + + it('should allow multiple parents to share the same composition', async () => { + // Create epic with shared note + const epic = new Epic(); + epic.title = 'Epic with Shared Note'; + epic.notes = [sharedNote]; + const savedEpic = await dataSource.save(epic); + + // Create story with the same shared note + const story = new Story(); + story.title = 'Story with Shared Note'; + story.notes = [sharedNote]; + const savedStory = await dataSource.save(story); + + // Verify both parents have the shared note + const retrievedEpic = await dataSource.findOneBy(Epic, { id: savedEpic.id }); + const retrievedStory = await dataSource.findOneBy(Story, { id: savedStory.id }); + + expect(retrievedEpic!.notes).toHaveLength(1); + expect(retrievedStory!.notes).toHaveLength(1); + expect(retrievedEpic!.notes[0]!.id).toBe(sharedNote.id); + expect(retrievedStory!.notes[0]!.id).toBe(sharedNote.id); + expect(retrievedEpic!.notes[0]!.content).toBe('This is a shared note'); + expect(retrievedStory!.notes[0]!.content).toBe('This is a shared note'); + }); + + it('should not delete shared composition when one parent is deleted', async () => { + // Create epic and story both sharing the note + const epic = new Epic(); + epic.title = 'Epic to Delete'; + epic.notes = [sharedNote]; + const savedEpic = await dataSource.save(epic); + + const story = new Story(); + story.title = 'Story to Keep'; + story.notes = [sharedNote]; + const savedStory = await dataSource.save(story); + + // Delete the epic + await dataSource.delete(Epic, savedEpic.id!); + + // Verify note still exists + const noteStillExists = await dataSource.existsBy(Note, { id: sharedNote.id }); + expect(noteStillExists).toBe(true); + + // Verify story still has the note + const remainingStory = await dataSource.findOneBy(Story, { id: savedStory.id }); + expect(remainingStory!.notes).toHaveLength(1); + expect(remainingStory!.notes[0]!.id).toBe(sharedNote.id); + }); + + it('should handle adding and removing shared compositions', async () => { + // Create epic + const epic = new Epic(); + epic.title = 'Epic for Shared Operations'; + epic.notes = []; + const savedEpic = await dataSource.save(epic); + + // Add shared note + savedEpic.notes = [sharedNote]; + const epicWithNote = await dataSource.save(savedEpic); + + expect(epicWithNote.notes).toHaveLength(1); + expect(epicWithNote.notes[0]!.id).toBe(sharedNote.id); + + // Remove shared note + epicWithNote.notes = []; + const epicWithoutNote = await dataSource.save(epicWithNote); + + expect(epicWithoutNote.notes).toHaveLength(0); + + // Verify note still exists independently + const noteStillExists = await dataSource.existsBy(Note, { id: sharedNote.id }); + expect(noteStillExists).toBe(true); + }); + }); + + describe('Edge Cases and Complex Scenarios', () => { + it('should handle null reference relationships', async () => { + const task = new Task(); + task.title = 'Task without Project'; + task.project = null as any; + task.assignees = []; + task.notes = []; + + const savedTask = await dataSource.save(task); + const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + + expect(retrievedTask!.project).toBeNull(); + }); + + it('should handle empty arrays in relationships', async () => { + const task = new Task(); + task.title = 'Task with Empty Arrays'; + task.assignees = []; + task.notes = []; + + const savedTask = await dataSource.save(task); + const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + + expect(retrievedTask!.assignees).toHaveLength(0); + expect(retrievedTask!.notes).toHaveLength(0); + }); + + it('should handle complex nested queries', async () => { + // Setup complex data + const user = new User(); + user.name = 'Complex User'; + user.email = 'complex@test.com'; + const savedUser = await dataSource.save(user); + + const project = new Project(); + project.name = 'Complex Project'; + const savedProject = await dataSource.save(project); + + const task = new Task(); + task.title = 'Complex Task'; + task.project = savedProject; + task.assignees = [savedUser]; + task.notes = []; + const savedTask = await dataSource.save(task); + + const note = new TaskNote(); + note.user = savedUser; + note.timestamp = new Date(); + note.note = 'Complex note'; + note.owner = savedTask; + + savedTask.notes = [note]; + await dataSource.save(savedTask); + + // Query with nested conditions + const tasks = await dataSource.findWithOptions(Task, { + where: { + project: { name: 'Complex Project' }, + assignees: { email: 'complex@test.com' }, + notes: { note: 'Complex note' } + } + }); + + expect(tasks).toHaveLength(1); + expect(tasks[0]!.title).toBe('Complex Task'); + }); + + it('should handle updating relationship references', async () => { + // Create initial data + const project1 = new Project(); + project1.name = 'Original Project'; + const savedProject1 = await dataSource.save(project1); + + const project2 = new Project(); + project2.name = 'New Project'; + const savedProject2 = await dataSource.save(project2); + + const task = new Task(); + task.title = 'Task to Update'; + task.project = savedProject1; + task.assignees = []; + task.notes = []; + const savedTask = await dataSource.save(task); + + // Update project reference + savedTask.project = savedProject2; + const updatedTask = await dataSource.save(savedTask); + + expect(updatedTask.project.id).toBe(savedProject2.id); + expect(updatedTask.project.name).toBe('New Project'); + + // Verify the change persisted + const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + expect(retrievedTask!.project.id).toBe(savedProject2.id); + }); + + it('should handle bulk operations on relationships', async () => { + // Create multiple users + const users = []; + for (let i = 1; i <= 5; i++) { + const user = new User(); + user.name = `Bulk User ${i}`; + user.email = `bulk${i}@test.com`; + users.push(await dataSource.save(user)); + } + + // Create task with all users + const task = new Task(); + task.title = 'Bulk Assignment Task'; + task.assignees = users; + task.notes = []; + const savedTask = await dataSource.save(task); + + expect(savedTask.assignees).toHaveLength(5); + + // Remove some assignees + savedTask.assignees = users.slice(0, 3); + const updatedTask = await dataSource.save(savedTask); + + expect(updatedTask.assignees).toHaveLength(3); + + // Verify the removed users still exist + const userCount = await dataSource.countBy(User, {}); + expect(userCount).toBe(5); + }); + }); }); From 79fe6472f163e03228ac767fab70808723e94206 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 10:26:16 -0300 Subject: [PATCH 176/254] Refactor remaining metadata keys in TypeORM and test files --- .../typeorm/TypeORMSqlDataSource.ts | 6 +- src/model/Model.ts | 16 ++--- .../EmbeddingAndInheritance.test.ts | 61 +++++++++++-------- .../MultipleNestedEmbedding.test.ts | 16 ++--- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 176d0ca..f8364e2 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -368,8 +368,8 @@ export class TypeORMSqlDataSource extends DataSource { this.configureEmbeddedField(embeddedType.prototype, embeddedFieldName, currentPrefix, columnTarget); } else { // Get field type and options from the embedded model - const fieldType = Reflect.getMetadata('field:type', embeddedType.prototype, embeddedFieldName); - const fieldOptions = Reflect.getMetadata('field:type:options', embeddedType.prototype, embeddedFieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, embeddedType.prototype, embeddedFieldName); + const fieldOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, embeddedType.prototype, embeddedFieldName); if (!fieldType) { continue; // Skip fields without type information @@ -510,7 +510,7 @@ export class TypeORMSqlDataSource extends DataSource { embeddedType: any, prefix: string ): any { - const embeddedFields = Reflect.getMetadata('model:fields', embeddedType) || []; + const embeddedFields = Reflect.getMetadata(MODEL_FIELDS, embeddedType) || []; // Create a new instance of the embedded type without calling its constructor const embeddedInstance = Object.create(embeddedType.prototype); diff --git a/src/model/Model.ts b/src/model/Model.ts index fbe9def..7c7cd69 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -24,8 +24,8 @@ function getAllFieldNames(constructor: Function): string[] { // Walk up the prototype chain to collect fields from all parent classes while (currentClass && currentClass !== Object) { // Check if the class has field metadata before trying to access it - if (Reflect.hasMetadata('model:fields', currentClass)) { - const fields = Reflect.getMetadata('model:fields', currentClass) || []; + if (Reflect.hasMetadata(MODEL_FIELDS, currentClass)) { + const fields = Reflect.getMetadata(MODEL_FIELDS, currentClass) || []; fields.forEach((field: string) => allFields.add(field)); } @@ -98,22 +98,22 @@ export function Model(options?: ModelOptions) { // Walk up the prototype chain to find the field metadata while (currentClass && currentClass !== Object && currentClass.prototype) { if (fieldType === undefined) { - if (Reflect.hasMetadata('field:type', currentClass.prototype, fieldName)) { - fieldType = Reflect.getMetadata('field:type', currentClass.prototype, fieldName); + if (Reflect.hasMetadata(FIELD_TYPE, currentClass.prototype, fieldName)) { + fieldType = Reflect.getMetadata(FIELD_TYPE, currentClass.prototype, fieldName); } else { fieldType = null; } } if (fieldTypeOptions === undefined) { - if (Reflect.hasMetadata('field:type:options', currentClass.prototype, fieldName)) { - fieldTypeOptions = Reflect.getMetadata('field:type:options', currentClass.prototype, fieldName); + if (Reflect.hasMetadata(FIELD_TYPE_OPTIONS, currentClass.prototype, fieldName)) { + fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, currentClass.prototype, fieldName); } else { fieldTypeOptions = null; } } if (fieldRequired === undefined) { - if (Reflect.hasMetadata('field:required', currentClass.prototype, fieldName)) { - fieldRequired = Reflect.getMetadata('field:required', currentClass.prototype, fieldName); + if (Reflect.hasMetadata(FIELD_REQUIRED, currentClass.prototype, fieldName)) { + fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, currentClass.prototype, fieldName); } else { fieldRequired = null; } diff --git a/test/types_tests/EmbeddingAndInheritance.test.ts b/test/types_tests/EmbeddingAndInheritance.test.ts index 0c78eff..ea504c0 100644 --- a/test/types_tests/EmbeddingAndInheritance.test.ts +++ b/test/types_tests/EmbeddingAndInheritance.test.ts @@ -5,6 +5,17 @@ import { CustomerWithAddress } from '../model/CustomerWithAddress'; import { PersonBase } from '../model/PersonBase'; import { Contact } from '../model/Contact'; import { Employee } from '../model/Employee'; +import { + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, + FIELD_EMBEDDED, + FIELD_EMBEDDED_TYPE, + DATASOURCE_EMBEDDED_CONFIGURED, + TYPEORM_ENTITY, + MODEL_DATASOURCE +} from '../../src/model/metadata/MetadataKeys'; describe('Embedding and Inheritance', () => { let dataSource: TypeORMSqlDataSource; @@ -20,16 +31,16 @@ describe('Embedding and Inheritance', () => { // Configure the CustomerWithAddress model with the data source const modelOptions = { dataSource }; - Reflect.defineMetadata("model:dataSource", dataSource, CustomerWithAddress); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, CustomerWithAddress); dataSource.configureModel(CustomerWithAddress, modelOptions); // Configure all fields with the data source - const fieldNames = Reflect.getMetadata('model:fields', CustomerWithAddress) || []; + const fieldNames = Reflect.getMetadata(MODEL_FIELDS, CustomerWithAddress) || []; fieldNames.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', CustomerWithAddress.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', CustomerWithAddress.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', CustomerWithAddress.prototype, fieldName); - const isEmbedded = Reflect.getMetadata('field:embedded', CustomerWithAddress.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, CustomerWithAddress.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, CustomerWithAddress.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, CustomerWithAddress.prototype, fieldName); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, CustomerWithAddress.prototype, fieldName); if (isEmbedded) { // For embedded fields, pass a special type indicator @@ -46,18 +57,18 @@ describe('Embedding and Inheritance', () => { }); // Configure Contact and Employee models for inheritance testing - Reflect.defineMetadata("model:dataSource", dataSource, Contact); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, Contact); dataSource.configureModel(Contact, modelOptions); - Reflect.defineMetadata("model:dataSource", dataSource, Employee); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, Employee); dataSource.configureModel(Employee, modelOptions); // Configure Contact fields - const contactFields = Reflect.getMetadata('model:fields', Contact) || []; + const contactFields = Reflect.getMetadata(MODEL_FIELDS, Contact) || []; contactFields.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', Contact.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', Contact.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', Contact.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Contact.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, Contact.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, Contact.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -69,11 +80,11 @@ describe('Embedding and Inheritance', () => { }); // Configure Employee fields - const employeeFields = Reflect.getMetadata('model:fields', Employee) || []; + const employeeFields = Reflect.getMetadata(MODEL_FIELDS, Employee) || []; employeeFields.forEach((fieldName: string) => { - const fieldType = Reflect.getMetadata('field:type', Employee.prototype, fieldName); - const fieldTypeOptions = Reflect.getMetadata('field:type:options', Employee.prototype, fieldName); - const fieldRequired = Reflect.getMetadata('field:required', Employee.prototype, fieldName); + const fieldType = Reflect.getMetadata(FIELD_TYPE, Employee.prototype, fieldName); + const fieldTypeOptions = Reflect.getMetadata(FIELD_TYPE_OPTIONS, Employee.prototype, fieldName); + const fieldRequired = Reflect.getMetadata(FIELD_REQUIRED, Employee.prototype, fieldName); if (fieldType) { const allFieldOptions = { @@ -97,21 +108,21 @@ describe('Embedding and Inheritance', () => { describe('Embedded Fields', () => { test('should store embedded model metadata correctly', () => { // Check that the embedded field is marked as such - const isEmbedded = Reflect.getMetadata('field:embedded', CustomerWithAddress.prototype, 'address'); + const isEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, CustomerWithAddress.prototype, 'address'); expect(isEmbedded).toBe(true); // Check that the embedded type is stored - const embeddedType = Reflect.getMetadata('field:embedded:type', CustomerWithAddress.prototype, 'address'); + const embeddedType = Reflect.getMetadata(FIELD_EMBEDDED_TYPE, CustomerWithAddress.prototype, 'address'); expect(embeddedType).toBe(Address); // Check that the Address model has its fields registered - const addressFields = Reflect.getMetadata('model:fields', Address); + const addressFields = Reflect.getMetadata(MODEL_FIELDS, Address); expect(addressFields).toEqual(expect.arrayContaining(['addressLine1', 'addressLine2', 'city', 'zipCode', 'state', 'country'])); }); test('should configure embedded fields correctly in TypeORM', () => { // Check that the embedded field is marked as configured - const isConfigured = Reflect.getMetadata('datasource:embedded:configured', CustomerWithAddress.prototype, 'address'); + const isConfigured = Reflect.getMetadata(DATASOURCE_EMBEDDED_CONFIGURED, CustomerWithAddress.prototype, 'address'); expect(isConfigured).toBe(true); // Check that column metadata exists for embedded fields @@ -162,25 +173,25 @@ describe('Embedding and Inheritance', () => { describe('Inheritance', () => { test('should create separate tables for inherited models', () => { // Check that Contact has TypeORM entity metadata - const contactEntityMetadata = Reflect.getMetadata('typeorm:entity', Contact); + const contactEntityMetadata = Reflect.getMetadata(TYPEORM_ENTITY, Contact); expect(contactEntityMetadata).toBe(true); // Check that Employee has TypeORM entity metadata - const employeeEntityMetadata = Reflect.getMetadata('typeorm:entity', Employee); + const employeeEntityMetadata = Reflect.getMetadata(TYPEORM_ENTITY, Employee); expect(employeeEntityMetadata).toBe(true); // The abstract PersonBase should not have entity metadata since it's not configured - const personBaseEntityMetadata = Reflect.getMetadata('typeorm:entity', PersonBase); + const personBaseEntityMetadata = Reflect.getMetadata(TYPEORM_ENTITY, PersonBase); expect(personBaseEntityMetadata).toBeUndefined(); }); test('should inherit fields from base class', () => { // Check that Contact has inherited fields from PersonBase - const contactFields = Reflect.getMetadata('model:fields', Contact) || []; + const contactFields = Reflect.getMetadata(MODEL_FIELDS, Contact) || []; expect(contactFields).toEqual(expect.arrayContaining(['firstName', 'lastName', 'fullName', 'email', 'phoneNumber'])); // Check that Employee has inherited fields from PersonBase - const employeeFields = Reflect.getMetadata('model:fields', Employee) || []; + const employeeFields = Reflect.getMetadata(MODEL_FIELDS, Employee) || []; expect(employeeFields).toEqual(expect.arrayContaining(['firstName', 'lastName', 'fullName', 'ssn', 'departmentId'])); }); diff --git a/test/types_tests/MultipleNestedEmbedding.test.ts b/test/types_tests/MultipleNestedEmbedding.test.ts index 506400a..0619efd 100644 --- a/test/types_tests/MultipleNestedEmbedding.test.ts +++ b/test/types_tests/MultipleNestedEmbedding.test.ts @@ -35,7 +35,7 @@ describe('Multiple Nested Embedded Models', () => { for (const ModelClass of models) { const modelOptions = { dataSource }; - Reflect.defineMetadata("model:dataSource", dataSource, ModelClass); + Reflect.defineMetadata(MODEL_DATASOURCE, dataSource, ModelClass); dataSource.configureModel(ModelClass, modelOptions); // Configure all fields with the data source @@ -124,31 +124,31 @@ describe('Multiple Nested Embedded Models', () => { describe('Complex Multiple Nested Embedding (Employee with Multiple Embedded Objects)', () => { test('should store complex nested embedded model metadata correctly', () => { // Check Employee -> PersonalAddress embedding - const isPersonalAddressEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'personalAddress'); + const isPersonalAddressEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Employee.prototype, 'personalAddress'); expect(isPersonalAddressEmbedded).toBe(true); // Check Employee -> Department embedding - const isDepartmentEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'department'); + const isDepartmentEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Employee.prototype, 'department'); expect(isDepartmentEmbedded).toBe(true); // Check Employee -> Company embedding - const isCompanyEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'company'); + const isCompanyEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Employee.prototype, 'company'); expect(isCompanyEmbedded).toBe(true); // Check Employee -> EmergencyContact embedding - const isEmergencyContactEmbedded = Reflect.getMetadata('field:embedded', Employee.prototype, 'emergencyContact'); + const isEmergencyContactEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Employee.prototype, 'emergencyContact'); expect(isEmergencyContactEmbedded).toBe(true); // Check Department -> Location (Address) embedding - const isDepartmentLocationEmbedded = Reflect.getMetadata('field:embedded', Department.prototype, 'location'); + const isDepartmentLocationEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Department.prototype, 'location'); expect(isDepartmentLocationEmbedded).toBe(true); // Check Company -> Headquarters (Address) embedding - const isCompanyHeadquartersEmbedded = Reflect.getMetadata('field:embedded', Company.prototype, 'headquarters'); + const isCompanyHeadquartersEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Company.prototype, 'headquarters'); expect(isCompanyHeadquartersEmbedded).toBe(true); // Check Company -> Contact embedding - const isCompanyContactEmbedded = Reflect.getMetadata('field:embedded', Company.prototype, 'contact'); + const isCompanyContactEmbedded = Reflect.getMetadata(FIELD_EMBEDDED, Company.prototype, 'contact'); expect(isCompanyContactEmbedded).toBe(true); }); From 464418bb9735138cbbc3915bf262b547129d8b87 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 15 Sep 2025 10:33:48 -0300 Subject: [PATCH 177/254] Updated to manage correctly the field extraction and choice fields enum. --- .../fields/changeReferenceToComposition.ts | 253 ++++++++++++++---- 1 file changed, 198 insertions(+), 55 deletions(-) diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index c296d38..9e07011 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -6,6 +6,7 @@ import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; import { FileSystemService } from "../../services/fileSystemService"; import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; import * as path from "path"; /** @@ -23,6 +24,7 @@ export class ChangeReferenceToCompositionTool { private sourceCodeService: SourceCodeService; private fileSystemService: FileSystemService; private explorerProvider: ExplorerProvider; + private deleteFieldTool: DeleteFieldTool; constructor(explorerProvider: ExplorerProvider) { this.userInputService = new UserInputService(); @@ -30,6 +32,7 @@ export class ChangeReferenceToCompositionTool { this.sourceCodeService = new SourceCodeService(); this.fileSystemService = new FileSystemService(); this.explorerProvider = explorerProvider; + this.deleteFieldTool = new DeleteFieldTool(); } /** @@ -66,7 +69,7 @@ export class ChangeReferenceToCompositionTool { const componentModelCode = await this.generateComponentModelCode(targetModel, sourceModel, cache); // Step 5: Remove the reference field decorators - await this.removeReferenceField(document, referenceField); + await this.removeReferenceField(document, referenceField, cache); // Step 6: Add the component model to the source file await this.addComponentModel(document, componentModelCode, sourceModel.name, cache); @@ -224,86 +227,226 @@ export class ChangeReferenceToCompositionTool { } /** - * Generates the TypeScript code for the new component model. + * Generates the TypeScript code for the new component model by copying the target model's class body. */ private async generateComponentModelCode( targetModel: DecoratedClass, sourceModel: DecoratedClass, cache: MetadataCache ): Promise { - const lines: string[] = []; - - // Get datasource from source model + // Step 1: Get the target model document to extract the class body + const targetDocument = await vscode.workspace.openTextDocument(targetModel.declaration.uri); + + // Step 2: Extract the complete class body from the target model + const classBody = this.sourceCodeService.extractClassBody(targetDocument, targetModel.name); + + // Step 3: Get datasource from source model const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; - - // Add model decorator - if (dataSource) { - lines.push(`@Model({`); - lines.push(`\tdataSource: ${dataSource}`); - lines.push(`})`); - } else { - lines.push(`@Model()`); + + // Step 4: Extract any enums from the target model file + const enumDefinitions = this.extractEnumDefinitions(targetDocument); + + // Step 5: Check for enum name conflicts and resolve them + const sourceDocument = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + const resolvedEnums = await this.resolveEnumConflicts(enumDefinitions, sourceDocument, classBody, sourceModel.name); + + // Step 6: Generate the complete component model content + let componentModelCode = this.sourceCodeService.generateModelFileContent( + targetModel.name, + resolvedEnums.updatedClassBody, + `PersistentComponentModel<${sourceModel.name}>`, // Use component model base class + dataSource, + new Set(["Field", "PersistentComponentModel"]), // Ensure required imports + true // This is a component model (no export keyword) + ); + + // Step 7: Extract only the component model part (remove imports and add enums) + const componentModelParts = this.extractComponentModelFromFileContent(componentModelCode); + + // Step 8: Add enum definitions if any exist + if (resolvedEnums.enumDefinitions.length > 0) { + const enumsContent = resolvedEnums.enumDefinitions.join('\n\n'); + return `${enumsContent}\n\n${componentModelParts}`; } + + return componentModelParts; + } - // Add class declaration as component model - lines.push(`class ${targetModel.name} extends PersistentComponentModel<${sourceModel.name}> {`); - lines.push(``); - - // Copy fields from the original model (except decorators that might not be compatible) - for (const [fieldName, field] of Object.entries(targetModel.properties)) { - // Add field decorators (filter out any that might be problematic) - const validDecorators = field.decorators.filter(d => - d.name === "Field" || - d.name === "Text" || - d.name === "Integer" || - d.name === "Number" || - d.name === "Boolean" || - d.name === "Date" || - d.name === "Email" || - d.name === "LongText" || - d.name === "Html" - ); - - // If no Field decorator, add one - if (!validDecorators.some(d => d.name === "Field")) { - lines.push(`\t@Field({})`); + /** + * Extracts enum definitions from a document. + */ + private extractEnumDefinitions(document: vscode.TextDocument): string[] { + const content = document.getText(); + const lines = content.split('\n'); + const enumDefinitions: string[] = []; + + let currentEnum: string[] = []; + let inEnum = false; + let braceCount = 0; + + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Check if we're starting an enum + if (line.trim().startsWith('export enum ') || line.trim().startsWith('enum ')) { + inEnum = true; + braceCount = 0; } + + if (inEnum) { + currentEnum.push(line); + + // Count braces + const openBraces = (line.match(/{/g) || []).length; + const closeBraces = (line.match(/}/g) || []).length; + braceCount += openBraces - closeBraces; + + // If we've closed all braces, we're done with this enum + if (braceCount === 0 && line.includes('}')) { + inEnum = false; + enumDefinitions.push(currentEnum.join('\n')); + currentEnum = []; + } + } + } + + return enumDefinitions; + } - // Add other decorators - for (const decorator of validDecorators) { - if (decorator.name !== "Field") { - lines.push(`\t@${decorator.name}()`); - } else { - lines.push(`\t@Field({})`); + /** + * Resolves enum name conflicts between target and source files. + */ + private async resolveEnumConflicts( + enumDefinitions: string[], + sourceDocument: vscode.TextDocument, + classBody: string, + sourceModelName: string + ): Promise<{ enumDefinitions: string[]; updatedClassBody: string }> { + if (enumDefinitions.length === 0) { + return { enumDefinitions: [], updatedClassBody: classBody }; + } + + const sourceContent = sourceDocument.getText(); + const existingEnums = this.extractEnumNames(sourceContent); + const resolvedEnums: string[] = []; + let updatedClassBody = classBody; + + for (const enumDef of enumDefinitions) { + const enumName = this.extractEnumName(enumDef); + + if (enumName && existingEnums.includes(enumName)) { + // Conflict detected, rename the enum + const newEnumName = `${sourceModelName}${enumName}`; + existingEnums.push(newEnumName); // Add to list to avoid future conflicts + + // Update enum definition + const updatedEnumDef = enumDef.replace( + new RegExp(`enum\\s+${enumName}\\b`), + `enum ${newEnumName}` + ); + + // Update class body to use new enum name + updatedClassBody = updatedClassBody.replace( + new RegExp(`\\b${enumName}\\b`, 'g'), + newEnumName + ); + + resolvedEnums.push(updatedEnumDef); + } else { + resolvedEnums.push(enumDef); + if (enumName) { + existingEnums.push(enumName); } } + } + + return { enumDefinitions: resolvedEnums, updatedClassBody }; + } - // Add property declaration - lines.push(`\t${fieldName}!: ${field.type};`); - lines.push(``); + /** + * Extracts enum names from file content. + */ + private extractEnumNames(content: string): string[] { + const enumRegex = /(?:export\s+)?enum\s+(\w+)/g; + const enumNames: string[] = []; + let match; + + while ((match = enumRegex.exec(content)) !== null) { + enumNames.push(match[1]); } + + return enumNames; + } - lines.push(`}`); + /** + * Extracts enum name from an enum definition. + */ + private extractEnumName(enumDefinition: string): string | null { + const match = enumDefinition.match(/(?:export\s+)?enum\s+(\w+)/); + return match ? match[1] : null; + } - return lines.join("\n"); + /** + * Extracts only the component model part from full file content (removes imports). + */ + private extractComponentModelFromFileContent(fileContent: string): string { + const lines = fileContent.split('\n'); + const result: string[] = []; + let foundModel = false; + + for (const line of lines) { + // Skip import lines + if (line.trim().startsWith('import ')) { + continue; + } + + // Skip empty lines before the model + if (!foundModel && line.trim() === '') { + continue; + } + + // Once we find the model decorator or class, include everything + if (line.trim().startsWith('@Model') || line.includes('class ')) { + foundModel = true; + } + + if (foundModel) { + result.push(line); + } + } + + return result.join('\n'); } /** * Removes the @Reference and @Field decorators from the field. */ - private async removeReferenceField(document: vscode.TextDocument, field: PropertyMetadata): Promise { - const edit = new vscode.WorkspaceEdit(); - - // Find and remove @Reference and @Field decorators - for (const decorator of field.decorators) { - if (decorator.name === "Reference" || decorator.name === "Field") { - const decoratorLine = document.lineAt(decorator.position.start.line); - edit.delete(document.uri, decoratorLine.rangeIncludingLineBreak); + private async removeReferenceField(document: vscode.TextDocument, field: PropertyMetadata, cache: MetadataCache): Promise { + // Find the model name that contains this field + const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); + let modelName = 'Unknown'; + + if (fileMetadata) { + for (const [className, classData] of Object.entries(fileMetadata.classes)) { + // Type assertion since we know the structure from cache + const classInfo = classData as DecoratedClass; + if (classInfo.properties[field.name] === field) { + modelName = className; + break; + } } } - await vscode.workspace.applyEdit(edit); + // Use the DeleteFieldTool to programmatically remove the field + const workspaceEdit = await this.deleteFieldTool.deleteFieldProgrammatically( + field, + modelName, + cache + ); + + // Apply the workspace edit + await vscode.workspace.applyEdit(workspaceEdit); } /** From afe08d133490799b3ebed338c2b807346f6d360f Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 15 Sep 2025 10:39:06 -0300 Subject: [PATCH 178/254] Refactored the commands registration. --- src/commands/commandHelpers.ts | 189 +++++++++++++++++ src/commands/commandRegistration.ts | 304 +++++++--------------------- 2 files changed, 261 insertions(+), 232 deletions(-) create mode 100644 src/commands/commandHelpers.ts diff --git a/src/commands/commandHelpers.ts b/src/commands/commandHelpers.ts new file mode 100644 index 0000000..22915b3 --- /dev/null +++ b/src/commands/commandHelpers.ts @@ -0,0 +1,189 @@ +import * as vscode from 'vscode'; +import { AppTreeItem } from '../explorer/appTreeItem'; + +/** + * Interface for URI resolution options + */ +export interface UriResolutionOptions { + /** Whether to require a TypeScript file */ + requireTypeScript?: boolean; + /** Whether to require a model file (contains @Model) */ + requireModel?: boolean; + /** Whether to allow fallback to active editor */ + allowActiveEditorFallback?: boolean; + /** Whether to use workspace folder as fallback when no URI provided */ + useWorkspaceFolderFallback?: boolean; + /** Error message when no URI is provided */ + noUriErrorMessage?: string; + /** Error message when file is not TypeScript */ + notTypeScriptErrorMessage?: string; + /** Error message when file is not a model */ + notModelErrorMessage?: string; +} + +/** + * Result of URI resolution + */ +export interface UriResolutionResult { + /** Resolved target URI */ + targetUri: vscode.Uri; + /** Model name if available from AppTreeItem */ + modelName?: string; + /** The document for the resolved URI */ + document?: vscode.TextDocument; +} + +/** + * Default options for URI resolution + */ +const DEFAULT_URI_OPTIONS: UriResolutionOptions = { + requireTypeScript: true, + requireModel: false, + allowActiveEditorFallback: true, + useWorkspaceFolderFallback: false, + noUriErrorMessage: 'Please select a file or open one in the editor.', + notTypeScriptErrorMessage: 'Please select a TypeScript file (.ts).', + notModelErrorMessage: 'The selected file does not appear to be a model file.' +}; + +/** + * Resolves a URI from various input sources with validation + */ +export async function resolveTargetUri( + uri?: vscode.Uri | AppTreeItem, + options: UriResolutionOptions = {} +): Promise { + const opts = { ...DEFAULT_URI_OPTIONS, ...options }; + let targetUri: vscode.Uri; + let modelName: string | undefined; + + // Step 1: Resolve the URI from different sources + if (uri) { + if (uri instanceof vscode.Uri) { + targetUri = uri; + } else { + // AppTreeItem case + if ((uri.itemType === 'model' || uri.itemType === 'compositionField') && uri.metadata?.declaration?.uri) { + targetUri = uri.metadata.declaration.uri; + modelName = uri.metadata?.name; + } else { + throw new Error(opts.noUriErrorMessage!); + } + } + } else { + // Fallback to active editor if allowed + if (opts.allowActiveEditorFallback) { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + // Use workspace folder as final fallback if allowed + if (opts.useWorkspaceFolderFallback) { + targetUri = vscode.workspace.workspaceFolders?.[0]?.uri ?? vscode.Uri.file(''); + } else { + throw new Error(opts.noUriErrorMessage!); + } + } else { + targetUri = activeEditor.document.uri; + } + } else { + throw new Error(opts.noUriErrorMessage!); + } + } + + // Step 2: Validate TypeScript file if required + if (opts.requireTypeScript && !targetUri.fsPath.endsWith('.ts')) { + throw new Error(opts.notTypeScriptErrorMessage!); + } + + // Step 3: Load document and validate model if required + let document: vscode.TextDocument | undefined; + if (opts.requireModel) { + document = await vscode.workspace.openTextDocument(targetUri); + const content = document.getText(); + + if (!content.includes('@Model')) { + throw new Error(opts.notModelErrorMessage!); + } + } + + return { + targetUri, + modelName, + document + }; +} + +/** + * Creates a standardized command handler that includes error handling + */ +export function createCommandHandler( + commandFn: (result: UriResolutionResult, ...args: any[]) => Promise, + uriOptions?: UriResolutionOptions +) { + return async (uri?: vscode.Uri | AppTreeItem, ...additionalArgs: any[]) => { + try { + const result = await resolveTargetUri(uri, uriOptions); + await commandFn(result, ...additionalArgs); + } catch (error) { + vscode.window.showErrorMessage(`${error}`); + } + }; +} + +/** + * Creates a command registration helper + */ +export function registerCommand( + disposables: vscode.Disposable[], + commandId: string, + commandFn: (result: UriResolutionResult, ...args: any[]) => Promise, + uriOptions?: UriResolutionOptions +): void { + const handler = createCommandHandler(commandFn, uriOptions); + const command = vscode.commands.registerCommand(commandId, handler); + disposables.push(command); +} + +/** + * Pre-configured URI resolution options for common scenarios + */ +export const URI_OPTIONS = { + /** For commands that work with any TypeScript file */ + TYPESCRIPT_FILE: { + requireTypeScript: true, + requireModel: false, + allowActiveEditorFallback: true, + useWorkspaceFolderFallback: false, + noUriErrorMessage: 'Please select a TypeScript file or open one in the editor.', + notTypeScriptErrorMessage: 'Please select a TypeScript file (.ts).' + } as UriResolutionOptions, + + /** For commands that specifically need model files */ + MODEL_FILE: { + requireTypeScript: true, + requireModel: true, + allowActiveEditorFallback: true, + useWorkspaceFolderFallback: false, + noUriErrorMessage: 'Please select a model file or open one in the editor.', + notTypeScriptErrorMessage: 'Please select a TypeScript model file (.ts).', + notModelErrorMessage: 'The selected file does not appear to be a model file.' + } as UriResolutionOptions, + + /** For commands that require explicit file selection (no active editor fallback) */ + EXPLICIT_MODEL_SELECTION: { + requireTypeScript: true, + requireModel: false, + allowActiveEditorFallback: false, + useWorkspaceFolderFallback: false, + noUriErrorMessage: 'Please select a model file.', + notTypeScriptErrorMessage: 'Please select a TypeScript model file (.ts).' + } as UriResolutionOptions, + + /** For commands that work with any file type */ + ANY_FILE: { + requireTypeScript: false, + requireModel: false, + allowActiveEditorFallback: true, + useWorkspaceFolderFallback: true, + noUriErrorMessage: 'Please select a file or open one in the editor.' + } as UriResolutionOptions +}; diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index 6747324..167aacf 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -4,7 +4,6 @@ import { ExplorerProvider } from '../explorer/explorerProvider'; import { NewModelTool } from './models/newModel'; import { DefineFieldsTool } from './fields/defineFields'; import { AddFieldTool } from './fields/addField'; -import { ChangeReferenceToCompositionTool } from './fields/changeReferenceToComposition'; import { NewFolderTool } from './folders/newFolder'; import { DeleteFolderTool } from './folders/deleteFolder'; import { RenameFolderTool } from './folders/renameFolder'; @@ -16,6 +15,7 @@ import { AddCompositionTool } from './models/addComposition'; import { AddReferenceTool } from './models/addReference'; import { AIService } from '../services/aiService'; import { ProjectAnalysisService } from '../services/projectAnalysisService'; +import { registerCommand, URI_OPTIONS, UriResolutionResult } from './commandHelpers'; export function registerGeneralCommands( context: vscode.ExtensionContext, @@ -26,6 +26,8 @@ export function registerGeneralCommands( const aiService = new AIService(); const projectAnalysisService = new ProjectAnalysisService(); + + // Navigation command const navigateToCodeCommand = vscode.commands.registerCommand('slingr-vscode-extension.navigateToCode', (location: vscode.Location) => { vscode.window.showTextDocument(location.uri).then(editor => { @@ -50,218 +52,87 @@ export function registerGeneralCommands( // New Model Tool const newModelTool = new NewModelTool(); - const newModelCommand = vscode.commands.registerCommand('slingr-vscode-extension.newModel', (uri?: vscode.Uri | AppTreeItem) => { - // If no URI provided, use the current workspace folder - const targetUri = uri || (vscode.workspace.workspaceFolders?.[0]?.uri ?? vscode.Uri.file('')); - return newModelTool.createNewModel(targetUri, cache); - }); - disposables.push(newModelCommand); + registerCommand( + disposables, + 'slingr-vscode-extension.newModel', + async (result: UriResolutionResult) => { + await newModelTool.createNewModel(result.targetUri, cache); + }, + URI_OPTIONS.ANY_FILE + ); // Define Fields Tool const defineFieldsTool = new DefineFieldsTool(); - const defineFieldsCommand = vscode.commands.registerCommand('slingr-vscode-extension.defineFields', async (uri?: vscode.Uri | AppTreeItem) => { - let targetUri: vscode.Uri; - - if (uri) { - // URI provided from context menu (right-click on file in explorer) - if (uri instanceof vscode.Uri) { - targetUri = uri; - } else { - // AppTreeItem case - check if it's a model with metadata - if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { - targetUri = uri.metadata.declaration.uri; - } else { - vscode.window.showErrorMessage('Please select a model file to define fields for.'); - return; - } + registerCommand( + disposables, + 'slingr-vscode-extension.defineFields', + async (result: UriResolutionResult) => { + const document = result.document || await vscode.workspace.openTextDocument(result.targetUri); + + const model = await projectAnalysisService.findModelClass(document, cache); + if (!model) { + throw new Error('Could not identify a model class in the selected file.'); } - } else { - // Fallback to active editor if no URI provided - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please select a model file or open one in the editor to define fields.'); - return; + + // Get field descriptions from user + const fieldsDescription = await vscode.window.showInputBox({ + prompt: "Enter field descriptions to be processed by AI", + placeHolder: "e.g., title, description, project (relationship to Project), status (enum: todo, in-progress, done)", + ignoreFocusOut: true + }); + + if (!fieldsDescription) { + return; // User cancelled } - targetUri = activeEditor.document.uri; - } - - // Validate that it's a TypeScript file - if (!targetUri.fsPath.endsWith('.ts')) { - vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); - return; - } - - // Open the document to extract model information - const document = await vscode.workspace.openTextDocument(targetUri); - const content = document.getText(); - - // Check if this is a model file - if (!content.includes('@Model')) { - vscode.window.showErrorMessage('The selected file does not appear to be a model file.'); - return; - } - - const model = await projectAnalysisService.findModelClass(document, cache); - - if (!model) { - vscode.window.showErrorMessage('Could not identify a model class in the selected file.'); - return; - } - const modelName = model?.name; - - // Get field descriptions from user - const fieldsDescription = await vscode.window.showInputBox({ - prompt: "Enter field descriptions to be processed by AI", - placeHolder: "e.g., title, description, project (relationship to Project), status (enum: todo, in-progress, done)", - ignoreFocusOut: true - }); - - if (!fieldsDescription) { - return; // User cancelled - } - try { await defineFieldsTool.processFieldDescriptions( fieldsDescription, - targetUri, + result.targetUri, cache, - modelName + model.name ); - } catch (error) { - vscode.window.showErrorMessage(`Failed to process field descriptions: ${error}`); - } - }); - disposables.push(defineFieldsCommand); + }, + URI_OPTIONS.MODEL_FILE + ); // Add Field Tool const addFieldTool = new AddFieldTool(); - const addFieldCommand = vscode.commands.registerCommand('slingr-vscode-extension.addField', async (uri?: vscode.Uri | AppTreeItem) => { - let targetUri: vscode.Uri; - - if (uri) { - // URI provided from context menu (right-click on file in explorer) - if (uri instanceof vscode.Uri) { - targetUri = uri; - } else { - // AppTreeItem case - check if it's a model with metadata - if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { - targetUri = uri.metadata.declaration.uri; - } else { - vscode.window.showErrorMessage('Please select a model file to add a field to.'); - return; - } - } - } else { - // Fallback to active editor if no URI provided - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please select a model file or open one in the editor to add a field.'); - return; - } - targetUri = activeEditor.document.uri; - } - - // Validate that it's a TypeScript file - if (!targetUri.fsPath.endsWith('.ts')) { - vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); - return; - } - - try { - await addFieldTool.addField(targetUri, cache); - } catch (error) { - vscode.window.showErrorMessage(`Failed to add field: ${error}`); - } - }); - disposables.push(addFieldCommand); + registerCommand( + disposables, + 'slingr-vscode-extension.addField', + async (result: UriResolutionResult) => { + await addFieldTool.addField(result.targetUri, cache); + }, + URI_OPTIONS.MODEL_FILE + ); // Add Composition Tool const addCompositionTool = new AddCompositionTool(explorerProvider); - const addCompositionCommand = vscode.commands.registerCommand('slingr-vscode-extension.addComposition', async (uri?: vscode.Uri | AppTreeItem) => { - let targetUri: vscode.Uri; - let modelName: string | undefined; - - if (uri) { - // URI provided from context menu (right-click on file in explorer) - if (uri instanceof vscode.Uri) { - targetUri = uri; - } else { - // AppTreeItem case - check if it's a model with metadata - if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { - targetUri = uri.metadata.declaration.uri; - modelName = uri.metadata?.name; - } else { - vscode.window.showErrorMessage('Please select a model file to add a composition to.'); - return; - } + registerCommand( + disposables, + 'slingr-vscode-extension.addComposition', + async (result: UriResolutionResult) => { + if (!result.modelName) { + throw new Error('Model name could not be determined.'); } - } else { - throw new Error('URI must be provided to add a composition.'); - } - - // Validate that it's a TypeScript file - if (!targetUri.fsPath.endsWith('.ts')) { - vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); - return; - } - - try { - if (modelName) { - await addCompositionTool.addComposition(cache, modelName); - } - else{ - vscode.window.showErrorMessage('Model name could not be determined.'); - } - - } catch (error) { - vscode.window.showErrorMessage(`Failed to add composition: ${error}`); - } - }); - disposables.push(addCompositionCommand); + await addCompositionTool.addComposition(cache, result.modelName); + }, + URI_OPTIONS.EXPLICIT_MODEL_SELECTION + ); // Add Reference Tool - const addReferenceTool = new AddReferenceTool(explorerProvider); - const addReferenceCommand = vscode.commands.registerCommand('slingr-vscode-extension.addReference', async (uri?: vscode.Uri | AppTreeItem) => { - let targetUri: vscode.Uri; - let modelName: string | undefined; - - if (uri) { - // URI provided from context menu (right-click on file in explorer) - if (uri instanceof vscode.Uri) { - targetUri = uri; - } else { - // AppTreeItem case - check if it's a model with metadata - if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { - targetUri = uri.metadata.declaration.uri; - modelName = uri.metadata?.name; - } else { - vscode.window.showErrorMessage('Please select a model file to add a reference to.'); - return; - } + const addReferenceTool = new AddReferenceTool(explorerProvider); + registerCommand( + disposables, + 'slingr-vscode-extension.addReference', + async (result: UriResolutionResult) => { + if (!result.modelName) { + throw new Error('Model name could not be determined.'); } - } else { - throw new Error('URI must be provided to add a reference.'); - } - - // Validate that it's a TypeScript file - if (!targetUri.fsPath.endsWith('.ts')) { - vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); - return; - } - - try { - if (modelName) { - await addReferenceTool.addReference(cache, modelName); - } - else{ - vscode.window.showErrorMessage('Model name could not be determined.'); - } - - } catch (error) { - vscode.window.showErrorMessage(`Failed to add reference: ${error}`); - } - }); - disposables.push(addReferenceCommand); + await addReferenceTool.addReference(cache, result.modelName); + }, + URI_OPTIONS.EXPLICIT_MODEL_SELECTION + ); // New Folder Tool const newFolderTool = new NewFolderTool(); @@ -286,45 +157,14 @@ export function registerGeneralCommands( // Create Test Tool const createTestTool = new CreateTestTool(aiService); - const createTestCommand = vscode.commands.registerCommand('slingr-vscode-extension.createTest', async (uri?: vscode.Uri | AppTreeItem) => { - let targetUri: vscode.Uri; - - if (uri) { - // URI provided from context menu (right-click on file in explorer) - if (uri instanceof vscode.Uri) { - targetUri = uri; - } else { - // AppTreeItem case - check if it's a model with metadata - if (uri.itemType === 'model' && uri.metadata?.declaration?.uri) { - targetUri = uri.metadata.declaration.uri; - } else { - vscode.window.showErrorMessage('Please select a model file to create a test for.'); - return; - } - } - } else { - // Fallback to active editor if no URI provided - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - vscode.window.showErrorMessage('Please select a model file or open one in the editor to create a test.'); - return; - } - targetUri = activeEditor.document.uri; - } - - // Validate that it's a TypeScript file - if (!targetUri.fsPath.endsWith('.ts')) { - vscode.window.showErrorMessage('Please select a TypeScript model file (.ts).'); - return; - } - - try { - await createTestTool.createTest(targetUri, cache); - } catch (error) { - vscode.window.showErrorMessage(`Failed to create test: ${error}`); - } - }); - disposables.push(createTestCommand); + registerCommand( + disposables, + 'slingr-vscode-extension.createTest', + async (result: UriResolutionResult) => { + await createTestTool.createTest(result.targetUri, cache); + }, + URI_OPTIONS.TYPESCRIPT_FILE + ); // General refactor command (placeholder for refactor controller integration) const refactorCommand = vscode.commands.registerCommand('slingr-vscode-extension.refactor', () => { From f705b608ec6af96340b226c5620334249e85a2a8 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 15 Sep 2025 10:41:29 -0300 Subject: [PATCH 179/254] Added changeCompositionToReference command. --- package.json | 47 ++- .../fields/changeCompositionToReference.ts | 385 ++++++++++++++++++ src/commands/models/newModel.ts | 42 ++ src/explorer/appTreeItem.ts | 3 + src/explorer/explorerProvider.ts | 39 +- src/quickInfoPanel/quickInfoProvider.ts | 2 +- src/refactor/refactorDisposables.ts | 2 + src/refactor/refactorInterfaces.ts | 2 +- .../tools/changeCompositionToReference.ts | 203 +++++++++ src/refactor/tools/deleteField.ts | 30 ++ src/services/sourceCodeService.ts | 166 ++++++++ 11 files changed, 886 insertions(+), 35 deletions(-) create mode 100644 src/commands/fields/changeCompositionToReference.ts create mode 100644 src/refactor/tools/changeCompositionToReference.ts diff --git a/package.json b/package.json index 30bce99..f476b86 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,10 @@ "command": "slingr-vscode-extension.changeReferenceToComposition", "title": "Change Reference to Composition" }, + { + "command": "slingr-vscode-extension.changeCompositionToReference", + "title": "Change Composition to Reference" + }, { "command": "slingr-vscode-extension.newModel", "title": "New Model" @@ -137,7 +141,7 @@ "view/item/context": [ { "command": "slingr-vscode-extension.newModel", - "when": "view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model')", + "when": "view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { @@ -147,37 +151,37 @@ }, { "command": "slingr-vscode-extension.defineFields", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.addField", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.addComposition", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.addReference", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.createTest", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.renameModel", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "1_modification" }, { "command": "slingr-vscode-extension.deleteModel", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "2_modification" }, { @@ -210,14 +214,19 @@ "when": "view == slingrExplorer && viewItem == 'referenceField'", "group": "3_modification" }, + { + "command": "slingr-vscode-extension.changeCompositionToReference", + "when": "view == slingrExplorer && viewItem == 'compositionField'", + "group": "3_modification" + }, { "command": "slingr-vscode-extension.createModelFromDescription", - "when": "view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model')", + "when": "view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model' || viewItem == 'compositionField')", "group": "0_creation" }, { "command": "slingr-vscode-extension.modifyModel", - "when": "view == slingrExplorer && viewItem == 'model'", + "when": "view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')", "group": "3_modification" } ], @@ -234,7 +243,7 @@ "slingr-vscode-extension.creation": [ { "command": "slingr-vscode-extension.newModel", - "when": "(view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model')) || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot' || viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "0_model" }, { @@ -249,44 +258,44 @@ }, { "command": "slingr-vscode-extension.defineFields", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "1_field" }, { "command": "slingr-vscode-extension.addField", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "1_field" }, { "command": "slingr-vscode-extension.addComposition", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "1_field" }, { "command": "slingr-vscode-extension.addReference", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "1_field" }, { "command": "slingr-vscode-extension.createTest", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "2_test" }, { "command": "slingr-vscode-extension.modifyModel", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "3_modify" } ], "slingr-vscode-extension.refactorings": [ { "command": "slingr-vscode-extension.renameModel", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "1_modification" }, { "command": "slingr-vscode-extension.deleteModel", - "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "when": "(view == slingrExplorer && (viewItem == 'model' || viewItem == 'compositionField')) || !viewItem", "group": "2_modification" }, { diff --git a/src/commands/fields/changeCompositionToReference.ts b/src/commands/fields/changeCompositionToReference.ts new file mode 100644 index 0000000..9246eed --- /dev/null +++ b/src/commands/fields/changeCompositionToReference.ts @@ -0,0 +1,385 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { FieldInfo, FieldTypeOption } from "../interfaces"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import * as path from "path"; + +/** + * Tool for converting composition relationships to reference relationships. + * + * This tool converts a @Composition field to a @Reference field by: + * 1. Finding the component model that is currently embedded + * 2. Extracting the component model to its own file + * 3. Converting the component model from PersistentComponentModel to PersistentModel + * 4. Converting the field from @Composition to @Reference + * 5. Adding the necessary imports for the new referenced model + */ +export class ChangeCompositionToReferenceTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private explorerProvider: ExplorerProvider; + private deleteFieldTool: DeleteFieldTool; + + constructor(explorerProvider: ExplorerProvider) { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.explorerProvider = explorerProvider; + this.deleteFieldTool = new DeleteFieldTool(); + } + + /** + * Converts a composition field to a reference field. + * + * @param cache - The metadata cache for context about existing models + * @param sourceModelName - The name of the model containing the composition field + * @param fieldName - The name of the composition field to convert + * @returns Promise that resolves when the conversion is complete + */ + public async changeCompositionToReference( + cache: MetadataCache, + sourceModelName: string, + fieldName: string + ): Promise { + try { + // Step 1: Validate the source model and composition field + const { sourceModel, document, compositionField, componentModel } = await this.validateCompositionField( + cache, + sourceModelName, + fieldName + ); + + // Step 2: Get confirmation from user + const shouldProceed = await this.confirmConversion(componentModel.name, sourceModelName); + if (!shouldProceed) { + return; // User cancelled + } + + // Step 3: Determine the target file path for the new independent model + const targetFilePath = await this.determineTargetFilePath(sourceModel, componentModel.name); + + // Step 4: Generate and create the independent model using existing tools + const modelFileUri = await this.generateAndCreateIndependentModel(componentModel, sourceModel, targetFilePath, cache); + + // Step 6: Remove the composition field from the source model + await this.removeCompositionField(document, compositionField, cache); + + // Step 7: Remove the component model from the source file + await this.removeComponentModel(document, componentModel, sourceModel, cache); + + // Step 8: Add the reference field to the source model + await this.addReferenceField(document, sourceModel.name, fieldName, componentModel.name, compositionField.type.endsWith('[]'), cache); + + // Step 9: Add import for the new model in the source file + const importEdit = new vscode.WorkspaceEdit(); + await this.sourceCodeService.addModelImport(document, componentModel.name, importEdit, cache); + await vscode.workspace.applyEdit(importEdit); + + // Step 10: Focus on the newly modified field + await this.sourceCodeService.focusOnElement(document, fieldName); + + // Step 11: Show success message + vscode.window.showInformationMessage( + `Composition converted to reference! The component model '${componentModel.name}' is now an independent model in its own file.` + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to change composition to reference: ${error}`); + console.error("Error changing composition to reference:", error); + } + } + + /** + * Validates that the specified field is a valid composition field. + */ + private async validateCompositionField( + cache: MetadataCache, + sourceModelName: string, + fieldName: string + ): Promise<{ + sourceModel: DecoratedClass; + document: vscode.TextDocument; + compositionField: PropertyMetadata; + componentModel: DecoratedClass; + }> { + // Get source model + const sourceModel = cache.getModelByName(sourceModelName); + if (!sourceModel) { + throw new Error(`Source model '${sourceModelName}' not found in the project`); + } + + // Get field + const compositionField = sourceModel.properties[fieldName]; + if (!compositionField) { + throw new Error(`Field '${fieldName}' not found in model '${sourceModelName}'`); + } + + // Check if field has @Composition decorator + const hasCompositionDecorator = compositionField.decorators.some(d => d.name === "Composition"); + if (!hasCompositionDecorator) { + throw new Error(`Field '${fieldName}' is not a composition field`); + } + + // Extract component model name from the field type + const componentModelName = compositionField.type.replace('[]', ''); // Remove array suffix if present + const componentModel = cache.getModelByName(componentModelName); + if (!componentModel) { + throw new Error(`Component model '${componentModelName}' not found in the project`); + } + + // Verify that the component model is actually defined in the same file as the source model + if (componentModel.declaration.uri.fsPath !== sourceModel.declaration.uri.fsPath) { + throw new Error(`Component model '${componentModelName}' is not in the same file as the source model. This operation only works with embedded component models.`); + } + + // Open source document + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + if (!document) { + throw new Error(`Could not open document for model '${sourceModelName}'`); + } + + return { sourceModel, document, compositionField, componentModel }; + } + + /** + * Asks user for confirmation before proceeding with the conversion. + */ + private async confirmConversion(componentModelName: string, sourceModelName: string): Promise { + const message = `Convert composition to reference? The component model '${componentModelName}' will be moved to its own file and become an independent model.`; + + const choice = await vscode.window.showWarningMessage( + message, + { modal: true }, + "Convert", + "Cancel" + ); + + return choice === "Convert"; + } + + /** + * Determines the target file path for the new independent model. + */ + private async determineTargetFilePath(sourceModel: DecoratedClass, componentModelName: string): Promise { + const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); + const fileName = `${componentModelName.toLowerCase()}.ts`; + return path.join(sourceDir, fileName); + } + + /** + * Creates the independent model by copying the component model's class body. + */ + private async generateAndCreateIndependentModel( + componentModel: DecoratedClass, + sourceModel: DecoratedClass, + targetFilePath: string, + cache: MetadataCache + ): Promise { + // Step 1: Get the source document to extract the class body + const sourceDocument = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + + // Step 2: Extract the complete class body from the component model + const classBody = this.sourceCodeService.extractClassBody(sourceDocument, componentModel.name); + + // Step 3: Get datasource from source model + const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); + const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; + + // Step 4: Extract existing model imports from the source file + const existingImports = this.sourceCodeService.extractModelImports(sourceDocument); + + // Step 5: Convert the class body for independent model use + const convertedClassBody = this.convertComponentClassBody(classBody); + + // Step 6: Generate the complete model file content + const modelFileContent = this.sourceCodeService.generateModelFileContent( + componentModel.name, + convertedClassBody, + "PersistentModel", // Change from PersistentComponentModel to PersistentModel + dataSource, + new Set(["Field"]), // Ensure Field is included + false // This is a standalone model (with export) + ); + + // Step 7: Create the new model file + const modelFileUri = vscode.Uri.file(targetFilePath); + const encoder = new TextEncoder(); + await vscode.workspace.fs.writeFile(modelFileUri, encoder.encode(modelFileContent)); + + // Step 8: Add model imports to the new file if needed + if (existingImports.length > 0) { + await this.addModelImportsToNewFile(modelFileUri, existingImports); + } + + console.log(`Created independent model file: ${targetFilePath}`); + return modelFileUri; + } + + /** + * Converts a component model class body to work as an independent model. + * This mainly involves ensuring proper formatting and removing any component-specific elements. + */ + private convertComponentClassBody(classBody: string): string { + // For now, we can use the class body as-is since the main difference is in the + // class declaration (PersistentComponentModel vs PersistentModel) which is handled + // in generateModelFileContent. + + // Future enhancements could include: + // - Removing component-specific decorators if any + // - Adjusting field configurations if needed + // - Updating comments that reference "component" + + return classBody; + } + + /** + * Adds model imports to the newly created model file. + */ + private async addModelImportsToNewFile(modelFileUri: vscode.Uri, importStatements: string[]): Promise { + if (importStatements.length === 0) { + return; + } + + try { + const document = await vscode.workspace.openTextDocument(modelFileUri); + const edit = new vscode.WorkspaceEdit(); + + // Find the position after the slingr-framework import + const content = document.getText(); + const lines = content.split("\n"); + + let insertPosition = 1; // Default to after first line + for (let i = 0; i < lines.length; i++) { + if (lines[i].includes("from") && lines[i].includes("slingr-framework")) { + insertPosition = i + 1; + break; + } + } + + // Add each import statement + const importsText = importStatements.join("\n") + "\n"; + edit.insert(modelFileUri, new vscode.Position(insertPosition, 0), importsText); + + await vscode.workspace.applyEdit(edit); + } catch (error) { + console.warn("Could not add model imports to new file:", error); + } + } + + /** + * Removes the @Composition and @Field decorators from the field. + */ + private async removeCompositionField(document: vscode.TextDocument, field: PropertyMetadata, cache: MetadataCache): Promise { + // Find the model name that contains this field + const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); + let modelName = 'Unknown'; + + if (fileMetadata) { + for (const [className, classData] of Object.entries(fileMetadata.classes)) { + // Type assertion since we know the structure from cache + const classInfo = classData as DecoratedClass; + if (classInfo.properties[field.name] === field) { + modelName = className; + break; + } + } + } + + // Use the DeleteFieldTool to programmatically remove the field + const workspaceEdit = await this.deleteFieldTool.deleteFieldProgrammatically( + field, + modelName, + cache + ); + + // Apply the workspace edit + await vscode.workspace.applyEdit(workspaceEdit); + } + + /** + * Removes the component model from the source file. + */ + private async removeComponentModel( + document: vscode.TextDocument, + componentModel: DecoratedClass, + sourceModel: DecoratedClass, + cache: MetadataCache + ): Promise { + // Get the text range for the component model + const modelRange = componentModel.declaration.range; + + // Extend the range to include any preceding decorators and following whitespace + const extendedRange = new vscode.Range( + new vscode.Position(Math.max(0, modelRange.start.line - 5), 0), // Include decorators + new vscode.Position(modelRange.end.line + 2, 0) // Include trailing whitespace + ); + + // Create workspace edit to remove the component model + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.delete(document.uri, extendedRange); + + await vscode.workspace.applyEdit(workspaceEdit); + } + + /** + * Adds the reference field to the source model. + */ + private async addReferenceField( + document: vscode.TextDocument, + sourceModelName: string, + fieldName: string, + targetModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Create field info for the reference field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Reference", + tsType: isArray ? `${targetModelName}[]` : targetModelName, + description: "Reference relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // References are typically optional + additionalConfig: { + relationshipType: "reference", + targetModel: targetModelName, + }, + }; + + // Generate the field code + const fieldCode = this.generateReferenceFieldCode(fieldInfo, targetModelName, isArray); + + // Insert the field + await this.sourceCodeService.insertField(document, sourceModelName, fieldInfo, fieldCode, cache, false); + } + + /** + * Generates the TypeScript code for the reference field. + */ + private generateReferenceFieldCode(fieldInfo: FieldInfo, targetModelName: string, isArray: boolean): string { + const lines: string[] = []; + + // Add Field decorator + lines.push("@Field({})"); + + // Add Reference decorator + lines.push("@Reference()"); + + // Add property declaration + const typeDeclaration = isArray ? `${targetModelName}[]` : targetModelName; + lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + + return lines.join("\n"); + } +} diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 483bec7..8d57dea 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -368,6 +368,48 @@ export class NewModelTool implements AIEnhancedTool { ); } + /** + * Creates a new model file programmatically without user interaction. + * + * @param modelName - The name of the model to create + * @param targetFilePath - The full file path where the model should be created + * @param docs - Optional documentation for the model + * @param dataSource - Optional datasource configuration + * @returns Promise that resolves when the model is created + */ + public async createModelProgrammatically( + modelName: string, + targetFilePath: string, + docs?: string, + dataSource?: string + ): Promise { + try { + // Generate model content + const modelContent = this.generateModelContent(modelName, docs); + + // Modify the content to include datasource if provided + let finalContent = modelContent; + if (dataSource) { + finalContent = finalContent.replace( + '@Model()', + `@Model({\n\tdataSource: ${dataSource}\n})` + ); + } + + // Create the file + const targetFileUri = await this.fileSystemService.createFile( + modelName, + targetFilePath, + finalContent, + false // Don't handle overwrite since we control the path + ); + + return targetFileUri; + } catch (error) { + throw new Error(`Failed to create model programmatically: ${error}`); + } + } + public toCamelCase(str: string): string { return str.charAt(0).toLowerCase() + str.slice(1); } diff --git a/src/explorer/appTreeItem.ts b/src/explorer/appTreeItem.ts index 9a47ee8..44146c1 100644 --- a/src/explorer/appTreeItem.ts +++ b/src/explorer/appTreeItem.ts @@ -45,6 +45,9 @@ export class AppTreeItem extends vscode.TreeItem { case "referenceField": iconFileName = "field.svg"; // You could create a specific icon for reference fields break; + case "compositionField": + iconFileName = "model-type.svg"; // You could create a specific icon for composition fields + break; case "modelActionsFolder": iconFileName = "action.svg"; break; diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index f29a7d1..2ba31fb 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -487,20 +487,26 @@ export class ExplorerProvider // --- DATA SOURCES ROOT --- if (element.itemType === "dataSourcesRoot") { - const dataSources = this.cache.getDataSources(); - return dataSources.map(ds => { - const item = new AppTreeItem(ds.name, vscode.TreeItemCollapsibleState.None, "dataSource", this.extensionUri, ds as any); - item.command = { - command: 'slingr-vscode-extension.handleTreeItemClick', - title: 'Handle Click', - arguments: [item] - }; - return item; - }); + const dataSources = this.cache.getDataSources(); + return dataSources.map((ds) => { + const item = new AppTreeItem( + ds.name, + vscode.TreeItemCollapsibleState.None, + "dataSource", + this.extensionUri, + ds as any + ); + item.command = { + command: "slingr-vscode-extension.handleTreeItemClick", + title: "Handle Click", + arguments: [item], + }; + return item; + }); } // --- Children of a specific Model --- - if (element.itemType === "model" && this.isDecoratedClass(element.metadata)) { + if ((element.itemType === "model" || element.itemType === "compositionField") && this.isDecoratedClass(element.metadata)) { const modelClass = element.metadata; const fields = Object.values(element.metadata.properties).filter((prop) => @@ -522,7 +528,7 @@ export class ExplorerProvider const compositionItem = new AppTreeItem( upperFieldName, vscode.TreeItemCollapsibleState.Collapsed, - "model", + "compositionField", this.extensionUri, relatedModel, element @@ -743,8 +749,13 @@ export class ExplorerProvider // Check if this is a reference field and adjust the itemType accordingly let actualItemType = itemType; - if (itemType === "field" && propData.decorators.some(d => d.name === "Reference")) { - actualItemType = "referenceField"; + if (itemType === "field") { + if (propData.decorators.some((d) => d.name === "Reference")) { + actualItemType = "referenceField"; + } + else if (propData.decorators.some((d) => d.name === "Composition")) { + actualItemType = "compositionField"; + } } const item = new AppTreeItem( diff --git a/src/quickInfoPanel/quickInfoProvider.ts b/src/quickInfoPanel/quickInfoProvider.ts index a365c4c..705dfff 100644 --- a/src/quickInfoPanel/quickInfoProvider.ts +++ b/src/quickInfoPanel/quickInfoProvider.ts @@ -162,7 +162,7 @@ export class QuickInfoProvider implements vscode.WebviewViewProvider { const { itemType, name, parentClassName } = data; let foundMetadata: MetadataItem | undefined; - if (itemType === 'field' && parentClassName) { + if ((itemType === 'field' || itemType === 'referenceField') && parentClassName) { const [parentClass] = this.cache.findMetadata( item => 'properties' in item && item.name === parentClassName ) as DecoratedClass[]; diff --git a/src/refactor/refactorDisposables.ts b/src/refactor/refactorDisposables.ts index 016f5bc..80d8b14 100644 --- a/src/refactor/refactorDisposables.ts +++ b/src/refactor/refactorDisposables.ts @@ -11,6 +11,7 @@ import { cache } from '../extension'; import { AppTreeItem } from '../explorer/appTreeItem'; import { AddDecoratorTool } from './tools/addDecorator'; import { ChangeReferenceToCompositionRefactorTool } from './tools/changeReferenceToComposition'; +import { ChangeCompositionToReferenceRefactorTool } from './tools/changeCompositionToReference'; import { isModelFile } from '../utils/metadata'; import { PropertyMetadata } from '../cache/cache'; import { fieldTypeConfig } from '../utils/fieldTypes'; @@ -38,6 +39,7 @@ export function getAllRefactorTools(): IRefactorTool[] { new ChangeFieldTypeTool(), new AddDecoratorTool(), new ChangeReferenceToCompositionRefactorTool(), + new ChangeCompositionToReferenceRefactorTool(), ]; } diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index b6a7957..5a84e3e 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -142,7 +142,7 @@ export interface ChangeReferenceToCompositionPayload { * - `ADD_DECORATOR`: A change that adds a decorator to a field. * - `CHANGE_REFERENCE_TO_COMPOSITION`: A change that converts a reference field to a composition field. */ -export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR' | 'CHANGE_REFERENCE_TO_COMPOSITION'; +export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR' | 'CHANGE_REFERENCE_TO_COMPOSITION' | 'CHANGE_COMPOSITION_TO_REFERENCE'; /** * Represents a single, atomic change to be applied as part of a refactoring operation. diff --git a/src/refactor/tools/changeCompositionToReference.ts b/src/refactor/tools/changeCompositionToReference.ts new file mode 100644 index 0000000..49dbf02 --- /dev/null +++ b/src/refactor/tools/changeCompositionToReference.ts @@ -0,0 +1,203 @@ +import * as vscode from "vscode"; +import { + IRefactorTool, + ChangeObject, + ManualRefactorContext, +} from "../refactorInterfaces"; +import { MetadataCache, PropertyMetadata, DecoratedClass } from "../../cache/cache"; +import { ChangeCompositionToReferenceTool } from "../../commands/fields/changeCompositionToReference"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { isModelFile } from "../../utils/metadata"; + +/** + * Payload interface for changing a composition field to a reference field. + */ +export interface ChangeCompositionToReferencePayload { + sourceModelName: string; + fieldName: string; + fieldMetadata: PropertyMetadata; + isManual: boolean; +} + +/** + * Refactor tool for converting composition fields to reference fields. + * + * This tool allows users to convert @Composition fields to @Reference fields + * through the VS Code refactor menu. It validates that the field is indeed + * a composition field before allowing the conversion. + */ +export class ChangeCompositionToReferenceRefactorTool implements IRefactorTool { + + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.changeCompositionToReference"; + } + + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Change Composition to Reference"; + } + + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["CHANGE_COMPOSITION_TO_REFERENCE"]; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Only allows conversion if this is a component model that has a parent with a composition field. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; + } + + // Must have class metadata (since composition fields are shown as models in explorer) + if (!context.metadata || !('name' in context.metadata)) { + return false; + } + + const componentModel = context.metadata as DecoratedClass; + + // Check if this is a component model by looking for a parent model with a composition field pointing to it + const parentFieldInfo = this.findParentCompositionField(context.cache, componentModel); + + return parentFieldInfo !== null; + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by creating a change object. + */ + async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('decorators' in context.metadata)) { + return undefined; + } + + // When right-clicking on a composition field (shown as a model in explorer), + // context.metadata is the component model, not the field metadata + const componentModel = context.metadata as DecoratedClass; + + // Find the parent model and field that has a composition relationship to this component model + const cache = context.cache; + const parentFieldInfo = this.findParentCompositionField(cache, componentModel); + + if (!parentFieldInfo) { + vscode.window.showErrorMessage("Could not find the parent model with composition field for this component model"); + return undefined; + } + + const payload: ChangeCompositionToReferencePayload = { + sourceModelName: parentFieldInfo.parentModel.name, + fieldName: parentFieldInfo.fieldName, + fieldMetadata: parentFieldInfo.fieldMetadata, + isManual: true, + }; + + return { + type: "CHANGE_COMPOSITION_TO_REFERENCE", + uri: context.uri, + description: `Change composition field '${parentFieldInfo.fieldName}' to reference in model '${parentFieldInfo.parentModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + * This delegates to the actual implementation tool. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ChangeCompositionToReferencePayload; + + // We don't actually prepare the edit here since the command tool handles everything + // This is more of a trigger for the actual implementation + const workspaceEdit = new vscode.WorkspaceEdit(); + + // Execute the actual command + setTimeout(async () => { + try { + // Get the explorer provider from the extension context + // For now, we'll create a mock explorer provider + const explorerProvider = { + refresh: () => {} + } as any; + + const tool = new ChangeCompositionToReferenceTool(explorerProvider); + await tool.changeCompositionToReference( + cache, + payload.sourceModelName, + payload.fieldName + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to change composition to reference: ${error}`); + } + }, 100); + + return workspaceEdit; + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModel(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + prop => prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } + + /** + * Finds the parent model that has a composition field pointing to the given component model. + */ + private findParentCompositionField(cache: MetadataCache, componentModel: DecoratedClass): { + parentModel: DecoratedClass; + fieldName: string; + fieldMetadata: PropertyMetadata; + } | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + for (const [fieldName, fieldMetadata] of Object.entries(model.properties)) { + // Check if this field has a @Composition decorator and points to the component model + const hasCompositionDecorator = fieldMetadata.decorators.some(d => d.name === "Composition"); + if (hasCompositionDecorator) { + // Check if the field type matches the component model name (handle both singular and array types) + const fieldType = fieldMetadata.type.replace('[]', ''); // Remove array suffix if present + if (fieldType === componentModel.name) { + return { + parentModel: model, + fieldName: fieldName, + fieldMetadata: fieldMetadata + }; + } + } + } + } + + return null; + } +} diff --git a/src/refactor/tools/deleteField.ts b/src/refactor/tools/deleteField.ts index 4da57f7..008c10c 100644 --- a/src/refactor/tools/deleteField.ts +++ b/src/refactor/tools/deleteField.ts @@ -253,6 +253,36 @@ export class DeleteFieldTool implements IRefactorTool { return workspaceEdit; } + /** + * Deletes a field programmatically without user interaction. + * This is useful for automated refactoring operations. + * + * @param fieldMetadata The metadata of the field to delete + * @param modelName The name of the model containing the field + * @param cache The metadata cache + * @returns A promise that resolves to a WorkspaceEdit for the deletion + */ + public async deleteFieldProgrammatically( + fieldMetadata: PropertyMetadata, + modelName: string, + cache: MetadataCache + ): Promise { + const payload: DeleteFieldPayload = { + oldFieldMetadata: fieldMetadata, + modelName: modelName, + isManual: true // Use manual mode to actually remove the field declaration + }; + + const change: ChangeObject = { + type: 'DELETE_FIELD', + uri: fieldMetadata.declaration.uri, + description: `Delete field '${fieldMetadata.name}' programmatically.`, + payload + }; + + return await this.prepareEdit(change, cache); + } + /** * Executes a prompt to help fix broken field references after a field deletion. * diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index edb92ed..76cf250 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -389,6 +389,172 @@ export class SourceCodeService { } } + /** + * Extracts the complete class body (everything between the class braces) from a model. + * + * @param document - The document containing the model + * @param className - The name of the class to extract from + * @returns The class body content including proper indentation + */ + public extractClassBody(document: vscode.TextDocument, className: string): string { + const lines = document.getText().split("\n"); + const { classStartLine, classEndLine } = this.findClassBoundaries(lines, className); + + // Find the opening brace of the class + let openBraceIndex = -1; + for (let i = classStartLine; i <= classEndLine; i++) { + if (lines[i].includes("{")) { + openBraceIndex = i; + break; + } + } + + if (openBraceIndex === -1) { + throw new Error(`Could not find opening brace for class ${className}`); + } + + // Extract content between the braces (excluding the braces themselves) + const classBodyLines = lines.slice(openBraceIndex + 1, classEndLine); + + // Remove any empty lines at the end + while (classBodyLines.length > 0 && classBodyLines[classBodyLines.length - 1].trim() === "") { + classBodyLines.pop(); + } + + return classBodyLines.join("\n"); + } + + /** + * Creates a complete model file with the given class body content. + * + * @param modelName - The name of the new model class + * @param classBody - The complete class body content + * @param baseClass - The base class to extend (default: "PersistentModel") + * @param dataSource - Optional datasource for the model + * @param existingImports - Set of imports that should be included + * @param isComponent - Whether this is a component model (affects export and class declaration) + * @returns The complete model file content + */ + public generateModelFileContent( + modelName: string, + classBody: string, + baseClass: string = "PersistentModel", + dataSource?: string, + existingImports?: Set, + isComponent: boolean = false + ): string { + const lines: string[] = []; + + // Determine required imports + const imports = new Set(["Model", "Field"]); + + // Add base class to imports (handle complex base classes like PersistentComponentModel) + const baseClassCore = baseClass.split('<')[0]; // Extract base class name before generic + imports.add(baseClassCore); + + // Add existing imports if provided + if (existingImports) { + existingImports.forEach(imp => imports.add(imp)); + } + + // Analyze the class body to determine additional needed imports + const bodyImports = this.extractImportsFromClassBody(classBody); + bodyImports.forEach(imp => imports.add(imp)); + + // Add import statement + const sortedImports = Array.from(imports).sort(); + lines.push(`import { ${sortedImports.join(", ")} } from "slingr-framework";`); + lines.push(''); + + // Add model decorator + if (dataSource) { + lines.push(`@Model({`); + lines.push(`\tdataSource: ${dataSource}`); + lines.push(`})`); + } else { + lines.push(`@Model()`); + } + + // Add class declaration (export only if not a component model) + const exportKeyword = isComponent ? "" : "export "; + lines.push(`${exportKeyword}class ${modelName} extends ${baseClass} {`); + + // Add class body (if not empty) + if (classBody.trim()) { + lines.push(''); + lines.push(classBody); + lines.push(''); + } + + lines.push(`}`); + + return lines.join("\n"); + } + + /** + * Analyzes class body content to determine which imports are needed. + * + * @param classBody - The class body content to analyze + * @returns Set of import names that should be included + */ + private extractImportsFromClassBody(classBody: string): Set { + const imports = new Set(); + + // Look for decorator patterns + const decoratorPatterns = [ + /@Text\b/g, /@LongText\b/g, /@Email\b/g, /@Html\b/g, + /@Integer\b/g, /@Money\b/g, /@Number\b/g, /@Boolean\b/g, + /@Date\b/g, /@DateRange\b/g, /@Choice\b/g, + /@Reference\b/g, /@Composition\b/g, /@Relationship\b/g + ]; + + const decoratorNames = [ + "Text", "LongText", "Email", "Html", + "Integer", "Money", "Number", "Boolean", + "Date", "DateRange", "Choice", + "Reference", "Composition", "Relationship" + ]; + + decoratorPatterns.forEach((pattern, index) => { + if (pattern.test(classBody)) { + imports.add(decoratorNames[index]); + } + }); + + // Always include Field if there are any field declarations + if (classBody.includes("!:") || classBody.includes(":")) { + imports.add("Field"); + } + + return imports; + } + + /** + * Extracts all model imports from a document (excluding slingr-framework imports). + * + * @param document - The document to extract imports from + * @returns Array of import statements for other models + */ + public extractModelImports(document: vscode.TextDocument): string[] { + const content = document.getText(); + const lines = content.split("\n"); + const modelImports: string[] = []; + + for (const line of lines) { + // Look for import statements that are not from slingr-framework + if (line.includes("import") && + line.includes("from") && + !line.includes("slingr-framework") && + !line.includes("vscode") && + !line.includes("path") && + line.trim().startsWith("import")) { + modelImports.push(line); + } + } + + return modelImports; + } + /** * Focuses on an element in a document navigating to it and highlighting it. * This method can find and focus on various types of elements including: From 24d81faf9fbf44f8b8c92524e4ebc0314e8c807f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 11:06:25 -0300 Subject: [PATCH 180/254] Implement managed schema support and automatic synchronization for TypeORM data sources --- docs/ManagedSchemas.md | 215 ++++++++++++ src/datasources/DataSource.ts | 27 ++ .../typeorm/DatabaseConfigBuilder.ts | 30 +- .../typeorm/TypeORMSqlDataSource.ts | 31 +- test/datasources/ManagedSchemas.test.ts | 177 ++++++++++ test/examples/SchemaMigrationDemo.test.ts | 322 ++++++++++++++++++ test/examples/TypeORMExample.test.ts | 33 +- 7 files changed, 825 insertions(+), 10 deletions(-) create mode 100644 docs/ManagedSchemas.md create mode 100644 test/datasources/ManagedSchemas.test.ts create mode 100644 test/examples/SchemaMigrationDemo.test.ts diff --git a/docs/ManagedSchemas.md b/docs/ManagedSchemas.md new file mode 100644 index 0000000..ab7d28d --- /dev/null +++ b/docs/ManagedSchemas.md @@ -0,0 +1,215 @@ +# Managed Schema Configuration + +The Slingr Framework provides managed schema functionality for TypeORM SQL data sources, allowing automatic schema synchronization during development while maintaining full control over production schema management. + +## Overview + +The `managed` flag in data source configuration determines whether Slingr automatically handles schema changes: + +- **Managed (`managed: true`)**: Slingr automatically manages schema updates using TypeORM's synchronization for development +- **Non-managed (`managed: false`)**: Developers manually handle all schema changes and migrations + +## Development vs Production Behavior + +### Development Environment +When `managed: true`, the framework automatically enables TypeORM's `synchronize` feature for rapid development: + +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: "postgres", + managed: true, // Enables automatic schema management + host: "localhost", + port: 5432, + username: "dev_user", + password: "dev_password", + database: "myapp_dev" + // synchronize will automatically be set to true +}); +``` + +**Benefits for Development:** +- Schema changes are applied automatically when models change +- No manual migration scripts needed during development +- Rapid prototyping and iteration + +**Important Warning:** +Schema synchronization can cause data loss when: +- Fields are renamed (TypeORM sees it as delete + create) +- Field types are changed incompatibly +- Tables are restructured + +### Production Environment (Future) +In production environments, managed schemas will use proper migration scripts instead of synchronization (this will be implemented in a future version). + +## Configuration Examples + +### Managed Schema with Default Synchronization +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + managed: true, + filename: "./dev.db" + // synchronize defaults to true when managed=true +}); +``` + +### Managed Schema with Explicit Synchronization Control +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: "mysql", + managed: true, + host: "localhost", + database: "myapp", + synchronize: false // Override default behavior +}); +``` + +### Non-Managed Schema +```typescript +const dataSource = new TypeORMSqlDataSource({ + type: "postgres", + managed: false, // Developer controls schema + host: "localhost", + database: "legacy_db" + // Developer must handle all schema changes manually +}); +``` + +## Data Source Support + +Not all data sources support managed schemas. The framework validates this during construction: + +```typescript +// TypeORM SQL data sources support managed schemas +const typeormSource = new TypeORMSqlDataSource({ managed: true, /* ... */ }); +console.log(typeormSource.supportsManagedSchemas()); // true + +// Custom data sources can override support +class CustomAPIDataSource extends DataSource { + supportsManagedSchemas(): boolean { + return false; // REST APIs don't support schema management + } +} + +// This will throw an error: +const apiSource = new CustomAPIDataSource({ managed: true }); // Error! +``` + +## Logging and Monitoring + +The framework provides clear logging about schema management: + +``` +TypeORM DataSource initialized successfully for postgres +Schema is managed by Slingr +⚠️ Schema synchronization is ENABLED - database schema will be automatically updated + This is recommended for development but may cause data loss on schema changes +``` + +## Best Practices + +### Development Workflow +1. Use `managed: true` for development databases +2. Implement datasets to quickly restore test data after schema changes +3. Never use managed schemas with production data +4. Test schema changes in isolated environments first + +### Schema Change Management +1. **Additive changes** (new fields, tables) - Generally safe with synchronization +2. **Destructive changes** (rename, delete, type changes) - May cause data loss +3. **Complex migrations** - Consider using explicit migration scripts even in development + +### Database-Specific Considerations + +#### SQLite +- Perfect for development with managed schemas +- File-based databases can be easily backed up/restored +- In-memory databases (`filename: ":memory:"`) ideal for testing + +#### PostgreSQL/MySQL +- Use separate development databases from production +- Consider using Docker containers for isolated development environments +- Test backup/restore procedures regularly + +## Migration to Production Schema Management + +When implementing production schema management (future feature), the framework will: + +1. Detect schema changes by comparing model definitions +2. Generate migration scripts automatically +3. Apply migrations in a controlled, reversible manner +4. Maintain migration history and versioning + +## Troubleshooting + +### Common Issues + +**Error: "This data source does not support managed schemas"** +- Occurs when trying to use `managed: true` with data sources that don't support it +- Solution: Set `managed: false` or use a different data source + +**Data Loss After Schema Changes** +- TypeORM synchronization cannot always preserve data during schema changes +- Solution: Implement datasets or backup/restore procedures for development data + +**Schema Not Updating** +- Verify `managed: true` is set +- Check that TypeORM synchronization is enabled in logs +- Ensure model changes are properly decorated with framework decorators + +### Debugging Schema Synchronization + +The framework logs detailed information about schema management: + +```typescript +// Enable detailed logging +const dataSource = new TypeORMSqlDataSource({ + type: "postgres", + managed: true, + logging: true, // Enable SQL query logging + // ... +}); +``` + +## Example: Complete Development Setup + +```typescript +import { TypeORMSqlDataSource, BaseModel, Model, Field, Text, Email } from 'slingr-framework'; + +// 1. Define your model +@Model({ dataSource: dataSource }) +class User extends BaseModel { + @Field() + @Text({ maxLength: 100 }) + name?: string; + + @Field() + @Email() + email?: string; +} + +// 2. Create managed data source +const dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + managed: true, + filename: "./dev.db", + logging: false +}); + +// 3. Initialize and use +async function setupDevelopmentEnvironment() { + await dataSource.initialize(dataSource.getOptions()); + + // Schema is automatically created/updated + // Start developing immediately + + const user = new User(); + user.name = "John Doe"; + user.email = "john@example.com"; + + const savedUser = await dataSource.save(user); + console.log("User saved:", savedUser); +} +``` + +This setup provides a complete development environment with automatic schema management, allowing developers to focus on business logic rather than database administration. \ No newline at end of file diff --git a/src/datasources/DataSource.ts b/src/datasources/DataSource.ts index 27ef5b8..e0132be 100644 --- a/src/datasources/DataSource.ts +++ b/src/datasources/DataSource.ts @@ -8,6 +8,9 @@ export interface DataSourceOptions { /** * Indicates if schema migrations have to be managed by Slingr. * When true, the framework will handle schema creation and updates automatically. + * + * For development environments, this enables automatic schema synchronization. + * For production environments, this will use proper migration scripts (future implementation). */ managed: boolean; } @@ -50,6 +53,30 @@ export abstract class DataSource { return this.isInitialized; } + /** + * Check if this data source supports managed schemas. + * Subclasses should override this method if they don't support managed schemas. + * + * @returns true if managed schemas are supported, false otherwise + */ + public supportsManagedSchemas(): boolean { + return true; // Default to true, subclasses can override + } + + /** + * Validate data source configuration. + * Checks if managed schemas are supported when requested. + * + * @throws Error if configuration is invalid + */ + protected validateConfiguration(): void { + if (this.options.managed && !this.supportsManagedSchemas()) { + throw new Error( + `This data source does not support managed schemas. Set 'managed: false' or use a different data source.` + ); + } + } + /** * Get the current data source options. * diff --git a/src/datasources/typeorm/DatabaseConfigBuilder.ts b/src/datasources/typeorm/DatabaseConfigBuilder.ts index 33d1bce..c0abe60 100644 --- a/src/datasources/typeorm/DatabaseConfigBuilder.ts +++ b/src/datasources/typeorm/DatabaseConfigBuilder.ts @@ -23,7 +23,7 @@ export class DatabaseConfigBuilder { const config: any = { type: options.type, logging: options.logging ?? false, - synchronize: options.synchronize ?? options.managed, + synchronize: DatabaseConfigBuilder.determineSynchronizeFlag(options), entities: entities, // Only include dropSchema when explicitly requested (typically in tests) ...(options.dropSchema ? { dropSchema: true } : {}) @@ -47,6 +47,34 @@ export class DatabaseConfigBuilder { return config as TypeORMDataSourceOptions; } + /** + * Determines the correct synchronize flag value based on options. + * + * For managed schemas: + * - If synchronize is explicitly set, use that value + * - If managed=true and synchronize is not set, enable it for development + * + * For non-managed schemas: + * - Use the explicit synchronize value or default to false + * + * @param options - Framework data source options + * @returns The synchronize flag value to use + */ + private static determineSynchronizeFlag(options: TypeORMSqlDataSourceOptions): boolean { + // If synchronize is explicitly provided, always respect it + if (options.synchronize !== undefined) { + return options.synchronize; + } + + // For managed schemas, enable synchronize by default (for development) + if (options.managed) { + return true; + } + + // For non-managed schemas, default to false + return false; + } + /** * Configures SQLite-specific options. * diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 1969f2a..2cbc187 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -58,7 +58,11 @@ export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { /** Enable logging of SQL queries */ logging?: boolean; - /** Synchronize schema automatically (for development) */ + /** + * Synchronize schema automatically (for development). + * When not explicitly set and managed=true, defaults to true for development. + * When not explicitly set and managed=false, defaults to false. + */ synchronize?: boolean; /** Connection timeout in milliseconds */ @@ -85,21 +89,27 @@ export interface TypeORMSqlDataSourceOptions extends DataSourceOptions { * * Features: * - Automatic connection management with pooling - * - Schema synchronization for development + * - Schema synchronization for development (when managed=true) * - Model and field configuration for TypeORM entities * - Transaction support * - Migration management * + * Managed Schemas: + * When managed=true, this data source will automatically handle schema changes: + * - In development: Uses TypeORM's synchronize feature for rapid prototyping + * - In production: Will use proper migration scripts (future implementation) + * * @example * ```typescript * const dataSource = new TypeORMSqlDataSource({ * type: "postgres", - * managed: true, + * managed: true, // Enable automatic schema management * host: "localhost", * port: 5432, * username: "admin", * password: "admin", * database: "myapp" + * // synchronize will default to true when managed=true * }); * * await dataSource.initialize(); @@ -113,6 +123,8 @@ export class TypeORMSqlDataSource extends DataSource { constructor(options: TypeORMSqlDataSourceOptions) { super(options); + // Validate configuration on construction + this.validateConfiguration(); } /** @@ -141,7 +153,20 @@ export class TypeORMSqlDataSource extends DataSource { try { await this.typeormDataSource.initialize(); this.isInitialized = true; + + // Log schema management configuration + const isSynchronizeEnabled = config.synchronize; + const managedStatus = typeormOptions.managed ? 'managed' : 'not managed'; + console.log(`TypeORM DataSource initialized successfully for ${typeormOptions.type}`); + console.log(`Schema is ${managedStatus} by Slingr`); + if (isSynchronizeEnabled) { + console.log('⚠️ Schema synchronization is ENABLED - database schema will be automatically updated'); + console.log(' This is recommended for development but may cause data loss on schema changes'); + } else { + console.log('ℹ️ Schema synchronization is DISABLED - manual schema management required'); + } + return this.typeormDataSource; } catch (error) { console.error('Failed to initialize TypeORM DataSource:', error); diff --git a/test/datasources/ManagedSchemas.test.ts b/test/datasources/ManagedSchemas.test.ts new file mode 100644 index 0000000..4ef66d4 --- /dev/null +++ b/test/datasources/ManagedSchemas.test.ts @@ -0,0 +1,177 @@ +import { TypeORMSqlDataSource } from '../../index'; +import { DataSource } from '../../src/datasources/DataSource'; + +describe('Managed Schema Configuration Tests', () => { + describe('TypeORM SQL DataSource Managed Schema Support', () => { + it('should support managed schemas', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + + expect(dataSource.supportsManagedSchemas()).toBe(true); + }); + + it('should enable synchronize when managed=true and synchronize is not explicitly set', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + // synchronize not explicitly set + }); + + // We can't directly access the internal config, but we can test the behavior + // by checking the options passed to the initialization + const options = dataSource.getOptions(); + expect(options.managed).toBe(true); + }); + + it('should respect explicit synchronize=false even when managed=true', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: false, // explicitly set to false + }); + + const options = dataSource.getOptions(); + expect(options.managed).toBe(true); + expect((options as any).synchronize).toBe(false); + }); + + it('should not enable synchronize when managed=false', () => { + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + // synchronize not explicitly set + }); + + const options = dataSource.getOptions(); + expect(options.managed).toBe(false); + }); + + it('should validate configuration during construction', () => { + // Create a mock data source that doesn't support managed schemas + class NonManagedDataSource extends DataSource { + constructor(options: any) { + super(options); + // Call validation like TypeORMSqlDataSource does + this.validateConfiguration(); + } + + supportsManagedSchemas(): boolean { + return false; + } + + async initialize(): Promise { + return Promise.resolve(); + } + + configureModel(): void { + // Mock implementation + } + + configureField(): void { + // Mock implementation + } + } + + expect(() => { + new NonManagedDataSource({ managed: true }); + }).toThrow('This data source does not support managed schemas'); + }); + + it('should not throw error when managed=false on non-managed data source', () => { + class NonManagedDataSource extends DataSource { + constructor(options: any) { + super(options); + // Call validation like TypeORMSqlDataSource does + this.validateConfiguration(); + } + + supportsManagedSchemas(): boolean { + return false; + } + + async initialize(): Promise { + return Promise.resolve(); + } + + configureModel(): void { + // Mock implementation + } + + configureField(): void { + // Mock implementation + } + } + + expect(() => { + new NonManagedDataSource({ managed: false }); + }).not.toThrow(); + }); + }); + + describe('Database Configuration Builder Synchronize Logic', () => { + it('should correctly determine synchronize flag for various scenarios', async () => { + // Test scenario 1: managed=true, synchronize not set -> should enable synchronize + const dataSource1 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + + await dataSource1.initialize(dataSource1.getOptions()); + + // Check that schema synchronization is working by verifying the connection + expect(dataSource1.isConnected()).toBe(true); + + await dataSource1.disconnect(); + + // Test scenario 2: managed=true, synchronize=false -> should respect explicit setting + const dataSource2 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: false, + }); + + await dataSource2.initialize(dataSource2.getOptions()); + expect(dataSource2.isConnected()).toBe(true); + await dataSource2.disconnect(); + + // Test scenario 3: managed=false, synchronize not set -> should not enable synchronize + const dataSource3 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + }); + + await dataSource3.initialize(dataSource3.getOptions()); + expect(dataSource3.isConnected()).toBe(true); + await dataSource3.disconnect(); + + // Test scenario 4: managed=false, synchronize=true -> should respect explicit setting + const dataSource4 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + synchronize: true, + }); + + await dataSource4.initialize(dataSource4.getOptions()); + expect(dataSource4.isConnected()).toBe(true); + await dataSource4.disconnect(); + }); + }); +}); \ No newline at end of file diff --git a/test/examples/SchemaMigrationDemo.test.ts b/test/examples/SchemaMigrationDemo.test.ts new file mode 100644 index 0000000..54fa8b7 --- /dev/null +++ b/test/examples/SchemaMigrationDemo.test.ts @@ -0,0 +1,322 @@ +/** + * Schema Migration Demo Test + * + * This test demonstrates how managed schemas work in practice: + * 1. Starting with a basic entity + * 2. Adding new fields (schema evolution) + * 3. Performing CRUD operations + * 4. Showing automatic schema synchronization + */ + +import { + PersistentModel, + Model, + Field, + TypeORMSqlDataSource, + Text, + Email, + DateTime, + Boolean, + Integer +} from '../../index'; + +// Create the data source that will be used by models +const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + database: ':memory:', + managed: true, // 🎯 Enable managed schemas for automatic synchronization + logging: false // Reduce noise during tests +}); + +// Initial User model - basic version +@Model({ + docs: 'Basic User model - Version 1', + dataSource: dataSource +}) +class UserV1 extends PersistentModel { + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + firstName!: string; + + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + lastName!: string; + + @Field({ required: true }) + @Email() + email!: string; +} + +// Evolved User model - with additional fields +@Model({ + docs: 'Enhanced User model - Version 2 with additional profile fields', + dataSource: dataSource +}) +class UserV2 extends PersistentModel { + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + firstName!: string; + + @Field({ required: true }) + @Text({ minLength: 2, maxLength: 50 }) + lastName!: string; + + @Field({ required: true }) + @Email() + email!: string; + + // New fields added in V2 + @Field({ + validation: (_: number, user: UserV2) => { + let errors = []; + if (user.age !== undefined && (user.age < 18 || user.age > 120)) { + errors.push({ + constraint: "invalidAge", + message: "Age must be between 18 and 120", + }); + } + return errors; + }, + }) + @Integer({ min: 18, max: 120 }) + age!: number; + + @Field() + @DateTime() + createdAt?: Date; + + @Field() + @Boolean() + isActive!: boolean; + + @Field() + @Text({ maxLength: 500 }) + bio!: string; +} + +describe('Schema Migration Demo', () => { + beforeAll(async () => { + // Initialize the shared data source once for all tests + await dataSource.initialize(dataSource.getOptions()); + }); + + // Don't clear data between tests - let them build on each other + // This simulates real schema evolution + + afterAll(async () => { + // Final cleanup - disconnect the data source + if (dataSource) { + await dataSource.disconnect(); + } + }); + + describe('Basic Schema Operations with V1 Model', () => { + it('should create initial schema and perform basic operations', async () => { + console.log('\n=== Schema Migration Demo: Basic Operations ==='); + + console.log('✓ Database initialized with UserV1 schema'); + console.log(' Fields: firstName, lastName, email'); + + // Create some initial users + const user1 = new UserV1(); + user1.firstName = 'John'; + user1.lastName = 'Doe'; + user1.email = 'john.doe@example.com'; + + const user2 = new UserV1(); + user2.firstName = 'Jane'; + user2.lastName = 'Smith'; + user2.email = 'jane.smith@example.com'; + + // Validate before saving + const errors1 = await user1.validate(); + const errors2 = await user2.validate(); + expect(errors1).toHaveLength(0); + expect(errors2).toHaveLength(0); + + // Save users + await dataSource.save(user1); + await dataSource.save(user2); + console.log('✓ Created 2 users with basic schema'); + + // Query users + const allUsers = await dataSource.find(UserV1); + expect(allUsers).toHaveLength(2); + console.log(`✓ Retrieved ${allUsers.length} users from database`); + + // Test specific queries + const johnUser = await dataSource.findOne(UserV1, { + where: { firstName: 'John' } + }); + expect(johnUser).toBeTruthy(); + expect(johnUser?.email).toBe('john.doe@example.com'); + console.log('✓ Successfully queried user by firstName'); + + console.log('=== Basic operations completed successfully ===\n'); + }); + }); + + describe('Schema Evolution with V2 Model', () => { + it('should demonstrate schema evolution with additional fields', async () => { + console.log('\n=== Schema Migration Demo: Schema Evolution ==='); + + console.log('✓ Using shared data source with managed schemas enabled'); + console.log(' Schemas automatically synchronize when models change'); + + // Create a user with the evolved schema (V2) + const evolvedUser = new UserV2(); + evolvedUser.firstName = 'Bob'; + evolvedUser.lastName = 'Wilson'; + evolvedUser.email = 'bob.wilson@example.com'; + evolvedUser.age = 28; + evolvedUser.createdAt = new Date(); + evolvedUser.isActive = true; + evolvedUser.bio = 'Software developer passionate about TypeScript and databases.'; + + const errors = await evolvedUser.validate(); + expect(errors).toHaveLength(0); + + await dataSource.save(evolvedUser); + console.log('✓ Created user with evolved schema including new fields'); + + // Query and verify the new schema works + const users = await dataSource.find(UserV2); + expect(users.length).toBeGreaterThan(0); + + const savedUser = users.find(u => u.firstName === 'Bob'); + expect(savedUser).toBeDefined(); + expect(savedUser!.firstName).toBe('Bob'); + expect(savedUser!.email).toBe('bob.wilson@example.com'); + expect(savedUser!.isActive).toBe(true); + expect(savedUser!.bio).toContain('TypeScript'); + console.log('✓ Successfully retrieved user with all new fields'); + + console.log('=== Schema evolution completed successfully ===\n'); + }); + }); + + describe('Real-world Schema Evolution Scenario', () => { + it('should simulate a complete development workflow', async () => { + console.log('\n=== Schema Migration Demo: Development Workflow ==='); + + // Simulate development phases + console.log('📅 Development Phase: Working with managed schemas'); + + // Create initial user base with V1 model + const users = [ + { firstName: 'John', lastName: 'Doe', email: 'john@company.com' }, + { firstName: 'Jane', lastName: 'Smith', email: 'jane@company.com' }, + { firstName: 'Bob', lastName: 'Johnson', email: 'bob@company.com' } + ]; + + for (const userData of users) { + const user = new UserV1(); + user.firstName = userData.firstName; + user.lastName = userData.lastName; + user.email = userData.email; + await dataSource.save(user); + } + + console.log(`✓ Created ${users.length} initial users with V1 schema`); + + // Simulate finding users + const johnDoe = await dataSource.findOne(UserV1, { + where: { email: 'john@company.com' } + }); + expect(johnDoe).toBeTruthy(); + console.log('✓ Successfully queried users by email'); + + // Count total users (should include users from previous tests) + const userCount = await dataSource.count(UserV1); + expect(userCount).toBeGreaterThanOrEqual(3); + console.log(`✓ Database contains ${userCount} users`); + + console.log('\n📅 Schema Evolution: Adding user profiles with V2 model'); + console.log(' With managed schemas, new fields are automatically supported!'); + + // Create users with enhanced profiles using V2 model + const enhancedUser = new UserV2(); + enhancedUser.firstName = 'Alice'; + enhancedUser.lastName = 'Cooper'; + enhancedUser.email = 'alice@company.com'; + enhancedUser.age = 32; + enhancedUser.createdAt = new Date(); + enhancedUser.isActive = true; + enhancedUser.bio = 'Product manager with 8 years of experience in tech startups.'; + + await dataSource.save(enhancedUser); + console.log('✓ Successfully created user with enhanced profile'); + + // Demonstrate querying with new fields + const allV2Users = await dataSource.find(UserV2); + const activeUsers = allV2Users.filter(user => user.isActive === true); + expect(activeUsers.length).toBeGreaterThan(0); + console.log(`✓ Found ${activeUsers.length} active users using V2 schema`); + + // Demonstrate complex queries - filter users with age defined + const usersWithAge = allV2Users.filter(user => user.age !== undefined); + console.log(`✓ Found ${usersWithAge.length} users with age information`); + + console.log('=== Development workflow simulation completed ===\n'); + }); + }); + + describe('Performance and Edge Cases', () => { + it('should handle bulk operations with managed schemas', async () => { + console.log('\n=== Schema Migration Demo: Performance Testing ==='); + + console.log('✓ Using managed schemas for bulk operations'); + + // Create bulk users for performance testing + const bulkUsers: UserV2[] = []; + const startTime = Date.now(); + + for (let i = 0; i < 50; i++) { + const user = new UserV2(); + user.firstName = `User${i}`; + user.lastName = `Test${i}`; + user.email = `user${i}@testing.com`; + user.age = 20 + (i % 50); + user.createdAt = new Date(Date.now() - (i * 24 * 60 * 60 * 1000)); // Stagger dates + user.isActive = i % 3 !== 0; // Most users active + user.bio = `This is test user number ${i} for performance testing.`; + + bulkUsers.push(user); + } + + // Validate all users + for (const user of bulkUsers) { + const errors = await user.validate(); + expect(errors).toHaveLength(0); + } + + // Save all users + for (const user of bulkUsers) { + await dataSource.save(user); + } + + const endTime = Date.now(); + console.log(`✓ Created 50 users in ${endTime - startTime}ms`); + + // Test complex queries + const queryStart = Date.now(); + + const allUsers = await dataSource.find(UserV2); + const activeUsers = allUsers.filter(user => user.isActive === true); + const usersWithAge = allUsers.filter(user => user.age !== undefined && user.age > 0); + + const queryEnd = Date.now(); + + expect(allUsers.length).toBeGreaterThan(0); + expect(activeUsers.length).toBeGreaterThan(0); + expect(usersWithAge.length).toBeGreaterThan(0); + + console.log(`✓ Executed complex queries in ${queryEnd - queryStart}ms`); + console.log(` - Total users: ${allUsers.length}`); + console.log(` - Active users: ${activeUsers.length}`); + console.log(` - Users with age: ${usersWithAge.length}`); + + console.log('=== Performance testing completed ===\n'); + }); + }); +}); \ No newline at end of file diff --git a/test/examples/TypeORMExample.test.ts b/test/examples/TypeORMExample.test.ts index 7352f9f..5a4417d 100644 --- a/test/examples/TypeORMExample.test.ts +++ b/test/examples/TypeORMExample.test.ts @@ -1,17 +1,17 @@ -import { TypeORMSqlDataSource } from '@/datasources/typeorm/TypeORMSqlDataSource'; +import { TypeORMSqlDataSource } from '../../index'; describe('TypeORM DataSource Example', () => { - it('should demonstrate basic usage', async () => { - // 1. Create the data source + it('should demonstrate basic usage with managed schemas', async () => { + // 1. Create the data source with managed schemas enabled const mainDataSource = new TypeORMSqlDataSource({ type: "sqlite", - managed: true, + managed: true, // Enable managed schemas - synchronize will be automatically enabled filename: ":memory:", logging: false, - synchronize: true, + // Note: synchronize not explicitly set - will default to true when managed=true }); - console.log('=== TypeORM DataSource Example ==='); + console.log('=== TypeORM DataSource Example - Managed Schemas ==='); // 2. Initialize the data source console.log('Initializing data source...'); @@ -24,6 +24,7 @@ describe('TypeORM DataSource Example', () => { console.log('- Type:', options.type); console.log('- Managed:', options.managed); console.log('- Filename:', options.filename); + console.log('- Automatic schema synchronization enabled for development'); // 4. Check connection status console.log('\nConnection status:'); @@ -52,4 +53,24 @@ describe('TypeORM DataSource Example', () => { console.log('\n=== Example completed successfully ==='); }); + + it('should demonstrate non-managed schema configuration', async () => { + // Example of a non-managed data source where developer controls schema + const nonManagedDataSource = new TypeORMSqlDataSource({ + type: "sqlite", + managed: false, // Schema not managed by Slingr + filename: ":memory:", + logging: false, + synchronize: false, // Explicitly disable synchronization + }); + + console.log('\n=== TypeORM DataSource Example - Non-Managed Schemas ==='); + + await nonManagedDataSource.initialize(nonManagedDataSource.getOptions()); + console.log('✓ Non-managed data source initialized'); + console.log('- Developer must handle schema changes manually'); + + await nonManagedDataSource.disconnect(); + console.log('✓ Non-managed data source disconnected'); + }); }); From afc021f68fbe93fd4409655da52282e47acba73f Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 11:27:10 -0300 Subject: [PATCH 181/254] Refactor age field validation in UserV2 model to use decorators instead of custom validation logic --- test/examples/SchemaMigrationDemo.test.ts | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/test/examples/SchemaMigrationDemo.test.ts b/test/examples/SchemaMigrationDemo.test.ts index 54fa8b7..d47cae7 100644 --- a/test/examples/SchemaMigrationDemo.test.ts +++ b/test/examples/SchemaMigrationDemo.test.ts @@ -66,18 +66,7 @@ class UserV2 extends PersistentModel { email!: string; // New fields added in V2 - @Field({ - validation: (_: number, user: UserV2) => { - let errors = []; - if (user.age !== undefined && (user.age < 18 || user.age > 120)) { - errors.push({ - constraint: "invalidAge", - message: "Age must be between 18 and 120", - }); - } - return errors; - }, - }) + @Field() @Integer({ min: 18, max: 120 }) age!: number; From 1fcbf4cb36e89f6fab1b56d0af157f181af8820b Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 11:33:58 -0300 Subject: [PATCH 182/254] Enhance configuration validation for TypeORM data source to include early checks and warnings for synchronize flag settings --- src/datasources/DataSource.ts | 17 ++- .../typeorm/TypeORMSqlDataSource.ts | 51 +++++++ .../ConfigurationValidation.test.ts | 133 ++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 test/datasources/ConfigurationValidation.test.ts diff --git a/src/datasources/DataSource.ts b/src/datasources/DataSource.ts index e0132be..fdbafaf 100644 --- a/src/datasources/DataSource.ts +++ b/src/datasources/DataSource.ts @@ -65,7 +65,8 @@ export abstract class DataSource { /** * Validate data source configuration. - * Checks if managed schemas are supported when requested. + * Checks if managed schemas are supported when requested and validates + * configuration consistency. * * @throws Error if configuration is invalid */ @@ -75,6 +76,20 @@ export abstract class DataSource { `This data source does not support managed schemas. Set 'managed: false' or use a different data source.` ); } + + // Allow subclasses to perform additional validation + this.validateSpecificConfiguration(); + } + + /** + * Validate data source specific configuration. + * Override this method in subclasses to add data source specific validation. + * This is called during construction to catch configuration issues early. + * + * @throws Error if configuration is invalid + */ + protected validateSpecificConfiguration(): void { + // Default implementation - no additional validation } /** diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 2cbc187..4f8f280 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -127,6 +127,57 @@ export class TypeORMSqlDataSource extends DataSource { this.validateConfiguration(); } + /** + * Validate TypeORM-specific configuration. + * Performs early validation of synchronize flag settings to prevent + * configuration issues that could bypass validation. + * + * @throws Error if configuration is invalid + */ + protected validateSpecificConfiguration(): void { + const options = this.options as TypeORMSqlDataSourceOptions; + + // Validate synchronize flag consistency with managed schemas + // This mirrors the logic in DatabaseConfigBuilder.determineSynchronizeFlag() + // to catch configuration issues early + const wouldEnableSynchronize = this.wouldEnableSynchronization(options); + + if (wouldEnableSynchronize && !options.managed) { + // If synchronize would be enabled but managed=false, warn about potential issues + if (options.synchronize === true) { + console.warn( + 'Warning: synchronize=true with managed=false. This bypasses Slingr schema management. ' + + 'Consider setting managed=true for automatic schema management.' + ); + } + } + + // Additional validation can be added here for other TypeORM-specific configurations + } + + /** + * Determines if synchronization would be enabled based on current options. + * This mirrors the logic in DatabaseConfigBuilder.determineSynchronizeFlag() + * for early validation purposes. + * + * @param options - TypeORM data source options + * @returns true if synchronization would be enabled + */ + private wouldEnableSynchronization(options: TypeORMSqlDataSourceOptions): boolean { + // If synchronize is explicitly provided, use that value + if (options.synchronize !== undefined) { + return options.synchronize; + } + + // For managed schemas, enable synchronize by default (for development) + if (options.managed) { + return true; + } + + // For non-managed schemas, default to false + return false; + } + /** * Initialize the TypeORM data source. * Sets up the TypeORM DataSource, establishes database connection, diff --git a/test/datasources/ConfigurationValidation.test.ts b/test/datasources/ConfigurationValidation.test.ts new file mode 100644 index 0000000..0fb828c --- /dev/null +++ b/test/datasources/ConfigurationValidation.test.ts @@ -0,0 +1,133 @@ +import { TypeORMSqlDataSource } from '../../index'; + +describe('Configuration Validation Tests', () => { + describe('Early Configuration Validation', () => { + let consoleSpy: jest.SpyInstance; + + beforeEach(() => { + consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => {}); + }); + + afterEach(() => { + consoleSpy.mockRestore(); + }); + + it('should validate configuration during construction', () => { + // This should succeed - valid managed configuration + expect(() => { + new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + }).not.toThrow(); + }); + + it('should warn when synchronize=true with managed=false', () => { + // This should warn but not throw + const dataSource = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + synchronize: true, // Explicit synchronize with non-managed schema + }); + + expect(consoleSpy).toHaveBeenCalledWith( + expect.stringContaining('Warning: synchronize=true with managed=false') + ); + + expect(dataSource).toBeDefined(); + }); + + it('should not warn when synchronize=false with managed=false', () => { + new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + synchronize: false, // Explicit synchronize with non-managed schema + }); + + expect(consoleSpy).not.toHaveBeenCalled(); + }); + + it('should not warn when managed=true (default synchronize behavior)', () => { + new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + // synchronize not explicitly set - should default to true + }); + + expect(consoleSpy).not.toHaveBeenCalled(); + }); + + it('should not warn when managed=true with explicit synchronize=true', () => { + new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: true, // Explicit synchronize with managed schema + }); + + expect(consoleSpy).not.toHaveBeenCalled(); + }); + + it('should not warn when managed=true with explicit synchronize=false', () => { + new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: false, // Explicit override of default behavior + }); + + expect(consoleSpy).not.toHaveBeenCalled(); + }); + }); + + describe('Configuration Consistency Validation', () => { + it('should properly determine synchronize flag during initialization', async () => { + // Test case 1: managed=true, synchronize not set -> should enable + const dataSource1 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + }); + + await dataSource1.initialize(dataSource1.getOptions()); + expect(dataSource1.isConnected()).toBe(true); + await dataSource1.disconnect(); + + // Test case 2: managed=false, synchronize not set -> should disable + const dataSource2 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: false, + filename: ':memory:', + logging: false, + }); + + await dataSource2.initialize(dataSource2.getOptions()); + expect(dataSource2.isConnected()).toBe(true); + await dataSource2.disconnect(); + + // Test case 3: managed=true, synchronize=false -> should respect explicit setting + const dataSource3 = new TypeORMSqlDataSource({ + type: 'sqlite', + managed: true, + filename: ':memory:', + logging: false, + synchronize: false, + }); + + await dataSource3.initialize(dataSource3.getOptions()); + expect(dataSource3.isConnected()).toBe(true); + await dataSource3.disconnect(); + }); + }); +}); \ No newline at end of file From b56d72a6ec35638f678942c913f1d2a0e0e1e959 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Mon, 15 Sep 2025 11:47:21 -0300 Subject: [PATCH 183/254] Refactor financial number handling to use aliases for consistency in Decimal and Money types --- index.ts | 33 +++++++++++++++++++ .../ComplexTypesPersistence.test.ts | 29 ++++++++-------- test/types_tests/DecimalAndMoney.test.ts | 14 ++++---- 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/index.ts b/index.ts index 4168f5b..a7343d3 100644 --- a/index.ts +++ b/index.ts @@ -1,4 +1,5 @@ import { PersistentModel } from './src/model'; +import number from 'financial-number'; // Export all the core components of the framework export { BaseModel } from './src/model/BaseModel'; @@ -27,3 +28,35 @@ export { PersistentModel } from './src/model'; export { TypeORMSqlDataSource } from './src/datasources'; export type { TypeORMSqlDataSourceOptions } from './src/datasources'; export { Relationship } from './src/model/types'; + +// Aliases for the number() function from financial-number library + +/** + * Creates a decimal number using the financial-number library. + * This is an alias for number() that provides consistency with the Decimal type naming. + * + * @param value - The numeric value as a string or number + * @returns A FinancialNumber instance for decimal operations + * + * @example + * ```typescript + * const price = decimal("123.45"); + * const total = price.plus("10.00"); + * ``` + */ +export const decimal = number; + +/** + * Creates a money value using the financial-number library. + * This is an alias for number() that provides consistency with the Money type naming. + * + * @param value - The numeric value as a string or number + * @returns A FinancialNumber instance for monetary operations + * + * @example + * ```typescript + * const price = money("999.99"); + * const discounted = price.multiply("0.9"); + * ``` + */ +export const money = number; diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 92a636e..660d816 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -10,10 +10,11 @@ import { Text, DecimalNumber, MoneyNumber, - dateTimeRange + dateTimeRange, + decimal, + money } from "../../index"; import { validateSync } from 'class-validator'; -import number from 'financial-number'; import { FIELD_REQUIRED, FIELD_TYPE, FIELD_TYPE_OPTIONS, MODEL_DATASOURCE, MODEL_FIELDS } from "../../src/model/metadata"; // Test model for complex type persistence @@ -111,10 +112,10 @@ describe("Complex Types Persistence in SQL Databases", () => { testEntity.name = "Complex Types Test"; // Set up Decimal value - testEntity.priceDecimal = number("123.45"); + testEntity.priceDecimal = decimal("123.45"); // Set up Money value - testEntity.priceMoney = number("999.99"); + testEntity.priceMoney = money("999.99"); // Set up required DateTimeRange const activeRange = dateTimeRange('2024-01-01T00:00:00Z', '2024-12-31T23:59:59Z'); @@ -153,7 +154,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should persist Decimal precision correctly", async () => { - testEntity.priceDecimal = number("123.456"); // Will be truncated to 2 decimals + testEntity.priceDecimal = decimal("123.456"); // Will be truncated to 2 decimals const savedEntity = await dataSource.save(testEntity); @@ -195,7 +196,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should persist Money with correct rounding", async () => { - testEntity.priceMoney = number("123.456"); // Will be rounded to 2 decimals + testEntity.priceMoney = money("123.456"); // Will be rounded to 2 decimals const savedEntity = await dataSource.save(testEntity); @@ -293,8 +294,8 @@ describe("Complex Types Persistence in SQL Databases", () => { // Create first test entity const entity1 = new ComplexTypesModel(); entity1.name = "Entity 1"; - entity1.priceDecimal = number("100.00"); - entity1.priceMoney = number("200.00"); + entity1.priceDecimal = decimal("100.00"); + entity1.priceMoney = money("200.00"); const range1 = dateTimeRange('2024-01-01T00:00:00Z', '2024-06-30T23:59:59Z'); entity1.activeRange = range1; @@ -304,8 +305,8 @@ describe("Complex Types Persistence in SQL Databases", () => { // Create second test entity const entity2 = new ComplexTypesModel(); entity2.name = "Entity 2"; - entity2.priceDecimal = number("150.00"); - entity2.priceMoney = number("300.00"); + entity2.priceDecimal = decimal("150.00"); + entity2.priceMoney = money("300.00"); const range2 = dateTimeRange('2024-07-01T00:00:00Z', '2024-12-31T23:59:59Z'); entity2.activeRange = range2; @@ -348,7 +349,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should update Decimal values correctly", async () => { - savedEntity.priceDecimal = number("456.78"); + savedEntity.priceDecimal = decimal("456.78"); const updatedEntity = await dataSource.save(savedEntity); @@ -360,7 +361,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); it("should update Money values correctly", async () => { - savedEntity.priceMoney = number("555.55"); + savedEntity.priceMoney = money("555.55"); const updatedEntity = await dataSource.save(savedEntity); @@ -390,7 +391,7 @@ describe("Complex Types Persistence in SQL Databases", () => { describe("Complex Types Validation", () => { it("should validate Decimal constraints", async () => { // Test minimum value constraint - testEntity.priceDecimal = number("0.001"); // Below minimum + testEntity.priceDecimal = decimal("0.001"); // Below minimum const errors = validateSync(testEntity); const decimalErrors = errors.filter(e => e.property === 'priceDecimal'); @@ -399,7 +400,7 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should validate Money constraints", async () => { // Test maximum value constraint - testEntity.priceMoney = number("20000.00"); // Above maximum + testEntity.priceMoney = money("20000.00"); // Above maximum const errors = validateSync(testEntity); const moneyErrors = errors.filter(e => e.property === 'priceMoney'); diff --git a/test/types_tests/DecimalAndMoney.test.ts b/test/types_tests/DecimalAndMoney.test.ts index 6ee741c..8d52cab 100644 --- a/test/types_tests/DecimalAndMoney.test.ts +++ b/test/types_tests/DecimalAndMoney.test.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; -import number from 'financial-number'; import { DecimalMoneyModel } from '../model/DecimalMoneyModel'; +import { decimal, money } from '../../index'; describe('@Decimal Decorator', () => { @@ -8,7 +8,7 @@ describe('@Decimal Decorator', () => { it('should serialize a Decimal value with truncate rounding', () => { const product = new DecimalMoneyModel(); product.name = 'Test'; - product.priceTruncate = number('123.456'); // Input with more decimals + product.priceTruncate = decimal('123.456'); // Input with more decimals const jsonObject = product.toJSON(); @@ -21,7 +21,7 @@ describe('@Decimal Decorator', () => { it('should serialize a Decimal value with roundHalfToEven (round half up)', () => { const product = new DecimalMoneyModel(); product.name = 'Test'; - product.priceRound = number('123.455'); + product.priceRound = decimal('123.455'); const jsonObject = product.toJSON(); @@ -106,7 +106,7 @@ describe('@Decimal Decorator', () => { it("should fail if an incorrect number of decimals is set manually", async () => { const product = new DecimalMoneyModel(); product.name = 'Test'; - product.priceTruncate = number('123.456'); // Set a value with more than 2 decimals + product.priceTruncate = decimal('123.456'); // Set a value with more than 2 decimals const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -122,7 +122,7 @@ describe('@Money Decorator', () => { it('should correctly serialize and deserialize a Money value', async () => { const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; - product.priceMoney = number('1.25'); + product.priceMoney = money('1.25'); const jsonObject = product.toJSON(); expect(jsonObject.priceMoney).toBe('1.25'); @@ -147,7 +147,7 @@ describe('@Money Decorator', () => { it('should fail if an incorrect number of decimals is set manually', async () => { const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; - product.priceMoney = number('1.245'); + product.priceMoney = money('1.245'); const errors = await product.validate(); expect(errors.length).toBeGreaterThan(0); @@ -158,7 +158,7 @@ describe('@Money Decorator', () => { it('should pass validation when the correct number of decimals is set manually', async () => { const product = new DecimalMoneyModel(); product.name = 'Ice Cream'; - product.priceMoney = number('1.25'); + product.priceMoney = money('1.25'); const errors = await product.validate(); expect(errors).toHaveLength(0); From 95630b1d7e414a45e132712ef66d75380074659a Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 15 Sep 2025 15:05:36 -0300 Subject: [PATCH 184/254] Fix: now the changeCompositionToReference command removes the model from the source file correctly. --- .../fields/changeCompositionToReference.ts | 244 +++++++++++++++--- src/services/sourceCodeService.ts | 221 ++++++++++++++++ 2 files changed, 425 insertions(+), 40 deletions(-) diff --git a/src/commands/fields/changeCompositionToReference.ts b/src/commands/fields/changeCompositionToReference.ts index 9246eed..abc2e3e 100644 --- a/src/commands/fields/changeCompositionToReference.ts +++ b/src/commands/fields/changeCompositionToReference.ts @@ -69,21 +69,22 @@ export class ChangeCompositionToReferenceTool { // Step 4: Generate and create the independent model using existing tools const modelFileUri = await this.generateAndCreateIndependentModel(componentModel, sourceModel, targetFilePath, cache); - // Step 6: Remove the composition field from the source model - await this.removeCompositionField(document, compositionField, cache); + // Step 5: Extract related enums before removing the component model + const relatedEnums = await this.sourceCodeService.extractRelatedEnums(document, componentModel, + this.sourceCodeService.extractClassBody(document, componentModel.name)); - // Step 7: Remove the component model from the source file - await this.removeComponentModel(document, componentModel, sourceModel, cache); + // Step 6-8: Remove field, model, and enums in a single workspace edit to avoid coordinate issues + await this.removeFieldModelAndEnums(document, compositionField, componentModel, relatedEnums, cache); - // Step 8: Add the reference field to the source model + // Step 9: Add the reference field to the source model await this.addReferenceField(document, sourceModel.name, fieldName, componentModel.name, compositionField.type.endsWith('[]'), cache); - // Step 9: Add import for the new model in the source file + // Step 10: Add import for the new model in the source file const importEdit = new vscode.WorkspaceEdit(); await this.sourceCodeService.addModelImport(document, componentModel.name, importEdit, cache); await vscode.workspace.applyEdit(importEdit); - // Step 10: Focus on the newly modified field + // Step 11: Focus on the newly modified field await this.sourceCodeService.focusOnElement(document, fieldName); // Step 11: Show success message @@ -169,7 +170,7 @@ export class ChangeCompositionToReferenceTool { */ private async determineTargetFilePath(sourceModel: DecoratedClass, componentModelName: string): Promise { const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); - const fileName = `${componentModelName.toLowerCase()}.ts`; + const fileName = `${componentModelName}.ts`; return path.join(sourceDir, fileName); } @@ -188,17 +189,20 @@ export class ChangeCompositionToReferenceTool { // Step 2: Extract the complete class body from the component model const classBody = this.sourceCodeService.extractClassBody(sourceDocument, componentModel.name); - // Step 3: Get datasource from source model + // Step 3: Extract related enums from the source file (for Choice fields) + const relatedEnums = await this.sourceCodeService.extractRelatedEnums(sourceDocument, componentModel, classBody); + + // Step 4: Get datasource from source model const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; - // Step 4: Extract existing model imports from the source file + // Step 5: Extract existing model imports from the source file const existingImports = this.sourceCodeService.extractModelImports(sourceDocument); - // Step 5: Convert the class body for independent model use + // Step 6: Convert the class body for independent model use const convertedClassBody = this.convertComponentClassBody(classBody); - // Step 6: Generate the complete model file content + // Step 7: Generate the complete model file content const modelFileContent = this.sourceCodeService.generateModelFileContent( componentModel.name, convertedClassBody, @@ -208,12 +212,15 @@ export class ChangeCompositionToReferenceTool { false // This is a standalone model (with export) ); - // Step 7: Create the new model file + // Step 8: Add related enums to the file content + const finalFileContent = this.sourceCodeService.addEnumsToFileContent(modelFileContent, relatedEnums); + + // Step 9: Create the new model file const modelFileUri = vscode.Uri.file(targetFilePath); const encoder = new TextEncoder(); - await vscode.workspace.fs.writeFile(modelFileUri, encoder.encode(modelFileContent)); + await vscode.workspace.fs.writeFile(modelFileUri, encoder.encode(finalFileContent)); - // Step 8: Add model imports to the new file if needed + // Step 10: Add model imports to the new file if needed if (existingImports.length > 0) { await this.addModelImportsToNewFile(modelFileUri, existingImports); } @@ -274,58 +281,215 @@ export class ChangeCompositionToReferenceTool { } /** - * Removes the @Composition and @Field decorators from the field. + * Removes the composition field, component model, and unused enums in a single workspace edit + * to avoid coordinate invalidation issues. */ - private async removeCompositionField(document: vscode.TextDocument, field: PropertyMetadata, cache: MetadataCache): Promise { - // Find the model name that contains this field + private async removeFieldModelAndEnums( + document: vscode.TextDocument, + compositionField: PropertyMetadata, + componentModel: DecoratedClass, + relatedEnums: string[], + cache: MetadataCache + ): Promise { + const workspaceEdit = new vscode.WorkspaceEdit(); + + // Step 1: Get field deletion range (using DeleteFieldTool logic) const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); let modelName = 'Unknown'; if (fileMetadata) { for (const [className, classData] of Object.entries(fileMetadata.classes)) { - // Type assertion since we know the structure from cache const classInfo = classData as DecoratedClass; - if (classInfo.properties[field.name] === field) { + if (classInfo.properties[compositionField.name] === compositionField) { modelName = className; break; } } } - // Use the DeleteFieldTool to programmatically remove the field - const workspaceEdit = await this.deleteFieldTool.deleteFieldProgrammatically( - field, + // Get field deletion edit without applying it + const fieldDeletionEdit = await this.deleteFieldTool.deleteFieldProgrammatically( + compositionField, modelName, cache ); - // Apply the workspace edit + // Step 2: Get model deletion range + await this.sourceCodeService.deleteModelClassFromFile(document.uri, componentModel, workspaceEdit); + + // Step 3: Get enum deletion ranges + await this.addEnumDeletionsToWorkspaceEdit(document, relatedEnums, workspaceEdit, componentModel); + + // Step 4: Merge field deletion edits into the main workspace edit + this.mergeWorkspaceEdits(fieldDeletionEdit, workspaceEdit); + + // Step 5: Apply all deletions in a single operation await vscode.workspace.applyEdit(workspaceEdit); } /** - * Removes the component model from the source file. + * Adds enum deletion ranges to the workspace edit if the enums are no longer used. */ - private async removeComponentModel( + private async addEnumDeletionsToWorkspaceEdit( document: vscode.TextDocument, - componentModel: DecoratedClass, - sourceModel: DecoratedClass, - cache: MetadataCache + extractedEnums: string[], + workspaceEdit: vscode.WorkspaceEdit, + componentModel: DecoratedClass ): Promise { - // Get the text range for the component model - const modelRange = componentModel.declaration.range; + if (extractedEnums.length === 0) { + return; + } - // Extend the range to include any preceding decorators and following whitespace - const extendedRange = new vscode.Range( - new vscode.Position(Math.max(0, modelRange.start.line - 5), 0), // Include decorators - new vscode.Position(modelRange.end.line + 2, 0) // Include trailing whitespace - ); + const sourceContent = document.getText(); + + // Extract enum names from the enum definitions + const enumNames = extractedEnums.map(enumDef => { + const match = enumDef.match(/enum\s+(\w+)/); + return match ? match[1] : null; + }).filter(name => name !== null) as string[]; + + console.log(`Found ${enumNames.length} enums to check for deletion: ${enumNames.join(', ')}`); + + // Check each enum to see if it's still used in the source file + for (const enumName of enumNames) { + if (!this.isEnumStillUsedInFile(sourceContent, enumName, extractedEnums, componentModel)) { + console.log(`Enum "${enumName}" is not used anymore, scheduling for deletion`); + await this.addEnumDeletionToWorkspaceEdit(document, enumName, workspaceEdit); + } else { + console.log(`Enum "${enumName}" is still used, keeping it in source file`); + } + } + } - // Create workspace edit to remove the component model - const workspaceEdit = new vscode.WorkspaceEdit(); - workspaceEdit.delete(document.uri, extendedRange); + /** + * Checks if an enum is still referenced in the source file (excluding the extracted enums and component model). + */ + private isEnumStillUsedInFile(sourceContent: string, enumName: string, extractedEnums: string[], componentModel: DecoratedClass): boolean { + // Create a version of the source content without the extracted enums + let contentWithoutExtractedEnums = sourceContent; + for (const enumDef of extractedEnums) { + contentWithoutExtractedEnums = contentWithoutExtractedEnums.replace(enumDef, ''); + } - await vscode.workspace.applyEdit(workspaceEdit); + // Also remove the component model class from the content since we're extracting it + // This prevents false positives where the enum is only used in the component model + try { + const lines = contentWithoutExtractedEnums.split('\n'); + const { classStartLine, classEndLine } = this.sourceCodeService.findClassBoundaries(lines, componentModel.name); + + // Remove the component model class from the content + const linesWithoutComponentModel = [ + ...lines.slice(0, classStartLine), + ...lines.slice(classEndLine + 1) + ]; + contentWithoutExtractedEnums = linesWithoutComponentModel.join('\n'); + } catch (error) { + console.warn(`Could not remove component model "${componentModel.name}" from content for enum usage check:`, error); + } + + // Look for references to the enum name in the remaining content + const enumRefRegex = new RegExp(`\\b${enumName}\\b`, 'g'); + const matches = contentWithoutExtractedEnums.match(enumRefRegex); + + console.log(`Checking if enum "${enumName}" is still used: found ${matches ? matches.length : 0} references`); + + // If there are matches, the enum is still used + return matches !== null && matches.length > 0; + } + + /** + * Adds an enum deletion range to the workspace edit. + */ + private async addEnumDeletionToWorkspaceEdit( + document: vscode.TextDocument, + enumName: string, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + const sourceContent = document.getText(); + const lines = sourceContent.split('\n'); + + // Find the enum definition with better pattern matching + let enumStartLine = -1; + let enumEndLine = -1; + + // Look for the enum declaration line + for (let i = 0; i < lines.length; i++) { + const line = lines[i].trim(); + + // Match: "enum EnumName {" or "export enum EnumName {" + const enumMatch = line.match(new RegExp(`^(export\\s+)?enum\\s+${enumName}\\s*\\{`)); + if (enumMatch) { + enumStartLine = i; + + // Look for any preceding comments or empty lines that belong to this enum + for (let j = i - 1; j >= 0; j--) { + const prevLine = lines[j].trim(); + if (prevLine === '' || prevLine.startsWith('//') || prevLine.startsWith('/*') || prevLine.endsWith('*/')) { + enumStartLine = j; + } else { + break; + } + } + + // Find the closing brace + let braceCount = 0; + let foundOpenBrace = false; + + for (let j = i; j < lines.length; j++) { + const currentLine = lines[j]; + + for (const char of currentLine) { + if (char === '{') { + braceCount++; + foundOpenBrace = true; + } else if (char === '}') { + braceCount--; + if (foundOpenBrace && braceCount === 0) { + enumEndLine = j; + break; + } + } + } + + if (foundOpenBrace && braceCount === 0) { + break; + } + } + + break; // Found the enum, stop searching + } + } + + if (enumStartLine !== -1 && enumEndLine !== -1) { + // Include any trailing empty lines that belong to this enum + /* while (enumEndLine + 1 < lines.length && lines[enumEndLine + 1].trim() === '') { + enumEndLine++; + } */ + + // Create the range to delete (include the newline of the last line) + const rangeToDelete = new vscode.Range( + new vscode.Position(enumStartLine, 0), + new vscode.Position(enumEndLine + 1, 0) + ); + + workspaceEdit.delete(document.uri, rangeToDelete); + console.log(`Scheduled deletion of enum "${enumName}" from lines ${enumStartLine} to ${enumEndLine}`); + } else { + console.warn(`Could not find enum "${enumName}" for deletion`); + } + } + + /** + * Merges edits from one workspace edit into another. + */ + private mergeWorkspaceEdits(sourceEdit: vscode.WorkspaceEdit, targetEdit: vscode.WorkspaceEdit): void { + sourceEdit.entries().forEach(([uri, edits]) => { + edits.forEach(edit => { + if (edit instanceof vscode.TextEdit) { + targetEdit.replace(uri, edit.range, edit.newText); + } + }); + }); } /** diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 76cf250..7976a76 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -637,4 +637,225 @@ export class SourceCodeService { await vscode.window.showTextDocument(document, { preview: false }); } } + + /** + * Deletes a specific model class from a file that contains multiple models. + * + * @param fileUri - The URI of the file containing the model + * @param modelMetadata - The metadata of the model to delete + * @param workspaceEdit - The workspace edit to add the deletion to + */ + public async deleteModelClassFromFile( + fileUri: vscode.Uri, + modelMetadata: any, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + try { + const document = await vscode.workspace.openTextDocument(fileUri); + const text = document.getText(); + const lines = text.split('\n'); + + // Find the class declaration range + const classDeclaration = modelMetadata.declaration; + const startLine = classDeclaration.range.start.line; + const endLine = classDeclaration.range.end.line; + + // Find the @Model decorator using cache information + let actualStartLine = startLine; + + // Check if the model has decorators in the cache + if (modelMetadata.decorators && modelMetadata.decorators.length > 0) { + // Find the @Model decorator specifically + const modelDecorator = modelMetadata.decorators.find((d: any) => d.name === "Model"); + if (modelDecorator && modelDecorator.position) { + // Use the decorator's range from cache for precise deletion + actualStartLine = Math.min(actualStartLine, modelDecorator.position.start.line); + } + } + + // Also look backwards to find any other decorators and comments that belong to this class + for (let i = actualStartLine - 1; i >= 0; i--) { + const line = lines[i].trim(); + if (line === '' || line.startsWith('//') || line.startsWith('/*') || line.endsWith('*/')) { + // Empty lines, single-line comments, or comment blocks - continue looking + actualStartLine = i; + } else if (line.startsWith('@')) { + // Decorator - include it + actualStartLine = i; + } else { + // Found non-empty, non-comment, non-decorator line - stop here + break; + } + } + + // Look forward to find the complete class body (including closing brace) + let actualEndLine = endLine; + let braceCount = 0; + let foundOpenBrace = false; + + for (let i = startLine; i < lines.length; i++) { + const line = lines[i]; + + for (const char of line) { + if (char === '{') { + braceCount++; + foundOpenBrace = true; + } else if (char === '}') { + braceCount--; + if (foundOpenBrace && braceCount === 0) { + actualEndLine = i; + break; + } + } + } + + if (foundOpenBrace && braceCount === 0) { + break; + } + } + + // Include any trailing empty lines that belong to this class + while (actualEndLine + 1 < lines.length && lines[actualEndLine + 1].trim() === '') { + actualEndLine++; + } + + // Create the range to delete (include the newline of the last line) + const rangeToDelete = new vscode.Range( + new vscode.Position(actualStartLine, 0), + new vscode.Position(actualEndLine + 1, 0) + ); + + workspaceEdit.delete(fileUri, rangeToDelete); + + } catch (error) { + console.error(`Error deleting model class from file ${fileUri.fsPath}:`, error); + // Fallback: just comment out the class declaration + workspaceEdit.replace(fileUri, modelMetadata.declaration.range, `/* DELETED_MODEL: ${modelMetadata.name} */`); + } + } + + /** + * Extracts enums that are related to a model's Choice fields. + * This analyzes the model's properties and identifies any enums + * that are referenced in @Choice decorators. + * + * @param sourceDocument - The document containing the model + * @param componentModel - The model metadata to analyze + * @param classBody - The class body content (optional optimization) + * @returns Array of enum definition strings + */ + public async extractRelatedEnums( + sourceDocument: vscode.TextDocument, + componentModel: any, + classBody?: string + ): Promise { + const relatedEnums: string[] = []; + const sourceContent = sourceDocument.getText(); + + // Find all Choice fields in the component model + const choiceFields = Object.values(componentModel.properties || {}).filter((property: any) => + property.decorators?.some((decorator: any) => decorator.name === "Choice") + ); + + if (choiceFields.length === 0) { + return relatedEnums; + } + + // For each Choice field, try to find referenced enums + for (const field of choiceFields) { + const choiceDecorator = (field as any).decorators?.find((d: any) => d.name === "Choice"); + if (choiceDecorator) { + // Look for enum references in the property type declaration + const enumNames = this.extractEnumNamesFromChoiceProperty(field); + + for (const enumName of enumNames) { + // Find the enum definition in the source file + const enumDefinition = this.extractEnumDefinition(sourceContent, enumName); + if (enumDefinition && !relatedEnums.includes(enumDefinition)) { + relatedEnums.push(enumDefinition); + } + } + } + } + + return relatedEnums; + } + + /** + * Extracts enum names from a Choice field's property type. + * For Choice fields, the enum is specified in the property type declaration, not the decorator. + * Example: @Choice() status: TaskStatus = TaskStatus.Active; + */ + private extractEnumNamesFromChoiceProperty(property: any): string[] { + const enumNames: string[] = []; + + // The enum name is in the property's type field + if (property.type && typeof property.type === 'string') { + // Remove array brackets if present (e.g., "TaskStatus[]" -> "TaskStatus") + const cleanType = property.type.replace(/\[\]$/, ''); + + // Check if this looks like an enum (starts with uppercase, follows enum naming conventions) + // Also exclude common TypeScript types that aren't enums + const isCommonType = ['string', 'number', 'boolean', 'Date', 'any', 'object', 'void'].includes(cleanType); + const enumMatch = cleanType.match(/^[A-Z][a-zA-Z0-9_]*$/); + + if (enumMatch && !isCommonType) { + enumNames.push(cleanType); + console.log(`Found potential enum "${cleanType}" in Choice field "${property.name}"`); + } + } + + return enumNames; + } + + /** + * Extracts the complete enum definition from source content. + */ + private extractEnumDefinition(sourceContent: string, enumName: string): string | null { + // Create regex to match enum definition including export keyword + const enumRegex = new RegExp( + `(export\\s+)?enum\\s+${enumName}\\s*\\{[^}]*\\}`, + 'gs' + ); + + const match = enumRegex.exec(sourceContent); + if (match) { + return match[0]; + } + + return null; + } + + /** + * Adds enum definitions to the model file content. + */ + public addEnumsToFileContent(modelFileContent: string, enums: string[]): string { + if (enums.length === 0) { + return modelFileContent; + } + + const lines = modelFileContent.split('\n'); + + // Find the position to insert enums (after imports, before the model class) + let insertPosition = 0; + for (let i = 0; i < lines.length; i++) { + if (lines[i].startsWith('import ')) { + insertPosition = i + 1; + } else if (lines[i].trim() === '' && insertPosition > 0) { + // Found empty line after imports + insertPosition = i; + break; + } else if (lines[i].includes('@Model') || lines[i].includes('class ')) { + // Found the start of the model definition + break; + } + } + + // Insert enums with proper spacing + const enumContent = enums.join('\n\n') + '\n\n'; + lines.splice(insertPosition, 0, enumContent); + + return lines.join('\n'); + } + } From 8281997e7839f43601e1c43e13529227915c1728 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 02:08:09 +0000 Subject: [PATCH 185/254] Initial plan From eb13590b83a27914a58e84825dc418eaea02bc89 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 02:19:10 +0000 Subject: [PATCH 186/254] Fix data source initialization to not require parameters Co-authored-by: dgaviola <190500+dgaviola@users.noreply.github.com> --- src/datasources/DataSource.ts | 5 ++--- src/datasources/typeorm/TypeORMSqlDataSource.ts | 7 +++---- test/datasources/DataSource.test.ts | 14 +++++++------- test/datasources/MultiDatabaseOperations.test.ts | 6 +++--- test/datasources/TypeORMConnection.test.ts | 12 ++++++------ test/datasources/TypeORMRepositoryMethods.test.ts | 2 +- test/examples/TypeORMExample.test.ts | 2 +- test/types_tests/ArrayPersistence.test.ts | 2 +- test/types_tests/ComplexTypesPersistence.test.ts | 2 +- .../DateTimeRangeArrayPersistence.test.ts | 2 +- 10 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/datasources/DataSource.ts b/src/datasources/DataSource.ts index 27ef5b8..4302bce 100644 --- a/src/datasources/DataSource.ts +++ b/src/datasources/DataSource.ts @@ -32,14 +32,13 @@ export abstract class DataSource { } /** - * Initialize the data source with the provided options. + * Initialize the data source using the options provided during construction. * This method should establish connections, set up the data source, * and prepare it for use. * - * @param options - Configuration options for the data source * @returns Promise that resolves when initialization is complete */ - abstract initialize(options: DataSourceOptions): Promise; + abstract initialize(): Promise; /** * Check if the data source has been initialized. diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index 1969f2a..ef292ed 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -118,13 +118,12 @@ export class TypeORMSqlDataSource extends DataSource { /** * Initialize the TypeORM data source. * Sets up the TypeORM DataSource, establishes database connection, - * and configures connection pooling. + * and configures connection pooling using options provided during construction. * - * @param options - TypeORM-specific configuration options * @returns Promise resolving to the initialized TypeORM DataSource */ - async initialize(options: DataSourceOptions): Promise { - const typeormOptions = options as TypeORMSqlDataSourceOptions; + async initialize(): Promise { + const typeormOptions = this.options as TypeORMSqlDataSourceOptions; // Get all entities (models + array element entities) const allEntities = [ diff --git a/test/datasources/DataSource.test.ts b/test/datasources/DataSource.test.ts index e02ded0..cf05863 100644 --- a/test/datasources/DataSource.test.ts +++ b/test/datasources/DataSource.test.ts @@ -353,7 +353,7 @@ describe('Data Source Integration', () => { } // Initialize the data source after model is configured - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save a user const user = new TestUser(); @@ -392,7 +392,7 @@ describe('Data Source Integration', () => { age!: number; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save multiple users const user1 = new TestUser(); @@ -428,7 +428,7 @@ describe('Data Source Integration', () => { age!: number; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save users with different ages const youngUser = new TestUser(); @@ -464,7 +464,7 @@ describe('Data Source Integration', () => { name!: string; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save a user const user = new TestUser(); @@ -497,7 +497,7 @@ describe('Data Source Integration', () => { category!: string; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save users with different categories const user1 = new TestUser(); @@ -551,7 +551,7 @@ describe('Data Source Integration', () => { contact!: string; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Create and save a complex model const model = new ComplexModel(); @@ -596,7 +596,7 @@ describe('Data Source Integration', () => { age!: number; } - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Try to save an invalid user const invalidUser = new ValidatedUser(); diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/test/datasources/MultiDatabaseOperations.test.ts index 7179084..1473cf3 100644 --- a/test/datasources/MultiDatabaseOperations.test.ts +++ b/test/datasources/MultiDatabaseOperations.test.ts @@ -390,7 +390,7 @@ describe('Multi-Database Operations Test Suite', () => { try { console.log(`Initializing ${dbConfig.name}...`); - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); console.log(`✓ ${dbConfig.name} initialized successfully`); } catch (error) { console.error(`✗ Failed to initialize ${dbConfig.name}:`, error); @@ -484,7 +484,7 @@ describe('Multi-Database Operations Test Suite', () => { const pooledDataSource = new TypeORMSqlDataSource(pooledConfig); configureModelWithDataSource(BlogPost, pooledDataSource); - await pooledDataSource.initialize(pooledDataSource.getOptions()); + await pooledDataSource.initialize(); expect(pooledDataSource.isConnected()).toBe(true); @@ -529,7 +529,7 @@ describe('Multi-Database Operations Test Suite', () => { try { configureModelWithDataSource(BlogPost, dataSource); - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); // Insert test data using repository directly const typeormInstance = dataSource.getTypeORMDataSource(); diff --git a/test/datasources/TypeORMConnection.test.ts b/test/datasources/TypeORMConnection.test.ts index 2f4baf8..1af7878 100644 --- a/test/datasources/TypeORMConnection.test.ts +++ b/test/datasources/TypeORMConnection.test.ts @@ -12,7 +12,7 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { synchronize: true, }); - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); expect(dataSource.isConnected()).toBe(true); expect(dataSource.getInitializationStatus()).toBe(true); @@ -33,7 +33,7 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { synchronize: true, }); - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); expect(dataSource.isConnected()).toBe(true); @@ -72,7 +72,7 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { minConnections: 3, }); - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); expect(dataSource.isConnected()).toBe(true); await dataSource.disconnect(); @@ -92,7 +92,7 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { connectTimeout: 1000, }); - await expect(dataSource.initialize(dataSource.getOptions())) + await expect(dataSource.initialize()) .rejects .toThrow(); @@ -128,8 +128,8 @@ describe('TypeORM SQL DataSource - Basic Connection Tests', () => { }); // Initialize both - await dataSource1.initialize(dataSource1.getOptions()); - await dataSource2.initialize(dataSource2.getOptions()); + await dataSource1.initialize(); + await dataSource2.initialize(); expect(dataSource1.isConnected()).toBe(true); expect(dataSource2.isConnected()).toBe(true); diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index 34d9eca..d37872e 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -42,7 +42,7 @@ describe('TypeORM Repository-Style Methods', () => { } }); - await dataSource.initialize(options); + await dataSource.initialize(); }); afterEach(async () => { diff --git a/test/examples/TypeORMExample.test.ts b/test/examples/TypeORMExample.test.ts index 7352f9f..a0c3933 100644 --- a/test/examples/TypeORMExample.test.ts +++ b/test/examples/TypeORMExample.test.ts @@ -15,7 +15,7 @@ describe('TypeORM DataSource Example', () => { // 2. Initialize the data source console.log('Initializing data source...'); - await mainDataSource.initialize(mainDataSource.getOptions()); + await mainDataSource.initialize(); console.log('✓ Data source initialized successfully'); // 3. Check configuration diff --git a/test/types_tests/ArrayPersistence.test.ts b/test/types_tests/ArrayPersistence.test.ts index 410865f..e011c59 100644 --- a/test/types_tests/ArrayPersistence.test.ts +++ b/test/types_tests/ArrayPersistence.test.ts @@ -38,7 +38,7 @@ describe("Array Persistence in SQL Databases", () => { }); // Initialize the data source - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); }); beforeEach(() => { diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 92a636e..f35d443 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -103,7 +103,7 @@ describe("Complex Types Persistence in SQL Databases", () => { }); // Initialize the data source - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); }); beforeEach(() => { diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index ef13448..db2a0ee 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -75,7 +75,7 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { }); // Initialize the data source - await dataSource.initialize(dataSource.getOptions()); + await dataSource.initialize(); }); beforeEach(() => { From 667428f2910873db5d37bb0926ff074308043f75 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 09:28:18 -0300 Subject: [PATCH 187/254] Simplify relationship assertion in SimpleRelationshipTest by removing manual loading check for assignedUser --- test/types_tests/SimpleRelationshipTest.test.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/test/types_tests/SimpleRelationshipTest.test.ts b/test/types_tests/SimpleRelationshipTest.test.ts index 3c34ad4..fad36ed 100644 --- a/test/types_tests/SimpleRelationshipTest.test.ts +++ b/test/types_tests/SimpleRelationshipTest.test.ts @@ -101,13 +101,6 @@ describe('Simple Relationship Test', () => { expect(savedTask.id).toBeDefined(); console.log('Task assignedUser:', savedTask.assignedUser); - if (savedTask.assignedUser) { - expect(savedTask.assignedUser.name).toBe('Test User'); - } else { - // If not eagerly loaded, try to load it manually - const loadedTask = await dataSource.findOneById(SimpleTask, savedTask.id); - console.log('Manually loaded task:', loadedTask); - expect(loadedTask?.assignedUser?.name).toBe('Test User'); - } + expect(savedTask.assignedUser?.name).toBe('Test User'); }); }); From 85749d258b1e87a00f65140acd8209eb52f27de3 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 10:40:38 -0300 Subject: [PATCH 188/254] Update default loading behavior for Reference options and enhance relationship persistence tests --- src/model/types/relationship/Relationship.ts | 2 +- .../RelationshipPersistence.test.ts | 218 ++++++++++++------ 2 files changed, 148 insertions(+), 72 deletions(-) diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index 4e95aa6..bcb4ca9 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -304,7 +304,7 @@ export interface SharedCompositionOptions { export function Reference(options: ReferenceOptions = {}) { const relationshipOptions: RelationshipOptions = { type: 'reference', - load: options.load ?? true, // Default to true for eager loading + load: options.load ?? false, // Default to true for eager loading onDelete: options.onDelete ?? 'removeReference' }; diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 3c14055..00b4e34 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -2,11 +2,11 @@ import { BaseModel, Field, Model, PersistentModel, PersistentComponentModel } fr import { Reference, Composition, SharedComposition } from "../../index"; import { TypeORMSqlDataSource } from "../../src/datasources"; import { Text, HTML, DateTime } from "../../index"; -import { - MODEL_FIELDS, - FIELD_TYPE, - FIELD_TYPE_OPTIONS, - FIELD_REQUIRED, +import { + MODEL_FIELDS, + FIELD_TYPE, + FIELD_TYPE_OPTIONS, + FIELD_REQUIRED, FIELD_RELATIONSHIP_TYPE, TYPEORM_RELATIONSHIP, TYPEORM_RELATIONSHIP_TYPE @@ -124,7 +124,7 @@ describe('Relationship Persistence', () => { const models = [User, Project, Task, TaskNote, Note, Epic, Story]; for (const modelClass of models) { dataSource.configureModel(modelClass); - + // Get all field names and configure them const fieldNames = Reflect.getMetadata(MODEL_FIELDS, modelClass) || []; for (const fieldName of fieldNames) { @@ -161,7 +161,7 @@ describe('Relationship Persistence', () => { it('should store relationship metadata for @Reference', () => { const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Task.prototype, 'project'); const fieldType = Reflect.getMetadata(FIELD_TYPE, Task.prototype, 'project'); - + expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('reference'); }); @@ -169,7 +169,7 @@ describe('Relationship Persistence', () => { it('should store relationship metadata for @Composition', () => { const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Task.prototype, 'notes'); const fieldType = Reflect.getMetadata(FIELD_TYPE, Task.prototype, 'notes'); - + expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('composition'); }); @@ -177,7 +177,7 @@ describe('Relationship Persistence', () => { it('should store relationship metadata for @SharedComposition', () => { const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, Epic.prototype, 'notes'); const fieldType = Reflect.getMetadata(FIELD_TYPE, Epic.prototype, 'notes'); - + expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('sharedComposition'); }); @@ -185,7 +185,7 @@ describe('Relationship Persistence', () => { it('should store relationship metadata for parent relationship in PersistentComponentModel', () => { const relationshipType = Reflect.getMetadata(FIELD_RELATIONSHIP_TYPE, TaskNote.prototype, 'owner'); const fieldType = Reflect.getMetadata(FIELD_TYPE, TaskNote.prototype, 'owner'); - + expect(fieldType).toBe('relationship'); expect(relationshipType).toBe('parent'); }); @@ -193,15 +193,15 @@ describe('Relationship Persistence', () => { it('should create TypeORM relationship metadata after configuration', () => { // Configure the field first dataSource.configureField( - Task.prototype, - 'project', - 'relationship', + Task.prototype, + 'project', + 'relationship', { required: false } ); - + const relationshipMetadata = Reflect.getMetadata(TYPEORM_RELATIONSHIP, Task.prototype, 'project'); const relationshipType = Reflect.getMetadata(TYPEORM_RELATIONSHIP_TYPE, Task.prototype, 'project'); - + expect(relationshipMetadata).toBe(true); expect(relationshipType).toBe('reference'); }); @@ -220,12 +220,19 @@ describe('Relationship Persistence', () => { task.project = savedProject; task.assignees = []; task.notes = []; - + const savedTask = await dataSource.save(task); - + expect(savedTask.id).toBeDefined(); - expect(savedTask.project).toBeDefined(); - expect(savedTask.project.id).toBe(savedProject.id); + expect(savedTask.project).toBeUndefined(); + + const retrievedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { project: true } + }); + expect(retrievedTask).toBeDefined(); + expect(retrievedTask!.project).toBeDefined(); + expect(retrievedTask!.project.id).toBe(savedProject.id); }); it('should persist composition relationships', async () => { @@ -253,11 +260,17 @@ describe('Relationship Persistence', () => { // Update the task with the note savedTask.notes = [note]; - const updatedTask = await dataSource.save(savedTask); + await dataSource.save(savedTask); + + const updatedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: { user: true } } + }); + - expect(updatedTask.notes).toHaveLength(1); - expect(updatedTask.notes[0]!.note).toBe('Test note content'); - expect(updatedTask.notes[0]!.user.name).toBe('Test User'); + expect(updatedTask?.notes).toHaveLength(1); + expect(updatedTask?.notes[0]!.note).toBe('Test note content'); + expect(updatedTask?.notes[0]!.user.name).toBe('Test User'); }); }); @@ -280,11 +293,17 @@ describe('Relationship Persistence', () => { task.assignees = [savedUser1, savedUser2]; task.notes = []; - const savedTask = await dataSource.save(task); + await dataSource.save(task); - expect(savedTask.assignees).toHaveLength(2); - expect(savedTask.assignees.map(u => u.name)).toContain('User 1'); - expect(savedTask.assignees.map(u => u.name)).toContain('User 2'); + const savedTask = await dataSource.findOne(Task, { + where: { title: 'Multi-assignee Task' }, + relations: { assignees: true } + }); + + expect(savedTask).toBeDefined(); + expect(savedTask!.assignees).toHaveLength(2); + expect(savedTask!.assignees.map(u => u.name)).toContain('User 1'); + expect(savedTask!.assignees.map(u => u.name)).toContain('User 2'); }); }); @@ -322,12 +341,19 @@ describe('Relationship Persistence', () => { savedTask.notes = [note]; const finalTask = await dataSource.save(savedTask); - expect(finalTask.project.name).toBe('Complex Project'); - expect(finalTask.assignees).toHaveLength(1); - expect(finalTask.assignees[0]!.name).toBe('Task Creator'); - expect(finalTask.notes).toHaveLength(1); - expect(finalTask.notes[0]!.note).toBe('Complex task note'); - expect(finalTask.notes[0]!.user.name).toBe('Task Creator'); + expect(finalTask.project).toBeUndefined(); + + const retrievedTask = await dataSource.findOne(Task, { + where: { id: finalTask.id }, + relations: { project: true, assignees: true, notes: { user: true } } + }); + + expect(retrievedTask).toBeDefined(); + expect(retrievedTask!.assignees).toHaveLength(1); + expect(retrievedTask!.assignees[0]!.name).toBe('Task Creator'); + expect(retrievedTask!.notes).toHaveLength(1); + expect(retrievedTask!.notes[0]!.note).toBe('Complex task note'); + expect(retrievedTask!.notes[0]!.user.name).toBe('Task Creator'); }); }); @@ -366,8 +392,11 @@ describe('Relationship Persistence', () => { }); it('should find tasks by project reference', async () => { - const tasks = await dataSource.findBy(Task, { project: { id: savedProject.id } }); - + const tasks = await dataSource.findWithOptions(Task, { + where: { project: { id: savedProject.id } }, + relations: { project: true } + }); + expect(tasks).toHaveLength(1); expect(tasks[0]!.title).toBe('Query Test Task'); expect(tasks[0]!.project.id).toBe(savedProject.id); @@ -375,17 +404,21 @@ describe('Relationship Persistence', () => { it('should find tasks by assignee reference', async () => { const tasks = await dataSource.findWithOptions(Task, { - where: { assignees: { id: savedUser.id } } + where: { assignees: { id: savedUser.id } }, + relations: { assignees: true } }); - + expect(tasks).toHaveLength(1); expect(tasks[0]!.title).toBe('Query Test Task'); expect(tasks[0]!.assignees.some(u => u.id === savedUser.id)).toBe(true); }); it('should find one task with relations loaded', async () => { - const task = await dataSource.findOneBy(Task, { id: savedTask.id }); - + const task = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { project: true, assignees: true, notes: { user: true } } + }); + expect(task).toBeDefined(); expect(task!.title).toBe('Query Test Task'); expect(task!.project).toBeDefined(); @@ -403,24 +436,24 @@ describe('Relationship Persistence', () => { assignees: { email: 'query@example.com' } } }); - + expect(tasks).toHaveLength(1); expect(tasks[0]!.title).toBe('Query Test Task'); }); it('should count tasks with relationships', async () => { - const count = await dataSource.countBy(Task, { - project: { id: savedProject.id } + const count = await dataSource.countBy(Task, { + project: { id: savedProject.id } }); - + expect(count).toBe(1); }); it('should check existence of tasks with relationships', async () => { - const exists = await dataSource.existsBy(Task, { - assignees: { id: savedUser.id } + const exists = await dataSource.existsBy(Task, { + assignees: { id: savedUser.id } }); - + expect(exists).toBe(true); }); }); @@ -577,8 +610,11 @@ describe('Relationship Persistence', () => { }); it('should load task with all composition children', async () => { - const task = await dataSource.findOneBy(Task, { id: taskId }); - + const task = await dataSource.findOne(Task, { + where: { id: taskId }, + relations: { project: true, assignees: true, notes: { user: true } } + }); + expect(task).toBeDefined(); expect(task!.notes).toHaveLength(2); expect(task!.notes[0]!.note).toBeDefined(); @@ -589,21 +625,27 @@ describe('Relationship Persistence', () => { it('should load compositions with nested references', async () => { const task = await dataSource.findOneBy(Task, { id: taskId }); - + expect(task).toBeDefined(); const firstNote = task!.notes[0]!; - - expect(firstNote.user).toBeDefined(); - expect(firstNote.user.id).toBe(userId); - expect(firstNote.user.name).toBe('Composition Reader'); - expect(firstNote.user.email).toBe('reader@composition.com'); + + const reloadedFirstNote = await dataSource.findOne(TaskNote, { + where: { id: firstNote.id }, + relations: { user: true } + }); + + expect(reloadedFirstNote).toBeDefined(); + expect(reloadedFirstNote!.user).toBeDefined(); + expect(reloadedFirstNote!.user.id).toBe(userId); + expect(reloadedFirstNote!.user.name).toBe('Composition Reader'); + expect(reloadedFirstNote!.user.email).toBe('reader@composition.com'); }); it('should find tasks by composition properties', async () => { const tasks = await dataSource.findWithOptions(Task, { where: { notes: { note: 'First composition note' } } }); - + expect(tasks).toHaveLength(1); expect(tasks[0]!.id).toBe(taskId); }); @@ -615,8 +657,12 @@ describe('Relationship Persistence', () => { emptyTask.notes = []; const savedEmptyTask = await dataSource.save(emptyTask); - const retrievedTask = await dataSource.findOneBy(Task, { id: savedEmptyTask.id }); - + const retrievedTask = await dataSource.findOne(Task, + { + where: { id: savedEmptyTask.id }, + relations: { assignees: true } + }); + expect(retrievedTask).toBeDefined(); expect(retrievedTask!.notes).toHaveLength(0); expect(retrievedTask!.assignees).toHaveLength(0); @@ -721,7 +767,7 @@ describe('Relationship Persistence', () => { // Verify users still exist (should NOT be deleted) const user1Exists = await dataSource.existsBy(User, { id: savedUser1.id }); const user2Exists = await dataSource.existsBy(User, { id: savedUser2.id }); - + expect(user1Exists).toBe(true); expect(user2Exists).toBe(true); }); @@ -829,9 +875,17 @@ describe('Relationship Persistence', () => { task.project = null as any; task.assignees = []; task.notes = []; - + const savedTask = await dataSource.save(task); - const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + + expect(savedTask.id).toBeDefined(); + expect(savedTask.project).toBeUndefined(); + + const retrievedTask = await dataSource.findOne(Task, + { + where: { id: savedTask.id }, + relations: { project: true } + }); expect(retrievedTask!.project).toBeNull(); }); @@ -841,9 +895,13 @@ describe('Relationship Persistence', () => { task.title = 'Task with Empty Arrays'; task.assignees = []; task.notes = []; - + const savedTask = await dataSource.save(task); - const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + const retrievedTask = await dataSource.findOne(Task, + { + where: { id: savedTask.id }, + relations: { assignees: true } + }); expect(retrievedTask!.assignees).toHaveLength(0); expect(retrievedTask!.notes).toHaveLength(0); @@ -908,13 +966,21 @@ describe('Relationship Persistence', () => { // Update project reference savedTask.project = savedProject2; - const updatedTask = await dataSource.save(savedTask); + await dataSource.save(savedTask); + + const updatedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { project: true } + }); - expect(updatedTask.project.id).toBe(savedProject2.id); - expect(updatedTask.project.name).toBe('New Project'); + expect(updatedTask!.project.id).toBe(savedProject2.id); + expect(updatedTask!.project.name).toBe('New Project'); // Verify the change persisted - const retrievedTask = await dataSource.findOneBy(Task, { id: savedTask.id }); + const retrievedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { project: true } + }); expect(retrievedTask!.project.id).toBe(savedProject2.id); }); @@ -933,15 +999,25 @@ describe('Relationship Persistence', () => { task.title = 'Bulk Assignment Task'; task.assignees = users; task.notes = []; - const savedTask = await dataSource.save(task); + await dataSource.save(task); - expect(savedTask.assignees).toHaveLength(5); + const savedTask = await dataSource.findOne(Task, { + where: { title: 'Bulk Assignment Task' }, + relations: { assignees: true } + }); + + expect(savedTask!.assignees).toHaveLength(5); // Remove some assignees - savedTask.assignees = users.slice(0, 3); - const updatedTask = await dataSource.save(savedTask); + savedTask!.assignees = users.slice(0, 3); + await dataSource.save(savedTask!); + + const updatedTask = await dataSource.findOne(Task, { + where: { id: savedTask!.id }, + relations: { assignees: true } + }); - expect(updatedTask.assignees).toHaveLength(3); + expect(updatedTask!.assignees).toHaveLength(3); // Verify the removed users still exist const userCount = await dataSource.countBy(User, {}); From bd6d6335e41f20cf58e0539109ecf31f1708d03d Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 10:49:59 -0300 Subject: [PATCH 189/254] Add Department and Employee models with eager loading relationships tests --- .../RelationshipPersistence.test.ts | 97 ++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 00b4e34..378e379 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -106,6 +106,29 @@ class Story extends PersistentModel { notes!: Note[]; } +// Test models for eager loading relationships +@Model() +class Department extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; +} + +@Model() +class Employee extends PersistentModel { + @Field({ required: true }) + @Text() + name!: string; + + @Field({ required: true }) + @Text() + email!: string; + + @Field({ required: false }) + @Reference({ load: true }) + department!: Department; +} + describe('Relationship Persistence', () => { let dataSource: TypeORMSqlDataSource; @@ -121,7 +144,7 @@ describe('Relationship Persistence', () => { beforeEach(async () => { // Configure models with the data source - const models = [User, Project, Task, TaskNote, Note, Epic, Story]; + const models = [User, Project, Task, TaskNote, Note, Epic, Story, Department, Employee]; for (const modelClass of models) { dataSource.configureModel(modelClass); @@ -1024,4 +1047,76 @@ describe('Relationship Persistence', () => { expect(userCount).toBe(5); }); }); + + describe('Eager Loading Relationships', () => { + it('should eagerly load reference relationships with load: true', async () => { + // Create a department + const department = new Department(); + department.name = 'Engineering'; + const savedDepartment = await dataSource.save(department); + + // Create an employee with department reference + const employee = new Employee(); + employee.name = 'Jane Developer'; + employee.email = 'jane.developer@company.com'; + employee.department = savedDepartment; + + const savedEmployee = await dataSource.save(employee); + + expect(savedEmployee.id).toBeDefined(); + + // With eager loading (load: true), relationships should be loaded automatically + // without needing to specify relations in the query + const retrievedEmployee = await dataSource.findOneBy(Employee, { id: savedEmployee.id }); + + expect(retrievedEmployee).toBeDefined(); + expect(retrievedEmployee!.name).toBe('Jane Developer'); + + // Department should be eagerly loaded + expect(retrievedEmployee!.department).toBeDefined(); + expect(retrievedEmployee!.department.id).toBe(savedDepartment.id); + expect(retrievedEmployee!.department.name).toBe('Engineering'); + }); + + it('should eagerly load relationships in findWithOptions queries', async () => { + // Create department + const department = new Department(); + department.name = 'Sales'; + const savedDepartment = await dataSource.save(department); + + // Create employee + const employee = new Employee(); + employee.name = 'Bob Salesperson'; + employee.email = 'bob.sales@company.com'; + employee.department = savedDepartment; + const savedEmployee = await dataSource.save(employee); + + // Query employees by department - relationships should be eagerly loaded + const employees = await dataSource.findWithOptions(Employee, { + where: { department: { name: 'Sales' } } + }); + + expect(employees).toHaveLength(1); + expect(employees[0]!.name).toBe('Bob Salesperson'); + + // Department should be eagerly loaded without specifying relations + expect(employees[0]!.department).toBeDefined(); + expect(employees[0]!.department.name).toBe('Sales'); + }); + + it('should handle null eager-loaded relationships', async () => { + // Create employee without department + const employee = new Employee(); + employee.name = 'Freelancer'; + employee.email = 'freelancer@company.com'; + employee.department = null as any; + + const savedEmployee = await dataSource.save(employee); + const retrievedEmployee = await dataSource.findOneBy(Employee, { id: savedEmployee.id }); + + expect(retrievedEmployee).toBeDefined(); + expect(retrievedEmployee!.name).toBe('Freelancer'); + expect(retrievedEmployee!.department).toBeNull(); + }); + }); }); From f3166a245f4cc6e4daad45262668a0a527100a98 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 11:38:11 -0300 Subject: [PATCH 190/254] Add parent-centric composition operations tests for Task and TaskNote models --- .../RelationshipPersistence.test.ts | 521 +++++++++++++++++- 1 file changed, 515 insertions(+), 6 deletions(-) diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 378e379..27bd4c6 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -481,6 +481,241 @@ describe('Relationship Persistence', () => { }); }); + describe('Parent-Centric Composition Operations', () => { + let savedTask: Task; + let savedUser1: User; + let savedUser2: User; + + beforeEach(async () => { + // Create users + const user1 = new User(); + user1.name = 'Parent Operation User 1'; + user1.email = 'parent1@ops.com'; + savedUser1 = await dataSource.save(user1); + + const user2 = new User(); + user2.name = 'Parent Operation User 2'; + user2.email = 'parent2@ops.com'; + savedUser2 = await dataSource.save(user2); + + // Create task + const task = new Task(); + task.title = 'Parent-Centric Operations Task'; + task.assignees = []; + task.notes = []; + savedTask = await dataSource.save(task); + }); + + it('should add composition elements by modifying parent array', async () => { + // Initially empty + expect(savedTask.notes).toHaveLength(0); + + // Add first note through parent + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date('2024-01-01'); + note1.note = 'First parent-added note'; + note1.owner = savedTask; + + savedTask.notes = [note1]; + const taskWithOneNote = await dataSource.save(savedTask); + + expect(taskWithOneNote.notes).toHaveLength(1); + expect(taskWithOneNote.notes[0]!.note).toBe('First parent-added note'); + expect(taskWithOneNote.notes[0]!.id).toBeDefined(); + + // Add second note through parent by extending array + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date('2024-01-02'); + note2.note = 'Second parent-added note'; + note2.owner = savedTask; + + taskWithOneNote.notes.push(note2); + const taskWithTwoNotes = await dataSource.save(taskWithOneNote); + + expect(taskWithTwoNotes.notes).toHaveLength(2); + expect(taskWithTwoNotes.notes.map(n => n.note)).toContain('First parent-added note'); + expect(taskWithTwoNotes.notes.map(n => n.note)).toContain('Second parent-added note'); + + // Verify both notes have IDs and exist in database + expect(taskWithTwoNotes.notes.every(n => n.id !== undefined)).toBe(true); + + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + expect(reloadedTask!.notes).toHaveLength(2); + }); + + it('should remove composition elements by explicit deletion then parent update', async () => { + // Start with multiple notes + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date(); + note1.note = 'Keep this note'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date(); + note2.note = 'Remove this note'; + note2.owner = savedTask; + + const note3 = new TaskNote(); + note3.user = savedUser1; + note3.timestamp = new Date(); + note3.note = 'Also keep this note'; + note3.owner = savedTask; + + savedTask.notes = [note1, note2, note3]; + await dataSource.save(savedTask); + + const taskWithThreeNotes = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(taskWithThreeNotes!.notes).toHaveLength(3); + const noteToRemoveId = taskWithThreeNotes!.notes.find(n => n.note === 'Remove this note')!.id; + + await dataSource.delete(TaskNote, noteToRemoveId!); + + const resultAfterDeletion = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(resultAfterDeletion!.notes).toHaveLength(2); + expect(resultAfterDeletion!.notes.map(n => n.note)).toEqual(['Keep this note', 'Also keep this note']); + + // Verify removed note was deleted from database + const deletedNote = await dataSource.findOneBy(TaskNote, { id: noteToRemoveId! }); + expect(deletedNote).toBeNull(); + }); + + it('should update composition elements through parent object properties', async () => { + // Add initial note + const note = new TaskNote(); + note.user = savedUser1; + note.timestamp = new Date('2024-01-01'); + note.note = 'Original content'; + note.owner = savedTask; + + savedTask.notes = [note]; + const taskWithNote = await dataSource.save(savedTask); + + const originalNoteId = taskWithNote.notes[0]!.id; + + // Update through parent's note reference + taskWithNote.notes[0]!.note = 'Updated content via parent'; + taskWithNote.notes[0]!.timestamp = new Date('2024-01-15'); + taskWithNote.notes[0]!.user = savedUser2; // Change reference too + + await dataSource.save(taskWithNote); + + const taskWithUpdatedNote = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: { user: true } } + }); + + expect(taskWithUpdatedNote!.notes[0]!.note).toBe('Updated content via parent'); + expect(taskWithUpdatedNote!.notes[0]!.timestamp).toEqual(new Date('2024-01-15')); + expect(taskWithUpdatedNote!.notes[0]!.id).toBe(originalNoteId); // Same object, updated + + // Verify changes persisted + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: { user: true } } + }); + + expect(reloadedTask!.notes[0]!.note).toBe('Updated content via parent'); + expect(reloadedTask!.notes[0]!.user.id).toBe(savedUser2.id); + }); + + it('should handle mixed parent operations with explicit deletions', async () => { + // Start with initial notes + const initialNote1 = new TaskNote(); + initialNote1.user = savedUser1; + initialNote1.timestamp = new Date('2024-01-01'); + initialNote1.note = 'Update me'; + initialNote1.owner = savedTask; + + const initialNote2 = new TaskNote(); + initialNote2.user = savedUser2; + initialNote2.timestamp = new Date('2024-01-02'); + initialNote2.note = 'Delete me'; + initialNote2.owner = savedTask; + + savedTask.notes = [initialNote1, initialNote2]; + const taskWithInitialNotes = await dataSource.save(savedTask); + + expect(taskWithInitialNotes.notes).toHaveLength(2); + const noteToDeleteId = taskWithInitialNotes.notes.find(n => n.note === 'Delete me')!.id; + const noteToUpdateId = taskWithInitialNotes.notes.find(n => n.note === 'Update me')!.id; + + // 1. Update existing note + const noteToUpdate = taskWithInitialNotes.notes.find(n => n.note === 'Update me')!; + noteToUpdate.note = 'I was updated!'; + noteToUpdate.timestamp = new Date('2024-01-10'); + + await dataSource.save(taskWithInitialNotes); + + // 2. Explicitly delete the note to be removed + await dataSource.delete(TaskNote, noteToDeleteId!); + + + const taskWithUpdatedNotes = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + // 4. Add two new notes + const newNote1 = new TaskNote(); + newNote1.user = savedUser2; + newNote1.timestamp = new Date('2024-01-03'); + newNote1.note = 'New note 1'; + newNote1.owner = savedTask; + + const newNote2 = new TaskNote(); + newNote2.user = savedUser1; + newNote2.timestamp = new Date('2024-01-04'); + newNote2.note = 'New note 2'; + newNote2.owner = savedTask; + + taskWithUpdatedNotes!.notes.push(newNote1, newNote2); + + // Save all changes in one operation + const finalTask = await dataSource.save(taskWithUpdatedNotes!); + + expect(finalTask.notes).toHaveLength(3); + expect(finalTask.notes.map(n => n.note).sort()).toEqual([ + 'I was updated!', 'New note 1', 'New note 2' + ]); + + // Verify database state + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(reloadedTask!.notes).toHaveLength(3); + + // Verify update preserved ID + const updatedNote = reloadedTask!.notes.find(n => n.note === 'I was updated!')!; + expect(updatedNote.id).toBe(noteToUpdateId); + + // Verify deletion worked + const deletedNote = await dataSource.findOneBy(TaskNote, { id: noteToDeleteId! }); + expect(deletedNote).toBeNull(); + + // Verify new notes got IDs + const newNotes = reloadedTask!.notes.filter(n => n.note.startsWith('New note')); + expect(newNotes).toHaveLength(2); + expect(newNotes.every(n => n.id !== undefined)).toBe(true); + }); + }); + describe('Array Composition Operations', () => { let savedTask: Task; let savedUser1: User; @@ -535,7 +770,7 @@ describe('Relationship Persistence', () => { expect(updatedTask2.notes.map(n => n.note)).toContain('Second note'); }); - it('should remove elements from composition array', async () => { + it('should remove elements from composition array with explicit deletion', async () => { // Start with two notes const note1 = new TaskNote(); note1.user = savedUser1; @@ -554,15 +789,15 @@ describe('Relationship Persistence', () => { expect(taskWithTwoNotes.notes).toHaveLength(2); - // Get the note to remove and its ID + // Get the note to remove and its ID for verification const noteToRemove = taskWithTwoNotes.notes.find(n => n.note === 'Note to remove'); expect(noteToRemove).toBeDefined(); const noteToRemoveId = noteToRemove!.id; - // First, manually delete the composition element from the database + // Current framework pattern: explicit deletion first await dataSource.delete(TaskNote, noteToRemoveId!); - // Then update the parent's array to reflect the removal + // Then update parent's array to reflect the removal taskWithTwoNotes.notes = taskWithTwoNotes.notes.filter(n => n.note !== 'Note to remove'); const taskWithOneNote = await dataSource.save(taskWithTwoNotes); @@ -574,7 +809,7 @@ describe('Relationship Persistence', () => { expect(deletedNote).toBeNull(); }); - it('should modify elements in composition array', async () => { + it('should modify elements in composition array through parent', async () => { // Add a note const note = new TaskNote(); note.user = savedUser1; @@ -587,11 +822,285 @@ describe('Relationship Persistence', () => { expect(taskWithNote.notes[0]!.note).toBe('Original note content'); - // Modify the note + // Store the note ID for verification + const noteId = taskWithNote.notes[0]!.id; + + // Modify the note through parent object taskWithNote.notes[0]!.note = 'Modified note content'; + taskWithNote.notes[0]!.timestamp = new Date('2024-01-15'); const taskWithModifiedNote = await dataSource.save(taskWithNote); expect(taskWithModifiedNote.notes[0]!.note).toBe('Modified note content'); + expect(taskWithModifiedNote.notes[0]!.timestamp).toEqual(new Date('2024-01-15')); + + // Verify the changes persisted in the database + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(reloadedTask!.notes[0]!.note).toBe('Modified note content'); + expect(reloadedTask!.notes[0]!.id).toBe(noteId); // Same object, just updated + }); + + it('should handle mixed operations on composition array with explicit deletions', async () => { + // Start with two notes + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date('2024-01-01'); + note1.note = 'Note to keep and modify'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date('2024-01-02'); + note2.note = 'Note to remove'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + const taskWithTwoNotes = await dataSource.save(savedTask); + + expect(taskWithTwoNotes.notes).toHaveLength(2); + + // Store IDs for verification + const note1Id = taskWithTwoNotes.notes.find(n => n.note === 'Note to keep and modify')!.id; + const note2Id = taskWithTwoNotes.notes.find(n => n.note === 'Note to remove')!.id; + + // Mixed operations: update existing, remove one, add new + // 1. Modify existing note + const existingNote = taskWithTwoNotes.notes.find(n => n.note === 'Note to keep and modify')!; + existingNote.note = 'Modified note content'; + existingNote.timestamp = new Date('2024-01-10'); + + await dataSource.save(taskWithTwoNotes); + + // 2. Explicitly delete the note to be removed + await dataSource.delete(TaskNote, note2Id!); + + // 3. Remove from parent array + const taskWithOneNote = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + // 4. Add a new note + const newNote = new TaskNote(); + newNote.user = savedUser1; + newNote.timestamp = new Date('2024-01-15'); + newNote.note = 'New added note'; + newNote.owner = savedTask; + taskWithOneNote!.notes.push(newNote); + + // Save all changes through parent + const updatedTask = await dataSource.save(taskWithOneNote!); + + expect(updatedTask.notes).toHaveLength(2); + expect(updatedTask.notes.map(n => n.note)).toContain('Modified note content'); + expect(updatedTask.notes.map(n => n.note)).toContain('New added note'); + expect(updatedTask.notes.map(n => n.note)).not.toContain('Note to remove'); + + // Verify database state + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: { user: true } } + }); + + expect(reloadedTask!.notes).toHaveLength(2); + + // Verify the modified note kept its ID + const modifiedNote = reloadedTask!.notes.find(n => n.note === 'Modified note content')!; + expect(modifiedNote.id).toBe(note1Id); + expect(modifiedNote.timestamp).toEqual(new Date('2024-01-10')); + + // Verify the new note got an ID + const addedNote = reloadedTask!.notes.find(n => n.note === 'New added note')!; + expect(addedNote.id).toBeDefined(); + expect(addedNote.timestamp).toEqual(new Date('2024-01-15')); + + // Verify the removed note was deleted from database + const deletedNote = await dataSource.findOneBy(TaskNote, { id: note2Id! }); + expect(deletedNote).toBeNull(); + }); + + it('should replace entire composition array with explicit cleanup', async () => { + // Start with two notes + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date(); + note1.note = 'Original note 1'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date(); + note2.note = 'Original note 2'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + const taskWithOriginalNotes = await dataSource.save(savedTask); + + expect(taskWithOriginalNotes.notes).toHaveLength(2); + const originalNoteIds = taskWithOriginalNotes.notes.map(n => n.id); + + // Explicitly delete all existing notes + for (const noteId of originalNoteIds) { + await dataSource.delete(TaskNote, noteId!); + } + + // Replace entire array with new notes + const newNote1 = new TaskNote(); + newNote1.user = savedUser1; + newNote1.timestamp = new Date(); + newNote1.note = 'Replacement note 1'; + newNote1.owner = savedTask; + + const newNote2 = new TaskNote(); + newNote2.user = savedUser2; + newNote2.timestamp = new Date(); + newNote2.note = 'Replacement note 2'; + newNote2.owner = savedTask; + + const newNote3 = new TaskNote(); + newNote3.user = savedUser1; + newNote3.timestamp = new Date(); + newNote3.note = 'Replacement note 3'; + newNote3.owner = savedTask; + + // Replace entire array + taskWithOriginalNotes.notes = [newNote1, newNote2, newNote3]; + const taskWithReplacedNotes = await dataSource.save(taskWithOriginalNotes); + + expect(taskWithReplacedNotes.notes).toHaveLength(3); + expect(taskWithReplacedNotes.notes.map(n => n.note)).toEqual([ + 'Replacement note 1', + 'Replacement note 2', + 'Replacement note 3' + ]); + + // Verify old notes were deleted from database + for (const originalId of originalNoteIds) { + const deletedNote = await dataSource.findOneBy(TaskNote, { id: originalId! }); + expect(deletedNote).toBeNull(); + } + + // Verify new notes exist in database + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(reloadedTask!.notes).toHaveLength(3); + expect(reloadedTask!.notes.every(n => n.id !== undefined)).toBe(true); + }); + + it('should clear composition array with explicit cleanup', async () => { + // Start with notes + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date(); + note1.note = 'Note to clear 1'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date(); + note2.note = 'Note to clear 2'; + note2.owner = savedTask; + + savedTask.notes = [note1, note2]; + const taskWithNotes = await dataSource.save(savedTask); + + expect(taskWithNotes.notes).toHaveLength(2); + const noteIds = taskWithNotes.notes.map(n => n.id); + + // Explicitly delete all notes + for (const noteId of noteIds) { + await dataSource.delete(TaskNote, noteId!); + } + + // Clear the array through parent + taskWithNotes.notes = []; + const taskWithoutNotes = await dataSource.save(taskWithNotes); + + expect(taskWithoutNotes.notes).toHaveLength(0); + + // Verify notes were deleted from database + for (const noteId of noteIds) { + const deletedNote = await dataSource.findOneBy(TaskNote, { id: noteId! }); + expect(deletedNote).toBeNull(); + } + + // Verify task still exists with empty notes array + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(reloadedTask).toBeDefined(); + expect(reloadedTask!.notes).toHaveLength(0); + }); + + // TODO: Reordering composition arrays requires additional framework development + // The current implementation may not preserve all elements during reordering operations + it.skip('should handle reordering composition array through parent', async () => { + // Start with three notes in specific order + const note1 = new TaskNote(); + note1.user = savedUser1; + note1.timestamp = new Date('2024-01-01'); + note1.note = 'First note'; + note1.owner = savedTask; + + const note2 = new TaskNote(); + note2.user = savedUser2; + note2.timestamp = new Date('2024-01-02'); + note2.note = 'Second note'; + note2.owner = savedTask; + + const note3 = new TaskNote(); + note3.user = savedUser1; + note3.timestamp = new Date('2024-01-03'); + note3.note = 'Third note'; + note3.owner = savedTask; + + savedTask.notes = [note1, note2, note3]; + const taskWithOrderedNotes = await dataSource.save(savedTask); + + expect(taskWithOrderedNotes.notes).toHaveLength(3); + expect(taskWithOrderedNotes.notes.map(n => n.note)).toEqual([ + 'First note', 'Second note', 'Third note' + ]); + + // Store IDs to verify they remain the same after reordering + const originalIds = taskWithOrderedNotes.notes.map(n => n.id); + + // Reorder the array through parent + const reorderedNotes = [ + taskWithOrderedNotes.notes[2]!, // Third note first + taskWithOrderedNotes.notes[0]!, // First note second + taskWithOrderedNotes.notes[1]! // Second note third + ]; + + taskWithOrderedNotes.notes = reorderedNotes; + const taskWithReorderedNotes = await dataSource.save(taskWithOrderedNotes); + + expect(taskWithReorderedNotes.notes).toHaveLength(3); + expect(taskWithReorderedNotes.notes.map(n => n.note)).toEqual([ + 'Third note', 'First note', 'Second note' + ]); + + // Verify IDs are preserved (same objects, just reordered) + const newIds = taskWithReorderedNotes.notes.map(n => n.id); + expect(newIds.sort()).toEqual(originalIds.sort()); + + // Verify order persisted in database + const reloadedTask = await dataSource.findOne(Task, { + where: { id: savedTask.id }, + relations: { notes: true } + }); + + expect(reloadedTask!.notes.map(n => n.note)).toEqual([ + 'Third note', 'First note', 'Second note' + ]); }); }); From 32b95c8bbfa62ec18f2e3337c08af154cae43549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Tue, 16 Sep 2025 12:00:11 -0300 Subject: [PATCH 191/254] Update src/model/types/relationship/Relationship.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/model/types/relationship/Relationship.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/types/relationship/Relationship.ts b/src/model/types/relationship/Relationship.ts index bcb4ca9..9da5f05 100644 --- a/src/model/types/relationship/Relationship.ts +++ b/src/model/types/relationship/Relationship.ts @@ -304,7 +304,7 @@ export interface SharedCompositionOptions { export function Reference(options: ReferenceOptions = {}) { const relationshipOptions: RelationshipOptions = { type: 'reference', - load: options.load ?? false, // Default to true for eager loading + load: options.load ?? false, // Default to false for lazy loading onDelete: options.onDelete ?? 'removeReference' }; From aa43ae92849ce0b649c12fa9c317dc92b542e556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Tue, 16 Sep 2025 12:00:46 -0300 Subject: [PATCH 192/254] Update test/types_tests/RelationshipPersistence.test.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- test/types_tests/RelationshipPersistence.test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index 27bd4c6..cc1d263 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -289,8 +289,6 @@ describe('Relationship Persistence', () => { where: { id: savedTask.id }, relations: { notes: { user: true } } }); - - expect(updatedTask?.notes).toHaveLength(1); expect(updatedTask?.notes[0]!.note).toBe('Test note content'); expect(updatedTask?.notes[0]!.user.name).toBe('Test User'); From ba4d676ebcc2898c4898b1b2ea5c94b08cf337f8 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 12:24:40 -0300 Subject: [PATCH 193/254] Implement UUID v7 generation for entity IDs and update dependencies --- jest.config.ts | 2 +- package.json | 8 +++++--- src/datasources/typeorm/ArrayEntityFactory.ts | 15 +++++++++++++-- src/datasources/typeorm/TypeORMSqlDataSource.ts | 6 +++--- src/model/PersistentModel.ts | 14 +++++++++++--- test/datasources/TypeORMRepositoryMethods.test.ts | 5 +++++ 6 files changed, 38 insertions(+), 12 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index efbcf18..fc6cfa4 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -16,7 +16,7 @@ const config: Config = { ], }, transformIgnorePatterns: [ - '/node_modules/(?!bigint-money|class-transformer)', + '/node_modules/(?!bigint-money|class-transformer|uuid)', ], testMatch: ["/test/**/*.test.ts"], moduleNameMapper: { diff --git a/package.json b/package.json index 17bd922..ddbed3b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Slingr Framework - Smart Business Apps", "main": "./dist/index.js", "exports": { - ".": "./dist/index.js" + ".": "./dist/index.js" }, "scripts": { "test": "jest --verbose", @@ -25,6 +25,7 @@ "@types/jest": "^29.5.12", "@types/node": "^24.3.0", "@types/sqlite3": "^3.1.11", + "@types/uuid": "^10.0.0", "jest": "^29.7.0", "jest-circus": "^29.7.0", "mysql2": "^3.11.3", @@ -38,8 +39,9 @@ "dependencies": { "class-transformer": "^0.5.1", "class-validator": "^0.14.2", - "financial-number": "^4.0.4", "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions", - "typeorm": "^0.3.26" + "financial-number": "^4.0.4", + "typeorm": "^0.3.26", + "uuid": "^13.0.0" } } diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts index 67d29ab..482dda0 100644 --- a/src/datasources/typeorm/ArrayEntityFactory.ts +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -1,5 +1,6 @@ -import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Index } from 'typeorm'; +import { Entity, PrimaryColumn, Column, ManyToOne, JoinColumn, Index, BeforeInsert } from 'typeorm'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; +import { v7 as uuidv7 } from 'uuid'; /** * Factory class for creating dynamic array element entities. @@ -98,7 +99,17 @@ export class ArrayEntityFactory { Entity(tableName)(entityClass); // Configure the id field - PrimaryGeneratedColumn('uuid')(entityClass.prototype, 'id'); + PrimaryColumn('uuid')(entityClass.prototype, 'id'); + + // Add UUID v7 generation method + entityClass.prototype.generateId = function() { + if (!this.id) { + this.id = uuidv7(); + } + }; + + // Apply BeforeInsert decorator to the generateId method + BeforeInsert()(entityClass.prototype, 'generateId'); diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index d427ff4..396105f 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -10,7 +10,7 @@ import { DeleteResult, InsertResult } from 'typeorm'; -import { Entity, PrimaryGeneratedColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm'; +import { Entity, PrimaryColumn, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm'; import { Repository } from 'typeorm'; import { ObjectId } from 'typeorm'; import { DataSource, DataSourceOptions } from '../DataSource'; @@ -342,9 +342,9 @@ export class TypeORMSqlDataSource extends DataSource { fieldType: string, fieldOptions?: any ): void { - // Skip the id field if it's already configured with @PrimaryGeneratedColumn + // Skip the id field if it's already configured with @PrimaryColumn if (propertyKey === 'id') { - return; // PersistentModel already handles this with @PrimaryGeneratedColumn + return; // PersistentModel already handles this with @PrimaryColumn and UUID v7 generation } // Check if this is an embedded field diff --git a/src/model/PersistentModel.ts b/src/model/PersistentModel.ts index 3565c94..b67916e 100644 --- a/src/model/PersistentModel.ts +++ b/src/model/PersistentModel.ts @@ -1,7 +1,8 @@ import { BaseModel } from './BaseModel'; import { Model } from './Model'; import { Field } from './Field'; -import { PrimaryGeneratedColumn } from 'typeorm'; +import { PrimaryColumn, BeforeInsert } from 'typeorm'; +import { v7 as uuidv7 } from 'uuid'; /** * Abstract base class for persistent models that need to be stored in a data source. @@ -29,6 +30,13 @@ export abstract class PersistentModel extends BaseModel { required: false, docs: 'Unique identifier for the entity' }) - @PrimaryGeneratedColumn('uuid') - id!: string + @PrimaryColumn('uuid') + id?: string + + @BeforeInsert() + generateId() { + if (!this.id) { + this.id = uuidv7(); + } + } } \ No newline at end of file diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index d37872e..eac6ac9 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -317,7 +317,9 @@ describe('TypeORM Repository-Style Methods', () => { }); test('insert() should insert new entities', async () => { + const { v7: uuidv7 } = await import('uuid'); const newPost: Partial = { + id: uuidv7(), title: 'Insert Test Post', content: 'Content for insert test', tags: ['insert', 'test'], @@ -333,14 +335,17 @@ describe('TypeORM Repository-Style Methods', () => { }); test('insert() should insert multiple entities', async () => { + const { v7: uuidv7 } = await import('uuid'); const newPosts: Partial[] = [ { + id: uuidv7(), title: 'Bulk Insert Post 1', content: 'Content for bulk insert post 1', tags: ['bulk', 'insert'], collaboratorEmails: ['bulk1@example.com'] }, { + id: uuidv7(), title: 'Bulk Insert Post 2', content: 'Content for bulk insert post 2', tags: ['bulk', 'insert'], From a585f22a771c56dc61e9f1cf2fdf5acc39905952 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Tue, 16 Sep 2025 12:25:37 -0300 Subject: [PATCH 194/254] Fix findOneById test to ensure saved.id is not null --- test/datasources/TypeORMRepositoryMethods.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/test/datasources/TypeORMRepositoryMethods.test.ts index eac6ac9..2509860 100644 --- a/test/datasources/TypeORMRepositoryMethods.test.ts +++ b/test/datasources/TypeORMRepositoryMethods.test.ts @@ -417,7 +417,7 @@ describe('TypeORM Repository-Style Methods', () => { const saved = await dataSource.save(post); // Test findOneById method - const found = await dataSource.findOneById(BlogPost, saved.id); + const found = await dataSource.findOneById(BlogPost, saved.id!); expect(found).toBeDefined(); expect(found!.title).toBe('FindOneById Test Post'); expect(found!.content).toBe('Content for findOneById test'); From 161a868d61a2176f7d26baa2070f7d6f837aa1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Yornet?= <88344735+ElPelado619@users.noreply.github.com> Date: Tue, 16 Sep 2025 12:34:04 -0300 Subject: [PATCH 195/254] Update src/model/PersistentModel.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/model/PersistentModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/PersistentModel.ts b/src/model/PersistentModel.ts index b67916e..6fb5e6b 100644 --- a/src/model/PersistentModel.ts +++ b/src/model/PersistentModel.ts @@ -31,7 +31,7 @@ export abstract class PersistentModel extends BaseModel { docs: 'Unique identifier for the entity' }) @PrimaryColumn('uuid') - id?: string + id!: string @BeforeInsert() generateId() { From 502de3f2130124c6ae303a03cdf25d509f4ebb35 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 17 Sep 2025 08:46:01 -0300 Subject: [PATCH 196/254] Added support for selecting and reordering multiple fields in the explorer. --- src/explorer/explorerProvider.ts | 226 ++++++++++++++++++++++----- src/explorer/explorerRegistration.ts | 16 +- 2 files changed, 194 insertions(+), 48 deletions(-) diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index 2ba31fb..61fa292 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -47,14 +47,56 @@ export class ExplorerProvider dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken ): void | Thenable { + // Support multi-drag for fields only if (source.length > 1) { - // Multi-drag is not supported for reordering + // Check if all selected items are fields from the same model + const firstItem = source[0]; + if (firstItem.itemType !== "field" && firstItem.itemType !== "referenceField") { + return; // Multi-drag only supported for fields + } + + // Verify all items are fields from the same model + const modelFilePath = firstItem.parent?.metadata?.declaration.uri.fsPath; + const modelClassName = firstItem.parent?.metadata?.name; + + if (!modelFilePath || !modelClassName) { + return; + } + + const allFieldsFromSameModel = source.every(item => + (item.itemType === "field" || item.itemType === "referenceField") && + item.parent?.metadata?.declaration.uri.fsPath === modelFilePath && + item.parent?.metadata?.name === modelClassName + ); + + if (!allFieldsFromSameModel) { + return; // All fields must be from the same model + } + + // Create multi-field drag data + const fieldNames = source + .filter(item => item.metadata && "name" in item.metadata) + .map(item => (item.metadata as any).name); + + if (fieldNames.length > 0) { + dataTransfer.set( + FIELD_MIME_TYPE, + new vscode.DataTransferItem({ + fields: fieldNames, // Multiple fields + modelPath: modelFilePath, + modelClassName: modelClassName, + isMultiField: true + }) + ); + } return; } + + // Single item drag (existing logic) const draggedItem = source[0]; // We can drag fields, models, or folders - if (draggedItem.itemType === "field" && draggedItem.metadata && "name" in draggedItem.metadata) { + if ((draggedItem.itemType === "field" || draggedItem.itemType === "referenceField") && draggedItem.metadata && "name" in draggedItem.metadata) { // The parent of a field item is the 'modelFieldsFolder', which holds the model's metadata const modelFilePath = draggedItem.parent?.metadata?.declaration.uri.fsPath; const modelClassName = draggedItem.parent?.metadata?.name; @@ -174,6 +216,10 @@ export class ExplorerProvider private async handleFieldDrop(target: AppTreeItem | undefined, transferItem: vscode.DataTransferItem): Promise { const draggedData = transferItem.value; + // Check if this is a multi-field operation + const isMultiField = draggedData.isMultiField && draggedData.fields; + const fieldNames = isMultiField ? draggedData.fields : [draggedData.field]; + // Check if someone is trying to drop a composition model into a folder or data root if (target && (target.itemType === "folder" || target.itemType === "dataRoot" || target.itemType === "model")) { vscode.window.showWarningMessage( @@ -186,8 +232,8 @@ export class ExplorerProvider let targetFieldName: string | null = null; let targetModelPath: string | undefined = undefined; - if (target && target.itemType === "field" && target.metadata && "name" in target.metadata) { - // Dropping onto a regular field + if (target && (target.itemType === "field" || target.itemType === "referenceField") && target.metadata && "name" in target.metadata) { + // Dropping onto a regular field or reference field targetFieldName = target.metadata.name; targetModelPath = target.parent?.metadata?.declaration.uri.fsPath; } else if (target && target.itemType === "model" && target.parent && target.parent.itemType === "model") { @@ -215,59 +261,64 @@ export class ExplorerProvider } if (!target || !targetFieldName || !targetModelPath) { - vscode.window.showWarningMessage("A field can only be dropped onto another field or composition model."); + const fieldWord = isMultiField ? "Fields" : "A field"; + const verbWord = isMultiField ? "can" : "can"; + vscode.window.showWarningMessage(`${fieldWord} ${verbWord} only be dropped onto another field or composition model.`); return; } // Validate the drop operation if (draggedData.modelPath !== targetModelPath) { - vscode.window.showWarningMessage("Fields can only be reordered within the same model."); + const fieldWord = isMultiField ? "Fields" : "Fields"; + vscode.window.showWarningMessage(`${fieldWord} can only be reordered within the same model.`); return; } - if (draggedData.field === targetFieldName) { - return; // Dropped on itself + if (fieldNames.includes(targetFieldName)) { + return; // Dropped on one of the dragged fields } - // Perform the reordering - try { - // 1. Get the new text from ts-morph *without saving*. - const newText = await this.reorderFieldsAndGetText( - draggedData.modelPath, - draggedData.modelClassName, - draggedData.field, - targetFieldName - ); - - if (newText === null) { - vscode.window.showErrorMessage("Failed to reorder fields."); - return; - } - - // 2. Apply the changes to the editor and format. - const uri = vscode.Uri.file(draggedData.modelPath); - const document = await vscode.workspace.openTextDocument(uri); - const editor = await vscode.window.showTextDocument(document); + // For multi-field operations, we need to reorder multiple fields + if (isMultiField) { + try { + // Reorder multiple fields + const newText = await this.reorderMultipleFieldsAndGetText( + draggedData.modelPath, + draggedData.modelClassName, + fieldNames, + targetFieldName + ); - // Replace the entire document content with the new text. - await editor.edit((editBuilder) => { - const fullRange = new vscode.Range(document.positionAt(0), document.positionAt(document.getText().length)); - editBuilder.replace(fullRange, newText); - }); + if (newText === null) { + vscode.window.showErrorMessage("Failed to reorder fields."); + return; + } - // Execute the format command on the now-dirty file. - await vscode.commands.executeCommand("editor.action.formatDocument"); + await this.applyTextChanges(draggedData.modelPath, newText); + } catch (error: any) { + console.error("Error reordering multiple fields:", error); + vscode.window.showErrorMessage(`An error occurred: ${error.message}`); + } + } else { + // Single field reordering (existing logic) + try { + const newText = await this.reorderFieldsAndGetText( + draggedData.modelPath, + draggedData.modelClassName, + fieldNames[0], + targetFieldName + ); - // 3. Save the document a single time. - await document.save(); + if (newText === null) { + vscode.window.showErrorMessage("Failed to reorder fields."); + return; + } - // 4. Refresh the tree. The cache will update from the single save event. - setTimeout(() => { - this.refresh(); - }, 200); - } catch (error: any) { - console.error("Error reordering fields:", error); - vscode.window.showErrorMessage(`An error occurred: ${error.message}`); + await this.applyTextChanges(draggedData.modelPath, newText); + } catch (error: any) { + console.error("Error reordering fields:", error); + vscode.window.showErrorMessage(`An error occurred: ${error.message}`); + } } } @@ -463,6 +514,95 @@ export class ExplorerProvider return sourceFile.getFullText(); } + /** + * Reorders multiple fields in the model class file and returns the updated text. + * @param modelPath The path to the model class file. + * @param modelClassName The name of the model class to modify. + * @param sourceFieldNames Array of field names to move. + * @param targetFieldName The name of the field to move before. + * @returns The updated source code as a string, or null if an error occurs. + */ + private async reorderMultipleFieldsAndGetText( + modelPath: string, + modelClassName: string, + sourceFieldNames: string[], + targetFieldName: string + ): Promise { + const project = new Project(); + const sourceFile = project.addSourceFileAtPath(modelPath); + + // Find the specific class by name to handle multiple classes in the same file + const classDeclaration = sourceFile.getClass(modelClassName); + + if (!classDeclaration) { + console.error(`Class ${modelClassName} not found in ${modelPath}`); + return null; + } + + const targetProperty = classDeclaration.getProperty(targetFieldName); + if (!targetProperty) { + console.error(`Could not find target property ${targetFieldName} in ${classDeclaration.getName()}`); + return null; + } + + // Get all source properties and their structures + const sourceProperties: { property: any; structure: any }[] = []; + for (const fieldName of sourceFieldNames) { + const property = classDeclaration.getProperty(fieldName); + if (!property) { + console.error(`Could not find source property ${fieldName} in ${classDeclaration.getName()}`); + return null; + } + sourceProperties.push({ + property, + structure: property.getStructure() + }); + } + + const targetIndex = targetProperty.getChildIndex(); + + // Remove all source properties (in reverse order to maintain indices) + for (let i = sourceProperties.length - 1; i >= 0; i--) { + sourceProperties[i].property.remove(); + } + + // Insert all properties at the target position (in original order) + for (let i = 0; i < sourceProperties.length; i++) { + classDeclaration.insertProperty(targetIndex + i, sourceProperties[i].structure); + } + + return sourceFile.getFullText(); + } + + /** + * Applies text changes to a file using VS Code's editor API + * @param filePath The path to the file to modify + * @param newText The new text content + */ + private async applyTextChanges(filePath: string, newText: string): Promise { + // 2. Apply the changes to the editor and format. + const uri = vscode.Uri.file(filePath); + const document = await vscode.workspace.openTextDocument(uri); + const editor = await vscode.window.showTextDocument(document); + + // Replace the entire document content with the new text. + await editor.edit((editBuilder) => { + const fullRange = new vscode.Range(document.positionAt(0), document.positionAt(document.getText().length)); + editBuilder.replace(fullRange, newText); + }); + + // Execute the format command on the now-dirty file. + await vscode.commands.executeCommand("editor.action.formatDocument"); + + // 3. Save the document a single time. + await document.save(); + + // 4. Refresh the tree. The cache will update from the single save event. + setTimeout(() => { + this.refresh(); + }, 200); + } + /** * Returns the children of the given element in the tree. * If no element is provided, it returns the root items (Model and UI). diff --git a/src/explorer/explorerRegistration.ts b/src/explorer/explorerRegistration.ts index e07e2bc..3e48b1f 100644 --- a/src/explorer/explorerRegistration.ts +++ b/src/explorer/explorerRegistration.ts @@ -15,7 +15,8 @@ export function registerExplorer( const treeView = vscode.window.createTreeView('slingrExplorer', { treeDataProvider: explorerProvider, dragAndDropController: explorerProvider, - showCollapseAll: true + showCollapseAll: true, + canSelectMany: true }); // Double-click tracking variables @@ -53,10 +54,15 @@ export function registerExplorer( // Handle selection changes (for keyboard navigation and other selection events) const selectionDisposable = treeView.onDidChangeSelection(e => { - const selectedItem = e.selection?.[0] as AppTreeItem; - if (selectedItem) { - // Update info panel for keyboard navigation - quickInfoProvider.update(selectedItem.itemType, selectedItem.metadata); + const selectedItems = e.selection as AppTreeItem[]; + if (selectedItems && selectedItems.length > 0) { + // For single selection, update info panel + if (selectedItems.length === 1) { + quickInfoProvider.update(selectedItems[0].itemType, selectedItems[0].metadata); + } else { + // For multi-selection, clear the panel or show first item + quickInfoProvider.update('multipleSelection', undefined); + } } }); From 35cb8429795e368265363e942c8adf80253ec749 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 17 Sep 2025 09:40:01 -0300 Subject: [PATCH 197/254] Refactor persistence tests to ensure entities are reloaded after saving, improving validation of saved data --- .../typeorm/TypeORMSqlDataSource.ts | 16 +++++----- .../ComplexTypesPersistence.test.ts | 31 +++++++++++++------ .../DateTimeRangeArrayPersistence.test.ts | 17 +++++----- test/types_tests/SimpleComposition.test.ts | 18 +++++------ 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/src/datasources/typeorm/TypeORMSqlDataSource.ts index d427ff4..342790f 100644 --- a/src/datasources/typeorm/TypeORMSqlDataSource.ts +++ b/src/datasources/typeorm/TypeORMSqlDataSource.ts @@ -648,14 +648,14 @@ export class TypeORMSqlDataSource extends DataSource { // Reload the entity from the database to ensure all transformers are applied correctly. // This is necessary because TypeORM's save() method returns the original entity object, // not one that has been loaded back with transformers applied. - if ((saved as any).id) { - const reloaded = await repository.findOneBy({ id: (saved as any).id } as any) as T | null; - if (reloaded) { - // Restore embedded field values from flat columns - this.restoreEmbeddedValues(reloaded); - return reloaded; - } - } + // if ((saved as any).id) { + // const reloaded = await repository.findOneBy({ id: (saved as any).id } as any) as T | null; + // if (reloaded) { + // // Restore embedded field values from flat columns + // this.restoreEmbeddedValues(reloaded); + // return reloaded; + // } + // } return saved as T; } diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/test/types_tests/ComplexTypesPersistence.test.ts index 593b7fd..beaa59a 100644 --- a/test/types_tests/ComplexTypesPersistence.test.ts +++ b/test/types_tests/ComplexTypesPersistence.test.ts @@ -148,18 +148,22 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should handle null Decimal values", async () => { testEntity.priceDecimal = undefined; - const savedEntity = await dataSource.save(testEntity); - - expect(savedEntity.priceDecimal).toBeUndefined(); + await dataSource.save(testEntity); + + const savedEntity = await dataSource.findOneById(ComplexTypesModel, testEntity.id); + expect(savedEntity).not.toBeNull(); + expect(savedEntity!.priceDecimal).toBeUndefined(); }); it("should persist Decimal precision correctly", async () => { testEntity.priceDecimal = decimal("123.456"); // Will be truncated to 2 decimals - const savedEntity = await dataSource.save(testEntity); + await dataSource.save(testEntity); // Should be truncated based on decorator config - expect(savedEntity.priceDecimal!.toString()).toBe("123.45"); + const savedEntity = await dataSource.findOneById(ComplexTypesModel, testEntity.id); + expect(savedEntity).not.toBeNull(); + expect(savedEntity!.priceDecimal!.toString()).toBe("123.45"); }); it("should retrieve Decimal from database with proper type", async () => { @@ -190,18 +194,25 @@ describe("Complex Types Persistence in SQL Databases", () => { it("should handle null Money values", async () => { testEntity.priceMoney = undefined; - const savedEntity = await dataSource.save(testEntity); - - expect(savedEntity.priceMoney).toBeUndefined(); + await dataSource.save(testEntity); + + const savedEntity = await dataSource.findOneById(ComplexTypesModel, testEntity.id); + expect(savedEntity).not.toBeNull(); + + expect(savedEntity!.priceMoney).toBeUndefined(); }); it("should persist Money with correct rounding", async () => { testEntity.priceMoney = money("123.456"); // Will be rounded to 2 decimals - const savedEntity = await dataSource.save(testEntity); + await dataSource.save(testEntity); + + const savedEntity = await dataSource.findOneById(ComplexTypesModel, testEntity.id); + expect(savedEntity).not.toBeNull(); + expect(savedEntity!.priceMoney).toBeDefined(); // Should be rounded based on decorator config (roundHalfToEven) - expect(savedEntity.priceMoney!.toString()).toBe("123.46"); + expect(savedEntity!.priceMoney!.toString()).toBe("123.46"); }); it("should retrieve Money from database with proper type", async () => { diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/test/types_tests/DateTimeRangeArrayPersistence.test.ts index db2a0ee..fa9cfd8 100644 --- a/test/types_tests/DateTimeRangeArrayPersistence.test.ts +++ b/test/types_tests/DateTimeRangeArrayPersistence.test.ts @@ -207,15 +207,18 @@ describe("DateTimeRange Array Persistence in SQL Databases", () => { delete (testEntity as any).dateRanges; delete (testEntity as any).mixedDateRanges; - const savedEntity = await dataSource.save(testEntity); + await dataSource.save(testEntity); + + const savedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, testEntity.id); + expect(savedEntity).not.toBeNull(); // When properties are deleted, they become empty arrays in the relational model - expect(savedEntity.dateRanges).toEqual([]); - expect(savedEntity.mixedDateRanges).toEqual([]); - expect(Array.isArray(savedEntity.requiredDateRanges)).toBe(true); - expect(savedEntity.requiredDateRanges).toHaveLength(2); - - const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity.id!); + expect(savedEntity!.dateRanges).toEqual([]); + expect(savedEntity!.mixedDateRanges).toEqual([]); + expect(Array.isArray(savedEntity!.requiredDateRanges)).toBe(true); + expect(savedEntity!.requiredDateRanges).toHaveLength(2); + + const retrievedEntity = await dataSource.findOneById(DateTimeRangeArrayPersistenceModel, savedEntity!.id!); expect(retrievedEntity!.dateRanges).toEqual([]); expect(retrievedEntity!.mixedDateRanges).toEqual([]); expect(Array.isArray(retrievedEntity!.requiredDateRanges)).toBe(true); diff --git a/test/types_tests/SimpleComposition.test.ts b/test/types_tests/SimpleComposition.test.ts index ad60094..c7f760d 100644 --- a/test/types_tests/SimpleComposition.test.ts +++ b/test/types_tests/SimpleComposition.test.ts @@ -79,13 +79,7 @@ describe('Simple Composition (OneToOne)', () => { } } - await dataSource.initialize({ - type: 'sqlite', - database: ':memory:', - synchronize: true, - logging: false, - managed: true - } as any); + await dataSource.initialize(); }); afterEach(async () => { @@ -152,11 +146,13 @@ describe('Simple Composition (OneToOne)', () => { company.name = 'Remote Corp'; company.description = '

Fully remote company

'; - const savedCompany = await dataSource.save(company); + await dataSource.save(company); + const savedCompany = await dataSource.findOneById(Company, company.id!); - expect(savedCompany.id).toBeDefined(); - expect(savedCompany.headquarters).toBeNull(); - expect(savedCompany.name).toBe('Remote Corp'); + expect(savedCompany).toBeDefined(); + expect(savedCompany!.id).toBeDefined(); + expect(savedCompany!.headquarters).toBeNull(); + expect(savedCompany!.name).toBe('Remote Corp'); }); it('should retrieve company with composed address', async () => { From 6be60da2b42a3a2f727bf345975344d9762d83ec Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 17 Sep 2025 10:31:41 -0300 Subject: [PATCH 198/254] Adds extractFields commands (to be adjusted). --- package.json | 56 +++++++ src/commands/commandHelpers.ts | 109 +++++++++++++ src/commands/commandRegistration.ts | 117 +++++++++++++- src/commands/fields/addField.ts | 63 ++++---- .../fields/extractFieldsToComposition.ts | 152 ++++++++++++++++++ .../fields/extractFieldsToEmbedded.ts | 100 ++++++++++++ src/commands/fields/extractFieldsToParent.ts | 114 +++++++++++++ .../fields/extractFieldsToReference.ts | 114 +++++++++++++ src/commands/interfaces.ts | 2 +- src/commands/models/addComposition.ts | 43 +++-- src/commands/models/newModel.ts | 2 + src/services/projectAnalysisService.ts | 5 +- 12 files changed, 828 insertions(+), 49 deletions(-) create mode 100644 src/commands/fields/extractFieldsToComposition.ts create mode 100644 src/commands/fields/extractFieldsToEmbedded.ts create mode 100644 src/commands/fields/extractFieldsToParent.ts create mode 100644 src/commands/fields/extractFieldsToReference.ts diff --git a/package.json b/package.json index f476b86..396e700 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,22 @@ "command": "slingr-vscode-extension.modifyModel", "title": "Modify Model" }, + { + "command": "slingr-vscode-extension.extractFieldsToComposition", + "title": "Extract Fields to Composition" + }, + { + "command": "slingr-vscode-extension.extractFieldsToEmbedded", + "title": "Extract Fields to Embedded" + }, + { + "command": "slingr-vscode-extension.extractFieldsToParent", + "title": "Extract Fields to Parent" + }, + { + "command": "slingr-vscode-extension.extractFieldsToReference", + "title": "Extract Fields to Reference" + }, { "command": "slingr.runInfraUpdate", "title": "Run Infrastructure Update" @@ -209,6 +225,26 @@ "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "3_modification" }, + { + "command": "slingr-vscode-extension.extractFieldsToComposition", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToEmbedded", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToParent", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToReference", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, { "command": "slingr-vscode-extension.changeReferenceToComposition", "when": "view == slingrExplorer && viewItem == 'referenceField'", @@ -322,6 +358,26 @@ "command": "slingr-vscode-extension.changeFieldType", "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", "group": "3_modification" + }, + { + "command": "slingr-vscode-extension.extractFieldsToComposition", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToEmbedded", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToParent", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" + }, + { + "command": "slingr-vscode-extension.extractFieldsToReference", + "when": "view == slingrExplorer && (viewItem == 'field' || viewItem == 'referenceField')", + "group": "4_extract" } ] }, diff --git a/src/commands/commandHelpers.ts b/src/commands/commandHelpers.ts index 22915b3..d05c16b 100644 --- a/src/commands/commandHelpers.ts +++ b/src/commands/commandHelpers.ts @@ -1,6 +1,22 @@ import * as vscode from 'vscode'; import { AppTreeItem } from '../explorer/appTreeItem'; +/** + * Interface for tree view multi-selection context + */ +export interface TreeViewContext { + /** The tree item that was clicked */ + clickedItem: AppTreeItem; + /** All selected tree items */ + selectedItems: AppTreeItem[]; + /** Filtered field items from the selection */ + fieldItems: AppTreeItem[]; + /** Model name from the field items */ + modelName: string; + /** Model file path */ + modelPath: string; +} + /** * Interface for URI resolution options */ @@ -46,6 +62,99 @@ const DEFAULT_URI_OPTIONS: UriResolutionOptions = { notModelErrorMessage: 'The selected file does not appear to be a model file.' }; +/** + * Detects if command arguments represent a tree view multi-selection context + */ +export function isTreeViewContext(firstArg?: any, secondArg?: any): boolean { + return firstArg && + typeof firstArg === 'object' && + 'itemType' in firstArg && + secondArg && + Array.isArray(secondArg); +} + +/** + * Validates and extracts tree view context from command arguments + */ +export function validateTreeViewContext(firstArg: any, secondArg: any): TreeViewContext { + if (!isTreeViewContext(firstArg, secondArg)) { + throw new Error('Invalid tree view context arguments'); + } + + const clickedItem = firstArg as AppTreeItem; + const selectedItems = secondArg as AppTreeItem[]; + + // Filter for field items with valid parent metadata + const fieldItems = selectedItems.filter(item => + (item.itemType === "field" || item.itemType === "referenceField") && + item.parent?.metadata && 'name' in item.parent.metadata + ); + + if (fieldItems.length === 0) { + throw new Error("Please select one or more fields to extract."); + } + + const modelName = fieldItems[0].parent!.metadata!.name; + const modelPath = fieldItems[0].parent!.metadata!.declaration.uri.fsPath; + + // Verify all fields are from the same model + const allFromSameModel = fieldItems.every(item => + item.parent?.metadata?.name === modelName + ); + + if (!allFromSameModel) { + throw new Error("All selected fields must be from the same model."); + } + + return { + clickedItem, + selectedItems, + fieldItems, + modelName, + modelPath + }; +} + +/** + * Creates a command handler that supports both tree view context and standard URI resolution + */ +export function createTreeViewAwareCommandHandler( + treeViewHandler: (context: TreeViewContext) => Promise, + standardHandler: (result: UriResolutionResult) => Promise, + uriOptions?: UriResolutionOptions +) { + return async (firstArg?: any, secondArg?: any) => { + try { + if (isTreeViewContext(firstArg, secondArg)) { + // Handle tree view multi-selection context + const context = validateTreeViewContext(firstArg, secondArg); + await treeViewHandler(context); + } else { + // Handle standard URI resolution context + const result = await resolveTargetUri(firstArg, uriOptions); + await standardHandler(result); + } + } catch (error) { + vscode.window.showErrorMessage(`${error}`); + } + }; +} + +/** + * Registers a command that supports both tree view context and standard URI resolution + */ +export function registerTreeViewAwareCommand( + disposables: vscode.Disposable[], + commandId: string, + treeViewHandler: (context: TreeViewContext) => Promise, + standardHandler: (result: UriResolutionResult) => Promise, + uriOptions?: UriResolutionOptions +): void { + const handler = createTreeViewAwareCommandHandler(treeViewHandler, standardHandler, uriOptions); + const command = vscode.commands.registerCommand(commandId, handler); + disposables.push(command); +} + /** * Resolves a URI from various input sources with validation */ diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index 167aacf..9a9bfe6 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -15,7 +15,11 @@ import { AddCompositionTool } from './models/addComposition'; import { AddReferenceTool } from './models/addReference'; import { AIService } from '../services/aiService'; import { ProjectAnalysisService } from '../services/projectAnalysisService'; -import { registerCommand, URI_OPTIONS, UriResolutionResult } from './commandHelpers'; +import { registerCommand, URI_OPTIONS, UriResolutionResult, resolveTargetUri, registerTreeViewAwareCommand, TreeViewContext } from './commandHelpers'; +import { ExtractFieldsToCompositionTool } from './fields/extractFieldsToComposition'; +import { ExtractFieldsToReferenceTool } from './fields/extractFieldsToReference'; +import { ExtractFieldsToEmbeddedTool } from './fields/extractFieldsToEmbedded'; +import { ExtractFieldsToParentTool } from './fields/extractFieldsToParent'; export function registerGeneralCommands( context: vscode.ExtensionContext, @@ -67,9 +71,10 @@ export function registerGeneralCommands( disposables, 'slingr-vscode-extension.defineFields', async (result: UriResolutionResult) => { - const document = result.document || await vscode.workspace.openTextDocument(result.targetUri); - - const model = await projectAnalysisService.findModelClass(document, cache); + if(!result.modelName) { + throw new Error('Model name could not be determined.'); + } + const model = cache.getModelByName(result.modelName); if (!model) { throw new Error('Could not identify a model class in the selected file.'); } @@ -101,13 +106,16 @@ export function registerGeneralCommands( disposables, 'slingr-vscode-extension.addField', async (result: UriResolutionResult) => { - await addFieldTool.addField(result.targetUri, cache); + if (!result.modelName) { + throw new Error('Model name could not be determined.'); + } + await addFieldTool.addField(result.targetUri, result.modelName, cache); }, URI_OPTIONS.MODEL_FILE ); // Add Composition Tool - const addCompositionTool = new AddCompositionTool(explorerProvider); + const addCompositionTool = new AddCompositionTool(); registerCommand( disposables, 'slingr-vscode-extension.addComposition', @@ -186,5 +194,102 @@ export function registerGeneralCommands( }); disposables.push(modifyModelCommand); + // Extract Fields to Composition + const extractFieldsToCompositionTool = new ExtractFieldsToCompositionTool(); + registerTreeViewAwareCommand( + disposables, + 'slingr-vscode-extension.extractFieldsToComposition', + async (context: TreeViewContext) => { + // Tree view context handler + const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); + const editor = await vscode.window.showTextDocument(document); + await extractFieldsToCompositionTool.extractFieldsToComposition( + cache, + editor, + context.modelName, + { fieldItems: context.fieldItems } + ); + }, + async (result: UriResolutionResult) => { + // Standard URI resolution handler + const editor = vscode.window.activeTextEditor; + if (editor && result.modelName) { + await extractFieldsToCompositionTool.extractFieldsToComposition(cache, editor, result.modelName); + } else { + throw new Error('Could not determine model name or no active editor.'); + } + }, + URI_OPTIONS.MODEL_FILE + ); + + // Extract Fields to Reference + const extractFieldsToReferenceTool = new ExtractFieldsToReferenceTool(); + registerTreeViewAwareCommand( + disposables, + 'slingr-vscode-extension.extractFieldsToReference', + async (context: TreeViewContext) => { + // Tree view context handler + const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); + const editor = await vscode.window.showTextDocument(document); + await extractFieldsToReferenceTool.extractFieldsToReference(cache, editor, context.modelName); + }, + async (result: UriResolutionResult) => { + // Standard URI resolution handler + const editor = vscode.window.activeTextEditor; + if (editor && result.modelName) { + await extractFieldsToReferenceTool.extractFieldsToReference(cache, editor, result.modelName); + } else { + throw new Error('Could not determine model name or no active editor.'); + } + }, + URI_OPTIONS.MODEL_FILE + ); + + // Extract Fields to Embedded Model + const extractFieldsToEmbeddedTool = new ExtractFieldsToEmbeddedTool(); + registerTreeViewAwareCommand( + disposables, + 'slingr-vscode-extension.extractFieldsToEmbedded', + async (context: TreeViewContext) => { + // Tree view context handler + const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); + const editor = await vscode.window.showTextDocument(document); + await extractFieldsToEmbeddedTool.extractFieldsToEmbedded(cache, editor, context.modelName); + }, + async (result: UriResolutionResult) => { + // Standard URI resolution handler + const editor = vscode.window.activeTextEditor; + if (editor && result.modelName) { + await extractFieldsToEmbeddedTool.extractFieldsToEmbedded(cache, editor, result.modelName); + } else { + throw new Error('Could not determine model name or no active editor.'); + } + }, + URI_OPTIONS.MODEL_FILE + ); + + // Extract Fields to Parent Model + const extractFieldsToParentTool = new ExtractFieldsToParentTool(); + registerTreeViewAwareCommand( + disposables, + 'slingr-vscode-extension.extractFieldsToParent', + async (context: TreeViewContext) => { + // Tree view context handler + const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); + const editor = await vscode.window.showTextDocument(document); + await extractFieldsToParentTool.extractFieldsToParent(cache, editor, context.modelName); + }, + async (result: UriResolutionResult) => { + // Standard URI resolution handler + const editor = vscode.window.activeTextEditor; + if (editor && result.modelName) { + await extractFieldsToParentTool.extractFieldsToParent(cache, editor, result.modelName); + } else { + throw new Error('Could not determine model name or no active editor.'); + } + }, + URI_OPTIONS.MODEL_FILE + ); + return disposables; } \ No newline at end of file diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index c6348bb..d581add 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -34,18 +34,18 @@ import { FileSystemService } from "../../services/fileSystemService"; * ``` */ export class AddFieldTool implements AIEnhancedTool { - private userInputService: UserInputService; - private projectAnalysisService: ProjectAnalysisService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; - private defineFieldsTool: DefineFieldsTool; + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private defineFieldsTool: DefineFieldsTool; constructor() { - this.userInputService = new UserInputService(); - this.projectAnalysisService = new ProjectAnalysisService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); - this.defineFieldsTool = new DefineFieldsTool(); + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.defineFieldsTool = new DefineFieldsTool(); } /** @@ -59,25 +59,31 @@ export class AddFieldTool implements AIEnhancedTool { async processWithAI( userInput: string, targetUri: vscode.Uri, + modelName: string, cache: MetadataCache, additionalContext?: any ): Promise { // The current addField method handles user interaction internally, // so we just call it with the provided parameters - await this.addField(targetUri, cache); + await this.addField(targetUri, modelName, cache); } /** * Adds a new field to an existing model file. * * @param targetUri - The URI of the model file where the field should be added + * @param modelName - The name of the model class to which the field will be added * @param cache - The metadata cache for context about existing models (optional) * @returns Promise that resolves when the field is added */ - public async addField(targetUri: vscode.Uri, cache?: MetadataCache): Promise { + public async addField(targetUri: vscode.Uri, modelName: string, cache?: MetadataCache): Promise { try { // Step 1: Validate target file - const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, modelName, cache); + + if (!modelClass) { + throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); + } // Step 2: Get field information from user const fieldInfo = await this.gatherFieldInformation(modelClass, cache); @@ -92,7 +98,7 @@ export class AddFieldTool implements AIEnhancedTool { const fieldCode = this.generateFieldCode(fieldInfo); // Step 5: Insert field into model class - await this.sourceCodeService.insertField(document, modelClass.name,fieldInfo, fieldCode, cache); + await this.sourceCodeService.insertField(document, modelClass.name, fieldInfo, fieldCode, cache); // Step 5.5: If it's a Choice field, also create the enum if (fieldInfo.type.decorator === "Choice") { @@ -133,6 +139,7 @@ export class AddFieldTool implements AIEnhancedTool { * * @param targetUri - The URI of the model file where the field should be added * @param fieldInfo - Predefined field information + * @param modelName - The name of the model class to which the field will be added * @param cache - The metadata cache for context about existing models * @param silent - If true, suppresses success/error messages (defaults to false) * @returns Promise that resolves when the field is added @@ -140,28 +147,31 @@ export class AddFieldTool implements AIEnhancedTool { public async addFieldProgrammatically( targetUri: vscode.Uri, fieldInfo: FieldInfo, + modelName: string, cache: MetadataCache, silent: boolean = false ): Promise { try { // Step 1: Validate target file - const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, modelName, cache); // Step 2: Check if field already exists - const existingFields = Object.keys(modelClass.properties || {}); - if (existingFields.includes(fieldInfo.name)) { - const message = `Field '${fieldInfo.name}' already exists in model ${modelClass.name}`; - if (!silent) { - vscode.window.showWarningMessage(message); + if (modelClass) { + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(fieldInfo.name)) { + const message = `Field '${fieldInfo.name}' already exists in model ${modelClass.name}`; + if (!silent) { + vscode.window.showWarningMessage(message); + } + return; } - return; } // Step 3: Generate basic field structure const fieldCode = this.generateFieldCode(fieldInfo); // Step 4: Insert field into model class - await this.sourceCodeService.insertField(document, modelClass.name,fieldInfo, fieldCode, cache); + await this.sourceCodeService.insertField(document, modelName, fieldInfo, fieldCode, cache); // Step 5: If it's a Choice field, also create the enum if (fieldInfo.type.decorator === "Choice") { @@ -187,8 +197,9 @@ export class AddFieldTool implements AIEnhancedTool { */ private async validateAndPrepareTarget( targetUri: vscode.Uri, + modelName: string, cache?: MetadataCache - ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { + ): Promise<{ modelClass: DecoratedClass | null; document: vscode.TextDocument }> { // Ensure the file is a TypeScript file if (!targetUri.fsPath.endsWith(".ts")) { throw new Error("Target file must be a TypeScript file (.ts)"); @@ -202,11 +213,7 @@ export class AddFieldTool implements AIEnhancedTool { throw new Error("Metadata cache is required for field addition"); } - const modelClass = await this.projectAnalysisService.findModelClass(document, cache); - - if (!modelClass) { - throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); - } + const modelClass = cache.getModelByName(modelName); return { modelClass, document }; } diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts new file mode 100644 index 0000000..3e8339a --- /dev/null +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -0,0 +1,152 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { AddCompositionTool } from "../models/addComposition"; +import { AddFieldTool } from "./addField"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { TreeViewContext } from "../commandHelpers"; +import * as path from "path"; + +export class ExtractFieldsToCompositionTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private addCompositionTool: AddCompositionTool; + private addFieldTool: AddFieldTool; + private deleteFieldTool: DeleteFieldTool; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.addCompositionTool = new AddCompositionTool(); + this.addFieldTool = new AddFieldTool(); + this.deleteFieldTool = new DeleteFieldTool(); + } + + public async extractFieldsToComposition( + cache: MetadataCache, + editor: vscode.TextEditor, + modelName: string, + treeViewContext?: { fieldItems: TreeViewContext["fieldItems"] } + ): Promise { + try { + const { document, selections } = editor; + const sourceModel = cache.getModelByName(modelName); + if (!sourceModel) { + throw new Error("Could not find a model class in the current file."); + } + + let selectedFields: PropertyMetadata[]; + + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem) => { + //to lowercase + const fieldItemName = fieldItem.label.toLowerCase(); + const field = Object.values(sourceModel.properties).find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${modelName}'`); + } + return field; + }); + } else { + // Editor context: use text selections + selectedFields = this.getSelectedFields(sourceModel, selections); + } + + if (selectedFields.length === 0) { + vscode.window.showInformationMessage("No fields selected."); + return; + } + + const compositionFieldName = await this.userInputService.showPrompt( + "Enter the name for the new composition field (e.g., 'address', 'contactInfo'):" + ); + if (!compositionFieldName) { + return; + } + + // Store field information before deletion + const fieldsToAdd = selectedFields.map((field) => this.propertyMetadataToFieldInfo(field)); + + // Use AddCompositionTool to create the composition relationship and inner model + const createdModelName = await this.addCompositionTool.addCompositionProgrammatically( + cache, + modelName, + compositionFieldName + ); + + const compModelUri = sourceModel.declaration.uri; + const newModelName = this.toPascalCase(compositionFieldName); + + // Add the extracted fields to the new composition model + for (const fieldInfo of fieldsToAdd) { + await this.addFieldTool.addFieldProgrammatically( + compModelUri, + fieldInfo, + newModelName, + cache, + true // Skip validation since we're programmatically adding + ); + } + + // Remove the fields from the source model + for (const field of selectedFields) { + const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); + if (deleteEdit) { + await vscode.workspace.applyEdit(deleteEdit); + } + } + + vscode.window.showInformationMessage( + `Fields extracted to new composition model '${createdModelName}' and linked via '${compositionFieldName}' field.` + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to extract fields to composition: ${error}`); + console.error("Error extracting fields to composition:", error); + } + } + + private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { + const selectedFields: PropertyMetadata[] = []; + for (const selection of selections) { + for (const field of Object.values(model.properties)) { + if (selection.intersection(field.declaration.range)) { + selectedFields.push(field); + } + } + } + return selectedFields; + } + + private propertyMetadataToFieldInfo(property: PropertyMetadata): FieldInfo { + const fieldType = + FIELD_TYPE_OPTIONS.find((o) => o.decorator === this.getDecoratorName(property.decorators)) || + FIELD_TYPE_OPTIONS[0]; + const fieldDecorator = property.decorators.find((d) => d.name === "Field"); + const isRequired = fieldDecorator?.arguments.some((arg: any) => arg.required === true) || false; + + return { + name: property.name, + type: fieldType, + required: isRequired, + }; + } + + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : "Text"; + } + + private toPascalCase(str: string): string { + return str.charAt(0).toUpperCase() + str.slice(1); + } +} diff --git a/src/commands/fields/extractFieldsToEmbedded.ts b/src/commands/fields/extractFieldsToEmbedded.ts new file mode 100644 index 0000000..7697209 --- /dev/null +++ b/src/commands/fields/extractFieldsToEmbedded.ts @@ -0,0 +1,100 @@ +// src/commands/fields/extractFieldsToEmbedded.ts +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; + +export class ExtractFieldsToEmbeddedTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private deleteFieldTool: DeleteFieldTool; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.deleteFieldTool = new DeleteFieldTool(); + } + + public async extractFieldsToEmbedded(cache: MetadataCache, editor: vscode.TextEditor, modelName:string): Promise { + try { + const { document, selections } = editor; + const sourceModel = cache.getModelByName(modelName); + if (!sourceModel) { + throw new Error("Could not find a model class in the current file."); + } + + const selectedFields = this.getSelectedFields(sourceModel, selections); + if (selectedFields.length === 0) { + vscode.window.showInformationMessage("No fields selected."); + return; + } + + const newModelName = await this.userInputService.showPrompt("Enter the name for the new embedded model:"); + if (!newModelName) return; + + // Create the new embedded model with the selected fields + const newModelContent = this.generateEmbeddedModelContent(newModelName, selectedFields); + await this.sourceCodeService.insertModel(document, newModelContent, sourceModel.name); + + // Remove the fields from the source model + for (const field of selectedFields) { + const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); + await vscode.workspace.applyEdit(deleteEdit); + } + + // Add the embedded field + const embeddedFieldInfo: FieldInfo = { + name: this.toCamelCase(newModelName), + type: { decorator: 'Embedded', label: 'Embedded', tsType: newModelName, description: 'Embedded Model' }, + required: false + }; + // This will require a new decorator and logic in AddFieldTool, for now, we'll add it manually + const fieldCode = `@Field()\n @Embedded()\n ${embeddedFieldInfo.name}!: ${newModelName};`; + await this.sourceCodeService.insertField(document, sourceModel.name, embeddedFieldInfo, fieldCode, cache, false); + + vscode.window.showInformationMessage(`Fields extracted to new embedded model '${newModelName}'.`); + } catch (error) { + vscode.window.showErrorMessage(`Failed to extract fields to embedded model: ${error}`); + } + } + + private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { + const selectedFields: PropertyMetadata[] = []; + for (const selection of selections) { + for (const field of Object.values(model.properties)) { + if (selection.intersection(field.declaration.range)) { + selectedFields.push(field); + } + } + } + return selectedFields; + } + + private generateEmbeddedModelContent(modelName: string, fields: PropertyMetadata[]): string { + let content = `\n@Model()\nclass ${modelName} {\n`; + for (const field of fields) { + for(const decorator of field.decorators) { + content += ` @${decorator.name}(${this.formatDecoratorArgs(decorator.arguments)})\n`; + } + content += ` ${field.name}!: ${field.type};\n\n`; + } + content += '}\n'; + return content; + } + + private formatDecoratorArgs(args: any[]): string { + if (!args || args.length === 0) { + return ''; + } + return JSON.stringify(args[0]).replace(/"/g, "'"); + } + + private toCamelCase(str: string): string { + return str.charAt(0).toLowerCase() + str.slice(1); + } +} \ No newline at end of file diff --git a/src/commands/fields/extractFieldsToParent.ts b/src/commands/fields/extractFieldsToParent.ts new file mode 100644 index 0000000..d7255bb --- /dev/null +++ b/src/commands/fields/extractFieldsToParent.ts @@ -0,0 +1,114 @@ +// src/commands/fields/extractFieldsToParent.ts +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import * as path from 'path'; + +export class ExtractFieldsToParentTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private deleteFieldTool: DeleteFieldTool; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.deleteFieldTool = new DeleteFieldTool(); + } + + public async extractFieldsToParent(cache: MetadataCache, editor: vscode.TextEditor, modelName:string): Promise { + try { + const { document, selections } = editor; + const sourceModel = cache.getModelByName(modelName); + if (!sourceModel) { + throw new Error("Could not find a model class in the current file."); + } + + const selectedFields = this.getSelectedFields(sourceModel, selections); + if (selectedFields.length === 0) { + vscode.window.showInformationMessage("No fields selected."); + return; + } + + const newModelName = await this.userInputService.showPrompt("Enter the name for the new abstract parent model:"); + if (!newModelName) return; + + // Create the new parent model + const newModelContent = this.generateParentModelContent(newModelName, selectedFields); + const targetFilePath = path.join(path.dirname(document.uri.fsPath), `${newModelName}.ts`); + const newModelUri = vscode.Uri.file(targetFilePath); + await vscode.workspace.fs.writeFile(newModelUri, Buffer.from(newModelContent, 'utf8')); + + // Remove the fields from the source model + for (const field of selectedFields) { + const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); + await vscode.workspace.applyEdit(deleteEdit); + } + + // Update the source model to extend the new parent model + await this.updateSourceModelToExtend(document, sourceModel.name, newModelName); + + vscode.window.showInformationMessage(`Fields extracted to new parent model '${newModelName}'.`); + + } catch (error) { + vscode.window.showErrorMessage(`Failed to extract fields to parent model: ${error}`); + } + } + + private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { + const selectedFields: PropertyMetadata[] = []; + for (const selection of selections) { + for (const field of Object.values(model.properties)) { + if (selection.intersection(field.declaration.range)) { + selectedFields.push(field); + } + } + } + return selectedFields; + } + + private generateParentModelContent(modelName: string, fields: PropertyMetadata[]): string { + let content = `import { BaseModel, Field, Text, Model } from 'slingr-framework';\n\n`; // Add necessary imports + content += `@Model()\nexport abstract class ${modelName} extends BaseModel {\n`; + for (const field of fields) { + for(const decorator of field.decorators) { + content += ` @${decorator.name}(${this.formatDecoratorArgs(decorator.arguments)})\n`; + } + content += ` ${field.name}!: ${field.type};\n\n`; + } + content += '}\n'; + return content; + } + + private formatDecoratorArgs(args: any[]): string { + if (!args || args.length === 0) { + return ''; + } + return JSON.stringify(args[0]).replace(/"/g, "'"); + } + + private async updateSourceModelToExtend(document: vscode.TextDocument, sourceModelName: string, newParentName: string) { + const edit = new vscode.WorkspaceEdit(); + const text = document.getText(); + const regex = new RegExp(`(class ${sourceModelName} extends) (\\w+)`); + const match = text.match(regex); + + if (match) { + const index = match.index || 0; + const startPos = document.positionAt(index + match[1].length + 1); + const endPos = document.positionAt(index + match[1].length + 1 + match[2].length); + edit.replace(document.uri, new vscode.Range(startPos, endPos), newParentName); + + // Add import for the new parent model + const importStatement = `\nimport { ${newParentName} } from './${newParentName}';`; + const firstLine = document.lineAt(0); + edit.insert(document.uri, firstLine.range.start, importStatement); + + await vscode.workspace.applyEdit(edit); + } + } +} \ No newline at end of file diff --git a/src/commands/fields/extractFieldsToReference.ts b/src/commands/fields/extractFieldsToReference.ts new file mode 100644 index 0000000..e4ca19d --- /dev/null +++ b/src/commands/fields/extractFieldsToReference.ts @@ -0,0 +1,114 @@ +// src/commands/fields/extractFieldsToReference.ts +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { NewModelTool } from "../models/newModel"; +import { AddFieldTool } from "./addField"; +import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; +import * as path from 'path'; + +export class ExtractFieldsToReferenceTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private newModelTool: NewModelTool; + private addFieldTool: AddFieldTool; + private deleteFieldTool: DeleteFieldTool; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.newModelTool = new NewModelTool(); + this.addFieldTool = new AddFieldTool(); + this.deleteFieldTool = new DeleteFieldTool(); + } + + public async extractFieldsToReference(cache: MetadataCache, editor: vscode.TextEditor, modelName:string): Promise { + try { + const { document, selections } = editor; + const sourceModel = cache.getModelByName(modelName); + if (!sourceModel) { + throw new Error("Could not find a model class in the current file."); + } + + const selectedFields = this.getSelectedFields(sourceModel, selections); + if (selectedFields.length === 0) { + vscode.window.showInformationMessage("No fields selected."); + return; + } + + const newModelName = await this.userInputService.showPrompt("Enter the name for the new model:"); + if (!newModelName) return; + + const referenceFieldName = await this.userInputService.showPrompt("Enter the name for the new reference field:"); + if (!referenceFieldName) return; + + const targetFilePath = path.join(path.dirname(document.uri.fsPath), `${newModelName}.ts`); + + // Create the new model with the extracted fields + const newModelUri = await this.newModelTool.createModelProgrammatically(newModelName, targetFilePath, `Represents a reference model with fields from ${sourceModel.name}.`); + for (const field of selectedFields) { + const fieldInfo = this.propertyMetadataToFieldInfo(field); + await this.addFieldTool.addFieldProgrammatically(newModelUri, fieldInfo, modelName, cache, true); + } + + // Remove the fields from the source model + for (const field of selectedFields) { + const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); + await vscode.workspace.applyEdit(deleteEdit); + } + + // Add the reference relationship to the source model + const referenceFieldInfo: FieldInfo = { + name: referenceFieldName, + type: FIELD_TYPE_OPTIONS.find(o => o.decorator === "Relationship")!, + required: false, + additionalConfig: { + targetModel: newModelName, + relationshipType: 'reference' + } + }; + await this.addFieldTool.addFieldProgrammatically(document.uri, referenceFieldInfo,modelName, cache); + + vscode.window.showInformationMessage(`Fields extracted to new reference model '${newModelName}'.`); + } catch (error) { + vscode.window.showErrorMessage(`Failed to extract fields to reference: ${error}`); + } + } + + private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { + const selectedFields: PropertyMetadata[] = []; + for (const selection of selections) { + for (const field of Object.values(model.properties)) { + if (selection.intersection(field.declaration.range)) { + selectedFields.push(field); + } + } + } + return selectedFields; + } + + private propertyMetadataToFieldInfo(property: PropertyMetadata): FieldInfo { + const fieldType = FIELD_TYPE_OPTIONS.find(o => o.decorator === this.getDecoratorName(property.decorators)) || FIELD_TYPE_OPTIONS[0]; + const fieldDecorator = property.decorators.find(d => d.name === 'Field'); + const isRequired = fieldDecorator?.arguments.some((arg: any) => arg.required === true) || false; + + return { + name: property.name, + type: fieldType, + required: isRequired + }; + } + + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find(d => FIELD_TYPE_OPTIONS.some(o => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : 'Text'; + } +} \ No newline at end of file diff --git a/src/commands/interfaces.ts b/src/commands/interfaces.ts index 6f4796f..44ed54c 100644 --- a/src/commands/interfaces.ts +++ b/src/commands/interfaces.ts @@ -25,8 +25,8 @@ export interface AIEnhancedTool { processWithAI( userInput: string, targetUri: vscode.Uri, + modelName: string, cache: MetadataCache, - additionalContext?: any ): Promise; } diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 3ddbdd3..6d826e7 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -16,14 +16,12 @@ export class AddCompositionTool { private projectAnalysisService: ProjectAnalysisService; private sourceCodeService: SourceCodeService; private fileSystemService: FileSystemService; - private explorerProvider: ExplorerProvider; - constructor(explorerProvider: ExplorerProvider) { + constructor() { this.userInputService = new UserInputService(); this.projectAnalysisService = new ProjectAnalysisService(); this.sourceCodeService = new SourceCodeService(); this.fileSystemService = new FileSystemService(); - this.explorerProvider = explorerProvider; } /** @@ -44,28 +42,51 @@ export class AddCompositionTool { return; // User cancelled } - // Step 3: Determine inner model name and array status + await this.addCompositionProgrammatically(cache, modelName, fieldName); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add composition: ${error}`); + console.error("Error adding composition:", error); + } + } + + /** + * Adds a composition relationship programmatically with a predefined field name. + * This method is used by other tools that need to create compositions without user interaction. + * + * @param cache - The metadata cache for context about existing models + * @param modelName - The name of the model to which the composition is being added + * @param fieldName - The predefined field name for the composition + * @returns Promise that resolves with the created inner model name when the composition is added + */ + public async addCompositionProgrammatically(cache: MetadataCache, modelName: string, fieldName: string): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(modelName, cache); + + // Step 2: Determine inner model name and array status const { innerModelName, isArray } = this.determineInnerModelInfo(fieldName); - // Step 4: Check if inner model already exists + // Step 3: Check if inner model already exists await this.validateInnerModelName(cache, innerModelName); - // Step 5: Create the inner model + // Step 4: Create the inner model await this.createInnerModel(document, innerModelName, modelClass.name, cache); - // Step 6: Add composition field to outer model + // Step 5: Add composition field to outer model await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); - // Step 7: Focus on the newly created field + // Step 6: Focus on the newly created field await this.sourceCodeService.focusOnElement(document, fieldName); - // Step 8: Show success message + // Step 7: Show success message vscode.window.showInformationMessage( `Composition relationship created successfully! Added ${innerModelName} model and ${fieldName} field.` ); + + return innerModelName; } catch (error) { - vscode.window.showErrorMessage(`Failed to add composition: ${error}`); - console.error("Error adding composition:", error); + console.error("Error adding composition programmatically:", error); + throw error; } } diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 8d57dea..92a44c2 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -57,6 +57,7 @@ export class NewModelTool implements AIEnhancedTool { async processWithAI( userInput: string, targetUri: vscode.Uri, + modelName: string, cache: MetadataCache, additionalContext?: any ): Promise { @@ -363,6 +364,7 @@ export class NewModelTool implements AIEnhancedTool { await this.addFieldTool.addFieldProgrammatically( parentModelUri, fieldInfo, + newModelName, cache, true // silent mode - suppress success/error messages ); diff --git a/src/services/projectAnalysisService.ts b/src/services/projectAnalysisService.ts index 2b1ee78..f5e3a4d 100644 --- a/src/services/projectAnalysisService.ts +++ b/src/services/projectAnalysisService.ts @@ -6,14 +6,13 @@ import { PropertyMetadata } from "../cache/cache"; import { fieldTypeConfig } from "../utils/fieldTypes"; export class ProjectAnalysisService { - private fileSystemService: FileSystemService; constructor() { this.fileSystemService = new FileSystemService(); } - public async findModelClass( + public async selectModelClass( document: vscode.TextDocument, cache: MetadataCache ): Promise { @@ -33,7 +32,7 @@ export class ProjectAnalysisService { if (modelClasses.length > 1) { const selected = await vscode.window.showQuickPick( modelClasses.map((c) => c.name), - { placeHolder: 'Select a model class from this file' } + { placeHolder: "Select a model class from this file" } ); return modelClasses.find((c) => c.name === selected); } From 71cad301c050cac31ce29342f994d93a370fcc49 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 17 Sep 2025 10:34:02 -0300 Subject: [PATCH 199/254] Update package.json to include 'files' field and add 'prepare' script for build process --- package.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 17bd922..d557642 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,20 @@ "version": "1.0.0", "description": "Slingr Framework - Smart Business Apps", "main": "./dist/index.js", + "files": [ + "dist/**/*", + "src/**/*", + "README.md", + "LICENSE.txt" + ], "exports": { ".": "./dist/index.js" }, "scripts": { "test": "jest --verbose", "watch": "tsc --project tsconfig.build.json --watch", - "build": "tsc --project tsconfig.build.json" + "build": "tsc --project tsconfig.build.json", + "prepare": "npm run build" }, "repository": { "type": "git", From 79848cd58543af6e8b58749ad01826f99e6f141a Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 17 Sep 2025 11:10:23 -0300 Subject: [PATCH 200/254] Refactor RelationshipPersistence tests to simplify task saving and retrieval, ensuring proper validation of saved data --- .../RelationshipPersistence.test.ts | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/test/types_tests/RelationshipPersistence.test.ts b/test/types_tests/RelationshipPersistence.test.ts index cc1d263..287d142 100644 --- a/test/types_tests/RelationshipPersistence.test.ts +++ b/test/types_tests/RelationshipPersistence.test.ts @@ -165,13 +165,7 @@ describe('Relationship Persistence', () => { } } - await dataSource.initialize({ - type: 'sqlite', - database: ':memory:', - synchronize: true, - logging: false, - managed: true - } as any); + await dataSource.initialize(); }); afterEach(async () => { @@ -244,13 +238,17 @@ describe('Relationship Persistence', () => { task.assignees = []; task.notes = []; - const savedTask = await dataSource.save(task); + await dataSource.save(task); - expect(savedTask.id).toBeDefined(); - expect(savedTask.project).toBeUndefined(); + const savedTask = await dataSource.findOne(Task, { + where: { title: 'Test Task' } + }); + + expect(savedTask!.id).toBeDefined(); + expect(savedTask!.project).toBeUndefined(); const retrievedTask = await dataSource.findOne(Task, { - where: { id: savedTask.id }, + where: { id: savedTask!.id }, relations: { project: true } }); expect(retrievedTask).toBeDefined(); @@ -360,12 +358,16 @@ describe('Relationship Persistence', () => { // Update task with note savedTask.notes = [note]; - const finalTask = await dataSource.save(savedTask); + await dataSource.save(savedTask); + + const finalTask = await dataSource.findOne(Task, { + where: { id: savedTask.id } + }); - expect(finalTask.project).toBeUndefined(); + expect(finalTask!.project).toBeUndefined(); const retrievedTask = await dataSource.findOne(Task, { - where: { id: finalTask.id }, + where: { id: finalTask!.id }, relations: { project: true, assignees: true, notes: { user: true } } }); @@ -1406,14 +1408,19 @@ describe('Relationship Persistence', () => { task.assignees = []; task.notes = []; - const savedTask = await dataSource.save(task); + await dataSource.save(task); - expect(savedTask.id).toBeDefined(); - expect(savedTask.project).toBeUndefined(); + const savedTask = await dataSource.findOne(Task, { + where: { title: 'Task without Project' }, + relations: { project: true } + }); + + expect(savedTask!.id).toBeDefined(); + expect(savedTask!.project).toBeNull(); const retrievedTask = await dataSource.findOne(Task, { - where: { id: savedTask.id }, + where: { id: savedTask!.id }, relations: { project: true } }); From c9e577337c7794b2ecb16a44db0c9e7ff507c0e8 Mon Sep 17 00:00:00 2001 From: ElPelado619 Date: Wed, 17 Sep 2025 12:43:12 -0300 Subject: [PATCH 201/254] Update .gitignore, package.json, and TypeScript configuration; refactor UUID generation in ArrayEntityFactory and PersistentModel --- .gitignore | 3 ++- package.json | 2 +- src/datasources/typeorm/ArrayEntityFactory.ts | 4 ++-- src/model/PersistentModel.ts | 6 +++--- tsconfig.json | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 13f5af9..64bf07a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ node_modules/ package-lock.json dist/ -prompts/ \ No newline at end of file +prompts/ +.vscode/settings.json diff --git a/package.json b/package.json index 8616e09..89ee196 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "dependencies": { "class-transformer": "^0.5.1", "class-validator": "^0.14.2", - "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions#fix/buildScripts", "financial-number": "^4.0.4", "typeorm": "^0.3.26", "uuid": "^13.0.0" diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/src/datasources/typeorm/ArrayEntityFactory.ts index 482dda0..de64dc5 100644 --- a/src/datasources/typeorm/ArrayEntityFactory.ts +++ b/src/datasources/typeorm/ArrayEntityFactory.ts @@ -1,6 +1,5 @@ import { Entity, PrimaryColumn, Column, ManyToOne, JoinColumn, Index, BeforeInsert } from 'typeorm'; import { TypeORMTypeMapper } from './TypeORMTypeMapper'; -import { v7 as uuidv7 } from 'uuid'; /** * Factory class for creating dynamic array element entities. @@ -102,8 +101,9 @@ export class ArrayEntityFactory { PrimaryColumn('uuid')(entityClass.prototype, 'id'); // Add UUID v7 generation method - entityClass.prototype.generateId = function() { + entityClass.prototype.generateId = async function() { if (!this.id) { + const { v7: uuidv7 } = await import('uuid'); this.id = uuidv7(); } }; diff --git a/src/model/PersistentModel.ts b/src/model/PersistentModel.ts index 6fb5e6b..8adb903 100644 --- a/src/model/PersistentModel.ts +++ b/src/model/PersistentModel.ts @@ -2,7 +2,6 @@ import { BaseModel } from './BaseModel'; import { Model } from './Model'; import { Field } from './Field'; import { PrimaryColumn, BeforeInsert } from 'typeorm'; -import { v7 as uuidv7 } from 'uuid'; /** * Abstract base class for persistent models that need to be stored in a data source. @@ -34,9 +33,10 @@ export abstract class PersistentModel extends BaseModel { id!: string @BeforeInsert() - generateId() { + async generateId() { if (!this.id) { - this.id = uuidv7(); + const { v7 } = await import('uuid'); + this.id = v7(); } } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index bdfe4d7..a4d157e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { - "module": "commonjs", + "module": "Node16", "target": "esnext", + "moduleResolution": "node16", "types": ["node", "jest"], "sourceMap": true, "declaration": true, From 831025e722d7d95c2b64e9b725d7b6d80c75ea99 Mon Sep 17 00:00:00 2001 From: Luciano Date: Wed, 17 Sep 2025 15:26:47 -0300 Subject: [PATCH 202/254] The extractFieldToComposition command is now handled by the RefactorController. Adds multiple fields handling in the RefactorController. Adds some code refactors and utility methods in addField.ts and addComposition.ts --- src/commands/commandRegistration.ts | 97 --- src/commands/fields/addField.ts | 155 ++++ .../fields/changeReferenceToComposition.ts | 42 +- .../fields/extractFieldsToComposition.ts | 698 +++++++++++++++--- src/commands/models/addComposition.ts | 137 ++++ src/refactor/RefactorController.ts | 226 ++++-- src/refactor/refactorDisposables.ts | 13 +- src/refactor/refactorInterfaces.ts | 26 +- src/services/sourceCodeService.ts | 41 + 9 files changed, 1123 insertions(+), 312 deletions(-) diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index 9a9bfe6..e13bc08 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -194,102 +194,5 @@ export function registerGeneralCommands( }); disposables.push(modifyModelCommand); - // Extract Fields to Composition - const extractFieldsToCompositionTool = new ExtractFieldsToCompositionTool(); - registerTreeViewAwareCommand( - disposables, - 'slingr-vscode-extension.extractFieldsToComposition', - async (context: TreeViewContext) => { - // Tree view context handler - const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); - const editor = await vscode.window.showTextDocument(document); - await extractFieldsToCompositionTool.extractFieldsToComposition( - cache, - editor, - context.modelName, - { fieldItems: context.fieldItems } - ); - }, - async (result: UriResolutionResult) => { - // Standard URI resolution handler - const editor = vscode.window.activeTextEditor; - if (editor && result.modelName) { - await extractFieldsToCompositionTool.extractFieldsToComposition(cache, editor, result.modelName); - } else { - throw new Error('Could not determine model name or no active editor.'); - } - }, - URI_OPTIONS.MODEL_FILE - ); - - // Extract Fields to Reference - const extractFieldsToReferenceTool = new ExtractFieldsToReferenceTool(); - registerTreeViewAwareCommand( - disposables, - 'slingr-vscode-extension.extractFieldsToReference', - async (context: TreeViewContext) => { - // Tree view context handler - const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); - const editor = await vscode.window.showTextDocument(document); - await extractFieldsToReferenceTool.extractFieldsToReference(cache, editor, context.modelName); - }, - async (result: UriResolutionResult) => { - // Standard URI resolution handler - const editor = vscode.window.activeTextEditor; - if (editor && result.modelName) { - await extractFieldsToReferenceTool.extractFieldsToReference(cache, editor, result.modelName); - } else { - throw new Error('Could not determine model name or no active editor.'); - } - }, - URI_OPTIONS.MODEL_FILE - ); - - // Extract Fields to Embedded Model - const extractFieldsToEmbeddedTool = new ExtractFieldsToEmbeddedTool(); - registerTreeViewAwareCommand( - disposables, - 'slingr-vscode-extension.extractFieldsToEmbedded', - async (context: TreeViewContext) => { - // Tree view context handler - const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); - const editor = await vscode.window.showTextDocument(document); - await extractFieldsToEmbeddedTool.extractFieldsToEmbedded(cache, editor, context.modelName); - }, - async (result: UriResolutionResult) => { - // Standard URI resolution handler - const editor = vscode.window.activeTextEditor; - if (editor && result.modelName) { - await extractFieldsToEmbeddedTool.extractFieldsToEmbedded(cache, editor, result.modelName); - } else { - throw new Error('Could not determine model name or no active editor.'); - } - }, - URI_OPTIONS.MODEL_FILE - ); - - // Extract Fields to Parent Model - const extractFieldsToParentTool = new ExtractFieldsToParentTool(); - registerTreeViewAwareCommand( - disposables, - 'slingr-vscode-extension.extractFieldsToParent', - async (context: TreeViewContext) => { - // Tree view context handler - const document = await vscode.workspace.openTextDocument(vscode.Uri.file(context.modelPath)); - const editor = await vscode.window.showTextDocument(document); - await extractFieldsToParentTool.extractFieldsToParent(cache, editor, context.modelName); - }, - async (result: UriResolutionResult) => { - // Standard URI resolution handler - const editor = vscode.window.activeTextEditor; - if (editor && result.modelName) { - await extractFieldsToParentTool.extractFieldsToParent(cache, editor, result.modelName); - } else { - throw new Error('Could not determine model name or no active editor.'); - } - }, - URI_OPTIONS.MODEL_FILE - ); - return disposables; } \ No newline at end of file diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index d581add..e3dc465 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -192,6 +192,161 @@ export class AddFieldTool implements AIEnhancedTool { } } + /** + * Creates a WorkspaceEdit for adding a field programmatically without applying it. + * This method prepares all the necessary changes (field insertion, imports, enums) + * and returns them as a WorkspaceEdit that can be applied later or combined with other edits. + * + * @param targetUri - The URI of the model file where the field should be added + * @param fieldInfo - Predefined field information + * @param modelName - The name of the model class to which the field will be added + * @param cache - The metadata cache for context about existing models + * @param enumValues - For Choice fields, the enum values to use (if not provided, default values will be used) + * @returns Promise that resolves to a WorkspaceEdit containing all necessary changes + * @throws Error if validation fails or field already exists + * + */ + public async createAddFieldWorkspaceEdit( + targetUri: vscode.Uri, + fieldInfo: FieldInfo, + modelName: string, + cache: MetadataCache, + enumValues?: string[] + ): Promise { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, modelName, cache); + + // Step 2: Check if field already exists + if (modelClass) { + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(fieldInfo.name)) { + throw new Error(`Field '${fieldInfo.name}' already exists in model ${modelClass.name}`); + } + } + + // Step 3: Generate basic field structure + const fieldCode = this.generateFieldCode(fieldInfo); + + // Step 4: Create the workspace edit + const edit = new vscode.WorkspaceEdit(); + + // Step 5: Add field insertion edit (delegate to source code service but intercept the edit) + await this.addFieldEditToWorkspace(edit, document, modelName, fieldInfo, fieldCode, cache); + + // Step 6: If it's a Choice field, also add enum creation edit + if (fieldInfo.type.decorator === "Choice") { + await this.addEnumEditToWorkspace(edit, document, fieldInfo, enumValues); + } + + return edit; + } + + /** + * Adds field insertion edits to the provided WorkspaceEdit. + * This mirrors the logic from sourceCodeService.insertField but adds to the edit instead of applying. + */ + private async addFieldEditToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + modelClassName: string, + fieldInfo: FieldInfo, + fieldCode: string, + cache?: MetadataCache + ): Promise { + const lines = document.getText().split("\n"); + const newImports = new Set(["Field", fieldInfo.type.decorator]); + + if (fieldInfo.type.decorator === "Composition") { + newImports.add("PersistentComponentModel"); + } + + // Add imports using source code service logic (we need to call a helper method) + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, newImports); + + // Add model import if needed + if (fieldInfo.additionalConfig?.targetModel) { + await this.sourceCodeService.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); + } + + // Find class boundaries and add field + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, modelClassName); + const indentation = detectIndentation(lines, 0, lines.length); + const indentedFieldCode = applyIndentation(fieldCode, indentation); + + edit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`); + } + + /** + * Adds enum creation edits to the provided WorkspaceEdit for Choice fields. + */ + private async addEnumEditToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + fieldInfo: FieldInfo, + enumValues?: string[] + ): Promise { + const enumName = this.generateEnumName(fieldInfo.name); + + // Use provided enum values or generate default ones + let values = enumValues; + if (!values || values.length === 0) { + values = this.generateDefaultEnumValues(fieldInfo.name); + } + + // Normalize the values + const normalizedValues = values.map(value => this.normalizeEnumValue(value)); + + // Generate enum code + const enumCode = this.generateEnumCode(enumName, normalizedValues); + + // Find insertion point at the end of the file + const content = document.getText(); + const lines = content.split("\n"); + + let insertionLine = lines.length; + for (let i = lines.length - 1; i >= 0; i--) { + if (lines[i].trim()) { + insertionLine = i + 1; + break; + } + } + + const insertPosition = new vscode.Position(insertionLine, 0); + const codeToInsert = "\n" + enumCode + "\n"; + + edit.insert(document.uri, insertPosition, codeToInsert); + } + + /** + * Generates default enum values for a Choice field when none are provided. + */ + private generateDefaultEnumValues(fieldName: string): string[] { + const fieldLower = fieldName.toLowerCase(); + + // Generate context-appropriate default values + if (fieldLower.includes("status")) { + return ["Active", "Inactive", "Pending"]; + } + if (fieldLower.includes("type")) { + return ["TypeA", "TypeB", "TypeC"]; + } + if (fieldLower.includes("category")) { + return ["General", "Important", "Urgent"]; + } + if (fieldLower.includes("state")) { + return ["Open", "InProgress", "Closed"]; + } + if (fieldLower.includes("priority")) { + return ["Low", "Medium", "High"]; + } + if (fieldLower.includes("level")) { + return ["Basic", "Intermediate", "Advanced"]; + } + + // Default generic values + return ["Option1", "Option2", "Option3"]; + } + /** * Validates the target file and prepares it for field addition. */ diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index 9e07011..e627b7e 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -245,7 +245,7 @@ export class ChangeReferenceToCompositionTool { const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; // Step 4: Extract any enums from the target model file - const enumDefinitions = this.extractEnumDefinitions(targetDocument); + const enumDefinitions = this.sourceCodeService.extractEnumDefinitions(targetDocument); // Step 5: Check for enum name conflicts and resolve them const sourceDocument = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); @@ -273,46 +273,6 @@ export class ChangeReferenceToCompositionTool { return componentModelParts; } - /** - * Extracts enum definitions from a document. - */ - private extractEnumDefinitions(document: vscode.TextDocument): string[] { - const content = document.getText(); - const lines = content.split('\n'); - const enumDefinitions: string[] = []; - - let currentEnum: string[] = []; - let inEnum = false; - let braceCount = 0; - - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; - - // Check if we're starting an enum - if (line.trim().startsWith('export enum ') || line.trim().startsWith('enum ')) { - inEnum = true; - braceCount = 0; - } - - if (inEnum) { - currentEnum.push(line); - - // Count braces - const openBraces = (line.match(/{/g) || []).length; - const closeBraces = (line.match(/}/g) || []).length; - braceCount += openBraces - closeBraces; - - // If we've closed all braces, we're done with this enum - if (braceCount === 0 && line.includes('}')) { - inEnum = false; - enumDefinitions.push(currentEnum.join('\n')); - currentEnum = []; - } - } - } - - return enumDefinitions; - } /** * Resolves enum name conflicts between target and source files. diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts index 3e8339a..9158783 100644 --- a/src/commands/fields/extractFieldsToComposition.ts +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -1,152 +1,666 @@ import * as vscode from "vscode"; +import { + IRefactorTool, + ChangeObject, + ManualRefactorContext, + ExtractFieldsToCompositionPayload, +} from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; import { UserInputService } from "../../services/userInputService"; -import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; -import { FileSystemService } from "../../services/fileSystemService"; import { AddCompositionTool } from "../models/addComposition"; import { AddFieldTool } from "./addField"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; -import { ExplorerProvider } from "../../explorer/explorerProvider"; import { TreeViewContext } from "../commandHelpers"; -import * as path from "path"; +import { isModelFile } from "../../utils/metadata"; -export class ExtractFieldsToCompositionTool { +/** + * Refactor tool for extracting multiple fields from a model to a new composition model. + * + * This tool allows users to select multiple fields and move them to a new composition + * model, creating a composition relationship between the source and new models. + * It provides preview functionality before applying changes. + */ +export class ExtractFieldsToCompositionTool implements IRefactorTool { private userInputService: UserInputService; - private projectAnalysisService: ProjectAnalysisService; private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; private addCompositionTool: AddCompositionTool; private addFieldTool: AddFieldTool; private deleteFieldTool: DeleteFieldTool; constructor() { this.userInputService = new UserInputService(); - this.projectAnalysisService = new ProjectAnalysisService(); this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); this.addCompositionTool = new AddCompositionTool(); this.addFieldTool = new AddFieldTool(); this.deleteFieldTool = new DeleteFieldTool(); } - public async extractFieldsToComposition( - cache: MetadataCache, - editor: vscode.TextEditor, - modelName: string, - treeViewContext?: { fieldItems: TreeViewContext["fieldItems"] } - ): Promise { - try { - const { document, selections } = editor; - const sourceModel = cache.getModelByName(modelName); - if (!sourceModel) { - throw new Error("Could not find a model class in the current file."); - } + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.extractFieldsToComposition"; + } - let selectedFields: PropertyMetadata[]; + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Extract Fields to Composition"; + } - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - //to lowercase - const fieldItemName = fieldItem.label.toLowerCase(); - const field = Object.values(sourceModel.properties).find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${modelName}'`); - } - return field; - }); - } else { - // Editor context: use text selections - selectedFields = this.getSelectedFields(sourceModel, selections); - } + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["EXTRACT_FIELDS_TO_COMPOSITION"]; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Allows extraction when multiple fields are selected in a model file. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; + } + + // Get the source model from context + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + return false; + } + + // For manual trigger, we allow it if there are fields in the model + return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by prompting user for field selection and composition name. + */ + async initiateManualRefactor( + context: ManualRefactorContext, + ): Promise { + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find a model in the current context"); + return undefined; + } - if (selectedFields.length === 0) { - vscode.window.showInformationMessage("No fields selected."); - return; + // Get all fields in the model + const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; + if (allFields.length < 2) { + vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to composition"); + return undefined; + } + + let selectedFields: PropertyMetadata[] | undefined; + + const treeViewContext = context.treeViewContext as TreeViewContext | undefined; + + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem) => { + const fieldItemName = fieldItem.label.toLowerCase(); + const field = allFields.find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); + } + return field; + }); + } else { + // Let user select which fields to extract + selectedFields = await this.selectFieldsForExtraction(allFields); + if (!selectedFields || selectedFields.length === 0) { + return undefined; } + } - const compositionFieldName = await this.userInputService.showPrompt( - "Enter the name for the new composition field (e.g., 'address', 'contactInfo'):" - ); - if (!compositionFieldName) { - return; + // Get the composition field name + const compositionFieldName = await this.userInputService.showPrompt( + "Enter the name for the new composition field (e.g., 'address', 'contactInfo'):" + ); + if (!compositionFieldName) { + return undefined; + } + + const payload: ExtractFieldsToCompositionPayload = { + sourceModelName: sourceModel.name, + compositionFieldName: compositionFieldName, + fieldsToExtract: selectedFields, + isManual: true, + }; + + return { + type: "EXTRACT_FIELDS_TO_COMPOSITION", + uri: context.uri, + description: `Extract ${selectedFields.length} field(s) to new composition '${compositionFieldName}' in model '${sourceModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ExtractFieldsToCompositionPayload; + + try { + const sourceModel = cache.getModelByName(payload.sourceModelName); + if (!sourceModel) { + throw new Error(`Could not find source model '${payload.sourceModelName}'`); } - // Store field information before deletion - const fieldsToAdd = selectedFields.map((field) => this.propertyMetadataToFieldInfo(field)); + const combinedEdit = new vscode.WorkspaceEdit(); - // Use AddCompositionTool to create the composition relationship and inner model - const createdModelName = await this.addCompositionTool.addCompositionProgrammatically( + // Step 1: Create the composition field and new model WITH the extracted fields already included + // Use PropertyMetadata directly to preserve all decorator information + const fieldsToAdd = payload.fieldsToExtract; // These are already PropertyMetadata objects + + // Create the composition with the fields included + const { edit: compositionEdit, innerModelName } = await this.createCompositionWithFields( cache, - modelName, - compositionFieldName + payload.sourceModelName, + payload.compositionFieldName, + fieldsToAdd ); - const compModelUri = sourceModel.declaration.uri; - const newModelName = this.toPascalCase(compositionFieldName); - - // Add the extracted fields to the new composition model - for (const fieldInfo of fieldsToAdd) { - await this.addFieldTool.addFieldProgrammatically( - compModelUri, - fieldInfo, - newModelName, - cache, - true // Skip validation since we're programmatically adding - ); - } + // Merge composition edit + this.mergeWorkspaceEdits(combinedEdit, compositionEdit); - // Remove the fields from the source model - for (const field of selectedFields) { + // Step 2: Remove the fields from the source model + for (const field of payload.fieldsToExtract) { const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); - if (deleteEdit) { - await vscode.workspace.applyEdit(deleteEdit); - } + this.mergeWorkspaceEdits(combinedEdit, deleteEdit); } - vscode.window.showInformationMessage( - `Fields extracted to new composition model '${createdModelName}' and linked via '${compositionFieldName}' field.` - ); + return combinedEdit; } catch (error) { - vscode.window.showErrorMessage(`Failed to extract fields to composition: ${error}`); - console.error("Error extracting fields to composition:", error); + vscode.window.showErrorMessage(`Failed to prepare extract fields to composition edit: ${error}`); + throw error; + } + } + + /** + * Creates a composition relationship with the extracted fields already included in the inner model. + */ + private async createCompositionWithFields( + cache: MetadataCache, + sourceModelName: string, + compositionFieldName: string, + fieldsToAdd: PropertyMetadata[] + ): Promise<{ edit: vscode.WorkspaceEdit; innerModelName: string }> { + const sourceModel = cache.getModelByName(sourceModelName); + if (!sourceModel) { + throw new Error(`Could not find source model '${sourceModelName}'`); + } + + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + const edit = new vscode.WorkspaceEdit(); + + // Determine inner model name and check if it should be an array + const { innerModelName, isArray } = this.determineInnerModelInfo(compositionFieldName); + + // Step 1: Add the inner model WITH the extracted fields already included + await this.addInnerModelWithFieldsToWorkspace(edit, document, innerModelName, sourceModelName, fieldsToAdd, cache); + + // Step 2: Add the composition field to the outer model + await this.addCompositionFieldToWorkspace( + edit, + document, + sourceModelName, + compositionFieldName, + innerModelName, + isArray, + cache + ); + + return { edit, innerModelName }; + } + + /** + * Generates inner model code with the specified fields already included. + */ + private generateInnerModelCodeWithFields( + innerModelName: string, + outerModelName: string, + dataSource: string | undefined, + fields: PropertyMetadata[] + ): string { + const lines: string[] = []; + + // Add model decorator + if (dataSource) { + lines.push(`@Model({`); + lines.push(`\tdataSource: ${dataSource}`); + lines.push(`})`); + } else { + lines.push(`@Model()`); } + + // Add class declaration + lines.push(`class ${innerModelName} extends PersistentComponentModel<${outerModelName}> {`); + lines.push(``); + + // Add each field using the enhanced method that preserves all decorator information + for (const property of fields) { + const fieldCode = this.generateFieldCodeFromPropertyMetadata(property); + lines.push(...fieldCode.split("\n").map((line) => (line ? `\t${line}` : ""))); + lines.push(``); // Empty line between fields + } + + lines.push(`}`); + + return lines.join("\n"); } - private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { - const selectedFields: PropertyMetadata[] = []; - for (const selection of selections) { - for (const field of Object.values(model.properties)) { - if (selection.intersection(field.declaration.range)) { - selectedFields.push(field); + /** + * Generates field code directly from PropertyMetadata, preserving all decorator information. + */ + private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { + const lines: string[] = []; + + // Add all decorators in the same order as the original + for (const decorator of property.decorators) { + if (decorator.name === "Field" || decorator.name === "Relationship") { + // Handle Field and Relationship decorators with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + lines.push(`@${decorator.name}({`); + const args = decorator.arguments[0]; // Usually the first argument contains the options object + if (typeof args === "object" && args !== null) { + // Format each property of the arguments object + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}({})`); + } + } else { + // Handle type decorators (Text, Choice, etc.) with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + const args = decorator.arguments[0]; + if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { + lines.push(`@${decorator.name}({`); + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else if (Array.isArray(value)) { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}()`); + } + } else { + lines.push(`@${decorator.name}()`); } } } - return selectedFields; + + // Add property declaration using the original type + lines.push(`${property.name}!: ${property.type};`); + + return lines.join("\n"); } - private propertyMetadataToFieldInfo(property: PropertyMetadata): FieldInfo { - const fieldType = - FIELD_TYPE_OPTIONS.find((o) => o.decorator === this.getDecoratorName(property.decorators)) || - FIELD_TYPE_OPTIONS[0]; - const fieldDecorator = property.decorators.find((d) => d.name === "Field"); - const isRequired = fieldDecorator?.arguments.some((arg: any) => arg.required === true) || false; + /** + * Extracts the dataSource from a model using the cache. + */ + private extractDataSourceFromModel(model: DecoratedClass, cache: MetadataCache): string | undefined { + const modelDecorator = model.decorators.find((d) => d.name === "Model"); + return modelDecorator?.arguments?.[0]?.dataSource; + } - return { - name: property.name, - type: fieldType, - required: isRequired, - }; + /** + * Generates an enum name from a field name for Choice fields. + */ + private generateEnumName(fieldName: string): string { + const pascalCase = fieldName.charAt(0).toUpperCase() + fieldName.slice(1); + return pascalCase; + } + + /** + * Shows user a quick pick to select which fields to extract. + */ + private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { + const fieldItems = allFields.map((field) => ({ + label: field.name, + description: this.getFieldTypeDescription(field), + field: field, + })); + + const selectedItems = await vscode.window.showQuickPick(fieldItems, { + canPickMany: true, + placeHolder: "Select fields to extract to the new composition model", + title: "Extract Fields to Composition", + }); + + return selectedItems?.map((item) => item.field); } + /** + * Gets a description of the field type for display in the quick pick. + */ + private getFieldTypeDescription(field: PropertyMetadata): string { + const decoratorName = this.getDecoratorName(field.decorators); + return `@${decoratorName}`; + } + + /** + * Gets the source model from the refactor context, handling different context types. + */ + private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { + // Case 1: metadata is already a DecoratedClass (model) + if (context.metadata && "properties" in context.metadata) { + return context.metadata as DecoratedClass; + } + + // Case 2: metadata is a PropertyMetadata (field) - find the containing model + if (context.metadata && "decorators" in context.metadata) { + const fieldMetadata = context.metadata as PropertyMetadata; + return this.findSourceModelForField(context.cache, fieldMetadata); + } + + // Case 3: no specific metadata - try to find model at the range + return this.findModelAtRange(context.cache, context.uri, context.range); + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } + + /** + * Finds the model class that contains the given range. + */ + private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { + return model; + } + } + + return null; + } + + /** + * Gets the decorator name for a field's type. + */ private getDecoratorName(decorators: any[]): string { const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); return typeDecorator ? typeDecorator.name : "Text"; } + /** + * Determines the inner model name and whether the field should be an array. + */ + private determineInnerModelInfo(fieldName: string): { innerModelName: string; isArray: boolean } { + const singularName = this.toSingular(fieldName); + const innerModelName = this.toPascalCase(singularName); + const isArray = fieldName !== singularName; // If we converted from plural to singular, it's an array + + return { innerModelName, isArray }; + } + + /** + * Converts a potentially plural field name to singular using basic rules. + */ + private toSingular(fieldName: string): string { + if (!fieldName) { + return ""; + } + + // Rule 1: Handle "...ies" -> "...y" (e.g., "cities" -> "city") + if (fieldName.toLowerCase().endsWith("ies")) { + return fieldName.slice(0, -3) + "y"; + } + + // Rule 2: Handle "...es" -> "..." (e.g., "boxes" -> "box", "wishes" -> "wish") + if (fieldName.toLowerCase().endsWith("es")) { + const base = fieldName.slice(0, -2); + // Check if the base word ends in s, x, z, ch, sh + if (["s", "x", "z"].some((char) => base.endsWith(char)) || ["ch", "sh"].some((pair) => base.endsWith(pair))) { + return base; + } + } + + // Rule 3: Handle simple "...s" -> "..." (e.g., "cats" -> "cat") + if (fieldName.toLowerCase().endsWith("s") && !fieldName.toLowerCase().endsWith("ss")) { + return fieldName.slice(0, -1); + } + + // If no plural pattern was found, return the original string + return fieldName; + } + + /** + * Converts camelCase to PascalCase. + */ private toPascalCase(str: string): string { return str.charAt(0).toUpperCase() + str.slice(1); } + + /** + * Adds inner model with fields to workspace edit. + */ + private async addInnerModelWithFieldsToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + innerModelName: string, + outerModelName: string, + fieldsToAdd: PropertyMetadata[], + cache: MetadataCache + ): Promise { + // Check if inner model already exists + const existingModel = cache.getModelByName(innerModelName); + if (existingModel) { + throw new Error(`A model named '${innerModelName}' already exists in the project`); + } + + // Get data source from outer model + const outerModelClass = cache.getModelByName(outerModelName); + if (!outerModelClass) { + throw new Error(`Could not find model metadata for '${outerModelName}'`); + } + + const dataSource = this.extractDataSourceFromModel(outerModelClass, cache); + + // Generate the inner model code with fields + const innerModelCode = this.generateInnerModelCodeWithFields( + innerModelName, + outerModelName, + dataSource, + fieldsToAdd + ); + + // Add required imports - collect from the PropertyMetadata decorators + const requiredImports = new Set(["Model", "Field", "PersistentComponentModel", "Composition"]); + // Add field-specific imports based on the decorators in PropertyMetadata + for (const property of fieldsToAdd) { + for (const decorator of property.decorators) { + requiredImports.add(decorator.name); + } + } + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Find insertion point after the outer model + const lines = document.getText().split("\n"); + let insertionLine = lines.length; // Default to end of file + + try { + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); + insertionLine = classEndLine + 1; + } catch (error) { + console.warn(`Could not find model ${outerModelName}, inserting at end of file`); + } + + // Insert the inner model with appropriate spacing + const spacing = insertionLine < lines.length ? "\n\n" : "\n"; + edit.insert(document.uri, new vscode.Position(insertionLine, 0), `${spacing}${innerModelCode}\n`); + } + + /** + * Adds composition field to the outer model workspace edit. + */ + private async addCompositionFieldToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + outerModelName: string, + fieldName: string, + innerModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Check if composition field already exists + const outerModelClass = cache.getModelByName(outerModelName); + if (!outerModelClass) { + throw new Error(`Could not find model metadata for '${outerModelName}'`); + } + + const existingFields = Object.keys(outerModelClass.properties || {}); + if (existingFields.includes(fieldName)) { + throw new Error(`Field '${fieldName}' already exists in model ${outerModelName}`); + } + + // Create field info for the composition field + const fieldType = { + label: "Relationship", + decorator: "Composition", + tsType: isArray ? `${innerModelName}[]` : innerModelName, + description: "Composition relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // Compositions are typically optional + }; + + // Generate the field code + const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); + + // Add required imports + const requiredImports = new Set(["Field", "Composition"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Find class boundaries and add field + const lines = document.getText().split("\n"); + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); + const indentation = this.detectIndentation(lines, 0, lines.length); + const indentedFieldCode = this.applyIndentation(fieldCode, indentation); + + edit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`); + } + + /** + * Generates the composition field code. + */ + private generateCompositionFieldCode(fieldInfo: FieldInfo, innerModelName: string, isArray: boolean): string { + const lines: string[] = []; + + // Add Field decorator + if (fieldInfo.required) { + lines.push("@Field({"); + lines.push(" required: true"); + lines.push("})"); + } else { + lines.push("@Field({})"); + } + + // Add Composition decorator + lines.push("@Composition()"); + + // Add property declaration + const typeAnnotation = isArray ? `${innerModelName}[]` : innerModelName; + lines.push(`${fieldInfo.name}!: ${typeAnnotation};`); + + return lines.join("\n"); + } + + /** + * Simple indentation detection (copied from utils). + */ + private detectIndentation(lines: string[], startLine: number, endLine: number): string { + for (let i = startLine; i < Math.min(lines.length, endLine); i++) { + const line = lines[i]; + const match = line.match(/^(\s+)/); + if (match) { + return match[1]; + } + } + return "\t"; // Default to tab + } + + /** + * Apply indentation to code (copied from utils). + */ + private applyIndentation(code: string, indentation: string): string { + return code + .split("\n") + .map((line) => (line.trim() ? `${indentation}${line}` : line)) + .join("\n"); + } + + /** + * Merges two workspace edits into one. + */ + private mergeWorkspaceEdits(target: vscode.WorkspaceEdit, source: vscode.WorkspaceEdit): void { + // Merge text edits + source.entries().forEach(([uri, edits]) => { + const existing = target.get(uri) || []; + target.set(uri, [...existing, ...edits]); + }); + + // Merge file operations if any + if (source.size > 0) { + // Copy any file operations from source to target + // This is a simplified merge - in practice you might need more sophisticated merging + } + } } diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 6d826e7..82b7e0e 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -6,6 +6,7 @@ import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; import { FileSystemService } from "../../services/fileSystemService"; import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { detectIndentation, applyIndentation } from "../../utils/detectIndentation"; /** * Tool for adding composition relationships to existing Model classes. @@ -90,6 +91,142 @@ export class AddCompositionTool { } } + /** + * Creates a WorkspaceEdit for adding a composition relationship programmatically without applying it. + * This method prepares all the necessary changes (inner model creation and composition field addition) + * and returns them as a WorkspaceEdit that can be applied later or combined with other edits. + * + * @param cache - The metadata cache for context about existing models + * @param modelName - The name of the model to which the composition is being added + * @param fieldName - The predefined field name for the composition + * @returns Promise that resolves to a WorkspaceEdit containing all necessary changes and the inner model name + * @throws Error if validation fails or models already exist + * + */ + public async createAddCompositionWorkspaceEdit( + cache: MetadataCache, + modelName: string, + fieldName: string + ): Promise<{ edit: vscode.WorkspaceEdit; innerModelName: string }> { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(modelName, cache); + + // Step 2: Determine inner model name and array status + const { innerModelName, isArray } = this.determineInnerModelInfo(fieldName); + + // Step 3: Check if inner model already exists + await this.validateInnerModelName(cache, innerModelName); + + // Step 4: Check if composition field already exists + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(fieldName)) { + throw new Error(`Field '${fieldName}' already exists in model ${modelClass.name}`); + } + + // Step 5: Create the workspace edit + const edit = new vscode.WorkspaceEdit(); + + // Step 6: Add inner model creation edit + await this.addInnerModelEditToWorkspace(edit, document, innerModelName, modelClass.name, cache); + + // Step 7: Add composition field edit + await this.addCompositionFieldEditToWorkspace(edit, document, modelClass.name, fieldName, innerModelName, isArray, cache); + + return { edit, innerModelName }; + } + + /** + * Adds inner model creation edits to the provided WorkspaceEdit. + */ + private async addInnerModelEditToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + innerModelName: string, + outerModelName: string, + cache: MetadataCache + ): Promise { + // Determine data source from outer model + const outerModelClass = cache.getModelByName(outerModelName); + if (!outerModelClass) { + throw new Error(`Could not find model metadata for '${outerModelName}'`); + } + + const outerModelDecorator = cache.getModelDecoratorByName("Model", outerModelClass); + const dataSource = outerModelDecorator?.arguments?.[0]?.dataSource; + + // Generate the inner model code + const innerModelCode = this.generateInnerModelCode(innerModelName, outerModelName, dataSource); + + // Add required imports + const requiredImports = new Set(["Model", "Field", "Relationship", "PersistentComponentModel"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Find insertion point after the outer model + const lines = document.getText().split("\n"); + let insertionLine = lines.length; // Default to end of file + + try { + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); + insertionLine = classEndLine + 1; + } catch (error) { + // If we can't find the specified model, fall back to end of file + console.warn(`Could not find model ${outerModelName}, inserting at end of file`); + } + + // Insert the inner model with appropriate spacing + const spacing = insertionLine < lines.length ? "\n\n" : "\n"; + edit.insert(document.uri, new vscode.Position(insertionLine, 0), `${spacing}${innerModelCode}\n`); + } + + /** + * Adds composition field creation edits to the provided WorkspaceEdit. + */ + private async addCompositionFieldEditToWorkspace( + edit: vscode.WorkspaceEdit, + document: vscode.TextDocument, + outerModelName: string, + fieldName: string, + innerModelName: string, + isArray: boolean, + cache: MetadataCache + ): Promise { + // Create field info for the composition field + const fieldType: FieldTypeOption = { + label: "Relationship", + decorator: "Composition", + tsType: isArray ? `${innerModelName}[]` : innerModelName, + description: "Composition relationship", + }; + + const fieldInfo: FieldInfo = { + name: fieldName, + type: fieldType, + required: false, // Compositions are typically optional + additionalConfig: { + relationshipType: "composition", + targetModel: innerModelName, + targetModelPath: document.uri.fsPath, + }, + }; + + // Generate the field code + const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); + + // Add field insertion edits using the source code service approach + const lines = document.getText().split("\n"); + const requiredImports = new Set(["Field", "Composition"]); + + // Add imports + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Find class boundaries and add field + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); + const indentation = detectIndentation(lines, 0, lines.length); + const indentedFieldCode = applyIndentation(fieldCode, indentation); + + edit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`); + } + /** * Validates the target file and prepares it for composition addition. */ diff --git a/src/refactor/RefactorController.ts b/src/refactor/RefactorController.ts index eaef374..1720d62 100644 --- a/src/refactor/RefactorController.ts +++ b/src/refactor/RefactorController.ts @@ -1,17 +1,24 @@ import * as vscode from "vscode"; -import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteModelPayload, RenameModelPayload } from "./refactorInterfaces"; +import { + ChangeObject, + IRefactorTool, + ManualRefactorContext, + DeleteModelPayload, + RenameModelPayload, +} from "./refactorInterfaces"; import { findNodeAtPosition } from "../utils/ast"; import { MetadataCache } from "../cache/cache"; import { AppTreeItem } from "../explorer/appTreeItem"; +import { isTreeViewContext, validateTreeViewContext, TreeViewContext } from "../commands/commandHelpers"; /** * Controls and orchestrates refactoring operations within the VS Code extension. - * + * * The RefactorController serves as the central coordinator for all refactoring activities, * managing both manual user-initiated refactors and automatic refactors detected through * metadata analysis. It maintains a collection of refactoring tools and handles the * complete refactoring workflow from detection to user approval and application. - * + * * @remarks * Key responsibilities include: * - Managing a registry of refactoring tools and their supported change types @@ -20,20 +27,20 @@ import { AppTreeItem } from "../explorer/appTreeItem"; * - Preparing and merging workspace edits while avoiding duplicate modifications * - Presenting changes to users through VS Code's built-in refactor preview UI * - Coordinating file operations including text edits and file deletions - * + * * The controller uses a change handler map to efficiently route different types of * changes to their appropriate refactoring tools. It includes safeguards to prevent * concurrent edit operations and provides comprehensive error handling throughout * the refactoring process. - * + * * @example * ```typescript * const tools = [new RenameActionTool(), new DeleteModelTool()]; * const controller = new RefactorController(tools, metadataCache); - * + * * // Handle manual refactor command * await controller.handleManualRefactorCommand('rename-action', treeItem); - * + * * // Process automatic refactors * await controller.proposeAutomaticRefactors(detectedChanges); * ``` @@ -66,15 +73,30 @@ export class RefactorController { * @param commandId - The identifier of the refactoring command to execute * @param context - Optional context providing either a URI or AppTreeItem for the refactoring target. * If not provided, uses the active text editor as the target. + * @param secondArg - Optional second argument, used for tree view multi-selection contexts * @returns A Promise that resolves when the refactoring operation is complete * @remarks * - Shows error message if the command ID is not recognized * - For AppTreeItem context, uses the item's metadata for refactoring scope * - For URI context or no context, uses the active editor's selection or cursor position + * - Detects tree view multi-selection context and passes field selection information * - Presents changes for user approval before applying them * - Shows information message if no changes are needed */ - public async handleManualRefactorCommand(commandId: string, context?: vscode.Uri | AppTreeItem | ManualRefactorContext, decoratorName?: string) { + public async handleManualRefactorCommand( + commandId: string, + context?: vscode.Uri | AppTreeItem | ManualRefactorContext, + secondArg?: any + ) { + console.log('[RefactorController] handleManualRefactorCommand called with:', { + commandId, + contextType: context ? typeof context : 'undefined', + contextItemType: context && typeof context === 'object' && 'itemType' in context ? context.itemType : 'N/A', + secondArgType: secondArg ? typeof secondArg : 'undefined', + secondArgIsArray: Array.isArray(secondArg), + secondArgLength: Array.isArray(secondArg) ? secondArg.length : 'N/A' + }); + const tool = this.tools.find((t) => t.getCommandId() === commandId); if (!tool) { vscode.window.showErrorMessage(`Unknown refactoring command: ${commandId}`); @@ -83,53 +105,108 @@ export class RefactorController { let refactorContext: ManualRefactorContext | undefined; - if (context instanceof AppTreeItem) { - if (!context.metadata) { - vscode.window.showInformationMessage("No metadata found for the selected item."); - return; + // Check if this is a tree view multi-selection context + if (context && typeof context === "object" && "itemType" in context && secondArg && Array.isArray(secondArg)) { + try { + if (isTreeViewContext(context, secondArg)) { + const treeContext = validateTreeViewContext(context, secondArg); + + // Create the refactor context from the tree view context + const targetModel = treeContext.fieldItems[0]?.parent?.metadata; + if (targetModel && "declaration" in targetModel) { + refactorContext = { + cache: this.cache, + uri: targetModel.declaration.uri, + range: targetModel.declaration.range, + metadata: targetModel, + treeViewContext: treeContext, + }; + } + } + } catch (error) { + // If tree view context validation fails, fall back to regular handling + console.warn("Failed to process tree view context:", error); } - refactorContext = { - cache: this.cache, - uri: context.metadata.declaration.uri, - range: context.metadata.declaration.range, - metadata: context.metadata, - }; - } else if (context instanceof vscode.Uri) { - const fileMeta = this.cache.getMetadataForFile(context.fsPath); - if (!fileMeta || Object.keys(fileMeta.classes).length === 0) { - vscode.window.showInformationMessage("No class found in the selected file to refactor."); - return; + } + // Check if this is a single field selection from tree view + else if (context instanceof AppTreeItem && + (context.itemType === "field" || context.itemType === "referenceField") && + context.parent?.metadata && + 'name' in context.parent.metadata) { + try { + // Create a tree view context for single field selection + const singleFieldTreeContext: TreeViewContext = { + clickedItem: context, + selectedItems: [context], + fieldItems: [context], + modelName: context.parent.metadata.name, + modelPath: context.parent.metadata.declaration.uri.fsPath + }; + + refactorContext = { + cache: this.cache, + uri: context.parent.metadata.declaration.uri, + range: context.parent.metadata.declaration.range, + metadata: context.parent.metadata, + treeViewContext: singleFieldTreeContext, + }; + } catch (error) { + console.warn("Failed to process single field tree view context:", error); } - // When triggered from file explorer, we assume the target is the first class in the file. - const targetClass = Object.values(fileMeta.classes)[0]; - refactorContext = { - cache: this.cache, - uri: context, - range: targetClass.declaration.range, - metadata: targetClass, - }; - } else if (context && 'cache' in context && 'uri' in context) { - refactorContext = context as ManualRefactorContext; - } else { - const editor = vscode.window.activeTextEditor; - if (!editor) { - vscode.window.showInformationMessage("Cannot determine file for refactoring. Please open a file."); - return; + } + + // If not a tree view context or tree view processing failed, handle as before + if (!refactorContext) { + if (context instanceof AppTreeItem) { + if (!context.metadata) { + vscode.window.showInformationMessage("No metadata found for the selected item."); + return; + } + refactorContext = { + cache: this.cache, + uri: context.metadata.declaration.uri, + range: context.metadata.declaration.range, + metadata: context.metadata, + }; + } else if (context instanceof vscode.Uri) { + const fileMeta = this.cache.getMetadataForFile(context.fsPath); + if (!fileMeta || Object.keys(fileMeta.classes).length === 0) { + vscode.window.showInformationMessage("No class found in the selected file to refactor."); + return; + } + // When triggered from file explorer, we assume the target is the first class in the file. + const targetClass = Object.values(fileMeta.classes)[0]; + refactorContext = { + cache: this.cache, + uri: context, + range: targetClass.declaration.range, + metadata: targetClass, + }; + } else if (context && "cache" in context && "uri" in context) { + refactorContext = context as ManualRefactorContext; + } else { + const editor = vscode.window.activeTextEditor; + if (!editor) { + vscode.window.showInformationMessage("Cannot determine file for refactoring. Please open a file."); + return; + } + const position = editor.selection.active; + refactorContext = { + cache: this.cache, + uri: editor.document.uri, + range: new vscode.Range(position, position), + metadata: await findNodeAtPosition(editor.document.uri, position), + }; } - const position = editor.selection.active; - refactorContext = { - cache: this.cache, - uri: editor.document.uri, - range: new vscode.Range(position, position), - metadata: await findNodeAtPosition(editor.document.uri, position), - }; } if (!refactorContext) { vscode.window.showErrorMessage("Could not determine the context for refactoring."); return; } - const changeObject = await (tool as any).initiateManualRefactor(refactorContext, decoratorName); + + // Call the tool with the refactor context (tree view context is included in the context) + const changeObject = await (tool as any).initiateManualRefactor(refactorContext); if (changeObject) { const workspaceEdit = await this.prepareWorkspaceEdit([changeObject]); if (!workspaceEdit) { @@ -138,7 +215,7 @@ export class RefactorController { const hasTextEdits = workspaceEdit.size > 0; let hasFileDeletions = false; - if (changeObject.type === 'DELETE_MODEL') { + if (changeObject.type === "DELETE_MODEL") { const deletePayload = changeObject.payload as DeleteModelPayload; hasFileDeletions = Array.isArray(deletePayload.urisToDelete) && deletePayload.urisToDelete.length > 0; } @@ -152,17 +229,17 @@ export class RefactorController { /** * Presents workspace changes to the user for approval and handles post-approval analysis. - * + * * This method applies the workspace edit with proper confirmation metadata on existing edits * to trigger VS Code's refactoring preview UI, and optionally runs AI analysis on the changes * after user approval to help identify and fix potential errors. - * + * * @param workspaceEdit - The VS Code WorkspaceEdit containing all file changes to be applied * @param changeObject - The primary change object being processed, used as an anchor for the preview * @param allChanges - Optional array of all changes for automatic refactors with multiple operations - * + * * @returns A Promise that resolves when the approval process and any follow-up analysis is complete - * + * * @remarks * - Annotates existing text edits with confirmation metadata to trigger VS Code's preview UI * - Prefers to annotate edits on the anchor URI when available, otherwise uses the first available edit @@ -173,10 +250,10 @@ export class RefactorController { private async presentChangesForApproval( workspaceEdit: vscode.WorkspaceEdit, changeObject: ChangeObject, - allChanges?: ChangeObject[] + allChanges?: ChangeObject[] ): Promise { const anchorUri = changeObject.uri; - const isDelete = changeObject.type.startsWith('DELETE_'); + const isDelete = changeObject.type.startsWith("DELETE_"); let uriForDummyChange = anchorUri; @@ -247,7 +324,7 @@ export class RefactorController { // We have to add the file renames and deletions from the original changes const changesToProcess = allChanges || [changeObject]; for (const change of changesToProcess) { - if (change.type === 'DELETE_MODEL') { + if (change.type === "DELETE_MODEL") { const deletePayload = change.payload as DeleteModelPayload; if (Array.isArray(deletePayload.urisToDelete)) { for (const uri of deletePayload.urisToDelete) { @@ -255,8 +332,8 @@ export class RefactorController { } } } - - if (change.type === 'RENAME_MODEL') { + + if (change.type === "RENAME_MODEL") { const renamePayload = change.payload as RenameModelPayload; if (renamePayload.newUri) { annotated.renameFile(change.uri, renamePayload.newUri); @@ -264,7 +341,7 @@ export class RefactorController { } } editToApply = annotated; - } + } } catch (e) { console.error("Error while annotating workspace edits for review:", e); } @@ -276,7 +353,7 @@ export class RefactorController { await vscode.workspace.saveAll(false); const changesToProcess = allChanges || [changeObject]; // Check for compilation errors after applying changes - const changesWithPrompts = changesToProcess.filter(change => { + const changesWithPrompts = changesToProcess.filter((change) => { const tool = this.changeHandlerMap.get(change.type); return tool?.executePrompt; }); @@ -324,14 +401,14 @@ export class RefactorController { /** * Proposes automatic refactoring suggestions based on detected changes. - * + * * This method analyzes the provided changes and prepares a workspace edit containing * potential refactoring operations. If changes are detected, it prompts the user for * permission to review the proposed refactors before applying them. - * + * * @param changes - Array of change objects representing detected modifications that could benefit from refactoring * @returns A promise that resolves when the refactoring proposal process is complete - * + * * @remarks * - Returns early if currently applying an edit or if no changes are provided * - Only proceeds with user confirmation before presenting changes for review @@ -357,14 +434,14 @@ export class RefactorController { /** * Prepares a workspace edit by processing an array of change objects and merging their edits. - * + * * This method iterates through the provided changes, uses the appropriate change handlers to generate * text edits, and ensures no duplicate edits are applied to the same range. It also handles file * deletions when specified in the change payload. - * + * * @param changes - Array of change objects to be processed into workspace edits * @returns A Promise that resolves to a WorkspaceEdit containing all merged changes, or undefined if an error occurs - * + * * @remarks * - Edits are deduplicated based on their exact range location (line and character positions) * - File deletions are processed with recursive and ignoreIfNotExists options @@ -380,7 +457,6 @@ export class RefactorController { const tool = this.changeHandlerMap.get(change.type); if (tool) { try { - const editFromTool = await tool.prepareEdit(change, this.cache); for (const [uri, textEdits] of editFromTool.entries()) { const uriString = uri.toString(); @@ -399,10 +475,9 @@ export class RefactorController { if (existingEdits.length > 0) { allUniqueEdits.set(uriString, existingEdits); } - } - if (change.type === 'DELETE_MODEL') { + if (change.type === "DELETE_MODEL") { const deletePayload = change.payload as DeleteModelPayload; if (Array.isArray(deletePayload.urisToDelete)) { for (const uri of deletePayload.urisToDelete) { @@ -411,13 +486,12 @@ export class RefactorController { } } - if (change.type === 'RENAME_MODEL') { + if (change.type === "RENAME_MODEL") { const renamePayload = change.payload as RenameModelPayload; if (renamePayload.newUri) { mergedEdit.renameFile(change.uri, renamePayload.newUri); } } - } catch (error) { vscode.window.showErrorMessage(`Error preparing refactor for '${change.description}': ${error}`); return undefined; @@ -433,10 +507,10 @@ export class RefactorController { /** * Collects all file URIs that were modified during the refactoring operation. - * + * * This method gathers URIs from both the workspace edit entries and the change objects * to create a comprehensive list of files that should be checked for compilation errors. - * + * * @param workspaceEdit - The workspace edit containing text modifications * @param changes - Array of change objects that triggered the refactoring * @returns A Set of unique URIs representing all modified files @@ -455,14 +529,14 @@ export class RefactorController { /** * Checks for compilation errors in the specified files. - * + * * This method uses VS Code's diagnostic API to detect compilation errors * in the provided file URIs. It's useful for determining whether a refactoring * operation has introduced any syntax or type errors that need attention. - * + * * @param uris - Set of file URIs to check for compilation errors * @returns A Promise that resolves to true if any compilation errors are found, false otherwise - * + * * @remarks * - Only checks for diagnostics with Error severity level * - Gracefully handles cases where diagnostics cannot be retrieved for a file @@ -472,7 +546,7 @@ export class RefactorController { for (const uri of uris) { try { const diagnostics = vscode.languages.getDiagnostics(uri); - const errors = diagnostics.filter(d => d.severity === vscode.DiagnosticSeverity.Error); + const errors = diagnostics.filter((d) => d.severity === vscode.DiagnosticSeverity.Error); if (errors.length > 0) { return true; } @@ -486,7 +560,7 @@ export class RefactorController { /** * Retrieves the list of available refactor tools. - * + * * @returns An array of refactor tools that are currently registered with this controller. */ public getTools(): IRefactorTool[] { diff --git a/src/refactor/refactorDisposables.ts b/src/refactor/refactorDisposables.ts index 80d8b14..436561c 100644 --- a/src/refactor/refactorDisposables.ts +++ b/src/refactor/refactorDisposables.ts @@ -12,6 +12,7 @@ import { AppTreeItem } from '../explorer/appTreeItem'; import { AddDecoratorTool } from './tools/addDecorator'; import { ChangeReferenceToCompositionRefactorTool } from './tools/changeReferenceToComposition'; import { ChangeCompositionToReferenceRefactorTool } from './tools/changeCompositionToReference'; +import { ExtractFieldsToCompositionTool } from '../commands/fields/extractFieldsToComposition'; import { isModelFile } from '../utils/metadata'; import { PropertyMetadata } from '../cache/cache'; import { fieldTypeConfig } from '../utils/fieldTypes'; @@ -29,6 +30,7 @@ import { fieldTypeConfig } from '../utils/fieldTypes'; * - RenameFieldTool: Handles field renaming operations * - DeleteFieldTool: Handles field deletion operations * - ChangeFieldTypeTool: Handles field type modification operations + * - ExtractFieldsToCompositionTool: Handles extracting fields to composition models */ export function getAllRefactorTools(): IRefactorTool[] { return [ @@ -40,6 +42,7 @@ export function getAllRefactorTools(): IRefactorTool[] { new AddDecoratorTool(), new ChangeReferenceToCompositionRefactorTool(), new ChangeCompositionToReferenceRefactorTool(), + new ExtractFieldsToCompositionTool(), ]; } @@ -60,12 +63,14 @@ export function registerRefactorCommands(controller: RefactorController, context for (const tool of controller.getTools()) { disposables.push( - vscode.commands.registerCommand(tool.getCommandId(), (context?: vscode.Uri | AppTreeItem | ManualRefactorContext, decoratorName?: string) => { - // The command can now be called with more complex arguments from CodeActions + vscode.commands.registerCommand(tool.getCommandId(), (context?: vscode.Uri | AppTreeItem | ManualRefactorContext, secondArg?: any) => { + // The command can now be called with more complex arguments from CodeActions or tree view multi-selection if (context && 'cache' in context && 'uri' in context) { - controller.handleManualRefactorCommand(tool.getCommandId(), context, decoratorName); + // ManualRefactorContext case - secondArg might be decoratorName + controller.handleManualRefactorCommand(tool.getCommandId(), context, secondArg); } else { - controller.handleManualRefactorCommand(tool.getCommandId(), context); + // Tree view context case - secondArg might be the selected items array + controller.handleManualRefactorCommand(tool.getCommandId(), context, secondArg); } }) ); diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index 5a84e3e..af4d15f 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -1,5 +1,6 @@ import * as vscode from 'vscode'; import { DecoratedClass, DecoratorMetadata, FileMetadata, MetadataCache, PropertyMetadata } from '../cache/cache'; +import { TreeViewContext } from '../commands/commandHelpers'; /** * Context object containing all necessary information for performing refactoring operations. @@ -129,6 +130,23 @@ export interface ChangeReferenceToCompositionPayload { isManual: boolean; } +/** + * Payload interface for extracting fields to a composition model. + * This involves moving selected fields from a source model to a new composition model + * and creating a composition relationship between them. + * + * @property {string} sourceModelName - The name of the source model containing the fields to extract + * @property {string} compositionFieldName - The name of the new composition field to be created + * @property {PropertyMetadata[]} fieldsToExtract - The field metadata for all fields being extracted + * @property {boolean} isManual - Whether the extraction was initiated manually by the user + */ +export interface ExtractFieldsToCompositionPayload { + sourceModelName: string; + compositionFieldName: string; + fieldsToExtract: PropertyMetadata[]; + isManual: boolean; +} + /** * Represents the specific type of refactoring change being applied. @@ -141,8 +159,9 @@ export interface ChangeReferenceToCompositionPayload { * - `CHANGE_FIELD_TYPE`: A change that modifies the data type of a field. * - `ADD_DECORATOR`: A change that adds a decorator to a field. * - `CHANGE_REFERENCE_TO_COMPOSITION`: A change that converts a reference field to a composition field. + * - `EXTRACT_FIELDS_TO_COMPOSITION`: A change that extracts selected fields to a new composition model. */ -export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR' | 'CHANGE_REFERENCE_TO_COMPOSITION' | 'CHANGE_COMPOSITION_TO_REFERENCE'; +export type ChangeType = 'RENAME_MODEL' | 'DELETE_MODEL' | 'RENAME_FIELD' | 'DELETE_FIELD' | 'CHANGE_FIELD_TYPE'| 'ADD_DECORATOR' | 'CHANGE_REFERENCE_TO_COMPOSITION' | 'CHANGE_COMPOSITION_TO_REFERENCE' | 'EXTRACT_FIELDS_TO_COMPOSITION'; /** * Represents a single, atomic change to be applied as part of a refactoring operation. @@ -165,7 +184,8 @@ export interface ChangeObject { | DeleteFieldPayload | ChangeFieldTypePayload | AddDecoratorPayload - | ChangeReferenceToCompositionPayload; + | ChangeReferenceToCompositionPayload + | ExtractFieldsToCompositionPayload; } @@ -183,6 +203,8 @@ export interface ManualRefactorContext { uri: vscode.Uri; range: vscode.Range; metadata?: DecoratedClass | PropertyMetadata; + treeViewContext?: TreeViewContext; + } /** diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 7976a76..cd383f8 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -858,4 +858,45 @@ export class SourceCodeService { return lines.join('\n'); } + /** + * Extracts enum definitions from a document. + */ + public extractEnumDefinitions(document: vscode.TextDocument): string[] { + const content = document.getText(); + const lines = content.split('\n'); + const enumDefinitions: string[] = []; + + let currentEnum: string[] = []; + let inEnum = false; + let braceCount = 0; + + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Check if we're starting an enum + if (line.trim().startsWith('export enum ') || line.trim().startsWith('enum ')) { + inEnum = true; + braceCount = 0; + } + + if (inEnum) { + currentEnum.push(line); + + // Count braces + const openBraces = (line.match(/{/g) || []).length; + const closeBraces = (line.match(/}/g) || []).length; + braceCount += openBraces - closeBraces; + + // If we've closed all braces, we're done with this enum + if (braceCount === 0 && line.includes('}')) { + inEnum = false; + enumDefinitions.push(currentEnum.join('\n')); + currentEnum = []; + } + } + } + + return enumDefinitions; + } + } From 7fcc76189805dd3dc407f357bbf894a64fc785e3 Mon Sep 17 00:00:00 2001 From: Luciano Date: Fri, 19 Sep 2025 09:46:48 -0300 Subject: [PATCH 203/254] Adds interfaces --- src/refactor/refactorInterfaces.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index aaf0f9a..a303d76 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -64,6 +64,7 @@ export interface CreateModelPayload { export interface DeleteFieldPayload { oldFieldMetadata: PropertyMetadata; modelName: string; + isManual: boolean; } export interface ChangeFieldTypePayload extends BasePayload { @@ -250,6 +251,11 @@ export type ChangePayloadMap = { 'ADD_DECORATOR': AddDecoratorPayload; 'RENAME_DATA_SOURCE': RenameDataSourcePayload; 'DELETE_DATA_SOURCE': DeleteDataSourcePayload; + 'CHANGE_REFERENCE_TO_COMPOSITION': ChangeReferenceToCompositionPayload; + 'CHANGE_COMPOSITION_TO_REFERENCE': ChangeReferenceToCompositionPayload; + 'EXTRACT_FIELDS_TO_COMPOSITION': ExtractFieldsToCompositionPayload; + 'EXTRACT_FIELDS_TO_REFERENCE': ExtractFieldsToReferencePayload; + // Add more change types and their payloads as needed }; /** From 5938c7a69511a1bd275e3030f4c17082a0d9044c Mon Sep 17 00:00:00 2001 From: Luciano Date: Fri, 19 Sep 2025 12:58:37 -0300 Subject: [PATCH 204/254] Fixed RefactorController workspaceEdit changes management and updated the creation of edit in every refactor command. --- .../fields/extractFieldsToReference.ts | 917 +++++++++--------- src/refactor/RefactorController.ts | 72 +- src/refactor/refactorInterfaces.ts | 40 +- src/refactor/tools/addDecorator.ts | 2 +- .../tools/changeCompositionToReference.ts | 2 +- src/refactor/tools/changeFieldType.ts | 12 +- src/refactor/tools/deleteDataSource.ts | 2 +- src/refactor/tools/deleteField.ts | 8 +- src/refactor/tools/deleteModel.ts | 10 +- src/refactor/tools/renameDataSource.ts | 6 +- src/refactor/tools/renameField.ts | 4 +- src/refactor/tools/renameModel.ts | 4 +- src/services/sourceCodeService.ts | 268 ++--- 13 files changed, 710 insertions(+), 637 deletions(-) diff --git a/src/commands/fields/extractFieldsToReference.ts b/src/commands/fields/extractFieldsToReference.ts index aa08b1d..fd702c0 100644 --- a/src/commands/fields/extractFieldsToReference.ts +++ b/src/commands/fields/extractFieldsToReference.ts @@ -15,7 +15,7 @@ import { DeleteFieldTool } from "../../refactor/tools/deleteField"; import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; import { TreeViewContext } from "../commandHelpers"; import { isModelFile } from "../../utils/metadata"; -import * as path from 'path'; +import * as path from "path"; /** * Refactor tool for extracting multiple fields from a model to a new reference model. @@ -25,502 +25,531 @@ import * as path from 'path'; * It provides preview functionality before applying changes. */ export class ExtractFieldsToReferenceTool implements IRefactorTool { - private userInputService: UserInputService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; - private newModelTool: NewModelTool; - private addFieldTool: AddFieldTool; - private deleteFieldTool: DeleteFieldTool; - - constructor() { - this.userInputService = new UserInputService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); - this.newModelTool = new NewModelTool(); - this.addFieldTool = new AddFieldTool(); - this.deleteFieldTool = new DeleteFieldTool(); + private userInputService: UserInputService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private newModelTool: NewModelTool; + private addFieldTool: AddFieldTool; + private deleteFieldTool: DeleteFieldTool; + + constructor() { + this.userInputService = new UserInputService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.newModelTool = new NewModelTool(); + this.addFieldTool = new AddFieldTool(); + this.deleteFieldTool = new DeleteFieldTool(); + } + + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.extractFieldsToReference"; + } + + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Extract Fields to Reference"; + } + + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["EXTRACT_FIELDS_TO_REFERENCE"]; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Allows extraction when multiple fields are selected in a model file. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; } - /** - * Returns the VS Code command identifier for this refactor tool. - */ - getCommandId(): string { - return "slingr-vscode-extension.extractFieldsToReference"; + // Get the source model from context + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + return false; } - /** - * Returns the human-readable title shown in refactor menus. - */ - getTitle(): string { - return "Extract Fields to Reference"; + // For manual trigger, we allow it if there are fields in the model + return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by prompting user for field selection, new model name, and reference field name. + */ + async initiateManualRefactor(context: ManualRefactorContext): Promise { + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find a model in the current context"); + return undefined; } - /** - * Returns the types of changes this tool handles. - */ - getHandledChangeTypes(): string[] { - return ["EXTRACT_FIELDS_TO_REFERENCE"]; + // Get all fields in the model + const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; + if (allFields.length < 2) { + vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to reference"); + return undefined; } - /** - * Determines if this tool can handle a manual refactor trigger. - * Allows extraction when multiple fields are selected in a model file. - */ - async canHandleManualTrigger(context: ManualRefactorContext): Promise { - // Must be in a model file - if (!isModelFile(context.uri)) { - return false; - } + let selectedFields: PropertyMetadata[] | undefined; - // Get the source model from context - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - return false; - } + const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - // For manual trigger, we allow it if there are fields in the model - return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem) => { + const fieldItemName = fieldItem.label.toLowerCase(); + const field = allFields.find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); + } + return field; + }); + } else { + // Let user select which fields to extract + selectedFields = await this.selectFieldsForExtraction(allFields); + if (!selectedFields || selectedFields.length === 0) { + return undefined; + } } - /** - * This tool doesn't detect automatic changes. - */ - analyze(): ChangeObject[] { - return []; + // Get the new model name + const newModelName = await this.userInputService.showPrompt("Enter the name for the new reference model:"); + if (!newModelName) { + return undefined; } - /** - * Initiates the manual refactor by prompting user for field selection, new model name, and reference field name. - */ - async initiateManualRefactor( - context: ManualRefactorContext, - ): Promise { - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - vscode.window.showErrorMessage("Could not find a model in the current context"); - return undefined; - } - - // Get all fields in the model - const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; - if (allFields.length < 2) { - vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to reference"); - return undefined; - } - - let selectedFields: PropertyMetadata[] | undefined; - - const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - const fieldItemName = fieldItem.label.toLowerCase(); - const field = allFields.find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); - } - return field; - }); - } else { - // Let user select which fields to extract - selectedFields = await this.selectFieldsForExtraction(allFields); - if (!selectedFields || selectedFields.length === 0) { - return undefined; - } - } - - // Get the new model name - const newModelName = await this.userInputService.showPrompt( - "Enter the name for the new reference model:" - ); - if (!newModelName) { - return undefined; - } - - // Get the reference field name - const referenceFieldName = await this.userInputService.showPrompt( - "Enter the name for the new reference field (e.g., 'user', 'category'):" - ); - if (!referenceFieldName) { - return undefined; - } - - const payload: ExtractFieldsToReferencePayload = { - sourceModelName: sourceModel.name, - newModelName: newModelName, - referenceFieldName: referenceFieldName, - fieldsToExtract: selectedFields, - isManual: true, - }; - - return { - type: "EXTRACT_FIELDS_TO_REFERENCE", - uri: context.uri, - description: `Extract ${selectedFields.length} field(s) to new reference model '${newModelName}' with reference field '${referenceFieldName}' in model '${sourceModel.name}'`, - payload, - }; + // Get the reference field name + const referenceFieldName = await this.userInputService.showPrompt( + "Enter the name for the new reference field (e.g., 'user', 'category'):" + ); + if (!referenceFieldName) { + return undefined; } - /** - * Prepares the workspace edit for the refactor operation. - */ - async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { - const payload = change.payload as ExtractFieldsToReferencePayload; - - try { - const sourceModel = cache.getModelByName(payload.sourceModelName); - if (!sourceModel) { - throw new Error(`Could not find source model '${payload.sourceModelName}'`); - } - - const combinedEdit = new vscode.WorkspaceEdit(); - - const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); - const newModelPath = path.join(sourceDir, `${payload.newModelName}.ts`); - const newModelUri = vscode.Uri.file(newModelPath); - - // Step 1: Create the new reference model with the extracted fields - const { edit: edit } = await this.createReferenceModelWithFields( - sourceModel, - payload.newModelName, - payload.fieldsToExtract, - cache, - newModelUri - ); - - // Step 2: Add the reference field to the source model - await this.addReferenceFieldToSourceModel( - edit, - sourceModel, - payload.referenceFieldName, - payload.newModelName, - cache - ); - - // Step 3: Remove the fields from the source model - for (const field of payload.fieldsToExtract) { - await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache, edit); - } - - return edit; - } catch (error) { - vscode.window.showErrorMessage(`Failed to prepare extract fields to reference edit: ${error}`); - throw error; - } + const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); + const newModelPath = path.join(sourceDir, `${newModelName}.ts`); + const newModelUri = vscode.Uri.file(newModelPath); + + const payload: ExtractFieldsToReferencePayload = { + sourceModelName: sourceModel.name, + newModelName: newModelName, + referenceFieldName: referenceFieldName, + fieldsToExtract: selectedFields, + isManual: true, + urisToCreate: [ + { + uri: newModelUri, + }, + ], + }; + + return { + type: "EXTRACT_FIELDS_TO_REFERENCE", + uri: context.uri, + description: `Extract ${selectedFields.length} field(s) to new reference model '${newModelName}' with reference field '${referenceFieldName}' in model '${sourceModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ExtractFieldsToReferencePayload; + + try { + const sourceModel = cache.getModelByName(payload.sourceModelName); + if (!sourceModel) { + throw new Error(`Could not find source model '${payload.sourceModelName}'`); + } + + const edit = new vscode.WorkspaceEdit(); + + // Get the URI from the payload + const newModelUri = payload.urisToCreate![0].uri; + + // Generate the complete file content + const completeFileContent = this.generateCompleteReferenceModelFile( + payload.newModelName, + payload.fieldsToExtract, + sourceModel, + cache + ); + + const metadata: vscode.WorkspaceEditEntryMetadata = { + label: `Create new model file ${path.basename(newModelUri.fsPath)}`, + description: `Creating new model file for ${payload.newModelName}`, + needsConfirmation: true, + }; + + // Create the file with content + edit.createFile( + newModelUri, + { + overwrite: false, + ignoreIfExists: true, + contents: Buffer.from(completeFileContent, "utf8"), + }, + metadata + ); + + // Step 2: Add the reference field to the source model + await this.addReferenceFieldToSourceModel( + edit, + sourceModel, + payload.referenceFieldName, + payload.newModelName, + cache + ); + + // Step 3: Remove the fields from the source model + for (const field of payload.fieldsToExtract) { + await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache, edit); + } + + return edit; + } catch (error) { + vscode.window.showErrorMessage(`Failed to prepare extract fields to reference edit: ${error}`); + throw error; } - - /** - * Helper method to get selected fields from editor selections. - */ - private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { - const selectedFields: PropertyMetadata[] = []; - for (const selection of selections) { - for (const field of Object.values(model.properties)) { - if (selection.intersection(field.declaration.range)) { - selectedFields.push(field); - } - } + } + + /** + * Helper method to get selected fields from editor selections. + */ + private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { + const selectedFields: PropertyMetadata[] = []; + for (const selection of selections) { + for (const field of Object.values(model.properties)) { + if (selection.intersection(field.declaration.range)) { + selectedFields.push(field); } - return selectedFields; + } + } + return selectedFields; + } + + /** + * Shows user a quick pick to select which fields to extract. + */ + private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { + const fieldItems = allFields.map((field) => ({ + label: field.name, + description: this.getFieldTypeDescription(field), + field: field, + })); + + const selectedItems = await vscode.window.showQuickPick(fieldItems, { + canPickMany: true, + placeHolder: "Select fields to extract to the new reference model", + title: "Extract Fields to Reference", + }); + + return selectedItems?.map((item) => item.field); + } + + /** + * Gets a description of the field type for display in the quick pick. + */ + private getFieldTypeDescription(field: PropertyMetadata): string { + const decoratorName = this.getDecoratorName(field.decorators); + return `@${decoratorName}`; + } + + /** + * Gets the source model from the refactor context, handling different context types. + */ + private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { + // Case 1: metadata is already a DecoratedClass (model) + if (context.metadata && "properties" in context.metadata) { + return context.metadata as DecoratedClass; } - /** - * Shows user a quick pick to select which fields to extract. - */ - private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { - const fieldItems = allFields.map((field) => ({ - label: field.name, - description: this.getFieldTypeDescription(field), - field: field, - })); - - const selectedItems = await vscode.window.showQuickPick(fieldItems, { - canPickMany: true, - placeHolder: "Select fields to extract to the new reference model", - title: "Extract Fields to Reference", - }); - - return selectedItems?.map((item) => item.field); + // Case 2: metadata is a PropertyMetadata (field) - find the containing model + if (context.metadata && "decorators" in context.metadata) { + const fieldMetadata = context.metadata as PropertyMetadata; + return this.findSourceModelForField(context.cache, fieldMetadata); } - /** - * Gets a description of the field type for display in the quick pick. - */ - private getFieldTypeDescription(field: PropertyMetadata): string { - const decoratorName = this.getDecoratorName(field.decorators); - return `@${decoratorName}`; + // Case 3: no specific metadata - try to find model at the range + return this.findModelAtRange(context.cache, context.uri, context.range); + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } } - /** - * Gets the source model from the refactor context, handling different context types. - */ - private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { - // Case 1: metadata is already a DecoratedClass (model) - if (context.metadata && "properties" in context.metadata) { - return context.metadata as DecoratedClass; - } + return null; + } - // Case 2: metadata is a PropertyMetadata (field) - find the containing model - if (context.metadata && "decorators" in context.metadata) { - const fieldMetadata = context.metadata as PropertyMetadata; - return this.findSourceModelForField(context.cache, fieldMetadata); - } + /** + * Finds the model class that contains the given range. + */ + private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); - // Case 3: no specific metadata - try to find model at the range - return this.findModelAtRange(context.cache, context.uri, context.range); + for (const model of allModels) { + if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { + return model; + } } - /** - * Finds the model that contains the given field. - */ - private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - const fieldInModel = Object.values(model.properties).find( - (prop) => - prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line - ); - - if (fieldInModel) { - return model; - } - } - - return null; + return null; + } + + /** + * Gets the decorator name for a field's type. + */ + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : "Text"; + } + + /** + * Creates a new reference model in a separate file with the extracted fields. + */ + private async createReferenceModelWithFields( + sourceModel: DecoratedClass, + newModelName: string, + fieldsToExtract: PropertyMetadata[], + cache: MetadataCache, + newModelUri: vscode.Uri + ): Promise<{ edit: vscode.WorkspaceEdit; newModelUri: vscode.Uri }> { + // Check if model with this name already exists + const existingModel = cache.getModelByName(newModelName); + if (existingModel) { + throw new Error(`A model named '${newModelName}' already exists in the project`); } - /** - * Finds the model class that contains the given range. - */ - private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { - return model; - } - } - - return null; + const edit = new vscode.WorkspaceEdit(); + + // Generate the complete file content including imports and model + const completeFileContent = this.generateCompleteReferenceModelFile( + newModelName, + fieldsToExtract, + sourceModel, + cache + ); + + edit.createFile(newModelUri, { + overwrite: false, + ignoreIfExists: true, + contents: Buffer.from(completeFileContent, "utf8"), + }); + + return { edit, newModelUri }; + } + + /** + * Generates the complete file content for the new reference model, including imports. + */ + private generateCompleteReferenceModelFile( + modelName: string, + fieldsToExtract: PropertyMetadata[], + sourceModel: DecoratedClass, + cache: MetadataCache + ): string { + const lines: string[] = []; + + // Extract data source from source model + const dataSource = this.extractDataSourceFromModel(sourceModel, cache); + + // Generate imports + const requiredImports = new Set(["Model", "Field", "PersistentModel"]); + for (const field of fieldsToExtract) { + for (const decorator of field.decorators) { + requiredImports.add(decorator.name); + } } - /** - * Gets the decorator name for a field's type. - */ - private getDecoratorName(decorators: any[]): string { - const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); - return typeDecorator ? typeDecorator.name : "Text"; + // Add the import statement + const importList = Array.from(requiredImports).sort(); + lines.push(`import { ${importList.join(", ")} } from 'slingr-framework';`); + + //Add dataSource import + lines.push(`import { ${dataSource} } from '../dataSources/datasource';`); + lines.push(""); // Empty line after imports + + // Add model decorator and class + if (dataSource) { + lines.push(`@Model({`); + lines.push(` dataSource: ${dataSource}`); + lines.push(`})`); + } else { + lines.push(`@Model()`); } - /** - * Creates a new reference model in a separate file with the extracted fields. - */ - private async createReferenceModelWithFields( - sourceModel: DecoratedClass, - newModelName: string, - fieldsToExtract: PropertyMetadata[], - cache: MetadataCache, - newModelUri: vscode.Uri - ): Promise<{ edit: vscode.WorkspaceEdit; newModelUri: vscode.Uri }> { - // Check if model with this name already exists - const existingModel = cache.getModelByName(newModelName); - if (existingModel) { - throw new Error(`A model named '${newModelName}' already exists in the project`); - } - - const edit = new vscode.WorkspaceEdit(); - - // Generate the complete file content including imports and model - const completeFileContent = this.generateCompleteReferenceModelFile(newModelName, fieldsToExtract, sourceModel, cache); + lines.push(`export class ${modelName} extends PersistentModel {`); + lines.push(""); - edit.createFile(newModelUri, {overwrite: false, ignoreIfExists: true, contents: Buffer.from(completeFileContent, 'utf8')}); - - return { edit, newModelUri }; + // Add each field using PropertyMetadata to preserve all decorator information + for (const field of fieldsToExtract) { + const fieldCode = this.generateFieldCodeFromPropertyMetadata(field); + lines.push(...fieldCode.split("\n").map((line) => (line ? ` ${line}` : ""))); + lines.push(""); } - /** - * Generates the complete file content for the new reference model, including imports. - */ - private generateCompleteReferenceModelFile( - modelName: string, - fieldsToExtract: PropertyMetadata[], - sourceModel: DecoratedClass, - cache: MetadataCache - ): string { - const lines: string[] = []; - - // Extract data source from source model - const dataSource = this.extractDataSourceFromModel(sourceModel, cache); - - // Generate imports - const requiredImports = new Set(["Model", "Field", "PersistentModel"]); - for (const field of fieldsToExtract) { - for (const decorator of field.decorators) { - requiredImports.add(decorator.name); + lines.push("}"); + lines.push(""); // Empty line at end + + return lines.join("\n"); + } + + /** + * Generates field code directly from PropertyMetadata, preserving all decorator information. + */ + private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { + const lines: string[] = []; + + // Add all decorators in the same order as the original + for (const decorator of property.decorators) { + if (decorator.name === "Field" || decorator.name === "Relationship") { + // Handle Field and Relationship decorators with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + lines.push(`@${decorator.name}({`); + const args = decorator.arguments[0]; // Usually the first argument contains the options object + if (typeof args === "object" && args !== null) { + // Format each property of the arguments object + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } } - } - - // Add the import statement - const importList = Array.from(requiredImports).sort(); - lines.push(`import { ${importList.join(', ')} } from 'slingr-framework';`); - - - //Add dataSource import - lines.push(`import { ${dataSource} } from '../datasources/datasource';`); - lines.push(''); // Empty line after imports - - // Add model decorator and class - if (dataSource) { - lines.push(`@Model({`); - lines.push(` dataSource: ${dataSource}`); - lines.push(`})`); + } + lines.push("})"); } else { - lines.push(`@Model()`); + lines.push(`@${decorator.name}({})`); } - - lines.push(`export class ${modelName} extends PersistentModel {`); - lines.push(""); - - // Add each field using PropertyMetadata to preserve all decorator information - for (const field of fieldsToExtract) { - const fieldCode = this.generateFieldCodeFromPropertyMetadata(field); - lines.push(...fieldCode.split("\n").map((line) => (line ? ` ${line}` : ""))); - lines.push(""); - } - - lines.push("}"); - lines.push(''); // Empty line at end - - return lines.join("\n"); - } - - /** - * Generates field code directly from PropertyMetadata, preserving all decorator information. - */ - private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { - const lines: string[] = []; - - // Add all decorators in the same order as the original - for (const decorator of property.decorators) { - if (decorator.name === "Field" || decorator.name === "Relationship") { - // Handle Field and Relationship decorators with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - lines.push(`@${decorator.name}({`); - const args = decorator.arguments[0]; // Usually the first argument contains the options object - if (typeof args === "object" && args !== null) { - // Format each property of the arguments object - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}({})`); - } - } else { - // Handle type decorators (Text, Choice, etc.) with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - const args = decorator.arguments[0]; - if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { - lines.push(`@${decorator.name}({`); - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else if (Array.isArray(value)) { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}()`); - } - } else { - lines.push(`@${decorator.name}()`); - } + } else { + // Handle type decorators (Text, Choice, etc.) with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + const args = decorator.arguments[0]; + if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { + lines.push(`@${decorator.name}({`); + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else if (Array.isArray(value)) { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } } + lines.push("})"); + } else { + lines.push(`@${decorator.name}()`); + } + } else { + lines.push(`@${decorator.name}()`); } - - // Add property declaration using the original type - lines.push(`${property.name}!: ${property.type};`); - - return lines.join("\n"); + } } - /** - * Extracts the dataSource from a model using the cache. - */ - private extractDataSourceFromModel(model: DecoratedClass, cache: MetadataCache): string | undefined { - const modelDecorator = model.decorators.find((d) => d.name === "Model"); - return modelDecorator?.arguments?.[0]?.dataSource; + // Add property declaration using the original type + lines.push(`${property.name}!: ${property.type};`); + + return lines.join("\n"); + } + + /** + * Extracts the dataSource from a model using the cache. + */ + private extractDataSourceFromModel(model: DecoratedClass, cache: MetadataCache): string | undefined { + const modelDecorator = model.decorators.find((d) => d.name === "Model"); + return modelDecorator?.arguments?.[0]?.dataSource; + } + + /** + * Adds a reference field to the source model. + */ + private async addReferenceFieldToSourceModel( + edit: vscode.WorkspaceEdit, + sourceModel: DecoratedClass, + referenceFieldName: string, + targetModelName: string, + cache: MetadataCache + ): Promise { + // Check if reference field already exists + const existingFields = Object.keys(sourceModel.properties || {}); + if (existingFields.includes(referenceFieldName)) { + throw new Error(`Field '${referenceFieldName}' already exists in model ${sourceModel.name}`); } - /** - * Adds a reference field to the source model. - */ - private async addReferenceFieldToSourceModel( - edit: vscode.WorkspaceEdit, - sourceModel: DecoratedClass, - referenceFieldName: string, - targetModelName: string, - cache: MetadataCache - ): Promise { - // Check if reference field already exists - const existingFields = Object.keys(sourceModel.properties || {}); - if (existingFields.includes(referenceFieldName)) { - throw new Error(`Field '${referenceFieldName}' already exists in model ${sourceModel.name}`); - } + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); - const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + // Generate the reference field code + const fieldCode = this.generateReferenceFieldCode(referenceFieldName, targetModelName); - // Generate the reference field code - const fieldCode = this.generateReferenceFieldCode(referenceFieldName, targetModelName); + // Add required imports + const requiredImports = new Set(["Field", "Reference"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); - // Add required imports - const requiredImports = new Set(["Field", "Reference"]); - await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + // Add import for the target model + await this.sourceCodeService.addModelImport(document, targetModelName, edit, cache); - // Find class boundaries and add field - const lines = document.getText().split("\n"); - const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModel.name); + // Find class boundaries and add field + const lines = document.getText().split("\n"); + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModel.name); - edit.insert(sourceModel.declaration.uri, new vscode.Position(classEndLine, 0), `\n${fieldCode}\n`); - } + edit.insert(sourceModel.declaration.uri, new vscode.Position(classEndLine, 0), `\n${fieldCode}\n`); + } - /** - * Generates the reference field code. - */ - private generateReferenceFieldCode(fieldName: string, targetModelName: string): string { - const lines: string[] = []; + /** + * Generates the reference field code. + */ + private generateReferenceFieldCode(fieldName: string, targetModelName: string): string { + const lines: string[] = []; - // Add Field decorator - lines.push(" @Field({})"); + // Add Field decorator + lines.push(" @Field({})"); - // Add Reference decorator - lines.push(" @Reference()"); - - // Add property declaration - lines.push(` ${fieldName}!: ${targetModelName};`); - - return lines.join("\n"); - } + // Add Reference decorator + lines.push(" @Reference()"); + // Add property declaration + lines.push(` ${fieldName}!: ${targetModelName};`); -} \ No newline at end of file + return lines.join("\n"); + } +} diff --git a/src/refactor/RefactorController.ts b/src/refactor/RefactorController.ts index fc29590..f64ae85 100644 --- a/src/refactor/RefactorController.ts +++ b/src/refactor/RefactorController.ts @@ -1,5 +1,5 @@ import * as vscode from "vscode"; -import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteModelPayload, RenameModelPayload } from "./refactorInterfaces"; +import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteModelPayload, RenameModelPayload, ExtractFieldsToReferencePayload } from "./refactorInterfaces"; import { findNodeAtPosition } from "../utils/ast"; import { MetadataCache } from "../cache/cache"; import { AppTreeItem } from "../explorer/appTreeItem"; @@ -219,16 +219,16 @@ export class RefactorController { this.isApplyingEdit = true; try { - const success = await vscode.workspace.applyEdit(confirmedEdit); + const success = await vscode.workspace.applyEdit(workspaceEdit,{isRefactoring: true}); if (success) { await vscode.workspace.saveAll(false); const changesToProcess = allChanges || [changeObject]; + // Check for compilation errors after applying changes const changesWithPrompts = changesToProcess.filter(change => { const tool = this.changeHandlerMap.get(change.type); return tool?.executePrompt; }); - // Ask user if they want to execute prompts to analyze changes and fix errors if (changesWithPrompts.length > 0) { const modifiedUris = this.collectModifiedUris(workspaceEdit, changesToProcess); @@ -244,16 +244,17 @@ export class RefactorController { "No, Skip Analysis" ); - if (promptConfirmation === "Yes, Analyze Changes") { - // Execute custom prompts for the changes - for (const change of changesWithPrompts) { - const tool = this.changeHandlerMap.get(change.type); - if (tool?.executePrompt) { - try { - await tool.executePrompt(change); - } catch (error) { - console.error(`Error executing prompt for change ${change.type}:`, error); - vscode.window.showWarningMessage(`Failed to execute analysis for ${change.description}: ${error}`); + if (promptConfirmation === "Yes, Analyze Errors") { + // Execute custom prompts for the changes + for (const change of changesWithPrompts) { + const tool = this.changeHandlerMap.get(change.type); + if (tool?.executePrompt) { + try { + await tool.executePrompt(change); + } catch (error) { + console.error(`Error executing prompt for change ${change.type}:`, error); + vscode.window.showWarningMessage(`Failed to execute analysis for ${change.description}: ${error}`); + } } } } @@ -322,13 +323,17 @@ export class RefactorController { const mergedEdit = new vscode.WorkspaceEdit(); const modifiedRanges = new Set(); const allUniqueEdits = new Map(); + const fileOperations = new Set(); // Track file operations to avoid duplicates + let editFromTool: vscode.WorkspaceEdit = new vscode.WorkspaceEdit(); for (const change of changes) { const tool = this.changeHandlerMap.get(change.type); if (tool) { try { - const editFromTool = await tool.prepareEdit(change, this.cache); + editFromTool = await tool.prepareEdit(change, this.cache); + + // Handle text edits with deduplication for (const [uri, textEdits] of editFromTool.entries()) { const uriString = uri.toString(); const existingEdits = allUniqueEdits.get(uriString) || []; @@ -340,23 +345,49 @@ export class RefactorController { existingEdits.push(edit); } } - // Note: modifiedRanges was not part of the original payload interface - // change.payload.modifiedRanges = Array.from(modifiedRanges); if (existingEdits.length > 0) { allUniqueEdits.set(uriString, existingEdits); } + } + // Handle file creation operations from change payload + if ('urisToCreate' in change.payload && Array.isArray(change.payload.urisToCreate)) { + for (const createInfo of change.payload.urisToCreate) { + const createOpId = `CREATE::${createInfo.uri.toString()}`; + if (!fileOperations.has(createOpId)) { + fileOperations.add(createOpId); + // If content is provided, create file with content, otherwise just create the file + if (createInfo.content !== undefined) { + mergedEdit.createFile(createInfo.uri, { + ignoreIfExists: true, + contents: Buffer.from(createInfo.content, 'utf8') + }); + } else { + mergedEdit.createFile(createInfo.uri, { ignoreIfExists: true }); + } + } + } } + // Handle delete operations from change payload if ('urisToDelete' in change.payload && Array.isArray((change.payload as any).urisToDelete)) { for (const uri of (change.payload as any).urisToDelete) { - mergedEdit.deleteFile(uri, { recursive: true, ignoreIfNotExists: true }); + const deleteOpId = `DELETE::${uri.toString()}`; + if (!fileOperations.has(deleteOpId)) { + fileOperations.add(deleteOpId); + mergedEdit.deleteFile(uri, { recursive: true, ignoreIfNotExists: true }); + } } } + // Handle rename operations from change payload if ('newUri' in change.payload && (change.payload as any).newUri) { - mergedEdit.renameFile(change.uri, (change.payload as any).newUri); + const renameOpId = `RENAME::${change.uri.toString()}::${(change.payload as any).newUri.toString()}`; + if (!fileOperations.has(renameOpId)) { + fileOperations.add(renameOpId); + mergedEdit.renameFile(change.uri, (change.payload as any).newUri); + } } } catch (error) { @@ -366,10 +397,11 @@ export class RefactorController { } } + // Apply all unique text edits for (const [uriString, edits] of allUniqueEdits) { mergedEdit.set(vscode.Uri.parse(uriString), edits); } - return mergedEdit; + return editFromTool; } /** @@ -476,4 +508,4 @@ export class RefactorController { public getTools(): IRefactorTool[] { return this.tools; } -} +} \ No newline at end of file diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index a303d76..0d0ebbb 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -1,6 +1,15 @@ import * as vscode from 'vscode'; import { DataSourceMetadata, DecoratedClass, DecoratorMetadata, FileMetadata, MetadataCache, PropertyMetadata } from '../cache/cache'; import { TreeViewContext } from '../commands/commandHelpers'; +import { ChangeCompositionToReferencePayload } from './tools/changeCompositionToReference'; + +/** + * Information about a file to be created. + */ +export interface FileCreationInfo { + uri: vscode.Uri; + content?: string; // Optional content for the file +} /** * Common properties shared across all refactoring payloads. @@ -174,27 +183,7 @@ export interface BaseExtractFieldsPayload { sourceModelName: string; fieldsToExtract: PropertyMetadata[]; isManual: boolean; -} -export interface ExtractFieldsToCompositionPayload extends BaseExtractFieldsPayload { - compositionFieldName: string; -} - - -/** - * Payload interface for extracting fields to a reference model. - * This involves moving selected fields from a source model to a new reference model in a separate file - * and creating a reference relationship between them. - * - * @property {string} sourceModelName - The name of the source model containing the fields to extract - * @property {string} newModelName - The name of the new reference model to be created - * @property {string} referenceFieldName - The name of the new reference field to be created - * @property {PropertyMetadata[]} fieldsToExtract - The field metadata for all fields being extracted - * @property {boolean} isManual - Whether the extraction was initiated manually by the user - */ -export interface ExtractFieldsToReferencePayload { - sourceModelName: string; - newModelName: string; - referenceFieldName: string; + urisToCreate?: FileCreationInfo[]; } /** @@ -220,15 +209,12 @@ export interface ExtractFieldsToCompositionPayload extends BaseExtractFieldsPayl * @property {string} sourceModelName - The name of the source model containing the fields to extract * @property {string} newModelName - The name of the new reference model to be created * @property {string} referenceFieldName - The name of the new reference field to be created - * @property {PropertyMetadata[]} fieldsToExtract - The field metadata for all fields being extracted - * @property {boolean} isManual - Whether the extraction was initiated manually by the user + * @property {fileCreationInfo?: FileCreationInfo} - Optional info for creating the new model file */ -export interface ExtractFieldsToReferencePayload { +export interface ExtractFieldsToReferencePayload extends BaseExtractFieldsPayload { sourceModelName: string; newModelName: string; referenceFieldName: string; - fieldsToExtract: PropertyMetadata[]; - isManual: boolean; } export interface DeleteDataSourcePayload extends BasePayload { @@ -252,7 +238,7 @@ export type ChangePayloadMap = { 'RENAME_DATA_SOURCE': RenameDataSourcePayload; 'DELETE_DATA_SOURCE': DeleteDataSourcePayload; 'CHANGE_REFERENCE_TO_COMPOSITION': ChangeReferenceToCompositionPayload; - 'CHANGE_COMPOSITION_TO_REFERENCE': ChangeReferenceToCompositionPayload; + 'CHANGE_COMPOSITION_TO_REFERENCE': ChangeCompositionToReferencePayload; 'EXTRACT_FIELDS_TO_COMPOSITION': ExtractFieldsToCompositionPayload; 'EXTRACT_FIELDS_TO_REFERENCE': ExtractFieldsToReferencePayload; // Add more change types and their payloads as needed diff --git a/src/refactor/tools/addDecorator.ts b/src/refactor/tools/addDecorator.ts index feac7de..fe4dce3 100644 --- a/src/refactor/tools/addDecorator.ts +++ b/src/refactor/tools/addDecorator.ts @@ -121,7 +121,7 @@ export class AddDecoratorTool implements IRefactorTool { const indentation = fieldLine.text.substring(0, fieldLine.firstNonWhitespaceCharacterIndex); const textToInsert = `@${decoratorName}()\n${indentation}`; const insertPosition = new vscode.Position(fieldMetadata.declaration.range.start.line, fieldMetadata.declaration.range.start.character); - workspaceEdit.insert(fieldMetadata.declaration.uri, insertPosition, textToInsert); + workspaceEdit.insert(fieldMetadata.declaration.uri, insertPosition, textToInsert, {label: `Add @${decoratorName} decorator to '${fieldMetadata.name}'`, needsConfirmation: true}); return workspaceEdit; } diff --git a/src/refactor/tools/changeCompositionToReference.ts b/src/refactor/tools/changeCompositionToReference.ts index 49dbf02..af2e93d 100644 --- a/src/refactor/tools/changeCompositionToReference.ts +++ b/src/refactor/tools/changeCompositionToReference.ts @@ -136,7 +136,7 @@ export class ChangeCompositionToReferenceRefactorTool implements IRefactorTool { } as any; const tool = new ChangeCompositionToReferenceTool(explorerProvider); - await tool.changeCompositionToReference( + await tool.changeCompositionToReference( cache, payload.sourceModelName, payload.fieldName diff --git a/src/refactor/tools/changeFieldType.ts b/src/refactor/tools/changeFieldType.ts index 7c2d6d7..f78e641 100644 --- a/src/refactor/tools/changeFieldType.ts +++ b/src/refactor/tools/changeFieldType.ts @@ -280,18 +280,18 @@ export class ChangeFieldTypeTool implements IRefactorTool { : `@${newType}()`; if (isReplacing) { - workspaceEdit.replace(change.uri, positionToActOn, decoratorString); + workspaceEdit.replace(change.uri, positionToActOn, decoratorString, {label: `Change field '${field.name}' type to '${newType}'`, needsConfirmation: true}); } else { const document = await vscode.workspace.openTextDocument(change.uri); const decoratorLine = document.lineAt(positionToActOn.start.line); const indentation = decoratorLine.text.substring(0, decoratorLine.firstNonWhitespaceCharacterIndex); const textToInsert = `${decoratorString}\n${indentation}`; - workspaceEdit.insert(change.uri, positionToActOn.start, textToInsert); + workspaceEdit.insert(change.uri, positionToActOn.start, textToInsert, {label: `Add @${newType} decorator to '${field.name}'`, needsConfirmation: true} ); } const typeCorrectionEdit = await this.validateAndCorrectType(field, newType, change.uri); if (typeCorrectionEdit) { - workspaceEdit.replace(change.uri, typeCorrectionEdit.range, typeCorrectionEdit.newText); + workspaceEdit.replace(change.uri, typeCorrectionEdit.range, typeCorrectionEdit.newText, {label: `Replace type of '${field.name}' to '${typeCorrectionEdit.newText}'`, needsConfirmation: true}); } } return workspaceEdit; @@ -338,17 +338,17 @@ export class ChangeFieldTypeTool implements IRefactorTool { const enumString = `\n\nexport enum ${enumName} {\n${enumMembers}\n}`; const document = await vscode.workspace.openTextDocument(uri); const endOfFile = document.lineAt(document.lineCount - 1).range.end; - workspaceEdit.insert(uri, endOfFile, enumString); + workspaceEdit.insert(uri, endOfFile, enumString, {label: `Create enum '${enumName}'`, needsConfirmation: true}); // Generate the new @Choice decorator const labels = values.map(v => ` ${v}: "${this.toTitleCase(v)}"`).join(',\n'); const decoratorString = `@Choice<${enumName}>({\n labels: {\n${labels}\n }\n })`; - workspaceEdit.replace(uri, decoratorPosition, decoratorString); + workspaceEdit.replace(uri, decoratorPosition, decoratorString, {label: `Change field '${field.name}' type to 'Choice'`, needsConfirmation: true}); // Create an edit to change the property's type from 'string' to the new enum name const typeCorrectionEdit = await this.validateAndCorrectType(field, enumName, uri, true); if (typeCorrectionEdit) { - workspaceEdit.replace(uri, typeCorrectionEdit.range, typeCorrectionEdit.newText); + workspaceEdit.replace(uri, typeCorrectionEdit.range, typeCorrectionEdit.newText, {label: `Change type of '${field.name}' to '${enumName}'`, needsConfirmation: true}); } } diff --git a/src/refactor/tools/deleteDataSource.ts b/src/refactor/tools/deleteDataSource.ts index 2516557..5607b73 100644 --- a/src/refactor/tools/deleteDataSource.ts +++ b/src/refactor/tools/deleteDataSource.ts @@ -79,7 +79,7 @@ export class DeleteDataSourceTool implements IRefactorTool { async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { const workspaceEdit = new vscode.WorkspaceEdit(); - workspaceEdit.deleteFile(change.uri); + workspaceEdit.deleteFile(change.uri, {}, {label: `Delete data source file`, needsConfirmation: true}); return workspaceEdit; } } \ No newline at end of file diff --git a/src/refactor/tools/deleteField.ts b/src/refactor/tools/deleteField.ts index 403d923..62d011c 100644 --- a/src/refactor/tools/deleteField.ts +++ b/src/refactor/tools/deleteField.ts @@ -236,8 +236,8 @@ export class DeleteFieldTool implements IRefactorTool { continue; } - workspaceEdit.replace(ref.uri, ref.range, '/* DELETED_FIELD_REFERENCE */'); - edit?.replace(ref.uri, ref.range, '/* DELETED_FIELD_REFERENCE */'); + workspaceEdit.replace(ref.uri, ref.range, '/* DELETED_FIELD_REFERENCE */', {label: `Reference to deleted field '${field.name}'`, needsConfirmation: true}); + edit?.replace(ref.uri, ref.range, '/* DELETED_FIELD_REFERENCE */',{label: `Reference to deleted field '${field.name}'`, needsConfirmation: true}); } } @@ -255,8 +255,8 @@ export class DeleteFieldTool implements IRefactorTool { const endLine = doc.lineAt(field.declaration.range.end.line); const fullRangeToDelete = new vscode.Range(startPosition, endLine.rangeIncludingLineBreak.end); - workspaceEdit.delete(field.declaration.uri, fullRangeToDelete); - edit?.delete(field.declaration.uri, fullRangeToDelete); + workspaceEdit.delete(field.declaration.uri, fullRangeToDelete, {label: `Delete field '${field.name}'`, needsConfirmation: true} ); + edit?.delete(field.declaration.uri, fullRangeToDelete, {label: `Delete field '${field.name}'`, needsConfirmation: true} ); } return workspaceEdit; diff --git a/src/refactor/tools/deleteModel.ts b/src/refactor/tools/deleteModel.ts index c40f5f8..7d0a75c 100644 --- a/src/refactor/tools/deleteModel.ts +++ b/src/refactor/tools/deleteModel.ts @@ -257,11 +257,11 @@ export class DeleteModelTool implements IRefactorTool { const doc = await vscode.workspace.openTextDocument(ref.uri); const line = doc.lineAt(ref.range.start.line); if (!line.isEmptyOrWhitespace) { - workspaceEdit.delete(ref.uri, line.rangeIncludingLineBreak); + workspaceEdit.delete(ref.uri, line.rangeIncludingLineBreak, {label: `Delete reference to deleted model '${deletedModelName}'`, needsConfirmation: true}); } } catch (e) { console.error(`Could not process reference in ${ref.uri.fsPath}:`, e); - workspaceEdit.replace(ref.uri, ref.range, "/* DELETED_REFERENCE */"); + workspaceEdit.replace(ref.uri, ref.range, "/* DELETED_REFERENCE */", {label: `Reference to deleted model '${deletedModelName}'`, needsConfirmation: true} ); } } @@ -349,12 +349,12 @@ export class DeleteModelTool implements IRefactorTool { new vscode.Position(actualEndLine + 1, 0) ); - workspaceEdit.delete(fileUri, rangeToDelete); + workspaceEdit.delete(fileUri, rangeToDelete, {label: `Delete model class '${modelMetadata.name}'`, needsConfirmation: true}); } catch (error) { console.error(`Error deleting model class from file ${fileUri.fsPath}:`, error); // Fallback: just comment out the class declaration - workspaceEdit.replace(fileUri, modelMetadata.declaration.range, `/* DELETED_MODEL: ${modelMetadata.name} */`); + workspaceEdit.replace(fileUri, modelMetadata.declaration.range, `/* DELETED_MODEL: ${modelMetadata.name} */`, {label: `Comment out model class '${modelMetadata.name}'`, needsConfirmation: true} ); } } @@ -434,7 +434,7 @@ export class DeleteModelTool implements IRefactorTool { // Apply all deletions for (const range of rangesToDelete) { - workspaceEdit.delete(field.declaration.uri, range); + workspaceEdit.delete(field.declaration.uri, range, {label: `Delete decorator for field '${field.name}'`, needsConfirmation: true} ); } } catch (e) { diff --git a/src/refactor/tools/renameDataSource.ts b/src/refactor/tools/renameDataSource.ts index b1346ec..361eb84 100644 --- a/src/refactor/tools/renameDataSource.ts +++ b/src/refactor/tools/renameDataSource.ts @@ -119,19 +119,19 @@ export class RenameDataSourceTool implements IRefactorTool { if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { continue; } - workspaceEdit.replace(ref.uri, ref.range, newName); + workspaceEdit.replace(ref.uri, ref.range, newName, {label: `Update reference to data source '${oldName}'`, needsConfirmation: true} ); } // If it's a manual rename, we also need to change the declaration if (isManual) { - workspaceEdit.replace(declarationUri, declarationRange, newName); + workspaceEdit.replace(declarationUri, declarationRange, newName, {label: `Rename data source declaration from '${oldName}' to '${newName}'`, needsConfirmation: true} ); } // Rename the file if its name matches the old data source name const oldFileName = oldUri.path.split('/').pop()?.replace('.ts', ''); if (oldFileName === oldName) { const newUri = vscode.Uri.joinPath(oldUri, '..', `${newName}.ts`); - workspaceEdit.renameFile(oldUri, newUri); + workspaceEdit.renameFile(oldUri, newUri, {}, {label: `Rename data source file from '${oldName}.ts' to '${newName}.ts'`, needsConfirmation: true} ); } return workspaceEdit; diff --git a/src/refactor/tools/renameField.ts b/src/refactor/tools/renameField.ts index eb0fb45..5c44b8d 100644 --- a/src/refactor/tools/renameField.ts +++ b/src/refactor/tools/renameField.ts @@ -225,11 +225,11 @@ export class RenameFieldTool implements IRefactorTool { if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { continue; } - workspaceEdit.replace(ref.uri, ref.range, newName); + workspaceEdit.replace(ref.uri, ref.range, newName, {label: `Update reference to field '${oldFieldMetadata.name}'`, needsConfirmation: true} ); } if (change.payload.isManual) { - workspaceEdit.replace(declarationUri, declarationRange, newName); + workspaceEdit.replace(declarationUri, declarationRange, newName, {label: `Rename field declaration from '${oldFieldMetadata.name}' to '${newName}'`, needsConfirmation: true} ); } return workspaceEdit; diff --git a/src/refactor/tools/renameModel.ts b/src/refactor/tools/renameModel.ts index a076dc6..930581d 100644 --- a/src/refactor/tools/renameModel.ts +++ b/src/refactor/tools/renameModel.ts @@ -186,11 +186,11 @@ export class RenameModelTool implements IRefactorTool { if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { continue; } - workspaceEdit.replace(ref.uri, ref.range, newName); + workspaceEdit.replace(ref.uri, ref.range, newName, {label: `Update reference to model '${oldModelMetadata.name}'`, needsConfirmation: true} ); } if (change.payload.isManual) { - workspaceEdit.replace(declarationUri, declarationRange, newName); + workspaceEdit.replace(declarationUri, declarationRange, newName, {label: `Rename model declaration from '${oldModelMetadata.name}' to '${newName}'`, needsConfirmation: true} ); } return workspaceEdit; diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index cd383f8..38e550f 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -7,6 +7,7 @@ import { FileSystemService } from "./fileSystemService"; import { ProjectAnalysisService } from "./projectAnalysisService"; export class SourceCodeService { + private fileSystemService: FileSystemService; private projectAnalysisService: ProjectAnalysisService; constructor() { @@ -25,14 +26,14 @@ export class SourceCodeService { const edit = new vscode.WorkspaceEdit(); const lines = document.getText().split("\n"); const newImports = new Set(["Field", fieldInfo.type.decorator]); - if(fieldInfo.type.decorator === "Composition") { + if (fieldInfo.type.decorator === "Composition") { newImports.add("PersistentComponentModel"); } await this.ensureSlingrFrameworkImports(document, edit, newImports); if (importModel && fieldInfo.additionalConfig) { - await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); + await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); } const { classEndLine } = this.findClassBoundaries(lines, modelClassName); @@ -121,6 +122,7 @@ export class SourceCodeService { } } + /** * Adds an import for a target model type. */ @@ -391,7 +393,7 @@ export class SourceCodeService { /** * Extracts the complete class body (everything between the class braces) from a model. - * + * * @param document - The document containing the model * @param className - The name of the class to extract from * @returns The class body content including proper indentation @@ -399,7 +401,7 @@ export class SourceCodeService { public extractClassBody(document: vscode.TextDocument, className: string): string { const lines = document.getText().split("\n"); const { classStartLine, classEndLine } = this.findClassBoundaries(lines, className); - + // Find the opening brace of the class let openBraceIndex = -1; for (let i = classStartLine; i <= classEndLine; i++) { @@ -408,25 +410,25 @@ export class SourceCodeService { break; } } - + if (openBraceIndex === -1) { throw new Error(`Could not find opening brace for class ${className}`); } - + // Extract content between the braces (excluding the braces themselves) const classBodyLines = lines.slice(openBraceIndex + 1, classEndLine); - + // Remove any empty lines at the end while (classBodyLines.length > 0 && classBodyLines[classBodyLines.length - 1].trim() === "") { classBodyLines.pop(); } - + return classBodyLines.join("\n"); } /** * Creates a complete model file with the given class body content. - * + * * @param modelName - The name of the new model class * @param classBody - The complete class body content * @param baseClass - The base class to extend (default: "PersistentModel") @@ -444,28 +446,28 @@ export class SourceCodeService { isComponent: boolean = false ): string { const lines: string[] = []; - + // Determine required imports const imports = new Set(["Model", "Field"]); - + // Add base class to imports (handle complex base classes like PersistentComponentModel) - const baseClassCore = baseClass.split('<')[0]; // Extract base class name before generic + const baseClassCore = baseClass.split("<")[0]; // Extract base class name before generic imports.add(baseClassCore); - + // Add existing imports if provided if (existingImports) { - existingImports.forEach(imp => imports.add(imp)); + existingImports.forEach((imp) => imports.add(imp)); } - + // Analyze the class body to determine additional needed imports const bodyImports = this.extractImportsFromClassBody(classBody); - bodyImports.forEach(imp => imports.add(imp)); - + bodyImports.forEach((imp) => imports.add(imp)); + // Add import statement const sortedImports = Array.from(imports).sort(); lines.push(`import { ${sortedImports.join(", ")} } from "slingr-framework";`); - lines.push(''); - + lines.push(""); + // Add model decorator if (dataSource) { lines.push(`@Model({`); @@ -474,64 +476,84 @@ export class SourceCodeService { } else { lines.push(`@Model()`); } - + // Add class declaration (export only if not a component model) const exportKeyword = isComponent ? "" : "export "; lines.push(`${exportKeyword}class ${modelName} extends ${baseClass} {`); - + // Add class body (if not empty) if (classBody.trim()) { - lines.push(''); + lines.push(""); lines.push(classBody); - lines.push(''); + lines.push(""); } - + lines.push(`}`); - + return lines.join("\n"); } /** * Analyzes class body content to determine which imports are needed. - * + * * @param classBody - The class body content to analyze * @returns Set of import names that should be included */ private extractImportsFromClassBody(classBody: string): Set { const imports = new Set(); - + // Look for decorator patterns const decoratorPatterns = [ - /@Text\b/g, /@LongText\b/g, /@Email\b/g, /@Html\b/g, - /@Integer\b/g, /@Money\b/g, /@Number\b/g, /@Boolean\b/g, - /@Date\b/g, /@DateRange\b/g, /@Choice\b/g, - /@Reference\b/g, /@Composition\b/g, /@Relationship\b/g + /@Text\b/g, + /@LongText\b/g, + /@Email\b/g, + /@Html\b/g, + /@Integer\b/g, + /@Money\b/g, + /@Number\b/g, + /@Boolean\b/g, + /@Date\b/g, + /@DateRange\b/g, + /@Choice\b/g, + /@Reference\b/g, + /@Composition\b/g, + /@Relationship\b/g, ]; - + const decoratorNames = [ - "Text", "LongText", "Email", "Html", - "Integer", "Money", "Number", "Boolean", - "Date", "DateRange", "Choice", - "Reference", "Composition", "Relationship" + "Text", + "LongText", + "Email", + "Html", + "Integer", + "Money", + "Number", + "Boolean", + "Date", + "DateRange", + "Choice", + "Reference", + "Composition", + "Relationship", ]; - + decoratorPatterns.forEach((pattern, index) => { if (pattern.test(classBody)) { imports.add(decoratorNames[index]); } }); - + // Always include Field if there are any field declarations if (classBody.includes("!:") || classBody.includes(":")) { imports.add("Field"); } - + return imports; } /** * Extracts all model imports from a document (excluding slingr-framework imports). - * + * * @param document - The document to extract imports from * @returns Array of import statements for other models */ @@ -539,19 +561,21 @@ export class SourceCodeService { const content = document.getText(); const lines = content.split("\n"); const modelImports: string[] = []; - + for (const line of lines) { // Look for import statements that are not from slingr-framework - if (line.includes("import") && - line.includes("from") && - !line.includes("slingr-framework") && - !line.includes("vscode") && - !line.includes("path") && - line.trim().startsWith("import")) { + if ( + line.includes("import") && + line.includes("from") && + !line.includes("slingr-framework") && + !line.includes("vscode") && + !line.includes("path") && + line.trim().startsWith("import") + ) { modelImports.push(line); } } - + return modelImports; } @@ -578,36 +602,43 @@ export class SourceCodeService { // Look for different patterns in order of specificity for (let i = 0; i < lines.length; i++) { const line = lines[i]; - + // Pattern 1: Property declarations (fieldName!: Type or fieldName: Type) if (line.includes(`${elementName}!:`) || line.includes(`${elementName}:`)) { elementLine = i; elementIndex = line.indexOf(elementName); break; } - + // Pattern 2: Method declarations (methodName() or methodName( - if (line.includes(`${elementName}(`) && (line.includes('function') || line.includes('){') || line.includes(') {'))) { + if ( + line.includes(`${elementName}(`) && + (line.includes("function") || line.includes("){") || line.includes(") {")) + ) { elementLine = i; elementIndex = line.indexOf(elementName); break; } - + // Pattern 3: Class declarations (class ClassName) if (line.includes(`class ${elementName}`)) { elementLine = i; elementIndex = line.indexOf(elementName); break; } - + // Pattern 4: Variable declarations (const elementName, let elementName, var elementName) - if ((line.includes(`const ${elementName}`) || line.includes(`let ${elementName}`) || line.includes(`var ${elementName}`)) && - (line.includes('=') || line.includes(';'))) { + if ( + (line.includes(`const ${elementName}`) || + line.includes(`let ${elementName}`) || + line.includes(`var ${elementName}`)) && + (line.includes("=") || line.includes(";")) + ) { elementLine = i; elementIndex = line.indexOf(elementName); break; } - + // Pattern 5: General word boundary match (as fallback) const wordBoundaryRegex = new RegExp(`\\b${elementName}\\b`); if (wordBoundaryRegex.test(line)) { @@ -640,29 +671,29 @@ export class SourceCodeService { /** * Deletes a specific model class from a file that contains multiple models. - * + * * @param fileUri - The URI of the file containing the model * @param modelMetadata - The metadata of the model to delete * @param workspaceEdit - The workspace edit to add the deletion to */ public async deleteModelClassFromFile( - fileUri: vscode.Uri, - modelMetadata: any, + fileUri: vscode.Uri, + modelMetadata: any, workspaceEdit: vscode.WorkspaceEdit ): Promise { try { const document = await vscode.workspace.openTextDocument(fileUri); const text = document.getText(); - const lines = text.split('\n'); - + const lines = text.split("\n"); + // Find the class declaration range const classDeclaration = modelMetadata.declaration; const startLine = classDeclaration.range.start.line; const endLine = classDeclaration.range.end.line; - + // Find the @Model decorator using cache information let actualStartLine = startLine; - + // Check if the model has decorators in the cache if (modelMetadata.decorators && modelMetadata.decorators.length > 0) { // Find the @Model decorator specifically @@ -672,14 +703,14 @@ export class SourceCodeService { actualStartLine = Math.min(actualStartLine, modelDecorator.position.start.line); } } - + // Also look backwards to find any other decorators and comments that belong to this class for (let i = actualStartLine - 1; i >= 0; i--) { const line = lines[i].trim(); - if (line === '' || line.startsWith('//') || line.startsWith('/*') || line.endsWith('*/')) { + if (line === "" || line.startsWith("//") || line.startsWith("/*") || line.endsWith("*/")) { // Empty lines, single-line comments, or comment blocks - continue looking actualStartLine = i; - } else if (line.startsWith('@')) { + } else if (line.startsWith("@")) { // Decorator - include it actualStartLine = i; } else { @@ -687,20 +718,20 @@ export class SourceCodeService { break; } } - + // Look forward to find the complete class body (including closing brace) let actualEndLine = endLine; let braceCount = 0; let foundOpenBrace = false; - + for (let i = startLine; i < lines.length; i++) { const line = lines[i]; - + for (const char of line) { - if (char === '{') { + if (char === "{") { braceCount++; foundOpenBrace = true; - } else if (char === '}') { + } else if (char === "}") { braceCount--; if (foundOpenBrace && braceCount === 0) { actualEndLine = i; @@ -708,25 +739,24 @@ export class SourceCodeService { } } } - + if (foundOpenBrace && braceCount === 0) { break; } } - + // Include any trailing empty lines that belong to this class - while (actualEndLine + 1 < lines.length && lines[actualEndLine + 1].trim() === '') { + while (actualEndLine + 1 < lines.length && lines[actualEndLine + 1].trim() === "") { actualEndLine++; } - + // Create the range to delete (include the newline of the last line) const rangeToDelete = new vscode.Range( new vscode.Position(actualStartLine, 0), new vscode.Position(actualEndLine + 1, 0) ); - + workspaceEdit.delete(fileUri, rangeToDelete); - } catch (error) { console.error(`Error deleting model class from file ${fileUri.fsPath}:`, error); // Fallback: just comment out the class declaration @@ -738,36 +768,36 @@ export class SourceCodeService { * Extracts enums that are related to a model's Choice fields. * This analyzes the model's properties and identifies any enums * that are referenced in @Choice decorators. - * + * * @param sourceDocument - The document containing the model * @param componentModel - The model metadata to analyze * @param classBody - The class body content (optional optimization) * @returns Array of enum definition strings */ public async extractRelatedEnums( - sourceDocument: vscode.TextDocument, - componentModel: any, + sourceDocument: vscode.TextDocument, + componentModel: any, classBody?: string ): Promise { const relatedEnums: string[] = []; const sourceContent = sourceDocument.getText(); - + // Find all Choice fields in the component model - const choiceFields = Object.values(componentModel.properties || {}).filter((property: any) => + const choiceFields = Object.values(componentModel.properties || {}).filter((property: any) => property.decorators?.some((decorator: any) => decorator.name === "Choice") ); - + if (choiceFields.length === 0) { return relatedEnums; } - + // For each Choice field, try to find referenced enums for (const field of choiceFields) { const choiceDecorator = (field as any).decorators?.find((d: any) => d.name === "Choice"); if (choiceDecorator) { // Look for enum references in the property type declaration const enumNames = this.extractEnumNamesFromChoiceProperty(field); - + for (const enumName of enumNames) { // Find the enum definition in the source file const enumDefinition = this.extractEnumDefinition(sourceContent, enumName); @@ -777,7 +807,7 @@ export class SourceCodeService { } } } - + return relatedEnums; } @@ -788,23 +818,23 @@ export class SourceCodeService { */ private extractEnumNamesFromChoiceProperty(property: any): string[] { const enumNames: string[] = []; - + // The enum name is in the property's type field - if (property.type && typeof property.type === 'string') { + if (property.type && typeof property.type === "string") { // Remove array brackets if present (e.g., "TaskStatus[]" -> "TaskStatus") - const cleanType = property.type.replace(/\[\]$/, ''); - + const cleanType = property.type.replace(/\[\]$/, ""); + // Check if this looks like an enum (starts with uppercase, follows enum naming conventions) // Also exclude common TypeScript types that aren't enums - const isCommonType = ['string', 'number', 'boolean', 'Date', 'any', 'object', 'void'].includes(cleanType); + const isCommonType = ["string", "number", "boolean", "Date", "any", "object", "void"].includes(cleanType); const enumMatch = cleanType.match(/^[A-Z][a-zA-Z0-9_]*$/); - + if (enumMatch && !isCommonType) { enumNames.push(cleanType); console.log(`Found potential enum "${cleanType}" in Choice field "${property.name}"`); } } - + return enumNames; } @@ -813,16 +843,13 @@ export class SourceCodeService { */ private extractEnumDefinition(sourceContent: string, enumName: string): string | null { // Create regex to match enum definition including export keyword - const enumRegex = new RegExp( - `(export\\s+)?enum\\s+${enumName}\\s*\\{[^}]*\\}`, - 'gs' - ); - + const enumRegex = new RegExp(`(export\\s+)?enum\\s+${enumName}\\s*\\{[^}]*\\}`, "gs"); + const match = enumRegex.exec(sourceContent); if (match) { return match[0]; } - + return null; } @@ -833,29 +860,29 @@ export class SourceCodeService { if (enums.length === 0) { return modelFileContent; } - - const lines = modelFileContent.split('\n'); - + + const lines = modelFileContent.split("\n"); + // Find the position to insert enums (after imports, before the model class) let insertPosition = 0; for (let i = 0; i < lines.length; i++) { - if (lines[i].startsWith('import ')) { + if (lines[i].startsWith("import ")) { insertPosition = i + 1; - } else if (lines[i].trim() === '' && insertPosition > 0) { + } else if (lines[i].trim() === "" && insertPosition > 0) { // Found empty line after imports insertPosition = i; break; - } else if (lines[i].includes('@Model') || lines[i].includes('class ')) { + } else if (lines[i].includes("@Model") || lines[i].includes("class ")) { // Found the start of the model definition break; } } - + // Insert enums with proper spacing - const enumContent = enums.join('\n\n') + '\n\n'; + const enumContent = enums.join("\n\n") + "\n\n"; lines.splice(insertPosition, 0, enumContent); - - return lines.join('\n'); + + return lines.join("\n"); } /** @@ -863,40 +890,39 @@ export class SourceCodeService { */ public extractEnumDefinitions(document: vscode.TextDocument): string[] { const content = document.getText(); - const lines = content.split('\n'); + const lines = content.split("\n"); const enumDefinitions: string[] = []; - + let currentEnum: string[] = []; let inEnum = false; let braceCount = 0; - + for (let i = 0; i < lines.length; i++) { const line = lines[i]; - + // Check if we're starting an enum - if (line.trim().startsWith('export enum ') || line.trim().startsWith('enum ')) { + if (line.trim().startsWith("export enum ") || line.trim().startsWith("enum ")) { inEnum = true; braceCount = 0; } - + if (inEnum) { currentEnum.push(line); - + // Count braces const openBraces = (line.match(/{/g) || []).length; const closeBraces = (line.match(/}/g) || []).length; braceCount += openBraces - closeBraces; - + // If we've closed all braces, we're done with this enum - if (braceCount === 0 && line.includes('}')) { + if (braceCount === 0 && line.includes("}")) { inEnum = false; - enumDefinitions.push(currentEnum.join('\n')); + enumDefinitions.push(currentEnum.join("\n")); currentEnum = []; } } } - + return enumDefinitions; } - } From b70559cfbe562653e78bb8d71898c6e0d46c78ae Mon Sep 17 00:00:00 2001 From: Luciano Date: Fri, 19 Sep 2025 13:40:29 -0300 Subject: [PATCH 205/254] Fixed extractFieldsToCompositionTool to add correctly the edits and updated explorer to detect new 'Composition' decorators. --- .../fields/extractFieldsToComposition.ts | 17 +++++++---------- src/explorer/explorerProvider.ts | 9 +++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts index d39603d..21c9fed 100644 --- a/src/commands/fields/extractFieldsToComposition.ts +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -155,6 +155,8 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { */ async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { const payload = change.payload as ExtractFieldsToCompositionPayload; + let edit = new vscode.WorkspaceEdit(); + let innerModelName = ""; try { const sourceModel = cache.getModelByName(payload.sourceModelName); @@ -169,23 +171,22 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { const fieldsToAdd = payload.fieldsToExtract; // These are already PropertyMetadata objects // Create the composition with the fields included - const { edit: compositionEdit, innerModelName } = await this.createCompositionWithFields( + const result = await this.createCompositionWithFields( cache, payload.sourceModelName, payload.compositionFieldName, fieldsToAdd ); + edit = result.edit; + innerModelName = result.innerModelName; - // Merge composition edit - this.mergeWorkspaceEdits(combinedEdit, compositionEdit); // Step 2: Remove the fields from the source model for (const field of payload.fieldsToExtract) { - const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); - this.mergeWorkspaceEdits(combinedEdit, deleteEdit); + await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache,edit); } - return combinedEdit; + return edit; } catch (error) { vscode.window.showErrorMessage(`Failed to prepare extract fields to composition edit: ${error}`); throw error; @@ -586,10 +587,6 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { // Generate the field code const fieldCode = this.generateCompositionFieldCode(fieldInfo, innerModelName, isArray); - // Add required imports - const requiredImports = new Set(["Field", "Composition"]); - await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); - // Find class boundaries and add field const lines = document.getText().split("\n"); const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index 6b66d5b..436d492 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -1044,7 +1044,16 @@ export class ExplorerProvider if (hasFieldDecorator) { // Check if this property has a @Relationship decorator with type: "Composition" const relationshipDecorator = property.decorators.find((d) => d.name === "Relationship"); + const compositionDecorator = property.decorators.find((d) => d.name === "Composition"); + // If there's a @Composition decorator, we can directly consider it + if (compositionDecorator) { + const baseType = this.extractBaseTypeFromArrayType(property.type); + compositionModels.add(baseType); + continue; // No need to check further + } + + // If there's a @Relationship decorator, check its arguments if (relationshipDecorator) { // Check if the relationship decorator has type: "Composition" or "composition" const hasCompositionType = relationshipDecorator.arguments.some( From 12545fd330232363daada4fed978915b0d4ae457 Mon Sep 17 00:00:00 2001 From: Luciano Date: Fri, 19 Sep 2025 21:19:23 -0300 Subject: [PATCH 206/254] Fixed changeCompositionToReference tool. --- .../fields/changeCompositionToReference.ts | 106 ++++++++---------- src/refactor/RefactorController.ts | 1 + .../tools/changeCompositionToReference.ts | 14 +-- 3 files changed, 53 insertions(+), 68 deletions(-) diff --git a/src/commands/fields/changeCompositionToReference.ts b/src/commands/fields/changeCompositionToReference.ts index abc2e3e..dbbc0e1 100644 --- a/src/commands/fields/changeCompositionToReference.ts +++ b/src/commands/fields/changeCompositionToReference.ts @@ -7,6 +7,7 @@ import { SourceCodeService } from "../../services/sourceCodeService"; import { FileSystemService } from "../../services/fileSystemService"; import { ExplorerProvider } from "../../explorer/explorerProvider"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import { detectIndentation, applyIndentation } from "../../utils/detectIndentation"; import * as path from "path"; /** @@ -24,15 +25,13 @@ export class ChangeCompositionToReferenceTool { private projectAnalysisService: ProjectAnalysisService; private sourceCodeService: SourceCodeService; private fileSystemService: FileSystemService; - private explorerProvider: ExplorerProvider; private deleteFieldTool: DeleteFieldTool; - constructor(explorerProvider: ExplorerProvider) { + constructor() { this.userInputService = new UserInputService(); this.projectAnalysisService = new ProjectAnalysisService(); this.sourceCodeService = new SourceCodeService(); this.fileSystemService = new FileSystemService(); - this.explorerProvider = explorerProvider; this.deleteFieldTool = new DeleteFieldTool(); } @@ -42,13 +41,16 @@ export class ChangeCompositionToReferenceTool { * @param cache - The metadata cache for context about existing models * @param sourceModelName - The name of the model containing the composition field * @param fieldName - The name of the composition field to convert - * @returns Promise that resolves when the conversion is complete + * @returns Promise that resolves to a WorkspaceEdit containing all changes needed for the conversion */ public async changeCompositionToReference( cache: MetadataCache, sourceModelName: string, fieldName: string - ): Promise { + ): Promise { + + const edit = new vscode.WorkspaceEdit(); + try { // Step 1: Validate the source model and composition field const { sourceModel, document, compositionField, componentModel } = await this.validateCompositionField( @@ -57,43 +59,39 @@ export class ChangeCompositionToReferenceTool { fieldName ); - // Step 2: Get confirmation from user - const shouldProceed = await this.confirmConversion(componentModel.name, sourceModelName); - if (!shouldProceed) { - return; // User cancelled - } - // Step 3: Determine the target file path for the new independent model const targetFilePath = await this.determineTargetFilePath(sourceModel, componentModel.name); // Step 4: Generate and create the independent model using existing tools - const modelFileUri = await this.generateAndCreateIndependentModel(componentModel, sourceModel, targetFilePath, cache); - + await this.generateAndCreateIndependentModel(componentModel, sourceModel, targetFilePath, cache, edit); + // Step 5: Extract related enums before removing the component model const relatedEnums = await this.sourceCodeService.extractRelatedEnums(document, componentModel, this.sourceCodeService.extractClassBody(document, componentModel.name)); // Step 6-8: Remove field, model, and enums in a single workspace edit to avoid coordinate issues - await this.removeFieldModelAndEnums(document, compositionField, componentModel, relatedEnums, cache); + await this.removeFieldModelAndEnums(document, compositionField, componentModel, relatedEnums, cache, edit); // Step 9: Add the reference field to the source model - await this.addReferenceField(document, sourceModel.name, fieldName, componentModel.name, compositionField.type.endsWith('[]'), cache); + await this.addReferenceField(document, sourceModel.name, fieldName, componentModel.name, compositionField.type.endsWith('[]'), cache, edit); // Step 10: Add import for the new model in the source file - const importEdit = new vscode.WorkspaceEdit(); - await this.sourceCodeService.addModelImport(document, componentModel.name, importEdit, cache); - await vscode.workspace.applyEdit(importEdit); + await this.sourceCodeService.addModelImport(document, componentModel.name, edit, cache); // Step 11: Focus on the newly modified field await this.sourceCodeService.focusOnElement(document, fieldName); - // Step 11: Show success message + // Step 12: Show success message vscode.window.showInformationMessage( `Composition converted to reference! The component model '${componentModel.name}' is now an independent model in its own file.` ); + + // Return the consolidated workspace edit containing all changes + return edit; } catch (error) { vscode.window.showErrorMessage(`Failed to change composition to reference: ${error}`); console.error("Error changing composition to reference:", error); + return edit; // Return the edit even if there was an error } } @@ -149,21 +147,6 @@ export class ChangeCompositionToReferenceTool { return { sourceModel, document, compositionField, componentModel }; } - /** - * Asks user for confirmation before proceeding with the conversion. - */ - private async confirmConversion(componentModelName: string, sourceModelName: string): Promise { - const message = `Convert composition to reference? The component model '${componentModelName}' will be moved to its own file and become an independent model.`; - - const choice = await vscode.window.showWarningMessage( - message, - { modal: true }, - "Convert", - "Cancel" - ); - - return choice === "Convert"; - } /** * Determines the target file path for the new independent model. @@ -181,8 +164,10 @@ export class ChangeCompositionToReferenceTool { componentModel: DecoratedClass, sourceModel: DecoratedClass, targetFilePath: string, - cache: MetadataCache - ): Promise { + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + // Step 1: Get the source document to extract the class body const sourceDocument = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); @@ -198,6 +183,7 @@ export class ChangeCompositionToReferenceTool { // Step 5: Extract existing model imports from the source file const existingImports = this.sourceCodeService.extractModelImports(sourceDocument); + const existingImportsSet = new Set(existingImports); // Step 6: Convert the class body for independent model use const convertedClassBody = this.convertComponentClassBody(classBody); @@ -206,27 +192,21 @@ export class ChangeCompositionToReferenceTool { const modelFileContent = this.sourceCodeService.generateModelFileContent( componentModel.name, convertedClassBody, - "PersistentModel", // Change from PersistentComponentModel to PersistentModel + "PersistentModel", // Convert from PersistentComponentModel to PersistentModel dataSource, - new Set(["Field"]), // Ensure Field is included - false // This is a standalone model (with export) + existingImportsSet, + false // isComponent = false since this is now an independent model ); // Step 8: Add related enums to the file content const finalFileContent = this.sourceCodeService.addEnumsToFileContent(modelFileContent, relatedEnums); - // Step 9: Create the new model file + // Step 9: Create the workspace edit to create the new model file const modelFileUri = vscode.Uri.file(targetFilePath); - const encoder = new TextEncoder(); - await vscode.workspace.fs.writeFile(modelFileUri, encoder.encode(finalFileContent)); + workspaceEdit.createFile(modelFileUri, { ignoreIfExists: true }, {label: 'Create independent model file', needsConfirmation: true}); + workspaceEdit.insert(modelFileUri, new vscode.Position(0, 0), finalFileContent, {label: 'Insert model content', needsConfirmation: true}); - // Step 10: Add model imports to the new file if needed - if (existingImports.length > 0) { - await this.addModelImportsToNewFile(modelFileUri, existingImports); - } - - console.log(`Created independent model file: ${targetFilePath}`); - return modelFileUri; + console.log(`Prepared workspace edit to create independent model file: ${targetFilePath}`); } /** @@ -289,9 +269,9 @@ export class ChangeCompositionToReferenceTool { compositionField: PropertyMetadata, componentModel: DecoratedClass, relatedEnums: string[], - cache: MetadataCache + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit ): Promise { - const workspaceEdit = new vscode.WorkspaceEdit(); // Step 1: Get field deletion range (using DeleteFieldTool logic) const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); @@ -323,8 +303,7 @@ export class ChangeCompositionToReferenceTool { // Step 4: Merge field deletion edits into the main workspace edit this.mergeWorkspaceEdits(fieldDeletionEdit, workspaceEdit); - // Step 5: Apply all deletions in a single operation - await vscode.workspace.applyEdit(workspaceEdit); + console.log("Prepared workspace edit to remove field, model, and unused enums"); } /** @@ -472,7 +451,7 @@ export class ChangeCompositionToReferenceTool { new vscode.Position(enumEndLine + 1, 0) ); - workspaceEdit.delete(document.uri, rangeToDelete); + workspaceEdit.delete(document.uri, rangeToDelete, {label: `Delete unused enum ${enumName}`, needsConfirmation: true}); console.log(`Scheduled deletion of enum "${enumName}" from lines ${enumStartLine} to ${enumEndLine}`); } else { console.warn(`Could not find enum "${enumName}" for deletion`); @@ -486,7 +465,7 @@ export class ChangeCompositionToReferenceTool { sourceEdit.entries().forEach(([uri, edits]) => { edits.forEach(edit => { if (edit instanceof vscode.TextEdit) { - targetEdit.replace(uri, edit.range, edit.newText); + targetEdit.replace(uri, edit.range, edit.newText, {label: 'Merge field deletion edits', needsConfirmation: true}); } }); }); @@ -501,7 +480,8 @@ export class ChangeCompositionToReferenceTool { fieldName: string, targetModelName: string, isArray: boolean, - cache: MetadataCache + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit ): Promise { // Create field info for the reference field const fieldType: FieldTypeOption = { @@ -524,8 +504,20 @@ export class ChangeCompositionToReferenceTool { // Generate the field code const fieldCode = this.generateReferenceFieldCode(fieldInfo, targetModelName, isArray); + // Create the field insertion edits manually and merge into main workspace edit + const lines = document.getText().split("\n"); + const { classStartLine, classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModelName); + + // Apply proper indentation + const indentation = detectIndentation(lines, classStartLine, classEndLine); + const indentedFieldCode = applyIndentation(fieldCode, indentation); + // Insert the field - await this.sourceCodeService.insertField(document, sourceModelName, fieldInfo, fieldCode, cache, false); + workspaceEdit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`, {label: `Add reference field ${fieldName}`, needsConfirmation: true}); + + // Add necessary imports to the workspace edit + const newImports = new Set(["Field", "Reference"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, workspaceEdit, newImports); } /** diff --git a/src/refactor/RefactorController.ts b/src/refactor/RefactorController.ts index f64ae85..270d679 100644 --- a/src/refactor/RefactorController.ts +++ b/src/refactor/RefactorController.ts @@ -401,6 +401,7 @@ export class RefactorController { for (const [uriString, edits] of allUniqueEdits) { mergedEdit.set(vscode.Uri.parse(uriString), edits); } + // Now it's just returning the edit from the tool. return editFromTool; } diff --git a/src/refactor/tools/changeCompositionToReference.ts b/src/refactor/tools/changeCompositionToReference.ts index af2e93d..f8c3ad7 100644 --- a/src/refactor/tools/changeCompositionToReference.ts +++ b/src/refactor/tools/changeCompositionToReference.ts @@ -124,19 +124,12 @@ export class ChangeCompositionToReferenceRefactorTool implements IRefactorTool { // We don't actually prepare the edit here since the command tool handles everything // This is more of a trigger for the actual implementation - const workspaceEdit = new vscode.WorkspaceEdit(); + let workspaceEdit = new vscode.WorkspaceEdit(); // Execute the actual command - setTimeout(async () => { try { - // Get the explorer provider from the extension context - // For now, we'll create a mock explorer provider - const explorerProvider = { - refresh: () => {} - } as any; - - const tool = new ChangeCompositionToReferenceTool(explorerProvider); - await tool.changeCompositionToReference( + const tool = new ChangeCompositionToReferenceTool(); + workspaceEdit = await tool.changeCompositionToReference( cache, payload.sourceModelName, payload.fieldName @@ -144,7 +137,6 @@ export class ChangeCompositionToReferenceRefactorTool implements IRefactorTool { } catch (error) { vscode.window.showErrorMessage(`Failed to change composition to reference: ${error}`); } - }, 100); return workspaceEdit; } From 7c3210bbb19eb77446288afad0cc69de634c3749 Mon Sep 17 00:00:00 2001 From: Luciano Date: Fri, 19 Sep 2025 22:36:53 -0300 Subject: [PATCH 207/254] Updated changeReferenceToComposition tool to show edits preview --- .../fields/changeReferenceToComposition.ts | 152 +++++++++++++----- .../tools/changeReferenceToComposition.ts | 66 +++----- 2 files changed, 139 insertions(+), 79 deletions(-) diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index e627b7e..20be908 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -7,6 +7,7 @@ import { SourceCodeService } from "../../services/sourceCodeService"; import { FileSystemService } from "../../services/fileSystemService"; import { ExplorerProvider } from "../../explorer/explorerProvider"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; +import { detectIndentation, applyIndentation } from "../../utils/detectIndentation"; import * as path from "path"; /** @@ -23,15 +24,13 @@ export class ChangeReferenceToCompositionTool { private projectAnalysisService: ProjectAnalysisService; private sourceCodeService: SourceCodeService; private fileSystemService: FileSystemService; - private explorerProvider: ExplorerProvider; private deleteFieldTool: DeleteFieldTool; - constructor(explorerProvider: ExplorerProvider) { + constructor() { this.userInputService = new UserInputService(); this.projectAnalysisService = new ProjectAnalysisService(); this.sourceCodeService = new SourceCodeService(); this.fileSystemService = new FileSystemService(); - this.explorerProvider = explorerProvider; this.deleteFieldTool = new DeleteFieldTool(); } @@ -41,13 +40,15 @@ export class ChangeReferenceToCompositionTool { * @param cache - The metadata cache for context about existing models * @param sourceModelName - The name of the model containing the reference field * @param fieldName - The name of the reference field to convert - * @returns Promise that resolves when the conversion is complete + * @returns Promise that resolves to a WorkspaceEdit containing all changes needed for the conversion */ public async changeReferenceToComposition( cache: MetadataCache, sourceModelName: string, fieldName: string - ): Promise { + ): Promise { + + const edit = new vscode.WorkspaceEdit(); try { // Step 1: Validate the source model and reference field const { sourceModel, document, referenceField, targetModel } = await this.validateReferenceField( @@ -59,47 +60,47 @@ export class ChangeReferenceToCompositionTool { // Step 2: Check if target model is referenced by other fields const isReferencedElsewhere = this.isModelReferencedElsewhere(cache, targetModel.name, sourceModelName, fieldName); - // Step 3: Inform user about the action and get confirmation - const shouldProceed = await this.confirmConversion(targetModel.name, isReferencedElsewhere); - if (!shouldProceed) { - return; // User cancelled - } // Step 4: Create the component model content based on the target model const componentModelCode = await this.generateComponentModelCode(targetModel, sourceModel, cache); // Step 5: Remove the reference field decorators - await this.removeReferenceField(document, referenceField, cache); + await this.removeReferenceField(document, referenceField, cache, edit); // Step 6: Add the component model to the source file - await this.addComponentModel(document, componentModelCode, sourceModel.name, cache); + await this.addComponentModel(document, componentModelCode, sourceModel.name, cache, edit); // Step 6.1: Remove the import for the target model since it's now defined in the same file - await this.fileSystemService.removeModelImport(document, targetModel.name); + await this.removeModelImport(document, targetModel.name, edit); // Step 7: Add the composition field - await this.addCompositionField(document, sourceModel.name, fieldName, targetModel.name, false, cache); + await this.addCompositionField(document, sourceModel.name, fieldName, targetModel.name, false, cache, edit); // Step 8: Delete the target model file if not referenced elsewhere if (!isReferencedElsewhere) { - await this.deleteTargetModelFile(targetModel); + await this.deleteTargetModelFile(targetModel, edit); } - // Refresh the explorer to reflect changes - //this.explorerProvider.refresh(); + // Add necessary imports to the workspace edit + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, new Set(["Model", "PersistentComponentModel", "Field", "Composition"])); // Step 9: Focus on the newly modified field await this.sourceCodeService.focusOnElement(document, fieldName); // Step 10: Show success message const message = isReferencedElsewhere - ? `Reference converted to composition! The original ${targetModel.name} model was kept as it's referenced elsewhere.` + ? `Reference converted to composition! The origin + private async addEnumDeletionToWorkspacal ${targetModel.name} model was kept as it's referenced elsewhere.` : `Reference converted to composition! The original ${targetModel.name} model was deleted and recreated as a component.`; vscode.window.showInformationMessage(message); + + // Return the consolidated workspace edit containing all changes + return edit; } catch (error) { vscode.window.showErrorMessage(`Failed to change reference to composition: ${error}`); console.error("Error changing reference to composition:", error); + return edit; // Return the edit even if there was an error } } @@ -382,7 +383,12 @@ export class ChangeReferenceToCompositionTool { /** * Removes the @Reference and @Field decorators from the field. */ - private async removeReferenceField(document: vscode.TextDocument, field: PropertyMetadata, cache: MetadataCache): Promise { + private async removeReferenceField( + document: vscode.TextDocument, + field: PropertyMetadata, + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { // Find the model name that contains this field const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); let modelName = 'Unknown'; @@ -399,14 +405,12 @@ export class ChangeReferenceToCompositionTool { } // Use the DeleteFieldTool to programmatically remove the field - const workspaceEdit = await this.deleteFieldTool.deleteFieldProgrammatically( + await this.deleteFieldTool.deleteFieldProgrammatically( field, modelName, - cache + cache, + workspaceEdit ); - - // Apply the workspace edit - await vscode.workspace.applyEdit(workspaceEdit); } /** @@ -416,16 +420,27 @@ export class ChangeReferenceToCompositionTool { document: vscode.TextDocument, componentModelCode: string, sourceModelName: string, - cache: MetadataCache + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit ): Promise { - const newImports = new Set(["Model", "PersistentComponentModel"]); - await this.sourceCodeService.insertModel( - document, - componentModelCode, - sourceModelName, // Insert after the source model - newImports - ); + // Manually implement model insertion to use our workspace edit + const lines = document.getText().split("\n"); + + // Find the position to insert the model (after the source model) + let insertPosition = lines.length; // Default to end of file + if (sourceModelName) { + try { + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModelName); + insertPosition = classEndLine + 1; + } catch (error) { + console.warn(`Could not find source model "${sourceModelName}", inserting at end of file`); + } + } + + // Insert the component model with proper spacing + const modelWithSpacing = `\n${componentModelCode}\n`; + workspaceEdit.insert(document.uri, new vscode.Position(insertPosition, 0), modelWithSpacing, {label: 'Add component model', needsConfirmation: true}); } /** @@ -437,7 +452,8 @@ export class ChangeReferenceToCompositionTool { fieldName: string, targetModelName: string, isArray: boolean, - cache: MetadataCache + cache: MetadataCache, + workspaceEdit: vscode.WorkspaceEdit ): Promise { // Create field info for the composition field const fieldType: FieldTypeOption = { @@ -461,8 +477,20 @@ export class ChangeReferenceToCompositionTool { // Generate the field code const fieldCode = this.generateCompositionFieldCode(fieldInfo, targetModelName, isArray); + // Create the field insertion edits manually and merge into main workspace edit + const lines = document.getText().split("\n"); + const { classStartLine, classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModelName); + + // Apply proper indentation + const indentation = detectIndentation(lines, classStartLine, classEndLine); + const indentedFieldCode = applyIndentation(fieldCode, indentation); + // Insert the field - await this.sourceCodeService.insertField(document, sourceModelName, fieldInfo, fieldCode, cache, false); + workspaceEdit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`, {label: `Add composition field ${fieldName}`, needsConfirmation: true}); + + // Add necessary imports to the workspace edit + const newImports = new Set(["Composition"]); + //await this.sourceCodeService.ensureSlingrFrameworkImports(document, workspaceEdit, newImports); } /** @@ -484,15 +512,63 @@ export class ChangeReferenceToCompositionTool { return lines.join("\n"); } + + /** + * Removes model import from the document. + */ + private async removeModelImport( + document: vscode.TextDocument, + modelName: string, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + const content = document.getText(); + const lines = content.split("\n"); + + // Find and remove import lines that contain the model name + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Check for import statements that import the specific model + if (line.trim().startsWith('import ') && line.includes(modelName)) { + // Check if this import only imports the target model + const importMatch = line.match(/import\s+{([^}]+)}\s+from/); + if (importMatch) { + const imports = importMatch[1].split(',').map(imp => imp.trim()); + + if (imports.length === 1 && imports[0] === modelName) { + // Remove the entire import line + const range = new vscode.Range( + new vscode.Position(i, 0), + new vscode.Position(i + 1, 0) + ); + workspaceEdit.delete(document.uri, range, {label: `Remove import for ${modelName}`, needsConfirmation: true}); + } else if (imports.includes(modelName)) { + // Remove just the model name from the import + const newImports = imports.filter(imp => imp !== modelName); + const newImportLine = line.replace( + /import\s+{[^}]+}/, + `import { ${newImports.join(', ')} }` + ); + const range = new vscode.Range( + new vscode.Position(i, 0), + new vscode.Position(i, line.length) + ); + workspaceEdit.replace(document.uri, range, newImportLine, {label: `Update import removing ${modelName}`, needsConfirmation: true}); + } + } + } + } + } + /** * Deletes the target model file if it's safe to do so. */ - private async deleteTargetModelFile(targetModel: DecoratedClass): Promise { + private async deleteTargetModelFile(targetModel: DecoratedClass, workspaceEdit: vscode.WorkspaceEdit): Promise { try { - await vscode.workspace.fs.delete(targetModel.declaration.uri); - console.log(`Deleted target model file: ${targetModel.declaration.uri.fsPath}`); + workspaceEdit.deleteFile(targetModel.declaration.uri, { ignoreIfNotExists: true }, {label: `Delete original model file ${targetModel.name}`, needsConfirmation: true}); + console.log(`Scheduled deletion of target model file: ${targetModel.declaration.uri.fsPath}`); } catch (error) { - console.warn(`Could not delete target model file: ${error}`); + console.warn(`Could not schedule deletion of target model file: ${error}`); // Don't throw error here as the conversion was successful } } diff --git a/src/refactor/tools/changeReferenceToComposition.ts b/src/refactor/tools/changeReferenceToComposition.ts index c6c80b5..c655730 100644 --- a/src/refactor/tools/changeReferenceToComposition.ts +++ b/src/refactor/tools/changeReferenceToComposition.ts @@ -1,9 +1,5 @@ import * as vscode from "vscode"; -import { - IRefactorTool, - ChangeObject, - ManualRefactorContext, -} from "../refactorInterfaces"; +import { IRefactorTool, ChangeObject, ManualRefactorContext } from "../refactorInterfaces"; import { MetadataCache, PropertyMetadata, DecoratedClass } from "../../cache/cache"; import { ChangeReferenceToCompositionTool } from "../../commands/fields/changeReferenceToComposition"; import { ExplorerProvider } from "../../explorer/explorerProvider"; @@ -21,13 +17,12 @@ export interface ChangeReferenceToCompositionPayload { /** * Refactor tool for converting reference fields to composition fields. - * + * * This tool allows users to convert @Reference fields to @Composition fields * through the VS Code refactor menu. It validates that the field is indeed * a reference field before allowing the conversion. */ export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { - /** * Returns the VS Code command identifier for this refactor tool. */ @@ -60,15 +55,15 @@ export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { } // Must have field metadata - if (!context.metadata || !('decorators' in context.metadata)) { + if (!context.metadata || !("decorators" in context.metadata)) { return false; } const fieldMetadata = context.metadata as PropertyMetadata; - + // Check if this field has a @Reference decorator - const hasReferenceDecorator = fieldMetadata.decorators.some(d => d.name === "Reference"); - + const hasReferenceDecorator = fieldMetadata.decorators.some((d) => d.name === "Reference"); + return hasReferenceDecorator; } @@ -83,16 +78,16 @@ export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { * Initiates the manual refactor by creating a change object. */ async initiateManualRefactor(context: ManualRefactorContext): Promise { - if (!context.metadata || !('decorators' in context.metadata)) { + if (!context.metadata || !("decorators" in context.metadata)) { return undefined; } const fieldMetadata = context.metadata as PropertyMetadata; - + // Find the model that contains this field const cache = context.cache; const sourceModel = this.findSourceModel(cache, fieldMetadata); - + if (!sourceModel) { vscode.window.showErrorMessage("Could not find the model containing this field"); return undefined; @@ -119,30 +114,18 @@ export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { */ async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { const payload = change.payload as ChangeReferenceToCompositionPayload; - + // We don't actually prepare the edit here since the command tool handles everything // This is more of a trigger for the actual implementation - const workspaceEdit = new vscode.WorkspaceEdit(); - + let workspaceEdit = new vscode.WorkspaceEdit(); + // Execute the actual command - setTimeout(async () => { - try { - // Get the explorer provider from the extension context - // For now, we'll create a mock explorer provider - const explorerProvider = { - refresh: () => {} - } as any; - - const tool = new ChangeReferenceToCompositionTool(explorerProvider); - await tool.changeReferenceToComposition( - cache, - payload.sourceModelName, - payload.fieldName - ); - } catch (error) { - vscode.window.showErrorMessage(`Failed to change reference to composition: ${error}`); - } - }, 100); + try { + const tool = new ChangeReferenceToCompositionTool(); + workspaceEdit = await tool.changeReferenceToComposition(cache, payload.sourceModelName, payload.fieldName); + } catch (error) { + vscode.window.showErrorMessage(`Failed to change reference to composition: ${error}`); + } return workspaceEdit; } @@ -152,19 +135,20 @@ export class ChangeReferenceToCompositionRefactorTool implements IRefactorTool { */ private findSourceModel(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { const allModels = cache.getDataModelClasses(); - + for (const model of allModels) { const fieldInModel = Object.values(model.properties).find( - prop => prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line ); - + if (fieldInModel) { return model; } } - + return null; } } From e33eb8a94c2b76bce40ef42f2fc802939994fdd7 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 22 Sep 2025 08:55:49 -0300 Subject: [PATCH 208/254] Adds the ExtractFieldsToParentTool and ExtractFieldsToEmbeddedTool --- .../fields/extractFieldsToEmbedded.ts | 534 +++++++++++++++-- src/commands/fields/extractFieldsToParent.ts | 544 +++++++++++++++--- src/refactor/refactorDisposables.ts | 4 + src/refactor/refactorInterfaces.ts | 25 + 4 files changed, 964 insertions(+), 143 deletions(-) diff --git a/src/commands/fields/extractFieldsToEmbedded.ts b/src/commands/fields/extractFieldsToEmbedded.ts index 7697209..dca0625 100644 --- a/src/commands/fields/extractFieldsToEmbedded.ts +++ b/src/commands/fields/extractFieldsToEmbedded.ts @@ -1,100 +1,522 @@ // src/commands/fields/extractFieldsToEmbedded.ts import * as vscode from "vscode"; +import { + IRefactorTool, + ChangeObject, + ManualRefactorContext, + ExtractFieldsToEmbeddedPayload, +} from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; import { UserInputService } from "../../services/userInputService"; -import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; +import { TreeViewContext } from "../commandHelpers"; +import { isModelFile } from "../../utils/metadata"; +import * as path from "path"; -export class ExtractFieldsToEmbeddedTool { +/** + * Refactor tool for extracting multiple fields from a model to a new embedded model. + * + * This tool allows users to select multiple fields and move them to a new embedded + * model in a separate file, creating an embedded relationship between the source and new models. + * The embedded model extends BaseModel and has no dataSource. + */ +export class ExtractFieldsToEmbeddedTool implements IRefactorTool { private userInputService: UserInputService; - private projectAnalysisService: ProjectAnalysisService; private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; private deleteFieldTool: DeleteFieldTool; constructor() { this.userInputService = new UserInputService(); - this.projectAnalysisService = new ProjectAnalysisService(); this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); this.deleteFieldTool = new DeleteFieldTool(); } - public async extractFieldsToEmbedded(cache: MetadataCache, editor: vscode.TextEditor, modelName:string): Promise { + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.extractFieldsToEmbedded"; + } + + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Extract Fields to Embedded"; + } + + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["EXTRACT_FIELDS_TO_EMBEDDED"]; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Allows extraction when multiple fields are selected in a model file. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; + } + + // Get the source model from context + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + return false; + } + + // For manual trigger, we allow it if there are fields in the model + return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by prompting user for field selection, new model name, and embedded field name. + */ + async initiateManualRefactor(context: ManualRefactorContext): Promise { + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find a model in the current context"); + return undefined; + } + + // Get all fields in the model + const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; + if (allFields.length < 2) { + vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to embedded"); + return undefined; + } + + let selectedFields: PropertyMetadata[] | undefined; + + const treeViewContext = context.treeViewContext as TreeViewContext | undefined; + + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem) => { + const fieldItemName = fieldItem.label.toLowerCase(); + const field = allFields.find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); + } + return field; + }); + } else { + // Let user select which fields to extract + selectedFields = await this.selectFieldsForExtraction(allFields); + if (!selectedFields || selectedFields.length === 0) { + return undefined; + } + } + + // Get the new model name + const newModelName = await this.userInputService.showPrompt("Enter the name for the new embedded model:"); + if (!newModelName) { + return undefined; + } + + // Get the embedded field name + const embeddedFieldName = await this.userInputService.showPrompt( + "Enter the name for the new embedded field (e.g., 'address', 'profile'):" + ); + if (!embeddedFieldName) { + return undefined; + } + + const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); + const newModelPath = path.join(sourceDir, `${newModelName}.ts`); + const newModelUri = vscode.Uri.file(newModelPath); + + const payload: ExtractFieldsToEmbeddedPayload = { + sourceModelName: sourceModel.name, + newModelName: newModelName, + embeddedFieldName: embeddedFieldName, + fieldsToExtract: selectedFields, + isManual: true, + urisToCreate: [ + { + uri: newModelUri, + }, + ], + }; + + return { + type: "EXTRACT_FIELDS_TO_EMBEDDED", + uri: context.uri, + description: `Extract ${selectedFields.length} field(s) to new embedded model '${newModelName}' with embedded field '${embeddedFieldName}' in model '${sourceModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ExtractFieldsToEmbeddedPayload; + try { - const { document, selections } = editor; - const sourceModel = cache.getModelByName(modelName); + const sourceModel = cache.getModelByName(payload.sourceModelName); if (!sourceModel) { - throw new Error("Could not find a model class in the current file."); + throw new Error(`Could not find source model '${payload.sourceModelName}'`); } - const selectedFields = this.getSelectedFields(sourceModel, selections); - if (selectedFields.length === 0) { - vscode.window.showInformationMessage("No fields selected."); - return; - } + const edit = new vscode.WorkspaceEdit(); - const newModelName = await this.userInputService.showPrompt("Enter the name for the new embedded model:"); - if (!newModelName) return; + // Get the URI from the payload + const newModelUri = payload.urisToCreate![0].uri; - // Create the new embedded model with the selected fields - const newModelContent = this.generateEmbeddedModelContent(newModelName, selectedFields); - await this.sourceCodeService.insertModel(document, newModelContent, sourceModel.name); + // Generate the complete file content + const completeFileContent = this.generateCompleteEmbeddedModelFile( + payload.newModelName, + payload.fieldsToExtract + ); - // Remove the fields from the source model - for (const field of selectedFields) { - const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); - await vscode.workspace.applyEdit(deleteEdit); - } - - // Add the embedded field - const embeddedFieldInfo: FieldInfo = { - name: this.toCamelCase(newModelName), - type: { decorator: 'Embedded', label: 'Embedded', tsType: newModelName, description: 'Embedded Model' }, - required: false + const metadata: vscode.WorkspaceEditEntryMetadata = { + label: `Create new embedded model file ${path.basename(newModelUri.fsPath)}`, + description: `Creating new embedded model file for ${payload.newModelName}`, + needsConfirmation: true, }; - // This will require a new decorator and logic in AddFieldTool, for now, we'll add it manually - const fieldCode = `@Field()\n @Embedded()\n ${embeddedFieldInfo.name}!: ${newModelName};`; - await this.sourceCodeService.insertField(document, sourceModel.name, embeddedFieldInfo, fieldCode, cache, false); - vscode.window.showInformationMessage(`Fields extracted to new embedded model '${newModelName}'.`); + // Create the file with content + edit.createFile( + newModelUri, + { + overwrite: false, + ignoreIfExists: true, + contents: Buffer.from(completeFileContent, "utf8"), + }, + metadata + ); + + // Step 2: Add the embedded field to the source model + await this.addEmbeddedFieldToSourceModel( + edit, + sourceModel, + payload.embeddedFieldName, + payload.newModelName, + cache + ); + + // Step 3: Remove the fields from the source model + for (const field of payload.fieldsToExtract) { + await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache, edit); + } + + return edit; } catch (error) { - vscode.window.showErrorMessage(`Failed to extract fields to embedded model: ${error}`); + vscode.window.showErrorMessage(`Failed to prepare extract fields to embedded edit: ${error}`); + throw error; } } - private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { - const selectedFields: PropertyMetadata[] = []; - for (const selection of selections) { - for (const field of Object.values(model.properties)) { - if (selection.intersection(field.declaration.range)) { - selectedFields.push(field); - } + /** + * Shows user a quick pick to select which fields to extract. + */ + private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { + const fieldItems = allFields.map((field) => ({ + label: field.name, + description: this.getFieldTypeDescription(field), + field: field, + })); + + const selectedItems = await vscode.window.showQuickPick(fieldItems, { + canPickMany: true, + placeHolder: "Select fields to extract to the new embedded model", + title: "Extract Fields to Embedded", + }); + + return selectedItems?.map((item) => item.field); + } + + /** + * Gets a description of the field type for display in the quick pick. + */ + private getFieldTypeDescription(field: PropertyMetadata): string { + const decoratorName = this.getDecoratorName(field.decorators); + return `@${decoratorName}`; + } + + /** + * Gets the source model from the refactor context, handling different context types. + */ + private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { + // Case 1: metadata is already a DecoratedClass (model) + if (context.metadata && "properties" in context.metadata) { + return context.metadata as DecoratedClass; + } + + // Case 2: metadata is a PropertyMetadata (field) - find the containing model + if (context.metadata && "decorators" in context.metadata) { + const fieldMetadata = context.metadata as PropertyMetadata; + return this.findSourceModelForField(context.cache, fieldMetadata); + } + + // Case 3: no specific metadata - try to find model at the range + return this.findModelAtRange(context.cache, context.uri, context.range); + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } + + /** + * Finds the model class that contains the given range. + */ + private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { + return model; } } - return selectedFields; + + return null; + } + + /** + * Gets the decorator name for a field's type. + */ + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : "Text"; + } + + /** + * Generates the complete file content for the new embedded model, including imports. + * Embedded models extend BaseModel and have no dataSource. + */ + private generateCompleteEmbeddedModelFile( + modelName: string, + fieldsToExtract: PropertyMetadata[] + ): string { + const lines: string[] = []; + + // Generate imports for embedded model (no dataSource import needed) + const requiredImports = new Set(["Field", "BaseModel", "Model"]); + for (const field of fieldsToExtract) { + for (const decorator of field.decorators) { + requiredImports.add(decorator.name); + } + } + // Add the import statement + const importList = Array.from(requiredImports).sort(); + lines.push(`import { ${importList.join(", ")} } from 'slingr-framework';`); + lines.push(""); // Empty line after imports + + // Add model decorator + lines.push(`@Model()`); + + // Add class + lines.push(`export class ${modelName} extends BaseModel {`); + lines.push(""); + + // Add each field using PropertyMetadata to preserve all decorator information + for (const field of fieldsToExtract) { + const fieldCode = this.generateFieldCodeFromPropertyMetadata(field); + lines.push(...fieldCode.split("\n").map((line) => (line ? ` ${line}` : ""))); + lines.push(""); + } + + lines.push("}"); + lines.push(""); // Empty line at end + + return lines.join("\n"); } - private generateEmbeddedModelContent(modelName: string, fields: PropertyMetadata[]): string { - let content = `\n@Model()\nclass ${modelName} {\n`; - for (const field of fields) { - for(const decorator of field.decorators) { - content += ` @${decorator.name}(${this.formatDecoratorArgs(decorator.arguments)})\n`; + /** + * Generates field code directly from PropertyMetadata, preserving all decorator information. + */ + private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { + const lines: string[] = []; + + // Add all decorators in the same order as the original + for (const decorator of property.decorators) { + if (decorator.name === "Field" || decorator.name === "Relationship") { + // Handle Field and Relationship decorators with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + lines.push(`@${decorator.name}({`); + const args = decorator.arguments[0]; // Usually the first argument contains the options object + if (typeof args === "object" && args !== null) { + // Format each property of the arguments object + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}({})`); + } + } else { + // Handle type decorators (Text, Choice, etc.) with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + const args = decorator.arguments[0]; + if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { + lines.push(`@${decorator.name}({`); + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else if (Array.isArray(value)) { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}()`); + } + } else { + lines.push(`@${decorator.name}()`); + } } - content += ` ${field.name}!: ${field.type};\n\n`; } - content += '}\n'; - return content; + + // Add property declaration using the original type + lines.push(`${property.name}!: ${property.type};`); + + return lines.join("\n"); + } + + /** + * Adds an embedded field to the source model. + */ + private async addEmbeddedFieldToSourceModel( + edit: vscode.WorkspaceEdit, + sourceModel: DecoratedClass, + embeddedFieldName: string, + targetModelName: string, + cache: MetadataCache + ): Promise { + // Check if embedded field already exists + const existingFields = Object.keys(sourceModel.properties || {}); + if (existingFields.includes(embeddedFieldName)) { + throw new Error(`Field '${embeddedFieldName}' already exists in model ${sourceModel.name}`); + } + + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + + // Generate the embedded field code + const fieldCode = this.generateEmbeddedFieldCode(embeddedFieldName, targetModelName); + + // Add required imports + const requiredImports = new Set(["Field", "Embedded"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Add import for the target model + await this.sourceCodeService.addModelImport(document, targetModelName, edit, cache); + + // Find class boundaries and add field + const lines = document.getText().split("\n"); + const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, sourceModel.name); + + const metadata: vscode.WorkspaceEditEntryMetadata = { + label: `Add embedded field ${embeddedFieldName}`, + description: `Adding embedded field ${embeddedFieldName} of type ${targetModelName}`, + needsConfirmation: true, + }; + + edit.insert(sourceModel.declaration.uri, new vscode.Position(classEndLine, 0), `\n${fieldCode}\n`, metadata); } - private formatDecoratorArgs(args: any[]): string { - if (!args || args.length === 0) { - return ''; + /** + * Public method for programmatic usage of the extract fields to embedded functionality. + */ + public async extractFieldsToEmbedded( + cache: MetadataCache, + sourceModelName: string, + fieldsToExtract: PropertyMetadata[], + newModelName: string, + embeddedFieldName: string + ): Promise { + const sourceModel = cache.getModelByName(sourceModelName); + if (!sourceModel) { + throw new Error(`Could not find source model '${sourceModelName}'`); } - return JSON.stringify(args[0]).replace(/"/g, "'"); + + const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); + const newModelPath = path.join(sourceDir, `${newModelName}.ts`); + const newModelUri = vscode.Uri.file(newModelPath); + + const payload: ExtractFieldsToEmbeddedPayload = { + sourceModelName: sourceModelName, + newModelName: newModelName, + embeddedFieldName: embeddedFieldName, + fieldsToExtract: fieldsToExtract, + isManual: false, + urisToCreate: [ + { + uri: newModelUri, + }, + ], + }; + + const changeObject: ChangeObject = { + type: "EXTRACT_FIELDS_TO_EMBEDDED", + uri: sourceModel.declaration.uri, + description: `Extract ${fieldsToExtract.length} field(s) to new embedded model '${newModelName}' with embedded field '${embeddedFieldName}' in model '${sourceModelName}'`, + payload, + }; + + return await this.prepareEdit(changeObject, cache); } - private toCamelCase(str: string): string { - return str.charAt(0).toLowerCase() + str.slice(1); + /** + * Generates the embedded field code with only @Embedded() decorator. + */ + private generateEmbeddedFieldCode(fieldName: string, targetModelName: string): string { + const lines: string[] = []; + + // Add Embedded decorator (no arguments needed) + lines.push(" @Embedded()"); + + // Add property declaration + lines.push(` ${fieldName}!: ${targetModelName};`); + + return lines.join("\n"); } } \ No newline at end of file diff --git a/src/commands/fields/extractFieldsToParent.ts b/src/commands/fields/extractFieldsToParent.ts index d7255bb..93bc734 100644 --- a/src/commands/fields/extractFieldsToParent.ts +++ b/src/commands/fields/extractFieldsToParent.ts @@ -1,114 +1,484 @@ -// src/commands/fields/extractFieldsToParent.ts import * as vscode from "vscode"; +import { + IRefactorTool, + ChangeObject, + ManualRefactorContext, + ExtractFieldsToParentPayload, +} from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; import { UserInputService } from "../../services/userInputService"; -import { ProjectAnalysisService } from "../../services/projectAnalysisService"; import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { NewModelTool } from "../models/newModel"; +import { AddFieldTool } from "./addField"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; -import * as path from 'path'; - -export class ExtractFieldsToParentTool { - private userInputService: UserInputService; - private projectAnalysisService: ProjectAnalysisService; - private sourceCodeService: SourceCodeService; - private deleteFieldTool: DeleteFieldTool; - - constructor() { - this.userInputService = new UserInputService(); - this.projectAnalysisService = new ProjectAnalysisService(); - this.sourceCodeService = new SourceCodeService(); - this.deleteFieldTool = new DeleteFieldTool(); - } - - public async extractFieldsToParent(cache: MetadataCache, editor: vscode.TextEditor, modelName:string): Promise { - try { - const { document, selections } = editor; - const sourceModel = cache.getModelByName(modelName); - if (!sourceModel) { - throw new Error("Could not find a model class in the current file."); - } +import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; +import { TreeViewContext } from "../commandHelpers"; +import { isModelFile } from "../../utils/metadata"; +import * as path from "path"; - const selectedFields = this.getSelectedFields(sourceModel, selections); - if (selectedFields.length === 0) { - vscode.window.showInformationMessage("No fields selected."); - return; - } +/** + * Refactor tool for extracting multiple fields from a model to a new abstract parent model. + * + * This tool allows users to select multiple fields and move them to a new abstract parent + * model extending BaseModel. The source model will then extend from this new parent model + * instead of its current parent. It provides preview functionality before applying changes. + */ +export class ExtractFieldsToParentTool implements IRefactorTool { + private userInputService: UserInputService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private newModelTool: NewModelTool; + private addFieldTool: AddFieldTool; + private deleteFieldTool: DeleteFieldTool; - const newModelName = await this.userInputService.showPrompt("Enter the name for the new abstract parent model:"); - if (!newModelName) return; + constructor() { + this.userInputService = new UserInputService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.newModelTool = new NewModelTool(); + this.addFieldTool = new AddFieldTool(); + this.deleteFieldTool = new DeleteFieldTool(); + } - // Create the new parent model - const newModelContent = this.generateParentModelContent(newModelName, selectedFields); - const targetFilePath = path.join(path.dirname(document.uri.fsPath), `${newModelName}.ts`); - const newModelUri = vscode.Uri.file(targetFilePath); - await vscode.workspace.fs.writeFile(newModelUri, Buffer.from(newModelContent, 'utf8')); + /** + * Returns the VS Code command identifier for this refactor tool. + */ + getCommandId(): string { + return "slingr-vscode-extension.extractFieldsToParent"; + } - // Remove the fields from the source model - for (const field of selectedFields) { - const deleteEdit = await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache); - await vscode.workspace.applyEdit(deleteEdit); - } + /** + * Returns the human-readable title shown in refactor menus. + */ + getTitle(): string { + return "Extract Fields to Parent"; + } - // Update the source model to extend the new parent model - await this.updateSourceModelToExtend(document, sourceModel.name, newModelName); - - vscode.window.showInformationMessage(`Fields extracted to new parent model '${newModelName}'.`); + /** + * Returns the types of changes this tool handles. + */ + getHandledChangeTypes(): string[] { + return ["EXTRACT_FIELDS_TO_PARENT"]; + } - } catch (error) { - vscode.window.showErrorMessage(`Failed to extract fields to parent model: ${error}`); - } + /** + * Determines if this tool can handle a manual refactor trigger. + * Allows extraction when multiple fields are selected in a model file. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; } - private getSelectedFields(model: DecoratedClass, selections: readonly vscode.Selection[]): PropertyMetadata[] { - const selectedFields: PropertyMetadata[] = []; - for (const selection of selections) { - for (const field of Object.values(model.properties)) { - if (selection.intersection(field.declaration.range)) { - selectedFields.push(field); - } - } + // Get the source model from context + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + return false; + } + + // For manual trigger, we allow it if there are fields in the model + return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + } + + /** + * This tool doesn't detect automatic changes. + */ + analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates the manual refactor by prompting user for field selection and new parent model name. + */ + async initiateManualRefactor(context: ManualRefactorContext): Promise { + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find a model in the current context"); + return undefined; + } + + // Get all fields in the model + const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; + if (allFields.length < 2) { + vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to parent"); + return undefined; + } + + let selectedFields: PropertyMetadata[] | undefined; + + const treeViewContext = context.treeViewContext as TreeViewContext | undefined; + + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem) => { + const fieldItemName = fieldItem.label.toLowerCase(); + const field = allFields.find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); } - return selectedFields; + return field; + }); + } else { + // Let user select which fields to extract + selectedFields = await this.selectFieldsForExtraction(allFields); + if (!selectedFields || selectedFields.length === 0) { + return undefined; + } + } + + // Get the new parent model name + const newParentModelName = await this.userInputService.showPrompt("Enter the name for the new abstract parent model:"); + if (!newParentModelName) { + return undefined; + } + + const sourceDir = path.dirname(sourceModel.declaration.uri.fsPath); + const newParentModelPath = path.join(sourceDir, `${newParentModelName}.ts`); + const newParentModelUri = vscode.Uri.file(newParentModelPath); + + const payload: ExtractFieldsToParentPayload = { + sourceModelName: sourceModel.name, + newParentModelName: newParentModelName, + fieldsToExtract: selectedFields, + isManual: true, + urisToCreate: [ + { + uri: newParentModelUri, + }, + ], + }; + + return { + type: "EXTRACT_FIELDS_TO_PARENT", + uri: context.uri, + description: `Extract ${selectedFields.length} field(s) to new abstract parent model '${newParentModelName}' for model '${sourceModel.name}'`, + payload, + }; + } + + /** + * Prepares the workspace edit for the refactor operation. + */ + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const payload = change.payload as ExtractFieldsToParentPayload; + + try { + const sourceModel = cache.getModelByName(payload.sourceModelName); + if (!sourceModel) { + throw new Error(`Could not find source model '${payload.sourceModelName}'`); + } + + const edit = new vscode.WorkspaceEdit(); + + // Get the URI from the payload + const newParentModelUri = payload.urisToCreate![0].uri; + + // Generate the complete file content for the abstract parent model + const completeFileContent = this.generateCompleteParentModelFile( + payload.newParentModelName, + payload.fieldsToExtract, + sourceModel, + cache + ); + + const metadata: vscode.WorkspaceEditEntryMetadata = { + label: `Create new abstract parent model file ${path.basename(newParentModelUri.fsPath)}`, + description: `Creating new abstract parent model file for ${payload.newParentModelName}`, + needsConfirmation: true, + }; + + // Create the file with content + edit.createFile( + newParentModelUri, + { + overwrite: false, + ignoreIfExists: true, + contents: Buffer.from(completeFileContent, "utf8"), + }, + metadata + ); + + // Step 2: Update the source model to extend from the new parent model + await this.updateSourceModelToExtendParent( + edit, + sourceModel, + payload.newParentModelName, + cache + ); + + // Step 3: Remove the fields from the source model + for (const field of payload.fieldsToExtract) { + await this.deleteFieldTool.deleteFieldProgrammatically(field, sourceModel.name, cache, edit); + } + + return edit; + } catch (error) { + vscode.window.showErrorMessage(`Failed to prepare extract fields to parent edit: ${error}`); + throw error; } + } + + /** + * Shows user a quick pick to select which fields to extract. + */ + private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { + const fieldItems = allFields.map((field) => ({ + label: field.name, + description: this.getFieldTypeDescription(field), + field: field, + })); - private generateParentModelContent(modelName: string, fields: PropertyMetadata[]): string { - let content = `import { BaseModel, Field, Text, Model } from 'slingr-framework';\n\n`; // Add necessary imports - content += `@Model()\nexport abstract class ${modelName} extends BaseModel {\n`; - for (const field of fields) { - for(const decorator of field.decorators) { - content += ` @${decorator.name}(${this.formatDecoratorArgs(decorator.arguments)})\n`; + const selectedItems = await vscode.window.showQuickPick(fieldItems, { + canPickMany: true, + placeHolder: "Select fields to extract to the new abstract parent model", + title: "Extract Fields to Parent", + }); + + return selectedItems?.map((item) => item.field); + } + + /** + * Gets a description of the field type for display in the quick pick. + */ + private getFieldTypeDescription(field: PropertyMetadata): string { + const decoratorName = this.getDecoratorName(field.decorators); + return `@${decoratorName}`; + } + + /** + * Gets the source model from the refactor context, handling different context types. + */ + private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { + // Case 1: metadata is already a DecoratedClass (model) + if (context.metadata && "properties" in context.metadata) { + return context.metadata as DecoratedClass; + } + + // Case 2: metadata is a PropertyMetadata (field) - find the containing model + if (context.metadata && "decorators" in context.metadata) { + const fieldMetadata = context.metadata as PropertyMetadata; + return this.findSourceModelForField(context.cache, fieldMetadata); + } + + // Case 3: no specific metadata - try to find model at the range + return this.findModelAtRange(context.cache, context.uri, context.range); + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } + + /** + * Finds the model class that contains the given range. + */ + private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { + return model; + } + } + + return null; + } + + /** + * Gets the decorator name for a field's type. + */ + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : "Text"; + } + + /** + * Generates the complete file content for the new abstract parent model, including imports. + */ + private generateCompleteParentModelFile( + modelName: string, + fieldsToExtract: PropertyMetadata[], + sourceModel: DecoratedClass, + cache: MetadataCache + ): string { + const lines: string[] = []; + + // Generate imports + const requiredImports = new Set(["BaseModel", "Field"]); + for (const field of fieldsToExtract) { + for (const decorator of field.decorators) { + requiredImports.add(decorator.name); + } + } + + // Add the import statement + const importList = Array.from(requiredImports).sort(); + lines.push(`import { ${importList.join(", ")} } from 'slingr-framework';`); + lines.push(""); // Empty line after imports + + // Add model decorator + lines.push(`@Model()`); + + // Add abstract model class extending BaseModel + lines.push(`export abstract class ${modelName} extends BaseModel {`); + lines.push(""); + + // Add each field using PropertyMetadata to preserve all decorator information + for (const field of fieldsToExtract) { + const fieldCode = this.generateFieldCodeFromPropertyMetadata(field); + lines.push(...fieldCode.split("\n").map((line) => (line ? ` ${line}` : ""))); + lines.push(""); + } + + lines.push("}"); + lines.push(""); // Empty line at end + + return lines.join("\n"); + } + + /** + * Generates field code directly from PropertyMetadata, preserving all decorator information. + */ + private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { + const lines: string[] = []; + + // Add all decorators in the same order as the original + for (const decorator of property.decorators) { + if (decorator.name === "Field" || decorator.name === "Relationship") { + // Handle Field and Relationship decorators with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + lines.push(`@${decorator.name}({`); + const args = decorator.arguments[0]; // Usually the first argument contains the options object + if (typeof args === "object" && args !== null) { + // Format each property of the arguments object + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}({})`); + } + } else { + // Handle type decorators (Text, Choice, etc.) with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + const args = decorator.arguments[0]; + if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { + lines.push(`@${decorator.name}({`); + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else if (Array.isArray(value)) { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } } - content += ` ${field.name}!: ${field.type};\n\n`; + lines.push("})"); + } else { + lines.push(`@${decorator.name}()`); + } + } else { + lines.push(`@${decorator.name}()`); } - content += '}\n'; - return content; + } } - private formatDecoratorArgs(args: any[]): string { - if (!args || args.length === 0) { - return ''; - } - return JSON.stringify(args[0]).replace(/"/g, "'"); + // Add property declaration using the original type + lines.push(`${property.name}!: ${property.type};`); + + return lines.join("\n"); + } + + /** + * Updates the source model to extend from the new parent model instead of its current parent. + */ + private async updateSourceModelToExtendParent( + edit: vscode.WorkspaceEdit, + sourceModel: DecoratedClass, + newParentModelName: string, + cache: MetadataCache + ): Promise { + const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); + + // Add import for the parent model + await this.sourceCodeService.addModelImport(document, newParentModelName, edit, cache); + + // Find the class declaration line and update it to extend from the new parent + const lines = document.getText().split("\n"); + const classLine = this.findClassDeclarationLine(lines, sourceModel.name); + + if (classLine === -1) { + throw new Error(`Could not find class declaration for ${sourceModel.name}`); } - private async updateSourceModelToExtend(document: vscode.TextDocument, sourceModelName: string, newParentName: string) { - const edit = new vscode.WorkspaceEdit(); - const text = document.getText(); - const regex = new RegExp(`(class ${sourceModelName} extends) (\\w+)`); - const match = text.match(regex); + const currentLine = lines[classLine]; + const newLine = this.updateClassExtension(currentLine, sourceModel.name, newParentModelName); - if (match) { - const index = match.index || 0; - const startPos = document.positionAt(index + match[1].length + 1); - const endPos = document.positionAt(index + match[1].length + 1 + match[2].length); - edit.replace(document.uri, new vscode.Range(startPos, endPos), newParentName); + const lineRange = new vscode.Range( + new vscode.Position(classLine, 0), + new vscode.Position(classLine, currentLine.length) + ); - // Add import for the new parent model - const importStatement = `\nimport { ${newParentName} } from './${newParentName}';`; - const firstLine = document.lineAt(0); - edit.insert(document.uri, firstLine.range.start, importStatement); + const metadata: vscode.WorkspaceEditEntryMetadata = { + label: `Update ${sourceModel.name} to extend ${newParentModelName}`, + description: `Changing class inheritance for ${sourceModel.name}`, + needsConfirmation: true, + }; - await vscode.workspace.applyEdit(edit); - } + edit.replace(sourceModel.declaration.uri, lineRange, newLine, metadata); + } + + /** + * Finds the line number of the class declaration. + */ + private findClassDeclarationLine(lines: string[], className: string): number { + for (let i = 0; i < lines.length; i++) { + const line = lines[i].trim(); + if (line.includes(`class ${className}`) && line.includes("extends")) { + return i; + } } + return -1; + } + + /** + * Updates the class extension to use the new parent model. + */ + private updateClassExtension(currentLine: string, className: string, newParentModelName: string): string { + // Replace the current extends clause with the new parent + const extendsPattern = /extends\s+\w+/; + return currentLine.replace(extendsPattern, `extends ${newParentModelName}`); + } } \ No newline at end of file diff --git a/src/refactor/refactorDisposables.ts b/src/refactor/refactorDisposables.ts index 5012c64..17816ca 100644 --- a/src/refactor/refactorDisposables.ts +++ b/src/refactor/refactorDisposables.ts @@ -19,6 +19,8 @@ import { PropertyMetadata } from '../cache/cache'; import { fieldTypeConfig } from '../utils/fieldTypes'; import { RenameDataSourceTool } from './tools/renameDataSource'; import { DeleteDataSourceTool } from './tools/deleteDataSource'; +import { ExtractFieldsToEmbeddedTool } from '../commands/fields/extractFieldsToEmbedded'; +import { ExtractFieldsToParentTool } from '../commands/fields/extractFieldsToParent'; /** * Returns an array of all available refactor tools for the application. @@ -50,6 +52,8 @@ export function getAllRefactorTools(): IRefactorTool[] { new RenameDataSourceTool(), new DeleteDataSourceTool(), new ExtractFieldsToReferenceTool(), + new ExtractFieldsToEmbeddedTool(), + new ExtractFieldsToParentTool() ]; } diff --git a/src/refactor/refactorInterfaces.ts b/src/refactor/refactorInterfaces.ts index 0d0ebbb..7834c7f 100644 --- a/src/refactor/refactorInterfaces.ts +++ b/src/refactor/refactorInterfaces.ts @@ -217,6 +217,29 @@ export interface ExtractFieldsToReferencePayload extends BaseExtractFieldsPayloa referenceFieldName: string; } +/** + * Payload for extracting fields to a new embedded model. + * @property {string} sourceModelName - The name of the source model containing the fields to extract + * @property {string} newModelName - The name of the new embedded model to be created + * @property {string} embeddedFieldName - The name of the new embedded field to be created + * @property {fileCreationInfo?: FileCreationInfo} - Optional info for creating the new model file + */ +export interface ExtractFieldsToEmbeddedPayload extends BaseExtractFieldsPayload { + sourceModelName: string; + newModelName: string; + embeddedFieldName: string; +} + +/** + * Payload for extracting fields to a new parent model. + * @property {string} sourceModelName - The name of the source model containing the fields to extract + * @property {string} newParentModelName - The name of the new abstract parent model to be created + */ +export interface ExtractFieldsToParentPayload extends BaseExtractFieldsPayload { + sourceModelName: string; + newParentModelName: string; +} + export interface DeleteDataSourcePayload extends BasePayload { dataSourceName: string; urisToDelete: vscode.Uri[]; @@ -241,6 +264,8 @@ export type ChangePayloadMap = { 'CHANGE_COMPOSITION_TO_REFERENCE': ChangeCompositionToReferencePayload; 'EXTRACT_FIELDS_TO_COMPOSITION': ExtractFieldsToCompositionPayload; 'EXTRACT_FIELDS_TO_REFERENCE': ExtractFieldsToReferencePayload; + 'EXTRACT_FIELDS_TO_EMBEDDED': ExtractFieldsToEmbeddedPayload; + 'EXTRACT_FIELDS_TO_PARENT': ExtractFieldsToParentPayload; // Add more change types and their payloads as needed }; From d05b575b41f43cff60619a677d3d26026c025514 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 22 Sep 2025 10:39:25 -0300 Subject: [PATCH 209/254] Added `extractFieldsController` to better organization and logic reuse. --- .../fields/extractFieldsController.ts | 264 ++++++++++++++++++ .../fields/extractFieldsToComposition.ts | 230 +-------------- .../fields/extractFieldsToEmbedded.ts | 235 +--------------- src/commands/fields/extractFieldsToParent.ts | 237 +--------------- .../fields/extractFieldsToReference.ts | 241 +--------------- 5 files changed, 292 insertions(+), 915 deletions(-) create mode 100644 src/commands/fields/extractFieldsController.ts diff --git a/src/commands/fields/extractFieldsController.ts b/src/commands/fields/extractFieldsController.ts new file mode 100644 index 0000000..501423a --- /dev/null +++ b/src/commands/fields/extractFieldsController.ts @@ -0,0 +1,264 @@ +import { WorkspaceEdit } from "vscode"; +import { DecoratedClass, FileMetadata, MetadataCache, PropertyMetadata } from "../../cache/cache"; +import { ChangeObject, IRefactorTool, ManualRefactorContext } from "../../refactor/refactorInterfaces"; +import { TreeViewContext } from "../commandHelpers"; +import { UserInputService } from "../../services/userInputService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { isModelFile } from "../../utils/metadata"; +import * as vscode from "vscode"; +import { FIELD_TYPE_OPTIONS } from "../interfaces"; + +export abstract class ExtractFieldsController implements IRefactorTool { + protected userInputService: UserInputService; + protected sourceCodeService: SourceCodeService; + + constructor() { + this.userInputService = new UserInputService(); + this.sourceCodeService = new SourceCodeService(); + } + + // Abstract methods - must be implemented by subclasses + abstract getCommandId(): string; + abstract getTitle(): string; + abstract getHandledChangeTypes(): string[]; + abstract prepareEdit(change: ChangeObject, cache: MetadataCache): Promise; + // Abstract method for manual refactor - each tool implements its own prompting logic + abstract initiateManualRefactor(context: ManualRefactorContext): Promise; + + // Concrete methods - shared logic implemented in base class + + /** + * This tool doesn't detect automatic changes. + */ + analyze( + oldFileMeta?: FileMetadata, + newFileMeta?: FileMetadata, + accumulatedChanges?: ChangeObject[] + ): ChangeObject[] { + return []; + } + + /** + * Determines if this tool can handle a manual refactor trigger. + * Allows extraction when multiple fields are selected in a model file. + */ + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Must be in a model file + if (!isModelFile(context.uri)) { + return false; + } + + // Get the source model from context + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + return false; + } + + // For manual trigger, we allow it if there are fields in the model + return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract + } + + /** + * Common field selection and validation logic for manual refactors. + */ + protected async getSelectedFieldsFromContext( + context: ManualRefactorContext, + targetType: string + ): Promise<{ sourceModel: DecoratedClass; selectedFields: PropertyMetadata[] } | undefined> { + const sourceModel = this.getSourceModelFromContext(context); + if (!sourceModel) { + vscode.window.showErrorMessage("Could not find a model in the current context"); + return undefined; + } + + // Get all fields in the model + const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; + if (allFields.length < 2) { + vscode.window.showErrorMessage(`Model must have at least 2 fields to extract some to ${targetType}`); + return undefined; + } + + let selectedFields: PropertyMetadata[] | undefined; + + const treeViewContext = context.treeViewContext as TreeViewContext | undefined; + + if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { + // Tree view context: use the selected field items + selectedFields = treeViewContext.fieldItems.map((fieldItem: any) => { + const fieldItemName = fieldItem.label.toLowerCase(); + const field = allFields.find((prop) => prop.name === fieldItemName); + if (!field) { + throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); + } + return field; + }); + } else { + // Let user select which fields to extract + selectedFields = await this.selectFieldsForExtraction(allFields, targetType); + if (!selectedFields || selectedFields.length === 0) { + return undefined; + } + } + + return { sourceModel, selectedFields }; + } + + /** + * Shows user a quick pick to select which fields to extract. + */ + public async selectFieldsForExtraction(allFields: PropertyMetadata[], type:string): Promise { + const fieldItems = allFields.map((field) => ({ + label: field.name, + description: this.getFieldTypeDescription(field), + field: field, + })); + + const typeUpper = type.charAt(0).toUpperCase() + type.slice(1); + + const selectedItems = await vscode.window.showQuickPick(fieldItems, { + canPickMany: true, + placeHolder: `Select fields to extract to the new ${type} model`, + title: `Extract Fields to ${typeUpper}`, + }); + + return selectedItems?.map((item) => item.field); + } + + /** + * Gets a description of the field type for display in the quick pick. + */ + private getFieldTypeDescription(field: PropertyMetadata): string { + const decoratorName = this.getDecoratorName(field.decorators); + return `@${decoratorName}`; + } + + /** + * Gets the decorator name for a field's type. + */ + private getDecoratorName(decorators: any[]): string { + const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); + return typeDecorator ? typeDecorator.name : "Text"; + } + + /** + * Gets the source model from the refactor context, handling different context types. + */ + protected getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { + // Case 1: metadata is already a DecoratedClass (model) + if (context.metadata && "properties" in context.metadata) { + return context.metadata as DecoratedClass; + } + + // Case 2: metadata is a PropertyMetadata (field) - find the containing model + if (context.metadata && "decorators" in context.metadata) { + const fieldMetadata = context.metadata as PropertyMetadata; + return this.findSourceModelForField(context.cache, fieldMetadata); + } + + // Case 3: no specific metadata - try to find model at the range + return this.findModelAtRange(context.cache, context.uri, context.range); + } + + /** + * Finds the model that contains the given field. + */ + private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + const fieldInModel = Object.values(model.properties).find( + (prop) => + prop.name === fieldMetadata.name && + prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && + prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line + ); + + if (fieldInModel) { + return model; + } + } + + return null; + } + + /** + * Finds the model class that contains the given range. + */ + private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { + const allModels = cache.getDataModelClasses(); + + for (const model of allModels) { + if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { + return model; + } + } + + return null; + } + + /** + * Generates field code directly from PropertyMetadata, preserving all decorator information. + */ + protected generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { + const lines: string[] = []; + + // Add all decorators in the same order as the original + for (const decorator of property.decorators) { + if (decorator.name === "Field" || decorator.name === "Relationship") { + // Handle Field and Relationship decorators with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + lines.push(`@${decorator.name}({`); + const args = decorator.arguments[0]; // Usually the first argument contains the options object + if (typeof args === "object" && args !== null) { + // Format each property of the arguments object + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}({})`); + } + } else { + // Handle type decorators (Text, Choice, etc.) with their arguments + if (decorator.arguments && decorator.arguments.length > 0) { + const args = decorator.arguments[0]; + if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { + lines.push(`@${decorator.name}({`); + for (const [key, value] of Object.entries(args)) { + if (typeof value === "string") { + lines.push(` ${key}: "${value}",`); + } else if (typeof value === "boolean") { + lines.push(` ${key}: ${value},`); + } else if (typeof value === "number") { + lines.push(` ${key}: ${value},`); + } else if (Array.isArray(value)) { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } else { + lines.push(` ${key}: ${JSON.stringify(value)},`); + } + } + lines.push("})"); + } else { + lines.push(`@${decorator.name}()`); + } + } else { + lines.push(`@${decorator.name}()`); + } + } + } + + // Add property declaration using the original type + lines.push(`${property.name}!: ${property.type};`); + + return lines.join("\n"); + } +} diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts index 21c9fed..0b309e9 100644 --- a/src/commands/fields/extractFieldsToComposition.ts +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -1,20 +1,16 @@ import * as vscode from "vscode"; import { - IRefactorTool, ChangeObject, ManualRefactorContext, ExtractFieldsToCompositionPayload, } from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; -import { UserInputService } from "../../services/userInputService"; -import { SourceCodeService } from "../../services/sourceCodeService"; import { AddCompositionTool } from "../models/addComposition"; import { AddFieldTool } from "./addField"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; -import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; -import { TreeViewContext } from "../commandHelpers"; -import { isModelFile } from "../../utils/metadata"; +import { FieldInfo } from "../interfaces"; import { detectIndentation, applyIndentation } from "../../utils/detectIndentation"; +import { ExtractFieldsController } from "./extractFieldsController"; /** * Refactor tool for extracting multiple fields from a model to a new composition model. @@ -23,16 +19,13 @@ import { detectIndentation, applyIndentation } from "../../utils/detectIndentati * model, creating a composition relationship between the source and new models. * It provides preview functionality before applying changes. */ -export class ExtractFieldsToCompositionTool implements IRefactorTool { - private userInputService: UserInputService; - private sourceCodeService: SourceCodeService; +export class ExtractFieldsToCompositionTool extends ExtractFieldsController { private addCompositionTool: AddCompositionTool; private addFieldTool: AddFieldTool; private deleteFieldTool: DeleteFieldTool; constructor() { - this.userInputService = new UserInputService(); - this.sourceCodeService = new SourceCodeService(); + super(); this.addCompositionTool = new AddCompositionTool(); this.addFieldTool = new AddFieldTool(); this.deleteFieldTool = new DeleteFieldTool(); @@ -59,73 +52,18 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { return ["EXTRACT_FIELDS_TO_COMPOSITION"]; } - /** - * Determines if this tool can handle a manual refactor trigger. - * Allows extraction when multiple fields are selected in a model file. - */ - async canHandleManualTrigger(context: ManualRefactorContext): Promise { - // Must be in a model file - if (!isModelFile(context.uri)) { - return false; - } - - // Get the source model from context - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - return false; - } - - // For manual trigger, we allow it if there are fields in the model - return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract - } - - /** - * This tool doesn't detect automatic changes. - */ - analyze(): ChangeObject[] { - return []; - } - /** * Initiates the manual refactor by prompting user for field selection and composition name. */ async initiateManualRefactor( context: ManualRefactorContext, ): Promise { - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - vscode.window.showErrorMessage("Could not find a model in the current context"); + const fieldSelection = await this.getSelectedFieldsFromContext(context, "composition"); + if (!fieldSelection) { return undefined; } - // Get all fields in the model - const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; - if (allFields.length < 2) { - vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to composition"); - return undefined; - } - - let selectedFields: PropertyMetadata[] | undefined; - - const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - const fieldItemName = fieldItem.label.toLowerCase(); - const field = allFields.find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); - } - return field; - }); - } else { - // Let user select which fields to extract - selectedFields = await this.selectFieldsForExtraction(allFields); - if (!selectedFields || selectedFields.length === 0) { - return undefined; - } - } + const { sourceModel, selectedFields } = fieldSelection; // Get the composition field name const compositionFieldName = await this.userInputService.showPrompt( @@ -266,71 +204,7 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { return lines.join("\n"); } - /** - * Generates field code directly from PropertyMetadata, preserving all decorator information. - */ - private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { - const lines: string[] = []; - // Add all decorators in the same order as the original - for (const decorator of property.decorators) { - if (decorator.name === "Field" || decorator.name === "Relationship") { - // Handle Field and Relationship decorators with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - lines.push(`@${decorator.name}({`); - const args = decorator.arguments[0]; // Usually the first argument contains the options object - if (typeof args === "object" && args !== null) { - // Format each property of the arguments object - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}({})`); - } - } else { - // Handle type decorators (Text, Choice, etc.) with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - const args = decorator.arguments[0]; - if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { - lines.push(`@${decorator.name}({`); - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else if (Array.isArray(value)) { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}()`); - } - } else { - lines.push(`@${decorator.name}()`); - } - } - } - - // Add property declaration using the original type - lines.push(`${property.name}!: ${property.type};`); - - return lines.join("\n"); - } /** * Extracts the dataSource from a model using the cache. @@ -348,96 +222,6 @@ export class ExtractFieldsToCompositionTool implements IRefactorTool { return pascalCase; } - /** - * Shows user a quick pick to select which fields to extract. - */ - private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { - const fieldItems = allFields.map((field) => ({ - label: field.name, - description: this.getFieldTypeDescription(field), - field: field, - })); - - const selectedItems = await vscode.window.showQuickPick(fieldItems, { - canPickMany: true, - placeHolder: "Select fields to extract to the new composition model", - title: "Extract Fields to Composition", - }); - - return selectedItems?.map((item) => item.field); - } - - /** - * Gets a description of the field type for display in the quick pick. - */ - private getFieldTypeDescription(field: PropertyMetadata): string { - const decoratorName = this.getDecoratorName(field.decorators); - return `@${decoratorName}`; - } - - /** - * Gets the source model from the refactor context, handling different context types. - */ - private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { - // Case 1: metadata is already a DecoratedClass (model) - if (context.metadata && "properties" in context.metadata) { - return context.metadata as DecoratedClass; - } - - // Case 2: metadata is a PropertyMetadata (field) - find the containing model - if (context.metadata && "decorators" in context.metadata) { - const fieldMetadata = context.metadata as PropertyMetadata; - return this.findSourceModelForField(context.cache, fieldMetadata); - } - - // Case 3: no specific metadata - try to find model at the range - return this.findModelAtRange(context.cache, context.uri, context.range); - } - - /** - * Finds the model that contains the given field. - */ - private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - const fieldInModel = Object.values(model.properties).find( - (prop) => - prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line - ); - - if (fieldInModel) { - return model; - } - } - - return null; - } - - /** - * Finds the model class that contains the given range. - */ - private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { - return model; - } - } - - return null; - } - - /** - * Gets the decorator name for a field's type. - */ - private getDecoratorName(decorators: any[]): string { - const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); - return typeDecorator ? typeDecorator.name : "Text"; - } /** * Determines the inner model name and whether the field should be an array. diff --git a/src/commands/fields/extractFieldsToEmbedded.ts b/src/commands/fields/extractFieldsToEmbedded.ts index dca0625..fe25322 100644 --- a/src/commands/fields/extractFieldsToEmbedded.ts +++ b/src/commands/fields/extractFieldsToEmbedded.ts @@ -1,19 +1,13 @@ // src/commands/fields/extractFieldsToEmbedded.ts import * as vscode from "vscode"; import { - IRefactorTool, ChangeObject, ManualRefactorContext, ExtractFieldsToEmbeddedPayload, } from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; -import { UserInputService } from "../../services/userInputService"; -import { SourceCodeService } from "../../services/sourceCodeService"; -import { FileSystemService } from "../../services/fileSystemService"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; -import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; -import { TreeViewContext } from "../commandHelpers"; -import { isModelFile } from "../../utils/metadata"; +import { ExtractFieldsController } from "./extractFieldsController"; import * as path from "path"; /** @@ -23,16 +17,11 @@ import * as path from "path"; * model in a separate file, creating an embedded relationship between the source and new models. * The embedded model extends BaseModel and has no dataSource. */ -export class ExtractFieldsToEmbeddedTool implements IRefactorTool { - private userInputService: UserInputService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; +export class ExtractFieldsToEmbeddedTool extends ExtractFieldsController { private deleteFieldTool: DeleteFieldTool; constructor() { - this.userInputService = new UserInputService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); + super(); this.deleteFieldTool = new DeleteFieldTool(); } @@ -57,71 +46,16 @@ export class ExtractFieldsToEmbeddedTool implements IRefactorTool { return ["EXTRACT_FIELDS_TO_EMBEDDED"]; } - /** - * Determines if this tool can handle a manual refactor trigger. - * Allows extraction when multiple fields are selected in a model file. - */ - async canHandleManualTrigger(context: ManualRefactorContext): Promise { - // Must be in a model file - if (!isModelFile(context.uri)) { - return false; - } - - // Get the source model from context - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - return false; - } - - // For manual trigger, we allow it if there are fields in the model - return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract - } - - /** - * This tool doesn't detect automatic changes. - */ - analyze(): ChangeObject[] { - return []; - } - /** * Initiates the manual refactor by prompting user for field selection, new model name, and embedded field name. */ async initiateManualRefactor(context: ManualRefactorContext): Promise { - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - vscode.window.showErrorMessage("Could not find a model in the current context"); - return undefined; - } - - // Get all fields in the model - const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; - if (allFields.length < 2) { - vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to embedded"); + const fieldSelection = await this.getSelectedFieldsFromContext(context, "embedded"); + if (!fieldSelection) { return undefined; } - let selectedFields: PropertyMetadata[] | undefined; - - const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - const fieldItemName = fieldItem.label.toLowerCase(); - const field = allFields.find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); - } - return field; - }); - } else { - // Let user select which fields to extract - selectedFields = await this.selectFieldsForExtraction(allFields); - if (!selectedFields || selectedFields.length === 0) { - return undefined; - } - } + const { sourceModel, selectedFields } = fieldSelection; // Get the new model name const newModelName = await this.userInputService.showPrompt("Enter the name for the new embedded model:"); @@ -223,97 +157,6 @@ export class ExtractFieldsToEmbeddedTool implements IRefactorTool { } } - /** - * Shows user a quick pick to select which fields to extract. - */ - private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { - const fieldItems = allFields.map((field) => ({ - label: field.name, - description: this.getFieldTypeDescription(field), - field: field, - })); - - const selectedItems = await vscode.window.showQuickPick(fieldItems, { - canPickMany: true, - placeHolder: "Select fields to extract to the new embedded model", - title: "Extract Fields to Embedded", - }); - - return selectedItems?.map((item) => item.field); - } - - /** - * Gets a description of the field type for display in the quick pick. - */ - private getFieldTypeDescription(field: PropertyMetadata): string { - const decoratorName = this.getDecoratorName(field.decorators); - return `@${decoratorName}`; - } - - /** - * Gets the source model from the refactor context, handling different context types. - */ - private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { - // Case 1: metadata is already a DecoratedClass (model) - if (context.metadata && "properties" in context.metadata) { - return context.metadata as DecoratedClass; - } - - // Case 2: metadata is a PropertyMetadata (field) - find the containing model - if (context.metadata && "decorators" in context.metadata) { - const fieldMetadata = context.metadata as PropertyMetadata; - return this.findSourceModelForField(context.cache, fieldMetadata); - } - - // Case 3: no specific metadata - try to find model at the range - return this.findModelAtRange(context.cache, context.uri, context.range); - } - - /** - * Finds the model that contains the given field. - */ - private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - const fieldInModel = Object.values(model.properties).find( - (prop) => - prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line - ); - - if (fieldInModel) { - return model; - } - } - - return null; - } - - /** - * Finds the model class that contains the given range. - */ - private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { - return model; - } - } - - return null; - } - - /** - * Gets the decorator name for a field's type. - */ - private getDecoratorName(decorators: any[]): string { - const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); - return typeDecorator ? typeDecorator.name : "Text"; - } - /** * Generates the complete file content for the new embedded model, including imports. * Embedded models extend BaseModel and have no dataSource. @@ -356,72 +199,6 @@ export class ExtractFieldsToEmbeddedTool implements IRefactorTool { return lines.join("\n"); } - /** - * Generates field code directly from PropertyMetadata, preserving all decorator information. - */ - private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { - const lines: string[] = []; - - // Add all decorators in the same order as the original - for (const decorator of property.decorators) { - if (decorator.name === "Field" || decorator.name === "Relationship") { - // Handle Field and Relationship decorators with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - lines.push(`@${decorator.name}({`); - const args = decorator.arguments[0]; // Usually the first argument contains the options object - if (typeof args === "object" && args !== null) { - // Format each property of the arguments object - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}({})`); - } - } else { - // Handle type decorators (Text, Choice, etc.) with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - const args = decorator.arguments[0]; - if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { - lines.push(`@${decorator.name}({`); - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else if (Array.isArray(value)) { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}()`); - } - } else { - lines.push(`@${decorator.name}()`); - } - } - } - - // Add property declaration using the original type - lines.push(`${property.name}!: ${property.type};`); - - return lines.join("\n"); - } - /** * Adds an embedded field to the source model. */ diff --git a/src/commands/fields/extractFieldsToParent.ts b/src/commands/fields/extractFieldsToParent.ts index 93bc734..aa87448 100644 --- a/src/commands/fields/extractFieldsToParent.ts +++ b/src/commands/fields/extractFieldsToParent.ts @@ -1,20 +1,14 @@ import * as vscode from "vscode"; import { - IRefactorTool, ChangeObject, ManualRefactorContext, ExtractFieldsToParentPayload, } from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; -import { UserInputService } from "../../services/userInputService"; -import { SourceCodeService } from "../../services/sourceCodeService"; -import { FileSystemService } from "../../services/fileSystemService"; import { NewModelTool } from "../models/newModel"; import { AddFieldTool } from "./addField"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; -import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; -import { TreeViewContext } from "../commandHelpers"; -import { isModelFile } from "../../utils/metadata"; +import { ExtractFieldsController } from "./extractFieldsController"; import * as path from "path"; /** @@ -24,18 +18,13 @@ import * as path from "path"; * model extending BaseModel. The source model will then extend from this new parent model * instead of its current parent. It provides preview functionality before applying changes. */ -export class ExtractFieldsToParentTool implements IRefactorTool { - private userInputService: UserInputService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; +export class ExtractFieldsToParentTool extends ExtractFieldsController { private newModelTool: NewModelTool; private addFieldTool: AddFieldTool; private deleteFieldTool: DeleteFieldTool; constructor() { - this.userInputService = new UserInputService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); + super(); this.newModelTool = new NewModelTool(); this.addFieldTool = new AddFieldTool(); this.deleteFieldTool = new DeleteFieldTool(); @@ -62,71 +51,16 @@ export class ExtractFieldsToParentTool implements IRefactorTool { return ["EXTRACT_FIELDS_TO_PARENT"]; } - /** - * Determines if this tool can handle a manual refactor trigger. - * Allows extraction when multiple fields are selected in a model file. - */ - async canHandleManualTrigger(context: ManualRefactorContext): Promise { - // Must be in a model file - if (!isModelFile(context.uri)) { - return false; - } - - // Get the source model from context - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - return false; - } - - // For manual trigger, we allow it if there are fields in the model - return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract - } - - /** - * This tool doesn't detect automatic changes. - */ - analyze(): ChangeObject[] { - return []; - } - /** * Initiates the manual refactor by prompting user for field selection and new parent model name. */ async initiateManualRefactor(context: ManualRefactorContext): Promise { - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - vscode.window.showErrorMessage("Could not find a model in the current context"); - return undefined; - } - - // Get all fields in the model - const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; - if (allFields.length < 2) { - vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to parent"); + const fieldSelection = await this.getSelectedFieldsFromContext(context, "parent"); + if (!fieldSelection) { return undefined; } - let selectedFields: PropertyMetadata[] | undefined; - - const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - const fieldItemName = fieldItem.label.toLowerCase(); - const field = allFields.find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); - } - return field; - }); - } else { - // Let user select which fields to extract - selectedFields = await this.selectFieldsForExtraction(allFields); - if (!selectedFields || selectedFields.length === 0) { - return undefined; - } - } + const { sourceModel, selectedFields } = fieldSelection; // Get the new parent model name const newParentModelName = await this.userInputService.showPrompt("Enter the name for the new abstract parent model:"); @@ -220,97 +154,6 @@ export class ExtractFieldsToParentTool implements IRefactorTool { } } - /** - * Shows user a quick pick to select which fields to extract. - */ - private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { - const fieldItems = allFields.map((field) => ({ - label: field.name, - description: this.getFieldTypeDescription(field), - field: field, - })); - - const selectedItems = await vscode.window.showQuickPick(fieldItems, { - canPickMany: true, - placeHolder: "Select fields to extract to the new abstract parent model", - title: "Extract Fields to Parent", - }); - - return selectedItems?.map((item) => item.field); - } - - /** - * Gets a description of the field type for display in the quick pick. - */ - private getFieldTypeDescription(field: PropertyMetadata): string { - const decoratorName = this.getDecoratorName(field.decorators); - return `@${decoratorName}`; - } - - /** - * Gets the source model from the refactor context, handling different context types. - */ - private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { - // Case 1: metadata is already a DecoratedClass (model) - if (context.metadata && "properties" in context.metadata) { - return context.metadata as DecoratedClass; - } - - // Case 2: metadata is a PropertyMetadata (field) - find the containing model - if (context.metadata && "decorators" in context.metadata) { - const fieldMetadata = context.metadata as PropertyMetadata; - return this.findSourceModelForField(context.cache, fieldMetadata); - } - - // Case 3: no specific metadata - try to find model at the range - return this.findModelAtRange(context.cache, context.uri, context.range); - } - - /** - * Finds the model that contains the given field. - */ - private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - const fieldInModel = Object.values(model.properties).find( - (prop) => - prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line - ); - - if (fieldInModel) { - return model; - } - } - - return null; - } - - /** - * Finds the model class that contains the given range. - */ - private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { - return model; - } - } - - return null; - } - - /** - * Gets the decorator name for a field's type. - */ - private getDecoratorName(decorators: any[]): string { - const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); - return typeDecorator ? typeDecorator.name : "Text"; - } - /** * Generates the complete file content for the new abstract parent model, including imports. */ @@ -323,7 +166,7 @@ export class ExtractFieldsToParentTool implements IRefactorTool { const lines: string[] = []; // Generate imports - const requiredImports = new Set(["BaseModel", "Field"]); + const requiredImports = new Set(["BaseModel", "Field", "Model"]); for (const field of fieldsToExtract) { for (const decorator of field.decorators) { requiredImports.add(decorator.name); @@ -355,72 +198,6 @@ export class ExtractFieldsToParentTool implements IRefactorTool { return lines.join("\n"); } - /** - * Generates field code directly from PropertyMetadata, preserving all decorator information. - */ - private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { - const lines: string[] = []; - - // Add all decorators in the same order as the original - for (const decorator of property.decorators) { - if (decorator.name === "Field" || decorator.name === "Relationship") { - // Handle Field and Relationship decorators with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - lines.push(`@${decorator.name}({`); - const args = decorator.arguments[0]; // Usually the first argument contains the options object - if (typeof args === "object" && args !== null) { - // Format each property of the arguments object - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}({})`); - } - } else { - // Handle type decorators (Text, Choice, etc.) with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - const args = decorator.arguments[0]; - if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { - lines.push(`@${decorator.name}({`); - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else if (Array.isArray(value)) { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}()`); - } - } else { - lines.push(`@${decorator.name}()`); - } - } - } - - // Add property declaration using the original type - lines.push(`${property.name}!: ${property.type};`); - - return lines.join("\n"); - } - /** * Updates the source model to extend from the new parent model instead of its current parent. */ diff --git a/src/commands/fields/extractFieldsToReference.ts b/src/commands/fields/extractFieldsToReference.ts index fd702c0..f63b2ea 100644 --- a/src/commands/fields/extractFieldsToReference.ts +++ b/src/commands/fields/extractFieldsToReference.ts @@ -1,20 +1,14 @@ import * as vscode from "vscode"; import { - IRefactorTool, ChangeObject, ManualRefactorContext, ExtractFieldsToReferencePayload, } from "../../refactor/refactorInterfaces"; import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; -import { UserInputService } from "../../services/userInputService"; -import { SourceCodeService } from "../../services/sourceCodeService"; -import { FileSystemService } from "../../services/fileSystemService"; import { NewModelTool } from "../models/newModel"; import { AddFieldTool } from "./addField"; import { DeleteFieldTool } from "../../refactor/tools/deleteField"; -import { FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; -import { TreeViewContext } from "../commandHelpers"; -import { isModelFile } from "../../utils/metadata"; +import { ExtractFieldsController } from "./extractFieldsController"; import * as path from "path"; /** @@ -24,18 +18,13 @@ import * as path from "path"; * model in a separate file, creating a reference relationship between the source and new models. * It provides preview functionality before applying changes. */ -export class ExtractFieldsToReferenceTool implements IRefactorTool { - private userInputService: UserInputService; - private sourceCodeService: SourceCodeService; - private fileSystemService: FileSystemService; +export class ExtractFieldsToReferenceTool extends ExtractFieldsController { private newModelTool: NewModelTool; private addFieldTool: AddFieldTool; private deleteFieldTool: DeleteFieldTool; constructor() { - this.userInputService = new UserInputService(); - this.sourceCodeService = new SourceCodeService(); - this.fileSystemService = new FileSystemService(); + super(); this.newModelTool = new NewModelTool(); this.addFieldTool = new AddFieldTool(); this.deleteFieldTool = new DeleteFieldTool(); @@ -62,82 +51,25 @@ export class ExtractFieldsToReferenceTool implements IRefactorTool { return ["EXTRACT_FIELDS_TO_REFERENCE"]; } - /** - * Determines if this tool can handle a manual refactor trigger. - * Allows extraction when multiple fields are selected in a model file. - */ - async canHandleManualTrigger(context: ManualRefactorContext): Promise { - // Must be in a model file - if (!isModelFile(context.uri)) { - return false; - } - - // Get the source model from context - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - return false; - } - - // For manual trigger, we allow it if there are fields in the model - return Object.keys(sourceModel.properties || {}).length > 1; // Need at least 2 fields to extract - } - - /** - * This tool doesn't detect automatic changes. - */ - analyze(): ChangeObject[] { - return []; - } - /** * Initiates the manual refactor by prompting user for field selection, new model name, and reference field name. */ async initiateManualRefactor(context: ManualRefactorContext): Promise { - const sourceModel = this.getSourceModelFromContext(context); - if (!sourceModel) { - vscode.window.showErrorMessage("Could not find a model in the current context"); - return undefined; - } - - // Get all fields in the model - const allFields = Object.values(sourceModel.properties) as PropertyMetadata[]; - if (allFields.length < 2) { - vscode.window.showErrorMessage("Model must have at least 2 fields to extract some to reference"); + const fieldSelection = await this.getSelectedFieldsFromContext(context, "reference"); + if (!fieldSelection) { return undefined; } - let selectedFields: PropertyMetadata[] | undefined; + const { sourceModel, selectedFields } = fieldSelection; - const treeViewContext = context.treeViewContext as TreeViewContext | undefined; - - if (treeViewContext?.fieldItems && treeViewContext.fieldItems.length > 0) { - // Tree view context: use the selected field items - selectedFields = treeViewContext.fieldItems.map((fieldItem) => { - const fieldItemName = fieldItem.label.toLowerCase(); - const field = allFields.find((prop) => prop.name === fieldItemName); - if (!field) { - throw new Error(`Could not find field '${fieldItem.label}' in model '${context.metadata?.name}'`); - } - return field; - }); - } else { - // Let user select which fields to extract - selectedFields = await this.selectFieldsForExtraction(allFields); - if (!selectedFields || selectedFields.length === 0) { - return undefined; - } - } - - // Get the new model name + // Get the new reference model name const newModelName = await this.userInputService.showPrompt("Enter the name for the new reference model:"); if (!newModelName) { return undefined; } // Get the reference field name - const referenceFieldName = await this.userInputService.showPrompt( - "Enter the name for the new reference field (e.g., 'user', 'category'):" - ); + const referenceFieldName = await this.userInputService.showPrompt("Enter the name for the reference field:"); if (!referenceFieldName) { return undefined; } @@ -245,97 +177,6 @@ export class ExtractFieldsToReferenceTool implements IRefactorTool { return selectedFields; } - /** - * Shows user a quick pick to select which fields to extract. - */ - private async selectFieldsForExtraction(allFields: PropertyMetadata[]): Promise { - const fieldItems = allFields.map((field) => ({ - label: field.name, - description: this.getFieldTypeDescription(field), - field: field, - })); - - const selectedItems = await vscode.window.showQuickPick(fieldItems, { - canPickMany: true, - placeHolder: "Select fields to extract to the new reference model", - title: "Extract Fields to Reference", - }); - - return selectedItems?.map((item) => item.field); - } - - /** - * Gets a description of the field type for display in the quick pick. - */ - private getFieldTypeDescription(field: PropertyMetadata): string { - const decoratorName = this.getDecoratorName(field.decorators); - return `@${decoratorName}`; - } - - /** - * Gets the source model from the refactor context, handling different context types. - */ - private getSourceModelFromContext(context: ManualRefactorContext): DecoratedClass | null { - // Case 1: metadata is already a DecoratedClass (model) - if (context.metadata && "properties" in context.metadata) { - return context.metadata as DecoratedClass; - } - - // Case 2: metadata is a PropertyMetadata (field) - find the containing model - if (context.metadata && "decorators" in context.metadata) { - const fieldMetadata = context.metadata as PropertyMetadata; - return this.findSourceModelForField(context.cache, fieldMetadata); - } - - // Case 3: no specific metadata - try to find model at the range - return this.findModelAtRange(context.cache, context.uri, context.range); - } - - /** - * Finds the model that contains the given field. - */ - private findSourceModelForField(cache: MetadataCache, fieldMetadata: PropertyMetadata): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - const fieldInModel = Object.values(model.properties).find( - (prop) => - prop.name === fieldMetadata.name && - prop.declaration.uri.fsPath === fieldMetadata.declaration.uri.fsPath && - prop.declaration.range.start.line === fieldMetadata.declaration.range.start.line - ); - - if (fieldInModel) { - return model; - } - } - - return null; - } - - /** - * Finds the model class that contains the given range. - */ - private findModelAtRange(cache: MetadataCache, uri: vscode.Uri, range: vscode.Range): DecoratedClass | null { - const allModels = cache.getDataModelClasses(); - - for (const model of allModels) { - if (model.declaration.uri.fsPath === uri.fsPath && model.declaration.range.contains(range)) { - return model; - } - } - - return null; - } - - /** - * Gets the decorator name for a field's type. - */ - private getDecoratorName(decorators: any[]): string { - const typeDecorator = decorators.find((d) => FIELD_TYPE_OPTIONS.some((o) => o.decorator === d.name)); - return typeDecorator ? typeDecorator.name : "Text"; - } - /** * Creates a new reference model in a separate file with the extracted fields. */ @@ -426,72 +267,6 @@ export class ExtractFieldsToReferenceTool implements IRefactorTool { return lines.join("\n"); } - /** - * Generates field code directly from PropertyMetadata, preserving all decorator information. - */ - private generateFieldCodeFromPropertyMetadata(property: PropertyMetadata): string { - const lines: string[] = []; - - // Add all decorators in the same order as the original - for (const decorator of property.decorators) { - if (decorator.name === "Field" || decorator.name === "Relationship") { - // Handle Field and Relationship decorators with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - lines.push(`@${decorator.name}({`); - const args = decorator.arguments[0]; // Usually the first argument contains the options object - if (typeof args === "object" && args !== null) { - // Format each property of the arguments object - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}({})`); - } - } else { - // Handle type decorators (Text, Choice, etc.) with their arguments - if (decorator.arguments && decorator.arguments.length > 0) { - const args = decorator.arguments[0]; - if (typeof args === "object" && args !== null && Object.keys(args).length > 0) { - lines.push(`@${decorator.name}({`); - for (const [key, value] of Object.entries(args)) { - if (typeof value === "string") { - lines.push(` ${key}: "${value}",`); - } else if (typeof value === "boolean") { - lines.push(` ${key}: ${value},`); - } else if (typeof value === "number") { - lines.push(` ${key}: ${value},`); - } else if (Array.isArray(value)) { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } else { - lines.push(` ${key}: ${JSON.stringify(value)},`); - } - } - lines.push("})"); - } else { - lines.push(`@${decorator.name}()`); - } - } else { - lines.push(`@${decorator.name}()`); - } - } - } - - // Add property declaration using the original type - lines.push(`${property.name}!: ${property.type};`); - - return lines.join("\n"); - } - /** * Extracts the dataSource from a model using the cache. */ From 35a32bb95a604935094c7cb6828e2d407e21f9a2 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 22 Sep 2025 12:21:41 -0300 Subject: [PATCH 210/254] Changed `PersistentModel` and `PersistentComponentModel` instances into `BaseModel` --- src/commands/fields/addField.ts | 4 - .../fields/changeCompositionToReference.ts | 30 +-- .../fields/changeReferenceToComposition.ts | 12 +- .../fields/extractFieldsToComposition.ts | 6 +- .../fields/extractFieldsToReference.ts | 4 +- src/commands/models/addComposition.ts | 36 ++- src/commands/models/addReference.ts | 4 +- src/services/sourceCodeService.ts | 239 ++++++++++++++++-- src/test/addComposition.test.ts | 4 +- .../changeCompositionToReference.test.ts | 2 +- src/test/refactor/deleteModel.test.ts | 4 +- 11 files changed, 268 insertions(+), 77 deletions(-) diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index e3dc465..9929981 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -255,10 +255,6 @@ export class AddFieldTool implements AIEnhancedTool { ): Promise { const lines = document.getText().split("\n"); const newImports = new Set(["Field", fieldInfo.type.decorator]); - - if (fieldInfo.type.decorator === "Composition") { - newImports.add("PersistentComponentModel"); - } // Add imports using source code service logic (we need to call a helper method) await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, newImports); diff --git a/src/commands/fields/changeCompositionToReference.ts b/src/commands/fields/changeCompositionToReference.ts index dbbc0e1..4b82ae4 100644 --- a/src/commands/fields/changeCompositionToReference.ts +++ b/src/commands/fields/changeCompositionToReference.ts @@ -13,12 +13,7 @@ import * as path from "path"; /** * Tool for converting composition relationships to reference relationships. * - * This tool converts a @Composition field to a @Reference field by: - * 1. Finding the component model that is currently embedded - * 2. Extracting the component model to its own file - * 3. Converting the component model from PersistentComponentModel to PersistentModel - * 4. Converting the field from @Composition to @Reference - * 5. Adding the necessary imports for the new referenced model + * This tool converts a @Composition field to a @Reference */ export class ChangeCompositionToReferenceTool { private userInputService: UserInputService; @@ -181,21 +176,19 @@ export class ChangeCompositionToReferenceTool { const sourceModelDecorator = cache.getModelDecoratorByName("Model", sourceModel); const dataSource = sourceModelDecorator?.arguments?.[0]?.dataSource; - // Step 5: Extract existing model imports from the source file - const existingImports = this.sourceCodeService.extractModelImports(sourceDocument); - const existingImportsSet = new Set(existingImports); - - // Step 6: Convert the class body for independent model use + // Step 5: Convert the class body for independent model use const convertedClassBody = this.convertComponentClassBody(classBody); - // Step 7: Generate the complete model file content - const modelFileContent = this.sourceCodeService.generateModelFileContent( + // Step 6: Generate the complete model file content + const modelFileContent = await this.sourceCodeService.generateModelFileContent( componentModel.name, convertedClassBody, - "PersistentModel", // Convert from PersistentComponentModel to PersistentModel + "BaseModel", dataSource, - existingImportsSet, - false // isComponent = false since this is now an independent model + undefined, + false, + targetFilePath, + cache ); // Step 8: Add related enums to the file content @@ -214,10 +207,7 @@ export class ChangeCompositionToReferenceTool { * This mainly involves ensuring proper formatting and removing any component-specific elements. */ private convertComponentClassBody(classBody: string): string { - // For now, we can use the class body as-is since the main difference is in the - // class declaration (PersistentComponentModel vs PersistentModel) which is handled - // in generateModelFileContent. - + // Future enhancements could include: // - Removing component-specific decorators if any // - Adjusting field configurations if needed diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index 20be908..7035536 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -82,7 +82,7 @@ export class ChangeReferenceToCompositionTool { } // Add necessary imports to the workspace edit - await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, new Set(["Model", "PersistentComponentModel", "Field", "Composition"])); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, new Set(["Model", "BaseModel", "Field", "Composition"])); // Step 9: Focus on the newly modified field await this.sourceCodeService.focusOnElement(document, fieldName); @@ -253,13 +253,15 @@ export class ChangeReferenceToCompositionTool { const resolvedEnums = await this.resolveEnumConflicts(enumDefinitions, sourceDocument, classBody, sourceModel.name); // Step 6: Generate the complete component model content - let componentModelCode = this.sourceCodeService.generateModelFileContent( + let componentModelCode = await this.sourceCodeService.generateModelFileContent( targetModel.name, resolvedEnums.updatedClassBody, - `PersistentComponentModel<${sourceModel.name}>`, // Use component model base class + `BaseModel`, // Use component model base class dataSource, - new Set(["Field", "PersistentComponentModel"]), // Ensure required imports - true // This is a component model (no export keyword) + new Set(["Field", "BaseModel"]), // Ensure required imports + true, // This is a component model (no export keyword) + targetModel.declaration.uri.fsPath, + cache ); // Step 7: Extract only the component model part (remove imports and add enums) diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts index 0b309e9..120fba6 100644 --- a/src/commands/fields/extractFieldsToComposition.ts +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -173,7 +173,6 @@ export class ExtractFieldsToCompositionTool extends ExtractFieldsController { */ private generateInnerModelCodeWithFields( innerModelName: string, - outerModelName: string, dataSource: string | undefined, fields: PropertyMetadata[] ): string { @@ -189,7 +188,7 @@ export class ExtractFieldsToCompositionTool extends ExtractFieldsController { } // Add class declaration - lines.push(`class ${innerModelName} extends PersistentComponentModel<${outerModelName}> {`); + lines.push(`class ${innerModelName} extends BaseModel {`); lines.push(``); // Add each field using the enhanced method that preserves all decorator information @@ -300,13 +299,12 @@ export class ExtractFieldsToCompositionTool extends ExtractFieldsController { // Generate the inner model code with fields const innerModelCode = this.generateInnerModelCodeWithFields( innerModelName, - outerModelName, dataSource, fieldsToAdd ); // Add required imports - collect from the PropertyMetadata decorators - const requiredImports = new Set(["Model", "Field", "PersistentComponentModel", "Composition"]); + const requiredImports = new Set(["Model", "Field", "Composition"]); // Add field-specific imports based on the decorators in PropertyMetadata for (const property of fieldsToAdd) { for (const decorator of property.decorators) { diff --git a/src/commands/fields/extractFieldsToReference.ts b/src/commands/fields/extractFieldsToReference.ts index f63b2ea..bee5c3a 100644 --- a/src/commands/fields/extractFieldsToReference.ts +++ b/src/commands/fields/extractFieldsToReference.ts @@ -227,7 +227,7 @@ export class ExtractFieldsToReferenceTool extends ExtractFieldsController { const dataSource = this.extractDataSourceFromModel(sourceModel, cache); // Generate imports - const requiredImports = new Set(["Model", "Field", "PersistentModel"]); + const requiredImports = new Set(["Model", "Field", "BaseModel"]); for (const field of fieldsToExtract) { for (const decorator of field.decorators) { requiredImports.add(decorator.name); @@ -251,7 +251,7 @@ export class ExtractFieldsToReferenceTool extends ExtractFieldsController { lines.push(`@Model()`); } - lines.push(`export class ${modelName} extends PersistentModel {`); + lines.push(`export class ${modelName} extends BaseModel {`); lines.push(""); // Add each field using PropertyMetadata to preserve all decorator information diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 82b7e0e..17883bd 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -59,7 +59,12 @@ export class AddCompositionTool { * @param fieldName - The predefined field name for the composition * @returns Promise that resolves with the created inner model name when the composition is added */ - public async addCompositionProgrammatically(cache: MetadataCache, modelName: string, fieldName: string): Promise { + public async addCompositionProgrammatically( + cache: MetadataCache, + modelName: string, + fieldName: string + ): Promise { + const edit = new vscode.WorkspaceEdit(); try { // Step 1: Validate target file const { modelClass, document } = await this.validateAndPrepareTarget(modelName, cache); @@ -76,6 +81,13 @@ export class AddCompositionTool { // Step 5: Add composition field to outer model await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); + // Add required imports + const requiredImports = new Set(["Model", "Field", "Relationship", "BaseModel"]); + await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + + // Apply the edit + await vscode.workspace.applyEdit(edit); + // Step 6: Focus on the newly created field await this.sourceCodeService.focusOnElement(document, fieldName); @@ -101,7 +113,7 @@ export class AddCompositionTool { * @param fieldName - The predefined field name for the composition * @returns Promise that resolves to a WorkspaceEdit containing all necessary changes and the inner model name * @throws Error if validation fails or models already exist - * + * */ public async createAddCompositionWorkspaceEdit( cache: MetadataCache, @@ -130,7 +142,15 @@ export class AddCompositionTool { await this.addInnerModelEditToWorkspace(edit, document, innerModelName, modelClass.name, cache); // Step 7: Add composition field edit - await this.addCompositionFieldEditToWorkspace(edit, document, modelClass.name, fieldName, innerModelName, isArray, cache); + await this.addCompositionFieldEditToWorkspace( + edit, + document, + modelClass.name, + fieldName, + innerModelName, + isArray, + cache + ); return { edit, innerModelName }; } @@ -158,7 +178,7 @@ export class AddCompositionTool { const innerModelCode = this.generateInnerModelCode(innerModelName, outerModelName, dataSource); // Add required imports - const requiredImports = new Set(["Model", "Field", "Relationship", "PersistentComponentModel"]); + const requiredImports = new Set(["Model", "Field", "Relationship", "BaseModel"]); await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); // Find insertion point after the outer model @@ -214,10 +234,10 @@ export class AddCompositionTool { // Add field insertion edits using the source code service approach const lines = document.getText().split("\n"); - const requiredImports = new Set(["Field", "Composition"]); + //const requiredImports = new Set(["Field", "Composition", "BaseModel"]); // Add imports - await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); + //await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); // Find class boundaries and add field const { classEndLine } = this.sourceCodeService.findClassBoundaries(lines, outerModelName); @@ -382,7 +402,7 @@ export class AddCompositionTool { lines.push(`@Model()`); } lines.push(`})`); - lines.push(`class ${innerModelName} extends PersistentComponentModel<${outerModelName}> {`); + lines.push(`class ${innerModelName} extends BaseModel {`); lines.push(``); lines.push(`}`); @@ -444,6 +464,4 @@ export class AddCompositionTool { return lines.join("\n"); } - - } diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index a3e415f..c4ed885 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -331,7 +331,7 @@ export class AddReferenceTool { const lines: string[] = []; // Add basic framework imports - lines.push(`import { Model, PersistentModel, Field } from 'slingr-framework';`); + lines.push(`import { Model, BaseModel, Field } from 'slingr-framework';`); // Add datasource import if needed if (dataSource) { @@ -351,7 +351,7 @@ export class AddReferenceTool { } else { lines.push(`@Model()`); } - lines.push(`export class ${modelName} extends PersistentModel {`); + lines.push(`export class ${modelName} extends BaseModel {`); lines.push(``); lines.push(`\t@Field({})`); lines.push(`\tname!: string;`); diff --git a/src/services/sourceCodeService.ts b/src/services/sourceCodeService.ts index 38e550f..c68d4ae 100644 --- a/src/services/sourceCodeService.ts +++ b/src/services/sourceCodeService.ts @@ -26,9 +26,6 @@ export class SourceCodeService { const edit = new vscode.WorkspaceEdit(); const lines = document.getText().split("\n"); const newImports = new Set(["Field", fieldInfo.type.decorator]); - if (fieldInfo.type.decorator === "Composition") { - newImports.add("PersistentComponentModel"); - } await this.ensureSlingrFrameworkImports(document, edit, newImports); @@ -157,27 +154,75 @@ export class SourceCodeService { // Determine the import path let importPath = `./${targetModel}`; - if (cache) { - // Find the file path for the target model - const targetModelFilePath = this.findModelFilePath(cache, targetModel); - - if (targetModelFilePath) { - // Calculate relative path from current file to target model file - const currentFilePath = document.uri.fsPath; - const relativePath = path.relative(path.dirname(currentFilePath), targetModelFilePath); - importPath = relativePath.replace(/\.ts$/, "").replace(/\\/g, "/"); - if (!importPath.startsWith(".")) { - importPath = "./" + importPath; - } - } - } - // Create the import statement const importStatement = `import { ${targetModel} } from '${importPath}';`; edit.insert(document.uri, new vscode.Position(insertLine, 0), importStatement + "\n"); } + /** + * Adds a datasource import to a document. + * + * @param document - The document to add the import to + * @param dataSourceName - The name of the datasource to import + * @param edit - The workspace edit to add changes to + * @param cache - Optional metadata cache to lookup datasource information + * @returns Promise + */ + public async addDataSourceImport( + document: vscode.TextDocument, + dataSourceName: string, + edit: vscode.WorkspaceEdit, + cache?: MetadataCache + ): Promise { + const content = document.getText(); + const lines = content.split("\n"); + + // Clean up the datasource name (remove quotes if it's a string literal) + const cleanDataSourceName = dataSourceName.replace(/['"]/g, ""); + + // Check if the datasource is already imported + const existingImport = lines.find( + (line) => line.includes("import") && line.includes(cleanDataSourceName) && !line.includes("slingr-framework") + ); + + if (existingImport) { + return; // Already imported + } + + // Find the best place to insert the import (after slingr-framework imports, before model imports) + let insertLine = 0; + for (let i = 0; i < lines.length; i++) { + if (lines[i].includes("import") && lines[i].includes("slingr-framework")) { + insertLine = i + 1; + // Look for empty line after slingr-framework import + if (i + 1 < lines.length && lines[i + 1].trim() === "") { + insertLine = i + 1; + break; + } + } else if (lines[i].startsWith("import ") && !lines[i].includes("slingr-framework")) { + // Found other imports, insert before them + break; + } else if (lines[i].includes("@Model") || lines[i].includes("export class")) { + // Found the start of the model definition + break; + } + } + + // Get the datasource import using our findDataSourcePath method + try { + const dataSourceImport = await this.findDataSourcePath(cleanDataSourceName, document.uri.fsPath, cache); + if (dataSourceImport) { + edit.insert(document.uri, new vscode.Position(insertLine, 0), dataSourceImport + "\n"); + } + } catch (error) { + console.warn("Could not resolve datasource import, using fallback:", error); + // Fallback to generic import + const importStatement = `import { ${cleanDataSourceName} } from '../dataSources/${cleanDataSourceName}';`; + edit.insert(document.uri, new vscode.Position(insertLine, 0), importStatement + "\n"); + } + } + /** * Updates import statements in a file to reflect a folder rename. * @@ -335,12 +380,123 @@ export class SourceCodeService { return undefined; } + /** + * Finds the datasource path by name in the workspace. + * + * @param dataSourceName - The name of the datasource to find + * @param fromFilePath - The file path from which to calculate relative import path + * @param cache - Optional metadata cache to lookup datasource information + * @returns The import statement for the datasource or null if not found + */ + public async findDataSourcePath(dataSourceName: string, fromFilePath: string, cache?: MetadataCache): Promise { + try { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + return null; + } + + // Clean up the datasource name (remove quotes if it's a string literal) + const cleanDataSourceName = dataSourceName.replace(/['"]/g, ""); + + // First, try to find the datasource in the cache + if (cache) { + const dataSources = cache.getDataSources(); + const targetDataSource = dataSources.find(ds => ds.name === cleanDataSourceName); + + if (targetDataSource) { + // Use the actual file path from the cache + const dataSourceFilePath = targetDataSource.declaration.uri.fsPath; + const fromFileDir = path.dirname(fromFilePath); + const relativePath = path.relative(fromFileDir, dataSourceFilePath); + + // Remove file extension for import + const importPath = relativePath.replace(/\.(ts|js)$/, "").replace(/\\/g, "/"); + + // Ensure the path starts with './' if it's a relative path + const finalImportPath = importPath.startsWith(".") ? importPath : "./" + importPath; + + return `import { ${cleanDataSourceName} } from '${finalImportPath}';`; + } + } + + // Fallback: Look for datasource file in src/dataSources directory + const dataSourcesDir = path.join(workspaceFolder.uri.fsPath, "src", "dataSources"); + + // Try common file extensions for datasource files + const possibleExtensions = [".ts", ".js"]; + + for (const ext of possibleExtensions) { + const dataSourceFile = path.join(dataSourcesDir, cleanDataSourceName + ext); + + try { + // Check if the file exists + await vscode.workspace.fs.stat(vscode.Uri.file(dataSourceFile)); + + // Calculate relative path from the target file to the datasource + const fromFileDir = path.dirname(fromFilePath); + const relativePath = path.relative(fromFileDir, dataSourceFile); + + // Remove file extension for import + const importPath = relativePath.replace(/\.(ts|js)$/, "").replace(/\\/g, "/"); + + // Ensure the path starts with './' if it's a relative path + const finalImportPath = importPath.startsWith(".") ? importPath : "./" + importPath; + + return `import { ${cleanDataSourceName} } from '${finalImportPath}';`; + } catch (error) { + // File doesn't exist, continue to next extension + continue; + } + } + + // If no file found, create a generic import based on standard structure + const fromFileDir = path.dirname(fromFilePath); + const relativePath = path.relative(fromFileDir, dataSourcesDir); + const importPath = relativePath.replace(/\\/g, "/"); + const finalImportPath = importPath.startsWith(".") ? importPath : "./" + importPath; + + return `import { ${cleanDataSourceName} } from '${finalImportPath}/${cleanDataSourceName}';`; + } catch (error) { + console.warn("Could not find datasource path:", error); + return null; + } + } + + /** + * Gets the actual file path where a datasource is defined using the cache. + * This is useful when you need to know the physical location of a datasource. + * + * @param dataSourceName - The name of the datasource to find + * @param cache - The metadata cache to lookup datasource information + * @returns The file path where the datasource is defined, or null if not found + */ + public getDataSourceFilePath(dataSourceName: string, cache: MetadataCache): string | null { + try { + const cleanDataSourceName = dataSourceName.replace(/['"]/g, ""); + const dataSources = cache.getDataSources(); + const targetDataSource = dataSources.find(ds => ds.name === cleanDataSourceName); + + return targetDataSource ? targetDataSource.declaration.uri.fsPath : null; + } catch (error) { + console.warn("Could not find datasource in cache:", error); + return null; + } + } + /** * Extracts the datasource import from the source model file. */ - public async extractImport(sourceModel: DecoratedClass, importName: string): Promise { + public async extractImport(sourceModel: DecoratedClass, importName: string, cache?: MetadataCache): Promise { try { - // Read the source model file to extract datasource imports + // First, try to use the cache to find the datasource and generate the import + if (cache) { + const dataSourceImport = await this.findDataSourcePath(importName, sourceModel.declaration.uri.fsPath, cache); + if (dataSourceImport) { + return dataSourceImport; + } + } + + // Fallback: Read the source model file to extract datasource imports const document = await vscode.workspace.openTextDocument(sourceModel.declaration.uri); const content = document.getText(); const lines = content.split("\n"); @@ -431,26 +587,30 @@ export class SourceCodeService { * * @param modelName - The name of the new model class * @param classBody - The complete class body content - * @param baseClass - The base class to extend (default: "PersistentModel") + * @param baseClass - The base class to extend (default: "BaseModel") * @param dataSource - Optional datasource for the model * @param existingImports - Set of imports that should be included * @param isComponent - Whether this is a component model (affects export and class declaration) + * @param targetFilePath - Optional path where the model file will be created (for accurate relative import calculation) + * @param cache - Optional metadata cache to lookup datasource information * @returns The complete model file content */ - public generateModelFileContent( + public async generateModelFileContent( modelName: string, classBody: string, - baseClass: string = "PersistentModel", + baseClass: string = "BaseModel", dataSource?: string, existingImports?: Set, - isComponent: boolean = false - ): string { + isComponent: boolean = false, + targetFilePath?: string, + cache?: MetadataCache + ): Promise { const lines: string[] = []; // Determine required imports const imports = new Set(["Model", "Field"]); - // Add base class to imports (handle complex base classes like PersistentComponentModel) + // Add base class to imports const baseClassCore = baseClass.split("<")[0]; // Extract base class name before generic imports.add(baseClassCore); @@ -468,6 +628,31 @@ export class SourceCodeService { lines.push(`import { ${sortedImports.join(", ")} } from "slingr-framework";`); lines.push(""); + // Add datasource import if applicable + if (dataSource) { + if (targetFilePath) { + // Use the new findDataSourcePath function for accurate import resolution + try { + const dataSourceImport = await this.findDataSourcePath(dataSource, targetFilePath, cache); + if (dataSourceImport) { + lines.push(dataSourceImport); + lines.push(""); + } + } catch (error) { + console.warn("Could not resolve datasource import, using fallback:", error); + // Fallback to generic import + const cleanDataSource = dataSource.replace(/['"]/g, ""); + lines.push(`import { ${cleanDataSource} } from '../dataSources/${cleanDataSource}';`); + lines.push(""); + } + } else { + // Fallback to generic import pattern when no target file path is provided + const cleanDataSource = dataSource.replace(/['"]/g, ""); + lines.push(`import { ${cleanDataSource} } from '../dataSources/${cleanDataSource}';`); + lines.push(""); + } + } + // Add model decorator if (dataSource) { lines.push(`@Model({`); @@ -493,6 +678,8 @@ export class SourceCodeService { return lines.join("\n"); } + + /** * Analyzes class body content to determine which imports are needed. * diff --git a/src/test/addComposition.test.ts b/src/test/addComposition.test.ts index 662e3a7..101890f 100644 --- a/src/test/addComposition.test.ts +++ b/src/test/addComposition.test.ts @@ -318,7 +318,7 @@ profile!: Profile;`; assert.ok(modifiedContent.includes('addresses!: Address[]'), 'Field declaration should be present'); // Verify the inner model was created - assert.ok(modifiedContent.includes('class Address extends PersistentComponentModel'), 'Inner model should be created'); + assert.ok(modifiedContent.includes('class Address extends BaseModel'), 'Inner model should be created'); assert.ok(modifiedContent.includes('@Model()'), 'Model decorator should be present on inner model'); // Verify original file is unchanged (since we didn't apply the edit) @@ -365,7 +365,7 @@ profile!: Profile;`; assert.ok(!modifiedContent.includes('profile!: Profile[]'), 'Should not be array for singular field'); // Verify the inner model was created - assert.ok(modifiedContent.includes('class Profile extends PersistentComponentModel'), 'Inner model should be created'); + assert.ok(modifiedContent.includes('class Profile extends BaseModel'), 'Inner model should be created'); }); test('should throw error when composition field already exists', async () => { diff --git a/src/test/refactor/changeCompositionToReference.test.ts b/src/test/refactor/changeCompositionToReference.test.ts index 2b5188e..e4d3513 100644 --- a/src/test/refactor/changeCompositionToReference.test.ts +++ b/src/test/refactor/changeCompositionToReference.test.ts @@ -14,7 +14,7 @@ if (typeof suite !== 'undefined') { mockExplorerProvider = { refresh: () => {} }; - changeCompositionToReferenceTool = new ChangeCompositionToReferenceTool(mockExplorerProvider); + changeCompositionToReferenceTool = new ChangeCompositionToReferenceTool(); }); const createMockPropertyMetadata = (name: string, type: string, decoratorNames: string[]): PropertyMetadata => { diff --git a/src/test/refactor/deleteModel.test.ts b/src/test/refactor/deleteModel.test.ts index d05c2a7..62b46f8 100644 --- a/src/test/refactor/deleteModel.test.ts +++ b/src/test/refactor/deleteModel.test.ts @@ -582,7 +582,7 @@ if (typeof suite !== 'undefined') { const mockFileContent = `import { Model, Field } from '@slingr/platform'; @Model() -export class User extends PersistentModel { +export class User extends BaseModel { @Field() name: string; @@ -591,7 +591,7 @@ export class User extends PersistentModel { } @Model() -export class Order extends PersistentModel { +export class Order extends BaseModel { @Field() orderNumber: string; }`; From 8bcdcd2d2739038fdb3cba484b3bc6c579a9cb74 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 22 Sep 2025 12:30:23 -0300 Subject: [PATCH 211/254] Adds primary key when creating new reference or composition model --- src/commands/models/addComposition.ts | 6 +++++- src/commands/models/addReference.ts | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 17883bd..67409da 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -82,7 +82,7 @@ export class AddCompositionTool { await this.addCompositionField(document, modelClass.name, fieldName, innerModelName, isArray, cache); // Add required imports - const requiredImports = new Set(["Model", "Field", "Relationship", "BaseModel"]); + const requiredImports = new Set(["Model", "Field", "Relationship", "BaseModel", "UUID", "PrimaryKey"]); await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, requiredImports); // Apply the edit @@ -404,6 +404,10 @@ export class AddCompositionTool { lines.push(`})`); lines.push(`class ${innerModelName} extends BaseModel {`); lines.push(``); + lines.push(`\t@Field({})`); + lines.push(`\t@UUID()`); + lines.push(`\t@PrimaryKey()`); + lines.push(`\tid!: string`); lines.push(`}`); return lines.join("\n"); diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index c4ed885..13b7852 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -331,7 +331,7 @@ export class AddReferenceTool { const lines: string[] = []; // Add basic framework imports - lines.push(`import { Model, BaseModel, Field } from 'slingr-framework';`); + lines.push(`import { Model, BaseModel, Field, UUID, PrimaryKey } from 'slingr-framework';`); // Add datasource import if needed if (dataSource) { @@ -354,8 +354,10 @@ export class AddReferenceTool { lines.push(`export class ${modelName} extends BaseModel {`); lines.push(``); lines.push(`\t@Field({})`); - lines.push(`\tname!: string;`); - lines.push(``); + lines.push(`\t@Field({})`); + lines.push(`\t@UUID()`); + lines.push(`\t@PrimaryKey()`); + lines.push(`\tid!: string`); lines.push(`}`); lines.push(``); From bc9b042c773874742021ef09832ea081bcace006 Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 22 Sep 2025 12:50:51 -0300 Subject: [PATCH 212/254] Fixed double Fileld decorator --- src/commands/models/addReference.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index 13b7852..ebb9dec 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -354,7 +354,6 @@ export class AddReferenceTool { lines.push(`export class ${modelName} extends BaseModel {`); lines.push(``); lines.push(`\t@Field({})`); - lines.push(`\t@Field({})`); lines.push(`\t@UUID()`); lines.push(`\t@PrimaryKey()`); lines.push(`\tid!: string`); From a4e25982d4afde5a0df1c3d3bd802b3fb4fc6286 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 13:04:26 +0000 Subject: [PATCH 213/254] Initial plan From 23bdb9185bad43c0ad4fe0159e5c302fbeffea72 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 13:15:53 +0000 Subject: [PATCH 214/254] Convert repository to monorepo structure with framework, CLI, and VS Code extension Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- .gitignore | 9 +- DEVELOPMENT.md | 238 + README.md | 90 +- cli/README.md | 30 + cli/package.json | 23 + framework/README.md | 124 + {docs => framework/docs}/ManagedSchemas.md | 0 .../docs}/MultiDatabaseSupport.md | 0 index.ts => framework/index.ts | 0 jest.config.ts => framework/jest.config.ts | 0 framework/package-lock.json | 6593 +++++++++++++++++ framework/package.json | 54 + .../src}/datasources/DataSource.ts | 0 {src => framework/src}/datasources/index.ts | 0 .../datasources/typeorm/ArrayEntityFactory.ts | 0 .../datasources/typeorm/ArrayFieldManager.ts | 0 .../typeorm/DatabaseConfigBuilder.ts | 0 .../typeorm/DateTimeRangeFieldManager.ts | 0 .../typeorm/RelationshipFieldManager.ts | 0 .../typeorm/TypeORMSqlDataSource.ts | 0 .../datasources/typeorm/TypeORMTypeMapper.ts | 0 .../datasources/typeorm/ValueTransformers.ts | 0 .../src}/datasources/typeorm/index.ts | 0 {src => framework/src}/model/BaseModel.ts | 0 {src => framework/src}/model/Embedded.ts | 0 {src => framework/src}/model/Field.ts | 0 {src => framework/src}/model/Model.ts | 0 .../src}/model/PersistentComponentModel.ts | 0 .../src}/model/PersistentModel.ts | 0 {src => framework/src}/model/index.ts | 0 .../src}/model/metadata/MetadataKeys.ts | 0 .../src}/model/metadata/index.ts | 0 .../src}/model/types/FieldTypeConfig.ts | 0 .../src}/model/types/SharedTypes.ts | 0 .../src}/model/types/TypeRegistry.ts | 0 .../src}/model/types/boolean/Boolean.ts | 0 .../src}/model/types/date_time/DateTime.ts | 0 .../model/types/date_time/DateTimeRange.ts | 0 .../src}/model/types/enum/Choice.ts | 0 {src => framework/src}/model/types/index.ts | 0 .../src}/model/types/number/Decimal.ts | 0 .../src}/model/types/number/Integer.ts | 0 .../src}/model/types/number/Money.ts | 0 .../src}/model/types/number/Number.ts | 0 .../model/types/relationship/Relationship.ts | 0 .../src}/model/types/string/Email.ts | 0 .../src}/model/types/string/HTML.ts | 0 .../src}/model/types/string/Text.ts | 0 {src => framework/src}/model/types/utils.ts | 0 .../validators/CustomValidationConstraint.ts | 0 .../test}/FieldDecorator.test.ts | 0 .../ConfigurationValidation.test.ts | 0 .../test}/datasources/DataSource.test.ts | 0 .../test}/datasources/ManagedSchemas.test.ts | 0 .../MultiDatabaseOperations.test.ts | 0 .../datasources/TypeORMConnection.test.ts | 0 .../TypeORMRepositoryMethods.test.ts | 0 .../test}/debug/TransformerDebug.test.ts | 0 .../examples/SchemaMigrationDemo.test.ts | 0 .../test}/examples/TypeORMExample.test.ts | 0 .../test}/fromJSON-defaults.test.ts | 0 {test => framework/test}/model/Address.ts | 0 {test => framework/test}/model/App.ts | 0 {test => framework/test}/model/BlogPost.ts | 0 {test => framework/test}/model/Contact.ts | 0 {test => framework/test}/model/Customer.ts | 0 .../test}/model/CustomerWithAddress.ts | 0 .../test}/model/DecimalMoneyModel.ts | 0 {test => framework/test}/model/Employee.ts | 0 {test => framework/test}/model/LineItem.ts | 0 .../test}/model/NestedEmbeddingModels.ts | 0 .../test}/model/NumberIntegerModel.ts | 0 {test => framework/test}/model/Order.ts | 0 {test => framework/test}/model/Person.ts | 0 {test => framework/test}/model/PersonBase.ts | 0 {test => framework/test}/model/Product.ts | 0 {test => framework/test}/model/Project.ts | 0 {test => framework/test}/model/Task.ts | 0 .../types_tests/ArrayPersistence.test.ts | 0 .../test}/types_tests/Boolean.test.ts | 0 .../test}/types_tests/Choice.test.ts | 0 .../test}/types_tests/ComplexObjects.test.ts | 0 .../ComplexTypesPersistence.test.ts | 0 .../test}/types_tests/DateTime.test.ts | 0 .../test}/types_tests/DateTimeRange.test.ts | 0 .../types_tests/DateTimeRangeArray.test.ts | 0 .../DateTimeRangeArrayPersistence.test.ts | 0 .../test}/types_tests/DecimalAndMoney.test.ts | 0 .../test}/types_tests/Email.test.ts | 0 .../EmbeddingAndInheritance.test.ts | 0 .../test}/types_tests/HTML.test.ts | 0 .../test}/types_tests/HTMLArray.test.ts | 0 .../MultipleNestedEmbedding.test.ts | 0 .../test}/types_tests/Number.test.ts | 0 .../test}/types_tests/NumberInteger.test.ts | 0 .../test}/types_tests/Relationship.test.ts | 0 .../RelationshipPersistence.test.ts | 0 .../types_tests/SimpleComposition.test.ts | 0 .../SimpleRelationshipTest.test.ts | 0 .../types_tests/TaskArraySupport.test.ts | 0 .../test}/types_tests/Text.test.ts | 0 .../tsconfig.build.json | 0 tsconfig.json => framework/tsconfig.json | 0 package-lock.json | 5632 ++++++++++++++ package.json | 49 +- vs-code-extension/README.md | 40 + vs-code-extension/package.json | 34 + 107 files changed, 12859 insertions(+), 57 deletions(-) create mode 100644 DEVELOPMENT.md create mode 100644 cli/README.md create mode 100644 cli/package.json create mode 100644 framework/README.md rename {docs => framework/docs}/ManagedSchemas.md (100%) rename {docs => framework/docs}/MultiDatabaseSupport.md (100%) rename index.ts => framework/index.ts (100%) rename jest.config.ts => framework/jest.config.ts (100%) create mode 100644 framework/package-lock.json create mode 100644 framework/package.json rename {src => framework/src}/datasources/DataSource.ts (100%) rename {src => framework/src}/datasources/index.ts (100%) rename {src => framework/src}/datasources/typeorm/ArrayEntityFactory.ts (100%) rename {src => framework/src}/datasources/typeorm/ArrayFieldManager.ts (100%) rename {src => framework/src}/datasources/typeorm/DatabaseConfigBuilder.ts (100%) rename {src => framework/src}/datasources/typeorm/DateTimeRangeFieldManager.ts (100%) rename {src => framework/src}/datasources/typeorm/RelationshipFieldManager.ts (100%) rename {src => framework/src}/datasources/typeorm/TypeORMSqlDataSource.ts (100%) rename {src => framework/src}/datasources/typeorm/TypeORMTypeMapper.ts (100%) rename {src => framework/src}/datasources/typeorm/ValueTransformers.ts (100%) rename {src => framework/src}/datasources/typeorm/index.ts (100%) rename {src => framework/src}/model/BaseModel.ts (100%) rename {src => framework/src}/model/Embedded.ts (100%) rename {src => framework/src}/model/Field.ts (100%) rename {src => framework/src}/model/Model.ts (100%) rename {src => framework/src}/model/PersistentComponentModel.ts (100%) rename {src => framework/src}/model/PersistentModel.ts (100%) rename {src => framework/src}/model/index.ts (100%) rename {src => framework/src}/model/metadata/MetadataKeys.ts (100%) rename {src => framework/src}/model/metadata/index.ts (100%) rename {src => framework/src}/model/types/FieldTypeConfig.ts (100%) rename {src => framework/src}/model/types/SharedTypes.ts (100%) rename {src => framework/src}/model/types/TypeRegistry.ts (100%) rename {src => framework/src}/model/types/boolean/Boolean.ts (100%) rename {src => framework/src}/model/types/date_time/DateTime.ts (100%) rename {src => framework/src}/model/types/date_time/DateTimeRange.ts (100%) rename {src => framework/src}/model/types/enum/Choice.ts (100%) rename {src => framework/src}/model/types/index.ts (100%) rename {src => framework/src}/model/types/number/Decimal.ts (100%) rename {src => framework/src}/model/types/number/Integer.ts (100%) rename {src => framework/src}/model/types/number/Money.ts (100%) rename {src => framework/src}/model/types/number/Number.ts (100%) rename {src => framework/src}/model/types/relationship/Relationship.ts (100%) rename {src => framework/src}/model/types/string/Email.ts (100%) rename {src => framework/src}/model/types/string/HTML.ts (100%) rename {src => framework/src}/model/types/string/Text.ts (100%) rename {src => framework/src}/model/types/utils.ts (100%) rename {src => framework/src}/validators/CustomValidationConstraint.ts (100%) rename {test => framework/test}/FieldDecorator.test.ts (100%) rename {test => framework/test}/datasources/ConfigurationValidation.test.ts (100%) rename {test => framework/test}/datasources/DataSource.test.ts (100%) rename {test => framework/test}/datasources/ManagedSchemas.test.ts (100%) rename {test => framework/test}/datasources/MultiDatabaseOperations.test.ts (100%) rename {test => framework/test}/datasources/TypeORMConnection.test.ts (100%) rename {test => framework/test}/datasources/TypeORMRepositoryMethods.test.ts (100%) rename {test => framework/test}/debug/TransformerDebug.test.ts (100%) rename {test => framework/test}/examples/SchemaMigrationDemo.test.ts (100%) rename {test => framework/test}/examples/TypeORMExample.test.ts (100%) rename {test => framework/test}/fromJSON-defaults.test.ts (100%) rename {test => framework/test}/model/Address.ts (100%) rename {test => framework/test}/model/App.ts (100%) rename {test => framework/test}/model/BlogPost.ts (100%) rename {test => framework/test}/model/Contact.ts (100%) rename {test => framework/test}/model/Customer.ts (100%) rename {test => framework/test}/model/CustomerWithAddress.ts (100%) rename {test => framework/test}/model/DecimalMoneyModel.ts (100%) rename {test => framework/test}/model/Employee.ts (100%) rename {test => framework/test}/model/LineItem.ts (100%) rename {test => framework/test}/model/NestedEmbeddingModels.ts (100%) rename {test => framework/test}/model/NumberIntegerModel.ts (100%) rename {test => framework/test}/model/Order.ts (100%) rename {test => framework/test}/model/Person.ts (100%) rename {test => framework/test}/model/PersonBase.ts (100%) rename {test => framework/test}/model/Product.ts (100%) rename {test => framework/test}/model/Project.ts (100%) rename {test => framework/test}/model/Task.ts (100%) rename {test => framework/test}/types_tests/ArrayPersistence.test.ts (100%) rename {test => framework/test}/types_tests/Boolean.test.ts (100%) rename {test => framework/test}/types_tests/Choice.test.ts (100%) rename {test => framework/test}/types_tests/ComplexObjects.test.ts (100%) rename {test => framework/test}/types_tests/ComplexTypesPersistence.test.ts (100%) rename {test => framework/test}/types_tests/DateTime.test.ts (100%) rename {test => framework/test}/types_tests/DateTimeRange.test.ts (100%) rename {test => framework/test}/types_tests/DateTimeRangeArray.test.ts (100%) rename {test => framework/test}/types_tests/DateTimeRangeArrayPersistence.test.ts (100%) rename {test => framework/test}/types_tests/DecimalAndMoney.test.ts (100%) rename {test => framework/test}/types_tests/Email.test.ts (100%) rename {test => framework/test}/types_tests/EmbeddingAndInheritance.test.ts (100%) rename {test => framework/test}/types_tests/HTML.test.ts (100%) rename {test => framework/test}/types_tests/HTMLArray.test.ts (100%) rename {test => framework/test}/types_tests/MultipleNestedEmbedding.test.ts (100%) rename {test => framework/test}/types_tests/Number.test.ts (100%) rename {test => framework/test}/types_tests/NumberInteger.test.ts (100%) rename {test => framework/test}/types_tests/Relationship.test.ts (100%) rename {test => framework/test}/types_tests/RelationshipPersistence.test.ts (100%) rename {test => framework/test}/types_tests/SimpleComposition.test.ts (100%) rename {test => framework/test}/types_tests/SimpleRelationshipTest.test.ts (100%) rename {test => framework/test}/types_tests/TaskArraySupport.test.ts (100%) rename {test => framework/test}/types_tests/Text.test.ts (100%) rename tsconfig.build.json => framework/tsconfig.build.json (100%) rename tsconfig.json => framework/tsconfig.json (100%) create mode 100644 package-lock.json create mode 100644 vs-code-extension/README.md create mode 100644 vs-code-extension/package.json diff --git a/.gitignore b/.gitignore index 64bf07a..3afe9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ /.idea/ node_modules/ -package-lock.json dist/ prompts/ .vscode/settings.json + +# Monorepo structure +framework/node_modules/ +cli/node_modules/ +vs-code-extension/node_modules/ + +# Keep package-lock.json at root and in each package +# package-lock.json - removed this since it's needed for monorepo management diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 0000000..a2e1592 --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,238 @@ +# Slingr Monorepo Development Guide + +This document provides detailed information about working with the Slingr monorepo structure. + +## Repository Structure + +``` +slingr-framework/ +├── framework/ # Core Slingr Framework +│ ├── src/ # Framework source code +│ ├── test/ # Framework tests +│ ├── docs/ # Framework documentation +│ ├── package.json # Framework dependencies +│ └── README.md # Framework documentation +├── cli/ # Slingr CLI tool +│ ├── src/ # CLI source code (future) +│ ├── package.json # CLI dependencies +│ └── README.md # CLI documentation +├── vs-code-extension/ # VS Code extension +│ ├── src/ # Extension source code (future) +│ ├── package.json # Extension dependencies +│ └── README.md # Extension documentation +├── package.json # Monorepo workspace configuration +└── README.md # Main repository documentation +``` + +## Development Workflow + +### Initial Setup + +1. Clone the repository: + ```bash + git clone https://github.com/slingr-stack/framework.git + cd framework + ``` + +2. Install all dependencies: + ```bash + npm run install:all + ``` + +### Working on Individual Packages + +#### Framework Development + +```bash +# Navigate to framework +cd framework + +# Install dependencies (if not done via npm run install:all) +npm install + +# Run tests +npm test + +# Build +npm run build + +# Watch mode for development +npm run watch +``` + +#### CLI Development (Future) + +```bash +# Navigate to CLI +cd cli + +# Install dependencies +npm install + +# Build CLI +npm run build + +# Test CLI locally +npm link +slingr --help +``` + +#### VS Code Extension Development (Future) + +```bash +# Navigate to extension +cd vs-code-extension + +# Install dependencies +npm install + +# Build extension +npm run build + +# Run in development mode +code --extensionDevelopmentPath=. +``` + +### Monorepo Commands + +From the root directory: + +```bash +# Build all packages +npm run build + +# Run tests for all packages +npm test + +# Clean all packages +npm run clean + +# Install dependencies for all workspaces +npm run install:all + +# Run a command in a specific workspace +npm run test --workspace=framework +npm run build --workspace=cli +``` + +### Package Management + +#### Adding Dependencies + +To add dependencies to a specific package: + +```bash +# Add to framework +npm install --workspace=framework package-name + +# Add dev dependency to CLI +npm install --save-dev --workspace=cli package-name + +# Add dependency to all workspaces +npm install --workspaces package-name +``` + +#### Workspace Interdependencies + +Packages can depend on each other using workspace references: + +```json +{ + "dependencies": { + "@slingr/framework": "workspace:*" + } +} +``` + +## Migration Status + +### ✅ Completed +- [x] Monorepo structure created +- [x] Framework moved to `framework/` directory +- [x] All framework tests passing (371/387 - same as before) +- [x] Framework builds successfully +- [x] npm workspaces configuration +- [x] Root-level package management +- [x] Documentation updated + +### 🔄 In Progress +- [ ] CLI integration from existing repository +- [ ] VS Code extension integration from existing repository + +### 📋 Future Work +- [ ] Shared build configuration across packages +- [ ] Shared linting and formatting rules +- [ ] Continuous integration setup for monorepo +- [ ] Release automation for individual packages + +## Testing + +### Framework Tests +The framework maintains comprehensive test coverage with 371 passing tests. Some MySQL tests fail in the current environment due to database setup, which is expected behavior. + +### Running Specific Tests +```bash +# Run framework tests only +npm test --workspace=framework + +# Run specific test file +cd framework && npm test -- test/Text.test.ts + +# Run tests in watch mode +cd framework && npm test -- --watch +``` + +## Building + +### Framework Build +The framework builds successfully to the `framework/dist/` directory: + +```bash +npm run build --workspace=framework +``` + +### All Packages +Build all packages from root: + +```bash +npm run build +``` + +## Common Issues and Solutions + +### Node Modules +If you encounter dependency issues, try: + +```bash +# Clean all node_modules and reinstall +rm -rf node_modules framework/node_modules cli/node_modules vs-code-extension/node_modules +npm run install:all +``` + +### TypeScript Issues +Each package has its own TypeScript configuration: +- Framework: `framework/tsconfig.json` and `framework/tsconfig.build.json` +- CLI: Will have its own configuration +- VS Code Extension: Will have its own configuration + +### Testing Issues +Ensure you're running tests from the correct directory or using workspace commands. + +## Contributing + +When contributing to this monorepo: + +1. Make changes in the appropriate package directory +2. Test changes both individually and at the monorepo level +3. Update documentation if needed +4. Follow existing code style and conventions +5. Run `npm test` from root to ensure all packages work together + +## Versioning + +Each package in the monorepo can have its own version: +- Framework: Published as `slingr-framework` +- CLI: Published as `@slingr/cli` +- VS Code Extension: Published to VS Code marketplace + +The monorepo itself uses a shared version for coordination but packages can version independently. \ No newline at end of file diff --git a/README.md b/README.md index e7d2e58..e5c4481 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,97 @@ -# Slingr Framework +# Slingr Monorepo -The Slingr Framework is a powerful tool for building smart business applications. It provides a robust set of features and tools to help developers create high-quality applications quickly and efficiently. +This monorepo contains the complete Slingr ecosystem for building smart business applications: -## Features +- **Framework** - The core TypeScript framework with model validation, serialization, and field types +- **CLI** - Command-line tools for Slingr development and deployment +- **VS Code Extension** - IDE support for Slingr application development --- +## Repository Structure + +``` +├── framework/ # Core Slingr Framework (TypeScript) +├── cli/ # Slingr CLI tool +├── vs-code-extension/ # VS Code extension for Slingr +├── package.json # Monorepo workspace configuration +└── README.md # This file +``` ## Getting Started -To get started with the Slingr Framework, follow these steps: +### Prerequisites -1. **Clone the Repository**: Clone the Slingr Framework repository from GitHub. +- Node.js 18+ and npm +- TypeScript 5+ - ```bash - # Clone the repo - https://github.com/slingr-stack/framework.git +### Installation - # Navigate to directory +1. **Clone the Repository**: + ```bash + git clone https://github.com/slingr-stack/framework.git cd framework ``` -2. **Install Dependencies**: Run the following command to install the required dependencies: - +2. **Install Dependencies**: ```bash - # Install dependencies - npm install + npm run install:all ``` -3. **Run Tests**: To run the tests, use the following command: +3. **Build All Packages**: + ```bash + npm run build + ``` +4. **Run Tests**: ```bash - # Run tests npm test ``` -## Documentation +## Working with Individual Packages + +### Framework Development + +```bash +cd framework +npm install +npm test +npm run build +``` + +See [framework/README.md](framework/README.md) for detailed framework documentation. + +### CLI Development + +```bash +cd cli +npm install +npm run build +``` + +See [cli/README.md](cli/README.md) for CLI documentation. + +### VS Code Extension Development + +```bash +cd vs-code-extension +npm install +npm run build +``` + +See [vs-code-extension/README.md](vs-code-extension/README.md) for extension development guide. + +## Available Scripts + +From the root directory: --- +- `npm run build` - Build all packages +- `npm run test` - Run tests for all packages +- `npm run clean` - Clean build artifacts from all packages +- `npm run install:all` - Install dependencies for all packages ## Contributing --- +This monorepo uses npm workspaces to manage multiple packages. Each package has its own `package.json` and can be developed independently while sharing common dependencies. ## License --- \ No newline at end of file +Apache-2.0 - See [LICENSE.txt](LICENSE.txt) for details. \ No newline at end of file diff --git a/cli/README.md b/cli/README.md new file mode 100644 index 0000000..dbd523d --- /dev/null +++ b/cli/README.md @@ -0,0 +1,30 @@ +# Slingr CLI + +The Slingr CLI tool provides command-line utilities for working with Slingr applications and the framework. + +## Coming Soon + +The CLI tool will be integrated from the existing CLI repository into this monorepo structure. + +## Features (Planned) + +- Project scaffolding and generation +- Framework development utilities +- Application deployment tools +- Model and field generators + +## Installation + +```bash +npm install -g @slingr/cli +``` + +## Usage + +```bash +slingr --help +``` + +## Development + +This package is part of the Slingr monorepo. See the main README for development setup instructions. \ No newline at end of file diff --git a/cli/package.json b/cli/package.json new file mode 100644 index 0000000..fcbf551 --- /dev/null +++ b/cli/package.json @@ -0,0 +1,23 @@ +{ + "name": "@slingr/cli", + "version": "1.0.0", + "description": "Slingr CLI - Command line tools for Slingr framework", + "main": "dist/index.js", + "bin": { + "slingr": "dist/cli.js" + }, + "scripts": { + "build": "echo 'CLI build - to be implemented'", + "test": "echo 'CLI tests - to be implemented'", + "clean": "rm -rf dist" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/slingr-stack/framework.git", + "directory": "cli" + }, + "author": "Slingr", + "license": "Apache-2.0", + "dependencies": {}, + "devDependencies": {} +} \ No newline at end of file diff --git a/framework/README.md b/framework/README.md new file mode 100644 index 0000000..53603de --- /dev/null +++ b/framework/README.md @@ -0,0 +1,124 @@ +# Slingr Framework + +The Slingr Framework is a TypeScript framework for building smart business applications with robust model validation, serialization, and field type decorators. It uses class-validator for validation and class-transformer for JSON serialization. + +## Features + +- **Type-safe Models** - Strongly typed model definitions with decorators +- **Validation Engine** - Built on class-validator with custom validation support +- **JSON Serialization** - Automatic JSON conversion with class-transformer +- **Field Types** - Rich set of field decorators (@Text, @Email, @DateTime, @Money, etc.) +- **Data Sources** - TypeORM integration for database persistence +- **Relationships** - Support for model relationships and embedded objects + +## Getting Started + +### Installation + +```bash +npm install slingr-framework +``` + +### Basic Usage + +```typescript +import { BaseModel, Field, Model, Text, Email } from 'slingr-framework'; + +@Model() +class User extends BaseModel { + @Field() + @Text({ minLength: 2, maxLength: 50 }) + name?: string; + + @Field() + @Email() + email?: string; +} + +// Create and validate +const user = new User(); +user.name = "John Doe"; +user.email = "john@example.com"; + +const errors = await user.validate(); +if (errors.length === 0) { + console.log("User is valid!"); + console.log("JSON:", user.toJSON()); +} +``` + +## Field Types + +The framework provides a comprehensive set of field type decorators: + +- **Text Fields**: `@Text()`, `@Email()`, `@HTML()` +- **Numbers**: `@Integer()`, `@Decimal()`, `@Money()` +- **Dates**: `@DateTime()`, `@DateTimeRange()` +- **Choices**: `@Choice()`, `@Boolean()` +- **Relationships**: `@Reference()`, `@Composition()` + +## Data Sources + +Connect your models to databases using TypeORM: + +```typescript +import { TypeORMSqlDataSource } from 'slingr-framework'; + +const dataSource = new TypeORMSqlDataSource({ + type: "sqlite", + managed: true, + filename: "./app.db" +}); + +await dataSource.initialize(); + +@Model({ dataSource }) +class Product extends BaseModel { + @Field() + @Text({ maxLength: 100 }) + name?: string; + + @Field() + @Money({ currency: 'USD' }) + price?: number; +} +``` + +## Development + +### Prerequisites + +- Node.js 18+ +- TypeScript 5+ + +### Setup + +```bash +npm install +``` + +### Testing + +```bash +npm test +``` + +### Building + +```bash +npm run build +``` + +## Documentation + +For comprehensive documentation, examples, and API reference, see: +- [Managed Schemas Documentation](docs/ManagedSchemas.md) +- [Multi-Database Support](docs/MultiDatabaseSupport.md) + +## Contributing + +This package is part of the Slingr monorepo. Please see the main README for contribution guidelines. + +## License + +Apache-2.0 - See [LICENSE.txt](../LICENSE.txt) for details. \ No newline at end of file diff --git a/docs/ManagedSchemas.md b/framework/docs/ManagedSchemas.md similarity index 100% rename from docs/ManagedSchemas.md rename to framework/docs/ManagedSchemas.md diff --git a/docs/MultiDatabaseSupport.md b/framework/docs/MultiDatabaseSupport.md similarity index 100% rename from docs/MultiDatabaseSupport.md rename to framework/docs/MultiDatabaseSupport.md diff --git a/index.ts b/framework/index.ts similarity index 100% rename from index.ts rename to framework/index.ts diff --git a/jest.config.ts b/framework/jest.config.ts similarity index 100% rename from jest.config.ts rename to framework/jest.config.ts diff --git a/framework/package-lock.json b/framework/package-lock.json new file mode 100644 index 0000000..f664757 --- /dev/null +++ b/framework/package-lock.json @@ -0,0 +1,6593 @@ +{ + "name": "slingr-framework", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "slingr-framework", + "version": "1.0.0", + "license": "Apache-2.0", + "dependencies": { + "class-transformer": "^0.5.1", + "class-validator": "^0.14.2", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions#fix/buildScripts", + "financial-number": "^4.0.4", + "typeorm": "^0.3.26", + "uuid": "^13.0.0" + }, + "devDependencies": { + "@types/jest": "^29.5.12", + "@types/node": "^24.3.0", + "@types/sqlite3": "^3.1.11", + "@types/uuid": "^10.0.0", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", + "mysql2": "^3.11.3", + "pg": "^8.12.0", + "reflect-metadata": "^0.2.2", + "sqlite3": "^5.1.7", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz", + "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", + "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.4", + "@babel/parser": "^7.28.4", + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.4", + "@babel/types": "^7.28.4", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", + "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.27.2", + "@babel/helper-validator-option": "^7.27.1", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-globals": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", + "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", + "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.28.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", + "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", + "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", + "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.4" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", + "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", + "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", + "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", + "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.28.4", + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.4", + "debug": "^4.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@gar/promisify": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@npmcli/fs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", + "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "node_modules/@npmcli/fs/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/move-file": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", + "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@sqltools/formatter": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz", + "integrity": "sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==", + "license": "MIT" + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", + "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.2" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "29.5.14", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz", + "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "node_modules/@types/node": { + "version": "24.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz", + "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.12.0" + } + }, + "node_modules/@types/sqlite3": { + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.11.tgz", + "integrity": "sha512-KYF+QgxAnnAh7DWPdNDroxkDI3/MspH1NMx6m/N/6fT1G6+jvsw4/ZePt8R8cr7ta58aboeTfYFBDxTJ5yv15w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/validator": { + "version": "13.15.3", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.3.tgz", + "integrity": "sha512-7bcUmDyS6PN3EuD9SlGGOxM77F8WLVsrwkxyWxKnxzmXoequ6c7741QBrANq6htVRGOITJ7z72mTP6Z4XyuG+Q==", + "license": "MIT" + }, + "node_modules/@types/yargs": { + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "devOptional": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agentkeepalive": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", + "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/ansis": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/ansis/-/ansis-3.17.0.tgz", + "integrity": "sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==", + "license": "ISC", + "engines": { + "node": ">=14" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/app-root-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", + "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aproba": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", + "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/aws-ssl-profiles": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz", + "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", + "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + }, + "peerDependencies": { + "@babel/core": "^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "dev": true, + "license": "MIT", + "dependencies": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/baseline-browser-mapping": { + "version": "2.8.6", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz", + "integrity": "sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.26.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz", + "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "baseline-browser-mapping": "^2.8.3", + "caniuse-lite": "^1.0.30001741", + "electron-to-chromium": "^1.5.218", + "node-releases": "^2.0.21", + "update-browserslist-db": "^1.1.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cacache": { + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", + "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cacache/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001743", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz", + "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/class-transformer": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", + "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==", + "license": "MIT" + }, + "node_modules/class-validator": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.2.tgz", + "integrity": "sha512-3kMVRF2io8N8pY1IFIXlho9r8IPUUIfHe2hYVtiebvAzU2XeQFXTv+XI4WX+TnXmtwXMDcjngcpkiPM0O9PvLw==", + "license": "MIT", + "dependencies": { + "@types/validator": "^13.11.8", + "libphonenumber-js": "^1.11.1", + "validator": "^13.9.0" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/dayjs": { + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", + "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dedent": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz", + "integrity": "sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==", + "license": "MIT", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "devOptional": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/detect-libc": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", + "devOptional": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "devOptional": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dotenv": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.5.223", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.223.tgz", + "integrity": "sha512-qKm55ic6nbEmagFlTFczML33rF90aU+WtrJ9MdTCThrcvDNdUHN4p6QfVN78U06ZmguqXIyMPyYhw2TrbDUwPQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", + "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/error-ex": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "devOptional": true, + "license": "(MIT OR WTFPL)", + "engines": { + "node": ">=6" + } + }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/financial-arithmetic-functions": { + "version": "3.3.0", + "resolved": "git+ssh://git@github.com/slingr-stack/financial-arithmetic-functions.git#a7a0b7727c6244c2cc28ee00aa4ce00cf96ee7c8", + "license": "WTFPL" + }, + "node_modules/financial-number": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/financial-number/-/financial-number-4.0.4.tgz", + "integrity": "sha512-fFIMvx2W6yx8brbChXlRy9JdSmG4KuO8gv101AhUoZaSsKruLprWX88mgrqdNLir4y+2vUfRKWee2rbtYhH4Fg==", + "license": "WTFPL", + "dependencies": { + "financial-arithmetic-functions": "^3.2.0" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/generate-function": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", + "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "is-property": "^1.0.2" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ms": "^2.0.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/ip-address": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", + "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/libphonenumber-js": { + "version": "1.12.22", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.22.tgz", + "integrity": "sha512-nzdkDyqlcLV754o1RrOJxh8kycG+63odJVUqnK4dxhw7buNkdTqJc/a/CE0h599dTJgFbzvr6GEOemFBSBryAA==", + "license": "MIT" + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/long": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz", + "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==", + "devOptional": true, + "license": "Apache-2.0" + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/lru.min": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.2.tgz", + "integrity": "sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg==", + "devOptional": true, + "license": "MIT", + "engines": { + "bun": ">=1.0.0", + "deno": ">=1.30.0", + "node": ">=8.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wellwelwel" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/make-fetch-happen": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", + "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "agentkeepalive": "^4.1.3", + "cacache": "^15.2.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^6.0.0", + "minipass": "^3.1.3", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^1.3.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.2", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^6.0.0", + "ssri": "^8.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-fetch-happen/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "devOptional": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-fetch": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", + "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "minipass": "^3.1.0", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "optionalDependencies": { + "encoding": "^0.1.12" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "devOptional": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/mysql2": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.15.0.tgz", + "integrity": "sha512-tT6pomf5Z/I7Jzxu8sScgrYBMK9bUFWd7Kbo6Fs1L0M13OOIJ/ZobGKS3Z7tQ8Re4lj+LnLXIQVZZxa3fhYKzA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "aws-ssl-profiles": "^1.1.1", + "denque": "^2.1.0", + "generate-function": "^2.3.1", + "iconv-lite": "^0.7.0", + "long": "^5.2.1", + "lru.min": "^1.0.0", + "named-placeholders": "^1.1.3", + "seq-queue": "^0.0.5", + "sqlstring": "^2.3.2" + }, + "engines": { + "node": ">= 8.0" + } + }, + "node_modules/named-placeholders": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz", + "integrity": "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "lru-cache": "^7.14.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/named-placeholders/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-abi": { + "version": "3.77.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", + "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-abi/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "devOptional": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/node-gyp": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", + "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^9.1.0", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">= 10.12.0" + } + }, + "node_modules/node-gyp/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-releases": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", + "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", + "dev": true, + "license": "MIT" + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npmlog": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pg": { + "version": "8.16.3", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", + "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "pg-connection-string": "^2.9.1", + "pg-pool": "^3.10.1", + "pg-protocol": "^1.10.3", + "pg-types": "2.2.0", + "pgpass": "1.0.5" + }, + "engines": { + "node": ">= 16.0.0" + }, + "optionalDependencies": { + "pg-cloudflare": "^1.2.7" + }, + "peerDependencies": { + "pg-native": ">=3.0.1" + }, + "peerDependenciesMeta": { + "pg-native": { + "optional": true + } + } + }, + "node_modules/pg-cloudflare": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz", + "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/pg-connection-string": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz", + "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-pool": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz", + "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==", + "devOptional": true, + "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", + "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pgpass": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", + "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "split2": "^4.1.0" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pirates": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pump": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", + "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT" + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "devOptional": true, + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true, + "license": "MIT" + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/reflect-metadata": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "license": "Apache-2.0" + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/seq-queue": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz", + "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==", + "devOptional": true + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/sha.js": { + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", + "license": "(MIT AND BSD-3-Clause)", + "dependencies": { + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" + }, + "bin": { + "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", + "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ip-address": "^10.0.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", + "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/split2": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">= 10.x" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/sql-highlight": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/sql-highlight/-/sql-highlight-6.1.0.tgz", + "integrity": "sha512-ed7OK4e9ywpE7pgRMkMQmZDPKSVdm0oX5IEtZiKnFucSF0zu6c80GZBe38UqHuVhTWJ9xsKgSMjCG2bml86KvA==", + "funding": [ + "https://github.com/scriptcoded/sql-highlight?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/scriptcoded" + } + ], + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/sqlite3": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz", + "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==", + "devOptional": true, + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^7.0.0", + "prebuild-install": "^7.1.1", + "tar": "^6.1.11" + }, + "optionalDependencies": { + "node-gyp": "8.x" + }, + "peerDependencies": { + "node-gyp": "8.x" + }, + "peerDependenciesMeta": { + "node-gyp": { + "optional": true + } + } + }, + "node_modules/sqlstring": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz", + "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-fs": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/to-buffer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz", + "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==", + "license": "MIT", + "dependencies": { + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-jest": { + "version": "29.4.4", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.4.tgz", + "integrity": "sha512-ccVcRABct5ZELCT5U0+DZwkXMCcOCLi2doHRrKy1nK/s7J7bch6TzJMsrY09WxgUUIP/ITfmcDS8D2yl63rnXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "fast-json-stable-stringify": "^2.1.0", + "handlebars": "^4.7.8", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.2", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jest-util": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "devOptional": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typeorm": { + "version": "0.3.27", + "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.27.tgz", + "integrity": "sha512-pNV1bn+1n8qEe8tUNsNdD8ejuPcMAg47u2lUGnbsajiNUr3p2Js1XLKQjBMH0yMRMDfdX8T+fIRejFmIwy9x4A==", + "license": "MIT", + "dependencies": { + "@sqltools/formatter": "^1.2.5", + "ansis": "^3.17.0", + "app-root-path": "^3.1.0", + "buffer": "^6.0.3", + "dayjs": "^1.11.13", + "debug": "^4.4.0", + "dedent": "^1.6.0", + "dotenv": "^16.4.7", + "glob": "^10.4.5", + "sha.js": "^2.4.12", + "sql-highlight": "^6.0.0", + "tslib": "^2.8.1", + "uuid": "^11.1.0", + "yargs": "^17.7.2" + }, + "bin": { + "typeorm": "cli.js", + "typeorm-ts-node-commonjs": "cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "cli-ts-node-esm.js" + }, + "engines": { + "node": ">=16.13.0" + }, + "funding": { + "url": "https://opencollective.com/typeorm" + }, + "peerDependencies": { + "@google-cloud/spanner": "^5.18.0 || ^6.0.0 || ^7.0.0", + "@sap/hana-client": "^2.14.22", + "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0", + "ioredis": "^5.0.4", + "mongodb": "^5.8.0 || ^6.0.0", + "mssql": "^9.1.1 || ^10.0.1 || ^11.0.1", + "mysql2": "^2.2.5 || ^3.0.1", + "oracledb": "^6.3.0", + "pg": "^8.5.1", + "pg-native": "^3.0.0", + "pg-query-stream": "^4.0.0", + "redis": "^3.1.1 || ^4.0.0 || ^5.0.14", + "reflect-metadata": "^0.1.14 || ^0.2.0", + "sql.js": "^1.4.0", + "sqlite3": "^5.0.3", + "ts-node": "^10.7.0", + "typeorm-aurora-data-api-driver": "^2.0.0 || ^3.0.0" + }, + "peerDependenciesMeta": { + "@google-cloud/spanner": { + "optional": true + }, + "@sap/hana-client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "mongodb": { + "optional": true + }, + "mssql": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-native": { + "optional": true + }, + "pg-query-stream": { + "optional": true + }, + "redis": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "ts-node": { + "optional": true + }, + "typeorm-aurora-data-api-driver": { + "optional": true + } + } + }, + "node_modules/typeorm/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/typeorm/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "node_modules/typeorm/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/typeorm/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/typeorm/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/typeorm/node_modules/uuid": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/esm/bin/uuid" + } + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "devOptional": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/undici-types": { + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", + "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "node_modules/unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/uuid": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz", + "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist-node/bin/uuid" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/validator": { + "version": "13.15.15", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz", + "integrity": "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/framework/package.json b/framework/package.json new file mode 100644 index 0000000..89ee196 --- /dev/null +++ b/framework/package.json @@ -0,0 +1,54 @@ +{ + "name": "slingr-framework", + "version": "1.0.0", + "description": "Slingr Framework - Smart Business Apps", + "main": "./dist/index.js", + "files": [ + "dist/**/*", + "src/**/*", + "README.md", + "LICENSE.txt" + ], + "exports": { + ".": "./dist/index.js" + }, + "scripts": { + "test": "jest --verbose", + "watch": "tsc --project tsconfig.build.json --watch", + "build": "tsc --project tsconfig.build.json", + "prepare": "npm run build" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/slingr-stack/framework.git" + }, + "author": "Slingr", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/slingr-stack/framework/issues" + }, + "homepage": "https://github.com/slingr-stack/framework#readme", + "devDependencies": { + "@types/jest": "^29.5.12", + "@types/node": "^24.3.0", + "@types/sqlite3": "^3.1.11", + "@types/uuid": "^10.0.0", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", + "mysql2": "^3.11.3", + "pg": "^8.12.0", + "reflect-metadata": "^0.2.2", + "sqlite3": "^5.1.7", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + }, + "dependencies": { + "class-transformer": "^0.5.1", + "class-validator": "^0.14.2", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions#fix/buildScripts", + "financial-number": "^4.0.4", + "typeorm": "^0.3.26", + "uuid": "^13.0.0" + } +} diff --git a/src/datasources/DataSource.ts b/framework/src/datasources/DataSource.ts similarity index 100% rename from src/datasources/DataSource.ts rename to framework/src/datasources/DataSource.ts diff --git a/src/datasources/index.ts b/framework/src/datasources/index.ts similarity index 100% rename from src/datasources/index.ts rename to framework/src/datasources/index.ts diff --git a/src/datasources/typeorm/ArrayEntityFactory.ts b/framework/src/datasources/typeorm/ArrayEntityFactory.ts similarity index 100% rename from src/datasources/typeorm/ArrayEntityFactory.ts rename to framework/src/datasources/typeorm/ArrayEntityFactory.ts diff --git a/src/datasources/typeorm/ArrayFieldManager.ts b/framework/src/datasources/typeorm/ArrayFieldManager.ts similarity index 100% rename from src/datasources/typeorm/ArrayFieldManager.ts rename to framework/src/datasources/typeorm/ArrayFieldManager.ts diff --git a/src/datasources/typeorm/DatabaseConfigBuilder.ts b/framework/src/datasources/typeorm/DatabaseConfigBuilder.ts similarity index 100% rename from src/datasources/typeorm/DatabaseConfigBuilder.ts rename to framework/src/datasources/typeorm/DatabaseConfigBuilder.ts diff --git a/src/datasources/typeorm/DateTimeRangeFieldManager.ts b/framework/src/datasources/typeorm/DateTimeRangeFieldManager.ts similarity index 100% rename from src/datasources/typeorm/DateTimeRangeFieldManager.ts rename to framework/src/datasources/typeorm/DateTimeRangeFieldManager.ts diff --git a/src/datasources/typeorm/RelationshipFieldManager.ts b/framework/src/datasources/typeorm/RelationshipFieldManager.ts similarity index 100% rename from src/datasources/typeorm/RelationshipFieldManager.ts rename to framework/src/datasources/typeorm/RelationshipFieldManager.ts diff --git a/src/datasources/typeorm/TypeORMSqlDataSource.ts b/framework/src/datasources/typeorm/TypeORMSqlDataSource.ts similarity index 100% rename from src/datasources/typeorm/TypeORMSqlDataSource.ts rename to framework/src/datasources/typeorm/TypeORMSqlDataSource.ts diff --git a/src/datasources/typeorm/TypeORMTypeMapper.ts b/framework/src/datasources/typeorm/TypeORMTypeMapper.ts similarity index 100% rename from src/datasources/typeorm/TypeORMTypeMapper.ts rename to framework/src/datasources/typeorm/TypeORMTypeMapper.ts diff --git a/src/datasources/typeorm/ValueTransformers.ts b/framework/src/datasources/typeorm/ValueTransformers.ts similarity index 100% rename from src/datasources/typeorm/ValueTransformers.ts rename to framework/src/datasources/typeorm/ValueTransformers.ts diff --git a/src/datasources/typeorm/index.ts b/framework/src/datasources/typeorm/index.ts similarity index 100% rename from src/datasources/typeorm/index.ts rename to framework/src/datasources/typeorm/index.ts diff --git a/src/model/BaseModel.ts b/framework/src/model/BaseModel.ts similarity index 100% rename from src/model/BaseModel.ts rename to framework/src/model/BaseModel.ts diff --git a/src/model/Embedded.ts b/framework/src/model/Embedded.ts similarity index 100% rename from src/model/Embedded.ts rename to framework/src/model/Embedded.ts diff --git a/src/model/Field.ts b/framework/src/model/Field.ts similarity index 100% rename from src/model/Field.ts rename to framework/src/model/Field.ts diff --git a/src/model/Model.ts b/framework/src/model/Model.ts similarity index 100% rename from src/model/Model.ts rename to framework/src/model/Model.ts diff --git a/src/model/PersistentComponentModel.ts b/framework/src/model/PersistentComponentModel.ts similarity index 100% rename from src/model/PersistentComponentModel.ts rename to framework/src/model/PersistentComponentModel.ts diff --git a/src/model/PersistentModel.ts b/framework/src/model/PersistentModel.ts similarity index 100% rename from src/model/PersistentModel.ts rename to framework/src/model/PersistentModel.ts diff --git a/src/model/index.ts b/framework/src/model/index.ts similarity index 100% rename from src/model/index.ts rename to framework/src/model/index.ts diff --git a/src/model/metadata/MetadataKeys.ts b/framework/src/model/metadata/MetadataKeys.ts similarity index 100% rename from src/model/metadata/MetadataKeys.ts rename to framework/src/model/metadata/MetadataKeys.ts diff --git a/src/model/metadata/index.ts b/framework/src/model/metadata/index.ts similarity index 100% rename from src/model/metadata/index.ts rename to framework/src/model/metadata/index.ts diff --git a/src/model/types/FieldTypeConfig.ts b/framework/src/model/types/FieldTypeConfig.ts similarity index 100% rename from src/model/types/FieldTypeConfig.ts rename to framework/src/model/types/FieldTypeConfig.ts diff --git a/src/model/types/SharedTypes.ts b/framework/src/model/types/SharedTypes.ts similarity index 100% rename from src/model/types/SharedTypes.ts rename to framework/src/model/types/SharedTypes.ts diff --git a/src/model/types/TypeRegistry.ts b/framework/src/model/types/TypeRegistry.ts similarity index 100% rename from src/model/types/TypeRegistry.ts rename to framework/src/model/types/TypeRegistry.ts diff --git a/src/model/types/boolean/Boolean.ts b/framework/src/model/types/boolean/Boolean.ts similarity index 100% rename from src/model/types/boolean/Boolean.ts rename to framework/src/model/types/boolean/Boolean.ts diff --git a/src/model/types/date_time/DateTime.ts b/framework/src/model/types/date_time/DateTime.ts similarity index 100% rename from src/model/types/date_time/DateTime.ts rename to framework/src/model/types/date_time/DateTime.ts diff --git a/src/model/types/date_time/DateTimeRange.ts b/framework/src/model/types/date_time/DateTimeRange.ts similarity index 100% rename from src/model/types/date_time/DateTimeRange.ts rename to framework/src/model/types/date_time/DateTimeRange.ts diff --git a/src/model/types/enum/Choice.ts b/framework/src/model/types/enum/Choice.ts similarity index 100% rename from src/model/types/enum/Choice.ts rename to framework/src/model/types/enum/Choice.ts diff --git a/src/model/types/index.ts b/framework/src/model/types/index.ts similarity index 100% rename from src/model/types/index.ts rename to framework/src/model/types/index.ts diff --git a/src/model/types/number/Decimal.ts b/framework/src/model/types/number/Decimal.ts similarity index 100% rename from src/model/types/number/Decimal.ts rename to framework/src/model/types/number/Decimal.ts diff --git a/src/model/types/number/Integer.ts b/framework/src/model/types/number/Integer.ts similarity index 100% rename from src/model/types/number/Integer.ts rename to framework/src/model/types/number/Integer.ts diff --git a/src/model/types/number/Money.ts b/framework/src/model/types/number/Money.ts similarity index 100% rename from src/model/types/number/Money.ts rename to framework/src/model/types/number/Money.ts diff --git a/src/model/types/number/Number.ts b/framework/src/model/types/number/Number.ts similarity index 100% rename from src/model/types/number/Number.ts rename to framework/src/model/types/number/Number.ts diff --git a/src/model/types/relationship/Relationship.ts b/framework/src/model/types/relationship/Relationship.ts similarity index 100% rename from src/model/types/relationship/Relationship.ts rename to framework/src/model/types/relationship/Relationship.ts diff --git a/src/model/types/string/Email.ts b/framework/src/model/types/string/Email.ts similarity index 100% rename from src/model/types/string/Email.ts rename to framework/src/model/types/string/Email.ts diff --git a/src/model/types/string/HTML.ts b/framework/src/model/types/string/HTML.ts similarity index 100% rename from src/model/types/string/HTML.ts rename to framework/src/model/types/string/HTML.ts diff --git a/src/model/types/string/Text.ts b/framework/src/model/types/string/Text.ts similarity index 100% rename from src/model/types/string/Text.ts rename to framework/src/model/types/string/Text.ts diff --git a/src/model/types/utils.ts b/framework/src/model/types/utils.ts similarity index 100% rename from src/model/types/utils.ts rename to framework/src/model/types/utils.ts diff --git a/src/validators/CustomValidationConstraint.ts b/framework/src/validators/CustomValidationConstraint.ts similarity index 100% rename from src/validators/CustomValidationConstraint.ts rename to framework/src/validators/CustomValidationConstraint.ts diff --git a/test/FieldDecorator.test.ts b/framework/test/FieldDecorator.test.ts similarity index 100% rename from test/FieldDecorator.test.ts rename to framework/test/FieldDecorator.test.ts diff --git a/test/datasources/ConfigurationValidation.test.ts b/framework/test/datasources/ConfigurationValidation.test.ts similarity index 100% rename from test/datasources/ConfigurationValidation.test.ts rename to framework/test/datasources/ConfigurationValidation.test.ts diff --git a/test/datasources/DataSource.test.ts b/framework/test/datasources/DataSource.test.ts similarity index 100% rename from test/datasources/DataSource.test.ts rename to framework/test/datasources/DataSource.test.ts diff --git a/test/datasources/ManagedSchemas.test.ts b/framework/test/datasources/ManagedSchemas.test.ts similarity index 100% rename from test/datasources/ManagedSchemas.test.ts rename to framework/test/datasources/ManagedSchemas.test.ts diff --git a/test/datasources/MultiDatabaseOperations.test.ts b/framework/test/datasources/MultiDatabaseOperations.test.ts similarity index 100% rename from test/datasources/MultiDatabaseOperations.test.ts rename to framework/test/datasources/MultiDatabaseOperations.test.ts diff --git a/test/datasources/TypeORMConnection.test.ts b/framework/test/datasources/TypeORMConnection.test.ts similarity index 100% rename from test/datasources/TypeORMConnection.test.ts rename to framework/test/datasources/TypeORMConnection.test.ts diff --git a/test/datasources/TypeORMRepositoryMethods.test.ts b/framework/test/datasources/TypeORMRepositoryMethods.test.ts similarity index 100% rename from test/datasources/TypeORMRepositoryMethods.test.ts rename to framework/test/datasources/TypeORMRepositoryMethods.test.ts diff --git a/test/debug/TransformerDebug.test.ts b/framework/test/debug/TransformerDebug.test.ts similarity index 100% rename from test/debug/TransformerDebug.test.ts rename to framework/test/debug/TransformerDebug.test.ts diff --git a/test/examples/SchemaMigrationDemo.test.ts b/framework/test/examples/SchemaMigrationDemo.test.ts similarity index 100% rename from test/examples/SchemaMigrationDemo.test.ts rename to framework/test/examples/SchemaMigrationDemo.test.ts diff --git a/test/examples/TypeORMExample.test.ts b/framework/test/examples/TypeORMExample.test.ts similarity index 100% rename from test/examples/TypeORMExample.test.ts rename to framework/test/examples/TypeORMExample.test.ts diff --git a/test/fromJSON-defaults.test.ts b/framework/test/fromJSON-defaults.test.ts similarity index 100% rename from test/fromJSON-defaults.test.ts rename to framework/test/fromJSON-defaults.test.ts diff --git a/test/model/Address.ts b/framework/test/model/Address.ts similarity index 100% rename from test/model/Address.ts rename to framework/test/model/Address.ts diff --git a/test/model/App.ts b/framework/test/model/App.ts similarity index 100% rename from test/model/App.ts rename to framework/test/model/App.ts diff --git a/test/model/BlogPost.ts b/framework/test/model/BlogPost.ts similarity index 100% rename from test/model/BlogPost.ts rename to framework/test/model/BlogPost.ts diff --git a/test/model/Contact.ts b/framework/test/model/Contact.ts similarity index 100% rename from test/model/Contact.ts rename to framework/test/model/Contact.ts diff --git a/test/model/Customer.ts b/framework/test/model/Customer.ts similarity index 100% rename from test/model/Customer.ts rename to framework/test/model/Customer.ts diff --git a/test/model/CustomerWithAddress.ts b/framework/test/model/CustomerWithAddress.ts similarity index 100% rename from test/model/CustomerWithAddress.ts rename to framework/test/model/CustomerWithAddress.ts diff --git a/test/model/DecimalMoneyModel.ts b/framework/test/model/DecimalMoneyModel.ts similarity index 100% rename from test/model/DecimalMoneyModel.ts rename to framework/test/model/DecimalMoneyModel.ts diff --git a/test/model/Employee.ts b/framework/test/model/Employee.ts similarity index 100% rename from test/model/Employee.ts rename to framework/test/model/Employee.ts diff --git a/test/model/LineItem.ts b/framework/test/model/LineItem.ts similarity index 100% rename from test/model/LineItem.ts rename to framework/test/model/LineItem.ts diff --git a/test/model/NestedEmbeddingModels.ts b/framework/test/model/NestedEmbeddingModels.ts similarity index 100% rename from test/model/NestedEmbeddingModels.ts rename to framework/test/model/NestedEmbeddingModels.ts diff --git a/test/model/NumberIntegerModel.ts b/framework/test/model/NumberIntegerModel.ts similarity index 100% rename from test/model/NumberIntegerModel.ts rename to framework/test/model/NumberIntegerModel.ts diff --git a/test/model/Order.ts b/framework/test/model/Order.ts similarity index 100% rename from test/model/Order.ts rename to framework/test/model/Order.ts diff --git a/test/model/Person.ts b/framework/test/model/Person.ts similarity index 100% rename from test/model/Person.ts rename to framework/test/model/Person.ts diff --git a/test/model/PersonBase.ts b/framework/test/model/PersonBase.ts similarity index 100% rename from test/model/PersonBase.ts rename to framework/test/model/PersonBase.ts diff --git a/test/model/Product.ts b/framework/test/model/Product.ts similarity index 100% rename from test/model/Product.ts rename to framework/test/model/Product.ts diff --git a/test/model/Project.ts b/framework/test/model/Project.ts similarity index 100% rename from test/model/Project.ts rename to framework/test/model/Project.ts diff --git a/test/model/Task.ts b/framework/test/model/Task.ts similarity index 100% rename from test/model/Task.ts rename to framework/test/model/Task.ts diff --git a/test/types_tests/ArrayPersistence.test.ts b/framework/test/types_tests/ArrayPersistence.test.ts similarity index 100% rename from test/types_tests/ArrayPersistence.test.ts rename to framework/test/types_tests/ArrayPersistence.test.ts diff --git a/test/types_tests/Boolean.test.ts b/framework/test/types_tests/Boolean.test.ts similarity index 100% rename from test/types_tests/Boolean.test.ts rename to framework/test/types_tests/Boolean.test.ts diff --git a/test/types_tests/Choice.test.ts b/framework/test/types_tests/Choice.test.ts similarity index 100% rename from test/types_tests/Choice.test.ts rename to framework/test/types_tests/Choice.test.ts diff --git a/test/types_tests/ComplexObjects.test.ts b/framework/test/types_tests/ComplexObjects.test.ts similarity index 100% rename from test/types_tests/ComplexObjects.test.ts rename to framework/test/types_tests/ComplexObjects.test.ts diff --git a/test/types_tests/ComplexTypesPersistence.test.ts b/framework/test/types_tests/ComplexTypesPersistence.test.ts similarity index 100% rename from test/types_tests/ComplexTypesPersistence.test.ts rename to framework/test/types_tests/ComplexTypesPersistence.test.ts diff --git a/test/types_tests/DateTime.test.ts b/framework/test/types_tests/DateTime.test.ts similarity index 100% rename from test/types_tests/DateTime.test.ts rename to framework/test/types_tests/DateTime.test.ts diff --git a/test/types_tests/DateTimeRange.test.ts b/framework/test/types_tests/DateTimeRange.test.ts similarity index 100% rename from test/types_tests/DateTimeRange.test.ts rename to framework/test/types_tests/DateTimeRange.test.ts diff --git a/test/types_tests/DateTimeRangeArray.test.ts b/framework/test/types_tests/DateTimeRangeArray.test.ts similarity index 100% rename from test/types_tests/DateTimeRangeArray.test.ts rename to framework/test/types_tests/DateTimeRangeArray.test.ts diff --git a/test/types_tests/DateTimeRangeArrayPersistence.test.ts b/framework/test/types_tests/DateTimeRangeArrayPersistence.test.ts similarity index 100% rename from test/types_tests/DateTimeRangeArrayPersistence.test.ts rename to framework/test/types_tests/DateTimeRangeArrayPersistence.test.ts diff --git a/test/types_tests/DecimalAndMoney.test.ts b/framework/test/types_tests/DecimalAndMoney.test.ts similarity index 100% rename from test/types_tests/DecimalAndMoney.test.ts rename to framework/test/types_tests/DecimalAndMoney.test.ts diff --git a/test/types_tests/Email.test.ts b/framework/test/types_tests/Email.test.ts similarity index 100% rename from test/types_tests/Email.test.ts rename to framework/test/types_tests/Email.test.ts diff --git a/test/types_tests/EmbeddingAndInheritance.test.ts b/framework/test/types_tests/EmbeddingAndInheritance.test.ts similarity index 100% rename from test/types_tests/EmbeddingAndInheritance.test.ts rename to framework/test/types_tests/EmbeddingAndInheritance.test.ts diff --git a/test/types_tests/HTML.test.ts b/framework/test/types_tests/HTML.test.ts similarity index 100% rename from test/types_tests/HTML.test.ts rename to framework/test/types_tests/HTML.test.ts diff --git a/test/types_tests/HTMLArray.test.ts b/framework/test/types_tests/HTMLArray.test.ts similarity index 100% rename from test/types_tests/HTMLArray.test.ts rename to framework/test/types_tests/HTMLArray.test.ts diff --git a/test/types_tests/MultipleNestedEmbedding.test.ts b/framework/test/types_tests/MultipleNestedEmbedding.test.ts similarity index 100% rename from test/types_tests/MultipleNestedEmbedding.test.ts rename to framework/test/types_tests/MultipleNestedEmbedding.test.ts diff --git a/test/types_tests/Number.test.ts b/framework/test/types_tests/Number.test.ts similarity index 100% rename from test/types_tests/Number.test.ts rename to framework/test/types_tests/Number.test.ts diff --git a/test/types_tests/NumberInteger.test.ts b/framework/test/types_tests/NumberInteger.test.ts similarity index 100% rename from test/types_tests/NumberInteger.test.ts rename to framework/test/types_tests/NumberInteger.test.ts diff --git a/test/types_tests/Relationship.test.ts b/framework/test/types_tests/Relationship.test.ts similarity index 100% rename from test/types_tests/Relationship.test.ts rename to framework/test/types_tests/Relationship.test.ts diff --git a/test/types_tests/RelationshipPersistence.test.ts b/framework/test/types_tests/RelationshipPersistence.test.ts similarity index 100% rename from test/types_tests/RelationshipPersistence.test.ts rename to framework/test/types_tests/RelationshipPersistence.test.ts diff --git a/test/types_tests/SimpleComposition.test.ts b/framework/test/types_tests/SimpleComposition.test.ts similarity index 100% rename from test/types_tests/SimpleComposition.test.ts rename to framework/test/types_tests/SimpleComposition.test.ts diff --git a/test/types_tests/SimpleRelationshipTest.test.ts b/framework/test/types_tests/SimpleRelationshipTest.test.ts similarity index 100% rename from test/types_tests/SimpleRelationshipTest.test.ts rename to framework/test/types_tests/SimpleRelationshipTest.test.ts diff --git a/test/types_tests/TaskArraySupport.test.ts b/framework/test/types_tests/TaskArraySupport.test.ts similarity index 100% rename from test/types_tests/TaskArraySupport.test.ts rename to framework/test/types_tests/TaskArraySupport.test.ts diff --git a/test/types_tests/Text.test.ts b/framework/test/types_tests/Text.test.ts similarity index 100% rename from test/types_tests/Text.test.ts rename to framework/test/types_tests/Text.test.ts diff --git a/tsconfig.build.json b/framework/tsconfig.build.json similarity index 100% rename from tsconfig.build.json rename to framework/tsconfig.build.json diff --git a/tsconfig.json b/framework/tsconfig.json similarity index 100% rename from tsconfig.json rename to framework/tsconfig.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..c414fe6 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,5632 @@ +{ + "name": "slingr-monorepo", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "slingr-monorepo", + "version": "1.0.0", + "license": "Apache-2.0", + "workspaces": [ + "framework", + "cli", + "vs-code-extension" + ], + "devDependencies": { + "typescript": "^5.9.2" + } + }, + "cli": { + "name": "@slingr/cli", + "version": "1.0.0", + "license": "Apache-2.0", + "bin": { + "slingr": "dist/cli.js" + }, + "devDependencies": {} + }, + "framework": { + "name": "slingr-framework", + "version": "1.0.0", + "license": "Apache-2.0", + "dependencies": { + "class-transformer": "^0.5.1", + "class-validator": "^0.14.2", + "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions#fix/buildScripts", + "financial-number": "^4.0.4", + "typeorm": "^0.3.26", + "uuid": "^13.0.0" + }, + "devDependencies": { + "@types/jest": "^29.5.12", + "@types/node": "^24.3.0", + "@types/sqlite3": "^3.1.11", + "@types/uuid": "^10.0.0", + "jest": "^29.7.0", + "jest-circus": "^29.7.0", + "mysql2": "^3.11.3", + "pg": "^8.12.0", + "reflect-metadata": "^0.2.2", + "sqlite3": "^5.1.7", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + } + }, + "framework/node_modules/@babel/code-frame": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/compat-data": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/core": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.4", + "@babel/parser": "^7.28.4", + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.4", + "@babel/types": "^7.28.4", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "framework/node_modules/@babel/generator": { + "version": "7.28.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-compilation-targets": { + "version": "7.27.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.27.2", + "@babel/helper-validator-option": "^7.27.1", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-globals": { + "version": "7.28.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-module-imports": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-module-transforms": { + "version": "7.28.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.28.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "framework/node_modules/@babel/helper-plugin-utils": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-validator-identifier": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helper-validator-option": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/helpers": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/parser": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.4" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "framework/node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-jsx": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/plugin-syntax-typescript": { + "version": "7.27.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "framework/node_modules/@babel/template": { + "version": "7.27.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/traverse": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.28.4", + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.4", + "debug": "^4.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@babel/types": { + "version": "7.28.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "framework/node_modules/@gar/promisify": { + "version": "1.1.3", + "dev": true, + "license": "MIT", + "optional": true + }, + "framework/node_modules/@isaacs/cliui": { + "version": "8.0.2", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "framework/node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.3", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "framework/node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "license": "MIT" + }, + "framework/node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "framework/node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "framework/node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/@jest/console": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/core": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "framework/node_modules/@jest/environment": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/expect": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/expect-utils": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/fake-timers": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/globals": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/reporters": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "framework/node_modules/@jest/schemas": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/source-map": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/test-result": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/transform": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jest/types": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "framework/node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "framework/node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "framework/node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "framework/node_modules/@npmcli/fs": { + "version": "1.1.1", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "framework/node_modules/@npmcli/fs/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/@npmcli/move-file": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "framework/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/@sinonjs/commons": { + "version": "3.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "framework/node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "framework/node_modules/@sqltools/formatter": { + "version": "1.2.5", + "license": "MIT" + }, + "framework/node_modules/@tootallnate/once": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/@tsconfig/node10": { + "version": "1.0.11", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/@tsconfig/node12": { + "version": "1.0.11", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/@tsconfig/node14": { + "version": "1.0.3", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/@tsconfig/node16": { + "version": "1.0.4", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/@types/babel__core": { + "version": "7.20.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "framework/node_modules/@types/babel__generator": { + "version": "7.27.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "framework/node_modules/@types/babel__template": { + "version": "7.4.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "framework/node_modules/@types/babel__traverse": { + "version": "7.28.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.2" + } + }, + "framework/node_modules/@types/graceful-fs": { + "version": "4.1.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "framework/node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "framework/node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "framework/node_modules/@types/jest": { + "version": "29.5.14", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "framework/node_modules/@types/node": { + "version": "24.5.2", + "devOptional": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.12.0" + } + }, + "framework/node_modules/@types/sqlite3": { + "version": "3.1.11", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "framework/node_modules/@types/stack-utils": { + "version": "2.0.3", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/@types/uuid": { + "version": "10.0.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/@types/validator": { + "version": "13.15.3", + "license": "MIT" + }, + "framework/node_modules/@types/yargs": { + "version": "17.0.33", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "framework/node_modules/@types/yargs-parser": { + "version": "21.0.3", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/abbrev": { + "version": "1.1.1", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/acorn": { + "version": "8.15.0", + "devOptional": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "framework/node_modules/acorn-walk": { + "version": "8.3.4", + "devOptional": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "framework/node_modules/agent-base": { + "version": "6.0.2", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "framework/node_modules/agentkeepalive": { + "version": "4.6.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "framework/node_modules/aggregate-error": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/ansi-escapes": { + "version": "4.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/ansi-regex": { + "version": "5.0.1", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/ansi-styles": { + "version": "4.3.0", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "framework/node_modules/ansis": { + "version": "3.17.0", + "license": "ISC", + "engines": { + "node": ">=14" + } + }, + "framework/node_modules/anymatch": { + "version": "3.1.3", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/app-root-path": { + "version": "3.1.0", + "license": "MIT", + "engines": { + "node": ">= 6.0.0" + } + }, + "framework/node_modules/aproba": { + "version": "2.1.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/are-we-there-yet": { + "version": "3.0.1", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "framework/node_modules/arg": { + "version": "4.1.3", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/argparse": { + "version": "1.0.10", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "framework/node_modules/available-typed-arrays": { + "version": "1.0.7", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/aws-ssl-profiles": { + "version": "1.1.2", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">= 6.0.0" + } + }, + "framework/node_modules/babel-jest": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "framework/node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/babel-preset-current-node-syntax": { + "version": "1.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + }, + "peerDependencies": { + "@babel/core": "^7.0.0 || ^8.0.0-0" + } + }, + "framework/node_modules/babel-preset-jest": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "framework/node_modules/balanced-match": { + "version": "1.0.2", + "license": "MIT" + }, + "framework/node_modules/base64-js": { + "version": "1.5.1", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "framework/node_modules/baseline-browser-mapping": { + "version": "2.8.6", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, + "framework/node_modules/bindings": { + "version": "1.5.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "framework/node_modules/bl": { + "version": "4.1.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "framework/node_modules/brace-expansion": { + "version": "1.1.12", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "framework/node_modules/braces": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/browserslist": { + "version": "4.26.2", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "baseline-browser-mapping": "^2.8.3", + "caniuse-lite": "^1.0.30001741", + "electron-to-chromium": "^1.5.218", + "node-releases": "^2.0.21", + "update-browserslist-db": "^1.1.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "framework/node_modules/bs-logger": { + "version": "0.2.6", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/bser": { + "version": "2.1.1", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "framework/node_modules/buffer": { + "version": "5.7.1", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "framework/node_modules/buffer-from": { + "version": "1.1.2", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/cacache": { + "version": "15.3.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "engines": { + "node": ">= 10" + } + }, + "framework/node_modules/cacache/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/cacache/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/call-bind": { + "version": "1.0.8", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/call-bound": { + "version": "1.0.4", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/callsites": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/camelcase": { + "version": "5.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/caniuse-lite": { + "version": "1.0.30001743", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "framework/node_modules/chalk": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "framework/node_modules/char-regex": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/chownr": { + "version": "2.0.0", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/ci-info": { + "version": "3.9.0", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/cjs-module-lexer": { + "version": "1.4.3", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/class-transformer": { + "version": "0.5.1", + "license": "MIT" + }, + "framework/node_modules/class-validator": { + "version": "0.14.2", + "license": "MIT", + "dependencies": { + "@types/validator": "^13.11.8", + "libphonenumber-js": "^1.11.1", + "validator": "^13.9.0" + } + }, + "framework/node_modules/clean-stack": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/cliui": { + "version": "8.0.1", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/co": { + "version": "4.6.0", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "framework/node_modules/collect-v8-coverage": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/color-convert": { + "version": "2.0.1", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "framework/node_modules/color-name": { + "version": "1.1.4", + "license": "MIT" + }, + "framework/node_modules/color-support": { + "version": "1.1.3", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "color-support": "bin.js" + } + }, + "framework/node_modules/concat-map": { + "version": "0.0.1", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/console-control-strings": { + "version": "1.1.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/convert-source-map": { + "version": "2.0.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/create-jest": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/create-require": { + "version": "1.1.1", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/cross-spawn": { + "version": "7.0.6", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/dayjs": { + "version": "1.11.18", + "license": "MIT" + }, + "framework/node_modules/debug": { + "version": "4.4.3", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "framework/node_modules/decompress-response": { + "version": "6.0.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/dedent": { + "version": "1.7.0", + "license": "MIT", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "framework/node_modules/deep-extend": { + "version": "0.6.0", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "framework/node_modules/deepmerge": { + "version": "4.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/define-data-property": { + "version": "1.1.4", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/delegates": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "optional": true + }, + "framework/node_modules/denque": { + "version": "2.1.0", + "devOptional": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" + } + }, + "framework/node_modules/detect-libc": { + "version": "2.1.0", + "devOptional": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/detect-newline": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/diff": { + "version": "4.0.2", + "devOptional": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "framework/node_modules/diff-sequences": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/dotenv": { + "version": "16.6.1", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "framework/node_modules/dunder-proto": { + "version": "1.0.1", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/eastasianwidth": { + "version": "0.2.0", + "license": "MIT" + }, + "framework/node_modules/electron-to-chromium": { + "version": "1.5.223", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/emittery": { + "version": "0.13.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "framework/node_modules/emoji-regex": { + "version": "8.0.0", + "license": "MIT" + }, + "framework/node_modules/encoding": { + "version": "0.1.13", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "framework/node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/end-of-stream": { + "version": "1.4.5", + "devOptional": true, + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "framework/node_modules/env-paths": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/err-code": { + "version": "2.0.3", + "dev": true, + "license": "MIT", + "optional": true + }, + "framework/node_modules/error-ex": { + "version": "1.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "framework/node_modules/es-define-property": { + "version": "1.0.1", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/es-errors": { + "version": "1.3.0", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/es-object-atoms": { + "version": "1.1.1", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/escalade": { + "version": "3.2.0", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/escape-string-regexp": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/esprima": { + "version": "4.0.1", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "framework/node_modules/execa": { + "version": "5.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "framework/node_modules/exit": { + "version": "0.1.2", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "framework/node_modules/expand-template": { + "version": "2.0.3", + "devOptional": true, + "license": "(MIT OR WTFPL)", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/expect": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/fb-watchman": { + "version": "2.0.2", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bser": "2.1.1" + } + }, + "framework/node_modules/file-uri-to-path": { + "version": "1.0.0", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/fill-range": { + "version": "7.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/financial-number": { + "version": "4.0.4", + "license": "WTFPL", + "dependencies": { + "financial-arithmetic-functions": "^3.2.0" + } + }, + "framework/node_modules/find-up": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/for-each": { + "version": "0.3.5", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/foreground-child": { + "version": "3.3.1", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/fs-constants": { + "version": "1.0.0", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/fs-minipass": { + "version": "2.1.0", + "devOptional": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/fs.realpath": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/function-bind": { + "version": "1.1.2", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/gauge": { + "version": "4.0.4", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "framework/node_modules/generate-function": { + "version": "2.3.1", + "devOptional": true, + "license": "MIT", + "dependencies": { + "is-property": "^1.0.2" + } + }, + "framework/node_modules/gensync": { + "version": "1.0.0-beta.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "framework/node_modules/get-caller-file": { + "version": "2.0.5", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "framework/node_modules/get-intrinsic": { + "version": "1.3.0", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/get-package-type": { + "version": "0.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "framework/node_modules/get-proto": { + "version": "1.0.1", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/get-stream": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/github-from-package": { + "version": "0.0.0", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/glob": { + "version": "7.2.3", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/gopd": { + "version": "1.2.0", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/graceful-fs": { + "version": "4.2.11", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/handlebars": { + "version": "4.7.8", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "framework/node_modules/has-flag": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/has-property-descriptors": { + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/has-symbols": { + "version": "1.1.0", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/has-tostringtag": { + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/has-unicode": { + "version": "2.0.1", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/hasown": { + "version": "2.0.2", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/html-escaper": { + "version": "2.0.2", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/http-cache-semantics": { + "version": "4.2.0", + "dev": true, + "license": "BSD-2-Clause", + "optional": true + }, + "framework/node_modules/http-proxy-agent": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/https-proxy-agent": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/human-signals": { + "version": "2.1.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "framework/node_modules/humanize-ms": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ms": "^2.0.0" + } + }, + "framework/node_modules/iconv-lite": { + "version": "0.7.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "framework/node_modules/ieee754": { + "version": "1.2.1", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "framework/node_modules/import-local": { + "version": "3.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/imurmurhash": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "framework/node_modules/indent-string": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/infer-owner": { + "version": "1.0.4", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/inflight": { + "version": "1.0.6", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "framework/node_modules/inherits": { + "version": "2.0.4", + "license": "ISC" + }, + "framework/node_modules/ini": { + "version": "1.3.8", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/ip-address": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "framework/node_modules/is-arrayish": { + "version": "0.2.1", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/is-callable": { + "version": "1.2.7", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/is-core-module": { + "version": "2.16.1", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/is-generator-fn": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/is-lambda": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "optional": true + }, + "framework/node_modules/is-number": { + "version": "7.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "framework/node_modules/is-property": { + "version": "1.0.2", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/is-stream": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/is-typed-array": { + "version": "1.1.15", + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/isarray": { + "version": "2.0.5", + "license": "MIT" + }, + "framework/node_modules/isexe": { + "version": "2.0.0", + "license": "ISC" + }, + "framework/node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/istanbul-lib-report": { + "version": "3.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/istanbul-reports": { + "version": "3.2.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/jackspeak": { + "version": "3.4.3", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "framework/node_modules/jest": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "framework/node_modules/jest-changed-files": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-circus": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-cli": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "framework/node_modules/jest-config": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "framework/node_modules/jest-diff": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-docblock": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-each": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-environment-node": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-get-type": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-haste-map": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "framework/node_modules/jest-leak-detector": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-matcher-utils": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-message-util": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-mock": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "framework/node_modules/jest-regex-util": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-resolve": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-runner": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-runtime": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-snapshot": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-snapshot/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/jest-util": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-validate": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/jest-watcher": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-worker": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "framework/node_modules/js-tokens": { + "version": "4.0.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/js-yaml": { + "version": "3.14.1", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "framework/node_modules/jsesc": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/json5": { + "version": "2.2.3", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/kleur": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/leven": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/libphonenumber-js": { + "version": "1.12.22", + "license": "MIT" + }, + "framework/node_modules/lines-and-columns": { + "version": "1.2.4", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/locate-path": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/lodash.memoize": { + "version": "4.1.2", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/long": { + "version": "5.3.2", + "devOptional": true, + "license": "Apache-2.0" + }, + "framework/node_modules/lru-cache": { + "version": "5.1.1", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "framework/node_modules/lru.min": { + "version": "1.1.2", + "devOptional": true, + "license": "MIT", + "engines": { + "bun": ">=1.0.0", + "deno": ">=1.30.0", + "node": ">=8.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wellwelwel" + } + }, + "framework/node_modules/make-dir": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/make-dir/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/make-error": { + "version": "1.3.6", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/make-fetch-happen": { + "version": "9.1.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "agentkeepalive": "^4.1.3", + "cacache": "^15.2.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^6.0.0", + "minipass": "^3.1.3", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^1.3.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.2", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^6.0.0", + "ssri": "^8.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "framework/node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/make-fetch-happen/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/makeerror": { + "version": "1.0.12", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tmpl": "1.0.5" + } + }, + "framework/node_modules/math-intrinsics": { + "version": "1.1.0", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/merge-stream": { + "version": "2.0.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/micromatch": { + "version": "4.0.8", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "framework/node_modules/mimic-fn": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/mimic-response": { + "version": "3.1.0", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/minimatch": { + "version": "3.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "framework/node_modules/minimist": { + "version": "1.2.8", + "devOptional": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/minipass": { + "version": "3.3.6", + "devOptional": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/minipass-collect": { + "version": "1.0.2", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/minipass-fetch": { + "version": "1.4.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "minipass": "^3.1.0", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "optionalDependencies": { + "encoding": "^0.1.12" + } + }, + "framework/node_modules/minipass-flush": { + "version": "1.0.5", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/minipass-pipeline": { + "version": "1.2.4", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/minipass-sized": { + "version": "1.0.3", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/minipass/node_modules/yallist": { + "version": "4.0.0", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/minizlib": { + "version": "2.1.2", + "devOptional": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/mkdirp": { + "version": "1.0.4", + "devOptional": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/mkdirp-classic": { + "version": "0.5.3", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/ms": { + "version": "2.1.3", + "license": "MIT" + }, + "framework/node_modules/mysql2": { + "version": "3.15.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "aws-ssl-profiles": "^1.1.1", + "denque": "^2.1.0", + "generate-function": "^2.3.1", + "iconv-lite": "^0.7.0", + "long": "^5.2.1", + "lru.min": "^1.0.0", + "named-placeholders": "^1.1.3", + "seq-queue": "^0.0.5", + "sqlstring": "^2.3.2" + }, + "engines": { + "node": ">= 8.0" + } + }, + "framework/node_modules/named-placeholders": { + "version": "1.1.3", + "devOptional": true, + "license": "MIT", + "dependencies": { + "lru-cache": "^7.14.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "framework/node_modules/named-placeholders/node_modules/lru-cache": { + "version": "7.18.3", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/napi-build-utils": { + "version": "2.0.0", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/natural-compare": { + "version": "1.4.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/negotiator": { + "version": "0.6.4", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "framework/node_modules/neo-async": { + "version": "2.6.2", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/node-abi": { + "version": "3.77.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/node-abi/node_modules/semver": { + "version": "7.7.2", + "devOptional": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/node-addon-api": { + "version": "7.1.1", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/node-gyp": { + "version": "8.4.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^9.1.0", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">= 10.12.0" + } + }, + "framework/node_modules/node-gyp/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/node-int64": { + "version": "0.4.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/node-releases": { + "version": "2.0.21", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/nopt": { + "version": "5.0.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/normalize-path": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/npm-run-path": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/npmlog": { + "version": "6.0.2", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "framework/node_modules/once": { + "version": "1.4.0", + "devOptional": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "framework/node_modules/onetime": { + "version": "5.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/p-limit": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/p-locate": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/p-map": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/p-try": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/package-json-from-dist": { + "version": "1.0.1", + "license": "BlueOak-1.0.0" + }, + "framework/node_modules/parse-json": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/path-exists": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/path-is-absolute": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/path-key": { + "version": "3.1.1", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/path-parse": { + "version": "1.0.7", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/path-scurry": { + "version": "1.11.1", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "license": "ISC" + }, + "framework/node_modules/path-scurry/node_modules/minipass": { + "version": "7.1.2", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "framework/node_modules/pg": { + "version": "8.16.3", + "devOptional": true, + "license": "MIT", + "dependencies": { + "pg-connection-string": "^2.9.1", + "pg-pool": "^3.10.1", + "pg-protocol": "^1.10.3", + "pg-types": "2.2.0", + "pgpass": "1.0.5" + }, + "engines": { + "node": ">= 16.0.0" + }, + "optionalDependencies": { + "pg-cloudflare": "^1.2.7" + }, + "peerDependencies": { + "pg-native": ">=3.0.1" + }, + "peerDependenciesMeta": { + "pg-native": { + "optional": true + } + } + }, + "framework/node_modules/pg-cloudflare": { + "version": "1.2.7", + "dev": true, + "license": "MIT", + "optional": true + }, + "framework/node_modules/pg-connection-string": { + "version": "2.9.1", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/pg-int8": { + "version": "1.0.1", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "framework/node_modules/pg-pool": { + "version": "3.10.1", + "devOptional": true, + "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "framework/node_modules/pg-protocol": { + "version": "1.10.3", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/pg-types": { + "version": "2.2.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "framework/node_modules/pgpass": { + "version": "1.0.5", + "devOptional": true, + "license": "MIT", + "dependencies": { + "split2": "^4.1.0" + } + }, + "framework/node_modules/picocolors": { + "version": "1.1.1", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/picomatch": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "framework/node_modules/pirates": { + "version": "4.0.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/pkg-dir": { + "version": "4.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/possible-typed-array-names": { + "version": "1.1.0", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/postgres-array": { + "version": "2.0.0", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "framework/node_modules/postgres-bytea": { + "version": "1.0.0", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/postgres-date": { + "version": "1.0.7", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/postgres-interval": { + "version": "1.2.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/prebuild-install": { + "version": "7.1.3", + "devOptional": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/pretty-format": { + "version": "29.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "framework/node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "framework/node_modules/promise-inflight": { + "version": "1.0.1", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/promise-retry": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/prompts": { + "version": "2.4.2", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/pump": { + "version": "3.0.3", + "devOptional": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "framework/node_modules/pure-rand": { + "version": "6.1.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT" + }, + "framework/node_modules/rc": { + "version": "1.2.8", + "devOptional": true, + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "framework/node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/react-is": { + "version": "18.3.1", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/readable-stream": { + "version": "3.6.2", + "devOptional": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "framework/node_modules/reflect-metadata": { + "version": "0.2.2", + "license": "Apache-2.0" + }, + "framework/node_modules/require-directory": { + "version": "2.1.1", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/resolve": { + "version": "1.22.10", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/resolve-cwd": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/resolve-from": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/resolve.exports": { + "version": "2.0.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/retry": { + "version": "0.12.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "framework/node_modules/rimraf": { + "version": "3.0.2", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/safe-buffer": { + "version": "5.2.1", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "framework/node_modules/safer-buffer": { + "version": "2.1.2", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/semver": { + "version": "6.3.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "framework/node_modules/seq-queue": { + "version": "0.0.5", + "devOptional": true + }, + "framework/node_modules/set-blocking": { + "version": "2.0.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "framework/node_modules/set-function-length": { + "version": "1.2.2", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/sha.js": { + "version": "2.4.12", + "license": "(MIT AND BSD-3-Clause)", + "dependencies": { + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" + }, + "bin": { + "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/shebang-command": { + "version": "2.0.0", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/shebang-regex": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/signal-exit": { + "version": "3.0.7", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/simple-concat": { + "version": "1.0.1", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "framework/node_modules/simple-get": { + "version": "4.0.1", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "framework/node_modules/sisteransi": { + "version": "1.0.5", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/slash": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/smart-buffer": { + "version": "4.2.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "framework/node_modules/socks": { + "version": "2.8.7", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ip-address": "^10.0.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "framework/node_modules/socks-proxy-agent": { + "version": "6.2.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "framework/node_modules/source-map": { + "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "framework/node_modules/source-map-support": { + "version": "0.5.13", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "framework/node_modules/split2": { + "version": "4.2.0", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">= 10.x" + } + }, + "framework/node_modules/sprintf-js": { + "version": "1.0.3", + "dev": true, + "license": "BSD-3-Clause" + }, + "framework/node_modules/sql-highlight": { + "version": "6.1.0", + "funding": [ + "https://github.com/scriptcoded/sql-highlight?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/scriptcoded" + } + ], + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "framework/node_modules/sqlite3": { + "version": "5.1.7", + "devOptional": true, + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^7.0.0", + "prebuild-install": "^7.1.1", + "tar": "^6.1.11" + }, + "optionalDependencies": { + "node-gyp": "8.x" + }, + "peerDependencies": { + "node-gyp": "8.x" + }, + "peerDependenciesMeta": { + "node-gyp": { + "optional": true + } + } + }, + "framework/node_modules/sqlstring": { + "version": "2.3.3", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "framework/node_modules/ssri": { + "version": "8.0.1", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/stack-utils": { + "version": "2.0.6", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/string_decoder": { + "version": "1.3.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "framework/node_modules/string-length": { + "version": "4.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/string-width": { + "version": "4.2.3", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/strip-ansi": { + "version": "6.0.1", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/strip-bom": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/strip-final-newline": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/strip-json-comments": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/supports-color": { + "version": "7.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/tar": { + "version": "6.2.1", + "devOptional": true, + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/tar-fs": { + "version": "2.1.4", + "devOptional": true, + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "framework/node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/tar-stream": { + "version": "2.2.0", + "devOptional": true, + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "devOptional": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/test-exclude": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "framework/node_modules/tmpl": { + "version": "1.0.5", + "dev": true, + "license": "BSD-3-Clause" + }, + "framework/node_modules/to-buffer": { + "version": "1.2.1", + "license": "MIT", + "dependencies": { + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/to-regex-range": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "framework/node_modules/ts-jest": { + "version": "29.4.4", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "fast-json-stable-stringify": "^2.1.0", + "handlebars": "^4.7.8", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.2", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jest-util": { + "optional": true + } + } + }, + "framework/node_modules/ts-jest/node_modules/semver": { + "version": "7.7.2", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/ts-node": { + "version": "10.9.2", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "framework/node_modules/tslib": { + "version": "2.8.1", + "license": "0BSD" + }, + "framework/node_modules/tunnel-agent": { + "version": "0.6.0", + "devOptional": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "framework/node_modules/type-detect": { + "version": "4.0.8", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "framework/node_modules/type-fest": { + "version": "0.21.3", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "framework/node_modules/typed-array-buffer": { + "version": "1.0.3", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "framework/node_modules/typeorm": { + "version": "0.3.27", + "license": "MIT", + "dependencies": { + "@sqltools/formatter": "^1.2.5", + "ansis": "^3.17.0", + "app-root-path": "^3.1.0", + "buffer": "^6.0.3", + "dayjs": "^1.11.13", + "debug": "^4.4.0", + "dedent": "^1.6.0", + "dotenv": "^16.4.7", + "glob": "^10.4.5", + "sha.js": "^2.4.12", + "sql-highlight": "^6.0.0", + "tslib": "^2.8.1", + "uuid": "^11.1.0", + "yargs": "^17.7.2" + }, + "bin": { + "typeorm": "cli.js", + "typeorm-ts-node-commonjs": "cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "cli-ts-node-esm.js" + }, + "engines": { + "node": ">=16.13.0" + }, + "funding": { + "url": "https://opencollective.com/typeorm" + }, + "peerDependencies": { + "@google-cloud/spanner": "^5.18.0 || ^6.0.0 || ^7.0.0", + "@sap/hana-client": "^2.14.22", + "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0", + "ioredis": "^5.0.4", + "mongodb": "^5.8.0 || ^6.0.0", + "mssql": "^9.1.1 || ^10.0.1 || ^11.0.1", + "mysql2": "^2.2.5 || ^3.0.1", + "oracledb": "^6.3.0", + "pg": "^8.5.1", + "pg-native": "^3.0.0", + "pg-query-stream": "^4.0.0", + "redis": "^3.1.1 || ^4.0.0 || ^5.0.14", + "reflect-metadata": "^0.1.14 || ^0.2.0", + "sql.js": "^1.4.0", + "sqlite3": "^5.0.3", + "ts-node": "^10.7.0", + "typeorm-aurora-data-api-driver": "^2.0.0 || ^3.0.0" + }, + "peerDependenciesMeta": { + "@google-cloud/spanner": { + "optional": true + }, + "@sap/hana-client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "mongodb": { + "optional": true + }, + "mssql": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-native": { + "optional": true + }, + "pg-query-stream": { + "optional": true + }, + "redis": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "ts-node": { + "optional": true + }, + "typeorm-aurora-data-api-driver": { + "optional": true + } + } + }, + "framework/node_modules/typeorm/node_modules/brace-expansion": { + "version": "2.0.2", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "framework/node_modules/typeorm/node_modules/buffer": { + "version": "6.0.3", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "framework/node_modules/typeorm/node_modules/glob": { + "version": "10.4.5", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/typeorm/node_modules/minimatch": { + "version": "9.0.5", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "framework/node_modules/typeorm/node_modules/minipass": { + "version": "7.1.2", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "framework/node_modules/typeorm/node_modules/uuid": { + "version": "11.1.0", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/esm/bin/uuid" + } + }, + "framework/node_modules/uglify-js": { + "version": "3.19.3", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "framework/node_modules/undici-types": { + "version": "7.12.0", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/unique-filename": { + "version": "1.1.1", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "framework/node_modules/unique-slug": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, + "framework/node_modules/update-browserslist-db": { + "version": "1.1.3", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "framework/node_modules/util-deprecate": { + "version": "1.0.2", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/uuid": { + "version": "13.0.0", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist-node/bin/uuid" + } + }, + "framework/node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "devOptional": true, + "license": "MIT" + }, + "framework/node_modules/v8-to-istanbul": { + "version": "9.3.0", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "framework/node_modules/validator": { + "version": "13.15.15", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "framework/node_modules/walker": { + "version": "1.0.8", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "makeerror": "1.0.12" + } + }, + "framework/node_modules/which": { + "version": "2.0.2", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "framework/node_modules/which-typed-array": { + "version": "1.1.19", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "framework/node_modules/wide-align": { + "version": "1.1.5", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "framework/node_modules/wordwrap": { + "version": "1.0.0", + "dev": true, + "license": "MIT" + }, + "framework/node_modules/wrap-ansi": { + "version": "7.0.0", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "framework/node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "framework/node_modules/wrappy": { + "version": "1.0.2", + "devOptional": true, + "license": "ISC" + }, + "framework/node_modules/write-file-atomic": { + "version": "4.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "framework/node_modules/xtend": { + "version": "4.0.2", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "framework/node_modules/y18n": { + "version": "5.0.8", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "framework/node_modules/yallist": { + "version": "3.1.1", + "dev": true, + "license": "ISC" + }, + "framework/node_modules/yargs": { + "version": "17.7.2", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/yargs-parser": { + "version": "21.1.1", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "framework/node_modules/yn": { + "version": "3.1.1", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "framework/node_modules/yocto-queue": { + "version": "0.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@slingr/cli": { + "resolved": "cli", + "link": true + }, + "node_modules/@slingr/vscode-extension": { + "resolved": "vs-code-extension", + "link": true + }, + "node_modules/financial-arithmetic-functions": { + "version": "3.3.0", + "resolved": "git+ssh://git@github.com/slingr-stack/financial-arithmetic-functions.git#a7a0b7727c6244c2cc28ee00aa4ce00cf96ee7c8", + "license": "WTFPL" + }, + "node_modules/slingr-framework": { + "resolved": "framework", + "link": true + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "devOptional": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "vs-code-extension": { + "name": "@slingr/vscode-extension", + "version": "1.0.0", + "license": "Apache-2.0", + "devDependencies": {}, + "engines": { + "vscode": "^1.60.0" + } + } + } +} diff --git a/package.json b/package.json index 89ee196..b344a50 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,19 @@ { - "name": "slingr-framework", + "name": "slingr-monorepo", "version": "1.0.0", - "description": "Slingr Framework - Smart Business Apps", - "main": "./dist/index.js", - "files": [ - "dist/**/*", - "src/**/*", - "README.md", - "LICENSE.txt" + "description": "Slingr Monorepo - Framework, CLI, and VS Code Extension", + "private": true, + "workspaces": [ + "framework", + "cli", + "vs-code-extension" ], - "exports": { - ".": "./dist/index.js" - }, "scripts": { - "test": "jest --verbose", - "watch": "tsc --project tsconfig.build.json --watch", - "build": "tsc --project tsconfig.build.json", - "prepare": "npm run build" + "build": "npm run build --workspaces", + "test": "npm run test --workspaces", + "lint": "npm run lint --workspaces --if-present", + "install:all": "npm install && npm install --workspaces", + "clean": "npm run clean --workspaces --if-present" }, "repository": { "type": "git", @@ -29,26 +26,6 @@ }, "homepage": "https://github.com/slingr-stack/framework#readme", "devDependencies": { - "@types/jest": "^29.5.12", - "@types/node": "^24.3.0", - "@types/sqlite3": "^3.1.11", - "@types/uuid": "^10.0.0", - "jest": "^29.7.0", - "jest-circus": "^29.7.0", - "mysql2": "^3.11.3", - "pg": "^8.12.0", - "reflect-metadata": "^0.2.2", - "sqlite3": "^5.1.7", - "ts-jest": "^29.2.5", - "ts-node": "^10.9.2", "typescript": "^5.9.2" - }, - "dependencies": { - "class-transformer": "^0.5.1", - "class-validator": "^0.14.2", - "financial-arithmetic-functions": "https://github.com/slingr-stack/financial-arithmetic-functions#fix/buildScripts", - "financial-number": "^4.0.4", - "typeorm": "^0.3.26", - "uuid": "^13.0.0" } -} +} \ No newline at end of file diff --git a/vs-code-extension/README.md b/vs-code-extension/README.md new file mode 100644 index 0000000..f786409 --- /dev/null +++ b/vs-code-extension/README.md @@ -0,0 +1,40 @@ +# Slingr VS Code Extension + +The Slingr VS Code Extension provides IDE support for developing Slingr applications. + +## Coming Soon + +The VS Code extension will be integrated from the existing extension repository into this monorepo structure. + +## Features (Planned) + +- Syntax highlighting for Slingr models +- IntelliSense and code completion +- Integrated framework documentation +- Project templates and scaffolding +- Built-in testing and debugging support + +## Installation + +Install from the Visual Studio Code Marketplace: + +1. Open VS Code +2. Go to Extensions (Ctrl+Shift+X) +3. Search for "Slingr" +4. Click Install + +## Development + +This package is part of the Slingr monorepo. See the main README for development setup instructions. + +### Building the Extension + +```bash +npm run build +``` + +### Testing + +```bash +npm test +``` \ No newline at end of file diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json new file mode 100644 index 0000000..ecc98be --- /dev/null +++ b/vs-code-extension/package.json @@ -0,0 +1,34 @@ +{ + "name": "@slingr/vscode-extension", + "displayName": "Slingr", + "description": "VS Code extension for Slingr framework development", + "version": "1.0.0", + "publisher": "slingr", + "engines": { + "vscode": "^1.60.0" + }, + "categories": [ + "Programming Languages", + "Snippets", + "Other" + ], + "activationEvents": [ + "onLanguage:typescript", + "onLanguage:javascript" + ], + "main": "./dist/extension.js", + "scripts": { + "build": "echo 'VS Code extension build - to be implemented'", + "test": "echo 'VS Code extension tests - to be implemented'", + "clean": "rm -rf dist" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/slingr-stack/framework.git", + "directory": "vs-code-extension" + }, + "author": "Slingr", + "license": "Apache-2.0", + "dependencies": {}, + "devDependencies": {} +} \ No newline at end of file From 4a44ff28c8109260956108b4d7404a19f1bacea5 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 10:19:58 -0300 Subject: [PATCH 215/254] remove fields capitalization on the explorer --- src/explorer/explorerProvider.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/explorer/explorerProvider.ts b/src/explorer/explorerProvider.ts index 436d492..631f1d1 100644 --- a/src/explorer/explorerProvider.ts +++ b/src/explorer/explorerProvider.ts @@ -711,9 +711,9 @@ export class ExplorerProvider ) { const relationshipType = this.extractBaseTypeFromArrayType(field.type); const relatedModel = this.cache.getDataModelClasses().find((model) => model.name === relationshipType); - const upperFieldName = field.name.charAt(0).toUpperCase() + field.name.slice(1); + const compositionItem = new AppTreeItem( - upperFieldName, + field.name, vscode.TreeItemCollapsibleState.Collapsed, "compositionField", this.extensionUri, @@ -972,7 +972,6 @@ export class ExplorerProvider } private mapPropertyToTreeItem(propData: PropertyMetadata, itemType: string, parent?: AppTreeItem): AppTreeItem { - const upperFieldName = propData.name.charAt(0).toUpperCase() + propData.name.slice(1); // Check if this is a reference field and adjust the itemType accordingly let actualItemType = itemType; @@ -986,7 +985,7 @@ export class ExplorerProvider } const item = new AppTreeItem( - upperFieldName, + propData.name, vscode.TreeItemCollapsibleState.None, actualItemType, this.extensionUri, From 2dcb8cd04b7892e65c4605b93587b65286f861e0 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 10:56:52 -0300 Subject: [PATCH 216/254] fix model docs --- src/commands/models/newModel.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 92a44c2..1ed7a35 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -236,15 +236,18 @@ export class NewModelTool implements AIEnhancedTool { lines.push("import { BaseModel } from 'slingr-framework';"); lines.push(""); - // Add documentation comment if provided + // Add Model decorator with docs if provided if (docs) { - lines.push("/**"); - lines.push(` * ${docs}`); - lines.push(" */"); + // Escape single quotes in the docs string to prevent breaking the code + const escapedDocs = docs.replace(/'/g, "\\'"); + lines.push(`@Model({`); + lines.push(` docs: '${escapedDocs}'`); + lines.push(`})`); + } + else { + // Add Model decorator + lines.push(`@Model()`); } - - // Add Model decorator - lines.push(`@Model()`); // Add class declaration lines.push(`export class ${modelName} extends BaseModel {`); From a9580f3ac291c87ddc035ccb70ea1645d0c933ae Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 11:06:40 -0300 Subject: [PATCH 217/254] fix command to create model not triggering from a folder or root node in the explorer --- src/commands/commandRegistration.ts | 12 ++++-------- src/commands/models/newModel.ts | 28 +++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/commands/commandRegistration.ts b/src/commands/commandRegistration.ts index 701930b..ef7fe9b 100644 --- a/src/commands/commandRegistration.ts +++ b/src/commands/commandRegistration.ts @@ -69,14 +69,10 @@ export function registerGeneralCommands( // New Model Tool const newModelTool = new NewModelTool(); - registerCommand( - disposables, - 'slingr-vscode-extension.newModel', - async (result: UriResolutionResult) => { - await newModelTool.createNewModel(result.targetUri, cache); - }, - URI_OPTIONS.ANY_FILE - ); + const newModelCommand = vscode.commands.registerCommand('slingr-vscode-extension.newModel', (uri?: vscode.Uri | AppTreeItem) => { + return newModelTool.createNewModel(uri, cache); + }); + disposables.push(newModelCommand); // Define Fields Tool const defineFieldsTool = new DefineFieldsTool(); diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 1ed7a35..b431516 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -69,11 +69,11 @@ export class NewModelTool implements AIEnhancedTool { /** * Creates a new model file in the specified directory. * - * @param targetUri - The URI where the new model should be created (file, folder, or AppTreeItem) + * @param targetUri - The URI where the new model should be created (file, folder, or AppTreeItem) - optional * @param cache - The metadata cache for context about existing models (optional) * @returns Promise that resolves when the model is created */ - public async createNewModel(targetUri: vscode.Uri | AppTreeItem, cache?: MetadataCache): Promise { + public async createNewModel(targetUri?: vscode.Uri | AppTreeItem, cache?: MetadataCache): Promise { let finalTargetUri: vscode.Uri; let parentModelInfo: { name: string; filePath: string } | null = null; @@ -82,9 +82,31 @@ export class NewModelTool implements AIEnhancedTool { // Detect if we're coming from a model context parentModelInfo = this.detectParentModel(targetUri, cache); finalTargetUri = this.fileSystemService.resolveTargetUri(targetUri); - } else { + } else if (targetUri) { // Handle vscode.Uri case finalTargetUri = this.fileSystemService.resolveTargetUri(targetUri); + } else { + // Handle undefined case - use workspace folder or a default location + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (workspaceFolder) { + // Try to use src/data folder if it exists, otherwise create it or use workspace root + const srcDataPath = vscode.Uri.joinPath(workspaceFolder.uri, 'src', 'data'); + try { + await vscode.workspace.fs.stat(srcDataPath); + finalTargetUri = srcDataPath; + } catch { + // src/data doesn't exist, try to create it + try { + await vscode.workspace.fs.createDirectory(srcDataPath); + finalTargetUri = srcDataPath; + } catch { + // Can't create src/data, use workspace root + finalTargetUri = workspaceFolder.uri; + } + } + } else { + throw new Error('No workspace folder is open. Please open a workspace folder first.'); + } } try { // Step 1: Get model name from user From 60b1e7b8f467407d6554545cc8bffbc42f1f94a9 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 11:11:18 -0300 Subject: [PATCH 218/254] remove user confirmation when creating a model with fields --- src/commands/fields/defineFields.ts | 7 +++++-- src/commands/models/newModel.ts | 2 +- src/services/aiService.ts | 26 ++++++++++++++++++-------- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/commands/fields/defineFields.ts b/src/commands/fields/defineFields.ts index 12a3d2a..abb8ce8 100644 --- a/src/commands/fields/defineFields.ts +++ b/src/commands/fields/defineFields.ts @@ -27,20 +27,23 @@ export class DefineFieldsTool { * @param targetModelUri - URI of the model file where fields will be added * @param cache - Metadata cache for context about existing models and fields * @param modelName - Name of the target model class + * @param autoExecute - Whether to automatically execute the AI prompt without user confirmation * @returns Promise that resolves when fields are processed and added */ public async processFieldDescriptions( fieldsDescription: string, targetModelUri: vscode.Uri, cache: MetadataCache, - modelName: string + modelName: string, + autoExecute: boolean = false ): Promise { try { this.aiService.defineFieldsWithAI( fieldsDescription, targetModelUri, cache, - modelName + modelName, + autoExecute ); } catch (error) { diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index b431516..6bd5ff1 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -198,7 +198,7 @@ export class NewModelTool implements AIEnhancedTool { // Give the cache a moment to process the new file await new Promise((resolve) => setTimeout(resolve, 500)); - await this.defineFieldsTool.processFieldDescriptions(fieldsInfo.trim(), targetFileUri, cache, modelName); + await this.defineFieldsTool.processFieldDescriptions(fieldsInfo.trim(), targetFileUri, cache, modelName, true); } catch (fieldError) { console.warn("Failed to process field descriptions:", fieldError); vscode.window.showWarningMessage( diff --git a/src/services/aiService.ts b/src/services/aiService.ts index e9338f6..79c142b 100644 --- a/src/services/aiService.ts +++ b/src/services/aiService.ts @@ -75,7 +75,8 @@ export class AIService { fieldsDescription: string, targetModelUri: vscode.Uri, cache: MetadataCache, - modelName: string + modelName: string, + autoExecute: boolean = false ): Promise { try { // Step 1: Gather application context @@ -88,16 +89,25 @@ export class AIService { const prompt = this.generateDefineFieldsPrompt(fieldsDescription, appContext, modelContext); // Step 4: Request AI field generation - const action = await vscode.window.showInformationMessage( - "AI Field Generation: An AI prompt has been prepared. Do you want to execute it in the chat view?", - "Execute Prompt" - ); - - if (action === "Execute Prompt") { + if (autoExecute) { + // Automatically execute the AI prompt without user confirmation await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + } else { + // Ask for user confirmation before executing + const action = await vscode.window.showInformationMessage( + "AI Field Generation: An AI prompt has been prepared. Do you want to execute it in the chat view?", + "Execute Prompt" + ); + + if (action === "Execute Prompt") { + await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + } } - vscode.window.showInformationMessage(`Fields successfully generated for ${modelName}!`); + // Only show success message if not auto-executing (since the calling code will handle messaging) + if (!autoExecute) { + vscode.window.showInformationMessage(`Fields successfully generated for ${modelName}!`); + } } catch (error) { vscode.window.showErrorMessage(`Failed to process field descriptions: ${error}`); console.error("Error processing field descriptions:", error); From a70df9b6e61bd83500645cb9a699e7d8d71b9574 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 11:25:44 -0300 Subject: [PATCH 219/254] change decorator Field() to not be create wth "{}" --- src/commands/fields/addField.ts | 2 +- src/commands/fields/changeCompositionToReference.ts | 2 +- src/commands/fields/changeReferenceToComposition.ts | 2 +- src/commands/fields/extractFieldsToComposition.ts | 2 +- src/commands/fields/extractFieldsToReference.ts | 2 +- src/commands/models/addComposition.ts | 4 ++-- src/commands/models/addReference.ts | 4 ++-- src/commands/models/newModel.ts | 2 +- src/services/aiService.ts | 10 +++++----- src/test/addComposition.test.ts | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index 9929981..f48d33b 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -557,7 +557,7 @@ export class AddFieldTool implements AIEnhancedTool { lines.push(" required: true"); lines.push("})"); } else { - lines.push("@Field({})"); + lines.push("@Field()"); } // Add type-specific decorator diff --git a/src/commands/fields/changeCompositionToReference.ts b/src/commands/fields/changeCompositionToReference.ts index 4b82ae4..5e6d2be 100644 --- a/src/commands/fields/changeCompositionToReference.ts +++ b/src/commands/fields/changeCompositionToReference.ts @@ -517,7 +517,7 @@ export class ChangeCompositionToReferenceTool { const lines: string[] = []; // Add Field decorator - lines.push("@Field({})"); + lines.push("@Field()"); // Add Reference decorator lines.push("@Reference()"); diff --git a/src/commands/fields/changeReferenceToComposition.ts b/src/commands/fields/changeReferenceToComposition.ts index 7035536..30f2ccd 100644 --- a/src/commands/fields/changeReferenceToComposition.ts +++ b/src/commands/fields/changeReferenceToComposition.ts @@ -502,7 +502,7 @@ export class ChangeReferenceToCompositionTool { const lines: string[] = []; // Add Field decorator - lines.push("@Field({})"); + lines.push("@Field()"); // Add Composition decorator lines.push("@Composition()"); diff --git a/src/commands/fields/extractFieldsToComposition.ts b/src/commands/fields/extractFieldsToComposition.ts index 120fba6..f504097 100644 --- a/src/commands/fields/extractFieldsToComposition.ts +++ b/src/commands/fields/extractFieldsToComposition.ts @@ -390,7 +390,7 @@ export class ExtractFieldsToCompositionTool extends ExtractFieldsController { lines.push(" required: true"); lines.push("})"); } else { - lines.push("@Field({})"); + lines.push("@Field()"); } // Add Composition decorator diff --git a/src/commands/fields/extractFieldsToReference.ts b/src/commands/fields/extractFieldsToReference.ts index bee5c3a..23fade0 100644 --- a/src/commands/fields/extractFieldsToReference.ts +++ b/src/commands/fields/extractFieldsToReference.ts @@ -317,7 +317,7 @@ export class ExtractFieldsToReferenceTool extends ExtractFieldsController { const lines: string[] = []; // Add Field decorator - lines.push(" @Field({})"); + lines.push(" @Field()"); // Add Reference decorator lines.push(" @Reference()"); diff --git a/src/commands/models/addComposition.ts b/src/commands/models/addComposition.ts index 67409da..a1bccf5 100644 --- a/src/commands/models/addComposition.ts +++ b/src/commands/models/addComposition.ts @@ -404,7 +404,7 @@ export class AddCompositionTool { lines.push(`})`); lines.push(`class ${innerModelName} extends BaseModel {`); lines.push(``); - lines.push(`\t@Field({})`); + lines.push(`\t@Field()`); lines.push(`\t@UUID()`); lines.push(`\t@PrimaryKey()`); lines.push(`\tid!: string`); @@ -457,7 +457,7 @@ export class AddCompositionTool { const lines: string[] = []; // Add Field decorator - lines.push("@Field({})"); + lines.push("@Field()"); // Add Relationship decorator lines.push("@Composition()"); diff --git a/src/commands/models/addReference.ts b/src/commands/models/addReference.ts index ebb9dec..72c7b14 100644 --- a/src/commands/models/addReference.ts +++ b/src/commands/models/addReference.ts @@ -353,7 +353,7 @@ export class AddReferenceTool { } lines.push(`export class ${modelName} extends BaseModel {`); lines.push(``); - lines.push(`\t@Field({})`); + lines.push(`\t@Field()`); lines.push(`\t@UUID()`); lines.push(`\t@PrimaryKey()`); lines.push(`\tid!: string`); @@ -409,7 +409,7 @@ export class AddReferenceTool { const lines: string[] = []; // Add Field decorator - lines.push("@Field({})"); + lines.push("@Field()"); // Add Relationship decorator for reference lines.push("@Reference()"); diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 6bd5ff1..8cf83e2 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -27,7 +27,7 @@ import path from "path"; * } * * // If created from a Project model context, automatically adds to Project: - * @Field({}) + * @Field() * @Relationship({ * type: 'composition' * }) diff --git a/src/services/aiService.ts b/src/services/aiService.ts index 79c142b..ab58180 100644 --- a/src/services/aiService.ts +++ b/src/services/aiService.ts @@ -286,25 +286,25 @@ Example output format: @Text() title!: string; -@Field({}) +@Field() @Text() description!: string; -@Field({}) +@Field() @Relationship() customer!: Customer; -@Field({}) +@Field() @Date() date!: Date; -@Field({}) +@Field() @Relationship({ type: 'composition' }) project!: Project; -@Field({}) +@Field() @Choice() status: ProjectStatus = ProjectStatus.Planning; \`\`\` diff --git a/src/test/addComposition.test.ts b/src/test/addComposition.test.ts index 101890f..d1ef796 100644 --- a/src/test/addComposition.test.ts +++ b/src/test/addComposition.test.ts @@ -235,7 +235,7 @@ export class Address { const result = generateCompositionFieldCode(fieldInfo, 'Address', true); - const expected = `@Field({}) + const expected = `@Field() @Relationship({ type: 'composition' }) @@ -267,7 +267,7 @@ addresses!: Address[];`; const result = generateCompositionFieldCode(fieldInfo, 'Profile', false); - const expected = `@Field({}) + const expected = `@Field() @Relationship({ type: 'composition' }) @@ -313,7 +313,7 @@ profile!: Profile;`; // Verify the composition field was added assert.ok(modifiedContent.includes('addresses'), 'Composition field name should be in the modified content'); - assert.ok(modifiedContent.includes('@Field({})'), 'Field decorator should be present'); + assert.ok(modifiedContent.includes('@Field()'), 'Field decorator should be present'); assert.ok(modifiedContent.includes('@Composition()'), 'Composition decorator should be present'); assert.ok(modifiedContent.includes('addresses!: Address[]'), 'Field declaration should be present'); From 44cbec532425f525c874f08651497a229d8b4078 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 11:29:39 -0300 Subject: [PATCH 220/254] fix typo in HTML decorator --- src/commands/interfaces.ts | 2 +- src/utils/fieldTypes.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/interfaces.ts b/src/commands/interfaces.ts index 44ed54c..342b25b 100644 --- a/src/commands/interfaces.ts +++ b/src/commands/interfaces.ts @@ -72,7 +72,7 @@ export const FIELD_TYPE_OPTIONS: FieldTypeOption[] = [ }, { label: "HTML", - decorator: "Html", + decorator: "HTML", tsType: "string", description: "Rich text content with HTML support" }, diff --git a/src/utils/fieldTypes.ts b/src/utils/fieldTypes.ts index 198c22a..3e0df32 100644 --- a/src/utils/fieldTypes.ts +++ b/src/utils/fieldTypes.ts @@ -86,7 +86,7 @@ export const fieldTypeConfig: Record = { ], buildDecoratorString: genericBuildDecoratorString }, - 'Html': { + 'HTML': { requiredTsType: 'string', supportedArgs: [ { name: 'docs', type: 'string' }, From a16407e2bac8fc6f263c0ce16b6c3833f6ac1931 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 11:57:55 -0300 Subject: [PATCH 221/254] added correct types based in the framework --- src/commands/interfaces.ts | 68 +++++++++++++++-------- src/utils/fieldTypes.ts | 108 +++++++++++++++++++++++++++++-------- 2 files changed, 133 insertions(+), 43 deletions(-) diff --git a/src/commands/interfaces.ts b/src/commands/interfaces.ts index 342b25b..db197a1 100644 --- a/src/commands/interfaces.ts +++ b/src/commands/interfaces.ts @@ -56,19 +56,13 @@ export const FIELD_TYPE_OPTIONS: FieldTypeOption[] = [ label: "Text", decorator: "Text", tsType: "string", - description: "Short text field (up to 255 characters)" - }, - { - label: "Long Text", - decorator: "LongText", - tsType: "string", - description: "Long text field for large content" + description: "Short text field with optional length and regex validation" }, { label: "Email", decorator: "Email", tsType: "string", - description: "Email address with validation" + description: "Email address with built-in validation" }, { label: "HTML", @@ -80,25 +74,37 @@ export const FIELD_TYPE_OPTIONS: FieldTypeOption[] = [ label: "Integer", decorator: "Integer", tsType: "number", - description: "Whole number field" + description: "Whole number field with optional range constraints" + }, + { + label: "Number", + decorator: "Number", + tsType: "number", + description: "Floating-point number field with optional constraints" + }, + { + label: "Decimal", + decorator: "Decimal", + tsType: "number", + description: "Decimal number with precision and scale control" }, { label: "Money", decorator: "Money", - tsType: "number", - description: "Currency amount field" + tsType: "Money", + description: "Monetary value with precision control and rounding" }, { - label: "Date", - decorator: "Date", + label: "Date Time", + decorator: "DateTime", tsType: "Date", - description: "Date field" + description: "Date and time field with optional range constraints" }, { - label: "Date Range", - decorator: "DateRange", - tsType: "DateRange", - description: "Date range field" + label: "Date Time Range", + decorator: "DateTimeRange", + tsType: "DateTimeRangeValue", + description: "Date and time range field with timezone support" }, { label: "Boolean", @@ -109,14 +115,32 @@ export const FIELD_TYPE_OPTIONS: FieldTypeOption[] = [ { label: "Choice", decorator: "Choice", - tsType: "string", // Will be replaced with actual enum type - description: "Selection from predefined options" + tsType: "enum", + description: "Enumeration field for predefined choices" }, { label: "Relationship", decorator: "Relationship", - tsType: "object", // Will be replaced with actual model type - description: "Reference to another model" + tsType: "object", + description: "Generic relationship to other models" + }, + { + label: "Reference", + decorator: "Reference", + tsType: "object", + description: "Reference relationship to independent models" + }, + { + label: "Composition", + decorator: "Composition", + tsType: "object", + description: "Composition relationship where child cannot exist without parent" + }, + { + label: "Shared Composition", + decorator: "SharedComposition", + tsType: "object", + description: "Shared composition relationship across multiple models" } ]; diff --git a/src/utils/fieldTypes.ts b/src/utils/fieldTypes.ts index 3e0df32..93da3a0 100644 --- a/src/utils/fieldTypes.ts +++ b/src/utils/fieldTypes.ts @@ -63,23 +63,16 @@ export const fieldTypeConfig: Record = { supportedArgs: [ { name: 'docs', type: 'string' }, { name: 'isUnique', type: 'boolean' }, - { name: 'maxLength', type: 'number' }, { name: 'minLength', type: 'number' }, + { name: 'maxLength', type: 'number' }, { name: 'regex', type: 'string' }, { name: 'regexMessage', type: 'string' }, ], buildDecoratorString: genericBuildDecoratorString }, - 'LongText': { - requiredTsType: 'string', - supportedArgs: [ - { name: 'docs', type: 'string' }, - { name: 'isUnique', type: 'boolean' }, - ], - buildDecoratorString: genericBuildDecoratorString - }, 'Email': { requiredTsType: 'string', + mapsFromTsTypes: ['string'], supportedArgs: [ { name: 'docs', type: 'string' }, { name: 'isUnique', type: 'boolean' }, @@ -88,6 +81,7 @@ export const fieldTypeConfig: Record = { }, 'HTML': { requiredTsType: 'string', + mapsFromTsTypes: ['string'], supportedArgs: [ { name: 'docs', type: 'string' }, ], @@ -108,13 +102,27 @@ export const fieldTypeConfig: Record = { ], buildDecoratorString: genericBuildDecoratorString }, - 'Money': { + 'Number': { requiredTsType: 'number', + mapsFromTsTypes: ['number'], supportedArgs: [ { name: 'docs', type: 'string' }, - { name: 'numberOfDecimals', type: 'number' }, - { name: 'roundingType', type: 'enum' }, - { name: 'error', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + { name: 'positive', type: 'boolean' }, + { name: 'negative', type: 'boolean' }, + { name: 'min', type: 'number' }, + { name: 'max', type: 'number' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Decimal': { + requiredTsType: 'number', + mapsFromTsTypes: ['number'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + { name: 'precision', type: 'number' }, + { name: 'scale', type: 'number' }, { name: 'positive', type: 'boolean' }, { name: 'negative', type: 'boolean' }, { name: 'min', type: 'number' }, @@ -122,17 +130,40 @@ export const fieldTypeConfig: Record = { ], buildDecoratorString: genericBuildDecoratorString }, + 'Money': { + requiredTsType: 'Money', + mapsFromTsTypes: ['Money'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'decimals', type: 'number' }, + { name: 'roundingType', type: 'enum' }, + { name: 'positive', type: 'boolean' }, + { name: 'negative', type: 'boolean' }, + { name: 'min', type: 'string' }, + { name: 'max', type: 'string' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, // --- Date/Time Types --- - 'Date': { + 'DateTime': { requiredTsType: 'Date', mapsFromTsTypes: ['Date'], - supportedArgs: [{ name: 'docs', type: 'string' }], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'min', type: 'object' }, + { name: 'max', type: 'object' }, + ], buildDecoratorString: genericBuildDecoratorString }, - 'DateRange': { - requiredTsType: 'DateRange', - supportedArgs: [{ name: 'docs', type: 'string' }], + 'DateTimeRange': { + requiredTsType: 'DateTimeRangeValue', + mapsFromTsTypes: ['DateTimeRangeValue'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'allowOpenRanges', type: 'boolean' }, + { name: 'timezone', type: 'string' }, + ], buildDecoratorString: genericBuildDecoratorString }, @@ -150,14 +181,49 @@ export const fieldTypeConfig: Record = { // --- Special Types --- 'Choice': { requiredTsType: undefined, - supportedArgs: [], + supportedArgs: [ + { name: 'docs', type: 'string' }, + ], buildDecoratorString: genericBuildDecoratorString }, + + // --- Relationship Types --- 'Relationship': { requiredTsType: undefined, supportedArgs: [ - { name: 'type', type: 'string' }, - { name: 'filter', type: 'object' }, + { name: 'docs', type: 'string' }, + { name: 'type', type: 'enum' }, + { name: 'elementType', type: 'string' }, + { name: 'load', type: 'boolean' }, + { name: 'onDelete', type: 'enum' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Reference': { + requiredTsType: undefined, + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'load', type: 'boolean' }, + { name: 'onDelete', type: 'enum' }, + { name: 'elementType', type: 'string' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Composition': { + requiredTsType: undefined, + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'load', type: 'boolean' }, + { name: 'elementType', type: 'string' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'SharedComposition': { + requiredTsType: undefined, + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'load', type: 'boolean' }, + { name: 'elementType', type: 'string' }, ], buildDecoratorString: genericBuildDecoratorString }, From c1a4812577ae17528875aa6a8e402acaf3256ac9 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 12:26:26 -0300 Subject: [PATCH 222/254] Improved creation of relationship field. --- src/commands/fields/addField.ts | 134 +++++++++++++++++++++++--------- src/commands/models/newModel.ts | 10 +-- src/services/aiService.ts | 13 ++-- src/test/addComposition.test.ts | 10 +-- 4 files changed, 110 insertions(+), 57 deletions(-) diff --git a/src/commands/fields/addField.ts b/src/commands/fields/addField.ts index f48d33b..7375a4c 100644 --- a/src/commands/fields/addField.ts +++ b/src/commands/fields/addField.ts @@ -254,7 +254,22 @@ export class AddFieldTool implements AIEnhancedTool { cache?: MetadataCache ): Promise { const lines = document.getText().split("\n"); - const newImports = new Set(["Field", fieldInfo.type.decorator]); + const newImports = new Set(["Field"]); + + // Add the appropriate decorator import based on field type + if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.relationshipType) { + // For generic Relationship, use specific decorator if possible + const relationshipType = fieldInfo.additionalConfig.relationshipType; + if (relationshipType === "reference") { + newImports.add("Reference"); + } else if (relationshipType === "composition") { + newImports.add("Composition"); + } else { + newImports.add("Relationship"); + } + } else { + newImports.add(fieldInfo.type.decorator); + } // Add imports using source code service logic (we need to call a helper method) await this.sourceCodeService.ensureSlingrFrameworkImports(document, edit, newImports); @@ -414,8 +429,9 @@ export class AddFieldTool implements AIEnhancedTool { // Step 4: Handle special field types let additionalConfig: Record = {}; - if (fieldType.decorator === "Relationship") { - const relationshipConfig = await this.getRelationshipConfiguration(cache); + // Handle all relationship field types + if (this.isRelationshipField(fieldType.decorator)) { + const relationshipConfig = await this.getRelationshipConfiguration(fieldType.decorator, cache); if (!relationshipConfig) { return null; // User cancelled } @@ -478,9 +494,16 @@ export class AddFieldTool implements AIEnhancedTool { } /** - * Gets relationship configuration for Relationship fields. + * Checks if a field decorator represents a relationship field. + */ + private isRelationshipField(decorator: string): boolean { + return ["Relationship", "Reference", "Composition", "SharedComposition"].includes(decorator); + } + + /** + * Gets relationship configuration for relationship fields. */ - private async getRelationshipConfiguration(cache?: MetadataCache): Promise | null> { + private async getRelationshipConfiguration(decorator: string, cache?: MetadataCache): Promise | null> { // Step 1: Get available models const availableModels = this.getAvailableModels(cache); if (availableModels.length === 0) { @@ -494,10 +517,10 @@ export class AddFieldTool implements AIEnhancedTool { const targetModel = await vscode.window.showQuickPick( availableModels.map((model) => ({ label: model, - description: `Reference to ${model} model`, + description: `${this.getRelationshipDescription(decorator)} to ${model} model`, })), { - placeHolder: "Select the target model for this relationship", + placeHolder: `Select the target model for this ${decorator.toLowerCase()}`, } ); @@ -505,34 +528,59 @@ export class AddFieldTool implements AIEnhancedTool { return null; // User cancelled } - // Step 3: Let user select relationship type - const relationshipType = await vscode.window.showQuickPick( - [ + // Step 3: For generic Relationship decorator, let user select relationship type + let relationshipType: string; + if (decorator === "Relationship") { + const relationshipTypeSelection = await vscode.window.showQuickPick( + [ + { + label: "Reference", + description: "Reference relationship - points to another entity", + value: "reference", + }, + { + label: "Composition", + description: "Composition relationship - contains/owns another entity", + value: "composition", + }, + ], { - label: "Reference", - description: "Reference relationship - points to another entity", - value: "reference", - }, - { - label: "Composition", - description: "Composition relationship - contains/owns another entity", - value: "composition", - }, - ], - { - placeHolder: "Select the relationship type", - } - ); + placeHolder: "Select the relationship type", + } + ); - if (!relationshipType) { - return null; // User cancelled + if (!relationshipTypeSelection) { + return null; // User cancelled + } + relationshipType = relationshipTypeSelection.value; + } else { + // For specific decorators, derive the relationship type + relationshipType = decorator.toLowerCase(); } return { targetModel: targetModel.label, - relationshipType: relationshipType.value, + relationshipType: relationshipType, }; } + + /** + * Gets a human-readable description for the relationship type. + */ + private getRelationshipDescription(decorator: string): string { + switch (decorator) { + case "Reference": + return "Reference relationship"; + case "Composition": + return "Composition relationship"; + case "SharedComposition": + return "Shared composition relationship"; + case "Relationship": + return "Generic relationship"; + default: + return "Relationship"; + } + } /** * Gets available models from the cache. */ @@ -561,10 +609,25 @@ export class AddFieldTool implements AIEnhancedTool { } // Add type-specific decorator - if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.relationshipType) { - lines.push(`@${fieldInfo.type.decorator}({`); - lines.push(` type: '${fieldInfo.additionalConfig.relationshipType}'`); - lines.push(`})`); + // Handle relationship decorators + if (this.isRelationshipField(fieldInfo.type.decorator)) { + if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.relationshipType) { + // For generic Relationship decorator, use specific decorators when possible + const relationshipType = fieldInfo.additionalConfig.relationshipType; + if (relationshipType === "reference") { + lines.push("@Reference()"); + } else if (relationshipType === "composition") { + lines.push("@Composition()"); + } else { + // Fallback to generic Relationship with type parameter + lines.push(`@Relationship({`); + lines.push(` type: '${relationshipType}'`); + lines.push(`})`); + } + } else { + // Use specific decorators directly (Reference, Composition, SharedComposition) + lines.push(`@${fieldInfo.type.decorator}()`); + } } else { lines.push(`@${fieldInfo.type.decorator}()`); } @@ -574,13 +637,10 @@ export class AddFieldTool implements AIEnhancedTool { if (fieldInfo.type.decorator === "Choice") { const enumName = this.generateEnumName(fieldInfo.name); lines.push(`${fieldInfo.name}!: ${enumName};`); - } else if (fieldInfo.type.decorator === "Relationship") { - // For Relationship fields, use the target model type + } else if (this.isRelationshipField(fieldInfo.type.decorator)) { + // For relationship fields, use the target model type as single values (not arrays) const targetModel = fieldInfo.additionalConfig?.targetModel || "any"; - // Check if it's a composition relationship to determine if it should be an array - const isComposition = fieldInfo.additionalConfig?.relationshipType === "composition"; - const typeDeclaration = isComposition ? `${targetModel}[]` : targetModel; - lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + lines.push(`${fieldInfo.name}!: ${targetModel};`); } else { lines.push(`${fieldInfo.name}!: ${fieldInfo.type.tsType};`); } diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 8cf83e2..91af888 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -368,16 +368,16 @@ export class NewModelTool implements AIEnhancedTool { // Create the parent model URI const parentModelUri = vscode.Uri.file(parentModelInfo.filePath); - // Find the Relationship field type option - const relationshipFieldType = FIELD_TYPE_OPTIONS.find((option) => option.decorator === "Relationship"); - if (!relationshipFieldType) { - throw new Error("Relationship field type not found in FIELD_TYPE_OPTIONS"); + // Find the Composition field type option (preferred over generic Relationship) + const compositionFieldType = FIELD_TYPE_OPTIONS.find((option) => option.decorator === "Composition"); + if (!compositionFieldType) { + throw new Error("Composition field type not found in FIELD_TYPE_OPTIONS"); } // Create the field info for the composition relationship const fieldInfo: FieldInfo = { name: fieldName, - type: relationshipFieldType, + type: compositionFieldType, required: false, // Composition relationships are typically optional additionalConfig: { targetModel: newModelName, diff --git a/src/services/aiService.ts b/src/services/aiService.ts index ab58180..36602e4 100644 --- a/src/services/aiService.ts +++ b/src/services/aiService.ts @@ -147,8 +147,8 @@ You are an expert in the Slingr framework. Your task is to create a new data mod 1. **Framework Usage:** You MUST use the Slingr framework. All models MUST extend \`BaseModel\` and use the \`@Model()\` and \`@Field()\` decorators. 2. **File Location:** The new model file should be placed in the \`/src/data\` directory. The filename should be the camelCase version of the model name (e.g., \`userProfile.ts\` for a \`UserProfile\` model). 3. **Model Naming:** The class name for the model should be in PascalCase. -4. **Field Types:** Use appropriate field types and decorators from the Slingr framework (e.g., \`@Text\`, \`@Email\`, \`@Integer\`, \`@Relationship\`). -5. **Relationships:** If the model references other existing models, make sure to import them and use the \`@Relationship\` decorator correctly. In the other way round, if other models reference this model, ensure to use the \`@Relationship\` decorator in those models as well. +4. **Field Types:** Use appropriate field types and decorators from the Slingr framework (e.g., \`@Text\`, \`@Email\`, \`@Integer\`, \`@Reference\`, \`@Composition\`). +5. **Relationships:** For relationships, use specific decorators: \`@Reference\` for independent models that can exist separately, \`@Composition\` for dependent models that cannot exist without the parent. Only use the generic \`@Relationship\` decorator when the specific decorators don't fit. 6. **Code Only:** Provide only the TypeScript code for the new model file. Do not include any explanations or markdown formatting. **Example of a good response:** @@ -178,8 +178,7 @@ export class Customer extends BaseModel { This new model will be used as a composition in the "${parentModelInfo.name}" model. **IMPORTANT:** After creating the new model, you MUST also add a composition relationship field to the "${parentModelInfo.name}" model (located at ${parentModelInfo.filePath}) that references this new model. The field should: -- Use the @Relationship decorator -- Have relationshipType: 'composition' +- Use the @Composition decorator (preferred over generic @Relationship) - Be named as a plural, camelCase version of the new model name - Import the new model class `; @@ -291,7 +290,7 @@ title!: string; description!: string; @Field() -@Relationship() +@Reference() customer!: Customer; @Field() @@ -299,9 +298,7 @@ customer!: Customer; date!: Date; @Field() -@Relationship({ - type: 'composition' -}) +@Composition() project!: Project; @Field() diff --git a/src/test/addComposition.test.ts b/src/test/addComposition.test.ts index d1ef796..6e8a65e 100644 --- a/src/test/addComposition.test.ts +++ b/src/test/addComposition.test.ts @@ -204,7 +204,7 @@ export class TestModel extends BaseModel { export class Address { @Field() - @Relationship({ type: 'reference' }) + @Reference() parent!: User; }`; @@ -236,9 +236,7 @@ export class Address { const result = generateCompositionFieldCode(fieldInfo, 'Address', true); const expected = `@Field() -@Relationship({ - type: 'composition' -}) +@Composition() addresses!: Address[];`; assert.strictEqual(result, expected); @@ -268,9 +266,7 @@ addresses!: Address[];`; const result = generateCompositionFieldCode(fieldInfo, 'Profile', false); const expected = `@Field() -@Relationship({ - type: 'composition' -}) +@Composition() profile!: Profile;`; assert.strictEqual(result, expected); From 812389bd9da4e864a4615ef5af9519c7fadeefe9 Mon Sep 17 00:00:00 2001 From: Gaviola Date: Wed, 24 Sep 2025 12:40:47 -0300 Subject: [PATCH 223/254] added datasource relation when creating a new model --- src/commands/models/newModel.ts | 106 ++++++++++++++++++++++---------- src/test/newModel.test.ts | 2 +- 2 files changed, 76 insertions(+), 32 deletions(-) diff --git a/src/commands/models/newModel.ts b/src/commands/models/newModel.ts index 91af888..773a160 100644 --- a/src/commands/models/newModel.ts +++ b/src/commands/models/newModel.ts @@ -148,7 +148,44 @@ export class NewModelTool implements AIEnhancedTool { return; // User pressed Esc } - // Step 3: Get optional fields information + // Step 3: Get datasource selection + let selectedDataSource: string | null = null; + if (cache) { + const availableDataSources = cache.getDataSources(); + + if (availableDataSources.length === 1) { + // Automatically use the single datasource + selectedDataSource = availableDataSources[0].name; + } else if (availableDataSources.length > 1) { + // Ask user to select from multiple datasources + const dataSourceItems = availableDataSources.map(ds => ({ + label: ds.name, + description: `Type: ${ds.type}`, + value: ds.name + })); + + // Add an option to skip datasource selection + dataSourceItems.push({ + label: "None", + description: "Don't specify a datasource for this model", + value: null as any + }); + + const selectedItem = await vscode.window.showQuickPick(dataSourceItems, { + placeHolder: "Select a datasource for this model (or None to skip)", + matchOnDescription: true + }); + + if (selectedItem === undefined) { + return; // User cancelled + } + + selectedDataSource = selectedItem.value; + } + // If no datasources available, selectedDataSource remains null + } + + // Step 4: Get optional fields information const fieldsInfo = await vscode.window.showInputBox({ prompt: "Enter field information (free text, press Enter to skip)", placeHolder: "e.g., title (string), description (text), project (relationship to Project), status (enum)", @@ -159,10 +196,10 @@ export class NewModelTool implements AIEnhancedTool { return; // User pressed Esc } - // Step 4: Determine target directory + // Step 5: Determine target directory let targetDirectory = this.fileSystemService.determineTargetDirectory(finalTargetUri); - // Step 5: Check if file already exists and handle overwrite + // Step 6: Check if file already exists and handle overwrite const filePath = path.join(targetDirectory, `${modelName}.ts`); const fileUri = vscode.Uri.file(filePath); const fileExists = await this.fileSystemService.fileExists(fileUri); @@ -177,22 +214,23 @@ export class NewModelTool implements AIEnhancedTool { } } - // Step 6: Generate model content + // Step 7: Generate model content const modelContent = this.generateModelContent( modelName, docs?.trim() || null, fieldsInfo?.trim() || null, - targetDirectory + targetDirectory, + selectedDataSource ); - // Step 7: Create the file (without handling overwrite since we already did) + // Step 8: Create the file (without handling overwrite since we already did) const targetFileUri = await this.fileSystemService.createFile(modelName, filePath, modelContent, false); - // Step 8: Open the new file + // Step 9: Open the new file const document = await vscode.workspace.openTextDocument(targetFileUri); await vscode.window.showTextDocument(document); - // Step 9: Process field descriptions if provided and cache is available + // Step 10: Process field descriptions if provided and cache is available if (fieldsInfo?.trim() && cache) { try { // Give the cache a moment to process the new file @@ -207,7 +245,7 @@ export class NewModelTool implements AIEnhancedTool { } } - // Step 10: Handle parent model relationship if applicable + // Step 11: Handle parent model relationship if applicable if (parentModelInfo && cache) { try { await this.addCompositionRelationshipToParent(parentModelInfo, modelName, cache); @@ -219,12 +257,16 @@ export class NewModelTool implements AIEnhancedTool { } } - // Step 11: Show success message + // Step 12: Show success message let successMessage = fieldsInfo?.trim() && cache ? `Model ${modelName} created and fields processed successfully!` : `Model ${modelName} created successfully!`; + if (selectedDataSource) { + successMessage += ` Using datasource: ${selectedDataSource}.`; + } + if (parentModelInfo) { successMessage += ` Composition relationship added to ${parentModelInfo.name}.`; } @@ -243,13 +285,15 @@ export class NewModelTool implements AIEnhancedTool { * @param docs - Optional documentation string * @param fieldsInfo - Optional field information (to be processed later by AI) * @param targetDirectory - The directory where the model file will be created + * @param dataSource - Optional datasource name to include in the Model decorator * @returns The complete TypeScript content for the model file */ private generateModelContent( modelName: string, docs?: string | null, fieldsInfo?: string | null, - targetDirectory?: string + targetDirectory?: string, + dataSource?: string | null ): string { const lines: string[] = []; @@ -258,16 +302,25 @@ export class NewModelTool implements AIEnhancedTool { lines.push("import { BaseModel } from 'slingr-framework';"); lines.push(""); - // Add Model decorator with docs if provided - if (docs) { - // Escape single quotes in the docs string to prevent breaking the code - const escapedDocs = docs.replace(/'/g, "\\'"); + // Add Model decorator with docs and/or datasource if provided + const hasOptions = docs || dataSource; + + if (hasOptions) { lines.push(`@Model({`); - lines.push(` docs: '${escapedDocs}'`); + + if (docs) { + // Escape single quotes in the docs string to prevent breaking the code + const escapedDocs = docs.replace(/'/g, "\\'"); + lines.push(` docs: '${escapedDocs}'${dataSource ? ',' : ''}`); + } + + if (dataSource) { + lines.push(` dataSource: '${dataSource}'`); + } + lines.push(`})`); - } - else { - // Add Model decorator + } else { + // Add Model decorator without options lines.push(`@Model()`); } @@ -389,7 +442,7 @@ export class NewModelTool implements AIEnhancedTool { await this.addFieldTool.addFieldProgrammatically( parentModelUri, fieldInfo, - newModelName, + parentModelInfo.name, // Use parent model name, not new model name cache, true // silent mode - suppress success/error messages ); @@ -412,22 +465,13 @@ export class NewModelTool implements AIEnhancedTool { ): Promise { try { // Generate model content - const modelContent = this.generateModelContent(modelName, docs); - - // Modify the content to include datasource if provided - let finalContent = modelContent; - if (dataSource) { - finalContent = finalContent.replace( - '@Model()', - `@Model({\n\tdataSource: ${dataSource}\n})` - ); - } + const modelContent = this.generateModelContent(modelName, docs, null, undefined, dataSource); // Create the file const targetFileUri = await this.fileSystemService.createFile( modelName, targetFilePath, - finalContent, + modelContent, false // Don't handle overwrite since we control the path ); diff --git a/src/test/newModel.test.ts b/src/test/newModel.test.ts index c2699ee..c872ba9 100644 --- a/src/test/newModel.test.ts +++ b/src/test/newModel.test.ts @@ -488,7 +488,7 @@ export class ParentModel extends BaseModel { // We can't directly test the private method, but we can verify the generated content // by creating a model and checking the file content - const testContent = (tool as any).generateModelContent('TestModel', 'Test documentation', null, testDataDir); + const testContent = (tool as any).generateModelContent('TestModel', 'Test documentation', null, testDataDir, null); assert.ok(testContent.includes('import { Model, Field } from \'slingr-framework\';'), 'Should import decorators'); assert.ok(testContent.includes('import { BaseModel } from \'slingr-framework\';'), 'Should import BaseModel'); From c89e9ece79f49fcbc7a19f4058e6175b4bdca0e2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 16:12:56 +0000 Subject: [PATCH 224/254] Copy CLI and VS Code extension files from external repositories Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- cli/.gitignore | 16 ++ cli/.npmignore | 7 + cli/.prettierrc.json | 1 + cli/README.md | 88 ++++++- cli/bin/dev.js | 5 + cli/bin/run.js | 5 + cli/eslint.config.mjs | 16 ++ cli/package.json | 81 +++++- cli/src/commands/create-app.ts | 156 ++++++++++++ cli/src/index.ts | 1 + cli/src/project-structure.ts | 163 ++++++++++++ cli/tsconfig.json | 16 ++ framework/tsconfig.build.json | 19 +- vs-code-extension/.gitignore | 5 + vs-code-extension/.vscodeignore | 11 + vs-code-extension/README.md | 83 ++++-- vs-code-extension/eslint.config.mjs | 28 +++ vs-code-extension/package.json | 375 ++++++++++++++++++++++++++-- vs-code-extension/src/extension.ts | 18 ++ vs-code-extension/tsconfig.json | 22 ++ 20 files changed, 1049 insertions(+), 67 deletions(-) create mode 100644 cli/.gitignore create mode 100644 cli/.npmignore create mode 100644 cli/.prettierrc.json create mode 100755 cli/bin/dev.js create mode 100755 cli/bin/run.js create mode 100644 cli/eslint.config.mjs create mode 100644 cli/src/commands/create-app.ts create mode 100644 cli/src/index.ts create mode 100644 cli/src/project-structure.ts create mode 100644 cli/tsconfig.json create mode 100644 vs-code-extension/.gitignore create mode 100644 vs-code-extension/.vscodeignore create mode 100644 vs-code-extension/eslint.config.mjs create mode 100644 vs-code-extension/src/extension.ts create mode 100644 vs-code-extension/tsconfig.json diff --git a/cli/.gitignore b/cli/.gitignore new file mode 100644 index 0000000..e0319f4 --- /dev/null +++ b/cli/.gitignore @@ -0,0 +1,16 @@ +*-debug.log +*-error.log +**/.DS_Store +/.idea +/dist +/tmp +/node_modules +oclif.manifest.json + + + +yarn.lock +pnpm-lock.yaml + +package-lock.json +tsconfig.tsbuildinfo \ No newline at end of file diff --git a/cli/.npmignore b/cli/.npmignore new file mode 100644 index 0000000..70b1dfa --- /dev/null +++ b/cli/.npmignore @@ -0,0 +1,7 @@ +* +!bin/** +!dist/** +!oclif.manifest.json +!README.md +!package.json +!LICENSE \ No newline at end of file diff --git a/cli/.prettierrc.json b/cli/.prettierrc.json new file mode 100644 index 0000000..ed9b7b5 --- /dev/null +++ b/cli/.prettierrc.json @@ -0,0 +1 @@ +@oclif/prettier-config \ No newline at end of file diff --git a/cli/README.md b/cli/README.md index dbd523d..1ed9e06 100644 --- a/cli/README.md +++ b/cli/README.md @@ -1,30 +1,98 @@ # Slingr CLI -The Slingr CLI tool provides command-line utilities for working with Slingr applications and the framework. +A command line tool for creating Slingr applications with TypeScript and best practices built-in. -## Coming Soon +## How to test set-up? -The CLI tool will be integrated from the existing CLI repository into this monorepo structure. +1. Clone repository -## Features (Planned) +```bash +git clone https://github.com/slingr-stack/cli.git +cd cli +``` -- Project scaffolding and generation -- Framework development utilities -- Application deployment tools -- Model and field generators +2. Install dependencies, build and link + +```bash +npm install +npm run build +npm link +``` + +3. Execute + +```bash +slingr create-app +slingr --help +``` ## Installation ```bash +# Install globally npm install -g @slingr/cli + +# Or use with npx (no installation required) +npx @slingr/cli create-app my-app ``` ## Usage +### Create a new application + ```bash -slingr --help +slingr create-app my-app ``` +This command will: +1. Ask you questions about your application type and requirements +2. Create a project directory with the specified name +3. Set up a complete TypeScript project structure +4. Generate sample files and configurations +5. Configure VS Code settings and recommended extensions + +### Interactive Setup + +The CLI will ask you several questions to customize your project: + +- **Application Type**: What kind of app you're building (CRM, task manager, etc.) +- **Backend**: Whether you want to create a backend +- **Frontend**: Whether you want to create a frontend (only if backend is selected) +- **Description**: A detailed description of what your app should do + +## Generated Project Structure + +``` +your-app/ +├── .vscode/ +│ ├── extensions.json # Recommended VS Code extensions +│ └── settings.json # VS Code settings for optimal development +├── .github/ +│ └── copilot-instructions.md # GitHub Copilot context +├── src/ +│ └── data/ +│ ├── SampleModel.ts # Example data model +│ └── SampleModel.test.ts # Example tests +├── docs/ +│ └── app-description.md # Generated app documentation +├── package.json # Project configuration +└── tsconfig.json # TypeScript configuration +``` + +## Features + +- **TypeScript Setup**: Pre-configured TypeScript with strict settings +- **Testing**: Jest test framework with sample tests +- **Linting**: ESLint with TypeScript support +- **VS Code Integration**: Optimized settings and extension recommendations +- **GitHub Copilot**: Pre-configured with context instructions +- **Sample Code**: Working examples to get you started quickly + ## Development -This package is part of the Slingr monorepo. See the main README for development setup instructions. \ No newline at end of file +After creating your project: + +```bash +cd your-app +npm install +``` \ No newline at end of file diff --git a/cli/bin/dev.js b/cli/bin/dev.js new file mode 100755 index 0000000..0261e86 --- /dev/null +++ b/cli/bin/dev.js @@ -0,0 +1,5 @@ +#!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning + +import {execute} from '@oclif/core' + +await execute({development: true, dir: import.meta.url}) \ No newline at end of file diff --git a/cli/bin/run.js b/cli/bin/run.js new file mode 100755 index 0000000..5f6cc73 --- /dev/null +++ b/cli/bin/run.js @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +import {execute} from '@oclif/core' + +await execute({dir: import.meta.url}) \ No newline at end of file diff --git a/cli/eslint.config.mjs b/cli/eslint.config.mjs new file mode 100644 index 0000000..07cbe89 --- /dev/null +++ b/cli/eslint.config.mjs @@ -0,0 +1,16 @@ +import {includeIgnoreFile} from '@eslint/compat' +import oclif from 'eslint-config-oclif' +import prettier from 'eslint-config-prettier' +import path from 'node:path' +import {fileURLToPath} from 'node:url' + +const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore') + +export default [ + includeIgnoreFile(gitignorePath), + ...oclif, + prettier, + { + ignores: ['scripts/**', 'bin/**'], + }, +] \ No newline at end of file diff --git a/cli/package.json b/cli/package.json index fcbf551..f66b6a7 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,23 +1,80 @@ { "name": "@slingr/cli", - "version": "1.0.0", - "description": "Slingr CLI - Command line tools for Slingr framework", - "main": "dist/index.js", + "description": "Slingr CLI tool for creating and managing Slingr applications", + "version": "0.0.0", + "author": "Francisco Devaux", "bin": { - "slingr": "dist/cli.js" + "slingr": "./bin/run.js" }, - "scripts": { - "build": "echo 'CLI build - to be implemented'", - "test": "echo 'CLI tests - to be implemented'", - "clean": "rm -rf dist" + "bugs": "https://github.com/slingr-stack/cli/issues", + "dependencies": { + "@oclif/core": "^4", + "@oclif/plugin-help": "^6", + "@oclif/plugin-plugins": "^5", + "@types/fs-extra": "^11.0.4", + "@types/inquirer": "^8.2.12", + "@types/js-yaml": "^4.0.9", + "fs-extra": "^11.3.1", + "inquirer": "^8.2.7", + "js-yaml": "^4.1.0", + "slingr-framework": "workspace:*" + }, + "devDependencies": { + "@eslint/compat": "^1", + "@oclif/prettier-config": "^0.2.1", + "@oclif/test": "^4", + "@types/chai": "^4", + "@types/node": "^18", + "chai": "^4", + "eslint": "^9", + "eslint-config-oclif": "^6", + "eslint-config-prettier": "^10", + "oclif": "^4", + "shx": "^0.3.3", + "ts-node": "^10", + "typescript": "^5" + }, + "engines": { + "node": ">=18.0.0" + }, + "files": [ + "./bin", + "./dist", + "./oclif.manifest.json" + ], + "homepage": "https://github.com/slingr-stack/cli", + "keywords": [ + "slingr", + "cli", + "scaffolding", + "project-generator" + ], + "license": "MIT", + "main": "dist/index.js", + "type": "module", + "oclif": { + "bin": "slingr", + "dirname": "slingr", + "commands": "./dist/commands", + "plugins": [ + "@oclif/plugin-help", + "@oclif/plugin-plugins" + ], + "topicSeparator": " " }, "repository": { "type": "git", "url": "git+https://github.com/slingr-stack/framework.git", "directory": "cli" }, - "author": "Slingr", - "license": "Apache-2.0", - "dependencies": {}, - "devDependencies": {} + "scripts": { + "build": "shx rm -rf dist && tsc -b", + "lint": "eslint", + "postpack": "shx rm -f oclif.manifest.json", + "posttest": "npm run lint", + "prepack": "oclif manifest && oclif readme", + "test": "mocha --forbid-only \"test/**/*.test.ts\"", + "version": "oclif readme && git add README.md" + }, + "types": "dist/index.d.ts" } \ No newline at end of file diff --git a/cli/src/commands/create-app.ts b/cli/src/commands/create-app.ts new file mode 100644 index 0000000..6e19117 --- /dev/null +++ b/cli/src/commands/create-app.ts @@ -0,0 +1,156 @@ +import { Args, Command, Flags } from '@oclif/core' +import fse from 'fs-extra' +import inquirer from 'inquirer' +import path from 'node:path' + +import { AppAnswers, createProjectStructure } from '../project-structure.js' + +export default class CreateApp extends Command { + static override args = { + name: Args.string({ + description: 'Name of the application to create', + required: false + }) + } + static override description = 'Create a new Slingr application' + static override examples = [ + '<%= config.bin %> <%= command.id %>', + '<%= config.bin %> <%= command.id %> my-app', + '<%= config.bin %> <%= command.id %> task-manager', + '<%= config.bin %> <%= command.id %> my-crm --type="CRM" --backend --frontend --database=postgres --description="A CRM system for managing customers"' + ] + static override flags = { + help: Flags.help({ char: 'h' }), + type: Flags.string({ + char: 't', + description: 'Type of application (e.g., CRM, task manager, ERP)', + }), + backend: Flags.boolean({ + char: 'b', + description: 'Include backend for the application', + allowNo: true + }), + frontend: Flags.boolean({ + char: 'f', + description: 'Include frontend for the application', + allowNo: true + }), + database: Flags.string({ + char: 'd', + description: 'Database to use (postgres or mysql)', + options: ['postgres', 'mysql'] + }), + description: Flags.string({ + char: 'D', + description: 'Description of what the application needs to do' + }) + } + + public async run(): Promise { + const { args, flags } = await this.parse(CreateApp) + let appName = args.name + + // If no name is provided, ask for it + if (!appName) { + const response = await inquirer.prompt<{ name: string }>([ + { + type: 'input', + name: 'name', + message: 'What is the name of your application?', + validate: async (input: string) => { + if (input.length === 0) return 'Please provide a name for your application' + const targetDir = path.join(process.cwd(), input) + if (await fse.pathExists(targetDir)) { + return `Directory ${input} already exists!` + } + return true + } + } + ]) + appName = response.name + } else { + // Check if directory already exists when name is provided as argument + const targetDir = path.join(process.cwd(), appName) + if (await fse.pathExists(targetDir)) { + this.error(`Directory ${appName} already exists!`) + } + } + + let answers: AppAnswers + + // Check if all flags are provided + const hasAllFlags = flags.type && + flags.backend !== undefined && + flags.frontend !== undefined && + flags.database && + flags.description + + if (hasAllFlags) { + // Use provided flags + answers = { + appType: flags.type!, + hasBackend: flags.backend!, + hasFrontend: flags.frontend!, + database: flags.database as 'postgres' | 'mysql', + description: flags.description! + } + } else { + this.log('') + this.log('Hi! Before we get started, we are going to ask you some information about your application.') + this.log('') + + // Interactive questions, pre-filling with any provided flags + answers = await inquirer.prompt([ + { + message: 'What type of application are you going to create? ', + name: 'appType', + suffix: "For example, a CRM, a task manager, an ERP, etc.\n", + type: 'input', + default: flags.type, + validate: (input: string) => input.length > 0 || 'Please provide an application type' + }, + { + default: flags.backend ?? true, + message: 'OK! Now, are you going to create a backend for your app?', + name: 'hasBackend', + type: 'confirm' + }, + { + default: flags.frontend ?? true, + message: 'Good! Do you also want to create the frontend with Slingr?', + name: 'hasFrontend', + type: 'confirm', + }, + { + type: 'list', + name: 'database', + message: 'Which database do you want to use?', + choices: [ + { name: 'PostgreSQL', value: 'postgres' }, + { name: 'MySQL', value: 'mysql' } + ], + default: flags.database || 'postgres' + }, + { + message: 'Perfect! Please, provide a description of what your app needs to do:\n', + name: 'description', + type: 'input', + default: flags.description, + validate: (input: string) => input.length > 0 || 'Please provide a description' + } + ]) + } + + this.log('') + this.log("That's very useful, thanks for the information!") + this.log('') + + // Create the project structure + await createProjectStructure(appName, answers) + + this.log(`Project ${appName} created successfully!`) + this.log(`To get started:`) + this.log(` cd ${appName}`) + this.log(` npm install`) + } +} \ No newline at end of file diff --git a/cli/src/index.ts b/cli/src/index.ts new file mode 100644 index 0000000..454cdc7 --- /dev/null +++ b/cli/src/index.ts @@ -0,0 +1 @@ +export {run} from '@oclif/core' \ No newline at end of file diff --git a/cli/src/project-structure.ts b/cli/src/project-structure.ts new file mode 100644 index 0000000..0327650 --- /dev/null +++ b/cli/src/project-structure.ts @@ -0,0 +1,163 @@ +import fse from 'fs-extra' +import path from 'node:path' +import { fileURLToPath } from 'node:url' + +export interface AppAnswers { + appType: string + description: string + hasBackend: boolean + hasFrontend: boolean + database: string +} + +async function copyTemplateFile(templatePath: string, targetPath: string, replacements?: Record): Promise { + let content = await fse.readFile(templatePath, 'utf8') + + // Apply replacements if provided + if (replacements) { + for (const [placeholder, value] of Object.entries(replacements)) { + content = content.replaceAll(placeholder, value) + } + } + + await fse.outputFile(targetPath, content) +} + +export async function createProjectStructure(appName: string, answers: AppAnswers): Promise { + const targetDir = path.join(process.cwd(), appName) + const currentDir = path.dirname(fileURLToPath(import.meta.url)) + // When running from dist/, we need to go up one level to reach the project root + const projectRoot = path.resolve(currentDir, '..') + const templatesDir = path.join(projectRoot, 'src', 'templates') + + // Create directory structure + await fse.ensureDir(targetDir) + await fse.ensureDir(path.join(targetDir, '.vscode')) + await fse.ensureDir(path.join(targetDir, '.github')) + await fse.ensureDir(path.join(targetDir, 'src', 'data')) + await fse.ensureDir(path.join(targetDir, 'src', 'dataSources')) + await fse.ensureDir(path.join(targetDir, 'docs')) + + // Copy .vscode files from templates + await fse.copy( + path.join(templatesDir, 'vscode', 'extensions.json'), + path.join(targetDir, '.vscode', 'extensions.json') + ) + + await fse.copy( + path.join(templatesDir, 'vscode', 'settings.json'), + path.join(targetDir, '.vscode', 'settings.json') + ) + + // Copy tsconfig.json from templates + await copyTemplateFile( + path.join(templatesDir, 'config', 'tsconfig.json.template'), + path.join(targetDir, 'tsconfig.json') + ) + + // Copy .gitignore from templates + await fse.copy( + path.join(templatesDir, 'config', '.gitignore'), + path.join(targetDir, '.gitignore') + ) + + // Copy jest.config.ts from templates + await fse.copy( + path.join(templatesDir, 'config', 'jest.config.ts'), + path.join(targetDir, 'jest.config.ts') + ) + + // Copy jest.setup.ts from templates + await fse.copy( + path.join(templatesDir, 'config', 'jest.setup.ts'), + path.join(targetDir, 'jest.setup.ts') + ) + + // Copy and process src files from templates + const replacements = { + '{{APP_NAME}}': appName + } + + await copyTemplateFile( + path.join(templatesDir, 'src', 'index.ts'), + path.join(targetDir, 'src', 'index.ts'), + replacements + ) + + // Copiar el template de datasource correspondiente según el tipo de base de datos + if (answers.hasBackend) { + let dbType = answers.database.toLowerCase() + let templateFile = '' + let targetFile = '' + switch (dbType) { + case 'postgres': + case 'postgresql': + templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') + break + case 'mysql': + templateFile = path.join(templatesDir, 'dataSources', 'mysql.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'mysql.ts') + break + // Agregar más casos si hay más templates + default: + templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') + } + await copyTemplateFile( + templateFile, + targetFile, + { '{{APP_NAME}}': appName } + ) + } + + // Copy sample model files + await fse.copy( + path.join(templatesDir, 'src', 'SampleModel.ts'), + path.join(targetDir, 'src', 'data', 'SampleModel.ts') + ) + + await fse.copy( + path.join(templatesDir, 'src', 'SampleModel.test.ts'), + path.join(targetDir, 'src', 'data', 'SampleModel.test.ts') + ) + + // Copy templated .github/copilot-instructions.md + await copyTemplateFile( + path.join(templatesDir, '.github', 'copilot-instructions.md.template'), + path.join(targetDir, '.github', 'copilot-instructions.md'), + { + '{{APP_NAME}}': appName, + '{{APP_TYPE}}': answers.appType, + '{{DESCRIPTION}}': answers.description, + '{{HAS_BACKEND}}': answers.hasBackend ? 'Yes' : 'No', + '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Yes' : 'No', + '{{DB_TYPE}}': answers.database + } + ) + + // Copy package.json template + await copyTemplateFile( + path.join(templatesDir, 'package.json.template'), + path.join(targetDir, 'package.json'), + { + '{{APP_NAME}}': appName, + '{{DESCRIPTION}}': answers.description, + '{{APP_KEYWORD}}': answers.appType.toLowerCase().replaceAll(/\s+/g, '-') + } + ) + + // Copy docs/app-description.md template + await copyTemplateFile( + path.join(templatesDir, 'docs', 'app-description.md.template'), + path.join(targetDir, 'docs', 'app-description.md'), + { + '{{APP_NAME}}': appName, + '{{DESCRIPTION}}': answers.description, + '{{APP_TYPE}}': answers.appType, + '{{HAS_BACKEND}}': answers.hasBackend ? 'Included' : 'Not included', + '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Included' : 'Not included', + '{{DB_TYPE}}': answers.database + } + ) +} \ No newline at end of file diff --git a/cli/tsconfig.json b/cli/tsconfig.json new file mode 100644 index 0000000..b3afec4 --- /dev/null +++ b/cli/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "declaration": true, + "module": "Node16", + "outDir": "dist", + "rootDir": "src", + "strict": true, + "target": "es2022", + "moduleResolution": "node16" + }, + "include": ["./src/**/*"], + "exclude": ["./src/templates/**/*"], + "ts-node": { + "esm": true + } +} \ No newline at end of file diff --git a/framework/tsconfig.build.json b/framework/tsconfig.build.json index f07362d..7ed6b35 100644 --- a/framework/tsconfig.build.json +++ b/framework/tsconfig.build.json @@ -1,6 +1,23 @@ { - "extends": "./tsconfig.json", "compilerOptions": { + "module": "Node16", + "target": "esnext", + "moduleResolution": "node16", + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "noUncheckedIndexedAccess": true, + "exactOptionalPropertyTypes": true, + "strict": true, + "jsx": "react-jsx", + "verbatimModuleSyntax": false, + "isolatedModules": true, + "noUncheckedSideEffectImports": true, + "moduleDetection": "force", + "skipLibCheck": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "esModuleInterop": true, "rootDir": ".", "outDir": "./dist" }, diff --git a/vs-code-extension/.gitignore b/vs-code-extension/.gitignore new file mode 100644 index 0000000..843fbca --- /dev/null +++ b/vs-code-extension/.gitignore @@ -0,0 +1,5 @@ +out +dist +node_modules +.vscode-test/ +*.vsix \ No newline at end of file diff --git a/vs-code-extension/.vscodeignore b/vs-code-extension/.vscodeignore new file mode 100644 index 0000000..60347ad --- /dev/null +++ b/vs-code-extension/.vscodeignore @@ -0,0 +1,11 @@ +.vscode/** +.vscode-test/** +src/** +.gitignore +.yarnrc +vsc-extension-quickstart.md +**/tsconfig.json +**/eslint.config.mjs +**/*.map +**/*.ts +**/.vscode-test.* \ No newline at end of file diff --git a/vs-code-extension/README.md b/vs-code-extension/README.md index f786409..d2c45e5 100644 --- a/vs-code-extension/README.md +++ b/vs-code-extension/README.md @@ -1,40 +1,71 @@ -# Slingr VS Code Extension +# slingr-vscode-extension README -The Slingr VS Code Extension provides IDE support for developing Slingr applications. +This is the README for your extension "slingr-vscode-extension". After writing up a brief description, we recommend including the following sections. -## Coming Soon +## Features -The VS Code extension will be integrated from the existing extension repository into this monorepo structure. +Describe specific features of your extension including screenshots of your extension in action. Image paths are relative to this README file. -## Features (Planned) +For example if there is an image subfolder under your extension project workspace: -- Syntax highlighting for Slingr models -- IntelliSense and code completion -- Integrated framework documentation -- Project templates and scaffolding -- Built-in testing and debugging support +\!\[feature X\]\(images/feature-x.png\) -## Installation +> Tip: Many popular extensions utilize animations. This is an excellent way to show off your extension! We recommend short, focused animations that are easy to follow. -Install from the Visual Studio Code Marketplace: +## Requirements -1. Open VS Code -2. Go to Extensions (Ctrl+Shift+X) -3. Search for "Slingr" -4. Click Install +If you have any requirements or dependencies, add a section describing those and how to install and configure them. -## Development +## Extension Settings -This package is part of the Slingr monorepo. See the main README for development setup instructions. +Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. -### Building the Extension +For example: -```bash -npm run build -``` +This extension contributes the following settings: -### Testing +* `myExtension.enable`: Enable/disable this extension. +* `myExtension.thing`: Set to `blah` to do something. -```bash -npm test -``` \ No newline at end of file +## Known Issues + +Calling out known issues can help limit users opening duplicate issues against your extension. + +## Release Notes + +Users appreciate release notes as you update your extension. + +### 1.0.0 + +Initial release of ... + +### 1.0.1 + +Fixed issue #. + +### 1.1.0 + +Added features X, Y, and Z. + +--- + +## Following extension guidelines + +Ensure that you've read through the extensions guidelines and follow the best practices for creating your extension. + +* [Extension Guidelines](https://code.visualstudio.com/api/references/extension-guidelines) + +## Working with Markdown + +You can author your README using Visual Studio Code. Here are some useful editor keyboard shortcuts: + +* Split the editor (`Cmd+\` on macOS or `Ctrl+\` on Windows and Linux). +* Toggle preview (`Shift+Cmd+V` on macOS or `Shift+Ctrl+V` on Windows and Linux). +* Press `Ctrl+Space` (Windows, Linux, macOS) to see a list of Markdown snippets. + +## For more information + +* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown) +* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/) + +**Enjoy!** \ No newline at end of file diff --git a/vs-code-extension/eslint.config.mjs b/vs-code-extension/eslint.config.mjs new file mode 100644 index 0000000..d5c0b53 --- /dev/null +++ b/vs-code-extension/eslint.config.mjs @@ -0,0 +1,28 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import tsParser from "@typescript-eslint/parser"; + +export default [{ + files: ["**/*.ts"], +}, { + plugins: { + "@typescript-eslint": typescriptEslint, + }, + + languageOptions: { + parser: tsParser, + ecmaVersion: 2022, + sourceType: "module", + }, + + rules: { + "@typescript-eslint/naming-convention": ["warn", { + selector: "import", + format: ["camelCase", "PascalCase"], + }], + + curly: "warn", + eqeqeq: "warn", + "no-throw-literal": "warn", + semi: "warn", + }, +}]; \ No newline at end of file diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json index ecc98be..335cc39 100644 --- a/vs-code-extension/package.json +++ b/vs-code-extension/package.json @@ -1,34 +1,373 @@ { - "name": "@slingr/vscode-extension", - "displayName": "Slingr", + "name": "slingr-vscode-extension", + "displayName": "Slingr VsCode Extension", "description": "VS Code extension for Slingr framework development", - "version": "1.0.0", - "publisher": "slingr", + "version": "0.0.1", "engines": { - "vscode": "^1.60.0" + "vscode": "^1.103.0" }, "categories": [ - "Programming Languages", - "Snippets", "Other" ], "activationEvents": [ - "onLanguage:typescript", - "onLanguage:javascript" + "onStartupFinished", + "onLanguage:typescript" ], - "main": "./dist/extension.js", - "scripts": { - "build": "echo 'VS Code extension build - to be implemented'", - "test": "echo 'VS Code extension tests - to be implemented'", - "clean": "rm -rf dist" + "main": "./out/extension.js", + "contributes": { + "commands": [ + { + "command": "slingr-vscode-extension.helloWorld", + "title": "Hello World" + }, + { + "command": "slingr-vscode-extension.navigateToCode", + "title": "Navigate to code" + }, + { + "command": "slingr-vscode-extension.refreshNavigation", + "title": "Refresh app navigation" + }, + { + "command": "slingr-vscode-extension.refactor", + "title": "Refactor" + }, + { + "command": "slingr-vscode-extension.renameModel", + "title": "Rename" + }, + { + "command": "slingr-vscode-extension.deleteModel", + "title": "Delete" + }, + { + "command": "slingr-vscode-extension.renameField", + "title": "Rename" + }, + { + "command": "slingr-vscode-extension.deleteField", + "title": "Delete" + }, + { + "command": "slingr-vscode-extension.changeFieldType", + "title": "Change type" + }, + { + "command": "slingr.runInfraUpdate", + "title": "Run infrastructure update" + }, + { + "command": "slingr-vscode-extension.newModel", + "title": "New model" + }, + { + "command": "slingr-vscode-extension.defineFields", + "title": "Define fields with AI" + }, + { + "command": "slingr-vscode-extension.addField", + "title": "Add field" + }, + { + "command": "slingr-vscode-extension.newFolder", + "title": "New folder" + }, + { + "command": "slingr-vscode-extension.renameFolder", + "title": "Rename" + }, + { + "command": "slingr-vscode-extension.deleteFolder", + "title": "Delete" + }, + { + "command": "slingr-vscode-extension.createTest", + "title": "Create test" + }, + { + "command": "slingr-vscode-extension.createModelFromDescription", + "title": "Create model from description" + }, + { + "command": "slingr-vscode-extension.modifyModel", + "title": "Modify with AI" + }, + { + "command": "slingr-vscode-extension.newDataSource", + "title": "New data source" + }, + { + "command": "slingr-vscode-extension.renameDataSource", + "title": "Rename data source" + }, + { + "command": "slingr-vscode-extension.deleteDataSource", + "title": "Delete data source" + } + ], + "submenus": [ + { + "id": "slingr-vscode-extension.actions", + "label": "Slingr Actions" + }, + { + "id": "slingr-vscode-extension.refactorings", + "label": "Refactor" + }, + { + "id": "slingr-vscode-extension.creation", + "label": "Creation" + } + ], + "menus": { + "editor/context": [ + { + "when": "resourceScheme == 'file' && resourceLangId == 'typescript' && resourcePath =~ /src[\\\\/]data[\\\\/]/", + "submenu": "slingr-vscode-extension.actions", + "group": "9_refactor@1" + } + ], + "explorer/context": [ + { + "when": "resourceScheme == 'file' && resourceLangId == 'typescript' && resourcePath =~ /src[\\\\/]data[\\\\/]/", + "submenu": "slingr-vscode-extension.actions", + "group": "2_workspace" + }, + { + "command": "slingr-vscode-extension.newDataSource", + "when": "explorerResourceIsFolder && resourcePath =~ /src[\\\\/]dataSources$/", + "group": "0_creation" + }, + { + "command": "slingr-vscode-extension.renameDataSource", + "when": "resourceScheme == 'file' && !explorerResourceIsFolder && resourceLangId == 'typescript' && resourcePath =~ /src[\\\\/]dataSources[\\\\/]/", + "group": "1_modification" + }, + { + "command": "slingr-vscode-extension.deleteDataSource", + "when": "resourceScheme == 'file' && !explorerResourceIsFolder && resourceLangId == 'typescript' && resourcePath =~ /src[\\\\/]dataSources[\\\\/]/", + "group": "2_modification" + } + ], + "view/item/context": [ + { + "command": "slingr-vscode-extension.newFolder", + "when": "view == slingrExplorer && viewItem == 'dataRoot'", + "group": "0_creation@1" + }, + { + "command": "slingr-vscode-extension.newModel", + "when": "view == slingrExplorer && viewItem == 'dataRoot'", + "group": "0_creation@2" + }, + { + "command": "slingr-vscode-extension.addField", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "0_creation@1" + }, + { + "command": "slingr-vscode-extension.defineFields", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "0_creation@2" + }, + { + "command": "slingr-vscode-extension.renameModel", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "1_modification@1" + }, + { + "command": "slingr-vscode-extension.modifyModel", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "1_modification@2" + }, + { + "command": "slingr-vscode-extension.deleteModel", + "when": "view == slingrExplorer && viewItem == 'model'", + "group": "1_modification@3" + }, + { + "command": "slingr-vscode-extension.renameField", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "0_modification@1" + }, + { + "command": "slingr-vscode-extension.changeFieldType", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "0_modification@2" + }, + { + "command": "slingr-vscode-extension.deleteField", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "0_modification@3" + }, + { + "command": "slingr-vscode-extension.newFolder", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "0_creation@1" + }, + { + "command": "slingr-vscode-extension.newModel", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "0_creation@2" + }, + { + "command": "slingr-vscode-extension.renameFolder", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "1_modification@1" + }, + { + "command": "slingr-vscode-extension.deleteFolder", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "1_modification@2" + }, + { + "command": "slingr-vscode-extension.newDataSource", + "when": "view == slingrExplorer && viewItem == 'dataSourcesRoot'", + "group": "0_creation" + }, + { + "command": "slingr-vscode-extension.renameDataSource", + "when": "view == slingrExplorer && viewItem == 'dataSource'", + "group": "1_modification" + }, + { + "command": "slingr-vscode-extension.deleteDataSource", + "when": "view == slingrExplorer && viewItem == 'dataSource'", + "group": "2_modification" + } + ], + "slingr-vscode-extension.actions": [ + { + "submenu": "slingr-vscode-extension.creation", + "group": "0_creation" + }, + { + "submenu": "slingr-vscode-extension.refactorings", + "group": "1_refactor" + } + ], + "slingr-vscode-extension.creation": [ + { + "command": "slingr-vscode-extension.newFolder", + "when": "(view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot')) || !viewItem", + "group": "0_model@1" + }, + { + "command": "slingr-vscode-extension.newModel", + "when": "(view == slingrExplorer && (viewItem == 'folder' || viewItem == 'dataRoot')) || !viewItem", + "group": "0_model@2" + }, + { + "command": "slingr-vscode-extension.addField", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_field@1" + }, + { + "command": "slingr-vscode-extension.defineFields", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_field@2" + }, + { + "command": "slingr-vscode-extension.createTest", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "2_test@1" + } + ], + "slingr-vscode-extension.refactorings": [ + { + "command": "slingr-vscode-extension.renameModel", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_modification@1" + }, + { + "command": "slingr-vscode-extension.modifyModel", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "1_modification@2" + }, + { + "command": "slingr-vscode-extension.deleteModel", + "when": "(view == slingrExplorer && viewItem == 'model') || !viewItem", + "group": "2_modification@1" + }, + { + "command": "slingr-vscode-extension.renameFolder", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "1_modification@3" + }, + { + "command": "slingr-vscode-extension.deleteFolder", + "when": "view == slingrExplorer && viewItem == 'folder'", + "group": "2_modification@2" + }, + { + "command": "slingr-vscode-extension.renameField", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "1_modification@4" + }, + { + "command": "slingr-vscode-extension.changeFieldType", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "1_modification@5" + }, + { + "command": "slingr-vscode-extension.deleteField", + "when": "view == slingrExplorer && viewItem == 'field'", + "group": "2_modification@3" + } + ] + }, + "viewsContainers": { + "activitybar": [ + { + "id": "slingr-vscode-extension", + "title": "Slingr", + "icon": "resources/slingr-icon.svg" + } + ] + }, + "views": { + "slingr-vscode-extension": [ + { + "id": "slingrExplorer", + "name": "Slingr Explorer", + "icon": "resources/slingr-icon.jpg" + }, + { + "id": "slingrQuickInfo", + "name": "Quick Info", + "type": "webview", + "icon": "resources/eye.svg" + } + ] + } }, "repository": { "type": "git", "url": "git+https://github.com/slingr-stack/framework.git", "directory": "vs-code-extension" }, - "author": "Slingr", - "license": "Apache-2.0", - "dependencies": {}, - "devDependencies": {} + "scripts": { + "vscode:prepublish": "npm run compile", + "compile": "tsc -p ./", + "watch": "tsc -watch -p ./", + "pretest": "npm run compile && npm run lint", + "lint": "eslint src", + "test": "vscode-test", + "build": "npm run compile", + "clean": "rm -rf out" + }, + "devDependencies": { + "@types/mocha": "^10.0.10", + "@types/node": "22.x", + "@types/vscode": "^1.103.0", + "@typescript-eslint/eslint-plugin": "^8.39.0", + "@typescript-eslint/parser": "^8.39.0", + "@vscode/test-cli": "^0.0.11", + "@vscode/test-electron": "^2.5.2", + "eslint": "^9.32.0", + "typescript": "^5.9.2" + }, + "dependencies": { + "ts-morph": "^26.0.0" + } } \ No newline at end of file diff --git a/vs-code-extension/src/extension.ts b/vs-code-extension/src/extension.ts new file mode 100644 index 0000000..443afb8 --- /dev/null +++ b/vs-code-extension/src/extension.ts @@ -0,0 +1,18 @@ +import * as vscode from 'vscode'; + +// Simple extension activation for the monorepo setup +export async function activate(context: vscode.ExtensionContext) { + console.log('Slingr VS Code Extension is now active!'); + + // Register basic Hello World command + const disposable = vscode.commands.registerCommand('slingr-vscode-extension.helloWorld', () => { + vscode.window.showInformationMessage('Hello World from Slingr VS Code Extension!'); + }); + + context.subscriptions.push(disposable); +} + +// This method is called when your extension is deactivated +export function deactivate() { + console.log('Slingr VS Code Extension is deactivated'); +} \ No newline at end of file diff --git a/vs-code-extension/tsconfig.json b/vs-code-extension/tsconfig.json new file mode 100644 index 0000000..d578a2c --- /dev/null +++ b/vs-code-extension/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "module": "Node16", + "target": "ES2022", + "outDir": "out", + "lib": [ + "ES2022" + ], + "sourceMap": true, + "rootDir": "src", + "strict": true, /* enable all strict type-checking options */ + "skipLibCheck": true, /* Skip type checking of declaration files */ + "forceConsistentCasingInFileNames": true, /* Ensure consistent casing in file names */ + /* Additional Checks */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + }, + "exclude": [ + "node_modules/**/*" + ] +} \ No newline at end of file From b18f17c602dcf04ed401537b58f85609ee80ff87 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 16:50:42 +0000 Subject: [PATCH 225/254] Initial plan From 95731574241fb2b1189d5df5420762613fe4b58f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 16:52:00 +0000 Subject: [PATCH 226/254] Initial plan From 45484cfeed2127d51ee659e2a01ec8663aa414e2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:00:56 +0000 Subject: [PATCH 227/254] Copy root-level files from vs-code-extension repository Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- vs-code-extension/.editorconfig | 7 ++ vs-code-extension/.vscode-test.mjs | 5 + vs-code-extension/CHANGELOG.md | 9 ++ vs-code-extension/TESTING.md | 119 ++++++++++++++++++ vs-code-extension/package.json | 11 +- vs-code-extension/src/extension.ts | 18 --- vs-code-extension/vsc-extension-quickstart.md | 44 +++++++ 7 files changed, 186 insertions(+), 27 deletions(-) create mode 100644 vs-code-extension/.editorconfig create mode 100644 vs-code-extension/.vscode-test.mjs create mode 100644 vs-code-extension/CHANGELOG.md create mode 100644 vs-code-extension/TESTING.md delete mode 100644 vs-code-extension/src/extension.ts create mode 100644 vs-code-extension/vsc-extension-quickstart.md diff --git a/vs-code-extension/.editorconfig b/vs-code-extension/.editorconfig new file mode 100644 index 0000000..1678dde --- /dev/null +++ b/vs-code-extension/.editorconfig @@ -0,0 +1,7 @@ +[*] +charset = utf-8 +insert_final_newline = true +end_of_line = lf +indent_style = space +indent_size = 2 +max_line_length = 120 \ No newline at end of file diff --git a/vs-code-extension/.vscode-test.mjs b/vs-code-extension/.vscode-test.mjs new file mode 100644 index 0000000..3038345 --- /dev/null +++ b/vs-code-extension/.vscode-test.mjs @@ -0,0 +1,5 @@ +import { defineConfig } from '@vscode/test-cli'; + +export default defineConfig({ + files: 'out/test/**/*.test.js', +}); \ No newline at end of file diff --git a/vs-code-extension/CHANGELOG.md b/vs-code-extension/CHANGELOG.md new file mode 100644 index 0000000..2f2c3ab --- /dev/null +++ b/vs-code-extension/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change Log + +All notable changes to the "slingr-vscode-extension" extension will be documented in this file. + +Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. + +## [Unreleased] + +- Initial release \ No newline at end of file diff --git a/vs-code-extension/TESTING.md b/vs-code-extension/TESTING.md new file mode 100644 index 0000000..294fc2d --- /dev/null +++ b/vs-code-extension/TESTING.md @@ -0,0 +1,119 @@ +# Testing the Slingr VS Code Extension Explorer + +## Overview + +This document explains how to test the explorer functionality in the Slingr VS Code extension. The tests are designed to ensure that the explorer correctly displays models from the `src/data` folder and provides proper navigation and interaction capabilities. + +## Test Structure + +### 1. Unit Tests (`explorer.test.ts`) +Tests the `ExplorerProvider` class in isolation using mock data: + +- **Root Level Items**: Tests that the explorer shows the correct root structure +- **Data Root Children**: Tests that models are properly loaded from the cache +- **Model Children**: Tests that model fields are displayed correctly +- **Tree Item Properties**: Tests tree item creation and properties +- **Drag and Drop**: Tests field reordering functionality +- **Cache Integration**: Tests cache update event handling + +### 2. Cache Tests (`cache.test.ts`) +Tests the `MetadataCache` class functionality: + +- **Cache Initialization**: Tests that the cache initializes without errors +- **Data Model Methods**: Tests `getDataModels()` and `getDataModelClasses()` methods +- **Event Handling**: Tests the `onDidUpdate` event +- **findMetadata Method**: Tests the metadata search functionality + +## Running the Tests + +### Prerequisites +1. Ensure VS Code is installed +2. Install dependencies: `npm install` +3. Compile the extension: `npm run compile` + +### Running All Tests +```bash +npm test +``` + +### Running Specific Test Suites + +#### In VS Code (Recommended) +1. Open the project in VS Code +2. Go to Run and Debug view (Ctrl+Shift+D) +3. Select test configuration: + - **"Run Extension Tests"**: Runs all tests + - **"Run Explorer Tests Only"**: Runs only explorer-related tests +4. Press F5 to run + +#### Command Line +```bash +# Run all tests +npm run test + +# Run with specific pattern +npm run test -- --grep "Explorer" +``` + +## Test Data Requirements + +### For Unit Tests +Unit tests use mock data and don't require real files. They test: +- Mock models with `@Model` decorators +- Mock properties with `@Field` decorators +- Mock cache responses + + +## What Each Test Verifies + +### Explorer Provider Tests +1. **Correct Tree Structure**: Verifies the explorer shows "Data" root with models underneath +2. **Model Loading**: Ensures only data models (from `src/data/`) are shown +3. **Field Display**: Confirms model fields are properly displayed +4. **Navigation**: Tests that clicking items navigates to the correct code location +5. **Drag & Drop**: Verifies field reordering works correctly + +### Cache Tests +1. **File Discovery**: Ensures cache finds TypeScript files in `src/data/` +2. **Decorator Parsing**: Verifies `@Model` and `@Field` decorators are correctly parsed +3. **Data Model Flag**: Confirms `isDataModel` flag is set correctly +4. **Update Events**: Tests that file changes trigger cache updates + + +## Debugging Tests + +### Common Issues and Solutions + +1. **No models found**: + - Check that `src/data/` directory exists + - Verify model files have `@Model` decorators + - Ensure `tsconfig.json` is properly configured + +2. **Tests timeout**: + - Increase timeout in test configuration + - Check that cache initialization completes + - Verify VS Code test environment is set up correctly + +3. **Import errors**: + - Ensure all dependencies are installed + - Check that compiled JavaScript files exist in `out/` directory + - Verify TypeScript compilation succeeded + +### Debug Configuration + +Use the VS Code debugger with the test configurations: +- Set breakpoints in test files or source code +- Use "Run Explorer Tests Only" for focused debugging +- Check the Debug Console for detailed output + +## Adding New Tests + +### For New Explorer Features +1. Add unit tests to `explorer.test.ts` +2. Create mock data for new functionality +3. Test both success and error cases + +### For New Cache Features +1. Add tests to `cache.test.ts` +2. Test with both real and mock data +3. Verify event handling and performance \ No newline at end of file diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json index 335cc39..fa43e2a 100644 --- a/vs-code-extension/package.json +++ b/vs-code-extension/package.json @@ -1,7 +1,7 @@ { "name": "slingr-vscode-extension", "displayName": "Slingr VsCode Extension", - "description": "VS Code extension for Slingr framework development", + "description": "", "version": "0.0.1", "engines": { "vscode": "^1.103.0" @@ -341,20 +341,13 @@ ] } }, - "repository": { - "type": "git", - "url": "git+https://github.com/slingr-stack/framework.git", - "directory": "vs-code-extension" - }, "scripts": { "vscode:prepublish": "npm run compile", "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "pretest": "npm run compile && npm run lint", "lint": "eslint src", - "test": "vscode-test", - "build": "npm run compile", - "clean": "rm -rf out" + "test": "vscode-test" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/vs-code-extension/src/extension.ts b/vs-code-extension/src/extension.ts deleted file mode 100644 index 443afb8..0000000 --- a/vs-code-extension/src/extension.ts +++ /dev/null @@ -1,18 +0,0 @@ -import * as vscode from 'vscode'; - -// Simple extension activation for the monorepo setup -export async function activate(context: vscode.ExtensionContext) { - console.log('Slingr VS Code Extension is now active!'); - - // Register basic Hello World command - const disposable = vscode.commands.registerCommand('slingr-vscode-extension.helloWorld', () => { - vscode.window.showInformationMessage('Hello World from Slingr VS Code Extension!'); - }); - - context.subscriptions.push(disposable); -} - -// This method is called when your extension is deactivated -export function deactivate() { - console.log('Slingr VS Code Extension is deactivated'); -} \ No newline at end of file diff --git a/vs-code-extension/vsc-extension-quickstart.md b/vs-code-extension/vsc-extension-quickstart.md new file mode 100644 index 0000000..ef194c4 --- /dev/null +++ b/vs-code-extension/vsc-extension-quickstart.md @@ -0,0 +1,44 @@ +# Welcome to your VS Code Extension + +## What's in the folder + +* This folder contains all of the files necessary for your extension. +* `package.json` - this is the manifest file in which you declare your extension and command. + * The sample plugin registers a command and defines its title and command name. With this information VS Code can show the command in the command palette. It doesn't yet need to load the plugin. +* `src/extension.ts` - this is the main file where you will provide the implementation of your command. + * The file exports one function, `activate`, which is called the very first time your extension is activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`. + * We pass the function containing the implementation of the command as the second parameter to `registerCommand`. + +## Get up and running straight away + +* Press `F5` to open a new window with your extension loaded. +* Run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World`. +* Set breakpoints in your code inside `src/extension.ts` to debug your extension. +* Find output from your extension in the debug console. + +## Make changes + +* You can relaunch the extension from the debug toolbar after changing code in `src/extension.ts`. +* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes. + +## Explore the API + +* You can open the full set of our API when you open the file `node_modules/@types/vscode/index.d.ts`. + +## Run tests + +* Install the [Extension Test Runner](https://marketplace.visualstudio.com/items?itemName=ms-vscode.extension-test-runner) +* Run the "watch" task via the **Tasks: Run Task** command. Make sure this is running, or tests might not be discovered. +* Open the Testing view from the activity bar and click the Run Test" button, or use the hotkey `Ctrl/Cmd + ; A` +* See the output of the test result in the Test Results view. +* Make changes to `src/test/extension.test.ts` or create new test files inside the `test` folder. + * The provided test runner will only consider files matching the name pattern `**.test.ts`. + * You can create folders inside the `test` folder to structure your tests any way you want. + +## Go further + +* [Follow UX guidelines](https://code.visualstudio.com/api/ux-guidelines/overview) to create extensions that seamlessly integrate with VS Code's native interface and patterns. +* Reduce the extension size and improve the startup time by [bundling your extension](https://code.visualstudio.com/api/working-with-extensions/bundling-extension). +* [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VS Code extension marketplace. +* Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration). +* Integrate to the [report issue](https://code.visualstudio.com/api/get-started/wrapping-up#issue-reporting) flow to get issue and feature requests reported by users. \ No newline at end of file From 6c6a8573139b96971b2b9068fa7b121f66c30cff Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:04:56 +0000 Subject: [PATCH 228/254] Add missing CLI commands and utilities for complete sync Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- cli/bin/dev.cmd | 3 + cli/bin/run.cmd | 3 + cli/src/commands/cli-build.ts | 41 ++++ cli/src/commands/infra/down.ts | 78 +++++++ cli/src/commands/infra/up.ts | 71 ++++++ cli/src/commands/infra/update.ts | 307 ++++++++++++++++++++++++++ cli/src/commands/run.ts | 267 ++++++++++++++++++++++ cli/src/utils/datasource-parser.ts | 99 +++++++++ cli/src/utils/port-checker.ts | 187 ++++++++++++++++ cli_backup/.gitignore | 16 ++ cli_backup/.npmignore | 7 + cli_backup/.prettierrc.json | 1 + cli_backup/README.md | 98 ++++++++ cli_backup/bin/dev.js | 5 + cli_backup/bin/run.js | 5 + cli_backup/eslint.config.mjs | 16 ++ cli_backup/package.json | 80 +++++++ cli_backup/src/commands/create-app.ts | 156 +++++++++++++ cli_backup/src/index.ts | 1 + cli_backup/src/project-structure.ts | 163 ++++++++++++++ cli_backup/tsconfig.json | 16 ++ 21 files changed, 1620 insertions(+) create mode 100644 cli/bin/dev.cmd create mode 100644 cli/bin/run.cmd create mode 100644 cli/src/commands/cli-build.ts create mode 100644 cli/src/commands/infra/down.ts create mode 100644 cli/src/commands/infra/up.ts create mode 100644 cli/src/commands/infra/update.ts create mode 100644 cli/src/commands/run.ts create mode 100644 cli/src/utils/datasource-parser.ts create mode 100644 cli/src/utils/port-checker.ts create mode 100644 cli_backup/.gitignore create mode 100644 cli_backup/.npmignore create mode 100644 cli_backup/.prettierrc.json create mode 100644 cli_backup/README.md create mode 100755 cli_backup/bin/dev.js create mode 100755 cli_backup/bin/run.js create mode 100644 cli_backup/eslint.config.mjs create mode 100644 cli_backup/package.json create mode 100644 cli_backup/src/commands/create-app.ts create mode 100644 cli_backup/src/index.ts create mode 100644 cli_backup/src/project-structure.ts create mode 100644 cli_backup/tsconfig.json diff --git a/cli/bin/dev.cmd b/cli/bin/dev.cmd new file mode 100644 index 0000000..aec22ec --- /dev/null +++ b/cli/bin/dev.cmd @@ -0,0 +1,3 @@ +@echo off + +node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev" %* \ No newline at end of file diff --git a/cli/bin/run.cmd b/cli/bin/run.cmd new file mode 100644 index 0000000..cf40b54 --- /dev/null +++ b/cli/bin/run.cmd @@ -0,0 +1,3 @@ +@echo off + +node "%~dp0\run" %* \ No newline at end of file diff --git a/cli/src/commands/cli-build.ts b/cli/src/commands/cli-build.ts new file mode 100644 index 0000000..f8c18a8 --- /dev/null +++ b/cli/src/commands/cli-build.ts @@ -0,0 +1,41 @@ +import { Command } from '@oclif/core' +import { execSync } from 'child_process' +import { fileURLToPath } from 'url' +import { dirname, join } from 'path' + +export default class CliBuild extends Command { + static description = 'Rebuild the Slingr CLI tool itself. This command is used for CLI development and maintenance, not for building Slingr applications.' + + static examples = [ + '<%= config.bin %> <%= command.id %>', + 'Description: Use this command when you need to rebuild the Slingr CLI after making changes to the CLI codebase.' + ] + + static aliases = ['cli-build'] + static strict = false + + public async run(): Promise { + const __filename = fileURLToPath(import.meta.url) + const __dirname = dirname(__filename) + const cliRootPath = join(__dirname, '..', '..') + + try { + this.log('Rebuilding Slingr CLI tool...') + execSync('npm run build', { + cwd: cliRootPath, + stdio: 'inherit' + }) + + this.log('Updating OCLIF manifest and documentation...') + execSync('npm run prepack', { + cwd: cliRootPath, + stdio: 'inherit' + }) + + this.log('Slingr CLI rebuild completed successfully!') + } catch (error) { + this.error('Failed to rebuild Slingr CLI') + throw error + } + } +} \ No newline at end of file diff --git a/cli/src/commands/infra/down.ts b/cli/src/commands/infra/down.ts new file mode 100644 index 0000000..a9bdaea --- /dev/null +++ b/cli/src/commands/infra/down.ts @@ -0,0 +1,78 @@ +import { Command, Flags } from '@oclif/core' +import fs from 'fs-extra' +import { execSync } from 'child_process' + +export default class InfraDown extends Command { + static description = 'Stop infrastructure services using Docker Compose (data is preserved by default)' + static examples = [ + '<%= config.bin %> <%= command.id %> # Stop services, preserve data', + '<%= config.bin %> <%= command.id %> --volumes # Stop services and delete all data' + ] + + static flags = { + volumes: Flags.boolean({ + char: 'v', + description: 'Remove volumes as well (WARNING: This will delete all data)', + default: false + }), + help: Flags.help({ char: 'h' }) + } + + private async checkDockerComposeFile(): Promise { + const dockerComposeFile = 'docker-compose.yml' + + if (!await fs.pathExists(dockerComposeFile)) { + this.error('No docker-compose.yml file found. Please run "slingr infra update" first to generate the infrastructure configuration.') + } + } + + private async checkDockerInstallation(): Promise { + try { + execSync('docker --version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker is not installed. Please install Docker to run infrastructure services.') + } + + try { + execSync('docker compose version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker Compose is not installed. Please install Docker Compose to run infrastructure services.') + } + } + + async run(): Promise { + const { flags } = await this.parse(InfraDown) + + try { + // Check if docker-compose.yml exists + await this.checkDockerComposeFile() + + // Check if Docker and Docker Compose are installed + await this.checkDockerInstallation() + + // Stop infrastructure services + this.log('🔽 Stopping infrastructure services...') + + const composeCommand = flags.volumes ? + 'docker compose down -v' : + 'docker compose down' + + if (flags.volumes) { + this.log('⚠️ WARNING: This will remove all volumes and permanently delete all data!') + } else { + this.log('ℹ️ Data will be preserved. Use --volumes flag to remove all data.') + } + + execSync(composeCommand, { stdio: 'inherit' }) + + if (flags.volumes) { + this.log('✅ Infrastructure services stopped and all data removed.') + } else { + this.log('✅ Infrastructure services stopped (data preserved).') + } + + } catch (error) { + this.error((error as Error).message) + } + } +} \ No newline at end of file diff --git a/cli/src/commands/infra/up.ts b/cli/src/commands/infra/up.ts new file mode 100644 index 0000000..1b62f96 --- /dev/null +++ b/cli/src/commands/infra/up.ts @@ -0,0 +1,71 @@ +import { Command, Flags } from '@oclif/core' +import fs from 'fs-extra' +import { execSync } from 'child_process' + +export default class InfraUp extends Command { + static description = 'Start infrastructure services using Docker Compose' + static examples = [ + '<%= config.bin %> <%= command.id %>', + '<%= config.bin %> <%= command.id %> --detach' + ] + + static flags = { + detach: Flags.boolean({ + char: 'd', + description: 'Run services in detached mode (background)', + default: true + }), + help: Flags.help({ char: 'h' }) + } + + private async checkDockerComposeFile(): Promise { + const dockerComposeFile = 'docker-compose.yml' + + if (!await fs.pathExists(dockerComposeFile)) { + this.error('No docker-compose.yml file found. Please run "slingr infra update" first to generate the infrastructure configuration.') + } + } + + private async checkDockerInstallation(): Promise { + try { + execSync('docker --version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker is not installed. Please install Docker to run infrastructure services.') + } + + try { + execSync('docker compose version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker Compose is not installed. Please install Docker Compose to run infrastructure services.') + } + } + + async run(): Promise { + const { flags } = await this.parse(InfraUp) + + try { + // Check if docker-compose.yml exists + await this.checkDockerComposeFile() + + // Check if Docker and Docker Compose are installed + await this.checkDockerInstallation() + + // Start infrastructure services + this.log('Starting infrastructure services...') + + const composeCommand = flags.detach ? + 'docker compose up -d' : + 'docker compose up' + + execSync(composeCommand, { stdio: 'inherit' }) + + if (flags.detach) { + this.log('Infrastructure services started in detached mode.') + this.log('Use "docker compose ps" to check service status.') + } + + } catch (error) { + this.error((error as Error).message) + } + } +} \ No newline at end of file diff --git a/cli/src/commands/infra/update.ts b/cli/src/commands/infra/update.ts new file mode 100644 index 0000000..afa9e50 --- /dev/null +++ b/cli/src/commands/infra/update.ts @@ -0,0 +1,307 @@ +import { Args, Command, Flags } from '@oclif/core' +import fs from 'fs-extra' +import inquirer from 'inquirer' +import * as yaml from 'js-yaml' +import * as path from 'path' +import { checkPortsUsage, findAvailablePort } from '../../utils/port-checker.js' + +interface DataSource { + // Allowed DB types + type: 'postgres' | 'mysql' | 'sqlite' + name: string + managed?: boolean + host?: string + port?: number + username?: string + password?: string + database?: string + logging?: boolean + synchronize?: boolean + connectTimeout?: number +} + +export default class InfraUpdate extends Command { + static description = 'Update infrastructure configuration based on metadata' + static examples = [ + '<%= config.bin %> <%= command.id %>', + '<%= config.bin %> <%= command.id %> --file postgres.ts', + '<%= config.bin %> <%= command.id %> -f mysql.ts', + '<%= config.bin %> <%= command.id %> --all', + '<%= config.bin %> <%= command.id %> -a' + ] + + static flags = { + file: Flags.string({ + char: 'f', + description: 'Optional: Specific data source file to update', + required: false + }), + all: Flags.boolean({ + char: 'a', + description: 'Update all available data sources', + required: false + }) + } + + private async readDataSources(specificFile?: string): Promise { + const datasourcesDir = path.join(process.cwd(), 'src', 'dataSources') + if (!fs.existsSync(datasourcesDir)) { + throw new Error('No dataSources directory found. Make sure you have a src/dataSources/ folder.') + } + + // Ensure file has .ts extension if specified + const normalizeFileName = (file: string) => + file.endsWith('.ts') ? file : `${file}.ts` + + const files = specificFile ? + [normalizeFileName(specificFile)] : + (await fs.readdir(datasourcesDir)).filter(f => f.endsWith('.ts')) + + const dataSources: DataSource[] = [] + for (const file of files) { + const filePath = path.join(datasourcesDir, file) + const fileContent = await fs.readFile(filePath, 'utf-8') + const extractRaw = (key: string): string | null => { + const re = new RegExp(key + "\\s*:\\s*([^,\n]+)", 'i') + const m = fileContent.match(re) + return m ? m[1].trim() : null + } + const interpret = (raw: string | null): any => { + if (!raw) return undefined + raw = raw.replace(/,$/, '').trim() + if (/^(true|false)$/i.test(raw)) return raw.toLowerCase() === 'true' + let m = raw.match(/parseInt\([^|]+\|\|\s*['"]([^'"]+)['"]\)/i) + if (m) return parseInt(m[1], 10) + m = raw.match(/process\.env\.[A-Z0-9_]+\s*\|\|\s*['"]([^'"]+)['"]/i) + if (m) return m[1] + m = raw.match(/^['"]([^'"]+)['"]$/) + if (m) return m[1] + m = raw.match(/^(\d+)$/) + if (m) return parseInt(m[1], 10) + return raw + } + const typeRaw = extractRaw('type') + if (!typeRaw) continue + let typeVal = (typeRaw.match(/['"]([^'"]+)['"]/i) || [null, typeRaw])[1].toLowerCase() + if (typeVal === 'postgresql') typeVal = 'postgres' + if (!['mysql', 'postgres', 'sqlite'].includes(typeVal)) { + this.warn(`Skipping unsupported database type: ${typeVal}. Only PostgreSQL, MySQL and SQLite are supported.`) + continue + } + const name = file.replace('.ts', '') + const dataSource: DataSource = { + type: typeVal as DataSource['type'], + name, + managed: interpret(extractRaw('managed')) ?? undefined, + host: interpret(extractRaw('host')) ?? undefined, + port: interpret(extractRaw('port')) ?? (typeVal === 'mysql' ? 3306 : 5432), + username: interpret(extractRaw('username')) ?? (typeVal === 'mysql' ? 'root' : 'postgres'), + password: interpret(extractRaw('password')) ?? (typeVal === 'mysql' ? 'root' : 'postgres'), + database: interpret(extractRaw('database')) ?? 'slingr', + logging: interpret(extractRaw('logging')) ?? undefined, + synchronize: interpret(extractRaw('synchronize')) ?? undefined, + connectTimeout: interpret(extractRaw('connectTimeout')) ?? undefined, + } + dataSources.push(dataSource) + } + return dataSources + } + + private async generateDockerCompose(dataSources: DataSource[], updateSingleService = false): Promise> { + let compose: { + services: Record + volumes: Record + } + + // Read existing docker-compose.yml when updating a single service + if (updateSingleService && await fs.pathExists('docker-compose.yml')) { + try { + const existingCompose = yaml.load(await fs.readFile('docker-compose.yml', 'utf-8')) as { + services?: Record + volumes?: Record + } + compose = { + services: existingCompose?.services || {}, + volumes: existingCompose?.volumes || {} + } + } catch (error) { + this.warn('Could not read existing docker-compose.yml, creating new one') + compose = { services: {}, volumes: {} } + } + } else { + compose = { services: {}, volumes: {} } + } + + dataSources.forEach(ds => { + switch (ds.type) { + case 'postgres': + compose.services[`${ds.name}-db`] = { + image: 'postgres:15-alpine', + ports: [`${ds.port || 5432}:5432`], + volumes: [`${ds.name}-data:/var/lib/postgresql/data`], + environment: { + POSTGRES_USER: ds.username || 'postgres', + POSTGRES_PASSWORD: ds.password || 'postgres', + POSTGRES_DB: ds.database || 'slingr', + }, + healthcheck: { + test: ["CMD-SHELL", "pg_isready"], + interval: "2s", + timeout: "5s", + retries: 15, + start_period: "10s" + } + } + compose.volumes[`${ds.name}-data`] = null + break + case 'mysql': + { + const env: Record = { + MYSQL_DATABASE: ds.database || 'slingr', + } + if ((ds.username || '').toLowerCase() === 'root') { + env.MYSQL_ROOT_PASSWORD = ds.password || 'root' + } else { + env.MYSQL_USER = ds.username || 'slingr' + env.MYSQL_PASSWORD = ds.password || 'slingr' + } + + compose.services[`${ds.name}-db`] = { + image: 'mysql:8.0', + ports: [`${ds.port || 3306}:3306`], + volumes: [`${ds.name}-data:/var/lib/mysql`], + environment: env, + healthcheck: { + test: ["CMD", "mysqladmin", "ping", "-h", "localhost"], + timeout: "20s", + retries: 10 + } + } + compose.volumes[`${ds.name}-data`] = null + } + break + case 'sqlite': + // SQLite stores its data in a file, so we need a volume to persist it + compose.services[`${ds.name}-db`] = { + image: 'keinos/sqlite3:latest', + volumes: [ + `${ds.name}-data:/data` + ], + environment: { + DB_FILE: ds.database || 'slingr.db' + }, + command: ["sh", "-c", "sqlite3 /data/${DB_FILE}"] + } + compose.volumes[`${ds.name}-data`] = null + break + } + }) + + return compose + } + + private async checkPortsBeforeGeneration(dataSources: DataSource[]): Promise { + const ports = dataSources.map(ds => ds.port || (ds.type === 'mysql' ? 3306 : 5432)) + const portUsage = await checkPortsUsage(ports) + + const conflictingPorts = portUsage.filter(p => p.inUse && !p.isProjectDocker) + const dockerPorts = portUsage.filter(p => p.inUse && p.isProjectDocker) + + // Show info about existing Docker containers + if (dockerPorts.length > 0) { + this.log('ℹ️ Found existing project containers:') + for (const dockerPort of dockerPorts) { + const dataSource = dataSources.find(ds => (ds.port || (ds.type === 'mysql' ? 3306 : 5432)) === dockerPort.port) + if (dataSource) { + this.log(` ✅ Port ${dockerPort.port} - ${dataSource.name} (${dockerPort.containerName})`) + } + } + this.log('') + } + + if (conflictingPorts.length > 0) { + this.warn('⚠️ Warning: Some ports are currently in use') + + for (const conflictPort of conflictingPorts) { + const dataSource = dataSources.find(ds => (ds.port || (ds.type === 'mysql' ? 3306 : 5432)) === conflictPort.port) + if (dataSource) { + this.warn(`⚠️ Port ${conflictPort.port} is in use (needed for ${dataSource.name} - ${dataSource.type})`) + if (conflictPort.process) { + this.warn(` Currently used by: ${conflictPort.process}`) + } + + // Suggest alternative ports + const alternativePort = await findAvailablePort(conflictPort.port + 1, 10) + if (alternativePort) { + this.warn(` 💡 Consider using port ${alternativePort} instead`) + } + } + } + + this.warn('💡 Note: Docker containers may fail to start due to these port conflicts') + this.warn('Consider updating your datasource files to use different ports\n') + } + } + + async run(): Promise { + try { + const { flags } = await this.parse(InfraUpdate) + this.log('Reading metadata and updating infrastructure configuration...') + + const dataSources = await this.readDataSources(flags.file) + if (dataSources.length === 0) { + this.log('No data sources found in configuration.') + return + } + + let selectedDataSources: DataSource[] + + if (flags.all) { + // When using --all flag, select all available data sources + selectedDataSources = dataSources + this.log(`Using all data sources (${dataSources.length} found):`) + dataSources.forEach(ds => { + this.log(` - ${ds.name} (${ds.type})`) + }) + } else if (dataSources.length === 1 || flags.file) { + // Auto-select when there's only one data source or when using --file flag + selectedDataSources = dataSources + this.log(`Using data source: ${dataSources[0].name} (${dataSources[0].type})`) + } else { + // Show interactive selection for multiple data sources + const answers = await inquirer.prompt([ + { + type: 'checkbox', + name: 'selectedDataSources', + message: 'Select the data sources you want to update:', + choices: dataSources.map(ds => ({ + name: `${ds.name} (${ds.type})`, + value: ds, + checked: true + })) + } + ]) + + selectedDataSources = answers.selectedDataSources as DataSource[] + if (selectedDataSources.length === 0) { + this.log('No data sources selected. Exiting...') + return + } + } + + // Check if we're updating a single service + const isSingleUpdate = selectedDataSources.length === 1 && !flags.all + + // Check for port conflicts before generating docker-compose + await this.checkPortsBeforeGeneration(selectedDataSources) + + const dockerCompose = await this.generateDockerCompose(selectedDataSources, isSingleUpdate) + const yamlContent = yaml.dump(dockerCompose) + + await fs.writeFile('docker-compose.yml', yamlContent) + this.log('Successfully generated docker-compose.yml with database configurations.') + } catch (error) { + this.error((error as Error).message) + } + } +} \ No newline at end of file diff --git a/cli/src/commands/run.ts b/cli/src/commands/run.ts new file mode 100644 index 0000000..b1dcab5 --- /dev/null +++ b/cli/src/commands/run.ts @@ -0,0 +1,267 @@ +import { Command, Flags } from '@oclif/core' +import path from 'node:path' +import fs from 'fs-extra' +import { execSync } from 'child_process' +import { checkPortsUsage, findAvailablePort } from '../utils/port-checker.js' +import { extractDataSourcePorts } from '../utils/datasource-parser.js' + +export default class Run extends Command { + static override description = 'Run a Slingr application locally' + + static override examples = [ + '<%= config.bin %> <%= command.id %>', + '<%= config.bin %> <%= command.id %> --skip-infra' + ] + + static override flags = { + 'skip-infra': Flags.boolean({ + char: 'i', + description: 'Skip infrastructure setup and checks', + required: false, + }), + help: Flags.help({ char: 'h' }) + } + + private async checkInfrastructure(): Promise { + const dataSources = await this.loadDataSources() + + // Check port availability before starting services + await this.checkPortAvailability() + + // Run infra update command to ensure latest infrastructure configuration + await this.config.runCommand('infra:update', ['--all']) + + // Check if docker is installed + try { + execSync('docker --version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker is not installed. Please install Docker to run infrastructure services.') + } + + // Check if Docker Engine is running + try { + execSync('docker info', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker Engine is not running. Please start Docker Desktop or the Docker service before continuing.') + } + + // Check if docker-compose is installed + try { + execSync('docker compose version', { stdio: 'pipe' }) + } catch (error) { + this.error('Docker Compose is not installed. Please install Docker Compose to run infrastructure services.') + } + + // Start infrastructure services + this.log('Starting infrastructure services...') + try { + execSync('docker compose up -d', { stdio: 'inherit' }) + } catch (error) { + this.error('Failed to start Docker services. This might be due to port conflicts or other Docker issues.') + } + + // Wait for services to be healthy + this.log('Waiting for services to be ready...') + for (const ds of dataSources) { + const serviceName = `${ds.name}-db` + this.log(`Checking ${serviceName}...`) + + let attempts = 0 + const maxAttempts = 30 + + while (attempts < maxAttempts) { + try { + const containerInfo = execSync(`docker ps -f name=${serviceName} --format '{{.Status}}'`, { encoding: 'utf-8' }) + + if (containerInfo.includes('healthy')) { + this.log(`Service ${serviceName} is healthy`) + break + } + } catch (error) { + // Continue trying + } + + await new Promise(resolve => setTimeout(resolve, 1000)) + attempts++ + + if (attempts === maxAttempts) { + this.error(`Service ${serviceName} is not healthy after ${maxAttempts} seconds`) + } + } + } + } + + private async checkPortAvailability(): Promise { + this.log('Checking port availability for datasources...') + + const dataSourcePorts = await extractDataSourcePorts() + + if (dataSourcePorts.length === 0) { + return + } + + const ports = dataSourcePorts.map(ds => ds.port) + const portUsage = await checkPortsUsage(ports) + + const conflictingPorts = portUsage.filter(p => p.inUse && !p.isProjectDocker) + const dockerPorts = portUsage.filter(p => p.inUse && p.isProjectDocker) + + // Show info about existing Docker containers + if (dockerPorts.length > 0) { + this.log('ℹ️ Found existing project containers:') + for (const dockerPort of dockerPorts) { + const dataSource = dataSourcePorts.find(ds => ds.port === dockerPort.port) + if (dataSource) { + this.log(` ✅ Port ${dockerPort.port} - ${dataSource.type} (${dockerPort.containerName})`) + } + } + this.log('') + } + + if (conflictingPorts.length > 0) { + this.log('⚠️ Port conflicts detected!') + this.log('') + + for (const conflictPort of conflictingPorts) { + const dataSource = dataSourcePorts.find(ds => ds.port === conflictPort.port) + if (dataSource) { + this.log(`❌ Port ${conflictPort.port} is already in use (required by ${dataSource.fileName})`) + this.log(` Database type: ${dataSource.type}`) + if (conflictPort.process) { + this.log(` Currently used by: ${conflictPort.process}`) + } + + // Suggest alternative ports + const alternativePort = await findAvailablePort(conflictPort.port + 1, 10) + if (alternativePort) { + this.log(` 💡 Suggested alternative: port ${alternativePort}`) + this.log(` To use this port, update ${dataSource.fileName} and change the port to ${alternativePort}`) + } + this.log('') + } + } + + this.log('💡 Solutions:') + this.log('1. Stop the processes using these ports') + this.log('2. Update your datasource files to use different ports') + this.log('3. Use --skip-infra flag to run without infrastructure') + this.log('') + + this.error(`Cannot start infrastructure due to port conflicts. Please resolve the port conflicts above.`) + } else { + this.log('✅ All required ports are available') + } + } + + private async loadDataSources(): Promise> { + const dataSources: Array<{ type: string; name: string }> = [] + const dataSourcesPath = path.join(process.cwd(), 'src', 'dataSources') + + if (await fs.pathExists(dataSourcesPath)) { + const files = await fs.readdir(dataSourcesPath) + for (const file of files) { + if (file.endsWith('.ts')) { + const content = await fs.readFile(path.join(dataSourcesPath, file), 'utf-8') + const typeMatch = content.match(/type:\s*['"]([^'"]+)['"]/) + if (typeMatch) { + let type = typeMatch[1] + if (type === 'postgresql') type = 'postgres' + + dataSources.push({ + type, + name: file.replace('.ts', '') + }) + } + } + } + } + + return dataSources + } + + private async generateCode(): Promise { + // Compile TypeScript code + this.log('Compiling TypeScript code...') + execSync('npm run build', { stdio: 'inherit' }) + } + + private async buildFramework(): Promise { + const currentDir = process.cwd() + const nodeModulesPath = path.join(currentDir, 'node_modules', 'slingr-framework') + const distPath = path.join(nodeModulesPath, 'dist') + const mainFile = path.join(distPath, 'index.js') + + this.log(`Looking for slingr-framework in: ${nodeModulesPath}`) + + if (!await fs.pathExists(nodeModulesPath)) { + this.error('slingr-framework not found in node_modules. Please run npm install first.') + } + + // Check if framework is already built + if (await fs.pathExists(mainFile)) { + this.log('✅ slingr-framework is already built') + return + } + + this.log('📦 Building slingr-framework...') + + try { + this.log('Changing to framework directory...') + process.chdir(nodeModulesPath) + + // Check if tsconfig.build.json exists, if not, try with regular tsconfig.json or default tsc + const tsconfigBuildPath = path.join(nodeModulesPath, 'tsconfig.build.json') + const tsconfigPath = path.join(nodeModulesPath, 'tsconfig.json') + + if (await fs.pathExists(tsconfigBuildPath)) { + this.log('Building framework with tsconfig.build.json...') + execSync('npm run build', { stdio: 'inherit' }) + } else if (await fs.pathExists(tsconfigPath)) { + this.log('Building framework with tsconfig.json...') + execSync('npx tsc', { stdio: 'inherit' }) + } else { + this.log('Building framework with default TypeScript settings...') + execSync('npx tsc --outDir dist --declaration', { stdio: 'inherit' }) + } + } catch (error) { + this.warn(`Failed to build framework: ${(error as Error).message}`) + this.warn('Framework build failed, but continuing anyway. This might cause runtime issues.') + } finally { + this.log('Returning to project directory...') + process.chdir(currentDir) + } + } public async run(): Promise { + const { flags } = await this.parse(Run) + + try { + // Check if we're in a Slingr app directory + const packageJsonPath = path.join(process.cwd(), 'package.json') + if (!await fs.pathExists(packageJsonPath)) { + this.error('Not in a Slingr application directory. Please run this command from your app\'s root directory.') + } + + const packageJson = await fs.readJSON(packageJsonPath) + if (!packageJson.dependencies?.['slingr-framework']) { + this.error('This directory does not contain a Slingr application.') + } + + // Step 1: Build slingr-framework + await this.buildFramework() + + // Step 2: Generate code + await this.generateCode() + + // Step 3: Update and check infrastructure + if (!flags['skip-infra']) { + await this.checkInfrastructure() + } + + // Execute index.ts + this.log('Starting application...') + execSync('npm run dev', { stdio: 'inherit' }) + + } catch (error) { + this.error((error as Error).message) + } + } +} \ No newline at end of file diff --git a/cli/src/utils/datasource-parser.ts b/cli/src/utils/datasource-parser.ts new file mode 100644 index 0000000..4512899 --- /dev/null +++ b/cli/src/utils/datasource-parser.ts @@ -0,0 +1,99 @@ +import fs from 'fs-extra' +import path from 'path' + +export interface DataSourcePortInfo { + fileName: string + type: string + port: number + host?: string + database?: string +} + +/** + * Extract port information from datasource files + */ +export async function extractDataSourcePorts(specificFile?: string): Promise { + const datasourcesDir = path.join(process.cwd(), 'src', 'dataSources') + + if (!fs.existsSync(datasourcesDir)) { + return [] + } + + // Ensure file has .ts extension if specified + const normalizeFileName = (file: string) => + file.endsWith('.ts') ? file : `${file}.ts` + + const files = specificFile ? + [normalizeFileName(specificFile)] : + (await fs.readdir(datasourcesDir)).filter(f => f.endsWith('.ts')) + + const dataSources: DataSourcePortInfo[] = [] + + for (const file of files) { + const filePath = path.join(datasourcesDir, file) + + if (!fs.existsSync(filePath)) { + continue + } + + const fileContent = await fs.readFile(filePath, 'utf-8') + + // Extract values using regex + const extractRaw = (key: string): string | null => { + const re = new RegExp(key + "\\s*:\\s*([^,\n]+)", 'i') + const m = fileContent.match(re) + return m ? m[1].trim() : null + } + + const interpret = (raw: string | null): any => { + if (!raw) return undefined + raw = raw.replace(/,$/, '').trim() + + // Handle boolean values + if (/^(true|false)$/i.test(raw)) return raw.toLowerCase() === 'true' + + // Handle parseInt with fallback + let m = raw.match(/parseInt\([^|]+\|\|\s*['"]([^'"]+)['"]\)/i) + if (m) return parseInt(m[1], 10) + + // Handle environment variables with fallback + m = raw.match(/process\.env\.[A-Z0-9_]+\s*\|\|\s*['"]([^'"]+)['"]/i) + if (m) return m[1] + + // Handle quoted strings + m = raw.match(/^['"]([^'"]+)['"]$/) + if (m) return m[1] + + // Handle plain numbers + m = raw.match(/^(\d+)$/) + if (m) return parseInt(m[1], 10) + + return raw + } + + const typeRaw = extractRaw('type') + if (!typeRaw) continue + + let typeVal = (typeRaw.match(/['"]([^'"]+)['"]/i) || [null, typeRaw])[1].toLowerCase() + if (typeVal === 'postgresql') typeVal = 'postgres' + + if (!['mysql', 'postgres', 'sqlite'].includes(typeVal)) { + continue + } + + const portRaw = extractRaw('port') + const port = interpret(portRaw) ?? (typeVal === 'mysql' ? 3306 : 5432) + + if (typeof port === 'number') { + dataSources.push({ + fileName: file, + type: typeVal, + port, + host: interpret(extractRaw('host')) ?? 'localhost', + database: interpret(extractRaw('database')) ?? undefined + }) + } + } + + return dataSources +} \ No newline at end of file diff --git a/cli/src/utils/port-checker.ts b/cli/src/utils/port-checker.ts new file mode 100644 index 0000000..a3fb685 --- /dev/null +++ b/cli/src/utils/port-checker.ts @@ -0,0 +1,187 @@ +import { execSync } from 'child_process' +import * as net from 'net' + +/** + * Check if a port is being used by a Docker container from the current project + */ +export function isPortUsedByProjectDocker(port: number): { isDocker: boolean; containerName?: string; containerId?: string } { + try { + // Get current working directory name as project identifier + const projectName = process.cwd().split('/').pop()?.toLowerCase() || 'unknown' + + // Check if there are Docker containers using this port with project-related names + const dockerPs = execSync(`docker ps --format "table {{.Names}}\\t{{.Ports}}" | grep ":${port}->"`, { + encoding: 'utf-8', + stdio: 'pipe' + }) + + const lines = dockerPs.trim().split('\n').filter(line => line.includes(':')) + + for (const line of lines) { + const [containerName, ports] = line.split('\t') + + // Check if container name contains project name or database-related patterns + if (containerName.includes(projectName) || + containerName.includes('-db') || + containerName.includes('mysql') || + containerName.includes('postgres') || + containerName.includes('sqlite')) { + + // Get container ID + try { + const containerId = execSync(`docker ps --filter name=${containerName} --format "{{.ID}}"`, { + encoding: 'utf-8', + stdio: 'pipe' + }).trim() + + return { + isDocker: true, + containerName, + containerId + } + } catch { + return { + isDocker: true, + containerName + } + } + } + } + + return { isDocker: false } + } catch { + return { isDocker: false } + } +} + +/** + * Check if a port is currently in use using system tools + */ +export async function isPortInUse(port: number, host = 'localhost'): Promise { + try { + // First try using lsof (most reliable on macOS and Linux) + const lsofResult = execSync(`lsof -ti:${port}`, { encoding: 'utf-8', stdio: 'pipe' }) + return lsofResult.trim().length > 0 + } catch { + try { + // Fallback: try netstat + const netstatResult = execSync(`netstat -tulpn 2>/dev/null | grep :${port}`, { + encoding: 'utf-8', + stdio: 'pipe' + }) + return netstatResult.trim().length > 0 + } catch { + // Final fallback: try to bind to the port + return new Promise((resolve) => { + const server = net.createServer() + + server.listen(port, host, () => { + server.once('close', () => { + resolve(false) // Port is available + }) + server.close() + }) + + server.on('error', () => { + resolve(true) // Port is in use + }) + }) + } + } +} + +/** + * Find what process is using a specific port + */ +export function getProcessUsingPort(port: number): string | null { + try { + // Use lsof to find what's using the port (works on macOS and Linux) + const result = execSync(`lsof -ti:${port}`, { encoding: 'utf-8', stdio: 'pipe' }) + const pid = result.trim() + + if (pid) { + try { + // Get process info + const processInfo = execSync(`ps -p ${pid} -o pid,comm,args --no-headers`, { + encoding: 'utf-8', + stdio: 'pipe' + }) + return processInfo.trim() + } catch { + return `Process ID: ${pid}` + } + } + } catch (error) { + // lsof might not be available or port might not be in use + try { + // Fallback: try netstat (more widely available) + const result = execSync(`netstat -tulpn 2>/dev/null | grep :${port}`, { + encoding: 'utf-8', + stdio: 'pipe' + }) + return result.trim() + } catch { + // If both fail, we can't determine what's using the port + } + } + + return null +} + +/** + * Find an available port starting from a given port + */ +export async function findAvailablePort(startingPort: number, maxAttempts = 10): Promise { + for (let port = startingPort; port < startingPort + maxAttempts; port++) { + if (!(await isPortInUse(port))) { + return port + } + } + return null +} + +/** + * Check multiple ports and return information about their usage + */ +export async function checkPortsUsage(ports: number[]): Promise> { + const results = [] + + for (const port of ports) { + const inUse = await isPortInUse(port) + const dockerInfo = isPortUsedByProjectDocker(port) + + const result: { + port: number + inUse: boolean + isProjectDocker?: boolean + containerName?: string + containerId?: string + process?: string + } = { + port, + inUse, + isProjectDocker: dockerInfo.isDocker, + containerName: dockerInfo.containerName, + containerId: dockerInfo.containerId + } + + if (inUse && !dockerInfo.isDocker) { + // Only get process info if it's not a project Docker container + const process = getProcessUsingPort(port) + if (process) { + result.process = process + } + } + + results.push(result) + } + + return results +} \ No newline at end of file diff --git a/cli_backup/.gitignore b/cli_backup/.gitignore new file mode 100644 index 0000000..e0319f4 --- /dev/null +++ b/cli_backup/.gitignore @@ -0,0 +1,16 @@ +*-debug.log +*-error.log +**/.DS_Store +/.idea +/dist +/tmp +/node_modules +oclif.manifest.json + + + +yarn.lock +pnpm-lock.yaml + +package-lock.json +tsconfig.tsbuildinfo \ No newline at end of file diff --git a/cli_backup/.npmignore b/cli_backup/.npmignore new file mode 100644 index 0000000..70b1dfa --- /dev/null +++ b/cli_backup/.npmignore @@ -0,0 +1,7 @@ +* +!bin/** +!dist/** +!oclif.manifest.json +!README.md +!package.json +!LICENSE \ No newline at end of file diff --git a/cli_backup/.prettierrc.json b/cli_backup/.prettierrc.json new file mode 100644 index 0000000..ed9b7b5 --- /dev/null +++ b/cli_backup/.prettierrc.json @@ -0,0 +1 @@ +@oclif/prettier-config \ No newline at end of file diff --git a/cli_backup/README.md b/cli_backup/README.md new file mode 100644 index 0000000..1ed9e06 --- /dev/null +++ b/cli_backup/README.md @@ -0,0 +1,98 @@ +# Slingr CLI + +A command line tool for creating Slingr applications with TypeScript and best practices built-in. + +## How to test set-up? + +1. Clone repository + +```bash +git clone https://github.com/slingr-stack/cli.git +cd cli +``` + +2. Install dependencies, build and link + +```bash +npm install +npm run build +npm link +``` + +3. Execute + +```bash +slingr create-app +slingr --help +``` + +## Installation + +```bash +# Install globally +npm install -g @slingr/cli + +# Or use with npx (no installation required) +npx @slingr/cli create-app my-app +``` + +## Usage + +### Create a new application + +```bash +slingr create-app my-app +``` + +This command will: +1. Ask you questions about your application type and requirements +2. Create a project directory with the specified name +3. Set up a complete TypeScript project structure +4. Generate sample files and configurations +5. Configure VS Code settings and recommended extensions + +### Interactive Setup + +The CLI will ask you several questions to customize your project: + +- **Application Type**: What kind of app you're building (CRM, task manager, etc.) +- **Backend**: Whether you want to create a backend +- **Frontend**: Whether you want to create a frontend (only if backend is selected) +- **Description**: A detailed description of what your app should do + +## Generated Project Structure + +``` +your-app/ +├── .vscode/ +│ ├── extensions.json # Recommended VS Code extensions +│ └── settings.json # VS Code settings for optimal development +├── .github/ +│ └── copilot-instructions.md # GitHub Copilot context +├── src/ +│ └── data/ +│ ├── SampleModel.ts # Example data model +│ └── SampleModel.test.ts # Example tests +├── docs/ +│ └── app-description.md # Generated app documentation +├── package.json # Project configuration +└── tsconfig.json # TypeScript configuration +``` + +## Features + +- **TypeScript Setup**: Pre-configured TypeScript with strict settings +- **Testing**: Jest test framework with sample tests +- **Linting**: ESLint with TypeScript support +- **VS Code Integration**: Optimized settings and extension recommendations +- **GitHub Copilot**: Pre-configured with context instructions +- **Sample Code**: Working examples to get you started quickly + +## Development + +After creating your project: + +```bash +cd your-app +npm install +``` \ No newline at end of file diff --git a/cli_backup/bin/dev.js b/cli_backup/bin/dev.js new file mode 100755 index 0000000..0261e86 --- /dev/null +++ b/cli_backup/bin/dev.js @@ -0,0 +1,5 @@ +#!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning + +import {execute} from '@oclif/core' + +await execute({development: true, dir: import.meta.url}) \ No newline at end of file diff --git a/cli_backup/bin/run.js b/cli_backup/bin/run.js new file mode 100755 index 0000000..5f6cc73 --- /dev/null +++ b/cli_backup/bin/run.js @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +import {execute} from '@oclif/core' + +await execute({dir: import.meta.url}) \ No newline at end of file diff --git a/cli_backup/eslint.config.mjs b/cli_backup/eslint.config.mjs new file mode 100644 index 0000000..07cbe89 --- /dev/null +++ b/cli_backup/eslint.config.mjs @@ -0,0 +1,16 @@ +import {includeIgnoreFile} from '@eslint/compat' +import oclif from 'eslint-config-oclif' +import prettier from 'eslint-config-prettier' +import path from 'node:path' +import {fileURLToPath} from 'node:url' + +const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore') + +export default [ + includeIgnoreFile(gitignorePath), + ...oclif, + prettier, + { + ignores: ['scripts/**', 'bin/**'], + }, +] \ No newline at end of file diff --git a/cli_backup/package.json b/cli_backup/package.json new file mode 100644 index 0000000..f66b6a7 --- /dev/null +++ b/cli_backup/package.json @@ -0,0 +1,80 @@ +{ + "name": "@slingr/cli", + "description": "Slingr CLI tool for creating and managing Slingr applications", + "version": "0.0.0", + "author": "Francisco Devaux", + "bin": { + "slingr": "./bin/run.js" + }, + "bugs": "https://github.com/slingr-stack/cli/issues", + "dependencies": { + "@oclif/core": "^4", + "@oclif/plugin-help": "^6", + "@oclif/plugin-plugins": "^5", + "@types/fs-extra": "^11.0.4", + "@types/inquirer": "^8.2.12", + "@types/js-yaml": "^4.0.9", + "fs-extra": "^11.3.1", + "inquirer": "^8.2.7", + "js-yaml": "^4.1.0", + "slingr-framework": "workspace:*" + }, + "devDependencies": { + "@eslint/compat": "^1", + "@oclif/prettier-config": "^0.2.1", + "@oclif/test": "^4", + "@types/chai": "^4", + "@types/node": "^18", + "chai": "^4", + "eslint": "^9", + "eslint-config-oclif": "^6", + "eslint-config-prettier": "^10", + "oclif": "^4", + "shx": "^0.3.3", + "ts-node": "^10", + "typescript": "^5" + }, + "engines": { + "node": ">=18.0.0" + }, + "files": [ + "./bin", + "./dist", + "./oclif.manifest.json" + ], + "homepage": "https://github.com/slingr-stack/cli", + "keywords": [ + "slingr", + "cli", + "scaffolding", + "project-generator" + ], + "license": "MIT", + "main": "dist/index.js", + "type": "module", + "oclif": { + "bin": "slingr", + "dirname": "slingr", + "commands": "./dist/commands", + "plugins": [ + "@oclif/plugin-help", + "@oclif/plugin-plugins" + ], + "topicSeparator": " " + }, + "repository": { + "type": "git", + "url": "git+https://github.com/slingr-stack/framework.git", + "directory": "cli" + }, + "scripts": { + "build": "shx rm -rf dist && tsc -b", + "lint": "eslint", + "postpack": "shx rm -f oclif.manifest.json", + "posttest": "npm run lint", + "prepack": "oclif manifest && oclif readme", + "test": "mocha --forbid-only \"test/**/*.test.ts\"", + "version": "oclif readme && git add README.md" + }, + "types": "dist/index.d.ts" +} \ No newline at end of file diff --git a/cli_backup/src/commands/create-app.ts b/cli_backup/src/commands/create-app.ts new file mode 100644 index 0000000..6e19117 --- /dev/null +++ b/cli_backup/src/commands/create-app.ts @@ -0,0 +1,156 @@ +import { Args, Command, Flags } from '@oclif/core' +import fse from 'fs-extra' +import inquirer from 'inquirer' +import path from 'node:path' + +import { AppAnswers, createProjectStructure } from '../project-structure.js' + +export default class CreateApp extends Command { + static override args = { + name: Args.string({ + description: 'Name of the application to create', + required: false + }) + } + static override description = 'Create a new Slingr application' + static override examples = [ + '<%= config.bin %> <%= command.id %>', + '<%= config.bin %> <%= command.id %> my-app', + '<%= config.bin %> <%= command.id %> task-manager', + '<%= config.bin %> <%= command.id %> my-crm --type="CRM" --backend --frontend --database=postgres --description="A CRM system for managing customers"' + ] + static override flags = { + help: Flags.help({ char: 'h' }), + type: Flags.string({ + char: 't', + description: 'Type of application (e.g., CRM, task manager, ERP)', + }), + backend: Flags.boolean({ + char: 'b', + description: 'Include backend for the application', + allowNo: true + }), + frontend: Flags.boolean({ + char: 'f', + description: 'Include frontend for the application', + allowNo: true + }), + database: Flags.string({ + char: 'd', + description: 'Database to use (postgres or mysql)', + options: ['postgres', 'mysql'] + }), + description: Flags.string({ + char: 'D', + description: 'Description of what the application needs to do' + }) + } + + public async run(): Promise { + const { args, flags } = await this.parse(CreateApp) + let appName = args.name + + // If no name is provided, ask for it + if (!appName) { + const response = await inquirer.prompt<{ name: string }>([ + { + type: 'input', + name: 'name', + message: 'What is the name of your application?', + validate: async (input: string) => { + if (input.length === 0) return 'Please provide a name for your application' + const targetDir = path.join(process.cwd(), input) + if (await fse.pathExists(targetDir)) { + return `Directory ${input} already exists!` + } + return true + } + } + ]) + appName = response.name + } else { + // Check if directory already exists when name is provided as argument + const targetDir = path.join(process.cwd(), appName) + if (await fse.pathExists(targetDir)) { + this.error(`Directory ${appName} already exists!`) + } + } + + let answers: AppAnswers + + // Check if all flags are provided + const hasAllFlags = flags.type && + flags.backend !== undefined && + flags.frontend !== undefined && + flags.database && + flags.description + + if (hasAllFlags) { + // Use provided flags + answers = { + appType: flags.type!, + hasBackend: flags.backend!, + hasFrontend: flags.frontend!, + database: flags.database as 'postgres' | 'mysql', + description: flags.description! + } + } else { + this.log('') + this.log('Hi! Before we get started, we are going to ask you some information about your application.') + this.log('') + + // Interactive questions, pre-filling with any provided flags + answers = await inquirer.prompt([ + { + message: 'What type of application are you going to create? ', + name: 'appType', + suffix: "For example, a CRM, a task manager, an ERP, etc.\n", + type: 'input', + default: flags.type, + validate: (input: string) => input.length > 0 || 'Please provide an application type' + }, + { + default: flags.backend ?? true, + message: 'OK! Now, are you going to create a backend for your app?', + name: 'hasBackend', + type: 'confirm' + }, + { + default: flags.frontend ?? true, + message: 'Good! Do you also want to create the frontend with Slingr?', + name: 'hasFrontend', + type: 'confirm', + }, + { + type: 'list', + name: 'database', + message: 'Which database do you want to use?', + choices: [ + { name: 'PostgreSQL', value: 'postgres' }, + { name: 'MySQL', value: 'mysql' } + ], + default: flags.database || 'postgres' + }, + { + message: 'Perfect! Please, provide a description of what your app needs to do:\n', + name: 'description', + type: 'input', + default: flags.description, + validate: (input: string) => input.length > 0 || 'Please provide a description' + } + ]) + } + + this.log('') + this.log("That's very useful, thanks for the information!") + this.log('') + + // Create the project structure + await createProjectStructure(appName, answers) + + this.log(`Project ${appName} created successfully!`) + this.log(`To get started:`) + this.log(` cd ${appName}`) + this.log(` npm install`) + } +} \ No newline at end of file diff --git a/cli_backup/src/index.ts b/cli_backup/src/index.ts new file mode 100644 index 0000000..454cdc7 --- /dev/null +++ b/cli_backup/src/index.ts @@ -0,0 +1 @@ +export {run} from '@oclif/core' \ No newline at end of file diff --git a/cli_backup/src/project-structure.ts b/cli_backup/src/project-structure.ts new file mode 100644 index 0000000..0327650 --- /dev/null +++ b/cli_backup/src/project-structure.ts @@ -0,0 +1,163 @@ +import fse from 'fs-extra' +import path from 'node:path' +import { fileURLToPath } from 'node:url' + +export interface AppAnswers { + appType: string + description: string + hasBackend: boolean + hasFrontend: boolean + database: string +} + +async function copyTemplateFile(templatePath: string, targetPath: string, replacements?: Record): Promise { + let content = await fse.readFile(templatePath, 'utf8') + + // Apply replacements if provided + if (replacements) { + for (const [placeholder, value] of Object.entries(replacements)) { + content = content.replaceAll(placeholder, value) + } + } + + await fse.outputFile(targetPath, content) +} + +export async function createProjectStructure(appName: string, answers: AppAnswers): Promise { + const targetDir = path.join(process.cwd(), appName) + const currentDir = path.dirname(fileURLToPath(import.meta.url)) + // When running from dist/, we need to go up one level to reach the project root + const projectRoot = path.resolve(currentDir, '..') + const templatesDir = path.join(projectRoot, 'src', 'templates') + + // Create directory structure + await fse.ensureDir(targetDir) + await fse.ensureDir(path.join(targetDir, '.vscode')) + await fse.ensureDir(path.join(targetDir, '.github')) + await fse.ensureDir(path.join(targetDir, 'src', 'data')) + await fse.ensureDir(path.join(targetDir, 'src', 'dataSources')) + await fse.ensureDir(path.join(targetDir, 'docs')) + + // Copy .vscode files from templates + await fse.copy( + path.join(templatesDir, 'vscode', 'extensions.json'), + path.join(targetDir, '.vscode', 'extensions.json') + ) + + await fse.copy( + path.join(templatesDir, 'vscode', 'settings.json'), + path.join(targetDir, '.vscode', 'settings.json') + ) + + // Copy tsconfig.json from templates + await copyTemplateFile( + path.join(templatesDir, 'config', 'tsconfig.json.template'), + path.join(targetDir, 'tsconfig.json') + ) + + // Copy .gitignore from templates + await fse.copy( + path.join(templatesDir, 'config', '.gitignore'), + path.join(targetDir, '.gitignore') + ) + + // Copy jest.config.ts from templates + await fse.copy( + path.join(templatesDir, 'config', 'jest.config.ts'), + path.join(targetDir, 'jest.config.ts') + ) + + // Copy jest.setup.ts from templates + await fse.copy( + path.join(templatesDir, 'config', 'jest.setup.ts'), + path.join(targetDir, 'jest.setup.ts') + ) + + // Copy and process src files from templates + const replacements = { + '{{APP_NAME}}': appName + } + + await copyTemplateFile( + path.join(templatesDir, 'src', 'index.ts'), + path.join(targetDir, 'src', 'index.ts'), + replacements + ) + + // Copiar el template de datasource correspondiente según el tipo de base de datos + if (answers.hasBackend) { + let dbType = answers.database.toLowerCase() + let templateFile = '' + let targetFile = '' + switch (dbType) { + case 'postgres': + case 'postgresql': + templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') + break + case 'mysql': + templateFile = path.join(templatesDir, 'dataSources', 'mysql.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'mysql.ts') + break + // Agregar más casos si hay más templates + default: + templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') + targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') + } + await copyTemplateFile( + templateFile, + targetFile, + { '{{APP_NAME}}': appName } + ) + } + + // Copy sample model files + await fse.copy( + path.join(templatesDir, 'src', 'SampleModel.ts'), + path.join(targetDir, 'src', 'data', 'SampleModel.ts') + ) + + await fse.copy( + path.join(templatesDir, 'src', 'SampleModel.test.ts'), + path.join(targetDir, 'src', 'data', 'SampleModel.test.ts') + ) + + // Copy templated .github/copilot-instructions.md + await copyTemplateFile( + path.join(templatesDir, '.github', 'copilot-instructions.md.template'), + path.join(targetDir, '.github', 'copilot-instructions.md'), + { + '{{APP_NAME}}': appName, + '{{APP_TYPE}}': answers.appType, + '{{DESCRIPTION}}': answers.description, + '{{HAS_BACKEND}}': answers.hasBackend ? 'Yes' : 'No', + '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Yes' : 'No', + '{{DB_TYPE}}': answers.database + } + ) + + // Copy package.json template + await copyTemplateFile( + path.join(templatesDir, 'package.json.template'), + path.join(targetDir, 'package.json'), + { + '{{APP_NAME}}': appName, + '{{DESCRIPTION}}': answers.description, + '{{APP_KEYWORD}}': answers.appType.toLowerCase().replaceAll(/\s+/g, '-') + } + ) + + // Copy docs/app-description.md template + await copyTemplateFile( + path.join(templatesDir, 'docs', 'app-description.md.template'), + path.join(targetDir, 'docs', 'app-description.md'), + { + '{{APP_NAME}}': appName, + '{{DESCRIPTION}}': answers.description, + '{{APP_TYPE}}': answers.appType, + '{{HAS_BACKEND}}': answers.hasBackend ? 'Included' : 'Not included', + '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Included' : 'Not included', + '{{DB_TYPE}}': answers.database + } + ) +} \ No newline at end of file diff --git a/cli_backup/tsconfig.json b/cli_backup/tsconfig.json new file mode 100644 index 0000000..b3afec4 --- /dev/null +++ b/cli_backup/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "declaration": true, + "module": "Node16", + "outDir": "dist", + "rootDir": "src", + "strict": true, + "target": "es2022", + "moduleResolution": "node16" + }, + "include": ["./src/**/*"], + "exclude": ["./src/templates/**/*"], + "ts-node": { + "esm": true + } +} \ No newline at end of file From 08e0b6becb583010e3ddc46e5bdfe1333019cc00 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:08:29 +0000 Subject: [PATCH 229/254] Complete vs-code-extension directory synchronization Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- vs-code-extension/.vscode/extensions.json | 8 + vs-code-extension/.vscode/launch.json | 58 + vs-code-extension/.vscode/settings.json | 11 + vs-code-extension/.vscode/tasks.json | 20 + vs-code-extension/package-lock.json | 3430 +++++++++++++++++ vs-code-extension/resources/eye.svg | 1 + .../resources/icons/dark/action.svg | 1 + .../resources/icons/dark/database.svg | 1 + .../resources/icons/dark/eye.svg | 1 + .../resources/icons/dark/field.svg | 7 + .../resources/icons/dark/folder-open.svg | 1 + .../resources/icons/dark/folder.svg | 1 + .../resources/icons/dark/global-type.svg | 1 + .../resources/icons/dark/group.svg | 1 + .../resources/icons/dark/javascript.svg | 1 + .../resources/icons/dark/model-type.svg | 1 + .../resources/icons/dark/model.svg | 7 + .../resources/icons/dark/record-type.svg | 1 + .../resources/icons/light/action.svg | 1 + .../resources/icons/light/database.svg | 1 + .../resources/icons/light/eye.svg | 1 + .../resources/icons/light/field.svg | 4 + .../resources/icons/light/folder-open.svg | 1 + .../resources/icons/light/folder.svg | 1 + .../resources/icons/light/global-type.svg | 1 + .../resources/icons/light/group.svg | 1 + .../resources/icons/light/model-type.svg | 1 + .../resources/icons/light/model.svg | 4 + .../resources/icons/light/record-type.svg | 1 + vs-code-extension/resources/slingr-icon.jpg | Bin 0 -> 14228 bytes vs-code-extension/resources/slingr-icon.svg | 17 + vs-code-extension/resources/slingrIcon.svg | 17 + vs-code-extension/src/cache/cache.ts | 1093 ++++++ vs-code-extension/src/extension.ts | 44 + .../infrastructure/infraStatusRegistration.ts | 85 + .../quickInfoPanel/infoPanelRegistration.ts | 26 + .../src/quickInfoPanel/quickInfoProvider.ts | 444 +++ .../quickInfoPanel/renderers/baseRenderer.ts | 119 + .../renderers/dataSourceRenderer.ts | 42 + .../quickInfoPanel/renderers/fieldRenderer.ts | 40 + .../renderers/iMetadataRenderer.ts | 50 + .../quickInfoPanel/renderers/modelRenderer.ts | 101 + .../renderers/rendererRegistry.ts | 18 + .../quickInfoPanel/renderers/rendererUtils.ts | 71 + .../src/refactor/RefactorController.ts | 480 +++ .../src/refactor/refactorDisposables.ts | 165 + vs-code-extension/src/services/aiService.ts | 494 +++ vs-code-extension/src/test/cache.test.ts | 99 + vs-code-extension/src/test/explorer.test.ts | 474 +++ vs-code-extension/src/test/extension.test.ts | 18 + .../src/tools/sqlToolsIntegration.ts | 180 + vs-code-extension/src/utils/ast.ts | 29 + .../src/utils/detectIndentation.ts | 84 + vs-code-extension/src/utils/fieldTypes.ts | 164 + vs-code-extension/src/utils/metadata.ts | 82 + 55 files changed, 8005 insertions(+) create mode 100644 vs-code-extension/.vscode/extensions.json create mode 100644 vs-code-extension/.vscode/launch.json create mode 100644 vs-code-extension/.vscode/settings.json create mode 100644 vs-code-extension/.vscode/tasks.json create mode 100644 vs-code-extension/package-lock.json create mode 100644 vs-code-extension/resources/eye.svg create mode 100644 vs-code-extension/resources/icons/dark/action.svg create mode 100644 vs-code-extension/resources/icons/dark/database.svg create mode 100644 vs-code-extension/resources/icons/dark/eye.svg create mode 100644 vs-code-extension/resources/icons/dark/field.svg create mode 100644 vs-code-extension/resources/icons/dark/folder-open.svg create mode 100644 vs-code-extension/resources/icons/dark/folder.svg create mode 100644 vs-code-extension/resources/icons/dark/global-type.svg create mode 100644 vs-code-extension/resources/icons/dark/group.svg create mode 100644 vs-code-extension/resources/icons/dark/javascript.svg create mode 100644 vs-code-extension/resources/icons/dark/model-type.svg create mode 100644 vs-code-extension/resources/icons/dark/model.svg create mode 100644 vs-code-extension/resources/icons/dark/record-type.svg create mode 100644 vs-code-extension/resources/icons/light/action.svg create mode 100644 vs-code-extension/resources/icons/light/database.svg create mode 100644 vs-code-extension/resources/icons/light/eye.svg create mode 100644 vs-code-extension/resources/icons/light/field.svg create mode 100644 vs-code-extension/resources/icons/light/folder-open.svg create mode 100644 vs-code-extension/resources/icons/light/folder.svg create mode 100644 vs-code-extension/resources/icons/light/global-type.svg create mode 100644 vs-code-extension/resources/icons/light/group.svg create mode 100644 vs-code-extension/resources/icons/light/model-type.svg create mode 100644 vs-code-extension/resources/icons/light/model.svg create mode 100644 vs-code-extension/resources/icons/light/record-type.svg create mode 100644 vs-code-extension/resources/slingr-icon.jpg create mode 100644 vs-code-extension/resources/slingr-icon.svg create mode 100644 vs-code-extension/resources/slingrIcon.svg create mode 100644 vs-code-extension/src/cache/cache.ts create mode 100644 vs-code-extension/src/extension.ts create mode 100644 vs-code-extension/src/infrastructure/infraStatusRegistration.ts create mode 100644 vs-code-extension/src/quickInfoPanel/infoPanelRegistration.ts create mode 100644 vs-code-extension/src/quickInfoPanel/quickInfoProvider.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/baseRenderer.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/dataSourceRenderer.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/fieldRenderer.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/iMetadataRenderer.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/modelRenderer.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/rendererRegistry.ts create mode 100644 vs-code-extension/src/quickInfoPanel/renderers/rendererUtils.ts create mode 100644 vs-code-extension/src/refactor/RefactorController.ts create mode 100644 vs-code-extension/src/refactor/refactorDisposables.ts create mode 100644 vs-code-extension/src/services/aiService.ts create mode 100644 vs-code-extension/src/test/cache.test.ts create mode 100644 vs-code-extension/src/test/explorer.test.ts create mode 100644 vs-code-extension/src/test/extension.test.ts create mode 100644 vs-code-extension/src/tools/sqlToolsIntegration.ts create mode 100644 vs-code-extension/src/utils/ast.ts create mode 100644 vs-code-extension/src/utils/detectIndentation.ts create mode 100644 vs-code-extension/src/utils/fieldTypes.ts create mode 100644 vs-code-extension/src/utils/metadata.ts diff --git a/vs-code-extension/.vscode/extensions.json b/vs-code-extension/.vscode/extensions.json new file mode 100644 index 0000000..fd613da --- /dev/null +++ b/vs-code-extension/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "dbaeumer.vscode-eslint", + "ms-vscode.extension-test-runner" + ] +} \ No newline at end of file diff --git a/vs-code-extension/.vscode/launch.json b/vs-code-extension/.vscode/launch.json new file mode 100644 index 0000000..79ec163 --- /dev/null +++ b/vs-code-extension/.vscode/launch.json @@ -0,0 +1,58 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Run Extension", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}" + ], + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "preLaunchTask": "${defaultBuildTask}" + }, + { + "name": "Run Extension Tests", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}", + "--extensionTestsPath=${workspaceFolder}/out/test" + ], + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "preLaunchTask": "${defaultBuildTask}" + }, + { + "name": "Run Explorer Tests Only", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}", + "--extensionTestsPath=${workspaceFolder}/out/test", + "--grep=Explorer" + ], + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "preLaunchTask": "${defaultBuildTask}" + }, + { + "name": "Debug Cache Refresh Test", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}", + "--extensionTestsPath=${workspaceFolder}/out/test", + "--grep=should refresh when cache updates" + ], + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "preLaunchTask": "${defaultBuildTask}" + } + ] +} \ No newline at end of file diff --git a/vs-code-extension/.vscode/settings.json b/vs-code-extension/.vscode/settings.json new file mode 100644 index 0000000..d6c6bf3 --- /dev/null +++ b/vs-code-extension/.vscode/settings.json @@ -0,0 +1,11 @@ +// Place your settings in this file to overwrite default and user settings. +{ + "files.exclude": { + "out": false // set this to true to hide the "out" folder with the compiled JS files + }, + "search.exclude": { + "out": true // set this to false to include "out" folder in search results + }, + // Turn off tsc task auto detection since we have the necessary tasks as npm scripts + "typescript.tsc.autoDetect": "off" +} \ No newline at end of file diff --git a/vs-code-extension/.vscode/tasks.json b/vs-code-extension/.vscode/tasks.json new file mode 100644 index 0000000..241aa6d --- /dev/null +++ b/vs-code-extension/.vscode/tasks.json @@ -0,0 +1,20 @@ +// See https://go.microsoft.com/fwlink/?LinkId=733558 +// for the documentation about the tasks.json format +{ + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "watch", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "presentation": { + "reveal": "never" + }, + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} \ No newline at end of file diff --git a/vs-code-extension/package-lock.json b/vs-code-extension/package-lock.json new file mode 100644 index 0000000..4c787fe --- /dev/null +++ b/vs-code-extension/package-lock.json @@ -0,0 +1,3430 @@ +{ + "name": "slingr-vscode-extension", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "slingr-vscode-extension", + "version": "0.0.1", + "dependencies": { + "ts-morph": "^26.0.0" + }, + "devDependencies": { + "@types/mocha": "^10.0.10", + "@types/node": "22.x", + "@types/vscode": "^1.103.0", + "@typescript-eslint/eslint-plugin": "^8.39.0", + "@typescript-eslint/parser": "^8.39.0", + "@vscode/test-cli": "^0.0.11", + "@vscode/test-electron": "^2.5.2", + "eslint": "^9.32.0", + "typescript": "^5.9.2" + }, + "engines": { + "vscode": "^1.103.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.6", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz", + "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz", + "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "9.33.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz", + "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz", + "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.15.2", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@isaacs/balanced-match": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", + "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", + "license": "MIT", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@isaacs/brace-expansion": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", + "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", + "license": "MIT", + "dependencies": { + "@isaacs/balanced-match": "^4.0.1" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.30", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", + "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@ts-morph/common": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.27.0.tgz", + "integrity": "sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==", + "license": "MIT", + "dependencies": { + "fast-glob": "^3.3.3", + "minimatch": "^10.0.1", + "path-browserify": "^1.0.1" + } + }, + "node_modules/@ts-morph/common/node_modules/minimatch": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", + "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "license": "ISC", + "dependencies": { + "@isaacs/brace-expansion": "^5.0.0" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/mocha": { + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.17.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.2.tgz", + "integrity": "sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/@types/vscode": { + "version": "1.103.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.103.0.tgz", + "integrity": "sha512-o4hanZAQdNfsKecexq9L3eHICd0AAvdbLk6hA60UzGXbGH/q8b/9xv2RgR7vV3ZcHuyKVq7b37IGd/+gM4Tu+Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.1.tgz", + "integrity": "sha512-yYegZ5n3Yr6eOcqgj2nJH8cH/ZZgF+l0YIdKILSDjYFRjgYQMgv/lRjV5Z7Up04b9VYUondt8EPMqg7kTWgJ2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.39.1", + "@typescript-eslint/type-utils": "8.39.1", + "@typescript-eslint/utils": "8.39.1", + "@typescript-eslint/visitor-keys": "8.39.1", + "graphemer": "^1.4.0", + "ignore": "^7.0.0", + "natural-compare": "^1.4.0", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.39.1", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.1.tgz", + "integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/scope-manager": "8.39.1", + "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/typescript-estree": "8.39.1", + "@typescript-eslint/visitor-keys": "8.39.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/project-service": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.1.tgz", + "integrity": "sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.39.1", + "@typescript-eslint/types": "^8.39.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.1.tgz", + "integrity": "sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/visitor-keys": "8.39.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.1.tgz", + "integrity": "sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.1.tgz", + "integrity": "sha512-gu9/ahyatyAdQbKeHnhT4R+y3YLtqqHyvkfDxaBYk97EcbfChSJXyaJnIL3ygUv7OuZatePHmQvuH5ru0lnVeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/typescript-estree": "8.39.1", + "@typescript-eslint/utils": "8.39.1", + "debug": "^4.3.4", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.1.tgz", + "integrity": "sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.1.tgz", + "integrity": "sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/project-service": "8.39.1", + "@typescript-eslint/tsconfig-utils": "8.39.1", + "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/visitor-keys": "8.39.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.1.tgz", + "integrity": "sha512-VF5tZ2XnUSTuiqZFXCZfZs1cgkdd3O/sSYmdo2EpSyDlC86UM/8YytTmKnehOW3TGAlivqTDT6bS87B/GQ/jyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.39.1", + "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/typescript-estree": "8.39.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.39.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.1.tgz", + "integrity": "sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.39.1", + "eslint-visitor-keys": "^4.2.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@vscode/test-cli": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.11.tgz", + "integrity": "sha512-qO332yvzFqGhBMJrp6TdwbIydiHgCtxXc2Nl6M58mbH/Z+0CyLR76Jzv4YWPEthhrARprzCRJUqzFvTHFhTj7Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mocha": "^10.0.2", + "c8": "^9.1.0", + "chokidar": "^3.5.3", + "enhanced-resolve": "^5.15.0", + "glob": "^10.3.10", + "minimatch": "^9.0.3", + "mocha": "^11.1.0", + "supports-color": "^9.4.0", + "yargs": "^17.7.2" + }, + "bin": { + "vscode-test": "out/bin.mjs" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@vscode/test-electron": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.5.2.tgz", + "integrity": "sha512-8ukpxv4wYe0iWMRQU18jhzJOHkeGKbnw7xWRX3Zw1WJA4cEKbHcmmLPdPrPtL6rhDcrlCZN+xKRpv09n4gRHYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "jszip": "^3.10.1", + "ora": "^8.1.0", + "semver": "^7.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/c8": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/c8/-/c8-9.1.0.tgz", + "integrity": "sha512-mBWcT5iqNir1zIkzSPyI3NCR9EZCVI3WUD+AVO17MVWTSFNyUueXE82qTeampNtTr+ilN/5Ua3j24LgbCKjDVg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@istanbuljs/schema": "^0.1.3", + "find-up": "^5.0.0", + "foreground-child": "^3.1.1", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.1", + "istanbul-reports": "^3.1.6", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.0.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1" + }, + "bin": { + "c8": "bin/c8.js" + }, + "engines": { + "node": ">=14.14.0" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/cli-cursor": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/code-block-writer": { + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz", + "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==", + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/enhanced-resolve": { + "version": "5.18.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", + "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.33.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz", + "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.3.1", + "@eslint/core": "^0.15.2", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.33.0", + "@eslint/plugin-kit": "^0.3.5", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-scope": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/espree": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.15.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-east-asian-width": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", + "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ignore": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", + "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-reports": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mocha": { + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz", + "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "browser-stdout": "^1.3.1", + "chokidar": "^4.0.1", + "debug": "^4.3.5", + "diff": "^7.0.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^10.4.5", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^9.0.5", + "ms": "^2.1.3", + "picocolors": "^1.1.1", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^9.2.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/mocha/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/mocha/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-function": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/ora": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz", + "integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.3.0", + "cli-cursor": "^5.0.0", + "cli-spinners": "^2.9.2", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^2.0.0", + "log-symbols": "^6.0.0", + "stdin-discarder": "^0.2.2", + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.0.tgz", + "integrity": "sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/emoji-regex": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", + "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz", + "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.3.0", + "is-unicode-supported": "^1.3.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true, + "license": "(MIT AND Zlib)" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "license": "MIT" + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true, + "license": "MIT" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/stdin-discarder": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz", + "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", + "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/tapable": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz", + "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-api-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" + } + }, + "node_modules/ts-morph": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-26.0.0.tgz", + "integrity": "sha512-ztMO++owQnz8c/gIENcM9XfCEzgoGphTv+nKpYNM1bgsdOVC/jRZuEBf6N+mLLDNg68Kl+GgUZfOySaRiG1/Ug==", + "license": "MIT", + "dependencies": { + "@ts-morph/common": "~0.27.0", + "code-block-writer": "^13.0.3" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "9.3.3", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.3.tgz", + "integrity": "sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/vs-code-extension/resources/eye.svg b/vs-code-extension/resources/eye.svg new file mode 100644 index 0000000..df62db2 --- /dev/null +++ b/vs-code-extension/resources/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/action.svg b/vs-code-extension/resources/icons/dark/action.svg new file mode 100644 index 0000000..cb9c3d4 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/action.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/database.svg b/vs-code-extension/resources/icons/dark/database.svg new file mode 100644 index 0000000..b43f1a3 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/eye.svg b/vs-code-extension/resources/icons/dark/eye.svg new file mode 100644 index 0000000..df62db2 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/field.svg b/vs-code-extension/resources/icons/dark/field.svg new file mode 100644 index 0000000..1ff92ab --- /dev/null +++ b/vs-code-extension/resources/icons/dark/field.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/folder-open.svg b/vs-code-extension/resources/icons/dark/folder-open.svg new file mode 100644 index 0000000..d517916 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/folder-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/folder.svg b/vs-code-extension/resources/icons/dark/folder.svg new file mode 100644 index 0000000..9d4905a --- /dev/null +++ b/vs-code-extension/resources/icons/dark/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/global-type.svg b/vs-code-extension/resources/icons/dark/global-type.svg new file mode 100644 index 0000000..a12451b --- /dev/null +++ b/vs-code-extension/resources/icons/dark/global-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/group.svg b/vs-code-extension/resources/icons/dark/group.svg new file mode 100644 index 0000000..6d3a286 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/group.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/javascript.svg b/vs-code-extension/resources/icons/dark/javascript.svg new file mode 100644 index 0000000..d6ced9e --- /dev/null +++ b/vs-code-extension/resources/icons/dark/javascript.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/model-type.svg b/vs-code-extension/resources/icons/dark/model-type.svg new file mode 100644 index 0000000..8fcedaf --- /dev/null +++ b/vs-code-extension/resources/icons/dark/model-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/model.svg b/vs-code-extension/resources/icons/dark/model.svg new file mode 100644 index 0000000..dd927cc --- /dev/null +++ b/vs-code-extension/resources/icons/dark/model.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/dark/record-type.svg b/vs-code-extension/resources/icons/dark/record-type.svg new file mode 100644 index 0000000..38387c5 --- /dev/null +++ b/vs-code-extension/resources/icons/dark/record-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/action.svg b/vs-code-extension/resources/icons/light/action.svg new file mode 100644 index 0000000..8d316a2 --- /dev/null +++ b/vs-code-extension/resources/icons/light/action.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/database.svg b/vs-code-extension/resources/icons/light/database.svg new file mode 100644 index 0000000..c86d4a0 --- /dev/null +++ b/vs-code-extension/resources/icons/light/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/eye.svg b/vs-code-extension/resources/icons/light/eye.svg new file mode 100644 index 0000000..f1efd5e --- /dev/null +++ b/vs-code-extension/resources/icons/light/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/field.svg b/vs-code-extension/resources/icons/light/field.svg new file mode 100644 index 0000000..66b1754 --- /dev/null +++ b/vs-code-extension/resources/icons/light/field.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/folder-open.svg b/vs-code-extension/resources/icons/light/folder-open.svg new file mode 100644 index 0000000..da1944c --- /dev/null +++ b/vs-code-extension/resources/icons/light/folder-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/folder.svg b/vs-code-extension/resources/icons/light/folder.svg new file mode 100644 index 0000000..c33aa8a --- /dev/null +++ b/vs-code-extension/resources/icons/light/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/global-type.svg b/vs-code-extension/resources/icons/light/global-type.svg new file mode 100644 index 0000000..f75410d --- /dev/null +++ b/vs-code-extension/resources/icons/light/global-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/group.svg b/vs-code-extension/resources/icons/light/group.svg new file mode 100644 index 0000000..9110627 --- /dev/null +++ b/vs-code-extension/resources/icons/light/group.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/model-type.svg b/vs-code-extension/resources/icons/light/model-type.svg new file mode 100644 index 0000000..ec9a8bd --- /dev/null +++ b/vs-code-extension/resources/icons/light/model-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/model.svg b/vs-code-extension/resources/icons/light/model.svg new file mode 100644 index 0000000..f9501f9 --- /dev/null +++ b/vs-code-extension/resources/icons/light/model.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/vs-code-extension/resources/icons/light/record-type.svg b/vs-code-extension/resources/icons/light/record-type.svg new file mode 100644 index 0000000..008be9e --- /dev/null +++ b/vs-code-extension/resources/icons/light/record-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vs-code-extension/resources/slingr-icon.jpg b/vs-code-extension/resources/slingr-icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5d5c40de0b5fcb2dbebad48e3b5dad2599a32d35 GIT binary patch literal 14228 zcmb`t2{c=K*e@JMl~Pqj&9qfBHIxbsIi)Cy8e>jTV`>OhK}cI;jjg$AII6~&=c!_d zXenwgYDg3{Rbq&gh@11?`@Y{=-*>;Y?z;ExtY`16WbgmlzrCON_ndt{TLxS<)HBcn zFfafB4D=7+j0OPdnCsrNG&R?_=J7<{+uzOO+H<8_ir1uq0=;}at{E8WUo(89tAFkJ z9c5{`Yw#fFr(VxOu4!IVQdDF;n+NF7*ZM!({$1q%Yz6w&XWal!7Qkn~XGVq_fWJ5y z7&#fvumDjyN~Zt5HsF7341Y16V>-{wa)FhNenQh_z+ViEjDMYDWMVpZj(&DH{eQqY zPNpl@mF}JAGIM6W0q0hJ`L>WnOuMd!$9#-<^R`RCs|&1GdHMJS#3dx9q-9i8@2COQ zHFWOl>ghi)Fto6=vWD2$+POY)bNBG{@(z3!^gI|55*is59TOY(IzBZmJtH$K`(4h5 zqL0NTrDf$6^$m?p%`L5M?Y({2e%!$4FN5O~lT*_(-)HCWgq5GGYwN!@Hc5N?2Z!V% z%AezZaWMcG|Lc+ccVPc7T%2@Vf1NwWc#ipBTnv8&(}j`q9Mg5B^H=VfF+0P#ZYaNG z;nsdzSl4qw?6x_P$0cBl_3BL(yg2D!X#auie+}5H|1D(y1?>O9H3zuJ$UuL2jGO>4 zfJT%05D)mjA~lkfG*TKK(vx(>l#^;hd5z})cu5P@2=Bf=oHv%;3Da&k19;di8jy$n z+&xV(iT^{+m`jSMx}N@X23W>m8hHB#K8?{>DE8PhfKX6J@E&100Li}`)BVR+zKLy1 zULVUFuRQ;js#dz5vMA)zH6MjkTN$~FW<^T&&Njm@n5H5IEqR2R6EjIwIWBJc3Z*xz ze|Wr3IC89+z*8Eq`Ao~+0pOi{JmNk5$g(k6KCv5I* zkd0+e^iQ;gmbO{7atWB?*5F?jg!8T}Qv{(iKx}KoZG%cJVM0Uale@S|X&vUM#2T0$ z-(1U7i=eo|+VAVfp2VwveJuB<-78rC&0gx%(fjke!O0h=+$|&ig!JH!eAfKUFPkg0 z)Qu1?v8P65!lzfPMm05*sPz#U-k7g}`jifmec#b*)IZdRq_vcA?nS@(XEj%0&1xbM z@U$SevPQQIX8@+W)0!@ZExVwsWF)kV`kVq6s@17L1QNuT$Te}+3om&g zcBaV+3^Ut)f0n)N@~b|c@1cG9e7*yi_R9#z|NMNlYzzf0MUXR=2`E1;Na%rl-Xf^G zqTHgeMm+Bx7dw?yq{D4;#rbF3T&_)b=Bgb`;x7&e8?j-L^6&l00#y$tXy1BWJw2W& zQb%OxT*~y>vs}dtK{EwYwUml6C_6v8>2zicsueN3)M(o0Hh`ZtpU$bTKOq zk$C*Ge~3urmb)l^&*93@nDm}V?es8#du{HLWP5Ptw1J@pp-Vn5d)I7zWn$DAlKaN` zACnN?Z_zrOF*PQt($=NGU4EQF)vYdGuW~(cZZn5cPcvO^!2eVXdQQ6- z)mkvoyI*rJEZgQbS$e*28DkjA>VMcW&G_}C`pEEOm<%9GS@n#B>-JMn4V`qKkR zUqkO=y?iF6>L1Vqk{CN#B=XymdXAvw)X=C3DiebI~h|P3AaB|F3Ke zktu6_uQTePvtur z*y`Mnw4?G;{+t*fJx)uIUO_9EM4I|E(i#236fT~Z*FV-W_RQWz|5)PX#~9l1n4JFK zoO*%#TrXg~vZq4CnqRMbekfej@*42X;#(h7*)&qf_11}1wr*otkBNoC3I{&o92guDoRoP7ltw-)KM9K` zW9RR^*uZ#Y5#0MLO)Sw z=$buR9G@S$oEyLanmNcjkwNu*I&PxcdBme&VBsVI$-P@86dxiP1{=0uWfau3=zpOZ z{Z`m=!))`P+|uj|H!y{xFU|n<1>GF8rMd~a6lr2dpVmd26-0FqEL`;#QnxIXd5(Pz zgBY%O;QM)TL+H!n;Z!lJ??r#^Viii5W2v{cmVt&zPHMwm`+f7y9&%T83_tiP1%9p2 zpIZ^*Z=GE0c7_8Db2F2b93Rjsi6_6320D$lm3~;+Wu13Zwe*m&DbwN4pDZC1d#*Na z1~`k$&SwcaCCjjDJryQXz%-VD6Dg|gX(rg+G1!PQ-~}&46c7}W-ASEV7dx^>x`@rW z?N<|u?CdsSsd9(%_q`;|CMzGcWXXRv4_zl;jhCfPtz44++B*Mwzgl*9CAKtsJ^PER zk_s_>)rj3-50{}~>8w6kATFb_F|k%|9wY-iF-%Qgl{f>8`(DC7#k@keisKzB5b>=S z)0i$^6{)@jFMnN8ByCx4-MGT1pI>E{Ap`7HDm8tdn(NAfqh|oJYbnL7QXgLYf24n^ z$wxtZ!Y?S#g*IV0-ZxI-ghuD)aW3|tX<^EhMB*2ar`)zfKnb8~}cdH+$^3-}9zYY-BO9$*aU z4zHe)Mb4d8#k@i>Hp%Pvp&DrK%2cb1(f1_32l>SZ-^sdXys)PDv{UwNo~Y3oAUh{| zO7&4)l+`J;7tDf4>)$>DoZOa5ncS=7Dz*TPqQ^5HO4!DtrCPN)>yu>_vGf@4|0X>I z6JlLu2Mo1>>F=SgBJJ@@7xsAGt<@i|!4j>!e!k;jt&34m#%kY5-@Lo;Tu)WWb&Kye zz8jXlVP54_tYP{KN|6qxUM;mDRSm?^m?A!he)=7|{CRFmpX7(L*HhezkdgD<-hEcX zC=^-rt3YPOX_VYmR`gUyUz^v0=2Md6YbYa|~Qncs;5ubPcPw=l6? zLjI*OwmcUTqW69||C27B{8c7kRC%~gDIu}WHbx=CqzMudrUA?1h>0Wv?NmIAAD#hj zcK%Hgj0YKx%6N2|Cg)3hAlLRh_G&S`HAtM2{95}i;_7d1X<7X_OC%-H_(8?@oGF-^ zBK@8JPKjb&Ag;%P?h$riCdBn<6=Mr*#I>pF$F<{)K7yw0Q$aq4E3f3`<+fX(PD(hG zxxefd>iYnhhcbKOP5CW)k*YraWP&Q~8te;lCUIFew?+0X^45Z)PoPw+>Uo;5n#mB? z=TW-Fd!GU7TBuwtdCRX9+!R+n$0l7 zZX#DvMN}DWXH_I{g?jTe4zv793*XesC{~3U#r5D9WF~wt|<>c>Y z4H(ro*Qr%KO~^BX&Qu?53N+2_**}_U;xAYOA}?~}qkI+S>6!4%w&rqKQ;MJo{Vt|E z{4@{>cw9mt?6jr&^SkrMzcM8a#>8Ci=j28@-y9I&U9_M~omSE>D+V`-?)X(~Dp5uU zLSv(;jPM}LLyFt-Nk^V!FZuaU|39BjL{!S)28CsfSC~iOxId z)DdJGJO_5zIHZc-zN?bF`{^eQL|&o3Eiifav1UHt z3{a>LbD&5{cEdVAvt8Q4j}PGdCg)SMa>o140B(d*6V|13B-NZSV|h`+yVwZ}toQdU z5GIzQ&lF{T&)%fAhc&?!lzV%9RCa*Q<gPm~}w zHQNQw0Jm6vrt)9$6nWrodT6ezkOt={Wjq5+jgDg;qMkr0GV425Co<5DV@oZ$F3Nl2 z2*(YKRiTrffd&HwoawGI)>s)sQb2huZn~m!yl>Js*K~I{rxYQ!VJx&4>lp7_g5Mew6~{J~GdQeHqCc4~SG z&TW}{6*uzTlNceN$#cTWvAUUK$bH>Hm^&>`r`aSQBBPC7~U-)Z{)s~ z7J-@&6%duFpwVA(1#5UE4|MfP4*C0bxM$zuGesN2pgJp8(NOQyQe(r)jecsDFg(V# z8!4Sja(X)7>&9n55YxV$D6^tuT!8?wUocSJA!Wat=$r6WP87G8n_Mk2`MC0jldgiH z^mv&^cdMdQ$7n8XyNu;It!DGMI`Pb@NTaB94UNnfZd9|3~R5}2C zCoa1CEcc>odfJ@~4kc1Cb0g=LpGNj|@ej2^V-@TAmTOgtcF;|tm21E+da|6^uHNFI zt(6aFRPs*qq-35+_2vm!;zdb;$*n6|B(^xx408ZjbP1v zPquMTQAxDQGZ-um&7G>4${m#Y(A7;L)=bq7qrsa+@N>f4a7dm<-gLdvadFQ-^sAsPI%`(S?k~@_|`d}%}Z5I$mx18~G=aBvXv%0JabpVGB$FNbDC>}Ste^)8er-!u zxJ!^RFYg7Z+eIny`GqQt1lsP+6lMkXmshH?IgwIH_tKvZ*KXJGJXX67lI=FUo1AP(Mpta;)fo-uD* za?-j}&HmvI^ZS5WcYwiwb?@86^>6WGA25Rt^<;Sx`>k;+aGtu>PU8>)9GGimm$5~F zO_fzlRXJ4|7zTM;=J;Bqb@<%%syRkS_u&13c0eH>RvVCnK$PP5r+2RAX>cnZNcYW7 z6zgS3;kY*@UKuJTKCS9%N9A(tysM&(iQG6Xj1Z%1WaCaj9NopgJ`z|gyi`~Uo6gE4 zdW8n%E&LjPR=|-k#Yp4y(dbUuPTB5T&A?Td5T^F3P#^tvI8LOH7fvfc@{&al_qq~ZE*FX#N)DF`Sxc@e6LM% z%4tp%%z?`aO$4_F(ob_yatO|FktHa#ezgJ)mR@-jYZJAv5qS* z&+z+G6=z5qQ6|14%r&Icalyv>4n!b)CwF2VI=g81qbJ-A?rA!=Q@!H{2`c{8v#oKk zRt`CAgesex+>)2%*Mpdw+Lul%Y!6kpd!i%^Z`~RyFFAHq)5%@LH4l8whrps;i zFs+DKlK?VaPPx1hAxBK^sGzuF+r@wI9^Y#CXX(fH%^aWMQcbHP7I{nkB|8fK(FhzD) z>Ymgdq)6~Yfb{BgL?hm&LRD0`T*kLp`V3Gm(Egy}S5L;krP#=g2~d#80=ofp=nO#R zoS?CyZ?#FrV4h&+?qY8{c(*l=M_i^pnDR}W5h!HUEq&Dq3F%-DPeOm()PM8$c#yTe zO|j|bUzpF}Dy1Kw-2PF8#wU^*`ZX#A8w>Jv}*2Ol-z3wbvL=hQ`V-D{q(-~ zqxZOAJL0jQgXdLR%={&0pO3-6$HPW{tUU0Q~dU5bg3A z;6U_pGLWIudht4#eAK-KU7VWuV?D!h`q?9Gj|uY@{IX{ME@ii7m@t}z;R8Y7Yaz6o zly@sh0cMgG@G3-sZKu#m>9Lu}86X(vnR?bb!&9LjP##Mhy|G7EWZ|joh&) zHNY|KAtYF4D9;b z`2>dL^r92!p>gt;C4FxU7N=Jkr*h!o#~`o5*qZ*0!!)$hj4;bTH0?$dUW+z5z1rf#v=Sk) zO>t0~y=qcP8_dnWDh0ovTikV*M-k#t2S3l} zS#2bZ`#Xx+^CV$s(oQVO)qbL?Q1`z|2(mBZjP0TxSGe<6hb7@mE(BWj%i*do7^3Yb zV|baPi-JAA7_vQi6)#n@7I|#>Z^N95q+3fgsz)M%Gh(J)uWAML*X#z0y$d`)pEW_X za(4GQP~iJfGpMpFY-?A+wxsleb8EAze4}Vh`&R%s{tS?aVWNp687R>;$Xk>;e3eeG zlQMC2CZo)2=4~4LYM1G(s=67~mB(N5yKz-J^3~P9JDJLBpDuof4Y#S(cjw);@%*V>H-s!bKKVsD zcry%C5X~g|39NXpIS3|H88N>aAgpV&R`a8+9~H&GYs^bk_H4eCL3$_CVlL%=Y8IX- zGJICB$2-pTYdsSl0nLWTo_}2a7>HpuEV<45qIV)%NP%;_nAg1hnOBc?zHcGFNsNS2 zLjR=G5U2D^xnTwE;xBa8^I(neh1H}VSL_yT9Ubfz>_ifgBMe%S0c$%t*3P;_aP(9RmTB^epK|#9T9d) zRL_x76{;|Xc$DxS&Wwty^zjok>%Qhq7Kl3+IZD)p(tF-SozWD#(q8DieP0A~=E-&! zH)ZAHrWVum&f1$0(fK>pS?w*+zA*tzyX2j`u1uwrEC}X@`ud;Ijl1|o-ejcGFnp4D zuv*|BA{+c)qmFB&mC|g8< zb)!&n8;-g89sx7HhKcc`+~VjqHpPQ?&;*oFpDWpq73oh8+rq!HF87~AR(_wi^%9Y9 zyc_CN-9qok255MbMgEx~XMHP(^QT<8OE3|s0cs=fy_vw`)#pr_WhMG?rBfS@xI-r{ z!T6e@BTxL+Wbn^b6b@{xC5m;W$i^UEB}$s}UkZV;CHyq506J{33BWk5&}C!EvW(Gv z`zrHQuM3$-%@`rN*_{E5Q}$K{F>1DIZ4lALhSoc$+(O6boG)a19GAb)1LV42xH-W=wrrD8`2D7q&L8 zO|K_sQ$u!>VJE%xwQbJ;J%594pFE)oPN;BP_I~X}TEgQ}O1%m$H->$A>r2&P|7bR6 zPg#E`q`I0}Hmgxl=C^%nTN1C$Hc+rXzmbQ}*QyqiC4r@TN4cU(Ulpa2lnXC;;Wd+N zhh)E^14<yr>INt#&$ZagsAYKL5dnuGu;Dj<|uW_KT3oRsvy$I<}0wGS$Li)-kGEub| zRvxlV^ddd?V5@3&^JhTK#dVo{{-)P4t}pXNvkWvyxJS<{9rFsB9{nO?jKBxjmz|%T zQM-NT3UXr5Jl1nyndt>^+rQt7Gk ztD1=ZV9{oU?fDQ7{9R8sN)54nZ3~CufOzaSr8XCk9#QW74ag$#Bz-EIs5hmWJXKkF zbz$K+OE;XEm2?Nz(`k?fH!-j^8&-bkBjgt>b5`-nlE@*8MdTE0M1&Oe`?~PLG7UmXS>BGMq-~w)2ZXK7=(e$Hw zWIoQ^B#G|$oB$Ee?UNuuxEfLzzB$9wt#yipp#~I;H!^O8owjLoWh?iwqrI*>x+S49 z=zY&TQ5Mo6c^$kmTEjydqxTV@9F)>tiqp-{6*wLTXC1Y{b>I+h+L}`I<}!)X!0A15 zq8DP81Tto`ew7dq1;&|jb>11JDiEHUURqBtmhqab$#C~CmBQbC+BTY+d7DFG^<6uX8L-`uP_{yo$O#J)W&sXlm^n~7C3r<+u#f9nz4^Y1+)8?=CCe6HWYQ(d z6*9rVWVe7$u>fkBdNzl)>$drZj!|J)LNkO*G%6`vA9N1 z*;L7jM$q+}#r&l~RW0qb4b*ZzifC;b1#Tjz6;nh9Afb@Hl$2@mH}Umozu&`MZ&zds zI_FYeR{xGq7*%RZyC;5V4D{c+!85QejLH&@K3vNShM`KG95#-o&F2^FoNR{!{lY!q z^ju%00v)Nj)bb>SMvm? zSQqXx_l`lYF4@0X1XbO~53L37O$ELHk3#t(Vkv{FB%}^rJ4W_`)g;yhsKe#NO#*t| z9Wnb{7gWsW;=iLFCU;5MAA4_L7GK9#Zdn{#N_#~CAGG&c6-DEBxzlUES9oV!RJ)2V z8z~XJ^69(IiQff1<$MuL-)M5rM7~IHAog3I9*+_iZCI-29etv}Z?11ya>okqNi`+v z5JWNv9f%Jv4~==;PI%)%TECf(!EqqX5SdMDfI4f=i^L6$*XK4gN+%qwA`!PK3gj?~5uLMi((Ez< zvr|O1CsjjIZHwZ=4UbiDSs!duMV}Yectc&s55^kPChEfIyeko@FKCK&6H`22@txqfT zQfE_RXHtog93~4JdXK5wc#d4Q^=iH`VG0P)J|V3f(pC^|y{XH792EViP2gacQL3{d z<%_lhG2hi%f%n}A*U6)h7%{Fd<0_NaYKDSoHxTdo%~m2nglg$hUIBhwV0=wvLdwm; ztg)ZHZne1)U#A&4V#old z5e1$|Qm<1wiNr6oqxj!c&7Cx8)?f$v#D?yoL}&vRRL0W+zlht2dA+QMlq}Lh)ghZv zxc1WaadIq?@Ff@#F*L+{DoDE`h-)QrN!;nmJm!Eyqr$}yN9^5BSK&;4zU6B_bYiOd zLd1clnVog&d93Mmz#O=_`J*AC(-Qwqn}Zj@3opGd)AS36Y7ZA~<>DG}lKjd2DY87n zpC-$JwH>zAGl}w_bwfb<@ZJV?w`^mSRs6g9hYd?a5EYqZOIZ`qwn;NxRMNl+A005@ zKSl3zy{v3mP(&GJeKP!Rim4qf0JU6#A?nG435~}y1E#Y&1`~}OaYujo*yF%#T-)st z2`jMFTh+gtpqJF=U5hBW4KJSUVP-YZZV%#hB2R_QpnlyV*GZ-^?@mRo;~m0!2{$t2 z+^^JUIACt~?n{FtoTDwGVCJ7zO}u)$L`rx456dkbMhS?czTbQ#u^Z?&BrPVofe)5& z@fv03gXOWUdjmW#uzQ1+-c>vgR5keG6g=XJt*_E^IE5M>gei8Bg>tBC;_ zeQ+FguJW8aj2=!dFZnSSNQR+}Mh9~9DgA*Nw8%3+b1;=Fk{o#2*!a2{8TcWEjjG#H z5A$Iopkl5yw~&P2S)HE^dYP1eb7CS@<<#I^K;M&uT8}@xr`4F{bZ`@78y#Nm-GDGT zB6#%Og@dLsoK!aFK(x)g7nVM9apBUN;+g~4k5|m(m|shRMbFJ;Pj!j!H>A7sZ;tgn zR?2P{lI>Sc(g><|nBX+Y6y>#*!hPIBhU>H1e4ottp?J8eFH$-zke(-n>!9PKS{v8?m4IvmypL7&%*^2NFO_!U-S>j+X z;K(P4-}4v|RXEpNhD>TBwB-$PEu^16>0)W@UgvZ8I~Q@j@!rRZ`&cWlFS;X0bY_xN z%dT~e%(H7vXzN^yw?CKal3$-*L;TJsmCi15 z?1V$G=dtuOA_{6!`y&Xo174`l9M_JS%mV+Kf7~MN>Lt8i+46SIejxCM>y-sI`1%`W zD>*iWnwfZtJz0>B9!2FpjYaa`Nm=&1IYSMqx#zv8LP@E#pGWz?ChT3WPQSFm)T>y! z%Zp@jJ^g_k2)BAey=K*(#)(`n8y?Q50Mj^LROOg5Ck-o7 z5(8|t9uU9f6h-&$n?P;9!frnUFTfDi+{$;SyLTKvmk(=E}LLqG>V z$~sViuviw2{QcXFh>59wq6np=n6Zbz=ys76?{lxG>#DkdR(5|(<^|k_poQyx%TCtG zGo3fK_8u5)L_!(f!nut46SAy)H~8vjI}8aF8VOS4SIuo53>=H*g> zl0=XW(!PT3+a&YiJzbQm*{mFtcx2R!lnA0vCKBrm)D9iGs7+F<8(+Ru1S$D^k>REj z4VcQ&pTrOGr=RKSV2|pN1R0!|Y|epkOUW9~i}0hfXMl&3^1ly~ZV;4Q(Ny#H`Zjs8 zz0jMdR2kM4n<-{$6!F<7Sx)q4Eu*B?rC5*_p6Yjnq@|V5rqFw@!oSlke!wNyzVJo& zqkzOZ;Ma#U;xdmgGHYn7i9(Yqn{dB#MAOTZmsmb6L3|}QDVu6Jk-H;>ueEWLs-P1= zLHs)Gk$wI9Q)ta4c^R{Er(zk4Mf#1>3FRK8AXEzN))?3mljJ0vIh;BbaIW)0GWj4jubT1yjwZVF)r&E%;dOOECZCg z8$h=FQ>;E&WBtiC-Ap&aCZgm&quYNTc?55KuB>kI&i9K$H4OCS=^gJ-w?0{DkB|Nj0(NS#YIy?$E`vJmX@${ip5@CXur+?vavZ&> zW2&xD)CrB&x)y(PfNJDQ+Kp$5B#o?)SIP>WdNZbkp8D71Xx*hvVdypV_C%3U71Enh zgfCz|mn7aieoK|RlXUe1pZgD6&#U*E^iQ04%<^y6x_2uxd_o^+39S_H;34d({slaw zDZ?f|qYLRjXPZOf(tL-~*kAR|luHf3a2aCo+1akUMaL(D8xB?<0o8?J$F7kP2@#T%*KvL8TJj_bSo-q&L|WB5cdLd) zNvs9j+&>Yn3P(5;8vvy`eY~^d6)3ZzjTSW63dhIYmul;*07DrRowo!cFl<+abkJ3Rthz zwo;WNp-Zx1P)%9T}m7k zQsvzxMmk>;MBahePW$~nbhI~b1qpU^3=!s{@z-2)iGcpcW6*^kjQA8LiWj}V=kA|r ztiw3UC+F^JP05{6%2l^Rr+k%J;6!!j$(oC$TjnWkTm% zv+6{^amin4$IXx|oT<&@`eW-tqlF{K5PBrYOhgkZz62`M8$cK>fQ+Y0K7sB4_$6`- zkY%pP3R)qhBfy_4$;_cgqI5pn1BaUPz-8v2qbMyqy5a;rVW&w>PCee=Jlo~VK~9KB z>-p2X4>m;gz}$QW5XaU&nSt()7u{6u;p?KYt$8N`Fvx@4->FE}pJ)F}Br28rx4U>%GUv@s3Nk!l7yzH#s!I)y+7k{_! zadUHad-`f|ZhB;TO51++Lm5lOUmuc+T&jC&(Ji2LmCZANG}4%4ngFsM74gGnmsN0! zTl1TkMh9KbbmQ}`?<{vN8}yrllvR>|UvN5Vth6Tr^_?qZkS-h{2P-(1x zeddk&QqT;rUncPD{!?AmAds;e(>C$o=g->j8mxI2LE_>(GEK6O3VIXlPuua||I@)? zU2X=-KD}(uJwPB$-(yl}h^(9>?ZDLAM&-+I)1 zlGi{W;(bI9waqty;Y|}&2ho9Zk|V7(1rihl5h=DL>kgFM-U3YHH#!&%9fdEc1%G`Y z#y{T((EEE0Gqz8Ddzu#^NKZ2_AkBz=gyfu=E+LX|`yaLEmDi_KH0>t;@5#-s8=1l2QAnV#_)mHJVaf3P5D!lFswKR-WT;x$GaM zOw|(Mcekmt`TP_3733jgW%tKPJib^@VNW3bAjuxj-0yS# za9fq`dNjv&U9$V-GtqeY=eXq&Qyo~Cb8hb8&gY}*Ge9?{9;Utc8YYx*6TW`C?dx?aooR{x&wp6DzKt-d9bkdBz zK+tyF4nYo8mci4T8c>RFjDD_59ovPN!3H@!=`TIbzaA@D!P-y?wWWqu=^dp^Zq=ou z+>o8vo?XhdrJXtw+xASCMl(^ZC+XI`a}A<=l=vB&nTX-Zrs}uLO(ZG%y2T;$$;PI0 z%eBCo@8H>88Vl2j67_DFrt6AFJkpdjHeVG96O;Il7cNviN#WGZ$f2H9G=};_1q5_ zT&gFQj-mS(W%KxTVqi~z8qEO%B)Lor!(69vgkgnk?!@%s5W`)&{h#KsYI|zLj^*`! zaFUZ)BQd47;4jMi0jKMoS%V42#NQdg5%ANkh8CY}MldpR;M%ePEei9*l%lqaJ?_V4 z5Y7N|>;3+Sum`8ZKQI?Nd4tKr?gtkYo2Ed2V@L{PRv9#MYW=3+=HQouGsRrWU8heCYgHw z*p*bksn-SVrU*C)XIUn03@N`)z8eR#$eU5s*iV_P{{mDMT;8z6j>A8Jo+@~pM&p;h z(VOh85tg?v-NB6}Gzgd{>1K^5)~Yi};|$>zMf@P&Cq+*_)@69%VG4xD#Xca|@=^D0 z)DnOy=Cxc9rN#6O#D*UNW@z<)_-=1M9JzY*HyJBa*;rP<0=miVePO9eT zMJEN`6zmMWhh&rJdz;5Ps1Dfa7}}a^a-&LbRU-pElV{i@DRCJ1-s5nZgNaW5PAb|6 z-4SJu>@$xRy2Hz+moLhpodGQC&680n67Ww9mFkzZeRfZm8=^k>pDEh^-_a6w7vi%E zV^sV-R({G4F4mHI92Y^5B8)n|eG%UEi#`BYr+fFyt~3}T`KRSHlr2+3l{;s6g^mxS?b_P+rL$u7+R literal 0 HcmV?d00001 diff --git a/vs-code-extension/resources/slingr-icon.svg b/vs-code-extension/resources/slingr-icon.svg new file mode 100644 index 0000000..08a3f58 --- /dev/null +++ b/vs-code-extension/resources/slingr-icon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/vs-code-extension/resources/slingrIcon.svg b/vs-code-extension/resources/slingrIcon.svg new file mode 100644 index 0000000..883e1f3 --- /dev/null +++ b/vs-code-extension/resources/slingrIcon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/vs-code-extension/src/cache/cache.ts b/vs-code-extension/src/cache/cache.ts new file mode 100644 index 0000000..f553dab --- /dev/null +++ b/vs-code-extension/src/cache/cache.ts @@ -0,0 +1,1093 @@ +import * as vscode from 'vscode'; +import { Project, SourceFile, ClassDeclaration, PropertyDeclaration, Decorator, Node, Type, MethodDeclaration, SyntaxKind, ObjectLiteralExpression, ArrayLiteralExpression, ParameterDeclaration, ArrowFunction, FunctionExpression, VariableDeclaration, ScriptTarget, ModuleKind } from 'ts-morph'; +import * as path from 'path'; +import { accessSync } from 'fs'; +import { RefactorController } from '../refactor/RefactorController'; +import { ChangeObject } from '../refactor/refactorInterfaces'; +import * as crypto from 'crypto'; + +// Represents the type of changes that can occur to a file +type FileChangeType = 'create' | 'change' | 'delete'; + +export type InfrastructureEventStatus = 'change-detected' | 'update-success' | 'update-failure'; + +export type CacheFileUpdateType = 'dataSource' | 'dataModel' | 'fullRefresh' | 'unknown'; + +export interface CacheUpdateEvent { + type: CacheFileUpdateType; + uri?: vscode.Uri; // The URI of the changed file. Undefined for a full refresh. +} + +export interface InfrastructureStatusChangeEvent { + status: InfrastructureEventStatus ; + uri: vscode.Uri; + error?: string; // Optional: only used for 'update-failure' +} + +/** + * The main cache structure to hold all the metadata of the project. + * It's a map where the key is the file path. + */ +export interface ProjectMetadataCache { + [filePath: string]: FileMetadata; +} + +/** + * Contains metadata about a single source file. + */ +export interface FileMetadata { + uri: vscode.Uri; + classes: { [className: string]: DecoratedClass }; + dataSources: { [dataSourceName: string]: DataSourceMetadata }; +} + +/** + * Contains metadata about a class, including its decorators. + */ +export interface DecoratedClass { + name: string; + decorators: DecoratorMetadata[]; + properties: { [propertyName: string]: PropertyMetadata }; + methods: { [methodName: string]: MethodMetadata }; + references: vscode.Location[]; + declaration: vscode.Location; + isDataModel: boolean; +} + +/** + * Contains metadata about a single data source definition. + */ +export interface DataSourceMetadata { + name: string; + type: string; // e.g., 'TypeORMSqlDataSource' + declaration: vscode.Location; + references: vscode.Location[]; + options: { [key: string]: any }; +} + +/** + * Contains metadata about a property of a class, including its decorators. + */ +export interface PropertyMetadata { + name: string; + type: string; + decorators: DecoratorMetadata[]; + references: vscode.Location[]; + declaration: vscode.Location; +} + +/** + * A generic representation of a decorator instance. + */ +export interface DecoratorMetadata { + name: string; + arguments: any[]; + position: vscode.Range; +} + +/** + * Contains metadata about a single method parameter. + */ +export interface ParameterMetadata { + name: string; + type: string; +} + +/** + * Contains metadata about a method, its parameters, and special return values. + */ +export interface MethodMetadata { + name: string; + parameters: ParameterMetadata[]; + decorators: DecoratorMetadata[]; + returnedFields: string[] | null; + declaration: vscode.Location; +} + +/** + * Manages a cache of project metadata extracted from TypeScript files using ts-morph. + * It is designed to be generic, efficient, and resilient to file system changes. + */ +export class MetadataCache { + private _onDidUpdate: vscode.EventEmitter = new vscode.EventEmitter(); + public readonly onDidUpdate: vscode.Event = this._onDidUpdate.event; + private tsMorphProject: Project; + private cache: ProjectMetadataCache = {}; + private fileWatcher: vscode.FileSystemWatcher | null = null; + private folderWatcher: vscode.FileSystemWatcher | null = null; + private isProcessingQueue = false; + private fileChangeQueue: { uri: vscode.Uri, type: FileChangeType }[] = []; + private refactorController: RefactorController | null = null; + private automaticRefactorsEnabled: boolean = true; + private dataSourceHashes: Map = new Map(); + private _onInfrastructureStatusChange: vscode.EventEmitter = new vscode.EventEmitter(); + public readonly onInfrastructureStatusChange: vscode.Event = this._onInfrastructureStatusChange.event; + public isInfrastructureUpdateNeeded: boolean = false; + private outOfSyncDataSources: Set = new Set(); + + /** + * Initializes the cache and the ts-morph project. + * @param extensionPath The absolute path to the extension's directory. + */ + constructor(extensionPath: string) { + // Try to find the workspace's tsconfig.json first, fallback to a basic configuration + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + let tsConfigPath: string | undefined; + + if (workspaceFolder) { + const workspaceTsConfig = path.join(workspaceFolder.uri.fsPath, "tsconfig.json"); + try { + // Check if workspace tsconfig exists + accessSync(workspaceTsConfig); + tsConfigPath = workspaceTsConfig; + console.log('[Cache] Using workspace tsconfig.json:', tsConfigPath); + } catch { + console.log('[Cache] No workspace tsconfig.json found, using default configuration'); + } + } + + this.tsMorphProject = new Project({ + tsConfigFilePath: tsConfigPath, + compilerOptions: { + experimentalDecorators: true, + emitDecoratorMetadata: true, + allowJs: true, + target: ScriptTarget.ES2020, + module: ModuleKind.CommonJS, + }, + }); + } + + /** + * Initializes the cache by parsing all relevant files in the workspace + * and setting up a file watcher to keep the cache up-to-date. + * This is the "shallow" initialization phase that loads basic structure without references. + */ + public async initialize(): Promise { + + const files = await vscode.workspace.findFiles('{src/data/**/*.ts,src/dataSources/**/*.ts}'); + for (const file of files) { + this.addSourceFile(file); + } + + this.setupFileWatcher(); + } + + /** + * Builds all references in the background after the initial shallow load. + * This allows the UI to render quickly while references are computed asynchronously. + */ + public buildAllReferencesInBackground(): void { + // Run reference building in the background + setTimeout(async () => { + await this.buildAllReferences(); + + // Notify that deep data is now available + this._onDidUpdate.fire({ type: 'fullRefresh' }); + }, 0); + } + + /** + * Sets the refactor controller to be used for managing refactorings. + * @param controller The refactor controller instance. + */ + public setRefactorController(controller: RefactorController): void { + this.refactorController = controller; + } + + /** + * Sets whether automatic refactors should be proposed and executed. + * @param enabled True to enable, false to disable. + */ + public setAutomaticRefactorsEnabled(enabled: boolean): void { + this.automaticRefactorsEnabled = enabled; + } + + /** + * Gets all SQL data sources from the cache. + * @returns An array of SQL data source metadata. + */ + public getSqlDataSources(): DataSourceMetadata[] { + return this.getDataSources().filter( + ds => ds.type === 'TypeORMSqlDataSource' + ); + } + + public notifyInfrastructureStatus(event: InfrastructureStatusChangeEvent): void { + this._onInfrastructureStatusChange.fire(event); + } + + /** + * Sets up file system watchers to detect changes, creations, and deletions + * of TypeScript files and folder structure changes in src/data. + */ + private setupFileWatcher(): void { + // Watch for TypeScript file changes + this.fileWatcher = vscode.workspace.createFileSystemWatcher('**/*.ts'); + + this.fileWatcher.onDidCreate(uri => this.queueFileChange(uri, 'create')); + this.fileWatcher.onDidChange(uri => this.queueFileChange(uri, 'change')); + this.fileWatcher.onDidDelete(uri => this.queueFileChange(uri, 'delete')); + + // Watch for folder structure changes in src/data directory + // ignoreCreateEvents: false, ignoreChangeEvents: true, ignoreDeleteEvents: false + this.folderWatcher = vscode.workspace.createFileSystemWatcher('**/src/data/**/*', false, true, false); + + this.folderWatcher.onDidCreate(uri => this.handleFolderStructureChange(uri, 'create')); + this.folderWatcher.onDidDelete(uri => this.handleFolderStructureChange(uri, 'delete')); + } + + /** + * Adds a file change event to the queue to be processed sequentially. + * This prevents race conditions and ensures cache consistency. + * @param uri The URI of the file that changed. + * @param type The type of change (create, change, delete). + */ + private queueFileChange(uri: vscode.Uri, type: FileChangeType): void { + if (uri.path.includes('/node_modules/')) { + return; + } + + this.fileChangeQueue.push({ uri, type }); + this.processQueue(); + } + + /** + * Handles folder structure changes in the src/data directory. + * When folders are created, deleted, or renamed, this triggers a cache refresh + * to ensure the explorer reflects the updated folder structure. + * @param uri The URI of the folder that changed. + * @param type The type of change (create, delete). + */ + private async handleFolderStructureChange(uri: vscode.Uri, type: 'create' | 'delete'): Promise { + // Only handle changes in src/data directory + if (!uri.path.includes('/src/data/')) { + return; + } + + // For folder changes, we need to refresh the entire cache to ensure + // the explorer reflects the new folder structure + console.log(`[Cache] Folder structure change detected: ${type} ${uri.path}`); + + // Force a cache refresh by re-reading all files + await this.forceRefresh(); + } + + /** + * Forces a complete refresh of the cache by re-reading all TypeScript files. + * This is useful when folder structure changes occur. + */ + public async forceRefresh(): Promise { + try { + // Clear existing cache + this.cache = {}; + + // Remove all source files from ts-morph project + this.tsMorphProject.getSourceFiles().forEach(sf => { + this.tsMorphProject.removeSourceFile(sf); + }); + + // Re-scan all files + const files = await vscode.workspace.findFiles('{src/data/**/*.ts,src/dataSources/**/*.ts}'); + for (const file of files) { + this.addSourceFile(file); + } + // Rebuild all references + this.buildAllReferences(); // Full rebuild for force refresh + // Notify listeners that the cache has been updated + this._onDidUpdate.fire({type: 'fullRefresh'}); + } catch (error) { + console.error('[Cache] Error during force refresh:', error); + } + } + + /** + * Manually triggers a cache update event. + * This can be used by external tools to force explorer refresh. + */ + public triggerUpdate(): void { + this._onDidUpdate.fire({type: 'fullRefresh'}); + } + + /** + * Processes a file change from the queue, performing Phase 1 (Analysis) of the pipeline. + */ + private async processQueue(): Promise { + if (this.isProcessingQueue || this.fileChangeQueue.length === 0) { + return; + } + + this.isProcessingQueue = true; + const { uri, type } = this.fileChangeQueue.shift()!; + const filePath = uri.fsPath.replace(/\\/g, '/'); + + // Check if the changed file is a data source + if (filePath.includes('/src/dataSources/')) { + try { + await this.handleDataSourceChange(uri, type); + } catch (error) { + console.error(`Error processing data source change for ${uri.fsPath}:`, error); + } finally { + this.isProcessingQueue = false; + this.processQueue(); + } + return; + } + + try { + // Get "before" state from cache and "after" state from disk. + const oldFileMeta = this.cache[filePath]; + let newFileMeta: FileMetadata | undefined; + + if (type === 'create' || type === 'change') { + let sourceFile = this.tsMorphProject.getSourceFile(filePath); + if (sourceFile) { + await sourceFile.refreshFromFileSystem(); + } else { + sourceFile = this.tsMorphProject.addSourceFileAtPath(filePath); + } + newFileMeta = this.parseFileForMetadata(sourceFile, false); + } + + // Only perform analysis and propose refactors if the feature is enabled. + if (this.automaticRefactorsEnabled && this.refactorController) { + const allChanges: ChangeObject[] = []; + const tools = this.refactorController.getTools(); + for (const tool of tools) { + const detectedChanges = tool.analyze(oldFileMeta, newFileMeta, allChanges); + allChanges.push(...detectedChanges); + } + + // If analysis found changes, hand them off for Planning and Execution. + if (allChanges.length > 0) { + await this.refactorController.proposeAutomaticRefactors(allChanges); + + // After execution, the file(s) on disk have changed. We must re-read + // the primary file to update our cache with the final state. + if (type !== 'delete') { + const sourceFile = this.tsMorphProject.getSourceFile(filePath); + if (sourceFile) { + await sourceFile.refreshFromFileSystem(); + newFileMeta = this.parseFileForMetadata(sourceFile, false); + } + } + } + } + + if (type === 'delete') { + this.removeSourceFile(filePath); + } else if (newFileMeta) { + this.cache[filePath] = newFileMeta; + } + + this.buildAllReferences(); + let fileType: CacheFileUpdateType = 'unknown'; + if (filePath.includes('/src/dataSources/')) { + fileType = 'dataSource'; + } else if (filePath.includes('/src/data/')) { + fileType = 'dataModel'; + } + this._onDidUpdate.fire({ type: fileType, uri: uri }); + + } catch (error) { + console.error(`Error processing file change for ${uri.fsPath}:`, error); + } finally { + this.isProcessingQueue = false; + this.processQueue(); + } + } + + /** + * Handles changes to data source files by checking for actual content changes + * and updating the infrastructure update flag if necessary. + * @param uri The URI of the changed data source file. + * @param type The type of change (create, change, delete). + */ + private async handleDataSourceChange(uri: vscode.Uri, type: FileChangeType): Promise { + const filePath = uri.fsPath.replace(/\\/g, '/'); + + // --- Infrastructure Hash Check Logic --- + const oldHash = this.dataSourceHashes.get(filePath); + let newHash: string | undefined; + + if (type === 'create' || type === 'change') { + let sourceFile = this.tsMorphProject.getSourceFile(filePath); + if (!sourceFile) { + sourceFile = this.tsMorphProject.addSourceFileAtPath(filePath); + } else { + await sourceFile.refreshFromFileSystem(); + } + newHash = this.parseDataSourceFile(sourceFile); + } + + // Determine if infrastructure changes occurred, but don't fire events yet + let hasInfrastructureChanges = false; + + if (type === 'delete') { + // File deleted - trigger update if there was a data source to delete + if (oldHash) { + hasInfrastructureChanges = true; + } + this.dataSourceHashes.delete(filePath); + } else { + // File created or changed + if (newHash) { + // Data source found in file + if (oldHash !== newHash) { + hasInfrastructureChanges = true; + } + this.dataSourceHashes.set(filePath, newHash); + } else { + // No data source found in file + if (oldHash) { + // Had a data source before, now it's gone + hasInfrastructureChanges = true; + } + this.dataSourceHashes.delete(filePath); + } + } + + // --- Refactoring and Cache Logic (mirrors processQueue) --- + const oldFileMeta = this.cache[filePath]; + let newFileMeta: FileMetadata | undefined; + + if (type === 'create' || type === 'change') { + const sourceFile = this.tsMorphProject.getSourceFile(filePath)!; + newFileMeta = this.parseFileForMetadata(sourceFile, false); + } + + if (this.automaticRefactorsEnabled && this.refactorController) { + const allChanges: ChangeObject[] = []; + const tools = this.refactorController.getTools(); + for (const tool of tools) { + const detectedChanges = tool.analyze(oldFileMeta, newFileMeta, allChanges); + allChanges.push(...detectedChanges); + } + + if (allChanges.length > 0) { + await this.refactorController.proposeAutomaticRefactors(allChanges); + + if (type !== 'delete') { + const sourceFile = this.tsMorphProject.getSourceFile(filePath); + if (sourceFile) { + await sourceFile.refreshFromFileSystem(); + newFileMeta = this.parseFileForMetadata(sourceFile, false); + } + } + } + } + + if (type === 'delete') { + this.removeSourceFile(filePath); + } else if (newFileMeta) { + this.cache[filePath] = newFileMeta; + } + + // Build references and fire update event (same as processQueue) + this.buildAllReferences(); + this._onDidUpdate.fire({ type: 'dataSource', uri: uri }); + + // Fire infrastructure status change event AFTER cache has been updated + if (hasInfrastructureChanges) { + this.isInfrastructureUpdateNeeded = true; + this.outOfSyncDataSources.add(filePath); + this._onInfrastructureStatusChange.fire({ status: 'change-detected', uri: uri }); + } + } + + /** + * Acknowledges that a global infrastructure update has completed successfully, + * resetting the state for all out-of-sync data sources. + */ + public acknowledgeAllInfrastructureUpdates(): void { + this.outOfSyncDataSources.clear(); + this.isInfrastructureUpdateNeeded = false; + } + + /** + * Gets metadata for a specific file. + * @param path The file path to get metadata for. + * @param isCopy Whether to return a copy of the metadata. + * @returns The file metadata or undefined if not found. + */ + public getMetadataForFile(path: string, isCopy: boolean = false): FileMetadata | undefined { + const normalizedPath = path.replace(/\\/g, '/'); + const fileData = this.cache[normalizedPath]; + return fileData ? (isCopy ? JSON.parse(JSON.stringify(fileData)) : fileData) : undefined; + } + + /** + * Adds a new source file to the ts-morph project and parses it for metadata. + * @param filePath The path to the source file. + */ + private addSourceFile(filePath: string | vscode.Uri): void { + const path = filePath instanceof vscode.Uri ? filePath.fsPath : filePath; + const normalizedPath = path.replace(/\\/g, '/'); + const sourceFile = this.tsMorphProject.addSourceFileAtPath(normalizedPath); + this.parseFileForMetadata(sourceFile); + } + + /** + * Removes a source file from the cache and the ts-morph project. + * @param filePath The path to the source file. + */ + private removeSourceFile(filePath: string): void { + delete this.cache[filePath]; + const sourceFile = this.tsMorphProject.getSourceFile(filePath); + if (sourceFile) { + this.tsMorphProject.removeSourceFile(sourceFile); + } + } + + /** + * Parses a data source file to extract its configuration. + * @param sourceFile The ts-morph SourceFile object. + * @returns A hash representing the data source configuration, or undefined if not found. + */ + private parseDataSourceFile(sourceFile: SourceFile): string | undefined { + const varDeclarations = sourceFile.getVariableDeclarations(); + + for (const varDecl of varDeclarations) { + if (varDecl.isExported()) { + const initializer = varDecl.getInitializer(); + + if (initializer && Node.isNewExpression(initializer)) { + const className = initializer.getExpression().getText(); + const varName = varDecl.getName(); + const constructorArgs = initializer.getArguments(); + + let configObjectText = ''; + if (constructorArgs.length > 0 && Node.isObjectLiteralExpression(constructorArgs[0])) { + configObjectText = constructorArgs[0].getText(); + } + + const stringToHash = `const ${varName} = new ${className}(${configObjectText});`; + return crypto.createHash('md5').update(stringToHash).digest('hex'); + } + } + } + return undefined; // No data source found in this file + } + + /** + * Parses a single source file to extract its metadata, properties, and decorators. + * @param sourceFile The ts-morph SourceFile object. + * @param commitToCache If true, the generated metadata will be stored in the cache. Defaults to true. + * @returns The generated `FileMetadata` for the source file. + */ + private parseFileForMetadata(sourceFile: SourceFile, commitToCache: boolean = true): FileMetadata { + const filePath = sourceFile.getFilePath(); + const normalizedFilePath = filePath.replace(/\\/g, '/'); + const fileMetadata: FileMetadata = { + uri: vscode.Uri.file(normalizedFilePath), + classes: {}, + dataSources: {}, + }; + + // Class parsing logic + sourceFile.getClasses().forEach((classDeclaration: ClassDeclaration) => { + const className = classDeclaration.getName() ?? '[Anonymous]'; + const isDataModel = filePath.includes('/src/data/'); + const decoratedClass: DecoratedClass = { + name: className, + decorators: this.extractDecoratorMetadata(classDeclaration), + properties: {}, + methods: {}, + references: [], + declaration: new vscode.Location( + vscode.Uri.file(normalizedFilePath), + this.tsNodeToVscodeRange(classDeclaration.getNameNode() ?? classDeclaration) + ), + isDataModel: isDataModel + }; + + classDeclaration.getProperties().forEach((property: PropertyDeclaration) => { + const propertyName = property.getName(); + decoratedClass.properties[propertyName] = { + name: propertyName, + type: this.getCleanTypeName(property.getType()), + decorators: this.extractDecoratorMetadata(property), + references: [], + declaration: new vscode.Location( + vscode.Uri.file(normalizedFilePath), + this.tsNodeToVscodeRange(property.getNameNode()) + ) + }; + }); + + classDeclaration.getMethods().forEach((method: MethodDeclaration) => { + const methodName = method.getName(); + decoratedClass.methods[methodName] = this.parseMethod(method); + }); + + fileMetadata.classes[className] = decoratedClass; + }); + + // Data source parsing logic + if (normalizedFilePath.includes('/src/dataSources/')) { + sourceFile.getVariableDeclarations().forEach((varDecl: VariableDeclaration) => { + if (varDecl.isExported()) { + const initializer = varDecl.getInitializer(); + if (initializer && Node.isNewExpression(initializer)) { + const dataSourceName = varDecl.getName(); + const dataSourceType = initializer.getExpression().getText(); + let options = {}; + const constructorArg = initializer.getArguments()[0]; + if (constructorArg && Node.isObjectLiteralExpression(constructorArg)) { + options = this.parseNodeValue(constructorArg); + } + + fileMetadata.dataSources[dataSourceName] = { + name: dataSourceName, + type: dataSourceType, + declaration: new vscode.Location( + vscode.Uri.file(normalizedFilePath), + this.tsNodeToVscodeRange(varDecl.getNameNode()) + ), + references: [], + options: options + }; + } + } + }); + } + + if (commitToCache) { + this.cache[normalizedFilePath] = fileMetadata; + } + + return fileMetadata; + } + + /** + * Parses any method to extract its parameters and special return values. + */ + private parseMethod(method: MethodDeclaration): MethodMetadata { + const methodName = method.getName(); + let returnedFields: string[] | null = null; + + if (methodName === 'getFields') { + const returnStatement = method.getFirstDescendantByKind(SyntaxKind.ReturnStatement); + if (returnStatement) { + const returnExpression = returnStatement.getExpression(); + if (returnExpression && Node.isArrayLiteralExpression(returnExpression)) { + const arrayLiteral = returnExpression as ArrayLiteralExpression; + const elements = arrayLiteral.getElements(); + + if (elements.length > 0) { + const fields: string[] = []; + elements.forEach((element: Node) => { + if (Node.isObjectLiteralExpression(element)) { + const obj = element as ObjectLiteralExpression; + const fieldProperty = obj.getProperty('field'); + if (fieldProperty && Node.isPropertyAssignment(fieldProperty)) { + const initializer = fieldProperty.getInitializer(); + if (initializer && Node.isStringLiteral(initializer)) { + fields.push(initializer.getLiteralValue()); + } + } + } + }); + returnedFields = fields; + } + } + } + } + + return { + name: methodName, + parameters: this.parseMethodParameters(method), + returnedFields: returnedFields, + decorators: [], + declaration: new vscode.Location( + vscode.Uri.file(method.getSourceFile().getFilePath().replace(/\\/g, '/')), + this.tsNodeToVscodeRange(method.getNameNode()) + ) + }; + } + + /** + * Parses the parameters of a given method. + */ + private parseMethodParameters(method: MethodDeclaration): ParameterMetadata[] { + return method.getParameters().map((param: ParameterDeclaration) => { + return { + name: param.getName(), + type: this.getCleanTypeName(param.getType()) + }; + }); + } + + /** + * Gets a clean, human-readable name for a ts-morph Type object. + * This method correctly handles imported types, removing the "import(...)" part, + * and properly extracts element types from arrays. + * @param type The ts-morph Type object. + * @returns The clean type name as a string. + */ + private getCleanTypeName(type: Type): string { + // Handle array types by extracting the element type + if (type.isArray()) { + const elementType = type.getArrayElementType(); + if (elementType) { + return this.getCleanTypeName(elementType); + } + } + + const aliasSymbol = type.getAliasSymbol(); + if (aliasSymbol) { + return aliasSymbol.getName(); + } + + const symbol = type.getSymbol(); + if (symbol) { + return symbol.getName(); + } + + return type.getText(); + } + + /** + * Extracts metadata from decorators on a given node (class or property). + * @param node The node to extract decorators from. + * @returns An array of DecoratorMetadata. + */ + private extractDecoratorMetadata(node: ClassDeclaration | PropertyDeclaration): DecoratorMetadata[] { + return node.getDecorators().map((decorator: Decorator) => ({ + name: decorator.getName(), + arguments: decorator.getArguments().map((arg: Node) => this.parseNodeValue(arg)), + position: this.tsNodeToVscodeRange(decorator), + })); + } + + private parseNodeValue(node: Node): any { + if (Node.isArrowFunction(node) || Node.isFunctionExpression(node)) { + return this.parseAnonymousFunction(node); + } + + if (Node.isObjectLiteralExpression(node)) { + const obj: { [key: string]: any } = {}; + node.getProperties().forEach((prop: Node) => { + if (Node.isPropertyAssignment(prop)) { + const key = prop.getName(); + const value = this.parseNodeValue(prop.getInitializer()!); + obj[key] = value; + } + }); + return obj; + } + if (Node.isStringLiteral(node)) { + return node.getLiteralValue(); + } + if (Node.isNumericLiteral(node)) { + return node.getLiteralValue(); + } + if (node.getKind() === SyntaxKind.TrueKeyword) { + return true; + } + if (node.getKind() === SyntaxKind.FalseKeyword) { + return false; + } + if (Node.isIdentifier(node)) { + return node.getText(); + } + if (Node.isArrayLiteralExpression(node)) { + return node.getElements().map((elem: Node) => this.parseNodeValue(elem)); + } + return node.getText(); + } + + // Add this new helper method inside the MetadataCache class + private parseAnonymousFunction(node: ArrowFunction | FunctionExpression): MethodMetadata { + const sourceFile = node.getSourceFile(); + + // Reuse existing logic to parse parameters and get the location + const parameters = node.getParameters().map((param: ParameterDeclaration) => { + return { + name: param.getName(), + type: this.getCleanTypeName(param.getType()) + }; + }); + + const location = new vscode.Location( + vscode.Uri.file(sourceFile.getFilePath()), + this.tsNodeToVscodeRange(node) + ); + + // Build an object that matches the MethodMetadata interface + return { + name: '[anonymous]', // Anonymous functions don't have a name + parameters: parameters, + declaration: location, + decorators: [], // Anonymous functions in args don't have decorators + returnedFields: null + }; + } + + /** + * Iterates through all cached items and finds their references throughout the project. + * This includes direct references found by ts-morph and implicit references + * from string literals in places like ModelView `getFields` methods. + * + * Optimized version that builds references efficiently using proven ts-morph methods. + * @param targetFilePath Optional file path to rebuild references for. If not provided, rebuilds all. + */ + private async buildAllReferences(targetFilePath?: string): Promise { + + // If targetFilePath is provided, only rebuild references for that specific file + if (targetFilePath) { + this.buildReferencesForFile(targetFilePath); + return; + } + + // Full rebuild - clear all references first + let totalItems = 0; + for (const file of Object.values(this.cache)) { + for (const cls of Object.values(file.classes)) { + cls.references = []; + totalItems++; + for (const prop of Object.values(cls.properties)) { + prop.references = []; + totalItems++; + } + } + for (const ds of Object.values(file.dataSources)) { + ds.references = []; + totalItems++; + } + } + + // single pass through all source files + await this.buildReferencesOptimized(); + } + + /** + * Optimized reference building that processes all cached items efficiently. + * Uses the proven ts-morph findReferences() method but optimizes by collecting all items first. + */ + private async buildReferencesOptimized(): Promise { + + // Ensure all TypeScript files in the workspace are loaded for proper cross-file reference resolution + const allTsFiles = await vscode.workspace.findFiles('{src/data/**/*.ts,src/dataSources/**/*.ts}'); + + for (const file of allTsFiles) { + const filePath = file.fsPath.replace(/\\/g, '/'); + if (!this.tsMorphProject.getSourceFile(filePath)) { + try { + this.tsMorphProject.addSourceFileAtPath(filePath); + } catch (error) { + // Silently continue if we can't load a file + } + } + } + + // Collect all nodes and their corresponding metadata objects + const nodesToProcess: Array<{ node: ClassDeclaration | PropertyDeclaration | VariableDeclaration, metadata: DecoratedClass | PropertyMetadata | DataSourceMetadata }> = []; + + for (const file of Object.values(this.cache)) { + const sourceFile = this.tsMorphProject.getSourceFile(file.uri.fsPath); + if (!sourceFile) continue; + + // Collect classes and their properties + for (const cls of Object.values(file.classes)) { + const classNode = sourceFile.getClass(cls.name); + if (classNode) { + nodesToProcess.push({ node: classNode, metadata: cls }); + + for (const prop of Object.values(cls.properties)) { + const propNode = classNode.getProperty(prop.name); + if (propNode) { + nodesToProcess.push({ node: propNode, metadata: prop }); + } + } + } + } + + // Collect data sources + for (const ds of Object.values(file.dataSources)) { + const varDecl = sourceFile.getVariableDeclaration(ds.name); + if (varDecl) { + nodesToProcess.push({ node: varDecl, metadata: ds }); + } + } + } + + // Process all nodes using the proven findReferences approach + for (const { node, metadata } of nodesToProcess) { + this.findAndStoreReferences(node, metadata); + } + } + + /** + * Builds references for a specific file's classes and properties + * @param filePath The file path to build references for + */ + private buildReferencesForFile(filePath: string): void { + const normalizedPath: string = filePath.replace(/\\/g, '/'); + const file = this.cache[normalizedPath]; + if (!file) { + return; + } + + const sourceFile = this.tsMorphProject.getSourceFile(normalizedPath); + if (!sourceFile) { + return; + } + + for (const cls of Object.values(file.classes)) { + const classNode = sourceFile.getClass(cls.name); + if (!classNode) { + continue; + } + + this.findAndStoreReferences(classNode, cls); + for (const prop of Object.values(cls.properties)) { + const propNode = classNode.getProperty(prop.name); + if (propNode) { + this.findAndStoreReferences(propNode, prop); + } + } + } + for (const ds of Object.values(file.dataSources)) { + const varDecl = sourceFile.getVariableDeclaration(ds.name); + if (varDecl) { + this.findAndStoreReferences(varDecl, ds); + } + } + } + + /** + * Finds all references to a given node (class or property) and stores them + * in the cache using your more precise method. + * @param node The ts-morph node to find references for. + * @param metadataObject The corresponding metadata object in the cache to store the references in. + */ + private findAndStoreReferences(node: ClassDeclaration | PropertyDeclaration | VariableDeclaration, metadataObject: DecoratedClass | PropertyMetadata | DataSourceMetadata): void { + const nodeName = node.getKind() === SyntaxKind.ClassDeclaration ? + (node as ClassDeclaration).getName() : + node.getKind() === SyntaxKind.PropertyDeclaration ? + (node as PropertyDeclaration).getName() : + (node as VariableDeclaration).getName(); + + try { + const referencedSymbols = node.findReferences(); + + for (const referencedSymbol of referencedSymbols) { + for (const reference of referencedSymbol.getReferences()) { + const refSourceFile = reference.getSourceFile(); + const textSpan = reference.getTextSpan(); + + const start = refSourceFile.getLineAndColumnAtPos(textSpan.getStart()); + const end = refSourceFile.getLineAndColumnAtPos(textSpan.getEnd()); + + const preciseRange = new vscode.Range( + new vscode.Position(start.line - 1, start.column - 1), + new vscode.Position(end.line - 1, end.column - 1) + ); + + const refLocation = new vscode.Location( + vscode.Uri.file(refSourceFile.getFilePath().replace(/\\/g, '/')), + preciseRange + ); + + metadataObject.references.push(refLocation); + } + } + } catch (error) { + console.warn(`[Cache] Error finding references for ${nodeName}:`, error); + } + } + + /** + * Provides a clean method to search for metadata across the entire cache. + * @param predicate A function that returns true for the metadata you're looking for. + * @returns An array of found metadata objects. + */ + public findMetadata(predicate: (item: DecoratedClass | PropertyMetadata | MethodMetadata) => boolean): (DecoratedClass | PropertyMetadata | MethodMetadata)[] { + const results: (DecoratedClass | PropertyMetadata | MethodMetadata)[] = []; + for (const fileData of Object.values(this.cache)) { + for (const classData of Object.values(fileData.classes)) { + if (predicate(classData)) { + results.push(classData); + } + for (const propData of Object.values(classData.properties)) { + if (predicate(propData)) { + results.push(propData); + } + } + for (const methodData of Object.values(classData.methods)) { + if (predicate(methodData)) { + results.push(methodData); + } + } + } + } + return results; + } + + /** + * Returns all models that are stored in the src/data folder. + * These are the models that will be shown in the explorer. + * @returns An array of DecoratedClass objects that represent data models. + */ + public getDataModels(): DecoratedClass[] { + const dataModels: DecoratedClass[] = []; + for (const fileData of Object.values(this.cache)) { + for (const classData of Object.values(fileData.classes)) { + if (classData.isDataModel) { + dataModels.push(classData); + } + } + } + return dataModels; + } + + /** + * Returns all @Model decorated classes that are stored in the src/data folder. + * This is a more specific version of getDataModels() that only returns + * classes with the @Model decorator. + * @returns An array of DecoratedClass objects that represent Model classes in the data folder. + */ + public getDataModelClasses(): DecoratedClass[] { + return this.getDataModels().filter(classData => + classData.decorators.some(decorator => decorator.name === 'Model') + ); + } + + /** + * Returns all data sources found in the cache. + * @returns An array of DataSourceMetadata objects. + */ + public getDataSources(): DataSourceMetadata[] { + const dataSources: DataSourceMetadata[] = []; + for (const fileData of Object.values(this.cache)) { + if (fileData.dataSources) { + dataSources.push(...Object.values(fileData.dataSources)); + } + } + return dataSources.sort((a, b) => a.name.localeCompare(b.name)); + } + + + /** + * Utility to convert a ts-morph Node's position to a VS Code Range. + * @param node The ts-morph Node. + * @returns A VS Code Range. + */ + private tsNodeToVscodeRange(node: Node): vscode.Range { + const sourceFile = node.getSourceFile(); + const start = node.getStart(); + const end = node.getEnd(); + const startPos = sourceFile.getLineAndColumnAtPos(start); + const endPos = sourceFile.getLineAndColumnAtPos(end); + return new vscode.Range(startPos.line - 1, startPos.column - 1, endPos.line - 1, endPos.column - 1); + } + + /** + * Disposes of the file watchers when the extension is deactivated. + */ + public dispose(): void { + this.fileWatcher?.dispose(); + this.folderWatcher?.dispose(); + } +} \ No newline at end of file diff --git a/vs-code-extension/src/extension.ts b/vs-code-extension/src/extension.ts new file mode 100644 index 0000000..8a6c832 --- /dev/null +++ b/vs-code-extension/src/extension.ts @@ -0,0 +1,44 @@ +import * as vscode from 'vscode'; +import { MetadataCache } from './cache/cache'; +import { getAllRefactorTools, registerRefactorCommands } from './refactor/refactorDisposables'; +import { RefactorController } from './refactor/RefactorController'; +import { registerExplorer } from './explorer/explorerRegistration'; +import { registerInfoPanel } from './quickInfoPanel/infoPanelRegistration'; +import { registerGeneralCommands } from './commands/commandRegistration'; +import { registerInfraStatus } from './infrastructure/infraStatusRegistration'; +import { setupSqlToolsIntegration } from './tools/sqlToolsIntegration'; + +export let cache: MetadataCache; + +export async function activate(context: vscode.ExtensionContext) { + // Core Services Initialization (Shallow Load) --- + cache = new MetadataCache(context.extensionPath); + await cache.initialize(); // Fast shallow initialization + + const refactorTools = getAllRefactorTools(); + const refactorController = new RefactorController(refactorTools, cache); + cache.setRefactorController(refactorController); + + // Feature Registration (UI can render immediately) --- + // Each function now handles the setup for a specific feature. + const quickInfoProvider = registerInfoPanel(context, cache); + const explorerRegistration = registerExplorer(context, cache, quickInfoProvider); + const generalCommandDisposables = registerGeneralCommands(context, cache, explorerRegistration.provider); + registerRefactorCommands(refactorController, context); // Pass context if needed for subscriptions + registerInfraStatus(context, cache); + + // Background Reference Building (Deep Load) --- + // Start building references in the background after UI is ready + cache.buildAllReferencesInBackground(); + + // --- SQLTools Integration --- + setupSqlToolsIntegration(context, cache); + + // --- Push remaining disposables --- + context.subscriptions.push(cache, ...generalCommandDisposables); +} + +// This method is called when your extension is deactivated +export function deactivate() { + cache.dispose(); +} \ No newline at end of file diff --git a/vs-code-extension/src/infrastructure/infraStatusRegistration.ts b/vs-code-extension/src/infrastructure/infraStatusRegistration.ts new file mode 100644 index 0000000..0c9e926 --- /dev/null +++ b/vs-code-extension/src/infrastructure/infraStatusRegistration.ts @@ -0,0 +1,85 @@ +import * as vscode from 'vscode'; +import { InfrastructureStatusChangeEvent, MetadataCache } from '../cache/cache'; +import { InfrastructureStatus } from './infrastructureStatus'; +import { exec } from 'child_process'; + +/** + * Registers the infrastructure status indicator and the manual update command. + * @param context The extension context. + * @param cache The metadata cache. + */ +export function registerInfraStatus(context: vscode.ExtensionContext, cache: MetadataCache) { + const infraStatus = new InfrastructureStatus(); + context.subscriptions.push(infraStatus); + + let isUpdating = false; + let lastError = ''; + + /** + * The main function to execute the infrastructure update. + */ + const runInfraUpdate = () => { + if (isUpdating) { + vscode.window.showInformationMessage('An infrastructure update is already in progress.'); + return; + } + + const workspaceFolders = vscode.workspace.workspaceFolders; + if (!workspaceFolders || workspaceFolders.length === 0) { + vscode.window.showErrorMessage('Cannot run infra update. No workspace is open.'); + return; + } + + isUpdating = true; + infraStatus.showSyncing(); + + const command = `slingr infra update -a`; + // Execute in the root of the first workspace folder + exec(command, { cwd: workspaceFolders[0].uri.fsPath }, (error, stdout, stderr) => { + if (error) { + lastError = stderr || stdout || error.message; + infraStatus.showError(lastError); + setTimeout(() => infraStatus.showUpdateNeeded(), 2000); + } else { + infraStatus.showSynced(); + // Acknowledge the update so the "Update Required" banner doesn't reappear + // until the next change is made. + cache.acknowledgeAllInfrastructureUpdates(); + } + isUpdating = false; + }); + }; + + // Register the command that the status bar button will trigger. + const runUpdateCommand = vscode.commands.registerCommand('slingr.runInfraUpdate', runInfraUpdate); + context.subscriptions.push(runUpdateCommand); + + // When a data source changes, simply show the button. + cache.onInfrastructureStatusChange((event: InfrastructureStatusChangeEvent) => { + if (event.status === 'change-detected') { + infraStatus.showUpdateNeeded(); + } + }); + + // When the extension activates, check if an update is already needed from previous changes. + if (cache.isInfrastructureUpdateNeeded) { + infraStatus.showUpdateNeeded(); + } + + // This command is for showing the error message popup + const showInfraErrorCommand = vscode.commands.registerCommand('slingr.showInfraError', () => { + if (!lastError) { + return; + } + vscode.window.showErrorMessage( + `Slingr Infra Sync Failed:\n${lastError}`, + { modal: true }, + 'Run Update Again' + ).then(selection => { + if (selection === 'Run Update Again') { + runInfraUpdate(); + } + }); + }); + context.subscriptions.push(showInfraErrorCommand); +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/infoPanelRegistration.ts b/vs-code-extension/src/quickInfoPanel/infoPanelRegistration.ts new file mode 100644 index 0000000..37a3a3f --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/infoPanelRegistration.ts @@ -0,0 +1,26 @@ +import * as vscode from 'vscode'; +import { QuickInfoProvider } from './quickInfoProvider'; +import { MetadataCache } from '../cache/cache'; + +/** + * Registers the Quick Info Panel as a webview view provider in VS Code. + * + * This module is responsible for setting up the Quick Info Panel integration with VS Code's + * extension system. It creates and registers the QuickInfoProvider as a webview view provider, + * which allows it to display metadata information in a dedicated panel within the VS Code UI. + * + * @param context - The VS Code extension context containing extension-specific information + * @param cache - The metadata cache containing parsed Slingr metadata from the workspace + * @returns The registered QuickInfoProvider instance for use by other extension components + */ +export function registerInfoPanel(context: vscode.ExtensionContext, cache: MetadataCache): QuickInfoProvider { + const provider = new QuickInfoProvider(context.extensionUri, cache); + + const registration = vscode.window.registerWebviewViewProvider( + QuickInfoProvider.viewType, + provider + ); + context.subscriptions.push(registration); + + return provider; +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/quickInfoProvider.ts b/vs-code-extension/src/quickInfoPanel/quickInfoProvider.ts new file mode 100644 index 0000000..78a571e --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/quickInfoProvider.ts @@ -0,0 +1,444 @@ +import * as vscode from 'vscode'; +import { DecoratedClass, MetadataCache, PropertyMetadata, DecoratorMetadata, DataSourceMetadata } from '../cache/cache'; +import { rendererRegistry } from './renderers/rendererRegistry'; +import { IMetadataRenderer, IRendererContext } from './renderers/iMetadataRenderer'; + +/** + * Union type for info provider metadata items. + * Represents all the different types of metadata that can be displayed in the Quick Info Panel. + */ +export type MetadataItem = DecoratedClass | PropertyMetadata | DecoratorMetadata | DataSourceMetadata; + +/** + * The QuickInfoProvider class implements VS Code's WebviewViewProvider interface to create + * a custom panel that displays detailed metadata information about Slingr components. + * + * This provider creates a webview-based panel that shows: + * - Model metadata with fields, decorators, and navigation + * - Field metadata with types, decorators, and source locations + * - Interactive navigation between related metadata items + * - Code navigation to source definitions + * + * Key Features: + * - **Dynamic Content Rendering**: Uses specialized renderers for different metadata types + * - **Navigation History**: Supports back/forward navigation through viewed items + * - **Interactive Elements**: Clickable links for code navigation and related item exploration + * - **Responsive Design**: Adapts to VS Code themes and provides a clean, readable interface + */ +export class QuickInfoProvider implements vscode.WebviewViewProvider { + /** The unique identifier for this webview view type, used by VS Code for registration */ + public static readonly viewType = 'slingrQuickInfo'; + + /** The webview view instance, set when the view is resolved */ + private _view?: vscode.WebviewView; + + /** Registry of specialized renderers for different metadata types */ + private readonly rendererRegistry: Map = rendererRegistry; + + /** Navigation history stack for back/forward functionality */ + private _navigationHistory: { itemType: string; metadata: MetadataItem }[] = []; + + /** Current state representing the currently displayed metadata item */ + private _currentState: { itemType: string; metadata: MetadataItem } | undefined; + + /** + * Creates a new QuickInfoProvider instance. + * + * @param _extensionUri - The URI of the extension, used for resolving local resources + * @param cache - The metadata cache containing parsed Slingr metadata + */ + constructor( + private readonly _extensionUri: vscode.Uri, + private readonly cache: MetadataCache + ) {} + + /** + * Resolves the webview view when VS Code creates it. + * This method is called by VS Code when the webview view needs to be displayed. + * + * Sets up: + * - Webview options (script execution, local resource access) + * - Message handlers for user interactions + * - Initial content display + * + * @param webviewView - The webview view instance created by VS Code + * @param context - Context information about the webview view + * @param _token - Cancellation token (unused) + */ + public resolveWebviewView( + webviewView: vscode.WebviewView, + context: vscode.WebviewViewResolveContext, + _token: vscode.CancellationToken, +) { + this._view = webviewView; + + webviewView.webview.options = { + enableScripts: true, + localResourceRoots: [this._extensionUri] + }; + + // Set up message handling for webview interactions + // This listener handles clicks from the webview and processes various commands + webviewView.webview.onDidReceiveMessage(async (message) => { + if (message.command === 'itemClicked') { + this._handleItemClicked(message.data); + } + if (message.command === 'navigateBack') { + this._navigateBack(); + } + if (message.command === 'goToLocation') { + const locData = message.data; + if (locData && locData.uri && locData.range) { + try { + const uri = vscode.Uri.file(locData.uri.path); + const startPosition = new vscode.Position(locData.range[0].line, locData.range[0].character); + const endPosition = new vscode.Position(locData.range[1].line, locData.range[1].character); + const range = new vscode.Range(startPosition, endPosition); + const location = new vscode.Location(uri, range); + + vscode.commands.executeCommand('slingr-vscode-extension.navigateToCode', location); + + } catch (e) { + console.error('Failed to reconstruct location for navigation:', e); + vscode.window.showErrorMessage('Could not navigate to the selected function.'); + } + } + } + }); + + this.update(undefined, undefined); +} + + /** + * Updates the content of the webview with the metadata from the selected tree item. + * + * This method handles: + * - Navigation history management (unless navigating back) + * - Content rendering using appropriate renderers + * - Fallback display when no item is selected + * + * @param itemType - The type of metadata item ('model', 'field', etc.) + * @param metadata - The metadata object to display + * @param isNavigatingBack - Whether this update is part of a back navigation (default: false) + */ + public update(itemType: string | undefined, metadata: MetadataItem | undefined, isNavigatingBack = false): void { + if (!this._view) { + return; + } + + if (this._currentState?.itemType === itemType && this._currentState?.metadata === metadata) { + return; + } + + if (!isNavigatingBack && this._currentState) { + this._navigationHistory.push(this._currentState); + } + + if (!itemType || !metadata) { + const contentHtml = ` +
+
+
📘
+

No item selected

+

Select a metadata in the Explorer to view its metadata and quick navigation options.

+
+
+ `; + this._view.webview.html = this._buildHtmlShell(contentHtml, ''); + return; + } + + this._currentState = { itemType, metadata }; + this._view.webview.html = this._getHtmlForWebview(itemType, metadata); + } + + /** + * Handles the logic for an 'itemClicked' event from the webview. + * + * Processes clicks on interactive elements within the webview and navigates + * to the corresponding metadata items. Supports: + * - Field navigation within model contexts + * - Model navigation by class name + * + * @param data - Click event data containing item type, name, and optional parent context + */ + private _handleItemClicked(data: { itemType: string; name: string; parentClassName?: string }): void { + const { itemType, name, parentClassName } = data; + let foundMetadata: MetadataItem | undefined; + + if (itemType === 'field' && parentClassName) { + const [parentClass] = this.cache.findMetadata( + item => 'properties' in item && item.name === parentClassName + ) as DecoratedClass[]; + + if (parentClass) { + foundMetadata = parentClass.properties[name]; + } + } else if (itemType === 'model') { + const [modelClass] = this.cache.findMetadata( + item => 'properties' in item && item.name === name + ) as DecoratedClass[]; + foundMetadata = modelClass; + } else if (itemType === 'dataSource') { + const dataSources = this.cache.getDataSources(); + foundMetadata = dataSources.find(ds => ds.name === name); + } + if (foundMetadata) { + // If we found the metadata, update the panel with it + this.update(itemType, foundMetadata); + } else { + vscode.window.showWarningMessage(`Could not find metadata for "${name}".`); + } + } + + /** + * Navigates back to the previous item in the navigation history. + * Removes the last item from the history stack and displays it. + */ + private _navigateBack(): void { + const lastState = this._navigationHistory.pop(); + if (lastState) { + this.update(lastState.itemType, lastState.metadata, true); + } + } + + /** + * Generates the HTML content for the webview based on the provided metadata. + * + * Uses the renderer registry to find appropriate specialized renderers for + * different metadata types. Falls back to JSON display for unknown types. + * + * @param itemType - The type of metadata item to render + * @param metadata - The metadata object to render + * @returns Complete HTML string for the webview content + */ + private _getHtmlForWebview(itemType: string, metadata: MetadataItem | undefined): string { + // Find the correct renderer for the given itemType + const renderer = this.rendererRegistry.get(itemType); + let contentHtml: string; + + if (renderer && this._view) { + // If we found a specialist, delegate the rendering task + const context: IRendererContext = { + webview: this._view.webview, + extensionUri: this._extensionUri, + findModel: (name: string) => this.cache.findMetadata( + item => 'properties' in item && item.name === name + )[0] as DecoratedClass | undefined, + findDataSource: (name: string) => this.cache.getDataSources().find(ds => ds.name === name) + }; + if (!metadata) { + contentHtml = `

No metadata found

`; + } else { + contentHtml = renderer.render(metadata, context); + } + } else { + // Fallback for unknown types + contentHtml = `
${JSON.stringify(metadata, null, 2)}
`; + } + + const backButtonHtml = this._navigationHistory.length > 0 + ? `` + : ''; + + return this._buildHtmlShell(contentHtml, backButtonHtml); + + } + + /** + * Builds the complete HTML shell for the webview. + * + * Creates a full HTML document with: + * - VS Code theme-aware CSS styling + * - Interactive JavaScript for handling user interactions + * - Navigation controls (back button when appropriate) + * - Content area for rendered metadata + * + * @param contentHtml - The main content HTML to display + * @param backButtonHtml - HTML for the back navigation button + * @returns Complete HTML document string + */ + private _buildHtmlShell(contentHtml: string, backButtonHtml: string): string { + return ` + + + + + Quick Info + + + + ${backButtonHtml} + ${contentHtml} + + + `; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/baseRenderer.ts b/vs-code-extension/src/quickInfoPanel/renderers/baseRenderer.ts new file mode 100644 index 0000000..2f4b831 --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/baseRenderer.ts @@ -0,0 +1,119 @@ +import * as vscode from 'vscode'; +import { DecoratorMetadata } from '../../cache/cache'; +import { IMetadataRenderer, IRendererContext } from './iMetadataRenderer'; +import { isMethodMetadata } from '../../utils/metadata'; +import { MetadataItem } from '../quickInfoProvider'; + +/** + * Abstract base class providing common functionality for all metadata renderers. + * + * This class implements the IMetadataRenderer interface and provides shared utilities + * that specialized renderers can use to create consistent, interactive HTML output. + * + * Key Features: + * - **Table Row Generation**: Standardized table row creation with labels and values + * - **Decorator Rendering**: Comprehensive decorator display with interactive elements + * - **Click Handler Support**: Automatic generation of clickable elements for navigation + * - **Type-Specific Formatting**: Special handling for method signatures and choice labels + * + * Subclasses must implement the abstract `render` method to provide type-specific + * rendering logic while leveraging the common utilities provided here. + */ +export abstract class BaseRenderer implements IMetadataRenderer { + /** + * Abstract method that must be implemented by subclasses. + * Defines the specific rendering logic for each metadata type. + * + * @param metadata - The metadata object to render + * @param context - Optional rendering context with VS Code components + * @returns HTML string representing the rendered metadata + */ + abstract render(metadata: MetadataItem, context?: IRendererContext): string; + + /** + * Creates a standardized table row with a label and value. + * + * Provides consistent formatting for metadata properties display. + * Automatically filters out empty, null, or undefined values. + * + * @param label - The label text for the property + * @param value - The value to display (can be HTML) + * @returns HTML table row string, or empty string if value is empty + */ + protected _renderTableRow(label: string, value: any): string { + if (value === undefined || value === null || value === '') { return ''; } + return `${label}${value}`; + } + + /** + * Renders a collection of decorators into interactive HTML. + * + * Creates a comprehensive display of decorators with: + * - Clickable decorator names that navigate to their definitions + * - Formatted argument lists with type-specific handling + * - Special formatting for method signatures and choice labels + * - Interactive elements for method declarations + * + * @param decorators - Array of decorator metadata to render + * @param parentUri - URI of the file containing the decorated element + * @returns HTML table row containing all decorator information + */ + protected _renderDecorators(decorators: DecoratorMetadata[], parentUri: vscode.Uri): string { + if (!decorators || decorators.length === 0) { + return ''; + } + + const decoratorHtml = decorators + .filter(dec => dec && dec.name) + .map(dec => { + // Create a Location object for this specific decorator + const decoratorLocation = new vscode.Location(parentUri, dec.position); + const commandData = { + command: 'goToLocation', + data: decoratorLocation + }; + let argsHtml = ''; + if (Array.isArray(dec.arguments) && dec.arguments.length > 0 && typeof dec.arguments[0] === 'object' && dec.arguments[0] !== null) { + const argsObject = dec.arguments[0]; + const argList = Object.entries(argsObject).map(([key, value]) => { + if (isMethodMetadata(value)) { + const commandData = { + command: 'goToLocation', + data: value.declaration + }; + const signature = `(${value.parameters.map(p => `${p.name}: ${p.type}`).join(', ')})`; + return ` +
  • + + ${key}: ${signature} + +
    • `; + } + if (dec.name === 'Choice' && key === 'labels' && typeof value === 'object' && value !== null) { + const choiceLabels = Object.entries(value) + .map(([valKey, valLabel]) => `
  • ${valKey}: "${valLabel}"
    • `) + .join(''); + return `
  • ${key}:
      ${choiceLabels}
    • `; + } + return `
  • ${key}: ${JSON.stringify(value)}
    • `; + }).join(''); + + if (argList) { + argsHtml = `
      ${argList}
    `; + } + } + + const decoratorClass = dec.name === 'Field' ? 'field-decorator' : ''; + + return ` +
    + +
    @${dec.name}
    +     + ${argsHtml} +
    `; + }).join(''); + + return `Decorators
    ${decoratorHtml}
    `; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/dataSourceRenderer.ts b/vs-code-extension/src/quickInfoPanel/renderers/dataSourceRenderer.ts new file mode 100644 index 0000000..9fe1f17 --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/dataSourceRenderer.ts @@ -0,0 +1,42 @@ +import { DataSourceMetadata } from '../../cache/cache'; +import { BaseRenderer } from './baseRenderer'; +import { IRendererContext } from './iMetadataRenderer'; + +/** + * Specialized renderer for Slingr data source metadata display. + * + * The DataSourceRenderer creates a view of data source configurations including: + * - Data source name with source code navigation + * - Type information + * - Connection details (excluding sensitive information) + */ +export class DataSourceRenderer extends BaseRenderer { + /** + * Renders data source metadata into a structured HTML display. + * @param metadata - The data source metadata to render + * @param context - Rendering context (currently unused but available for future enhancements) + * @returns HTML string with complete data source information display + */ + public render(metadata: DataSourceMetadata, context: IRendererContext): string { + const ds = metadata; + + const titleCommand = { + command: 'goToLocation', + data: ds.declaration + }; + + return ` +

    + Data Source + ${ds.name} +

    + + ${this._renderTableRow('Name', `${ds.name}`)} + ${this._renderTableRow('Type', `${ds.type}`)} + ${this._renderTableRow('Host', ds.options.host)} + ${this._renderTableRow('Port', ds.options.port)} + ${this._renderTableRow('Database', ds.options.database)} +
    + `; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/fieldRenderer.ts b/vs-code-extension/src/quickInfoPanel/renderers/fieldRenderer.ts new file mode 100644 index 0000000..f0f178e --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/fieldRenderer.ts @@ -0,0 +1,40 @@ +import { PropertyMetadata } from '../../cache/cache'; +import { BaseRenderer } from './baseRenderer'; +import { IRendererContext } from './iMetadataRenderer'; + +/** + * Specialized renderer for Slingr field metadata display. + * + * The FieldRenderer creates a detailed view of field properties including: + * - Field name with source code navigation + * - Type information with appropriate styling + * - Complete decorator information with interactive elements + */ +export class FieldRenderer extends BaseRenderer { + /** + * Renders field metadata into a structured HTML display. + * @param metadata - The field property metadata to render + * @param context - Rendering context (currently unused but available for future enhancements) + * @returns HTML string with complete field information display + */ + public render(metadata: PropertyMetadata, context: IRendererContext): string { + const prop = metadata; + + const titleCommand = { + command: 'goToLocation', + data: prop.declaration + }; + + return ` +

    + Field + ${prop.name} +

    + + ${this._renderTableRow('Name', `${prop.name}`)} + ${this._renderTableRow('Type', `${prop.type}`)} + ${this._renderDecorators(prop.decorators, prop.declaration.uri)} +
    + `; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/iMetadataRenderer.ts b/vs-code-extension/src/quickInfoPanel/renderers/iMetadataRenderer.ts new file mode 100644 index 0000000..81dbaf0 --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/iMetadataRenderer.ts @@ -0,0 +1,50 @@ +import vscode from 'vscode'; +import { DecoratedClass } from '../../cache/cache'; +import { MetadataItem } from '../quickInfoProvider'; + +/** + * Context interface providing renderers with access to VS Code components and utilities. + * + * This interface defines the context object passed to all metadata renderers, + * giving them access to: + * - VS Code webview for resource URI generation + * - Extension URI for local resource resolution + * - Model lookup functionality for cross-references + * + * The context ensures renderers can create interactive elements, resolve resources, + * and navigate between related metadata items. + */ +export interface IRendererContext { + /** The VS Code webview instance for generating resource URIs */ + webview: vscode.Webview; + + /** The extension's URI for resolving local resources like icons and stylesheets */ + extensionUri: vscode.Uri; + + /** Function to find model metadata by name for creating cross-references */ + findModel: (name: string) => DecoratedClass | undefined; + findDataSource: (name: string) => MetadataItem | undefined; +} + +/** + * Interface that all metadata renderers must implement. + * + * Defines the contract for specialized renderers that convert metadata objects + * into HTML representations for display in the Quick Info Panel. + * + * Renderers are responsible for: + * - Converting metadata into semantic HTML + * - Creating interactive elements for navigation + * - Applying appropriate styling and structure + * - Handling renderer-specific formatting requirements + */ +export interface IMetadataRenderer { + /** + * Renders metadata into HTML for display in the webview. + * + * @param metadata - The metadata object to render + * @param context - Rendering context with VS Code components and utilities + * @returns HTML string representing the rendered metadata + */ + render(metadata: MetadataItem, context: IRendererContext): string; +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/modelRenderer.ts b/vs-code-extension/src/quickInfoPanel/renderers/modelRenderer.ts new file mode 100644 index 0000000..5544aef --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/modelRenderer.ts @@ -0,0 +1,101 @@ +import { DecoratedClass } from '../../cache/cache'; +import * as vscode from 'vscode'; +import { BaseRenderer } from './baseRenderer'; +import { IRendererContext } from './iMetadataRenderer'; + +/** + * Specialized renderer for Slingr model metadata display. + * + * The ModelRenderer creates a comprehensive view of model classes including: + * - Model identification with name and label information + * - Source file navigation capabilities + * - Complete decorator information with interactive elements + * - Field listing with type information and navigation + * - Cross-references to related models + */ +export class ModelRenderer extends BaseRenderer { + /** + * Renders model metadata into a structured HTML display. + * @param metadata - The model class metadata to render + * @param context - Rendering context providing model lookup and webview access + * @returns HTML string with complete model information display + */ + public render(metadata: DecoratedClass, context: IRendererContext): string { + const cls = metadata; + const mainDecorator = cls.decorators.find(d => d.name === 'Model'); + const sourceFileLocation = new vscode.Location(cls.declaration.uri, new vscode.Position(0, 0)); + const sourceCommand = { + command: 'goToLocation', + data: sourceFileLocation + }; + + const dataSourceName = mainDecorator?.arguments[0]?.dataSource; + let dataSourceHtml = ''; + if (dataSourceName && context.findDataSource(dataSourceName)) { + const dataSourceClickCommand = { + command: 'itemClicked', + data: { + itemType: 'dataSource', + name: dataSourceName + } + }; + dataSourceHtml = `${dataSourceName}`; + } else if (dataSourceName) { + dataSourceHtml = `${dataSourceName}`; + } + + const fieldsListHtml = Object.values(cls.properties) + .filter(prop => prop.decorators.some(d => d.name === 'Field')) + .map(prop => { + // This creates the clickable data attribute for each field + const fieldClickCommand = { + command: 'itemClicked', + data: { + itemType: 'field', + name: prop.name, + parentClassName: cls.name + } + }; + const typeAsModel = context.findModel(prop.type); + let typeHtml: string; + if (typeAsModel) { + // If it's a model, make the type clickable + const typeClickCommand = { + command: 'itemClicked', + data: { + itemType: 'model', + name: prop.type + } + }; + typeHtml = ` + + ${prop.type} + `; + } else { + // Otherwise, just display it as a normal tag + typeHtml = `${prop.type}`; + } + + return ` +
  • + + ${prop.name} + + ${typeHtml} +
    • + `; + }).join(''); + + return ` +

    +

    Model ${cls.name}

    + + + ${this._renderTableRow('Source', `${vscode.workspace.asRelativePath(cls.declaration.uri)}`)} + ${this._renderTableRow('Data Source', dataSourceHtml)} + ${this._renderDecorators(cls.decorators, cls.declaration.uri)} +
    + ${fieldsListHtml ? `

    Fields

      ${fieldsListHtml}
    ` : ''} + `; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/rendererRegistry.ts b/vs-code-extension/src/quickInfoPanel/renderers/rendererRegistry.ts new file mode 100644 index 0000000..44ccf93 --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/rendererRegistry.ts @@ -0,0 +1,18 @@ +import { IMetadataRenderer } from './iMetadataRenderer'; +import { ModelRenderer } from './modelRenderer'; +import { FieldRenderer } from './fieldRenderer'; +import { DataSourceRenderer } from './dataSourceRenderer'; + +/** + * Central registry for metadata renderers in the Quick Info Panel system. + * + * This module maintains a mapping between metadata item types and their + * corresponding specialized renderers. The registry enables the Quick Info + * Provider to automatically select the appropriate renderer for each type + * of metadata being displayed. + */ +export const rendererRegistry = new Map([ + ['model', new ModelRenderer()], + ['field', new FieldRenderer()], + ['dataSource', new DataSourceRenderer()], +]); \ No newline at end of file diff --git a/vs-code-extension/src/quickInfoPanel/renderers/rendererUtils.ts b/vs-code-extension/src/quickInfoPanel/renderers/rendererUtils.ts new file mode 100644 index 0000000..747449f --- /dev/null +++ b/vs-code-extension/src/quickInfoPanel/renderers/rendererUtils.ts @@ -0,0 +1,71 @@ +import { DecoratorMetadata } from '../../cache/cache'; +import { isMethodMetadata } from '../../utils/metadata'; + +/** + * Utility functions for rendering metadata components in the Quick Info Panel. + * + * This module provides reusable rendering functions that can be shared across + * different renderer implementations. It serves as a centralized location for + * common rendering logic, ensuring consistency and reducing code duplication. + * + * Key Features: + * - **Decorator Rendering**: Comprehensive decorator display with interactive elements + * - **Method Signature Formatting**: Special handling for method metadata + * - **Choice Label Processing**: Enhanced formatting for @Choice decorator arguments + * - **Click Handler Generation**: Automatic creation of navigation commands + * + * @param decorators - Array of decorator metadata to render + * @returns HTML table row containing formatted decorator information + */ +export function renderDecorators(decorators: DecoratorMetadata[]): string { + if (!decorators || decorators.length === 0) { + return ''; + } + + const decoratorHtml = decorators + .filter(dec => dec && dec.name) // Ensure decorator is valid + .map(dec => { + let argsHtml = ''; + if (Array.isArray(dec.arguments) && dec.arguments.length > 0 && typeof dec.arguments[0] === 'object' && dec.arguments[0] !== null) { + const argsObject = dec.arguments[0]; + const argList = Object.entries(argsObject).map(([key, value]) => { + if (isMethodMetadata(value)) { + const commandData = { + command: 'goToLocation', + data: value.declaration + }; + + // Build the signature string from the parameters array + const signature = `(${value.parameters.map(p => `${p.name}: ${p.type}`).join(', ')})`; + + return ` +
  • + + ${key}: ${signature} + +
    • `; + } + // Special, more readable formatting for @Choice labels + if (dec.name === 'Choice' && key === 'labels' && typeof value === 'object' && value !== null) { + const choiceLabels = Object.entries(value) + .map(([valKey, valLabel]) => `
  • ${valKey}: "${valLabel}"
    • `) + .join(''); + return `
  • ${key}:
      ${choiceLabels}
    • `; + } + return `
  • ${key}: ${JSON.stringify(value)}
    • `; + }).join(''); + + if (argList) { + argsHtml = `
      ${argList}
    `; + } + } + + return ` +
    +
    @${dec.name}
    + ${argsHtml} +
    `; + }).join(''); + + return `Decorators
    ${decoratorHtml}
    `; +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/RefactorController.ts b/vs-code-extension/src/refactor/RefactorController.ts new file mode 100644 index 0000000..9e38f2e --- /dev/null +++ b/vs-code-extension/src/refactor/RefactorController.ts @@ -0,0 +1,480 @@ +import * as vscode from "vscode"; +import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteModelPayload, RenameModelPayload } from "./refactorInterfaces"; +import { findNodeAtPosition } from "../utils/ast"; +import { MetadataCache } from "../cache/cache"; +import { AppTreeItem } from "../explorer/appTreeItem"; + +/** + * Controls and orchestrates refactoring operations within the VS Code extension. + * + * The RefactorController serves as the central coordinator for all refactoring activities, + * managing both manual user-initiated refactors and automatic refactors detected through + * metadata analysis. It maintains a collection of refactoring tools and handles the + * complete refactoring workflow from detection to user approval and application. + * + * @remarks + * Key responsibilities include: + * - Managing a registry of refactoring tools and their supported change types + * - Handling manual refactoring commands from tree view items and editor selections + * - Processing automatic refactoring proposals detected by metadata cache analysis + * - Preparing and merging workspace edits while avoiding duplicate modifications + * - Presenting changes to users through VS Code's built-in refactor preview UI + * - Coordinating file operations including text edits and file deletions + * + * The controller uses a change handler map to efficiently route different types of + * changes to their appropriate refactoring tools. It includes safeguards to prevent + * concurrent edit operations and provides comprehensive error handling throughout + * the refactoring process. + * + * @example + * ```typescript + * const tools = [new RenameActionTool(), new DeleteModelTool()]; + * const controller = new RefactorController(tools, metadataCache); + * + * // Handle manual refactor command + * await controller.handleManualRefactorCommand('rename-action', treeItem); + * + * // Process automatic refactors + * await controller.proposeAutomaticRefactors(detectedChanges); + * ``` + */ +export class RefactorController { + private tools: IRefactorTool[]; + private changeHandlerMap: Map = new Map(); + private isApplyingEdit = false; + + /** + * Initializes the RefactorController with a list of tools and a metadata cache. + * It sets up the change handler map to associate change types with their respective tools. + * @param tools An array of refactor tools that can handle different change types. + * @param cache The metadata cache used for finding nodes and managing context. + */ + constructor(tools: IRefactorTool[], private cache: MetadataCache) { + this.tools = tools; + for (const tool of this.tools) { + for (const type of tool.getHandledChangeTypes()) { + this.changeHandlerMap.set(type, tool); + } + } + } + + /** + * Handles manual refactoring commands triggered by user interaction. + * This method processes refactoring commands from various contexts including tree view items + * and editor selections. It validates the command, determines the appropriate refactoring context, + * executes the refactoring tool, and presents the changes for user approval. + * @param commandId - The identifier of the refactoring command to execute + * @param context - Optional context providing either a URI or AppTreeItem for the refactoring target. + * If not provided, uses the active text editor as the target. + * @returns A Promise that resolves when the refactoring operation is complete + * @remarks + * - Shows error message if the command ID is not recognized + * - For AppTreeItem context, uses the item's metadata for refactoring scope + * - For URI context or no context, uses the active editor's selection or cursor position + * - Presents changes for user approval before applying them + * - Shows information message if no changes are needed + */ + public async handleManualRefactorCommand(commandId: string, context?: vscode.Uri | AppTreeItem | ManualRefactorContext, decoratorName?: string) { + const tool = this.tools.find((t) => t.getCommandId() === commandId); + if (!tool) { + vscode.window.showErrorMessage(`Unknown refactoring command: ${commandId}`); + return; + } + + let refactorContext: ManualRefactorContext | undefined; + + if (context instanceof AppTreeItem) { + if (!context.metadata) { + vscode.window.showInformationMessage("No metadata found for the selected item."); + return; + } + refactorContext = { + cache: this.cache, + uri: context.metadata.declaration.uri, + range: context.metadata.declaration.range, + metadata: context.metadata, + }; + } else if (context instanceof vscode.Uri) { + const fileMeta = this.cache.getMetadataForFile(context.fsPath); + if (!fileMeta || (Object.keys(fileMeta.classes).length === 0 && Object.keys(fileMeta.dataSources).length === 0)) { + vscode.window.showInformationMessage("No class or data source found in the selected file to refactor."); + return; + } + + if (Object.keys(fileMeta.classes).length > 0) { + const targetClass = Object.values(fileMeta.classes)[0]; + refactorContext = { + cache: this.cache, + uri: context, + range: targetClass.declaration.range, + metadata: targetClass, + }; + } else { + const targetDataSource = Object.values(fileMeta.dataSources)[0]; + refactorContext = { + cache: this.cache, + uri: context, + range: targetDataSource.declaration.range, + metadata: targetDataSource, + }; + } + } else if (context && 'cache' in context && 'uri' in context) { + refactorContext = context as ManualRefactorContext; + } else { + const editor = vscode.window.activeTextEditor; + if (!editor) { + vscode.window.showInformationMessage("Cannot determine file for refactoring. Please open a file."); + return; + } + const position = editor.selection.active; + refactorContext = { + cache: this.cache, + uri: editor.document.uri, + range: new vscode.Range(position, position), + metadata: await findNodeAtPosition(editor.document.uri, position), + }; + } + + if (!refactorContext) { + vscode.window.showErrorMessage("Could not determine the context for refactoring."); + return; + } + const changeObject = await (tool as any).initiateManualRefactor(refactorContext, decoratorName); + if (changeObject) { + const workspaceEdit = await this.prepareWorkspaceEdit([changeObject]); + if (!workspaceEdit) { + return; + } + + const hasFileOps = ('urisToDelete' in changeObject.payload && (changeObject.payload as any).urisToDelete?.length > 0) || + ('newUri' in changeObject.payload && !!(changeObject.payload as any).newUri); + + if (workspaceEdit.size === 0 && !hasFileOps) { + vscode.window.showInformationMessage("No changes were needed for this refactoring."); + return; + } + await this.presentChangesForApproval(workspaceEdit, changeObject); + } + } + + /** + * Presents workspace changes to the user for approval and handles post-approval analysis. + * + * This method applies the workspace edit with confirmation metadata to ensure + * users must review and approve all changes before they are applied. + * Optionally runs AI analysis on the changes after user approval to help identify + * and fix potential errors. + * + * @param workspaceEdit - The VS Code WorkspaceEdit containing all file changes to be applied + * @param changeObject - The primary change object being processed + * @param allChanges - Optional array of all changes for automatic refactors with multiple operations + * + * @returns A Promise that resolves when the approval process and any follow-up analysis is complete + * + * @remarks + * - Creates a new workspace edit with confirmation metadata to trigger VS Code's review UI + * - All text edits are marked as needing confirmation before application + * - Includes file operations (deletions and renames) from the change payloads in the workspace edit + * - After successful application, saves all documents and optionally runs AI analysis + * - Uses a timeout to reset the `isApplyingEdit` flag to prevent race conditions + */ + private async presentChangesForApproval( + workspaceEdit: vscode.WorkspaceEdit, + changeObject: ChangeObject, + allChanges?: ChangeObject[] + ): Promise { + // Create a new workspace edit with confirmation metadata + const confirmedEdit = new vscode.WorkspaceEdit(); + const metadata: vscode.WorkspaceEditEntryMetadata = { + needsConfirmation: true, + label: "Review Refactoring Changes", + }; + + // Copy all text edits with confirmation metadata + for (const [uri, textEdits] of workspaceEdit.entries()) { + for (const edit of textEdits) { + confirmedEdit.replace(uri, edit.range, edit.newText, metadata); + } + } + + // Add file operations from change payloads to the workspace edit + const changesToProcess = allChanges || [changeObject]; + for (const change of changesToProcess) { + if (change.type === 'DELETE_MODEL') { + const deletePayload = change.payload as DeleteModelPayload; + if (Array.isArray(deletePayload.urisToDelete)) { + for (const uri of deletePayload.urisToDelete) { + confirmedEdit.deleteFile(uri, { recursive: true, ignoreIfNotExists: true }); + } + } + } + + if (change.type === 'RENAME_MODEL') { + const renamePayload = change.payload as RenameModelPayload; + if (renamePayload.newUri) { + confirmedEdit.renameFile(change.uri, renamePayload.newUri); + } + } + } + + this.isApplyingEdit = true; + try { + const success = await vscode.workspace.applyEdit(confirmedEdit); + if (success) { + await vscode.workspace.saveAll(false); + const changesToProcess = allChanges || [changeObject]; + // Check for compilation errors after applying changes + const changesWithPrompts = changesToProcess.filter(change => { + const tool = this.changeHandlerMap.get(change.type); + return tool?.executePrompt; + }); + + if (changesWithPrompts.length > 0) { + const modifiedUris = this.collectModifiedUris(workspaceEdit, changesToProcess); + + // this catches pre-existing and new errors added by the refactor + const hasErrors = await this.awaitAndCheckForErrors(modifiedUris); + + // Only prompt for AI analysis if errors are detected + if (hasErrors) { + const promptConfirmation = await vscode.window.showWarningMessage( + `Compilation errors were detected after applying the refactoring changes. Would you like to run AI analysis to help identify and fix these errors?`, + { modal: false }, + "Yes, Analyze Errors", + "No, Skip Analysis" + ); + + if (promptConfirmation === "Yes, Analyze Errors") { + // Execute custom prompts for the changes + for (const change of changesWithPrompts) { + const tool = this.changeHandlerMap.get(change.type); + if (tool?.executePrompt) { + try { + await tool.executePrompt(change); + } catch (error) { + console.error(`Error executing prompt for change ${change.type}:`, error); + vscode.window.showWarningMessage(`Failed to execute analysis for ${change.description}: ${error}`); + } + } + } + } + } + } + } else { + vscode.window.showInformationMessage("Refactoring was canceled by the user."); + } + } finally { + setTimeout(() => { + this.isApplyingEdit = false; + }, 500); + } + } + + /** + * Proposes automatic refactoring suggestions based on detected changes. + * + * This method analyzes the provided changes and prepares a workspace edit containing + * potential refactoring operations. If changes are detected, it prompts the user for + * permission to review the proposed refactors before applying them. + * + * @param changes - Array of change objects representing detected modifications that could benefit from refactoring + * @returns A promise that resolves when the refactoring proposal process is complete + * + * @remarks + * - Returns early if currently applying an edit or if no changes are provided + * - Only proceeds with user confirmation before presenting changes for review + * - Uses the first change object when presenting changes for approval + */ + public async proposeAutomaticRefactors(changes: ChangeObject[]): Promise { + if (this.isApplyingEdit || changes.length === 0) { + return; + } + + const workspaceEdit = await this.prepareWorkspaceEdit(changes); + if (workspaceEdit && workspaceEdit.size > 0) { + const confirmation = await vscode.window.showInformationMessage( + `The extension has detected ${changes.length} potential refactoring(s). Would you like to review them?`, + "Review Changes" + ); + + if (confirmation === "Review Changes") { + await this.presentChangesForApproval(workspaceEdit, changes[0], changes); + } + } + } + + /** + * Prepares a workspace edit by processing an array of change objects and merging their edits. + * + * This method iterates through the provided changes, uses the appropriate change handlers to generate + * text edits, and ensures no duplicate edits are applied to the same range. It also handles file + * deletions when specified in the change payload. + * + * @param changes - Array of change objects to be processed into workspace edits + * @returns A Promise that resolves to a WorkspaceEdit containing all merged changes, or undefined if an error occurs + * + * @remarks + * - Edits are deduplicated based on their exact range location (line and character positions) + * - File deletions are processed with recursive and ignoreIfNotExists options + * - If any change handler throws an error, an error message is shown and undefined is returned + * - The method uses a cache through PrepareEditContext for optimization + */ + private async prepareWorkspaceEdit(changes: ChangeObject[]): Promise { + const mergedEdit = new vscode.WorkspaceEdit(); + const modifiedRanges = new Set(); + const allUniqueEdits = new Map(); + + for (const change of changes) { + const tool = this.changeHandlerMap.get(change.type); + if (tool) { + try { + + const editFromTool = await tool.prepareEdit(change, this.cache); + for (const [uri, textEdits] of editFromTool.entries()) { + const uriString = uri.toString(); + const existingEdits = allUniqueEdits.get(uriString) || []; + + for (const edit of textEdits) { + const rangeId = `${uriString}::${edit.range.start.line}:${edit.range.start.character}-${edit.range.end.line}:${edit.range.end.character}`; + if (!modifiedRanges.has(rangeId)) { + modifiedRanges.add(rangeId); + existingEdits.push(edit); + } + } + // Note: modifiedRanges was not part of the original payload interface + // change.payload.modifiedRanges = Array.from(modifiedRanges); + + if (existingEdits.length > 0) { + allUniqueEdits.set(uriString, existingEdits); + } + + } + + if ('urisToDelete' in change.payload && Array.isArray((change.payload as any).urisToDelete)) { + for (const uri of (change.payload as any).urisToDelete) { + mergedEdit.deleteFile(uri, { recursive: true, ignoreIfNotExists: true }); + } + } + + if ('newUri' in change.payload && (change.payload as any).newUri) { + mergedEdit.renameFile(change.uri, (change.payload as any).newUri); + } + + } catch (error) { + vscode.window.showErrorMessage(`Error preparing refactor for '${change.description}': ${error}`); + return undefined; + } + } + } + + for (const [uriString, edits] of allUniqueEdits) { + mergedEdit.set(vscode.Uri.parse(uriString), edits); + } + return mergedEdit; + } + + /** + * Collects all file URIs that were modified during the refactoring operation. + * + * This method gathers URIs from both the workspace edit entries and the change objects + * to create a comprehensive list of files that should be checked for compilation errors. + * + * @param workspaceEdit - The workspace edit containing text modifications + * @param changes - Array of change objects that triggered the refactoring + * @returns A Set of unique URIs representing all modified files + */ + private collectModifiedUris(workspaceEdit: vscode.WorkspaceEdit, changes: ChangeObject[]): Set { + const modifiedUris = new Set(); + for (const [uri] of workspaceEdit.entries()) { + modifiedUris.add(uri); + } + for (const change of changes) { + modifiedUris.add(change.uri); + } + + return modifiedUris; + } + + /** + * Checks for compilation errors in the specified files. + * + * This method uses VS Code's diagnostic API to detect compilation errors + * in the provided file URIs. It's useful for determining whether a refactoring + * operation has introduced any syntax or type errors that need attention. + * + * @param uris - Set of file URIs to check for compilation errors + * @returns A Promise that resolves to true if any compilation errors are found, false otherwise + * + * @remarks + * - Only checks for diagnostics with Error severity level + * - Gracefully handles cases where diagnostics cannot be retrieved for a file + * - Returns false if all files are error-free or if no diagnostics can be obtained + */ + private async checkForCompilationErrors(uris: Set): Promise { + for (const uri of uris) { + try { + const diagnostics = vscode.languages.getDiagnostics(uri); + const errors = diagnostics.filter(d => d.severity === vscode.DiagnosticSeverity.Error); + if (errors.length > 0) { + return true; + } + } catch (error) { + // If we can't get diagnostics, we'll skip the error check for this file + console.warn(`Could not get diagnostics for ${uri.fsPath}:`, error); + } + } + return false; + } + + /** + * Awaits changes in diagnostics for the specified file URIs and checks for errors. + * @param uris Set of file URIs to monitor for diagnostic changes + * @returns A Promise that resolves to true if any errors are found, false otherwise + */ + private async awaitAndCheckForErrors(uris: Set): Promise { + return new Promise((resolve) => { + const targetUris = Array.from(uris).map(uri => uri.toString()); + let timeout: NodeJS.Timeout | undefined; + + const disposable = vscode.languages.onDidChangeDiagnostics(e => { + // Check if any of the updated files are the ones we're watching. + const changedUris = e.uris.map(uri => uri.toString()); + const hasRelevantChange = changedUris.some(uri => targetUris.includes(uri)); + + if (hasRelevantChange) { + disposable.dispose(); + if (timeout) clearTimeout(timeout); + + this.checkForCompilationErrors(uris).then(hasErrors => { + resolve(hasErrors); + }); + } + }); + + // Set a timeout as a safeguard. + timeout = setTimeout(() => { + disposable.dispose(); + console.warn("Timeout waiting for diagnostics to update."); + resolve(false); + }, 5000); + + // Initial check + this.checkForCompilationErrors(uris).then(hasErrors => { + if (hasErrors) { + disposable.dispose(); + if (timeout) clearTimeout(timeout); + resolve(true); + } + }); + }); +} + + /** + * Retrieves the list of available refactor tools. + * + * @returns An array of refactor tools that are currently registered with this controller. + */ + public getTools(): IRefactorTool[] { + return this.tools; + } +} diff --git a/vs-code-extension/src/refactor/refactorDisposables.ts b/vs-code-extension/src/refactor/refactorDisposables.ts new file mode 100644 index 0000000..afc1f3e --- /dev/null +++ b/vs-code-extension/src/refactor/refactorDisposables.ts @@ -0,0 +1,165 @@ +import * as vscode from 'vscode'; +import { RefactorController } from './RefactorController'; +import { IRefactorTool, ManualRefactorContext } from './refactorInterfaces'; +import { RenameModelTool } from './tools/renameModel'; +import { DeleteModelTool } from './tools/deleteModel'; +import { RenameFieldTool } from './tools/renameField'; +import { DeleteFieldTool } from './tools/deleteField'; +import { ChangeFieldTypeTool } from './tools/changeFieldType'; +import { findNodeAtPosition } from '../utils/ast'; +import { cache } from '../extension'; +import { AppTreeItem } from '../explorer/appTreeItem'; +import { AddDecoratorTool } from './tools/addDecorator'; +import { isField, isModelFile } from '../utils/metadata'; +import { PropertyMetadata } from '../cache/cache'; +import { fieldTypeConfig } from '../utils/fieldTypes'; +import { RenameDataSourceTool } from './tools/renameDataSource'; +import { DeleteDataSourceTool } from './tools/deleteDataSource'; + +/** + * Returns an array of all available refactor tools for the application. + * @remarks + * The order of tools in the returned array is significant, as some refactoring + * operations may have dependencies on or affect the behavior of others. + * @returns An array containing instances of all refactor tools including: + * - DeleteModelTool: Handles model deletion operations + * - RenameModelTool: Handles model renaming operations + * - RenameFieldTool: Handles field renaming operations + * - DeleteFieldTool: Handles field deletion operations + * - ChangeFieldTypeTool: Handles field type modification operations + * - AddDecoratorTool: Handles adding decorators to fields + * - RenameDataSourceTool: Handles data source renaming operations + * - DeleteDataSourceTool: Handles data source deletion operations + */ +export function getAllRefactorTools(): IRefactorTool[] { + return [ + new DeleteModelTool(), + new RenameModelTool(), + new RenameFieldTool(), + new DeleteFieldTool(), + new ChangeFieldTypeTool(), + new AddDecoratorTool(), + new RenameDataSourceTool(), + new DeleteDataSourceTool(), + ]; +} + + +/** + * Registers all refactor commands and code action providers for the VS Code extension. + * This function sets up the refactoring infrastructure by: + * - Registering individual commands for each refactor tool available in the controller + * - Setting up a CodeActionProvider to show refactoring options in the editor (lightbulb menu) + * - Configuring the provider to work with TypeScript files and provide refactor code actions + * @param controller - The refactor controller that manages refactor tools and handles command execution + * @returns An array of disposables that can be used to clean up the registered commands and providers + */ +export function registerRefactorCommands(controller: RefactorController, context: vscode.ExtensionContext): vscode.Disposable[] { + const disposables: vscode.Disposable[] = []; + + for (const tool of controller.getTools()) { + disposables.push( + vscode.commands.registerCommand(tool.getCommandId(), (context?: vscode.Uri | AppTreeItem | ManualRefactorContext, decoratorName?: string) => { + // The command can now be called with more complex arguments from CodeActions + if (context && 'cache' in context && 'uri' in context) { + controller.handleManualRefactorCommand(tool.getCommandId(), context, decoratorName); + } else { + controller.handleManualRefactorCommand(tool.getCommandId(), context); + } + }) + ); + } + + const allTools = controller.getTools(); + const codeActionProvider = new RefactorCodeActionProvider(allTools); + disposables.push( + vscode.languages.registerCodeActionsProvider( + { scheme: 'file', language: 'typescript' }, + codeActionProvider, + { providedCodeActionKinds: [vscode.CodeActionKind.Refactor] } + ) + ); + return disposables; +} + +/** + * Provides code actions for refactoring operations in VS Code. + * This class implements the VS Code CodeActionProvider interface to offer + * refactoring suggestions and actions to users. It evaluates available refactor + * tools against the current document context and presents applicable refactoring + * options in the code action menu. + */ +export class RefactorCodeActionProvider implements vscode.CodeActionProvider { + constructor(private tools: IRefactorTool[]) {} + + /** + * Provides code actions for refactoring operations at a specific location in the document. + * This method is called by VS Code when the user requests code actions (e.g., through the light bulb menu + * or quick fix context menu). It iterates through available refactoring tools and creates code actions + * for those that can handle manual triggers at the specified position. + * @param document - The text document for which code actions are requested + * @param range - The range or selection in the document where code actions are requested + * @param context - Additional context information about the code action request + * @param token - Cancellation token to cancel the operation if needed + * @returns Promise that resolves to an array of available code actions for refactoring + */ + public async provideCodeActions(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise { + const codeActions: vscode.CodeAction[] = []; + const position = range.start; + const metadata = await findNodeAtPosition(document.uri, position); + const refactorContext: ManualRefactorContext = { + cache, + uri: document.uri, + range: new vscode.Range(position, position), + metadata: metadata + }; + + for (const tool of this.tools) { + if (tool.getCommandId() === 'slingr-vscode-extension.addDecorator') { + continue; + } + if (await tool.canHandleManualTrigger(refactorContext)) { + const action = new vscode.CodeAction(tool.getTitle(), vscode.CodeActionKind.Refactor); + action.command = { + command: tool.getCommandId(), + title: tool.getTitle(), + arguments: [refactorContext] + }; + codeActions.push(action); + } + } + + // This block should only run if we are on a field. + if (isModelFile(document.uri) && metadata && isField(metadata)) { + const fieldMetadata = metadata as PropertyMetadata; + const existingDecorators = new Set(fieldMetadata.decorators.map(d => d.name)); + + // Suggest @Field() if not present + if (!existingDecorators.has('Field')) { + const action = new vscode.CodeAction('Add @Field Decorator', vscode.CodeActionKind.Refactor); + action.command = { + command: 'slingr-vscode-extension.addDecorator', + title: 'Add @Field Decorator', + arguments: [refactorContext, 'Field'] + }; + codeActions.push(action); + } + + // Suggest type-specific decorators based on fieldTypes.ts + const fieldTsType = fieldMetadata.type.toLowerCase(); + for (const decoratorName in fieldTypeConfig) { + const config = fieldTypeConfig[decoratorName]; + if (config.mapsFromTsTypes?.includes(fieldTsType) && !existingDecorators.has(decoratorName)) { + const action = new vscode.CodeAction(`Add @${decoratorName} Decorator`, vscode.CodeActionKind.Refactor); + action.command = { + command: 'slingr-vscode-extension.addDecorator', + title: `Add @${decoratorName} Decorator`, + arguments: [refactorContext, decoratorName] + }; + codeActions.push(action); + } + } + } + return codeActions; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/services/aiService.ts b/vs-code-extension/src/services/aiService.ts new file mode 100644 index 0000000..e9338f6 --- /dev/null +++ b/vs-code-extension/src/services/aiService.ts @@ -0,0 +1,494 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass } from "../cache/cache"; +import { FieldInfo } from "../commands/interfaces"; +import { AppTreeItem } from "../explorer/appTreeItem"; +import { fieldTypeConfig } from "../utils/fieldTypes"; +import { ApplicationContext, ModelContext } from "./projectAnalysisService"; +import { FileSystemService } from "./fileSystemService"; +import { ProjectAnalysisService } from "./projectAnalysisService"; + +export class AIService { + + private fileSystemService: FileSystemService; + private projectAnalysisService: ProjectAnalysisService; + + constructor() { + this.fileSystemService = new FileSystemService(); + this.projectAnalysisService = new ProjectAnalysisService(); + } + + public async createModelWithAI(cache: MetadataCache, context?: vscode.Uri | AppTreeItem): Promise { + const userInput = await vscode.window.showInputBox({ + prompt: "Describe the model you want to create", + placeHolder: "e.g., A customer model with name, email, and phone number.", + }); + if (!userInput) return; + + const appDescriptionPath = vscode.workspace.workspaceFolders?.[0].uri.fsPath + "/docs/app-description.md"; + let appDescription = "No application description found."; + try { + const appDescriptionContent = await vscode.workspace.fs.readFile(vscode.Uri.file(appDescriptionPath)); + appDescription = appDescriptionContent.toString(); + } catch (error) { + console.warn("Could not read app-description.md"); + } + + // Check if the command was triggered from a model node to create a composition + let parentModelInfo: { name: string; filePath: string } | null = null; + if (context) { + parentModelInfo = this.detectParentModel(context, cache); + } + + const prompt = this.generateCreateModelPrompt(userInput, appDescription, parentModelInfo); + await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + } + + public async modifyModelWithAI(cache: MetadataCache): Promise { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage("Please open a model file to modify."); + return; + } + + const document = activeEditor.document; + const content = document.getText(); + + if (!content.includes("@Model")) { + vscode.window.showErrorMessage("The current file does not appear to be a model file."); + return; + } + + const userInput = await vscode.window.showInputBox({ + prompt: "Describe the changes you want to make to this model", + placeHolder: "e.g., Add a 'lastName' field, make the 'email' field optional, and rename 'name' to 'firstName'.", + }); + + if (!userInput) { + return; + } + + const prompt = this.generateModifyModelPrompt(userInput, document.uri.fsPath, content); + await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + } + + public async defineFieldsWithAI( + fieldsDescription: string, + targetModelUri: vscode.Uri, + cache: MetadataCache, + modelName: string + ): Promise { + try { + // Step 1: Gather application context + const appContext = await this.projectAnalysisService.gatherApplicationContext(cache, targetModelUri); + + // Step 2: Analyze existing model context + const modelContext = await this.projectAnalysisService.analyzeModelContext(targetModelUri, modelName, cache); + + // Step 3: Build AI prompt with context + const prompt = this.generateDefineFieldsPrompt(fieldsDescription, appContext, modelContext); + + // Step 4: Request AI field generation + const action = await vscode.window.showInformationMessage( + "AI Field Generation: An AI prompt has been prepared. Do you want to execute it in the chat view?", + "Execute Prompt" + ); + + if (action === "Execute Prompt") { + await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + } + + vscode.window.showInformationMessage(`Fields successfully generated for ${modelName}!`); + } catch (error) { + vscode.window.showErrorMessage(`Failed to process field descriptions: ${error}`); + console.error("Error processing field descriptions:", error); + } + } + + public async createTestWithAI(modelClass: DecoratedClass): Promise { + try { + const prompt = this.generateCreateTestPrompt(modelClass); + + await vscode.commands.executeCommand("workbench.action.chat.open", { query: prompt }); + + vscode.window.showInformationMessage(`Test file for ${modelClass.name} created successfully!`); + } catch (error) { + vscode.window.showErrorMessage(`Failed to create test: ${error}`); + console.error("Error creating test:", error); + } + } + + // --- Private Prompt Generation Methods --- + + private generateCreateModelPrompt( + userInput: string, + appDescription: string, + parentModelInfo?: { name: string; filePath: string } | null + ): string { + let rawPrompt = ` +You are an expert in the Slingr framework. Your task is to create a new data model based on the user's request and the application's description. + +**User Request:** +"${userInput}" + +**Application Description:** +"${appDescription}" + +**Instructions:** +1. **Framework Usage:** You MUST use the Slingr framework. All models MUST extend \`BaseModel\` and use the \`@Model()\` and \`@Field()\` decorators. +2. **File Location:** The new model file should be placed in the \`/src/data\` directory. The filename should be the camelCase version of the model name (e.g., \`userProfile.ts\` for a \`UserProfile\` model). +3. **Model Naming:** The class name for the model should be in PascalCase. +4. **Field Types:** Use appropriate field types and decorators from the Slingr framework (e.g., \`@Text\`, \`@Email\`, \`@Integer\`, \`@Relationship\`). +5. **Relationships:** If the model references other existing models, make sure to import them and use the \`@Relationship\` decorator correctly. In the other way round, if other models reference this model, ensure to use the \`@Relationship\` decorator in those models as well. +6. **Code Only:** Provide only the TypeScript code for the new model file. Do not include any explanations or markdown formatting. + +**Example of a good response:** +\`\`\`typescript +import { Model, Field, Text, Email } from 'slingr-framework'; +import { BaseModel } from 'slingr-framework'; + +@Model() +export class Customer extends BaseModel { + @Field({ required: true }) + @Text({ maxLength: 50 }) + name!: string; + + @Field({ required: true }) + @Email() + email!: string; + + @Field() + @Text() + phoneNumber!: string; +} + \`\`\` + `; + if (parentModelInfo) { + rawPrompt += ` +**Parent Model Context:** +This new model will be used as a composition in the "${parentModelInfo.name}" model. + +**IMPORTANT:** After creating the new model, you MUST also add a composition relationship field to the "${parentModelInfo.name}" model (located at ${parentModelInfo.filePath}) that references this new model. The field should: +- Use the @Relationship decorator +- Have relationshipType: 'composition' +- Be named as a plural, camelCase version of the new model name +- Import the new model class + `; + } + const prompt = rawPrompt.replace(/^\s+/gm, ""); + return prompt; + } + + private generateModifyModelPrompt(userInput: string, filePath: string, fileContent: string): string { + return ` +You are an expert in the Slingr framework. Your task is to modify an existing data model based on the user's request. + +**User Request:** +"${userInput}" + +**File to Modify:** +\`${filePath}\` + +**Current File Content:** +\`\`\`typescript +${fileContent} +\`\`\` + +**Instructions:** +1. **Framework Usage:** You MUST use the Slingr framework and its decorators correctly. Data models are located in the \`/src/data\` directory. +2. **Apply Changes:** Apply the user's requested changes to the provided file content. +3. **Refactoring Tools:** For renames or other refactorings, it's better to use the built-in refactoring tools. For this task, you can simply apply the changes directly to the code. +4. **Code Only:** Provide only the complete, modified TypeScript code for the file. Do not include any explanations or markdown formatting. +`; + } + + private generateDefineFieldsPrompt( + fieldsDescription: string, + appContext: ApplicationContext, + modelContext: ModelContext + ): string { + const rawPrompt = ` +You are an expert TypeScript developer working on a model-driven application. +I need you to generate TypeScript field definitions based on a description. + +## CONTEXT + +### Target Model: ${modelContext.modelName} +File: ${modelContext.filePath} + +### Existing Fields in This Model: +${ + modelContext.existingFields.length > 0 + ? modelContext.existingFields + .map((f) => `- ${f.name}: ${f.type} (decorators: ${f.decorators.join(", ")})`) + .join("\n") + : "- No existing fields" +} + +### Available Field Types and Their Usage: +${appContext.availableFieldTypes + .map((type) => { + const config = fieldTypeConfig[type]; + const supportedArgs = config.supportedArgs?.map((arg) => `${arg.name}: ${arg.type}`).join(", "); + return `- @${type}(): ${config.requiredTsType || "various"} (args: ${supportedArgs || "none"})`; + }) + .join("\n")} + +### Existing Models in Application (for relationships): +${appContext.existingModels.map((m) => `- ${m.name} (${m.fields.length} fields)`).join("\n")} + +### Common Field Patterns in This Project: +${Array.from(appContext.commonFieldPatterns.entries()) + .sort((a, b) => b[1] - a[1]) + .slice(0, 10) + .map(([pattern, count]) => `- ${pattern} (used ${count} times)`) + .join("\n")} + +## TASK + +Generate TypeScript field definitions for the following description: +"${fieldsDescription}" + +## REQUIREMENTS + +1. Generate proper TypeScript property declarations with appropriate decorators +2. Use the most suitable decorator type based on the field description +3. Include proper TypeScript types that match the decorator requirements +4. For relationships, reference existing models when possible +5. For enums/choices, create enum definitions and use @Choice decorator +6. Include reasonable default parameters for decorators when appropriate +7. Add brief documentation comments for complex fields +8. Follow the existing code style and patterns from the project +9. Ensure no duplicate field names with existing fields in the model +10. Add any necessary relative import statements for used decorators and types. Imports for types should be from the folder: 'src/framework/shared/types' +11. Before adding a property in a decorator, check if the property is supported by that decorator type'. + +## OUTPUT FORMAT + +Return ONLY valid TypeScript code that can be inserted into the class body. Do not include: +- Class declaration +- Explanatory text + +Example output format: +\`\`\`typescript +@Field({ + required: true +}) +@Text() +title!: string; + +@Field({}) +@Text() +description!: string; + +@Field({}) +@Relationship() +customer!: Customer; + +@Field({}) +@Date() +date!: Date; + +@Field({}) +@Relationship({ + type: 'composition' +}) +project!: Project; + +@Field({}) +@Choice() +status: ProjectStatus = ProjectStatus.Planning; +\`\`\` + +Generate the fields now, write in the file: ${modelContext.filePath}. + `; + const prompt = rawPrompt.replace(/^\s+/gm, ""); + + return prompt; + } + + private generateCreateTestPrompt(modelClass: DecoratedClass): string { + const modelName = modelClass.name; + const fields = Object.values(modelClass.properties) + .map((prop) => { + return `- ${prop.name}: ${prop.type}`; + }) + .join("\n"); + + const rawPrompt = ` +You are an expert TypeScript developer specializing in testing with Jest. +I need you to generate a Jest test suite for the following data model. + +## CONTEXT + +### Target Model: ${modelName} + +### Model Fields: + +${fields} + +## TASK + +Generate a Jest test suite for the "${modelName}" model. + +## REQUIREMENTS + +1. **Use Jest:** The test suite must be written using the Jest testing framework. +2. **File Location:** The test file should be placed in a 'test/${modelName}' directory at the first level. +3. **File Naming:** The test file should be named '${this.toCamelCase(modelName)}.test.ts'. +4. **Test Coverage:** Include tests for: + * **Model Instantiation:** Test that the model can be instantiated correctly. + * **Field Validation:** For each field, add tests for validation rules (e.g., required fields, data types). + * **Relationships:** If there are relationships, test that they are handled correctly. + * **Default Values:** Test that default values are set as expected. + * **Edge Cases:** Include tests for edge cases and invalid data. +5. **Imports:** Add any necessary import statements for the model and other dependencies. + +## OUTPUT FORMAT + +Return ONLY valid TypeScript code for the test file. Do not include: +- Explanatory text or markdown formatting. + +Example output format: +\`\`\`typescript +import { ${modelName} } from '../${this.toCamelCase(modelName)}'; + +describe('${modelName}', () => { + it('should create an instance of ${modelName}', () => { + const instance = new ${modelName}(); + expect(instance).toBeInstanceOf(${modelName}); +}); + +// Add more tests here... +}); +\`\`\` + +Generate the test suite now: + `; + const prompt = rawPrompt.replace(/^\s+/gm, ""); + + return prompt; + } + + /** + * Detects if the command is being executed from a model context. + * Handles both AppTreeItem (app tree explorer) and vscode.Uri (file explorer) contexts. + * @param context - The context where the command was triggered (AppTreeItem or vscode.Uri) + * @param cache - The metadata cache for model lookup + * @returns Information about the parent model or null if not in a model context + */ + private detectParentModel( + context: AppTreeItem | vscode.Uri, + cache: MetadataCache + ): { name: string; filePath: string } | null { + if (context instanceof AppTreeItem) { + // Handle app tree explorer context + return this.detectParentModelFromTreeItem(context, cache); + } else { + // Handle file explorer context (vscode.Uri) + return this.detectParentModelFromFile(context, cache); + } + } + + /** + * Detects parent model from app tree item context. + * @param targetUri - The AppTreeItem where the command was triggered + * @param cache - The metadata cache for model lookup + * @returns Information about the parent model or null if not in a model context + */ + private detectParentModelFromTreeItem( + targetUri: AppTreeItem, + cache: MetadataCache + ): { name: string; filePath: string } | null { + // Check if the current item is a model or if we need to traverse up the tree + let currentItem: AppTreeItem | undefined = targetUri; + + while (currentItem) { + // Check if this item represents a model + if (currentItem.itemType === "model" && currentItem.metadata) { + // This is a model item, get its information + const modelMetadata = currentItem.metadata as any; + const modelName = modelMetadata.name || currentItem.label; + + // Try to find the file path for this model + const modelFilePath = this.findModelFilePath(modelName, cache); + + if (modelFilePath) { + return { + name: modelName, + filePath: modelFilePath, + }; + } + } + + // Move to parent item + currentItem = currentItem.parent; + } + + return null; + } + + /** + * Detects if the command is being executed from a file context (VS Code file explorer). + * @param fileUri - The file URI where the command was triggered + * @param cache - The metadata cache for model lookup + * @returns Information about the parent model or null if not triggered from a model file + */ + private detectParentModelFromFile( + fileUri: vscode.Uri, + cache: MetadataCache + ): { name: string; filePath: string } | null { + const filePath = fileUri.fsPath; + + // Check if this is a TypeScript file in the src/data directory (model file) + if (!filePath.endsWith(".ts") || (!filePath.includes("/src/data/") && !filePath.includes("\\src\\data\\"))) { + return null; + } + + // Get the file metadata from cache + const normalizedPath = filePath.replace(/\\/g, "/"); + const fileMetadata = cache.getMetadataForFile(normalizedPath); + + if (!fileMetadata) { + return null; + } + + // Look for a class with @Model decorator in this file + for (const classData of Object.values(fileMetadata.classes)) { + if (classData.isDataModel && classData.decorators.some((d) => d.name === "Model")) { + return { + name: classData.name, + filePath: filePath, + }; + } + } + + return null; + } + + /** + * Finds the file path for a given model name in the cache. + * @param modelName - The name of the model to find + * @param cache - The metadata cache + * @returns The file path of the model or null if not found + */ + private findModelFilePath(modelName: string, cache: MetadataCache): string | null { + // Get all data models and find the one we're looking for + const modelClasses = cache.getDataModelClasses(); + const targetModel = modelClasses.find((model) => model.name === modelName); + + if (!targetModel) { + return null; + } + + // Get the model's declaration location to determine the file path + if (targetModel.declaration && targetModel.declaration.uri) { + return targetModel.declaration.uri.fsPath; + } + + return null; + } + + public toCamelCase(str: string): string { + return str.charAt(0).toLowerCase() + str.slice(1); + } +} diff --git a/vs-code-extension/src/test/cache.test.ts b/vs-code-extension/src/test/cache.test.ts new file mode 100644 index 0000000..b8e163c --- /dev/null +++ b/vs-code-extension/src/test/cache.test.ts @@ -0,0 +1,99 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import { before, after, describe, it } from 'mocha'; +import { MetadataCache } from '../cache/cache'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof describe !== 'undefined') { +describe('MetadataCache Tests', () => { + let cache: MetadataCache; + let extensionPath: string; + + before(() => { + extensionPath = path.join(__dirname, '..', '..'); + cache = new MetadataCache(extensionPath); + }); + + after(() => { + cache?.dispose(); + }); + + describe('Cache Initialization', () => { + it('should initialize without errors', async function() { + this.timeout(10000); // Cache initialization might take time + + try { + await cache.initialize(); + assert.ok(true, 'Cache should initialize successfully'); + } catch (error) { + assert.fail(`Cache initialization failed: ${error}`); + } + }); + + it('should have getDataModels method', () => { + assert.ok(typeof cache.getDataModels === 'function'); + }); + + it('should have getDataModelClasses method', () => { + assert.ok(typeof cache.getDataModelClasses === 'function'); + }); + }); + + describe('Data Model Methods', () => { + it('should return array from getDataModels', () => { + const models = cache.getDataModels(); + assert.ok(Array.isArray(models), 'getDataModels should return an array'); + }); + + it('should return array from getDataModelClasses', () => { + const models = cache.getDataModelClasses(); + assert.ok(Array.isArray(models), 'getDataModelClasses should return an array'); + }); + + it('should have isDataModel flag on models', () => { + const models = cache.getDataModels(); + models.forEach((model: any) => { + assert.strictEqual(model.isDataModel, true, 'All data models should have isDataModel = true'); + }); + }); + + it('should only return Model decorated classes from getDataModelClasses', () => { + const models = cache.getDataModelClasses(); + models.forEach((model: any) => { + const hasModelDecorator = model.decorators.some((d: any) => d.name === 'Model'); + assert.ok(hasModelDecorator, 'All items from getDataModelClasses should have @Model decorator'); + }); + }); + }); + + describe('Event Handling', () => { + it('should have onDidUpdate event', () => { + assert.ok(cache.onDidUpdate, 'Cache should have onDidUpdate event'); + assert.ok(typeof cache.onDidUpdate === 'function' || typeof cache.onDidUpdate === 'object'); + }); + }); + + describe('findMetadata Method', () => { + it('should find models with Model decorator', () => { + const models = cache.findMetadata(item => + 'decorators' in item && + Array.isArray(item.decorators) && + item.decorators.some(d => d.name === 'Model') + ); + + assert.ok(Array.isArray(models), 'findMetadata should return an array'); + }); + + it('should find fields with Field decorator', () => { + const fields = cache.findMetadata(item => + 'decorators' in item && + Array.isArray(item.decorators) && + item.decorators.some(d => d.name === 'Field') + ); + + assert.ok(Array.isArray(fields), 'findMetadata should return an array for fields'); + }); + }); +}); +} diff --git a/vs-code-extension/src/test/explorer.test.ts b/vs-code-extension/src/test/explorer.test.ts new file mode 100644 index 0000000..968adfc --- /dev/null +++ b/vs-code-extension/src/test/explorer.test.ts @@ -0,0 +1,474 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import { before, after, describe, it } from 'mocha'; +import { ExplorerProvider } from '../explorer/explorerProvider'; +import { MetadataCache, DecoratedClass, PropertyMetadata, DecoratorMetadata } from '../cache/cache'; +import { AppTreeItem } from '../explorer/appTreeItem'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof describe !== 'undefined') { +describe('Explorer Provider Tests', () => { + let explorerProvider: ExplorerProvider; + let mockCache: MetadataCache; + let extensionUri: vscode.Uri; + + before(async () => { + // Setup test environment + extensionUri = vscode.Uri.file(path.join(__dirname, '..', '..')); + + // Create a mock cache or use a test workspace + // For now, we'll create a minimal mock + mockCache = createMockCache(); + explorerProvider = new ExplorerProvider(mockCache, extensionUri); + }); + + describe('Root Level Items', () => { + it('should return Data root item when no element is provided', async () => { + const children = await explorerProvider.getChildren(); + + assert.strictEqual(children.length, 1); + assert.strictEqual(children[0].label, 'Data'); + assert.strictEqual(children[0].itemType, 'dataRoot'); + assert.strictEqual(children[0].collapsibleState, vscode.TreeItemCollapsibleState.Expanded); + }); + }); + + describe('Data Root Children', () => { + it('should return models from data folder when dataRoot is expanded', async () => { + const dataRootItem = new AppTreeItem( + 'Data', + vscode.TreeItemCollapsibleState.Expanded, + 'dataRoot', + extensionUri + ); + + const children = await explorerProvider.getChildren(dataRootItem); + + // Should return the mock models (sorted alphabetically by label) + assert.strictEqual(children.length, 2); + assert.strictEqual(children[0].label, 'ProjectModel'); // alphabetically first + assert.strictEqual(children[0].itemType, 'model'); + assert.strictEqual(children[1].label, 'User Model'); // alphabetically second + assert.strictEqual(children[1].itemType, 'model'); + }); + + it('should return empty array when no data models exist', async () => { + const emptyCache = createEmptyMockCache(); + const emptyExplorerProvider = new ExplorerProvider(emptyCache, extensionUri); + + const dataRootItem = new AppTreeItem( + 'Data', + vscode.TreeItemCollapsibleState.Expanded, + 'dataRoot', + extensionUri + ); + + const children = await emptyExplorerProvider.getChildren(dataRootItem); + assert.strictEqual(children.length, 0); + }); + + it('should display folders when models are in subfolders', async () => { + const cacheWithFolders = createMockCacheWithFolders(); + const folderExplorerProvider = new ExplorerProvider(cacheWithFolders, extensionUri); + + const dataRootItem = new AppTreeItem( + 'Data', + vscode.TreeItemCollapsibleState.Expanded, + 'dataRoot', + extensionUri + ); + + const children = await folderExplorerProvider.getChildren(dataRootItem); + + // Should have 1 model in root and 1 folder + assert.strictEqual(children.length, 2); + + // First should be the folder (alphabetically) + assert.strictEqual(children[0].label, 'models'); + assert.strictEqual(children[0].itemType, 'folder'); + + // Second should be the model + assert.strictEqual(children[1].label, 'Root Model'); + assert.strictEqual(children[1].itemType, 'model'); + }); + + it('should display models inside folders when folder is expanded', async () => { + const cacheWithFolders = createMockCacheWithFolders(); + const folderExplorerProvider = new ExplorerProvider(cacheWithFolders, extensionUri); + + // Create folder item + const folderItem = new AppTreeItem( + 'models', + vscode.TreeItemCollapsibleState.Collapsed, + 'folder', + extensionUri, + undefined, + undefined, + 'models' + ); + + const children = await folderExplorerProvider.getChildren(folderItem); + + // Should have 1 model in the models folder + assert.strictEqual(children.length, 1); + assert.strictEqual(children[0].label, 'Folder Model'); + assert.strictEqual(children[0].itemType, 'model'); + }); + }); + + describe('Model Children', () => { + it('should return fields when model is expanded', async () => { + const mockModel = createMockModel(); + const modelItem = new AppTreeItem( + 'User Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModel + ); + + const children = await explorerProvider.getChildren(modelItem); + + assert.strictEqual(children.length, 2); + assert.strictEqual(children[0].itemType, 'field'); + assert.strictEqual(children[1].itemType, 'field'); + }); + + it('should return empty array when model has no fields', async () => { + const mockModelNoFields = createMockModelWithoutFields(); + const modelItem = new AppTreeItem( + 'Empty Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModelNoFields + ); + + const children = await explorerProvider.getChildren(modelItem); + assert.strictEqual(children.length, 0); + }); + }); + + describe('Tree Item Properties', () => { + it('should create tree item with correct properties', () => { + const mockModel = createMockModel(); + const treeItem = explorerProvider.getTreeItem( + new AppTreeItem( + 'Test Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModel + ) + ); + + assert.strictEqual(treeItem.label, 'Test Model'); + assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed); + assert.strictEqual(treeItem.contextValue, 'model'); + }); + + it('should set click handler command for property items', async () => { + const mockModel = createMockModel(); + const modelItem = new AppTreeItem( + 'User Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModel + ); + + const children = await explorerProvider.getChildren(modelItem); + const fieldItem = children[0]; + + // Command should be set for click handling (single vs double-click detection) + assert.ok(fieldItem.command); + assert.strictEqual(fieldItem.command.command, 'slingr-vscode-extension.handleTreeItemClick'); + assert.strictEqual(fieldItem.command.title, 'Handle Click'); + }); + }); + + describe('Drag and Drop', () => { + it('should handle drag operation for field items', () => { + const mockProperty = createMockProperty('testField'); + const mockModel = createMockModel(); + const parentItem = new AppTreeItem( + 'User Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModel + ); + + const fieldItem = new AppTreeItem( + 'Test Field', + vscode.TreeItemCollapsibleState.None, + 'field', + extensionUri, + mockProperty, + parentItem + ); + + const dataTransfer = new vscode.DataTransfer(); + const token = new vscode.CancellationTokenSource().token; + + // This should not throw an error + explorerProvider.handleDrag([fieldItem], dataTransfer, token); + + // Check if data was set (requires checking the MIME type) + const transferItem = dataTransfer.get('application/vnd.slingr-vscode-extension.field'); + assert.ok(transferItem, 'Drag data should be set'); + }); + + it('should not handle drag for non-field items', () => { + const mockModel = createMockModel(); + const modelItem = new AppTreeItem( + 'User Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + mockModel + ); + + const dataTransfer = new vscode.DataTransfer(); + const token = new vscode.CancellationTokenSource().token; + + explorerProvider.handleDrag([modelItem], dataTransfer, token); + + // Should not set any data for non-field items + const transferItem = dataTransfer.get('application/vnd.slingr-vscode-extension.field'); + assert.strictEqual(transferItem, undefined); + }); + + it('should handle drag operation for composition model items', () => { + const childModel = createMockModel('ChildModel', 'Child Model', '/test/project/src/data/child-model.ts'); + const parentModel = createMockModel('ParentModel', 'Parent Model', '/test/project/src/data/parent-model.ts'); + + // Add a composition relationship property to the parent model + parentModel.properties['children'] = { + name: 'children', + type: 'ChildModel', + decorators: [ + { + name: 'Field', + arguments: [{ label: 'Children' }], + position: new vscode.Range(0, 0, 0, 10) + }, + { + name: 'Relationship', + arguments: [{ type: 'Composition' }], + position: new vscode.Range(0, 0, 0, 10) + } + ], + references: [], + declaration: new vscode.Location( + vscode.Uri.file('/test/project/src/data/parent-model.ts'), + new vscode.Range(5, 0, 5, 10) + ) + }; + + const parentItem = new AppTreeItem( + 'Parent Model', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + parentModel + ); + + const compositionItem = new AppTreeItem( + 'Children', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + childModel, + parentItem + ); + + const dataTransfer = new vscode.DataTransfer(); + const token = new vscode.CancellationTokenSource().token; + + // This should handle drag for composition model items + explorerProvider.handleDrag([compositionItem], dataTransfer, token); + + const transferItem = dataTransfer.get('application/vnd.slingr-vscode-extension.field'); + assert.ok(transferItem, 'Drag data should be set for composition model items'); + + const dragData = transferItem.value; + assert.strictEqual(dragData.field, 'children', 'Should drag the composition field name'); + assert.strictEqual(dragData.modelClassName, 'ParentModel', 'Should reference the parent model class'); + }); + }); +}); + +// Helper functions to create mock data +function createMockCache(): MetadataCache { + const mockCache = { + getDataModelClasses: () => [ + createMockModel('UserModel', 'User Model'), + createMockModel('ProjectModel', 'ProjectModel') + ], + getDataModels: () => [ + createMockModel('UserModel', 'User Model'), + createMockModel('ProjectModel', 'ProjectModel') + ], + onDidUpdate: new vscode.EventEmitter().event, + _onDidUpdate: new vscode.EventEmitter(), + getMetadataForFile: () => undefined + } as any; + + return mockCache; +} + +function createEmptyMockCache(): MetadataCache { + const mockCache = { + getDataModelClasses: () => [], + getDataModels: () => [], + onDidUpdate: new vscode.EventEmitter().event, + _onDidUpdate: new vscode.EventEmitter(), + getMetadataForFile: () => undefined + } as any; + + return mockCache; +} + +function createMockCacheWithFolders(): MetadataCache { + const mockCache = { + getDataModelClasses: () => [ + createMockModel('RootModel', 'Root Model', '/test/project/src/data/root-model.ts'), + createMockModel('FolderModel', 'Folder Model', '/test/project/src/data/models/folder-model.ts') + ], + getDataModels: () => [ + createMockModel('RootModel', 'Root Model', '/test/project/src/data/root-model.ts'), + createMockModel('FolderModel', 'Folder Model', '/test/project/src/data/models/folder-model.ts') + ], + onDidUpdate: new vscode.EventEmitter().event, + _onDidUpdate: new vscode.EventEmitter(), + getMetadataForFile: () => undefined + } as any; + + return mockCache; +} + +function createMockCacheWithComposition(): MetadataCache { + // Create child model that will be referenced by composition + const childModel = createMockModel('ChildModel', 'Child Model', '/test/project/src/data/child-model.ts'); + + // Create parent model with composition relationship to child + const parentModel = createMockModel('ParentModel', 'Parent Model', '/test/project/src/data/parent-model.ts'); + + // Add composition relationship field to parent model + parentModel.properties['child'] = { + name: 'child', + type: 'ChildModel', + decorators: [ + { + name: 'Field', + arguments: [{ label: 'Child' }], + position: new vscode.Range(0, 0, 0, 10) + }, + { + name: 'Relationship', + arguments: [{ type: 'Composition' }], + position: new vscode.Range(0, 0, 0, 10) + } + ], + references: [], + declaration: new vscode.Location( + vscode.Uri.file('/test/project/src/data/parent-model.ts'), + new vscode.Range(5, 0, 5, 10) + ) + }; + + // Add reference from parent to child model + childModel.references = [ + new vscode.Location( + vscode.Uri.file('/test/project/src/data/parent-model.ts'), + new vscode.Range(5, 0, 5, 10) + ) + ]; + + const mockCache = { + getDataModelClasses: () => [parentModel, childModel], + getDataModels: () => [parentModel, childModel], + onDidUpdate: new vscode.EventEmitter().event, + _onDidUpdate: new vscode.EventEmitter(), + getMetadataForFile: (filePath: string) => { + if (filePath === '/test/project/src/data/parent-model.ts') { + return { + uri: vscode.Uri.file(filePath), + classes: { + 'ParentModel': parentModel + } + }; + } + return undefined; + } + } as any; + + return mockCache; +} + +function createMockModel(name: string = 'UserModel', label?: string, filePath: string = '/test/project/src/data/model.ts'): DecoratedClass { + return { + name, + decorators: [ + { + name: 'Model', + arguments: [{ label: label || name }], + position: new vscode.Range(0, 0, 0, 10) + } + ], + properties: { + 'name': createMockProperty('name', 'User Name'), + 'email': createMockProperty('email', 'emailField') + }, + methods: {}, + references: [], + declaration: new vscode.Location( + vscode.Uri.file(filePath), + new vscode.Range(0, 0, 0, 10) + ), + isDataModel: true + }; +} + +function createMockModelWithoutFields(): DecoratedClass { + return { + name: 'EmptyModel', + decorators: [ + { + name: 'Model', + arguments: [{ label: 'Empty Model' }], + position: new vscode.Range(0, 0, 0, 10) + } + ], + properties: {}, + methods: {}, + references: [], + declaration: new vscode.Location( + vscode.Uri.file('/test/project/src/data/empty-model.ts'), + new vscode.Range(0, 0, 0, 10) + ), + isDataModel: true + }; +} + +function createMockProperty(name: string, label?: string, filePath: string = '/test/project/src/data/model.ts'): PropertyMetadata { + return { + name, + type: 'string', + decorators: [ + { + name: 'Field', + arguments: [{ label: label || name }], + position: new vscode.Range(0, 0, 0, 10) + } + ], + references: [], + declaration: new vscode.Location( + vscode.Uri.file(filePath), + new vscode.Range(5, 0, 5, 10) + ) + }; +} +} diff --git a/vs-code-extension/src/test/extension.test.ts b/vs-code-extension/src/test/extension.test.ts new file mode 100644 index 0000000..c712201 --- /dev/null +++ b/vs-code-extension/src/test/extension.test.ts @@ -0,0 +1,18 @@ +import * as assert from 'assert'; + +// You can import and use all API from the 'vscode' module +// as well as import your extension to test it +import * as vscode from 'vscode'; +// import * as myExtension from '../../extension'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('Extension Test Suite', () => { + vscode.window.showInformationMessage('Start all tests.'); + + test('Sample test', () => { + assert.strictEqual(-1, [1, 2, 3].indexOf(5)); + assert.strictEqual(-1, [1, 2, 3].indexOf(0)); + }); + }); +} diff --git a/vs-code-extension/src/tools/sqlToolsIntegration.ts b/vs-code-extension/src/tools/sqlToolsIntegration.ts new file mode 100644 index 0000000..972524d --- /dev/null +++ b/vs-code-extension/src/tools/sqlToolsIntegration.ts @@ -0,0 +1,180 @@ +import * as vscode from 'vscode'; +import { CacheUpdateEvent, DataSourceMetadata, MetadataCache } from '../cache/cache'; + +/** + * SQLTools connection configuration interface + */ +interface SQLToolsConnection { + name: string; + driver: string; + server?: string; + port?: number; + database?: string; + username?: string; + password?: string; + connectionTimeout?: number; +} + +// Maps TypeORM dialect names to SQLTools driver names +const driverMap: { [key: string]: string } = { + 'postgres': 'PostgreSQL', + 'mysql': 'MySQL', + 'mariadb': 'MariaDB', +}; + +// Map of TypeORM dialect to the required VS Code extension ID for the driver +const driverExtensionMap: { [key: string]: string } = { + 'postgres': 'mtxr.sqltools-driver-pg', + 'mysql': 'mtxr.sqltools-driver-mysql', + 'mariadb': 'mtxr.sqltools-driver-mariadb', +}; + +/** + * Validates if a data source has the minimum required configuration for SQLTools + */ +function isValidDataSource(ds: DataSourceMetadata): boolean { + return !!(ds.options.type && (ds.options.host || ds.options.server)); +} + +/** + * Sanitizes a string value, returning undefined if empty or invalid + */ +function sanitizeString(value: string | undefined): string | undefined { + if (value && value.trim()) { + return value.trim(); + } + return undefined; +} + +/** + * Sanitizes a numeric value, returning undefined if invalid + */ +function sanitizeNumber(value: number | string | undefined): number | undefined { + if (typeof value === 'number' && value > 0) { + return value; + } + if (typeof value === 'string') { + const parsed = parseInt(value, 10); + if (!isNaN(parsed) && parsed > 0) { + return parsed; + } + } + return undefined; +} + +/** + * Updates the SQLTools configuration with the provided data sources. + * Filters out invalid data sources and sanitizes configuration values to prevent + * SQLTools connection issues with empty or inconsistent values. + * @param sqlDataSources Array of SQL data source metadata + * @returns Promise that resolves when the configuration is updated + */ +async function updateSqlToolsConfig(sqlDataSources: DataSourceMetadata[]): Promise { + if (sqlDataSources.length === 0) { + return; + } + const sqlToolsExtension = vscode.extensions.getExtension('mtxr.sqltools'); + if (!sqlToolsExtension) { + const selection = await vscode.window.showInformationMessage( + 'The SQLTools extension is recommended for Slingr projects with SQL data sources. Would you like to install it?', + 'Install', + 'Ignore' + ); + if (selection === 'Install') { + await vscode.commands.executeCommand('workbench.extensions.installExtension', 'mtxr.sqltools'); + } + } + + // Check for required drivers + const requiredButNotInstalledDrivers = new Set(); + for (const ds of sqlDataSources) { + const driverId = driverExtensionMap[ds.options.type]; + if (driverId && !vscode.extensions.getExtension(driverId)) { + requiredButNotInstalledDrivers.add(driverId); + } + } + + // Prompt to install each missing driver + for (const driverId of requiredButNotInstalledDrivers) { + const driverName = driverId.split('-').pop()?.toUpperCase() || 'Driver'; + const selection = await vscode.window.showInformationMessage( + `The SQLTools Driver for ${driverName} is required to connect to your data source. Would you like to install it?`, + 'Install', + 'Ignore' + ); + if (selection === 'Install') { + await vscode.commands.executeCommand('workbench.extensions.installExtension', driverId); + } + } + + const newSlingrConnections: SQLToolsConnection[] = sqlDataSources + .filter(isValidDataSource) + .map(ds => { + const driver = driverMap[ds.options.type] || ds.options.type; + const connection: SQLToolsConnection = { + name: `Slingr: ${ds.name}`, + driver: driver, + }; + + // Handle server/host variations - server is required for SQLTools + connection.server = sanitizeString(ds.options.host || ds.options.server) || 'localhost'; + + // Add optional properties only if they have valid values + const port = sanitizeNumber(ds.options.port); + if (port) { + connection.port = port; + } + + const database = sanitizeString(ds.options.database); + if (database) { + connection.database = database; + } + + const username = sanitizeString(ds.options.username); + if (username) { + connection.username = username; + } + + const password = sanitizeString(ds.options.password); + if (password) { + connection.password = password; + } + + const connectionTimeout = sanitizeNumber(ds.options.connectionTimeout); + if (connectionTimeout) { + connection.connectionTimeout = connectionTimeout; + } + + return connection; + }); + + const config = vscode.workspace.getConfiguration(); + const existingConnections = config.get('sqltools.connections') || []; + const userConnections = existingConnections.filter(c => !c.name.startsWith('Slingr:')); + const finalConnections = [...userConnections, ...newSlingrConnections]; + await config.update('sqltools.connections', finalConnections, vscode.ConfigurationTarget.Workspace); +} + + +/** + * Sets up the listener for data source changes to keep SQLTools config in sync. + * @param context The extension context. + * @param cache The metadata cache. + */ +export function setupSqlToolsIntegration(context: vscode.ExtensionContext, cache: MetadataCache) { + const disposable = cache.onDidUpdate((event: CacheUpdateEvent) => { + // Only act when the infrastructure update has successfully completed + if (event.type === 'dataSource') { + // The rest of the logic is the same! + const allSqlDataSources = cache.getSqlDataSources(); + updateSqlToolsConfig(allSqlDataSources); + } + }); + context.subscriptions.push(disposable); + + // Initial sync on activation + const initialSqlDataSources = cache.getSqlDataSources(); + if (initialSqlDataSources.length > 0) { + updateSqlToolsConfig(initialSqlDataSources); + } +} \ No newline at end of file diff --git a/vs-code-extension/src/utils/ast.ts b/vs-code-extension/src/utils/ast.ts new file mode 100644 index 0000000..71650b1 --- /dev/null +++ b/vs-code-extension/src/utils/ast.ts @@ -0,0 +1,29 @@ +import * as vscode from 'vscode'; +import { cache } from '../extension'; +import { DecoratedClass, PropertyMetadata } from '../cache/cache'; + +/** + * Finds the metadata for a class or property at a specific position in a document. + * @param uri The URI of the document. + * @param position The position in the document. + * @returns The found metadata or undefined. + */ +export async function findNodeAtPosition(uri: vscode.Uri, position: vscode.Position): Promise { + const fileCache = cache.findMetadata(m => m.declaration.uri.fsPath === uri.fsPath); + + // Search for properties first, as they are more specific + const property = fileCache.find(m => + 'type' in m && m.declaration.range.contains(position) + ) as PropertyMetadata | undefined; + + if (property) { + return property; + } + + // If no property is found, search for a class + const classInfo = fileCache.find(m => + 'decorators' in m && !('type' in m) && m.declaration.range.contains(position) + ) as DecoratedClass | undefined; + + return classInfo; +} diff --git a/vs-code-extension/src/utils/detectIndentation.ts b/vs-code-extension/src/utils/detectIndentation.ts new file mode 100644 index 0000000..eb9a8fd --- /dev/null +++ b/vs-code-extension/src/utils/detectIndentation.ts @@ -0,0 +1,84 @@ +/** + * Detects the indentation pattern used in existing field declarations within the class. + * Analyzes 2-3 field declarations to determine if spaces or tabs are used and how many. + */ +export function detectIndentation(lines: string[], classStartLine: number, classEndLine: number): string { + const fieldIndentations: string[] = []; + + // Look for existing field declarations (lines with @Field or property declarations) + for (let i = classStartLine + 1; i < classEndLine; i++) { + const line = lines[i]; + + // Skip empty lines and comments + if (!line.trim() || line.trim().startsWith("//") || line.trim().startsWith("*")) { + continue; + } + + // Look for decorator lines (@Field, @Text, etc.) or property declarations + if (line.includes("@") || (line.includes(":") && line.includes(";"))) { + // Extract the leading whitespace + const match = line.match(/^(\s*)/); + if (match && match[1]) { + fieldIndentations.push(match[1]); + + // Stop after collecting 3 samples for consistency + if (fieldIndentations.length >= 3) { + break; + } + } + } + } + + // If no existing fields found, detect class-level indentation and add one level + if (fieldIndentations.length === 0) { + const classLine = lines[classStartLine]; + const classIndentMatch = classLine.match(/^(\s*)/); + const classIndent = classIndentMatch ? classIndentMatch[1] : ""; + + // Determine if the project uses tabs or spaces + if (classIndent.includes("\t")) { + return classIndent + "\t"; + } else { + // Default to 4 spaces if no pattern detected + const spaceCount = classIndent.length + 4; + return " ".repeat(spaceCount); + } + } + + // Analyze the collected indentations to find the most common pattern + const indentationCounts = new Map(); + fieldIndentations.forEach((indent) => { + const count = indentationCounts.get(indent) || 0; + indentationCounts.set(indent, count + 1); + }); + + // Return the most frequently used indentation + let mostCommonIndent = ""; + let maxCount = 0; + for (const [indent, count] of indentationCounts) { + if (count > maxCount) { + maxCount = count; + mostCommonIndent = indent; + } + } + + return mostCommonIndent || " "; // Default to 4 spaces if nothing detected +} + +/** + * Applies the detected indentation to the field code. + */ +export function applyIndentation(fieldCode: string, indentation: string): string { + const lines = fieldCode.split("\n"); + const indentedLines = lines.map((line) => { + // Skip empty lines + if (!line.trim()) { + return line; + } + + // Apply the base indentation while preserving any existing nested indentation + return indentation + line; + }); + + return indentedLines.join("\n"); +} diff --git a/vs-code-extension/src/utils/fieldTypes.ts b/vs-code-extension/src/utils/fieldTypes.ts new file mode 100644 index 0000000..198c22a --- /dev/null +++ b/vs-code-extension/src/utils/fieldTypes.ts @@ -0,0 +1,164 @@ +/** + * Defines a supported argument for a field decorator. + */ +export interface DecoratorArgument { + name: string; + type: 'string' | 'number' | 'boolean' | 'object' | 'enum'; +} + +/** + * Configuration object that defines how field types are handled in decorators. + * + * This interface provides the mapping and generation logic for converting between + * TypeScript types and their corresponding field decorators. + * + * @interface FieldTypeConfig + * + * @property {string} [requiredTsType] - The TypeScript type that this decorator requires. + * For example, a Text decorator might require 'string', while a Number decorator requires 'number'. + * + * @property {string[]} [mapsFromTsTypes] - An array of TypeScript types that can be automatically + * mapped to this decorator. For instance, 'string' type might suggest using a 'Text' decorator. + * + * @property {function} buildDecoratorString - A function that generates the actual decorator + * string based on the field metadata and new type. This allows for complex decorator generation + * that may include additional parameters or custom formatting. + */ +export interface FieldTypeConfig { + requiredTsType?: string; + + mapsFromTsTypes?: string[]; + + supportedArgs: DecoratorArgument[] | undefined; + + buildDecoratorString: (newTypeName: string, transferredArgs: Map) => string; +} + +// A generic function to build the decorator string +function genericBuildDecoratorString(newTypeName: string, transferredArgs: Map): string { + if (transferredArgs.size === 0) { + return `@${newTypeName}()`; + } + + const argsString = Array.from(transferredArgs.entries()) + .map(([key, value]) => { + let formattedValue: string; + if (typeof value === 'string') { + formattedValue = `'${value}'`; + } else { + formattedValue = String(value); + } + return `\n ${key}: ${formattedValue}`; + }) + .join(','); + + return `@${newTypeName}({${argsString}\n})`; +} + +export const fieldTypeConfig: Record = { + // --- String-based Types --- + 'Text': { + requiredTsType: 'string', + mapsFromTsTypes: ['string'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + { name: 'maxLength', type: 'number' }, + { name: 'minLength', type: 'number' }, + { name: 'regex', type: 'string' }, + { name: 'regexMessage', type: 'string' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'LongText': { + requiredTsType: 'string', + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Email': { + requiredTsType: 'string', + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Html': { + requiredTsType: 'string', + supportedArgs: [ + { name: 'docs', type: 'string' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + + // --- Number-based Types --- + 'Integer': { + requiredTsType: 'number', + mapsFromTsTypes: ['number'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'isUnique', type: 'boolean' }, + { name: 'positive', type: 'boolean' }, + { name: 'negative', type: 'boolean' }, + { name: 'min', type: 'number' }, + { name: 'max', type: 'number' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + 'Money': { + requiredTsType: 'number', + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'numberOfDecimals', type: 'number' }, + { name: 'roundingType', type: 'enum' }, + { name: 'error', type: 'string' }, + { name: 'positive', type: 'boolean' }, + { name: 'negative', type: 'boolean' }, + { name: 'min', type: 'number' }, + { name: 'max', type: 'number' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + + // --- Date/Time Types --- + 'Date': { + requiredTsType: 'Date', + mapsFromTsTypes: ['Date'], + supportedArgs: [{ name: 'docs', type: 'string' }], + buildDecoratorString: genericBuildDecoratorString + }, + 'DateRange': { + requiredTsType: 'DateRange', + supportedArgs: [{ name: 'docs', type: 'string' }], + buildDecoratorString: genericBuildDecoratorString + }, + + // --- Boolean Type --- + 'Boolean': { + requiredTsType: 'boolean', + mapsFromTsTypes: ['boolean'], + supportedArgs: [ + { name: 'docs', type: 'string' }, + { name: 'defaultValue', type: 'boolean' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, + + // --- Special Types --- + 'Choice': { + requiredTsType: undefined, + supportedArgs: [], + buildDecoratorString: genericBuildDecoratorString + }, + 'Relationship': { + requiredTsType: undefined, + supportedArgs: [ + { name: 'type', type: 'string' }, + { name: 'filter', type: 'object' }, + ], + buildDecoratorString: genericBuildDecoratorString + }, +}; \ No newline at end of file diff --git a/vs-code-extension/src/utils/metadata.ts b/vs-code-extension/src/utils/metadata.ts new file mode 100644 index 0000000..da7c83e --- /dev/null +++ b/vs-code-extension/src/utils/metadata.ts @@ -0,0 +1,82 @@ + +import * as vscode from 'vscode'; +import { DataSourceMetadata, DecoratedClass, MethodMetadata, PropertyMetadata } from "../cache/cache"; +import { fieldTypeConfig } from '../utils/fieldTypes'; + +/** + * Checks if a URI corresponds to a file in the model directory. + * @param uri - The VS Code URI to check. + * @returns True if the URI is for an model file, false otherwise. + */ +export function isModelFile(uri: vscode.Uri): boolean { + const modelFileRegex = /src\/data\/.*\.ts$/; + return modelFileRegex.test(uri.path); +} + +/** + * Checks if a class metadata object is an Model. + * @param metadata - The class or property metadata to check. + * @returns True if the metadata is for an Model class, false otherwise. + */ +export function isModel(metadata: DecoratedClass | PropertyMetadata | DataSourceMetadata): metadata is DecoratedClass { + if (!hasDecorators(metadata) || 'dataSources' in metadata) { + return false; + } + return metadata.decorators.some(d => d.name === 'Model'); +} + +const fieldDecoratorNames = Object.keys(fieldTypeConfig); + +function hasDecorators(obj: any): obj is { decorators: Array<{ name: string }> } { + if ('dataSources' in obj) { + return false; + } + return Array.isArray(obj?.decorators); +} + +/** + * Checks if a property metadata object is a Field. + * @param metadata - The class or property metadata to check. + * @returns True if the metadata is for a Field property, false otherwise. + */ +export function isField(metadata: DecoratedClass | PropertyMetadata | DataSourceMetadata): metadata is PropertyMetadata { + if (!hasDecorators(metadata) || 'dataSources' in metadata) { + return false; + } + return 'type' in metadata && metadata.decorators.some(d => fieldDecoratorNames.includes(d.name) || d.name === 'Field'); +} + +export function isMethodMetadata(value: any): value is MethodMetadata { + // Check for properties that uniquely identify a MethodMetadata object + return typeof value === 'object' && value !== null && 'parameters' in value && 'declaration' in value; +} + +/** + * Compares two range-like objects for equality. + * @param r1 - The first range object. + * @param r2 - The second range object. + * @returns True if both ranges are equal or both are undefined/null, false otherwise. + */ +export function areRangesEqual( + r1?: { start: { line: number, character: number }, end: { line: number, character: number } }, + r2?: { start: { line: number, character: number }, end: { line: number, character: number } } +): boolean { + if (!r1 || !r2) { + return r1 === r2; + } + return r1.start.line === r2.start.line && + r1.start.character === r2.start.character && + r1.end.line === r2.end.line && + r1.end.character === r2.end.character; +} + +/** + * Checks if a position is within a given range. + * + * @param position The position to check + * @param range The range to check against + * @returns True if the position is within the range, false otherwise + */ +export function isPositionWithinRange(position: vscode.Position, range: vscode.Range): boolean { + return range.contains(position); +} \ No newline at end of file From b0c977928bb9f9316950a5a3258254bf34827f3d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:11:57 +0000 Subject: [PATCH 230/254] Add final missing refactor tool files to complete synchronization Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- .../src/commands/commandRegistration.ts | 216 +++++ vs-code-extension/src/explorer/appTreeItem.ts | 136 +++ .../src/explorer/explorerProvider.ts | 918 ++++++++++++++++++ .../src/explorer/explorerRegistration.ts | 88 ++ .../src/refactor/refactorInterfaces.ts | 199 ++++ .../src/refactor/tools/addDecorator.ts | 128 +++ .../src/refactor/tools/changeFieldType.ts | 488 ++++++++++ .../src/refactor/tools/deleteDataSource.ts | 85 ++ .../src/refactor/tools/deleteField.ts | 368 +++++++ .../src/refactor/tools/deleteModel.ts | 598 ++++++++++++ .../src/refactor/tools/renameDataSource.ts | 140 +++ .../src/refactor/tools/renameField.ts | 237 +++++ .../src/refactor/tools/renameModel.ts | 198 ++++ 13 files changed, 3799 insertions(+) create mode 100644 vs-code-extension/src/commands/commandRegistration.ts create mode 100644 vs-code-extension/src/explorer/appTreeItem.ts create mode 100644 vs-code-extension/src/explorer/explorerProvider.ts create mode 100644 vs-code-extension/src/explorer/explorerRegistration.ts create mode 100644 vs-code-extension/src/refactor/refactorInterfaces.ts create mode 100644 vs-code-extension/src/refactor/tools/addDecorator.ts create mode 100644 vs-code-extension/src/refactor/tools/changeFieldType.ts create mode 100644 vs-code-extension/src/refactor/tools/deleteDataSource.ts create mode 100644 vs-code-extension/src/refactor/tools/deleteField.ts create mode 100644 vs-code-extension/src/refactor/tools/deleteModel.ts create mode 100644 vs-code-extension/src/refactor/tools/renameDataSource.ts create mode 100644 vs-code-extension/src/refactor/tools/renameField.ts create mode 100644 vs-code-extension/src/refactor/tools/renameModel.ts diff --git a/vs-code-extension/src/commands/commandRegistration.ts b/vs-code-extension/src/commands/commandRegistration.ts new file mode 100644 index 0000000..c12f944 --- /dev/null +++ b/vs-code-extension/src/commands/commandRegistration.ts @@ -0,0 +1,216 @@ +import * as vscode from 'vscode'; +import { MetadataCache } from '../cache/cache'; +import { ExplorerProvider } from '../explorer/explorerProvider'; +import { NewModelTool } from './models/newModel'; +import { DefineFieldsTool } from './fields/defineFields'; +import { AddFieldTool } from './fields/addField'; +import { NewFolderTool } from './folders/newFolder'; +import { DeleteFolderTool } from './folders/deleteFolder'; +import { RenameFolderTool } from './folders/renameFolder'; +import { CreateTestTool } from './createTest'; +import { AppTreeItem } from '../explorer/appTreeItem'; +import { CreateModelFromDescriptionTool } from './models/createModelFromDesc'; +import { ModifyModelTool } from './models/modifyModel'; +import { AIService } from '../services/aiService'; +import { NewDataSourceTool } from './newDataSource'; +import { createLaunchConfiguration } from './setupLaunchConfig'; +import { createTasksConfiguration } from './setupTaskConfig'; + +export function registerGeneralCommands( + context: vscode.ExtensionContext, + cache: MetadataCache, + explorerProvider: ExplorerProvider +): vscode.Disposable[] { + const disposables: vscode.Disposable[] = []; + const aiService = new AIService(); + + // Navigation command + const navigateToCodeCommand = vscode.commands.registerCommand('slingr-vscode-extension.navigateToCode', (location: vscode.Location) => { + vscode.window.showTextDocument(location.uri).then(editor => { + editor.selection = new vscode.Selection(location.range.start, location.range.end); + editor.revealRange(location.range, vscode.TextEditorRevealType.InCenter); + }); + }); + disposables.push(navigateToCodeCommand); + + // Register the command to set up the launch configuration + const setupCommand = vscode.commands.registerCommand('slingr.createDebugConfig', async () => { + await createLaunchConfiguration(); + await createTasksConfiguration(); + }); + createLaunchConfiguration(); + createTasksConfiguration(); + + disposables.push(setupCommand); + + // Hello World command (placeholder/example) + const helloWorldCommand = vscode.commands.registerCommand('slingr-vscode-extension.helloWorld', () => { + vscode.window.showInformationMessage('Hello World from Slingr VS Code Extension!'); + }); + disposables.push(helloWorldCommand); + + // Refresh Navigation command + const refreshNavigationCommand = vscode.commands.registerCommand('slingr-vscode-extension.refreshNavigation', () => { + explorerProvider.refresh(); + vscode.window.showInformationMessage('App navigation refreshed'); + }); + disposables.push(refreshNavigationCommand); + + // New Model Tool + const newModelTool = new NewModelTool(); + const newModelCommand = vscode.commands.registerCommand('slingr-vscode-extension.newModel', (uri?: vscode.Uri | AppTreeItem) => { + // If no URI provided, use the current workspace folder + const targetUri = uri || (vscode.workspace.workspaceFolders?.[0]?.uri ?? vscode.Uri.file('')); + return newModelTool.createNewModel(targetUri, cache); + }); + disposables.push(newModelCommand); + + // Define Fields Tool + const defineFieldsTool = new DefineFieldsTool(); + const defineFieldsCommand = vscode.commands.registerCommand('slingr-vscode-extension.defineFields', async () => { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please open a model file to define fields.'); + return; + } + + const document = activeEditor.document; + const content = document.getText(); + + // Check if this is a model file + if (!content.includes('@Model')) { + vscode.window.showErrorMessage('The current file does not appear to be a model file.'); + return; + } + + // Extract model name from class declaration + const classMatch = content.match(/export\s+class\s+(\w+)\s+extends\s+BaseModel/); + if (!classMatch) { + vscode.window.showErrorMessage('Could not find model class definition.'); + return; + } + + const modelName = classMatch[1]; + + // Get field descriptions from user + const fieldsDescription = await vscode.window.showInputBox({ + prompt: "Enter field descriptions to be processed by AI", + placeHolder: "e.g., title, description, project (relationship to Project), status (enum: todo, in-progress, done)", + ignoreFocusOut: true + }); + + if (!fieldsDescription) { + return; + } + + try { + await defineFieldsTool.processFieldDescriptions( + fieldsDescription, + document.uri, + cache, + modelName + ); + } catch (error) { + vscode.window.showErrorMessage(`Failed to process field descriptions: ${error}`); + } + }); + disposables.push(defineFieldsCommand); + + // Add Field Tool + const addFieldTool = new AddFieldTool(); + const addFieldCommand = vscode.commands.registerCommand('slingr-vscode-extension.addField', async () => { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please open a model file to add a field.'); + return; + } + + const document = activeEditor.document; + const content = document.getText(); + + // Check if this is a model file + if (!content.includes('@Model')) { + vscode.window.showErrorMessage('The current file does not appear to be a model file.'); + return; + } + + try { + await addFieldTool.addField(document.uri, cache); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add field: ${error}`); + } + }); + disposables.push(addFieldCommand); + + // New Folder Tool + const newFolderTool = new NewFolderTool(); + const newFolderCommand = vscode.commands.registerCommand('slingr-vscode-extension.newFolder', (uri?: vscode.Uri | AppTreeItem) => { + return newFolderTool.createFolder(explorerProvider, uri); + }); + disposables.push(newFolderCommand); + + // Delete Folder Tool + const deleteFolderTool = new DeleteFolderTool(); + const deleteFolderCommand = vscode.commands.registerCommand('slingr-vscode-extension.deleteFolder', (uri?: vscode.Uri | AppTreeItem) => { + return deleteFolderTool.deleteFolder(explorerProvider, cache, uri); + }); + disposables.push(deleteFolderCommand); + + // Rename Folder Tool + const renameFolderTool = new RenameFolderTool(); + const renameFolderCommand = vscode.commands.registerCommand('slingr-vscode-extension.renameFolder', (uri?: vscode.Uri | AppTreeItem) => { + return renameFolderTool.renameFolder(explorerProvider, cache, uri); + }); + disposables.push(renameFolderCommand); + + // Create Test Tool + const createTestTool = new CreateTestTool(aiService); + const createTestCommand = vscode.commands.registerCommand('slingr-vscode-extension.createTest', async (uri?: vscode.Uri) => { + let targetUri = uri; + + if (!targetUri) { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage('Please open a model file or select a file to create a test.'); + return; + } + targetUri = activeEditor.document.uri; + } + + try { + await createTestTool.createTest(targetUri, cache); + } catch (error) { + vscode.window.showErrorMessage(`Failed to create test: ${error}`); + } + }); + disposables.push(createTestCommand); + + // General refactor command (placeholder for refactor controller integration) + const refactorCommand = vscode.commands.registerCommand('slingr-vscode-extension.refactor', () => { + vscode.window.showInformationMessage('Refactor command executed - specific refactor tools are available in the context menu.'); + }); + disposables.push(refactorCommand); + + // Create Model from Description Tool + const createModelFromDescriptionTool = new CreateModelFromDescriptionTool(aiService); + const createModelFromDescriptionCommand = vscode.commands.registerCommand('slingr-vscode-extension.createModelFromDescription', (context?: vscode.Uri | AppTreeItem) => { + return createModelFromDescriptionTool.createModel(cache, context); + }); + disposables.push(createModelFromDescriptionCommand); + + // Modify Model Tool + const modifyModelTool = new ModifyModelTool(aiService); + const modifyModelCommand = vscode.commands.registerCommand('slingr-vscode-extension.modifyModel', () => { + return modifyModelTool.modifyModel(cache); + }); + disposables.push(modifyModelCommand); + + // New Data Source Tool + const newDataSourceTool = new NewDataSourceTool(); + const newDataSourceCommand = vscode.commands.registerCommand('slingr-vscode-extension.newDataSource', () => { + return newDataSourceTool.createNewDataSource(); + }); + disposables.push(newDataSourceCommand); + + return disposables; +} \ No newline at end of file diff --git a/vs-code-extension/src/explorer/appTreeItem.ts b/vs-code-extension/src/explorer/appTreeItem.ts new file mode 100644 index 0000000..3ff4034 --- /dev/null +++ b/vs-code-extension/src/explorer/appTreeItem.ts @@ -0,0 +1,136 @@ +import * as vscode from "vscode"; +import { DataSourceMetadata, DecoratedClass, PropertyMetadata } from "../cache/cache"; + +export class AppTreeItem extends vscode.TreeItem { + public folderPath?: string; // Add folder path property for folder items + + constructor( + public readonly label: string, + public readonly collapsibleState: vscode.TreeItemCollapsibleState, + public readonly itemType: string, + private readonly extensionUri: vscode.Uri, + public readonly metadata?: DecoratedClass | PropertyMetadata | DataSourceMetadata, + public readonly parent?: AppTreeItem, + folderPath?: string + ) { + super(label, collapsibleState); + this.contextValue = itemType; + this.folderPath = folderPath; + + // Icon logic + if (!this.extensionUri) { + console.warn(`[MyTreeItem] Extension URI not provided for item: "${label}". Local icons will not be loaded.`); + } else { + let iconFileName = ""; + // Icon assignment based on itemType + switch (this.itemType) { + case "dataRoot": + iconFileName = "model.svg"; + break; + case "folder": + iconFileName = "folder.svg"; + break; + case "modelsFolder": + iconFileName = "folder.svg"; + break; + case "model": + iconFileName = "model-type.svg"; + break; + case "modelFieldsFolder": + iconFileName = "folder.svg"; + break; + + case "dataSourcesRoot": + iconFileName = "database.svg"; + break; + case "dataSource": + iconFileName = "database.svg"; + break; + case "field": + iconFileName = "field.svg"; + break; + case "modelActionsFolder": + iconFileName = "action.svg"; + break; + case "actionsFolder": + iconFileName = "action.svg"; + break; + case "globalActionsFolder": + iconFileName = "folder.svg"; + break; + case "actionModelLink": + iconFileName = "folder.svg"; + break; + case "action": + iconFileName = "action.svg"; + break; + case "modelViewsFolder": + iconFileName = "eye.svg"; + break; + case "viewsByModelFolder": + iconFileName = "folder.svg"; + break; + case "viewModelLink": + iconFileName = "folder.svg"; + break; + case "view": + iconFileName = "eye.svg"; + break; + case "groupsFolder": + iconFileName = "folder.svg"; + break; + case "group": + iconFileName = "group.svg"; + break; + + case "modelActionsRoot": + iconFileName = "action.svg"; + break; + case "actionsByModelFolder": + iconFileName = "folder.svg"; + break; + case "actionsGlobalFolder": + iconFileName = "global-type.svg"; + break; + case "globalAction": + iconFileName = "action.svg"; + break; + case "modelLinkForActions": + iconFileName = "folder.svg"; + break; + case "uiRoot": + iconFileName = "eye.svg"; + break; + case "uiByTypeFolder": + iconFileName = "folder.svg"; + break; + case "uiByModelFolder": + iconFileName = "folder.svg"; + break; + case "uiRecordViewsFolder": + iconFileName = "eye.svg"; + break; + case "uiGridViewsFolder": + iconFileName = "eye.svg"; + break; + case "modelLinkForUiViews": + iconFileName = "eye.svg"; + break; + + case "error": + iconFileName = "error.svg"; + break; + default: + iconFileName = "default.svg"; + break; + } + + if (iconFileName) { + this.iconPath = { + light: vscode.Uri.joinPath(this.extensionUri, "resources", "icons", "light", iconFileName), + dark: vscode.Uri.joinPath(this.extensionUri, "resources", "icons", "dark", iconFileName), + }; + } + } + } +} diff --git a/vs-code-extension/src/explorer/explorerProvider.ts b/vs-code-extension/src/explorer/explorerProvider.ts new file mode 100644 index 0000000..9e5841a --- /dev/null +++ b/vs-code-extension/src/explorer/explorerProvider.ts @@ -0,0 +1,918 @@ +import * as vscode from "vscode"; +import { Project } from "ts-morph"; +import { MetadataCache, DecoratedClass, DecoratorMetadata, PropertyMetadata, DataSourceMetadata, CacheUpdateEvent } from "../cache/cache"; +import { AppTreeItem } from "./appTreeItem"; +import { promises as fsPromises } from "fs"; +import * as path from "path"; + + +// Define custom MIME types for our drag-and-drop operations +const FIELD_MIME_TYPE = "application/vnd.slingr-vscode-extension.field"; +const MODEL_MIME_TYPE = "application/vnd.slingr-vscode-extension.model"; +const FOLDER_MIME_TYPE = "application/vnd.slingr-vscode-extension.folder"; + +// Interface for folder structure +interface FolderNode { + folders: Map; + models: DecoratedClass[]; +} + +// Cache interface for performance optimizations +interface ExplorerCache { + folderStructure?: FolderNode; + compositionModelReferences?: Set; + lastCacheUpdate?: number; +} + +export class ExplorerProvider + implements vscode.TreeDataProvider, vscode.TreeDragAndDropController +{ + private _onDidChangeTreeData: vscode.EventEmitter = new vscode.EventEmitter< + AppTreeItem | undefined | null | void + >(); + readonly onDidChangeTreeData: vscode.Event = this._onDidChangeTreeData.event; + + public dragMimeTypes: readonly string[] = [FIELD_MIME_TYPE, MODEL_MIME_TYPE, FOLDER_MIME_TYPE]; + public dropMimeTypes: readonly string[] = [FIELD_MIME_TYPE, MODEL_MIME_TYPE, FOLDER_MIME_TYPE]; + + // Performance optimization cache + private explorerCache: ExplorerCache = {}; + private refreshTimeout: NodeJS.Timeout | undefined; + + constructor(private cache: MetadataCache, private extensionUri: vscode.Uri) { + // --- Listen for the cache's update event --- + this.cache.onDidUpdate(() => { + this.invalidateCache(); + this.debouncedRefresh(); + }); + } + + /** + * Invalidates the explorer cache when underlying data changes + */ + private invalidateCache(): void { + this.explorerCache = {}; + } + + /** + * Debounced refresh to prevent too frequent UI updates + */ + private debouncedRefresh(): void { + if (this.refreshTimeout) { + clearTimeout(this.refreshTimeout); + } + this.refreshTimeout = setTimeout(() => { + this.refresh(); + }, 100); // 100ms debounce + } + + refresh(): void { + this._onDidChangeTreeData.fire(); + } + + getTreeItem(element: AppTreeItem): vscode.TreeItem { + return element; + } + + handleDrag( + source: readonly AppTreeItem[], + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken + ): void | Thenable { + if (source.length > 1) { + // Multi-drag is not supported for reordering + return; + } + const draggedItem = source[0]; + + // We can drag fields, models, or folders + if (draggedItem.itemType === "field" && draggedItem.metadata && "name" in draggedItem.metadata) { + // The parent of a field item is the 'modelFieldsFolder', which holds the model's metadata + const modelFilePath = draggedItem.parent?.metadata?.declaration.uri.fsPath; + const modelClassName = draggedItem.parent?.metadata?.name; + if (modelFilePath && modelClassName) { + dataTransfer.set( + FIELD_MIME_TYPE, + new vscode.DataTransferItem({ + field: draggedItem.metadata.name, + modelPath: modelFilePath, + modelClassName: modelClassName, + }) + ); + } + } else if (draggedItem.itemType === "model" && draggedItem.metadata && this.isDecoratedClass(draggedItem.metadata)) { + // Check if this is a composition model (nested model within another model) + if (draggedItem.parent && draggedItem.parent.itemType === "model") { + // This is a composition model + const modelFilePath = draggedItem.parent.metadata?.declaration.uri.fsPath; + const modelClassName = draggedItem.parent.metadata?.name; + + // We need to find the property name that represents this composition relationship + // Look through the parent model's properties to find the one that matches this composition + if ( + modelFilePath && + modelClassName && + draggedItem.parent.metadata && + "properties" in draggedItem.parent.metadata + ) { + const parentModel = draggedItem.parent.metadata; + let compositionFieldName = null; + + // Find the field that represents this composition relationship + for (const [propName, prop] of Object.entries(parentModel.properties)) { + if ( + prop.decorators.some((d) => d.name === "Field") && + prop.decorators.some( + (d) => + d.name === "Relationship" && + d.arguments.some((arg) => arg.type === "composition" || arg.type === "Composition") + ) && + this.extractBaseTypeFromArrayType(prop.type) === draggedItem.metadata?.name + ) { + compositionFieldName = propName; + break; + } + } + + if (compositionFieldName) { + dataTransfer.set( + FIELD_MIME_TYPE, + new vscode.DataTransferItem({ + field: compositionFieldName, + modelPath: modelFilePath, + modelClassName: modelClassName, + }) + ); + } + } + } else { + // This is a standalone model that can be moved to folders + const modelFilePath = draggedItem.metadata.declaration.uri.fsPath; + dataTransfer.set( + MODEL_MIME_TYPE, + new vscode.DataTransferItem({ + modelPath: modelFilePath, + modelClassName: draggedItem.metadata.name, + }) + ); + } + } else if (draggedItem.itemType === "folder" && draggedItem.folderPath) { + // This is a folder that can be moved to other folders + dataTransfer.set( + FOLDER_MIME_TYPE, + new vscode.DataTransferItem({ + folderPath: draggedItem.folderPath, + folderName: draggedItem.label, + }) + ); + } + } + + async handleDrop( + target: AppTreeItem | undefined, + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken + ): Promise { + // Handle field reordering (existing functionality) + const fieldTransferItem = dataTransfer.get(FIELD_MIME_TYPE); + const modelTransferItem = dataTransfer.get(MODEL_MIME_TYPE); + const folderTransferItem = dataTransfer.get(FOLDER_MIME_TYPE); + + if (fieldTransferItem?.value !== '' && fieldTransferItem) { + await this.handleFieldDrop(target, fieldTransferItem); + return; + } + + // Handle model moving to folders + if (modelTransferItem?.value !== '' && modelTransferItem) { + await this.handleModelDrop(target, modelTransferItem); + return; + } + + // Handle folder moving to other folders + if (folderTransferItem?.value !== '' && folderTransferItem) { + await this.handleFolderDrop(target, folderTransferItem); + return; + } + + // If no valid transfer item is found, show an appropriate message + vscode.window.showWarningMessage("Invalid drop operation."); + } + + private async handleFieldDrop(target: AppTreeItem | undefined, transferItem: vscode.DataTransferItem): Promise { + const draggedData = transferItem.value; + + // Check if someone is trying to drop a composition model into a folder or data root + if (target && (target.itemType === "folder" || target.itemType === "dataRoot" || target.itemType === "model")) { + vscode.window.showWarningMessage("Composition models cannot be moved to folders or models. They are part of their parent model structure."); + return; + } + + // Ensure we have a valid target to drop onto (field or composition model) + let targetFieldName: string | null = null; + let targetModelPath: string | undefined = undefined; + + if (target && target.itemType === "field" && target.metadata && "name" in target.metadata) { + // Dropping onto a regular field + targetFieldName = target.metadata.name; + targetModelPath = target.parent?.metadata?.declaration.uri.fsPath; + } else if (target && target.itemType === "model" && target.parent && target.parent.itemType === "model") { + // Dropping onto a composition model + targetModelPath = target.parent.metadata?.declaration.uri.fsPath; + + // Find the field name that represents this composition relationship + if (target.parent.metadata && "properties" in target.parent.metadata) { + const parentModel = target.parent.metadata; + for (const [propName, prop] of Object.entries(parentModel.properties)) { + if ( + prop.decorators.some((d) => d.name === "Field") && + prop.decorators.some( + (d) => + d.name === "Relationship" && + d.arguments.some((arg) => arg.type === "Composition" || arg.type === "composition") + ) && + this.extractBaseTypeFromArrayType(prop.type) === target.metadata?.name + ) { + targetFieldName = propName; + break; + } + } + } + } + + if (!target || !targetFieldName || !targetModelPath) { + vscode.window.showWarningMessage("A field can only be dropped onto another field or composition model."); + return; + } + + // Validate the drop operation + if (draggedData.modelPath !== targetModelPath) { + vscode.window.showWarningMessage("Fields can only be reordered within the same model."); + return; + } + + if (draggedData.field === targetFieldName) { + return; // Dropped on itself + } + + // Perform the reordering + try { + // 1. Get the new text from ts-morph *without saving*. + const newText = await this.reorderFieldsAndGetText( + draggedData.modelPath, + draggedData.modelClassName, + draggedData.field, + targetFieldName + ); + + if (newText === null) { + vscode.window.showErrorMessage("Failed to reorder fields."); + return; + } + + // 2. Apply the changes to the editor and format. + const uri = vscode.Uri.file(draggedData.modelPath); + const document = await vscode.workspace.openTextDocument(uri); + const editor = await vscode.window.showTextDocument(document); + + // Replace the entire document content with the new text. + await editor.edit((editBuilder) => { + const fullRange = new vscode.Range(document.positionAt(0), document.positionAt(document.getText().length)); + editBuilder.replace(fullRange, newText); + }); + + // Execute the format command on the now-dirty file. + await vscode.commands.executeCommand("editor.action.formatDocument"); + + // 3. Save the document a single time. + await document.save(); + + // 4. Refresh the tree. The cache will update from the single save event. + setTimeout(() => { + this.refresh(); + }, 200); + } catch (error: any) { + console.error("Error reordering fields:", error); + vscode.window.showErrorMessage(`An error occurred: ${error.message}`); + } + } + + private async handleModelDrop(target: AppTreeItem | undefined, transferItem: vscode.DataTransferItem): Promise { + const draggedData = transferItem.value; + + // Models can only be dropped into folders or the data root + if (!target || (target.itemType !== "folder" && target.itemType !== "dataRoot")) { + vscode.window.showWarningMessage("Models can only be dropped into folders."); + return; + } + + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + vscode.window.showErrorMessage("No workspace folder found."); + return; + } + + const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + const targetPath = target.itemType === "dataRoot" ? srcDataPath : path.join(srcDataPath, target.folderPath || ""); + + try { + // Move the model file to the new location using VS Code's workspace edit API + const sourcePath = draggedData.modelPath; + const fileName = path.basename(sourcePath); + const newPath = path.join(targetPath, fileName); + + // Check if target file already exists + try { + await fsPromises.stat(newPath); + vscode.window.showErrorMessage(`A file named "${fileName}" already exists in the target folder.`); + return; + } catch (err: any) { + if (err.code !== "ENOENT") { + throw err; + } + } + + // Create target directory if it doesn't exist + try { + await fsPromises.access(targetPath); + } catch { + await fsPromises.mkdir(targetPath, { recursive: true }); + } + + // Use VS Code's workspace edit API to move the file + // This will automatically trigger import updates + const workspaceEdit = new vscode.WorkspaceEdit(); + const sourceUri = vscode.Uri.file(sourcePath); + const targetUri = vscode.Uri.file(newPath); + + workspaceEdit.renameFile(sourceUri, targetUri); + + const success = await vscode.workspace.applyEdit(workspaceEdit); + + if (success) { + // Force cache refresh after model move to ensure proper file path updates + await this.cache.forceRefresh(); + + // Wait a bit longer and then refresh the tree to ensure cache is fully updated + setTimeout(() => { + this.refresh(); + }, 300); + + vscode.window.showInformationMessage(`Model "${draggedData.modelClassName}" moved successfully.`); + } else { + vscode.window.showErrorMessage(`Failed to move model "${draggedData.modelClassName}".`); + } + } catch (error: any) { + console.error("Error moving model:", error); + vscode.window.showErrorMessage(`Failed to move model: ${error.message}`); + } + } + + private async handleFolderDrop(target: AppTreeItem | undefined, transferItem: vscode.DataTransferItem): Promise { + const draggedData = transferItem.value; + + // Folders can only be dropped into other folders or the data root + if (!target || (target.itemType !== "folder" && target.itemType !== "dataRoot")) { + vscode.window.showWarningMessage("Folders can only be dropped into other folders."); + return; + } + + // Prevent dropping a folder into itself or its children + if (target.itemType === "folder" && target.folderPath) { + // Normalize paths for cross-platform comparison + const normalizedTargetPath = target.folderPath.replace(/[\/\\]/g, path.sep); + const normalizedDraggedPath = draggedData.folderPath.replace(/[\/\\]/g, path.sep); + + if (normalizedTargetPath.startsWith(normalizedDraggedPath)) { + vscode.window.showWarningMessage("Cannot move a folder into itself or its subfolder."); + return; + } + } + + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + vscode.window.showErrorMessage("No workspace folder found."); + return; + } + + const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + const sourcePath = path.join(srcDataPath, draggedData.folderPath); + const targetBasePath = target.itemType === "dataRoot" ? srcDataPath : path.join(srcDataPath, target.folderPath || ""); + const newPath = path.join(targetBasePath, draggedData.folderName); + + try { + // Check if target folder already exists + try { + await fsPromises.stat(newPath); + vscode.window.showErrorMessage(`A folder named "${draggedData.folderName}" already exists in the target location.`); + return; + } catch (error: any) { + if (error.code === 'ENOENT') { + // Folder doesn't exist, which is what we want + } else { + throw error; + } + } + + // Create target directory if it doesn't exist + try { + await fsPromises.access(targetBasePath); + } catch { + await fsPromises.mkdir(targetBasePath, { recursive: true }); + } + + // Use VS Code's workspace edit API to move the folder + // This will automatically trigger import updates for all files in the folder + const workspaceEdit = new vscode.WorkspaceEdit(); + const sourceUri = vscode.Uri.file(sourcePath); + const targetUri = vscode.Uri.file(newPath); + + workspaceEdit.renameFile(sourceUri, targetUri); + + const success = await vscode.workspace.applyEdit(workspaceEdit); + + if (success) { + // Force cache refresh after folder move to ensure proper file path updates + await this.cache.forceRefresh(); + + // Wait a bit longer and then refresh the tree to ensure cache is fully updated + setTimeout(() => { + this.refresh(); + }, 300); + + vscode.window.showInformationMessage(`Folder "${draggedData.folderName}" moved successfully.`); + } else { + vscode.window.showErrorMessage(`Failed to move folder "${draggedData.folderName}".`); + } + } catch (error: any) { + console.error("Error moving folder:", error); + vscode.window.showErrorMessage(`Failed to move folder: ${error.message}`); + } + } + + /** + * Reorders fields in the model class file and returns the updated text. + * This function uses ts-morph to manipulate the source code without saving it. + * @param modelPath The path to the model class file. + * @param modelClassName The name of the model class to modify. + * @param sourceFieldName The name of the field to move. + * @param targetFieldName The name of the field to move before. + * @returns The updated source code as a string, or null if an error occurs. + */ + private async reorderFieldsAndGetText( + modelPath: string, + modelClassName: string, + sourceFieldName: string, + targetFieldName: string + ): Promise { + const project = new Project(); + const sourceFile = project.addSourceFileAtPath(modelPath); + + // Find the specific class by name to handle multiple classes in the same file + const classDeclaration = sourceFile.getClass(modelClassName); + + if (!classDeclaration) { + console.error(`Class ${modelClassName} not found in ${modelPath}`); + return null; + } + + const sourceProperty = classDeclaration.getProperty(sourceFieldName); + const targetProperty = classDeclaration.getProperty(targetFieldName); + + if (!sourceProperty || !targetProperty) { + console.error(`Could not find source or target property in ${classDeclaration.getName()}`); + return null; + } + + // 1. Get the structure of the source property including decorators + const sourceStructure = sourceProperty.getStructure(); + const targetIndex = targetProperty.getChildIndex(); + + // 2. Remove the original property + sourceProperty.remove(); + + // 3. Insert the property at the target position using the structure + // This preserves the original formatting without adding extra indentation + classDeclaration.insertProperty(targetIndex, sourceStructure); + + // await sourceFile.save(); + return sourceFile.getFullText(); + } + + /** + * Returns the children of the given element in the tree. + * If no element is provided, it returns the root items (Model and UI). + * @param element The parent element to get children for, or undefined for root. + */ + async getChildren(element?: AppTreeItem): Promise { + if (!element) { + // Root level: Data and Data Sources + return [ + new AppTreeItem("Data", vscode.TreeItemCollapsibleState.Expanded, "dataRoot", this.extensionUri), + new AppTreeItem("Data Sources", vscode.TreeItemCollapsibleState.Collapsed, "dataSourcesRoot", this.extensionUri) + ]; + } + + // --- DATA ROOT --- + if (element.itemType === "dataRoot") { + return await this.getDataRootChildren(); + } + + // --- FOLDER --- + if (element.itemType === "folder") { + return await this.getFolderChildren(element); + } + + // --- DATA SOURCES ROOT --- + if (element.itemType === "dataSourcesRoot") { + const dataSources = this.cache.getDataSources(); + return dataSources.map(ds => { + const item = new AppTreeItem(ds.name, vscode.TreeItemCollapsibleState.None, "dataSource", this.extensionUri, ds); + item.command = { + command: 'slingr-vscode-extension.handleTreeItemClick', + title: 'Handle Click', + arguments: [item] + }; + return item; + }); + } + + // --- Children of a specific Model --- + if (element.itemType === "model" && this.isDecoratedClass(element.metadata)) { + const modelClass = element.metadata; + + const fields = Object.values(element.metadata.properties).filter((prop) => + prop.decorators.some((d) => d.name === "Field") + ); + + return fields.map((field) => { + if ( + field.decorators.some( + (d) => + d.name === "Relationship" && + d.arguments.some((arg) => arg.type === "Composition" || arg.type === "composition") + ) + ) { + const relationshipType = this.extractBaseTypeFromArrayType(field.type); + const relatedModel = this.cache.getDataModelClasses().find((model) => model.name === relationshipType); + const upperFieldName = field.name.charAt(0).toUpperCase() + field.name.slice(1); + const compositionItem = new AppTreeItem( + upperFieldName, + vscode.TreeItemCollapsibleState.Collapsed, + "model", + this.extensionUri, + relatedModel, + element + ); + + // Set command for click handling (single vs double-click detection) + if (relatedModel) { + compositionItem.command = { + command: "slingr-vscode-extension.handleTreeItemClick", + title: "Handle Click", + arguments: [compositionItem], + }; + } + + return compositionItem; + } else { + return this.mapPropertyToTreeItem(field, "field", element); + } + }); + } + + return []; // Default empty + } + + /** + * Gets the children for the data root, which includes folders and models in the src/data directory + */ + private async getDataRootChildren(): Promise { + try { + const models = this.cache.getDataModelClasses(); + const folderStructure = await this.getCachedFolderStructure(models); + + return this.createTreeItemsFromStructure(folderStructure, ""); + } catch (error) { + console.error("[Explorer] Error getting data root children:", error); + return []; + } + } + + /** + * Gets the children for a specific folder + */ + private async getFolderChildren(folderElement: AppTreeItem): Promise { + try { + const models = this.cache.getDataModelClasses(); + const folderPath = folderElement.folderPath || ""; + const folderStructure = await this.getCachedFolderStructure(models); + + return this.createTreeItemsFromStructure(folderStructure, folderPath); + } catch (error) { + console.error("[Explorer] Error getting folder children:", error); + return []; + } + } + + /** + * Gets the cached folder structure, building it if not cached + */ + private async getCachedFolderStructure(models: DecoratedClass[]): Promise { + try { + if (!this.explorerCache.folderStructure) { + this.explorerCache.folderStructure = await this.buildFolderStructure(models); + } + // Ensure the structure is valid + if (!this.explorerCache.folderStructure || !this.explorerCache.folderStructure.folders) { + console.warn("[Explorer] Cached folder structure is invalid, rebuilding..."); + this.explorerCache.folderStructure = await this.buildFolderStructure(models); + } + return this.explorerCache.folderStructure; + } catch (error) { + console.error("[Explorer] Error getting folder structure:", error); + return { folders: new Map(), models: [] }; + } + } + + /** + * Builds a hierarchical folder structure from model file paths + */ + private async buildFolderStructure(models: DecoratedClass[]): Promise { + const root: FolderNode = { folders: new Map(), models: [] }; + + for (const model of models) { + const filePath = model.declaration.uri.fsPath; + + // Extract the relative path from src/data/ (handle both Unix and Windows paths) + const srcDataPattern = /[\/\\]src[\/\\]data[\/\\]/; + const match = filePath.match(srcDataPattern); + if (!match) { + continue; + } + + const dataIndex = filePath.indexOf(match[0]); + const relativePath = filePath.substring(dataIndex + match[0].length); + const pathParts = relativePath.split(/[\/\\]/); + + // Remove the file name (last part) + const fileName = pathParts.pop(); + + if (pathParts.length === 0) { + // Model is directly in src/data/ + root.models.push(model); + } else { + // Model is in a subfolder + let currentNode = root; + let currentPath = ""; + + for (const part of pathParts) { + currentPath = currentPath ? `${currentPath}${path.sep}${part}` : part; + + if (!currentNode.folders.has(part)) { + currentNode.folders.set(part, { folders: new Map(), models: [] }); + } + currentNode = currentNode.folders.get(part)!; + } + + currentNode.models.push(model); + } + } + // Also add empty directories from the filesystem + await this.addEmptyDirectoriesToStructure(root); + + return root; + } + + /** + * Recursively scans the src/data directory and adds empty directories to the folder structure + */ + private async addEmptyDirectoriesToStructure(root: FolderNode): Promise { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + return; + } + + const srcDataPath = path.join(workspaceFolder.uri.fsPath, 'src', 'data'); + try { + await fsPromises.access(srcDataPath); + } catch { + return; // Directory doesn't exist + } + + await this.scanDirectoryRecursively(srcDataPath, root, ''); + } + + /** + * Recursively scans a directory and adds empty folders to the structure + */ + private async scanDirectoryRecursively(dirPath: string, currentNode: FolderNode, relativePath: string): Promise { + try { + const entries = await fsPromises.readdir(dirPath, { withFileTypes: true }); + + for (const entry of entries) { + if (entry.isDirectory()) { + const folderName = entry.name; + const fullPath = path.join(dirPath, folderName); + const newRelativePath = relativePath ? `${relativePath}${path.sep}${folderName}` : folderName; + + // Add folder to structure if it doesn't exist + if (!currentNode.folders.has(folderName)) { + currentNode.folders.set(folderName, { folders: new Map(), models: [] }); + } + + // Recursively scan subdirectories + const folderNode = currentNode.folders.get(folderName)!; + await this.scanDirectoryRecursively(fullPath, folderNode, newRelativePath); + } + } + } catch (error) { + // Silently ignore permission errors or other issues + console.warn(`Could not scan directory ${dirPath}:`, error); + } + } + + /** + * Creates tree items from the folder structure + */ + private createTreeItemsFromStructure(structure: FolderNode, basePath: string): AppTreeItem[] { + const items: AppTreeItem[] = []; + + if (!structure || !structure.folders) { + console.warn("[Explorer] Folder structure is undefined or invalid, returning empty items"); + return items; + } + + // Get the current node for the given base path + let currentNode = structure; + if (basePath) { + const pathParts = basePath.split(/[\/\\]/); + for (const part of pathParts) { + if (!currentNode.folders) { + console.warn("[Explorer] Current node has no folders property, returning empty items"); + return items; + } + const nextNode = currentNode.folders.get(part); + if (!nextNode) { + return items; // Path not found + } + currentNode = nextNode; + } + } + + if (!currentNode.folders) { + console.warn("[Explorer] Current node has no folders property after path traversal, returning empty items"); + return items; + } + + // Add folders (sorted alphabetically) + const sortedFolders = Array.from(currentNode.folders.entries()).sort(([a], [b]) => a.localeCompare(b)); + for (const [folderName, folderNode] of sortedFolders) { + const folderPath = basePath ? `${basePath}${path.sep}${folderName}` : folderName; + const hasChildren = folderNode.folders.size > 0 || folderNode.models.length > 0; + + items.push( + new AppTreeItem( + folderName, + hasChildren ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None, + "folder", + this.extensionUri, + undefined, + undefined, + folderPath + ) + ); + } + + // Add models (sorted alphabetically by label) + const sortedModels = currentNode.models.sort((a, b) => { + const aDecorator = a.decorators.find((d) => d.name === "Model"); + const aLabel = aDecorator?.arguments[0]?.label || a.name; + const bDecorator = b.decorators.find((d) => d.name === "Model"); + const bLabel = bDecorator?.arguments[0]?.label || b.name; + return aLabel.localeCompare(bLabel); + }); + + for (const model of sortedModels) { + const decorator = model.decorators.find((d) => d.name === "Model"); + const label = decorator?.arguments[0]?.label || model.name; + + // Only show models that are NOT referenced by composition relationships + if (!this.isModelReferencedByCompositionCached(model)) { + const modelItem = new AppTreeItem(label, vscode.TreeItemCollapsibleState.Collapsed, "model", this.extensionUri, model); + + // Set command for click handling (single vs double-click detection) + modelItem.command = { + command: "slingr-vscode-extension.handleTreeItemClick", + title: "Handle Click", + arguments: [modelItem], + }; + + items.push(modelItem); + } + } + + return items; + } + + private mapPropertyToTreeItem(propData: PropertyMetadata, itemType: string, parent?: AppTreeItem): AppTreeItem { + const upperFieldName = propData.name.charAt(0).toUpperCase() + propData.name.slice(1); + + const item = new AppTreeItem( + upperFieldName, + vscode.TreeItemCollapsibleState.None, + itemType, + this.extensionUri, + propData, + parent + ); + // Set command for click handling (single vs double-click detection) + item.command = { + command: "slingr-vscode-extension.handleTreeItemClick", + title: "Handle Click", + arguments: [item], + }; + return item; + } + + getParent(element: AppTreeItem): vscode.ProviderResult { + // This can be implemented if needed for more complex tree interactions + return null; + } + + private isDecoratedClass(item: any): item is DecoratedClass { + return ( + item && + typeof item === "object" && + "name" in item && + "decorators" in item && + "properties" in item && + "declaration" in item + ); + } + + /** + * Cached version of isModelReferencedByComposition for better performance + */ + private isModelReferencedByCompositionCached(item: DecoratedClass): boolean { + if (!this.explorerCache.compositionModelReferences) { + this.buildCompositionModelReferencesCache(); + } + return this.explorerCache.compositionModelReferences!.has(item.name); + } + + /** + * Builds a cache of all models that are referenced by composition relationships + */ + private buildCompositionModelReferencesCache(): void { + const compositionModels = new Set(); + const allModels = this.cache.getDataModelClasses(); + + for (const model of allModels) { + // Check all properties of this model + for (const property of Object.values(model.properties)) { + // Check if this property has a @Field decorator (indicating it's a field) + const hasFieldDecorator = property.decorators.some((d) => d.name === "Field"); + + if (hasFieldDecorator) { + // Check if this property has a @Relationship decorator with type: "Composition" + const relationshipDecorator = property.decorators.find((d) => d.name === "Relationship"); + + if (relationshipDecorator) { + // Check if the relationship decorator has type: "Composition" or "composition" + const hasCompositionType = relationshipDecorator.arguments.some( + (arg) => { + if (typeof arg === "object" && arg !== null) { + return arg.type === "Composition" || arg.type === "composition"; + } + return arg === "Composition" || arg === "composition"; + } + ); + + if (hasCompositionType) { + // Extract the base type from the property type and add to cache + const baseType = this.extractBaseTypeFromArrayType(property.type); + compositionModels.add(baseType); + } + } + } + } + } + + this.explorerCache.compositionModelReferences = compositionModels; + } + + /** + * Extracts the base type from array types. + * For example, "Note[]" becomes "Note", "string" remains "string" + * @param type The type string that might be an array type + * @returns The base type without array brackets + */ + private extractBaseTypeFromArrayType(type: string): string { + // Remove array brackets if present + if (type.endsWith("[]")) { + return type.slice(0, -2); + } + return type; + } +} diff --git a/vs-code-extension/src/explorer/explorerRegistration.ts b/vs-code-extension/src/explorer/explorerRegistration.ts new file mode 100644 index 0000000..c8f44ef --- /dev/null +++ b/vs-code-extension/src/explorer/explorerRegistration.ts @@ -0,0 +1,88 @@ +import * as vscode from 'vscode'; +import { MetadataCache } from '../cache/cache'; +import { ExplorerProvider } from './explorerProvider'; +import { QuickInfoProvider } from '../quickInfoPanel/quickInfoProvider'; +import { AppTreeItem } from './appTreeItem'; + +export function registerExplorer( + context: vscode.ExtensionContext, + cache: MetadataCache, + quickInfoProvider: QuickInfoProvider +): { treeView: vscode.TreeView, provider: ExplorerProvider } { + + const explorerProvider = new ExplorerProvider(cache, context.extensionUri); + + const treeView = vscode.window.createTreeView('slingrExplorer', { + treeDataProvider: explorerProvider, + dragAndDropController: explorerProvider, + showCollapseAll: true + }); + + // Double-click tracking variables + let lastClickTime = 0; + let lastClickedItemKey: string | undefined; + const DOUBLE_CLICK_THRESHOLD = 300; // milliseconds + + // Register the tree item click handler command + const handleTreeItemClick = vscode.commands.registerCommand( + 'slingr-vscode-extension.handleTreeItemClick', + (item: AppTreeItem) => { + const currentTime = Date.now(); + const currentItemKey = getItemKey(item); + + // Check for double-click + if (lastClickedItemKey === currentItemKey && + (currentTime - lastClickTime) < DOUBLE_CLICK_THRESHOLD) { + + // Double-click: navigate to code + navigateToItemCode(item); + + // Reset tracking + lastClickTime = 0; + lastClickedItemKey = undefined; + } else { + // Single-click: just update info panel + quickInfoProvider.update(item.itemType, item.metadata as any); + + // Update tracking for potential double-click + lastClickTime = currentTime; + lastClickedItemKey = currentItemKey; + } + } + ); + + // Handle selection changes (for keyboard navigation and other selection events) + const selectionDisposable = treeView.onDidChangeSelection(e => { + const selectedItem = e.selection?.[0] as AppTreeItem; + if (selectedItem) { + // Update info panel for keyboard navigation + quickInfoProvider.update(selectedItem.itemType, selectedItem.metadata as any); + } + }); + + context.subscriptions.push(treeView, selectionDisposable, handleTreeItemClick); + + return { treeView, provider: explorerProvider }; +} + +/** + * Create a unique key for an tree item to enable proper double-click detection + */ +function getItemKey(item: AppTreeItem): string { + // Create a unique key based on item type, label, and metadata + const metadataKey = item.metadata && 'name' in item.metadata ? item.metadata.name : ''; + const parentKey = item.parent ? item.parent.label : ''; + return `${item.itemType}:${item.label}:${metadataKey}:${parentKey}`; +} + +/** + * Navigate to the code definition for the given tree item + */ +function navigateToItemCode(item: AppTreeItem): void { + if (!item.metadata || !('declaration' in item.metadata)) { + return; + } + + // Execute the navigate to code command + vscode.commands.executeCommand('slingr-vscode-extension.navigateToCode', item.metadata.declaration); +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/refactorInterfaces.ts b/vs-code-extension/src/refactor/refactorInterfaces.ts new file mode 100644 index 0000000..1383504 --- /dev/null +++ b/vs-code-extension/src/refactor/refactorInterfaces.ts @@ -0,0 +1,199 @@ +import * as vscode from 'vscode'; +import { DataSourceMetadata, DecoratedClass, DecoratorMetadata, FileMetadata, MetadataCache, PropertyMetadata } from '../cache/cache'; + +/** + * Common properties shared across all refactoring payloads. + */ +export interface BasePayload { + isManual: boolean; +} + +/** + * Context for a manual refactoring operation. + */ +export interface ManualRefactorContext { + cache: MetadataCache; + uri: vscode.Uri; + range: vscode.Range; + metadata?: DecoratedClass | PropertyMetadata | DataSourceMetadata; +} + +// --- Payloads for Specific Change Types --- + +export interface RenameModelPayload extends BasePayload { + oldName: string; + newName: string; + oldModelMetadata: DecoratedClass; + newUri?: vscode.Uri; +} + +export interface DeleteModelPayload extends BasePayload { + oldModelMetadata: DecoratedClass; + urisToDelete: vscode.Uri[]; +} + +export interface RenameFieldPayload extends BasePayload { + oldName: string; + newName: string; + modelName: string; + oldFieldMetadata: PropertyMetadata; +} + +export interface DeleteFieldPayload extends BasePayload { + oldFieldMetadata: PropertyMetadata; + modelName: string; +} + +export interface ChangeFieldTypePayload extends BasePayload { + newType: string; + field: PropertyMetadata; + decoratorPosition?: vscode.Range; + oldDecorator?: DecoratorMetadata; +} + +export interface AddDecoratorPayload extends BasePayload { + fieldMetadata: PropertyMetadata; + decoratorName: string; +} + +export interface RenameDataSourcePayload extends BasePayload { + oldName: string; + newName: string; + newUri?: vscode.Uri; +} + +export interface DeleteDataSourcePayload extends BasePayload { + dataSourceName: string; + urisToDelete: vscode.Uri[]; +} + +// --- Discriminated Union for ChangeObject --- + +/** + * Defines a mapping from each ChangeType to its corresponding payload interface. + * This is the core of the discriminated union. + */ +export type ChangePayloadMap = { + 'RENAME_MODEL': RenameModelPayload; + 'DELETE_MODEL': DeleteModelPayload; + 'RENAME_FIELD': RenameFieldPayload; + 'DELETE_FIELD': DeleteFieldPayload; + 'CHANGE_FIELD_TYPE': ChangeFieldTypePayload; + 'ADD_DECORATOR': AddDecoratorPayload; + 'RENAME_DATA_SOURCE': RenameDataSourcePayload; + 'DELETE_DATA_SOURCE': DeleteDataSourcePayload; +}; + +/** + * Represents all possible types of refactoring changes. + */ +export type ChangeType = keyof ChangePayloadMap; + +/** + * A generic ChangeObject that uses the ChangeType to determine the structure of its payload. + * This creates a robust, type-safe discriminated union. + * * For each possible `ChangeType`, it creates a specific object type. For example: + * { type: 'RENAME_MODEL', payload: RenameModelPayload, ... } + * { type: 'DELETE_FIELD', payload: DeleteFieldPayload, ... } + * * `ChangeObject` is then a union of all these specific types. + */ +export type ChangeObject = { + [K in ChangeType]: { + type: K; + uri: vscode.Uri; + description: string; + payload: ChangePayloadMap[K]; + } +}[ChangeType]; + + +/** + * Context object containing all necessary information for performing manual refactoring operations. + * + * @interface ManualRefactorContext + * @property {MetadataCache} cache - The metadata cache containing processed metadata information + * @property {vscode.Uri} uri - The URI of the file being refactored + * @property {vscode.Range} range - The range within the file that is selected for refactoring + * @property {DecoratedClass | PropertyMetadata} [metadata] - Optional specific metadata item being targeted for refactoring + */ +export interface ManualRefactorContext { + cache: MetadataCache; + uri: vscode.Uri; + range: vscode.Range; + metadata?: DecoratedClass | PropertyMetadata | DataSourceMetadata; +} + +/** + * Defines the contract for any refactoring tool. + */ +/** + * Interface defining a refactoring tool that can analyze code changes and generate workspace edits. + * + * Refactor tools support both automatic and manual refactoring workflows: + * - **Automatic**: Analyzes file diffs to detect changes and generate corresponding edits when files are saved/deleted + * - **Manual**: Provides user-triggered refactoring actions through VS Code's Code Actions menu + * + * @example + * ```typescript + * class RenameClassTool implements IRefactorTool { + * getCommandId() { return 'refactor.renameClass'; } + * getHandledChangeTypes() { return ['RENAME_CLASS']; } + * // ... implement other methods + * } + * ``` + * + * @see {@link ChangeObject} for the change representation format + * @see {@link ManualRefactorContext} for manual refactoring context + * @see {@link MetadataCache} for caching file metadata during refactoring + */ +export interface IRefactorTool { + /** + * A unique identifier for the command associated with this tool. + */ + getCommandId(): string; + + /** + * The human-readable title for the refactor action. + */ + getTitle(): string; + + /** + * Returns an array of ChangeObject types that this tool can handle. + * e.g., ['RENAME_CLASS', 'MOVE_CLASS'] + */ + getHandledChangeTypes(): string[]; + + /** + * Checks if the tool can be manually triggered in the given context. + * This is used to populate the Code Actions (lightbulb) menu. + */ + canHandleManualTrigger(context: ManualRefactorContext): Promise; + + /** + * --- For Automatic Refactoring --- + * Analyzes a file diff and returns a list of changes this tool is responsible for. + * This method has NO side effects. + */ + analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges?: ChangeObject[]): ChangeObject[]; + + /** + * --- For Manual Refactoring --- + * Handles user interaction for a manual refactor (e.g., showing an input box) + * and returns a single ChangeObject if the user proceeds. + */ + initiateManualRefactor(context: ManualRefactorContext): Promise; + + /** + * --- For All Refactoring --- + * Takes a ChangeObject and generates all necessary text edits for the refactor. + * This method has NO side effects. + */ + prepareEdit(change: ChangeObject, cache: MetadataCache): Promise; + + /** + * --- Post-Refactoring --- + * Executes a custom prompt in VS Code's chat interface after a successful refactoring operation. + * This allows each tool to provide context-specific guidance or information about the refactoring. + */ + executePrompt?(change: ChangeObject): Promise; +} diff --git a/vs-code-extension/src/refactor/tools/addDecorator.ts b/vs-code-extension/src/refactor/tools/addDecorator.ts new file mode 100644 index 0000000..feac7de --- /dev/null +++ b/vs-code-extension/src/refactor/tools/addDecorator.ts @@ -0,0 +1,128 @@ +import * as vscode from 'vscode'; +import { AddDecoratorPayload, ChangeObject, IRefactorTool, ManualRefactorContext } from '../refactorInterfaces'; +import { PropertyMetadata } from '../../cache/cache'; +import { isField, isModelFile } from '../../utils/metadata'; + +/** + * Tool for adding decorators to fields in Slingr model files. + * + * This refactor tool allows users to manually add TypeScript decorators to field definitions + * in model files. The tool handles the insertion of decorators with proper formatting and + * indentation, placing them on the line above the target field declaration. + */ +export class AddDecoratorTool implements IRefactorTool { + /** + * Returns the unique command identifier for this refactor tool. + * This ID is used to register the command with VS Code and identify + * the tool in the refactor system. + * + * @returns The command ID string used by VS Code + */ + public getCommandId(): string { + return 'slingr-vscode-extension.addDecorator'; + } + + /** + * Returns the human-readable title for this refactor tool. + * This title is displayed in VS Code's refactor menu and UI elements. + * + * @returns The display title for the tool + */ + public getTitle(): string { + return 'Add Decorator'; + } + + /** + * Returns the list of change types that this tool can handle. + * This is used by the refactor system to route changes to the appropriate tool. + * + * @returns Array of change type strings that this tool processes + */ + public getHandledChangeTypes(): string[] { + return ['ADD_DECORATOR']; + } + + /** + * Determines if this tool can handle a manual refactor trigger for the given context. + * + * This tool can be manually triggered when: + * - The file is a model file (contains model definitions) + * - The context contains valid metadata with a 'type' property + * - The metadata represents a field that can have decorators added + * + * @param context The manual refactor context containing URI and metadata + * @returns Promise True if the tool can handle the refactor, false otherwise + */ + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + if (context.metadata) { + return isModelFile(context.uri) && 'type' in context.metadata; + } + return false; + } + + /** + * This tool does not participate in automatic change detection. + * + * @returns Empty array since this tool doesn't detect automatic changes + */ + public analyze(): ChangeObject[] { + return []; + } + + /** + * Initiates a manual refactor operation to add a decorator to a field. + * + * This method is called by the CodeAction system when a user manually triggers + * the "Add Decorator" refactor. It creates a ChangeObject that describes the + * operation to be performed. + * + * @param context The manual refactor context containing the target URI and field metadata + * @param decoratorName The name of the decorator to add (without the @ symbol) + * @returns Promise A change object describing the refactor, or undefined if invalid + */ + public async initiateManualRefactor(context: ManualRefactorContext, decoratorName?: string): Promise { + if (!context.metadata) { + return undefined; + } + if (!decoratorName) { + return undefined; + } + const payload: AddDecoratorPayload = { + fieldMetadata: context.metadata as PropertyMetadata, + decoratorName, + isManual: true, + }; + return { + type: 'ADD_DECORATOR', + uri: context.uri, + description: `Add @${decoratorName} decorator to '${context.metadata.name}'.`, + payload, + }; + } + + /** + * Prepares the workspace edit for adding a decorator to a field. + * + * This method performs the actual text manipulation to insert the decorator + * in the correct location with proper formatting. + * + * @param change The change object containing the ADD_DECORATOR payload + * @returns Promise A workspace edit ready to be applied + */ + public async prepareEdit(change: ChangeObject): Promise { + if (change.type !== 'ADD_DECORATOR') { + throw new Error(`AddDecoratorTool can only handle ADD_DECORATOR changes, received: ${change.type}`); + } + const payload = change.payload; + const { fieldMetadata, decoratorName } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + const document = await vscode.workspace.openTextDocument(fieldMetadata.declaration.uri); + const fieldLine = document.lineAt(fieldMetadata.declaration.range.start.line); + const indentation = fieldLine.text.substring(0, fieldLine.firstNonWhitespaceCharacterIndex); + const textToInsert = `@${decoratorName}()\n${indentation}`; + const insertPosition = new vscode.Position(fieldMetadata.declaration.range.start.line, fieldMetadata.declaration.range.start.character); + workspaceEdit.insert(fieldMetadata.declaration.uri, insertPosition, textToInsert); + + return workspaceEdit; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/changeFieldType.ts b/vs-code-extension/src/refactor/tools/changeFieldType.ts new file mode 100644 index 0000000..7c2d6d7 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/changeFieldType.ts @@ -0,0 +1,488 @@ +import * as vscode from 'vscode'; +import { ChangeObject, IRefactorTool, ManualRefactorContext, ChangeFieldTypePayload, RenameModelPayload, RenameFieldPayload, ChangeType } from '../refactorInterfaces'; +import { FileMetadata, MetadataCache, PropertyMetadata } from '../../cache/cache'; +import { isModel, isModelFile, isField } from '../../utils/metadata'; +import { fieldTypeConfig } from '../../utils/fieldTypes'; + +/** + * A refactoring tool that handles changing field type decorators in model classes. + * + * This tool can automatically detect when field decorators or TypeScript types change + * and propose refactorings to keep them consistent. It supports manual refactoring + * through a Quick Pick menu and can handle special cases like converting primitive + * types to Choice fields with enum creation. + * + * Supported field types include: Choice, Html, Integer, LongText, Relationship, and Text. + * + * The tool provides two main scenarios: + * 1. Automatic detection of decorator/type mismatches during file analysis + * 2. Manual field type changes initiated by user commands + * + * Special handling is provided for Choice fields, where the tool can guide users + * through creating new enums and updating both the decorator and property type + * accordingly. + * @implements @see {@link IRefactorTool} + */ +export class ChangeFieldTypeTool implements IRefactorTool { + + private readonly availableTypes = Object.keys(fieldTypeConfig); + + public getCommandId(): string { + return 'slingr-vscode-extension.changeFieldType'; + } + + public getTitle(): string { + return 'Change Field Type'; + } + + public getHandledChangeTypes(): ChangeType[] { + return ['CHANGE_FIELD_TYPE']; + } + + private getTypeDecoratorName(prop: PropertyMetadata): string | undefined { + const decorator = prop.decorators.find(d => this.availableTypes.includes(d.name)); + return decorator?.name; + } + + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + if (!context.metadata) { + return false; + } + return (isModelFile(context.uri) && isField(context.metadata)); + } + + /** + * Analyzes changes between old and new file metadata to detect field type changes. + * + * This method compares model classes and their field properties between two versions + * of a file to identify when field types or decorators have been modified. It handles + * two main scenarios: + * 1. Explicit decorator changes by the user + * 2. TypeScript type changes that suggest a different decorator should be used + * + * The method also accounts for model and field renames that may have occurred + * through other refactoring tools by examining accumulated changes. + * + * @param oldFileMeta - The metadata from the previous version of the file + * @param newFileMeta - The metadata from the current version of the file + * @param accumulatedChanges - Array of changes from other refactoring tools that may affect model/field names + * @returns An array of ChangeObject instances representing detected field type changes + */ + public analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges: ChangeObject[] = []): ChangeObject[] { + const changes: ChangeObject[] = []; + if (!oldFileMeta || !newFileMeta || !isModelFile(newFileMeta.uri)) { + return []; + } + + const classRenames = new Map(); + const fieldRenamesByClass = new Map>(); + // Check for accumulated changes that may affect the analysis + for (const change of accumulatedChanges) { + if (change.type === 'RENAME_MODEL') { + const payload = change.payload; + if (payload.oldName && payload.newName) { + classRenames.set(payload.oldName, payload.newName); + } + } + if (change.type === 'RENAME_FIELD') { + const payload = change.payload; + if (payload.oldName && payload.newName) { + const className = payload.modelName; + if (!className) { continue; } + if (!fieldRenamesByClass.has(className)) { + fieldRenamesByClass.set(className, new Map()); + } + fieldRenamesByClass.get(className)!.set(payload.oldName, payload.newName); + } + } + } + + for (const oldClassName in oldFileMeta.classes) { + const oldClass = oldFileMeta.classes[oldClassName]; + const expectedNewClassName = classRenames.get(oldClassName) || oldClassName; + const newClass = newFileMeta.classes[expectedNewClassName]; + if (!newClass || !isModel(newClass) || !isModel(oldClass)) { + continue; + } + + const fieldRenames = fieldRenamesByClass.get(oldClassName) || new Map(); + for (const oldPropName in oldClass.properties) { + const oldProp = oldClass.properties[oldPropName]; + const expectedNewPropName = fieldRenames.get(oldPropName) || oldPropName; + const newProp = newClass.properties[expectedNewPropName]; + + if (!newProp || !isField(oldProp) || !isField(newProp)) { + continue; + } + const oldDecoratorName = this.getTypeDecoratorName(oldProp); + const newDecoratorName = this.getTypeDecoratorName(newProp); + const oldTsType = oldProp.type; + const newTsType = newProp.type; + + // Detect if the user explicitly changed the decorator + if (oldDecoratorName && newDecoratorName && oldDecoratorName !== newDecoratorName) { + const oldDecorator = oldProp.decorators.find(d => d.name === oldDecoratorName); + const payload: ChangeFieldTypePayload = { + isManual: false, + field: newProp, + newType: newDecoratorName, + oldDecorator + }; + changes.push({ + type: 'CHANGE_FIELD_TYPE', + uri: newFileMeta.uri, + description: `Decorator for '${newProp.name}' changed to '@${newDecoratorName}'.`, + payload + }); + } + // Detect if the user changed the TS type, but not the decorator + else if (oldTsType !== newTsType && oldDecoratorName === newDecoratorName) { + const suggestedDecorator = this.getDecoratorForType(newTsType); + // Propose a change only if the current decorator is not an appropriate one for the new type + if (suggestedDecorator && suggestedDecorator !== newDecoratorName) { + const oldDecorator = oldProp.decorators.find(d => d.name === oldDecoratorName); + const payload: ChangeFieldTypePayload = { + isManual: false, + field: newProp, + newType: suggestedDecorator, + oldDecorator + }; + changes.push({ + type: 'CHANGE_FIELD_TYPE', + uri: newFileMeta.uri, + description: `Type for '${newProp.name}' changed to '${newTsType}'. Suggest changing decorator to '@${suggestedDecorator}'.`, + payload + }); + } + } + } + } + return changes; + } + + /** + * Initiates a manual refactor operation to change the type of a field. + * + * This method validates that the provided context contains a valid field with a type decorator, + * prompts the user to select a new type from available options, and returns a change object + * that describes the refactor operation to be performed. + * + * @param context - The manual refactor context containing metadata about the field to be changed + * @returns A Promise that resolves to a ChangeObject describing the field type change operation, + * or undefined if the operation was cancelled or validation failed + * + * @throws Will show error messages via VS Code window if: + * - The context doesn't contain valid field metadata + * - No valid type decorator is found on the field + */ + public async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('type' in context.metadata) || !isField(context.metadata)) { + vscode.window.showErrorMessage('Could not find a valid field to change type.'); + return undefined; + } + + const field: PropertyMetadata = context.metadata; + const typeDecorator = field.decorators.find(d => this.availableTypes.includes(d.name)); + const fieldDecorator = field.decorators.find(d => d.name === 'Field'); + const targetDecorator = typeDecorator || fieldDecorator; + if (!targetDecorator) { + vscode.window.showErrorMessage('Could not find a valid decorator on this field.'); + return; + } + + const newType = await vscode.window.showQuickPick(this.availableTypes, { + placeHolder: `Select a new type for '${field.name}'`, + }); + if (!newType) { + return undefined; + } + + return { + type: 'CHANGE_FIELD_TYPE', + uri: context.uri, + description: `Change type of '${field.name}' to '${newType}'.`, + payload: { + isManual: true, + newType: newType, + field: field, + decoratorPosition: targetDecorator.position, + oldDecorator: typeDecorator // Will be undefined if only @Field exists + } + }; + } + + /** + * Prepares a workspace edit for changing a field type in the metadata. + * + * Handles two main scenarios: + * 1. Converting a primitive type to 'Choice' type, which requires creating an enum + * 2. All other type changes, which involve updating the decorator string and validating the new type + * + * @param change - The change object containing the new type, field information, and decorator position + * @param cache - The metadata cache used for constructing decorator strings + * @returns A promise that resolves to a WorkspaceEdit containing all necessary changes + */ + public async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + if (change.type !== 'CHANGE_FIELD_TYPE') { + throw new Error(`ChangeFieldTypeTool can only handle CHANGE_FIELD_TYPE changes, received: ${change.type}`); + } + + const payload = change.payload; + const { isManual, newType, field, decoratorPosition, oldDecorator } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + + let isReplacing = false; + let positionToActOn: vscode.Range | undefined; + + if (isManual) { + positionToActOn = decoratorPosition; + isReplacing = !!oldDecorator; + } else { + const typeDecorator = field?.decorators.find((d: any) => this.availableTypes.includes(d.name)); + if (typeDecorator) { + positionToActOn = typeDecorator.position; + isReplacing = true; + } else { + const anyDecorator = field?.decorators[0]; + if (anyDecorator) { + positionToActOn = anyDecorator.position; + isReplacing = false; + } + } + } + + if (!newType || !field || !positionToActOn) { + return workspaceEdit; + } + if (newType === 'Choice' && this.isPrimitiveType(field.type)) { + await this.applyChoiceEnumCreation(workspaceEdit, field, positionToActOn, change.uri); + } else { + let oldArgs = new Map(); + if (isManual && isReplacing) { + const document = await vscode.workspace.openTextDocument(change.uri); + const oldDecoratorText = document.getText(positionToActOn); + oldArgs = this.parseDecoratorArguments(oldDecoratorText); + } else if (!isManual && oldDecorator?.arguments) { + oldArgs = new Map(Object.entries(oldDecorator.arguments)); + } + + const newTypeConfig = fieldTypeConfig[newType]; + const transferredArgs = new Map(); + if (newTypeConfig) { + const newSupportedArgNames = new Set(newTypeConfig.supportedArgs?.map(arg => arg.name)); + for (const [key, value] of oldArgs.entries()) { + if (newSupportedArgNames.has(key)) { transferredArgs.set(key, value); } + } + } + + const decoratorString = newTypeConfig + ? newTypeConfig.buildDecoratorString(newType, transferredArgs) + : `@${newType}()`; + + if (isReplacing) { + workspaceEdit.replace(change.uri, positionToActOn, decoratorString); + } else { + const document = await vscode.workspace.openTextDocument(change.uri); + const decoratorLine = document.lineAt(positionToActOn.start.line); + const indentation = decoratorLine.text.substring(0, decoratorLine.firstNonWhitespaceCharacterIndex); + const textToInsert = `${decoratorString}\n${indentation}`; + workspaceEdit.insert(change.uri, positionToActOn.start, textToInsert); + } + + const typeCorrectionEdit = await this.validateAndCorrectType(field, newType, change.uri); + if (typeCorrectionEdit) { + workspaceEdit.replace(change.uri, typeCorrectionEdit.range, typeCorrectionEdit.newText); + } + } + return workspaceEdit; + } + + /** + * Applies a choice enum creation refactoring by generating a new enum type and updating the field decorator. + * + * This method performs the following operations: + * 1. Derives an enum name from the field name (capitalizing the first letter) + * 2. Prompts the user to input comma-separated enum values via an input box + * 3. Generates and inserts a new enum definition at the end of the file + * 4. Replaces the existing decorator with a new @Choice decorator that references the enum + * 5. Updates the property's type from 'string' to the new enum type + * + * @param workspaceEdit - The VS Code workspace edit to accumulate all text changes + * @param field - The property metadata containing information about the field being refactored + * @param decoratorPosition - The range position of the existing decorator to be replaced + * @param uri - The URI of the file being modified + * @returns A promise that resolves when all edit operations are complete + * + * @remarks + * - If the user cancels the input dialog or provides no values, the operation is aborted + * - Enum values are sanitized by trimming whitespace and removing internal spaces + * - The generated enum uses lowercase string values with PascalCase enum member names + * - Labels in the @Choice decorator are converted to title case for display purposes + */ + private async applyChoiceEnumCreation(workspaceEdit: vscode.WorkspaceEdit, field: PropertyMetadata, decoratorPosition: vscode.Range, uri: vscode.Uri) { + const enumName = field.name.charAt(0).toUpperCase() + field.name.slice(1); + const valuesString = await vscode.window.showInputBox({ + prompt: `Create enum '${enumName}' for field '${field.name}'. Enter comma-separated values.`, + placeHolder: "Example: ToDo, InProgress, Done" + }); + if (!valuesString) { + return; + } + const values = valuesString.split(',').map(v => v.trim().replace(/\s/g, '')).filter(v => v); + if (values.length === 0) { + return; + } + + // Generate the enum definition to be inserted at the end of the file + const enumMembers = values.map(v => ` ${v} = "${v.toLowerCase()}",`).join('\n'); + const enumString = `\n\nexport enum ${enumName} {\n${enumMembers}\n}`; + const document = await vscode.workspace.openTextDocument(uri); + const endOfFile = document.lineAt(document.lineCount - 1).range.end; + workspaceEdit.insert(uri, endOfFile, enumString); + + // Generate the new @Choice decorator + const labels = values.map(v => ` ${v}: "${this.toTitleCase(v)}"`).join(',\n'); + const decoratorString = `@Choice<${enumName}>({\n labels: {\n${labels}\n }\n })`; + workspaceEdit.replace(uri, decoratorPosition, decoratorString); + + // Create an edit to change the property's type from 'string' to the new enum name + const typeCorrectionEdit = await this.validateAndCorrectType(field, enumName, uri, true); + if (typeCorrectionEdit) { + workspaceEdit.replace(uri, typeCorrectionEdit.range, typeCorrectionEdit.newText); + } + } + + /** + * Validates and corrects the type of a field declaration in a TypeScript document. + * + * @param field - The property metadata containing type and declaration information + * @param newType - The new type to validate or apply to the field + * @param uri - The URI of the document containing the field declaration + * @param force - Whether to force the type change without validation (defaults to false) + * @returns A TextEdit object for replacing the field type, or undefined if no change is needed + * + * @remarks + * When force is false, the method determines the required type based on decorator rules. + * When force is true, it uses the newType directly. + * The method performs case-insensitive comparison to avoid unnecessary changes. + * + * @example + * ```typescript + * const edit = await validateAndCorrectType(fieldMetadata, 'string', documentUri); + * if (edit) { + * // Apply the text edit to change the field type + * } + * ``` + */ + private async validateAndCorrectType(field: PropertyMetadata, newType: string, uri: vscode.Uri, force: boolean = false): Promise { + const requiredType = force ? newType : this.getRequiredTypeForDecorator(newType); + if (!requiredType || field.type.toLowerCase() === requiredType.toLowerCase()) { + return undefined; + } + + try { + const document = await vscode.workspace.openTextDocument(uri); + const line = document.lineAt(field.declaration.range.start.line); + const typeRegex = new RegExp(`(:\\s*)${field.type}`); + const match = line.text.match(typeRegex); + + if (match && typeof match.index === 'number') { + const startPos = line.range.start.translate(0, match.index + match[1].length); + const endPos = startPos.translate(0, field.type.length); + return vscode.TextEdit.replace(new vscode.Range(startPos, endPos), requiredType); + } + } catch (e) { console.error(e); } + return undefined; + } + + private parseDecoratorArguments(decoratorText: string): Map { + const args = new Map(); + const match = decoratorText.match(/@\w+\(\s*(\{[\s\S]*\})\s*\)/); + if (!match || !match[1]) { + return args; + } + + const argBlock = match[1]; + // This regex captures key-value pairs. It's simplified and may need enhancing for complex values like nested objects. + const argRegex = /(\w+)\s*:\s*(?:'([^']*)'|"([^"]*)"|(\w+|[\d.]+))/g; + + let argMatch; + while ((argMatch = argRegex.exec(argBlock)) !== null) { + const key = argMatch[1]; + const value = argMatch[2] || argMatch[3] || argMatch[4]; + + if (value === 'true') { + args.set(key, true); + } else if (value === 'false') { + args.set(key, false); + } else if (!isNaN(Number(value))) { + args.set(key, Number(value)); + } else { + args.set(key, value); + } + } + return args; + } + + /** + * Maps TypeScript primitive types to their corresponding decorator names. + * + * @param tsType - The TypeScript type name (case-insensitive) + * @returns The corresponding decorator name, or undefined if no mapping exists + * + * @example + * ```typescript + * getDecoratorForType('string') // returns 'Text' + * getDecoratorForType('number') // returns 'Integer' + * getDecoratorForType('boolean') // returns undefined + * ``` + */ + private getDecoratorForType(tsType: string): string | undefined { + const lowerTsType = tsType.toLowerCase(); + for (const decoratorName in fieldTypeConfig) { + const config = fieldTypeConfig[decoratorName]; + if (config.mapsFromTsTypes?.includes(lowerTsType)) { + return decoratorName; + } + } + return undefined; +} + + /** + * Determines the required TypeScript type for a given decorator. + */ + /** + * Determines the required TypeScript type for a given decorator name. + * + * @param decoratorName - The name of the decorator to get the type for + * @returns The TypeScript type as a string, or undefined if the decorator is not recognized + * + * @example + * ```typescript + * getRequiredTypeForDecorator('Text') // returns 'string' + * getRequiredTypeForDecorator('Integer') // returns 'number' + * getRequiredTypeForDecorator('Unknown') // returns undefined + * ``` + */ + private getRequiredTypeForDecorator(decoratorName: string): string | undefined { + return fieldTypeConfig[decoratorName]?.requiredTsType; +} + + + /** + * Determines if the given type is a primitive JavaScript/TypeScript type. + * + * @param type - The type string to check (case-insensitive) + * @returns True if the type is 'string', 'number', or 'boolean'; false otherwise + */ + private isPrimitiveType(type: string): boolean { + return ['string', 'number', 'boolean'].includes(type.toLowerCase()); + } + + /** + * Converts a string from camelCase or PascalCase to Title Case. + */ + private toTitleCase(str: string): string { + return str.replace(/([A-Z])/g, ' $1').replace(/^./, (s) => s.toUpperCase()); + } +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/deleteDataSource.ts b/vs-code-extension/src/refactor/tools/deleteDataSource.ts new file mode 100644 index 0000000..2516557 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/deleteDataSource.ts @@ -0,0 +1,85 @@ +import * as vscode from 'vscode'; +import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteDataSourcePayload } from '../refactorInterfaces'; +import { FileMetadata, MetadataCache } from '../../cache/cache'; + +export class DeleteDataSourceTool implements IRefactorTool { + getCommandId(): string { + return 'slingr-vscode-extension.deleteDataSource'; + } + + getTitle(): string { + return 'Delete Data Source'; + } + + getHandledChangeTypes(): string[] { + return ['DELETE_DATA_SOURCE']; + } + + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + // Now we can check if the file actually contains a data source + const fileMeta = context.cache.getMetadataForFile(context.uri.fsPath); + return !!fileMeta && Object.keys(fileMeta.dataSources).length > 0; + } + + analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata): ChangeObject[] { + if (!oldFileMeta || newFileMeta !== undefined) { + return []; + } + + const oldDataSourceNames = Object.keys(oldFileMeta.dataSources); + if (oldDataSourceNames.length > 0) { + const dataSourceName = oldDataSourceNames[0]; + const payload: DeleteDataSourcePayload = { + dataSourceName, + urisToDelete: [oldFileMeta.uri], + isManual: false, + }; + return [{ + type: 'DELETE_DATA_SOURCE', + uri: oldFileMeta.uri, + description: `Delete data source '${dataSourceName}'`, + payload, + }]; + } + + return []; + } + + async initiateManualRefactor(context: ManualRefactorContext): Promise { + const fileMeta = context.cache.getMetadataForFile(context.uri.fsPath); + if (!fileMeta || Object.keys(fileMeta.dataSources).length === 0) { + vscode.window.showErrorMessage('No data source found in this file.'); + return; + } + + const dataSourceName = Object.keys(fileMeta.dataSources)[0]; + + const confirmation = await vscode.window.showWarningMessage( + `Are you sure you want to delete the data source '${dataSourceName}'? This action cannot be undone.`, + 'Yes, Delete' + ); + + if (confirmation !== 'Yes, Delete') { + return; + } + + const payload: DeleteDataSourcePayload = { + dataSourceName, + urisToDelete: [context.uri], + isManual: true, + }; + + return { + type: 'DELETE_DATA_SOURCE', + uri: context.uri, + description: `Delete data source '${dataSourceName}'`, + payload, + }; + } + + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.deleteFile(change.uri); + return workspaceEdit; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/deleteField.ts b/vs-code-extension/src/refactor/tools/deleteField.ts new file mode 100644 index 0000000..970ea99 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/deleteField.ts @@ -0,0 +1,368 @@ +import * as vscode from 'vscode'; +import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteFieldPayload, ChangeType, RenameModelPayload, RenameFieldPayload } from '../refactorInterfaces'; +import { FileMetadata, MetadataCache, PropertyMetadata } from '../../cache/cache'; +import { isModel, isModelFile, isField, isPositionWithinRange } from '../../utils/metadata'; +import { areRangesEqual } from '../../utils/metadata'; +import * as fs from 'fs'; + +/** + * Tool for handling field deletion from an model in TypeScript applications. + * + * This tool provides functionality to: + * - Detect when a field property is removed from an model class + * - Handle manual deletion commands triggered by users + * - Clean up references to the deleted field throughout the codebase + * + * The tool operates in two modes: + * 1. **Automatic detection**: Analyzes file changes to detect when field properties are removed. + * 2. **Manual trigger**: Allows users to explicitly delete fields via a command. + * + * When a field is deleted, the tool: + * - For manual deletion, removes the entire property declaration (including decorators). + * - For both modes, identifies all references to the field and replaces them with a placeholder comment. + * + * @example + * // Manual usage: + * // 1. Position the cursor on a field property within an model class. + * // 2. Execute the "Delete Field" command. + * // 3. Review changes in the Refactor Preview panel and apply. + * @implements @see {@link IRefactorTool} + */ +export class DeleteFieldTool implements IRefactorTool { + public getCommandId(): string { + return 'slingr-vscode-extension.deleteField'; + } + + public getTitle(): string { + return 'Delete Field'; + } + + public getHandledChangeTypes(): ChangeType[] { + return ['DELETE_FIELD']; + } + + /** + * Determines if this tool can be triggered manually in the given context. + * @param context The context for the manual refactoring. + * @returns True if the context metadata represents a valid field. + */ + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + if (!context.metadata) { + return false; + } + return (isModelFile(context.uri) && isField(context.metadata)); + } + + + /** + * Analyzes file metadata changes to detect field deletions. + * + * This method compares the properties of an model class between two versions of a file. + * A field deletion is detected when a property that is a field is present in the old + * metadata but not in the new. It accounts for model/field renames that may have + * occurred in the same operation. It also includes a heuristic to avoid false positives + * during active typing by checking the line content. + * + * @param oldFileMeta The metadata of the file before the change. + * @param newFileMeta The metadata of the file after the change. + * @param accumulatedChanges Changes from other tools that have already been detected. + * @returns An array of `ChangeObject` instances for any detected field deletions. + */ + public analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges: ChangeObject[] = []): ChangeObject[] { + const changes: ChangeObject[] = []; + if (!oldFileMeta || !newFileMeta || !isModelFile(newFileMeta.uri)) { + return []; + } + + const classRenames = new Map(); + const renamedFieldsByClass = new Map>(); + + for (const change of accumulatedChanges) { + if (change.type === 'RENAME_MODEL') { + const payload = change.payload; + if (payload.oldName && payload.newName) { + classRenames.set(payload.oldName, payload.newName); + } + } + if (change.type === 'RENAME_FIELD') { + const payload = change.payload; + if (payload.oldName && payload.modelName) { + const oldClassName = payload.modelName; + if (!renamedFieldsByClass.has(oldClassName)) { + renamedFieldsByClass.set(oldClassName, new Set()); + } + renamedFieldsByClass.get(oldClassName)!.add(payload.oldName); + } + } + } + + for (const oldClassName in oldFileMeta.classes) { + const oldClass = oldFileMeta.classes[oldClassName]; + const expectedNewClassName = classRenames.get(oldClassName) || oldClassName; + const newClass = newFileMeta.classes[expectedNewClassName]; + + if (!newClass || !isModel(oldClass) || !isModel(newClass)) { + continue; + } + + const oldProps = oldClass.properties; + const newProps = newClass.properties; + const removedPropNames = Object.keys(oldProps).filter(name => !(name in newProps)); + + const renamedInThisClass = renamedFieldsByClass.get(oldClassName); + + let newFileLines: string[] | undefined; + try { + const newFileText = fs.readFileSync(newFileMeta.uri.fsPath, 'utf8'); + newFileLines = newFileText.split(/\r?\n/); + } catch { + // If we can't read the file we proceed without the heuristic. + } + + for (const removedPropName of removedPropNames) { + if (renamedInThisClass?.has(removedPropName)) { + continue; + } + + const oldProp = oldProps[removedPropName]; + if (isField(oldProp)) { + if (newFileLines) { + const start = oldProp.declaration.range.start; + if (start.line < newFileLines.length) { + const lineText = newFileLines[start.line]; + const afterCol = lineText.slice(start.character).trimStart(); + + if (afterCol.startsWith(':') || afterCol.startsWith('!:')) { + return []; + } + } + } + const payload: DeleteFieldPayload = { + oldFieldMetadata: oldProp, + modelName: newClass.name, + isManual: false + }; + changes.push({ + type: 'DELETE_FIELD', + uri: newFileMeta.uri, + description: `Field '${oldProp.name}' was deleted from Model '${newClass.name}'.`, + payload + }); + } + } + } + return changes; + } + + /** + * Initiates a manual refactor to delete a field. + * + * This method validates that the context contains a valid field and then constructs + * a `ChangeObject` for the deletion. + * @param context The manual refactor context. + * @returns A promise that resolves to a `ChangeObject` for the deletion, or `undefined` if validation fails. + */ + public async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('type' in context.metadata) || !isField(context.metadata)) { + vscode.window.showErrorMessage('Could not find a valid field to delete.'); + return undefined; + } + + const field: PropertyMetadata = context.metadata; + + // Find the model name by getting the file metadata and looking for the class containing this field + const fileMetadata = context.cache.getMetadataForFile(context.uri.fsPath); + let modelName = 'Unknown'; + if (fileMetadata) { + for (const [className, classData] of Object.entries(fileMetadata.classes)) { + if (classData.properties[field.name] === field) { + modelName = className; + break; + } + } + } + + const payload: DeleteFieldPayload = { + oldFieldMetadata: field, + modelName: modelName, + isManual: true + }; + + return { + type: 'DELETE_FIELD', + uri: context.uri, + description: `Delete field '${field.name}'.`, + payload + }; + } + + /** + * Prepares a workspace edit for deleting a field. + * + * For manual deletions, this method creates an edit to remove the entire field + * declaration from the source file, including its decorators. + * + * For both manual and automatic deletions, it finds all references to the field + * (excluding the declaration itself) and replaces them with a placeholder comment. + * + * @param change The change object containing deletion details. + * @param cache The metadata cache (not used in this method). + * @returns A promise that resolves to a `WorkspaceEdit` with all necessary changes. + */ + public async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'DELETE_FIELD') { + throw new Error(`DeleteFieldTool can only handle DELETE_FIELD changes, received: ${change.type}`); + } + + const payload = change.payload; + const { oldFieldMetadata, isManual } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + const field: PropertyMetadata = oldFieldMetadata; + + if (!field?.declaration?.range) { + throw new Error(`Cannot delete field '${field.name}'; metadata is incomplete.`); + } + + if (field.references) { + for (const ref of field.references) { + // Skip references that are the field declaration itself + if (ref.uri.fsPath === field.declaration.uri.fsPath && areRangesEqual(ref.range, field.declaration.range)) { + continue; + } + + // Skip references that are within the field's own decorators + if (this.isReferenceWithinFieldDecorators(ref, field)) { + continue; + } + + workspaceEdit.replace(ref.uri, ref.range, '/* DELETED_FIELD_REFERENCE */'); + } + } + + if (isManual) { + let startPosition = field.declaration.range.start; + if (field.decorators && field.decorators.length > 0) { + for (const decorator of field.decorators) { + if (decorator.position && decorator.position.start.isBefore(startPosition)) { + startPosition = decorator.position.start; + } + } + } + + const doc = await vscode.workspace.openTextDocument(field.declaration.uri); + const endLine = doc.lineAt(field.declaration.range.end.line); + const fullRangeToDelete = new vscode.Range(startPosition, endLine.rangeIncludingLineBreak.end); + + workspaceEdit.delete(field.declaration.uri, fullRangeToDelete); + } + + return workspaceEdit; + } + + /** + * Checks if a reference is within the field's own decorators. + * This prevents conflicts when deleting a field that has references to itself + * in its decorator arguments (e.g., validation functions that reference the field). + * + * @param reference The reference to check + * @param field The field being deleted + * @returns True if the reference is within the field's decorators, false otherwise + */ + private isReferenceWithinFieldDecorators(reference: vscode.Location, field: PropertyMetadata): boolean { + // If the reference is not in the same file as the field, it can't be in the decorators + if (reference.uri.fsPath !== field.declaration.uri.fsPath) { + return false; + } + + // Check if the reference is within any of the field's decorators + if (field.decorators && field.decorators.length > 0) { + for (const decorator of field.decorators) { + if (decorator.position && isPositionWithinRange(reference.range.start, decorator.position)) { + return true; + } + } + } + + return false; + } + + /** + * Executes a prompt to help fix broken field references after a field deletion. + * + * This method generates and executes a chat prompt that guides the user through + * fixing code references that were broken when a field was deleted from an model. + * The prompt includes information about the deleted field, affected model, and + * lists of modified file paths where broken references may exist. + * + * @param change - The change object containing details about the field deletion + * + * @returns A promise that resolves when the chat command has been executed + * + * @throws Will log an error to console if the chat command fails to execute + */ + public async executePrompt(change: ChangeObject): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'DELETE_FIELD') { + console.error(`DeleteFieldTool can only execute prompts for DELETE_FIELD changes, received: ${change.type}`); + return; + } + + const payload = change.payload; + const { modelName, oldFieldMetadata } = payload; + const fieldName = oldFieldMetadata?.name || 'unknown'; + const fieldType = oldFieldMetadata?.type || 'unknown'; + + // Build decorator information for context + let decoratorInfo = ''; + if (oldFieldMetadata?.decorators && oldFieldMetadata.decorators.length > 0) { + const decoratorNames = oldFieldMetadata.decorators.map(d => `@${d.name}`).join(', '); + decoratorInfo = `\n\nThe deleted field had the following decorators: ${decoratorNames}`; + } + + // Count references for better context + const referenceCount = oldFieldMetadata?.references?.length || 0; + const referenceInfo = referenceCount > 0 + ? `\n\nThis field was referenced in ${referenceCount} location(s) throughout the codebase.` + : ''; + + const prompt = `## Field Deletion - Code Cleanup Required + +I have deleted the field **\`${fieldName}: ${fieldType}\`** from the model **\`${modelName}\`**.${decoratorInfo}${referenceInfo} + +**Problem:** This deletion has left broken references in the code, which are now marked with \`/* DELETED_FIELD_REFERENCE */\` comments. + +**Your Task:** Help me fix these broken references by analyzing each occurrence and providing specific solutions. + +### Instructions: + +1. **Search for all occurrences** of \`/* DELETED_FIELD_REFERENCE */\` in the workspace +2. **For each occurrence, analyze the context** and determine the best fix: + - **Remove the entire line/statement** if it's no longer needed + - **Replace with alternative field** if there's a suitable replacement + - **Refactor the logic** if the code needs to be restructured + - **Add null checks or default values** if the field was optional + +3. **Provide specific, actionable solutions** for each broken reference: + - Show the **exact file and line number** + - Provide **before/after code snippets** + - Explain **why** each change is recommended + +4. **Ask for confirmation** before applying any changes + +### Common Patterns to Consider: +- Database queries that reference the deleted field +- Form validations that check the field +- API responses that include the field +- Tests that assert on the field value +- UI components that display the field + +Please analyze each broken reference systematically and provide clear, implementable solutions.`; + + try { + await vscode.commands.executeCommand('workbench.action.chat.open', prompt); + } catch (error) { + console.error('Failed to open chat with custom prompt:', error); + } + } +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/deleteModel.ts b/vs-code-extension/src/refactor/tools/deleteModel.ts new file mode 100644 index 0000000..4c50554 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/deleteModel.ts @@ -0,0 +1,598 @@ +import * as vscode from "vscode"; +import { ChangeObject, IRefactorTool, ManualRefactorContext, DeleteModelPayload, ChangeType, RenameModelPayload } from "../refactorInterfaces"; +import { DecoratedClass, FileMetadata, MetadataCache, PropertyMetadata } from "../../cache/cache"; +import { isModel, isModelFile, isField, isPositionWithinRange } from "../../utils/metadata"; + +/** + * Tool for handling model deletion in TypeScript applications. + * + * This tool provides functionality to: + * - Detect when model files are deleted from the workspace + * - Handle manual deletion commands triggered by users + * - Clean up references to deleted models throughout the codebase + * - Delete related directories such as actions and UI components + * - Remove relationship fields in other models that reference the deleted model + * + * The tool operates in two modes: + * 1. **Automatic detection**: Analyzes file changes to detect when model files are removed + * 2. **Manual trigger**: Allows users to explicitly delete models via command + * + * When an model is deleted, the tool: + * - Identifies all references to the model across the workspace and removes them + * - Schedules the model file and related directories for deletion + * - Coordinates with the RefactorController to handle actual file/directory deletion + * + * @example + * // Manual usage: + * // 1. Right-click an model file in the explorer or open it and use the command palette + * // 2. Execute "Delete Model" command and confirm + * // 3. Review changes in Refactor Preview panel and apply + * @implements @see {@link IRefactorTool} + */ +export class DeleteModelTool implements IRefactorTool { + public getCommandId(): string { + return "slingr-vscode-extension.deleteModel"; + } + + public getTitle(): string { + return "Delete Model"; + } + + public getHandledChangeTypes(): ChangeType[] { + return ["DELETE_MODEL"]; + } + + /** + * Determines if this tool can be triggered manually in the given context. + * @param context The context for the manual refactoring. + * @returns True if the context URI points to an model file and contains valid model metadata. + */ + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + if (isModelFile(context.uri)) { + return !!context.metadata && "decorators" in context.metadata && isModel(context.metadata); + } + return false; + } + + /** + * Analyzes file metadata changes to detect when an model has been deleted. + * + * @param oldFileMeta - The metadata of the file before changes, containing class information + * @param newFileMeta - The metadata of the file after changes, or undefined if file was deleted + * @returns An array of ChangeObject instances. Returns DELETE_MODEL change objects for each deleted model + * + * @remarks + * This method performs the following checks: + * - Validates that oldFileMeta exists and represents an model file + * - Extracts all model classes from the old file metadata + * - Determines which models were deleted by comparing old and new metadata + * - Handles both full file deletion and selective model deletion within files + * - For each deleted model, collects related URIs that should also be removed (actions and UI directories) + * - Returns DELETE_MODEL change objects for each deleted model + */ + public analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges: ChangeObject[] = []): ChangeObject[] { + if (!oldFileMeta || !isModelFile(oldFileMeta.uri)) { + return []; + } + + const oldModelClasses = Object.values(oldFileMeta.classes).filter(isModel); + if (oldModelClasses.length === 0) { + return []; + } + + const changes: ChangeObject[] = []; + const newModelClasses = newFileMeta ? Object.values(newFileMeta.classes).filter(isModel) : []; + const newModelNames = new Set(newModelClasses.map(cls => cls.name)); + + for (const oldModelClass of oldModelClasses) { + // Check if this model was already handled by a rename operation + const wasRenamed = accumulatedChanges.some(change => { + if (change.type === 'RENAME_MODEL') { + const payload = change.payload as RenameModelPayload; + return payload.oldName === oldModelClass.name; + } + return false; + }); + + if (wasRenamed) { + // Model was renamed, not deleted + return []; + } + + const isModelDeleted = !newModelNames.has(oldModelClass.name); + + if (isModelDeleted) { + const urisToDelete: vscode.Uri[] = []; + const modelUri = oldFileMeta.uri; + const modelNameLower = oldModelClass.name.toLowerCase(); + const workspaceFolder = vscode.workspace.getWorkspaceFolder(modelUri); + + // Only delete the entire file if this was the only model in the file + const wasOnlyModel = oldModelClasses.length === 1; + if (wasOnlyModel) { + urisToDelete.push(modelUri); + } + + // Always collect related directories for deletion + if (workspaceFolder) { + const parentDirsToSearch = ["src/data/actions", "src/ui"]; + for (const parentDir of parentDirsToSearch) { + const relatedDirUri = vscode.Uri.joinPath(workspaceFolder.uri, parentDir, modelNameLower); + urisToDelete.push(relatedDirUri); + } + } + + const payload: DeleteModelPayload = { + oldModelMetadata: oldModelClass, + urisToDelete: urisToDelete, + isManual: false + }; + + changes.push({ + type: "DELETE_MODEL", + uri: oldFileMeta.uri, + description: `Model '${oldModelClass.name}' was deleted.`, + payload, + }); + } + } + + return changes; + } + + /** + * Initiates a manual refactor to delete an model. + * + * This method validates that the context contains a valid model and constructs a `ChangeObject` + * for the deletion. The change object includes the URIs of related directories to be deleted. + * If multiple models exist in the same file, only the specific model will be deleted, not the entire file. + * + * @param context The manual refactor context. + * @returns A promise that resolves to a `ChangeObject` for the deletion, or `undefined` if validation fails. + */ + public async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !("decorators" in context.metadata) || !isModel(context.metadata)) { + vscode.window.showErrorMessage("Could not find a valid model to delete."); + return undefined; + } + const model = context.metadata as DecoratedClass; + + // Check if there are multiple models in the same file + const fileMeta = context.cache.getMetadataForFile(context.uri.fsPath); + const allModelsInFile = fileMeta ? Object.values(fileMeta.classes).filter(isModel) : []; + const hasMultipleModels = allModelsInFile.length > 1; + + const urisToDelete: vscode.Uri[] = []; + const modelUri = context.uri; + + // Only delete the entire file if this is the only model in the file + if (!hasMultipleModels) { + urisToDelete.push(modelUri); + } + + const modelNameLower = model.name.toLowerCase(); + const workspaceFolder = vscode.workspace.getWorkspaceFolder(modelUri); + if (workspaceFolder) { + const parentDirsToSearch = ["src/model/actions", "src/ui"]; + for (const parentDir of parentDirsToSearch) { + const relatedDirUri = vscode.Uri.joinPath(workspaceFolder.uri, parentDir, modelNameLower); + urisToDelete.push(relatedDirUri); + } + } + + const payload: DeleteModelPayload = { + oldModelMetadata: model, + isManual: true, + urisToDelete: urisToDelete, + }; + + return { + type: "DELETE_MODEL", + uri: context.uri, + description: `Delete model '${model.name}'.`, + payload, + }; + } + + /** + * Prepares a workspace edit for deleting an model. + * + * This method performs several cleanup tasks: + * 1. If multiple models exist in the same file, removes only the specific model class + * 2. If it's the only model in the file, the entire file will be deleted via urisToDelete + * 3. Removes all external references to the deleted model + * 4. Cleans up relationship fields in other models that reference the deleted model + * + * @param change The change object containing deletion details. + * @param cache The metadata cache for looking up other models. + * @returns A promise that resolves to a `WorkspaceEdit` with all necessary changes. + */ + public async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'DELETE_MODEL') { + throw new Error(`DeleteModelTool can only handle DELETE_MODEL changes, received: ${change.type}`); + } + + const payload = change.payload; + const { oldModelMetadata } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + const urisToDelete: vscode.Uri[] = payload.urisToDelete || []; + const pathsToDelete = new Set(urisToDelete.map((uri) => uri.fsPath)); + const deletedModelName = oldModelMetadata.name; + const allReferences = (oldModelMetadata.references as vscode.Location[]) || []; + + // Check if we need to delete just the class or the entire file + const isEntireFileBeingDeleted = urisToDelete.some(uri => uri.fsPath === change.uri.fsPath); + + if (!isEntireFileBeingDeleted) { + // Multiple models in file - delete only the specific model class + await this.deleteModelClassFromFile(change.uri, oldModelMetadata, workspaceEdit); + } + + // Filter out references that are in files/directories being deleted + const externalReferences = allReferences.filter((ref) => { + for (const path of pathsToDelete) { + if (ref.uri.fsPath.startsWith(path)) { + return false; + } + } + + // If we're doing partial class deletion (not deleting the entire file), + // filter out references within the same file since deleteModelClassFromFile handles those + if (!isEntireFileBeingDeleted && ref.uri.fsPath === change.uri.fsPath) { + return false; + } + + // Filter out references within the model's own decorators to avoid conflicts + if (this.isReferenceWithinModelDecorators(ref, oldModelMetadata)) { + return false; + } + + return true; + }); + + // Remove external references to the deleted model + for (const ref of externalReferences) { + try { + const doc = await vscode.workspace.openTextDocument(ref.uri); + const line = doc.lineAt(ref.range.start.line); + if (!line.isEmptyOrWhitespace) { + workspaceEdit.delete(ref.uri, line.rangeIncludingLineBreak); + } + } catch (e) { + console.error(`Could not process reference in ${ref.uri.fsPath}:`, e); + workspaceEdit.replace(ref.uri, ref.range, "/* DELETED_REFERENCE */"); + } + } + + await this.cleanupRelationshipFields(deletedModelName, workspaceEdit, cache); + return workspaceEdit; + } + + /** + * Deletes a specific model class from a file that contains multiple models. + * This method calculates the exact range of the class declaration including + * its decorators, imports, and related code, then removes only that portion. + * It also cleans up any unused imports that were only used by the deleted model. + * + * @param fileUri - The URI of the file containing the model + * @param modelMetadata - The metadata of the model to delete + * @param workspaceEdit - The workspace edit to add the deletion to + */ + private async deleteModelClassFromFile( + fileUri: vscode.Uri, + modelMetadata: DecoratedClass, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + try { + const document = await vscode.workspace.openTextDocument(fileUri); + const text = document.getText(); + const lines = text.split('\n'); + + // Find the class declaration range + const classDeclaration = modelMetadata.declaration; + const startLine = classDeclaration.range.start.line; + const endLine = classDeclaration.range.end.line; + + // Extend the range to include decorators above the class + let actualStartLine = startLine; + + // Look backwards to find decorators and comments that belong to this class + for (let i = startLine - 1; i >= 0; i--) { + const line = lines[i].trim(); + if (line === '' || line.startsWith('//') || line.startsWith('/*') || line.endsWith('*/')) { + // Empty lines, single-line comments, or comment blocks - continue looking + actualStartLine = i; + } else if (line.startsWith('@')) { + // Decorator - include it + actualStartLine = i; + } else { + // Found non-empty, non-comment, non-decorator line - stop here + break; + } + } + + // Look forward to find the complete class body (including closing brace) + let actualEndLine = endLine; + let braceCount = 0; + let foundOpenBrace = false; + + for (let i = startLine; i < lines.length; i++) { + const line = lines[i]; + + for (const char of line) { + if (char === '{') { + braceCount++; + foundOpenBrace = true; + } else if (char === '}') { + braceCount--; + if (foundOpenBrace && braceCount === 0) { + actualEndLine = i; + break; + } + } + } + + if (foundOpenBrace && braceCount === 0) { + break; + } + } + + // Include any trailing empty lines that belong to this class + while (actualEndLine + 1 < lines.length && lines[actualEndLine + 1].trim() === '') { + actualEndLine++; + } + + // Create the range to delete (include the newline of the last line) + const rangeToDelete = new vscode.Range( + new vscode.Position(actualStartLine, 0), + new vscode.Position(actualEndLine + 1, 0) + ); + + workspaceEdit.delete(fileUri, rangeToDelete); + + } catch (error) { + console.error(`Error deleting model class from file ${fileUri.fsPath}:`, error); + // Fallback: just comment out the class declaration + workspaceEdit.replace(fileUri, modelMetadata.declaration.range, `/* DELETED_MODEL: ${modelMetadata.name} */`); + } + } + + /** + * Finds and removes relationship fields in other models that reference the deleted model. + * + * It iterates through all models in the cache, checks their fields, and if a + * relationship field points to the model being deleted, it schedules the removal + * of the entire field including all its decorators and the property declaration. + * @param deletedModelName The name of the model being deleted. + * @param workspaceEdit The workspace edit to add changes to. + * @param cache The metadata cache to find all other models. + */ + private async cleanupRelationshipFields( + deletedModelName: string, + workspaceEdit: vscode.WorkspaceEdit, + cache: MetadataCache + ): Promise { + const allModels = cache.findMetadata( + item => 'properties' in item && item.decorators.some(d => d.name === 'Model') + ) as DecoratedClass[]; + + for (const model of allModels) { + if (model.name === deletedModelName) { + continue; + } + + for (const property of Object.values(model.properties)) { + const relationshipDecorator = property.decorators.find(d => d.name === 'Relationship'); + const fieldDecorator = property.decorators.find(d => d.name === 'Field'); + + // If this property has both @Relationship and @Field decorators, + // it's a relationship field that should be removed when the referenced model is deleted + if (relationshipDecorator && fieldDecorator) { + if (property.type === deletedModelName || property.type === `Array<${deletedModelName}>`) { + await this.removeRelationshipField(property, workspaceEdit); + } + } + } + } + } + + /** + * Removes the entire relationship field including its decorators and property declaration. + * + * This method uses the cached metadata to identify the exact ranges of decorators and deletes them. + * + * @param field The property metadata for the relationship field. + * @param workspaceEdit The workspace edit to add changes to. + */ + private async removeRelationshipField( + field: PropertyMetadata, + workspaceEdit: vscode.WorkspaceEdit + ): Promise { + try { + if (!field.declaration) { + console.warn(`Cannot remove relationship field '${field.name}'; no declaration found.`); + return; + } + + const doc = await vscode.workspace.openTextDocument(field.declaration.uri); + const rangesToDelete: vscode.Range[] = []; + // Add decorator ranges from cache + for (const decorator of field.decorators) { + const decoratorLine = doc.lineAt(decorator.position.start.line); + const lineText = decoratorLine.text.trim(); + const decoratorText = doc.getText(decorator.position).trim(); + + if (lineText === decoratorText) { + // Decorator is alone on the line, delete the entire line + rangesToDelete.push(decoratorLine.rangeIncludingLineBreak); + } else { + // Decorator shares the line, delete only the decorator + rangesToDelete.push(decorator.position); + } + } + + // Apply all deletions + for (const range of rangesToDelete) { + workspaceEdit.delete(field.declaration.uri, range); + } + + } catch (e) { + console.error(`Could not remove relationship field '${field.name}':`, e); + } + } + + /** + * Checks if a reference is within the model's own decorators or any of its field decorators. + * This prevents conflicts when deleting a model that has references to itself + * in its class decorators or field decorators. + * + * @param reference The reference to check + * @param modelMetadata The model being deleted + * @returns True if the reference is within the model's decorators, false otherwise + */ + private isReferenceWithinModelDecorators(reference: vscode.Location, modelMetadata: DecoratedClass): boolean { + // If the reference is not in the same file as the model, it can't be in the decorators + if (reference.uri.fsPath !== modelMetadata.declaration.uri.fsPath) { + return false; + } + + // Check if the reference is within the model's class decorators + if (modelMetadata.decorators && modelMetadata.decorators.length > 0) { + for (const decorator of modelMetadata.decorators) { + if (decorator.position && isPositionWithinRange(reference.range.start, decorator.position)) { + return true; + } + } + } + + // Check if the reference is within any field's decorators + if (modelMetadata.properties) { + for (const property of Object.values(modelMetadata.properties)) { + if (property.decorators && property.decorators.length > 0) { + for (const decorator of property.decorators) { + if (decorator.position && isPositionWithinRange(reference.range.start, decorator.position)) { + return true; + } + } + } + } + } + + return false; + } + + /** + * Executes a custom prompt in VS Code's chat interface after a successful refactoring operation. + * This allows each tool to provide context-specific guidance or information about the refactoring. + */ + /** + * Executes a prompt to help users fix broken references after deleting an model. + * + * This method opens VS Code's chat interface with a detailed prompt that guides the user + * through fixing remaining broken references that may exist after an model deletion. + * The prompt includes information about the deleted model and affected file paths. + * + * @param change - The change object containing metadata about the deleted model + * + * @returns A promise that resolves when the chat command is executed successfully + * + * @throws Will log an error to console if the chat command fails to execute + */ + public async executePrompt(change: ChangeObject): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'DELETE_MODEL') { + console.error(`DeleteModelTool can only execute prompts for DELETE_MODEL changes, received: ${change.type}`); + return; + } + + const payload = change.payload as DeleteModelPayload; + const { oldModelMetadata, urisToDelete } = payload; + const modelName = oldModelMetadata?.name || 'unknown'; + + // Build decorator information for context + let decoratorInfo = ''; + if (oldModelMetadata?.decorators && oldModelMetadata.decorators.length > 0) { + const decoratorNames = oldModelMetadata.decorators.map(d => `@${d.name}`).join(', '); + decoratorInfo = `\n\nThe deleted model had the following decorators: ${decoratorNames}`; + } + + // Count references and properties for better context + const referenceCount = oldModelMetadata?.references?.length || 0; + const propertyCount = Object.keys(oldModelMetadata?.properties || {}).length; + const referenceInfo = referenceCount > 0 + ? `\n\nThis model was referenced in ${referenceCount} location(s) throughout the codebase.` + : ''; + + const propertyInfo = propertyCount > 0 + ? ` It had ${propertyCount} field(s).` + : ''; + + // Build information about deleted files and directories + let deletedFilesInfo = ''; + if (urisToDelete && urisToDelete.length > 0) { + const deletedPaths = urisToDelete.map(uri => uri.fsPath).join('\n- '); + deletedFilesInfo = `\n\n**Files and directories that were deleted:**\n- ${deletedPaths}`; + } + + const prompt = `## Model Deletion - Code Cleanup Required + +I have deleted the model **\`${modelName}\`**.${decoratorInfo}${referenceInfo}${propertyInfo}${deletedFilesInfo} + +**What was automatically cleaned up:** +- Model source file and related directories (actions, UI components) +- Relationship fields in other models that referenced this model +- Most direct references to the model class + +**Problem:** Some broken references may still remain, marked with these comments: +- \`/* DELETED_REFERENCE */\` - General references to the deleted model +- \`/* DELETED_MODEL */\` - Field decorators that referenced the model + +**Your Task:** Help me identify and fix these remaining broken references. + +### Instructions: + +1. **Search for all occurrences** of the following comment patterns: + - \`/* DELETED_REFERENCE */\` + - \`/* DELETED_MODEL */\` + +2. **For each occurrence, analyze the context** and determine the best fix: + - **Remove import statements** if the model was being imported + - **Remove entire lines/statements** if they're no longer needed + - **Update type definitions** if the model was used as a type + - **Fix API endpoints** that were returning or accepting the model + - **Remove or update tests** that were testing the deleted model + - **Clean up configuration files** that referenced the model + +3. **Provide specific, actionable solutions** for each broken reference: + - Show the **exact file and line number** + - Provide **before/after code snippets** + - Explain **why** each change is recommended + +4. **Ask for confirmation** before applying any changes + +### Common Areas to Check: +- **Import/Export statements**: Remove imports of the deleted model +- **Type annotations**: Replace with appropriate alternatives +- **API routes**: Remove endpoints that handled the model +- **Database migrations**: Clean up related migration files +- **Test files**: Remove or update tests for the deleted model +- **Configuration files**: Remove model references from configs +- **Documentation**: Update docs that mentioned the model +- **Service classes**: Remove methods that operated on the model + +### Priority Order: +1. **Critical**: Import statements and type errors that break compilation +2. **High**: API endpoints and service methods that would cause runtime errors +3. **Medium**: Tests and documentation references +4. **Low**: Comments and non-functional references + +Please analyze each broken reference systematically and provide clear, implementable solutions.`; + + try { + await vscode.commands.executeCommand('workbench.action.chat.open', prompt ); + } catch (error) { + console.error('Failed to open chat with custom prompt:', error); + } + } +} diff --git a/vs-code-extension/src/refactor/tools/renameDataSource.ts b/vs-code-extension/src/refactor/tools/renameDataSource.ts new file mode 100644 index 0000000..b1346ec --- /dev/null +++ b/vs-code-extension/src/refactor/tools/renameDataSource.ts @@ -0,0 +1,140 @@ +import * as vscode from 'vscode'; +import { ChangeObject, IRefactorTool, ManualRefactorContext, RenameDataSourcePayload } from '../refactorInterfaces'; +import { FileMetadata, MetadataCache } from '../../cache/cache'; +import { areRangesEqual } from '../../utils/metadata'; + +export class RenameDataSourceTool implements IRefactorTool { + getCommandId(): string { + return 'slingr-vscode-extension.renameDataSource'; + } + + getTitle(): string { + return 'Rename Data Source'; + } + + getHandledChangeTypes(): string[] { + return ['RENAME_DATA_SOURCE']; + } + + async canHandleManualTrigger(context: ManualRefactorContext): Promise { + const fileMeta = context.cache.getMetadataForFile(context.uri.fsPath); + return !!fileMeta && Object.keys(fileMeta.dataSources).length > 0; + } + + analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata): ChangeObject[] { + if (!oldFileMeta || !newFileMeta) { + return []; + } + + const oldDataSourceNames = Object.keys(oldFileMeta.dataSources); + const newDataSourceNames = Object.keys(newFileMeta.dataSources); + + const removed = oldDataSourceNames.filter(name => !newDataSourceNames.includes(name)); + const added = newDataSourceNames.filter(name => !oldDataSourceNames.includes(name)); + + if (removed.length === 1 && added.length === 1) { + const oldName = removed[0]; + const newName = added[0]; + const payload: RenameDataSourcePayload = { + oldName, + newName, + newUri: vscode.Uri.joinPath(oldFileMeta.uri, '..', `${newName}.ts`), + isManual: false, + }; + return [{ + type: 'RENAME_DATA_SOURCE', + uri: newFileMeta.uri, + description: `Rename data source '${oldName}' to '${newName}'`, + payload, + }]; + } + + return []; + } + + async initiateManualRefactor(context: ManualRefactorContext): Promise { + const fileMeta = context.cache.getMetadataForFile(context.uri.fsPath); + if (!fileMeta || Object.keys(fileMeta.dataSources).length === 0) { + vscode.window.showErrorMessage('No data source found in this file.'); + return; + } + + const oldName = Object.keys(fileMeta.dataSources)[0]; + + const newName = await vscode.window.showInputBox({ + prompt: `Rename data source '${oldName}'`, + value: oldName, + validateInput: (value) => { + if (!value) { + return 'Data source name cannot be empty'; + } + if (!/^[a-zA-Z0-9_]+$/.test(value)) { + return 'Invalid data source name. Only alphanumeric characters and underscores are allowed.'; + } + return null; + }, + }); + + if (!newName || newName === oldName) { + return; + } + + const payload: RenameDataSourcePayload = { + oldName, + newName, + newUri: vscode.Uri.joinPath(context.uri, '..', `${newName}.ts`), + isManual: true, + }; + + return { + type: 'RENAME_DATA_SOURCE', + uri: context.uri, + description: `Rename data source '${oldName}' to '${newName}'`, + payload, + }; + } + + async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + if (change.type !== 'RENAME_DATA_SOURCE') { + throw new Error(`RenameDataSourceTool can only handle RENAME_DATA_SOURCE changes, received: ${change.type}`); + } + const payload = change.payload; + const { oldName, newName, isManual } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + + const oldUri = change.uri; + const fileMeta = cache.getMetadataForFile(oldUri.fsPath); + const dataSourceMeta = fileMeta?.dataSources[oldName]; + + if (!dataSourceMeta) { + console.error(`Could not find metadata for data source '${oldName}'`); + return workspaceEdit; + } + + const declarationUri = dataSourceMeta.declaration.uri; + const declarationRange = dataSourceMeta.declaration.range; + + // Update all references EXCEPT the declaration itself (which is handled next) + for (const ref of dataSourceMeta.references) { + if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { + continue; + } + workspaceEdit.replace(ref.uri, ref.range, newName); + } + + // If it's a manual rename, we also need to change the declaration + if (isManual) { + workspaceEdit.replace(declarationUri, declarationRange, newName); + } + + // Rename the file if its name matches the old data source name + const oldFileName = oldUri.path.split('/').pop()?.replace('.ts', ''); + if (oldFileName === oldName) { + const newUri = vscode.Uri.joinPath(oldUri, '..', `${newName}.ts`); + workspaceEdit.renameFile(oldUri, newUri); + } + + return workspaceEdit; + } + +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/renameField.ts b/vs-code-extension/src/refactor/tools/renameField.ts new file mode 100644 index 0000000..eb0fb45 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/renameField.ts @@ -0,0 +1,237 @@ +import * as vscode from 'vscode'; +import { ChangeObject, ChangeType, DeleteFieldPayload, IRefactorTool, ManualRefactorContext, RenameModelPayload, RenameFieldPayload } from '../refactorInterfaces'; +import { DecoratedClass, FileMetadata, MetadataCache, PropertyMetadata } from '../../cache/cache'; +import { areRangesEqual, isModel, isModelFile, isField } from '../../utils/metadata'; + + +/** + * Tool for handling field property renaming within an model class. + * + * This tool provides functionality to: + * - Detect when a field property is renamed within an model class. + * - Handle manual rename commands triggered by users. + * - Update all references to the renamed field throughout the codebase. + * + * The tool operates in two modes: + * 1. **Automatic detection**: Analyzes file changes to detect property renames. + * 2. **Manual trigger**: Allows users to explicitly rename fields via a command. + * + * When a field is renamed, the tool updates the property declaration and all its usages. + * + * @example + * // Manual usage: + * // 1. Position the cursor on a field property name. + * // 2. Execute the "Rename Field" command and provide a new name. + * // 3. Review changes in the Refactor Preview panel and apply. + * @implements @see {@link IRefactorTool} + */ +export class RenameFieldTool implements IRefactorTool { + public getCommandId(): string { + return 'slingr-vscode-extension.renameField'; + } + + public getTitle(): string { + return 'Rename Field'; + } + + public getHandledChangeTypes(): ChangeType[] { + return ['RENAME_FIELD']; + } + + /** + * Determines if this tool can be triggered manually in the given context. + * @param context The context for the manual refactoring. + * @returns True if the context metadata represents a valid field. + */ + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + if (!context.metadata) { + return false; + } + return (isModelFile(context.uri) && isField(context.metadata)); + } + + /** + * Analyzes file metadata changes to detect field renames. + * + * A rename is detected by correlating removed and added properties within the same + * model class. It assumes that if an equal number of fields were removed and added, + * they correspond to renames. It accounts for model renames and field deletions + * that may have occurred in the same operation. + * + * @param oldFileMeta The metadata of the file before the change. + * @param newFileMeta The metadata of the file after the change. + * @param accumulatedChanges Changes from other tools that have already been detected. + * @returns An array of `ChangeObject` instances for any detected field renames. + */ + public analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges: ChangeObject[] = []): ChangeObject[] { + const changes: ChangeObject[] = []; + if (!oldFileMeta || !newFileMeta || !isModelFile(newFileMeta.uri)) { + return []; + } + + const classRenames = new Map(); + const deletedFieldsByClass = new Map>(); + for (const change of accumulatedChanges) { + if (change.type === 'RENAME_MODEL') { + const payload = change.payload; + if (payload.oldName && payload.newName) { + classRenames.set(payload.oldName, payload.newName); + } + } + if (change.type === 'DELETE_FIELD') { + const payload = change.payload; + if (payload.modelName && payload.oldFieldMetadata) { + const modelName = payload.modelName; + const fieldName = payload.oldFieldMetadata.name; + if (!deletedFieldsByClass.has(modelName)) { + deletedFieldsByClass.set(modelName, new Set()); + } + deletedFieldsByClass.get(modelName)!.add(fieldName); + } + } + } + + for (const oldClassName in oldFileMeta.classes) { + const oldClass = oldFileMeta.classes[oldClassName]; + const expectedNewClassName = classRenames.get(oldClassName) || oldClassName; + const newClass = newFileMeta.classes[expectedNewClassName]; + + if (!newClass || !isModel(newClass)) { + continue; + } + + const oldPropNames = new Set(Object.keys(oldClass.properties)); + const newPropNames = new Set(Object.keys(newClass.properties)); + const deletedInThisClass = deletedFieldsByClass.get(oldClassName); + + const removedProps = [...oldPropNames].filter(name => !newPropNames.has(name) && !deletedInThisClass?.has(name)); + const addedProps = [...newPropNames].filter(name => !oldPropNames.has(name)); + + if (removedProps.length > 0 && removedProps.length === addedProps.length) { + for (let i = 0; i < removedProps.length; i++) { + const oldProp = oldClass.properties[removedProps[i]]; + const newProp = newClass.properties[addedProps[i]]; + + if (isField(oldProp) && isField(newProp)) { + const payload: RenameFieldPayload = { + oldName: oldProp.name, + newName: newProp.name, + modelName: oldClassName, + oldFieldMetadata: oldProp, + isManual: false + }; + changes.push({ + type: 'RENAME_FIELD', + uri: newFileMeta.uri, + description: `Field '${oldProp.name}' was renamed to '${newProp.name}' in Model '${newClass.name}'.`, + payload + }); + } + } + } + } + return changes; + } + + /** + * Initiates a manual refactor to rename a field. + * + * This method validates that the context contains a valid field, then prompts the + * user for a new name. It validates the new name to ensure it's a valid property name. + * It also identifies the containing model for the field. + * + * @param context The manual refactor context. + * @returns A promise that resolves to a `ChangeObject` for the rename, or `undefined` if the user cancels or validation fails. + */ + public async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('type' in context.metadata) || !isField(context.metadata)) { + vscode.window.showErrorMessage('Cannot rename: Not a valid field.'); + return undefined; + } + + const field: PropertyMetadata = context.metadata; + + const newName = await vscode.window.showInputBox({ + prompt: `Rename field '${field.name}'`, + value: field.name, + validateInput: value => (value && /^[a-z][a-zA-Z0-9]*$/.test(value) ? null : 'Invalid field name.'), + }); + + if (!newName || newName === field.name) { + return undefined; + } + + let containingModel: DecoratedClass | undefined; + const filePath = context.uri.fsPath.replace(/\\/g, '/'); + const fileMeta = context.cache.getMetadataForFile(filePath); + if (fileMeta) { + for (const classData of Object.values(fileMeta.classes)) { + if (classData.properties[field.name]) { + containingModel = classData; + break; + } + } + } + + if (!containingModel) { + vscode.window.showErrorMessage('Could not determine the parent model for this field.'); + return undefined; + } + + + const payload: RenameFieldPayload = { + oldName: field.name, + newName: newName, + modelName: containingModel.name, + oldFieldMetadata: field, + isManual: true + }; + + return { + type: 'RENAME_FIELD', + uri: context.uri, + description: `Rename field '${field.name}' to '${newName}'.`, + payload + }; + } + + /** + * Prepares a workspace edit for renaming a field. + * + * This method creates edits to replace all references to the old field name with the new one. + * For manual refactors, it also includes an edit to rename the property declaration itself. + * Automatic refactors do not need to rename the declaration, as that change has already + * been made by the user in the file. + * + * @param change The change object containing rename details. + * @param cache The metadata cache (not used in this method). + * @returns A promise that resolves to a `WorkspaceEdit` with all necessary changes. + */ + public async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'RENAME_FIELD') { + throw new Error(`RenameFieldTool can only handle RENAME_FIELD changes, received: ${change.type}`); + } + + const payload = change.payload; + const { newName, oldFieldMetadata } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + const references = (oldFieldMetadata.references as vscode.Location[]) || []; + + const declarationUri = oldFieldMetadata.declaration.uri; + const declarationRange = oldFieldMetadata.declaration.range; + + for (const ref of references) { + if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { + continue; + } + workspaceEdit.replace(ref.uri, ref.range, newName); + } + + if (change.payload.isManual) { + workspaceEdit.replace(declarationUri, declarationRange, newName); + } + + return workspaceEdit; + } +} \ No newline at end of file diff --git a/vs-code-extension/src/refactor/tools/renameModel.ts b/vs-code-extension/src/refactor/tools/renameModel.ts new file mode 100644 index 0000000..a076dc6 --- /dev/null +++ b/vs-code-extension/src/refactor/tools/renameModel.ts @@ -0,0 +1,198 @@ +import * as vscode from 'vscode'; +import { ChangeObject, ChangeType, DeleteModelPayload, IRefactorTool, ManualRefactorContext, RenameModelPayload } from '../refactorInterfaces'; +import { DecoratedClass, FileMetadata, MetadataCache } from '../../cache/cache'; +import { areRangesEqual, isModel, isModelFile } from '../../utils/metadata'; + +/** + * Tool for handling model class renaming in TypeScript applications. + * + * This tool provides functionality to: + * - Detect when an model class is renamed within its file. + * - Handle manual rename commands triggered by users. + * - Update all references to the renamed model throughout the codebase. + * + * The tool operates in two modes: + * 1. **Automatic detection**: Analyzes file changes to detect class renames in model files. + * 2. **Manual trigger**: Allows users to explicitly rename models via a command. + * + * When an model is renamed, the tool updates the class declaration and all its usages. + * + * @example + * // Manual usage: + * // 1. Position the cursor on an model class name. + * // 2. Execute the "Rename Model" command and provide a new name. + * // 3. Review changes in the Refactor Preview panel and apply. + * @implements @see {@link IRefactorTool} + */ +export class RenameModelTool implements IRefactorTool { + public getCommandId(): string { + return 'slingr-vscode-extension.renameModel'; + } + + public getTitle(): string { + return 'Rename Model'; + } + + public getHandledChangeTypes(): ChangeType[] { + return ['RENAME_MODEL']; + } + + /** + * Determines if this tool can be triggered manually in the given context. + * @param context The context for the manual refactoring. + * @returns True if the context metadata represents a valid model class. + */ + public async canHandleManualTrigger(context: ManualRefactorContext): Promise { + return !!context.metadata && 'decorators' in context.metadata && isModel(context.metadata); + } + + /** + * Analyzes file metadata changes to detect model renames. + * + * A rename is detected when an model file has exactly one class removed and one + * class added between the old and new metadata. It accounts for models that + * might have been deleted by another tool in the same operation. + * + * @param oldFileMeta The metadata of the file before the change. + * @param newFileMeta The metadata of the file after the change. + * @returns An array containing a `ChangeObject` if a rename is detected, otherwise an empty array. + */ + public analyze(oldFileMeta?: FileMetadata, newFileMeta?: FileMetadata, accumulatedChanges: ChangeObject[] = []): ChangeObject[] { + if (!oldFileMeta || !newFileMeta || !isModelFile(newFileMeta.uri)) { + return []; + } + + const oldClassNames = new Set(Object.keys(oldFileMeta.classes)); + const newClassNames = new Set(Object.keys(newFileMeta.classes)); + const deletedClassNames = new Set(); + for (const change of accumulatedChanges) { + if (change.type === 'DELETE_MODEL') { + const payload = change.payload; + if (payload.oldModelMetadata) { + deletedClassNames.add(payload.oldModelMetadata.name); + } + } + } + + const removedClassNames = [...oldClassNames].filter(name => !newClassNames.has(name) && !deletedClassNames.has(name)); + const addedClassNames = [...newClassNames].filter(name => !oldClassNames.has(name)); + if (removedClassNames.length === 1 && addedClassNames.length === 1) { + const oldClass = oldFileMeta.classes[removedClassNames[0]]; + const newClass = newFileMeta.classes[addedClassNames[0]]; + + if (isModel(oldClass) && isModel(newClass)) { + const payload: RenameModelPayload = { + oldName: oldClass.name, + newName: newClass.name, + oldModelMetadata: oldClass, + newUri: undefined, + isManual: false + }; + + const oldFileName = oldFileMeta.uri.path.split('/').pop()?.replace('.ts', ''); + if (oldFileName === oldClass.name) { + const newUri = vscode.Uri.joinPath(oldFileMeta.uri, '..', `${newClass.name}.ts`); + payload.newUri = newUri; + } + + const change: ChangeObject = { + type: 'RENAME_MODEL', + uri: newFileMeta.uri, + description: `Model '${oldClass.name}' was renamed to '${newClass.name}'.`, + payload + }; + return [change]; + } + } + return []; + } + + /** + * Initiates a manual refactor to rename an model. + * + * This method validates that the context contains a valid model, then prompts the + * user for a new name. It validates the new name to ensure it's a valid class name. + * + * @param context The manual refactor context. + * @returns A promise that resolves to a `ChangeObject` for the rename, or `undefined` if the user cancels or provides an invalid name. + */ + public async initiateManualRefactor(context: ManualRefactorContext): Promise { + if (!context.metadata || !('decorators' in context.metadata) || !isModel(context.metadata)) { + vscode.window.showErrorMessage('Cannot rename: Not a valid model.'); + return undefined; + } + + const model: DecoratedClass = context.metadata; + const newName = await vscode.window.showInputBox({ + prompt: `Rename model '${model.name}'`, + value: model.name, + validateInput: value => (value && /^[A-Z][a-zA-Z0-9]*$/.test(value) ? null : 'Invalid model name.'), + }); + + if (!newName || newName === model.name) { + return undefined; + } + + const payload: RenameModelPayload = { + oldName: model.name, + newName: newName, + oldModelMetadata: model, + newUri: undefined, + isManual: true + }; + + const oldFileName = context.uri.path.split('/').pop()?.replace('.ts', ''); + if (oldFileName === model.name) { + const newUri = vscode.Uri.joinPath(context.uri, '..', `${newName}.ts`); + payload.newUri = newUri; + } + + const change: ChangeObject = { + type: 'RENAME_MODEL', + uri: context.uri, + description: `Rename model '${model.name}' to '${newName}'.`, + payload + }; + return change; + } + + /** + * Prepares a workspace edit for renaming an model. + * + * This method creates edits to replace all references to the old model name with the new one. + * For manual refactors, it also includes an edit to rename the class declaration itself. + * Automatic refactors do not need to rename the declaration, as that change has already + * been made by the user in the file. + * + * @param change The change object containing rename details. + * @param cache The metadata cache (not used in this method). + * @returns A promise that resolves to a `WorkspaceEdit` with all necessary changes. + */ + public async prepareEdit(change: ChangeObject, cache: MetadataCache): Promise { + // Type guard to ensure we're working with the correct payload type + if (change.type !== 'RENAME_MODEL') { + throw new Error(`RenameModelTool can only handle RENAME_MODEL changes, received: ${change.type}`); + } + + const payload = change.payload; + const { newName, oldModelMetadata } = payload; + const workspaceEdit = new vscode.WorkspaceEdit(); + + const references = (oldModelMetadata.references as vscode.Location[]) || []; + const declarationUri = oldModelMetadata.declaration.uri; + const declarationRange = oldModelMetadata.declaration.range; + + for (const ref of references) { + if (ref.uri.fsPath === declarationUri.fsPath && areRangesEqual(ref.range, declarationRange)) { + continue; + } + workspaceEdit.replace(ref.uri, ref.range, newName); + } + + if (change.payload.isManual) { + workspaceEdit.replace(declarationUri, declarationRange, newName); + } + + return workspaceEdit; + } +} \ No newline at end of file From 47d6a9bf4b39fc5ddcaf1f09756a72413e1520fb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:17:27 +0000 Subject: [PATCH 231/254] Complete CLI synchronization with core templates and configurations Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- .gitignore | 1 + cli/package.json | 8 +- .../.github/copilot-instructions.md.template | 17 ++ cli/src/templates/config/.gitignore | 95 ++++++++++ cli/src/templates/config/jest.config.ts | 33 ++++ cli/src/templates/config/jest.setup.ts | 1 + .../templates/config/tsconfig.json.template | 26 +++ .../templates/datasources/mysql.ts.template | 13 ++ .../datasources/postgres.ts.template | 13 ++ .../docs/app-description.md.template | 34 ++++ cli/src/templates/package.json.template | 29 ++++ cli/src/templates/src/SampleModel.ts | 82 +++++++++ cli/src/templates/src/index.ts | 4 + cli/src/templates/vscode/extensions.json | 3 + cli/src/templates/vscode/settings.json | 11 ++ cli_backup/.gitignore | 16 -- cli_backup/.npmignore | 7 - cli_backup/.prettierrc.json | 1 - cli_backup/README.md | 98 ----------- cli_backup/bin/dev.js | 5 - cli_backup/bin/run.js | 5 - cli_backup/eslint.config.mjs | 16 -- cli_backup/package.json | 80 --------- cli_backup/src/commands/create-app.ts | 156 ----------------- cli_backup/src/index.ts | 1 - cli_backup/src/project-structure.ts | 163 ------------------ cli_backup/tsconfig.json | 16 -- 27 files changed, 364 insertions(+), 570 deletions(-) create mode 100644 cli/src/templates/.github/copilot-instructions.md.template create mode 100644 cli/src/templates/config/.gitignore create mode 100644 cli/src/templates/config/jest.config.ts create mode 100644 cli/src/templates/config/jest.setup.ts create mode 100644 cli/src/templates/config/tsconfig.json.template create mode 100644 cli/src/templates/datasources/mysql.ts.template create mode 100644 cli/src/templates/datasources/postgres.ts.template create mode 100644 cli/src/templates/docs/app-description.md.template create mode 100644 cli/src/templates/package.json.template create mode 100644 cli/src/templates/src/SampleModel.ts create mode 100644 cli/src/templates/src/index.ts create mode 100644 cli/src/templates/vscode/extensions.json create mode 100644 cli/src/templates/vscode/settings.json delete mode 100644 cli_backup/.gitignore delete mode 100644 cli_backup/.npmignore delete mode 100644 cli_backup/.prettierrc.json delete mode 100644 cli_backup/README.md delete mode 100755 cli_backup/bin/dev.js delete mode 100755 cli_backup/bin/run.js delete mode 100644 cli_backup/eslint.config.mjs delete mode 100644 cli_backup/package.json delete mode 100644 cli_backup/src/commands/create-app.ts delete mode 100644 cli_backup/src/index.ts delete mode 100644 cli_backup/src/project-structure.ts delete mode 100644 cli_backup/tsconfig.json diff --git a/.gitignore b/.gitignore index 3afe9ed..da90df8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ vs-code-extension/node_modules/ # Keep package-lock.json at root and in each package # package-lock.json - removed this since it's needed for monorepo management +cli_backup/ diff --git a/cli/package.json b/cli/package.json index f66b6a7..1bf4623 100644 --- a/cli/package.json +++ b/cli/package.json @@ -17,7 +17,7 @@ "fs-extra": "^11.3.1", "inquirer": "^8.2.7", "js-yaml": "^4.1.0", - "slingr-framework": "workspace:*" + "slingr-framework": "github:slingr-stack/framework" }, "devDependencies": { "@eslint/compat": "^1", @@ -62,11 +62,7 @@ ], "topicSeparator": " " }, - "repository": { - "type": "git", - "url": "git+https://github.com/slingr-stack/framework.git", - "directory": "cli" - }, + "repository": "slingr-stack/cli", "scripts": { "build": "shx rm -rf dist && tsc -b", "lint": "eslint", diff --git a/cli/src/templates/.github/copilot-instructions.md.template b/cli/src/templates/.github/copilot-instructions.md.template new file mode 100644 index 0000000..4f469c3 --- /dev/null +++ b/cli/src/templates/.github/copilot-instructions.md.template @@ -0,0 +1,17 @@ +# GitHub Copilot Instructions for {{APP_NAME}} + +This is a {{APP_TYPE}} application built with Slingr. + +## Project Description +{{DESCRIPTION}} + +## Architecture +- Backend: {{HAS_BACKEND}} +- Frontend: {{HAS_FRONTEND}} +- Database: {{DB_TYPE}} + +## Development Guidelines +- Use TypeScript for all code +- Follow Slingr conventions and patterns +- Maintain clean, readable code with proper documentation +- Use the provided data models as starting points \ No newline at end of file diff --git a/cli/src/templates/config/.gitignore b/cli/src/templates/config/.gitignore new file mode 100644 index 0000000..cc80b62 --- /dev/null +++ b/cli/src/templates/config/.gitignore @@ -0,0 +1,95 @@ +# Dependencies +node_modules/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Build outputs +dist/ +build/ +*.tsbuildinfo + +# Environment files +.env +.env.local +.env.production +.env.staging + +# IDE files +.vscode/settings.json +.idea/ +*.swp +*.swo +*~ + +# OS generated files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Logs +logs/ +*.log + +# Runtime data +pids/ +*.pid +*.seed +*.pid.lock + +# Coverage directory used by tools like istanbul +coverage/ +*.lcov + +# nyc test coverage +.nyc_output/ + +# Dependency directories +jspm_packages/ + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test \ No newline at end of file diff --git a/cli/src/templates/config/jest.config.ts b/cli/src/templates/config/jest.config.ts new file mode 100644 index 0000000..42b6014 --- /dev/null +++ b/cli/src/templates/config/jest.config.ts @@ -0,0 +1,33 @@ +import type { Config } from "jest"; + +const config: Config = { + preset: "ts-jest", + testEnvironment: "node", + transform: { + '^.+\\.(ts|tsx|js|jsx)$': [ + 'ts-jest', + { + tsconfig: { + module: 'commonjs', + allowJs: true, + + }, + }, + ], + "^.+\\.[j]sx?$": "babel-jest" + }, + transformIgnorePatterns: [ + '/node_modules/(?!slingr-framework)', + ], + testMatch: ["/src/**/*.test.ts"], + moduleNameMapper: { + "#(.*)": "/node_modules/$1", + "slingr-framework": "/node_modules/slingr-framework", + }, + coverageProvider: "v8", + setupFilesAfterEnv: ["/jest.setup.ts"], + modulePaths: [""], + moduleDirectories: ["node_modules", ""], +}; + +module.exports = config; \ No newline at end of file diff --git a/cli/src/templates/config/jest.setup.ts b/cli/src/templates/config/jest.setup.ts new file mode 100644 index 0000000..359e0de --- /dev/null +++ b/cli/src/templates/config/jest.setup.ts @@ -0,0 +1 @@ +import 'reflect-metadata'; \ No newline at end of file diff --git a/cli/src/templates/config/tsconfig.json.template b/cli/src/templates/config/tsconfig.json.template new file mode 100644 index 0000000..9eb2db7 --- /dev/null +++ b/cli/src/templates/config/tsconfig.json.template @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "module": "node16", + "moduleResolution": "node16", + "target": "esnext", + "types": ["node", "jest"], + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "noUncheckedIndexedAccess": false, + "exactOptionalPropertyTypes": true, + "strict": true, + "jsx": "react-jsx", + "verbatimModuleSyntax": false, + "isolatedModules": true, + "noUncheckedSideEffectImports": true, + "moduleDetection": "force", + "skipLibCheck": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "./dist" + }, + "include": ["src/**/*", "test/**/*", "jest.config.js", "index.ts"], + "exclude": ["node_modules", "dist"] +} \ No newline at end of file diff --git a/cli/src/templates/datasources/mysql.ts.template b/cli/src/templates/datasources/mysql.ts.template new file mode 100644 index 0000000..30d1079 --- /dev/null +++ b/cli/src/templates/datasources/mysql.ts.template @@ -0,0 +1,13 @@ +import { TypeORMSqlDataSource } from 'slingr-framework' + +export const mysqlDataSource = new TypeORMSqlDataSource({ + type: 'mysql', + host: 'localhost', + port: 3306, + username: 'root', + password: 'root', + database: '{{APP_NAME}}', + synchronize: true, + logging: false, + managed: true +}) \ No newline at end of file diff --git a/cli/src/templates/datasources/postgres.ts.template b/cli/src/templates/datasources/postgres.ts.template new file mode 100644 index 0000000..63f4f08 --- /dev/null +++ b/cli/src/templates/datasources/postgres.ts.template @@ -0,0 +1,13 @@ +import { TypeORMSqlDataSource } from 'slingr-framework' + +export const postgresDataSource = new TypeORMSqlDataSource({ + type: 'postgres', + host: 'localhost', + port: 5432, + username: 'postgres', + password: 'postgres', + database: '{{APP_NAME}}', + synchronize: true, + logging: false, + managed: true +}) \ No newline at end of file diff --git a/cli/src/templates/docs/app-description.md.template b/cli/src/templates/docs/app-description.md.template new file mode 100644 index 0000000..2936589 --- /dev/null +++ b/cli/src/templates/docs/app-description.md.template @@ -0,0 +1,34 @@ +# {{APP_NAME}} + +## Overview +{{DESCRIPTION}} + +## Application Type +{{APP_TYPE}} + +## Architecture +- **Backend**: {{HAS_BACKEND}} +- **Frontend**: {{HAS_FRONTEND}} +- **Database**: {{DB_TYPE}} + +## Getting Started + +1. Install dependencies: + ```bash + npm install + ``` + +2. Start development: + ```bash + npm run dev + ``` + +3. Build for production: + ```bash + npm run build + ``` + +## Development +- Use TypeScript for all development +- Follow the established patterns in the `src/data` directory +- Refer to the GitHub Copilot instructions in `.github/copilot-instructions.md` \ No newline at end of file diff --git a/cli/src/templates/package.json.template b/cli/src/templates/package.json.template new file mode 100644 index 0000000..89107d3 --- /dev/null +++ b/cli/src/templates/package.json.template @@ -0,0 +1,29 @@ +{ + "name": "{{APP_NAME}}", + "version": "1.0.0", + "description": "{{DESCRIPTION}}", + "main": "dist/index.js", + "scripts": { + "build": "tsc", + "dev": "ts-node src/index.ts", + "test": "jest", + "test:watch": "jest --watch" + }, + "keywords": [ + "slingr", + "{{APP_KEYWORD}}" + ], + "author": "", + "license": "MIT", + "dependencies": { + "slingr-framework": "github:slingr-stack/framework" + }, + "devDependencies": { + "@types/jest": "^29.5.0", + "@types/node": "^20.0.0", + "jest": "^29.5.0", + "ts-jest": "^29.1.0", + "ts-node": "^10.9.0", + "typescript": "^5.0.0" + } +} \ No newline at end of file diff --git a/cli/src/templates/src/SampleModel.ts b/cli/src/templates/src/SampleModel.ts new file mode 100644 index 0000000..a04cd19 --- /dev/null +++ b/cli/src/templates/src/SampleModel.ts @@ -0,0 +1,82 @@ +import { Field, Text, Email, HTML, Boolean, Model, BaseModel } from "slingr-framework"; + +@Model({ + docs: "Represents a person", +}) +export class Person extends BaseModel { + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 30, + regex: /^[a-zA-Z]+$/, + regexMessage: "firstName must contain only letters", + }) + firstName!: string; + + @Field({ + required: true, + }) + @Text({ + minLength: 2, + maxLength: 30, + regex: /^[a-zA-Z]+$/, + regexMessage: "lastName must contain only letters", + }) + lastName!: string; + + @Field({}) + @Email() + email!: string; + + @Field({ + validation: (_: number, person: Person) => { + let errors = []; + if (person.age < 0 || person.age > 120) { + errors.push({ + constraint: "invalidAge", + message: "Age must be between 0 and 120", + }); + } + return errors; + }, + required: true, + }) + age!: number; + + + @Field({ + required: (person: Person) => { + return (person.age < 18); + }, + }) + @Email() + parentEmail!: string; + + + @Field({ + available: false, // This field should be excluded from JSON operations + docs: "Internal identifier not exposed in JSON" + }) + internalId!: string; + + @Field({ + required: false, + available: (person: Person) => { + return person.age >= 18; + }, + }) + phoneNumber!: string; + + @Field({}) + @HTML() + additionalInfo!: string; + + @Field({ + required: false, + }) + @Boolean() + isActive!: boolean; + +} \ No newline at end of file diff --git a/cli/src/templates/src/index.ts b/cli/src/templates/src/index.ts new file mode 100644 index 0000000..4f9c0b5 --- /dev/null +++ b/cli/src/templates/src/index.ts @@ -0,0 +1,4 @@ +export * from './data/SampleModel'; + +// Main entry point for the {{APP_NAME}} application +console.log('{{APP_NAME}} application initialized'); \ No newline at end of file diff --git a/cli/src/templates/vscode/extensions.json b/cli/src/templates/vscode/extensions.json new file mode 100644 index 0000000..55dfffc --- /dev/null +++ b/cli/src/templates/vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["github.copilot", "slingr.slingr"] +} \ No newline at end of file diff --git a/cli/src/templates/vscode/settings.json b/cli/src/templates/vscode/settings.json new file mode 100644 index 0000000..16714ba --- /dev/null +++ b/cli/src/templates/vscode/settings.json @@ -0,0 +1,11 @@ +{ + "editor.formatOnSave": true, + "editor.inlineSuggest.enabled": true, + "github.copilot.advanced": {}, + "github.copilot.enable": { + "*": true, + "markdown": true, + "plaintext": true + }, + "typescript.preferences.importModuleSpecifier": "relative" +} \ No newline at end of file diff --git a/cli_backup/.gitignore b/cli_backup/.gitignore deleted file mode 100644 index e0319f4..0000000 --- a/cli_backup/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -*-debug.log -*-error.log -**/.DS_Store -/.idea -/dist -/tmp -/node_modules -oclif.manifest.json - - - -yarn.lock -pnpm-lock.yaml - -package-lock.json -tsconfig.tsbuildinfo \ No newline at end of file diff --git a/cli_backup/.npmignore b/cli_backup/.npmignore deleted file mode 100644 index 70b1dfa..0000000 --- a/cli_backup/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -* -!bin/** -!dist/** -!oclif.manifest.json -!README.md -!package.json -!LICENSE \ No newline at end of file diff --git a/cli_backup/.prettierrc.json b/cli_backup/.prettierrc.json deleted file mode 100644 index ed9b7b5..0000000 --- a/cli_backup/.prettierrc.json +++ /dev/null @@ -1 +0,0 @@ -@oclif/prettier-config \ No newline at end of file diff --git a/cli_backup/README.md b/cli_backup/README.md deleted file mode 100644 index 1ed9e06..0000000 --- a/cli_backup/README.md +++ /dev/null @@ -1,98 +0,0 @@ -# Slingr CLI - -A command line tool for creating Slingr applications with TypeScript and best practices built-in. - -## How to test set-up? - -1. Clone repository - -```bash -git clone https://github.com/slingr-stack/cli.git -cd cli -``` - -2. Install dependencies, build and link - -```bash -npm install -npm run build -npm link -``` - -3. Execute - -```bash -slingr create-app -slingr --help -``` - -## Installation - -```bash -# Install globally -npm install -g @slingr/cli - -# Or use with npx (no installation required) -npx @slingr/cli create-app my-app -``` - -## Usage - -### Create a new application - -```bash -slingr create-app my-app -``` - -This command will: -1. Ask you questions about your application type and requirements -2. Create a project directory with the specified name -3. Set up a complete TypeScript project structure -4. Generate sample files and configurations -5. Configure VS Code settings and recommended extensions - -### Interactive Setup - -The CLI will ask you several questions to customize your project: - -- **Application Type**: What kind of app you're building (CRM, task manager, etc.) -- **Backend**: Whether you want to create a backend -- **Frontend**: Whether you want to create a frontend (only if backend is selected) -- **Description**: A detailed description of what your app should do - -## Generated Project Structure - -``` -your-app/ -├── .vscode/ -│ ├── extensions.json # Recommended VS Code extensions -│ └── settings.json # VS Code settings for optimal development -├── .github/ -│ └── copilot-instructions.md # GitHub Copilot context -├── src/ -│ └── data/ -│ ├── SampleModel.ts # Example data model -│ └── SampleModel.test.ts # Example tests -├── docs/ -│ └── app-description.md # Generated app documentation -├── package.json # Project configuration -└── tsconfig.json # TypeScript configuration -``` - -## Features - -- **TypeScript Setup**: Pre-configured TypeScript with strict settings -- **Testing**: Jest test framework with sample tests -- **Linting**: ESLint with TypeScript support -- **VS Code Integration**: Optimized settings and extension recommendations -- **GitHub Copilot**: Pre-configured with context instructions -- **Sample Code**: Working examples to get you started quickly - -## Development - -After creating your project: - -```bash -cd your-app -npm install -``` \ No newline at end of file diff --git a/cli_backup/bin/dev.js b/cli_backup/bin/dev.js deleted file mode 100755 index 0261e86..0000000 --- a/cli_backup/bin/dev.js +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning - -import {execute} from '@oclif/core' - -await execute({development: true, dir: import.meta.url}) \ No newline at end of file diff --git a/cli_backup/bin/run.js b/cli_backup/bin/run.js deleted file mode 100755 index 5f6cc73..0000000 --- a/cli_backup/bin/run.js +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env node - -import {execute} from '@oclif/core' - -await execute({dir: import.meta.url}) \ No newline at end of file diff --git a/cli_backup/eslint.config.mjs b/cli_backup/eslint.config.mjs deleted file mode 100644 index 07cbe89..0000000 --- a/cli_backup/eslint.config.mjs +++ /dev/null @@ -1,16 +0,0 @@ -import {includeIgnoreFile} from '@eslint/compat' -import oclif from 'eslint-config-oclif' -import prettier from 'eslint-config-prettier' -import path from 'node:path' -import {fileURLToPath} from 'node:url' - -const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore') - -export default [ - includeIgnoreFile(gitignorePath), - ...oclif, - prettier, - { - ignores: ['scripts/**', 'bin/**'], - }, -] \ No newline at end of file diff --git a/cli_backup/package.json b/cli_backup/package.json deleted file mode 100644 index f66b6a7..0000000 --- a/cli_backup/package.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "name": "@slingr/cli", - "description": "Slingr CLI tool for creating and managing Slingr applications", - "version": "0.0.0", - "author": "Francisco Devaux", - "bin": { - "slingr": "./bin/run.js" - }, - "bugs": "https://github.com/slingr-stack/cli/issues", - "dependencies": { - "@oclif/core": "^4", - "@oclif/plugin-help": "^6", - "@oclif/plugin-plugins": "^5", - "@types/fs-extra": "^11.0.4", - "@types/inquirer": "^8.2.12", - "@types/js-yaml": "^4.0.9", - "fs-extra": "^11.3.1", - "inquirer": "^8.2.7", - "js-yaml": "^4.1.0", - "slingr-framework": "workspace:*" - }, - "devDependencies": { - "@eslint/compat": "^1", - "@oclif/prettier-config": "^0.2.1", - "@oclif/test": "^4", - "@types/chai": "^4", - "@types/node": "^18", - "chai": "^4", - "eslint": "^9", - "eslint-config-oclif": "^6", - "eslint-config-prettier": "^10", - "oclif": "^4", - "shx": "^0.3.3", - "ts-node": "^10", - "typescript": "^5" - }, - "engines": { - "node": ">=18.0.0" - }, - "files": [ - "./bin", - "./dist", - "./oclif.manifest.json" - ], - "homepage": "https://github.com/slingr-stack/cli", - "keywords": [ - "slingr", - "cli", - "scaffolding", - "project-generator" - ], - "license": "MIT", - "main": "dist/index.js", - "type": "module", - "oclif": { - "bin": "slingr", - "dirname": "slingr", - "commands": "./dist/commands", - "plugins": [ - "@oclif/plugin-help", - "@oclif/plugin-plugins" - ], - "topicSeparator": " " - }, - "repository": { - "type": "git", - "url": "git+https://github.com/slingr-stack/framework.git", - "directory": "cli" - }, - "scripts": { - "build": "shx rm -rf dist && tsc -b", - "lint": "eslint", - "postpack": "shx rm -f oclif.manifest.json", - "posttest": "npm run lint", - "prepack": "oclif manifest && oclif readme", - "test": "mocha --forbid-only \"test/**/*.test.ts\"", - "version": "oclif readme && git add README.md" - }, - "types": "dist/index.d.ts" -} \ No newline at end of file diff --git a/cli_backup/src/commands/create-app.ts b/cli_backup/src/commands/create-app.ts deleted file mode 100644 index 6e19117..0000000 --- a/cli_backup/src/commands/create-app.ts +++ /dev/null @@ -1,156 +0,0 @@ -import { Args, Command, Flags } from '@oclif/core' -import fse from 'fs-extra' -import inquirer from 'inquirer' -import path from 'node:path' - -import { AppAnswers, createProjectStructure } from '../project-structure.js' - -export default class CreateApp extends Command { - static override args = { - name: Args.string({ - description: 'Name of the application to create', - required: false - }) - } - static override description = 'Create a new Slingr application' - static override examples = [ - '<%= config.bin %> <%= command.id %>', - '<%= config.bin %> <%= command.id %> my-app', - '<%= config.bin %> <%= command.id %> task-manager', - '<%= config.bin %> <%= command.id %> my-crm --type="CRM" --backend --frontend --database=postgres --description="A CRM system for managing customers"' - ] - static override flags = { - help: Flags.help({ char: 'h' }), - type: Flags.string({ - char: 't', - description: 'Type of application (e.g., CRM, task manager, ERP)', - }), - backend: Flags.boolean({ - char: 'b', - description: 'Include backend for the application', - allowNo: true - }), - frontend: Flags.boolean({ - char: 'f', - description: 'Include frontend for the application', - allowNo: true - }), - database: Flags.string({ - char: 'd', - description: 'Database to use (postgres or mysql)', - options: ['postgres', 'mysql'] - }), - description: Flags.string({ - char: 'D', - description: 'Description of what the application needs to do' - }) - } - - public async run(): Promise { - const { args, flags } = await this.parse(CreateApp) - let appName = args.name - - // If no name is provided, ask for it - if (!appName) { - const response = await inquirer.prompt<{ name: string }>([ - { - type: 'input', - name: 'name', - message: 'What is the name of your application?', - validate: async (input: string) => { - if (input.length === 0) return 'Please provide a name for your application' - const targetDir = path.join(process.cwd(), input) - if (await fse.pathExists(targetDir)) { - return `Directory ${input} already exists!` - } - return true - } - } - ]) - appName = response.name - } else { - // Check if directory already exists when name is provided as argument - const targetDir = path.join(process.cwd(), appName) - if (await fse.pathExists(targetDir)) { - this.error(`Directory ${appName} already exists!`) - } - } - - let answers: AppAnswers - - // Check if all flags are provided - const hasAllFlags = flags.type && - flags.backend !== undefined && - flags.frontend !== undefined && - flags.database && - flags.description - - if (hasAllFlags) { - // Use provided flags - answers = { - appType: flags.type!, - hasBackend: flags.backend!, - hasFrontend: flags.frontend!, - database: flags.database as 'postgres' | 'mysql', - description: flags.description! - } - } else { - this.log('') - this.log('Hi! Before we get started, we are going to ask you some information about your application.') - this.log('') - - // Interactive questions, pre-filling with any provided flags - answers = await inquirer.prompt([ - { - message: 'What type of application are you going to create? ', - name: 'appType', - suffix: "For example, a CRM, a task manager, an ERP, etc.\n", - type: 'input', - default: flags.type, - validate: (input: string) => input.length > 0 || 'Please provide an application type' - }, - { - default: flags.backend ?? true, - message: 'OK! Now, are you going to create a backend for your app?', - name: 'hasBackend', - type: 'confirm' - }, - { - default: flags.frontend ?? true, - message: 'Good! Do you also want to create the frontend with Slingr?', - name: 'hasFrontend', - type: 'confirm', - }, - { - type: 'list', - name: 'database', - message: 'Which database do you want to use?', - choices: [ - { name: 'PostgreSQL', value: 'postgres' }, - { name: 'MySQL', value: 'mysql' } - ], - default: flags.database || 'postgres' - }, - { - message: 'Perfect! Please, provide a description of what your app needs to do:\n', - name: 'description', - type: 'input', - default: flags.description, - validate: (input: string) => input.length > 0 || 'Please provide a description' - } - ]) - } - - this.log('') - this.log("That's very useful, thanks for the information!") - this.log('') - - // Create the project structure - await createProjectStructure(appName, answers) - - this.log(`Project ${appName} created successfully!`) - this.log(`To get started:`) - this.log(` cd ${appName}`) - this.log(` npm install`) - } -} \ No newline at end of file diff --git a/cli_backup/src/index.ts b/cli_backup/src/index.ts deleted file mode 100644 index 454cdc7..0000000 --- a/cli_backup/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {run} from '@oclif/core' \ No newline at end of file diff --git a/cli_backup/src/project-structure.ts b/cli_backup/src/project-structure.ts deleted file mode 100644 index 0327650..0000000 --- a/cli_backup/src/project-structure.ts +++ /dev/null @@ -1,163 +0,0 @@ -import fse from 'fs-extra' -import path from 'node:path' -import { fileURLToPath } from 'node:url' - -export interface AppAnswers { - appType: string - description: string - hasBackend: boolean - hasFrontend: boolean - database: string -} - -async function copyTemplateFile(templatePath: string, targetPath: string, replacements?: Record): Promise { - let content = await fse.readFile(templatePath, 'utf8') - - // Apply replacements if provided - if (replacements) { - for (const [placeholder, value] of Object.entries(replacements)) { - content = content.replaceAll(placeholder, value) - } - } - - await fse.outputFile(targetPath, content) -} - -export async function createProjectStructure(appName: string, answers: AppAnswers): Promise { - const targetDir = path.join(process.cwd(), appName) - const currentDir = path.dirname(fileURLToPath(import.meta.url)) - // When running from dist/, we need to go up one level to reach the project root - const projectRoot = path.resolve(currentDir, '..') - const templatesDir = path.join(projectRoot, 'src', 'templates') - - // Create directory structure - await fse.ensureDir(targetDir) - await fse.ensureDir(path.join(targetDir, '.vscode')) - await fse.ensureDir(path.join(targetDir, '.github')) - await fse.ensureDir(path.join(targetDir, 'src', 'data')) - await fse.ensureDir(path.join(targetDir, 'src', 'dataSources')) - await fse.ensureDir(path.join(targetDir, 'docs')) - - // Copy .vscode files from templates - await fse.copy( - path.join(templatesDir, 'vscode', 'extensions.json'), - path.join(targetDir, '.vscode', 'extensions.json') - ) - - await fse.copy( - path.join(templatesDir, 'vscode', 'settings.json'), - path.join(targetDir, '.vscode', 'settings.json') - ) - - // Copy tsconfig.json from templates - await copyTemplateFile( - path.join(templatesDir, 'config', 'tsconfig.json.template'), - path.join(targetDir, 'tsconfig.json') - ) - - // Copy .gitignore from templates - await fse.copy( - path.join(templatesDir, 'config', '.gitignore'), - path.join(targetDir, '.gitignore') - ) - - // Copy jest.config.ts from templates - await fse.copy( - path.join(templatesDir, 'config', 'jest.config.ts'), - path.join(targetDir, 'jest.config.ts') - ) - - // Copy jest.setup.ts from templates - await fse.copy( - path.join(templatesDir, 'config', 'jest.setup.ts'), - path.join(targetDir, 'jest.setup.ts') - ) - - // Copy and process src files from templates - const replacements = { - '{{APP_NAME}}': appName - } - - await copyTemplateFile( - path.join(templatesDir, 'src', 'index.ts'), - path.join(targetDir, 'src', 'index.ts'), - replacements - ) - - // Copiar el template de datasource correspondiente según el tipo de base de datos - if (answers.hasBackend) { - let dbType = answers.database.toLowerCase() - let templateFile = '' - let targetFile = '' - switch (dbType) { - case 'postgres': - case 'postgresql': - templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') - targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') - break - case 'mysql': - templateFile = path.join(templatesDir, 'dataSources', 'mysql.ts.template') - targetFile = path.join(targetDir, 'src', 'dataSources', 'mysql.ts') - break - // Agregar más casos si hay más templates - default: - templateFile = path.join(templatesDir, 'dataSources', 'postgres.ts.template') - targetFile = path.join(targetDir, 'src', 'dataSources', 'postgres.ts') - } - await copyTemplateFile( - templateFile, - targetFile, - { '{{APP_NAME}}': appName } - ) - } - - // Copy sample model files - await fse.copy( - path.join(templatesDir, 'src', 'SampleModel.ts'), - path.join(targetDir, 'src', 'data', 'SampleModel.ts') - ) - - await fse.copy( - path.join(templatesDir, 'src', 'SampleModel.test.ts'), - path.join(targetDir, 'src', 'data', 'SampleModel.test.ts') - ) - - // Copy templated .github/copilot-instructions.md - await copyTemplateFile( - path.join(templatesDir, '.github', 'copilot-instructions.md.template'), - path.join(targetDir, '.github', 'copilot-instructions.md'), - { - '{{APP_NAME}}': appName, - '{{APP_TYPE}}': answers.appType, - '{{DESCRIPTION}}': answers.description, - '{{HAS_BACKEND}}': answers.hasBackend ? 'Yes' : 'No', - '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Yes' : 'No', - '{{DB_TYPE}}': answers.database - } - ) - - // Copy package.json template - await copyTemplateFile( - path.join(templatesDir, 'package.json.template'), - path.join(targetDir, 'package.json'), - { - '{{APP_NAME}}': appName, - '{{DESCRIPTION}}': answers.description, - '{{APP_KEYWORD}}': answers.appType.toLowerCase().replaceAll(/\s+/g, '-') - } - ) - - // Copy docs/app-description.md template - await copyTemplateFile( - path.join(templatesDir, 'docs', 'app-description.md.template'), - path.join(targetDir, 'docs', 'app-description.md'), - { - '{{APP_NAME}}': appName, - '{{DESCRIPTION}}': answers.description, - '{{APP_TYPE}}': answers.appType, - '{{HAS_BACKEND}}': answers.hasBackend ? 'Included' : 'Not included', - '{{HAS_FRONTEND}}': answers.hasFrontend ? 'Included' : 'Not included', - '{{DB_TYPE}}': answers.database - } - ) -} \ No newline at end of file diff --git a/cli_backup/tsconfig.json b/cli_backup/tsconfig.json deleted file mode 100644 index b3afec4..0000000 --- a/cli_backup/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "module": "Node16", - "outDir": "dist", - "rootDir": "src", - "strict": true, - "target": "es2022", - "moduleResolution": "node16" - }, - "include": ["./src/**/*"], - "exclude": ["./src/templates/**/*"], - "ts-node": { - "esm": true - } -} \ No newline at end of file From c4591e40c55baf7264cfd398ba0d2db50cf63734 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:19:32 +0000 Subject: [PATCH 232/254] Complete CLI synchronization with SampleModel.test.ts template Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- cli/src/templates/src/SampleModel.test.ts | 289 ++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 cli/src/templates/src/SampleModel.test.ts diff --git a/cli/src/templates/src/SampleModel.test.ts b/cli/src/templates/src/SampleModel.test.ts new file mode 100644 index 0000000..629c1bf --- /dev/null +++ b/cli/src/templates/src/SampleModel.test.ts @@ -0,0 +1,289 @@ +import { Person } from './SampleModel'; + +describe('Person Model', () => { + describe('Validation Tests', () => { + it('should validate a valid adult person', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25, + phoneNumber: '123-456-7890', + additionalInfo: '

    Some info

    ', + isActive: true + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBe(0); + }); + + it('should validate a valid minor person with parent email', async () => { + const personData = { + firstName: 'Jane', + lastName: 'Smith', + email: 'jane@example.com', + age: 16, + parentEmail: 'parent@example.com', + additionalInfo: '

    Minor info

    ', + isActive: false + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBe(0); + }); + + it('should fail validation when firstName is too short', async () => { + const personData = { + firstName: 'J', + lastName: 'Doe', + email: 'john@example.com', + age: 25 + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const firstNameError = errors.find(e => e.property === 'firstName'); + expect(firstNameError).toBeDefined(); + expect(firstNameError?.constraints).toHaveProperty('minLength'); + }); + + it('should fail validation when firstName contains numbers', async () => { + const personData = { + firstName: 'John123', + lastName: 'Doe', + email: 'john@example.com', + age: 25 + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const firstNameError = errors.find(e => e.property === 'firstName'); + expect(firstNameError).toBeDefined(); + expect(firstNameError?.constraints).toHaveProperty('matches'); + }); + + it('should fail validation when email is invalid', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'invalid-email', + age: 25 + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const emailError = errors.find(e => e.property === 'email'); + expect(emailError).toBeDefined(); + expect(emailError?.constraints).toHaveProperty('isEmail'); + }); + + it('should fail validation when age is negative', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: -5 + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const ageError = errors.find(e => e.property === 'age'); + expect(ageError).toBeDefined(); + expect(ageError?.constraints).toHaveProperty('invalidAge'); + }); + + it('should fail validation when age is too high', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 150 + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const ageError = errors.find(e => e.property === 'age'); + expect(ageError).toBeDefined(); + expect(ageError?.constraints).toHaveProperty('invalidAge'); + }); + + it('should require parentEmail for minors', async () => { + const personData = { + firstName: 'Jane', + lastName: 'Smith', + email: 'jane@example.com', + age: 16 + // parentEmail missing + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + const parentEmailError = errors.find(e => e.property === 'parentEmail'); + expect(parentEmailError).toBeDefined(); + expect(parentEmailError?.constraints).toHaveProperty('isNotEmpty'); + }); + + it('should not require parentEmail for adults', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25 + // parentEmail not provided + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + // Should not have parentEmail error + const parentEmailError = errors.find(e => e.property === 'parentEmail'); + expect(parentEmailError).toBeUndefined(); + }); + }); + + describe('JSON Serialization Tests', () => { + it('should exclude internalId from JSON output', () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25, + internalId: 'secret-123', + isActive: true + }; + + const person = Person.fromJSON(personData); + const json = person.toJSON(); + + expect(json).not.toHaveProperty('internalId'); + expect(json).toHaveProperty('firstName', 'John'); + expect(json).toHaveProperty('lastName', 'Doe'); + expect(json).toHaveProperty('email', 'john@example.com'); + expect(json).toHaveProperty('age', 25); + expect(json).toHaveProperty('isActive', true); + }); + + it('should include phoneNumber for adults', () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25, + phoneNumber: '123-456-7890' + }; + + const person = Person.fromJSON(personData); + const json = person.toJSON(); + + expect(json).toHaveProperty('phoneNumber', '123-456-7890'); + }); + + it('should exclude phoneNumber for minors', () => { + const personData = { + firstName: 'Jane', + lastName: 'Smith', + email: 'jane@example.com', + age: 16, + parentEmail: 'parent@example.com', + phoneNumber: '123-456-7890' + }; + + const person = Person.fromJSON(personData); + const json = person.toJSON(); + + expect(json).not.toHaveProperty('phoneNumber'); + expect(json).toHaveProperty('firstName', 'Jane'); + expect(json).toHaveProperty('parentEmail', 'parent@example.com'); + }); + }); + + describe('Field Type Tests', () => { + it('should handle boolean field correctly', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25, + isActive: true + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBe(0); + expect(person.isActive).toBe(true); + }); + + it('should handle HTML field correctly', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 25, + additionalInfo: '

    This is HTML content

    ' + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBe(0); + expect(person.additionalInfo).toBe('

    This is HTML content

    '); + }); + }); + + describe('Edge Cases', () => { + it('should handle missing required fields', async () => { + const personData = { + // Missing firstName, lastName, age + email: 'john@example.com' + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBeGreaterThan(0); + + const firstNameError = errors.find(e => e.property === 'firstName'); + const lastNameError = errors.find(e => e.property === 'lastName'); + const ageError = errors.find(e => e.property === 'age'); + + expect(firstNameError).toBeDefined(); + expect(lastNameError).toBeDefined(); + expect(ageError).toBeDefined(); + }); + + it('should handle boundary age values', async () => { + const personData = { + firstName: 'John', + lastName: 'Doe', + email: 'john@example.com', + age: 18 // Boundary between minor and adult + }; + + const person = Person.fromJSON(personData); + const errors = await person.validate(); + + expect(errors.length).toBe(0); + + // At 18, parentEmail should not be required + const parentEmailError = errors.find(e => e.property === 'parentEmail'); + expect(parentEmailError).toBeUndefined(); + }); + }); +}); \ No newline at end of file From 809a3dd2aee6761f6c566f2b380bbc8f93746481 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:32:13 +0000 Subject: [PATCH 233/254] Initial plan From 5ea595276de3adbd8d775f55541c1ddea03ac631 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:34:24 +0000 Subject: [PATCH 234/254] Initial plan From 1817b460cdf33c645aef52b10560410612f3fb23 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:42:55 +0000 Subject: [PATCH 235/254] Add missing files from standalone vs-code-extension to files/vs-code-extension Co-authored-by: sebasmoyano <5084534+sebasmoyano@users.noreply.github.com> --- .../src/commands/createTest.ts | 90 ++ .../src/commands/fields/addField.ts | 582 ++++++++++++ .../src/commands/fields/defineFields.ts | 53 ++ .../src/commands/folders/deleteFolder.ts | 126 +++ .../src/commands/folders/newFolder.ts | 69 ++ .../src/commands/folders/renameFolder.ts | 204 +++++ .../src/commands/interfaces.ts | 137 +++ .../commands/models/createModelFromDesc.ts | 17 + .../src/commands/models/modifyModel.ts | 17 + .../src/commands/models/newModel.ts | 399 +++++++++ .../src/commands/newDataSource.ts | 135 +++ .../src/commands/setupLaunchConfig.ts | 49 + .../src/commands/setupTaskConfig.ts | 58 ++ .../infrastructure/infrastructureStatus.ts | 67 ++ .../src/services/fileSystemService.ts | 461 ++++++++++ .../src/services/projectAnalysisService.ts | 362 ++++++++ .../src/services/sourceCodeService.ts | 280 ++++++ .../src/services/userInputService.ts | 112 +++ .../src/test/addField.test.ts | 444 +++++++++ .../src/test/commands/newDataSource.test.ts | 255 ++++++ .../src/test/createTest.test.ts | 253 ++++++ files/vs-code-extension/src/test/index.ts | 39 + .../src/test/newFolder.test.ts | 205 +++++ .../src/test/newModel.test.ts | 578 ++++++++++++ .../infoPanelRegistration.test.ts | 130 +++ .../test/quickInfoPanel/integration.test.ts | 502 +++++++++++ .../quickInfoPanel/quickInfoProvider.test.ts | 215 +++++ .../src/test/quickInfoPanel/renderers.test.ts | 214 +++++ .../src/test/refactor/addDecorator.test.ts | 401 +++++++++ .../src/test/refactor/changeFieldType.test.ts | 585 ++++++++++++ .../test/refactor/deleteDataSource.test.ts | 333 +++++++ .../src/test/refactor/deleteField.test.ts | 480 ++++++++++ .../src/test/refactor/deleteModel.test.ts | 682 ++++++++++++++ .../test/refactor/refactorWorkflow.test.ts | 842 ++++++++++++++++++ .../test/refactor/renameDataSource.test.ts | 501 +++++++++++ .../src/test/refactor/renameField.test.ts | 744 ++++++++++++++++ .../src/test/refactor/renameModel.test.ts | 469 ++++++++++ .../src/test/renameFolder.test.ts | 203 +++++ files/vs-code-extension/src/test/runTest.ts | 26 + .../vs-code-extension/src/test/testHelpers.ts | 296 ++++++ 40 files changed, 11615 insertions(+) create mode 100644 files/vs-code-extension/src/commands/createTest.ts create mode 100644 files/vs-code-extension/src/commands/fields/addField.ts create mode 100644 files/vs-code-extension/src/commands/fields/defineFields.ts create mode 100644 files/vs-code-extension/src/commands/folders/deleteFolder.ts create mode 100644 files/vs-code-extension/src/commands/folders/newFolder.ts create mode 100644 files/vs-code-extension/src/commands/folders/renameFolder.ts create mode 100644 files/vs-code-extension/src/commands/interfaces.ts create mode 100644 files/vs-code-extension/src/commands/models/createModelFromDesc.ts create mode 100644 files/vs-code-extension/src/commands/models/modifyModel.ts create mode 100644 files/vs-code-extension/src/commands/models/newModel.ts create mode 100644 files/vs-code-extension/src/commands/newDataSource.ts create mode 100644 files/vs-code-extension/src/commands/setupLaunchConfig.ts create mode 100644 files/vs-code-extension/src/commands/setupTaskConfig.ts create mode 100644 files/vs-code-extension/src/infrastructure/infrastructureStatus.ts create mode 100644 files/vs-code-extension/src/services/fileSystemService.ts create mode 100644 files/vs-code-extension/src/services/projectAnalysisService.ts create mode 100644 files/vs-code-extension/src/services/sourceCodeService.ts create mode 100644 files/vs-code-extension/src/services/userInputService.ts create mode 100644 files/vs-code-extension/src/test/addField.test.ts create mode 100644 files/vs-code-extension/src/test/commands/newDataSource.test.ts create mode 100644 files/vs-code-extension/src/test/createTest.test.ts create mode 100644 files/vs-code-extension/src/test/index.ts create mode 100644 files/vs-code-extension/src/test/newFolder.test.ts create mode 100644 files/vs-code-extension/src/test/newModel.test.ts create mode 100644 files/vs-code-extension/src/test/quickInfoPanel/infoPanelRegistration.test.ts create mode 100644 files/vs-code-extension/src/test/quickInfoPanel/integration.test.ts create mode 100644 files/vs-code-extension/src/test/quickInfoPanel/quickInfoProvider.test.ts create mode 100644 files/vs-code-extension/src/test/quickInfoPanel/renderers.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/addDecorator.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/changeFieldType.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/deleteDataSource.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/deleteField.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/deleteModel.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/refactorWorkflow.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/renameDataSource.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/renameField.test.ts create mode 100644 files/vs-code-extension/src/test/refactor/renameModel.test.ts create mode 100644 files/vs-code-extension/src/test/renameFolder.test.ts create mode 100644 files/vs-code-extension/src/test/runTest.ts create mode 100644 files/vs-code-extension/src/test/testHelpers.ts diff --git a/files/vs-code-extension/src/commands/createTest.ts b/files/vs-code-extension/src/commands/createTest.ts new file mode 100644 index 0000000..d0c5b2f --- /dev/null +++ b/files/vs-code-extension/src/commands/createTest.ts @@ -0,0 +1,90 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import { MetadataCache, DecoratedClass } from "../cache/cache"; +import { AIService } from "../services/aiService"; + +export class CreateTestTool { + + constructor(private aiService:AIService) {} + public async createTest(targetUri: vscode.Uri, cache: MetadataCache): Promise { + try { + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + const modelName = modelClass.name; + const targetDirectory = path.dirname(document.uri.fsPath); + const testFileName = `${this.toCamelCase(modelName)}.test.ts`; + const testFilePath = path.join(targetDirectory, '..', '__tests__', testFileName); + const testFileUri = vscode.Uri.file(testFilePath); + + const overwrite = await this.checkIfFileExists(testFileUri, testFileName); + if (overwrite !== 'Overwrite') { + return; + } + + this.aiService.createTestWithAI(modelClass); + + } catch (error) { + vscode.window.showErrorMessage(`Failed to create test: ${error}`); + console.error('Error creating test:', error); + } + } + + private async validateAndPrepareTarget( + targetUri: vscode.Uri, + cache: MetadataCache + ): Promise<{ modelClass: DecoratedClass, document: vscode.TextDocument }> { + if (!targetUri.fsPath.endsWith('.ts')) { + throw new Error('Target file must be a TypeScript file (.ts)'); + } + + const document = await vscode.workspace.openTextDocument(targetUri); + const fileMetadata = cache.getMetadataForFile(targetUri.fsPath); + + if (!fileMetadata) { + throw new Error('No metadata found for this file. Make sure it contains a valid model class.'); + } + + const modelClasses = Object.values(fileMetadata.classes).filter( + (cls: DecoratedClass) => cls.decorators.some(d => d.name === 'Model') + ); + + if (modelClasses.length === 0) { + throw new Error('No model class found in this file. Make sure the class has a @Model decorator.'); + } + + if (modelClasses.length > 1) { + const choices = modelClasses.map((cls: DecoratedClass) => cls.name); + const selectedModel = await vscode.window.showQuickPick(choices, { + placeHolder: "Multiple model classes found. Select the target model:" + }); + + if (!selectedModel) { + throw new Error('No model selected'); + } + const modelClass = modelClasses.find((cls: DecoratedClass) => cls.name === selectedModel); + if (!modelClass) { + throw new Error('Selected model not found'); + } + return { modelClass, document }; + } + + return { modelClass: modelClasses[0], document }; + } + + private async checkIfFileExists(testFileUri: vscode.Uri, testFileName: string): Promise { + try { + await vscode.workspace.fs.stat(testFileUri); + return await vscode.window.showWarningMessage( + `Test file ${testFileName} already exists. Do you want to overwrite it?`, + 'Overwrite', + 'Cancel' + ); + } catch { + // File doesn't exist + } + return 'Overwrite'; + } + + private toCamelCase(str: string): string { + return str.charAt(0).toLowerCase() + str.slice(1); + } +} \ No newline at end of file diff --git a/files/vs-code-extension/src/commands/fields/addField.ts b/files/vs-code-extension/src/commands/fields/addField.ts new file mode 100644 index 0000000..8083aba --- /dev/null +++ b/files/vs-code-extension/src/commands/fields/addField.ts @@ -0,0 +1,582 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { DefineFieldsTool } from "../fields/defineFields"; +import { AIEnhancedTool, FIELD_TYPE_OPTIONS, FieldTypeOption, FieldInfo } from "../interfaces"; +import { detectIndentation, applyIndentation } from "../../utils/detectIndentation"; +import { AIService } from "../../services/aiService"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; + +/** + * Tool for adding new fields to existing Model classes. + * + * This tool provides both manual field creation and AI-enhanced field generation. + * It analyzes the target model, gathers user input, creates the basic field structure, + * and optionally enhances it with AI assistance based on user descriptions. + * + * @example + * ```typescript + * // Manual field addition: + * @Field() + * @Text() + * title: string; + * + * // AI-enhanced with description "user's full name with validation": + * @Field({ + * required: true + * }) + * @Text({ + * maxLength: 100 + * }) + * fullName: string; + * ``` + */ +export class AddFieldTool implements AIEnhancedTool { + private userInputService: UserInputService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + private fileSystemService: FileSystemService; + private defineFieldsTool: DefineFieldsTool; + + constructor() { + this.userInputService = new UserInputService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + this.fileSystemService = new FileSystemService(); + this.defineFieldsTool = new DefineFieldsTool(); + } + + /** + * Processes user input with AI enhancement for field addition. + * This method is used when AI assistance is requested for adding a field. + * @param userInput - Description of the field to create + * @param targetUri - Target model file for the new field + * @param cache - Metadata cache instance + * @param additionalContext - Additional context for field creation + */ + async processWithAI( + userInput: string, + targetUri: vscode.Uri, + cache: MetadataCache, + additionalContext?: any + ): Promise { + // The current addField method handles user interaction internally, + // so we just call it with the provided parameters + await this.addField(targetUri, cache); + } + + /** + * Adds a new field to an existing model file. + * + * @param targetUri - The URI of the model file where the field should be added + * @param cache - The metadata cache for context about existing models (optional) + * @returns Promise that resolves when the field is added + */ + public async addField(targetUri: vscode.Uri, cache?: MetadataCache): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + + // Step 2: Get field information from user + const fieldInfo = await this.gatherFieldInformation(modelClass, cache); + if (!fieldInfo) { + return; // User cancelled + } + + // Step 3: Get optional AI description + const aiDescription = await this.getAIDescription(); + + // Step 4: Generate basic field structure + const fieldCode = this.generateFieldCode(fieldInfo); + + // Step 5: Insert field into model class + await this.sourceCodeService.insertField(document, modelClass.name,fieldInfo, fieldCode, cache); + + // Step 5.5: If it's a Choice field, also create the enum + if (fieldInfo.type.decorator === "Choice") { + await this.insertEnumForChoiceField(document, fieldInfo); + } // Step 6: Apply AI enhancement if description was provided + if (aiDescription?.trim() && cache) { + try { + // Give the cache a moment to process the new field + await new Promise((resolve) => setTimeout(resolve, 500)); + + // Create a specific prompt for the newly added field + const enhancementPrompt = this.createFieldEnhancementPrompt(fieldInfo, aiDescription.trim(), modelClass.name); + + await this.defineFieldsTool.processFieldDescriptions(enhancementPrompt, targetUri, cache, modelClass.name); + } catch (aiError) { + console.warn("Failed to apply AI enhancement:", aiError); + vscode.window.showWarningMessage( + `Field added successfully, but AI enhancement failed: ${aiError}. You can manually enhance the field later.` + ); + } + } + + // Step 7: Show success message + const successMessage = + aiDescription?.trim() && cache + ? `Field ${fieldInfo.name} added and enhanced successfully!` + : `Field ${fieldInfo.name} added successfully!`; + vscode.window.showInformationMessage(successMessage); + } catch (error) { + vscode.window.showErrorMessage(`Failed to add field: ${error}`); + console.error("Error adding field:", error); + } + } + + /** + * Adds a field with predefined information (programmatic field addition). + * This method bypasses user input and directly adds the field with the provided configuration. + * + * @param targetUri - The URI of the model file where the field should be added + * @param fieldInfo - Predefined field information + * @param cache - The metadata cache for context about existing models + * @param silent - If true, suppresses success/error messages (defaults to false) + * @returns Promise that resolves when the field is added + */ + public async addFieldProgrammatically( + targetUri: vscode.Uri, + fieldInfo: FieldInfo, + cache: MetadataCache, + silent: boolean = false + ): Promise { + try { + // Step 1: Validate target file + const { modelClass, document } = await this.validateAndPrepareTarget(targetUri, cache); + + // Step 2: Check if field already exists + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(fieldInfo.name)) { + const message = `Field '${fieldInfo.name}' already exists in model ${modelClass.name}`; + if (!silent) { + vscode.window.showWarningMessage(message); + } + return; + } + + // Step 3: Generate basic field structure + const fieldCode = this.generateFieldCode(fieldInfo); + + // Step 4: Insert field into model class + await this.sourceCodeService.insertField(document, modelClass.name,fieldInfo, fieldCode, cache); + + // Step 5: If it's a Choice field, also create the enum + if (fieldInfo.type.decorator === "Choice") { + await this.insertEnumForChoiceField(document, fieldInfo); + } + + // Step 6: Show success message (if not silent) + if (!silent) { + vscode.window.showInformationMessage(`Field ${fieldInfo.name} added successfully!`); + } + } catch (error) { + const message = `Failed to add field: ${error}`; + if (!silent) { + vscode.window.showErrorMessage(message); + } + console.error("Error adding field programmatically:", error); + throw error; // Re-throw for caller to handle + } + } + + /** + * Validates the target file and prepares it for field addition. + */ + private async validateAndPrepareTarget( + targetUri: vscode.Uri, + cache?: MetadataCache + ): Promise<{ modelClass: DecoratedClass; document: vscode.TextDocument }> { + // Ensure the file is a TypeScript file + if (!targetUri.fsPath.endsWith(".ts")) { + throw new Error("Target file must be a TypeScript file (.ts)"); + } + + // Open the document + const document = await vscode.workspace.openTextDocument(targetUri); + + // Get model information from cache + if (!cache) { + throw new Error("Metadata cache is required for field addition"); + } + + const modelClass = await this.projectAnalysisService.findModelClass(document, cache); + if (!modelClass) { + throw new Error("No model class found in this file. Make sure the class has a @Model decorator."); + } + + return { modelClass, document }; + } + + /** + * Gathers field information from the user through interactive prompts. + */ + private async gatherFieldInformation(modelClass: DecoratedClass, cache?: MetadataCache): Promise { + // Step 1: Get field name + const fieldName = await vscode.window.showInputBox({ + prompt: "Enter the field name (camelCase)", + placeHolder: "e.g., userName, projectTitle, isActive", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Field name is required"; + } + if (!/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Field name must be in camelCase (e.g., userName, projectTitle)"; + } + + // Check if field already exists in the model + const existingFields = Object.keys(modelClass.properties || {}); + if (existingFields.includes(value.trim())) { + return `Field '${value.trim()}' already exists in this model`; + } + + return null; + }, + }); + + if (!fieldName) { + return null; // User cancelled + } + + // Step 2: Get field type + const fieldType = await this.selectFieldType(); + if (!fieldType) { + return null; // User cancelled + } + + // Step 3: Get required status + const isRequired = await this.getRequiredStatus(); + if (isRequired === undefined) { + return null; // User cancelled + } + + // Step 4: Handle special field types + let additionalConfig: Record = {}; + + if (fieldType.decorator === "Relationship") { + const relationshipConfig = await this.getRelationshipConfiguration(cache); + if (!relationshipConfig) { + return null; // User cancelled + } + additionalConfig = relationshipConfig; + } + + return { + name: fieldName.trim(), + type: fieldType, + required: isRequired, + additionalConfig: additionalConfig, + }; + } + + /** + * Shows a quick pick for field type selection. + */ + private async selectFieldType(): Promise { + const items = FIELD_TYPE_OPTIONS.map((option) => ({ + label: option.label, + description: option.description, + detail: `@${option.decorator}() : ${option.tsType}`, + option: option, + })); + + const selected = await vscode.window.showQuickPick(items, { + placeHolder: "Select the field type", + matchOnDescription: true, + matchOnDetail: true, + }); + + return selected?.option || null; + } + + /** + * Gets the required status from the user. + */ + private async getRequiredStatus(): Promise { + const choice = await vscode.window.showQuickPick( + [ + { label: "Required", description: "Field must have a value", value: true }, + { label: "Optional", description: "Field can be empty", value: false }, + ], + { + placeHolder: "Is this field required?", + } + ); + + return choice?.value; + } + + /** + * Gets optional AI description for field enhancement. + */ + private async getAIDescription(): Promise { + return await vscode.window.showInputBox({ + prompt: "Enter a description for AI enhancement (optional - press Enter to skip)", + placeHolder: "e.g., user's full name with validation, email with domain restrictions", + }); + } + + /** + * Gets relationship configuration for Relationship fields. + */ + private async getRelationshipConfiguration(cache?: MetadataCache): Promise | null> { + // Step 1: Get available models + const availableModels = this.getAvailableModels(cache); + if (availableModels.length === 0) { + vscode.window.showWarningMessage( + "No models found for relationship. Make sure you have other model classes defined." + ); + return null; + } + + // Step 2: Let user select target model + const targetModel = await vscode.window.showQuickPick( + availableModels.map((model) => ({ + label: model, + description: `Reference to ${model} model`, + })), + { + placeHolder: "Select the target model for this relationship", + } + ); + + if (!targetModel) { + return null; // User cancelled + } + + // Step 3: Let user select relationship type + const relationshipType = await vscode.window.showQuickPick( + [ + { + label: "Reference", + description: "Reference relationship - points to another entity", + value: "reference", + }, + { + label: "Composition", + description: "Composition relationship - contains/owns another entity", + value: "composition", + }, + ], + { + placeHolder: "Select the relationship type", + } + ); + + if (!relationshipType) { + return null; // User cancelled + } + + return { + targetModel: targetModel.label, + relationshipType: relationshipType.value, + }; + } + /** + * Gets available models from the cache. + */ + private getAvailableModels(cache?: MetadataCache): string[] { + if (!cache) { + return []; + } + + const dataModels = cache.getDataModelClasses(); + return dataModels.map((model) => model.name).sort(); + } + + /** + * Generates the TypeScript code for the field. + */ + private generateFieldCode(fieldInfo: FieldInfo): string { + const lines: string[] = []; + + // Add Field decorator (without indentation - will be applied later) + if (fieldInfo.required) { + lines.push("@Field({"); + lines.push(" required: true"); + lines.push("})"); + } else { + lines.push("@Field({})"); + } + + // Add type-specific decorator + if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.relationshipType) { + lines.push(`@${fieldInfo.type.decorator}({`); + lines.push(` type: '${fieldInfo.additionalConfig.relationshipType}'`); + lines.push(`})`); + } else { + lines.push(`@${fieldInfo.type.decorator}()`); + } + + // Add property declaration + // For Choice fields, use enum type instead of string + if (fieldInfo.type.decorator === "Choice") { + const enumName = this.generateEnumName(fieldInfo.name); + lines.push(`${fieldInfo.name}!: ${enumName};`); + } else if (fieldInfo.type.decorator === "Relationship") { + // For Relationship fields, use the target model type + const targetModel = fieldInfo.additionalConfig?.targetModel || "any"; + // Check if it's a composition relationship to determine if it should be an array + const isComposition = fieldInfo.additionalConfig?.relationshipType === "composition"; + const typeDeclaration = isComposition ? `${targetModel}[]` : targetModel; + lines.push(`${fieldInfo.name}!: ${typeDeclaration};`); + } else { + lines.push(`${fieldInfo.name}!: ${fieldInfo.type.tsType};`); + } + + return lines.join("\n"); + } + + /** + * Generates an enum name from a field name. + * Converts camelCase field name to PascalCase enum name. + */ + private generateEnumName(fieldName: string): string { + // Convert camelCase to PascalCase and add appropriate suffix + const pascalCase = fieldName.charAt(0).toUpperCase() + fieldName.slice(1); + + // Add descriptive suffix based on common patterns + const fieldLower = fieldName.toLowerCase(); + + if (fieldLower.includes("status")) { + return pascalCase.replace(/status/i, "Status"); + } + if (fieldLower.includes("type")) { + return pascalCase.replace(/type/i, "Type"); + } + if (fieldLower.includes("category")) { + return pascalCase.replace(/category/i, "Category"); + } + if (fieldLower.includes("state")) { + return pascalCase.replace(/state/i, "State"); + } + if (fieldLower.includes("mode")) { + return pascalCase.replace(/mode/i, "Mode"); + } + if (fieldLower.includes("level")) { + return pascalCase.replace(/level/i, "Level"); + } + + // Default: add "Type" suffix if no pattern matches + return pascalCase + "Type"; + } + + /** + * Creates and inserts an enum definition for a Choice field at the end of the file. + */ + private async insertEnumForChoiceField(document: vscode.TextDocument, fieldInfo: FieldInfo): Promise { + const enumName = this.generateEnumName(fieldInfo.name); + + // Ask user for enum values + const enumValues = await this.getEnumValues(fieldInfo.name, enumName); + if (!enumValues || enumValues.length === 0) { + return; // User cancelled or provided no values + } + + // Generate enum code + const enumCode = this.generateEnumCode(enumName, enumValues); + + // Insert enum at the end of the file + const content = document.getText(); + const lines = content.split("\n"); + + // Find the last non-empty line + let insertionLine = lines.length; + for (let i = lines.length - 1; i >= 0; i--) { + if (lines[i].trim()) { + insertionLine = i + 1; + break; + } + } + + const edit = new vscode.WorkspaceEdit(); + const insertPosition = new vscode.Position(insertionLine, 0); + + // Add spacing before enum + const codeToInsert = "\n" + enumCode + "\n"; + + edit.insert(document.uri, insertPosition, codeToInsert); + await vscode.workspace.applyEdit(edit); + await document.save(); + } + + /** + * Prompts user for enum values. + */ + private async getEnumValues(fieldName: string, enumName: string): Promise { + const enumValuesInput = await vscode.window.showInputBox({ + prompt: `Enter enum values for ${enumName} (comma-separated)`, + placeHolder: "e.g. in-progress, completed", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "At least one enum value is required"; + } + return null; + }, + }); + + if (!enumValuesInput) { + return null; + } + + // Parse and clean up the values + return enumValuesInput + .split(",") + .map((value) => value.trim()) + .filter((value) => value.length > 0) + .map((value) => this.normalizeEnumValue(value)); + } + + /** + * Normalizes an enum value to follow PascalCase conventions. + */ + private normalizeEnumValue(value: string): string { + // If it's already in PascalCase, return as is + if (/^[A-Z][a-zA-Z0-9]*$/.test(value)) { + return value; + } + + // Convert to PascalCase + return value + .replace(/[-_\s]+/g, " ") // Replace hyphens, underscores, and spaces with spaces + .split(" ") + .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()) + .join(""); + } + + /** + * Generates the enum code. + */ + private generateEnumCode(enumName: string, values: string[]): string { + const lines: string[] = []; + + lines.push(`export enum ${enumName} {`); + + values.forEach((value, index) => { + const isLast = index === values.length - 1; + // Use PascalCase for enum key, kebab-case for string value + const kebabValue = value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase(); + const enumEntry = ` ${value} = '${kebabValue}'${isLast ? "" : ","}`; + lines.push(enumEntry); + }); + + lines.push("}"); + + return lines.join("\n"); + } + + /** + * Creates a specific prompt for enhancing the newly added field. + */ + private createFieldEnhancementPrompt(fieldInfo: FieldInfo, description: string, modelName: string): string { + return ( + `Enhance the field '${fieldInfo.name}' of type ${fieldInfo.type.label} in model ${modelName}. ` + + `Current field structure: @Field(${fieldInfo.required ? "{required: true}" : ""}) @${ + fieldInfo.type.decorator + }() ${fieldInfo.name}: ${fieldInfo.type.tsType}. ` + + `Enhancement description: ${description}` + ); + } +} diff --git a/files/vs-code-extension/src/commands/fields/defineFields.ts b/files/vs-code-extension/src/commands/fields/defineFields.ts new file mode 100644 index 0000000..12a3d2a --- /dev/null +++ b/files/vs-code-extension/src/commands/fields/defineFields.ts @@ -0,0 +1,53 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import { MetadataCache, DecoratedClass, PropertyMetadata } from "../../cache/cache"; +import { fieldTypeConfig } from "../../utils/fieldTypes"; +import { AIService } from "../../services/aiService"; +/** + * Tool for defining fields using AI assistance. + * + * This tool analyzes field descriptions provided by users and generates appropriate + * field definitions with proper decorators based on the application context, existing + * models, and field patterns. It integrates with VS Code's language services to provide + * intelligent field generation. + * + */ +export class DefineFieldsTool { + + private aiService: AIService; + + constructor() { + this.aiService = new AIService(); + } + + /** + * Processes field descriptions and generates field definitions with AI assistance. + * + * @param fieldsDescription - Free text description of fields to be created + * @param targetModelUri - URI of the model file where fields will be added + * @param cache - Metadata cache for context about existing models and fields + * @param modelName - Name of the target model class + * @returns Promise that resolves when fields are processed and added + */ + public async processFieldDescriptions( + fieldsDescription: string, + targetModelUri: vscode.Uri, + cache: MetadataCache, + modelName: string + ): Promise { + try { + this.aiService.defineFieldsWithAI( + fieldsDescription, + targetModelUri, + cache, + modelName + ); + } + catch (error) { + vscode.window.showErrorMessage(`Failed to define fields: ${error}`); + console.error('Error defining fields with AI:', error); + } + + } + +} \ No newline at end of file diff --git a/files/vs-code-extension/src/commands/folders/deleteFolder.ts b/files/vs-code-extension/src/commands/folders/deleteFolder.ts new file mode 100644 index 0000000..0341181 --- /dev/null +++ b/files/vs-code-extension/src/commands/folders/deleteFolder.ts @@ -0,0 +1,126 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import * as fs from "fs"; +import { AppTreeItem } from "../../explorer/appTreeItem"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { MetadataCache } from "../../cache/cache"; +import { UserInputService } from "../../services/userInputService"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; +import { FileSystemService } from "../../services/fileSystemService"; +import { DefineFieldsTool } from "../fields/defineFields"; + +/** + * Tool for deleting folders in the src/data directory structure. + * + * This tool allows users to delete folders within the data model hierarchy. + * It provides two deletion modes: + * 1. "Yes, Delete All" - Deletes the folder and all its contents permanently using + * VS Code's workspace API to ensure file watcher events trigger automatic refactors + * 2. "Delete Folder, Keep Contents" - Deletes only the folder structure but moves + * all contents (files and subdirectories) to the parent directory + * + * The tool ensures that when files are deleted, they are processed through VS Code's + * workspace API rather than direct filesystem operations, which allows the metadata + * cache to detect the changes and trigger automatic refactoring operations. + */ +export class DeleteFolderTool { + private projectAnalysisService: ProjectAnalysisService; + private fileSystemService: FileSystemService; + + constructor() { + this.projectAnalysisService = new ProjectAnalysisService(); + this.fileSystemService = new FileSystemService(); + } + + /** + * Deletes a folder and handles model cleanup within it. + * Can be called from any folder within src/data. + * + * @param explorerProvider - The explorer provider for refreshing the view + * @param cache - The metadata cache for finding models + * @param targetUri - The target folder to delete + */ + public async deleteFolder( + explorerProvider: ExplorerProvider, + cache: MetadataCache, + targetUri?: vscode.Uri | AppTreeItem + ): Promise { + try { + // Determine the target directory to delete + const targetDirectory = this.fileSystemService.getTargetDirectoryToDelete(targetUri); + + if (!targetDirectory) { + vscode.window.showErrorMessage("Could not determine folder to delete."); + return; + } + + // Check if folder exists + if (!fs.existsSync(targetDirectory)) { + vscode.window.showErrorMessage(`Folder "${path.basename(targetDirectory)}" does not exist.`); + return; + } + + // Check if it's within src/data to prevent accidental deletion of important folders + if (!this.fileSystemService.isWithinSubDirectory(targetDirectory, "src/data")) { + vscode.window.showErrorMessage("Can only delete folders within the src/data directory."); + return; + } + + const folderName = path.basename(targetDirectory); + + // Find all models within this folder and its subdirectories + const modelsInFolder = this.projectAnalysisService.findModelsInDirectory(cache, targetDirectory); + + let confirmationMessage = `Are you sure you want to delete the folder "${folderName}"?`; + + if (modelsInFolder.length > 0) { + const modelNames = modelsInFolder.map((model) => model.name).join(", "); + confirmationMessage += `\n\nThis folder contains ${modelsInFolder.length} model(s): ${modelNames}`; + } else { + confirmationMessage += `\n\nThis folder does not contain any models.`; + } + + confirmationMessage += "\n\nThis action cannot be undone."; + + // Ask for confirmation + const confirmation = await vscode.window.showWarningMessage( + confirmationMessage, + "Yes, Delete All", + "Delete Folder, Keep Contents", + "Cancel" + ); + + if (confirmation === "Cancel" || !confirmation) { + return; // User cancelled + } + // If user chose to delete models as well, proceed with model deletion + else if (confirmation === "Yes, Delete All") { + await this.fileSystemService.deleteDirectory(targetDirectory); + + explorerProvider.refresh(); + + vscode.window.showInformationMessage( + `Folder "${folderName}" deleted successfully${ + modelsInFolder.length > 0 ? ` along with ${modelsInFolder.length} model(s)` : "" + }.` + ); + } else if (confirmation === "Delete Folder, Keep Contents") { + // Move all contents to parent directory , then delete the empty folder + await this.fileSystemService.moveFolderContentsToParent(targetDirectory); + + // Delete the now-empty folder + fs.rmdirSync(targetDirectory); + + explorerProvider.refresh(); + + vscode.window.showInformationMessage( + `Folder "${folderName}" deleted successfully. All contents moved to parent directory.` + ); + } + } catch (error) { + const errorMessage = error instanceof Error ? error.message : "Unknown error occurred"; + vscode.window.showErrorMessage(`Failed to delete folder: ${errorMessage}`); + } + } +} diff --git a/files/vs-code-extension/src/commands/folders/newFolder.ts b/files/vs-code-extension/src/commands/folders/newFolder.ts new file mode 100644 index 0000000..24ccbbd --- /dev/null +++ b/files/vs-code-extension/src/commands/folders/newFolder.ts @@ -0,0 +1,69 @@ +import * as vscode from "vscode"; +import { AppTreeItem } from "../../explorer/appTreeItem"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { FileSystemService } from "../../services/fileSystemService"; + +/** + * Tool for creating new folders in the src/data directory structure. + * + * This tool allows users to create new folders within the data model hierarchy + * to organize their models in a structured way. + */ +export class NewFolderTool { + private projectAnalysisService: ProjectAnalysisService; + private fileSystemService: FileSystemService; + + constructor() { + this.projectAnalysisService = new ProjectAnalysisService(); + this.fileSystemService = new FileSystemService(); + } + + /** + * Creates a new folder in the appropriate location within src/data. + * Can be called from the data root or from within any existing folder. + * + * @param targetUri - The target location where the folder should be created + */ + public async createFolder(explorerProvider: ExplorerProvider, targetUri?: vscode.Uri | AppTreeItem): Promise { + try { + // Get folder name from user + const folderName = await vscode.window.showInputBox({ + prompt: "Enter the name for the new folder", + placeHolder: "e.g., models, core, modules", + ignoreFocusOut: true, + validateInput: (folderName: string) => { + if (!folderName.trim()) { + return "Folder name cannot be empty"; + } + + // Check for valid folder name (basic validation) + if (!/^[a-zA-Z0-9-_]+$/.test(folderName.trim())) { + return "Folder name can only contain letters, numbers, hyphens, and underscores"; + } + + return null; + }, + }); + + if (!folderName) { + return; // User cancelled + } + + // Determine the target directory + const targetDirectory = this.fileSystemService.getTargetDirectoryForFolder(targetUri); + + // Create the folder + const newFolderPath = await this.fileSystemService.createFolder(targetDirectory, folderName); + + explorerProvider.refresh(); + + vscode.window.showInformationMessage(`Folder "${folderName}" created successfully at ${newFolderPath}`); + + // The explorer will automatically refresh when the cache detects file system changes + } catch (error) { + const errorMessage = error instanceof Error ? error.message : "Unknown error occurred"; + vscode.window.showErrorMessage(`Failed to create folder: ${errorMessage}`); + } + } +} diff --git a/files/vs-code-extension/src/commands/folders/renameFolder.ts b/files/vs-code-extension/src/commands/folders/renameFolder.ts new file mode 100644 index 0000000..e38cf2f --- /dev/null +++ b/files/vs-code-extension/src/commands/folders/renameFolder.ts @@ -0,0 +1,204 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import { AppTreeItem } from "../../explorer/appTreeItem"; +import { ExplorerProvider } from "../../explorer/explorerProvider"; +import { MetadataCache } from "../../cache/cache"; +import { FileSystemService } from "../../services/fileSystemService"; +import { DefineFieldsTool } from "../fields/defineFields"; +import { AddFieldTool } from "../fields/addField"; +import { ProjectAnalysisService } from "../../services/projectAnalysisService"; +import { SourceCodeService } from "../../services/sourceCodeService"; + +/** + * Tool for renaming folders in the src/data directory structure. + * + * This tool allows users to rename folders within the data model hierarchy + * and automatically updates all import references to files within that folder. + */ +export class RenameFolderTool { + private fileSystemService: FileSystemService; + private projectAnalysisService: ProjectAnalysisService; + private sourceCodeService: SourceCodeService; + + constructor() { + this.fileSystemService = new FileSystemService(); + this.projectAnalysisService = new ProjectAnalysisService(); + this.sourceCodeService = new SourceCodeService(); + + } + + /** + * Renames a folder in the src/data directory and updates all references. + * + * @param explorerProvider - The explorer provider to refresh after operation + * @param cache - The metadata cache to help find import references + * @param targetUri - The target folder to rename (must be an AppTreeItem with itemType 'folder') + */ + public async renameFolder( + explorerProvider: ExplorerProvider, + cache: MetadataCache, + targetUri?: vscode.Uri | AppTreeItem + ): Promise { + try { + // Validate the folder + const { folderPath, currentFolderPath, currentFolderName, parentDir } = this.validateFolderForRename(targetUri); + + // Get new folder name from user + const newFolderName = await vscode.window.showInputBox({ + prompt: `Enter the new name for folder '${currentFolderName}'`, + value: currentFolderName, + ignoreFocusOut: true, + validateInput: (value: string) => { + return this.validateNewFolderName(value, currentFolderName); + }, + }); + + if (!newFolderName) { + return; // User cancelled + } + + // Check if a folder with the new name already exists + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + throw new Error("No workspace folder found."); + } + + const dataDir = path.join(workspaceFolder.uri.fsPath, "src", "data"); + const conflictingPath = await this.fileSystemService.findConflictingFolderName(dataDir, newFolderName.trim()); + if (conflictingPath) { + vscode.window.showErrorMessage( + `A folder named "${newFolderName}" already exists at ${path.relative( + dataDir, + conflictingPath + )}. Please choose a different name.` + ); + return; + } + + // Create the new folder path + const newFolderPath = path.join(parentDir, newFolderName.trim()); + + // Find all files that might have imports from this folder + const filesToUpdate = await this.projectAnalysisService.findFilesWithImportsFromFolder(cache, folderPath); + + // Create workspace edit + const workspaceEdit = new vscode.WorkspaceEdit(); + + // Update import statements in files that reference the renamed folder + const newFolderRelativePath = this.getFolderPathFromParent(folderPath, newFolderName.trim()); + for (const fileInfo of filesToUpdate) { + await this.sourceCodeService.updateImportsInFile(workspaceEdit, fileInfo.uri, folderPath, newFolderRelativePath); + } + + // Add file system rename operation + workspaceEdit.renameFile(vscode.Uri.file(currentFolderPath), vscode.Uri.file(newFolderPath)); + + // Apply all changes + const success = await vscode.workspace.applyEdit(workspaceEdit); + + if (success) { + // Wait a moment for file system operations to complete + await new Promise((resolve) => setTimeout(resolve, 100)); + + // Force refresh the cache to ensure folder structure changes are detected + await cache.forceRefresh(); + + // Refresh the explorer to show the changes + explorerProvider.refresh(); + + vscode.window.showInformationMessage( + `Folder "${currentFolderName}" successfully renamed to "${newFolderName}".` + ); + } else { + vscode.window.showErrorMessage("Failed to rename folder. Please try again."); + } + } catch (error) { + const errorMessage = error instanceof Error ? error.message : "Unknown error occurred"; + vscode.window.showErrorMessage(`Failed to rename folder: ${errorMessage}`); + } + } + + /** + * Validates a folder for renaming operations. + * + * @param targetUri - The target folder to validate (must be an AppTreeItem with itemType 'folder') + * @returns The validated folder information + */ + public validateFolderForRename(targetUri?: vscode.Uri | any): { + folderPath: string; + currentFolderPath: string; + currentFolderName: string; + parentDir: string; + } { + // Validate that targetUri is a folder AppTreeItem + if (!targetUri || !targetUri.itemType || targetUri.itemType !== "folder") { + throw new Error("Please select a folder to rename."); + } + + if (!targetUri.folderPath) { + throw new Error("Selected folder does not have a valid path."); + } + + // Get the workspace folder + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + throw new Error("No workspace folder found."); + } + + // Construct the current folder path + const dataDir = path.join(workspaceFolder.uri.fsPath, "src", "data"); + const currentFolderPath = path.join(dataDir, targetUri.folderPath); + + // Validate the folder exists + this.fileSystemService.directoryExists(currentFolderPath); + + // Get the current folder name and parent directory + const currentFolderName = path.basename(currentFolderPath); + const parentDir = path.dirname(currentFolderPath); + + return { + folderPath: targetUri.folderPath, + currentFolderPath, + currentFolderName, + parentDir, + }; + } + + /** + * Validates a new folder name for renaming operations. + * + * @param newFolderName - The new folder name to validate + * @param currentFolderName - The current folder name + * @returns null if valid, error message if invalid + */ + public validateNewFolderName(newFolderName: string, currentFolderName: string): string | null { + if (!newFolderName.trim()) { + return "Folder name cannot be empty"; + } + + // Check for valid folder name (basic validation) + if (!/^[a-zA-Z0-9-_]+$/.test(newFolderName.trim())) { + return "Folder name can only contain letters, numbers, hyphens, and underscores"; + } + + // Check if new name is different from current + if (newFolderName.trim() === currentFolderName) { + return "New name must be different from current name"; + } + + return null; + } + + /** + * Helper to create the new folder path by replacing the last segment. + * + * @param originalPath - The original folder path + * @param newFolderName - The new folder name + * @returns The new folder path + */ + public getFolderPathFromParent(originalPath: string, newFolderName: string): string { + const segments = originalPath.split(path.sep); + segments[segments.length - 1] = newFolderName; + return segments.join(path.sep); + } +} diff --git a/files/vs-code-extension/src/commands/interfaces.ts b/files/vs-code-extension/src/commands/interfaces.ts new file mode 100644 index 0000000..6f4796f --- /dev/null +++ b/files/vs-code-extension/src/commands/interfaces.ts @@ -0,0 +1,137 @@ +import * as vscode from "vscode"; +import { MetadataCache } from "../cache/cache"; + +/** + * Interface for tools that can be enhanced with AI assistance. + * + * Tools implementing this interface provide both manual operation and AI-enhanced + * processing capabilities. The AI enhancement is triggered when users provide + * additional context or descriptions that can benefit from intelligent analysis. + */ +export interface AIEnhancedTool { + /** + * Processes user input with AI enhancement. + * + * This method is called when AI assistance is requested for the tool's operation. + * It should handle the AI processing workflow including context gathering, + * prompt generation, and result integration. + * + * @param userInput - Description or context provided by the user for AI processing + * @param targetUri - Target location (file, folder, or tree item) for the operation + * @param cache - Metadata cache instance for accessing application context + * @param additionalContext - Optional additional context for the operation + * @returns Promise that resolves when the AI-enhanced processing is complete + */ + processWithAI( + userInput: string, + targetUri: vscode.Uri, + cache: MetadataCache, + + additionalContext?: any + ): Promise; +} + +/** + * Standard field type options available in the framework. + * These correspond to the decorator types that can be applied to model fields. + */ +export interface FieldTypeOption { + /** Display name for the field type */ + label: string; + /** TypeScript decorator name */ + decorator: string; + /** Required TypeScript type for the field */ + tsType: string; + /** Description of when to use this field type */ + description: string; +} + +/** + * Available field types in the framework. + * This constant provides the mapping between user-friendly names and their + * corresponding decorators and TypeScript types. + */ +export const FIELD_TYPE_OPTIONS: FieldTypeOption[] = [ + { + label: "Text", + decorator: "Text", + tsType: "string", + description: "Short text field (up to 255 characters)" + }, + { + label: "Long Text", + decorator: "LongText", + tsType: "string", + description: "Long text field for large content" + }, + { + label: "Email", + decorator: "Email", + tsType: "string", + description: "Email address with validation" + }, + { + label: "HTML", + decorator: "Html", + tsType: "string", + description: "Rich text content with HTML support" + }, + { + label: "Integer", + decorator: "Integer", + tsType: "number", + description: "Whole number field" + }, + { + label: "Money", + decorator: "Money", + tsType: "number", + description: "Currency amount field" + }, + { + label: "Date", + decorator: "Date", + tsType: "Date", + description: "Date field" + }, + { + label: "Date Range", + decorator: "DateRange", + tsType: "DateRange", + description: "Date range field" + }, + { + label: "Boolean", + decorator: "Boolean", + tsType: "boolean", + description: "True/false field" + }, + { + label: "Choice", + decorator: "Choice", + tsType: "string", // Will be replaced with actual enum type + description: "Selection from predefined options" + }, + { + label: "Relationship", + decorator: "Relationship", + tsType: "object", // Will be replaced with actual model type + description: "Reference to another model" + } +]; + +/** + * Field information structure used for field creation and modification. + */ +export interface FieldInfo { + /** Field name in camelCase */ + name: string; + /** Field type information */ + type: FieldTypeOption; + /** Whether the field is required */ + required: boolean; + /** Optional description for AI enhancement */ + description?: string; + /** Additional field-specific configuration */ + additionalConfig?: Record; +} diff --git a/files/vs-code-extension/src/commands/models/createModelFromDesc.ts b/files/vs-code-extension/src/commands/models/createModelFromDesc.ts new file mode 100644 index 0000000..aa45a53 --- /dev/null +++ b/files/vs-code-extension/src/commands/models/createModelFromDesc.ts @@ -0,0 +1,17 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import { MetadataCache } from "../../cache/cache"; +import { AppTreeItem } from "../../explorer/appTreeItem"; +import { AIService } from "../../services/aiService"; + +export class CreateModelFromDescriptionTool { + constructor(private aiService: AIService) {} + + public async createModel(cache: MetadataCache, context?: vscode.Uri | AppTreeItem): Promise { + try { + await this.aiService.createModelWithAI(cache, context); + } catch (error: any) { + vscode.window.showErrorMessage(`Failed to create model from description: ${error.message}`); + } + } +} diff --git a/files/vs-code-extension/src/commands/models/modifyModel.ts b/files/vs-code-extension/src/commands/models/modifyModel.ts new file mode 100644 index 0000000..ffd110a --- /dev/null +++ b/files/vs-code-extension/src/commands/models/modifyModel.ts @@ -0,0 +1,17 @@ +import * as vscode from 'vscode'; +import { MetadataCache } from '../../cache/cache'; +import { AIService } from '../../services/aiService'; + +export class ModifyModelTool { + + constructor(private aiService: AIService) {} + + public async modifyModel(cache: MetadataCache): Promise { + try{ + await this.aiService.modifyModelWithAI(cache); + } + catch (error: any) { + vscode.window.showErrorMessage(`Failed to modify model: ${error.message}`); + } + } +} \ No newline at end of file diff --git a/files/vs-code-extension/src/commands/models/newModel.ts b/files/vs-code-extension/src/commands/models/newModel.ts new file mode 100644 index 0000000..483bec7 --- /dev/null +++ b/files/vs-code-extension/src/commands/models/newModel.ts @@ -0,0 +1,399 @@ +import * as vscode from "vscode"; +import { AppTreeItem } from "../../explorer/appTreeItem"; +import { DefineFieldsTool } from "../fields/defineFields"; +import { AddFieldTool } from "../fields/addField"; +import { MetadataCache } from "../../cache/cache"; +import { AIEnhancedTool, FieldInfo, FIELD_TYPE_OPTIONS } from "../interfaces"; +import { FileSystemService } from "../../services/fileSystemService"; +import path from "path"; + +/** + * Tool for creating new Model classes with the @Model decorator and extending BaseModel. + * + * This is a standalone creation tool that doesn't participate in the refactoring system. + * It provides a simple interface for generating new model files with proper structure. + * + * When executed from a model context (e.g., from a model tree item), it automatically + * creates a composition relationship field in the parent model pointing to the new model + * using the AddFieldTool for consistent field generation. + * + * @example + * ```typescript + * // Generated model example: + * @Model() + * class Task extends BaseModel { + * @Field() + * name: string; + * } + * + * // If created from a Project model context, automatically adds to Project: + * @Field({}) + * @Relationship({ + * type: 'composition' + * }) + * tasks!: Task[]; + * ``` + */ +export class NewModelTool implements AIEnhancedTool { + private fileSystemService: FileSystemService; + private defineFieldsTool: DefineFieldsTool; + private addFieldTool: AddFieldTool; + + constructor() { + this.fileSystemService = new FileSystemService(); + this.defineFieldsTool = new DefineFieldsTool(); + this.addFieldTool = new AddFieldTool(); + + } + + /** + * Processes user input with AI enhancement for model creation. + * This method is used when AI assistance is requested for creating a new model. + * @param userInput - Description of the model to create + * @param targetUri - Target directory for the new model + * @param cache - Metadata cache instance + * @param additionalContext - Additional context for model creation + */ + async processWithAI( + userInput: string, + targetUri: vscode.Uri, + cache: MetadataCache, + additionalContext?: any + ): Promise { + // The current createNewModel method handles user interaction internally, + // so we just call it with the provided parameters + await this.createNewModel(targetUri, cache); + } + + /** + * Creates a new model file in the specified directory. + * + * @param targetUri - The URI where the new model should be created (file, folder, or AppTreeItem) + * @param cache - The metadata cache for context about existing models (optional) + * @returns Promise that resolves when the model is created + */ + public async createNewModel(targetUri: vscode.Uri | AppTreeItem, cache?: MetadataCache): Promise { + let finalTargetUri: vscode.Uri; + let parentModelInfo: { name: string; filePath: string } | null = null; + + // Handle different types of input + if (targetUri instanceof AppTreeItem) { + // Detect if we're coming from a model context + parentModelInfo = this.detectParentModel(targetUri, cache); + finalTargetUri = this.fileSystemService.resolveTargetUri(targetUri); + } else { + // Handle vscode.Uri case + finalTargetUri = this.fileSystemService.resolveTargetUri(targetUri); + } + try { + // Step 1: Get model name from user + const modelName = await vscode.window.showInputBox({ + prompt: "Enter the name of the new model (PascalCase)", + placeHolder: "e.g., Task, User, Project", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Model name is required"; + } + if (!/^[A-Z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Model name must be in PascalCase (e.g., Task, UserProfile)"; + } + return null; + }, + }); + + if (!modelName) { + return; // User cancelled + } + + // Check if model name already exists in cache + if (cache) { + const existingModels = cache.getDataModelClasses().map((m) => m.name); + if (existingModels.includes(modelName)) { + vscode.window.showErrorMessage(`A model named ${modelName} already exists. Please choose a different name.`); + return; // Stop the process if model already exists + } + } + + // Step 2: Get optional documentation + const docs = await vscode.window.showInputBox({ + prompt: "Enter optional documentation for the model (press Enter to skip)", + placeHolder: "e.g., Represents a task in the project management system", + }); + + // Check if user cancelled + if (docs === undefined) { + return; // User pressed Esc + } + + // Step 3: Get optional fields information + const fieldsInfo = await vscode.window.showInputBox({ + prompt: "Enter field information (free text, press Enter to skip)", + placeHolder: "e.g., title (string), description (text), project (relationship to Project), status (enum)", + }); + + // Check if user cancelled + if (fieldsInfo === undefined) { + return; // User pressed Esc + } + + // Step 4: Determine target directory + let targetDirectory = this.fileSystemService.determineTargetDirectory(finalTargetUri); + + // Step 5: Check if file already exists and handle overwrite + const filePath = path.join(targetDirectory, `${modelName}.ts`); + const fileUri = vscode.Uri.file(filePath); + const fileExists = await this.fileSystemService.fileExists(fileUri); + if (fileExists) { + const overwrite = await vscode.window.showWarningMessage( + `File ${modelName}.ts already exists. Do you want to overwrite it?`, + "Overwrite", + "Cancel" + ); + if (overwrite !== "Overwrite") { + return; + } + } + + // Step 6: Generate model content + const modelContent = this.generateModelContent( + modelName, + docs?.trim() || null, + fieldsInfo?.trim() || null, + targetDirectory + ); + + // Step 7: Create the file (without handling overwrite since we already did) + const targetFileUri = await this.fileSystemService.createFile(modelName, filePath, modelContent, false); + + // Step 8: Open the new file + const document = await vscode.workspace.openTextDocument(targetFileUri); + await vscode.window.showTextDocument(document); + + // Step 9: Process field descriptions if provided and cache is available + if (fieldsInfo?.trim() && cache) { + try { + // Give the cache a moment to process the new file + await new Promise((resolve) => setTimeout(resolve, 500)); + + await this.defineFieldsTool.processFieldDescriptions(fieldsInfo.trim(), targetFileUri, cache, modelName); + } catch (fieldError) { + console.warn("Failed to process field descriptions:", fieldError); + vscode.window.showWarningMessage( + `Model created successfully, but field processing failed: ${fieldError}. You can manually use the Define Fields tool later.` + ); + } + } + + // Step 10: Handle parent model relationship if applicable + if (parentModelInfo && cache) { + try { + await this.addCompositionRelationshipToParent(parentModelInfo, modelName, cache); + } catch (relationshipError) { + console.warn("Failed to add composition relationship to parent model:", relationshipError); + vscode.window.showWarningMessage( + `Model created successfully, but failed to add composition relationship to parent model: ${relationshipError}` + ); + } + } + + // Step 11: Show success message + let successMessage = + fieldsInfo?.trim() && cache + ? `Model ${modelName} created and fields processed successfully!` + : `Model ${modelName} created successfully!`; + + if (parentModelInfo) { + successMessage += ` Composition relationship added to ${parentModelInfo.name}.`; + } + + vscode.window.showInformationMessage(successMessage); + } catch (error) { + vscode.window.showErrorMessage(`Failed to create model: ${error}`); + console.error("Error creating new model:", error); + } + } + + /** + * Generates the TypeScript content for a new model class. + * + * @param modelName - The name of the model class + * @param docs - Optional documentation string + * @param fieldsInfo - Optional field information (to be processed later by AI) + * @param targetDirectory - The directory where the model file will be created + * @returns The complete TypeScript content for the model file + */ + private generateModelContent( + modelName: string, + docs?: string | null, + fieldsInfo?: string | null, + targetDirectory?: string + ): string { + const lines: string[] = []; + + // Add imports with dynamically calculated relative paths + lines.push(`import { Model, Field } from 'slingr-framework';`); + lines.push("import { BaseModel } from 'slingr-framework';"); + lines.push(""); + + // Add documentation comment if provided + if (docs) { + lines.push("/**"); + lines.push(` * ${docs}`); + lines.push(" */"); + } + + // Add Model decorator + lines.push(`@Model()`); + + // Add class declaration + lines.push(`export class ${modelName} extends BaseModel {`); + + lines.push("}"); + lines.push(""); + + return lines.join("\n"); + } + + /** + * Detects if the command is being executed from a model context. + * @param targetUri - The AppTreeItem where the command was triggered + * @param cache - The metadata cache for model lookup + * @returns Information about the parent model or null if not in a model context + */ + private detectParentModel(targetUri: AppTreeItem, cache?: MetadataCache): { name: string; filePath: string } | null { + if (!cache) { + return null; + } + + // Check if the current item is a model or if we need to traverse up the tree + let currentItem: AppTreeItem | undefined = targetUri; + + while (currentItem) { + // Check if this item represents a model + if (currentItem.itemType === "model" && currentItem.metadata) { + // This is a model item, get its information + const modelMetadata = currentItem.metadata as any; + const modelName = modelMetadata.name || currentItem.label; + + // Try to find the file path for this model + const modelFilePath = this.findModelFilePath(modelName, cache); + + if (modelFilePath) { + return { + name: modelName, + filePath: modelFilePath, + }; + } + } + + // Move to parent item + currentItem = currentItem.parent; + } + + return null; + } + + /** + * Finds the file path for a given model name in the cache. + * @param modelName - The name of the model to find + * @param cache - The metadata cache + * @returns The file path of the model or null if not found + */ + private findModelFilePath(modelName: string, cache: MetadataCache): string | null { + // Get all data models and find the one we're looking for + const modelClasses = cache.getDataModelClasses(); + const targetModel = modelClasses.find((model) => model.name === modelName); + + if (!targetModel) { + return null; + } + + // Get the model's declaration location to determine the file path + if (targetModel.declaration && targetModel.declaration.uri) { + return targetModel.declaration.uri.fsPath; + } + + // Fallback: check if we can find it in the cache's file metadata + // Iterate through all cached files to find the model + const dataModels = cache.getDataModelClasses(); + for (const model of dataModels) { + if (model.name === modelName && model.declaration) { + return model.declaration.uri.fsPath; + } + } + + return null; + } + + /** + * Automatically adds a composition relationship field to the parent model. + * @param parentModelInfo - Information about the parent model + * @param newModelName - Name of the newly created model + * @param cache - The metadata cache + */ + private async addCompositionRelationshipToParent( + parentModelInfo: { name: string; filePath: string }, + newModelName: string, + cache: MetadataCache + ): Promise { + // Generate field name + const fieldName = this.generateCompositionFieldName(newModelName); + + // Create the parent model URI + const parentModelUri = vscode.Uri.file(parentModelInfo.filePath); + + // Find the Relationship field type option + const relationshipFieldType = FIELD_TYPE_OPTIONS.find((option) => option.decorator === "Relationship"); + if (!relationshipFieldType) { + throw new Error("Relationship field type not found in FIELD_TYPE_OPTIONS"); + } + + // Create the field info for the composition relationship + const fieldInfo: FieldInfo = { + name: fieldName, + type: relationshipFieldType, + required: false, // Composition relationships are typically optional + additionalConfig: { + targetModel: newModelName, + relationshipType: "composition", + }, + }; + + // Use AddFieldTool to add the field programmatically + await this.addFieldTool.addFieldProgrammatically( + parentModelUri, + fieldInfo, + cache, + true // silent mode - suppress success/error messages + ); + } + + public toCamelCase(str: string): string { + return str.charAt(0).toLowerCase() + str.slice(1); + } + + /** + * Generates a field name for composition relationships. + * Converts the model name to camelCase and makes it plural. + * @param modelName - The name of the target model + * @returns The generated field name + */ + public generateCompositionFieldName(modelName: string): string { + // Convert to camelCase + const camelCase = this.toCamelCase(modelName); + + // Make it plural (simple pluralization) + if (camelCase.endsWith("y")) { + return camelCase.slice(0, -1) + "ies"; + } else if ( + camelCase.endsWith("s") || + camelCase.endsWith("x") || + camelCase.endsWith("ch") || + camelCase.endsWith("sh") + ) { + return camelCase + "es"; + } else { + return camelCase + "s"; + } + } +} diff --git a/files/vs-code-extension/src/commands/newDataSource.ts b/files/vs-code-extension/src/commands/newDataSource.ts new file mode 100644 index 0000000..44658f8 --- /dev/null +++ b/files/vs-code-extension/src/commands/newDataSource.ts @@ -0,0 +1,135 @@ +import * as vscode from 'vscode'; + +interface DatabasePickOption { + label: string; + value: string; + description: string; + importPath?: string; + className?: string; + port?: number; + username?: string; + password?: string; +} + +export class NewDataSourceTool { + private getAvailableDataSources(): DatabasePickOption[] { + return [ + { + label: 'TypeORM SQL Data Source', + value: 'typeorm-sql', + description: 'SQL databases using TypeORM (PostgreSQL, MySQL, etc.)', + importPath: 'TypeORMSqlDataSource', + className: 'TypeORMSqlDataSource' + } + // Future data sources can be added here + ]; + } + + private getDatabaseTypesForDataSource(dataSourceType: string): DatabasePickOption[] { + switch (dataSourceType) { + case 'typeorm-sql': + return [ + { + label: 'PostgreSQL', + value: 'postgres', + description: 'PostgreSQL database', + port: 5432, + username: 'postgres', + password: 'postgres' + }, + { + label: 'MySQL', + value: 'mysql', + description: 'MySQL database', + port: 3306, + username: 'root', + password: 'root' + }, + { + label: 'mariadb', + value: 'mariadb', + description: 'MariaDB database', + port: 3306, + username: 'root', + password: 'root' + } + ]; + default: + return []; + } + } + + public async createNewDataSource(): Promise { + const dataSourceName = await vscode.window.showInputBox({ + prompt: 'Enter the name of the new data source', + validateInput: (value) => { + if (!value) { + return 'Data source name cannot be empty'; + } + if (!/^[a-zA-Z0-9_]+$/.test(value)) { + return 'Invalid data source name. Only alphanumeric characters and underscores are allowed.'; + } + return null; + }, + }); + + if (!dataSourceName) { + return; // User cancelled + } + + // Select data source type + const availableDataSources = this.getAvailableDataSources(); + const selectedDataSource = await vscode.window.showQuickPick(availableDataSources, { + placeHolder: 'Select the data source type', + ignoreFocusOut: true + }); + + if (!selectedDataSource) { + return; // User cancelled + } + + // Select database type within the chosen data source + const availableDatabases = this.getDatabaseTypesForDataSource(selectedDataSource.value); + const databaseType = await vscode.window.showQuickPick(availableDatabases, { + placeHolder: `Select the database type for ${selectedDataSource.label}`, + ignoreFocusOut: true + }); + + if (!databaseType) { + return; // User cancelled + } + + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + vscode.window.showErrorMessage('No workspace folder found.'); + return; + } + + const dataSourcePath = vscode.Uri.joinPath(workspaceFolder.uri, 'src', 'dataSources', `${dataSourceName}.ts`); + + let template: string; + + template = ` +import { ${selectedDataSource.importPath} } from 'slingr-framework'; + +export const ${dataSourceName} = new ${selectedDataSource.className}({ + type: "${databaseType.value}", + managed: true, + host: "localhost", + port: ${databaseType.port || 5432}, + username: "${databaseType.username || 'admin'}", + password: "${databaseType.password || 'admin'}", + database: "${dataSourceName.toLowerCase()}_db" +}); +`; + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.createFile(dataSourcePath); + workspaceEdit.insert(dataSourcePath, new vscode.Position(0, 0), template); + + await vscode.workspace.applyEdit(workspaceEdit); + + // Open the newly created file + const document = await vscode.workspace.openTextDocument(dataSourcePath); + await vscode.window.showTextDocument(document); + } +} \ No newline at end of file diff --git a/files/vs-code-extension/src/commands/setupLaunchConfig.ts b/files/vs-code-extension/src/commands/setupLaunchConfig.ts new file mode 100644 index 0000000..d8da449 --- /dev/null +++ b/files/vs-code-extension/src/commands/setupLaunchConfig.ts @@ -0,0 +1,49 @@ +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; + +/** + * Checks for and creates the launch.json file for a Slingr project. + */ +export async function createLaunchConfiguration() { + const workspaceFolders = vscode.workspace.workspaceFolders; + if (!workspaceFolders) { + vscode.window.showErrorMessage('Please open a Slingr project folder first.'); + return; + } + + const projectRoot = workspaceFolders[0].uri.fsPath.replace(/\\/g, '/'); + const dotVscodePath = path.join(projectRoot, '.vscode'); + const launchJsonPath = path.join(dotVscodePath, 'launch.json'); + + if (fs.existsSync(launchJsonPath)) { + return; + } + + // Ensure the .vscode directory exists + if (!fs.existsSync(dotVscodePath)) { + fs.mkdirSync(dotVscodePath); + } + + const launchConfigContent = `{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Slingr: Debug App", + "preLaunchTask": "slingr: run environment", + "runtimeArgs": [ + "-r", + "ts-node/register" + ], + "args": [ + "${projectRoot}/src/index.ts" + ], + "internalConsoleOptions": "openOnSessionStart" + } + ] +}`; + + await vscode.workspace.fs.writeFile(vscode.Uri.file(launchJsonPath), Buffer.from(launchConfigContent, 'utf8')); +} \ No newline at end of file diff --git a/files/vs-code-extension/src/commands/setupTaskConfig.ts b/files/vs-code-extension/src/commands/setupTaskConfig.ts new file mode 100644 index 0000000..3a03f43 --- /dev/null +++ b/files/vs-code-extension/src/commands/setupTaskConfig.ts @@ -0,0 +1,58 @@ +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; + +/** + * Checks for and creates the tasks.json file for a Slingr project. + */ +export async function createTasksConfiguration() { + const workspaceFolders = vscode.workspace.workspaceFolders; + if (!workspaceFolders) { + // No workspace open, so we can't create the file. + return; + } + + const projectRoot = workspaceFolders[0].uri.fsPath; + const dotVscodePath = path.join(projectRoot, '.vscode'); + const tasksJsonPath = path.join(dotVscodePath, 'tasks.json'); + + // If the file already exists, do nothing to avoid overwriting user changes. + if (fs.existsSync(tasksJsonPath)) { + return; + } + + // Ensure the .vscode directory exists + if (!fs.existsSync(dotVscodePath)) { + fs.mkdirSync(dotVscodePath); + } + + // This is the content of the tasks.json file we will create. + const tasksConfigContent = `{ + "version": "2.0.0", + "tasks": [ + { + "label": "slingr: run environment", + "type": "shell", + "command": "slingr run", + "isBackground": true, + "presentation": { + "reveal": "always", + "panel": "new" + }, + "problemMatcher": { + "owner": "slingr-runner", + "pattern": { + "regexp": ".*" + }, + "background": { + "activeOnStart": true, + "beginsPattern": "^(Starting infrastructure services...)", + "endsPattern": "^(\\\\w+) application initialized" + } + } + } + ] +}`; + + await vscode.workspace.fs.writeFile(vscode.Uri.file(tasksJsonPath), Buffer.from(tasksConfigContent, 'utf8')); +} \ No newline at end of file diff --git a/files/vs-code-extension/src/infrastructure/infrastructureStatus.ts b/files/vs-code-extension/src/infrastructure/infrastructureStatus.ts new file mode 100644 index 0000000..878c8af --- /dev/null +++ b/files/vs-code-extension/src/infrastructure/infrastructureStatus.ts @@ -0,0 +1,67 @@ +import * as vscode from 'vscode'; + +export class InfrastructureStatus { + private statusBarItem: vscode.StatusBarItem; + private hideTimer: NodeJS.Timeout | undefined; + + constructor() { + this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100); + } + + /** + * Shows a button in the status bar prompting the user to run the update. + */ + public showUpdateNeeded(): void { + this.clearHideTimer(); + this.statusBarItem.text = `$(sync) Slingr: Infra Update Required`; + this.statusBarItem.tooltip = 'Data source changes detected. Click to run infrastructure update.'; + this.statusBarItem.command = 'slingr.runInfraUpdate'; + this.statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground'); + this.statusBarItem.show(); + } + + public showSyncing(): void { + this.clearHideTimer(); + this.statusBarItem.text = `$(sync~spin) Slingr: Syncing Infra...`; + this.statusBarItem.tooltip = 'Executing `slingr infra update -a`...'; + this.statusBarItem.command = undefined; + this.statusBarItem.backgroundColor = undefined; + this.statusBarItem.show(); + } + + public showSynced(): void { + this.clearHideTimer(); + this.statusBarItem.text = `$(check) Slingr: Infra Synced`; + this.statusBarItem.tooltip = 'Infrastructure is up to date.'; + this.statusBarItem.command = undefined; + this.statusBarItem.backgroundColor = undefined; + this.statusBarItem.show(); + + this.hideTimer = setTimeout(() => this.hide(), 5000); + } + + public showError(errorMessage: string): void { + this.clearHideTimer(); + this.statusBarItem.text = `$(error) Slingr: Infra Sync Failed`; + this.statusBarItem.tooltip = `Click to view error and retry.`; + this.statusBarItem.command = 'slingr.showInfraError'; + this.statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.errorBackground'); + this.statusBarItem.show(); + } + + public hide(): void { + this.statusBarItem.hide(); + } + + private clearHideTimer(): void { + if (this.hideTimer) { + clearTimeout(this.hideTimer); + this.hideTimer = undefined; + } + } + + public dispose() { + this.clearHideTimer(); + this.statusBarItem.dispose(); + } +} \ No newline at end of file diff --git a/files/vs-code-extension/src/services/fileSystemService.ts b/files/vs-code-extension/src/services/fileSystemService.ts new file mode 100644 index 0000000..4b4ed4d --- /dev/null +++ b/files/vs-code-extension/src/services/fileSystemService.ts @@ -0,0 +1,461 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import * as fs from "fs"; + +export class FileSystemService { + public async createFile( + fileName: string, + filePath: string, + content: string, + handleOverwrite: boolean = true + ): Promise { + const fileUri = vscode.Uri.file(filePath); + + if (handleOverwrite && (await this.fileExists(fileUri))) { + const overwrite = await vscode.window.showWarningMessage( + `File ${fileName} already exists. Overwrite?`, + "Overwrite", + "Cancel" + ); + if (overwrite !== "Overwrite") { + throw new Error("User cancelled file overwrite."); + } + } + + await vscode.workspace.fs.writeFile(fileUri, new TextEncoder().encode(content)); + return fileUri; + } + + public async fileExists(fileUri: vscode.Uri): Promise { + try { + await vscode.workspace.fs.stat(fileUri); + return true; + } catch { + return false; + } + } + + public determineTargetDirectory(targetUri: vscode.Uri): string { + let targetDirectory = targetUri.fsPath; + + if (path.extname(targetUri.fsPath)) { + targetDirectory = path.dirname(targetUri.fsPath); + } + + if (!targetDirectory.includes(path.join("src", "data"))) { + const workspaceFolder = vscode.workspace.getWorkspaceFolder(targetUri); + if (workspaceFolder) { + targetDirectory = path.join(workspaceFolder.uri.fsPath, "src", "data"); + } + } + return targetDirectory; + } + + /** + * Determines the target directory to delete based on the provided context. + * + * @param targetUri - The provided target URI (can be AppTreeItem or vscode.Uri) + * @returns The absolute path to the directory to delete, or null if invalid + */ + public getTargetDirectoryToDelete(targetUri?: vscode.Uri | any): string | null { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + + if (!workspaceFolder) { + throw new Error("No workspace folder found"); + } + + if (!targetUri) { + throw new Error("No target folder specified for deletion"); + } + + if (targetUri.itemType) { + // Handle AppTreeItem cases + if (targetUri.itemType === "folder" && targetUri.folderPath) { + // Get the absolute path of the folder + const basePath = path.join(workspaceFolder.uri.fsPath, "src", "data"); + return path.join(basePath, ...targetUri.folderPath.split(/[\/\\]/)); + } else if (targetUri.itemType === "dataRoot") { + // Cannot delete the data root folder + throw new Error("Cannot delete the data root folder"); + } + } else if (targetUri.scheme === "file") { + // Handle vscode.Uri cases + const targetPath = targetUri.fsPath; + if (fs.existsSync(targetPath) && fs.lstatSync(targetPath).isDirectory()) { + return targetPath; + } + } + + return null; + } + + /** + * Determines if a path is within a specific subdirectory of the workspace. + * + * @param targetPath - The path to check + * @param subDirectory - The subdirectory to check against (e.g., 'src/data') + * @returns True if the path is within the specified subdirectory + */ + public isWithinSubDirectory(targetPath: string, subDirectory: string): boolean { + const relativePath = this.getWorkspaceRelativePath(targetPath); + if (!relativePath) { + return false; + } + + const normalizedSubDir = subDirectory.replace(/[\/\\]/g, path.sep); + const normalizedRelative = relativePath.replace(/[\/\\]/g, path.sep); + + return normalizedRelative.startsWith(normalizedSubDir); + } + + /** + * Gets the workspace-relative path from an absolute path. + * + * @param absolutePath - The absolute file system path + * @returns The path relative to the workspace root, or null if not within workspace + */ + public getWorkspaceRelativePath(absolutePath: string): string | null { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + + if (!workspaceFolder) { + return null; + } + + const workspacePath = workspaceFolder.uri.fsPath; + const normalizedAbsolute = path.resolve(absolutePath); + const normalizedWorkspace = path.resolve(workspacePath); + + if (normalizedAbsolute.startsWith(normalizedWorkspace)) { + return path.relative(normalizedWorkspace, normalizedAbsolute); + } + + return null; + } + + public async createFolder(targetDirectory: string, folderName: string): Promise { + const newFolderPath = path.join(targetDirectory, folderName.trim()); + if (fs.existsSync(newFolderPath)) { + throw new Error(`Folder "${folderName}" already exists in this location.`); + } + await fs.promises.mkdir(newFolderPath, { recursive: true }); + return newFolderPath; + } + + /** + * Deletes a directory and its contents using VS Code's workspace API. + * This method deletes files one by one, which triggers the file watcher events + * and allows automatic refactors to be processed properly. + * + * @param directoryPath - The absolute path of the directory to delete + */ + public async deleteDirectory(directoryPath: string): Promise { + if (!fs.existsSync(directoryPath)) { + return; + } + + // Collect all files and directories first to avoid issues with files being deleted during traversal + const allItems = await this.collectAllItemsRecursively(directoryPath); + + // Add the target directory itself to the list (it should be deleted last) + allItems.push({ path: directoryPath, isFile: false }); + + // Sort items so files come before their containing directories + // This ensures we delete files first, then empty directories + allItems.sort((a, b) => { + // Files (not directories) should come first + if (a.isFile && !b.isFile) { + return -1; + } + if (!a.isFile && b.isFile) { + return 1; + } + + // For directories, deeper ones should come first (so we delete children before parents) + if (!a.isFile && !b.isFile) { + return b.path.split(path.sep).length - a.path.split(path.sep).length; + } + + return 0; + }); + + // Delete all files first (this triggers automatic refactors) + for (const item of allItems.filter((item) => item.isFile)) { + try { + const fileUri = vscode.Uri.file(item.path); + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.deleteFile(fileUri, { ignoreIfNotExists: true }); + + const success = await vscode.workspace.applyEdit(workspaceEdit); + if (success) { + console.log(`[DeleteFolder] Deleted file: ${item.path}`); + // Small delay to allow cache to process the deletion + await new Promise((resolve) => setTimeout(resolve, 50)); + } else { + console.warn(`[DeleteFolder] Failed to delete file via workspace API: ${item.path}`); + // Fallback to direct filesystem deletion if file still exists + if (fs.existsSync(item.path)) { + fs.unlinkSync(item.path); + } + } + } catch (error) { + console.error(`[DeleteFolder] Error deleting file ${item.path}:`, error); + // Fallback to direct filesystem deletion if file still exists + try { + if (fs.existsSync(item.path)) { + fs.unlinkSync(item.path); + } + } catch (fallbackError) { + console.error(`[DeleteFolder] Fallback file deletion also failed:`, fallbackError); + } + } + } + + // Then delete all directories (starting with the deepest ones) + for (const item of allItems.filter((item) => !item.isFile)) { + try { + if (fs.existsSync(item.path)) { + const directoryUri = vscode.Uri.file(item.path); + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.deleteFile(directoryUri, { recursive: false, ignoreIfNotExists: true }); + + const success = await vscode.workspace.applyEdit(workspaceEdit); + if (success) { + console.log(`[DeleteFolder] Deleted directory: ${item.path}`); + } else { + console.warn(`[DeleteFolder] Failed to delete directory via workspace API: ${item.path}`); + // Fallback to direct filesystem deletion + fs.rmdirSync(item.path); + } + } + } catch (error) { + console.error(`[DeleteFolder] Error deleting directory ${item.path}:`, error); + // Fallback to direct filesystem deletion + try { + if (fs.existsSync(item.path)) { + fs.rmdirSync(item.path); + } + } catch (fallbackError) { + console.error(`[DeleteFolder] Fallback directory deletion also failed:`, fallbackError); + } + } + } + } + + /** + * Resolves AppTreeItem to a target URI for model creation. + * @param targetUri - The input URI or AppTreeItem + * @returns The resolved target URI + */ + public resolveTargetUri(targetUri: vscode.Uri | any): vscode.Uri { + if (targetUri instanceof vscode.Uri) { + // Handle vscode.Uri case + if (path.extname(targetUri.fsPath)) { + // If it's a file, use its directory + return vscode.Uri.file(path.dirname(targetUri.fsPath)); + } + return targetUri; + } else { + // Handle AppTreeItem case + if (targetUri.folderPath) { + if (targetUri.itemType === "dataRoot") { + return vscode.Uri.file(targetUri.folderPath); + } else { + // Construct the full path: workspace + src/data + folderPath + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + throw new Error("No workspace folder found"); + } + const fullFolderPath = path.join(workspaceFolder.uri.fsPath, "src", "data", targetUri.folderPath); + return vscode.Uri.file(fullFolderPath); + } + } else { + // Fallback to src/data if folderPath is not available + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + throw new Error("No workspace folder found"); + } + return vscode.Uri.file(path.join(workspaceFolder.uri.fsPath, "src", "data")); + } + } + } + + private async collectAllItemsRecursively(directoryPath: string): Promise<{ path: string; isFile: boolean }[]> { + const items: { path: string; isFile: boolean }[] = []; + if (!fs.existsSync(directoryPath)) { + return items; + } + + const entries = await fs.promises.readdir(directoryPath, { withFileTypes: true }); + for (const entry of entries) { + const fullPath = path.join(directoryPath, entry.name); + if (entry.isDirectory()) { + items.push(...(await this.collectAllItemsRecursively(fullPath))); + items.push({ path: fullPath, isFile: false }); + } else { + items.push({ path: fullPath, isFile: true }); + } + } + return items; + } + + public async openDocument(uri: vscode.Uri): Promise { + return vscode.workspace.openTextDocument(uri); + } + + public async saveDocument(document: vscode.TextDocument): Promise { + return document.save(); + } + + /** + * Moves all contents of a folder to its parent directory. + * + * @param directoryPath - The absolute path of the directory whose contents should be moved + */ + public async moveFolderContentsToParent(directoryPath: string): Promise { + if (!fs.existsSync(directoryPath)) { + throw new Error(`Directory "${directoryPath}" does not exist.`); + } + + const parentDirectory = path.dirname(directoryPath); + + // Check if parent directory exists + if (!fs.existsSync(parentDirectory)) { + throw new Error(`Parent directory "${parentDirectory}" does not exist.`); + } + + const files = fs.readdirSync(directoryPath); + + for (const file of files) { + const sourcePath = path.join(directoryPath, file); + const targetPath = path.join(parentDirectory, file); + + // Handle potential naming conflicts + const finalTargetPath = await this.resolveNamingConflict(targetPath); + + // Move the file or directory + fs.renameSync(sourcePath, finalTargetPath); + } + } + + /** + * Resolves naming conflicts when moving files to parent directory. + * If a file/folder with the same name already exists, appends a number to make it unique. + * + * @param targetPath - The intended target path + * @returns The final target path (may be modified to avoid conflicts) + */ + public async resolveNamingConflict(targetPath: string): Promise { + if (!fs.existsSync(targetPath)) { + return targetPath; // No conflict + } + + const directory = path.dirname(targetPath); + const extension = path.extname(targetPath); + const baseName = path.basename(targetPath, extension); + + let counter = 1; + let newTargetPath: string; + + do { + newTargetPath = path.join(directory, `${baseName}_${counter}${extension}`); + counter++; + } while (fs.existsSync(newTargetPath)); + + return newTargetPath; + } + + /** + * Recursively searches for any folder with the given name in the specified directory. + * + * @param searchDir - The directory to search in + * @param folderName - The folder name to search for + * @returns The path to the conflicting folder, or null if none found + */ + public async findConflictingFolderName(searchDir: string, folderName: string): Promise { + try { + const entries = await fs.promises.readdir(searchDir, { withFileTypes: true }); + + for (const entry of entries) { + if (entry.isDirectory()) { + if (entry.name === folderName) { + return path.join(searchDir, entry.name); + } + + // Recursively search subdirectories + const subDirPath = path.join(searchDir, entry.name); + const conflict = await this.findConflictingFolderName(subDirPath, folderName); + if (conflict) { + return conflict; + } + } + } + + return null; + } catch (error) { + // If we can't read a directory, assume no conflict + return null; + } + } + + /** + * Determines the target directory for folder creation based on the provided context. + * + * @param targetUri - The provided target URI (can be AppTreeItem or vscode.Uri) + * @param defaultSubPath - Default subdirectory path relative to workspace root (defaults to 'src/data') + * @returns The absolute path to the target directory + */ + public getTargetDirectoryForFolder(targetUri?: vscode.Uri | any, defaultSubPath: string = "src/data"): string { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + + if (!workspaceFolder) { + throw new Error("No workspace folder found"); + } + + // Start with the default path + let targetDirectory = path.join(workspaceFolder.uri.fsPath, ...defaultSubPath.split(/[\/\\]/)); + + if (targetUri) { + if (targetUri.itemType) { + // Handle AppTreeItem cases + if (targetUri.itemType === "folder" && targetUri.folderPath) { + // Creating within an existing folder - append folder path to default base + const basePath = path.join(workspaceFolder.uri.fsPath, ...defaultSubPath.split(/[\/\\]/)); + targetDirectory = path.join(basePath, ...targetUri.folderPath.split(/[\/\\]/)); + } else if (targetUri.itemType === "dataRoot") { + // Use the default base directory + targetDirectory = path.join(workspaceFolder.uri.fsPath, ...defaultSubPath.split(/[\/\\]/)); + } else if (targetUri.itemType === "model" && targetUri.metadata?.declaration?.uri) { + // If targeting a model, use the directory containing the model file + targetDirectory = path.dirname(targetUri.metadata.declaration.uri.fsPath); + } + } else if (targetUri.scheme === "file") { + // Handle vscode.Uri cases + const targetPath = targetUri.fsPath; + try { + if (fs.existsSync(targetPath)) { + if (fs.lstatSync(targetPath).isDirectory()) { + // If it's a directory, use it directly + targetDirectory = targetPath; + } else { + // If it's a file, use the containing directory + targetDirectory = path.dirname(targetPath); + } + } + } catch (error) { + // If file doesn't exist or can't be accessed, use default + console.warn("Could not access target path, using default:", error); + } + } + } + + return targetDirectory; + } + + public directoryExists(directoryPath: string): boolean { + // Validate the folder exists + if (!fs.existsSync(directoryPath)) { + throw new Error(`Folder ${directoryPath}} does not exist.`); + } + return true; + } +} diff --git a/files/vs-code-extension/src/services/projectAnalysisService.ts b/files/vs-code-extension/src/services/projectAnalysisService.ts new file mode 100644 index 0000000..ccbdbed --- /dev/null +++ b/files/vs-code-extension/src/services/projectAnalysisService.ts @@ -0,0 +1,362 @@ +import * as vscode from "vscode"; +import { MetadataCache, DecoratedClass } from "../cache/cache"; +import { FileSystemService } from "./fileSystemService"; +import * as path from "path"; +import { PropertyMetadata } from "../cache/cache"; +import { fieldTypeConfig } from "../utils/fieldTypes"; + +export class ProjectAnalysisService { + + private fileSystemService: FileSystemService; + + constructor() { + this.fileSystemService = new FileSystemService(); + } + + public async findModelClass( + document: vscode.TextDocument, + cache: MetadataCache + ): Promise { + const fileMetadata = cache.getMetadataForFile(document.uri.fsPath); + if (!fileMetadata) { + return undefined; + } + + const modelClasses = Object.values(fileMetadata.classes).filter((cls: DecoratedClass) => + cls.decorators.some((d) => d.name === "Model") + ); + + if (modelClasses.length === 1) { + return modelClasses[0]; + } + + if (modelClasses.length > 1) { + const selected = await vscode.window.showQuickPick(modelClasses.map((c) => c.name)); + return modelClasses.find((c) => c.name === selected); + } + return undefined; + } + + /** + * Gathers comprehensive application context including existing models, + * common field patterns, and project structure. + */ + public async gatherApplicationContext(cache: MetadataCache, targetUri: vscode.Uri): Promise { + const context: ApplicationContext = { + existingModels: [], + commonFieldPatterns: new Map(), + availableFieldTypes: Object.keys(fieldTypeConfig), + projectStructure: await this.analyzeProjectStructure(), + relationshipTargets: [], + }; + + // Get all data models (models with @Model decorator) + const dataModels = cache.getDataModelClasses(); + + for (const model of dataModels) { + const modelInfo: ModelInfo = { + name: model.name, + fields: [], + filePath: model.declaration.uri.fsPath, + documentation: this.extractModelDocumentation(model), + }; + + // Extract field information + for (const [fieldName, field] of Object.entries(model.properties)) { + const fieldInfo: FieldInfo = { + name: fieldName, + type: (field as PropertyMetadata).type, + decorators: (field as PropertyMetadata).decorators.map((d: any) => d.name), + documentation: this.extractFieldDocumentation(field as PropertyMetadata), + }; + modelInfo.fields.push(fieldInfo); + + // Track common field patterns + const pattern = `${fieldInfo.name}:${fieldInfo.type}`; + const count = context.commonFieldPatterns.get(pattern) || 0; + context.commonFieldPatterns.set(pattern, count + 1); + } + + context.existingModels.push(modelInfo); + context.relationshipTargets.push(model.name); + } + + return context; + } + + /** + * Extracts documentation from model decorators. + */ + private extractModelDocumentation(model: DecoratedClass): string | undefined { + const modelDecorator = model.decorators.find((d) => d.name === "Model"); + if (modelDecorator?.arguments) { + const docsArg = modelDecorator.arguments.find((arg) => arg.docs); + return docsArg?.docs; + } + return undefined; + } + + /** + * Extracts documentation from field decorators. + */ + public extractFieldDocumentation(field: PropertyMetadata): string | undefined { + for (const decorator of field.decorators) { + if (decorator.arguments) { + const docsArg = decorator.arguments.find((arg: any) => arg.docs); + if (docsArg) { + return docsArg.docs; + } + } + } + return undefined; + } + + /** + * Analyzes the current model context including existing fields and their patterns. + */ + public async analyzeModelContext( + modelUri: vscode.Uri, + modelName: string, + cache: MetadataCache + ): Promise { + const context: ModelContext = { + modelName, + existingFields: [], + filePath: modelUri.fsPath, + imports: [], + usedEnums: [], + }; + + // Try to get existing model metadata from cache + const fileMetadata = cache.getMetadataForFile(modelUri.fsPath); + if (fileMetadata) { + const modelClass = fileMetadata.classes[modelName]; + if (modelClass) { + context.existingFields = Object.values(modelClass.properties).map((prop: PropertyMetadata) => ({ + name: prop.name, + type: prop.type, + decorators: prop.decorators.map((d: any) => d.name), + documentation: this.extractFieldDocumentation(prop), + })); + } + } + + // Analyze current file content for imports and enums + const document = await vscode.workspace.openTextDocument(modelUri); + const content = document.getText(); + + context.imports = this.extractImports(content); + context.usedEnums = this.extractEnums(content); + + return context; + } + + /** + * Extracts import statements from file content. + */ + public extractImports(content: string): string[] { + const importRegex = /import\s+.*?\s+from\s+['"][^'"]+['"];?/g; + const matches = content.match(importRegex); + return matches || []; + } + + /** + * Extracts enum definitions from file content. + */ + public extractEnums(content: string): string[] { + const enumRegex = /export\s+enum\s+(\w+)/g; + const enums: string[] = []; + let match; + while ((match = enumRegex.exec(content)) !== null) { + enums.push(match[1]); + } + return enums; + } + + /** + * Analyzes project structure to understand patterns and conventions. + */ + public async analyzeProjectStructure(): Promise { + const workspaceFolders = vscode.workspace.workspaceFolders; + if (!workspaceFolders || workspaceFolders.length === 0) { + return { dataFolderPath: "", frameworkPath: "", hasCustomTypes: false }; + } + + const rootPath = workspaceFolders[0].uri.fsPath; + const dataPath = path.join(rootPath, "src", "data"); + const frameworkPath = path.join(rootPath, "src", "framework"); + + return { + dataFolderPath: dataPath, + frameworkPath: frameworkPath, + hasCustomTypes: await this.checkForCustomTypes(dataPath), + }; + } + + /** + * Checks if the project has custom field types or enums. + */ + public async checkForCustomTypes(dataPath: string): Promise { + try { + const files = await vscode.workspace.findFiles("src/data/**/*.ts"); + for (const file of files) { + const document = await vscode.workspace.openTextDocument(file); + const content = document.getText(); + if (content.includes("export enum ") || content.includes("export type ")) { + return true; + } + } + } catch (error) { + console.warn("Could not analyze custom types:", error); + } + return false; + } + + /** + * Finds all models within a specific directory and its subdirectories. + * + * @param cache - The metadata cache to search through + * @param directoryPath - The absolute path of the directory to search + * @returns An array of model metadata found in the directory + */ + public findModelsInDirectory(cache: MetadataCache, directoryPath: string): any[] { + const models: any[] = []; + const normalizedDirectoryPath = path.resolve(directoryPath); + + // Use the public findMetadata method to get all models, then filter by directory + const allModels = cache.findMetadata( + (item) => "decorators" in item && item.decorators.some((d) => d.name === "Model") + ); + + // Filter models that are within the target directory + for (const model of allModels) { + if ("declaration" in model && model.declaration) { + const modelFilePath = path.resolve(model.declaration.uri.fsPath); + + // Check if this model file is within the target directory + if (modelFilePath.startsWith(normalizedDirectoryPath)) { + models.push(model); + } + } + } + + return models; + } + + /** + * Finds all TypeScript files that have imports from the specified folder. + * + * @param cache - The metadata cache + * @param folderPath - The folder path to search for imports from + * @returns Array of files with imports from the folder + */ + public async findFilesWithImportsFromFolder( + cache: MetadataCache, + folderPath: string + ): Promise<{ uri: vscode.Uri; relativePath: string }[]> { + const results: { uri: vscode.Uri; relativePath: string }[] = []; + + // Get all TypeScript files in the workspace + const files = await vscode.workspace.findFiles("**/*.ts", "**/node_modules/**"); + + for (const fileUri of files) { + try { + const document = await vscode.workspace.openTextDocument(fileUri); + const content = document.getText(); + + // Look for import statements that reference files in the folder + const importRegex = /import\s+.*\s+from\s+['"]([^'"]+)['"]/g; + let match; + + while ((match = importRegex.exec(content)) !== null) { + const importPath = match[1]; + + // Check if this import references the folder we're renaming + if (this.importReferencesFolder(fileUri, importPath, folderPath)) { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (workspaceFolder) { + const relativePath = path.relative(workspaceFolder.uri.fsPath, fileUri.fsPath); + results.push({ uri: fileUri, relativePath }); + break; // Found at least one import, no need to check more in this file + } + } + } + } catch (error) { + // Skip files that can't be read + continue; + } + } + + return results; + } + + /** + * Checks if an import path references files within the specified folder. + * + * @param fileUri - The URI of the file containing the import + * @param importPath - The import path to check + * @param folderPath - The folder path to check against + * @returns True if the import references the folder + */ + public importReferencesFolder(fileUri: vscode.Uri, importPath: string, folderPath: string): boolean { + // Skip external modules (those without relative paths) + if (!importPath.startsWith(".")) { + return false; + } + + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + return false; + } + + // Resolve the import path relative to the importing file + const fileDir = path.dirname(fileUri.fsPath); + const resolvedImportPath = path.resolve(fileDir, importPath); + + // Get the path to the folder we're checking + const dataDir = path.join(workspaceFolder.uri.fsPath, "src", "data"); + const targetFolderPath = path.join(dataDir, folderPath); + + // Check if the resolved import path is within the target folder + const normalizedImport = path.normalize(resolvedImportPath); + const normalizedTarget = path.normalize(targetFolderPath); + + return normalizedImport.startsWith(normalizedTarget); + } +} + +export interface ProjectStructure { + dataFolderPath: string; + frameworkPath: string; + hasCustomTypes: boolean; +} + +export interface ApplicationContext { + existingModels: ModelInfo[]; + commonFieldPatterns: Map; + availableFieldTypes: string[]; + projectStructure: ProjectStructure; + relationshipTargets: string[]; +} + +export interface ModelContext { + modelName: string; + existingFields: FieldInfo[]; + filePath: string; + imports: string[]; + usedEnums: string[]; +} + +export interface ModelInfo { + name: string; + fields: FieldInfo[]; + filePath: string; + documentation?: string; +} + +export interface FieldInfo { + name: string; + type: string; + decorators: string[]; + documentation?: string; +} diff --git a/files/vs-code-extension/src/services/sourceCodeService.ts b/files/vs-code-extension/src/services/sourceCodeService.ts new file mode 100644 index 0000000..e03439e --- /dev/null +++ b/files/vs-code-extension/src/services/sourceCodeService.ts @@ -0,0 +1,280 @@ +import * as vscode from "vscode"; +import * as path from "path"; +import { MetadataCache } from "../cache/cache"; +import { FieldInfo } from "../commands/interfaces"; +import { detectIndentation, applyIndentation } from "../utils/detectIndentation"; +import { FileSystemService } from "./fileSystemService"; +import { ProjectAnalysisService } from "./projectAnalysisService"; + +export class SourceCodeService { + private fileSystemService: FileSystemService; + private projectAnalysisService: ProjectAnalysisService; + constructor() { + this.fileSystemService = new FileSystemService(); + this.projectAnalysisService = new ProjectAnalysisService(); + } + + public async insertField( + document: vscode.TextDocument, + modelClassName: string, + fieldInfo: FieldInfo, + fieldCode: string, + cache?: MetadataCache + ): Promise { + const edit = new vscode.WorkspaceEdit(); + const lines = document.getText().split("\n"); + + await this.ensureSlingrFrameworkImports(document, edit, new Set(["Field", fieldInfo.type.decorator])); + + if (fieldInfo.type.decorator === "Relationship" && fieldInfo.additionalConfig?.targetModel) { + await this.addModelImport(document, fieldInfo.additionalConfig.targetModel, edit, cache); + } + + const { classEndLine } = this.findClassBoundaries(lines, modelClassName); + const indentation = detectIndentation(lines, 0, lines.length); + const indentedFieldCode = applyIndentation(fieldCode, indentation); + + edit.insert(document.uri, new vscode.Position(classEndLine, 0), `\n${indentedFieldCode}\n`); + + await vscode.workspace.applyEdit(edit); + } + + public findClassBoundaries( + lines: string[], + modelClassName: string + ): { classStartLine: number; classEndLine: number } { + let classStartLine = -1; + let classEndLine = -1; + let braceCount = 0; + let inClass = false; + + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + if (line.includes(`class ${modelClassName}`)) { + classStartLine = i; + inClass = true; + } + if (inClass) { + if (line.includes("{")) braceCount++; + if (line.includes("}")) braceCount--; + if (braceCount === 0 && classStartLine !== -1) { + classEndLine = i; + break; + } + } + } + if (classStartLine === -1 || classEndLine === -1) { + throw new Error(`Could not find class boundaries for ${modelClassName}.`); + } + return { classStartLine, classEndLine }; + } + + /** + * Ensures that the required slingr-framework imports are present. + */ + public async ensureSlingrFrameworkImports( + document: vscode.TextDocument, + edit: vscode.WorkspaceEdit, + newImports: Set + ): Promise { + const content = document.getText(); + const lines = content.split("\n"); + + const slingrFrameworkImportLine = lines.findIndex( + (line) => line.includes("from") && line.includes("slingr-framework") + ); + + if (slingrFrameworkImportLine !== -1) { + // Update existing import + const currentImport = lines[slingrFrameworkImportLine]; + const importMatch = currentImport.match(/import\s+\{([^}]+)\}\s+from\s+['"]slingr-framework['"];?/); + + if (importMatch) { + const currentImports = importMatch[1] + .split(",") + .map((imp) => imp.trim()) + .filter((imp) => imp.length > 0); + + // Add new imports that aren't already present + const allImports = new Set([...currentImports, ...newImports]); + const newImportString = `import { ${Array.from(allImports).sort().join(", ")} } from 'slingr-framework';`; + + edit.replace( + document.uri, + new vscode.Range(slingrFrameworkImportLine, 0, slingrFrameworkImportLine, currentImport.length), + newImportString + ); + } + } else { + // Add new import if no slingr-framework import exists + const newImportString = `import { ${Array.from(newImports).sort().join(", ")} } from 'slingr-framework';\n`; + edit.insert(document.uri, new vscode.Position(0, 0), newImportString); + } + } + + /** + * Adds an import for a target model type. + */ + public async addModelImport( + document: vscode.TextDocument, + targetModel: string, + edit: vscode.WorkspaceEdit, + cache?: MetadataCache + ): Promise { + const content = document.getText(); + const lines = content.split("\n"); + + // Check if the model is already imported + const existingImport = lines.find( + (line) => line.includes("import") && line.includes(targetModel) && !line.includes("slingr-framework") + ); + + if (existingImport) { + return; // Already imported + } + + // Find the best place to insert the import (after existing imports) + let insertLine = 0; + for (let i = 0; i < lines.length; i++) { + if (lines[i].startsWith("import ")) { + insertLine = i + 1; + } else if (lines[i].trim() === "" && insertLine > 0) { + break; // Found end of import section + } + } + + // Determine the import path + let importPath = `./${targetModel}`; + + if (cache) { + // Find the file path for the target model + const targetModelFilePath = this.findModelFilePath(cache, targetModel); + + if (targetModelFilePath) { + // Calculate relative path from current file to target model file + const currentFilePath = document.uri.fsPath; + const relativePath = path.relative(path.dirname(currentFilePath), targetModelFilePath); + importPath = relativePath.replace(/\.ts$/, "").replace(/\\/g, "/"); + if (!importPath.startsWith(".")) { + importPath = "./" + importPath; + } + } + } + + // Create the import statement + const importStatement = `import { ${targetModel} } from '${importPath}';`; + + edit.insert(document.uri, new vscode.Position(insertLine, 0), importStatement + "\n"); + } + + /** + * Updates import statements in a file to reflect a folder rename. + * + * @param workspaceEdit - The workspace edit to add changes to + * @param fileUri - The URI of the file to update + * @param oldFolderPath - The old folder path + * @param newFolderPath - The new folder path + */ + public async updateImportsInFile( + workspaceEdit: vscode.WorkspaceEdit, + fileUri: vscode.Uri, + oldFolderPath: string, + newFolderPath: string + ): Promise { + try { + const document = await vscode.workspace.openTextDocument(fileUri); + const content = document.getText(); + + // Find and replace import statements + const importRegex = /import\s+.*\s+from\s+['"]([^'"]+)['"]/g; + let match; + + while ((match = importRegex.exec(content)) !== null) { + const importPath = match[1]; + + if (this.projectAnalysisService.importReferencesFolder(fileUri, importPath, oldFolderPath)) { + // Calculate the new import path + const newImportPath = this.calculateNewImportPath(fileUri, importPath, oldFolderPath, newFolderPath); + + if (newImportPath !== importPath) { + // Find the exact position of the import string + const fullMatch = match[0]; + const importStringStart = + fullMatch.indexOf(`'${importPath}'`) !== -1 + ? fullMatch.indexOf(`'${importPath}'`) + 1 + : fullMatch.indexOf(`"${importPath}"`) + 1; + + const start = document.positionAt(match.index + importStringStart); + const end = document.positionAt(match.index + importStringStart + importPath.length); + + workspaceEdit.replace(fileUri, new vscode.Range(start, end), newImportPath); + } + } + } + } catch (error) { + // Skip files that can't be processed + } + } + + /** + * Calculates the new import path after a folder rename. + * + * @param fileUri - The URI of the file containing the import + * @param currentImportPath - The current import path + * @param oldFolderPath - The old folder path + * @param newFolderPath - The new folder path + * @returns The updated import path + */ + public calculateNewImportPath( + fileUri: vscode.Uri, + currentImportPath: string, + oldFolderPath: string, + newFolderPath: string + ): string { + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]; + if (!workspaceFolder) { + return currentImportPath; + } + + // Resolve the current import to an absolute path + const fileDir = path.dirname(fileUri.fsPath); + const resolvedCurrentPath = path.resolve(fileDir, currentImportPath); + + // Replace the old folder path with the new one + const dataDir = path.join(workspaceFolder.uri.fsPath, "src", "data"); + const oldFolderAbsPath = path.join(dataDir, oldFolderPath); + const newFolderAbsPath = path.join(dataDir, newFolderPath); + + const updatedAbsolutePath = resolvedCurrentPath.replace(oldFolderAbsPath, newFolderAbsPath); + + // Convert back to a relative path + const newRelativePath = path.relative(fileDir, updatedAbsolutePath); + + // Ensure the path starts with './' if it's a relative path to the same or subdirectory + if (!newRelativePath.startsWith(".") && !path.isAbsolute(newRelativePath)) { + return "./" + newRelativePath; + } + + return newRelativePath.replace(/\\/g, "/"); // Normalize path separators for imports + } + + /** + * Finds the file path for a given model name in the cache. + */ + private findModelFilePath(cache: MetadataCache, modelName: string): string | undefined { + // Get all data models and find the one we're looking for + const modelClasses = cache.getDataModelClasses(); + const targetModel = modelClasses.find((model) => model.name === modelName); + + if (!targetModel) { + return undefined; + } + + // Get the model's declaration location to determine the file path + if (targetModel.declaration && targetModel.declaration.uri) { + return targetModel.declaration.uri.fsPath; + } + + return undefined; + } +} diff --git a/files/vs-code-extension/src/services/userInputService.ts b/files/vs-code-extension/src/services/userInputService.ts new file mode 100644 index 0000000..bd7fac0 --- /dev/null +++ b/files/vs-code-extension/src/services/userInputService.ts @@ -0,0 +1,112 @@ +import * as vscode from 'vscode'; +import { FIELD_TYPE_OPTIONS, FieldTypeOption, FieldInfo } from '../commands/interfaces'; +import { MetadataCache, DecoratedClass } from '../cache/cache'; + +export class UserInputService { + + public async getModelName(existingModels: string[]): Promise { + return await vscode.window.showInputBox({ + prompt: "Enter the name of the new model (PascalCase)", + placeHolder: "e.g., Task, User, Project", + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return "Model name is required"; + } + if (!/^[A-Z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Model name must be in PascalCase (e.g., Task, UserProfile)"; + } + if (existingModels.includes(value.trim())) { + return `A model named '${value.trim()}' already exists.`; + } + return null; + }, + }); + } + + public async getFieldInfo(modelClass: DecoratedClass, cache?: MetadataCache): Promise { + const fieldName = await this.getFieldName(modelClass); + if (!fieldName) return null; + + const fieldType = await this.selectFieldType(); + if (!fieldType) return null; + + const isRequired = await this.getRequiredStatus(); + if (isRequired === undefined) return null; + + let additionalConfig: Record = {}; + if (fieldType.decorator === 'Relationship') { + const relationshipConfig = await this.getRelationshipConfiguration(cache); + if (!relationshipConfig) return null; + additionalConfig = relationshipConfig; + } + + return { name: fieldName, type: fieldType, required: isRequired, additionalConfig }; + } + + public async getConfirmation(prompt: string, ...actions: string[]): Promise { + return await vscode.window.showWarningMessage(prompt, ...actions); + } + + public async showPrompt(prompt: string, placeHolder?: string): Promise { + return await vscode.window.showInputBox({ prompt, placeHolder }); + } + + private async getFieldName(modelClass: DecoratedClass): Promise { + const existingFields = Object.keys(modelClass.properties || {}); + return await vscode.window.showInputBox({ + prompt: "Enter the field name (camelCase)", + placeHolder: "e.g., userName, projectTitle", + validateInput: (value) => { + if (!value || !/^[a-z][a-zA-Z0-9]*$/.test(value.trim())) { + return "Field name must be in camelCase."; + } + if (existingFields.includes(value.trim())) { + return `Field '${value.trim()}' already exists in this model.`; + } + return null; + } + }); + } + + private async selectFieldType(): Promise { + const items = FIELD_TYPE_OPTIONS.map(option => ({ + label: option.label, + description: option.description, + detail: `@${option.decorator}() : ${option.tsType}`, + option + })); + const selected = await vscode.window.showQuickPick(items, { placeHolder: "Select the field type" }); + return selected?.option; + } + + private async getRequiredStatus(): Promise { + const choice = await vscode.window.showQuickPick( + [ + { label: "Required", description: "Field must have a value", value: true }, + { label: "Optional", description: "Field can be empty", value: false } + ], + { placeHolder: "Is this field required?" } + ); + return choice?.value; + } + + private async getRelationshipConfiguration(cache?: MetadataCache): Promise | null> { + if (!cache) return null; + const availableModels = cache.getDataModelClasses().map(m => m.name).sort(); + if (availableModels.length === 0) { + vscode.window.showWarningMessage('No other models found for relationship.'); + return { targetModel: 'any', relationshipType: 'reference' }; + } + + const targetModel = await vscode.window.showQuickPick(availableModels, { placeHolder: "Select the target model" }); + if (!targetModel) return null; + + const relationshipType = await vscode.window.showQuickPick( + ["reference", "composition"], + { placeHolder: "Select the relationship type" } + ); + if (!relationshipType) return null; + + return { targetModel, relationshipType }; + } +} \ No newline at end of file diff --git a/files/vs-code-extension/src/test/addField.test.ts b/files/vs-code-extension/src/test/addField.test.ts new file mode 100644 index 0000000..65c3c6d --- /dev/null +++ b/files/vs-code-extension/src/test/addField.test.ts @@ -0,0 +1,444 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { AddFieldTool } from '../commands/fields/addField'; +import { MetadataCache } from '../cache/cache'; +import { FIELD_TYPE_OPTIONS } from '../commands/interfaces'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('AddField Tool Tests', () => { + let testWorkspaceDir: string; + let testModelFile: string; + let mockCache: MetadataCache; + let addFieldTool: AddFieldTool; + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-addfield-test-')); + const testDataDir = path.join(testWorkspaceDir, 'src', 'data'); + + // Create the src/data directory structure + fs.mkdirSync(testDataDir, { recursive: true }); + + // Create a sample model file for testing + testModelFile = path.join(testDataDir, 'testModel.ts'); + const modelContent = `import { BaseModel, Field, Text, Model } from 'slingr-framework'; + +@Model() +export class TestModel extends BaseModel { + @Field() + @Text() + existingField!: string; +} +`; + fs.writeFileSync(testModelFile, modelContent); + + // Create mock cache + mockCache = { + getMetadataForFile: (filePath: string) => { + if (filePath === testModelFile) { + return { + classes: { + TestModel: { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + existingField: { + name: 'existingField', + type: 'string', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ] + } + }, + declaration: { + uri: vscode.Uri.file(testModelFile) + } + } + } + }; + } + return null; + }, + getDataModelClasses: () => [ + { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: {}, + declaration: { uri: vscode.Uri.file(testModelFile) } + }, + { + name: 'RelatedModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: {}, + declaration: { uri: vscode.Uri.file(path.join(testDataDir, 'relatedModel.ts')) } + } + ] + } as any; + + addFieldTool = new AddFieldTool(); + }); + + teardown(() => { + // Clean up the test workspace + if (testWorkspaceDir && fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true, force: true }); + } + }); + + test('AddField command should be registered', async () => { + const commands = await vscode.commands.getCommands(); + assert.ok( + commands.includes('slingr-vscode-extension.addField'), + 'AddField command should be registered' + ); + }); + + test('AddFieldTool should create instance successfully', () => { + const tool = new AddFieldTool(); + assert.ok(tool, 'AddFieldTool should be instantiated'); + assert.ok(typeof tool.addField === 'function', 'addField method should exist'); + }); + + test('Should validate field type options are correctly defined', () => { + // Test that all core field types are available + const expectedTypes = ['Text', 'LongText', 'Email', 'Integer', 'Boolean', 'Choice', 'Relationship']; + + expectedTypes.forEach(typeName => { + const foundType = FIELD_TYPE_OPTIONS.find(option => option.decorator === typeName); + assert.ok(foundType, `Field type ${typeName} should be available`); + assert.ok(foundType.label, `Field type ${typeName} should have a label`); + assert.ok(foundType.description, `Field type ${typeName} should have a description`); + assert.ok(foundType.tsType, `Field type ${typeName} should have a TypeScript type`); + }); + }); + + test('Should create simple text field programmatically', async () => { + // Mock the workspace folders + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowQuickPick = vscode.window.showQuickPick; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + let inputCallCount = 0; + vscode.window.showInputBox = async (options: any) => { + inputCallCount++; + if (options?.prompt?.includes('field name')) { + return 'newTextField'; + } + if (options?.prompt?.includes('AI enhancement')) { + return ''; // No AI enhancement + } + return undefined; + }; + + let quickPickCallCount = 0; + (vscode.window.showQuickPick as any) = async (items: any[], options: any) => { + quickPickCallCount++; + if (options?.placeHolder?.includes('field type')) { + // Return Text field type + return items.find((item: any) => item.option?.decorator === 'Text'); + } + if (options?.placeHolder?.includes('required')) { + // Return required = false + return { label: "Optional", value: false }; + } + return undefined; + }; + + // Test field creation + const modelUri = vscode.Uri.file(testModelFile); + await addFieldTool.addField(modelUri, mockCache); + + // Verify the mock functions were called + assert.ok(inputCallCount >= 1, 'Input box should be called for field name'); + assert.ok(quickPickCallCount >= 2, 'Quick pick should be called for field type and required status'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showQuickPick = originalShowQuickPick; + } + }); + + test('Should handle relationship field creation', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowQuickPick = vscode.window.showQuickPick; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async (options: any) => { + if (options?.prompt?.includes('field name')) { + return 'relatedItem'; + } + if (options?.prompt?.includes('AI enhancement')) { + return ''; // No AI enhancement + } + return undefined; + }; + + let quickPickCalls: any[] = []; + (vscode.window.showQuickPick as any) = async (items: any[], options: any) => { + quickPickCalls.push({ items, options }); + + if (options?.placeHolder?.includes('field type')) { + // Return Relationship field type + return items.find((item: any) => item.option?.decorator === 'Relationship'); + } + if (options?.placeHolder?.includes('required')) { + return { label: "Required", value: true }; + } + if (options?.placeHolder?.includes('target model')) { + // Return RelatedModel + return { label: 'RelatedModel', description: 'Reference to RelatedModel model' }; + } + if (options?.placeHolder?.includes('relationship type')) { + // Return reference relationship + return { label: "Reference", value: "reference" }; + } + return undefined; + }; + + const modelUri = vscode.Uri.file(testModelFile); + await addFieldTool.addField(modelUri, mockCache); + + // Verify relationship-specific interactions + const relationshipTypeCall = quickPickCalls.find(call => + call.options?.placeHolder?.includes('relationship type') + ); + assert.ok(relationshipTypeCall, 'Should prompt for relationship type'); + + const targetModelCall = quickPickCalls.find(call => + call.options?.placeHolder?.includes('target model') + ); + assert.ok(targetModelCall, 'Should prompt for target model'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showQuickPick = originalShowQuickPick; + } + }); + + test('Should handle choice field creation with enum generation', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowQuickPick = vscode.window.showQuickPick; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + let inputBoxCalls: any[] = []; + vscode.window.showInputBox = async (options: any) => { + inputBoxCalls.push(options); + + if (options?.prompt?.includes('field name')) { + return 'status'; + } + if (options?.prompt?.includes('AI enhancement')) { + return ''; // No AI enhancement + } + if (options?.prompt?.includes('enum values')) { + return 'draft, in-progress, completed, cancelled'; + } + return undefined; + }; + + (vscode.window.showQuickPick as any) = async (items: any[], options: any) => { + if (options?.placeHolder?.includes('field type')) { + // Return Choice field type + return items.find((item: any) => item.option?.decorator === 'Choice'); + } + if (options?.placeHolder?.includes('required')) { + return { label: "Required", value: true }; + } + return undefined; + }; + + const modelUri = vscode.Uri.file(testModelFile); + await addFieldTool.addField(modelUri, mockCache); + + // Verify enum values were requested + const enumValuesCall = inputBoxCalls.find(call => + call?.prompt?.includes('enum values') + ); + assert.ok(enumValuesCall, 'Should prompt for enum values when creating Choice field'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showQuickPick = originalShowQuickPick; + } + }); + + test('Should create AI enhancement prompt when description is provided', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowQuickPick = vscode.window.showQuickPick; + + // Mock the defineFields tool to capture AI prompt + let capturedPrompt: string = ''; + const mockDefineFieldsTool = { + processFieldDescriptions: async (prompt: string, uri: vscode.Uri, cache: any, modelName: string) => { + capturedPrompt = prompt; + } + }; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async (options: any) => { + if (options?.prompt?.includes('field name')) { + return 'userEmail'; + } + if (options?.prompt?.includes('AI enhancement')) { + return 'email field with domain validation and uniqueness constraint'; + } + return undefined; + }; + + (vscode.window.showQuickPick as any) = async (items: any[], options: any) => { + if (options?.placeHolder?.includes('field type')) { + return items.find((item: any) => item.option?.decorator === 'Email'); + } + if (options?.placeHolder?.includes('required')) { + return { label: "Required", value: true }; + } + return undefined; + }; + + // Replace the defineFieldsTool with our mock + (addFieldTool as any).defineFieldsTool = mockDefineFieldsTool; + + const modelUri = vscode.Uri.file(testModelFile); + await addFieldTool.addField(modelUri, mockCache); + + // Verify AI prompt was created correctly + assert.ok(capturedPrompt, 'AI enhancement prompt should be created'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showQuickPick = originalShowQuickPick; + } + }); + + test('Should handle error cases gracefully', async () => { + const originalShowErrorMessage = vscode.window.showErrorMessage; + let errorMessages: string[] = []; + + try { + vscode.window.showErrorMessage = async (message: string) => { + errorMessages.push(message); + return undefined; + }; + + // Test with invalid file (non-TypeScript) + const invalidUri = vscode.Uri.file(path.join(testWorkspaceDir, 'invalid.txt')); + fs.writeFileSync(invalidUri.fsPath, 'not a typescript file'); + + await addFieldTool.addField(invalidUri, mockCache); + + assert.ok(errorMessages.length > 0, 'Should show error message for invalid file'); + assert.ok(errorMessages.some(msg => msg.includes('Failed to add field')), 'Should show appropriate error message'); + + } finally { + vscode.window.showErrorMessage = originalShowErrorMessage; + } + }); + + test('Should handle user cancellation at different steps', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowQuickPick = vscode.window.showQuickPick; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + // Test cancellation at field name step + vscode.window.showInputBox = async () => undefined; // User cancels + vscode.window.showQuickPick = async () => undefined; // User cancels + + const modelUri = vscode.Uri.file(testModelFile); + + // Should handle cancellation gracefully without throwing errors + await assert.doesNotReject(async () => { + await addFieldTool.addField(modelUri, mockCache); + }, 'Should handle user cancellation gracefully'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showQuickPick = originalShowQuickPick; + } + }); + }); +} diff --git a/files/vs-code-extension/src/test/commands/newDataSource.test.ts b/files/vs-code-extension/src/test/commands/newDataSource.test.ts new file mode 100644 index 0000000..2caf1d3 --- /dev/null +++ b/files/vs-code-extension/src/test/commands/newDataSource.test.ts @@ -0,0 +1,255 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { NewDataSourceTool } from '../../commands/newDataSource'; + +if (typeof suite !== 'undefined') { + suite('NewDataSourceTool Tests', () => { + let testWorkspaceDir: string; + let testDataSourcesDir: string; + let newDataSourceTool: NewDataSourceTool; + let inputBoxResponse: string | undefined; + let appliedEdit: vscode.WorkspaceEdit | undefined; + let openedDocument: vscode.Uri | undefined; + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-newdatasource-test-')); + testDataSourcesDir = path.join(testWorkspaceDir, 'src', 'dataSources'); + + // Create the src/dataSources directory structure + fs.mkdirSync(testDataSourcesDir, { recursive: true }); + + newDataSourceTool = new NewDataSourceTool(); + inputBoxResponse = undefined; + appliedEdit = undefined; + openedDocument = undefined; + + // Mock VS Code workspace API + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + get: () => [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }], + configurable: true + }); + + // Mock input box + (vscode.window as any).showInputBox = async (options: vscode.InputBoxOptions) => { + return inputBoxResponse; + }; + + // Mock error message display + (vscode.window as any).showErrorMessage = async (message: string) => { + console.log('Error:', message); + }; + + // Mock workspace edit operations + (vscode.workspace as any).applyEdit = async (edit: vscode.WorkspaceEdit) => { + appliedEdit = edit; + return true; + }; + + // Mock document operations + (vscode.workspace as any).openTextDocument = async (uri: vscode.Uri) => { + openedDocument = uri; + return { + uri, + getText: () => '', + lineAt: () => ({ text: '', range: new vscode.Range(0, 0, 0, 0) }) + }; + }; + + (vscode.window as any).showTextDocument = async (document: any) => { + return {}; + }; + }); + + teardown(() => { + // Clean up the test workspace + if (testWorkspaceDir && fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true, force: true }); + } + }); + + suite('Data Source Creation', () => { + test('should create data source with valid name', async () => { + inputBoxResponse = 'userDatabase'; + + await newDataSourceTool.createNewDataSource(); + + assert.ok(appliedEdit, 'Workspace edit should have been applied'); + assert.ok(openedDocument, 'Document should have been opened'); + + // Check that the URI points to the correct location + const expectedPath = path.join(testDataSourcesDir, 'userDatabase.ts').replace(/\\/g, '/'); + const actualPath = openedDocument.fsPath.replace(/\\/g, '/'); + assert.ok(actualPath.endsWith('src/dataSources/userDatabase.ts'), + `Expected path to end with 'src/dataSources/userDatabase.ts', got: ${actualPath}`); + }); + + test('should handle user cancellation', async () => { + inputBoxResponse = undefined; // User cancelled + + await newDataSourceTool.createNewDataSource(); + + assert.strictEqual(appliedEdit, undefined, 'No workspace edit should have been applied'); + assert.strictEqual(openedDocument, undefined, 'No document should have been opened'); + }); + + test('should handle empty string input', async () => { + inputBoxResponse = ''; + + await newDataSourceTool.createNewDataSource(); + + assert.strictEqual(appliedEdit, undefined, 'No workspace edit should have been applied'); + assert.strictEqual(openedDocument, undefined, 'No document should have been opened'); + }); + + test('should handle no workspace folder', async () => { + // Mock no workspace folders + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + get: () => undefined, + configurable: true + }); + inputBoxResponse = 'testDataSource'; + + let errorMessage = ''; + (vscode.window as any).showErrorMessage = async (message: string) => { + errorMessage = message; + }; + + await newDataSourceTool.createNewDataSource(); + + assert.strictEqual(errorMessage, 'No workspace folder found.'); + assert.strictEqual(appliedEdit, undefined, 'No workspace edit should have been applied'); + }); + + test('should handle empty workspace folders', async () => { + // Mock empty workspace folders array + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + get: () => [], + configurable: true + }); + inputBoxResponse = 'testDataSource'; + + let errorMessage = ''; + (vscode.window as any).showErrorMessage = async (message: string) => { + errorMessage = message; + }; + + await newDataSourceTool.createNewDataSource(); + + assert.strictEqual(errorMessage, 'No workspace folder found.'); + assert.strictEqual(appliedEdit, undefined, 'No workspace edit should have been applied'); + }); + }); + + suite('Generated Template Content', () => { + test('should generate correct template content', async () => { + inputBoxResponse = 'myDataSource'; + + await newDataSourceTool.createNewDataSource(); + + assert.ok(appliedEdit, 'Workspace edit should have been applied'); + + // The workspace edit should contain the file creation and content insertion + // We can't easily inspect the content from the WorkspaceEdit object, + // but we can verify that the edit was created properly + assert.ok(appliedEdit.size > 0, 'Workspace edit should have operations'); + }); + + test('should use data source name in template', async () => { + const dataSourceName = 'customerDatabase'; + inputBoxResponse = dataSourceName; + + await newDataSourceTool.createNewDataSource(); + + assert.ok(appliedEdit, 'Workspace edit should have been applied'); + + // Verify the file path includes the data source name + const expectedPath = `src/dataSources/${dataSourceName}.ts`; + assert.ok(openedDocument?.fsPath.includes(expectedPath.replace(/\//g, path.sep)), + 'File path should include the data source name'); + }); + }); + + suite('File Operations', () => { + test('should create file in correct directory structure', async () => { + inputBoxResponse = 'testDB'; + + await newDataSourceTool.createNewDataSource(); + + assert.ok(openedDocument, 'Document should have been opened'); + + const expectedDir = path.join('src', 'dataSources'); + assert.ok(openedDocument.fsPath.includes(expectedDir), + `File should be created in ${expectedDir} directory`); + }); + + test('should create TypeScript file with correct extension', async () => { + inputBoxResponse = 'myDB'; + + await newDataSourceTool.createNewDataSource(); + + assert.ok(openedDocument, 'Document should have been opened'); + assert.ok(openedDocument.fsPath.endsWith('.ts'), + 'File should have .ts extension'); + }); + }); + + suite('Integration Tests', () => { + test('should complete full workflow successfully', async () => { + const dataSourceName = 'integrationTestDB'; + inputBoxResponse = dataSourceName; + + await newDataSourceTool.createNewDataSource(); + + // Verify all steps completed successfully + assert.ok(appliedEdit, 'Workspace edit should have been applied'); + assert.ok(openedDocument, 'Document should have been opened'); + + // Verify correct file path + assert.ok(openedDocument.fsPath.includes(dataSourceName), + 'Opened document should include the data source name'); + assert.ok(openedDocument.fsPath.replace(/\\/g, '/').includes('src/dataSources'), + 'File should be in src/dataSources directory'); + assert.ok(openedDocument.fsPath.endsWith('.ts'), + 'File should have TypeScript extension'); + }); + + test('should handle multiple data source creation', async () => { + // Create first data source + inputBoxResponse = 'firstDB'; + await newDataSourceTool.createNewDataSource(); + const firstEdit: vscode.WorkspaceEdit | undefined = appliedEdit; + const firstDocument: vscode.Uri | undefined = openedDocument; + + // Reset mocks + appliedEdit = undefined; + openedDocument = undefined; + + // Create second data source + inputBoxResponse = 'secondDB'; + await newDataSourceTool.createNewDataSource(); + + // Both should have succeeded + assert.ok(firstEdit, 'First data source edit should have been applied'); + assert.ok(firstDocument, 'First document should have been opened'); + assert.ok(appliedEdit, 'Second data source edit should have been applied'); + assert.ok(openedDocument, 'Second document should have been opened'); + + // They should be different files + if (firstDocument && openedDocument) { + const firstPath = (firstDocument as vscode.Uri).fsPath; + const secondPath = (openedDocument as vscode.Uri).fsPath; + assert.notStrictEqual(firstPath, secondPath, + 'Different data sources should create different files'); + } + }); + }); + }); +} diff --git a/files/vs-code-extension/src/test/createTest.test.ts b/files/vs-code-extension/src/test/createTest.test.ts new file mode 100644 index 0000000..49eacdd --- /dev/null +++ b/files/vs-code-extension/src/test/createTest.test.ts @@ -0,0 +1,253 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { CreateTestTool } from '../commands/createTest'; +import { MetadataCache, DecoratedClass } from '../cache/cache'; +import { AIService } from '../services/aiService'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('CreateTest Tool Tests', () => { + let testWorkspaceDir: string; + let testModelFile: string; + let mockCache: MetadataCache; + let createTestTool: CreateTestTool; + const aiService: AIService = new AIService(); + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-createtest-test-')); + const testDataDir = path.join(testWorkspaceDir, 'src', 'data'); + const testDir = path.join(testWorkspaceDir, 'tests'); + + // Create the directory structure + fs.mkdirSync(testDataDir, { recursive: true }); + fs.mkdirSync(testDir, { recursive: true }); + + // Create a sample model file for testing + testModelFile = path.join(testDataDir, 'testModel.ts'); + const modelContent = `import { BaseModel, Field, Text, Model, Integer } from 'slingr-framework'; + + @Model() + export class TestModel extends BaseModel { + @Field() + @Text() + name!: string; + + @Field() + @Integer() + age!: number; + } +`; + fs.writeFileSync(testModelFile, modelContent); + + // Create mock cache + mockCache = { + getMetadataForFile: (filePath: string) => { + if (filePath === testModelFile) { + return { + classes: { + TestModel: { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + name: { + name: 'name', + type: 'string', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ] + }, + age: { + name: 'age', + type: 'number', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Integer', arguments: [] } + ] + } + }, + declaration: { + uri: vscode.Uri.file(testModelFile) + } + } + } + }; + } + return null; + } + } as any; + + createTestTool = new CreateTestTool(aiService); + }); + + teardown(() => { + // Clean up the test workspace + if (testWorkspaceDir && fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true, force: true }); + } + }); + + test('CreateTestTool should create instance successfully', () => { + const tool = new CreateTestTool(aiService); + assert.ok(tool, 'CreateTestTool should be instantiated'); + assert.ok(typeof tool.createTest === 'function', 'createTest method should exist'); + }); + + test('Should reject non-TypeScript files', async () => { + const jsFile = path.join(testWorkspaceDir, 'test.js'); + fs.writeFileSync(jsFile, 'console.log("test");'); + const jsUri = vscode.Uri.file(jsFile); + + try { + await createTestTool.createTest(jsUri, mockCache); + assert.fail('Should have thrown an error for non-TypeScript file'); + } catch (error: any) { + assert.ok(error.message.includes('TypeScript file'), 'Should reject non-TypeScript files'); + } + }); + + test('Should reject files without metadata', async () => { + const unknownFile = path.join(testWorkspaceDir, 'unknown.ts'); + fs.writeFileSync(unknownFile, 'export class UnknownClass {}'); + const unknownUri = vscode.Uri.file(unknownFile); + + // Mock cache to return null for unknown file + const mockCacheWithoutMetadata = { + getMetadataForFile: () => null + } as any; + + // Mock the error message to capture the call + const originalShowErrorMessage = vscode.window.showErrorMessage; + let errorMessageCalled = false; + let errorMessage = ''; + + try { + (vscode.window as any).showErrorMessage = async (message: string) => { + errorMessageCalled = true; + errorMessage = message; + }; + + await createTestTool.createTest(unknownUri, mockCacheWithoutMetadata); + + assert.ok(errorMessageCalled, 'Should show error message for file without metadata'); + assert.ok(errorMessage.includes('No metadata found'), 'Error message should mention metadata issue'); + } finally { + (vscode.window as any).showErrorMessage = originalShowErrorMessage; + } + }); + + test('Should reject files without model classes', async () => { + const nonModelFile = path.join(testWorkspaceDir, 'nonModel.ts'); + fs.writeFileSync(nonModelFile, 'export class RegularClass {}'); + const nonModelUri = vscode.Uri.file(nonModelFile); + + // Mock cache to return metadata without model classes + const mockCacheWithoutModel = { + getMetadataForFile: () => ({ + classes: { + RegularClass: { + name: 'RegularClass', + decorators: [], // No @Model decorator + properties: {}, + declaration: { uri: nonModelUri } + } + } + }) + } as any; + + // Mock the error message to capture the call + const originalShowErrorMessage = vscode.window.showErrorMessage; + let errorMessageCalled = false; + let errorMessage = ''; + + try { + (vscode.window as any).showErrorMessage = async (message: string) => { + errorMessageCalled = true; + errorMessage = message; + }; + + await createTestTool.createTest(nonModelUri, mockCacheWithoutModel); + + assert.ok(errorMessageCalled, 'Should show error message for file without model classes'); + assert.ok(errorMessage.includes('No model class found'), 'Error message should mention model class issue'); + } finally { + (vscode.window as any).showErrorMessage = originalShowErrorMessage; + } + }); + + test('Should build correct AI prompt for model with fields', () => { + const modelClass: DecoratedClass = { + name: 'TestModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + name: { + name: 'name', + type: 'string', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ] + }, + age: { + name: 'age', + type: 'number', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Integer', arguments: [] } + ] + } + } + } as any; + + // Access the private method through type assertion + const prompt = (createTestTool as any).buildAIPrompt(modelClass); + + assert.ok(typeof prompt === 'string', 'Should return a string prompt'); + assert.ok(prompt.includes('TestModel'), 'Should include model name'); + assert.ok(prompt.includes('name: string'), 'Should include field information'); + assert.ok(prompt.includes('age: number'), 'Should include field information'); + assert.ok(prompt.includes('Jest'), 'Should mention Jest framework'); + assert.ok(prompt.includes('testModel.test.ts'), 'Should include correct test file name'); + }); + + test('Should handle file existence check correctly', async () => { + const existingTestFile = path.join(testWorkspaceDir, 'tests', 'existing.test.ts'); + fs.writeFileSync(existingTestFile, 'export const test = true;'); + const existingUri = vscode.Uri.file(existingTestFile); + + // Mock vscode.window.showWarningMessage to return 'Cancel' + const originalShowWarningMessage = vscode.window.showWarningMessage; + let warningMessageCalled = false; + + try { + (vscode.window as any).showWarningMessage = async (message: string, ...items: any[]) => { + warningMessageCalled = true; + assert.ok(message.includes('already exists'), 'Should show warning about existing file'); + assert.ok(items.includes('Overwrite'), 'Should offer overwrite option'); + assert.ok(items.includes('Cancel'), 'Should offer cancel option'); + return 'Cancel'; + }; + + const result = await (createTestTool as any).checkIfFileExists(existingUri, 'existing.test.ts'); + + assert.ok(warningMessageCalled, 'Should call warning message for existing file'); + assert.strictEqual(result, 'Cancel', 'Should return Cancel choice'); + } finally { + (vscode.window as any).showWarningMessage = originalShowWarningMessage; + } + }); + + test('Should handle non-existing file correctly', async () => { + const nonExistingFile = path.join(testWorkspaceDir, 'tests', 'nonexisting.test.ts'); + const nonExistingUri = vscode.Uri.file(nonExistingFile); + + const result = await (createTestTool as any).checkIfFileExists(nonExistingUri, 'nonexisting.test.ts'); + + assert.strictEqual(result, 'Overwrite', 'Should return Overwrite for non-existing file'); + }); + }); +} diff --git a/files/vs-code-extension/src/test/index.ts b/files/vs-code-extension/src/test/index.ts new file mode 100644 index 0000000..754d021 --- /dev/null +++ b/files/vs-code-extension/src/test/index.ts @@ -0,0 +1,39 @@ +import * as path from 'path'; +import Mocha from 'mocha'; +import { glob } from 'glob'; + +export function run(): Promise { + // Create the mocha test + const mocha = new Mocha({ + ui: 'bdd', + color: true, + timeout: 10000 // Increase timeout for integration tests + }); + + const testsRoot = path.resolve(__dirname, '..'); + + return new Promise((c, e) => { + glob('**/**.test.js', { cwd: testsRoot }) + .then((files: string[]) => { + // Add files to the test suite + files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f))); + + try { + // Run the mocha test + mocha.run((failures: number) => { + if (failures > 0) { + e(new Error(`${failures} tests failed.`)); + } else { + c(); + } + }); + } catch (err) { + console.error(err); + e(err); + } + }) + .catch((err: any) => { + e(err); + }); + }); +} diff --git a/files/vs-code-extension/src/test/newFolder.test.ts b/files/vs-code-extension/src/test/newFolder.test.ts new file mode 100644 index 0000000..de290b2 --- /dev/null +++ b/files/vs-code-extension/src/test/newFolder.test.ts @@ -0,0 +1,205 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { NewFolderTool } from '../commands/folders/newFolder'; +import { ExplorerProvider } from '../explorer/explorerProvider'; +import { MetadataCache } from '../cache/cache'; +import { AppTreeItem } from '../explorer/appTreeItem'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('NewFolder Tool Tests', () => { + let testWorkspaceDir: string; + let testDataDir: string; + let mockExplorerProvider: ExplorerProvider; + let mockCache: MetadataCache; + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-test-workspace-')); + testDataDir = path.join(testWorkspaceDir, 'src', 'data'); + + // Create the src/data directory structure + fs.mkdirSync(testDataDir, { recursive: true }); + + // Create a mock cache and explorer provider + mockCache = { + getDataModelClasses: () => [], + onDidUpdate: () => ({ dispose: () => {} }), + // Add other required methods as no-ops + } as any; + + mockExplorerProvider = { + refresh: () => {}, + // Add other required methods as no-ops + } as any; + }); + + teardown(() => { + // Clean up the test workspace + if (testWorkspaceDir && fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true, force: true }); + } + }); + + test('NewFolder command should be registered', async () => { + // Wait a moment for extension to fully activate + await new Promise(resolve => setTimeout(resolve, 500)); + + const commands = await vscode.commands.getCommands(); + assert.ok( + commands.includes('slingr-vscode-extension.newFolder'), + 'NewFolder command should be registered' + ); + }); + + test('NewFolderTool should create instance successfully', () => { + const tool = new NewFolderTool(); + assert.ok(tool, 'NewFolderTool should be instantiated'); + assert.ok(typeof tool.createFolder === 'function', 'createFolder method should exist'); + }); + + test('Should validate folder names correctly', () => { + // Test validation logic by checking the patterns + const validNames = ['models', 'core', 'test-folder', 'folder_name', 'folder123']; + const invalidNames = ['', ' ', 'folder with spaces', 'folder/with/slashes', 'folder\\with\\backslashes']; + + const validPattern = /^[a-zA-Z0-9-_]+$/; + + validNames.forEach(name => { + assert.ok(validPattern.test(name), `"${name}" should be a valid folder name`); + }); + + invalidNames.forEach(name => { + assert.ok(!validPattern.test(name.trim()) || !name.trim(), `"${name}" should be an invalid folder name`); + }); + }); + + test('Should handle workspace folder detection', () => { + // This is a basic test for the workspace folder logic + // In a real environment, we'd need to mock vscode.workspace.workspaceFolders + const tool = new NewFolderTool(); + + // Test that the tool exists and has the necessary methods + assert.ok(tool, 'Tool should be created'); + + // We can't fully test the actual folder creation without a real workspace + // This test ensures the class structure is correct + assert.strictEqual(typeof tool.createFolder, 'function', 'createFolder should be a function'); + }); + + test('Should create folder programmatically', async () => { + const tool = new NewFolderTool(); + + // Mock the workspace folders to point to our test directory + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + // Mock vscode.window.showInputBox to return a test folder name + const originalShowInputBox = vscode.window.showInputBox; + const testFolderName = 'test-created-folder'; + + try { + // Mock the workspace folders + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + // Mock the input box to return our test folder name + vscode.window.showInputBox = async () => testFolderName; + + // Test creating a folder programmatically + const expectedFolderPath = path.join(testDataDir, testFolderName); + + // Ensure the folder doesn't exist before the test + assert.ok(!fs.existsSync(expectedFolderPath), 'Test folder should not exist before creation'); + + // Create the folder using the tool + await tool.createFolder(mockExplorerProvider); + + // Verify the folder was created + assert.ok(fs.existsSync(expectedFolderPath), 'Folder should be created'); + assert.ok(fs.lstatSync(expectedFolderPath).isDirectory(), 'Created path should be a directory'); + + } finally { + // Restore original implementations + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + } + }); + + test('Should create nested folder structure', async () => { + const tool = new NewFolderTool(); + + // Create a parent folder first + const parentFolderName = 'parent-folder'; + const parentFolderPath = path.join(testDataDir, parentFolderName); + fs.mkdirSync(parentFolderPath, { recursive: true }); + + // Mock workspace folders + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const childFolderName = 'child-folder'; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async () => childFolderName; + + // Create AppTreeItem representing the parent folder + const extensionUri = vscode.Uri.file(testWorkspaceDir); + const parentFolderItem = new AppTreeItem( + parentFolderName, + vscode.TreeItemCollapsibleState.Collapsed, + 'folder', + extensionUri, + undefined, + undefined, + parentFolderName + ); + + // Create folder inside the parent + const expectedChildPath = path.join(parentFolderPath, childFolderName); + + assert.ok(!fs.existsSync(expectedChildPath), 'Child folder should not exist before creation'); + + await tool.createFolder(mockExplorerProvider, parentFolderItem); + + assert.ok(fs.existsSync(expectedChildPath), 'Child folder should be created'); + assert.ok(fs.lstatSync(expectedChildPath).isDirectory(), 'Created child path should be a directory'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + } + }); + + test('Basic functionality test', () => { + // This is a placeholder test - in a real scenario, we'd test the actual functionality + // with proper mocking of vscode APIs and file system operations + assert.strictEqual(1 + 1, 2); + }); + }); +} diff --git a/files/vs-code-extension/src/test/newModel.test.ts b/files/vs-code-extension/src/test/newModel.test.ts new file mode 100644 index 0000000..c25bdde --- /dev/null +++ b/files/vs-code-extension/src/test/newModel.test.ts @@ -0,0 +1,578 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import * as fs from 'fs'; +import * as os from 'os'; +import { NewModelTool } from '../commands/models/newModel'; +import { MetadataCache } from '../cache/cache'; +import { AppTreeItem } from '../explorer/appTreeItem'; + +// Only run tests if we're in a test environment (Mocha globals are available) +if (typeof suite !== 'undefined') { + suite('NewModel Tool Tests', () => { + let testWorkspaceDir: string; + let testDataDir: string; + let mockCache: MetadataCache; + let newModelTool: NewModelTool; + + setup(async () => { + // Create a temporary workspace directory for testing + testWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-newmodel-test-')); + testDataDir = path.join(testWorkspaceDir, 'src', 'data'); + + // Create the src/data directory structure + fs.mkdirSync(testDataDir, { recursive: true }); + + // Create a sample parent model file for relationship testing + const parentModelFile = path.join(testDataDir, 'parentModel.ts'); + const parentModelContent = `import { BaseModel, Field, Text, Model } from 'slingr-framework'; + +@Model() +export class ParentModel extends BaseModel { + @Field() + @Text() + name!: string; +} +`; + fs.writeFileSync(parentModelFile, parentModelContent); + + // Create mock cache + mockCache = { + getMetadataForFile: (filePath: string) => { + if (filePath === parentModelFile) { + return { + classes: { + ParentModel: { + name: 'ParentModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + name: { + name: 'name', + type: 'string', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ] + } + }, + declaration: { + uri: vscode.Uri.file(parentModelFile) + } + } + } + }; + } + return null; + }, + getDataModelClasses: () => [ + { + name: 'ParentModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: { + name: { + name: 'name', + type: 'string', + decorators: [ + { name: 'Field', arguments: [] }, + { name: 'Text', arguments: [] } + ] + } + }, + declaration: { uri: vscode.Uri.file(parentModelFile) } + }, + { + name: 'ExistingModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: {}, + declaration: { uri: vscode.Uri.file(path.join(testDataDir, 'existingModel.ts')) } + } + ] + } as any; + + newModelTool = new NewModelTool(); + }); + + teardown(() => { + // Clean up the test workspace + if (testWorkspaceDir && fs.existsSync(testWorkspaceDir)) { + fs.rmSync(testWorkspaceDir, { recursive: true, force: true }); + } + }); + + test('NewModel command should be registered', async () => { + // Wait a moment for extension to fully activate + await new Promise(resolve => setTimeout(resolve, 1000)); + + const commands = await vscode.commands.getCommands(); + assert.ok( + commands.includes('slingr-vscode-extension.newModel'), + 'NewModel command should be registered' + ); + }); + + test('NewModelTool should create instance successfully', () => { + const tool = new NewModelTool(); + assert.ok(tool, 'NewModelTool should be instantiated'); + assert.ok(typeof tool.createNewModel === 'function', 'createNewModel method should exist'); + assert.ok(typeof tool.processWithAI === 'function', 'processWithAI method should exist'); + }); + + test('Should create model with real fields - END-TO-END TEST', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowInformationMessage = vscode.window.showInformationMessage; + const originalOpenTextDocument = vscode.workspace.openTextDocument; + const originalShowTextDocument = vscode.window.showTextDocument; + const originalApplyEdit = vscode.workspace.applyEdit; + const originalExecuteCommand = vscode.commands.executeCommand; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + let inputCallCount = 0; + vscode.window.showInputBox = async (options: any) => { + inputCallCount++; + if (options?.prompt?.includes('name of the new model')) { + return 'UserModel'; + } + if (options?.prompt?.includes('optional documentation')) { + return 'A comprehensive user model for the application'; + } + if (options?.prompt?.includes('field information')) { + return ''; // Return empty string to skip AI processing + } + return ''; + }; + + let infoMessageCalled = false; + vscode.window.showInformationMessage = async (message: string) => { + infoMessageCalled = true; + return undefined; + }; + + // Mock document opening with full document interface + (vscode.workspace.openTextDocument as any) = async (uri: vscode.Uri) => { + return { + getText: () => fs.readFileSync(uri.fsPath, 'utf8'), + uri: uri, + save: async () => true, + fileName: uri.fsPath, + languageId: 'typescript', + version: 1, + isDirty: false, + isClosed: false, + isUntitled: false, + eol: vscode.EndOfLine.LF, + lineCount: fs.readFileSync(uri.fsPath, 'utf8').split('\n').length + } as any; + }; + + vscode.window.showTextDocument = async (document: any) => { + return {} as any; + }; + + // Mock workspace.applyEdit to actually apply text edits to files + (vscode.workspace.applyEdit as any) = async (edit: vscode.WorkspaceEdit) => { + for (const [uri, edits] of edit.entries()) { + if (edits && edits.length > 0) { + const filePath = uri.fsPath; + let content = fs.readFileSync(filePath, 'utf8'); + + // Apply edits in reverse order to maintain positions + const sortedEdits = edits.sort((a, b) => b.range.start.compareTo(a.range.start)); + + for (const edit of sortedEdits) { + const lines = content.split('\n'); + const startLine = edit.range.start.line; + const startChar = edit.range.start.character; + const endLine = edit.range.end.line; + const endChar = edit.range.end.character; + + if (startLine === endLine) { + const line = lines[startLine]; + lines[startLine] = line.substring(0, startChar) + edit.newText + line.substring(endChar); + } else { + const startPart = lines[startLine].substring(0, startChar); + const endPart = lines[endLine].substring(endChar); + lines.splice(startLine, endLine - startLine + 1, startPart + edit.newText + endPart); + } + + content = lines.join('\n'); + } + + fs.writeFileSync(filePath, content, 'utf8'); + } + } + return Promise.resolve(true); + }; + + // Mock executeCommand - should not be called for AI integration + (vscode.commands.executeCommand as any) = async (command: string, ...args: any[]) => { + // This should not be called when no field description is provided + assert.fail('AI integration should not be triggered when no field description is provided'); + }; + + // Mock DefineFieldsTool - should not be called when no fields are specified + const mockDefineFieldsTool = { + processFieldDescriptions: async (fieldsInfo: string, uri: vscode.Uri, cache: any, modelName: string) => { + assert.fail('DefineFieldsTool should not be called when no field description is provided'); + } + }; + + // Replace the defineFieldsTool with our mock + (newModelTool as any).defineFieldsTool = mockDefineFieldsTool; + + // Test model creation with real field processing + const targetUri = vscode.Uri.file(testDataDir); + await newModelTool.createNewModel(targetUri, mockCache); + + // Verify the model file was created + const expectedModelPath = path.join(testDataDir, 'UserModel.ts'); + assert.ok(fs.existsSync(expectedModelPath), 'Model file should be created'); + + // Verify the content of the created model + const modelContent = fs.readFileSync(expectedModelPath, 'utf8'); + + // Verify basic model structure + assert.ok(modelContent.includes('@Model()'), 'Model should have @Model decorator'); + assert.ok(modelContent.includes('export class UserModel extends BaseModel'), 'Model should extend BaseModel'); + assert.ok(modelContent.includes('* A comprehensive user model for the application'), 'Model should include documentation'); + + // Verify only basic imports are present + assert.ok(modelContent.includes('import { Model, Field }'), 'Should have basic imports'); + assert.ok(!modelContent.includes('Text, Email, Integer, Boolean, Choice'), 'Should NOT import field decorators when no fields specified'); + + // Verify the class is empty (just the basic structure) + assert.ok(modelContent.includes('export class UserModel extends BaseModel {\n}'), 'Model class should be empty when no fields specified'); + + // Verify user interactions + assert.ok(inputCallCount >= 3, 'Input box should be called for model name, docs, and fields'); + assert.ok(infoMessageCalled, 'Success message should be shown'); + + console.log('Created UserModel content (without AI integration):'); + console.log(modelContent); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showInformationMessage = originalShowInformationMessage; + vscode.workspace.openTextDocument = originalOpenTextDocument; + vscode.window.showTextDocument = originalShowTextDocument; + vscode.workspace.applyEdit = originalApplyEdit; + vscode.commands.executeCommand = originalExecuteCommand; + } + }); + + + test('Should create composition relationship when created from model context - REAL FILE TEST', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowInformationMessage = vscode.window.showInformationMessage; + const originalOpenTextDocument = vscode.workspace.openTextDocument; + const originalShowTextDocument = vscode.window.showTextDocument; + const originalApplyEdit = vscode.workspace.applyEdit; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async (options: any) => { + if (options?.prompt?.includes('name of the new model')) { + return 'ChildModel'; + } + return ''; + }; + + vscode.window.showInformationMessage = async () => undefined; + (vscode.workspace.openTextDocument as any) = async (uri: vscode.Uri) => { + return { + getText: () => fs.readFileSync(uri.fsPath, 'utf8'), + uri: uri, + save: async () => { + // Mock save method - in a real scenario this would save to VS Code + // For our test, the file changes are applied through workspace.applyEdit + return true; + }, + fileName: uri.fsPath, + languageId: 'typescript', + version: 1, + isDirty: false, + isClosed: false, + isUntitled: false, + eol: vscode.EndOfLine.LF, + lineCount: fs.readFileSync(uri.fsPath, 'utf8').split('\n').length + } as any; + }; + vscode.window.showTextDocument = async () => ({} as any); + + // Mock workspace.applyEdit to actually apply text edits to files + (vscode.workspace.applyEdit as any) = async (edit: vscode.WorkspaceEdit) => { + // Apply the text edits to the actual file system for testing + for (const [uri, edits] of edit.entries()) { + if (edits && edits.length > 0) { + const filePath = uri.fsPath; + let content = fs.readFileSync(filePath, 'utf8'); + + // Apply edits in reverse order to maintain positions + const sortedEdits = edits.sort((a, b) => b.range.start.compareTo(a.range.start)); + + for (const edit of sortedEdits) { + const lines = content.split('\n'); + const startLine = edit.range.start.line; + const startChar = edit.range.start.character; + const endLine = edit.range.end.line; + const endChar = edit.range.end.character; + + if (startLine === endLine) { + // Single line edit + const line = lines[startLine]; + lines[startLine] = line.substring(0, startChar) + edit.newText + line.substring(endChar); + } else { + // Multi-line edit + const startPart = lines[startLine].substring(0, startChar); + const endPart = lines[endLine].substring(endChar); + lines.splice(startLine, endLine - startLine + 1, startPart + edit.newText + endPart); + } + + content = lines.join('\n'); + } + + // Write the updated content back to the file + fs.writeFileSync(filePath, content, 'utf8'); + } + } + return Promise.resolve(true); + }; + + // Create AppTreeItem representing a model context + const extensionUri = vscode.Uri.file(testWorkspaceDir); + const parentModelItem = new AppTreeItem( + 'ParentModel', + vscode.TreeItemCollapsibleState.Collapsed, + 'model', + extensionUri, + { + name: 'ParentModel', + decorators: [{ name: 'Model', arguments: [] }], + properties: {} + } as any + ); + + // Get the original parent model content before the operation + const parentModelPath = path.join(testDataDir, 'parentModel.ts'); + const originalParentContent = fs.readFileSync(parentModelPath, 'utf8'); + + // Verify original content doesn't have the relationship field yet + assert.ok(!originalParentContent.includes('childModels'), 'Parent model should not initially contain childModels field'); + assert.ok(!originalParentContent.includes('@Relationship'), 'Parent model should not initially contain @Relationship decorator'); + + await newModelTool.createNewModel(parentModelItem, mockCache); + + // Verify the child model file was created + const expectedModelPath = path.join(testDataDir, 'ChildModel.ts'); + assert.ok(fs.existsSync(expectedModelPath), 'Child model file should be created'); + + // REAL FILE TEST: Check if the composition relationship field was actually added to the parent model file + const updatedParentContent = fs.readFileSync(parentModelPath, 'utf8'); + + // Verify the relationship field was actually written to the file + assert.ok(updatedParentContent.includes('childModels'), 'Parent model should contain the relationship field "childModels"'); + assert.ok(updatedParentContent.includes('@Field'), 'Parent model should have @Field decorator for the relationship'); + assert.ok(updatedParentContent.includes('@Relationship'), 'Parent model should have @Relationship decorator'); + assert.ok(updatedParentContent.includes('composition'), 'Relationship should be of type composition'); + assert.ok(updatedParentContent.includes('ChildModel'), 'Relationship should reference ChildModel type'); + + // Verify the field declaration syntax + assert.ok(updatedParentContent.includes('childModels!: ChildModel[]'), 'Should have correct TypeScript array syntax'); + + // Verify proper import was added for ChildModel + assert.ok( + updatedParentContent.includes(`import { ChildModel }`) || + updatedParentContent.includes(`import './ChildModel'`) || + updatedParentContent.includes('ChildModel'), + 'Should import or reference ChildModel' + ); + + console.log('Updated parent model content:'); + console.log(updatedParentContent); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showInformationMessage = originalShowInformationMessage; + vscode.workspace.openTextDocument = originalOpenTextDocument; + vscode.window.showTextDocument = originalShowTextDocument; + vscode.workspace.applyEdit = originalApplyEdit; + } + }); + + test('Should handle file overwrite confirmation', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + // Create an existing model file (using a name NOT in the cache) + const existingModelPath = path.join(testDataDir, 'FileExistingModel.ts'); + fs.writeFileSync(existingModelPath, 'export class FileExistingModel {}'); + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowWarningMessage = vscode.window.showWarningMessage; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async (options: any) => { + if (options?.prompt?.includes('name of the new model')) { + return 'FileExistingModel'; + } + return ''; + }; + + let warningMessageCalled = false; + (vscode.window.showWarningMessage as any) = async (message: string, ...items: string[]) => { + warningMessageCalled = true; + assert.ok(message.includes('already exists'), 'Warning should mention file already exists'); + assert.ok(items.includes('Overwrite'), 'Should offer overwrite option'); + assert.ok(items.includes('Cancel'), 'Should offer cancel option'); + return 'Cancel'; // User cancels + }; + + const targetUri = vscode.Uri.file(testDataDir); + await newModelTool.createNewModel(targetUri, mockCache); + + assert.ok(warningMessageCalled, 'Warning message should be shown for existing file'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showWarningMessage = originalShowWarningMessage; + } + }); + + test('Should test AI enhancement functionality', async () => { + const targetUri = vscode.Uri.file(testDataDir); + const userInput = "Create a User model with name, email, and authentication fields"; + + // Mock the createNewModel method to track if it was called + let createNewModelCalled = false; + const originalCreateNewModel = newModelTool.createNewModel; + newModelTool.createNewModel = async (uri: any, cache?: any) => { + createNewModelCalled = true; + return Promise.resolve(); + }; + + try { + await newModelTool.processWithAI(userInput, targetUri, mockCache); + + assert.ok(createNewModelCalled, 'createNewModel should be called by processWithAI'); + + } finally { + newModelTool.createNewModel = originalCreateNewModel; + } + }); + + test('Should generate correct model content', () => { + // Test the private generateModelContent method by creating a new instance + // and calling createNewModel with mocked inputs + const tool = new NewModelTool(); + + // We can't directly test the private method, but we can verify the generated content + // by creating a model and checking the file content + const testContent = (tool as any).generateModelContent('TestModel', 'Test documentation', null, testDataDir); + + assert.ok(testContent.includes('import { Model, Field } from \'slingr-framework\';'), 'Should import decorators'); + assert.ok(testContent.includes('import { BaseModel } from \'slingr-framework\';'), 'Should import BaseModel'); + assert.ok(testContent.includes('* Test documentation'), 'Should include documentation'); + assert.ok(testContent.includes('@Model()'), 'Should include @Model decorator'); + assert.ok(testContent.includes('export class TestModel extends BaseModel'), 'Should create proper class declaration'); + }); + + test('Should handle errors gracefully', async () => { + const mockWorkspaceFolders = [{ + uri: vscode.Uri.file(testWorkspaceDir), + name: 'test-workspace', + index: 0 + }]; + + const originalWorkspaceFolders = vscode.workspace.workspaceFolders; + const originalShowInputBox = vscode.window.showInputBox; + const originalShowErrorMessage = vscode.window.showErrorMessage; + + try { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: mockWorkspaceFolders, + configurable: true + }); + + vscode.window.showInputBox = async (options: any) => { + if (options?.prompt?.includes('name of the new model')) { + return 'TestModel'; + } + return ''; + }; + + let errorMessages: string[] = []; + vscode.window.showErrorMessage = async (message: string) => { + errorMessages.push(message); + return undefined; + }; + + // Test with invalid target directory (read-only) + const readOnlyDir = path.join(testWorkspaceDir, 'readonly'); + fs.mkdirSync(readOnlyDir, { recursive: true }); + try { + fs.chmodSync(readOnlyDir, 0o444); // Read-only + } catch { + // Skip this test on systems that don't support chmod + return; + } + + const targetUri = vscode.Uri.file(readOnlyDir); + await newModelTool.createNewModel(targetUri, mockCache); + + assert.ok(errorMessages.length > 0, 'Should show error message for failed file creation'); + assert.ok(errorMessages.some(msg => msg.includes('Failed to create model')), 'Should show appropriate error message'); + + } finally { + Object.defineProperty(vscode.workspace, 'workspaceFolders', { + value: originalWorkspaceFolders, + configurable: true + }); + vscode.window.showInputBox = originalShowInputBox; + vscode.window.showErrorMessage = originalShowErrorMessage; + } + }); + }); +} diff --git a/files/vs-code-extension/src/test/quickInfoPanel/infoPanelRegistration.test.ts b/files/vs-code-extension/src/test/quickInfoPanel/infoPanelRegistration.test.ts new file mode 100644 index 0000000..fa113d4 --- /dev/null +++ b/files/vs-code-extension/src/test/quickInfoPanel/infoPanelRegistration.test.ts @@ -0,0 +1,130 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import { registerInfoPanel } from '../../quickInfoPanel/infoPanelRegistration'; +import { QuickInfoProvider } from '../../quickInfoPanel/quickInfoProvider'; +import { MetadataCache } from '../../cache/cache'; +import { TestContextFactory } from '../testHelpers'; +import * as path from 'path'; + +suite('InfoPanel Registration Tests', () => { + let cache: MetadataCache; + let mockContext: vscode.ExtensionContext; + let extensionPath: string; + + setup(async () => { + extensionPath = path.join(__dirname, '..', '..', '..'); + cache = new MetadataCache(extensionPath); + + try { + await cache.initialize(); + } catch (error) { + console.warn('Cache initialization failed in test, using empty cache'); + } + + // Create a mock extension context using helper + mockContext = TestContextFactory.createMockExtensionContext(extensionPath); + }); + + teardown(() => { + cache?.dispose(); + }); + + suite('Registration Function', () => { + test('should register QuickInfoProvider successfully', () => { + // We can't actually register twice, so we test the creation instead + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + assert.ok(provider, 'Should return a provider instance'); + assert.ok(provider instanceof QuickInfoProvider, 'Should return QuickInfoProvider instance'); + }); + + test('should add registration to context subscriptions', () => { + // Test that the registration function would add to subscriptions + // We can't actually test registration due to VSCode limitations in tests + assert.ok(mockContext.subscriptions !== undefined, 'Context should have subscriptions array'); + }); + + test('should use correct viewType for registration', () => { + // The registration internally uses QuickInfoProvider.viewType + assert.strictEqual(QuickInfoProvider.viewType, 'slingrQuickInfo', + 'ViewType should match expected value'); + }); + + test('should work with different extension contexts', () => { + // Create another mock context + const anotherMockContext = { + ...mockContext, + subscriptions: [] + }; + + // Test provider creation instead of registration + const provider = new QuickInfoProvider(anotherMockContext.extensionUri, cache); + + assert.ok(provider, 'Should work with different contexts'); + }); + }); + + suite('Provider Configuration', () => { + test('should configure provider with correct extension URI', () => { + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + // We can't directly access private properties, but we can test behavior + assert.ok(provider, 'Provider should be configured without errors'); + }); + + test('should configure provider with cache reference', () => { + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + // Test that provider can access cache functionality indirectly + assert.ok(provider, 'Provider should have cache reference'); + }); + + test('should create provider that can resolve webview views', () => { + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + // Create a mock webview view using helper + const mockWebviewView = TestContextFactory.createMockWebviewView(); + const mockResolveContext = { state: undefined } as vscode.WebviewViewResolveContext; + const mockToken = { isCancellationRequested: false } as vscode.CancellationToken; + + // This should not throw + provider.resolveWebviewView(mockWebviewView, mockResolveContext, mockToken); + + assert.ok(true, 'Provider should resolve webview view without errors'); + }); + }); + + suite('Integration with VSCode', () => { + test('should create disposable registration', () => { + // Test the registration function exists and would work + assert.ok(typeof registerInfoPanel === 'function', 'registerInfoPanel should be a function'); + assert.ok(mockContext.subscriptions, 'Context should have subscriptions'); + }); + + test('should work with extension lifecycle', () => { + // Test multiple provider creations (simulating extension reload) + const provider1 = new QuickInfoProvider(mockContext.extensionUri, cache); + const provider2 = new QuickInfoProvider(mockContext.extensionUri, cache); + + assert.ok(provider1, 'First provider creation should work'); + assert.ok(provider2, 'Second provider creation should work'); + }); + }); + + suite('Provider Features', () => { + test('should create provider with update capability', () => { + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + // Test that provider has update method + assert.ok(typeof provider.update === 'function', 'Provider should have update method'); + }); + + test('should create provider with webview view resolution', () => { + const provider = new QuickInfoProvider(mockContext.extensionUri, cache); + + // Test that provider has resolveWebviewView method + assert.ok(typeof provider.resolveWebviewView === 'function', + 'Provider should have resolveWebviewView method'); + }); + }); +}); diff --git a/files/vs-code-extension/src/test/quickInfoPanel/integration.test.ts b/files/vs-code-extension/src/test/quickInfoPanel/integration.test.ts new file mode 100644 index 0000000..5db1a4f --- /dev/null +++ b/files/vs-code-extension/src/test/quickInfoPanel/integration.test.ts @@ -0,0 +1,502 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import { QuickInfoProvider, MetadataItem } from '../../quickInfoPanel/quickInfoProvider'; +import { MetadataCache, DecoratedClass, PropertyMetadata } from '../../cache/cache'; +import { rendererRegistry } from '../../quickInfoPanel/renderers/rendererRegistry'; +import { TestMetadataFactory, TestContextFactory } from '../testHelpers'; +import * as path from 'path'; + +suite('QuickInfoPanel Integration Tests', () => { + let provider: QuickInfoProvider; + let cache: MetadataCache; + let mockContext: vscode.ExtensionContext; + let mockWebviewView: any; + let extensionPath: string; + + // Test data that will be populated in the cache + let testUserModel: DecoratedClass; + let testOrderModel: DecoratedClass; + let testUsernameField: PropertyMetadata; + let testEmailField: PropertyMetadata; + + setup(async () => { + extensionPath = path.join(__dirname, '..', '..', '..'); + cache = new MetadataCache(extensionPath); + + try { + await cache.initialize(); + } catch (error) { + console.warn('Cache initialization failed in test, using empty cache'); + } + + // Create a mock extension context using helper + mockContext = TestContextFactory.createMockExtensionContext(extensionPath); + + // Set up test data in the cache + await setupTestDataInCache(); + + // Create provider directly instead of registering + provider = new QuickInfoProvider(mockContext.extensionUri, cache); + }); + + teardown(() => { + cache?.dispose(); + }); + + /** + * Sets up realistic test data for integration testing. + * Since MetadataCache doesn't support direct data injection, we create + * the test data that would realistically come from cache operations. + */ + async function setupTestDataInCache(): Promise { + // Create realistic test models and fields that represent what would be found in cache + testUsernameField = TestMetadataFactory.createFieldWithType('username', 'string', [ + { name: 'Field', arguments: [{ type: 'text', required: true }], position: new vscode.Range(5, 0, 5, 20) } + ]); + + testEmailField = TestMetadataFactory.createFieldWithType('email', 'string', [ + { name: 'Field', arguments: [{ type: 'email', required: true }], position: new vscode.Range(6, 0, 6, 20) } + ]); + + const ageField = TestMetadataFactory.createFieldWithType('age', 'number', [ + { name: 'Field', arguments: [{ type: 'number', min: 0 }], position: new vscode.Range(7, 0, 7, 20) } + ]); + + const isActiveField = TestMetadataFactory.createFieldWithType('isActive', 'boolean', [ + { name: 'Field', arguments: [{ type: 'boolean' }], position: new vscode.Range(8, 0, 8, 20) } + ]); + + // Create User model with realistic fields + testUserModel = TestMetadataFactory.createModel({ + name: 'User', + decorators: [{ + name: 'Model', + arguments: [], + position: new vscode.Range(0, 0, 0, 15) + }], + properties: { + username: testUsernameField, + email: testEmailField, + age: ageField, + isActive: isActiveField + }, + declaration: { + uri: vscode.Uri.file(path.join(extensionPath, 'src/data/User.ts')), + range: new vscode.Range(0, 0, 20, 0) + } + }); + + // Create a related Order model to test relationships + const customerField = TestMetadataFactory.createRelationshipField('customer', 'User'); + const totalField = TestMetadataFactory.createFieldWithType('total', 'number', [ + { name: 'Field', arguments: [{ type: 'number', min: 0 }], position: new vscode.Range(5, 0, 5, 20) } + ]); + + testOrderModel = TestMetadataFactory.createModel({ + name: 'Order', + decorators: [{ + name: 'Model', + arguments: [], + position: new vscode.Range(0, 0, 0, 15) + }], + properties: { + customer: customerField, + total: totalField + }, + declaration: { + uri: vscode.Uri.file(path.join(extensionPath, 'src/data/Order.ts')), + range: new vscode.Range(0, 0, 15, 0) + } + }); + + // Note: These models represent what would be found in a real cache + // The integration tests demonstrate how the provider would work with such data + } + + setup(() => { + // Each test will create its own fresh provider and webview to avoid state pollution + }); + + suite('End-to-End Workflow', () => { + test('should display User model from cache with real integration', () => { + // Create fresh webview for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + provider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Update provider with real model from cache + provider.update('model', testUserModel); + + const html = mockWebviewView.webview.html; + + // Verify model information is displayed + assert.ok(html.includes('User'), 'Should display User model name'); + assert.ok(html.includes('Model'), 'Should display Model tag'); + assert.ok(html.includes('username'), 'Should display username field'); + assert.ok(html.includes('email'), 'Should display email field'); + assert.ok(html.includes('age'), 'Should display age field'); + assert.ok(html.includes('isActive'), 'Should display isActive field'); + assert.ok(html.includes('Fields'), 'Should display fields section'); + }); + + test('should display field from cache and navigate back to model', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // First show the model + freshProvider.update('model', testUserModel); + let html = mockWebviewView.webview.html; + + // Verify model content is displayed + assert.ok(html.includes('User'), 'Should display User model name'); + assert.ok(html.includes('username'), 'Should display username field'); + + // Then navigate to a specific field + freshProvider.update('field', testUsernameField); + html = mockWebviewView.webview.html; + + // Verify field information is displayed + assert.ok(html.includes('username'), 'Should display username field name'); + assert.ok(html.includes('Field'), 'Should display Field tag'); + assert.ok(html.includes('string'), 'Should display field type'); + assert.ok(html.includes('text'), 'Should display field type configuration'); + + // Now should show back button because we navigated from model to field + assert.ok(html.includes('back-button'), 'Should show back button after navigating to field'); + }); + + test('should handle model with relationships from cache', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Display Order model which has relationship to User + freshProvider.update('model', testOrderModel); + + const html = mockWebviewView.webview.html; + + // Verify relationship information is displayed + assert.ok(html.includes('Order'), 'Should display Order model name'); + assert.ok(html.includes('customer'), 'Should display customer relationship field'); + assert.ok(html.includes('total'), 'Should display total field'); + assert.ok(html.includes('User'), 'Should display related User model type'); + }); + + test('should find and display models using cache lookup', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Test cache lookup functionality by finding User model + // First try real cache, then fall back to our test data + let foundModels = cache.findMetadata( + (item: any) => 'properties' in item && item.name === 'User' + ) as DecoratedClass[]; + + // If no User model in real cache, use our test data to demonstrate the integration + if (foundModels.length === 0) { + foundModels = [testUserModel]; + } + + assert.ok(foundModels.length > 0, 'Should have User model data (from cache or test setup)'); + const userModel = foundModels[0]; + assert.strictEqual(userModel.name, 'User', 'Found model should be User'); + + // Display the found model + freshProvider.update('model', userModel); + + const html = mockWebviewView.webview.html; + assert.ok(html.includes('User'), 'Should display found User model'); + assert.ok(html.includes('username'), 'Should display model fields'); + }); + + test('should handle field click navigation using cache data', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Start with User model + freshProvider.update('model', testUserModel); + + // Simulate field click by finding the field in the model and navigating to it + const emailFieldFromModel = testUserModel.properties['email']; + assert.ok(emailFieldFromModel, 'Email field should exist in User model'); + + // Navigate to the field + freshProvider.update('field', emailFieldFromModel); + + const html = mockWebviewView.webview.html; + assert.ok(html.includes('email'), 'Should display email field'); + assert.ok(html.includes('email'), 'Should display email field type configuration'); + assert.ok(html.includes('back-button'), 'Should show back button'); + }); + + test('should handle unknown metadata types with fallback', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + const unknownMetadata = { + name: 'UnknownItem', + type: 'unknown', + customProperty: 'custom value' + } as any; + + freshProvider.update('unknown', unknownMetadata); + + const html = mockWebviewView.webview.html; + + // Should fall back to JSON display + assert.ok(html.includes('UnknownItem'), 'Should display unknown metadata'); + assert.ok(html.includes('customProperty'), 'Should display custom properties'); + }); + }); + + suite('Renderer Integration', () => { + test('should use model renderer with cache data', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + const modelRenderer = rendererRegistry.get('model'); + assert.ok(modelRenderer, 'Model renderer should be available'); + + // Use real test data from cache setup + freshProvider.update('model', testUserModel); + + const html = mockWebviewView.webview.html; + assert.ok(html.includes('User'), 'Should render User model using model renderer'); + assert.ok(html.includes('username'), 'Should render model fields'); + assert.ok(html.includes('email'), 'Should render model fields'); + }); + + test('should use field renderer with cache data', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + const fieldRenderer = rendererRegistry.get('field'); + assert.ok(fieldRenderer, 'Field renderer should be available'); + + // Use real field data from cache setup + freshProvider.update('field', testEmailField); + + const html = mockWebviewView.webview.html; + assert.ok(html.includes('email'), 'Should render email field using field renderer'); + assert.ok(html.includes('string'), 'Should display field type'); + assert.ok(html.includes('email'), 'Should display field type configuration'); + }); + + test('should render relationship fields with proper context', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Use Order model which has relationship to User + freshProvider.update('model', testOrderModel); + + const html = mockWebviewView.webview.html; + assert.ok(html.includes('Order'), 'Should render Order model'); + assert.ok(html.includes('customer'), 'Should render customer relationship field'); + + // Test that clicking on User type would be possible (integration with findModel) + const customerField = testOrderModel.properties['customer']; + assert.ok(customerField, 'Customer field should exist'); + assert.strictEqual(customerField.type, 'User', 'Customer field should reference User type'); + }); + }); + + suite('Error Handling', () => { + test('should handle malformed metadata gracefully', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Use a malformed but non-breaking metadata structure + const malformedMetadata = { + name: 'MalformedModel', + decorators: [], + properties: {}, + methods: {}, + references: [], + declaration: { + uri: vscode.Uri.file('/test/malformed.ts'), + range: new vscode.Range(0, 0, 1, 0) + }, + isDataModel: true + }; + + // Should not throw + freshProvider.update('model', malformedMetadata); + + const html = mockWebviewView.webview.html; + assert.ok(html, 'Should generate some HTML even with malformed data'); + }); + + test('should handle renderer errors gracefully with cache data', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Test with valid cache data that might have edge cases + const problematicModel = TestMetadataFactory.createModel({ + name: 'ProblematicModel', + decorators: [] // Empty decorators array + }); + + // Should not throw + freshProvider.update('model', problematicModel); + + const html = mockWebviewView.webview.html; + assert.ok(html, 'Should handle renderer issues gracefully'); + }); + + test('should handle missing field references gracefully', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Create a field that references a non-existent type + const problematicField = TestMetadataFactory.createField({ + name: 'problematicField', + type: 'NonExistentType' // This type won't be found in cache + }); + + // Should not throw + freshProvider.update('field', problematicField); + + const html = mockWebviewView.webview.html; + assert.ok(html, 'Should handle missing type references gracefully'); + assert.ok(html.includes('problematicField'), 'Should still display field name'); + assert.ok(html.includes('NonExistentType'), 'Should display type even if not found'); + }); + }); + + suite('WebView Interaction', () => { + test('should generate valid HTML for webview with cache data', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Use real test data instead of mock + freshProvider.update('model', testUserModel); + + const html = mockWebviewView.webview.html; + + // Should be valid HTML + assert.ok(html.includes(''), 'Should have HTML5 doctype'); + assert.ok(html.includes(''), 'Should have head section'); + assert.ok(html.includes(''), 'Should have body section'); + assert.ok(html.includes(''), 'Should close html element'); + }); + + test('should include VSCode styling with real content', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Use real field data + freshProvider.update('field', testEmailField); + + const html = mockWebviewView.webview.html; + + // Should use VSCode variables + assert.ok(html.includes('--vscode-'), 'Should use VSCode CSS variables'); + assert.ok(html.includes('var(--vscode-'), 'Should reference VSCode variables'); + }); + + test('should include interaction scripts for cache-based navigation', () => { + // Create fresh webview and provider for this test + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + const freshProvider = new QuickInfoProvider(mockContext.extensionUri, cache); + freshProvider.resolveWebviewView( + mockWebviewView, + { state: undefined } as vscode.WebviewViewResolveContext, + { isCancellationRequested: false } as vscode.CancellationToken + ); + + // Use model with relationship for potential navigation + freshProvider.update('model', testOrderModel); + + const html = mockWebviewView.webview.html; + + // Should include JavaScript for interaction + assert.ok(html.includes('acquireVsCodeApi'), 'Should include VSCode API'); + assert.ok(html.includes('postMessage'), 'Should include message posting'); + assert.ok(html.includes('addEventListener'), 'Should include event handling'); + + // Should have clickable elements for navigation + assert.ok(html.includes('data-command'), 'Should include command data for interaction'); + }); + }); +}); diff --git a/files/vs-code-extension/src/test/quickInfoPanel/quickInfoProvider.test.ts b/files/vs-code-extension/src/test/quickInfoPanel/quickInfoProvider.test.ts new file mode 100644 index 0000000..ff4e111 --- /dev/null +++ b/files/vs-code-extension/src/test/quickInfoPanel/quickInfoProvider.test.ts @@ -0,0 +1,215 @@ +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import { QuickInfoProvider } from '../../quickInfoPanel/quickInfoProvider'; +import { MetadataCache } from '../../cache/cache'; +import { TestMetadataFactory, TestContextFactory } from '../testHelpers'; +import * as path from 'path'; + +suite('QuickInfoProvider Tests', () => { + let provider: QuickInfoProvider; + let cache: MetadataCache; + let extensionUri: vscode.Uri; + let mockWebviewView: any; + let mockContext: vscode.WebviewViewResolveContext; + let mockToken: vscode.CancellationToken; + + setup(async () => { + const extensionPath = path.join(__dirname, '..', '..', '..'); + extensionUri = vscode.Uri.file(extensionPath); + cache = new MetadataCache(extensionPath); + + try { + await cache.initialize(); + } catch (error) { + console.warn('Cache initialization failed in test, using empty cache'); + } + + provider = new QuickInfoProvider(extensionUri, cache); + }); + + teardown(() => { + cache?.dispose(); + }); + + setup(() => { + // Create a mock webview view for testing using helper + mockWebviewView = TestContextFactory.createMockWebviewView(QuickInfoProvider.viewType); + mockContext = { state: undefined } as vscode.WebviewViewResolveContext; + mockToken = { isCancellationRequested: false } as vscode.CancellationToken; + }); + + suite('Provider Creation and Initialization', () => { + test('should create provider with correct viewType', () => { + assert.strictEqual(QuickInfoProvider.viewType, 'slingrQuickInfo'); + }); + + test('should initialize without errors', () => { + assert.ok(provider, 'Provider should be created successfully'); + }); + + test('should resolve webview view correctly', () => { + const mockContext = { state: undefined } as vscode.WebviewViewResolveContext; + const mockToken = { isCancellationRequested: false } as vscode.CancellationToken; + + // This should not throw + provider.resolveWebviewView(mockWebviewView, mockContext, mockToken); + + // Check that webview options were set + assert.ok(mockWebviewView.webview.options.enableScripts, 'Scripts should be enabled'); + assert.ok(Array.isArray(mockWebviewView.webview.options.localResourceRoots), 'Local resource roots should be set'); + }); + }); + + suite('Update Method', () => { + setup(() => { + provider.resolveWebviewView(mockWebviewView, { state: undefined } as vscode.WebviewViewResolveContext, { isCancellationRequested: false } as vscode.CancellationToken); + }); + + test('should handle undefined metadata', () => { + provider.update(undefined, undefined); + + assert.ok(mockWebviewView.webview.html.includes('Select a metadata'), 'Should show default message'); + }); + + test('should handle model metadata', () => { + const mockModelMetadata = TestMetadataFactory.createModel(); + + provider.update('model', mockModelMetadata); + + assert.ok(mockWebviewView.webview.html.includes('TestModel'), 'Should contain model name'); + assert.ok(mockWebviewView.webview.html.includes('Model'), 'Should contain model tag'); + }); + + test('should handle field metadata', () => { + const mockFieldMetadata = TestMetadataFactory.createField(); + + provider.update('field', mockFieldMetadata); + + assert.ok(mockWebviewView.webview.html.includes('testField'), 'Should contain field name'); + assert.ok(mockWebviewView.webview.html.includes('Field'), 'Should contain field tag'); + }); + + test('should handle unknown metadata types with fallback', () => { + const unknownMetadata = { someProperty: 'someValue' } as any; + + provider.update('unknown', unknownMetadata); + + assert.ok(mockWebviewView.webview.html.includes('someProperty'), 'Should contain JSON fallback'); + }); + }); + + suite('Navigation History', () => { + setup(() => { + provider.resolveWebviewView(mockWebviewView, mockContext, mockToken); + }); + + test('should track navigation history', () => { + const mockField = TestMetadataFactory.createField({ name: 'TestField' }); + const mockModel = TestMetadataFactory.createModelWithFields('TestModel', [ + { name: 'testField', type: 'string' } + ]); + + // First update + provider.update('model', mockModel); + + // Second update should add first to history + provider.update('field', mockField); + + // Check that back button appears + assert.ok(mockWebviewView.webview.html.includes('back-button'), 'Should show back button'); + }); + + test('should not add to history when navigating back', () => { + const mockField = TestMetadataFactory.createField({ name: 'TestField' }); + const mockModel = TestMetadataFactory.createModelWithFields('TestModel', [ + { name: 'testField', type: 'string' } + ]); + + // Add items to history + provider.update('model', mockModel); + provider.update('field', mockField); + + // Navigate back (third parameter = true) + provider.update('model', mockModel, true); + + // Should still show back button since we didn't clear history + assert.ok(mockWebviewView.webview.html.includes('back-button'), 'Should still show back button'); + }); + }); + + suite('HTML Generation', () => { + setup(() => { + provider.resolveWebviewView(mockWebviewView, mockContext, mockToken); + }); + + test('should generate valid HTML structure', () => { + const mockMetadata = { name: 'Test' } as any; + provider.update('generic', mockMetadata); + + const html = mockWebviewView.webview.html; + + assert.ok(html.includes(''), 'Should have HTML doctype'); + assert.ok(html.includes(''), 'Should have head section'); + assert.ok(html.includes(''), 'Should have body section'); + assert.ok(html.includes('