@api-client/core 0.18.6 → 0.18.8

package/build/src/modeling/importers/CsvImporter.d.ts

@@ -1,8 +1,35 @@
-import { type CSVOptions, type ParseResult } from '@pawel-up/csv';
+import { type CSVOptions, type ParseResult as ParseResult_ } from '@pawel-up/csv';
 import type { DataDomain } from '../DataDomain.js';
 import type { DomainEntity } from '../DomainEntity.js';
 import type { DomainModel } from '../DomainModel.js';
-export type { CSVOptions, ParseResult };
+interface ParseResult extends ParseResult_ {
+    /**
+     * The file name of the CSV that was parsed.
+     * If the CSV is provided as a string, it will be named `inline_csv_0`, `inline_csv_1`, etc.
+     */
+    file: string;
+}
+interface ImportResult {
+    /**
+     * The DomainEntity created from the CSV data.
+     */
+    entity: DomainEntity;
+    /**
+     * The DomainModel that contains the imported entity.
+     */
+    model: DomainModel;
+}
+interface ImportManyResult {
+    /**
+     * An array of DomainEntity instances created from the CSV data.
+     */
+    entities: DomainEntity[];
+    /**
+     * The DomainModel that contains all imported entities.
+     */
+    model: DomainModel;
+}
+export type { CSVOptions, ParseResult, ImportResult, ImportManyResult };
 /**
  * Imports CSV data into a DataDomain.
  *
@@ -25,6 +52,7 @@ export declare class CsvImporter {
      * @returns A promise that resolves with the parsed result.
      */
     parse(csv: File | string): Promise<ParseResult>;
+    private removeExtension;
     /**
      * Imports the parsed CSV data structure into the domain as a new model and entity.
      * It creates a `DomainEntity` where each column from the CSV is represented as a `DomainProperty`.
@@ -33,9 +61,15 @@ export declare class CsvImporter {
      * @param modelName The name to be used for the created `DomainModel` and `DomainEntity`.
      * @returns A promise that resolves when the import is complete.
      */
-    import(data: ParseResult, modelName: string): Promise<{
-        entity: DomainEntity;
-        model: DomainModel;
-    }>;
+    import(data: ParseResult, modelName: string): Promise<ImportResult>;
+    /**
+     * Imports multiple parsed CSV data structures into the same data model.
+     * Creates a single `DomainModel` with multiple `DomainEntity` instances, one for each CSV data structure.
+     * Each entity represents the structure of its corresponding CSV file.
+     * @param data Array of objects containing parsed CSV data and entity names.
+     * @param modelName The name to be used for the created `DomainModel`.
+     * @returns A promise that resolves with the created model and all entities.
+     */
+    importMany(data: ParseResult[], modelName: string): Promise<ImportManyResult>;
 }
 //# sourceMappingURL=CsvImporter.d.ts.map

