@odata2ts/odata2ts 0.29.1 → 0.30.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.30.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.29.1...@odata2ts/odata2ts@0.30.0) (2023-10-05)
+
+### Features
+
+* one file for all services ([#223](https://github.com/odata2ts/odata2ts/issues/223)) ([f48bf5a](https://github.com/odata2ts/odata2ts/commit/f48bf5ab36aa09ddc7760cc078d952c79b7a2185))
+
 ## [0.29.1](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.29.0...@odata2ts/odata2ts@0.29.1) (2023-09-13)
 
 **Note:** Version bump only for package @odata2ts/odata2ts

package/lib/app.js

@@ -58,7 +58,6 @@ function runApp(metadataJson, options) {
         }
         // Generate Individual OData-Service
         if (isServiceGen(options.mode)) {
-            yield project.cleanServiceDir();
             yield (0, generator_1.generateServices)(dataModel, project, version, namingHelper, options);
         }
         yield project.writeFiles();

package/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\r\nimport { Modes, RunOptions } from \"./OptionModel\";\r\nimport { createProjectManager } from \"./project/ProjectManager\";\r\n\r\nfunction isQObjectGen(mode: Modes) {\r\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\nfunction isServiceGen(mode: Modes) {\r\n  return [Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\n/**\r\n *\r\n * @param metadataJson metadata of a given OData service already parsed as JSON\r\n * @param options further options\r\n */\r\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\r\n  // determine edmx edmxVersion attribute\r\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\r\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\r\n\r\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\r\n  const schemas = dataService.Schema as Array<SchemaV3 | SchemaV4>;\r\n\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = options.serviceName || detectedSchema.$.Namespace;\r\n\r\n  const namespaces: Array<string> = [];\r\n  schemas.forEach((schema) => {\r\n    namespaces.push(schema.$.Namespace);\r\n    if (schema.$.Alias) {\r\n      namespaces.push(schema.$.Alias);\r\n    }\r\n  });\r\n\r\n  // encapsulate the whole naming logic\r\n  const namingHelper = new NamingHelper(options, serviceName, namespaces);\r\n  // parse model information from edmx into something we can really work with\r\n  // => that stuff is called dataModel!\r\n  const dataModel =\r\n    version === ODataVersions.V2\r\n      ? await digestV2(dataService.Schema as Array<SchemaV3>, options, namingHelper)\r\n      : await digestV4(dataService.Schema as Array<SchemaV4>, options, namingHelper);\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(\r\n    namingHelper.getFileNames(),\r\n    options.output,\r\n    options.emitMode,\r\n    options.prettier,\r\n    options.tsconfig\r\n  );\r\n\r\n  // Generate Model Interfaces\r\n  // supported edmx types: EntityType, ComplexType, EnumType\r\n  const modelsFile = await project.createModelFile();\r\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\r\n\r\n  // Generate Query Objects\r\n  // supported edmx types: EntityType, ComplexType\r\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\r\n  if (isQObjectGen(options.mode)) {\r\n    const qFile = await project.createQObjectFile();\r\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    await project.cleanServiceDir();\r\n    await generateServices(dataModel, project, version, namingHelper, options);\r\n  }\r\n\r\n  await project.writeFiles();\r\n}\r\n"]}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\r\nimport { Modes, RunOptions } from \"./OptionModel\";\r\nimport { createProjectManager } from \"./project/ProjectManager\";\r\n\r\nfunction isQObjectGen(mode: Modes) {\r\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\nfunction isServiceGen(mode: Modes) {\r\n  return [Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\n/**\r\n *\r\n * @param metadataJson metadata of a given OData service already parsed as JSON\r\n * @param options further options\r\n */\r\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\r\n  // determine edmx edmxVersion attribute\r\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\r\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\r\n\r\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\r\n  const schemas = dataService.Schema as Array<SchemaV3 | SchemaV4>;\r\n\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = options.serviceName || detectedSchema.$.Namespace;\r\n\r\n  const namespaces: Array<string> = [];\r\n  schemas.forEach((schema) => {\r\n    namespaces.push(schema.$.Namespace);\r\n    if (schema.$.Alias) {\r\n      namespaces.push(schema.$.Alias);\r\n    }\r\n  });\r\n\r\n  // encapsulate the whole naming logic\r\n  const namingHelper = new NamingHelper(options, serviceName, namespaces);\r\n  // parse model information from edmx into something we can really work with\r\n  // => that stuff is called dataModel!\r\n  const dataModel =\r\n    version === ODataVersions.V2\r\n      ? await digestV2(dataService.Schema as Array<SchemaV3>, options, namingHelper)\r\n      : await digestV4(dataService.Schema as Array<SchemaV4>, options, namingHelper);\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(\r\n    namingHelper.getFileNames(),\r\n    options.output,\r\n    options.emitMode,\r\n    options.prettier,\r\n    options.tsconfig\r\n  );\r\n\r\n  // Generate Model Interfaces\r\n  // supported edmx types: EntityType, ComplexType, EnumType\r\n  const modelsFile = await project.createModelFile();\r\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\r\n\r\n  // Generate Query Objects\r\n  // supported edmx types: EntityType, ComplexType\r\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\r\n  if (isQObjectGen(options.mode)) {\r\n    const qFile = await project.createQObjectFile();\r\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    await generateServices(dataModel, project, version, namingHelper, options);\r\n  }\r\n\r\n  await project.writeFiles();\r\n}\r\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -11,6 +11,5 @@ export declare class ImportContainer {
     addGeneratedModel(...names: Array<string>): void;
     addGeneratedQObject(...names: Array<string>): void;
     addCustomType(moduleName: string, typeName: string): void;
-    addGeneratedService(key: string, ...names: Array<string>): void;
     getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
 }

package/lib/generator/ImportContainer.js

@@ -19,7 +19,6 @@ class ImportContainer {
             service: new Set(),
             genModel: new Set(),
             genQObjects: new Set(),
-            genServices: {},
             customTypes: new Map(),
         };
         this.mapping.genModel.moduleName = fileNames.model;
@@ -51,16 +50,8 @@ class ImportContainer {
         }
         importList.add(typeName);
     }
-    addGeneratedService(key, ...names) {
-        let serv = this.container.genServices[key];
-        if (!serv) {
-            serv = new Set();
-            this.container.genServices[key] = serv;
-        }
-        names.forEach((n) => serv.add(n));
-    }
     getImportDeclarations(fromSubPath = false) {
-        const _a = this.container, { genServices, customTypes } = _a, standardImports = tslib_1.__rest(_a, ["genServices", "customTypes"]);
+        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); })
@@ -71,7 +62,7 @@ class ImportContainer {
                 };
             }),
             ...Object.entries(standardImports)
