@odata2ts/odata2ts 0.36.3 → 0.38.0

package/lib/data-model/validation/NoopValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"NoopValidator.js","sourceRoot":"","sources":["../../../src/data-model/validation/NoopValidator.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IACxB,qBAAqB,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAY;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,MAAc,EAAE,IAAY;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,IAAY;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,MAAc,EAAE,IAAY;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAsB,CAAC,MAAc,EAAE,IAAY;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uBAAuB,CAAC,MAAc,EAAE,IAAY;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;CACF;AApCD,sCAoCC","sourcesContent":["import { TypeModel } from \"../../TypeModel\";\r\nimport { NameValidator, ValidationError } from \"./NameValidator\";\r\n\r\nexport class NoopValidator implements NameValidator {\r\n  addBoundOperationType(bindingName: string, fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addComplexType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEntitySet(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEntityType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEnumType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addOperationImportType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addSingleton(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addUnboundOperationType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  validate(): Map<string, ValidationError[]> {\r\n    return new Map();\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"NoopValidator.js","sourceRoot":"","sources":["../../../src/data-model/validation/NoopValidator.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,aAAa;IACxB,cAAc,CAAC,MAAc,EAAE,IAAY;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,IAAY;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,MAAc,EAAE,IAAY;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAsB,CAAC,MAAc,EAAE,IAAY;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAY,EAAE,aAA6B;QACpG,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uBAAuB,CAAC,MAAc,EAAE,IAAY,EAAE,aAA6B;QACjF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;CACF","sourcesContent":["import { OperationTypes } from \"../DataTypeModel\";\r\nimport { NameValidator, ValidationError } from \"./NameValidator.js\";\r\n\r\nexport class NoopValidator implements NameValidator {\r\n  addComplexType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEntitySet(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEntityType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addEnumType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addOperationImportType(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addSingleton(fqName: string, name: string): string {\r\n    return name;\r\n  }\r\n\r\n  addBoundOperationType(bindingName: string, fqName: string, name: string, operationType: OperationTypes): string {\r\n    return name;\r\n  }\r\n\r\n  addUnboundOperationType(fqName: string, name: string, operationType: OperationTypes): string {\r\n    return name;\r\n  }\r\n\r\n  validate(): Map<string, ValidationError[]> {\r\n    return new Map();\r\n  }\r\n}\r\n"]}

package/lib/defaultConfig.d.ts

