@odata2ts/odata2ts 0.40.1 → 0.40.2

package/CHANGELOG.md

@@ -13,6 +13,31 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
     * @odata2ts/odata-query-objects bumped from ^0.28.0 to ^0.28.1
     * @odata2ts/odata-service bumped from ^0.23.0 to ^0.23.1
 
+## [0.40.2](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts-v0.40.1...@odata2ts/odata2ts-v0.40.2) (2026-07-03)
+
+
+### Features
+
+* **odata2ts:** allow for native in-operator (V4 only) ([b7ddbf0](https://github.com/odata2ts/odata2ts/commit/b7ddbf0f87c9ed20f8c52611988a3f133bce5b2f))
+
+
+### Bug Fixes
+
+* **odata2ts:** fix subclass import for unbundled generation ([#378](https://github.com/odata2ts/odata2ts/issues/378)) ([537db36](https://github.com/odata2ts/odata2ts/commit/537db369e04b972ab473b0ef2cf4c8d8d858120a))
+* **odata2ts:** properly check for bundled file generation ([#376](https://github.com/odata2ts/odata2ts/issues/376)) ([3e09fc8](https://github.com/odata2ts/odata2ts/commit/3e09fc8aace4f3dc599d1eabdebb52142c1bc779))
+* restrict-expand ([#379](https://github.com/odata2ts/odata2ts/issues/379)) ([8624b2d](https://github.com/odata2ts/odata2ts/commit/8624b2d80e6f91f5ce0dcedf53a2e22a20713de3))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @odata2ts/odata-query-objects bumped from ^0.28.1 to ^0.28.2
+    * @odata2ts/odata-service bumped from ^0.23.1 to ^0.23.2
+  * peerDependencies
+    * @odata2ts/odata-query-objects bumped from ^0.28.1 to ^0.28.2
+    * @odata2ts/odata-service bumped from ^0.23.1 to ^0.23.2
+
 ## [0.40.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts-v0.39.2...@odata2ts/odata2ts-v0.40.0) (2025-11-01)
 
 

package/lib/FactoryFunctionModel.d.ts

@@ -4,10 +4,10 @@ import { Schema } from "./data-model/edmx/ODataEdmxModelBase.js";
 import { NamingHelper } from "./data-model/NamingHelper.js";
 import { RunOptions } from "./OptionModel.js";
 import { ProjectManager } from "./project/ProjectManager.js";
-export type DigestionOptions = Pick<RunOptions, "converters" | "disableAutoManagedKey" | "propertiesByName" | "byTypeAndName" | "v2ModelsWithExtraResultsWrapping" | "v4BigNumberAsString" | "skipEditableModels" | "skipComments" | "disableAutomaticNameClashResolution" | "bundledFileGeneration" | "enumType">;
+export type DigestionOptions = Pick<RunOptions, "converters" | "disableAutoManagedKey" | "propertiesByName" | "byTypeAndName" | "v2ModelsWithExtraResultsWrapping" | "v4BigNumberAsString" | "skipEditableModels" | "skipComments" | "skipIdModels" | "disableAutomaticNameClashResolution" | "bundledFileGeneration" | "enumType" | "enableNativeInOperator">;
 /**
  * Takes an EdmxSchema plus the run options and creates a DataModel.
  */
 export type DigesterFunction<S extends Schema<any, any>> = (schema: Array<S>, options: DigestionOptions, namingHelper: NamingHelper) => Promise<DataModel>;
-export type GeneratorFunctionOptions = Pick<RunOptions, "skipEditableModels" | "skipIdModels" | "skipOperations" | "skipComments" | "v2ModelsWithExtraResultsWrapping" | "enumType">;
+export type GeneratorFunctionOptions = Pick<RunOptions, "bundledFileGeneration" | "skipEditableModels" | "skipIdModels" | "skipOperations" | "skipComments" | "v2ModelsWithExtraResultsWrapping" | "enumType" | "enableNativeInOperator">;
 export type EntityBasedGeneratorFunction = (project: ProjectManager, dataModel: DataModel, version: ODataVersions, options: GeneratorFunctionOptions, namingHelper: NamingHelper) => Promise<void>;

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 { DataModel } from \"./data-model/DataModel.js\";\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase.js\";\nimport { NamingHelper } from \"./data-model/NamingHelper.js\";\nimport { RunOptions } from \"./OptionModel.js\";\nimport { ProjectManager } from \"./project/ProjectManager.js\";\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  | \"enumType\"\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\"\n  | \"skipIdModels\"\n  | \"skipOperations\"\n  | \"skipComments\"\n  | \"v2ModelsWithExtraResultsWrapping\"\n  | \"enumType\"\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 { DataModel } from \"./data-model/DataModel.js\";\r\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase.js\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper.js\";\r\nimport { RunOptions } from \"./OptionModel.js\";\r\nimport { ProjectManager } from \"./project/ProjectManager.js\";\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  | \"skipIdModels\"\r\n  | \"disableAutomaticNameClashResolution\"\r\n  | \"bundledFileGeneration\"\r\n  | \"enumType\"\r\n  | \"enableNativeInOperator\"\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  | \"bundledFileGeneration\"\r\n  | \"skipEditableModels\"\r\n  | \"skipIdModels\"\r\n  | \"skipOperations\"\r\n  | \"skipComments\"\r\n  | \"v2ModelsWithExtraResultsWrapping\"\r\n  | \"enumType\"\r\n  | \"enableNativeInOperator\"\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/OptionModel.d.ts

@@ -258,6 +258,14 @@ export interface ConfigFileOptions extends Omit<CliOptions, "sourceUrl" | "sourc
      * With this option you can also generate numeric enums or a simple string union type.
      */
     enumType?: "string" | "numeric" | "string-union";
+    /**
+     * By default, odata2ts emulates the in operator by rolling it out as a series of equals-or-expressions.
+     * This allows for maximum compatibility with all V4 services, as well as V2 services.
+     *
+     * Setting this value to true will instead use the native in operator, resulting in smaller queries
+     * on V4 services that support it.
+     */
+    enableNativeInOperator?: boolean;
 }
 /**
  * Custom generation options which are dependent on a specific odata service.

package/lib/OptionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"OptionModel.js","sourceRoot":"","sources":["../src/OptionModel.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAN,IAAY,KAKX;AALD,WAAY,KAAK;IACf,qCAAM,CAAA;IACN,yCAAQ,CAAA;IACR,uCAAO,CAAA;IACP,+BAAG,CAAA;AACL,CAAC,EALW,KAAK,KAAL,KAAK,QAKhB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB","sourcesContent":["import { TypeConverterConfig } from \"@odata2ts/converter-runtime\";\nimport { AxiosRequestConfig } from \"axios\";\nimport { NameSettings, OverridableNamingOptions } from \"./NamingModel.js\";\nimport { TypeModel } from \"./TypeModel.js\";\n\n/**\n * Generation mode, by default \"all\".\n */\nexport enum Modes {\n  models,\n  qobjects,\n  service,\n  all,\n}\n\n/**\n * What kind of stuff to emit: Either raw TS or TS that has been compiled to JS / DTS.\n */\nexport enum EmitModes {\n  ts = \"ts\",\n  js = \"js\",\n  dts = \"dts\",\n  js_dts = \"js_dts\",\n}\n\n/**\n * Config options for CLI.\n */\nexport interface CliOptions {\n  /**\n   * The URL to the root of your OData service. The URL might end in a slash or not, it might also end\n   * in $metadata, but we usually add this for you.\n   *\n   * Specifying the URL is a convenience feature to download the metadata file from the given URL.\n   * You can configure this request via `sourceConfig` option.\n   *\n   * The `source` option must still be specified as it is used to store the downloaded file on your disk.\n   * By default, the file is used once it has been downloaded.\n   */\n  sourceUrl?: string;\n  /**\n   * Downloads the metadata file and overwrites the existing one, if any.\n   *\n   * Only takes effect, if option `sourceUrl` is specified.\n   */\n  refreshFile?: boolean;\n  /**\n   * The source is the file to use (must be an EDMX compliant XML file) or the URL to the\n   * metadata (ROOT_SERVICE/$metadata).\n   *\n   * If not specified, at least one service must be configured in config file.\n   */\n  source?: string;\n  /**\n   * Specifies the output directory for the generated stuff.\n   *\n   *  If not specified, at least one service must be configured in config file.\n   */\n  output?: string;\n  /**\n   * Only generates the specified services.\n   * Relies on an existing config file where these service names are maintained.\n   */\n  services?: Array<string>;\n  /**\n   * Specifies what to generate:\n   * - {@code Modes.models} will only generate TS interfaces\n   * - {@code Modes.qobjects} will generate functional units used in QueryBuilder and for functions and actions\n   * - {@code Modes.service} will generate one main OData service client and one per each entity\n   * - {@code Modes.all} the same as {@code Modes.service}\n   *\n   * QObjects will also generate models, and generating the service client will also generate models and QObjects.\n   * Defaults to {@code Modes.all}\n   */\n  mode?: Modes;\n  /**\n   * Specifies the type of the output files: TypeScript, JS, DTS only, JS with DTS.\n   * Defaults to {@code EmitModes.js_dts}\n   */\n  emitMode?: EmitModes;\n  /**\n   * Uses prettier with your local configuration to pretty print TypeScript files.\n   * Only applies if mode is set to {@code EmitModes.ts}.\n   */\n  prettier?: boolean;\n  /**\n   * When compiling TypeScript to JS, \"tsconfig.json\" is used by default to add compilerOptions.\n   * This option allows to specify an alternative file.\n   *\n   * Only takes effect, when mode is set to anything else than {@code EmitModes.ts}.\n   */\n  tsconfig?: string;\n  /**\n   * Verbose debugging information.\n   */\n  debug?: boolean;\n  /**\n   * Overrides the service name found in the source file.\n   *\n   * The service name is the basis for all file names and the name of the main OData client service\n   * that serves as entry point for the user.\n   */\n  serviceName?: string;\n  /**\n   * odata2ts will automatically decide if a key prop is managed on the server side.\n   * If managed, the property will not be editable (create, update, patch).\n   * The following rule applies:\n   * If a property is the only key prop of an entity, then the prop is deemed to be managed;\n   * in ony other case the prop is unmanaged.\n   */\n  disableAutoManagedKey?: boolean;\n  /**\n   * By default, odata2ts doesn't change param, operation, property or model names.\n   * The generated models and their properties are named exactly as advertised by the server.\n   *\n   * By allowing odata2ts to change these names, certain predefined formatting strategies are used:\n   * Model / class names are formatted with PascalCase; property, param, and operation names with camelCase.\n   *\n   * The naming configuration allows to control this and other naming related settings.\n   * Note: Even if renaming is disabled, model prefixing / suffixing still applies.\n   */\n  allowRenaming?: boolean;\n}\n\n/**\n * Configuration options of the request to retrieve the metadata.\n * Only takes effect if `source` is a URL.\n */\nexport interface UrlSourceConfiguration {\n  /**\n   * Basic auth credentials: the username.\n   * Only takes effect if `password` has also been set.\n   */\n  username?: string;\n  /**\n   * Basic auth credentials: the password.\n   * Only takes effect if `username` has also been set.\n   */\n  password?: string;\n  /**\n   * Custom request configuration.\n   * URL and method `GET` are set by default, but can be overwritten.\n   */\n  custom?: AxiosRequestConfig;\n}\n\n/**\n * Available options for configuration files, i.e. odata2ts.config.ts.\n */\nexport interface ConfigFileOptions extends Omit<CliOptions, \"sourceUrl\" | \"source\" | \"output\" | \"services\"> {\n  /**\n   * Configuration options of the request to retrieve the metadata.\n   * Only takes effect if `sourceUrl` is a URL.\n   */\n  sourceUrlConfig?: UrlSourceConfiguration;\n\n  /**\n   * Configuration of each service.\n   *\n   * @example { services: { trippin: { source: \"...\", ... } }}\n   */\n  services?: { [serviceName: string]: ServiceGenerationOptions };\n\n  /**\n   * Specify which converters to use by their package name, e.g. \"@odata2ts/converter-v2-to-v4\".\n   * Each converter knows which data type to map.\n   *\n   * To only use specific converters, the object syntax must be used, where supported converters\n   * must be listed by their ids.\n   */\n  converters?: Array<string | TypeConverterConfig>;\n\n  /**\n   * For each model an editable version is generated which represents the model definition for\n   * create, update and patch actions.\n   *\n   * You can skip the generation altogether, not generating editable model variants,\n   * if the generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipEditableModels?: boolean;\n\n  /**\n   * ID models are generated from entity id parameters.\n   * The generation for one entity entails one model interface representing the id parameters and\n   * one QId function which allows to format the parameters for URL usage and to parse parameters\n   * from a URL string.\n   *\n   * You can skip the generation altogether, not generating models and QId objects, if the\n   * generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipIdModels?: boolean;\n  /**\n   * Operations are functions and actions of the OData service.\n   * The generation for one operation entails one parameter model interface\n   * and one QFunction / QAction class.\n   *\n   * You can skip the generation altogether, neither generating model nor query object,\n   * if the generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipOperations?: boolean;\n  /**\n   * Model properties have explaining comments by default.\n   * With this option you can turn that off.\n   */\n  skipComments?: boolean;\n  /**\n   * With OData you can read, update and delete data on a primitive property (`Edm.*`).\n   * Usually, you wouldn't do that, but go for a bigger request, fetching more relevant information in one go.\n   *\n   * There's one exception: Handling `Edm.Stream´ properties and Media entities. Services for stream / media\n   * stuff are generated regardless of this setting.\n   */\n  enablePrimitivePropertyServices?: boolean;\n\n  /**\n   * The naming options regarding the generated artefacts.\n   */\n  naming?: OverridableNamingOptions;\n\n  /**\n   * Some OData V2 services generate an extra wrapping for entity collection attributes:\n   * <code>trips: {results: [...]}</code>. So instead of directly returning an array of entities\n   * an object with the property \"results\" is wrapped around the entity collection.\n   *\n   * If you're using the odata client then there's a build-in workaround in place which transforms\n   * the results to remove this extra mapping. However, if you're only interested in the types, then\n   * the generated models will not match that extra wrapping.\n   *\n   * Setting this configuration option to <code>true</code> (default: false) will add this extra\n   * wrapping to the generated models. But this option is only valid if the generation mode is set\n   * to <code>models</code>; it is ignored otherwise.\n   */\n  v2ModelsWithExtraResultsWrapping?: boolean;\n  /**\n   * Numbers of type `Edm.Int64` and `Edm.Decimal` are represented as `number` in V4.\n   * However, these numbers might not fit into JS' number type, which might result in precision loss.\n   *\n   * OData offers a special IEEE754 format option to get those types as `string` instead to prevent any\n   * precision loss. So if you're handling very large or very small numbers (JS roughly supports 15 digits),\n   * then you should use this option and, probably, also an appropriate converter (see available converters).\n   *\n   * Activating this option affects the type generation and will use `string` for both mentioned types.\n   * All requests are executed with the \"accept\" header set to \"application/json;IEEE754Compatible=true\".\n   * Additionally, when sending data the very same value will be set for the \"content-type\" header.\n   */\n  v4BigNumberAsString?: boolean;\n  /**\n   * OData allows for namespaces so any entity is unique by virtue of it's name within a namespace.\n   * odata2ts works with these fully qualified names internally, but only uses the plain name when generating\n   * stuff. This might lead to name clashes (same name in different namespaces).\n   *\n   * odata2ts employs a simple, automatic resolution strategy: Adding a counter at the end of the name.\n   * Set this property to true in order to disable this automatism.\n   */\n  disableAutomaticNameClashResolution?: boolean;\n  /**\n   * By default, odata2ts generates a folder structure with individual files per entity.\n   * This allows for handling and scaling the generation process for large data structures.\n   *\n   * However, especially UI5 has problems with recursive structures, which are absolutely valid within\n   * OData. Here the solution is to generate only one file per type to circumvent cyclic imports.\n   * To enable this behaviour set this option to true.\n   */\n  bundledFileGeneration?: boolean;\n  /**\n   * By default, odata2ts generates string enums.\n   * With this option you can also generate numeric enums or a simple string union type.\n   */\n  enumType?: \"string\" | \"numeric\" | \"string-union\";\n}\n\n/**\n * Custom generation options which are dependent on a specific odata service.\n */\nexport interface ServiceGenerationOptions\n  extends Required<Pick<CliOptions, \"source\" | \"output\">>,\n    Pick<CliOptions, \"sourceUrl\" | \"refreshFile\">,\n    Omit<ConfigFileOptions, \"services\"> {\n  /**\n   * Configure generation process for individual properties based on their name.\n   */\n  propertiesByName?: Array<PropertyGenerationOptions>;\n  /**\n   * Rename any EntityType, ComplexType, EnumType, Function or Action.\n   *\n   * You must match the simple name (e.g. \"Person\") or the fully qualified name\n   * (e.g. \"Trippin.Person\") exactly. Alternatively, you can rename a bunch of types\n   * by using regular expressions.\n   *\n   * By providing additional type information via the \"type\" attribute you get even more options which only apply\n   * to the given type.\n   */\n  byTypeAndName?: Array<ComplexTypeGenerationOptions | EntityTypeGenerationOptions | GenericTypeGenerationOptions>;\n}\n\n/**\n * Available options for the actual generation run.\n * Every property is required, except the overriding service name.\n */\nexport interface RunOptions\n  extends Required<Omit<ServiceGenerationOptions, \"serviceName\" | \"sourceUrl\" | \"sourceUrlConfig\" | \"refreshFile\">>,\n    Pick<ServiceGenerationOptions, \"serviceName\" | \"sourceUrl\" | \"sourceUrlConfig\" | \"refreshFile\"> {\n  naming: NameSettings;\n}\n\nexport interface RenameOptions {\n  /**\n   * Matcher for the name of any EntityType, ComplexType, EnumType, Function or Action\n   * as it is stated in the EDMX model, e.g. \"Person\". As OData supports namespaces\n   * you can also use the fully qualified name (including the namespace) to address any model,\n   * e.g. \"Trippin.Person\". You can also match properties by their name.\n   *\n   * If the name is specified as plain string, it must match either the name or the fully qualified name\n   * exactly (case-sensitive).\n   *\n   * Alternatively, a regular expression can be used which is always applied to the fully qualified name\n   * (e.g. Trippin.Person). The regular expression must match the whole string\n   * (e.g. `/Person/` won't do, `/.*\\.Person/` would work).\n   *\n   * To make regular expressions useful, captured groups are also supported in combination with\n   * the `mappedName` attribute.\n   */\n  name: string | RegExp;\n\n  /**\n   * If specified, this attribute value is used as final name for the matched name as it will\n   * appear in the generated typescript.\n   *\n   * When using a regular expression for matching the name, then captured groups can be referenced\n   * as usual via $1, $2, etc. For example:\n   * - name: /Trippin\\.(.+)/\n   * - mappedName: \"T_$1\"\n   * The result would be \"T_Person\".\n   */\n  mappedName?: string;\n}\n\nexport type TypeBasedGenerationOptions =\n  | GenericTypeGenerationOptions\n  | ComplexTypeGenerationOptions\n  | EntityTypeGenerationOptions;\n\nexport interface GenericTypeGenerationOptions extends RenameOptions {\n  type:\n    | TypeModel.Any\n    | TypeModel.EnumType\n    | TypeModel.OperationType\n    | TypeModel.OperationImportType\n    | TypeModel.Singleton\n    | TypeModel.EntitySet;\n}\n\nexport interface ComplexTypeGenerationOptions extends RenameOptions {\n  type: TypeModel.ComplexType;\n\n  /**\n   * Configuration of individual properties.\n   */\n  properties?: Array<PropertyGenerationOptions>;\n\n  // converter: string | Array<string>\n}\n\n/**\n * Configuration options for EntityTypes and ComplexTypes.\n * This config applies if the name matches the name of an EntityType or ComplexType as it is specified\n * in the metadata (e.g. in EDMX <EntityType name=\"Test\" ...)\n */\nexport interface EntityTypeGenerationOptions extends Omit<ComplexTypeGenerationOptions, \"type\"> {\n  type: TypeModel.EntityType;\n\n  /**\n   * Overwrite the key specification by naming the props by their EDMX name.\n   */\n  keys?: Array<string>;\n\n  /**\n   * Whether the generated service should allow for querying this model.\n   * True by default.\n   */\n  // queryable?: boolean;\n  /**\n   * Whether the generated service should allow for creating new models (POST).\n   * True by default.\n   */\n  // creatable?: boolean;\n  /**\n   * Whether the generated service should allow for updates (PUT).\n   * True by default.\n   */\n  // updatable?: boolean;\n  /**\n   * Whether the generated service should allow for partial updates (PATCH).\n   * True by default.\n   */\n  // patchable?: boolean;\n  /**\n   * Whether the generated service should allow for deletion.\n   * True by default.\n   */\n  // deletable?: boolean;\n}\n\n/**\n * All configuration options for properties of models.\n */\nexport interface PropertyGenerationOptions extends RenameOptions {\n  /**\n   * Managed attributes - i.e. managed by the server - cannot be created or updated.\n   * Hence, they are left out of the editable model versions.\n   */\n  managed?: boolean;\n\n  /**\n   * TODO\n   *\n   * Each converter must specify its package name, e.g. \"@odata2ts/converter-v2-to-v4\",\n   * as well it's i\n   * and their ids, e.g. \"timeToDurationConverter\".\n   *\n   * To only use specific converters, the object syntax must be used, where supported converters\n   * must be listed by their ids.\n   */\n  // converters?: Array<Required<TypeConverterConfig>>;\n}\n"]}
+{"version":3,"file":"OptionModel.js","sourceRoot":"","sources":["../src/OptionModel.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAN,IAAY,KAKX;AALD,WAAY,KAAK;IACf,qCAAM,CAAA;IACN,yCAAQ,CAAA;IACR,uCAAO,CAAA;IACP,+BAAG,CAAA;AACL,CAAC,EALW,KAAK,KAAL,KAAK,QAKhB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB","sourcesContent":["import { TypeConverterConfig } from \"@odata2ts/converter-runtime\";\nimport { AxiosRequestConfig } from \"axios\";\nimport { NameSettings, OverridableNamingOptions } from \"./NamingModel.js\";\nimport { TypeModel } from \"./TypeModel.js\";\n\n/**\n * Generation mode, by default \"all\".\n */\nexport enum Modes {\n  models,\n  qobjects,\n  service,\n  all,\n}\n\n/**\n * What kind of stuff to emit: Either raw TS or TS that has been compiled to JS / DTS.\n */\nexport enum EmitModes {\n  ts = \"ts\",\n  js = \"js\",\n  dts = \"dts\",\n  js_dts = \"js_dts\",\n}\n\n/**\n * Config options for CLI.\n */\nexport interface CliOptions {\n  /**\n   * The URL to the root of your OData service. The URL might end in a slash or not, it might also end\n   * in $metadata, but we usually add this for you.\n   *\n   * Specifying the URL is a convenience feature to download the metadata file from the given URL.\n   * You can configure this request via `sourceConfig` option.\n   *\n   * The `source` option must still be specified as it is used to store the downloaded file on your disk.\n   * By default, the file is used once it has been downloaded.\n   */\n  sourceUrl?: string;\n  /**\n   * Downloads the metadata file and overwrites the existing one, if any.\n   *\n   * Only takes effect, if option `sourceUrl` is specified.\n   */\n  refreshFile?: boolean;\n  /**\n   * The source is the file to use (must be an EDMX compliant XML file) or the URL to the\n   * metadata (ROOT_SERVICE/$metadata).\n   *\n   * If not specified, at least one service must be configured in config file.\n   */\n  source?: string;\n  /**\n   * Specifies the output directory for the generated stuff.\n   *\n   *  If not specified, at least one service must be configured in config file.\n   */\n  output?: string;\n  /**\n   * Only generates the specified services.\n   * Relies on an existing config file where these service names are maintained.\n   */\n  services?: Array<string>;\n  /**\n   * Specifies what to generate:\n   * - {@code Modes.models} will only generate TS interfaces\n   * - {@code Modes.qobjects} will generate functional units used in QueryBuilder and for functions and actions\n   * - {@code Modes.service} will generate one main OData service client and one per each entity\n   * - {@code Modes.all} the same as {@code Modes.service}\n   *\n   * QObjects will also generate models, and generating the service client will also generate models and QObjects.\n   * Defaults to {@code Modes.all}\n   */\n  mode?: Modes;\n  /**\n   * Specifies the type of the output files: TypeScript, JS, DTS only, JS with DTS.\n   * Defaults to {@code EmitModes.js_dts}\n   */\n  emitMode?: EmitModes;\n  /**\n   * Uses prettier with your local configuration to pretty print TypeScript files.\n   * Only applies if mode is set to {@code EmitModes.ts}.\n   */\n  prettier?: boolean;\n  /**\n   * When compiling TypeScript to JS, \"tsconfig.json\" is used by default to add compilerOptions.\n   * This option allows to specify an alternative file.\n   *\n   * Only takes effect, when mode is set to anything else than {@code EmitModes.ts}.\n   */\n  tsconfig?: string;\n  /**\n   * Verbose debugging information.\n   */\n  debug?: boolean;\n  /**\n   * Overrides the service name found in the source file.\n   *\n   * The service name is the basis for all file names and the name of the main OData client service\n   * that serves as entry point for the user.\n   */\n  serviceName?: string;\n  /**\n   * odata2ts will automatically decide if a key prop is managed on the server side.\n   * If managed, the property will not be editable (create, update, patch).\n   * The following rule applies:\n   * If a property is the only key prop of an entity, then the prop is deemed to be managed;\n   * in ony other case the prop is unmanaged.\n   */\n  disableAutoManagedKey?: boolean;\n  /**\n   * By default, odata2ts doesn't change param, operation, property or model names.\n   * The generated models and their properties are named exactly as advertised by the server.\n   *\n   * By allowing odata2ts to change these names, certain predefined formatting strategies are used:\n   * Model / class names are formatted with PascalCase; property, param, and operation names with camelCase.\n   *\n   * The naming configuration allows to control this and other naming related settings.\n   * Note: Even if renaming is disabled, model prefixing / suffixing still applies.\n   */\n  allowRenaming?: boolean;\n}\n\n/**\n * Configuration options of the request to retrieve the metadata.\n * Only takes effect if `source` is a URL.\n */\nexport interface UrlSourceConfiguration {\n  /**\n   * Basic auth credentials: the username.\n   * Only takes effect if `password` has also been set.\n   */\n  username?: string;\n  /**\n   * Basic auth credentials: the password.\n   * Only takes effect if `username` has also been set.\n   */\n  password?: string;\n  /**\n   * Custom request configuration.\n   * URL and method `GET` are set by default, but can be overwritten.\n   */\n  custom?: AxiosRequestConfig;\n}\n\n/**\n * Available options for configuration files, i.e. odata2ts.config.ts.\n */\nexport interface ConfigFileOptions extends Omit<CliOptions, \"sourceUrl\" | \"source\" | \"output\" | \"services\"> {\n  /**\n   * Configuration options of the request to retrieve the metadata.\n   * Only takes effect if `sourceUrl` is a URL.\n   */\n  sourceUrlConfig?: UrlSourceConfiguration;\n\n  /**\n   * Configuration of each service.\n   *\n   * @example { services: { trippin: { source: \"...\", ... } }}\n   */\n  services?: { [serviceName: string]: ServiceGenerationOptions };\n\n  /**\n   * Specify which converters to use by their package name, e.g. \"@odata2ts/converter-v2-to-v4\".\n   * Each converter knows which data type to map.\n   *\n   * To only use specific converters, the object syntax must be used, where supported converters\n   * must be listed by their ids.\n   */\n  converters?: Array<string | TypeConverterConfig>;\n\n  /**\n   * For each model an editable version is generated which represents the model definition for\n   * create, update and patch actions.\n   *\n   * You can skip the generation altogether, not generating editable model variants,\n   * if the generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipEditableModels?: boolean;\n\n  /**\n   * ID models are generated from entity id parameters.\n   * The generation for one entity entails one model interface representing the id parameters and\n   * one QId function which allows to format the parameters for URL usage and to parse parameters\n   * from a URL string.\n   *\n   * You can skip the generation altogether, not generating models and QId objects, if the\n   * generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipIdModels?: boolean;\n  /**\n   * Operations are functions and actions of the OData service.\n   * The generation for one operation entails one parameter model interface\n   * and one QFunction / QAction class.\n   *\n   * You can skip the generation altogether, neither generating model nor query object,\n   * if the generation mode is {@code Mode.model} or {@code Mode.qobject}.\n   */\n  skipOperations?: boolean;\n  /**\n   * Model properties have explaining comments by default.\n   * With this option you can turn that off.\n   */\n  skipComments?: boolean;\n  /**\n   * With OData you can read, update and delete data on a primitive property (`Edm.*`).\n   * Usually, you wouldn't do that, but go for a bigger request, fetching more relevant information in one go.\n   *\n   * There's one exception: Handling `Edm.Stream´ properties and Media entities. Services for stream / media\n   * stuff are generated regardless of this setting.\n   */\n  enablePrimitivePropertyServices?: boolean;\n\n  /**\n   * The naming options regarding the generated artefacts.\n   */\n  naming?: OverridableNamingOptions;\n\n  /**\n   * Some OData V2 services generate an extra wrapping for entity collection attributes:\n   * <code>trips: {results: [...]}</code>. So instead of directly returning an array of entities\n   * an object with the property \"results\" is wrapped around the entity collection.\n   *\n   * If you're using the odata client then there's a build-in workaround in place which transforms\n   * the results to remove this extra mapping. However, if you're only interested in the types, then\n   * the generated models will not match that extra wrapping.\n   *\n   * Setting this configuration option to <code>true</code> (default: false) will add this extra\n   * wrapping to the generated models. But this option is only valid if the generation mode is set\n   * to <code>models</code>; it is ignored otherwise.\n   */\n  v2ModelsWithExtraResultsWrapping?: boolean;\n  /**\n   * Numbers of type `Edm.Int64` and `Edm.Decimal` are represented as `number` in V4.\n   * However, these numbers might not fit into JS' number type, which might result in precision loss.\n   *\n   * OData offers a special IEEE754 format option to get those types as `string` instead to prevent any\n   * precision loss. So if you're handling very large or very small numbers (JS roughly supports 15 digits),\n   * then you should use this option and, probably, also an appropriate converter (see available converters).\n   *\n   * Activating this option affects the type generation and will use `string` for both mentioned types.\n   * All requests are executed with the \"accept\" header set to \"application/json;IEEE754Compatible=true\".\n   * Additionally, when sending data the very same value will be set for the \"content-type\" header.\n   */\n  v4BigNumberAsString?: boolean;\n  /**\n   * OData allows for namespaces so any entity is unique by virtue of it's name within a namespace.\n   * odata2ts works with these fully qualified names internally, but only uses the plain name when generating\n   * stuff. This might lead to name clashes (same name in different namespaces).\n   *\n   * odata2ts employs a simple, automatic resolution strategy: Adding a counter at the end of the name.\n   * Set this property to true in order to disable this automatism.\n   */\n  disableAutomaticNameClashResolution?: boolean;\n  /**\n   * By default, odata2ts generates a folder structure with individual files per entity.\n   * This allows for handling and scaling the generation process for large data structures.\n   *\n   * However, especially UI5 has problems with recursive structures, which are absolutely valid within\n   * OData. Here the solution is to generate only one file per type to circumvent cyclic imports.\n   * To enable this behaviour set this option to true.\n   */\n  bundledFileGeneration?: boolean;\n  /**\n   * By default, odata2ts generates string enums.\n   * With this option you can also generate numeric enums or a simple string union type.\n   */\n  enumType?: \"string\" | \"numeric\" | \"string-union\";\n  /**\n   * By default, odata2ts emulates the in operator by rolling it out as a series of equals-or-expressions.\n   * This allows for maximum compatibility with all V4 services, as well as V2 services.\n   * \n   * Setting this value to true will instead use the native in operator, resulting in smaller queries\n   * on V4 services that support it.\n   */\n  enableNativeInOperator?: boolean;\n}\n\n/**\n * Custom generation options which are dependent on a specific odata service.\n */\nexport interface ServiceGenerationOptions\n  extends Required<Pick<CliOptions, \"source\" | \"output\">>,\n    Pick<CliOptions, \"sourceUrl\" | \"refreshFile\">,\n    Omit<ConfigFileOptions, \"services\"> {\n  /**\n   * Configure generation process for individual properties based on their name.\n   */\n  propertiesByName?: Array<PropertyGenerationOptions>;\n  /**\n   * Rename any EntityType, ComplexType, EnumType, Function or Action.\n   *\n   * You must match the simple name (e.g. \"Person\") or the fully qualified name\n   * (e.g. \"Trippin.Person\") exactly. Alternatively, you can rename a bunch of types\n   * by using regular expressions.\n   *\n   * By providing additional type information via the \"type\" attribute you get even more options which only apply\n   * to the given type.\n   */\n  byTypeAndName?: Array<ComplexTypeGenerationOptions | EntityTypeGenerationOptions | GenericTypeGenerationOptions>;\n}\n\n/**\n * Available options for the actual generation run.\n * Every property is required, except the overriding service name.\n */\nexport interface RunOptions\n  extends Required<Omit<ServiceGenerationOptions, \"serviceName\" | \"sourceUrl\" | \"sourceUrlConfig\" | \"refreshFile\">>,\n    Pick<ServiceGenerationOptions, \"serviceName\" | \"sourceUrl\" | \"sourceUrlConfig\" | \"refreshFile\"> {\n  naming: NameSettings;\n}\n\nexport interface RenameOptions {\n  /**\n   * Matcher for the name of any EntityType, ComplexType, EnumType, Function or Action\n   * as it is stated in the EDMX model, e.g. \"Person\". As OData supports namespaces\n   * you can also use the fully qualified name (including the namespace) to address any model,\n   * e.g. \"Trippin.Person\". You can also match properties by their name.\n   *\n   * If the name is specified as plain string, it must match either the name or the fully qualified name\n   * exactly (case-sensitive).\n   *\n   * Alternatively, a regular expression can be used which is always applied to the fully qualified name\n   * (e.g. Trippin.Person). The regular expression must match the whole string\n   * (e.g. `/Person/` won't do, `/.*\\.Person/` would work).\n   *\n   * To make regular expressions useful, captured groups are also supported in combination with\n   * the `mappedName` attribute.\n   */\n  name: string | RegExp;\n\n  /**\n   * If specified, this attribute value is used as final name for the matched name as it will\n   * appear in the generated typescript.\n   *\n   * When using a regular expression for matching the name, then captured groups can be referenced\n   * as usual via $1, $2, etc. For example:\n   * - name: /Trippin\\.(.+)/\n   * - mappedName: \"T_$1\"\n   * The result would be \"T_Person\".\n   */\n  mappedName?: string;\n}\n\nexport type TypeBasedGenerationOptions =\n  | GenericTypeGenerationOptions\n  | ComplexTypeGenerationOptions\n  | EntityTypeGenerationOptions;\n\nexport interface GenericTypeGenerationOptions extends RenameOptions {\n  type:\n    | TypeModel.Any\n    | TypeModel.EnumType\n    | TypeModel.OperationType\n    | TypeModel.OperationImportType\n    | TypeModel.Singleton\n    | TypeModel.EntitySet;\n}\n\nexport interface ComplexTypeGenerationOptions extends RenameOptions {\n  type: TypeModel.ComplexType;\n\n  /**\n   * Configuration of individual properties.\n   */\n  properties?: Array<PropertyGenerationOptions>;\n\n  // converter: string | Array<string>\n}\n\n/**\n * Configuration options for EntityTypes and ComplexTypes.\n * This config applies if the name matches the name of an EntityType or ComplexType as it is specified\n * in the metadata (e.g. in EDMX <EntityType name=\"Test\" ...)\n */\nexport interface EntityTypeGenerationOptions extends Omit<ComplexTypeGenerationOptions, \"type\"> {\n  type: TypeModel.EntityType;\n\n  /**\n   * Overwrite the key specification by naming the props by their EDMX name.\n   */\n  keys?: Array<string>;\n\n  /**\n   * Whether the generated service should allow for querying this model.\n   * True by default.\n   */\n  // queryable?: boolean;\n  /**\n   * Whether the generated service should allow for creating new models (POST).\n   * True by default.\n   */\n  // creatable?: boolean;\n  /**\n   * Whether the generated service should allow for updates (PUT).\n   * True by default.\n   */\n  // updatable?: boolean;\n  /**\n   * Whether the generated service should allow for partial updates (PATCH).\n   * True by default.\n   */\n  // patchable?: boolean;\n  /**\n   * Whether the generated service should allow for deletion.\n   * True by default.\n   */\n  // deletable?: boolean;\n}\n\n/**\n * All configuration options for properties of models.\n */\nexport interface PropertyGenerationOptions extends RenameOptions {\n  /**\n   * Managed attributes - i.e. managed by the server - cannot be created or updated.\n   * Hence, they are left out of the editable model versions.\n   */\n  managed?: boolean;\n\n  /**\n   * TODO\n   *\n   * Each converter must specify its package name, e.g. \"@odata2ts/converter-v2-to-v4\",\n   * as well it's i\n   * and their ids, e.g. \"timeToDurationConverter\".\n   *\n   * To only use specific converters, the object syntax must be used, where supported converters\n   * must be listed by their ids.\n   */\n  // converters?: Array<Required<TypeConverterConfig>>;\n}\n"]}

package/lib/data-model/DataModelDigestion.js

@@ -1,6 +1,7 @@
 import { __awaiter } from "tslib";
 import { Modes, } from "../OptionModel.js";
 import { DataModel, withNamespace } from "./DataModel.js";
+import { QueryObjectTypes } from "./QueryObjectTypes.js";
 import { ServiceConfigHelper } from "./ServiceConfigHelper.js";
 import { NameClashValidator } from "./validation/NameClashValidator.js";
 import { NoopValidator } from "./validation/NoopValidator.js";
@@ -43,6 +44,7 @@ export class Digester {
                 const modelType = this.model2Type.get(odataDataType);
                 const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(odataDataType);
                 const dataTypeNamespace = [dataTypePrefix];
+                const isComplexType = modelType === "ComplexType" /* DataTypes.ComplexType */;
                 if (!modelType) {
                     throw new Error(`Couldn't determine model type (EntityType, ComplexType, etc) for property "${p.$.Name}"! Given data type: "${odataDataType}".`);
                 }
@@ -53,21 +55,37 @@ export class Digester {
                     result = {
                         dataType: modelType,
                         type: this.namingHelper.getEnumName((_a = enumConfig === null || enumConfig === void 0 ? void 0 : enumConfig.mappedName) !== null && _a !== void 0 ? _a : odataDataType),
-                        qPath: isNumericEnum ? "QNumericEnumPath" : "QEnumPath",
-                        qObject: isCollection ? (isNumericEnum ? "QNumericEnumCollection" : "QEnumCollection") : undefined,
+                        qPath: isCollection
+                            ? isNumericEnum
+                                ? QueryObjectTypes.QNumericEnumCollectionPath
+                                : QueryObjectTypes.QEnumCollectionPath
+                            : isNumericEnum
+                                ? QueryObjectTypes.QNumericEnumPath
+                                : QueryObjectTypes.QEnumPath,
+                        qObject: isCollection
+                            ? isNumericEnum
+                                ? QueryObjectTypes.QNumericEnumCollection
+                                : QueryObjectTypes.QEnumCollection
+                            : undefined,
                         qParam: isNumericEnum ? "QNumericEnumParam" : "QEnumParam",
                     };
                 }
                 // handling of complex & entity types
                 else {
-                    const entityConfig = modelType === "ComplexType" /* DataTypes.ComplexType */
+                    const entityConfig = isComplexType
                         ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)
                         : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);
                     const typeName = (_b = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) !== null && _b !== void 0 ? _b : odataDataType;
                     result = {
                         dataType: modelType,
                         type: this.namingHelper.getModelName(typeName),
-                        qPath: "QEntityPath",
+                        qPath: isCollection
+                            ? isComplexType
+                                ? QueryObjectTypes.QComplexCollectionPath
+                                : QueryObjectTypes.QEntityCollectionPath
+                            : isComplexType
+                                ? QueryObjectTypes.QComplexPath
+                                : QueryObjectTypes.QEntityPath,
                         qObject: this.namingHelper.getQName(typeName),
                         qParam: "QComplexParam",
                     };
@@ -82,7 +100,7 @@ export class Digester {
                     dataType: "PrimitiveType" /* DataTypes.PrimitiveType */,
                     type,
                     typeModule,
-                    qPath,
+                    qPath: isCollection ? QueryObjectTypes.QCollectionPath : qPath,
                     qParam,
                     qObject: isCollection ? qCollection : undefined,
                     converters,

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

@@ -1 +1 @@
-{"version":3,"file":"DataModelDigestion.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestion.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\nimport type { DigestionOptions } from \"../FactoryFunctionModel.js\";\nimport {\n  ComplexTypeGenerationOptions,\n  EntityTypeGenerationOptions,\n  Modes,\n  PropertyGenerationOptions,\n} from \"../OptionModel.js\";\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel.js\";\nimport {\n  ComplexType as ComplexModelType,\n  DataTypes,\n  EntityType as EntityModelType,\n  ODataVersion,\n  PropertyModel,\n} from \"./DataTypeModel.js\";\nimport { ComplexType, EntityType, EnumType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase.js\";\nimport { EntityContainerV3, SchemaV3 } from \"./edmx/ODataEdmxModelV3.js\";\nimport { EntityContainerV4, SchemaV4 } from \"./edmx/ODataEdmxModelV4.js\";\nimport { NamingHelper } from \"./NamingHelper.js\";\nimport { ServiceConfigHelper, WithoutName } from \"./ServiceConfigHelper.js\";\nimport { NameClashValidator } from \"./validation/NameClashValidator.js\";\nimport { NameValidator } from \"./validation/NameValidator.js\";\nimport { NoopValidator } from \"./validation/NoopValidator.js\";\n\ntype CollectorTuple = [\n  Array<PropertyModel>,\n  Array<string>,\n  { fqIdName: string; idName: string; qIdName: string; open: boolean },\n];\n\nfunction ifTrue(value: string | undefined): boolean {\n  return value === \"true\";\n}\n\nfunction ifFalse(value: string | undefined): boolean {\n  return value === \"false\";\n}\n\nexport interface TypeModel {\n  outputType: string;\n  qPath: string;\n  qCollection: string;\n  qParam: string | undefined;\n}\n\nexport abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {\n  protected static EDM_PREFIX = \"Edm.\";\n\n  protected readonly dataModel: DataModel;\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\n  protected readonly nameValidator: NameValidator;\n\n  /**\n   * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.\n   */\n  private model2Type = new Map<string, DataTypes>();\n\n  protected constructor(\n    protected version: ODataVersion,\n    protected schemas: Array<S>,\n    protected options: DigestionOptions,\n    protected namingHelper: NamingHelper,\n    converters?: MappedConverterChains,\n  ) {\n    const namespaces = schemas.map<NamespaceWithAlias>((s) => [s.$.Namespace, s.$.Alias]);\n    this.dataModel = new DataModel(namespaces, version, converters);\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\n    this.nameValidator = options.bundledFileGeneration ? new NameClashValidator(options) : new NoopValidator();\n\n    this.collectModelTypes(schemas);\n  }\n\n  private collectModelTypes(schemas: Array<S>) {\n    schemas.forEach((schema) => {\n      const { Namespace: ns, Alias: alias } = schema.$;\n\n      schema.EnumType?.forEach((et) => {\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.EnumType);\n      });\n      schema.ComplexType?.forEach((ct) => {\n        this.addModel2Type(ns, alias, ct.$.Name, DataTypes.ComplexType);\n      });\n      schema.EntityType?.forEach((et) => {\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.ModelType);\n      });\n    });\n  }\n\n  private addModel2Type(ns: string, alias: string | undefined, name: string, dt: DataTypes) {\n    this.model2Type.set(withNamespace(ns, name), dt);\n    if (alias) {\n      this.model2Type.set(withNamespace(alias, name), dt);\n    }\n  }\n\n  protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;\n\n  protected abstract digestOperations(schema: SchemaV3 | SchemaV4): void;\n\n  protected abstract digestEntityContainer(schema: SchemaV3 | SchemaV4): void;\n\n  /**\n   * Get essential infos about a given odata type from the version specific service variants.\n   *\n   * @param type\n   * @return tuple of return type, query object, query collection object\n   */\n  protected abstract mapODataType(type: string): TypeModel;\n\n  public async digest(): Promise<DataModel> {\n    this.digestEntityTypesAndOperations();\n\n    // delegate to version specific entity container digestion\n    this.schemas.forEach((schema) => this.digestEntityContainer(schema));\n\n    this.dataModel.setNameValidation(this.nameValidator.validate());\n    return this.dataModel;\n  }\n\n  private digestEntityTypesAndOperations() {\n    this.schemas.forEach((schema) => {\n      const ns: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\n\n      // type definitions: alias for primitive types\n      this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);\n\n      // enums\n      this.addEnum(ns, schema.EnumType);\n\n      // complex types\n      this.addComplexType(ns, schema.ComplexType);\n\n      // entity types\n      this.addEntityType(ns, schema.EntityType);\n\n      // V4 only: function & action types\n      this.digestOperations(schema);\n    });\n\n    this.postProcessModel();\n    this.postProcessKeys();\n\n    this.schemas.forEach((schema) => {\n      this.analyzeModelUsage(schema.EntityContainer?.length ? schema.EntityContainer[0] : undefined);\n    });\n  }\n\n  private getBaseModel(\n    entityConfig: WithoutName<EntityTypeGenerationOptions | ComplexTypeGenerationOptions> | undefined,\n    model: ComplexType,\n    namespace: string,\n    name: string,\n    fqName: string,\n  ) {\n    const odataName = model.$.Name;\n\n    // map properties respecting the config\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)].map((p) => {\n      const epConfig = entityConfig?.properties?.find((ep) => ep.name === p.$.Name);\n      return this.mapProp(p, epConfig);\n    });\n\n    // support for base types, i.e. extends clause of interfaces\n    const baseClasses = [];\n    let finalBaseClass: string | undefined = undefined;\n    if (model.$.BaseType) {\n      baseClasses.push(model.$.BaseType);\n      const [baseName, basePrefix] = this.namingHelper.getNameAndServicePrefix(model.$.BaseType);\n      const baseConfig =\n        this.serviceConfigHelper.findEntityTypeConfig([basePrefix!], baseName) ||\n        this.serviceConfigHelper.findComplexTypeConfig([basePrefix!], baseName);\n      finalBaseClass = baseConfig?.mappedName ?? baseName;\n    }\n\n    return {\n      fqName,\n      odataName,\n      name,\n      modelName: this.namingHelper.getModelName(name),\n      qName: this.namingHelper.getQName(name),\n      editableName: this.namingHelper.getEditableModelName(name),\n      serviceName: this.namingHelper.getServiceName(name),\n      serviceCollectionName: this.namingHelper.getCollectionServiceName(name),\n      folderPath: this.namingHelper.getFolderPath(namespace, name),\n      baseClasses,\n      finalBaseClass,\n      props,\n      baseProps: [], // postprocess required\n      abstract: ifTrue(model.$.Abstract),\n      open: ifTrue(model.$.OpenType),\n      genMode: Modes.qobjects,\n      subtypes: new Set(),\n    } satisfies Partial<ComplexModelType>;\n  }\n\n  private addTypeDefinition(ns: string, types: Array<TypeDefinition> | undefined) {\n    if (!types || !types.length) {\n      return;\n    }\n\n    for (const t of types) {\n      this.dataModel.addTypeDefinition(ns, t.$.Name, t.$.UnderlyingType);\n    }\n  }\n\n  private addEnum(namespace: NamespaceWithAlias, models: Array<EnumType> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const et of models) {\n      const odataName = et.$.Name;\n      const fqName = withNamespace(namespace[0], odataName);\n      const config = this.serviceConfigHelper.findEnumTypeConfig(namespace, odataName);\n      const enumName = this.nameValidator.addEnumType(fqName, config?.mappedName || odataName);\n      const filePath = this.namingHelper.getFolderPath(namespace[0], enumName);\n      this.dataModel.addEnum(namespace[0], odataName, {\n        fqName,\n        odataName,\n        name: enumName,\n        modelName: this.namingHelper.getEnumName(enumName),\n        folderPath: filePath,\n        members: et.Member?.length ? et.Member.map((m) => ({ name: m.$.Name, value: m.$.Value })) : [],\n      });\n    }\n  }\n\n  private addComplexType(namespace: NamespaceWithAlias, models: Array<ComplexType> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const model of models) {\n      const config = this.serviceConfigHelper.findComplexTypeConfig(namespace, model.$.Name);\n      const fqName = withNamespace(namespace[0], model.$.Name);\n      const name = this.nameValidator.addComplexType(fqName, config?.mappedName || model.$.Name);\n      const baseModel = this.getBaseModel(config, model, namespace[0], name, fqName);\n      this.dataModel.addComplexType(namespace[0], baseModel.odataName, baseModel);\n    }\n  }\n\n  private addEntityType(namespace: NamespaceWithAlias, models: Array<ET> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const model of models) {\n      const entityConfig = this.serviceConfigHelper.findEntityTypeConfig(namespace, model.$.Name);\n      const fqName = withNamespace(namespace[0], model.$.Name);\n      const name = this.nameValidator.addEntityType(fqName, entityConfig?.mappedName || model.$.Name);\n      const baseModel = this.getBaseModel(entityConfig, model, namespace[0], name, fqName);\n\n      // key support: we add keys from this entity,\n      // but not keys stemming from base classes (postprocess required)\n      const keyNames: Array<string> = [];\n      if (entityConfig?.keys?.length) {\n        keyNames.push(...entityConfig.keys);\n      } else {\n        const entity = model as EntityType;\n        if (entity.Key && entity.Key.length && entity.Key[0].PropertyRef.length) {\n          const propNames = entity.Key[0].PropertyRef.map((key) => key.$.Name);\n          keyNames.push(...propNames);\n        }\n      }\n\n      this.dataModel.addEntityType(namespace[0], baseModel.odataName, {\n        ...baseModel,\n        id: {\n          fqName: baseModel.fqName,\n          modelName: this.namingHelper.getIdModelName(name),\n          qName: this.namingHelper.getQIdFunctionName(name),\n        },\n        generateId: !!keyNames.length,\n        keyNames: keyNames, // postprocess required to include key specs from base classes\n        keys: [], // postprocess required to include props from base classes\n        getKeyUnion: () => keyNames.join(\" | \"),\n        subtypes: new Set(),\n      });\n    }\n  }\n\n  /**\n   * Check that models (ComplexType or EntityType) have been referenced in the API\n   * as entry point or via navProp or by virtue of being a base type or subtype of those.\n   * For these models one or two services are generated.\n   *\n   * In this way unnecessary service generation is prevented. For example, complex types that\n   * are only referenced as response of an operation do not need a generated service.\n   *\n   * @param ec\n   * @private\n   */\n  private analyzeModelUsage(ec: EntityContainerV3 | EntityContainerV4 | undefined) {\n    if (ec?.EntitySet?.length) {\n      ec.EntitySet.forEach((et) => this.analyze(et.$.EntityType));\n    }\n    const ec4 = ec as EntityContainerV4;\n    if (ec4?.Singleton?.length) {\n      ec4.Singleton.forEach((singleton) => this.analyze(singleton.$.Type));\n    }\n  }\n\n  /**\n   * Check usage of model types within API.\n   *\n   * @param fqModelName\n   * @private\n   */\n  private analyze(fqModelName: string) {\n    // to also resolve aliases the data model needs to be used\n    const model = this.dataModel.getEntityType(fqModelName) ?? this.dataModel.getComplexType(fqModelName);\n    if (!model?.fqName || model.genMode === Modes.service) {\n      return;\n    }\n\n    model.genMode = Modes.service;\n\n    if (model) {\n      // respect base classes\n      if (model.baseClasses.length) {\n        this.analyze(model.baseClasses[0]);\n      }\n      // include subtypes since each base class can be cast to its subtypes\n      model.subtypes.forEach((subtype) => {\n        this.analyze(subtype);\n      });\n      model?.props.forEach((p) => {\n        if (p.dataType === DataTypes.ComplexType || p.dataType === DataTypes.ModelType) {\n          this.analyze(p.fqType);\n        }\n      });\n    }\n  }\n\n  private postProcessModel() {\n    // complex types\n    const complexTypes = this.dataModel.getComplexTypes();\n    complexTypes.forEach((ct) => {\n      // build up set of subtypes for each complex type\n      this.addSubtypes(ct);\n\n      // get props & keys from base types\n      const [baseProps, _, baseAttributes] = this.collectBaseClassPropsAndKeys(ct, []);\n      const { open } = baseAttributes;\n      ct.baseProps = baseProps.map((bp) => ({ ...bp }));\n      if (open) {\n        ct.open = true;\n      }\n    });\n    // entity types\n    const entityTypes = this.dataModel.getEntityTypes();\n    entityTypes.forEach((et) => {\n      // build up set of subtypes for each entity type\n      this.addSubtypes(et);\n\n      // get props & keys from base types\n      const [baseProps, baseKeys, baseAttributes] = this.collectBaseClassPropsAndKeys(et, []);\n      const { fqIdName, idName, qIdName, open } = baseAttributes;\n      et.baseProps = baseProps.map((bp) => ({ ...bp }));\n\n      if (!et.keyNames.length && idName) {\n        et.id = {\n          fqName: fqIdName,\n          modelName: idName,\n          qName: qIdName,\n        };\n        et.generateId = false;\n      }\n      if (open) {\n        et.open = open;\n      }\n      et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));\n    });\n  }\n\n  private postProcessKeys() {\n    const entityTypes = this.dataModel.getEntityTypes();\n    entityTypes.forEach((et) => {\n      const isSingleKey = et.keyNames.length === 1;\n      const props = [...et.baseProps, ...et.props];\n      et.keys = et.keyNames.map((keyName) => {\n        const prop = props.find((p) => p.odataName === keyName);\n        if (!prop) {\n          throw new Error(`Key with name [${keyName}] not found in props!`);\n        }\n\n        // automatically set key prop to managed, if this is the only key of the given entity\n        if (prop.managed === undefined) {\n          prop.managed = !this.options.disableAutoManagedKey && isSingleKey;\n        }\n\n        return prop;\n      });\n    });\n  }\n\n  private collectBaseClassPropsAndKeys(model: ComplexModelType, visitedModels: string[]): CollectorTuple {\n    if (visitedModels.includes(model.fqName)) {\n      throw new Error(`Cyclic inheritance detected for model ${model.fqName}!`);\n    }\n    visitedModels.push(model.fqName);\n    return model.baseClasses.reduce(\n      ([props, keys, attributes], bc) => {\n        const baseModel = this.dataModel.getEntityType(bc) || this.dataModel.getComplexType(bc);\n        if (!baseModel) {\n          throw new Error(`BaseModel \"${bc}\" doesn't exist!`);\n        }\n\n        let { fqIdName, idName, qIdName, open } = attributes;\n\n        // recursive\n        if (baseModel.baseClasses.length) {\n          const [parentProps, parentKeys, parentAttributes] = this.collectBaseClassPropsAndKeys(\n            baseModel,\n            visitedModels,\n          );\n          props.unshift(...parentProps);\n          keys.unshift(...parentKeys);\n          if (parentAttributes?.idName) {\n            fqIdName = parentAttributes.fqIdName;\n            idName = parentAttributes.idName;\n            qIdName = parentAttributes.qIdName;\n          }\n          if (parentAttributes?.open) {\n            open = true;\n          }\n        }\n\n        props.push(...baseModel.props);\n        const entityModel = baseModel as EntityModelType;\n        if (entityModel.keyNames?.length) {\n          keys.push(...entityModel.keyNames.filter((kn) => !keys.includes(kn)));\n          fqIdName = entityModel.id.fqName;\n          idName = entityModel.id.modelName;\n          qIdName = entityModel.id.qName;\n        }\n        if (baseModel.open) {\n          open = true;\n        }\n        return [props, keys, { fqIdName, idName, qIdName, open }];\n      },\n      [[], [], { fqIdName: \"\", idName: \"\", qIdName: \"\", open: false }] as CollectorTuple,\n    );\n  }\n\n  protected mapProp = (p: Property, entityPropConfig?: PropertyGenerationOptions | undefined): PropertyModel => {\n    if (!p.$.Type) {\n      throw new Error(`No type information given for property [${p.$.Name}]!`);\n    }\n\n    const configProp = this.serviceConfigHelper.findPropConfigByName(p.$.Name);\n    const modelName = this.namingHelper.getModelPropName(\n      entityPropConfig?.mappedName || configProp?.mappedName || p.$.Name,\n    );\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\n    let odataDataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\n\n    // support for primitive type mapping\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\n      const dt = this.dataModel.getPrimitiveType(odataDataType);\n      if (dt !== undefined) {\n        odataDataType = dt;\n      }\n    }\n\n    let result: Pick<PropertyModel, \"dataType\" | \"type\" | \"typeModule\" | \"qPath\" | \"qParam\" | \"qObject\" | \"converters\">;\n\n    // domain object known from service:\n    // EntityType, ComplexType, EnumType\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\n      const modelType = this.model2Type.get(odataDataType)!;\n      const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(odataDataType);\n      const dataTypeNamespace: NamespaceWithAlias = [dataTypePrefix!];\n      if (!modelType) {\n        throw new Error(\n          `Couldn't determine model type (EntityType, ComplexType, etc) for property \"${p.$.Name}\"! Given data type: \"${odataDataType}\".`,\n        );\n      }\n\n      // special handling for enums\n      if (modelType === DataTypes.EnumType) {\n        const isNumericEnum = this.options.enumType === \"numeric\";\n        const enumConfig = this.serviceConfigHelper.findEnumTypeConfig(dataTypeNamespace, dataTypeName);\n        result = {\n          dataType: modelType,\n          type: this.namingHelper.getEnumName(enumConfig?.mappedName ?? odataDataType),\n          qPath: isNumericEnum ? \"QNumericEnumPath\" : \"QEnumPath\",\n          qObject: isCollection ? (isNumericEnum ? \"QNumericEnumCollection\" : \"QEnumCollection\") : undefined,\n          qParam: isNumericEnum ? \"QNumericEnumParam\" : \"QEnumParam\",\n        };\n      }\n      // handling of complex & entity types\n      else {\n        const entityConfig =\n          modelType === DataTypes.ComplexType\n            ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)\n            : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);\n        const typeName = entityConfig?.mappedName ?? odataDataType;\n\n        result = {\n          dataType: modelType,\n          type: this.namingHelper.getModelName(typeName),\n          qPath: \"QEntityPath\",\n          qObject: this.namingHelper.getQName(typeName),\n          qParam: \"QComplexParam\",\n        };\n      }\n    }\n    // OData built-in data types\n    else if (odataDataType.startsWith(Digester.EDM_PREFIX)) {\n      const { outputType, qPath, qParam, qCollection } = this.mapODataType(odataDataType);\n      const { to, toModule: typeModule, converters } = this.dataModel.getConverter(odataDataType) || {};\n\n      const type = !to ? outputType : to.startsWith(Digester.EDM_PREFIX) ? this.mapODataType(to).outputType : to;\n\n      result = {\n        dataType: DataTypes.PrimitiveType,\n        type,\n        typeModule,\n        qPath,\n        qParam,\n        qObject: isCollection ? qCollection : undefined,\n        converters,\n      };\n    } else {\n      throw new Error(\n        `Unknown type [${odataDataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!`,\n      );\n    }\n\n    return {\n      odataName: p.$.Name,\n      name: modelName,\n      odataType: p.$.Type,\n      fqType: odataDataType,\n      required: ifFalse(p.$.Nullable),\n      isCollection: isCollection,\n      managed: typeof entityPropConfig?.managed !== \"undefined\" ? entityPropConfig.managed : configProp?.managed,\n      ...result,\n    };\n  };\n\n  private addSubtypes(model: ComplexModelType, grandChildren = new Set<string>()) {\n    if (!model.baseClasses.length) {\n      return;\n    }\n\n    model.baseClasses.forEach((baseClass) => {\n      const baseType = this.dataModel.getModel(baseClass) as ComplexModelType;\n\n      // add subtypes & base name for q-objects\n      baseType.subtypes.add(model.fqName);\n      if (!baseType.qBaseName) {\n        baseType.qBaseName = this.namingHelper.getQBaseName(baseType.name);\n      }\n      grandChildren.forEach((gc) => baseType.subtypes.add(gc));\n\n      // recursive\n      grandChildren.add(model.fqName);\n      this.addSubtypes(baseType, grandChildren);\n    });\n  }\n}\n"]}
+{"version":3,"file":"DataModelDigestion.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestion.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\nimport type { DigestionOptions } from \"../FactoryFunctionModel.js\";\nimport {\n  ComplexTypeGenerationOptions,\n  EntityTypeGenerationOptions,\n  Modes,\n  PropertyGenerationOptions,\n} from \"../OptionModel.js\";\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel.js\";\nimport {\n  ComplexType as ComplexModelType,\n  DataTypes,\n  EntityType as EntityModelType,\n  ODataVersion,\n  PropertyModel,\n} from \"./DataTypeModel.js\";\nimport { ComplexType, EntityType, EnumType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase.js\";\nimport { EntityContainerV3, SchemaV3 } from \"./edmx/ODataEdmxModelV3.js\";\nimport { EntityContainerV4, SchemaV4 } from \"./edmx/ODataEdmxModelV4.js\";\nimport { NamingHelper } from \"./NamingHelper.js\";\nimport { QueryObjectTypes } from \"./QueryObjectTypes.js\";\nimport { ServiceConfigHelper, WithoutName } from \"./ServiceConfigHelper.js\";\nimport { NameClashValidator } from \"./validation/NameClashValidator.js\";\nimport { NameValidator } from \"./validation/NameValidator.js\";\nimport { NoopValidator } from \"./validation/NoopValidator.js\";\n\ntype CollectorTuple = [\n  Array<PropertyModel>,\n  Array<string>,\n  { fqIdName: string; idName: string; qIdName: string; open: boolean },\n];\n\nfunction ifTrue(value: string | undefined): boolean {\n  return value === \"true\";\n}\n\nfunction ifFalse(value: string | undefined): boolean {\n  return value === \"false\";\n}\n\nexport interface TypeModel {\n  outputType: string;\n  qPath: string;\n  qCollection: string;\n  qParam: string | undefined;\n}\n\nexport abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {\n  protected static EDM_PREFIX = \"Edm.\";\n\n  protected readonly dataModel: DataModel;\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\n  protected readonly nameValidator: NameValidator;\n\n  /**\n   * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.\n   */\n  private model2Type = new Map<string, DataTypes>();\n\n  protected constructor(\n    protected version: ODataVersion,\n    protected schemas: Array<S>,\n    protected options: DigestionOptions,\n    protected namingHelper: NamingHelper,\n    converters?: MappedConverterChains,\n  ) {\n    const namespaces = schemas.map<NamespaceWithAlias>((s) => [s.$.Namespace, s.$.Alias]);\n    this.dataModel = new DataModel(namespaces, version, converters);\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\n    this.nameValidator = options.bundledFileGeneration ? new NameClashValidator(options) : new NoopValidator();\n\n    this.collectModelTypes(schemas);\n  }\n\n  private collectModelTypes(schemas: Array<S>) {\n    schemas.forEach((schema) => {\n      const { Namespace: ns, Alias: alias } = schema.$;\n\n      schema.EnumType?.forEach((et) => {\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.EnumType);\n      });\n      schema.ComplexType?.forEach((ct) => {\n        this.addModel2Type(ns, alias, ct.$.Name, DataTypes.ComplexType);\n      });\n      schema.EntityType?.forEach((et) => {\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.ModelType);\n      });\n    });\n  }\n\n  private addModel2Type(ns: string, alias: string | undefined, name: string, dt: DataTypes) {\n    this.model2Type.set(withNamespace(ns, name), dt);\n    if (alias) {\n      this.model2Type.set(withNamespace(alias, name), dt);\n    }\n  }\n\n  protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;\n\n  protected abstract digestOperations(schema: SchemaV3 | SchemaV4): void;\n\n  protected abstract digestEntityContainer(schema: SchemaV3 | SchemaV4): void;\n\n  /**\n   * Get essential infos about a given odata type from the version specific service variants.\n   *\n   * @param type\n   * @return tuple of return type, query object, query collection object\n   */\n  protected abstract mapODataType(type: string): TypeModel;\n\n  public async digest(): Promise<DataModel> {\n    this.digestEntityTypesAndOperations();\n\n    // delegate to version specific entity container digestion\n    this.schemas.forEach((schema) => this.digestEntityContainer(schema));\n\n    this.dataModel.setNameValidation(this.nameValidator.validate());\n    return this.dataModel;\n  }\n\n  private digestEntityTypesAndOperations() {\n    this.schemas.forEach((schema) => {\n      const ns: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\n\n      // type definitions: alias for primitive types\n      this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);\n\n      // enums\n      this.addEnum(ns, schema.EnumType);\n\n      // complex types\n      this.addComplexType(ns, schema.ComplexType);\n\n      // entity types\n      this.addEntityType(ns, schema.EntityType);\n\n      // V4 only: function & action types\n      this.digestOperations(schema);\n    });\n\n    this.postProcessModel();\n    this.postProcessKeys();\n\n    this.schemas.forEach((schema) => {\n      this.analyzeModelUsage(schema.EntityContainer?.length ? schema.EntityContainer[0] : undefined);\n    });\n  }\n\n  private getBaseModel(\n    entityConfig: WithoutName<EntityTypeGenerationOptions | ComplexTypeGenerationOptions> | undefined,\n    model: ComplexType,\n    namespace: string,\n    name: string,\n    fqName: string,\n  ) {\n    const odataName = model.$.Name;\n\n    // map properties respecting the config\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)].map((p) => {\n      const epConfig = entityConfig?.properties?.find((ep) => ep.name === p.$.Name);\n      return this.mapProp(p, epConfig);\n    });\n\n    // support for base types, i.e. extends clause of interfaces\n    const baseClasses = [];\n    let finalBaseClass: string | undefined = undefined;\n    if (model.$.BaseType) {\n      baseClasses.push(model.$.BaseType);\n      const [baseName, basePrefix] = this.namingHelper.getNameAndServicePrefix(model.$.BaseType);\n      const baseConfig =\n        this.serviceConfigHelper.findEntityTypeConfig([basePrefix!], baseName) ||\n        this.serviceConfigHelper.findComplexTypeConfig([basePrefix!], baseName);\n      finalBaseClass = baseConfig?.mappedName ?? baseName;\n    }\n\n    return {\n      fqName,\n      odataName,\n      name,\n      modelName: this.namingHelper.getModelName(name),\n      qName: this.namingHelper.getQName(name),\n      editableName: this.namingHelper.getEditableModelName(name),\n      serviceName: this.namingHelper.getServiceName(name),\n      serviceCollectionName: this.namingHelper.getCollectionServiceName(name),\n      folderPath: this.namingHelper.getFolderPath(namespace, name),\n      baseClasses,\n      finalBaseClass,\n      props,\n      baseProps: [], // postprocess required\n      abstract: ifTrue(model.$.Abstract),\n      open: ifTrue(model.$.OpenType),\n      genMode: Modes.qobjects,\n      subtypes: new Set(),\n    } satisfies Partial<ComplexModelType>;\n  }\n\n  private addTypeDefinition(ns: string, types: Array<TypeDefinition> | undefined) {\n    if (!types || !types.length) {\n      return;\n    }\n\n    for (const t of types) {\n      this.dataModel.addTypeDefinition(ns, t.$.Name, t.$.UnderlyingType);\n    }\n  }\n\n  private addEnum(namespace: NamespaceWithAlias, models: Array<EnumType> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const et of models) {\n      const odataName = et.$.Name;\n      const fqName = withNamespace(namespace[0], odataName);\n      const config = this.serviceConfigHelper.findEnumTypeConfig(namespace, odataName);\n      const enumName = this.nameValidator.addEnumType(fqName, config?.mappedName || odataName);\n      const filePath = this.namingHelper.getFolderPath(namespace[0], enumName);\n      this.dataModel.addEnum(namespace[0], odataName, {\n        fqName,\n        odataName,\n        name: enumName,\n        modelName: this.namingHelper.getEnumName(enumName),\n        folderPath: filePath,\n        members: et.Member?.length ? et.Member.map((m) => ({ name: m.$.Name, value: m.$.Value })) : [],\n      });\n    }\n  }\n\n  private addComplexType(namespace: NamespaceWithAlias, models: Array<ComplexType> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const model of models) {\n      const config = this.serviceConfigHelper.findComplexTypeConfig(namespace, model.$.Name);\n      const fqName = withNamespace(namespace[0], model.$.Name);\n      const name = this.nameValidator.addComplexType(fqName, config?.mappedName || model.$.Name);\n      const baseModel = this.getBaseModel(config, model, namespace[0], name, fqName);\n      this.dataModel.addComplexType(namespace[0], baseModel.odataName, baseModel);\n    }\n  }\n\n  private addEntityType(namespace: NamespaceWithAlias, models: Array<ET> | undefined) {\n    if (!models || !models.length) {\n      return;\n    }\n\n    for (const model of models) {\n      const entityConfig = this.serviceConfigHelper.findEntityTypeConfig(namespace, model.$.Name);\n      const fqName = withNamespace(namespace[0], model.$.Name);\n      const name = this.nameValidator.addEntityType(fqName, entityConfig?.mappedName || model.$.Name);\n      const baseModel = this.getBaseModel(entityConfig, model, namespace[0], name, fqName);\n\n      // key support: we add keys from this entity,\n      // but not keys stemming from base classes (postprocess required)\n      const keyNames: Array<string> = [];\n      if (entityConfig?.keys?.length) {\n        keyNames.push(...entityConfig.keys);\n      } else {\n        const entity = model as EntityType;\n        if (entity.Key && entity.Key.length && entity.Key[0].PropertyRef.length) {\n          const propNames = entity.Key[0].PropertyRef.map((key) => key.$.Name);\n          keyNames.push(...propNames);\n        }\n      }\n\n      this.dataModel.addEntityType(namespace[0], baseModel.odataName, {\n        ...baseModel,\n        id: {\n          fqName: baseModel.fqName,\n          modelName: this.namingHelper.getIdModelName(name),\n          qName: this.namingHelper.getQIdFunctionName(name),\n        },\n        generateId: !!keyNames.length,\n        keyNames: keyNames, // postprocess required to include key specs from base classes\n        keys: [], // postprocess required to include props from base classes\n        getKeyUnion: () => keyNames.join(\" | \"),\n        subtypes: new Set(),\n      });\n    }\n  }\n\n  /**\n   * Check that models (ComplexType or EntityType) have been referenced in the API\n   * as entry point or via navProp or by virtue of being a base type or subtype of those.\n   * For these models one or two services are generated.\n   *\n   * In this way unnecessary service generation is prevented. For example, complex types that\n   * are only referenced as response of an operation do not need a generated service.\n   *\n   * @param ec\n   * @private\n   */\n  private analyzeModelUsage(ec: EntityContainerV3 | EntityContainerV4 | undefined) {\n    if (ec?.EntitySet?.length) {\n      ec.EntitySet.forEach((et) => this.analyze(et.$.EntityType));\n    }\n    const ec4 = ec as EntityContainerV4;\n    if (ec4?.Singleton?.length) {\n      ec4.Singleton.forEach((singleton) => this.analyze(singleton.$.Type));\n    }\n  }\n\n  /**\n   * Check usage of model types within API.\n   *\n   * @param fqModelName\n   * @private\n   */\n  private analyze(fqModelName: string) {\n    // to also resolve aliases the data model needs to be used\n    const model = this.dataModel.getEntityType(fqModelName) ?? this.dataModel.getComplexType(fqModelName);\n    if (!model?.fqName || model.genMode === Modes.service) {\n      return;\n    }\n\n    model.genMode = Modes.service;\n\n    if (model) {\n      // respect base classes\n      if (model.baseClasses.length) {\n        this.analyze(model.baseClasses[0]);\n      }\n      // include subtypes since each base class can be cast to its subtypes\n      model.subtypes.forEach((subtype) => {\n        this.analyze(subtype);\n      });\n      model?.props.forEach((p) => {\n        if (p.dataType === DataTypes.ComplexType || p.dataType === DataTypes.ModelType) {\n          this.analyze(p.fqType);\n        }\n      });\n    }\n  }\n\n  private postProcessModel() {\n    // complex types\n    const complexTypes = this.dataModel.getComplexTypes();\n    complexTypes.forEach((ct) => {\n      // build up set of subtypes for each complex type\n      this.addSubtypes(ct);\n\n      // get props & keys from base types\n      const [baseProps, _, baseAttributes] = this.collectBaseClassPropsAndKeys(ct, []);\n      const { open } = baseAttributes;\n      ct.baseProps = baseProps.map((bp) => ({ ...bp }));\n      if (open) {\n        ct.open = true;\n      }\n    });\n    // entity types\n    const entityTypes = this.dataModel.getEntityTypes();\n    entityTypes.forEach((et) => {\n      // build up set of subtypes for each entity type\n      this.addSubtypes(et);\n\n      // get props & keys from base types\n      const [baseProps, baseKeys, baseAttributes] = this.collectBaseClassPropsAndKeys(et, []);\n      const { fqIdName, idName, qIdName, open } = baseAttributes;\n      et.baseProps = baseProps.map((bp) => ({ ...bp }));\n\n      if (!et.keyNames.length && idName) {\n        et.id = {\n          fqName: fqIdName,\n          modelName: idName,\n          qName: qIdName,\n        };\n        et.generateId = false;\n      }\n      if (open) {\n        et.open = open;\n      }\n      et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));\n    });\n  }\n\n  private postProcessKeys() {\n    const entityTypes = this.dataModel.getEntityTypes();\n    entityTypes.forEach((et) => {\n      const isSingleKey = et.keyNames.length === 1;\n      const props = [...et.baseProps, ...et.props];\n      et.keys = et.keyNames.map((keyName) => {\n        const prop = props.find((p) => p.odataName === keyName);\n        if (!prop) {\n          throw new Error(`Key with name [${keyName}] not found in props!`);\n        }\n\n        // automatically set key prop to managed, if this is the only key of the given entity\n        if (prop.managed === undefined) {\n          prop.managed = !this.options.disableAutoManagedKey && isSingleKey;\n        }\n\n        return prop;\n      });\n    });\n  }\n\n  private collectBaseClassPropsAndKeys(model: ComplexModelType, visitedModels: string[]): CollectorTuple {\n    if (visitedModels.includes(model.fqName)) {\n      throw new Error(`Cyclic inheritance detected for model ${model.fqName}!`);\n    }\n    visitedModels.push(model.fqName);\n    return model.baseClasses.reduce(\n      ([props, keys, attributes], bc) => {\n        const baseModel = this.dataModel.getEntityType(bc) || this.dataModel.getComplexType(bc);\n        if (!baseModel) {\n          throw new Error(`BaseModel \"${bc}\" doesn't exist!`);\n        }\n\n        let { fqIdName, idName, qIdName, open } = attributes;\n\n        // recursive\n        if (baseModel.baseClasses.length) {\n          const [parentProps, parentKeys, parentAttributes] = this.collectBaseClassPropsAndKeys(\n            baseModel,\n            visitedModels,\n          );\n          props.unshift(...parentProps);\n          keys.unshift(...parentKeys);\n          if (parentAttributes?.idName) {\n            fqIdName = parentAttributes.fqIdName;\n            idName = parentAttributes.idName;\n            qIdName = parentAttributes.qIdName;\n          }\n          if (parentAttributes?.open) {\n            open = true;\n          }\n        }\n\n        props.push(...baseModel.props);\n        const entityModel = baseModel as EntityModelType;\n        if (entityModel.keyNames?.length) {\n          keys.push(...entityModel.keyNames.filter((kn) => !keys.includes(kn)));\n          fqIdName = entityModel.id.fqName;\n          idName = entityModel.id.modelName;\n          qIdName = entityModel.id.qName;\n        }\n        if (baseModel.open) {\n          open = true;\n        }\n        return [props, keys, { fqIdName, idName, qIdName, open }];\n      },\n      [[], [], { fqIdName: \"\", idName: \"\", qIdName: \"\", open: false }] as CollectorTuple,\n    );\n  }\n\n  protected mapProp = (p: Property, entityPropConfig?: PropertyGenerationOptions | undefined): PropertyModel => {\n    if (!p.$.Type) {\n      throw new Error(`No type information given for property [${p.$.Name}]!`);\n    }\n\n    const configProp = this.serviceConfigHelper.findPropConfigByName(p.$.Name);\n    const modelName = this.namingHelper.getModelPropName(\n      entityPropConfig?.mappedName || configProp?.mappedName || p.$.Name,\n    );\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\n    let odataDataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\n\n    // support for primitive type mapping\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\n      const dt = this.dataModel.getPrimitiveType(odataDataType);\n      if (dt !== undefined) {\n        odataDataType = dt;\n      }\n    }\n\n    let result: Pick<PropertyModel, \"dataType\" | \"type\" | \"typeModule\" | \"qPath\" | \"qParam\" | \"qObject\" | \"converters\">;\n\n    // domain object known from service:\n    // EntityType, ComplexType, EnumType\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\n      const modelType = this.model2Type.get(odataDataType)!;\n      const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(odataDataType);\n      const dataTypeNamespace: NamespaceWithAlias = [dataTypePrefix!];\n      const isComplexType = modelType === DataTypes.ComplexType;\n      if (!modelType) {\n        throw new Error(\n          `Couldn't determine model type (EntityType, ComplexType, etc) for property \"${p.$.Name}\"! Given data type: \"${odataDataType}\".`,\n        );\n      }\n\n      // special handling for enums\n      if (modelType === DataTypes.EnumType) {\n        const isNumericEnum = this.options.enumType === \"numeric\";\n        const enumConfig = this.serviceConfigHelper.findEnumTypeConfig(dataTypeNamespace, dataTypeName);\n        result = {\n          dataType: modelType,\n          type: this.namingHelper.getEnumName(enumConfig?.mappedName ?? odataDataType),\n          qPath: isCollection\n            ? isNumericEnum\n              ? QueryObjectTypes.QNumericEnumCollectionPath\n              : QueryObjectTypes.QEnumCollectionPath\n            : isNumericEnum\n              ? QueryObjectTypes.QNumericEnumPath\n              : QueryObjectTypes.QEnumPath,\n          qObject: isCollection\n            ? isNumericEnum\n              ? QueryObjectTypes.QNumericEnumCollection\n              : QueryObjectTypes.QEnumCollection\n            : undefined,\n          qParam: isNumericEnum ? \"QNumericEnumParam\" : \"QEnumParam\",\n        };\n      }\n      // handling of complex & entity types\n      else {\n        const entityConfig = isComplexType\n          ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)\n          : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);\n        const typeName = entityConfig?.mappedName ?? odataDataType;\n\n        result = {\n          dataType: modelType,\n          type: this.namingHelper.getModelName(typeName),\n          qPath: isCollection\n            ? isComplexType\n              ? QueryObjectTypes.QComplexCollectionPath\n              : QueryObjectTypes.QEntityCollectionPath\n            : isComplexType\n              ? QueryObjectTypes.QComplexPath\n              : QueryObjectTypes.QEntityPath,\n          qObject: this.namingHelper.getQName(typeName),\n          qParam: \"QComplexParam\",\n        };\n      }\n    }\n    // OData built-in data types\n    else if (odataDataType.startsWith(Digester.EDM_PREFIX)) {\n      const { outputType, qPath, qParam, qCollection } = this.mapODataType(odataDataType);\n      const { to, toModule: typeModule, converters } = this.dataModel.getConverter(odataDataType) || {};\n\n      const type = !to ? outputType : to.startsWith(Digester.EDM_PREFIX) ? this.mapODataType(to).outputType : to;\n\n      result = {\n        dataType: DataTypes.PrimitiveType,\n        type,\n        typeModule,\n        qPath: isCollection ? QueryObjectTypes.QCollectionPath : qPath,\n        qParam,\n        qObject: isCollection ? qCollection : undefined,\n        converters,\n      };\n    } else {\n      throw new Error(\n        `Unknown type [${odataDataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!`,\n      );\n    }\n\n    return {\n      odataName: p.$.Name,\n      name: modelName,\n      odataType: p.$.Type,\n      fqType: odataDataType,\n      required: ifFalse(p.$.Nullable),\n      isCollection: isCollection,\n      managed: typeof entityPropConfig?.managed !== \"undefined\" ? entityPropConfig.managed : configProp?.managed,\n      ...result,\n    };\n  };\n\n  private addSubtypes(model: ComplexModelType, grandChildren = new Set<string>()) {\n    if (!model.baseClasses.length) {\n      return;\n    }\n\n    model.baseClasses.forEach((baseClass) => {\n      const baseType = this.dataModel.getModel(baseClass) as ComplexModelType;\n\n      // add subtypes & base name for q-objects\n      baseType.subtypes.add(model.fqName);\n      if (!baseType.qBaseName) {\n        baseType.qBaseName = this.namingHelper.getQBaseName(baseType.name);\n      }\n      grandChildren.forEach((gc) => baseType.subtypes.add(gc));\n\n      // recursive\n      grandChildren.add(model.fqName);\n      this.addSubtypes(baseType, grandChildren);\n    });\n  }\n}\n"]}

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

@@ -0,0 +1,13 @@
+export declare enum QueryObjectTypes {
+    QEnumCollection = "QEnumCollection",
+    QNumericEnumCollection = "QNumericEnumCollection",
+    QEnumPath = "QEnumPath",
+    QEnumCollectionPath = "QEnumCollectionPath",
+    QNumericEnumPath = "QNumericEnumPath",
+    QNumericEnumCollectionPath = "QNumericEnumCollectionPath",
+    QCollectionPath = "QCollectionPath",
+    QComplexPath = "QComplexPath",
+    QEntityPath = "QEntityPath",
+    QComplexCollectionPath = "QComplexCollectionPath",
+    QEntityCollectionPath = "QEntityCollectionPath"
+}

package/lib/data-model/QueryObjectTypes.js

@@ -0,0 +1,15 @@
+export var QueryObjectTypes;
+(function (QueryObjectTypes) {
+    QueryObjectTypes["QEnumCollection"] = "QEnumCollection";
+    QueryObjectTypes["QNumericEnumCollection"] = "QNumericEnumCollection";
+    QueryObjectTypes["QEnumPath"] = "QEnumPath";
+    QueryObjectTypes["QEnumCollectionPath"] = "QEnumCollectionPath";
+    QueryObjectTypes["QNumericEnumPath"] = "QNumericEnumPath";
+    QueryObjectTypes["QNumericEnumCollectionPath"] = "QNumericEnumCollectionPath";
+    QueryObjectTypes["QCollectionPath"] = "QCollectionPath";
+    QueryObjectTypes["QComplexPath"] = "QComplexPath";
+    QueryObjectTypes["QEntityPath"] = "QEntityPath";
+    QueryObjectTypes["QComplexCollectionPath"] = "QComplexCollectionPath";
+    QueryObjectTypes["QEntityCollectionPath"] = "QEntityCollectionPath";
+})(QueryObjectTypes || (QueryObjectTypes = {}));
+//# sourceMappingURL=QueryObjectTypes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryObjectTypes.js","sourceRoot":"","sources":["../../src/data-model/QueryObjectTypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,gBAYX;AAZD,WAAY,gBAAgB;IAC1B,uDAAmC,CAAA;IACnC,qEAAiD,CAAA;IACjD,2CAAuB,CAAA;IACvB,+DAA2C,CAAA;IAC3C,yDAAqC,CAAA;IACrC,6EAAyD,CAAA;IACzD,uDAAmC,CAAA;IACnC,iDAA6B,CAAA;IAC7B,+CAA2B,CAAA;IAC3B,qEAAiD,CAAA;IACjD,mEAA+C,CAAA;AACjD,CAAC,EAZW,gBAAgB,KAAhB,gBAAgB,QAY3B","sourcesContent":["export enum QueryObjectTypes {\n  QEnumCollection = \"QEnumCollection\",\n  QNumericEnumCollection = \"QNumericEnumCollection\",\n  QEnumPath = \"QEnumPath\",\n  QEnumCollectionPath = \"QEnumCollectionPath\",\n  QNumericEnumPath = \"QNumericEnumPath\",\n  QNumericEnumCollectionPath = \"QNumericEnumCollectionPath\",\n  QCollectionPath = \"QCollectionPath\",\n  QComplexPath = \"QComplexPath\",\n  QEntityPath = \"QEntityPath\",\n  QComplexCollectionPath = \"QComplexCollectionPath\",\n  QEntityCollectionPath = \"QEntityCollectionPath\",\n}\n"]}

package/lib/defaultConfig.js

@@ -100,6 +100,7 @@ const defaultConfig = {
     },
     propertiesByName: [],
     byTypeAndName: [],
+    enableNativeInOperator: false
 };
 const { models, queryObjects, services } = defaultConfig.naming;
 const minimalNamingConfig = {

package/lib/defaultConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\nimport { NameSettings, NamingStrategies } from \"./NamingModel.js\";\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel.js\";\n\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\n/**\n * The default configuration.\n */\nconst defaultConfig: DefaultConfiguration = {\n  sourceUrlConfig: {},\n  refreshFile: false,\n  mode: Modes.all,\n  emitMode: EmitModes.js_dts,\n  debug: false,\n  prettier: false,\n  tsconfig: \"tsconfig.json\",\n  converters: [],\n  skipEditableModels: false,\n  skipIdModels: false,\n  skipOperations: false,\n  skipComments: false,\n  enablePrimitivePropertyServices: false,\n  disableAutoManagedKey: false,\n  allowRenaming: false,\n  v2ModelsWithExtraResultsWrapping: false,\n  v4BigNumberAsString: false,\n  disableAutomaticNameClashResolution: false,\n  bundledFileGeneration: true,\n  enumType: \"string\",\n  naming: {\n    models: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      editableModels: {\n        prefix: \"Editable\",\n        suffix: \"\",\n        applyModelNaming: true,\n      },\n      idModels: {\n        prefix: \"\",\n        suffix: \"Id\",\n        applyModelNaming: true,\n      },\n      operationParamModels: {\n        prefix: \"\",\n        suffix: \"Params\",\n        applyModelNaming: true,\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"\",\n        suffix: \"Model\",\n      },\n    },\n    queryObjects: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      prefix: \"Q\",\n      suffix: \"\",\n      idFunctions: {\n        prefix: \"\",\n        suffix: \"Id\",\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"Q\",\n        suffix: \"\",\n      },\n      baseType: {\n        applyQNaming: true,\n        prefix: \"\",\n        suffix: \"BaseType\",\n      },\n    },\n    services: {\n      prefix: \"\",\n      suffix: \"Service\",\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      main: {\n        applyServiceNaming: true,\n      },\n      collection: {\n        prefix: \"\",\n        suffix: \"Collection\",\n        applyServiceNaming: true,\n      },\n      operations: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n      },\n      relatedServiceGetter: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"\",\n        suffix: \"\",\n      },\n      privateProps: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"_\",\n        suffix: \"\",\n      },\n    },\n  },\n  propertiesByName: [],\n  byTypeAndName: [],\n};\n\nconst { models, queryObjects, services } = defaultConfig.naming;\nconst minimalNamingConfig: NameSettings = {\n  models: {\n    fileName: {\n      prefix: models.fileName.prefix,\n      suffix: models.fileName.suffix,\n    },\n    idModels: {\n      applyModelNaming: true,\n      prefix: models.idModels.prefix,\n      suffix: models.idModels.suffix,\n    },\n    editableModels: {\n      applyModelNaming: true,\n      prefix: models.editableModels.prefix,\n      suffix: models.editableModels.suffix,\n    },\n    operationParamModels: {\n      applyModelNaming: true,\n      prefix: models.operationParamModels.prefix,\n      suffix: models.operationParamModels.suffix,\n    },\n  },\n  queryObjects: {\n    prefix: queryObjects.prefix,\n    suffix: queryObjects.suffix,\n    fileName: {\n      prefix: queryObjects.fileName.prefix,\n      suffix: queryObjects.fileName.suffix,\n    },\n    idFunctions: {\n      prefix: queryObjects.idFunctions.prefix,\n      suffix: queryObjects.idFunctions.suffix,\n    },\n    baseType: {\n      prefix: queryObjects.baseType.prefix,\n      suffix: queryObjects.baseType.suffix,\n    },\n  },\n  services: {\n    prefix: services.prefix,\n    suffix: services.suffix,\n    main: {\n      applyServiceNaming: true,\n    },\n    collection: {\n      applyServiceNaming: true,\n      prefix: services.collection.prefix,\n      suffix: services.collection.suffix,\n    },\n    privateProps: {\n      prefix: services.privateProps.prefix,\n      suffix: services.privateProps.suffix,\n    },\n    relatedServiceGetter: {\n      prefix: services.relatedServiceGetter.prefix,\n      suffix: services.relatedServiceGetter.suffix,\n    },\n  },\n};\n\n/**\n * Creates a defensive copy of the default config.\n */\nexport function getDefaultConfig(): DefaultConfiguration {\n  return deepmerge(defaultConfig, {});\n}\n\n/**\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\n */\nexport function getMinimalConfig(): DefaultConfiguration {\n  const { naming, ...passThrough } = defaultConfig;\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\n}\n"]}
+{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\nimport { NameSettings, NamingStrategies } from \"./NamingModel.js\";\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel.js\";\n\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\n/**\n * The default configuration.\n */\nconst defaultConfig: DefaultConfiguration = {\n  sourceUrlConfig: {},\n  refreshFile: false,\n  mode: Modes.all,\n  emitMode: EmitModes.js_dts,\n  debug: false,\n  prettier: false,\n  tsconfig: \"tsconfig.json\",\n  converters: [],\n  skipEditableModels: false,\n  skipIdModels: false,\n  skipOperations: false,\n  skipComments: false,\n  enablePrimitivePropertyServices: false,\n  disableAutoManagedKey: false,\n  allowRenaming: false,\n  v2ModelsWithExtraResultsWrapping: false,\n  v4BigNumberAsString: false,\n  disableAutomaticNameClashResolution: false,\n  bundledFileGeneration: true,\n  enumType: \"string\",\n  naming: {\n    models: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      editableModels: {\n        prefix: \"Editable\",\n        suffix: \"\",\n        applyModelNaming: true,\n      },\n      idModels: {\n        prefix: \"\",\n        suffix: \"Id\",\n        applyModelNaming: true,\n      },\n      operationParamModels: {\n        prefix: \"\",\n        suffix: \"Params\",\n        applyModelNaming: true,\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"\",\n        suffix: \"Model\",\n      },\n    },\n    queryObjects: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      prefix: \"Q\",\n      suffix: \"\",\n      idFunctions: {\n        prefix: \"\",\n        suffix: \"Id\",\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"Q\",\n        suffix: \"\",\n      },\n      baseType: {\n        applyQNaming: true,\n        prefix: \"\",\n        suffix: \"BaseType\",\n      },\n    },\n    services: {\n      prefix: \"\",\n      suffix: \"Service\",\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      main: {\n        applyServiceNaming: true,\n      },\n      collection: {\n        prefix: \"\",\n        suffix: \"Collection\",\n        applyServiceNaming: true,\n      },\n      operations: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n      },\n      relatedServiceGetter: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"\",\n        suffix: \"\",\n      },\n      privateProps: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"_\",\n        suffix: \"\",\n      },\n    },\n  },\n  propertiesByName: [],\n  byTypeAndName: [],\n  enableNativeInOperator: false\n};\n\nconst { models, queryObjects, services } = defaultConfig.naming;\nconst minimalNamingConfig: NameSettings = {\n  models: {\n    fileName: {\n      prefix: models.fileName.prefix,\n      suffix: models.fileName.suffix,\n    },\n    idModels: {\n      applyModelNaming: true,\n      prefix: models.idModels.prefix,\n      suffix: models.idModels.suffix,\n    },\n    editableModels: {\n      applyModelNaming: true,\n      prefix: models.editableModels.prefix,\n      suffix: models.editableModels.suffix,\n    },\n    operationParamModels: {\n      applyModelNaming: true,\n      prefix: models.operationParamModels.prefix,\n      suffix: models.operationParamModels.suffix,\n    },\n  },\n  queryObjects: {\n    prefix: queryObjects.prefix,\n    suffix: queryObjects.suffix,\n    fileName: {\n      prefix: queryObjects.fileName.prefix,\n      suffix: queryObjects.fileName.suffix,\n    },\n    idFunctions: {\n      prefix: queryObjects.idFunctions.prefix,\n      suffix: queryObjects.idFunctions.suffix,\n    },\n    baseType: {\n      prefix: queryObjects.baseType.prefix,\n      suffix: queryObjects.baseType.suffix,\n    },\n  },\n  services: {\n    prefix: services.prefix,\n    suffix: services.suffix,\n    main: {\n      applyServiceNaming: true,\n    },\n    collection: {\n      applyServiceNaming: true,\n      prefix: services.collection.prefix,\n      suffix: services.collection.suffix,\n    },\n    privateProps: {\n      prefix: services.privateProps.prefix,\n      suffix: services.privateProps.suffix,\n    },\n    relatedServiceGetter: {\n      prefix: services.relatedServiceGetter.prefix,\n      suffix: services.relatedServiceGetter.suffix,\n    },\n  },\n};\n\n/**\n * Creates a defensive copy of the default config.\n */\nexport function getDefaultConfig(): DefaultConfiguration {\n  return deepmerge(defaultConfig, {});\n}\n\n/**\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\n */\nexport function getMinimalConfig(): DefaultConfiguration {\n  const { naming, ...passThrough } = defaultConfig;\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\n}\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -1,6 +1,7 @@
 import { ODataVersions } from "@odata2ts/odata-core";
 import { ImportDeclarationStructure, OptionalKind } from "ts-morph";
 import { DataModel } from "../data-model/DataModel.js";
+import { ComplexType } from "../data-model/DataTypeModel.js";
 import { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from "./import/ImportObjects.js";
 /**
  * Handles all the import statements for a given file.
@@ -31,6 +32,7 @@ export declare class ImportContainer {
         service: string;
     }, bundledFileGeneration: boolean, reservedNames: Array<string> | undefined);
     addCoreLib(odataVersion: ODataVersions, coreLib: CoreImports): string;
+    addFromMainQObject(name: string, isTypeOnly?: boolean): string;
     private addFromQObject;
     addQObject(qObject: QueryObjectImports | string): string;
     addQObjectType(qObject: string): string;
@@ -41,6 +43,7 @@ export declare class ImportContainer {
     private isDifferentFile;
     private addGeneratedImport;
     addGeneratedModel(fqName: string, name: string, isTypeOnly?: boolean): string;
+    addGeneratedQBaseObject(model: ComplexType, isTypeOnly?: boolean): string;
     addGeneratedQObject(fqName: string, name: string, isTypeOnly?: boolean): string;
     addGeneratedService(fqName: string, name: string): string;
     private createImportDecl;

package/lib/generator/ImportContainer.js

@@ -44,6 +44,9 @@ export class ImportContainer {
         this.libs.core.typeOnly.set(name, importName);
         return importName;
     }
+    addFromMainQObject(name, isTypeOnly = false) {
+        return this.addGeneratedImport("", this.mainFileNames.qObject, name, isTypeOnly);
+    }
     addFromQObject(name, typeOnlyImport = false) {
         const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, name);
         const imports = this.libs.qObject;
@@ -133,6 +136,14 @@ export class ImportContainer {
             return this.addGeneratedImport(folderPath, modelName, name, isTypeOnly);
         }
     }
+    addGeneratedQBaseObject(model, isTypeOnly = false) {
+        if (!model.qBaseName) {
+            throw new Error(`Model ${model.fqName} has no base type!`);
+        }
+        return this.bundledFileGeneration
+            ? this.addGeneratedImport("", this.mainFileNames.qObject, model.qBaseName, isTypeOnly)
+            : this.addGeneratedImport(model.folderPath, model.qBaseName, model.qBaseName, isTypeOnly);
+    }
     addGeneratedQObject(fqName, name, isTypeOnly = false) {
         if (this.bundledFileGeneration) {
             return this.addGeneratedImport("", this.mainFileNames.qObject, name, isTypeOnly);