-                .filter(([key, values]) => !!values.size)
+                .filter(([_, values]) => !!values.size)
                 .map(([key, values]) => {
                 const mapping = this.mapping[key];
                 return {
@@ -79,12 +70,6 @@ class ImportContainer {
                     moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
                 };
             }),
-            ...Object.entries(genServices).map(([key, values]) => {
-                return {
-                    namedImports: [...values],
-                    moduleSpecifier: (fromSubPath ? "./" : "./service/") + key,
-                };
-            }),
         ];
     }
 }

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  genServices: { [key: string]: 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    genServices: {},\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 addGeneratedService(key: string, ...names: Array<string>) {\r\n    let serv = this.container.genServices[key];\r\n    if (!serv) {\r\n      serv = new Set();\r\n      this.container.genServices[key] = serv;\r\n    }\r\n    names.forEach((n) => serv.add(n));\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    const { genServices, 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(([key, 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      ...Object.entries(genServices).map(([key, values]) => {\r\n        return {\r\n          namedImports: [...values],\r\n          moduleSpecifier: (fromSubPath ? \"./\" : \"./service/\") + key,\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 { 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"]}

package/lib/generator/ServiceGenerator.js

@@ -46,7 +46,6 @@ class ServiceGenerator {
             const serviceName = this.namingHelper.getMainServiceName();
             const container = this.dataModel.getEntityContainer();
             const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];
-            yield this.generateModelServices();
             const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
             importContainer.addFromClientApi("ODataHttpClient");
             importContainer.addFromService(ROOT_SERVICE);
@@ -70,6 +69,7 @@ class ServiceGenerator {
                 properties,
                 methods,
             });
+            yield this.generateModelServices(sourceFile, importContainer);
             sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));
         });
     }
@@ -100,10 +100,6 @@ class ServiceGenerator {
         importContainer.addFromClientApi("ODataHttpClient");
         importContainer.addGeneratedModel(idName);
         importContainer.addGeneratedQObject(idFunctionName);
-        // make sure to not falsely import self-referential stuff
-        if (!currentServiceName || currentServiceName !== serviceName) {
-            importContainer.addGeneratedService(serviceName, collectionName, serviceName);
-        }
         return {
             scope: ts_morph_1.Scope.Public,
             name: this.namingHelper.getRelatedServiceGetter(propName),
@@ -141,7 +137,6 @@ class ServiceGenerator {
     generateSingletonProp(singleton, importContainer) {
         const { name, entityType } = singleton;
         const type = this.namingHelper.getServiceName(entityType.name);
-        importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);
         return {
             scope: ts_morph_1.Scope.Private,
             name: this.namingHelper.getPrivatePropName(name),
@@ -252,10 +247,6 @@ class ServiceGenerator {
             propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;
         }
         else {
-            // don't include imports for this type
-            if (serviceName !== key) {
-                importContainer.addGeneratedService(key, propModelType);
-            }
             propModelType = `${propModelType}<ClientType>`;
         }
         return {
@@ -396,27 +387,21 @@ class ServiceGenerator {
             });
         });
     }
-    generateModelServices() {
+    generateModelServices(serviceFile, importContainer) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // build service file for each entity, consisting of EntityTypeService & EntityCollectionService
             for (const model of this.dataModel.getModels()) {
                 const serviceName = this.namingHelper.getServiceName(model.name);
-                const serviceFile = yield this.project.createServiceFile(serviceName);
-                const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
                 // entity type service
                 yield this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);
                 // entity collection service
                 yield this.generateEntityCollectionService(model, serviceFile, importContainer);
-                serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
             }
             // build service file for complex types
             for (const model of this.dataModel.getComplexTypes()) {
                 const serviceName = this.namingHelper.getServiceName(model.name);
-                const serviceFile = yield this.project.createServiceFile(serviceName);
-                const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
                 // entity type service
                 yield this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);
-                serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
             }
         });
     }