package/build/src/modeling/importers/CsvImporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CsvImporter.d.ts","sourceRoot":"","sources":["../../../../src/modeling/importers/CsvImporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAa,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,CAAA;AAEvC;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAY;IAE1B;;;;OAIG;gBACS,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,UAAU;IAKpD;;;;;OAKG;IACI,KAAK,CAAC,GAAG,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAItD;;;;;;;OAOG;IACU,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,YAAY,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,CAAC;CA2CjH"}
+{"version":3,"file":"CsvImporter.d.ts","sourceRoot":"","sources":["../../../../src/modeling/importers/CsvImporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAa,KAAK,WAAW,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,UAAU,WAAY,SAAQ,YAAY;IACxC;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAID,UAAU,YAAY;IACpB;;OAEG;IACH,MAAM,EAAE,YAAY,CAAA;IACpB;;OAEG;IACH,KAAK,EAAE,WAAW,CAAA;CACnB;AAED,UAAU,gBAAgB;IACxB;;OAEG;IACH,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,WAAW,CAAA;CACnB;AAED,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAA;AAEvE;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAY;IAE1B;;;;OAIG;gBACS,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,UAAU;IAKpD;;;;;OAKG;IACU,KAAK,CAAC,GAAG,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAQ5D,OAAO,CAAC,eAAe;IAOvB;;;;;;;OAOG;IACU,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IA6ChF;;;;;;;OAOG;IACU,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAyD3F"}

package/build/src/modeling/importers/CsvImporter.js

@@ -1,5 +1,6 @@
 import { CSVParser } from '@pawel-up/csv';
 import { sanitizeInput, toDatabaseColumnName, toDatabaseTableName } from '../helpers/database.js';
+let increment = 0;
 /**
  * Imports CSV data into a DataDomain.
  *
@@ -24,8 +25,18 @@ export class CsvImporter {
      * @param csv The CSV content to parse, as a File object or a string.
      * @returns A promise that resolves with the parsed result.
      */
-    parse(csv) {
-        return this.parser.parse(csv);
+    async parse(csv) {
+        const result = await this.parser.parse(csv);
+        return {
+            ...result,
+            file: typeof csv === 'string' ? 'inline_csv_' + increment++ : csv.name,
+        };
+    }
+    removeExtension(name) {
+        if (name.endsWith('.csv')) {
+            name = name.slice(0, -4); // Remove .csv extension if present
+        }
+        return name;
     }
     /**
      * Imports the parsed CSV data structure into the domain as a new model and entity.
@@ -36,6 +47,7 @@ export class CsvImporter {
      * @returns A promise that resolves when the import is complete.
      */
     async import(data, modelName) {
+        modelName = this.removeExtension(modelName);
         const name = toDatabaseTableName(modelName, 'imported_cvs_data');
         const model = this.domain.addModel({ info: { name } });
         const entity = model.addEntity({ info: { name } });
@@ -78,5 +90,66 @@ export class CsvImporter {
         }
         return { entity, model };
     }
+    /**
+     * Imports multiple parsed CSV data structures into the same data model.
+     * Creates a single `DomainModel` with multiple `DomainEntity` instances, one for each CSV data structure.
+     * Each entity represents the structure of its corresponding CSV file.
+     * @param data Array of objects containing parsed CSV data and entity names.
+     * @param modelName The name to be used for the created `DomainModel`.
+     * @returns A promise that resolves with the created model and all entities.
+     */
+    async importMany(data, modelName) {
+        modelName = this.removeExtension(modelName);
+        const name = toDatabaseTableName(modelName, 'imported_cvs_data');
+        const model = this.domain.addModel({ info: { name } });
+        const sanitizedModelName = sanitizeInput(modelName);
+        if (name !== sanitizedModelName) {
+            model.info.displayName = sanitizedModelName;
+        }
+        const entities = [];
+        for (const { format, values, file } of data) {
+            const cleanFile = this.removeExtension(file);
+            const entityDbName = toDatabaseTableName(cleanFile, `entity_${entities.length}`);
+            const entity = model.addEntity({ info: { name: entityDbName } });
+            const sanitizedEntityName = sanitizeInput(cleanFile);
+            if (entityDbName !== sanitizedEntityName) {
+                entity.info.displayName = sanitizedEntityName;
+            }
+            const exampleRow = values[0];
+            for (const row of format) {
+                const { index, name, type, format } = row;
+                const columnName = toDatabaseColumnName(name, `column_${index}`);
+                const schema = {
+                    info: { name: columnName },
+                    type,
+                };
+                if (format) {
+                    schema.bindings = [
+                        {
+                            type: 'web',
+                            schema: {
+                                format: format === 'integer' ? 'int64' : 'double',
+                            },
+                        },
+                    ];
+                }
+                if (Array.isArray(exampleRow) && exampleRow[index]) {
+                    const value = exampleRow[index];
+                    if (value !== undefined && value !== null) {
+                        schema.schema = {
+                            examples: [sanitizeInput(String(value))],
+                        };
+                    }
+                }
+                const prop = entity.addProperty(schema);
+                const sn = sanitizeInput(name);
+                if (sn !== columnName) {
+                    prop.info.displayName = sn;
+                }
+            }
+            entities.push(entity);
+        }
+        return { entities, model };
+    }
 }
 //# sourceMappingURL=CsvImporter.js.map

package/build/src/modeling/importers/CsvImporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"CsvImporter.js","sourceRoot":"","sources":["../../../../src/modeling/importers/CsvImporter.ts"],"names":[],"mappings":"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","sourcesContent":["import { type CSVOptions, CSVParser, type ParseResult } from '@pawel-up/csv'\nimport type { DataDomain } from '../DataDomain.js'\nimport { sanitizeInput, toDatabaseColumnName, toDatabaseTableName } from '../helpers/database.js'\nimport type { DomainPropertySchema } from '../DomainProperty.js'\nimport type { DomainEntity } from '../DomainEntity.js'\nimport type { DomainModel } from '../DomainModel.js'\n\nexport type { CSVOptions, ParseResult }\n\n/**\n * Imports CSV data into a DataDomain.\n *\n * This class parses CSV files and translates the column definitions into DomainProperty instances\n * within a specified DomainModel and DomainEntity.\n */\nexport class CsvImporter {\n  private parser: CSVParser\n  private domain: DataDomain\n\n  /**\n   * Creates an instance of CsvImporter.\n   * @param domain The DataDomain to which the imported data will be added.\n   * @param options Optional CSV parsing options.\n   */\n  constructor(domain: DataDomain, options?: CSVOptions) {\n    this.parser = new CSVParser(options)\n    this.domain = domain\n  }\n\n  /**\n   * Parses a CSV file or string to extract its structure and data.\n   * This is a wrapper around the underlying CSV parser.\n   * @param csv The CSV content to parse, as a File object or a string.\n   * @returns A promise that resolves with the parsed result.\n   */\n  public parse(csv: File | string): Promise<ParseResult> {\n    return this.parser.parse(csv)\n  }\n\n  /**\n   * Imports the parsed CSV data structure into the domain as a new model and entity.\n   * It creates a `DomainEntity` where each column from the CSV is represented as a `DomainProperty`.\n   * The first row of data is used to provide an example value for each property.\n   * @param data The result from the `parse` method, containing the CSV structure and values.\n   * @param modelName The name to be used for the created `DomainModel` and `DomainEntity`.\n   * @returns A promise that resolves when the import is complete.\n   */\n  public async import(data: ParseResult, modelName: string): Promise<{ entity: DomainEntity; model: DomainModel }> {\n    const name = toDatabaseTableName(modelName, 'imported_cvs_data')\n    const model = this.domain.addModel({ info: { name } })\n    const entity = model.addEntity({ info: { name } })\n    const sanitizedInputName = sanitizeInput(modelName)\n    if (name !== sanitizedInputName) {\n      model.info.displayName = sanitizedInputName\n      entity.info.displayName = sanitizedInputName\n    }\n    for (const row of data.format) {\n      const { index, name, type, format } = row\n      const columnName = toDatabaseColumnName(name, `column_${index}`)\n      const schema: Partial<DomainPropertySchema> = {\n        info: { name: columnName },\n        type,\n      }\n      if (format) {\n        schema.bindings = [\n          {\n            type: 'web',\n            schema: {\n              format: format === 'integer' ? 'int64' : 'double',\n            },\n          },\n        ]\n      }\n      const exampleRow = data.values[0]\n      if (Array.isArray(exampleRow) && exampleRow[index]) {\n        const value = exampleRow[index]\n        if (value !== undefined && value !== null) {\n          schema.schema = {\n            examples: [sanitizeInput(String(value))],\n          }\n        }\n      }\n      const prop = entity.addProperty(schema)\n      const sn = sanitizeInput(name)\n      if (sn !== columnName) {\n        prop.info.displayName = sn\n      }\n    }\n    return { entity, model }\n  }\n}\n"]}
+{"version":3,"file":"CsvImporter.js","sourceRoot":"","sources":["../../../../src/modeling/importers/CsvImporter.ts"],"names":[],"mappings":"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","sourcesContent":["import { type CSVOptions, CSVParser, type ParseResult as ParseResult_ } from '@pawel-up/csv'\nimport type { DataDomain } from '../DataDomain.js'\nimport { sanitizeInput, toDatabaseColumnName, toDatabaseTableName } from '../helpers/database.js'\nimport type { DomainPropertySchema } from '../DomainProperty.js'\nimport type { DomainEntity } from '../DomainEntity.js'\nimport type { DomainModel } from '../DomainModel.js'\n\ninterface ParseResult extends ParseResult_ {\n  /**\n   * The file name of the CSV that was parsed.\n   * If the CSV is provided as a string, it will be named `inline_csv_0`, `inline_csv_1`, etc.\n   */\n  file: string\n}\n\nlet increment = 0\n\ninterface ImportResult {\n  /**\n   * The DomainEntity created from the CSV data.\n   */\n  entity: DomainEntity\n  /**\n   * The DomainModel that contains the imported entity.\n   */\n  model: DomainModel\n}\n\ninterface ImportManyResult {\n  /**\n   * An array of DomainEntity instances created from the CSV data.\n   */\n  entities: DomainEntity[]\n  /**\n   * The DomainModel that contains all imported entities.\n   */\n  model: DomainModel\n}\n\nexport type { CSVOptions, ParseResult, ImportResult, ImportManyResult }\n\n/**\n * Imports CSV data into a DataDomain.\n *\n * This class parses CSV files and translates the column definitions into DomainProperty instances\n * within a specified DomainModel and DomainEntity.\n */\nexport class CsvImporter {\n  private parser: CSVParser\n  private domain: DataDomain\n\n  /**\n   * Creates an instance of CsvImporter.\n   * @param domain The DataDomain to which the imported data will be added.\n   * @param options Optional CSV parsing options.\n   */\n  constructor(domain: DataDomain, options?: CSVOptions) {\n    this.parser = new CSVParser(options)\n    this.domain = domain\n  }\n\n  /**\n   * Parses a CSV file or string to extract its structure and data.\n   * This is a wrapper around the underlying CSV parser.\n   * @param csv The CSV content to parse, as a File object or a string.\n   * @returns A promise that resolves with the parsed result.\n   */\n  public async parse(csv: File | string): Promise<ParseResult> {\n    const result = await this.parser.parse(csv)\n    return {\n      ...result,\n      file: typeof csv === 'string' ? 'inline_csv_' + increment++ : csv.name,\n    }\n  }\n\n  private removeExtension(name: string): string {\n    if (name.endsWith('.csv')) {\n      name = name.slice(0, -4) // Remove .csv extension if present\n    }\n    return name\n  }\n\n  /**\n   * Imports the parsed CSV data structure into the domain as a new model and entity.\n   * It creates a `DomainEntity` where each column from the CSV is represented as a `DomainProperty`.\n   * The first row of data is used to provide an example value for each property.\n   * @param data The result from the `parse` method, containing the CSV structure and values.\n   * @param modelName The name to be used for the created `DomainModel` and `DomainEntity`.\n   * @returns A promise that resolves when the import is complete.\n   */\n  public async import(data: ParseResult, modelName: string): Promise<ImportResult> {\n    modelName = this.removeExtension(modelName)\n    const name = toDatabaseTableName(modelName, 'imported_cvs_data')\n    const model = this.domain.addModel({ info: { name } })\n    const entity = model.addEntity({ info: { name } })\n    const sanitizedInputName = sanitizeInput(modelName)\n    if (name !== sanitizedInputName) {\n      model.info.displayName = sanitizedInputName\n      entity.info.displayName = sanitizedInputName\n    }\n    for (const row of data.format) {\n      const { index, name, type, format } = row\n      const columnName = toDatabaseColumnName(name, `column_${index}`)\n      const schema: Partial<DomainPropertySchema> = {\n        info: { name: columnName },\n        type,\n      }\n      if (format) {\n        schema.bindings = [\n          {\n            type: 'web',\n            schema: {\n              format: format === 'integer' ? 'int64' : 'double',\n            },\n          },\n        ]\n      }\n      const exampleRow = data.values[0]\n      if (Array.isArray(exampleRow) && exampleRow[index]) {\n        const value = exampleRow[index]\n        if (value !== undefined && value !== null) {\n          schema.schema = {\n            examples: [sanitizeInput(String(value))],\n          }\n        }\n      }\n      const prop = entity.addProperty(schema)\n      const sn = sanitizeInput(name)\n      if (sn !== columnName) {\n        prop.info.displayName = sn\n      }\n    }\n    return { entity, model }\n  }\n\n  /**\n   * Imports multiple parsed CSV data structures into the same data model.\n   * Creates a single `DomainModel` with multiple `DomainEntity` instances, one for each CSV data structure.\n   * Each entity represents the structure of its corresponding CSV file.\n   * @param data Array of objects containing parsed CSV data and entity names.\n   * @param modelName The name to be used for the created `DomainModel`.\n   * @returns A promise that resolves with the created model and all entities.\n   */\n  public async importMany(data: ParseResult[], modelName: string): Promise<ImportManyResult> {\n    modelName = this.removeExtension(modelName)\n    const name = toDatabaseTableName(modelName, 'imported_cvs_data')\n    const model = this.domain.addModel({ info: { name } })\n    const sanitizedModelName = sanitizeInput(modelName)\n    if (name !== sanitizedModelName) {\n      model.info.displayName = sanitizedModelName\n    }\n\n    const entities: DomainEntity[] = []\n\n    for (const { format, values, file } of data) {\n      const cleanFile = this.removeExtension(file)\n      const entityDbName = toDatabaseTableName(cleanFile, `entity_${entities.length}`)\n      const entity = model.addEntity({ info: { name: entityDbName } })\n      const sanitizedEntityName = sanitizeInput(cleanFile)\n      if (entityDbName !== sanitizedEntityName) {\n        entity.info.displayName = sanitizedEntityName\n      }\n\n      const exampleRow = values[0]\n      for (const row of format) {\n        const { index, name, type, format } = row\n        const columnName = toDatabaseColumnName(name, `column_${index}`)\n        const schema: Partial<DomainPropertySchema> = {\n          info: { name: columnName },\n          type,\n        }\n        if (format) {\n          schema.bindings = [\n            {\n              type: 'web',\n              schema: {\n                format: format === 'integer' ? 'int64' : 'double',\n              },\n            },\n          ]\n        }\n        if (Array.isArray(exampleRow) && exampleRow[index]) {\n          const value = exampleRow[index]\n          if (value !== undefined && value !== null) {\n            schema.schema = {\n              examples: [sanitizeInput(String(value))],\n            }\n          }\n        }\n        const prop = entity.addProperty(schema)\n        const sn = sanitizeInput(name)\n        if (sn !== columnName) {\n          prop.info.displayName = sn\n        }\n      }\n      entities.push(entity)\n    }\n\n    return { entities, model }\n  }\n}\n"]}