@@ -1,4 +1,4 @@
-import { RunOptions } from "./OptionModel";
+import { RunOptions } from "./OptionModel.js";
 export type DefaultConfiguration = Omit<RunOptions, "sourceUrl" | "source" | "output" | "serviceName">;
 /**
  * Creates a defensive copy of the default config.

package/lib/defaultConfig.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimalConfig = exports.getDefaultConfig = void 0;
-const tslib_1 = require("tslib");
-const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
-const NamingModel_1 = require("./NamingModel");
-const OptionModel_1 = require("./OptionModel");
+import { __rest } from "tslib";
+import deepmerge from "deepmerge";
+import { NamingStrategies } from "./NamingModel.js";
+import { EmitModes, Modes } from "./OptionModel.js";
 /**
  * The default configuration.
  */
 const defaultConfig = {
     sourceUrlConfig: {},
     refreshFile: false,
-    mode: OptionModel_1.Modes.all,
-    emitMode: OptionModel_1.EmitModes.js_dts,
+    mode: Modes.all,
+    emitMode: EmitModes.js_dts,
     debug: false,
     prettier: false,
     tsconfig: "tsconfig.json",
@@ -28,10 +25,11 @@ const defaultConfig = {
     v4BigNumberAsString: false,
     disableAutomaticNameClashResolution: false,
     bundledFileGeneration: true,
+    numericEnums: false,
     naming: {
         models: {
-            namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
-            propNamingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
+            namingStrategy: NamingStrategies.PASCAL_CASE,
+            propNamingStrategy: NamingStrategies.CAMEL_CASE,
             editableModels: {
                 prefix: "Editable",
                 suffix: "",
@@ -48,14 +46,14 @@ const defaultConfig = {
                 applyModelNaming: true,
             },
             fileName: {
-                namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
+                namingStrategy: NamingStrategies.PASCAL_CASE,
                 prefix: "",
                 suffix: "Model",
             },
         },
         queryObjects: {
-            namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
-            propNamingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
+            namingStrategy: NamingStrategies.PASCAL_CASE,
+            propNamingStrategy: NamingStrategies.CAMEL_CASE,
             prefix: "Q",
             suffix: "",
             idFunctions: {
@@ -63,7 +61,7 @@ const defaultConfig = {
                 suffix: "Id",
             },
             fileName: {
-                namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
+                namingStrategy: NamingStrategies.PASCAL_CASE,
                 prefix: "Q",
                 suffix: "",
             },
@@ -71,7 +69,7 @@ const defaultConfig = {
         services: {
             prefix: "",
             suffix: "Service",
-            namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
+            namingStrategy: NamingStrategies.PASCAL_CASE,
             main: {
                 applyServiceNaming: true,
             },
@@ -81,15 +79,15 @@ const defaultConfig = {
                 applyServiceNaming: true,
             },
             operations: {
-                namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
+                namingStrategy: NamingStrategies.CAMEL_CASE,
             },
             relatedServiceGetter: {
-                namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
+                namingStrategy: NamingStrategies.CAMEL_CASE,
                 prefix: "",
                 suffix: "",
             },
             privateProps: {
-                namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
+                namingStrategy: NamingStrategies.CAMEL_CASE,
                 prefix: "_",
                 suffix: "",
             },
@@ -157,16 +155,14 @@ const minimalNamingConfig = {
 /**
  * Creates a defensive copy of the default config.
  */
-function getDefaultConfig() {
-    return (0, deepmerge_1.default)(defaultConfig, {});
+export function getDefaultConfig() {
+    return deepmerge(defaultConfig, {});
 }
-exports.getDefaultConfig = getDefaultConfig;
 /**
  * Creates a defensive copy of the minimal config: minimal in respect to naming.
  */
-function getMinimalConfig() {
-    const { naming } = defaultConfig, passThrough = tslib_1.__rest(defaultConfig, ["naming"]);
-    return (0, deepmerge_1.default)(passThrough, { naming: minimalNamingConfig });
+export function getMinimalConfig() {
+    const { naming } = defaultConfig, passThrough = __rest(defaultConfig, ["naming"]);
+    return deepmerge(passThrough, { naming: minimalNamingConfig });
 }
-exports.getMinimalConfig = getMinimalConfig;
 //# sourceMappingURL=defaultConfig.js.map

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

package/lib/download/downloadMetadata.d.ts

@@ -1,4 +1,4 @@
-import { UrlSourceConfiguration } from "../OptionModel";
+import { UrlSourceConfiguration } from "../OptionModel.js";
 /**
  * Retrieves the metadata from the given URL using the given configuration.
  *

package/lib/download/downloadMetadata.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadMetadata = void 0;
-const tslib_1 = require("tslib");
-const axios_1 = tslib_1.__importDefault(require("axios"));
+import { __awaiter, __rest } from "tslib";
+import axios from "axios";
 const METADATA_PATH = "$metadata";
 const PWD_BLIND_TEXT = { password: "xxx hidden xxx" };
 function evaluateRequestConfig(url, config) {
@@ -24,8 +21,8 @@ function evaluateRequestConfig(url, config) {
  * @param sourceConfig
  * @param debug
  */
-function downloadMetadata(sourceUrl, sourceConfig = {}, debug = false) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+export function downloadMetadata(sourceUrl, sourceConfig = {}, debug = false) {
+    return __awaiter(this, void 0, void 0, function* () {
         // add the $metadata suffix
         const url = sourceUrl.endsWith(METADATA_PATH)
             ? sourceUrl
@@ -35,14 +32,13 @@ function downloadMetadata(sourceUrl, sourceConfig = {}, debug = false) {
         const config = evaluateRequestConfig(url, sourceConfig);
         // log request configuration without password
         if (debug) {
-            const { auth } = config, loggable = tslib_1.__rest(config, ["auth"]);
+            const { auth } = config, loggable = __rest(config, ["auth"]);
             const safeConfig = auth ? Object.assign(Object.assign({}, loggable), { auth: Object.assign(Object.assign({}, auth), (auth.password ? PWD_BLIND_TEXT : {})) }) : loggable;
             console.log(`Request configuration:`, safeConfig);
         }
         // execute the request & return response data
-        const response = yield axios_1.default.request(config);
+        const response = yield axios.request(config);
         return response.data;
     });
 }
-exports.downloadMetadata = downloadMetadata;
 //# sourceMappingURL=downloadMetadata.js.map

package/lib/download/downloadMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"downloadMetadata.js","sourceRoot":"","sources":["../../src/download/downloadMetadata.ts"],"names":[],"mappings":";;;;AAAA,0DAAkD;AAIlD,MAAM,aAAa,GAAG,WAAW,CAAC;AAClC,MAAM,cAAc,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AAEtD,SAAS,qBAAqB,CAAC,GAAW,EAAE,MAA8B;IACxE,MAAM,gBAAgB,GAAuB,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACzE,MAAM,SAAS,GAAuB,MAAM,CAAC,MAAM;QACjD,CAAC,CAAC,MAAM,CAAC,MAAM;QACf,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,KAAK,QAAQ;YAC7E,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE;YACpE,CAAC,CAAC,EAAE,CAAC;IACP,uCAAY,gBAAgB,GAAK,SAAS,EAAG;AAC/C,CAAC;AAED;;;;;;;;;GASG;AACH,SAAsB,gBAAgB,CACpC,SAAiB,EACjB,eAAuC,EAAE,EACzC,QAAiB,KAAK;;QAEtB,2BAA2B;QAC3B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC3C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAE/C,6CAA6C;QAC7C,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAExD,6CAA6C;QAC7C,IAAI,KAAK,EAAE;YACT,MAAM,EAAE,IAAI,KAAkB,MAAM,EAAnB,QAAQ,kBAAK,MAAM,EAA9B,QAAqB,CAAS,CAAC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,iCAAM,QAAQ,KAAE,IAAI,kCAAO,IAAI,GAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;YAClH,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;SACnD;QAED,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;CAAA;AAxBD,4CAwBC","sourcesContent":["import axios, { AxiosRequestConfig } from \"axios\";\r\n\r\nimport { UrlSourceConfiguration } from \"../OptionModel\";\r\n\r\nconst METADATA_PATH = \"$metadata\";\r\nconst PWD_BLIND_TEXT = { password: \"xxx hidden xxx\" };\r\n\r\nfunction evaluateRequestConfig(url: string, config: UrlSourceConfiguration): AxiosRequestConfig {\r\n  const defaultReqConfig: AxiosRequestConfig = { url: url, method: \"GET\" };\r\n  const reqConfig: AxiosRequestConfig = config.custom\r\n    ? config.custom\r\n    : typeof config.username === \"string\" && typeof config?.password === \"string\"\r\n    ? { auth: { username: config.username, password: config.password } }\r\n    : {};\r\n  return { ...defaultReqConfig, ...reqConfig };\r\n}\r\n\r\n/**\r\n * Retrieves the metadata from the given URL using the given configuration.\r\n *\r\n * Failure handling must be implemented by consumer.\r\n * Exception is thrown for failed requests (400, 401, ...).\r\n *\r\n * @param sourceUrl\r\n * @param sourceConfig\r\n * @param debug\r\n */\r\nexport async function downloadMetadata(\r\n  sourceUrl: string,\r\n  sourceConfig: UrlSourceConfiguration = {},\r\n  debug: boolean = false\r\n): Promise<string> {\r\n  // add the $metadata suffix\r\n  const url = sourceUrl.endsWith(METADATA_PATH)\r\n    ? sourceUrl\r\n    : sourceUrl + (sourceUrl.endsWith(\"/\") ? \"\" : \"/\") + METADATA_PATH;\r\n  console.log(`Reading metadata from URL:`, url);\r\n\r\n  // evaluate configured request config options\r\n  const config = evaluateRequestConfig(url, sourceConfig);\r\n\r\n  // log request configuration without password\r\n  if (debug) {\r\n    const { auth, ...loggable } = config;\r\n    const safeConfig = auth ? { ...loggable, auth: { ...auth, ...(auth.password ? PWD_BLIND_TEXT : {}) } } : loggable;\r\n    console.log(`Request configuration:`, safeConfig);\r\n  }\r\n\r\n  // execute the request & return response data\r\n  const response = await axios.request(config);\r\n  return response.data;\r\n}\r\n"]}
+{"version":3,"file":"downloadMetadata.js","sourceRoot":"","sources":["../../src/download/downloadMetadata.ts"],"names":[],"mappings":";AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAIlD,MAAM,aAAa,GAAG,WAAW,CAAC;AAClC,MAAM,cAAc,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AAEtD,SAAS,qBAAqB,CAAC,GAAW,EAAE,MAA8B;IACxE,MAAM,gBAAgB,GAAuB,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACzE,MAAM,SAAS,GAAuB,MAAM,CAAC,MAAM;QACjD,CAAC,CAAC,MAAM,CAAC,MAAM;QACf,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,KAAK,QAAQ;YAC7E,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE;YACpE,CAAC,CAAC,EAAE,CAAC;IACP,uCAAY,gBAAgB,GAAK,SAAS,EAAG;AAC/C,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAgB,gBAAgB,CACpC,SAAiB,EACjB,eAAuC,EAAE,EACzC,QAAiB,KAAK;;QAEtB,2BAA2B;QAC3B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC3C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAE/C,6CAA6C;QAC7C,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAExD,6CAA6C;QAC7C,IAAI,KAAK,EAAE;YACT,MAAM,EAAE,IAAI,KAAkB,MAAM,EAAnB,QAAQ,UAAK,MAAM,EAA9B,QAAqB,CAAS,CAAC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,iCAAM,QAAQ,KAAE,IAAI,kCAAO,IAAI,GAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;YAClH,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;SACnD;QAED,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;CAAA","sourcesContent":["import axios, { AxiosRequestConfig } from \"axios\";\r\n\r\nimport { UrlSourceConfiguration } from \"../OptionModel.js\";\r\n\r\nconst METADATA_PATH = \"$metadata\";\r\nconst PWD_BLIND_TEXT = { password: \"xxx hidden xxx\" };\r\n\r\nfunction evaluateRequestConfig(url: string, config: UrlSourceConfiguration): AxiosRequestConfig {\r\n  const defaultReqConfig: AxiosRequestConfig = { url: url, method: \"GET\" };\r\n  const reqConfig: AxiosRequestConfig = config.custom\r\n    ? config.custom\r\n    : typeof config.username === \"string\" && typeof config?.password === \"string\"\r\n    ? { auth: { username: config.username, password: config.password } }\r\n    : {};\r\n  return { ...defaultReqConfig, ...reqConfig };\r\n}\r\n\r\n/**\r\n * Retrieves the metadata from the given URL using the given configuration.\r\n *\r\n * Failure handling must be implemented by consumer.\r\n * Exception is thrown for failed requests (400, 401, ...).\r\n *\r\n * @param sourceUrl\r\n * @param sourceConfig\r\n * @param debug\r\n */\r\nexport async function downloadMetadata(\r\n  sourceUrl: string,\r\n  sourceConfig: UrlSourceConfiguration = {},\r\n  debug: boolean = false\r\n): Promise<string> {\r\n  // add the $metadata suffix\r\n  const url = sourceUrl.endsWith(METADATA_PATH)\r\n    ? sourceUrl\r\n    : sourceUrl + (sourceUrl.endsWith(\"/\") ? \"\" : \"/\") + METADATA_PATH;\r\n  console.log(`Reading metadata from URL:`, url);\r\n\r\n  // evaluate configured request config options\r\n  const config = evaluateRequestConfig(url, sourceConfig);\r\n\r\n  // log request configuration without password\r\n  if (debug) {\r\n    const { auth, ...loggable } = config;\r\n    const safeConfig = auth ? { ...loggable, auth: { ...auth, ...(auth.password ? PWD_BLIND_TEXT : {}) } } : loggable;\r\n    console.log(`Request configuration:`, safeConfig);\r\n  }\r\n\r\n  // execute the request & return response data\r\n  const response = await axios.request(config);\r\n  return response.data;\r\n}\r\n"]}

package/lib/download/index.d.ts

@@ -1,2 +1,2 @@
-export { downloadMetadata } from "./downloadMetadata";
-export { storeMetadata } from "./storeMetadata";
+export { downloadMetadata } from "./downloadMetadata.js";
+export { storeMetadata } from "./storeMetadata.js";

package/lib/download/index.js

@@ -1,8 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeMetadata = exports.downloadMetadata = void 0;
-var downloadMetadata_1 = require("./downloadMetadata");
-Object.defineProperty(exports, "downloadMetadata", { enumerable: true, get: function () { return downloadMetadata_1.downloadMetadata; } });
-var storeMetadata_1 = require("./storeMetadata");
-Object.defineProperty(exports, "storeMetadata", { enumerable: true, get: function () { return storeMetadata_1.storeMetadata; } });
+export { downloadMetadata } from "./downloadMetadata.js";
+export { storeMetadata } from "./storeMetadata.js";
 //# sourceMappingURL=index.js.map

package/lib/download/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/download/index.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA","sourcesContent":["export { downloadMetadata } from \"./downloadMetadata\";\r\nexport { storeMetadata } from \"./storeMetadata\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/download/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC","sourcesContent":["export { downloadMetadata } from \"./downloadMetadata.js\";\r\nexport { storeMetadata } from \"./storeMetadata.js\";\r\n"]}

package/lib/download/storeMetadata.js

@@ -1,10 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeMetadata = void 0;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = require("fs-extra");
-const prettier_1 = tslib_1.__importDefault(require("prettier"));
+import { __awaiter } from "tslib";
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import { mkdirp } from "mkdirp";
+import { format, resolveConfig } from "prettier";
 /**
  * Write (prettified) data to disk.
  *
@@ -12,17 +10,17 @@ const prettier_1 = tslib_1.__importDefault(require("prettier"));
  * @param metadataXml
  * @param prettify
  */
-function storeMetadata(filePath, metadataXml, prettify) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const outDir = path_1.default.dirname(filePath);
-        const prettierConfig = yield prettier_1.default.resolveConfig(outDir);
-        const prettified = prettify
-            ? prettier_1.default.format(metadataXml, Object.assign(Object.assign({ xmlWhitespaceSensitivity: "ignore" }, prettierConfig), { parser: "xml", plugins: ["@prettier/plugin-xml"] }))
-            : metadataXml;
-        yield (0, fs_extra_1.ensureDir)(outDir);
-        yield (0, fs_extra_1.writeFile)(filePath, prettified);
+export function storeMetadata(filePath, metadataXml, prettify) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const outDir = path.dirname(filePath);
+        let prettified = metadataXml;
+        if (prettify) {
+            const prettierConfig = yield resolveConfig(outDir);
+            prettified = yield format(metadataXml, Object.assign(Object.assign({}, prettierConfig), { parser: "xml", plugins: ["@prettier/plugin-xml"] }));
+        }
+        yield mkdirp(outDir);
+        yield writeFile(filePath, prettified);
         return prettified;
     });
 }
-exports.storeMetadata = storeMetadata;
 //# sourceMappingURL=storeMetadata.js.map

package/lib/download/storeMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"storeMetadata.js","sourceRoot":"","sources":["../../src/download/storeMetadata.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,uCAAgD;AAChD,gEAAgC;AAEhC;;;;;;GAMG;AACH,SAAsB,aAAa,CAAC,QAAgB,EAAE,WAAmB,EAAE,QAAiB;;QAC1F,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,QAAQ;YACzB,CAAC,CAAC,kBAAQ,CAAC,MAAM,CACb,WAAW,gCAET,wBAAwB,EAAE,QAAQ,IAAK,cAAc,KAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC1G;YACH,CAAC,CAAC,WAAW,CAAC;QAEhB,MAAM,IAAA,oBAAS,EAAC,MAAM,CAAC,CAAC;QACxB,MAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEtC,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AAhBD,sCAgBC","sourcesContent":["import path from \"path\";\r\n\r\nimport { ensureDir, writeFile } from \"fs-extra\";\r\nimport prettier from \"prettier\";\r\n\r\n/**\r\n * Write (prettified) data to disk.\r\n *\r\n * @param filePath\r\n * @param metadataXml\r\n * @param prettify\r\n */\r\nexport async function storeMetadata(filePath: string, metadataXml: string, prettify: boolean) {\r\n  const outDir = path.dirname(filePath);\r\n\r\n  const prettierConfig = await prettier.resolveConfig(outDir);\r\n  const prettified = prettify\r\n    ? prettier.format(\r\n        metadataXml,\r\n        // @ts-ignore: xmlWhitespaceSensitivity is an option of the plugin\r\n        { xmlWhitespaceSensitivity: \"ignore\", ...prettierConfig, parser: \"xml\", plugins: [\"@prettier/plugin-xml\"] }\r\n      )\r\n    : metadataXml;\r\n\r\n  await ensureDir(outDir);\r\n  await writeFile(filePath, prettified);\r\n\r\n  return prettified;\r\n}\r\n"]}
+{"version":3,"file":"storeMetadata.js","sourceRoot":"","sources":["../../src/download/storeMetadata.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,MAAM,UAAgB,aAAa,CAAC,QAAgB,EAAE,WAAmB,EAAE,QAAiB;;QAC1F,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEtC,IAAI,UAAU,GAAG,WAAW,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;YACnD,UAAU,GAAG,MAAM,MAAM,CACvB,WAAW,kCAEN,cAAc,KAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,IACtE,CAAC;SACH;QAED,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEtC,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA","sourcesContent":["import { writeFile } from \"node:fs/promises\";\r\nimport path from \"node:path\";\r\nimport { mkdirp } from \"mkdirp\";\r\nimport { format, resolveConfig } from \"prettier\";\r\n\r\n/**\r\n * Write (prettified) data to disk.\r\n *\r\n * @param filePath\r\n * @param metadataXml\r\n * @param prettify\r\n */\r\nexport async function storeMetadata(filePath: string, metadataXml: string, prettify: boolean) {\r\n  const outDir = path.dirname(filePath);\r\n\r\n  let prettified = metadataXml;\r\n  if (prettify) {\r\n    const prettierConfig = await resolveConfig(outDir);\r\n    prettified = await format(\r\n      metadataXml,\r\n      // @ts-ignore: xmlWhitespaceSensitivity is an option of the plugin\r\n      { ...prettierConfig, parser: \"xml\", plugins: [\"@prettier/plugin-xml\"] },\r\n    );\r\n  }\r\n\r\n  await mkdirp(outDir);\r\n  await writeFile(filePath, prettified);\r\n\r\n  return prettified;\r\n}\r\n"]}

package/lib/evaluateConfig.d.ts

@@ -1,4 +1,4 @@
-import { CliOptions, ConfigFileOptions, RunOptions } from "./OptionModel";
+import { CliOptions, ConfigFileOptions, RunOptions } from "./OptionModel.js";
 /**
  * Provides default values and evaluates the various config file and CLI options.
  * This function always returns a list of RunOptions,

package/lib/evaluateConfig.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateConfigOptions = void 0;
-const tslib_1 = require("tslib");
-const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
-const defaultConfig_1 = require("./defaultConfig");
-const OptionModel_1 = require("./OptionModel");
+import { __rest } from "tslib";
+import deepmerge from "deepmerge";
+import { getDefaultConfig, getMinimalConfig } from "./defaultConfig.js";
+import { Modes } from "./OptionModel.js";
 /**
  * Provides default values and evaluates the various config file and CLI options.
  * This function always returns a list of RunOptions,
@@ -28,25 +25,25 @@ const OptionModel_1 = require("./OptionModel");
  * @param cliOpts CLI passed options
  * @param configOpts config file options
  */
-function evaluateConfigOptions(cliOpts, configOpts) {
+export function evaluateConfigOptions(cliOpts, configOpts) {
     var _a;
-    const defaultConfig = ((_a = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : (0, defaultConfig_1.getDefaultConfig)();
+    const defaultConfig = ((_a = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) ? getMinimalConfig() : getDefaultConfig();
     // No config file
     if (!configOpts) {
         if (!cliOpts.source || !cliOpts.output) {
             throw new Error("Without any configuration file options --source and --output must be specified!");
         }
-        return [(0, deepmerge_1.default)(defaultConfig, cliOpts)];
+        return [deepmerge(defaultConfig, cliOpts)];
     }
-    const { services: cliServices, source, output } = cliOpts, cliBaseOpts = tslib_1.__rest(cliOpts, ["services", "source", "output"]);
-    const { services: confServices } = configOpts, confBaseOpts = tslib_1.__rest(configOpts, ["services"]);
+    const { services: cliServices, source, output } = cliOpts, cliBaseOpts = __rest(cliOpts, ["services", "source", "output"]);
+    const { services: confServices } = configOpts, confBaseOpts = __rest(configOpts, ["services"]);
     // No configurations of services in config file
     // or CLI opts specify source and output => ignore service config
     if ((source && output) || !confServices) {
         if (!source || !output) {
             throw new Error("No services were configured in config file, so options --source and --output must be specified!");
         }
-        const merged = deepmerge_1.default.all([defaultConfig, confBaseOpts, cliOpts]);
+        const merged = deepmerge.all([defaultConfig, confBaseOpts, cliOpts]);
         return [safeGuardOptions(merged)];
     }
     // Either services are specified or we use all configured services
@@ -57,25 +54,24 @@ function evaluateConfigOptions(cliOpts, configOpts) {
         if (!service) {
             throw new Error(`Specified service "${s}" doesn't exist in configuration!`);
         }
-        const serviceDefault = ((_a = service.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) && !((_b = configOpts.naming) === null || _b === void 0 ? void 0 : _b.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : defaultConfig;
-        const merged = deepmerge_1.default.all([serviceDefault, confBaseOpts, service, cliBaseOpts]);
+        const serviceDefault = ((_a = service.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) && !((_b = configOpts.naming) === null || _b === void 0 ? void 0 : _b.minimalDefaults) ? getMinimalConfig() : defaultConfig;
+        const merged = deepmerge.all([serviceDefault, confBaseOpts, service, cliBaseOpts]);
         return safeGuardOptions(merged);
     });
 }
-exports.evaluateConfigOptions = evaluateConfigOptions;
 /**
  * Make sure that some options are only active if in correct mode.
  * @param options
  */
 function safeGuardOptions(options) {
     // skip options are not valid for service generation
-    if (options.mode === OptionModel_1.Modes.service || options.mode === OptionModel_1.Modes.all) {
+    if (options.mode === Modes.service || options.mode === Modes.all) {
         options.skipEditableModels = false;
         options.skipIdModels = false;
         options.skipOperations = false;
     }
     // special option which is only valid for model generation
-    if (options.mode !== OptionModel_1.Modes.models) {
+    if (options.mode !== Modes.models) {
         options.v2ModelsWithExtraResultsWrapping = false;
     }
     return options;

package/lib/evaluateConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluateConfig.js","sourceRoot":"","sources":["../src/evaluateConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { getDefaultConfig, getMinimalConfig } from \"./defaultConfig\";\r\nimport { CliOptions, ConfigFileOptions, Modes, RunOptions } from \"./OptionModel\";\r\n\r\n/**\r\n * Provides default values and evaluates the various config file and CLI options.\r\n * This function always returns a list of RunOptions,\r\n * whereby each item represents one generation run / one service.\r\n *\r\n * Configurations are merged in the following order (last one wins):\r\n * - default values\r\n * - config file: base settings\r\n * - config file: service specific settings\r\n * - CLI options\r\n *\r\n * If the CLI options specify source and output, then the service config is completely ignored and only the\r\n * base settings are applied from the config file.\r\n *\r\n * If the CLI options do not specify source and output, but do specify services, then these services must\r\n * exist in the config file and each service must supply values for source and output as a minimum.\r\n *\r\n * If the CLI options neither entail source nor services, then at least one service must be configured in the\r\n * config file. All configured services are returned.\r\n *\r\n * @param cliOpts CLI passed options\r\n * @param configOpts config file options\r\n */\r\nexport function evaluateConfigOptions(\r\n  cliOpts: CliOptions,\r\n  configOpts: ConfigFileOptions | undefined\r\n): Array<RunOptions> {\r\n  const defaultConfig = configOpts?.naming?.minimalDefaults ? getMinimalConfig() : getDefaultConfig();\r\n  // No config file\r\n  if (!configOpts) {\r\n    if (!cliOpts.source || !cliOpts.output) {\r\n      throw new Error(\"Without any configuration file options --source and --output must be specified!\");\r\n    }\r\n    return [deepmerge(defaultConfig, cliOpts)];\r\n  }\r\n\r\n  const { services: cliServices, source, output, ...cliBaseOpts } = cliOpts;\r\n  const { services: confServices, ...confBaseOpts } = configOpts;\r\n\r\n  // No configurations of services in config file\r\n  // or CLI opts specify source and output => ignore service config\r\n  if ((source && output) || !confServices) {\r\n    if (!source || !output) {\r\n      throw new Error(\r\n        \"No services were configured in config file, so options --source and --output must be specified!\"\r\n      );\r\n    }\r\n    const merged = deepmerge.all([defaultConfig, confBaseOpts, cliOpts]) as RunOptions;\r\n    return [safeGuardOptions(merged)];\r\n  }\r\n\r\n  // Either services are specified or we use all configured services\r\n  const servicesToUse = cliServices?.length ? cliServices : Object.keys(confServices);\r\n  return servicesToUse.map((s) => {\r\n    const service = confServices[s];\r\n    if (!service) {\r\n      throw new Error(`Specified service \"${s}\" doesn't exist in configuration!`);\r\n    }\r\n    const serviceDefault =\r\n      service.naming?.minimalDefaults && !configOpts.naming?.minimalDefaults ? getMinimalConfig() : defaultConfig;\r\n    const merged = deepmerge.all([serviceDefault, confBaseOpts, service, cliBaseOpts]) as RunOptions;\r\n    return safeGuardOptions(merged);\r\n  });\r\n}\r\n\r\n/**\r\n * Make sure that some options are only active if in correct mode.\r\n * @param options\r\n */\r\nfunction safeGuardOptions(options: RunOptions): RunOptions {\r\n  // skip options are not valid for service generation\r\n  if (options.mode === Modes.service || options.mode === Modes.all) {\r\n    options.skipEditableModels = false;\r\n    options.skipIdModels = false;\r\n    options.skipOperations = false;\r\n  }\r\n  // special option which is only valid for model generation\r\n  if (options.mode !== Modes.models) {\r\n    options.v2ModelsWithExtraResultsWrapping = false;\r\n  }\r\n\r\n  return options;\r\n}\r\n"]}
+{"version":3,"file":"evaluateConfig.js","sourceRoot":"","sources":["../src/evaluateConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { getDefaultConfig, getMinimalConfig } from \"./defaultConfig.js\";\r\nimport { CliOptions, ConfigFileOptions, Modes, RunOptions } from \"./OptionModel.js\";\r\n\r\n/**\r\n * Provides default values and evaluates the various config file and CLI options.\r\n * This function always returns a list of RunOptions,\r\n * whereby each item represents one generation run / one service.\r\n *\r\n * Configurations are merged in the following order (last one wins):\r\n * - default values\r\n * - config file: base settings\r\n * - config file: service specific settings\r\n * - CLI options\r\n *\r\n * If the CLI options specify source and output, then the service config is completely ignored and only the\r\n * base settings are applied from the config file.\r\n *\r\n * If the CLI options do not specify source and output, but do specify services, then these services must\r\n * exist in the config file and each service must supply values for source and output as a minimum.\r\n *\r\n * If the CLI options neither entail source nor services, then at least one service must be configured in the\r\n * config file. All configured services are returned.\r\n *\r\n * @param cliOpts CLI passed options\r\n * @param configOpts config file options\r\n */\r\nexport function evaluateConfigOptions(\r\n  cliOpts: CliOptions,\r\n  configOpts: ConfigFileOptions | undefined\r\n): Array<RunOptions> {\r\n  const defaultConfig = configOpts?.naming?.minimalDefaults ? getMinimalConfig() : getDefaultConfig();\r\n  // No config file\r\n  if (!configOpts) {\r\n    if (!cliOpts.source || !cliOpts.output) {\r\n      throw new Error(\"Without any configuration file options --source and --output must be specified!\");\r\n    }\r\n    return [deepmerge(defaultConfig, cliOpts)];\r\n  }\r\n\r\n  const { services: cliServices, source, output, ...cliBaseOpts } = cliOpts;\r\n  const { services: confServices, ...confBaseOpts } = configOpts;\r\n\r\n  // No configurations of services in config file\r\n  // or CLI opts specify source and output => ignore service config\r\n  if ((source && output) || !confServices) {\r\n    if (!source || !output) {\r\n      throw new Error(\r\n        \"No services were configured in config file, so options --source and --output must be specified!\"\r\n      );\r\n    }\r\n    const merged = deepmerge.all([defaultConfig, confBaseOpts, cliOpts]) as RunOptions;\r\n    return [safeGuardOptions(merged)];\r\n  }\r\n\r\n  // Either services are specified or we use all configured services\r\n  const servicesToUse = cliServices?.length ? cliServices : Object.keys(confServices);\r\n  return servicesToUse.map((s) => {\r\n    const service = confServices[s];\r\n    if (!service) {\r\n      throw new Error(`Specified service \"${s}\" doesn't exist in configuration!`);\r\n    }\r\n    const serviceDefault =\r\n      service.naming?.minimalDefaults && !configOpts.naming?.minimalDefaults ? getMinimalConfig() : defaultConfig;\r\n    const merged = deepmerge.all([serviceDefault, confBaseOpts, service, cliBaseOpts]) as RunOptions;\r\n    return safeGuardOptions(merged);\r\n  });\r\n}\r\n\r\n/**\r\n * Make sure that some options are only active if in correct mode.\r\n * @param options\r\n */\r\nfunction safeGuardOptions(options: RunOptions): RunOptions {\r\n  // skip options are not valid for service generation\r\n  if (options.mode === Modes.service || options.mode === Modes.all) {\r\n    options.skipEditableModels = false;\r\n    options.skipIdModels = false;\r\n    options.skipOperations = false;\r\n  }\r\n  // special option which is only valid for model generation\r\n  if (options.mode !== Modes.models) {\r\n    options.v2ModelsWithExtraResultsWrapping = false;\r\n  }\r\n\r\n  return options;\r\n}\r\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -1,7 +1,7 @@
 import { ODataVersions } from "@odata2ts/odata-core";
 import { ImportDeclarationStructure, OptionalKind } from "ts-morph";
-import { DataModel } from "../data-model/DataModel";
-import { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from "./import/ImportObjects";
+import { DataModel } from "../data-model/DataModel.js";
+import { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from "./import/ImportObjects.js";
 /**
  * Handles all the import statements for a given file.
  *
@@ -40,7 +40,7 @@ export declare class ImportContainer {
     private pathAndFile;
     private isDifferentFile;
     private addGeneratedImport;
-    addGeneratedModel(fqName: string, name: string): string;
+    addGeneratedModel(fqName: string, name: string, isTypeOnly?: boolean): string;
     addGeneratedQObject(fqName: string, name: string, isTypeOnly?: boolean): string;
     addGeneratedService(fqName: string, name: string): string;
     private createImportDecl;

package/lib/generator/ImportContainer.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportContainer = void 0;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const odata_core_1 = require("@odata2ts/odata-core");
-const ImportObjects_1 = require("./import/ImportObjects");
-const ImportedNameValidator_1 = require("./ImportedNameValidator");
+import path from "path";
+import { ODataVersions } from "@odata2ts/odata-core";
+import { ClientApiImports, CoreImports, LIB_MODULES, ServiceImports, VERSIONED_CORE_IMPORTS, VERSIONED_SERVICE_IMPORTS, } from "./import/ImportObjects.js";
+import { ImportedNameValidator } from "./ImportedNameValidator.js";
 /**
  * Handles all the import statements for a given file.
  *
@@ -14,7 +10,7 @@ const ImportedNameValidator_1 = require("./ImportedNameValidator");
  *
  * Map<string,string>
  */
-class ImportContainer {
+export class ImportContainer {
     constructor(path, fileName, dataModel, mainFileNames, bundledFileGeneration, reservedNames) {
         this.path = path;
         this.fileName = fileName;
@@ -38,20 +34,30 @@ class ImportContainer {
             clientApi: { regular: new Map(), typeOnly: new Map() },
             service: { regular: new Map(), typeOnly: new Map() },
         };
-        this.importedNameValidator = new ImportedNameValidator_1.ImportedNameValidator(reservedNames);
+        this.importedNameValidator = new ImportedNameValidator(reservedNames);
     }
     addCoreLib(odataVersion, coreLib) {
-        const isVersioned = ImportObjects_1.VERSIONED_CORE_IMPORTS.includes(coreLib);
-        const name = ImportObjects_1.CoreImports[coreLib] + (isVersioned ? odata_core_1.ODataVersions[odataVersion] : "");
-        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.core, name);
+        const isVersioned = VERSIONED_CORE_IMPORTS.includes(coreLib);
+        const name = CoreImports[coreLib] + (isVersioned ? ODataVersions[odataVersion] : "");
+        const importName = this.importedNameValidator.validateName(LIB_MODULES.core, name);
         // TODO: currently only types are imported, however enums could potentially be imported too
         this.libs.core.typeOnly.set(name, importName);
         return importName;
     }
     addFromQObject(name, typeOnlyImport = false) {
-        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.qObject, name);
-        const imports = typeOnlyImport ? this.libs.qObject.typeOnly : this.libs.qObject.regular;
-        imports.set(name, importName);
+        const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, name);
+        const imports = this.libs.qObject;
+        if (typeOnlyImport) {
+            if (!imports.regular.has(name)) {
+                imports.typeOnly.set(name, importName);
+            }
+        }
+        else {
+            if (imports.typeOnly.has(name)) {
+                imports.typeOnly.delete(name);
+            }
+            imports.regular.set(name, importName);
+        }
         return importName;
     }
     addQObject(qObject) {
@@ -61,20 +67,21 @@ class ImportContainer {
         return this.addFromQObject(qObject, true);
     }
     addClientApi(clientApi) {
-        const name = ImportObjects_1.ClientApiImports[clientApi];
-        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.clientApi, name);
+        const name = ClientApiImports[clientApi];
+        const importName = this.importedNameValidator.validateName(LIB_MODULES.clientApi, name);
         // complete client api consists only of types
         this.libs.clientApi.typeOnly.set(name, importName);
         return importName;
     }
     addServiceObject(odataVersion, serviceObject) {
-        const isVersioned = ImportObjects_1.VERSIONED_SERVICE_IMPORTS.includes(serviceObject);
-        const name = ImportObjects_1.ServiceImports[serviceObject] + (isVersioned ? odata_core_1.ODataVersions[odataVersion] : "");
-        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.service, name);
+        const isVersioned = VERSIONED_SERVICE_IMPORTS.includes(serviceObject);
+        const name = ServiceImports[serviceObject] + (isVersioned ? ODataVersions[odataVersion] : "");
+        const importName = this.importedNameValidator.validateName(LIB_MODULES.service, name);
         // only regular imports for the service package
         this.libs.service.regular.set(name, importName);
         return importName;
     }
+    // TODO: make sure that regular imports win over additional typeOnly imports
     addCustomType(moduleName, typeName, isTypeOnly = false) {
         const importName = this.importedNameValidator.validateName(moduleName, typeName);
         const imports = isTypeOnly ? this.customTypes.typeOnly : this.customTypes.regular;
@@ -93,6 +100,7 @@ class ImportContainer {
         return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);
     }
     addGeneratedImport(folderPath, fileName, name, isTypeOnly = false) {
+        var _a, _b, _c;
         // imports are only relevant for different files
         if (!this.isDifferentFile(folderPath, fileName)) {
             return name;
@@ -100,14 +108,20 @@ class ImportContainer {
         const moduleName = this.pathAndFile(folderPath, fileName);
         const importName = this.importedNameValidator.validateName(moduleName, name);
         const imports = isTypeOnly ? this.internalImports.typeOnly : this.internalImports.regular;
+        if (isTypeOnly && ((_a = this.internalImports.regular.get(moduleName)) === null || _a === void 0 ? void 0 : _a.has(name))) {
+            return importName;
+        }
+        if (!isTypeOnly && ((_b = this.internalImports.typeOnly.get(moduleName)) === null || _b === void 0 ? void 0 : _b.has(name))) {
+            (_c = this.internalImports.typeOnly.get(moduleName)) === null || _c === void 0 ? void 0 : _c.delete(name);
+        }
         const importList = imports.get(moduleName) || new Map();
         importList.set(name, importName);
         imports.set(moduleName, importList);
         return importName;
     }
-    addGeneratedModel(fqName, name) {
+    addGeneratedModel(fqName, name, isTypeOnly = true) {
         if (this.bundledFileGeneration) {
-            return this.addGeneratedImport("", this.mainFileNames.model, name, true);
+            return this.addGeneratedImport("", this.mainFileNames.model, name, isTypeOnly);
         }
         else {
             const model = this.dataModel.getModel(fqName);
@@ -116,7 +130,7 @@ class ImportContainer {
             }
             const folderPath = model ? model.folderPath : "";
             const modelName = model ? model.modelName : this.mainFileNames.model;
-            return this.addGeneratedImport(folderPath, modelName, name, true);
+            return this.addGeneratedImport(folderPath, modelName, name, isTypeOnly);
         }
     }
     addGeneratedQObject(fqName, name, isTypeOnly = false) {
@@ -152,7 +166,7 @@ class ImportContainer {
     getImportDeclarations() {
         return [
             ...Object.entries(this.libs).reduce((result, [moduleName, toImport]) => {
-                const module = ImportObjects_1.LIB_MODULES[moduleName];
+                const module = LIB_MODULES[moduleName];
                 if (toImport.typeOnly.size) {
                     result.push(this.createImportDecl(module, toImport.typeOnly, true));
                 }
@@ -192,9 +206,8 @@ class ImportContainer {
         }));
     }
     getModuleSpecifier(filePath) {
-        const relativePath = path_1.default.relative(this.path, filePath).replaceAll(path_1.default.sep, "/");
+        const relativePath = path.relative(this.path, filePath).replaceAll(path.sep, "/");
         return !relativePath.startsWith(".") ? "./" + relativePath : relativePath;
     }
 }
-exports.ImportContainer = ImportContainer;
 //# sourceMappingURL=ImportContainer.js.map