@abp/ng.schematics 10.5.0-rc.4 → 10.6.0-rc.1

package/utils/generics.js

@@ -1,90 +1,90 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.replacePlaceholdersWithGenerics = exports.extractGenerics = exports.extractSimpleGenerics = exports.generateRefWithPlaceholders = exports.GenericsCollector = void 0;
-const models_1 = require("../models");
-class GenericsCollector {
-    constructor(getTypeIdentifier = (type) => type) {
-        this.getTypeIdentifier = getTypeIdentifier;
-        this._generics = [];
-        this.apply = (value, index) => {
-            const generic = this.get(index);
-            if (generic) {
-                if (!generic.type)
-                    generic.setType(value);
-                return value + generic.default;
-            }
-            return value;
-        };
-    }
-    get generics() {
-        return this._generics;
-    }
-    createGeneric(type, ref, defaultValue) {
-        const _default = this.getTypeIdentifier(defaultValue);
-        const refs = [generateRefWithPlaceholders(ref)];
-        const generic = new models_1.Generic({ type, default: _default, refs });
-        return generic;
-    }
-    register(index, generic) {
-        const existing = this.get(index);
-        if (existing) {
-            existing.setDefault(generic.default);
-            existing.setType(generic.type);
-        }
-        else
-            this.set(index, generic);
-    }
-    collect(generics, genericArguments) {
-        generics.forEach((ref, i) => {
-            const generic = this.createGeneric(genericArguments[i], ref, genericArguments.includes(ref) ? '' : ref);
-            this.register(i, generic);
-        });
-    }
-    get(index) {
-        return this.generics[index];
-    }
-    set(index, value) {
-        this.generics[index] = value;
-    }
-    reset() {
-        this._generics = [];
-    }
-}
-exports.GenericsCollector = GenericsCollector;
-function generateRefWithPlaceholders(sourceType) {
-    // eslint-disable-next-line prefer-const
-    let { identifier, generics } = extractGenerics(sourceType);
-    generics = generics.map((_, i) => `T${i}`);
-    return generics.length ? `${identifier}<${generics}>` : identifier;
-}
-exports.generateRefWithPlaceholders = generateRefWithPlaceholders;
-function extractSimpleGenerics(sourceType) {
-    const { identifier, generics, array } = extractGenerics(sourceType);
-    return {
-        identifier: getLastSegment(identifier),
-        generics: generics.map(getLastSegment),
-        array,
-    };
-}
-exports.extractSimpleGenerics = extractSimpleGenerics;
-function extractGenerics(sourceType) {
-    const isArray = /\[\]$/.test(sourceType);
-    const regex = /(?<identifier>[^<]+)(<(?<generics>.+)>)?/g;
-    const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {};
-    return {
-        identifier,
-        generics: generics.split(/,\s*/).filter(Boolean),
-        array: isArray ? '[]' : '',
-    };
-}
-exports.extractGenerics = extractGenerics;
-function getLastSegment(str) {
-    return str.split('.').pop();
-}
-function replacePlaceholdersWithGenerics(type, generics, genericsCollector) {
-    return generics
-        .map(genericsCollector.apply)
-        .reduce((acc, v, i) => acc.replace(new RegExp(`([<, ])T${i}([,>])`, 'g'), `$1${v}$2`), type);
-}
-exports.replacePlaceholdersWithGenerics = replacePlaceholdersWithGenerics;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GenericsCollector = void 0;
+exports.generateRefWithPlaceholders = generateRefWithPlaceholders;
+exports.extractSimpleGenerics = extractSimpleGenerics;
+exports.extractGenerics = extractGenerics;
+exports.replacePlaceholdersWithGenerics = replacePlaceholdersWithGenerics;
+const models_1 = require("../models");
+class GenericsCollector {
+    get generics() {
+        return this._generics;
+    }
+    constructor(getTypeIdentifier = (type) => type) {
+        this.getTypeIdentifier = getTypeIdentifier;
+        this._generics = [];
+        this.apply = (value, index) => {
+            const generic = this.get(index);
+            if (generic) {
+                if (!generic.type)
+                    generic.setType(value);
+                return value + generic.default;
+            }
+            return value;
+        };
+    }
+    createGeneric(type, ref, defaultValue) {
+        const _default = this.getTypeIdentifier(defaultValue);
+        const refs = [generateRefWithPlaceholders(ref)];
+        const generic = new models_1.Generic({ type, default: _default, refs });
+        return generic;
+    }
+    register(index, generic) {
+        const existing = this.get(index);
+        if (existing) {
+            existing.setDefault(generic.default);
+            existing.setType(generic.type);
+        }
+        else
+            this.set(index, generic);
+    }
+    collect(generics, genericArguments) {
+        generics.forEach((ref, i) => {
+            const generic = this.createGeneric(genericArguments[i], ref, genericArguments.includes(ref) ? '' : ref);
+            this.register(i, generic);
+        });
+    }
+    get(index) {
+        return this.generics[index];
+    }
+    set(index, value) {
+        this.generics[index] = value;
+    }
+    reset() {
+        this._generics = [];
+    }
+}
+exports.GenericsCollector = GenericsCollector;
+function generateRefWithPlaceholders(sourceType) {
+    // eslint-disable-next-line prefer-const
+    let { identifier, generics } = extractGenerics(sourceType);
+    generics = generics.map((_, i) => `T${i}`);
+    return generics.length ? `${identifier}<${generics}>` : identifier;
+}
+function extractSimpleGenerics(sourceType) {
+    const { identifier, generics, array } = extractGenerics(sourceType);
+    return {
+        identifier: getLastSegment(identifier),
+        generics: generics.map(getLastSegment),
+        array,
+    };
+}
+function extractGenerics(sourceType) {
+    const isArray = /\[\]$/.test(sourceType);
+    const regex = /(?<identifier>[^<]+)(<(?<generics>.+)>)?/g;
+    const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {};
+    return {
+        identifier,
+        generics: generics.split(/,\s*/).filter(Boolean),
+        array: isArray ? '[]' : '',
+    };
+}
+function getLastSegment(str) {
+    return str.split('.').pop();
+}
+function replacePlaceholdersWithGenerics(type, generics, genericsCollector) {
+    return generics
+        .map(genericsCollector.apply)
+        .reduce((acc, v, i) => acc.replace(new RegExp(`([<, ])T${i}([,>])`, 'g'), `$1${v}$2`), type);
+}
 //# sourceMappingURL=generics.js.map

