@odata2ts/odata2ts 0.33.1 → 0.34.0

package/lib/generator/ImportContainer.js

@@ -2,76 +2,179 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportContainer = void 0;
 const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const odata_core_1 = require("@odata2ts/odata-core");
+const ImportObjects_1 = require("./import/ImportObjects");
+const ImportedNameValidator_1 = require("./ImportedNameValidator");
+/**
+ * Handles all the import statements for a given file.
+ *
+ * Features a renaming mechanism, so that when the import name conflicts with an existing import a new
+ * name is generated and returned.
+ *
+ * Map<string,string>
+ */
 class ImportContainer {
-    constructor(fileNames) {
-        this.mapping = {
-            core: { moduleName: "@odata2ts/odata-core", isRelative: false },
-            qobjects: { moduleName: "@odata2ts/odata-query-objects", isRelative: false },
-            clientApi: { moduleName: "@odata2ts/http-client-api", isRelative: false },
-            service: { moduleName: "@odata2ts/odata-service", isRelative: false },
-            genModel: { moduleName: "", isRelative: true },
-            genQObjects: { moduleName: "", isRelative: true },
+    constructor(path, fileName, dataModel, mainFileNames, bundledFileGeneration, reservedNames) {
+        this.path = path;
+        this.fileName = fileName;
+        this.dataModel = dataModel;
+        this.mainFileNames = mainFileNames;
+        this.bundledFileGeneration = bundledFileGeneration;
+        this.reservedNames = reservedNames;
+        // mapping of a custom defined type to a primitive type
+        this.customTypes = new Map();
+        // imports to generated artefacts
+        this.internalImports = new Map();
+        this.libs = {
+            core: new Map(),
+            qObject: new Map(),
+            clientApi: new Map(),
+            service: new Map(),
         };
-        this.container = {
-            core: new Set(),
-            qobjects: new Set(),
-            clientApi: new Set(),
-            service: new Set(),
-            genModel: new Set(),
-            genQObjects: new Set(),
-            customTypes: new Map(),
-        };
-        this.mapping.genModel.moduleName = fileNames.model;
-        this.mapping.genQObjects.moduleName = fileNames.qObject;
+        this.importedNameValidator = new ImportedNameValidator_1.ImportedNameValidator(reservedNames);
     }
-    addFromCore(...names) {
-        names.forEach((n) => this.container.core.add(n));
+    addCoreLib(odataVersion, ...coreLibs) {
+        return coreLibs.map((coreLib) => {
+            const name = ImportObjects_1.CoreImports[coreLib] + (ImportObjects_1.VERSIONED_CORE_IMPORTS.includes(coreLib) ? odata_core_1.ODataVersions[odataVersion] : "");
+            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.core, name);
+            this.libs.core.set(name, importName);
+            return importName;
+        });
     }
     addFromQObject(...names) {
-        names.forEach((n) => this.container.qobjects.add(n));
-    }
-    addFromClientApi(...names) {
-        names.forEach((n) => this.container.clientApi.add(n));
+        return names.map((n) => {
+            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.qObject, n);
+            this.libs.qObject.set(n, importName);
+            return importName;
+        });
     }
-    addFromService(...names) {
-        names.forEach((n) => this.container.service.add(n));
+    addQObject(...qObjects) {
+        return this.addFromQObject(...qObjects.map((qObject) => ImportObjects_1.QueryObjectImports[qObject]));
     }
-    addGeneratedModel(...names) {
-        names.forEach((n) => this.container.genModel.add(n));
+    addClientApi(...clientApis) {
+        return clientApis.map((clientApi) => {
+            const name = ImportObjects_1.ClientApiImports[clientApi];
+            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.clientApi, name);
+            this.libs.clientApi.set(name, importName);
+            return importName;
+        });
     }
-    addGeneratedQObject(...names) {
-        names.forEach((n) => this.container.genQObjects.add(n));
+    addServiceObject(odataVersion, ...serviceObjects) {
+        return serviceObjects
+            .map((so) => {
+            return ImportObjects_1.ServiceImports[so] + (ImportObjects_1.VERSIONED_SERVICE_IMPORTS.includes(so) ? odata_core_1.ODataVersions[odataVersion] : "");
+        })
+            .map((so) => {
+            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.service, so);
+            this.libs.service.set(so, importName);
+            return importName;
+        });
     }
     addCustomType(moduleName, typeName) {
-        let importList = this.container.customTypes.get(moduleName);
+        let importList = this.customTypes.get(moduleName);
         if (!importList) {
-            importList = new Set();
-            this.container.customTypes.set(moduleName, importList);
+            importList = new Map();
+            this.customTypes.set(moduleName, importList);
+        }
+        const importName = this.importedNameValidator.validateName(moduleName, typeName);
+        importList.set(typeName, importName);
+        return importName;
+    }
+    pathAndFile(filePath, fileName) {
+        return filePath ? `${filePath}/${fileName}` : fileName;
+    }
+    isDifferentFile(filePath, fileName) {
+        return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);
+    }
+    addGeneratedImport(folderPath, fileName, name) {
+        // imports are only relevant for different files
+        if (!this.isDifferentFile(folderPath, fileName)) {
+            return name;
+        }
+        const moduleName = this.pathAndFile(folderPath, fileName);
+        const importName = this.importedNameValidator.validateName(moduleName, name);
+        const imports = this.internalImports.get(moduleName) || new Map();
+        imports.set(name, importName);
+        this.internalImports.set(moduleName, imports);
+        return importName;
+    }
+    addGeneratedModel(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.model, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            if (!model && fqName !== "") {
+                throw new Error(`Cannot find model by its fully qualified name: ${fqName}!`);
+            }
+            const folderPath = model ? model.folderPath : "";
+            const modelName = model ? model.modelName : this.mainFileNames.model;
+            return this.addGeneratedImport(folderPath, modelName, name);
+        }
+    }
+    addGeneratedQObject(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.qObject, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            if (!model && fqName !== "") {
+                throw new Error(`Cannot find q-object by its fully qualified name: ${fqName}!`);
+            }
+            const folderPath = model ? model.folderPath : "";
+            const qName = model ? model.qName : this.mainFileNames.qObject;
+            return this.addGeneratedImport(folderPath, qName, name);
+        }
+    }
+    addGeneratedService(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.service, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            return this.addGeneratedImport(model.folderPath, model.serviceName, name);
         }
