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

package/utils/tree.js

@@ -1,84 +1,84 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGenerics = exports.parseGenericsOld = exports.TypeNode = void 0;
-class TypeNode {
-    constructor(data, parent, mapperFn = (node) => node.data) {
-        this.data = data;
-        this.parent = parent;
-        this.mapperFn = mapperFn;
-        this.children = [];
-        this.index = 0;
-    }
-    toGenerics() {
-        const generics = this.children.length ? `<${this.children.map(n => `T${n.index}`)}>` : '';
-        return [this.data + generics].concat(this.children.reduce((acc, node) => acc.concat(node.toGenerics()), []));
-    }
-    toString() {
-        const self = this.mapperFn(this);
-        if (!self)
-            return '';
-        const representation = self + this.children.filter(String).join(', ');
-        if (!this.parent)
-            return representation;
-        const siblings = this.parent.children;
-        return ((siblings[0] === this ? '<' : '') +
-            representation +
-            (siblings[siblings.length - 1] === this ? '>' : ''));
-    }
-    valueOf() {
-        return this.toString();
-    }
-}
-exports.TypeNode = TypeNode;
-function parseGenericsOld(type, mapperFn) {
-    const [rootType, ...types] = type.split('<');
-    const root = new TypeNode(rootType, null, mapperFn);
-    types.reduce((parent, t) => {
-        const [left, right] = t.split(/>+,?\s*/);
-        const leftNode = new TypeNode(left, parent, mapperFn);
-        leftNode.index = parent.children.length;
-        parent.children.push(leftNode);
-        parent = leftNode;
-        let { length } = t.match(/>/g) || [];
-        while (length--)
-            parent = parent.parent;
-        if (right) {
-            parent = parent.parent;
-            const rightNode = new TypeNode(right, parent, mapperFn);
-            rightNode.index = parent.children.length;
-            parent.children.push(rightNode);
-            parent = rightNode;
-        }
-        return parent;
-    }, root);
-    return root;
-}
-exports.parseGenericsOld = parseGenericsOld;
-function parseGenerics(type, mapperFn, parent) {
-    const regex = /(?<MainType>[\w.]+)<(?<GenericType>.*)>/;
-    const match = type.match(regex);
-    if (!match) {
-        return new TypeNode(type, null, mapperFn);
-    }
-    const mainType = match.groups?.MainType || '';
-    const genericType = match.groups?.GenericType || '';
-    const root = new TypeNode(mainType, parent ?? null, mapperFn);
-    if (genericType.includes(',')) {
-        const genericTypes = genericType.split(',');
-        genericTypes.forEach((genericType, index) => {
-            const child = parseGenerics(genericType, mapperFn, root);
-            child.index = index;
-            root.children.push(child);
-            child.parent = root;
-        });
-    }
-    else {
-        const child = parseGenerics(genericType, mapperFn, root);
-        child.index = root.children.length;
-        root.children.push(child);
-        child.parent = root;
-    }
-    return root;
-}
-exports.parseGenerics = parseGenerics;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeNode = void 0;
+exports.parseGenericsOld = parseGenericsOld;
+exports.parseGenerics = parseGenerics;
+class TypeNode {
+    constructor(data, parent, mapperFn = (node) => node.data) {
+        this.data = data;
+        this.parent = parent;
+        this.mapperFn = mapperFn;
+        this.children = [];
+        this.index = 0;
+    }
+    toGenerics() {
+        const generics = this.children.length ? `<${this.children.map(n => `T${n.index}`)}>` : '';
+        return [this.data + generics].concat(this.children.reduce((acc, node) => acc.concat(node.toGenerics()), []));
+    }
+    toString() {
+        const self = this.mapperFn(this);
+        if (!self)
+            return '';
+        const representation = self + this.children.filter(String).join(', ');
+        if (!this.parent)
+            return representation;
+        const siblings = this.parent.children;
+        return ((siblings[0] === this ? '<' : '') +
+            representation +
+            (siblings[siblings.length - 1] === this ? '>' : ''));
+    }
+    valueOf() {
+        return this.toString();
+    }
+}
+exports.TypeNode = TypeNode;
+function parseGenericsOld(type, mapperFn) {
+    const [rootType, ...types] = type.split('<');
+    const root = new TypeNode(rootType, null, mapperFn);
+    types.reduce((parent, t) => {
+        const [left, right] = t.split(/>+,?\s*/);
+        const leftNode = new TypeNode(left, parent, mapperFn);
+        leftNode.index = parent.children.length;
+        parent.children.push(leftNode);
+        parent = leftNode;
+        let { length } = t.match(/>/g) || [];
+        while (length--)
+            parent = parent.parent;
+        if (right) {
+            parent = parent.parent;
+            const rightNode = new TypeNode(right, parent, mapperFn);
+            rightNode.index = parent.children.length;
+            parent.children.push(rightNode);
+            parent = rightNode;
+        }
+        return parent;
+    }, root);
+    return root;
+}
+function parseGenerics(type, mapperFn, parent) {
+    const regex = /(?<MainType>[\w.]+)<(?<GenericType>.*)>/;
+    const match = type.match(regex);
+    if (!match) {
+        return new TypeNode(type, null, mapperFn);
+    }
+    const mainType = match.groups?.MainType || '';
+    const genericType = match.groups?.GenericType || '';
+    const root = new TypeNode(mainType, parent ?? null, mapperFn);
+    if (genericType.includes(',')) {
+        const genericTypes = genericType.split(',');
+        genericTypes.forEach((genericType, index) => {
+            const child = parseGenerics(genericType, mapperFn, root);
+            child.index = index;
+            root.children.push(child);
+            child.parent = root;
+        });
+    }
+    else {
+        const child = parseGenerics(genericType, mapperFn, root);
+        child.index = root.children.length;
+        root.children.push(child);
+        child.parent = root;
+    }
+    return root;
+}
 //# sourceMappingURL=tree.js.map

