@odata2ts/odata2ts 0.34.0 → 0.36.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.36.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.35.0...@odata2ts/odata2ts@0.36.0) (2024-07-31)
+
+### Features
+
+* **generator:** add ts-nocheck to each generated file by default ([#284](https://github.com/odata2ts/odata2ts/issues/284)) ([655a3ab](https://github.com/odata2ts/odata2ts/commit/655a3ab801c79e34841f35b1a72cf7d02064f3b8))
+* **generator:** generate services based on API reference chain ([#275](https://github.com/odata2ts/odata2ts/issues/275)) ([8fd415b](https://github.com/odata2ts/odata2ts/commit/8fd415bd0a49144e14da08cd5e32d44e947c7f23))
+* **generator:** support function overloads for different parameter sets ([#282](https://github.com/odata2ts/odata2ts/issues/282)) ([0b53271](https://github.com/odata2ts/odata2ts/commit/0b532710499d975155c21984a62707ecf4789439))
+* **generator:** support type-only imports ([#290](https://github.com/odata2ts/odata2ts/issues/290)) ([dea381e](https://github.com/odata2ts/odata2ts/commit/dea381e7c31f84e03acbaafc15ede58aa9041c13))
+* model files always get type checked (no [@ts-nocheck](https://github.com/ts-nocheck)) ([#288](https://github.com/odata2ts/odata2ts/issues/288)) ([43ca58b](https://github.com/odata2ts/odata2ts/commit/43ca58bf72bb8e783b80798eaa73d5fd19676627))
+
+### BREAKING CHANGES
+
+* **generator:** generated code won't be type checked anymore. Use `debug: true` to get type checking back.
+
+# [0.35.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.34.0...@odata2ts/odata2ts@0.35.0) (2024-05-16)
+
+### Bug Fixes
+
+* empty enum ([#270](https://github.com/odata2ts/odata2ts/issues/270)) ([32eeb1e](https://github.com/odata2ts/odata2ts/commit/32eeb1e587f507a138ca96d81c7ab3da4c0bdba8))
+
+### Features
+
+* invariant client type ([#272](https://github.com/odata2ts/odata2ts/issues/272)) ([0ee3c94](https://github.com/odata2ts/odata2ts/commit/0ee3c94d3bf34e7774e1be8dad657ed5e64e597e))
+
 # [0.34.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.33.2...@odata2ts/odata2ts@0.34.0) (2024-05-03)
 
 ### Bug Fixes

package/README.md

@@ -1,81 +1,81 @@
-[![npm (scoped)](https://img.shields.io/npm/v/@odata2ts/odata2ts?style=for-the-badge)](https://www.npmjs.com/package/@odata2ts/odata2ts)
-
-# odata2ts
-
-The basic idea of `odata2ts` is to leverage the readily available metadata of any OData service
-to generate different sorts of typed artefacts which you use in your TypeScript code.
-This package (`@odata2ts/odata2ts`) realizes the generation process.
-
-The generator is supposed to be used with a TypeScript based configuration file.
-Then it's able to handle the generation for multiple OData services.
-
-It comes with powerful configuration options. Some highlights:
-
-- generation of TypeScript files or compiled JS / DTS files
-- name or rename stuff
-  - naming of pretty much any aspect of the generated artefacts
-  - e.g. all types should be prefixed with an "I", Person => IPerson
-  - consistent casing (as in "camelCase" or "PascalCase") even for property names of entity types
-- use type converters
-
-See the [generator documentation](https://odata2ts.github.io/docs/generator/setup-and-usage) for more information.
-
-## Installation
-
-```
-npm install --save-dev @odata2ts/odata2ts
-```
-
-### Implicit Dependencies
-
-Most of the generated artefacts depend on other libraries. `odata2ts` lists them as peer dependencies.
-
-Depending on your use case, you will need to add runtime dependencies matching the mentioned peer dependencies.
-See the [Getting Started Guide](https://odata2ts.github.io/docs/category/getting-started/) of the documentation
-for guidance.
-
-## Documentation
-
-[Generator Documentation](https://odata2ts.github.io/docs/generator/setup-and-usage)
-
-Main documentation for the odata2ts eco system:
-[https://odata2ts.github.io](https://odata2ts.github.io/)
-
-## Examples
-
-See [example packages](https://github.com/odata2ts/odata2ts/tree/main/examples) for examples of how to integrate `odata2ts`.
-
-## Tests
-
-See folder [test](https://github.com/odata2ts/odata2ts/tree/main/packages/odata2ts/test)
-for unit tests.
-
-See folder [int-test](https://github.com/odata2ts/odata2ts/tree/main/packages/odata2ts/int-test) for integration
-tests of the CLI.
-
-Each example package serves as integration test of the generator.
-
-## Support, Feedback, Contributing
-
-This project is open to feature requests, suggestions, bug reports, usage questions etc.
-via [GitHub issues](https://github.com/odata2ts/odata2ts/issues).
-
-Contributions and feedback are encouraged and always welcome.
-
-See the [contribution guidelines](https://github.com/odata2ts/odata2ts/blob/main/CONTRIBUTING.md) for further information.
-
-## Spirit
-
-This project and this module have been created and are maintained in the following spirit:
-
-- adhere to the **OData specification** as much as possible
-  - support any OData service implementation which conforms to the spec
-  - allow to work around faulty implementations if possible
-- stability matters
-  - exercise Test Driven Development
-  - bomb the place with unit tests (code coverage > 95%)
-  - ensure that assumptions & understanding are correct by creating integration tests
-
-## License
-
-MIT - see [License](./LICENSE).
+[![npm (scoped)](https://img.shields.io/npm/v/@odata2ts/odata2ts?style=for-the-badge)](https://www.npmjs.com/package/@odata2ts/odata2ts)
+
+# odata2ts
+
+The basic idea of `odata2ts` is to leverage the readily available metadata of any OData service
+to generate different sorts of typed artefacts which you use in your TypeScript code.
+This package (`@odata2ts/odata2ts`) realizes the generation process.
+
+The generator is supposed to be used with a TypeScript based configuration file.
+Then it's able to handle the generation for multiple OData services.
+
+It comes with powerful configuration options. Some highlights:
+
+- generation of TypeScript files or compiled JS / DTS files
+- name or rename stuff
+  - naming of pretty much any aspect of the generated artefacts
+  - e.g. all types should be prefixed with an "I", Person => IPerson
+  - consistent casing (as in "camelCase" or "PascalCase") even for property names of entity types
+- use type converters
+
+See the [generator documentation](https://odata2ts.github.io/docs/generator/setup-and-usage) for more information.
+
+## Installation
+
+```
+npm install --save-dev @odata2ts/odata2ts
+```
+
+### Implicit Dependencies
+
+Most of the generated artefacts depend on other libraries. `odata2ts` lists them as peer dependencies.
+
+Depending on your use case, you will need to add runtime dependencies matching the mentioned peer dependencies.
+See the [Getting Started Guide](https://odata2ts.github.io/docs/category/getting-started/) of the documentation
+for guidance.
+
+## Documentation
+
+[Generator Documentation](https://odata2ts.github.io/docs/generator/setup-and-usage)
+
+Main documentation for the odata2ts eco system:
+[https://odata2ts.github.io](https://odata2ts.github.io/)
+
+## Examples
+
+See [example packages](https://github.com/odata2ts/odata2ts/tree/main/examples) for examples of how to integrate `odata2ts`.
+
+## Tests
+
+See folder [test](https://github.com/odata2ts/odata2ts/tree/main/packages/odata2ts/test)
+for unit tests.
+
+See folder [int-test](https://github.com/odata2ts/odata2ts/tree/main/packages/odata2ts/int-test) for integration
+tests of the CLI.
+
+Each example package serves as integration test of the generator.
+
+## Support, Feedback, Contributing
+
+This project is open to feature requests, suggestions, bug reports, usage questions etc.
+via [GitHub issues](https://github.com/odata2ts/odata2ts/issues).
+
+Contributions and feedback are encouraged and always welcome.
+
+See the [contribution guidelines](https://github.com/odata2ts/odata2ts/blob/main/CONTRIBUTING.md) for further information.
+
+## Spirit
+
+This project and this module have been created and are maintained in the following spirit:
+
+- adhere to the **OData specification** as much as possible
+  - support any OData service implementation which conforms to the spec
+  - allow to work around faulty implementations if possible
+- stability matters
+  - exercise Test Driven Development
+  - bomb the place with unit tests (code coverage > 95%)
+  - ensure that assumptions & understanding are correct by creating integration tests
+
+## License
+
+MIT - see [License](./LICENSE).

package/lib/FactoryFunctionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"FactoryFunctionModel.js","sourceRoot":"","sources":["../src/FactoryFunctionModel.ts"],"names":[],"mappings":"","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\nimport { SourceFile } from \"ts-morph\";\n\nimport { DataModel } from \"./data-model/DataModel\";\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\nimport { NamingHelper } from \"./data-model/NamingHelper\";\nimport { RunOptions } from \"./OptionModel\";\nimport { ProjectManager } from \"./project/ProjectManager\";\n\nexport type DigestionOptions = Pick<\n  RunOptions,\n  | \"converters\"\n  | \"disableAutoManagedKey\"\n  | \"propertiesByName\"\n  | \"byTypeAndName\"\n  | \"v2ModelsWithExtraResultsWrapping\"\n  | \"v4BigNumberAsString\"\n  | \"skipEditableModels\"\n  | \"skipComments\"\n  | \"disableAutomaticNameClashResolution\"\n  | \"bundledFileGeneration\"\n>;\n\n/**\n * Takes an EdmxSchema plus the run options and creates a DataModel.\n */\nexport type DigesterFunction<S extends Schema<any, any>> = (\n  schema: Array<S>,\n  options: DigestionOptions,\n  namingHelper: NamingHelper\n) => Promise<DataModel>;\n\nexport type GeneratorFunctionOptions = Pick<\n  RunOptions,\n  \"skipEditableModels\" | \"skipIdModels\" | \"skipOperations\" | \"skipComments\" | \"v2ModelsWithExtraResultsWrapping\"\n>;\n\nexport type EntityBasedGeneratorFunction = (\n  project: ProjectManager,\n  dataModel: DataModel,\n  version: ODataVersions,\n  options: GeneratorFunctionOptions,\n  namingHelper: NamingHelper\n) => Promise<void>;\n"]}
+{"version":3,"file":"FactoryFunctionModel.js","sourceRoot":"","sources":["../src/FactoryFunctionModel.ts"],"names":[],"mappings":"","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { SourceFile } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"./data-model/DataModel\";\r\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { RunOptions } from \"./OptionModel\";\r\nimport { ProjectManager } from \"./project/ProjectManager\";\r\n\r\nexport type DigestionOptions = Pick<\r\n  RunOptions,\r\n  | \"converters\"\r\n  | \"disableAutoManagedKey\"\r\n  | \"propertiesByName\"\r\n  | \"byTypeAndName\"\r\n  | \"v2ModelsWithExtraResultsWrapping\"\r\n  | \"v4BigNumberAsString\"\r\n  | \"skipEditableModels\"\r\n  | \"skipComments\"\r\n  | \"disableAutomaticNameClashResolution\"\r\n  | \"bundledFileGeneration\"\r\n>;\r\n\r\n/**\r\n * Takes an EdmxSchema plus the run options and creates a DataModel.\r\n */\r\nexport type DigesterFunction<S extends Schema<any, any>> = (\r\n  schema: Array<S>,\r\n  options: DigestionOptions,\r\n  namingHelper: NamingHelper\r\n) => Promise<DataModel>;\r\n\r\nexport type GeneratorFunctionOptions = Pick<\r\n  RunOptions,\r\n  \"skipEditableModels\" | \"skipIdModels\" | \"skipOperations\" | \"skipComments\" | \"v2ModelsWithExtraResultsWrapping\"\r\n>;\r\n\r\nexport type EntityBasedGeneratorFunction = (\r\n  project: ProjectManager,\r\n  dataModel: DataModel,\r\n  version: ODataVersions,\r\n  options: GeneratorFunctionOptions,\r\n  namingHelper: NamingHelper\r\n) => Promise<void>;\r\n"]}

package/lib/TypeModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeModel.js","sourceRoot":"","sources":["../src/TypeModel.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAWX;AAXD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,oCAAuB,CAAA;IACvB,oCAAuB,CAAA;IACvB,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,kCAAqB,CAAA;IACrB,yDAAyD;IACzD,4CAA+B,CAAA;IAC/B,mDAAmD;IACnD,wDAA2C,CAAA;AAC7C,CAAC,EAXW,SAAS,yBAAT,SAAS,QAWpB","sourcesContent":["export enum TypeModel {\n  Any = \"Any\",\n  EntitySet = \"EntitySet\",\n  Singleton = \"Singleton\",\n  EntityType = \"EntityType\",\n  ComplexType = \"ComplexType\",\n  EnumType = \"EnumType\",\n  // Bundle Function and Action (bound or unbound; v4 only)\n  OperationType = \"OperationType\",\n  // Bundles ActionImport and FunctionImport elements\n  OperationImportType = \"OperationImportType\",\n}\n"]}
+{"version":3,"file":"TypeModel.js","sourceRoot":"","sources":["../src/TypeModel.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAWX;AAXD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,oCAAuB,CAAA;IACvB,oCAAuB,CAAA;IACvB,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,kCAAqB,CAAA;IACrB,yDAAyD;IACzD,4CAA+B,CAAA;IAC/B,mDAAmD;IACnD,wDAA2C,CAAA;AAC7C,CAAC,EAXW,SAAS,yBAAT,SAAS,QAWpB","sourcesContent":["export enum TypeModel {\r\n  Any = \"Any\",\r\n  EntitySet = \"EntitySet\",\r\n  Singleton = \"Singleton\",\r\n  EntityType = \"EntityType\",\r\n  ComplexType = \"ComplexType\",\r\n  EnumType = \"EnumType\",\r\n  // Bundle Function and Action (bound or unbound; v4 only)\r\n  OperationType = \"OperationType\",\r\n  // Bundles ActionImport and FunctionImport elements\r\n  OperationImportType = \"OperationImportType\",\r\n}\r\n"]}

package/lib/app.js

@@ -65,6 +65,7 @@ function runApp(metadataJson, options) {
             usePrettier: options.prettier,
             tsConfigPath: options.tsconfig,
             bundledFileGeneration: options.bundledFileGeneration,
+            allowTypeChecking: options.debug,
         });
         // const promises: Array<Promise<void>> = [
         // Generate Model Interfaces

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\";\nimport { pascalCase } from \"pascal-case\";\n\nimport { NamespaceWithAlias } from \"./data-model/DataModel\";\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\nimport { ODataEdmxModelBase } from \"./data-model/edmx/ODataEdmxModelBase\";\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\nimport { NamingHelper } from \"./data-model/NamingHelper\";\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\nimport { Modes, RunOptions } from \"./OptionModel\";\nimport { createProjectManager } from \"./project/ProjectManager\";\n\nfunction isQObjectGen(mode: Modes) {\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\n}\n\nfunction isServiceGen(mode: Modes) {\n  return [Modes.service, Modes.all].includes(mode);\n}\n\nfunction getServiceName(options: RunOptions, schemas: Array<SchemaV3 | SchemaV4>) {\n  if (options.serviceName) {\n    return options.serviceName;\n  }\n\n  // auto-detection of first namespace with defined EntityTypes\n  // NOTE: we make use of PascalCase here to enforce valid class names\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\n  const serviceName = detectedSchema.$.Namespace;\n  return pascalCase(serviceName);\n}\n\n/**\n *\n * @param metadataJson metadata of a given OData service already parsed as JSON\n * @param options further options\n */\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\n  // determine edmx edmxVersion attribute\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\n\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\n  const schemas = dataService.Schema as Array<SchemaV3 | SchemaV4>;\n\n  const serviceName = getServiceName(options, schemas);\n\n  const namespaces = schemas.map<NamespaceWithAlias>((schema) => [schema.$.Namespace, schema.$.Alias]);\n\n  // encapsulate the whole naming logic\n  const namingHelper = new NamingHelper(options, serviceName, namespaces);\n  // parse model information from edmx into something we can really work with\n  // => that stuff is called dataModel!\n  const dataModel =\n    version === ODataVersions.V2\n      ? await digestV2(dataService.Schema as Array<SchemaV3>, options, namingHelper)\n      : await digestV4(dataService.Schema as Array<SchemaV4>, options, namingHelper);\n\n  // Validation of entity names: the same name might be used across different namespaces\n  const validationErrors = dataModel.getNameValidation();\n  if (validationErrors.size) {\n    console.log(\"---\");\n    validationErrors.forEach((errors, name) => {\n      console.log(\n        `Duplicate name: ${name} - Fully Qualified Names: ${errors\n          .map((error) => error.fqName + (error.renamedTo ? ` (renamed to: ${error.renamedTo})` : \"\"))\n          .join(\", \")}`\n      );\n    });\n\n    if (options.disableAutomaticNameClashResolution) {\n      throw new Error(\"Name validation failed: Multiple entities have the same name across different namespaces!\");\n    }\n  }\n\n  // handling the overall generation project\n  const project = await createProjectManager(options.output, options.emitMode, namingHelper, dataModel, {\n    usePrettier: options.prettier,\n    tsConfigPath: options.tsconfig,\n    bundledFileGeneration: options.bundledFileGeneration,\n  });\n\n  // const promises: Array<Promise<void>> = [\n  // Generate Model Interfaces\n  // generateModels(project, dataModel, version, options, namingHelper),\n  // ];\n  await generateModels(project, dataModel, version, options, namingHelper);\n  console.log(\"Successfully generated models!\");\n\n  // Generate Query Objects\n  // supported edmx types: EntityType, ComplexType\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\n  if (isQObjectGen(options.mode)) {\n    // promises.push(generateQueryObjects(project, dataModel, version, options, namingHelper));\n    await generateQueryObjects(project, dataModel, version, options, namingHelper);\n    console.log(\"Successfully generated q-objects!\");\n  }\n\n  // Generate Individual OData-Service\n  if (isServiceGen(options.mode)) {\n    // promises.push(generateServices(project, dataModel, version, namingHelper, options));\n    await generateServices(project, dataModel, version, namingHelper, options);\n    console.log(\"Successfully generated services!\");\n  }\n\n  // await Promise.all(promises);\n  console.log(\"Successfully finished!\");\n}\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\nimport { pascalCase } from \"pascal-case\";\r\n\r\nimport { NamespaceWithAlias } from \"./data-model/DataModel\";\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase } 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\nfunction getServiceName(options: RunOptions, schemas: Array<SchemaV3 | SchemaV4>) {\r\n  if (options.serviceName) {\r\n    return options.serviceName;\r\n  }\r\n\r\n  // auto-detection of first namespace with defined EntityTypes\r\n  // NOTE: we make use of PascalCase here to enforce valid class names\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = detectedSchema.$.Namespace;\r\n  return pascalCase(serviceName);\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 serviceName = getServiceName(options, schemas);\r\n\r\n  const namespaces = schemas.map<NamespaceWithAlias>((schema) => [schema.$.Namespace, schema.$.Alias]);\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\r\n  // Validation of entity names: the same name might be used across different namespaces\r\n  const validationErrors = dataModel.getNameValidation();\r\n  if (validationErrors.size) {\r\n    console.log(\"---\");\r\n    validationErrors.forEach((errors, name) => {\r\n      console.log(\r\n        `Duplicate name: ${name} - Fully Qualified Names: ${errors\r\n          .map((error) => error.fqName + (error.renamedTo ? ` (renamed to: ${error.renamedTo})` : \"\"))\r\n          .join(\", \")}`\r\n      );\r\n    });\r\n\r\n    if (options.disableAutomaticNameClashResolution) {\r\n      throw new Error(\"Name validation failed: Multiple entities have the same name across different namespaces!\");\r\n    }\r\n  }\r\n\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(options.output, options.emitMode, namingHelper, dataModel, {\r\n    usePrettier: options.prettier,\r\n    tsConfigPath: options.tsconfig,\r\n    bundledFileGeneration: options.bundledFileGeneration,\r\n    allowTypeChecking: options.debug,\r\n  });\r\n\r\n  // const promises: Array<Promise<void>> = [\r\n  // Generate Model Interfaces\r\n  // generateModels(project, dataModel, version, options, namingHelper),\r\n  // ];\r\n  await generateModels(project, dataModel, version, options, namingHelper);\r\n  console.log(\"Successfully generated models!\");\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    // promises.push(generateQueryObjects(project, dataModel, version, options, namingHelper));\r\n    await generateQueryObjects(project, dataModel, version, options, namingHelper);\r\n    console.log(\"Successfully generated q-objects!\");\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    // promises.push(generateServices(project, dataModel, version, namingHelper, options));\r\n    await generateServices(project, dataModel, version, namingHelper, options);\r\n    console.log(\"Successfully generated services!\");\r\n  }\r\n\r\n  // await Promise.all(promises);\r\n  console.log(\"Successfully finished!\");\r\n}\r\n"]}

package/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["import commander, { Option } from \"commander\";\nimport { cosmiconfig } from \"cosmiconfig\";\nimport { TypeScriptLoader } from \"cosmiconfig-typescript-loader\";\nimport { emptyDir, pathExists, readFile } from \"fs-extra\";\nimport { parseStringPromise } from \"xml2js\";\n\nimport { runApp } from \"./app\";\nimport { ODataEdmxModelBase } from \"./data-model/edmx/ODataEdmxModelBase\";\nimport { downloadMetadata, storeMetadata } from \"./download/\";\nimport { evaluateConfigOptions } from \"./evaluateConfig\";\nimport { CliOptions, ConfigFileOptions, EmitModes, Modes, RunOptions, UrlSourceConfiguration } from \"./OptionModel\";\nimport { logFilePath } from \"./project/logger/logFilePath\";\n\nfunction parseMode(value: string, dummyPrevious: Modes | undefined) {\n  switch (value) {\n    case \"models\":\n      return Modes.models;\n    case \"qobjects\":\n      return Modes.qobjects;\n    case \"service\":\n      return Modes.service;\n    case \"all\":\n      return Modes.all;\n    default:\n      throw new Error(`Not a valid Mode: ${value}`);\n  }\n}\n\nfunction parseEmitMode(value: string, dummyPrevious: EmitModes) {\n  switch (value) {\n    case \"dts\":\n      return EmitModes.dts;\n    case \"js\":\n      return EmitModes.js;\n    case \"ts\":\n      return EmitModes.ts;\n    case \"js_dts\":\n      return EmitModes.js_dts;\n    default:\n      throw new Error(`Not a valid EmitMode: ${value}`);\n  }\n}\n\nfunction processCliArgs() {\n  const cli = new commander.Command()\n    .version(\"0.3.0\")\n    .description(\"CLI to generate Typescript Interfaces for models of a given OData service.\")\n    .argument(\"[services...]\", \"Run the generation process only for certain services specified in config file\", [])\n    .option(\"-s, --source <url or metadata.xml>\", \"Path to metadata file\")\n    .option(\"-o, --output <path>\", \"Output location for generated files\")\n    .option(\"-u, --source-url <sourceUrl>\", \"URL to the root of the OData service\")\n    .option(\n      \"-f, --refresh-file\",\n      \"Download metadata again and overwrite existing file (only applies if sourceUrl is specified)\"\n    )\n    .addOption(\n      new Option(\"-m, --mode <mode>\", \"What kind of stuff gets generated\")\n        .choices(Object.values(Modes).filter((t): t is string => isNaN(Number(t))))\n        .argParser<Modes>(parseMode)\n    )\n    .addOption(\n      new Option(\n        \"-e, --emit-mode <mode>\",\n        \"Output TS source files, compiled JS files with/wihthout generated d.ts files\"\n      )\n        .choices(Object.values(EmitModes))\n        .argParser<EmitModes>(parseEmitMode)\n    )\n    .option(\"-p, --prettier\", \"Format result with prettier (only applies if emitMode=ts)\")\n    .option(\n      \"-t, --tsconfig <path>\",\n      \"Specify alternative to 'tsconfig.json' to use specific compilerOptions (applies if emitMode is not ts)\"\n    )\n    .option(\"-d, --debug\", \"Verbose debug infos\")\n    .option(\"-name, --service-name <serviceName>\", \"Give the service your own name\")\n    .option(\n      \"-n, --disable-auto-managed-key\",\n      \"Don't mark single key props as managed by the server side (not editable)\"\n    )\n    .option(\"-r, --allow-renaming\", \"Allow that property and entity names may be changed by configured casing\")\n    .parse(process.argv);\n\n  const args = cli.args?.length ? { services: cli.args } : {};\n  return {\n    ...cli.opts(),\n    ...args,\n  } as CliOptions;\n}\n\nasync function processConfigFile() {\n  const moduleName = \"odata2ts\";\n  const explorer = cosmiconfig(moduleName, {\n    searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.cjs`],\n    loaders: {\n      \".ts\": TypeScriptLoader(),\n    },\n  });\n  const discoveredConfig = await explorer.search();\n\n  if (discoveredConfig?.config) {\n    console.log(\"Loaded config file: \", logFilePath(discoveredConfig.filepath));\n  } else {\n    console.log(\"No config file found.\");\n  }\n\n  return discoveredConfig?.config as ConfigFileOptions;\n}\n\nexport class Cli {\n  async run(): Promise<void> {\n    let runs;\n    try {\n      const cliOpts = processCliArgs();\n      if (cliOpts.debug) {\n        console.log(\"CLI opts:\", cliOpts);\n      }\n      const fileOpts = await processConfigFile();\n\n      runs = evaluateConfigOptions(cliOpts, fileOpts);\n    } catch (error: any) {\n      console.error(\"Bad arguments!\", error?.message);\n      process.exit(1);\n    }\n\n    for (let run of runs) {\n      await startServiceGenerationRun(run);\n    }\n  }\n}\n\nasync function startServiceGenerationRun(options: RunOptions) {\n  const { source, output, sourceUrl, refreshFile, sourceUrlConfig, debug, mode, emitMode, prettier, serviceName } =\n    options;\n  console.log(\"---------------------------\");\n  console.log(\n    `Starting generation process. Service name ${serviceName ? `\"${serviceName}\"` : \"will be detected automatically!\"}`\n  );\n\n  if (debug) {\n    console.log(\"Resolved config:\", {\n      source,\n      output,\n      sourceUrl,\n      refreshFile,\n      debug,\n      mode: Modes[mode],\n      emitMode,\n      prettier,\n      serviceName,\n    });\n  }\n\n  // evaluate source\n  const exists = await pathExists(source);\n  console.log(`${exists ? \"Found\" : \"Didn't find\"} metadata file at: `, source);\n\n  let metadataXml;\n  // download metadata and store on disk\n  if (sourceUrl && (!exists || refreshFile)) {\n    try {\n      metadataXml = await downloadMetadata(sourceUrl, sourceUrlConfig, debug);\n    } catch (e) {\n      console.error(`Failed to load metadata! Message: ${(e as Error)?.message}`);\n      process.exit(10);\n    }\n    metadataXml = await storeMetadata(source, metadataXml, prettier);\n  }\n  // otherwise file must exist\n  else if (!exists) {\n    console.error(`Input source [${source}] doesn't exist!`);\n    process.exit(2);\n  }\n  // read the metadata from file\n  else {\n    console.log(\"Reading metadata from file:\", source);\n    metadataXml = await readFile(source);\n  }\n\n  const metadataJson = (await parseStringPromise(metadataXml)) as ODataEdmxModelBase<any>;\n  // TODO find out if \"1.0\" and \"4.0\" are really correct\n  // TODO exit here if no version not suitable version was detected\n  // console.log(`OData version detected: ${metadataJson[\"edmx:Edmx\"].$.Version}`);\n\n  // ensure that output directory exists\n  try {\n    await emptyDir(output);\n  } catch (error) {\n    console.error(`Output path [${output}] couldn't be created!`, error);\n    process.exit(3);\n  }\n\n  // run the app\n  try {\n    await runApp(metadataJson, options);\n  } catch (err: any) {\n    console.error(\"Error while running the program\", err);\n    process.exit(99);\n  }\n}\n"]}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["import commander, { Option } from \"commander\";\r\nimport { cosmiconfig } from \"cosmiconfig\";\r\nimport { TypeScriptLoader } from \"cosmiconfig-typescript-loader\";\r\nimport { emptyDir, pathExists, readFile } from \"fs-extra\";\r\nimport { parseStringPromise } from \"xml2js\";\r\n\r\nimport { runApp } from \"./app\";\r\nimport { ODataEdmxModelBase } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { downloadMetadata, storeMetadata } from \"./download/\";\r\nimport { evaluateConfigOptions } from \"./evaluateConfig\";\r\nimport { CliOptions, ConfigFileOptions, EmitModes, Modes, RunOptions, UrlSourceConfiguration } from \"./OptionModel\";\r\nimport { logFilePath } from \"./project/logger/logFilePath\";\r\n\r\nfunction parseMode(value: string, dummyPrevious: Modes | undefined) {\r\n  switch (value) {\r\n    case \"models\":\r\n      return Modes.models;\r\n    case \"qobjects\":\r\n      return Modes.qobjects;\r\n    case \"service\":\r\n      return Modes.service;\r\n    case \"all\":\r\n      return Modes.all;\r\n    default:\r\n      throw new Error(`Not a valid Mode: ${value}`);\r\n  }\r\n}\r\n\r\nfunction parseEmitMode(value: string, dummyPrevious: EmitModes) {\r\n  switch (value) {\r\n    case \"dts\":\r\n      return EmitModes.dts;\r\n    case \"js\":\r\n      return EmitModes.js;\r\n    case \"ts\":\r\n      return EmitModes.ts;\r\n    case \"js_dts\":\r\n      return EmitModes.js_dts;\r\n    default:\r\n      throw new Error(`Not a valid EmitMode: ${value}`);\r\n  }\r\n}\r\n\r\nfunction processCliArgs() {\r\n  const cli = new commander.Command()\r\n    .version(\"0.3.0\")\r\n    .description(\"CLI to generate Typescript Interfaces for models of a given OData service.\")\r\n    .argument(\"[services...]\", \"Run the generation process only for certain services specified in config file\", [])\r\n    .option(\"-s, --source <url or metadata.xml>\", \"Path to metadata file\")\r\n    .option(\"-o, --output <path>\", \"Output location for generated files\")\r\n    .option(\"-u, --source-url <sourceUrl>\", \"URL to the root of the OData service\")\r\n    .option(\r\n      \"-f, --refresh-file\",\r\n      \"Download metadata again and overwrite existing file (only applies if sourceUrl is specified)\"\r\n    )\r\n    .addOption(\r\n      new Option(\"-m, --mode <mode>\", \"What kind of stuff gets generated\")\r\n        .choices(Object.values(Modes).filter((t): t is string => isNaN(Number(t))))\r\n        .argParser<Modes>(parseMode)\r\n    )\r\n    .addOption(\r\n      new Option(\r\n        \"-e, --emit-mode <mode>\",\r\n        \"Output TS source files, compiled JS files with/wihthout generated d.ts files\"\r\n      )\r\n        .choices(Object.values(EmitModes))\r\n        .argParser<EmitModes>(parseEmitMode)\r\n    )\r\n    .option(\"-p, --prettier\", \"Format result with prettier (only applies if emitMode=ts)\")\r\n    .option(\r\n      \"-t, --tsconfig <path>\",\r\n      \"Specify alternative to 'tsconfig.json' to use specific compilerOptions (applies if emitMode is not ts)\"\r\n    )\r\n    .option(\"-d, --debug\", \"Verbose debug infos\")\r\n    .option(\"-name, --service-name <serviceName>\", \"Give the service your own name\")\r\n    .option(\r\n      \"-n, --disable-auto-managed-key\",\r\n      \"Don't mark single key props as managed by the server side (not editable)\"\r\n    )\r\n    .option(\"-r, --allow-renaming\", \"Allow that property and entity names may be changed by configured casing\")\r\n    .parse(process.argv);\r\n\r\n  const args = cli.args?.length ? { services: cli.args } : {};\r\n  return {\r\n    ...cli.opts(),\r\n    ...args,\r\n  } as CliOptions;\r\n}\r\n\r\nasync function processConfigFile() {\r\n  const moduleName = \"odata2ts\";\r\n  const explorer = cosmiconfig(moduleName, {\r\n    searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.cjs`],\r\n    loaders: {\r\n      \".ts\": TypeScriptLoader(),\r\n    },\r\n  });\r\n  const discoveredConfig = await explorer.search();\r\n\r\n  if (discoveredConfig?.config) {\r\n    console.log(\"Loaded config file: \", logFilePath(discoveredConfig.filepath));\r\n  } else {\r\n    console.log(\"No config file found.\");\r\n  }\r\n\r\n  return discoveredConfig?.config as ConfigFileOptions;\r\n}\r\n\r\nexport class Cli {\r\n  async run(): Promise<void> {\r\n    let runs;\r\n    try {\r\n      const cliOpts = processCliArgs();\r\n      if (cliOpts.debug) {\r\n        console.log(\"CLI opts:\", cliOpts);\r\n      }\r\n      const fileOpts = await processConfigFile();\r\n\r\n      runs = evaluateConfigOptions(cliOpts, fileOpts);\r\n    } catch (error: any) {\r\n      console.error(\"Bad arguments!\", error?.message);\r\n      process.exit(1);\r\n    }\r\n\r\n    for (let run of runs) {\r\n      await startServiceGenerationRun(run);\r\n    }\r\n  }\r\n}\r\n\r\nasync function startServiceGenerationRun(options: RunOptions) {\r\n  const { source, output, sourceUrl, refreshFile, sourceUrlConfig, debug, mode, emitMode, prettier, serviceName } =\r\n    options;\r\n  console.log(\"---------------------------\");\r\n  console.log(\r\n    `Starting generation process. Service name ${serviceName ? `\"${serviceName}\"` : \"will be detected automatically!\"}`\r\n  );\r\n\r\n  if (debug) {\r\n    console.log(\"Resolved config:\", {\r\n      source,\r\n      output,\r\n      sourceUrl,\r\n      refreshFile,\r\n      debug,\r\n      mode: Modes[mode],\r\n      emitMode,\r\n      prettier,\r\n      serviceName,\r\n    });\r\n  }\r\n\r\n  // evaluate source\r\n  const exists = await pathExists(source);\r\n  console.log(`${exists ? \"Found\" : \"Didn't find\"} metadata file at: `, source);\r\n\r\n  let metadataXml;\r\n  // download metadata and store on disk\r\n  if (sourceUrl && (!exists || refreshFile)) {\r\n    try {\r\n      metadataXml = await downloadMetadata(sourceUrl, sourceUrlConfig, debug);\r\n    } catch (e) {\r\n      console.error(`Failed to load metadata! Message: ${(e as Error)?.message}`);\r\n      process.exit(10);\r\n    }\r\n    metadataXml = await storeMetadata(source, metadataXml, prettier);\r\n  }\r\n  // otherwise file must exist\r\n  else if (!exists) {\r\n    console.error(`Input source [${source}] doesn't exist!`);\r\n    process.exit(2);\r\n  }\r\n  // read the metadata from file\r\n  else {\r\n    console.log(\"Reading metadata from file:\", source);\r\n    metadataXml = await readFile(source);\r\n  }\r\n\r\n  const metadataJson = (await parseStringPromise(metadataXml)) as ODataEdmxModelBase<any>;\r\n  // TODO find out if \"1.0\" and \"4.0\" are really correct\r\n  // TODO exit here if no version not suitable version was detected\r\n  // console.log(`OData version detected: ${metadataJson[\"edmx:Edmx\"].$.Version}`);\r\n\r\n  // ensure that output directory exists\r\n  try {\r\n    await emptyDir(output);\r\n  } catch (error) {\r\n    console.error(`Output path [${output}] couldn't be created!`, error);\r\n    process.exit(3);\r\n  }\r\n\r\n  // run the app\r\n  try {\r\n    await runApp(metadataJson, options);\r\n  } catch (err: any) {\r\n    console.error(\"Error while running the program\", err);\r\n    process.exit(99);\r\n  }\r\n}\r\n"]}

package/lib/data-model/DataModel.js

@@ -138,6 +138,14 @@ class DataModel {
         return [...this.models.values()].filter((m) => m.dataType === "EnumType" /* DataTypes.EnumType */);
     }
     addUnboundOperationType(namespace, operationType) {
+        // supporting function overrides
+        const isFunction = operationType.type === "Function" /* OperationTypes.Function */;
+        const existingFn = isFunction ? this.unboundOperationTypes.get(operationType.fqName) : undefined;
+        if (existingFn) {
+            const params = operationType.parameters;
+            existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);
+            return;
+        }
         this.unboundOperationTypes.set(operationType.fqName, operationType);
         this.addAlias(namespace, operationType.odataName);
     }
@@ -150,9 +158,18 @@ class DataModel {
     addBoundOperationType(namespace, bindingProp, operationType) {
         const fqEntityType = bindingProp.fqType;
         const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;
-        const list = store.get(fqEntityType);
-        if (list) {
-            list.push(operationType);
+        const boundOps = store.get(fqEntityType);
+        if (boundOps) {
+            // supporting function overrides
+            const isFunction = operationType.type === "Function" /* OperationTypes.Function */;
+            const existingFn = isFunction ? boundOps.find((bo) => bo.fqName === operationType.fqName) : undefined;
+            if (existingFn) {
+                const params = operationType.parameters;
+                existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);
+            }
+            else {
+                boundOps.push(operationType);
+            }
         }
         else {
             store.set(fqEntityType, [operationType]);

package/lib/data-model/DataModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EntityType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\nimport { ValidationError } from \"./validation/NameValidator\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\n/**\r\n * Each namespace is represented as tuple: 1. the namespace 2. the alias, if any.\r\n */\r\nexport type NamespaceWithAlias = [string, string?];\r\n\r\nexport function withNamespace(ns: string, name: string) {\r\n  // this supports the edge case of an empty string as namespace which isn't really valid according to spec (see CSDL)\r\n  return ns ? `${ns}.${name}` : name;\r\n}\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n  private nameValidation: Map<string, ValidationError[]> | undefined;\r\n\r\n  private models = new Map<string, EntityType | ComplexType | EnumType>();\r\n  /**\r\n   * Stores unbound operations by their fully qualified name.\r\n   * @private\r\n   */\r\n  private unboundOperationTypes = new Map<string, OperationType>();\r\n  /**\r\n   * Stores operations bound to an entity type by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  /**\r\n   * Stores operations bound to an entity collection by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityCollectionBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  /**\r\n   * Stores own type definitions which map to primitive types.\r\n   * @private\r\n   */\r\n  private typeDefinitions = new Map<string, string>();\r\n  private readonly namespace2Alias: { [ns: string]: string };\r\n  private aliases: Record<string, string> = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(\r\n    namespaces: Array<NamespaceWithAlias>,\r\n    private version: ODataVersion,\r\n    converters: MappedConverterChains = new Map()\r\n  ) {\r\n    this.converters = converters;\r\n    this.namespace2Alias = namespaces.reduce<Record<string, string>>((col, [ns, alias]) => {\r\n      if (alias) {\r\n        col[ns] = alias;\r\n      }\r\n      return col;\r\n    }, {});\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  private retrieveType<T>(fqName: string, haystack: Map<string, T>): T | undefined {\r\n    return haystack.get(fqName) || (this.aliases[fqName] ? haystack.get(this.aliases[fqName]) : undefined);\r\n  }\r\n\r\n  private addAlias(namespace: string, name: string) {\r\n    const alias = this.namespace2Alias[namespace];\r\n    if (alias) {\r\n      this.aliases[withNamespace(alias, name)] = withNamespace(namespace, name);\r\n    }\r\n  }\r\n\r\n  public addTypeDefinition(namespace: string, name: string, type: string) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.typeDefinitions.set(fqName, type);\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  public getPrimitiveType(fqName: string): string | undefined {\r\n    return this.retrieveType(fqName, this.typeDefinitions);\r\n  }\r\n\r\n  public getModel(fqName: string) {\r\n    return this.retrieveType(fqName, this.models);\r\n  }\r\n\r\n  public getModelTypes(): Array<ModelType> {\r\n    return [...this.models.values()];\r\n  }\r\n\r\n  public addEntityType(namespace: string, name: string, model: Omit<EntityType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ModelType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the fully qualified name of the entity\r\n   * @returns the model type\r\n   */\r\n  public getEntityType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as EntityType;\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known EntityType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getEntityTypes() {\r\n    const ets = [...this.models.values()].filter((m): m is EntityType => m.dataType === DataTypes.ModelType);\r\n    return this.sortModelsByInheritance(ets);\r\n  }\r\n\r\n  public addComplexType(namespace: string, name: string, model: Omit<ComplexType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ComplexType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as ComplexType;\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known ComplexType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    const types = [...this.models.values()].filter((m): m is ComplexType => m.dataType === DataTypes.ComplexType);\r\n    return this.sortModelsByInheritance(types);\r\n  }\r\n\r\n  public addEnum(namespace: string, name: string, type: Omit<EnumType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...type, dataType: DataTypes.EnumType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return [...this.models.values()].filter((m): m is EnumType => m.dataType === DataTypes.EnumType);\r\n  }\r\n\r\n  public addUnboundOperationType(namespace: string, operationType: OperationType) {\r\n    this.unboundOperationTypes.set(operationType.fqName, operationType);\r\n    this.addAlias(namespace, operationType.odataName);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    return [...this.unboundOperationTypes.values()];\r\n  }\r\n\r\n  public getUnboundOperationType(fqOpName: string): OperationType | undefined {\r\n    return this.retrieveType(fqOpName, this.unboundOperationTypes);\r\n  }\r\n\r\n  public addBoundOperationType(namespace: string, bindingProp: PropertyModel, operationType: OperationType) {\r\n    const fqEntityType = bindingProp.fqType;\r\n\r\n    const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;\r\n    const list = store.get(fqEntityType);\r\n    if (list) {\r\n      list.push(operationType);\r\n    } else {\r\n      store.set(fqEntityType, [operationType]);\r\n    }\r\n  }\r\n\r\n  public getEntityTypeOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityBoundOperationTypes);\r\n    return operations || [];\r\n  }\r\n\r\n  public getEntitySetOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityCollectionBoundOperationTypes);\r\n    return operations || [];\r\n  }\r\n\r\n  public getAllEntityOperations(fqEntityName: string): Array<OperationType> {\r\n    return [...this.getEntityTypeOperations(fqEntityName), ...this.getEntitySetOperations(fqEntityName)];\r\n  }\r\n\r\n  public addAction(fqName: string, action: ActionImportType) {\r\n    this.container.actions[fqName] = action;\r\n  }\r\n\r\n  public addFunction(fqName: string, func: FunctionImportType) {\r\n    this.container.functions[fqName] = func;\r\n  }\r\n\r\n  public addSingleton(fqName: string, singleton: SingletonType) {\r\n    this.container.singletons[fqName] = singleton;\r\n  }\r\n\r\n  public addEntitySet(fqName: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[fqName] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n\r\n  private sortModelsByInheritance<Type extends Omit<ComplexType, \"dataType\">>(models: Array<Type>): Array<Type> {\r\n    // recursively visit all models and sort them by inheritance such that base classes\r\n    // are always before derived classes\r\n    const sorted: Array<Type> = [];\r\n    const visitedModels = new Set<string>();\r\n    const inProgressModels = new Set<string>();\r\n\r\n    function visit(model: Type) {\r\n      const fqName = model.fqName;\r\n      if (inProgressModels.has(fqName)) {\r\n        throw new Error(`Cyclic inheritance detected for model \"${fqName}\"!`);\r\n      }\r\n\r\n      if (!visitedModels.has(fqName)) {\r\n        inProgressModels.add(fqName);\r\n\r\n        for (const baseClassName of model.baseClasses) {\r\n          const baseClass = models.find((e) => e.fqName === baseClassName);\r\n          if (baseClass) {\r\n            visit(baseClass);\r\n          }\r\n        }\r\n        visitedModels.add(fqName);\r\n        inProgressModels.delete(fqName);\r\n        sorted.push(model);\r\n      }\r\n    }\r\n\r\n    for (const model of models) {\r\n      visit(model);\r\n    }\r\n    return sorted;\r\n  }\r\n\r\n  public setNameValidation(map: Map<string, ValidationError[]>) {\r\n    this.nameValidation = map;\r\n  }\r\n\r\n  public getNameValidation() {\r\n    return this.nameValidation!;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EntityType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\nimport { ValidationError } from \"./validation/NameValidator\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\n/**\r\n * Each namespace is represented as tuple: 1. the namespace 2. the alias, if any.\r\n */\r\nexport type NamespaceWithAlias = [string, string?];\r\n\r\nexport function withNamespace(ns: string, name: string) {\r\n  // this supports the edge case of an empty string as namespace which isn't really valid according to spec (see CSDL)\r\n  return ns ? `${ns}.${name}` : name;\r\n}\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n  private nameValidation: Map<string, ValidationError[]> | undefined;\r\n\r\n  private models = new Map<string, EntityType | ComplexType | EnumType>();\r\n  /**\r\n   * Stores unbound operations by their fully qualified name.\r\n   * @private\r\n   */\r\n  private unboundOperationTypes = new Map<string, OperationType>();\r\n  /**\r\n   * Stores operations bound to an entity type by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  /**\r\n   * Stores operations bound to an entity collection by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityCollectionBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  /**\r\n   * Stores own type definitions which map to primitive types.\r\n   * @private\r\n   */\r\n  private typeDefinitions = new Map<string, string>();\r\n  private readonly namespace2Alias: { [ns: string]: string };\r\n  private aliases: Record<string, string> = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(\r\n    namespaces: Array<NamespaceWithAlias>,\r\n    private version: ODataVersion,\r\n    converters: MappedConverterChains = new Map()\r\n  ) {\r\n    this.converters = converters;\r\n    this.namespace2Alias = namespaces.reduce<Record<string, string>>((col, [ns, alias]) => {\r\n      if (alias) {\r\n        col[ns] = alias;\r\n      }\r\n      return col;\r\n    }, {});\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  private retrieveType<T>(fqName: string, haystack: Map<string, T>): T | undefined {\r\n    return haystack.get(fqName) || (this.aliases[fqName] ? haystack.get(this.aliases[fqName]) : undefined);\r\n  }\r\n\r\n  private addAlias(namespace: string, name: string) {\r\n    const alias = this.namespace2Alias[namespace];\r\n    if (alias) {\r\n      this.aliases[withNamespace(alias, name)] = withNamespace(namespace, name);\r\n    }\r\n  }\r\n\r\n  public addTypeDefinition(namespace: string, name: string, type: string) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.typeDefinitions.set(fqName, type);\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  public getPrimitiveType(fqName: string): string | undefined {\r\n    return this.retrieveType(fqName, this.typeDefinitions);\r\n  }\r\n\r\n  public getModel(fqName: string) {\r\n    return this.retrieveType(fqName, this.models);\r\n  }\r\n\r\n  public getModelTypes(): Array<ModelType> {\r\n    return [...this.models.values()];\r\n  }\r\n\r\n  public addEntityType(namespace: string, name: string, model: Omit<EntityType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ModelType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the fully qualified name of the entity\r\n   * @returns the model type\r\n   */\r\n  public getEntityType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as EntityType;\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known EntityType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getEntityTypes() {\r\n    const ets = [...this.models.values()].filter((m): m is EntityType => m.dataType === DataTypes.ModelType);\r\n    return this.sortModelsByInheritance(ets);\r\n  }\r\n\r\n  public addComplexType(namespace: string, name: string, model: Omit<ComplexType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ComplexType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as ComplexType;\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known ComplexType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    const types = [...this.models.values()].filter((m): m is ComplexType => m.dataType === DataTypes.ComplexType);\r\n    return this.sortModelsByInheritance(types);\r\n  }\r\n\r\n  public addEnum(namespace: string, name: string, type: Omit<EnumType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\r\n    this.models.set(fqName, { ...type, dataType: DataTypes.EnumType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return [...this.models.values()].filter((m): m is EnumType => m.dataType === DataTypes.EnumType);\r\n  }\r\n\r\n  public addUnboundOperationType(namespace: string, operationType: OperationType) {\r\n    // supporting function overrides\r\n    const isFunction = operationType.type === OperationTypes.Function;\r\n    const existingFn = isFunction ? this.unboundOperationTypes.get(operationType.fqName) : undefined;\r\n    if (existingFn) {\r\n      const params = operationType.parameters;\r\n      existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);\r\n      return;\r\n    }\r\n\r\n    this.unboundOperationTypes.set(operationType.fqName, operationType);\r\n    this.addAlias(namespace, operationType.odataName);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    return [...this.unboundOperationTypes.values()];\r\n  }\r\n\r\n  public getUnboundOperationType(fqOpName: string): OperationType | undefined {\r\n    return this.retrieveType(fqOpName, this.unboundOperationTypes);\r\n  }\r\n\r\n  public addBoundOperationType(namespace: string, bindingProp: PropertyModel, operationType: OperationType) {\r\n    const fqEntityType = bindingProp.fqType;\r\n    const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;\r\n    const boundOps = store.get(fqEntityType);\r\n\r\n    if (boundOps) {\r\n      // supporting function overrides\r\n      const isFunction = operationType.type === OperationTypes.Function;\r\n      const existingFn = isFunction ? boundOps.find((bo) => bo.fqName === operationType.fqName) : undefined;\r\n      if (existingFn) {\r\n        const params = operationType.parameters;\r\n        existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);\r\n      } else {\r\n        boundOps.push(operationType);\r\n      }\r\n    } else {\r\n      store.set(fqEntityType, [operationType]);\r\n    }\r\n  }\r\n\r\n  public getEntityTypeOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityBoundOperationTypes);\r\n    return operations || [];\r\n  }\r\n\r\n  public getEntitySetOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityCollectionBoundOperationTypes);\r\n    return operations || [];\r\n  }\r\n\r\n  public getAllEntityOperations(fqEntityName: string): Array<OperationType> {\r\n    return [...this.getEntityTypeOperations(fqEntityName), ...this.getEntitySetOperations(fqEntityName)];\r\n  }\r\n\r\n  public addAction(fqName: string, action: ActionImportType) {\r\n    this.container.actions[fqName] = action;\r\n  }\r\n\r\n  public addFunction(fqName: string, func: FunctionImportType) {\r\n    this.container.functions[fqName] = func;\r\n  }\r\n\r\n  public addSingleton(fqName: string, singleton: SingletonType) {\r\n    this.container.singletons[fqName] = singleton;\r\n  }\r\n\r\n  public addEntitySet(fqName: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[fqName] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n\r\n  private sortModelsByInheritance<Type extends Omit<ComplexType, \"dataType\">>(models: Array<Type>): Array<Type> {\r\n    // recursively visit all models and sort them by inheritance such that base classes\r\n    // are always before derived classes\r\n    const sorted: Array<Type> = [];\r\n    const visitedModels = new Set<string>();\r\n    const inProgressModels = new Set<string>();\r\n\r\n    function visit(model: Type) {\r\n      const fqName = model.fqName;\r\n      if (inProgressModels.has(fqName)) {\r\n        throw new Error(`Cyclic inheritance detected for model \"${fqName}\"!`);\r\n      }\r\n\r\n      if (!visitedModels.has(fqName)) {\r\n        inProgressModels.add(fqName);\r\n\r\n        for (const baseClassName of model.baseClasses) {\r\n          const baseClass = models.find((e) => e.fqName === baseClassName);\r\n          if (baseClass) {\r\n            visit(baseClass);\r\n          }\r\n        }\r\n        visitedModels.add(fqName);\r\n        inProgressModels.delete(fqName);\r\n        sorted.push(model);\r\n      }\r\n    }\r\n\r\n    for (const model of models) {\r\n      visit(model);\r\n    }\r\n    return sorted;\r\n  }\r\n\r\n  public setNameValidation(map: Map<string, ValidationError[]>) {\r\n    this.nameValidation = map;\r\n  }\r\n\r\n  public getNameValidation() {\r\n    return this.nameValidation!;\r\n  }\r\n}\r\n"]}

package/lib/data-model/DataModelDigestion.d.ts

@@ -24,7 +24,20 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     protected readonly dataModel: DataModel;
     protected readonly serviceConfigHelper: ServiceConfigHelper;
     protected readonly nameValidator: NameValidator;
+    /**
+     * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.
+     */
     private model2Type;
+    /**
+     * Stores models (ComplexType or EntityType) by fqName that have been referenced in the API
+     * as entry point or via navProp.
+     * For these models one or two services are generated.
+     *
+     * In this way unnecessary service generation is prevented. For example, complex types that
+     * are only referenced as response of an operation do not need a generated service.
+     * @private
+     */
+    private serviceModels;
     protected constructor(version: ODataVersion, schemas: Array<S>, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
     private collectModelTypes;
     private addModel2Type;
@@ -45,6 +58,8 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     private addEnum;
     private addComplexType;
     private addEntityType;
+    private analyzeModelUsage;
+    private analyze;
     private postProcessModel;
     private postProcessKeys;
     private collectBaseClassPropsAndKeys;