package/lib/generator/ServiceGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport deepmerge from \"deepmerge\";\r\nimport {\r\n  ClassDeclarationStructure,\r\n  MethodDeclarationStructure,\r\n  OptionalKind,\r\n  PropertyDeclarationStructure,\r\n  Scope,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport { upperCaseFirst } from \"upper-case-first\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityContainerModel,\r\n  FunctionImportType,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { ConfigFileOptions } from \"../OptionModel\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nconst ROOT_SERVICE = \"ODataService\";\r\n\r\nconst RESPONSE_TYPES = {\r\n  collection: \"ODataCollectionResponse\",\r\n  model: \"ODataModelResponse\",\r\n  value: \"ODataValueResponse\",\r\n};\r\n\r\nexport interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, \"properties\" | \"methods\">> {}\r\n\r\nexport interface ServiceGeneratorOptions\r\n  extends Pick<ConfigFileOptions, \"enablePrimitivePropertyServices\" | \"v4BigNumberAsString\"> {}\r\n\r\nexport async function generateServices(\r\n  dataModel: DataModel,\r\n  project: ProjectManager,\r\n  version: ODataVersions,\r\n  namingHelper: NamingHelper,\r\n  options?: ServiceGeneratorOptions\r\n) {\r\n  const generator = new ServiceGenerator(dataModel, project, version, namingHelper, options);\r\n  return generator.generate();\r\n}\r\n\r\nclass ServiceGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private project: ProjectManager,\r\n    private version: ODataVersions,\r\n    private namingHelper: NamingHelper,\r\n    private options: ServiceGeneratorOptions = {}\r\n  ) {}\r\n\r\n  private isV4BigNumber() {\r\n    return this.options.v4BigNumberAsString && this.version === ODataVersions.V4;\r\n  }\r\n\r\n  public async generate(): Promise<void> {\r\n    const sourceFile = await this.project.createMainServiceFile();\r\n    const serviceName = this.namingHelper.getMainServiceName();\r\n    const container = this.dataModel.getEntityContainer();\r\n    const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\r\n\r\n    await this.generateModelServices();\r\n\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addFromService(ROOT_SERVICE);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateMainServiceProperties(container, importContainer),\r\n      this.generateMainServiceOperations(unboundOperations, importContainer)\r\n    );\r\n\r\n    sourceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends: `${ROOT_SERVICE}<ClientType>`,\r\n      ctors: this.isV4BigNumber()\r\n        ? [\r\n            {\r\n              parameters: [\r\n                { name: \"client\", type: \"ClientType\" },\r\n                { name: \"basePath\", type: \"string\" },\r\n              ],\r\n              statements: [`super(client, basePath, true);`],\r\n            },\r\n          ]\r\n        : [],\r\n      properties,\r\n      methods,\r\n    });\r\n\r\n    sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateMainServiceProperties(\r\n    container: EntityContainerModel,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    Object.values(container.entitySets).forEach(({ name, odataName, entityType }) => {\r\n      result.methods.push(this.generateRelatedServiceGetter(name, odataName, entityType, importContainer));\r\n    });\r\n\r\n    Object.values(container.singletons).forEach((singleton) => {\r\n      result.properties.push(this.generateSingletonProp(singleton, importContainer));\r\n      result.methods.push(this.generateSingletonGetter(singleton));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateMainServiceOperations(\r\n    ops: Array<FunctionImportType | ActionImportType>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    ops.forEach(({ operation, name }) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateRelatedServiceGetter(\r\n    propName: string,\r\n    odataPropName: string,\r\n    entityType: ModelType,\r\n    importContainer: ImportContainer,\r\n    currentServiceName?: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const idName = entityType.idModelName;\r\n    const idFunctionName = entityType.qIdFunctionName;\r\n    const serviceName = this.namingHelper.getServiceName(entityType.name);\r\n    const collectionName = this.namingHelper.getCollectionServiceName(entityType.name);\r\n\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addGeneratedModel(idName);\r\n    importContainer.addGeneratedQObject(idFunctionName);\r\n    // make sure to not falsely import self-referential stuff\r\n    if (!currentServiceName || currentServiceName !== serviceName) {\r\n      importContainer.addGeneratedService(serviceName, collectionName, serviceName);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(propName),\r\n      parameters: [\r\n        {\r\n          name: \"id\",\r\n          type: `${idName} | undefined`,\r\n          hasQuestionToken: true,\r\n        },\r\n      ],\r\n      overloads: [\r\n        {\r\n          parameters: [],\r\n          returnType: `${collectionName}<ClientType>`,\r\n        },\r\n        {\r\n          parameters: [\r\n            {\r\n              name: \"id\",\r\n              type: idName,\r\n            },\r\n          ],\r\n          returnType: `${serviceName}<ClientType>`,\r\n        },\r\n      ],\r\n      statements: [\r\n        `const fieldName = \"${odataPropName}\";`,\r\n        `const { client, path } = this.__base;`,\r\n        'return typeof id === \"undefined\" || id === null',\r\n        `? new ${collectionName}(client, path, fieldName)`,\r\n        `: new ${serviceName}(client, path, new ${idFunctionName}(fieldName).buildUrl(id));`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generateSingletonProp(\r\n    singleton: SingletonType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const { name, entityType } = singleton;\r\n    const type = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(name),\r\n      type: `${type}<ClientType>`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateQOperationProp = (operation: OperationType) => {\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(operation.qName),\r\n      type: operation.qName,\r\n      hasQuestionToken: true,\r\n    };\r\n  };\r\n\r\n  private generateSingletonGetter(singleton: SingletonType): OptionalKind<MethodDeclarationStructure> {\r\n    const { name, odataName, entityType } = singleton;\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\r\n    const serviceType = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${serviceType}(client, path, \"${odataName}\")`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private getVersionSuffix() {\r\n    return this.version === ODataVersions.V2 ? \"V2\" : \"V4\";\r\n  }\r\n\r\n  private async generateEntityTypeService(\r\n    model: ComplexType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entityServiceType = \"EntityTypeService\" + this.getVersionSuffix();\r\n\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n    const operations = this.dataModel.getOperationTypeByBinding(model.name);\r\n    const props = [...model.baseProps, ...model.props];\r\n\r\n    importContainer.addFromService(entityServiceType);\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addGeneratedModel(model.name, editableModelName);\r\n    importContainer.addGeneratedQObject(model.qName, qObjectName);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateServiceProperties(serviceName, props, importContainer),\r\n      this.generateServiceOperations(operations, importContainer)\r\n    );\r\n\r\n    // generate EntityTypeService\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends: entityServiceType + `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [`super(client, basePath, name, ${qObjectName}${this.isV4BigNumber() ? \", true\" : \"\"});`],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private getPrimitiveServiceType() {\r\n    return \"PrimitiveTypeService\" + this.getVersionSuffix();\r\n  }\r\n\r\n  private generateServiceProperties(\r\n    serviceName: string,\r\n    props: Array<PropertyModel>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const collectionServiceType = \"CollectionService\" + this.getVersionSuffix();\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    props.forEach((prop) => {\r\n      if ((prop.dataType === DataTypes.ModelType && !prop.isCollection) || prop.dataType === DataTypes.ComplexType) {\r\n        result.properties.push(this.generateModelProp(prop, collectionServiceType, serviceName, importContainer));\r\n        result.methods.push(this.generateModelPropGetter(prop, collectionServiceType));\r\n      } else if (prop.isCollection) {\r\n        // collection of entity types\r\n        if (prop.dataType === DataTypes.ModelType) {\r\n          const entityType = this.dataModel.getModel(prop.type);\r\n          result.methods.push(\r\n            this.generateRelatedServiceGetter(prop.name, prop.odataName, entityType, importContainer, serviceName)\r\n          );\r\n        }\r\n        // collection of primitive or complex types\r\n        else {\r\n          result.properties.push(this.generatePrimitiveCollectionProp(prop, collectionServiceType, importContainer));\r\n          result.methods.push(this.generatePrimitiveCollectionGetter(prop, collectionServiceType));\r\n        }\r\n      } else if (this.options.enablePrimitivePropertyServices && prop.dataType === DataTypes.PrimitiveType) {\r\n        result.properties.push(this.generatePrimitiveTypeProp(prop, importContainer));\r\n        result.methods.push(this.generatePrimitiveTypeGetter(prop));\r\n      }\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateServiceOperations(operations: Array<OperationType>, importContainer: ImportContainer): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    operations.forEach((operation) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(operation.name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateModelProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    serviceName: string,\r\n    importContainer: ImportContainer\r\n  ): PropertyDeclarationStructure {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const key = this.namingHelper.getServiceName(prop.type);\r\n    let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;\r\n\r\n    if (prop.isCollection && complexType) {\r\n      const editableName = complexType.editableName;\r\n      importContainer.addFromService(collectionServiceType);\r\n      importContainer.addGeneratedModel(complexType.name, editableName);\r\n      importContainer.addGeneratedQObject(complexType.qName, firstCharLowerCase(complexType.qName));\r\n      propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;\r\n    } else {\r\n      // don't include imports for this type\r\n      if (serviceName !== key) {\r\n        importContainer.addGeneratedService(key, propModelType);\r\n      }\r\n\r\n      propModelType = `${propModelType}<ClientType>`;\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: propModelType,\r\n      hasQuestionToken: true,\r\n    } as PropertyDeclarationStructure;\r\n  }\r\n\r\n  private generatePrimitiveCollectionProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const isEnum = prop.dataType === DataTypes.EnumType;\r\n    const type = isEnum ? `EnumCollection<${prop.type}>` : `${upperCaseFirst(prop.type)}Collection`;\r\n    const qType = isEnum ? \"QEnumCollection\" : prop.qObject;\r\n    const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\r\n\r\n    if (!prop.qObject) {\r\n      throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\r\n    }\r\n\r\n    importContainer.addFromService(collectionServiceType);\r\n    importContainer.addFromQObject(prop.qObject, firstCharLowerCase(prop.qObject));\r\n    if (isEnum) {\r\n      importContainer.addGeneratedModel(prop.type);\r\n      importContainer.addFromQObject(\"EnumCollection\");\r\n    } else {\r\n      importContainer.addFromQObject(type);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: `${collectionType}`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveTypeProp(\r\n    prop: PropertyModel,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const serviceType = this.getPrimitiveServiceType();\r\n    importContainer.addFromService(serviceType);\r\n    if (prop.typeModule) {\r\n      importContainer.addCustomType(prop.typeModule, prop.type);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: `${serviceType}<ClientType, ${prop.type}>`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateModelPropGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const isComplexCollection = prop.isCollection && complexType;\r\n    const type = isComplexCollection\r\n      ? collectionServiceType\r\n      : prop.isCollection\r\n      ? this.namingHelper.getCollectionServiceName(prop.type)\r\n      : this.namingHelper.getServiceName(prop.type);\r\n    const typeWithGenerics = isComplexCollection\r\n      ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`\r\n      : `${type}<ClientType>`;\r\n\r\n    const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      returnType: typeWithGenerics,\r\n      statements: [\r\n        `if(!${privateSrvProp}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${privateSrvProp} = new ${type}(client, path, \"${prop.odataName}\"${isComplexCollection ? `, ${firstCharLowerCase(complexType.qName)}`: \"\"})`,\r\n        \"}\",\r\n        `return ${privateSrvProp}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveCollectionGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${collectionServiceType}(client, path, \"${prop.odataName}\", ${firstCharLowerCase(prop.qObject!)}${this.isV4BigNumber() ? \", true\": \"\"})`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveTypeGetter(prop: PropertyModel): OptionalKind<MethodDeclarationStructure> {\r\n    const serviceType = this.getPrimitiveServiceType();\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n    // for V2: mapped name must be specified\r\n    const useMappedName = this.version === ODataVersions.V2 && prop.name !== prop.odataName;\r\n    // for V4: big number support\r\n    const useBigNumber = this.isV4BigNumber();\r\n    const addParamString = useMappedName ? `, \"${prop.name}\"` : useBigNumber ? \", true\" : \"\";\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path, qModel } = this.__base;`,\r\n        `  ${propName} = new ${serviceType}(client, path, \"${prop.odataName}\", qModel.${prop.name}.converter${addParamString})`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private async generateEntityCollectionService(\r\n    model: ModelType,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entitySetServiceType = \"EntitySetService\" + this.getVersionSuffix();\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n\r\n    importContainer.addFromService(entitySetServiceType);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n    importContainer.addGeneratedQObject(model.qIdFunctionName);\r\n\r\n    const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);\r\n\r\n    const { properties, methods } = this.generateServiceOperations(collectionOperations, importContainer);\r\n\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: this.namingHelper.getCollectionServiceName(model.name),\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends:\r\n        entitySetServiceType +\r\n        `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [\r\n            `super(client, basePath, name, ${qObjectName}, new ${model.qIdFunctionName}(name)${\r\n              this.isV4BigNumber() ? \", true\" : \"\"\r\n            });`,\r\n          ],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private async generateModelServices() {\r\n    // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\r\n    for (const model of this.dataModel.getModels()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n\r\n      // entity collection service\r\n      await this.generateEntityCollectionService(model, serviceFile, importContainer);\r\n\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n\r\n    // build service file for complex types\r\n    for (const model of this.dataModel.getComplexTypes()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n  }\r\n\r\n  private generateMethod(\r\n    name: string,\r\n    operation: OperationType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const isFunc = operation.type === OperationTypes.Function;\r\n    const odataType = operation.returnType?.isCollection\r\n      ? RESPONSE_TYPES.collection + this.getVersionSuffix()\r\n      : operation.returnType?.dataType === DataTypes.PrimitiveType\r\n      ? RESPONSE_TYPES.value + this.getVersionSuffix()\r\n      : RESPONSE_TYPES.model + this.getVersionSuffix();\r\n    const returnType = operation.returnType;\r\n    const requestConfigParam = {\r\n      name: \"requestConfig\",\r\n      hasQuestionToken: true,\r\n      type: \"ODataHttpClientConfig<ClientType>\",\r\n    };\r\n    const hasParams = operation.parameters.length > 0;\r\n\r\n    // importing dependencies\r\n    importContainer.addFromClientApi(\"ODataHttpClientConfig\", \"ODataResponse\");\r\n    importContainer.addFromCore(odataType);\r\n    if (returnType?.type) {\r\n      if ([DataTypes.EnumType, DataTypes.ModelType, DataTypes.ComplexType].includes(returnType.dataType)) {\r\n        importContainer.addGeneratedModel(returnType.type);\r\n      }\r\n    }\r\n    importContainer.addGeneratedQObject(operation.qName);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n\r\n    const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      isAsync: true,\r\n      name,\r\n      parameters: hasParams\r\n        ? [{ name: \"params\", type: operation.paramsModelName }, requestConfigParam]\r\n        : [requestConfigParam],\r\n      returnType: `ODataResponse<${odataType}<${returnType?.type || \"void\"}>>`,\r\n      statements: [\r\n        `if(!${qOpProp}) {`,\r\n        `  ${qOpProp} = new ${operation.qName}()`,\r\n        \"}\",\r\n\r\n        `const { addFullPath, client, getDefaultHeaders } = this.__base;`,\r\n        `const url = addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params\" : \"\"}));`,\r\n        `${returnType ? \"const response = await \" : \"return\"} client.${\r\n          !isFunc\r\n            ? // actions: since V4\r\n              `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${\r\n                requestConfigParam.name\r\n              }, getDefaultHeaders())`\r\n            : operation.usePost\r\n            ? // V2 POST => BUT values are still query params, they are not part of the request body\r\n              `post(url, undefined, ${requestConfigParam.name}, getDefaultHeaders())`\r\n            : // functions: since V2\r\n              `get(url, ${requestConfigParam.name}, getDefaultHeaders())`\r\n        };`,\r\n        returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\r\n      ],\r\n    };\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport deepmerge from \"deepmerge\";\r\nimport {\r\n  ClassDeclarationStructure,\r\n  MethodDeclarationStructure,\r\n  OptionalKind,\r\n  PropertyDeclarationStructure,\r\n  Scope,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport { upperCaseFirst } from \"upper-case-first\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityContainerModel,\r\n  FunctionImportType,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { ConfigFileOptions } from \"../OptionModel\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nconst ROOT_SERVICE = \"ODataService\";\r\n\r\nconst RESPONSE_TYPES = {\r\n  collection: \"ODataCollectionResponse\",\r\n  model: \"ODataModelResponse\",\r\n  value: \"ODataValueResponse\",\r\n};\r\n\r\nexport interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, \"properties\" | \"methods\">> {}\r\n\r\nexport interface ServiceGeneratorOptions\r\n  extends Pick<ConfigFileOptions, \"enablePrimitivePropertyServices\" | \"v4BigNumberAsString\"> {}\r\n\r\nexport async function generateServices(\r\n  dataModel: DataModel,\r\n  project: ProjectManager,\r\n  version: ODataVersions,\r\n  namingHelper: NamingHelper,\r\n  options?: ServiceGeneratorOptions\r\n) {\r\n  const generator = new ServiceGenerator(dataModel, project, version, namingHelper, options);\r\n  return generator.generate();\r\n}\r\n\r\nclass ServiceGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private project: ProjectManager,\r\n    private version: ODataVersions,\r\n    private namingHelper: NamingHelper,\r\n    private options: ServiceGeneratorOptions = {}\r\n  ) {}\r\n\r\n  private isV4BigNumber() {\r\n    return this.options.v4BigNumberAsString && this.version === ODataVersions.V4;\r\n  }\r\n\r\n  public async generate(): Promise<void> {\r\n    const sourceFile = await this.project.createMainServiceFile();\r\n    const serviceName = this.namingHelper.getMainServiceName();\r\n    const container = this.dataModel.getEntityContainer();\r\n    const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\r\n\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addFromService(ROOT_SERVICE);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateMainServiceProperties(container, importContainer),\r\n      this.generateMainServiceOperations(unboundOperations, importContainer)\r\n    );\r\n\r\n    sourceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends: `${ROOT_SERVICE}<ClientType>`,\r\n      ctors: this.isV4BigNumber()\r\n        ? [\r\n            {\r\n              parameters: [\r\n                { name: \"client\", type: \"ClientType\" },\r\n                { name: \"basePath\", type: \"string\" },\r\n              ],\r\n              statements: [`super(client, basePath, true);`],\r\n            },\r\n          ]\r\n        : [],\r\n      properties,\r\n      methods,\r\n    });\r\n\r\n    await this.generateModelServices(sourceFile, importContainer);\r\n\r\n    sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateMainServiceProperties(\r\n    container: EntityContainerModel,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    Object.values(container.entitySets).forEach(({ name, odataName, entityType }) => {\r\n      result.methods.push(this.generateRelatedServiceGetter(name, odataName, entityType, importContainer));\r\n    });\r\n\r\n    Object.values(container.singletons).forEach((singleton) => {\r\n      result.properties.push(this.generateSingletonProp(singleton, importContainer));\r\n      result.methods.push(this.generateSingletonGetter(singleton));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateMainServiceOperations(\r\n    ops: Array<FunctionImportType | ActionImportType>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    ops.forEach(({ operation, name }) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateRelatedServiceGetter(\r\n    propName: string,\r\n    odataPropName: string,\r\n    entityType: ModelType,\r\n    importContainer: ImportContainer,\r\n    currentServiceName?: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const idName = entityType.idModelName;\r\n    const idFunctionName = entityType.qIdFunctionName;\r\n    const serviceName = this.namingHelper.getServiceName(entityType.name);\r\n    const collectionName = this.namingHelper.getCollectionServiceName(entityType.name);\r\n\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addGeneratedModel(idName);\r\n    importContainer.addGeneratedQObject(idFunctionName);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(propName),\r\n      parameters: [\r\n        {\r\n          name: \"id\",\r\n          type: `${idName} | undefined`,\r\n          hasQuestionToken: true,\r\n        },\r\n      ],\r\n      overloads: [\r\n        {\r\n          parameters: [],\r\n          returnType: `${collectionName}<ClientType>`,\r\n        },\r\n        {\r\n          parameters: [\r\n            {\r\n              name: \"id\",\r\n              type: idName,\r\n            },\r\n          ],\r\n          returnType: `${serviceName}<ClientType>`,\r\n        },\r\n      ],\r\n      statements: [\r\n        `const fieldName = \"${odataPropName}\";`,\r\n        `const { client, path } = this.__base;`,\r\n        'return typeof id === \"undefined\" || id === null',\r\n        `? new ${collectionName}(client, path, fieldName)`,\r\n        `: new ${serviceName}(client, path, new ${idFunctionName}(fieldName).buildUrl(id));`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generateSingletonProp(\r\n    singleton: SingletonType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const { name, entityType } = singleton;\r\n    const type = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(name),\r\n      type: `${type}<ClientType>`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateQOperationProp = (operation: OperationType) => {\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(operation.qName),\r\n      type: operation.qName,\r\n      hasQuestionToken: true,\r\n    };\r\n  };\r\n\r\n  private generateSingletonGetter(singleton: SingletonType): OptionalKind<MethodDeclarationStructure> {\r\n    const { name, odataName, entityType } = singleton;\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\r\n    const serviceType = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${serviceType}(client, path, \"${odataName}\")`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private getVersionSuffix() {\r\n    return this.version === ODataVersions.V2 ? \"V2\" : \"V4\";\r\n  }\r\n\r\n  private async generateEntityTypeService(\r\n    model: ComplexType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entityServiceType = \"EntityTypeService\" + this.getVersionSuffix();\r\n\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n    const operations = this.dataModel.getOperationTypeByBinding(model.name);\r\n    const props = [...model.baseProps, ...model.props];\r\n\r\n    importContainer.addFromService(entityServiceType);\r\n    importContainer.addFromClientApi(\"ODataHttpClient\");\r\n    importContainer.addGeneratedModel(model.name, editableModelName);\r\n    importContainer.addGeneratedQObject(model.qName, qObjectName);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateServiceProperties(serviceName, props, importContainer),\r\n      this.generateServiceOperations(operations, importContainer)\r\n    );\r\n\r\n    // generate EntityTypeService\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends: entityServiceType + `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [`super(client, basePath, name, ${qObjectName}${this.isV4BigNumber() ? \", true\" : \"\"});`],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private getPrimitiveServiceType() {\r\n    return \"PrimitiveTypeService\" + this.getVersionSuffix();\r\n  }\r\n\r\n  private generateServiceProperties(\r\n    serviceName: string,\r\n    props: Array<PropertyModel>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const collectionServiceType = \"CollectionService\" + this.getVersionSuffix();\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    props.forEach((prop) => {\r\n      if ((prop.dataType === DataTypes.ModelType && !prop.isCollection) || prop.dataType === DataTypes.ComplexType) {\r\n        result.properties.push(this.generateModelProp(prop, collectionServiceType, serviceName, importContainer));\r\n        result.methods.push(this.generateModelPropGetter(prop, collectionServiceType));\r\n      } else if (prop.isCollection) {\r\n        // collection of entity types\r\n        if (prop.dataType === DataTypes.ModelType) {\r\n          const entityType = this.dataModel.getModel(prop.type);\r\n          result.methods.push(\r\n            this.generateRelatedServiceGetter(prop.name, prop.odataName, entityType, importContainer, serviceName)\r\n          );\r\n        }\r\n        // collection of primitive or complex types\r\n        else {\r\n          result.properties.push(this.generatePrimitiveCollectionProp(prop, collectionServiceType, importContainer));\r\n          result.methods.push(this.generatePrimitiveCollectionGetter(prop, collectionServiceType));\r\n        }\r\n      } else if (this.options.enablePrimitivePropertyServices && prop.dataType === DataTypes.PrimitiveType) {\r\n        result.properties.push(this.generatePrimitiveTypeProp(prop, importContainer));\r\n        result.methods.push(this.generatePrimitiveTypeGetter(prop));\r\n      }\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateServiceOperations(operations: Array<OperationType>, importContainer: ImportContainer): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    operations.forEach((operation) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(operation.name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateModelProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    serviceName: string,\r\n    importContainer: ImportContainer\r\n  ): PropertyDeclarationStructure {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const key = this.namingHelper.getServiceName(prop.type);\r\n    let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;\r\n\r\n    if (prop.isCollection && complexType) {\r\n      const editableName = complexType.editableName;\r\n      importContainer.addFromService(collectionServiceType);\r\n      importContainer.addGeneratedModel(complexType.name, editableName);\r\n      importContainer.addGeneratedQObject(complexType.qName, firstCharLowerCase(complexType.qName));\r\n      propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;\r\n    } else {\r\n      propModelType = `${propModelType}<ClientType>`;\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: propModelType,\r\n      hasQuestionToken: true,\r\n    } as PropertyDeclarationStructure;\r\n  }\r\n\r\n  private generatePrimitiveCollectionProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const isEnum = prop.dataType === DataTypes.EnumType;\r\n    const type = isEnum ? `EnumCollection<${prop.type}>` : `${upperCaseFirst(prop.type)}Collection`;\r\n    const qType = isEnum ? \"QEnumCollection\" : prop.qObject;\r\n    const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\r\n\r\n    if (!prop.qObject) {\r\n      throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\r\n    }\r\n\r\n    importContainer.addFromService(collectionServiceType);\r\n    importContainer.addFromQObject(prop.qObject, firstCharLowerCase(prop.qObject));\r\n    if (isEnum) {\r\n      importContainer.addGeneratedModel(prop.type);\r\n      importContainer.addFromQObject(\"EnumCollection\");\r\n    } else {\r\n      importContainer.addFromQObject(type);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: `${collectionType}`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveTypeProp(\r\n    prop: PropertyModel,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const serviceType = this.getPrimitiveServiceType();\r\n    importContainer.addFromService(serviceType);\r\n    if (prop.typeModule) {\r\n      importContainer.addCustomType(prop.typeModule, prop.type);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: `${serviceType}<ClientType, ${prop.type}>`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateModelPropGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const isComplexCollection = prop.isCollection && complexType;\r\n    const type = isComplexCollection\r\n      ? collectionServiceType\r\n      : prop.isCollection\r\n      ? this.namingHelper.getCollectionServiceName(prop.type)\r\n      : this.namingHelper.getServiceName(prop.type);\r\n    const typeWithGenerics = isComplexCollection\r\n      ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`\r\n      : `${type}<ClientType>`;\r\n\r\n    const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      returnType: typeWithGenerics,\r\n      statements: [\r\n        `if(!${privateSrvProp}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${privateSrvProp} = new ${type}(client, path, \"${prop.odataName}\"${isComplexCollection ? `, ${firstCharLowerCase(complexType.qName)}`: \"\"})`,\r\n        \"}\",\r\n        `return ${privateSrvProp}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveCollectionGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path } = this.__base;`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${collectionServiceType}(client, path, \"${prop.odataName}\", ${firstCharLowerCase(prop.qObject!)}${this.isV4BigNumber() ? \", true\": \"\"})`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveTypeGetter(prop: PropertyModel): OptionalKind<MethodDeclarationStructure> {\r\n    const serviceType = this.getPrimitiveServiceType();\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n    // for V2: mapped name must be specified\r\n    const useMappedName = this.version === ODataVersions.V2 && prop.name !== prop.odataName;\r\n    // for V4: big number support\r\n    const useBigNumber = this.isV4BigNumber();\r\n    const addParamString = useMappedName ? `, \"${prop.name}\"` : useBigNumber ? \", true\" : \"\";\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        `  const { client, path, qModel } = this.__base;`,\r\n        `  ${propName} = new ${serviceType}(client, path, \"${prop.odataName}\", qModel.${prop.name}.converter${addParamString})`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private async generateEntityCollectionService(\r\n    model: ModelType,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entitySetServiceType = \"EntitySetService\" + this.getVersionSuffix();\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n\r\n    importContainer.addFromService(entitySetServiceType);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n    importContainer.addGeneratedQObject(model.qIdFunctionName);\r\n\r\n    const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);\r\n\r\n    const { properties, methods } = this.generateServiceOperations(collectionOperations, importContainer);\r\n\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: this.namingHelper.getCollectionServiceName(model.name),\r\n      typeParameters: [\"ClientType extends ODataHttpClient\"],\r\n      extends:\r\n        entitySetServiceType +\r\n        `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [\r\n            `super(client, basePath, name, ${qObjectName}, new ${model.qIdFunctionName}(name)${\r\n              this.isV4BigNumber() ? \", true\" : \"\"\r\n            });`,\r\n          ],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private async generateModelServices(serviceFile: SourceFile, importContainer: ImportContainer) {\r\n    // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\r\n    for (const model of this.dataModel.getModels()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n\r\n      // entity collection service\r\n      await this.generateEntityCollectionService(model, serviceFile, importContainer);\r\n    }\r\n\r\n    // build service file for complex types\r\n    for (const model of this.dataModel.getComplexTypes()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n    }\r\n  }\r\n\r\n  private generateMethod(\r\n    name: string,\r\n    operation: OperationType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const isFunc = operation.type === OperationTypes.Function;\r\n    const odataType = operation.returnType?.isCollection\r\n      ? RESPONSE_TYPES.collection + this.getVersionSuffix()\r\n      : operation.returnType?.dataType === DataTypes.PrimitiveType\r\n      ? RESPONSE_TYPES.value + this.getVersionSuffix()\r\n      : RESPONSE_TYPES.model + this.getVersionSuffix();\r\n    const returnType = operation.returnType;\r\n    const requestConfigParam = {\r\n      name: \"requestConfig\",\r\n      hasQuestionToken: true,\r\n      type: \"ODataHttpClientConfig<ClientType>\",\r\n    };\r\n    const hasParams = operation.parameters.length > 0;\r\n\r\n    // importing dependencies\r\n    importContainer.addFromClientApi(\"ODataHttpClientConfig\", \"ODataResponse\");\r\n    importContainer.addFromCore(odataType);\r\n    if (returnType?.type) {\r\n      if ([DataTypes.EnumType, DataTypes.ModelType, DataTypes.ComplexType].includes(returnType.dataType)) {\r\n        importContainer.addGeneratedModel(returnType.type);\r\n      }\r\n    }\r\n    importContainer.addGeneratedQObject(operation.qName);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n\r\n    const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      isAsync: true,\r\n      name,\r\n      parameters: hasParams\r\n        ? [{ name: \"params\", type: operation.paramsModelName }, requestConfigParam]\r\n        : [requestConfigParam],\r\n      returnType: `ODataResponse<${odataType}<${returnType?.type || \"void\"}>>`,\r\n      statements: [\r\n        `if(!${qOpProp}) {`,\r\n        `  ${qOpProp} = new ${operation.qName}()`,\r\n        \"}\",\r\n\r\n        `const { addFullPath, client, getDefaultHeaders } = this.__base;`,\r\n        `const url = addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params\" : \"\"}));`,\r\n        `${returnType ? \"const response = await \" : \"return\"} client.${\r\n          !isFunc\r\n            ? // actions: since V4\r\n              `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${\r\n                requestConfigParam.name\r\n              }, getDefaultHeaders())`\r\n            : operation.usePost\r\n            ? // V2 POST => BUT values are still query params, they are not part of the request body\r\n              `post(url, undefined, ${requestConfigParam.name}, getDefaultHeaders())`\r\n            : // functions: since V2\r\n              `get(url, ${requestConfigParam.name}, getDefaultHeaders())`\r\n        };`,\r\n        returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\r\n      ],\r\n    };\r\n  }\r\n}\r\n"]}

