npm - angular-odata - Versions diffs - 0.140.1 → 0.142.0 - Mend

angular-odata 0.140.1 → 0.142.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/schematics/apigen/metadata/csdl/csdl-structural-property.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"csdl-structural-property.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structural-property.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;~~AAElD~~,MAAsB,sBAAuB,SAAQ,+BAAa;IAMhE,~~YAAY~~,~~EACV~~,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,UAAU,GAMX;~~QACC~~,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;~~QACtB~~,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;IAEQ,MAAM;QACb,OAAO,gCACF,KAAK,CAAC,MAAM,EAAE,KACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAC9D,QAAQ,EAAE,IAAI,CAAC,QAAQ,GACE,CAAC;IAC9B,CAAC;CACF;~~AAhCD~~,~~wDAgCC~~;AAED,MAAa,YAAa,SAAQ,sBAAsB;IAQtD,~~YAAY~~,~~EACV~~,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,SAAS,EACT,KAAK,EACL,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,UAAU,GAYX;~~QACC~~,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;~~QAC5C~~,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEQ,MAAM;QACb,MAAM,IAAI,qBAAgC,KAAK,CAAC,MAAM,EAAE,CAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;~~AA9DD~~,~~oCA8DC~~;AAED,MAAa,sBAAuB,SAAQ,sBAAsB;IAMhE,~~YAAY~~,~~EACV~~,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,cAAc,EACd,sBAAsB,EACtB,QAAQ,EACR,UAAU,GAUX;~~QACC~~,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;~~QAC5C~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,GAAG,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,yBAAyB,CAAC,CAAC,CAAC,CACxC,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,CAAC;IAEQ,MAAM;QACb,MAAM,IAAI,qBAAgC,KAAK,CAAC,MAAM,EAAE,CAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC;QAC/C,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzF,IAAI,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;~~AAlDD~~,~~wDAkDC~~;AAED,MAAa,yBAAyB;IAIpC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAoD;QAC5F,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;IAED,MAAM;QACJ,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC;IACJ,CAAC;CACF;AAfD,8DAeC;AAED,MAAa,YAAY;IAGvB,YAAY,EAAE,MAAM,EAAsB;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM;QACJ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;CACF;AAZD,oCAYC"}
1	+ {"version":3,"file":"csdl-structural-property.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structural-property.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/metadata/csdl/csdl-structured-type.d.ts CHANGED Viewed

@@ -24,6 +24,7 @@ export declare class CsdlStructuredType extends CsdlAnnotable {
     name(): string;
     namespace(): string;
     fullName(): string;
+    findNavigationPropertyType(propertyName: string, findEntityType: (fullName: string) => CsdlEntityType | undefined): CsdlNavigationProperty | undefined;
 }
 export declare class CsdlComplexType extends CsdlStructuredType {
     constructor(schema: CsdlSchema, { Name, Property, NavigationProperty, BaseType, OpenType, Abstract, Annotation, }: {

package/schematics/apigen/metadata/csdl/csdl-structured-type.js CHANGED Viewed

@@ -8,8 +8,8 @@ class CsdlStructuredType extends csdl_annotation_1.CsdlAnnotable {
         super({ Annotation });
         this.schema = schema;
         this.Name = Name;
-        this.Property = Property === null || Property === void 0 ? void 0 : Property.map((p) => new csdl_structural_property_1.CsdlProperty(p));
-        this.NavigationProperty = NavigationProperty === null || NavigationProperty === void 0 ? void 0 : NavigationProperty.map((n) => new csdl_structural_property_1.CsdlNavigationProperty(n));
+        this.Property = Property === null || Property === void 0 ? void 0 : Property.map((p) => new csdl_structural_property_1.CsdlProperty(this, p));
+        this.NavigationProperty = NavigationProperty === null || NavigationProperty === void 0 ? void 0 : NavigationProperty.map((n) => new csdl_structural_property_1.CsdlNavigationProperty(this, n));
         this.BaseType = BaseType;
         this.OpenType = OpenType;
         this.Abstract = Abstract;
@@ -42,6 +42,20 @@ class CsdlStructuredType extends csdl_annotation_1.CsdlAnnotable {
     fullName() {
         return `${this.schema.Namespace}.${this.Name}`;
     }
+    findNavigationPropertyType(propertyName, findEntityType) {
+        var _a;
+        let nav;
+        let structured = this;
+        while (true) {
+            nav = (_a = structured.NavigationProperty) === null || _a === void 0 ? void 0 : _a.find((n) => n.Name === propertyName);
+            if (nav)
+                return nav;
+            if (!structured.BaseType)
+                break;
+            structured = findEntityType(structured.BaseType);
+        }
+        throw new Error(`Navigation property '${propertyName}' not found on type '${this.fullName()}' or its base types.`);
+    }
 }
 exports.CsdlStructuredType = CsdlStructuredType;
 class CsdlComplexType extends CsdlStructuredType {

package/schematics/apigen/metadata/csdl/csdl-structured-type.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"csdl-structured-type.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structured-type.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAClD,yEAAkF;AAGlF,MAAa,kBAAmB,SAAQ,+BAAa;IAQnD,YACU,MAAkB,EAC1B,EACE,IAAI,EACJ,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,UAAU,GASX;QAED,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAnBd,WAAM,GAAN,MAAM,CAAY;QAoB1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,uCAAY,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAC1D~~,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,iDAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;~~QACxF~~,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEQ,MAAM;QACb,MAAM,IAAI,mCAAgC,KAAK,CAAC,MAAM,EAAE,KAAE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAE,CAAC;QAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,SAAS;QACP,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;~~AApED~~,~~gDAoEC~~;AAED,MAAa,eAAgB,SAAQ,kBAAkB;IACrD,YACE,MAAkB,EAClB,EACE,IAAI,EACJ,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,UAAU,GASX;QAED,KAAK,CAAC,MAAM,EAAE;YACZ,IAAI;YACJ,QAAQ;YACR,kBAAkB;YAClB,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAEQ,MAAM;QACb,yBACK,KAAK,CAAC,MAAM,EAAE,EACjB;IACJ,CAAC;CACF;AArCD,0CAqCC;AAED,MAAa,cAAe,SAAQ,kBAAkB;IAIpD,YACE,MAAkB,EAClB,EACE,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,UAAU,GAWX;QAED,KAAK,CAAC,MAAM,EAAE;YACZ,IAAI;YACJ,QAAQ;YACR,kBAAkB;YAClB,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,UAAU;SACX,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEQ,MAAM;QACb,MAAM,IAAI,qBAAgC,KAAK,CAAC,MAAM,EAAE,CAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnDD,wCAmDC;AAED,MAAa,OAAO;IAGlB,YAAY,EAAE,WAAW,EAA0B;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,MAAM;;QACJ,OAAO;YACL,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACtD,CAAC;IACJ,CAAC;CACF;AAZD,0BAYC;AAED,MAAa,eAAe;IAI1B,YAAY,EAAE,IAAI,EAAE,KAAK,EAAoC;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC;CACF;AAfD,0CAeC"}
1	+ {"version":3,"file":"csdl-structured-type.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structured-type.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/metadata/metadata.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
+import { CsdlEntitySet } from './csdl/csdl-entity-set';
+import { CsdlEnumType } from './csdl/csdl-enum-type';
 import { CsdlAction, CsdlFunction } from './csdl/csdl-function-action';
 import { CsdlReference } from './csdl/csdl-reference';
 import { CsdlSchema } from './csdl/csdl-schema';
+import { CsdlComplexType, CsdlEntityType } from './csdl/csdl-structured-type';
 export declare class ODataMetadata {
     Version: string;
     References: CsdlReference[];
@@ -15,7 +18,15 @@ export declare class ODataMetadata {
             [key: string]: any;
         }[];
     };
+    static fromJson(json: any): ODataMetadata;
     functions(): CsdlFunction[];
     actions(): CsdlAction[];
-    static fromJson(json: any): ODataMetadata;
+    enumTypes(): CsdlEnumType[];
+    entityTypes(): CsdlEntityType[];
+    complexTypes(): CsdlComplexType[];
+    entitySets(): CsdlEntitySet[];
+    findEnumType(fullName: string): CsdlEnumType | undefined;
+    findEntityType(fullName: string): CsdlEntityType | undefined;
+    findComplexType(fullName: string): CsdlComplexType | undefined;
+    findEntitySet(fullName: string): CsdlEntitySet | undefined;
 }

package/schematics/apigen/metadata/metadata.js CHANGED Viewed

@@ -16,6 +16,9 @@ class ODataMetadata {
             Schemas: this.Schemas.map((s) => s.toJson()),
         };
     }
+    static fromJson(json) {
+        return new ODataMetadata(json.Version, json.References, json.Schemas);
+    }
     functions() {
         return this.Schemas.reduce((acc, s) => {
             var _a;
@@ -28,8 +31,47 @@ class ODataMetadata {
             return [...acc, ...((_a = s.Action) !== null && _a !== void 0 ? _a : [])];
         }, []);
     }
-    static fromJson(json) {
-        return new ODataMetadata(json.Version, json.References, json.Schemas);
+    enumTypes() {
+        return this.Schemas.reduce((acc, s) => {
+            var _a;
+            return [...acc, ...((_a = s.EnumType) !== null && _a !== void 0 ? _a : [])];
+        }, []);
+    }
+    entityTypes() {
+        return this.Schemas.reduce((acc, s) => {
+            var _a;
+            return [...acc, ...((_a = s.EntityType) !== null && _a !== void 0 ? _a : [])];
+        }, []);
+    }
+    complexTypes() {
+        return this.Schemas.reduce((acc, s) => {
+            var _a;
+            return [...acc, ...((_a = s.ComplexType) !== null && _a !== void 0 ? _a : [])];
+        }, []);
+    }
+    entitySets() {
+        return this.Schemas.reduce((acc, s) => {
+            var _a;
+            return [...acc, ...((_a = s.EntityContainer) !== null && _a !== void 0 ? _a : [])];
+        }, []).reduce((acc, ec) => {
+            var _a;
+            return [...acc, ...((_a = ec.EntitySet) !== null && _a !== void 0 ? _a : [])];
+        }, []);
+    }
+    findEnumType(fullName) {
+        return this.enumTypes().find((et) => et.fullName() === fullName);
+    }
+    findEntityType(fullName) {
+        var _a;
+        return (_a = this.entityTypes()) === null || _a === void 0 ? void 0 : _a.find((et) => et.fullName() === fullName);
+    }
+    findComplexType(fullName) {
+        var _a;
+        return (_a = this.complexTypes()) === null || _a === void 0 ? void 0 : _a.find((ct) => ct.fullName() === fullName);
+    }
+    findEntitySet(fullName) {
+        var _a;
+        return (_a = this.entitySets()) === null || _a === void 0 ? void 0 : _a.find((ct) => ct.EntityType === fullName);
     }
 }
 exports.ODataMetadata = ODataMetadata;

package/schematics/apigen/metadata/metadata.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/metadata/metadata.ts"],"names":[],"mappings":";;;~~AACA~~,0DAAsD;AACtD,oDAAgD;~~AAEhD~~,MAAa,aAAa;IAIxB,YAAY,OAAe,EAAE,UAAiB,EAAE,OAAc;QAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,8BAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,wBAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAClD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAC7C,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;;YACpC,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC,EAAE,EAAoB,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;;YACpC,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,CAAC;QACvC,CAAC,EAAE,EAAkB,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,~~IAAS~~;~~QACvB~~,OAAO,IAAI,~~aAAa~~,CAAC,~~IAAI~~,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;~~IACxE~~,CAAC;CACF;~~AAjCD~~,~~sCAiCC~~"}
1	+ {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/metadata/metadata.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/schema.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export interface Schema {
     project: string;
     metadata: string;
     path: string;
+    models: boolean;
     serviceRootUrl?: string;
     version?: string;
     creation?: Date;

package/schematics/apigen/schema.json CHANGED Viewed

@@ -18,6 +18,11 @@
       "description": "The path at which to create the module, relative to the workspace root.",
       "visible": false
     },
+    "models": {
+      "type": "boolean",
+      "description": "Generate models for the entities and complex types.",
+      "default": true
+    },
     "project": {
       "type": "string",
       "description": "The name of the project.",

package/schematics/random.js CHANGED Viewed

@@ -597,7 +597,7 @@ const getRandomName = () => {
     let name = '';
     while (name == '' || name == 'BoringWozniak')
         /* Steve Wozniak is not boring */
-        name = `"${Left[getRandomInt(Left.length)]}${Right[getRandomInt(Right.length)]}`;
+        name = `${Left[getRandomInt(Left.length)]}${Right[getRandomInt(Right.length)]}`;
     return name;
 };
 exports.getRandomName = getRandomName;

package/schematics/random.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"random.js","sourceRoot":"","sources":["../../../projects/angular-odata/schematics/random.ts"],"names":[],"mappings":"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~~IAAI~~,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;~~IACnF~~,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}
1	+ {"version":3,"file":"random.js","sourceRoot":"","sources":["../../../projects/angular-odata/schematics/random.ts"],"names":[],"mappings":"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"}