@odata2ts/odata2ts 0.31.1 → 0.32.0

package/lib/data-model/DataModelDigestionV4.js

@@ -19,6 +19,15 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
     }
     getNavigationProps(entityType) {
         return entityType.NavigationProperty || [];
+        // .map(p => {
+        //   const entityConfig = this.serviceConfigHelper.findEntityTypeConfig()
+        //   return {
+        //     $: {
+        //       ...p.$,
+        //       Type:
+        //     }
+        //   }
+        // })
     }
     digestOperations(schema) {
         const nsWithAlias = [schema.$.Namespace, schema.$.Alias];
@@ -30,13 +39,12 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
         var _a, _b, _c, _d;
         if (schema.EntityContainer && schema.EntityContainer.length) {
             const container = schema.EntityContainer[0];
-            const namespace = schema.$.Namespace;
-            const ns = [namespace, schema.$.Alias];
+            const ecName = container.$.Name;
             (_a = container.ActionImport) === null || _a === void 0 ? void 0 : _a.forEach((actionImport) => {
                 const odataName = actionImport.$.Name;
-                const fqName = (0, DataModel_1.withNamespace)(namespace, odataName);
-                const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);
-                const opName = (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName;
+                const fqName = (0, DataModel_1.withNamespace)(ecName, odataName);
+                const opConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);
+                const opName = this.nameValidator.addOperationImportType(fqName, (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName);
                 this.dataModel.addAction(fqName, {
                     fqName,
                     name: this.namingHelper.getActionName(opName),
@@ -46,9 +54,9 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
             });
             (_b = container.FunctionImport) === null || _b === void 0 ? void 0 : _b.forEach((funcImport) => {
                 const odataName = funcImport.$.Name;
-                const fqName = (0, DataModel_1.withNamespace)(namespace, odataName);
-                const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);
-                const opName = (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName;
+                const fqName = (0, DataModel_1.withNamespace)(ecName, odataName);
+                const opConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);
+                const opName = this.nameValidator.addOperationImportType(fqName, (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName);
                 this.dataModel.addFunction(fqName, {
                     fqName,
                     odataName,
@@ -58,8 +66,10 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
                 });
             });
             (_c = container.Singleton) === null || _c === void 0 ? void 0 : _c.forEach((singleton) => {
-                const name = singleton.$.Name;
-                const fqName = (0, DataModel_1.withNamespace)(namespace, name);
+                const odataName = singleton.$.Name;
+                const fqName = (0, DataModel_1.withNamespace)(ecName, odataName);
+                const singletonConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);
+                const name = this.nameValidator.addSingleton((0, DataModel_1.withNamespace)(fqName, odataName), (singletonConfig === null || singletonConfig === void 0 ? void 0 : singletonConfig.mappedName) || odataName);
                 const navPropBindings = singleton.NavigationPropertyBinding || [];
                 const entityType = this.dataModel.getEntityType(singleton.$.Type);
                 if (!entityType) {
@@ -67,8 +77,8 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
                 }
                 this.dataModel.addSingleton(fqName, {
                     fqName,
+                    odataName,
                     name,
-                    odataName: singleton.$.Name,
                     entityType,
                     navPropBinding: navPropBindings.map((binding) => ({
                         path: this.namingHelper.stripServicePrefix(binding.$.Path),
@@ -77,8 +87,10 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
                 });
             });
             (_d = container.EntitySet) === null || _d === void 0 ? void 0 : _d.forEach((entitySet) => {
-                const name = entitySet.$.Name;
-                const fqName = (0, DataModel_1.withNamespace)(namespace, name);
+                const odataName = entitySet.$.Name;
+                const fqName = (0, DataModel_1.withNamespace)(ecName, odataName);
+                const config = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);
+                const name = this.nameValidator.addEntitySet(fqName, (config === null || config === void 0 ? void 0 : config.mappedName) || odataName);
                 const navPropBindings = entitySet.NavigationPropertyBinding || [];
                 const entityType = this.dataModel.getEntityType(entitySet.$.EntityType);
                 if (!entityType) {
@@ -86,8 +98,8 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
                 }
                 this.dataModel.addEntitySet(fqName, {
                     fqName,
+                    odataName,
                     name,
-                    odataName: entitySet.$.Name,
                     entityType,
                     navPropBinding: navPropBindings.map((binding) => ({
                         path: this.namingHelper.stripServicePrefix(binding.$.Path),
@@ -188,19 +200,21 @@ class DigesterV4 extends DataModelDigestion_1.Digester {
         operations.forEach((op) => {
             var _a, _b, _c, _d;
             const odataName = op.$.Name;
+            const isBound = op.$.IsBound === "true";
             const fqName = (0, DataModel_1.withNamespace)(namespace, odataName);
-            const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);
-            const opName = (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName;
+            const opConfig = this.serviceConfigHelper.findOperationTypeConfig(ns, odataName);
             const params = (_b = (_a = op.Parameter) === null || _a === void 0 ? void 0 : _a.map((p) => this.mapProp(p))) !== null && _b !== void 0 ? _b : [];
             const returnType = (_c = op.ReturnType) === null || _c === void 0 ? void 0 : _c.map((rt) => {
                 return this.mapProp(Object.assign(Object.assign({}, rt), { $: Object.assign({ Name: "NO_NAME_BECAUSE_RETURN_TYPE" }, rt.$) }));
             })[0];
-            const isBound = op.$.IsBound === "true";
             if (isBound && !params.length) {
                 throw new Error(`IllegalState: Operation '${odataName}' is bound, but has no parameters!`);
             }
             const bindingProp = isBound ? params.shift() : undefined;
             const bindingEntityName = bindingProp ? (_d = this.dataModel.getModel(bindingProp.fqType)) === null || _d === void 0 ? void 0 : _d.name : undefined;
+            const opName = bindingEntityName
+                ? this.nameValidator.addBoundOperationType(bindingEntityName, fqName, (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName)
+                : this.nameValidator.addUnboundOperationType(fqName, (opConfig === null || opConfig === void 0 ? void 0 : opConfig.mappedName) || odataName);
             const name = type === "Function" /* OperationTypes.Function */
                 ? this.namingHelper.getFunctionName(opName)
                 : this.namingHelper.getActionName(opName);

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

@@ -1 +1 @@
-{"version":3,"file":"DataModelDigestionV4.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestionV4.ts"],"names":[],"mappings":";;;;AAAA,mEAAoF;AACpF,qDAAmE;AAGnE,2CAAgE;AAChE,6DAA2D;AAC3D,mDAA6F;AAKtF,MAAM,MAAM,GAA+B,CAAO,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;IACzF,MAAM,UAAU,GAAG,MAAM,IAAA,kCAAc,EAAC,0BAAa,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAC5E,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;AAC3B,CAAC,CAAA,CAAC;AALW,QAAA,MAAM,UAKjB;AAEF,MAAM,UAAW,SAAQ,6BAA+C;IACtE,YACE,OAAwB,EACxB,OAAyB,EACzB,YAA0B,EAC1B,UAAkC;QAElC,KAAK,CAAC,4BAAY,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC;IAES,kBAAkB,CAAC,UAAsC;QACjE,OAAQ,UAA2B,CAAC,kBAAkB,IAAI,EAAE,CAAC;IAC/D,CAAC;IAES,gBAAgB,CAAC,MAAgB;QACzC,MAAM,WAAW,GAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7E,sBAAsB;QACtB,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,2CAA0B,CAAC;QAC1E,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,uCAAwB,CAAC;IACxE,CAAC;IAES,qBAAqB,CAAC,MAAgB;;QAC9C,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACrC,MAAM,EAAE,GAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAE3D,MAAA,SAAS,CAAC,YAAY,0CAAE,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;gBACtC,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnF,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,KAAI,SAAS,CAAC;gBAEjD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE;oBAC/B,MAAM;oBACN,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;oBAC7C,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI;oBAC9B,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM;iBACjC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAA,SAAS,CAAC,cAAc,0CAAE,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpC,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnF,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,KAAI,SAAS,CAAC;gBAEjD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE;oBACjC,MAAM;oBACN,SAAS;oBACT,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC;oBAC/C,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ;oBAChC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS;iBAClC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAA,SAAS,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC9C,MAAM,eAAe,GAAG,SAAS,CAAC,yBAAyB,IAAI,EAAE,CAAC;gBAClE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClE,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,gBAAgB,SAAS,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC;iBACjE;gBAED,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE;oBAClC,MAAM;oBACN,IAAI;oBACJ,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI;oBAC3B,UAAU;oBACV,cAAc,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBAChD,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;wBAC1D,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM;qBACzB,CAAC,CAAC;iBACJ,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAA,SAAS,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC9C,MAAM,eAAe,GAAG,SAAS,CAAC,yBAAyB,IAAI,EAAE,CAAC;gBAClE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBACxE,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,gBAAgB,SAAS,CAAC,CAAC,CAAC,UAAU,cAAc,CAAC,CAAC;iBACvE;gBAED,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE;oBAClC,MAAM;oBACN,IAAI;oBACJ,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI;oBAC3B,UAAU;oBACV,cAAc,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBAChD,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;wBAC1D,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM;qBACzB,CAAC,CAAC;iBACJ,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAES,YAAY,CAAC,IAAY;QACjC,QAAQ,IAAI,EAAE;YACZ,KAAK,yBAAY,CAAC,OAAO;gBACvB,OAAO;oBACL,UAAU,EAAE,SAAS;oBACrB,KAAK,EAAE,cAAc;oBACrB,WAAW,EAAE,oBAAoB;oBACjC,MAAM,EAAE,eAAe;iBACxB,CAAC;YACJ,KAAK,yBAAY,CAAC,KAAK,CAAC;YACxB,KAAK,yBAAY,CAAC,OAAO;gBACvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;oBACpC,OAAO;wBACL,UAAU,EAAE,QAAQ;wBACpB,KAAK,EAAE,gBAAgB;wBACvB,WAAW,EAAE,sBAAsB;wBACnC,MAAM,EAAE,iBAAiB;qBAC1B,CAAC;iBACH;YACH,iCAAiC;YACjC,KAAK,yBAAY,CAAC,IAAI,CAAC;YACvB,KAAK,yBAAY,CAAC,KAAK,CAAC;YACxB,KAAK,yBAAY,CAAC,KAAK,CAAC;YACxB,KAAK,yBAAY,CAAC,KAAK,CAAC;YACxB,KAAK,yBAAY,CAAC,MAAM,CAAC;YACzB,KAAK,yBAAY,CAAC,MAAM;gBACtB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,mBAAmB;oBAChC,MAAM,EAAE,cAAc;iBACvB,CAAC;YACJ,KAAK,yBAAY,CAAC,MAAM;gBACtB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,mBAAmB;oBAChC,MAAM,EAAE,cAAc;iBACvB,CAAC;YACJ,KAAK,yBAAY,CAAC,IAAI;gBACpB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,WAAW;oBAClB,WAAW,EAAE,iBAAiB;oBAC9B,MAAM,EAAE,YAAY;iBACrB,CAAC;YACJ,KAAK,yBAAY,CAAC,SAAS;gBACzB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,gBAAgB;oBACvB,WAAW,EAAE,sBAAsB;oBACnC,MAAM,EAAE,iBAAiB;iBAC1B,CAAC;YACJ,KAAK,yBAAY,CAAC,cAAc;gBAC9B,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,qBAAqB;oBAC5B,WAAW,EAAE,2BAA2B;oBACxC,MAAM,EAAE,sBAAsB;iBAC/B,CAAC;YACJ,KAAK,yBAAY,CAAC,MAAM;gBACtB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,mBAAmB;oBAChC,MAAM,EAAE,SAAS;iBAClB,CAAC;YACJ,KAAK,yBAAY,CAAC,IAAI;gBACpB,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,WAAW;oBAClB,WAAW,EAAE,iBAAiB;oBAC9B,MAAM,EAAE,YAAY;iBACrB,CAAC;YACJ;gBACE,OAAO;oBACL,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,mBAAmB;oBAChC,MAAM,EAAE,SAAS;iBAClB,CAAC;SACL;IACH,CAAC;IAEO,aAAa,CAAC,EAAsB,EAAE,UAAwC,EAAE,IAAoB;QAC1G,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACrC,OAAO;SACR;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;;YACxB,MAAM,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YACnF,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,KAAI,SAAS,CAAC;YACjD,MAAM,MAAM,GAAyB,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;YACrF,MAAM,UAAU,GAA8B,MAAA,EAAE,CAAC,UAAU,0CAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBACtE,OAAO,IAAI,CAAC,OAAO,iCAAM,EAAE,KAAE,CAAC,kBAAI,IAAI,EAAE,6BAA6B,IAAK,EAAE,CAAC,CAAC,KAAK,CAAC;YACtF,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,MAAM,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC;YAExC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,oCAAoC,CAAC,CAAC;aAC5F;YAED,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACzD,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAY,CAAC,MAAM,CAAC,0CAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAEvG,MAAM,IAAI,GACR,IAAI,6CAA4B;gBAC9B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,KAAK,GACT,IAAI,6CAA4B;gBAC9B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAC/D,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;YAClE,MAAM,MAAM,GAAkB;gBAC5B,MAAM;gBACN,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gBACvC,IAAI;gBACJ,KAAK;gBACL,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBACzF,IAAI;gBACJ,UAAU,EAAE,MAAM;gBAClB,UAAU;aACX,CAAC;YAEF,IAAI,WAAW,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtE;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;aAC3D;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { MappedConverterChains, loadConverters } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV4, ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { DigesterFunction, DigestionOptions } from \"../FactoryFunctionModel\";\r\nimport { NamespaceWithAlias, withNamespace } from \"./DataModel\";\r\nimport { Digester, TypeModel } from \"./DataModelDigestion\";\r\nimport { ODataVersion, OperationType, OperationTypes, PropertyModel } from \"./DataTypeModel\";\r\nimport { ComplexType, Property } from \"./edmx/ODataEdmxModelBase\";\r\nimport { ComplexTypeV4, EntityTypeV4, Operation, SchemaV4 } from \"./edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./NamingHelper\";\r\n\r\nexport const digest: DigesterFunction<SchemaV4> = async (schemas, options, namingHelper) => {\r\n  const converters = await loadConverters(ODataVersions.V2, options.converters);\r\n\r\n  const digester = new DigesterV4(schemas, options, namingHelper, converters);\r\n  return digester.digest();\r\n};\r\n\r\nclass DigesterV4 extends Digester<SchemaV4, EntityTypeV4, ComplexTypeV4> {\r\n  constructor(\r\n    schemas: Array<SchemaV4>,\r\n    options: DigestionOptions,\r\n    namingHelper: NamingHelper,\r\n    converters?: MappedConverterChains\r\n  ) {\r\n    super(ODataVersion.V4, schemas, options, namingHelper, converters);\r\n  }\r\n\r\n  protected getNavigationProps(entityType: ComplexType | EntityTypeV4): Array<Property> {\r\n    return (entityType as EntityTypeV4).NavigationProperty || [];\r\n  }\r\n\r\n  protected digestOperations(schema: SchemaV4) {\r\n    const nsWithAlias: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\r\n    // functions & actions\r\n    this.addOperations(nsWithAlias, schema.Function, OperationTypes.Function);\r\n    this.addOperations(nsWithAlias, schema.Action, OperationTypes.Action);\r\n  }\r\n\r\n  protected digestEntityContainer(schema: SchemaV4) {\r\n    if (schema.EntityContainer && schema.EntityContainer.length) {\r\n      const container = schema.EntityContainer[0];\r\n      const namespace = schema.$.Namespace;\r\n      const ns: NamespaceWithAlias = [namespace, schema.$.Alias];\r\n\r\n      container.ActionImport?.forEach((actionImport) => {\r\n        const odataName = actionImport.$.Name;\r\n        const fqName = withNamespace(namespace, odataName);\r\n        const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);\r\n        const opName = opConfig?.mappedName || odataName;\r\n\r\n        this.dataModel.addAction(fqName, {\r\n          fqName,\r\n          name: this.namingHelper.getActionName(opName),\r\n          odataName: actionImport.$.Name,\r\n          operation: actionImport.$.Action,\r\n        });\r\n      });\r\n\r\n      container.FunctionImport?.forEach((funcImport) => {\r\n        const odataName = funcImport.$.Name;\r\n        const fqName = withNamespace(namespace, odataName);\r\n        const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);\r\n        const opName = opConfig?.mappedName || odataName;\r\n\r\n        this.dataModel.addFunction(fqName, {\r\n          fqName,\r\n          odataName,\r\n          name: this.namingHelper.getFunctionName(opName),\r\n          operation: funcImport.$.Function,\r\n          entitySet: funcImport.$.EntitySet,\r\n        });\r\n      });\r\n\r\n      container.Singleton?.forEach((singleton) => {\r\n        const name = singleton.$.Name;\r\n        const fqName = withNamespace(namespace, name);\r\n        const navPropBindings = singleton.NavigationPropertyBinding || [];\r\n        const entityType = this.dataModel.getEntityType(singleton.$.Type);\r\n        if (!entityType) {\r\n          throw new Error(`Entity type \"${singleton.$.Type}\" not found!`);\r\n        }\r\n\r\n        this.dataModel.addSingleton(fqName, {\r\n          fqName,\r\n          name,\r\n          odataName: singleton.$.Name,\r\n          entityType,\r\n          navPropBinding: navPropBindings.map((binding) => ({\r\n            path: this.namingHelper.stripServicePrefix(binding.$.Path),\r\n            target: binding.$.Target,\r\n          })),\r\n        });\r\n      });\r\n\r\n      container.EntitySet?.forEach((entitySet) => {\r\n        const name = entitySet.$.Name;\r\n        const fqName = withNamespace(namespace, name);\r\n        const navPropBindings = entitySet.NavigationPropertyBinding || [];\r\n        const entityType = this.dataModel.getEntityType(entitySet.$.EntityType);\r\n        if (!entityType) {\r\n          throw new Error(`Entity type \"${entitySet.$.EntityType}\" not found!`);\r\n        }\r\n\r\n        this.dataModel.addEntitySet(fqName, {\r\n          fqName,\r\n          name,\r\n          odataName: entitySet.$.Name,\r\n          entityType,\r\n          navPropBinding: navPropBindings.map((binding) => ({\r\n            path: this.namingHelper.stripServicePrefix(binding.$.Path),\r\n            target: binding.$.Target,\r\n          })),\r\n        });\r\n      });\r\n    }\r\n  }\r\n\r\n  protected mapODataType(type: string): TypeModel {\r\n    switch (type) {\r\n      case ODataTypesV4.Boolean:\r\n        return {\r\n          outputType: \"boolean\",\r\n          qPath: \"QBooleanPath\",\r\n          qCollection: \"QBooleanCollection\",\r\n          qParam: \"QBooleanParam\",\r\n        };\r\n      case ODataTypesV4.Int64:\r\n      case ODataTypesV4.Decimal:\r\n        if (this.options.v4BigNumberAsString) {\r\n          return {\r\n            outputType: \"string\",\r\n            qPath: \"QBigNumberPath\",\r\n            qCollection: \"QBigNumberCollection\",\r\n            qParam: \"QBigNumberParam\",\r\n          };\r\n        }\r\n      // yes, intentional fall through!\r\n      case ODataTypesV4.Byte:\r\n      case ODataTypesV4.SByte:\r\n      case ODataTypesV4.Int16:\r\n      case ODataTypesV4.Int32:\r\n      case ODataTypesV4.Single:\r\n      case ODataTypesV4.Double:\r\n        return {\r\n          outputType: \"number\",\r\n          qPath: \"QNumberPath\",\r\n          qCollection: \"QNumberCollection\",\r\n          qParam: \"QNumberParam\",\r\n        };\r\n      case ODataTypesV4.String:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QStringPath\",\r\n          qCollection: \"QStringCollection\",\r\n          qParam: \"QStringParam\",\r\n        };\r\n      case ODataTypesV4.Date:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QDatePath\",\r\n          qCollection: \"QDateCollection\",\r\n          qParam: \"QDateParam\",\r\n        };\r\n      case ODataTypesV4.TimeOfDay:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QTimeOfDayPath\",\r\n          qCollection: \"QTimeOfDayCollection\",\r\n          qParam: \"QTimeOfDayParam\",\r\n        };\r\n      case ODataTypesV4.DateTimeOffset:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QDateTimeOffsetPath\",\r\n          qCollection: \"QDateTimeOffsetCollection\",\r\n          qParam: \"QDateTimeOffsetParam\",\r\n        };\r\n      case ODataTypesV4.Binary:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QBinaryPath\",\r\n          qCollection: \"QBinaryCollection\",\r\n          qParam: undefined,\r\n        };\r\n      case ODataTypesV4.Guid:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QGuidPath\",\r\n          qCollection: \"QGuidCollection\",\r\n          qParam: \"QGuidParam\",\r\n        };\r\n      default:\r\n        return {\r\n          outputType: \"string\",\r\n          qPath: \"QStringPath\",\r\n          qCollection: \"QStringCollection\",\r\n          qParam: undefined,\r\n        };\r\n    }\r\n  }\r\n\r\n  private addOperations(ns: NamespaceWithAlias, operations: Array<Operation> | undefined, type: OperationTypes) {\r\n    const [namespace] = ns;\r\n    if (!operations || !operations.length) {\r\n      return;\r\n    }\r\n\r\n    operations.forEach((op) => {\r\n      const odataName = op.$.Name;\r\n      const fqName = withNamespace(namespace, odataName);\r\n      const opConfig = this.serviceConfigHelper.findOperationConfigByName(ns, odataName);\r\n      const opName = opConfig?.mappedName || odataName;\r\n      const params: Array<PropertyModel> = op.Parameter?.map((p) => this.mapProp(p)) ?? [];\r\n      const returnType: PropertyModel | undefined = op.ReturnType?.map((rt) => {\r\n        return this.mapProp({ ...rt, $: { Name: \"NO_NAME_BECAUSE_RETURN_TYPE\", ...rt.$ } });\r\n      })[0];\r\n      const isBound = op.$.IsBound === \"true\";\r\n\r\n      if (isBound && !params.length) {\r\n        throw new Error(`IllegalState: Operation '${odataName}' is bound, but has no parameters!`);\r\n      }\r\n\r\n      const bindingProp = isBound ? params.shift() : undefined;\r\n      const bindingEntityName = bindingProp ? this.dataModel.getModel(bindingProp!.fqType)?.name : undefined;\r\n\r\n      const name =\r\n        type === OperationTypes.Function\r\n          ? this.namingHelper.getFunctionName(opName)\r\n          : this.namingHelper.getActionName(opName);\r\n      const qName =\r\n        type === OperationTypes.Function\r\n          ? this.namingHelper.getQFunctionName(opName, bindingEntityName)\r\n          : this.namingHelper.getQActionName(opName, bindingEntityName);\r\n      const opType: OperationType = {\r\n        fqName,\r\n        odataName: isBound ? fqName : odataName,\r\n        name,\r\n        qName,\r\n        paramsModelName: this.namingHelper.getOperationParamsModelName(opName, bindingEntityName),\r\n        type,\r\n        parameters: params,\r\n        returnType,\r\n      };\r\n\r\n      if (bindingProp) {\r\n        this.dataModel.addBoundOperationType(namespace, bindingProp, opType);\r\n      } else {\r\n        this.dataModel.addUnboundOperationType(namespace, opType);\r\n      }\r\n    });\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"DataModelDigestionV4.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestionV4.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains, loadConverters } from \"@odata2ts/converter-runtime\";\nimport { ODataTypesV4, ODataVersions } from \"@odata2ts/odata-core\";\n\nimport { DigesterFunction, DigestionOptions } from \"../FactoryFunctionModel\";\nimport { NamespaceWithAlias, withNamespace } from \"./DataModel\";\nimport { Digester, TypeModel } from \"./DataModelDigestion\";\nimport { ODataVersion, OperationType, OperationTypes, PropertyModel } from \"./DataTypeModel\";\nimport { ComplexType, Property } from \"./edmx/ODataEdmxModelBase\";\nimport { ComplexTypeV4, EntityTypeV4, Operation, SchemaV4 } from \"./edmx/ODataEdmxModelV4\";\nimport { NamingHelper } from \"./NamingHelper\";\n\nexport const digest: DigesterFunction<SchemaV4> = async (schemas, options, namingHelper) => {\n  const converters = await loadConverters(ODataVersions.V2, options.converters);\n\n  const digester = new DigesterV4(schemas, options, namingHelper, converters);\n  return digester.digest();\n};\n\nclass DigesterV4 extends Digester<SchemaV4, EntityTypeV4, ComplexTypeV4> {\n  constructor(\n    schemas: Array<SchemaV4>,\n    options: DigestionOptions,\n    namingHelper: NamingHelper,\n    converters?: MappedConverterChains\n  ) {\n    super(ODataVersion.V4, schemas, options, namingHelper, converters);\n  }\n\n  protected getNavigationProps(entityType: ComplexType | EntityTypeV4): Array<Property> {\n    return (entityType as EntityTypeV4).NavigationProperty || [];\n    // .map(p => {\n    //   const entityConfig = this.serviceConfigHelper.findEntityTypeConfig()\n    //   return {\n    //     $: {\n    //       ...p.$,\n    //       Type:\n    //     }\n    //   }\n    // })\n  }\n\n  protected digestOperations(schema: SchemaV4) {\n    const nsWithAlias: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\n    // functions & actions\n    this.addOperations(nsWithAlias, schema.Function, OperationTypes.Function);\n    this.addOperations(nsWithAlias, schema.Action, OperationTypes.Action);\n  }\n\n  protected digestEntityContainer(schema: SchemaV4) {\n    if (schema.EntityContainer && schema.EntityContainer.length) {\n      const container = schema.EntityContainer[0];\n\n      const ecName = container.$.Name;\n\n      container.ActionImport?.forEach((actionImport) => {\n        const odataName = actionImport.$.Name;\n        const fqName = withNamespace(ecName, odataName);\n        const opConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);\n        const opName = this.nameValidator.addOperationImportType(fqName, opConfig?.mappedName || odataName);\n\n        this.dataModel.addAction(fqName, {\n          fqName,\n          name: this.namingHelper.getActionName(opName),\n          odataName: actionImport.$.Name,\n          operation: actionImport.$.Action,\n        });\n      });\n\n      container.FunctionImport?.forEach((funcImport) => {\n        const odataName = funcImport.$.Name;\n        const fqName = withNamespace(ecName, odataName);\n        const opConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);\n        const opName = this.nameValidator.addOperationImportType(fqName, opConfig?.mappedName || odataName);\n\n        this.dataModel.addFunction(fqName, {\n          fqName,\n          odataName,\n          name: this.namingHelper.getFunctionName(opName),\n          operation: funcImport.$.Function,\n          entitySet: funcImport.$.EntitySet,\n        });\n      });\n\n      container.Singleton?.forEach((singleton) => {\n        const odataName = singleton.$.Name;\n        const fqName = withNamespace(ecName, odataName);\n        const singletonConfig = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);\n        const name = this.nameValidator.addSingleton(\n          withNamespace(fqName, odataName),\n          singletonConfig?.mappedName || odataName\n        );\n        const navPropBindings = singleton.NavigationPropertyBinding || [];\n        const entityType = this.dataModel.getEntityType(singleton.$.Type);\n        if (!entityType) {\n          throw new Error(`Entity type \"${singleton.$.Type}\" not found!`);\n        }\n\n        this.dataModel.addSingleton(fqName, {\n          fqName,\n          odataName,\n          name,\n          entityType,\n          navPropBinding: navPropBindings.map((binding) => ({\n            path: this.namingHelper.stripServicePrefix(binding.$.Path),\n            target: binding.$.Target,\n          })),\n        });\n      });\n\n      container.EntitySet?.forEach((entitySet) => {\n        const odataName = entitySet.$.Name;\n        const fqName = withNamespace(ecName, odataName);\n        const config = this.serviceConfigHelper.findOperationImportConfig(ecName, odataName);\n        const name = this.nameValidator.addEntitySet(fqName, config?.mappedName || odataName);\n        const navPropBindings = entitySet.NavigationPropertyBinding || [];\n        const entityType = this.dataModel.getEntityType(entitySet.$.EntityType);\n        if (!entityType) {\n          throw new Error(`Entity type \"${entitySet.$.EntityType}\" not found!`);\n        }\n\n        this.dataModel.addEntitySet(fqName, {\n          fqName,\n          odataName,\n          name,\n          entityType,\n          navPropBinding: navPropBindings.map((binding) => ({\n            path: this.namingHelper.stripServicePrefix(binding.$.Path),\n            target: binding.$.Target,\n          })),\n        });\n      });\n    }\n  }\n\n  protected mapODataType(type: string): TypeModel {\n    switch (type) {\n      case ODataTypesV4.Boolean:\n        return {\n          outputType: \"boolean\",\n          qPath: \"QBooleanPath\",\n          qCollection: \"QBooleanCollection\",\n          qParam: \"QBooleanParam\",\n        };\n      case ODataTypesV4.Int64:\n      case ODataTypesV4.Decimal:\n        if (this.options.v4BigNumberAsString) {\n          return {\n            outputType: \"string\",\n            qPath: \"QBigNumberPath\",\n            qCollection: \"QBigNumberCollection\",\n            qParam: \"QBigNumberParam\",\n          };\n        }\n      // yes, intentional fall through!\n      case ODataTypesV4.Byte:\n      case ODataTypesV4.SByte:\n      case ODataTypesV4.Int16:\n      case ODataTypesV4.Int32:\n      case ODataTypesV4.Single:\n      case ODataTypesV4.Double:\n        return {\n          outputType: \"number\",\n          qPath: \"QNumberPath\",\n          qCollection: \"QNumberCollection\",\n          qParam: \"QNumberParam\",\n        };\n      case ODataTypesV4.String:\n        return {\n          outputType: \"string\",\n          qPath: \"QStringPath\",\n          qCollection: \"QStringCollection\",\n          qParam: \"QStringParam\",\n        };\n      case ODataTypesV4.Date:\n        return {\n          outputType: \"string\",\n          qPath: \"QDatePath\",\n          qCollection: \"QDateCollection\",\n          qParam: \"QDateParam\",\n        };\n      case ODataTypesV4.TimeOfDay:\n        return {\n          outputType: \"string\",\n          qPath: \"QTimeOfDayPath\",\n          qCollection: \"QTimeOfDayCollection\",\n          qParam: \"QTimeOfDayParam\",\n        };\n      case ODataTypesV4.DateTimeOffset:\n        return {\n          outputType: \"string\",\n          qPath: \"QDateTimeOffsetPath\",\n          qCollection: \"QDateTimeOffsetCollection\",\n          qParam: \"QDateTimeOffsetParam\",\n        };\n      case ODataTypesV4.Binary:\n        return {\n          outputType: \"string\",\n          qPath: \"QBinaryPath\",\n          qCollection: \"QBinaryCollection\",\n          qParam: undefined,\n        };\n      case ODataTypesV4.Guid:\n        return {\n          outputType: \"string\",\n          qPath: \"QGuidPath\",\n          qCollection: \"QGuidCollection\",\n          qParam: \"QGuidParam\",\n        };\n      default:\n        return {\n          outputType: \"string\",\n          qPath: \"QStringPath\",\n          qCollection: \"QStringCollection\",\n          qParam: undefined,\n        };\n    }\n  }\n\n  private addOperations(ns: NamespaceWithAlias, operations: Array<Operation> | undefined, type: OperationTypes) {\n    const [namespace] = ns;\n    if (!operations || !operations.length) {\n      return;\n    }\n\n    operations.forEach((op) => {\n      const odataName = op.$.Name;\n      const isBound = op.$.IsBound === \"true\";\n      const fqName = withNamespace(namespace, odataName);\n      const opConfig = this.serviceConfigHelper.findOperationTypeConfig(ns, odataName);\n      const params: Array<PropertyModel> = op.Parameter?.map((p) => this.mapProp(p)) ?? [];\n      const returnType: PropertyModel | undefined = op.ReturnType?.map((rt) => {\n        return this.mapProp({ ...rt, $: { Name: \"NO_NAME_BECAUSE_RETURN_TYPE\", ...rt.$ } });\n      })[0];\n\n      if (isBound && !params.length) {\n        throw new Error(`IllegalState: Operation '${odataName}' is bound, but has no parameters!`);\n      }\n\n      const bindingProp = isBound ? params.shift() : undefined;\n      const bindingEntityName = bindingProp ? this.dataModel.getModel(bindingProp!.fqType)?.name : undefined;\n\n      const opName = bindingEntityName\n        ? this.nameValidator.addBoundOperationType(bindingEntityName, fqName, opConfig?.mappedName || odataName)\n        : this.nameValidator.addUnboundOperationType(fqName, opConfig?.mappedName || odataName);\n\n      const name =\n        type === OperationTypes.Function\n          ? this.namingHelper.getFunctionName(opName)\n          : this.namingHelper.getActionName(opName);\n      const qName =\n        type === OperationTypes.Function\n          ? this.namingHelper.getQFunctionName(opName, bindingEntityName)\n          : this.namingHelper.getQActionName(opName, bindingEntityName);\n      const opType: OperationType = {\n        fqName,\n        odataName: isBound ? fqName : odataName,\n        name,\n        qName,\n        paramsModelName: this.namingHelper.getOperationParamsModelName(opName, bindingEntityName),\n        type,\n        parameters: params,\n        returnType,\n      };\n\n      if (bindingProp) {\n        this.dataModel.addBoundOperationType(namespace, bindingProp, opType);\n      } else {\n        this.dataModel.addUnboundOperationType(namespace, opType);\n      }\n    });\n  }\n}\n"]}

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

@@ -47,6 +47,7 @@ export interface ComplexType {
     props: Array<PropertyModel>;
     baseProps: Array<PropertyModel>;
     baseClasses: Array<string>;
+    finalBaseClass: string | undefined;
 }
 export interface EnumType {
     dataType: DataTypes;

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

@@ -1 +1 @@
-{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  fqType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport interface ModelType extends ComplexType {\r\n  idModelName: string;\r\n  qIdFunctionName: string;\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  editableName: string;\r\n  qName: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n}\r\n\r\nexport interface EnumType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  members: Array<string>;\r\n}\r\n\r\nexport interface OperationType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  paramsModelName: string;\r\n  qName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: ModelType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: ModelType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  operation: string;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}
+{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\n\nexport enum ODataVersion {\n  V2 = \"2.0\",\n  V4 = \"4.0\",\n}\n\nexport const enum DataTypes {\n  PrimitiveType = \"PrimitiveType\",\n  EnumType = \"EnumType\",\n  ComplexType = \"ComplexType\",\n  ModelType = \"ModelType\",\n}\n\nexport const enum OperationTypes {\n  Function = \"Function\",\n  Action = \"Action\",\n}\n\nexport interface PropertyModel {\n  odataName: string;\n  name: string;\n  odataType: string;\n  fqType: string;\n  type: string;\n  typeModule?: string;\n  qObject?: string;\n  qPath: string;\n  qParam?: string;\n  required: boolean;\n  isCollection: boolean;\n  dataType: DataTypes;\n  converters?: Array<ValueConverterImport>;\n  managed?: boolean;\n}\n\nexport interface ModelType extends ComplexType {\n  idModelName: string;\n  qIdFunctionName: string;\n  generateId: boolean;\n  keyNames: Array<string>;\n  keys: Array<PropertyModel>;\n  getKeyUnion(): string;\n}\n\nexport interface ComplexType {\n  dataType: DataTypes;\n  fqName: string;\n  odataName: string;\n  name: string;\n  editableName: string;\n  qName: string;\n  props: Array<PropertyModel>;\n  baseProps: Array<PropertyModel>;\n  baseClasses: Array<string>;\n  finalBaseClass: string | undefined;\n}\n\nexport interface EnumType {\n  dataType: DataTypes;\n  fqName: string;\n  odataName: string;\n  name: string;\n  members: Array<string>;\n}\n\nexport interface OperationType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  paramsModelName: string;\n  qName: string;\n  type: OperationTypes;\n  parameters: Array<PropertyModel>;\n  returnType?: ReturnTypeModel;\n  usePost?: boolean;\n}\n\nexport interface ReturnTypeModel extends PropertyModel {}\n\nexport type EntityContainerModel = {\n  entitySets: { [name: string]: EntitySetType };\n  singletons: { [name: string]: SingletonType };\n  functions: { [name: string]: FunctionImportType };\n  actions: { [name: string]: ActionImportType };\n};\n\nexport interface SingletonType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  entityType: ModelType;\n  navPropBinding?: Array<NavPropBindingType>;\n}\n\nexport interface EntitySetType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  entityType: ModelType;\n  navPropBinding?: Array<NavPropBindingType>;\n}\n\nexport interface NavPropBindingType {\n  path: string;\n  target: string;\n}\n\nexport interface ActionImportType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  operation: string;\n}\n\nexport interface FunctionImportType extends ActionImportType {\n  entitySet: string;\n}\n"]}

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

@@ -28,6 +28,7 @@ export declare class NamingHelper {
     private getFileName;
     getFileNameService(name: string): string;
     stripServicePrefix(token: string): string;
+    getNameAndServicePrefix(token: string): [string, string | undefined];
     private namingFunction;
     private getName;
     private getModelNamingStrategy;

package/lib/data-model/NamingHelper.js

@@ -105,6 +105,11 @@ class NamingHelper {
         const found = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));
         return found ? token.replace(found, "") : token;
     }
+    getNameAndServicePrefix(token) {
+        const prefix = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));
+        const name = prefix ? token.replace(prefix, "") : token;
+        return [name, prefix];
+    }
     namingFunction(strategy) {
         const strategyFn = getNamingStrategyImpl(strategy);
         if (!strategyFn || !this.allowModelPropRenaming) {

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

@@ -1 +1 @@
-{"version":3,"file":"NamingHelper.js","sourceRoot":"","sources":["../../src/data-model/NamingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { camelCase } from \"camel-case\";\r\nimport { constantCase } from \"constant-case\";\r\nimport { pascalCase } from \"pascal-case\";\r\nimport { snakeCase } from \"snake-case\";\r\n\r\nimport { FileNamingStrategyOption, NameSettings, NamingStrategies, StandardNamingOptions } from \"../NamingModel\";\r\nimport { RunOptions } from \"../OptionModel\";\r\nimport { NamespaceWithAlias } from \"./DataModel\";\r\nimport { PropertyModel } from \"./DataTypeModel\";\r\n\r\nfunction getNamingStrategyImpl(strategy: NamingStrategies | undefined) {\r\n  switch (strategy) {\r\n    case NamingStrategies.CAMEL_CASE:\r\n      return camelCase;\r\n    case NamingStrategies.PASCAL_CASE:\r\n      return pascalCase;\r\n    case NamingStrategies.CONSTANT_CASE:\r\n      return constantCase;\r\n    case NamingStrategies.SNAKE_CASE:\r\n      return snakeCase;\r\n    default:\r\n      return undefined;\r\n  }\r\n}\r\n\r\nconst noopNamingFunction = (value: string, options?: StandardNamingOptions) => {\r\n  return (options?.prefix || \"\") + value + (options?.suffix || \"\");\r\n};\r\n\r\nexport interface NamingHelperSettings extends Pick<RunOptions, \"allowRenaming\" | \"naming\"> {}\r\n\r\nexport class NamingHelper {\r\n  private readonly allowModelPropRenaming: boolean;\r\n  private readonly mainServiceName: string;\r\n  private readonly namespacePrefixes: Array<string>;\r\n  private readonly options: NameSettings;\r\n\r\n  constructor(options: NamingHelperSettings, mainServiceName: string, namespaces?: Array<NamespaceWithAlias>) {\r\n    if (!options) {\r\n      throw new Error(\"NamingHelper: Options must be supplied!\");\r\n    }\r\n    if (!mainServiceName?.trim()) {\r\n      throw new Error(\"NamingHelper: MainServiceName must be supplied!\");\r\n    }\r\n\r\n    if (!namespaces?.length) {\r\n      namespaces = [[mainServiceName]];\r\n    }\r\n\r\n    this.allowModelPropRenaming = options.allowRenaming ?? false;\r\n    this.options = options.naming;\r\n    this.mainServiceName = mainServiceName;\r\n    this.namespacePrefixes = namespaces\r\n      .reduce<Array<string>>((accu, [ns, alias]) => {\r\n        accu.push(ns);\r\n        if (alias) {\r\n          accu.push(alias);\r\n        }\r\n        return accu;\r\n      }, [])\r\n      .map((sn) => sn + \".\")\r\n      .sort((a, b) => (a.length === b.length ? 0 : a.length > b.length ? -1 : 1));\r\n  }\r\n\r\n  /**\r\n   * The prefix used to reference model or enum types in this schema.\r\n   *\r\n   * @returns service prefix\r\n   */\r\n  public includesServicePrefix(name: string) {\r\n    for (let prefix of this.namespacePrefixes) {\r\n      if (name.startsWith(prefix)) {\r\n        return true;\r\n      }\r\n    }\r\n    return false;\r\n  }\r\n\r\n  /**\r\n   * The OData service name as it was found and is used in metadata file.\r\n   *\r\n   * @returns\r\n   */\r\n  public getODataServiceName() {\r\n    return this.mainServiceName;\r\n  }\r\n\r\n  public getFileNames() {\r\n    return {\r\n      model: this.getFileName(this.options.models?.fileName),\r\n      qObject: this.getFileName(this.options.queryObjects?.fileName),\r\n      service: this.getMainServiceName(),\r\n    };\r\n  }\r\n\r\n  private getFileName(opts?: FileNamingStrategyOption & StandardNamingOptions) {\r\n    return this.getName(this.mainServiceName, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getFileNameService(name: string) {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public stripServicePrefix(token: string) {\r\n    const found = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));\r\n    return found ? token.replace(found, \"\") : token;\r\n  }\r\n\r\n  private namingFunction(strategy: NamingStrategies | undefined) {\r\n    const strategyFn = getNamingStrategyImpl(strategy);\r\n    if (!strategyFn || !this.allowModelPropRenaming) {\r\n      return noopNamingFunction;\r\n    }\r\n\r\n    return (value: string, options?: StandardNamingOptions) => {\r\n      const prefix = options?.prefix;\r\n      const suffix = options?.suffix;\r\n      const isPrefixSpecialChar = prefix?.startsWith(\"_\");\r\n      const isSuffixSpecialChar = suffix?.endsWith(\"_\");\r\n\r\n      let result = strategyFn((prefix ? prefix + \"_\" : \"\") + value + (suffix ? \"_\" + suffix : \"\"));\r\n      if (isPrefixSpecialChar) {\r\n        result = \"_\" + result;\r\n      }\r\n      if (isSuffixSpecialChar) {\r\n        result = result + \"_\";\r\n      }\r\n      return result;\r\n    };\r\n  }\r\n\r\n  private getName(\r\n    name: string,\r\n    strategy: (value: string, options?: StandardNamingOptions) => string,\r\n    options?: StandardNamingOptions\r\n  ) {\r\n    return strategy(this.stripServicePrefix(name), options);\r\n  }\r\n\r\n  private getModelNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.namingStrategy);\r\n  }\r\n\r\n  private getModelPropNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.propNamingStrategy);\r\n  }\r\n\r\n  private getQObjectNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.namingStrategy);\r\n  }\r\n\r\n  private getQObjectPropNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.propNamingStrategy);\r\n  }\r\n\r\n  private getOperationNamingStrategy() {\r\n    return this.namingFunction(this.options.services?.operations?.namingStrategy);\r\n  }\r\n\r\n  public getModelName(name: string): string {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getModelPropName(name: string): string {\r\n    return this.getName(name, this.getModelPropNamingStrategy());\r\n  }\r\n\r\n  public getEnumName(name: string) {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getEditableModelName(name: string) {\r\n    let options = this.options.models?.editableModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getIdModelName(name: string) {\r\n    let options = this.options.models?.idModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getOperationParamsModelName(operationName: string, boundEntity?: string) {\r\n    const settings = this.options.models?.operationParamModels;\r\n    const result = this.getName(operationName, this.getModelNamingStrategy(), settings);\r\n    const name = settings?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n    return this.getPrefixedName(name, boundEntity);\r\n  }\r\n\r\n  public getQName(name: string) {\r\n    return this.getName(name, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQPropName(name: string): string {\r\n    return this.getName(name, this.getQObjectPropNamingStrategy());\r\n  }\r\n\r\n  public getQIdFunctionName(name: string) {\r\n    const opts = this.options.queryObjects?.idFunctions;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQFunctionName(operationName: string, boundEntity?: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(operationName, this.getQObjectNamingStrategy(), opts?.function || opts);\r\n    const name = this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n    return this.getPrefixedName(name, boundEntity);\r\n  }\r\n\r\n  public getQActionName(operationName: string, boundEntity?: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(operationName, this.getQObjectNamingStrategy(), opts?.action || opts);\r\n    const name = this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n    return this.getPrefixedName(name, boundEntity);\r\n  }\r\n\r\n  public getMainServiceName() {\r\n    const name = this.getODataServiceName();\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(\r\n      opts?.main?.namingStrategy ?? (opts?.main?.applyServiceNaming ? opts.namingStrategy : undefined)\r\n    );\r\n    const result = this.getName(name, strategy, opts?.main);\r\n    return opts?.main?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  }\r\n\r\n  public getServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n\r\n  public getCollectionServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(opts?.namingStrategy);\r\n    const result = this.getName(name, strategy, opts?.collection);\r\n    return opts?.collection?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  };\r\n\r\n  private getPrefixedName(name: string, boundEntity: string | undefined) {\r\n    return boundEntity ? boundEntity + \"_\" + name : name;\r\n  }\r\n\r\n  public getFunctionName(operationName: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(operationName, this.getOperationNamingStrategy(), opts?.function || opts);\r\n  }\r\n\r\n  public getActionName(operationName: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(operationName, this.getOperationNamingStrategy(), opts?.action || opts);\r\n  }\r\n\r\n  public getRelatedServiceGetter(name: string) {\r\n    const opts = this.options.services?.relatedServiceGetter;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getPrivatePropName = (name: string) => {\r\n    const opts = this.options.services?.privateProps;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"NamingHelper.js","sourceRoot":"","sources":["../../src/data-model/NamingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { camelCase } from \"camel-case\";\nimport { constantCase } from \"constant-case\";\nimport { pascalCase } from \"pascal-case\";\nimport { snakeCase } from \"snake-case\";\n\nimport { FileNamingStrategyOption, NameSettings, NamingStrategies, StandardNamingOptions } from \"../NamingModel\";\nimport { RunOptions } from \"../OptionModel\";\nimport { NamespaceWithAlias } from \"./DataModel\";\n\nfunction getNamingStrategyImpl(strategy: NamingStrategies | undefined) {\n  switch (strategy) {\n    case NamingStrategies.CAMEL_CASE:\n      return camelCase;\n    case NamingStrategies.PASCAL_CASE:\n      return pascalCase;\n    case NamingStrategies.CONSTANT_CASE:\n      return constantCase;\n    case NamingStrategies.SNAKE_CASE:\n      return snakeCase;\n    default:\n      return undefined;\n  }\n}\n\nconst noopNamingFunction = (value: string, options?: StandardNamingOptions) => {\n  return (options?.prefix || \"\") + value + (options?.suffix || \"\");\n};\n\nexport interface NamingHelperSettings extends Pick<RunOptions, \"allowRenaming\" | \"naming\"> {}\n\nexport class NamingHelper {\n  private readonly allowModelPropRenaming: boolean;\n  private readonly mainServiceName: string;\n  private readonly namespacePrefixes: Array<string>;\n  private readonly options: NameSettings;\n\n  constructor(options: NamingHelperSettings, mainServiceName: string, namespaces?: Array<NamespaceWithAlias>) {\n    if (!options) {\n      throw new Error(\"NamingHelper: Options must be supplied!\");\n    }\n    if (!mainServiceName?.trim()) {\n      throw new Error(\"NamingHelper: MainServiceName must be supplied!\");\n    }\n\n    if (!namespaces?.length) {\n      namespaces = [[mainServiceName]];\n    }\n\n    this.allowModelPropRenaming = options.allowRenaming ?? false;\n    this.options = options.naming;\n    this.mainServiceName = mainServiceName;\n    this.namespacePrefixes = namespaces\n      .reduce<Array<string>>((accu, [ns, alias]) => {\n        accu.push(ns);\n        if (alias) {\n          accu.push(alias);\n        }\n        return accu;\n      }, [])\n      .map((sn) => sn + \".\")\n      .sort((a, b) => (a.length === b.length ? 0 : a.length > b.length ? -1 : 1));\n  }\n\n  /**\n   * The prefix used to reference model or enum types in this schema.\n   *\n   * @returns service prefix\n   */\n  public includesServicePrefix(name: string) {\n    for (let prefix of this.namespacePrefixes) {\n      if (name.startsWith(prefix)) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  /**\n   * The OData service name as it was found and is used in metadata file.\n   *\n   * @returns\n   */\n  public getODataServiceName() {\n    return this.mainServiceName;\n  }\n\n  public getFileNames() {\n    return {\n      model: this.getFileName(this.options.models?.fileName),\n      qObject: this.getFileName(this.options.queryObjects?.fileName),\n      service: this.getMainServiceName(),\n    };\n  }\n\n  private getFileName(opts?: FileNamingStrategyOption & StandardNamingOptions) {\n    return this.getName(this.mainServiceName, this.namingFunction(opts?.namingStrategy), opts);\n  }\n\n  public getFileNameService(name: string) {\n    const opts = this.options.services;\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\n  }\n\n  public stripServicePrefix(token: string) {\n    const found = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));\n    return found ? token.replace(found, \"\") : token;\n  }\n\n  public getNameAndServicePrefix(token: string): [string, string | undefined] {\n    const prefix = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));\n    const name = prefix ? token.replace(prefix, \"\") : token;\n    return [name, prefix];\n  }\n\n  private namingFunction(strategy: NamingStrategies | undefined) {\n    const strategyFn = getNamingStrategyImpl(strategy);\n    if (!strategyFn || !this.allowModelPropRenaming) {\n      return noopNamingFunction;\n    }\n\n    return (value: string, options?: StandardNamingOptions) => {\n      const prefix = options?.prefix;\n      const suffix = options?.suffix;\n      const isPrefixSpecialChar = prefix?.startsWith(\"_\");\n      const isSuffixSpecialChar = suffix?.endsWith(\"_\");\n\n      let result = strategyFn((prefix ? prefix + \"_\" : \"\") + value + (suffix ? \"_\" + suffix : \"\"));\n      if (isPrefixSpecialChar) {\n        result = \"_\" + result;\n      }\n      if (isSuffixSpecialChar) {\n        result = result + \"_\";\n      }\n      return result;\n    };\n  }\n\n  private getName(\n    name: string,\n    strategy: (value: string, options?: StandardNamingOptions) => string,\n    options?: StandardNamingOptions\n  ) {\n    return strategy(this.stripServicePrefix(name), options);\n  }\n\n  private getModelNamingStrategy() {\n    return this.namingFunction(this.options.models?.namingStrategy);\n  }\n\n  private getModelPropNamingStrategy() {\n    return this.namingFunction(this.options.models?.propNamingStrategy);\n  }\n\n  private getQObjectNamingStrategy() {\n    return this.namingFunction(this.options.queryObjects?.namingStrategy);\n  }\n\n  private getQObjectPropNamingStrategy() {\n    return this.namingFunction(this.options.queryObjects?.propNamingStrategy);\n  }\n\n  private getOperationNamingStrategy() {\n    return this.namingFunction(this.options.services?.operations?.namingStrategy);\n  }\n\n  public getModelName(name: string): string {\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\n  }\n\n  public getModelPropName(name: string): string {\n    return this.getName(name, this.getModelPropNamingStrategy());\n  }\n\n  public getEnumName(name: string) {\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\n  }\n\n  public getEditableModelName(name: string) {\n    let options = this.options.models?.editableModels;\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\n    return options?.applyModelNaming\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\n      : result;\n  }\n\n  public getIdModelName(name: string) {\n    let options = this.options.models?.idModels;\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\n    return options?.applyModelNaming\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\n      : result;\n  }\n\n  public getOperationParamsModelName(operationName: string, boundEntity?: string) {\n    const settings = this.options.models?.operationParamModels;\n    const result = this.getName(operationName, this.getModelNamingStrategy(), settings);\n    const name = settings?.applyModelNaming\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\n      : result;\n    return this.getPrefixedName(name, boundEntity);\n  }\n\n  public getQName(name: string) {\n    return this.getName(name, this.getQObjectNamingStrategy(), this.options.queryObjects);\n  }\n\n  public getQPropName(name: string): string {\n    return this.getName(name, this.getQObjectPropNamingStrategy());\n  }\n\n  public getQIdFunctionName(name: string) {\n    const opts = this.options.queryObjects?.idFunctions;\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts);\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\n  }\n\n  public getQFunctionName(operationName: string, boundEntity?: string) {\n    const opts = this.options.queryObjects?.operations;\n    const result = this.getName(operationName, this.getQObjectNamingStrategy(), opts?.function || opts);\n    const name = this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\n    return this.getPrefixedName(name, boundEntity);\n  }\n\n  public getQActionName(operationName: string, boundEntity?: string) {\n    const opts = this.options.queryObjects?.operations;\n    const result = this.getName(operationName, this.getQObjectNamingStrategy(), opts?.action || opts);\n    const name = this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\n    return this.getPrefixedName(name, boundEntity);\n  }\n\n  public getMainServiceName() {\n    const name = this.getODataServiceName();\n    const opts = this.options.services;\n    const strategy = this.namingFunction(\n      opts?.main?.namingStrategy ?? (opts?.main?.applyServiceNaming ? opts.namingStrategy : undefined)\n    );\n    const result = this.getName(name, strategy, opts?.main);\n    return opts?.main?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\n  }\n\n  public getServiceName = (name: string) => {\n    const opts = this.options.services;\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\n  };\n\n  public getCollectionServiceName = (name: string) => {\n    const opts = this.options.services;\n    const strategy = this.namingFunction(opts?.namingStrategy);\n    const result = this.getName(name, strategy, opts?.collection);\n    return opts?.collection?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\n  };\n\n  private getPrefixedName(name: string, boundEntity: string | undefined) {\n    return boundEntity ? boundEntity + \"_\" + name : name;\n  }\n\n  public getFunctionName(operationName: string) {\n    const opts = this.options.services?.operations;\n    return this.getName(operationName, this.getOperationNamingStrategy(), opts?.function || opts);\n  }\n\n  public getActionName(operationName: string) {\n    const opts = this.options.services?.operations;\n    return this.getName(operationName, this.getOperationNamingStrategy(), opts?.action || opts);\n  }\n\n  public getRelatedServiceGetter(name: string) {\n    const opts = this.options.services?.relatedServiceGetter;\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\n  }\n\n  public getPrivatePropName = (name: string) => {\n    const opts = this.options.services?.privateProps;\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\n  };\n}\n"]}

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

@@ -1,30 +1,27 @@
 import { DigestionOptions } from "../FactoryFunctionModel";
-import { EntityGenerationOptions, OperationGenerationOptions, PropertyGenerationOptions } from "../OptionModel";
+import { ComplexTypeGenerationOptions, EntityTypeGenerationOptions, GenericTypeGenerationOptions, PropertyGenerationOptions } from "../OptionModel";
 import { NamespaceWithAlias } from "./DataModel";
-export interface ConfiguredProp extends Omit<PropertyGenerationOptions, "name"> {
-}
-export interface ConfiguredEntity extends Omit<EntityGenerationOptions, "name"> {
-}
-export interface ConfiguredOperation extends Omit<OperationGenerationOptions, "name"> {
+export type WithoutName<T> = Omit<T, "name">;
+export interface ConfiguredProp extends WithoutName<PropertyGenerationOptions> {
 }
 export declare class ServiceConfigHelper {
     private propMapping;
-    private entityMapping;
-    private operationMapping;
     private propRegExps;
-    private entityRegExps;
-    private operationRegExps;
+    private mapping;
     constructor(options: DigestionOptions);
     private evaluateProps;
     private getPropByName;
     private getPropByRegExp;
     findPropConfigByName: (name: string) => ConfiguredProp | undefined;
     private evaluateEntities;
-    private getEntityByName;
-    private getEntityByRegExp;
-    findEntityConfigByName: (namespace: NamespaceWithAlias, name: string) => ConfiguredEntity | undefined;
-    private evaluateOperations;
-    private getOperationByName;
-    private getOperationByRegExp;
-    findOperationConfigByName: (namespace: NamespaceWithAlias, name: string) => ConfiguredOperation | undefined;
+    private getByName;
+    private getByRegExp;
+    private findConfig;
+    findEntityTypeConfig(namespace: NamespaceWithAlias, name: string): WithoutName<EntityTypeGenerationOptions> | undefined;
+    findComplexTypeConfig(namespace: NamespaceWithAlias, name: string): WithoutName<ComplexTypeGenerationOptions> | undefined;
+    findEnumTypeConfig(namespace: NamespaceWithAlias, name: string): WithoutName<GenericTypeGenerationOptions> | undefined;
+    findOperationTypeConfig(namespace: NamespaceWithAlias, name: string): WithoutName<GenericTypeGenerationOptions> | undefined;
+    findOperationImportConfig(namespace: string, name: string): WithoutName<GenericTypeGenerationOptions> | undefined;
+    findEntitySetConfig(namespace: string, name: string): WithoutName<GenericTypeGenerationOptions> | undefined;
+    findSingletonConfig(namespace: string, name: string): WithoutName<GenericTypeGenerationOptions> | undefined;
 }

package/lib/data-model/ServiceConfigHelper.js

@@ -2,35 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceConfigHelper = void 0;
 const tslib_1 = require("tslib");
+const TypeModel_1 = require("../TypeModel");
 const DataModel_1 = require("./DataModel");
 const EXCEPTION_NO_NAME = "No value for required attribute [name] specified!";
 const EXCEPTION_WRONG_NAME_TYPE = "Wrong type for attribute [name]! You have to supply either a plain string or a RegExp.";
+function createMapping() {
+    return {
+        names: {},
+        regExps: [],
+    };
+}
 class ServiceConfigHelper {
     constructor(options) {
         this.propMapping = new Map();
-        this.entityMapping = new Map();
-        this.operationMapping = new Map();
         this.propRegExps = [];
-        this.entityRegExps = [];
-        this.operationRegExps = [];
+        this.mapping = {
+            [TypeModel_1.TypeModel.Any]: createMapping(),
+            [TypeModel_1.TypeModel.EntityType]: createMapping(),
+            [TypeModel_1.TypeModel.ComplexType]: createMapping(),
+            [TypeModel_1.TypeModel.EnumType]: createMapping(),
+            [TypeModel_1.TypeModel.OperationType]: createMapping(),
+            [TypeModel_1.TypeModel.OperationImportType]: createMapping(),
+            [TypeModel_1.TypeModel.EntitySet]: createMapping(),
+            [TypeModel_1.TypeModel.Singleton]: createMapping(),
+        };
         this.findPropConfigByName = (name) => {
             const stringProp = this.getPropByName(name);
             const reProp = this.getPropByRegExp(name);
             return stringProp && reProp ? Object.assign(Object.assign({}, reProp), stringProp) : stringProp || reProp;
         };
-        this.findEntityConfigByName = (namespace, name) => {
-            const stringEnt = this.getEntityByName(namespace, name);
-            const reEnt = this.getEntityByRegExp(namespace, name);
-            return stringEnt && reEnt ? Object.assign(Object.assign({}, reEnt), stringEnt) : stringEnt || reEnt;
-        };
-        this.findOperationConfigByName = (namespace, name) => {
-            const stringEnt = this.getOperationByName(namespace, name);
-            const reEnt = this.getOperationByRegExp(namespace, name);
-            return stringEnt && reEnt ? Object.assign(Object.assign({}, reEnt), stringEnt) : stringEnt || reEnt;
-        };
         this.evaluateProps(options);
         this.evaluateEntities(options);
-        this.evaluateOperations(options);
     }
     evaluateProps(options) {
         options.propertiesByName.forEach((prop) => {
@@ -76,21 +78,25 @@ class ServiceConfigHelper {
             }, {});
     }
     evaluateEntities(options) {
-        options.entitiesByName.forEach((ent) => {
+        options.byTypeAndName.forEach((ent) => {
             if (!ent.name) {
                 throw new Error(EXCEPTION_NO_NAME);
             }
+            const mapping = this.mapping[ent.type];
             switch (typeof ent.name) {
                 case "string":
                     // TODO: check for existing prop.name and throw?
-                    this.entityMapping.set(ent.name, ent);
+                    mapping.names[ent.name] = ent;
                     break;
                 case "object":
                     const { source, ignoreCase } = ent.name;
                     if (!source) {
                         throw new Error(EXCEPTION_WRONG_NAME_TYPE);
                     }
-                    this.entityRegExps.push([new RegExp(`^${source}$`, ignoreCase ? "i" : ""), ent]);
+                    const regExp = new RegExp(`^${source}$`, ignoreCase ? "i" : "");
+                    mapping.regExps.push(
+                    // @ts-ignore: too generic
+                    [regExp, ent]);
                     break;
                 default:
                     throw new Error(EXCEPTION_WRONG_NAME_TYPE);
@@ -98,23 +104,25 @@ class ServiceConfigHelper {
         });
     }
     // get entity config by name matching: simple name or fully qualified name (alias also supported)
-    getEntityByName(namespace, nameToMap) {
+    getByName(mapping, namespace, nameToMap) {
         const [ns, alias] = namespace;
-        const config = this.entityMapping.get((0, DataModel_1.withNamespace)(ns, nameToMap)) ||
-            (alias ? this.entityMapping.get((0, DataModel_1.withNamespace)(alias, nameToMap)) : undefined) ||
-            this.entityMapping.get(nameToMap);
+        const hayStack = Object.assign(Object.assign({}, this.mapping.Any.names), mapping);
+        const config = hayStack[(0, DataModel_1.withNamespace)(ns, nameToMap)] ||
+            (alias ? hayStack[(0, DataModel_1.withNamespace)(alias, nameToMap)] : undefined) ||
+            hayStack[nameToMap];
         if (!config) {
             return;
         }
-        const { name } = config, attrs = tslib_1.__rest(config, ["name"]);
+        const { name, type } = config, attrs = tslib_1.__rest(config, ["name", "type"]);
         return Object.assign({}, attrs);
     }
-    getEntityByRegExp([mainNs, alias], nameToMap) {
+    getByRegExp(mapping, [mainNs, alias], nameToMap) {
         const fqName = `${mainNs}.${nameToMap}`;
-        const resultList = this.entityRegExps
-            .filter(([regExp]) => regExp.test(fqName))
+        const hayStack = [...this.mapping.Any.regExps, ...mapping];
+        const resultList = hayStack
+            .filter(([regExp, config]) => regExp.test(fqName))
             .map((_a) => {
-            var [regExp, _b] = _a, { name, mappedName } = _b, attrs = tslib_1.__rest(_b, ["name", "mappedName"]);
+            var [regExp, _b] = _a, { name, mappedName, type } = _b, attrs = tslib_1.__rest(_b, ["name", "mappedName", "type"]);
             return (Object.assign({ mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined }, attrs));
         });
         return !resultList.length
@@ -123,53 +131,31 @@ class ServiceConfigHelper {
                 return Object.assign(Object.assign({}, result), prop);
             }, {});
     }
-    evaluateOperations(options) {
-        options.operationsByName.forEach((op) => {
-            if (!op.name) {
-                throw new Error(EXCEPTION_NO_NAME);
-            }
-            switch (typeof op.name) {
-                case "string":
-                    // TODO: check for existing operation name and throw?
-                    this.operationMapping.set(op.name, op);
-                    break;
-                case "object":
-                    const { source, ignoreCase } = op.name;
-                    if (!source) {
-                        throw new Error(EXCEPTION_WRONG_NAME_TYPE);
-                    }
-                    this.operationRegExps.push([new RegExp(`^${source}$`, ignoreCase ? "i" : ""), op]);
-                    break;
-                default:
-                    throw new Error(EXCEPTION_WRONG_NAME_TYPE);
-            }
-        });
+    findConfig(mapping, namespace, name) {
+        const stringEnt = this.getByName(mapping.names, namespace, name);
+        const reEnt = this.getByRegExp(mapping.regExps, namespace, name);
+        return stringEnt && reEnt ? Object.assign(Object.assign({}, reEnt), stringEnt) : stringEnt || reEnt;
     }
-    // get entity config by name matching: simple name or fully qualified name (alias also supported)
-    getOperationByName(namespace, nameToMap) {
-        const [ns, alias] = namespace;
-        const config = this.operationMapping.get((0, DataModel_1.withNamespace)(ns, nameToMap)) ||
-            (alias ? this.operationMapping.get((0, DataModel_1.withNamespace)(alias, nameToMap)) : undefined) ||
-            this.operationMapping.get(nameToMap);
-        if (!config) {
-            return;
-        }
-        const { name } = config, attrs = tslib_1.__rest(config, ["name"]);
-        return Object.assign({}, attrs);
+    findEntityTypeConfig(namespace, name) {
+        return this.findConfig(this.mapping.EntityType, namespace, name);
     }
-    getOperationByRegExp([mainNs, alias], nameToMap) {
-        const fqName = `${mainNs}.${nameToMap}`;
-        const resultList = this.operationRegExps
-            .filter(([regExp]) => regExp.test(fqName))
-            .map((_a) => {
-            var [regExp, _b] = _a, { name, mappedName } = _b, attrs = tslib_1.__rest(_b, ["name", "mappedName"]);
-            return (Object.assign({ mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined }, attrs));
-        });
-        return !resultList.length
-            ? undefined
-            : resultList.reduce((result, prop) => {
-                return Object.assign(Object.assign({}, result), prop);
-            }, {});
+    findComplexTypeConfig(namespace, name) {
+        return this.findConfig(this.mapping.ComplexType, namespace, name);
+    }
+    findEnumTypeConfig(namespace, name) {
+        return this.findConfig(this.mapping.EnumType, namespace, name);
+    }
+    findOperationTypeConfig(namespace, name) {
+        return this.findConfig(this.mapping.OperationType, namespace, name);
+    }
+    findOperationImportConfig(namespace, name) {
+        return this.findConfig(this.mapping.OperationImportType, [namespace], name);
+    }
+    findEntitySetConfig(namespace, name) {
+        return this.findConfig(this.mapping.EntitySet, [namespace], name);
+    }
+    findSingletonConfig(namespace, name) {
+        return this.findConfig(this.mapping.Singleton, [namespace], name);
     }
 }
 exports.ServiceConfigHelper = ServiceConfigHelper;