package/build/src/modeling/importers/JsonSchemaImporter.d.ts

@@ -68,6 +68,10 @@ export declare class JsonSchemaImporter {
      * Helper for entity creation, can be extended for custom logic.
      */
     private createEntity;
+    /**
+     * Generates a meaningful name for inline entities based on their parent context.
+     */
+    private generateInlineEntityName;
     /**
      * Populates a DomainEntity with its properties, associations, and parent relationships.
      */

package/build/src/modeling/importers/JsonSchemaImporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSchemaImporter.d.ts","sourceRoot":"","sources":["../../../../src/modeling/importers/JsonSchemaImporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA8C,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAQ/C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB;;OAEG;IACH,KAAK,EAAE,WAAW,CAAA;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED;;;;;GAKG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,KAAK,CAAiC;gBAElC,MAAM,EAAE,UAAU;IAI9B;;OAEG;IACH,OAAO,CAAC,UAAU;IAOlB;;OAEG;IACH,OAAO,CAAC,MAAM;IAId;;OAEG;IACU,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqE5F,OAAO,CAAC,MAAM;IAYd;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAuBxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAgDpB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAiD3B;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAwEnC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA0D5B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAuE/B,OAAO,CAAC,kBAAkB;CA+F3B"}
+{"version":3,"file":"JsonSchemaImporter.d.ts","sourceRoot":"","sources":["../../../../src/modeling/importers/JsonSchemaImporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA8C,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAS/C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB;;OAEG;IACH,KAAK,EAAE,WAAW,CAAA;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED;;;;;GAKG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,KAAK,CAAiC;gBAElC,MAAM,EAAE,UAAU;IAI9B;;OAEG;IACH,OAAO,CAAC,UAAU;IAOlB;;OAEG;IACH,OAAO,CAAC,MAAM;IAId;;OAEG;IACU,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4F5F,OAAO,CAAC,MAAM;IAYd;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAuBxB;;OAEG;IACH,OAAO,CAAC,YAAY;IA6BpB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAehC;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAgDpB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAsF3B;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAyEnC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA0D5B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAuE/B,OAAO,CAAC,kBAAkB;CAgG3B"}

package/build/src/modeling/importers/JsonSchemaImporter.js

@@ -1,5 +1,6 @@
 import { DomainProperty } from '../DomainProperty.js';
 import { sanitizeInput, toDatabaseColumnName, toDatabaseTableName } from '../helpers/database.js';
+import { nanoid } from '../../nanoid.js';
 /**
  * Imports JSON Schema definitions into a DataDomain.
  *
@@ -38,31 +39,47 @@ export class JsonSchemaImporter {
         // Build a flat map of all definitions and $id-indexed schemas
         const definitionMap = new Map();
         const idMap = new Map();
+        const processedSchemas = new Set(); // Track processed schema objects to avoid duplicates
         for (const schema of schemas) {
             // Add $id mapping if present
             if (schema.contents.$id) {
                 idMap.set(schema.contents.$id, schema.contents);
+                // Add the entire schema to the definitions maps as well as they can be referenced by other schemas.
+                definitionMap.set(schema.contents.$id, schema.contents);
             }
             // Add the schema itself by its path
             definitionMap.set(schema.path, schema.contents);
             // Add all definitions inside this schema
-            const defs = (schema.contents.definitions ||
-                schema.contents.$defs);
-            if (defs) {
-                for (const [defName, defSchema] of Object.entries(defs)) {
+            const definitions = schema.contents.definitions;
+            const defs = schema.contents.$defs;
+            if (definitions) {
+                for (const [defName, defSchema] of Object.entries(definitions)) {
                     if (typeof defSchema === 'object') {
-                        // Use a JSON pointer for the key
+                        // Use a JSON pointer for the key - include both full path and short form
                         definitionMap.set(`${schema.path}#/definitions/${defName}`, defSchema);
-                        // Also allow lookup by just #/definitions/defName for single-file schemas
                         definitionMap.set(`#/definitions/${defName}`, defSchema);
                     }
                 }
             }
+            if (defs) {
+                for (const [defName, defSchema] of Object.entries(defs)) {
+                    if (typeof defSchema === 'object') {
+                        // Use a JSON pointer for the key - include both full path and short form
+                        definitionMap.set(`${schema.path}#/$defs/${defName}`, defSchema);
+                        definitionMap.set(`#/$defs/${defName}`, defSchema);
+                    }
+                }
+            }
         }
         // == Pass 1: Create all entities ==
         for (const [key, schema] of definitionMap.entries()) {
+            // Skip if this schema object has already been processed
+            if (processedSchemas.has(schema)) {
+                continue;
+            }
             if (typeof schema === 'object' && schema.type === 'object') {
                 this.createEntity(key, schema, key);
+                processedSchemas.add(schema);
             }
             else if (this.isEnum(schema)) {
                 this.enums.set(key, schema);
@@ -73,10 +90,15 @@ export class JsonSchemaImporter {
         }
         // Also create entities for all $id-indexed schemas if not already present
         for (const [id, schema] of idMap.entries()) {
+            // Skip if this schema object has already been processed
+            if (processedSchemas.has(schema)) {
+                continue;
+            }
             if (!this.refMap.has(id) && typeof schema === 'object' && schema.type === 'object') {
                 this.createEntity(id, schema, id);
+                processedSchemas.add(schema);
             }
-            else if (this.isEnum(schema)) {
+            else if (this.isEnum(schema) && !this.enums.has(id)) {
                 this.enums.set(id, schema);
             }
             else {
@@ -120,10 +142,10 @@ export class JsonSchemaImporter {
             return definitionMap.get(refPath);
         if (idMap.has(refPath))
             return idMap.get(refPath);
-        // Try to resolve #/definitions/Name from any schema
-        if (refPath.startsWith('#/definitions/')) {
+        // Try to resolve #/definitions/Name or #/$defs/Name from any schema
+        if (refPath.startsWith('#/definitions/') || refPath.startsWith('#/$defs/')) {
             for (const [key, schema] of definitionMap.entries()) {
-                if (key.endsWith(refPath))
+                if (key === refPath)
                     return schema;
             }
         }
@@ -140,7 +162,16 @@ export class JsonSchemaImporter {
      * Helper for entity creation, can be extended for custom logic.
      */
     createEntity(name, schema, refPath) {
-        const fixedName = schema.title || name;
+        let fixedName = schema.title || name;
+        // Extract just the definition name from JSON pointers (both short and full paths)
+        if (name.includes('#/definitions/')) {
+            const parts = name.split('#/definitions/');
+            fixedName = schema.title || parts[parts.length - 1];
+        }
+        else if (name.includes('#/$defs/')) {
+            const parts = name.split('#/$defs/');
+            fixedName = schema.title || parts[parts.length - 1];
+        }
         const cleanName = toDatabaseTableName(fixedName, 'untitled_entity');
         const entity = this.model.addEntity({
             info: {
@@ -157,6 +188,21 @@ export class JsonSchemaImporter {
         this.refMap.set(refPath, entity.key);
         return entity;
     }
+    /**
+     * Generates a meaningful name for inline entities based on their parent context.
+     */
+    generateInlineEntityName(parentEntityKey, propName, schema) {
+        // Try to use the schema title first
+        if (schema.title) {
+            return toDatabaseTableName(schema.title, 'untitled_entity');
+        }
+        // Find the parent entity to create a meaningful name
+        const parentEntity = this.domain.findEntity(parentEntityKey);
+        const parentName = parentEntity?.info.name || 'unknown';
+        // Create a name like "User_Address" or "Order_ShippingInfo"
+        const combinedName = `${parentName}_${propName}`;
+        return toDatabaseTableName(combinedName, 'untitled_entity');
+    }
     /**
      * Populates a DomainEntity with its properties, associations, and parent relationships.
      */
@@ -223,7 +269,7 @@ export class JsonSchemaImporter {
      * Recursively analyzes a schema definition to find all contained primitive types and `$ref`s.
      * It's used to understand the nature of a property (is it a primitive, an association, or a mix).
      */
-    collectTypesAndRefs(schema) {
+    collectTypesAndRefs(schema, parentEntityKey, propName) {
         const collected = { refs: new Set(), types: new Set(), isArray: false };
         if (typeof schema !== 'object') {
             return collected;
@@ -239,11 +285,22 @@ export class JsonSchemaImporter {
                     collected.types.add(t);
             }
         }
+        // Handle inline object types by creating entities immediately
+        if (schema.type === 'object' && schema.properties && parentEntityKey && propName) {
+            // Create an entity for this inline object immediately
+            const inlineEntityName = this.generateInlineEntityName(parentEntityKey, propName, schema);
+            const inlineEntity = this.createEntity(inlineEntityName, schema, inlineEntityName);
+            // Populate it immediately since we have the schema
+            this.populateEntity(inlineEntity, schema);
+            // Add a reference to it so it gets treated as an association
+            collected.refs.add(inlineEntityName);
+            return collected;
+        }
         if (schema.type === 'array') {
             collected.isArray = true;
             if (typeof schema.items === 'object') {
-                // Recurse into items
-                const itemInfo = this.collectTypesAndRefs(Array.isArray(schema.items) ? schema.items[0] : schema.items);
+                // Recurse into items - pass along parent context for inline objects in arrays
+                const itemInfo = this.collectTypesAndRefs(Array.isArray(schema.items) ? schema.items[0] : schema.items, parentEntityKey, propName ? `${propName}_item` : undefined);
                 itemInfo.refs.forEach((r) => collected.refs.add(r));
                 itemInfo.types.forEach((t) => collected.types.add(t));
             }
@@ -252,7 +309,7 @@ export class JsonSchemaImporter {
         const choices = schema.anyOf || schema.oneOf;
         if (choices) {
             for (const choice of choices) {
-                const choiceInfo = this.collectTypesAndRefs(choice);
+                const choiceInfo = this.collectTypesAndRefs(choice, parentEntityKey);
                 choiceInfo.refs.forEach((r) => collected.refs.add(r));
                 choiceInfo.types.forEach((t) => collected.types.add(t));
                 if (choiceInfo.isArray) {
@@ -260,6 +317,19 @@ export class JsonSchemaImporter {
                 }
             }
         }
+        if (schema.enum) {
+            // If the schema has an enum, we treat it as a string type with specific values.
+            collected.types.add('string');
+            // consider the following schema: `"enum": ["one", "two", "three"]`
+            const id = nanoid(8);
+            this.enums.set(id, {
+                type: 'string',
+                oneOf: schema.enum.map((value) => ({
+                    const: String(value), // Ensure enum values are strings
+                })),
+            });
+            collected.refs.add(id); // Add the enum reference
+        }
         return collected;
     }
     /**
@@ -267,7 +337,9 @@ export class JsonSchemaImporter {
      */
     createPropertyOrAssociation(entity, propName, propSchema, isRequired) {
         // Analyze the property schema to understand its composition (primitives, refs, arrays).
-        const analysis = this.collectTypesAndRefs(propSchema);
+        // Pass entity context to collectTypesAndRefs for inline object handling
+        const analysis = this.collectTypesAndRefs(propSchema, entity.key, propName);
+        // console.log(`Analyzing property '${propName}' in entity '${entity.info.name}':`, analysis, propSchema)
         // Case 1: If the property has `$ref` to an enum, we treat it as a DomainProperty.
         if (analysis.refs.size === 1 && this.enums.has([...analysis.refs][0])) {
             const prop = this.createEnumProperty(propName, propSchema, this.enums.get([...analysis.refs][0]), entity.info.name);
@@ -517,6 +589,7 @@ export class JsonSchemaImporter {
             }
         }
         if (Object.keys(schema).length > 0) {
+            // console.log(`Creating enum property '${propName}' with schema:`, schema)
             prop.schema = schema;
         }
         return prop;