package/utils/generics.js.map

@@ -1 +1 @@
-{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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"}

package/utils/import.d.ts

@@ -1,3 +1,3 @@
-import { Import } from '../models';
-export declare function sortImports(imports: Import[]): void;
-export declare function removeRelative(importDef: Import): string;
+import { Import } from '../models';
+export declare function sortImports(imports: Import[]): void;
+export declare function removeRelative(importDef: Import): string;

package/utils/import.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeRelative = exports.sortImports = void 0;
-function sortImports(imports) {
-    imports.sort((a, b) => removeRelative(a) > removeRelative(b) ? 1 : a.keyword > b.keyword ? 1 : -1);
-}
-exports.sortImports = sortImports;
-function removeRelative(importDef) {
-    return importDef.path.replace(/\.\.\//g, '');
-}
-exports.removeRelative = removeRelative;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortImports = sortImports;
+exports.removeRelative = removeRelative;
+function sortImports(imports) {
+    imports.sort((a, b) => removeRelative(a) > removeRelative(b) ? 1 : a.keyword > b.keyword ? 1 : -1);
+}
+function removeRelative(importDef) {
+    return importDef.path.replace(/\.\.\//g, '');
+}
 //# sourceMappingURL=import.js.map

package/utils/import.js.map

@@ -1 +1 @@
-{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/import.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CAAC,OAAiB;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACpB,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC;AAJD,kCAIC;AAED,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/import.ts"],"names":[],"mappings":";;AAEA,kCAIC;AAED,wCAEC;AARD,SAAgB,WAAW,CAAC,OAAiB;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACpB,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC"}

package/utils/index.d.ts

@@ -1,22 +1,22 @@
-export * from './angular';
-export * from './api';
-export * from './ast';
-export * from './barrel';
-export * from './common';
-export * from './enum';
-export * from './file';
-export * from './generics';
-export * from './import';
-export * from './methods';
-export * from './model';
-export * from './namespace';
-export * from './path';
-export * from './rule';
-export * from './service';
-export * from './source';
-export * from './text';
-export * from './tree';
-export * from './type';
-export * from './workspace';
-export * from './standalone';
-export * from './ng-module';
+export * from './angular';
+export * from './api';
+export * from './ast';
+export * from './barrel';
+export * from './common';
+export * from './enum';
+export * from './file';
+export * from './generics';
+export * from './import';
+export * from './methods';
+export * from './model';
+export * from './namespace';
+export * from './path';
+export * from './rule';
+export * from './service';
+export * from './source';
+export * from './text';
+export * from './tree';
+export * from './type';
+export * from './workspace';
+export * from './standalone';
+export * from './ng-module';

package/utils/index.js

@@ -1,39 +1,26 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./angular"), exports);
-__exportStar(require("./api"), exports);
-__exportStar(require("./ast"), exports);
-__exportStar(require("./barrel"), exports);
-__exportStar(require("./common"), exports);
-__exportStar(require("./enum"), exports);
-__exportStar(require("./file"), exports);
-__exportStar(require("./generics"), exports);
-__exportStar(require("./import"), exports);
-__exportStar(require("./methods"), exports);
-__exportStar(require("./model"), exports);
-__exportStar(require("./namespace"), exports);
-__exportStar(require("./path"), exports);
-__exportStar(require("./rule"), exports);
-__exportStar(require("./service"), exports);
-__exportStar(require("./source"), exports);
-__exportStar(require("./text"), exports);
-__exportStar(require("./tree"), exports);
-__exportStar(require("./type"), exports);
-__exportStar(require("./workspace"), exports);
-__exportStar(require("./standalone"), exports);
-__exportStar(require("./ng-module"), exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./angular"), exports);
+tslib_1.__exportStar(require("./api"), exports);
+tslib_1.__exportStar(require("./ast"), exports);
+tslib_1.__exportStar(require("./barrel"), exports);
+tslib_1.__exportStar(require("./common"), exports);
+tslib_1.__exportStar(require("./enum"), exports);
+tslib_1.__exportStar(require("./file"), exports);
+tslib_1.__exportStar(require("./generics"), exports);
+tslib_1.__exportStar(require("./import"), exports);
+tslib_1.__exportStar(require("./methods"), exports);
+tslib_1.__exportStar(require("./model"), exports);
+tslib_1.__exportStar(require("./namespace"), exports);
+tslib_1.__exportStar(require("./path"), exports);
+tslib_1.__exportStar(require("./rule"), exports);
+tslib_1.__exportStar(require("./service"), exports);
+tslib_1.__exportStar(require("./source"), exports);
+tslib_1.__exportStar(require("./text"), exports);
+tslib_1.__exportStar(require("./tree"), exports);
+tslib_1.__exportStar(require("./type"), exports);
+tslib_1.__exportStar(require("./workspace"), exports);
+tslib_1.__exportStar(require("./standalone"), exports);
+tslib_1.__exportStar(require("./ng-module"), exports);
 //# sourceMappingURL=index.js.map

package/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B;AAC5B,+CAA6B;AAC7B,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,gDAAsB;AACtB,gDAAsB;AACtB,mDAAyB;AACzB,mDAAyB;AACzB,iDAAuB;AACvB,iDAAuB;AACvB,qDAA2B;AAC3B,mDAAyB;AACzB,oDAA0B;AAC1B,kDAAwB;AACxB,sDAA4B;AAC5B,iDAAuB;AACvB,iDAAuB;AACvB,oDAA0B;AAC1B,mDAAyB;AACzB,iDAAuB;AACvB,iDAAuB;AACvB,iDAAuB;AACvB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B"}

package/utils/methods.d.ts

@@ -1,4 +1,4 @@
-export declare const getParamName: (paramName: string) => string;
-export declare const getParamValueName: (paramName: string, descriptorName: string) => string;
-export declare function isDictionaryType(type?: string, typeSimple?: string): boolean;
-export declare function isCollectionType(type?: string, typeSimple?: string): boolean;
+export declare const getParamName: (paramName: string) => string;
+export declare const getParamValueName: (paramName: string, descriptorName: string) => string;
+export declare function isDictionaryType(type?: string, typeSimple?: string): boolean;
+export declare function isCollectionType(type?: string, typeSimple?: string): boolean;

package/utils/methods.js

@@ -1,30 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCollectionType = exports.isDictionaryType = exports.getParamValueName = exports.getParamName = void 0;
-const text_1 = require("./text");
-const shouldQuote = require('should-quote');
-const getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
-exports.getParamName = getParamName;
-const getParamValueName = (paramName, descriptorName) => {
-    if (paramName.includes('.')) {
-        const splitted = paramName.split('.');
-        const param = splitted.map(x => (shouldQuote(x) ? `[${x}]` : `.${(0, text_1.camel)(x)}`)).join('');
-        return `${descriptorName}${param}`;
-    }
-    if (shouldQuote(paramName)) {
-        return `${descriptorName}['${paramName}']`;
-    }
-    return `${descriptorName}.${paramName}`;
-};
-exports.getParamValueName = getParamValueName;
-function isDictionaryType(type, typeSimple) {
-    const haystacks = [type || '', typeSimple || ''];
-    return haystacks.some(t => /(^|\b)(System\.Collections\.Generic\.)?(I)?Dictionary\s*</.test(t));
-}
-exports.isDictionaryType = isDictionaryType;
-function isCollectionType(type, typeSimple) {
-    const haystacks = [type || '', typeSimple || ''];
-    return haystacks.some(t => /(^|\b)(System\.Collections\.Generic\.)?(I)?(List|Enumerable|Collection)\s*</.test(t));
-}
-exports.isCollectionType = isCollectionType;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getParamValueName = exports.getParamName = void 0;
+exports.isDictionaryType = isDictionaryType;
+exports.isCollectionType = isCollectionType;
+const text_1 = require("./text");
+const shouldQuote = require('should-quote');
+const getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
+exports.getParamName = getParamName;
+const getParamValueName = (paramName, descriptorName) => {
+    if (paramName.includes('.')) {
+        const splitted = paramName.split('.');
+        // Flattened nested query params: any intermediate object may be absent at runtime, and
+        // nested members are typed as `T | null`, so navigate them with optional chaining (`?.`).
+        const param = splitted.map(x => (shouldQuote(x) ? `?.['${x}']` : `?.${(0, text_1.camel)(x)}`)).join('');
+        return `${descriptorName}${param}`;
+    }
+    if (shouldQuote(paramName)) {
+        return `${descriptorName}['${paramName}']`;
+    }
+    return `${descriptorName}.${paramName}`;
+};
+exports.getParamValueName = getParamValueName;
+function isDictionaryType(type, typeSimple) {
+    const haystacks = [type || '', typeSimple || ''];
+    return haystacks.some(t => /(^|\b)(System\.Collections\.Generic\.)?(I)?Dictionary\s*</.test(t));
+}
+function isCollectionType(type, typeSimple) {
+    const haystacks = [type || '', typeSimple || ''];
+    return haystacks.some(t => /(^|\b)(System\.Collections\.Generic\.)?(I)?(List|Enumerable|Collection)\s*</.test(t));
+}
 //# sourceMappingURL=methods.js.map

package/utils/methods.js.map

@@ -1 +1 @@
-{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAE/B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,EAAE,CAChD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAD7C,QAAA,YAAY,gBACiC;AAEnD,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAE,cAAsB,EAAE,EAAE;IAC7E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAA,YAAK,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvF,OAAO,GAAG,cAAc,GAAG,KAAK,EAAE,CAAC;KACpC;IACD,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO,GAAG,cAAc,KAAK,SAAS,IAAI,CAAC;KAC5C;IACD,OAAO,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC;AAC1C,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEF,SAAgB,gBAAgB,CAAC,IAAa,EAAE,UAAmB;IACjE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,2DAA2D,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAAC,IAAa,EAAE,UAAmB;IACjE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,6EAA6E,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACpH,CAAC;AAHD,4CAGC"}
+{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAoBA,4CAGC;AAED,4CAGC;AA5BD,iCAA+B;AAE/B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,EAAE,CAChD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAD7C,QAAA,YAAY,gBACiC;AAEnD,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAE,cAAsB,EAAE,EAAE;IAC7E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,uFAAuF;QACvF,0FAA0F;QAC1F,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAA,YAAK,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5F,OAAO,GAAG,cAAc,GAAG,KAAK,EAAE,CAAC;IACrC,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,GAAG,cAAc,KAAK,SAAS,IAAI,CAAC;IAC7C,CAAC;IACD,OAAO,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC;AAC1C,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEF,SAAgB,gBAAgB,CAAC,IAAa,EAAE,UAAmB;IACjE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,2DAA2D,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAa,EAAE,UAAmB;IACjE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,6EAA6E,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACpH,CAAC"}

package/utils/model.d.ts

@@ -1,14 +1,14 @@
-import { Import, Interface, Model, Type, TypeWithEnum } from '../models';
-export interface ModelGeneratorParams {
-    targetPath: string;
-    solution: string;
-    types: Record<string, Type>;
-    serviceImports: Record<string, string[]>;
-    modelImports: Record<string, string[]>;
-}
-export declare function createImportRefsToModelReducer(params: ModelGeneratorParams): (models: Model[], importRefs: string[]) => Model[];
-export declare function createImportRefToInterfaceReducerCreator(params: ModelGeneratorParams): (interfaces: Interface[], ref: string) => Interface[];
-export declare function createRefToImportReducerCreator(params: ModelGeneratorParams): (namespace: string) => (imports: Import[], types: TypeWithEnum[]) => Import[];
-export declare function parseBaseTypeWithGenericTypes(type: string): string[];
-export declare function resolveAbpPackages(models: Model[]): void;
-export declare function resolveSelfGenericProps(params: Partial<ModelGeneratorParams>): void;
+import { Import, Interface, Model, Type, TypeWithEnum } from '../models';
+export interface ModelGeneratorParams {
+    targetPath: string;
+    solution: string;
+    types: Record<string, Type>;
+    serviceImports: Record<string, string[]>;
+    modelImports: Record<string, string[]>;
+}
+export declare function createImportRefsToModelReducer(params: ModelGeneratorParams): (models: Model[], importRefs: string[]) => Model[];
+export declare function createImportRefToInterfaceReducerCreator(params: ModelGeneratorParams): (interfaces: Interface[], ref: string) => Interface[];
+export declare function createRefToImportReducerCreator(params: ModelGeneratorParams): (namespace: string) => (imports: Import[], types: TypeWithEnum[]) => Import[];
+export declare function parseBaseTypeWithGenericTypes(type: string): string[];
+export declare function resolveAbpPackages(models: Model[]): void;
+export declare function resolveSelfGenericProps(params: Partial<ModelGeneratorParams>): void;