package/utils/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/tree.ts"],"names":[],"mappings":";;;AAAA,MAAa,QAAQ;IAKnB,YACS,IAAY,EACZ,MAAuB,EACvB,WAAW,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;QAFxC,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAiB;QACvB,aAAQ,GAAR,QAAQ,CAAgC;QAPjD,aAAQ,GAAe,EAAE,CAAC;QAE1B,UAAK,GAAG,CAAC,CAAC;IAMP,CAAC;IAEJ,UAAU;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC,MAAM,CAClC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC,CACjF,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,cAAc,CAAC;QAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEtC,OAAO,CACL,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,cAAc;YACd,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACF;AAvCD,4BAuCC;AAED,SAAgB,gBAAgB,CAAC,IAAY,EAAE,QAA2B;IACxE,MAAM,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpD,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACtD,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,GAAG,QAAQ,CAAC;QAElB,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,MAAM,EAAE;YAAE,MAAM,GAAG,MAAM,CAAC,MAAO,CAAC;QAEzC,IAAI,KAAK,EAAE;YACT,MAAM,GAAG,MAAM,CAAC,MAAO,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxD,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACzC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChC,MAAM,GAAG,SAAS,CAAC;SACpB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,4CA2BC;AAED,SAAgB,aAAa,CAAC,IAAY,EAAE,QAA2B,EAAE,MAAwB;IAC/F,MAAM,KAAK,GAAG,yCAAyC,CAAC;IAExD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC3C;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC;IACpD,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YACzD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzD,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;KACrB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA1BD,sCA0BC"}
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/tree.ts"],"names":[],"mappings":"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"}

package/utils/type.d.ts

@@ -1,13 +1,13 @@
-import { Import, TypeWithEnum } from '../models';
-export declare function createTypeSimplifier(): (type: string) => string;
-export declare function createTypeParser(replacerFn?: (t: string) => string): (originalType: string) => string[];
-export declare function createTypeNormalizer(replacerFn?: (t: string) => string): (type: string) => string;
-export declare function flattenDictionaryTypes(types: string[], type: string): string[];
-export declare function normalizeTypeAnnotations(type: string): string;
-export declare function removeGenerics(type: string): string;
-export declare function removeTypeModifiers(type: string): string;
-export declare function getTypeForEnumList(type: string): string;
-export declare function createTypesToImportsReducer(solution: string, namespace: string): (imports: Import[], types: TypeWithEnum[]) => Import[];
-export declare function createTypeToImportMapper(solution: string, namespace: string): (type: string, isEnum: boolean) => Import | undefined;
-export declare function createTypeAdapter(): (type: string) => string;
-export declare function extendsSelf(type: string, base: string): boolean;
+import { Import, TypeWithEnum } from '../models';
+export declare function createTypeSimplifier(): (type: string) => string;
+export declare function createTypeParser(replacerFn?: (t: string) => string): (originalType: string) => string[];
+export declare function createTypeNormalizer(replacerFn?: (t: string) => string): (type: string) => string;
+export declare function flattenDictionaryTypes(types: string[], type: string): string[];
+export declare function normalizeTypeAnnotations(type: string): string;
+export declare function removeGenerics(type: string): string;
+export declare function removeTypeModifiers(type: string): string;
+export declare function getTypeForEnumList(type: string): string;
+export declare function createTypesToImportsReducer(solution: string, namespace: string): (imports: Import[], types: TypeWithEnum[]) => Import[];
+export declare function createTypeToImportMapper(solution: string, namespace: string): (type: string, isEnum: boolean) => Import | undefined;
+export declare function createTypeAdapter(): (type: string) => string;
+export declare function extendsSelf(type: string, base: string): boolean;