-        importList.add(typeName);
     }
     getImportDeclarations(fromSubPath = false) {
-        const _a = this.container, { customTypes } = _a, standardImports = tslib_1.__rest(_a, ["customTypes"]);
         return [
-            ...[...customTypes.keys()]
-                .filter((key) => { var _a; return !!((_a = customTypes.get(key)) === null || _a === void 0 ? void 0 : _a.size); })
-                .map((key) => {
+            ...Object.entries(this.libs)
+                .filter(([_, values]) => !!values.size)
+                .map(([moduleName, toImport]) => {
                 return {
-                    namedImports: [...customTypes.get(key)],
-                    moduleSpecifier: key,
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: ImportObjects_1.LIB_MODULES[moduleName],
                 };
             }),
-            ...Object.entries(standardImports)
-                .filter(([_, values]) => !!values.size)
-                .map(([key, values]) => {
-                const mapping = this.mapping[key];
+            ...[...this.customTypes.keys()]
+                .filter((moduleName) => { var _a; return !!((_a = this.customTypes.get(moduleName)) === null || _a === void 0 ? void 0 : _a.size); })
+                .map((moduleName) => {
+                const toImport = this.customTypes.get(moduleName);
                 return {
-                    namedImports: [...values],
-                    moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: moduleName,
+                };
+            }),
+            ...[...this.internalImports.entries()]
+                .filter(([_, toImport]) => toImport.size > 0)
+                .map(([key, toImport]) => {
+                return {
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: this.getModuleSpecifier(key),
                 };
             }),
         ];
     }
+    getNamedImports(toImport) {
+        return [...toImport.entries()].map(([name, alias]) => ({
+            name,
+            alias: alias !== name ? alias : undefined,
+        }));
+    }
+    getModuleSpecifier(filePath) {
+        const relativePath = path_1.default.relative(this.path, filePath).replaceAll(path_1.default.sep, "/");
+        return !relativePath.startsWith(".") ? "./" + relativePath : relativePath;
+    }
 }
 exports.ImportContainer = ImportContainer;
 //# sourceMappingURL=ImportContainer.js.map

package/lib/generator/ImportContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\n\r\ntype ImportContainerType = {\r\n  core: Set<string>;\r\n  qobjects: Set<string>;\r\n  clientApi: Set<string>;\r\n  service: Set<string>;\r\n  genModel: Set<string>;\r\n  genQObjects: Set<string>;\r\n  customTypes: Map<string, Set<string>>;\r\n};\r\n\r\nexport class ImportContainer {\r\n  private mapping: {\r\n    [K in keyof ImportContainerType as string]: { moduleName: string; isRelative: boolean; addName?: boolean };\r\n  } = {\r\n    core: { moduleName: \"@odata2ts/odata-core\", isRelative: false },\r\n    qobjects: { moduleName: \"@odata2ts/odata-query-objects\", isRelative: false },\r\n    clientApi: { moduleName: \"@odata2ts/http-client-api\", isRelative: false },\r\n    service: { moduleName: \"@odata2ts/odata-service\", isRelative: false },\r\n    genModel: { moduleName: \"\", isRelative: true },\r\n    genQObjects: { moduleName: \"\", isRelative: true },\r\n  };\r\n\r\n  private container: ImportContainerType = {\r\n    core: new Set(),\r\n    qobjects: new Set(),\r\n    clientApi: new Set(),\r\n    service: new Set(),\r\n    genModel: new Set(),\r\n    genQObjects: new Set(),\r\n    customTypes: new Map(),\r\n  };\r\n\r\n  constructor(fileNames: ProjectFiles) {\r\n    this.mapping.genModel.moduleName = fileNames.model;\r\n    this.mapping.genQObjects.moduleName = fileNames.qObject;\r\n  }\r\n\r\n  public addFromCore(...names: Array<string>) {\r\n    names.forEach((n) => this.container.core.add(n));\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.qobjects.add(n));\r\n  }\r\n\r\n  public addFromClientApi(...names: Array<string>) {\r\n    names.forEach((n) => this.container.clientApi.add(n));\r\n  }\r\n\r\n  public addFromService(...names: Array<string>) {\r\n    names.forEach((n) => this.container.service.add(n));\r\n  }\r\n\r\n  public addGeneratedModel(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genModel.add(n));\r\n  }\r\n\r\n  public addGeneratedQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genQObjects.add(n));\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.container.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Set();\r\n      this.container.customTypes.set(moduleName, importList);\r\n    }\r\n    importList.add(typeName);\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    const { customTypes, ...standardImports } = this.container;\r\n\r\n    return [\r\n      ...[...customTypes.keys()]\r\n        .filter((key) => !!customTypes.get(key)?.size)\r\n        .map((key) => {\r\n          return {\r\n            namedImports: [...customTypes.get(key)!],\r\n            moduleSpecifier: key,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(standardImports)\r\n        .filter(([_, values]) => !!values.size)\r\n        .map(([key, values]) => {\r\n          const mapping = this.mapping[key];\r\n          return {\r\n            namedImports: [...values],\r\n            moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? \"..\" : \".\"}/` : \"\"}${mapping.moduleName}`,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n    ];\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"path\";\r\n\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport { ComplexType, OperationType } from \"../data-model/DataTypeModel\";\r\nimport {\r\n  ClientApiImports,\r\n  CoreImports,\r\n  LIB_MODULES,\r\n  QueryObjectImports,\r\n  ServiceImports,\r\n  VERSIONED_CORE_IMPORTS,\r\n  VERSIONED_SERVICE_IMPORTS,\r\n} from \"./import/ImportObjects\";\r\nimport { ImportedNameValidator } from \"./ImportedNameValidator\";\r\n\r\ntype ImportContainerType = Record<keyof typeof LIB_MODULES, Map<string, string>>;\r\n\r\n/**\r\n * Handles all the import statements for a given file.\r\n *\r\n * Features a renaming mechanism, so that when the import name conflicts with an existing import a new\r\n * name is generated and returned.\r\n *\r\n * Map<string,string>\r\n */\r\nexport class ImportContainer {\r\n  private readonly importedNameValidator: ImportedNameValidator;\r\n  // mapping of a custom defined type to a primitive type\r\n  private customTypes = new Map<string, Map<string, string>>();\r\n  // imports to generated artefacts\r\n  private internalImports = new Map<string, Map<string, string>>();\r\n\r\n  private libs: ImportContainerType = {\r\n    core: new Map(),\r\n    qObject: new Map(),\r\n    clientApi: new Map(),\r\n    service: new Map(),\r\n  };\r\n\r\n  constructor(\r\n    protected path: string,\r\n    protected fileName: string,\r\n    protected dataModel: DataModel,\r\n    protected mainFileNames: { model: string; qObject: string; service: string },\r\n    protected readonly bundledFileGeneration: boolean,\r\n    protected reservedNames: Array<string> | undefined\r\n  ) {\r\n    this.importedNameValidator = new ImportedNameValidator(reservedNames);\r\n  }\r\n\r\n  public addCoreLib(odataVersion: ODataVersions, ...coreLibs: Array<CoreImports>) {\r\n    return coreLibs.map((coreLib) => {\r\n      const name = CoreImports[coreLib] + (VERSIONED_CORE_IMPORTS.includes(coreLib) ? ODataVersions[odataVersion] : \"\");\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.core, name);\r\n      this.libs.core.set(name, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    return names.map((n) => {\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, n);\r\n      this.libs.qObject.set(n, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addQObject(...qObjects: Array<QueryObjectImports>) {\r\n    return this.addFromQObject(...qObjects.map((qObject) => QueryObjectImports[qObject]));\r\n  }\r\n\r\n  public addClientApi(...clientApis: Array<ClientApiImports>) {\r\n    return clientApis.map((clientApi) => {\r\n      const name = ClientApiImports[clientApi];\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.clientApi, name);\r\n      this.libs.clientApi.set(name, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addServiceObject(odataVersion: ODataVersions, ...serviceObjects: Array<ServiceImports>) {\r\n    return serviceObjects\r\n      .map((so) => {\r\n        return ServiceImports[so] + (VERSIONED_SERVICE_IMPORTS.includes(so) ? ODataVersions[odataVersion] : \"\");\r\n      })\r\n      .map((so) => {\r\n        const importName = this.importedNameValidator.validateName(LIB_MODULES.service, so);\r\n        this.libs.service.set(so, importName);\r\n        return importName;\r\n      });\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Map();\r\n      this.customTypes.set(moduleName, importList);\r\n    }\r\n\r\n    const importName = this.importedNameValidator.validateName(moduleName, typeName);\r\n    importList.set(typeName, importName);\r\n    return importName;\r\n  }\r\n\r\n  private pathAndFile(filePath: string, fileName: string) {\r\n    return filePath ? `${filePath}/${fileName}` : fileName;\r\n  }\r\n\r\n  private isDifferentFile(filePath: string, fileName: string) {\r\n    return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);\r\n  }\r\n\r\n  private addGeneratedImport(folderPath: string, fileName: string, name: string): string {\r\n    // imports are only relevant for different files\r\n    if (!this.isDifferentFile(folderPath, fileName)) {\r\n      return name;\r\n    }\r\n\r\n    const moduleName = this.pathAndFile(folderPath, fileName);\r\n    const importName = this.importedNameValidator.validateName(moduleName, name);\r\n\r\n    const imports = this.internalImports.get(moduleName) || new Map<string, string>();\r\n    imports.set(name, importName);\r\n    this.internalImports.set(moduleName, imports);\r\n\r\n    return importName;\r\n  }\r\n\r\n  public addGeneratedModel(fqName: string, name: string): string {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.model, name);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\r\n      if (!model && fqName !== \"\") {\r\n        throw new Error(`Cannot find model by its fully qualified name: ${fqName}!`);\r\n      }\r\n\r\n      const folderPath = model ? model.folderPath : \"\";\r\n      const modelName = model ? model.modelName : this.mainFileNames.model;\r\n      return this.addGeneratedImport(folderPath, modelName, name);\r\n    }\r\n  }\r\n\r\n  public addGeneratedQObject(fqName: string, name: string) {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.qObject, name);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\r\n      if (!model && fqName !== \"\") {\r\n        throw new Error(`Cannot find q-object by its fully qualified name: ${fqName}!`);\r\n      }\r\n\r\n      const folderPath = model ? model.folderPath : \"\";\r\n      const qName = model ? model.qName : this.mainFileNames!.qObject;\r\n      return this.addGeneratedImport(folderPath, qName, name);\r\n    }\r\n  }\r\n\r\n  public addGeneratedService(fqName: string, name: string) {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.service, name);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType;\r\n      return this.addGeneratedImport(model.folderPath, model.serviceName, name);\r\n    }\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    return [\r\n      ...Object.entries(this.libs)\r\n        .filter(([_, values]) => !!values.size)\r\n        .map(([moduleName, toImport]) => {\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: LIB_MODULES[moduleName as keyof typeof LIB_MODULES],\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...[...this.customTypes.keys()]\r\n        .filter((moduleName) => !!this.customTypes.get(moduleName)?.size)\r\n        .map((moduleName) => {\r\n          const toImport = this.customTypes.get(moduleName)!;\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: moduleName,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...[...this.internalImports.entries()]\r\n        .filter(([_, toImport]) => toImport.size > 0)\r\n        .map(([key, toImport]) => {\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: this.getModuleSpecifier(key),\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n    ];\r\n  }\r\n\r\n  private getNamedImports(toImport: Map<string, string>): Array<{ name: string; alias: string | undefined }> {\r\n    return [...toImport.entries()].map(([name, alias]) => ({\r\n      name,\r\n      alias: alias !== name ? alias : undefined,\r\n    }));\r\n  }\r\n\r\n  private getModuleSpecifier(filePath: string): string {\r\n    const relativePath = path.relative(this.path, filePath).replaceAll(path.sep, \"/\");\r\n    return !relativePath.startsWith(\".\") ? \"./\" + relativePath : relativePath;\r\n  }\r\n}\r\n"]}

package/lib/generator/ImportedNameValidator.d.ts

@@ -0,0 +1,5 @@
+export declare class ImportedNameValidator {
+    private importedNames;
+    constructor(reservedNames?: Array<string> | undefined);
+    validateName(qualifier: string, name: string): string;
+}

package/lib/generator/ImportedNameValidator.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportedNameValidator = void 0;
+class ImportedNameValidator {
+    constructor(reservedNames) {
+        this.importedNames = new Map();
+        reservedNames === null || reservedNames === void 0 ? void 0 : reservedNames.forEach((rn) => {
+            this.importedNames.set(rn, { ["_"]: rn });
+        });
+    }
+    validateName(qualifier, name) {
+        var _a;
+        const qualifiers = (_a = this.importedNames.get(name)) !== null && _a !== void 0 ? _a : {};
+        const hitName = qualifiers[qualifier];
+        if (hitName) {
+            return hitName;
+        }
+        const qualifiersSize = Object.keys(qualifiers).length;
+        const result = qualifiersSize ? `${name}_${qualifiersSize}` : name;
+        qualifiers[qualifier] = result;
+        this.importedNames.set(name, qualifiers);
+        return result;
+    }
+}
+exports.ImportedNameValidator = ImportedNameValidator;
+//# sourceMappingURL=ImportedNameValidator.js.map

package/lib/generator/ImportedNameValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportedNameValidator.js","sourceRoot":"","sources":["../../src/generator/ImportedNameValidator.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAqB;IAGhC,YAAmB,aAAyC;QAFpD,kBAAa,GAAG,IAAI,GAAG,EAAkC,CAAC;QAGhE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC5B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,YAAY,CAAC,SAAiB,EAAE,IAAY;;QACjD,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;QACtD,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QAEtC,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;QACtD,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAEnE,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEzC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAzBD,sDAyBC","sourcesContent":["export class ImportedNameValidator {\n  private importedNames = new Map<string, Record<string, string>>();\n\n  public constructor(reservedNames?: Array<string> | undefined) {\n    reservedNames?.forEach((rn) => {\n      this.importedNames.set(rn, { [\"_\"]: rn });\n    });\n  }\n\n  public validateName(qualifier: string, name: string): string {\n    const qualifiers = this.importedNames.get(name) ?? {};\n    const hitName = qualifiers[qualifier];\n\n    if (hitName) {\n      return hitName;\n    }\n\n    const qualifiersSize = Object.keys(qualifiers).length;\n    const result = qualifiersSize ? `${name}_${qualifiersSize}` : name;\n\n    qualifiers[qualifier] = result;\n    this.importedNames.set(name, qualifiers);\n\n    return result;\n  }\n}\n"]}

package/lib/generator/ModelGenerator.js

@@ -1,75 +1,113 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModels = void 0;
+const tslib_1 = require("tslib");
 const ts_morph_1 = require("ts-morph");
-const ImportContainer_1 = require("./ImportContainer");
-const generateModels = (dataModel, sourceFile, version, options, namingHelper) => {
-    const generator = new ModelGenerator(dataModel, sourceFile, version, options, namingHelper);
+const ImportObjects_1 = require("./import/ImportObjects");
+const generateModels = (project, dataModel, version, options, namingHelper) => {
+    const generator = new ModelGenerator(project, dataModel, version, options, namingHelper);
     return generator.generate();
 };
 exports.generateModels = generateModels;
-const DEFERRED_CONTENT = "DeferredContent";
 class ModelGenerator {
-    constructor(dataModel, sourceFile, version, options, namingHelper) {
+    constructor(project, dataModel, version, options, namingHelper) {
+        this.project = project;
         this.dataModel = dataModel;
-        this.sourceFile = sourceFile;
         this.version = version;
         this.options = options;
         this.namingHelper = namingHelper;
     }
     generate() {
-        this.importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
-        this.generateEnums();
-        this.generateModels();
-        if (!this.options.skipOperations) {
-            this.generateUnboundOperationParams();
-        }
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.project.initModels();
+            const promises = [
+                ...this.generateEnums(),
+                ...this.generateEntityTypeModels(),
+                ...this.generateComplexTypeModels(),
+            ];
+            if (!this.options.skipOperations) {
+                promises.push(this.generateUnboundOperationParams());
+            }
+            yield Promise.all(promises);
+            return this.project.finalizeModels();
+        });
     }
     generateEnums() {
-        this.dataModel.getEnums().forEach((et) => {
-            this.sourceFile.addEnum({
-                name: et.name,
+        return this.dataModel.getEnums().map((et) => {
+            const file = this.project.createOrGetModelFile(et.folderPath, et.modelName);
+            file.getFile().addEnum({
+                name: et.modelName,
                 isExported: true,
                 members: et.members.map((mem) => ({ name: mem, initializer: `"${mem}"` })),
             });
+            return this.project.finalizeFile(file);
         });
     }
-    generateModels() {
-        this.dataModel.getEntityTypes().forEach((model) => {
-            this.generateModel(model);
+    generateEntityTypeModels() {
+        return this.dataModel.getEntityTypes().map((model) => {
+            const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [
+                model.modelName,
+                model.id.modelName,
+                model.editableName,
+            ]);
+            // query model
+            this.generateModel(file, model);
+            // key model
             if (!this.options.skipIdModels && model.generateId) {
-                this.generateIdModel(model);
+                this.generateIdModel(file, model);
             }
-            if (!this.options.skipEditableModels && !model.abstract) {
-                this.generateEditableModel(model);
+            // editable model
+            if (!this.options.skipEditableModels) {
+                this.generateEditableModel(file, model);
             }
+            // param models for bound operations
             if (!this.options.skipOperations) {
-                this.generateBoundOperationParams(model.fqName);
+                [
+                    ...this.dataModel.getEntityTypeOperations(model.fqName),
+                    ...this.dataModel.getEntitySetOperations(model.fqName),
+                ].forEach((operation) => {
+                    this.generateOperationParams(file, operation);
+                });
             }
+            return this.project.finalizeFile(file);
         });
-        this.dataModel.getComplexTypes().forEach((model) => {
-            this.generateModel(model);
-            if (!this.options.skipEditableModels && !model.abstract) {
-                this.generateEditableModel(model);
+    }
+    generateComplexTypeModels() {
+        return this.dataModel.getComplexTypes().map((model) => {
+            const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [
+                model.modelName,
+                model.editableName,
+            ]);
+            // query model
+            this.generateModel(file, model);
+            // editable model
+            if (!this.options.skipEditableModels) {
+                this.generateEditableModel(file, model);
             }
+            return this.project.finalizeFile(file);
         });
-        this.sourceFile.addImportDeclarations(this.importContainer.getImportDeclarations());
     }
-    generateModel(model) {
-        this.sourceFile.addInterface({
-            name: model.name,
+    generateModel(file, model) {
+        const imports = file.getImports();
+        let extendsClause = undefined;
+        if (model.finalBaseClass) {
+            const modelName = imports.addGeneratedModel(model.baseClasses[0], this.namingHelper.getModelName(model.finalBaseClass));
+            extendsClause = [modelName];
+        }
+        file.getFile().addInterface({
+            name: model.modelName,
             isExported: true,
             properties: model.props.map((p) => {
                 const isEntity = p.dataType == "ModelType" /* DataTypes.ModelType */;
                 return {
                     name: p.name,
-                    type: this.getPropType(p),
+                    type: this.getPropType(file.getImports(), p),
                     // props for entities or entity collections are not added in V4 if not explicitly expanded
                     hasQuestionToken: this.dataModel.isV4() && isEntity,
                     docs: this.options.skipComments ? undefined : [this.generatePropDoc(p, model)],
                 };
             }),
-            extends: model.finalBaseClass ? [this.namingHelper.getModelName(model.finalBaseClass)] : undefined,
+            extends: extendsClause,
         });
     }
     generatePropDoc(prop, model) {
@@ -98,21 +136,24 @@ class ModelGenerator {
             attributeTable.map((row) => `| ${row[0]} | \`${row[1]}\` |`).join("\n");
         return { kind: ts_morph_1.StructureKind.JSDoc, description };
     }
-    getPropType(prop) {
-        const isEntity = prop.dataType == "ModelType" /* DataTypes.ModelType */;
+    getPropType(imports, prop) {
         // V2 entity special: deferred content
         let suffix = "";
-        if (isEntity && this.dataModel.isV2()) {
-            this.importContainer.addFromCore(DEFERRED_CONTENT);
-            suffix = ` | ${DEFERRED_CONTENT}`;
+        if (this.dataModel.isV2() && prop.dataType == "ModelType" /* DataTypes.ModelType */) {
+            const [defContent] = imports.addCoreLib(this.version, ImportObjects_1.CoreImports.DeferredContent);
+            suffix = ` | ${defContent}`;
+        }
+        let typeName;
+        if (prop.dataType === "PrimitiveType" /* DataTypes.PrimitiveType */) {
+            // custom types which require type imports => possible via converters
+            typeName = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type) : prop.type;
         }
-        // custom types which require type imports => possible via converters
-        else if (prop.typeModule) {
-            this.importContainer.addCustomType(prop.typeModule, prop.type);
+        else {
+            typeName = imports.addGeneratedModel(prop.fqType, prop.type);
         }
         // Collections
         if (prop.isCollection) {
-            const type = `Array<${prop.type}>`;
+            const type = `Array<${typeName}>`;
             if (this.dataModel.isV2() && this.options.v2ModelsWithExtraResultsWrapping) {
                 return `{ results: ${type} }` + suffix;
             }
@@ -121,19 +162,21 @@ class ModelGenerator {
             }
         }
         // primitive, enum & complex types
-        return prop.type + (prop.required ? "" : " | null") + suffix;
+        return typeName + (prop.required ? "" : " | null") + suffix;
     }
-    generateIdModel(model) {
+    generateIdModel(file, model) {
         const singleType = model.keys.length === 1 ? `${model.keys[0].type} | ` : "";
-        const keyTypes = model.keys.map((keyProp) => `${keyProp.name}: ${this.getPropType(keyProp)}`).join(",");
+        const keyTypes = model.keys
+            .map((keyProp) => `${keyProp.name}: ${this.getPropType(file.getImports(), keyProp)}`)
+            .join(",");
         const type = `${singleType}{${keyTypes}}`;
-        this.sourceFile.addTypeAlias({
-            name: model.idModelName,
+        file.getFile().addTypeAlias({
+            name: model.id.modelName,
             isExported: true,
             type,
         });
     }
-    generateEditableModel(model) {
+    generateEditableModel(file, model) {
         const entityTypes = ["ModelType" /* DataTypes.ModelType */, "ComplexType" /* DataTypes.ComplexType */];
         const allProps = [...model.baseProps, ...model.props].filter((p) => !p.managed);
         const requiredProps = allProps
@@ -146,10 +189,10 @@ class ModelGenerator {
             .join(" | ");
         const complexProps = allProps.filter((p) => p.dataType === "ComplexType" /* DataTypes.ComplexType */);
         const extendsClause = [
-            requiredProps ? `Pick<${model.name}, ${requiredProps}>` : null,
-            optionalProps ? `Partial<Pick<${model.name}, ${optionalProps}>>` : null,
+            requiredProps ? `Pick<${model.modelName}, ${requiredProps}>` : null,
+            optionalProps ? `Partial<Pick<${model.modelName}, ${optionalProps}>>` : null,
         ].filter((e) => !!e);
-        this.sourceFile.addInterface({
+        file.getFile().addInterface({
             name: model.editableName,
             isExported: true,
             extends: extendsClause,
@@ -158,7 +201,7 @@ class ModelGenerator {
                 : complexProps.map((p) => {
                     return {
                         name: p.name,
-                        type: this.getEditablePropType(p),
+                        type: this.getEditablePropType(file.getImports(), p),
                         // optional props don't need to be specified in editable model
                         // also, entities would require deep insert func => we make it optional for now
                         hasQuestionToken: !p.required || p.dataType === "ModelType" /* DataTypes.ModelType */,
@@ -166,43 +209,41 @@ class ModelGenerator {
                 }),
         });
     }
-    getEditablePropType(prop) {
-        const type = prop.dataType === "ModelType" /* DataTypes.ModelType */
-            ? this.dataModel.getEntityType(prop.fqType).editableName
-            : prop.dataType === "ComplexType" /* DataTypes.ComplexType */
-                ? this.dataModel.getComplexType(prop.fqType).editableName
-                : prop.type;
+    getEditablePropType(imports, prop) {
+        const isModelType = ["ModelType" /* DataTypes.ModelType */, "ComplexType" /* DataTypes.ComplexType */].includes(prop.dataType);
+        let editableType = prop.type;
+        if (isModelType) {
+            const editName = this.dataModel.getComplexType(prop.fqType).editableName;
+            editableType = imports.addGeneratedModel(prop.fqType, editName);
+        }
         // Collections
         if (prop.isCollection) {
-            return `Array<${type}>`;
+            return `Array<${editableType}>`;
         }
         // primitive, enum & complex types
-        return type + (prop.required ? "" : " | null");
+        return editableType + (prop.required ? "" : " | null");
     }
     generateUnboundOperationParams() {
-        this.dataModel.getUnboundOperationTypes().forEach((operation) => {
-            this.generateOperationParams(operation);
-        });
-    }
-    generateBoundOperationParams(entityName) {
-        [
-            ...this.dataModel.getEntityTypeOperations(entityName),
-            ...this.dataModel.getEntitySetOperations(entityName),
-        ].forEach((operation) => {
-            this.generateOperationParams(operation);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const unboundOps = this.dataModel.getUnboundOperationTypes();
+            const reservedNames = unboundOps.map((op) => op.paramsModelName);
+            const file = this.project.createOrGetMainModelFile(reservedNames);
+            unboundOps.forEach((operation) => {
+                this.generateOperationParams(file, operation);
+            });
         });
     }
-    generateOperationParams(operation) {
+    generateOperationParams(file, operation) {
         if (!operation.parameters.length) {
             return;
         }
-        this.sourceFile.addInterface({
+        file.getFile().addInterface({
             name: operation.paramsModelName,
             isExported: true,
             properties: operation.parameters.map((p) => {
                 return {
                     name: p.name,
-                    type: this.getPropType(p),
+                    type: this.getPropType(file.getImports(), p),
                     hasQuestionToken: !p.required,
                 };
             }),