package/lib/project/ProjectManager.d.ts

@@ -10,7 +10,6 @@ export declare class ProjectManager {
     private formatter;
     private project;
     private files;
-    private serviceFiles;
     constructor(projectFiles: ProjectFiles, outputDir: string, emitMode: EmitModes, formatter: FileFormatter, compilerOptions: CompilerOptions | undefined);
     private createFile;
     createModelFile(): Promise<SourceFile>;
@@ -19,10 +18,6 @@ export declare class ProjectManager {
     getQObjectFile(): SourceFile;
     createMainServiceFile(): Promise<SourceFile>;
     getMainServiceFile(): SourceFile;
-    getServiceDir(): string;
-    cleanServiceDir(): Promise<void>;
-    createServiceFile(name: string): Promise<SourceFile>;
-    getServiceFiles(): SourceFile[];
     writeFiles(): Promise<void>;
     private emitJsFiles;
     private emitTsFiles;

package/lib/project/ProjectManager.js

@@ -50,7 +50,6 @@ function getTarget(target) {
     const matchedKey = Object.keys(typescript_1.default.ScriptTarget).find((st) => st.toLowerCase() === t);
     return matchedKey ? typescript_1.default.ScriptTarget[matchedKey] : undefined;
 }
-const STATIC_SERVICE_DIR = "service";
 class ProjectManager {
     constructor(projectFiles, outputDir, emitMode, formatter, compilerOptions) {
         this.projectFiles = projectFiles;
@@ -58,7 +57,6 @@ class ProjectManager {
         this.emitMode = emitMode;
         this.formatter = formatter;
         this.files = {};
-        this.serviceFiles = [];
         this.formatAndWriteFile = (file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const fileName = file.getFilePath();
             const content = file.getFullText();
@@ -119,24 +117,6 @@ class ProjectManager {
     getMainServiceFile() {
         return this.files.mainService;
     }
-    getServiceDir() {
-        return path.join(this.outputDir, STATIC_SERVICE_DIR);
-    }
-    cleanServiceDir() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (0, fs_extra_1.emptyDir)(this.getServiceDir());
-        });
-    }
-    createServiceFile(name) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const file = yield this.createFile(path.join(STATIC_SERVICE_DIR, name));
-            this.serviceFiles.push(file);
-            return file;
-        });
-    }
-    getServiceFiles() {
-        return this.serviceFiles;
-    }
     writeFiles() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             switch (this.emitMode) {
@@ -168,7 +148,7 @@ class ProjectManager {
     }
     emitTsFiles() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile(), ...this.getServiceFiles()];
+            const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile()];
             console.log(`Emitting ${files.length} TS files`);
             return Promise.all([...files.filter((file) => !!file).map(this.formatAndWriteFile)]);
         });