package/utils/type.js

@@ -1,114 +1,113 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendsSelf = exports.createTypeAdapter = exports.createTypeToImportMapper = exports.createTypesToImportsReducer = exports.getTypeForEnumList = exports.removeTypeModifiers = exports.removeGenerics = exports.normalizeTypeAnnotations = exports.flattenDictionaryTypes = exports.createTypeNormalizer = exports.createTypeParser = exports.createTypeSimplifier = void 0;
-const constants_1 = require("../constants");
-const enums_1 = require("../enums");
-const models_1 = require("../models");
-const generics_1 = require("./generics");
-const namespace_1 = require("./namespace");
-const path_1 = require("./path");
-const tree_1 = require("./tree");
-function createTypeSimplifier() {
-    const parseType = createTypeParser(t => {
-        let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => constants_1.SYSTEM_TYPES.get(match) ?? 'any');
-        type = /any</.test(type) ? 'any' : type;
-        const { identifier, generics, array } = (0, generics_1.extractSimpleGenerics)(type);
-        return generics.length ? `${identifier}<${generics.join(', ')}>${array}` : identifier;
-    });
-    return (type) => {
-        const parsed = parseType(type);
-        const last = parsed.pop();
-        return parsed.reduceRight((record, tKey) => `Record<${tKey}, ${record}>`, last);
-    };
-}
-exports.createTypeSimplifier = createTypeSimplifier;
-function createTypeParser(replacerFn = (t) => t) {
-    const normalizeType = createTypeNormalizer(replacerFn);
-    return (originalType) => flattenDictionaryTypes([], originalType).map(normalizeType);
-}
-exports.createTypeParser = createTypeParser;
-function createTypeNormalizer(replacerFn = (t) => t) {
-    return (type) => {
-        return replacerFn(normalizeTypeAnnotations(type));
-    };
-}
-exports.createTypeNormalizer = createTypeNormalizer;
-function flattenDictionaryTypes(types, type) {
-    type
-        .replace(/[}{]/g, '')
-        .split(':')
-        .forEach(t => types.push(t));
-    return types;
-}
-exports.flattenDictionaryTypes = flattenDictionaryTypes;
-function normalizeTypeAnnotations(type) {
-    return type.replace(/\[(.+)+\]/g, '$1[]').replace(/\?/g, '');
-}
-exports.normalizeTypeAnnotations = normalizeTypeAnnotations;
-function removeGenerics(type) {
-    return type.replace(/<.+>/g, '');
-}
-exports.removeGenerics = removeGenerics;
-function removeTypeModifiers(type) {
-    return type.replace(/\[\]/g, '');
-}
-exports.removeTypeModifiers = removeTypeModifiers;
-function getTypeForEnumList(type) {
-    return type.replace(/^.*<([^>]+)>.*$/, '[$1]');
-}
-exports.getTypeForEnumList = getTypeForEnumList;
-function createTypesToImportsReducer(solution, namespace) {
-    const mapTypeToImport = createTypeToImportMapper(solution, namespace);
-    return (imports, types) => {
-        types.forEach(({ type, isEnum }) => {
-            const newImport = mapTypeToImport(type, isEnum);
-            if (!newImport) {
-                return;
-            }
-            if (newImport.specifiers.some(f => f.toLocaleLowerCase() === type.toLocaleLowerCase())) {
-                return;
-            }
-            const existingImport = imports.find(({ keyword, path }) => keyword === newImport.keyword && path === newImport.path);
-            if (!existingImport) {
-                return imports.push(newImport);
-            }
-            existingImport.refs = [...new Set([...existingImport.refs, ...newImport.refs])];
-            existingImport.specifiers = [
-                ...new Set([...existingImport.specifiers, ...newImport.specifiers]),
-            ].sort();
-        });
-        return imports;
-    };
-}
-exports.createTypesToImportsReducer = createTypesToImportsReducer;
-function createTypeToImportMapper(solution, namespace) {
-    const adaptType = createTypeAdapter();
-    const simplifyType = createTypeSimplifier();
-    return (type, isEnum) => {
-        if (!type || type.startsWith('System'))
-            return;
-        const modelNamespace = (0, namespace_1.parseNamespace)(solution, type);
-        const refs = [removeTypeModifiers(type)];
-        const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
-        let path = (0, path_1.relativePathToModel)(namespace, modelNamespace);
-        if (constants_1.VOLO_REGEX.test(type)) {
-            path = '@abp/ng.core';
-        }
-        if (isEnum) {
-            path = (0, path_1.relativePathToEnum)(namespace, modelNamespace, specifiers[0]);
-        }
-        return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
-    };
-}
-exports.createTypeToImportMapper = createTypeToImportMapper;
-function createTypeAdapter() {
-    const simplifyType = createTypeSimplifier();
-    return (type) => (0, tree_1.parseGenerics)(type, node => simplifyType(node.data)).toString();
-}
-exports.createTypeAdapter = createTypeAdapter;
-// naming here is depictive only
-function extendsSelf(type, base) {
-    return removeGenerics(base) === removeGenerics(type);
-}
-exports.extendsSelf = extendsSelf;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTypeSimplifier = createTypeSimplifier;
+exports.createTypeParser = createTypeParser;
+exports.createTypeNormalizer = createTypeNormalizer;
+exports.flattenDictionaryTypes = flattenDictionaryTypes;
+exports.normalizeTypeAnnotations = normalizeTypeAnnotations;
+exports.removeGenerics = removeGenerics;
+exports.removeTypeModifiers = removeTypeModifiers;
+exports.getTypeForEnumList = getTypeForEnumList;
+exports.createTypesToImportsReducer = createTypesToImportsReducer;
+exports.createTypeToImportMapper = createTypeToImportMapper;
+exports.createTypeAdapter = createTypeAdapter;
+exports.extendsSelf = extendsSelf;
+const constants_1 = require("../constants");
+const enums_1 = require("../enums");
+const models_1 = require("../models");
+const generics_1 = require("./generics");
+const namespace_1 = require("./namespace");
+const path_1 = require("./path");
+const tree_1 = require("./tree");
+function createTypeSimplifier() {
+    const parseType = createTypeParser(t => {
+        let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => constants_1.SYSTEM_TYPES.get(match) ?? 'any');
+        type = /any</.test(type) ? 'any' : type;
+        const { identifier, generics, array } = (0, generics_1.extractSimpleGenerics)(type);
+        return generics.length ? `${identifier}<${generics.join(', ')}>${array}` : identifier;
+    });
+    return (type) => {
+        const parsed = parseType(type);
+        const last = parsed.pop();
+        return parsed.reduceRight((record, tKey) => `Record<${tKey}, ${record}>`, last);
+    };
+}
+function createTypeParser(replacerFn = (t) => t) {
+    const normalizeType = createTypeNormalizer(replacerFn);
+    return (originalType) => flattenDictionaryTypes([], originalType).map(normalizeType);
+}
+function createTypeNormalizer(replacerFn = (t) => t) {
+    return (type) => {
+        return replacerFn(normalizeTypeAnnotations(type));
+    };
+}
+function flattenDictionaryTypes(types, type) {
+    type
+        .replace(/[}{]/g, '')
+        .split(':')
+        .forEach(t => types.push(t));
+    return types;
+}
+function normalizeTypeAnnotations(type) {
+    return type.replace(/\[(.+)+\]/g, '$1[]').replace(/\?/g, '');
+}
+function removeGenerics(type) {
+    return type.replace(/<.+>/g, '');
+}
+function removeTypeModifiers(type) {
+    return type.replace(/\[\]/g, '');
+}
+function getTypeForEnumList(type) {
+    return type.replace(/^.*<([^>]+)>.*$/, '[$1]');
+}
+function createTypesToImportsReducer(solution, namespace) {
+    const mapTypeToImport = createTypeToImportMapper(solution, namespace);
+    return (imports, types) => {
+        types.forEach(({ type, isEnum }) => {
+            const newImport = mapTypeToImport(type, isEnum);
+            if (!newImport) {
+                return;
+            }
+            if (newImport.specifiers.some(f => f.toLocaleLowerCase() === type.toLocaleLowerCase())) {
+                return;
+            }
+            const existingImport = imports.find(({ keyword, path }) => keyword === newImport.keyword && path === newImport.path);
+            if (!existingImport) {
+                return imports.push(newImport);
+            }
+            existingImport.refs = [...new Set([...existingImport.refs, ...newImport.refs])];
+            existingImport.specifiers = [
+                ...new Set([...existingImport.specifiers, ...newImport.specifiers]),
+            ].sort();
+        });
+        return imports;
+    };
+}
+function createTypeToImportMapper(solution, namespace) {
+    const adaptType = createTypeAdapter();
+    const simplifyType = createTypeSimplifier();
+    return (type, isEnum) => {
+        if (!type || type.startsWith('System'))
+            return;
+        const modelNamespace = (0, namespace_1.parseNamespace)(solution, type);
+        const refs = [removeTypeModifiers(type)];
+        const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
+        let path = (0, path_1.relativePathToModel)(namespace, modelNamespace);
+        if (constants_1.VOLO_REGEX.test(type)) {
+            path = '@abp/ng.core';
+        }
+        if (isEnum) {
+            path = (0, path_1.relativePathToEnum)(namespace, modelNamespace, specifiers[0]);
+        }
+        return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
+    };
+}
+function createTypeAdapter() {
+    const simplifyType = createTypeSimplifier();
+    return (type) => (0, tree_1.parseGenerics)(type, node => simplifyType(node.data)).toString();
+}
+// naming here is depictive only
+function extendsSelf(type, base) {
+    return removeGenerics(base) === removeGenerics(type);
+}
 //# sourceMappingURL=type.js.map