package/lib/project/ProjectManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeFile } from \"fs/promises\";\r\nimport * as path from \"path\";\r\n\r\nimport { emptyDir, remove } from \"fs-extra\";\r\nimport {\r\n  CompilerOptions,\r\n  ModuleKind,\r\n  ModuleResolutionKind,\r\n  NewLineKind,\r\n  Project,\r\n  ScriptTarget,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport load from \"tsconfig-loader\";\r\nimport ts from \"typescript\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\nimport { EmitModes } from \"../OptionModel\";\r\nimport { createFormatter } from \"./formatter\";\r\nimport { FileFormatter } from \"./formatter/FileFormatter\";\r\n\r\nexport async function createProjectManager(\r\n  projectFiles: ProjectFiles,\r\n  outputDir: string,\r\n  emitMode: EmitModes,\r\n  usePrettier: boolean,\r\n  tsConfigPath: string = \"tsconfig.json\"\r\n): Promise<ProjectManager> {\r\n  const generateDeclarations = EmitModes.js_dts === emitMode || EmitModes.dts === emitMode;\r\n  const conf = load({ filename: tsConfigPath });\r\n  const formatter = await createFormatter(outputDir, usePrettier);\r\n\r\n  const {\r\n    // ignored props\r\n    noEmit, // we always want to emit\r\n    importsNotUsedAsValues, // type is missing\r\n    jsx,\r\n    plugins,\r\n    // mapped props\r\n    moduleResolution,\r\n    lib,\r\n    module,\r\n    newLine,\r\n    target,\r\n    rootDir,\r\n    rootDirs,\r\n    ...passThrough\r\n  } = conf?.tsConfig.compilerOptions || {};\r\n\r\n  const compilerOpts: CompilerOptions = {\r\n    ...passThrough,\r\n    outDir: outputDir,\r\n    declaration: generateDeclarations,\r\n    moduleResolution: getModuleResolutionKind(moduleResolution),\r\n    module: getModuleKind(module),\r\n    target: getTarget(target),\r\n    lib: lib as string[],\r\n    newLine:\r\n      newLine?.toLowerCase() === \"crlf\"\r\n        ? NewLineKind.CarriageReturnLineFeed\r\n        : newLine?.toLowerCase() === \"lf\"\r\n        ? NewLineKind.LineFeed\r\n        : undefined,\r\n  };\r\n\r\n  return new ProjectManager(projectFiles, outputDir, emitMode, formatter, compilerOpts);\r\n}\r\n\r\nfunction getModuleResolutionKind(\r\n  moduleResolution: string | undefined | Record<string, any>\r\n): ModuleResolutionKind | undefined {\r\n  const modRes =\r\n    typeof moduleResolution === \"string\"\r\n      ? moduleResolution.toLowerCase() === \"node\"\r\n        ? \"nodejs\"\r\n        : moduleResolution.toLowerCase()\r\n      : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleResolutionKind).find(\r\n    (mk): mk is keyof typeof ModuleResolutionKind => mk.toLowerCase() === modRes\r\n  );\r\n  return matchedKey ? (ts.ModuleResolutionKind[matchedKey] as ModuleResolutionKind) : undefined;\r\n}\r\n\r\nfunction getModuleKind(module: string | undefined | Record<string, any>): ModuleKind | undefined {\r\n  const mod = typeof module === \"string\" ? module.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleKind).find((mk): mk is keyof typeof ModuleKind => mk.toLowerCase() === mod);\r\n  return matchedKey ? (ts.ModuleKind[matchedKey] as ModuleKind) : undefined;\r\n}\r\n\r\nfunction getTarget(target: string | undefined | Record<string, any>): ScriptTarget | undefined {\r\n  const t = typeof target === \"string\" ? target.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ScriptTarget).find((st): st is keyof typeof ScriptTarget => st.toLowerCase() === t);\r\n  return matchedKey ? (ts.ScriptTarget[matchedKey] as ScriptTarget) : undefined;\r\n}\r\n\r\nconst STATIC_SERVICE_DIR = \"service\";\r\n\r\nexport class ProjectManager {\r\n  private project!: Project;\r\n\r\n  private files: { [name: string]: SourceFile } = {};\r\n  private serviceFiles: Array<SourceFile> = [];\r\n\r\n  constructor(\r\n    private projectFiles: ProjectFiles,\r\n    private outputDir: string,\r\n    private emitMode: EmitModes,\r\n    private formatter: FileFormatter,\r\n    compilerOptions: CompilerOptions | undefined\r\n  ) {\r\n    // Create ts-morph project\r\n    this.project = new Project({\r\n      manipulationSettings: this.formatter.getSettings(),\r\n      skipAddingFilesFromTsConfig: true,\r\n      compilerOptions,\r\n    });\r\n  }\r\n\r\n  private async createFile(name: string) {\r\n    const fileName = path.join(this.outputDir, `${name}.ts`);\r\n    await remove(fileName);\r\n    return this.project.createSourceFile(fileName);\r\n  }\r\n\r\n  public async createModelFile() {\r\n    this.files.model = await this.createFile(this.projectFiles.model);\r\n    return this.getModelFile();\r\n  }\r\n\r\n  public getModelFile() {\r\n    return this.files.model;\r\n  }\r\n\r\n  public async createQObjectFile() {\r\n    this.files.qobject = await this.createFile(this.projectFiles.qObject);\r\n    return this.getQObjectFile();\r\n  }\r\n\r\n  public getQObjectFile() {\r\n    return this.files.qobject;\r\n  }\r\n\r\n  public async createMainServiceFile() {\r\n    this.files.mainService = await this.createFile(this.projectFiles.service);\r\n    return this.getMainServiceFile();\r\n  }\r\n\r\n  public getMainServiceFile() {\r\n    return this.files.mainService;\r\n  }\r\n\r\n  public getServiceDir() {\r\n    return path.join(this.outputDir, STATIC_SERVICE_DIR);\r\n  }\r\n\r\n  public async cleanServiceDir() {\r\n    return emptyDir(this.getServiceDir());\r\n  }\r\n\r\n  public async createServiceFile(name: string) {\r\n    const file = await this.createFile(path.join(STATIC_SERVICE_DIR, name));\r\n    this.serviceFiles.push(file);\r\n\r\n    return file;\r\n  }\r\n\r\n  public getServiceFiles() {\r\n    return this.serviceFiles;\r\n  }\r\n\r\n  public async writeFiles() {\r\n    switch (this.emitMode) {\r\n      case EmitModes.js:\r\n      case EmitModes.js_dts:\r\n        await this.emitJsFiles();\r\n        break;\r\n      case EmitModes.dts:\r\n        await this.emitJsFiles(true);\r\n        break;\r\n      case EmitModes.ts:\r\n        await this.emitTsFiles();\r\n        break;\r\n      default:\r\n        throw new Error(`Emit mode \"${this.emitMode}\" is invalid!`);\r\n    }\r\n  }\r\n\r\n  private async emitJsFiles(declarationOnly?: boolean) {\r\n    console.log(\r\n      declarationOnly\r\n        ? \"Emitting declaration files\"\r\n        : `Emitting JS files (${this.emitMode === EmitModes.js_dts ? \"including\" : \"without\"} declaration files)`\r\n    );\r\n\r\n    await this.project.emit({ emitOnlyDtsFiles: !!declarationOnly });\r\n\r\n    /* for (const diagnostic of this.project.getPreEmitDiagnostics()) {\r\n      console.log(diagnostic.getMessageText());\r\n    } */\r\n  }\r\n\r\n  private async emitTsFiles() {\r\n    const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile(), ...this.getServiceFiles()];\r\n    console.log(`Emitting ${files.length} TS files`);\r\n    return Promise.all([...files.filter((file) => !!file).map(this.formatAndWriteFile)]);\r\n  }\r\n\r\n  private formatAndWriteFile = async (file: SourceFile) => {\r\n    const fileName = file.getFilePath();\r\n    const content = file.getFullText();\r\n\r\n    try {\r\n      const formatted = await this.formatter.format(content);\r\n\r\n      try {\r\n        return writeFile(fileName, formatted);\r\n      } catch (writeError) {\r\n        console.error(`Failed to write file [/${fileName}]`, writeError);\r\n        process.exit(3);\r\n      }\r\n    } catch (formattingError) {\r\n      console.error(\"Formatting failed\");\r\n      await writeFile(\"error.log\", formattingError?.toString() || \"no error message!\");\r\n      process.exit(99);\r\n    }\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeFile } from \"fs/promises\";\r\nimport * as path from \"path\";\r\n\r\nimport { remove } from \"fs-extra\";\r\nimport {\r\n  CompilerOptions,\r\n  ModuleKind,\r\n  ModuleResolutionKind,\r\n  NewLineKind,\r\n  Project,\r\n  ScriptTarget,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport load from \"tsconfig-loader\";\r\nimport ts from \"typescript\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\nimport { EmitModes } from \"../OptionModel\";\r\nimport { createFormatter } from \"./formatter\";\r\nimport { FileFormatter } from \"./formatter/FileFormatter\";\r\n\r\nexport async function createProjectManager(\r\n  projectFiles: ProjectFiles,\r\n  outputDir: string,\r\n  emitMode: EmitModes,\r\n  usePrettier: boolean,\r\n  tsConfigPath: string = \"tsconfig.json\"\r\n): Promise<ProjectManager> {\r\n  const generateDeclarations = EmitModes.js_dts === emitMode || EmitModes.dts === emitMode;\r\n  const conf = load({ filename: tsConfigPath });\r\n  const formatter = await createFormatter(outputDir, usePrettier);\r\n\r\n  const {\r\n    // ignored props\r\n    noEmit, // we always want to emit\r\n    importsNotUsedAsValues, // type is missing\r\n    jsx,\r\n    plugins,\r\n    // mapped props\r\n    moduleResolution,\r\n    lib,\r\n    module,\r\n    newLine,\r\n    target,\r\n    rootDir,\r\n    rootDirs,\r\n    ...passThrough\r\n  } = conf?.tsConfig.compilerOptions || {};\r\n\r\n  const compilerOpts: CompilerOptions = {\r\n    ...passThrough,\r\n    outDir: outputDir,\r\n    declaration: generateDeclarations,\r\n    moduleResolution: getModuleResolutionKind(moduleResolution),\r\n    module: getModuleKind(module),\r\n    target: getTarget(target),\r\n    lib: lib as string[],\r\n    newLine:\r\n      newLine?.toLowerCase() === \"crlf\"\r\n        ? NewLineKind.CarriageReturnLineFeed\r\n        : newLine?.toLowerCase() === \"lf\"\r\n        ? NewLineKind.LineFeed\r\n        : undefined,\r\n  };\r\n\r\n  return new ProjectManager(projectFiles, outputDir, emitMode, formatter, compilerOpts);\r\n}\r\n\r\nfunction getModuleResolutionKind(\r\n  moduleResolution: string | undefined | Record<string, any>\r\n): ModuleResolutionKind | undefined {\r\n  const modRes =\r\n    typeof moduleResolution === \"string\"\r\n      ? moduleResolution.toLowerCase() === \"node\"\r\n        ? \"nodejs\"\r\n        : moduleResolution.toLowerCase()\r\n      : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleResolutionKind).find(\r\n    (mk): mk is keyof typeof ModuleResolutionKind => mk.toLowerCase() === modRes\r\n  );\r\n  return matchedKey ? (ts.ModuleResolutionKind[matchedKey] as ModuleResolutionKind) : undefined;\r\n}\r\n\r\nfunction getModuleKind(module: string | undefined | Record<string, any>): ModuleKind | undefined {\r\n  const mod = typeof module === \"string\" ? module.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleKind).find((mk): mk is keyof typeof ModuleKind => mk.toLowerCase() === mod);\r\n  return matchedKey ? (ts.ModuleKind[matchedKey] as ModuleKind) : undefined;\r\n}\r\n\r\nfunction getTarget(target: string | undefined | Record<string, any>): ScriptTarget | undefined {\r\n  const t = typeof target === \"string\" ? target.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ScriptTarget).find((st): st is keyof typeof ScriptTarget => st.toLowerCase() === t);\r\n  return matchedKey ? (ts.ScriptTarget[matchedKey] as ScriptTarget) : undefined;\r\n}\r\n\r\nexport class ProjectManager {\r\n  private project!: Project;\r\n\r\n  private files: { [name: string]: SourceFile } = {};\r\n\r\n  constructor(\r\n    private projectFiles: ProjectFiles,\r\n    private outputDir: string,\r\n    private emitMode: EmitModes,\r\n    private formatter: FileFormatter,\r\n    compilerOptions: CompilerOptions | undefined\r\n  ) {\r\n    // Create ts-morph project\r\n    this.project = new Project({\r\n      manipulationSettings: this.formatter.getSettings(),\r\n      skipAddingFilesFromTsConfig: true,\r\n      compilerOptions,\r\n    });\r\n  }\r\n\r\n  private async createFile(name: string) {\r\n    const fileName = path.join(this.outputDir, `${name}.ts`);\r\n    await remove(fileName);\r\n    return this.project.createSourceFile(fileName);\r\n  }\r\n\r\n  public async createModelFile() {\r\n    this.files.model = await this.createFile(this.projectFiles.model);\r\n    return this.getModelFile();\r\n  }\r\n\r\n  public getModelFile() {\r\n    return this.files.model;\r\n  }\r\n\r\n  public async createQObjectFile() {\r\n    this.files.qobject = await this.createFile(this.projectFiles.qObject);\r\n    return this.getQObjectFile();\r\n  }\r\n\r\n  public getQObjectFile() {\r\n    return this.files.qobject;\r\n  }\r\n\r\n  public async createMainServiceFile() {\r\n    this.files.mainService = await this.createFile(this.projectFiles.service);\r\n    return this.getMainServiceFile();\r\n  }\r\n\r\n  public getMainServiceFile() {\r\n    return this.files.mainService;\r\n  }\r\n\r\n  public async writeFiles() {\r\n    switch (this.emitMode) {\r\n      case EmitModes.js:\r\n      case EmitModes.js_dts:\r\n        await this.emitJsFiles();\r\n        break;\r\n      case EmitModes.dts:\r\n        await this.emitJsFiles(true);\r\n        break;\r\n      case EmitModes.ts:\r\n        await this.emitTsFiles();\r\n        break;\r\n      default:\r\n        throw new Error(`Emit mode \"${this.emitMode}\" is invalid!`);\r\n    }\r\n  }\r\n\r\n  private async emitJsFiles(declarationOnly?: boolean) {\r\n    console.log(\r\n      declarationOnly\r\n        ? \"Emitting declaration files\"\r\n        : `Emitting JS files (${this.emitMode === EmitModes.js_dts ? \"including\" : \"without\"} declaration files)`\r\n    );\r\n\r\n    await this.project.emit({ emitOnlyDtsFiles: !!declarationOnly });\r\n\r\n    /* for (const diagnostic of this.project.getPreEmitDiagnostics()) {\r\n      console.log(diagnostic.getMessageText());\r\n    } */\r\n  }\r\n\r\n  private async emitTsFiles() {\r\n    const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile()];\r\n    console.log(`Emitting ${files.length} TS files`);\r\n    return Promise.all([...files.filter((file) => !!file).map(this.formatAndWriteFile)]);\r\n  }\r\n\r\n  private formatAndWriteFile = async (file: SourceFile) => {\r\n    const fileName = file.getFilePath();\r\n    const content = file.getFullText();\r\n\r\n    try {\r\n      const formatted = await this.formatter.format(content);\r\n\r\n      try {\r\n        return writeFile(fileName, formatted);\r\n      } catch (writeError) {\r\n        console.error(`Failed to write file [/${fileName}]`, writeError);\r\n        process.exit(3);\r\n      }\r\n    } catch (formattingError) {\r\n      console.error(\"Formatting failed\");\r\n      await writeFile(\"error.log\", formattingError?.toString() || \"no error message!\");\r\n      process.exit(99);\r\n    }\r\n  };\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.29.1",
+  "version": "0.30.0",
   "publishConfig": {
     "access": "public"
   },
@@ -87,6 +87,6 @@
     "typescript": "^5.1.3"
   },
   "types": "./lib/index.d.ts",
-  "gitHead": "372172139002d0d0f4d815e58985ab23b8052243",
+  "gitHead": "548d7d30c7559c9be67259282f372407273ea714",
   "readme": "README.md"
 }