package/utils/type.js.map

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

package/utils/workspace.d.ts

@@ -1,20 +1,20 @@
-import { workspaces } from '@angular-devkit/core';
-import { Tree } from '@angular-devkit/schematics';
-import { Project } from '../models';
-import { ProjectType, WorkspaceSchema } from './angular';
-export declare function isLibrary(project: workspaces.ProjectDefinition): boolean;
-export declare function readEnvironment(tree: Tree, project: workspaces.ProjectDefinition): import("typescript").ObjectLiteralExpression | undefined;
-export declare function getFirstApplication(tree: Tree): {
-    name: string | undefined;
-    project: import("./angular").WorkspaceProject<ProjectType> | undefined;
-};
-export declare function readWorkspaceSchema(tree: Tree): WorkspaceSchema;
-export declare function resolveProject<T = any>(tree: Tree, name: string, notFoundValue?: T): Promise<Project | T>;
-export declare function getWorkspaceSchema(host: Tree): WorkspaceSchema;
-export declare function getWorkspacePath(host: Tree): string;
-/**
- * Build a default project path for generating.
- * @param project The project which will have its default path generated.
- * @param entryPoint The secondary-entry-point.
- */
-export declare function buildTargetPath(project: workspaces.ProjectDefinition, entryPoint?: string): string;
+import { workspaces } from '@angular-devkit/core';
+import { Tree } from '@angular-devkit/schematics';
+import { Project } from '../models';
+import { ProjectType, WorkspaceSchema } from './angular';
+export declare function isLibrary(project: workspaces.ProjectDefinition): boolean;
+export declare function readEnvironment(tree: Tree, project: workspaces.ProjectDefinition): import("typescript").ObjectLiteralExpression | undefined;
+export declare function getFirstApplication(tree: Tree): {
+    name: string | undefined;
+    project: import("./angular").WorkspaceProject<ProjectType> | undefined;
+};
+export declare function readWorkspaceSchema(tree: Tree): WorkspaceSchema;
+export declare function resolveProject<T = any>(tree: Tree, name: string, notFoundValue?: T): Promise<Project | T>;
+export declare function getWorkspaceSchema(host: Tree): WorkspaceSchema;
+export declare function getWorkspacePath(host: Tree): string;
+/**
+ * Build a default project path for generating.
+ * @param project The project which will have its default path generated.
+ * @param entryPoint The secondary-entry-point.
+ */
+export declare function buildTargetPath(project: workspaces.ProjectDefinition, entryPoint?: string): string;