@abp/ng.schematics 5.0.1 → 5.0.2

package/utils/tree.d.ts

@@ -1,13 +1,13 @@
-export declare class TypeNode {
-    data: string;
-    parent: TypeNode | null;
-    mapperFn: (node: TypeNode) => string;
-    children: TypeNode[];
-    index: number;
-    constructor(data: string, parent: TypeNode | null, mapperFn?: (node: TypeNode) => string);
-    toGenerics(): string[];
-    toString(): string;
-    valueOf(): string;
-}
-export declare function parseGenerics(type: string, mapperFn?: TypeNodeMapperFn): TypeNode;
-export declare type TypeNodeMapperFn = (node: TypeNode) => string;
+export declare class TypeNode {
+    data: string;
+    parent: TypeNode | null;
+    mapperFn: (node: TypeNode) => string;
+    children: TypeNode[];
+    index: number;
+    constructor(data: string, parent: TypeNode | null, mapperFn?: (node: TypeNode) => string);
+    toGenerics(): string[];
+    toString(): string;
+    valueOf(): string;
+}
+export declare function parseGenerics(type: string, mapperFn?: TypeNodeMapperFn): TypeNode;
+export declare type TypeNodeMapperFn = (node: TypeNode) => string;

package/utils/tree.js

@@ -1,57 +1,57 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGenerics = 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 parseGenerics(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.parseGenerics = parseGenerics;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseGenerics = 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 parseGenerics(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.parseGenerics = parseGenerics;
 //# sourceMappingURL=tree.js.map

package/utils/type.d.ts

@@ -1,12 +1,12 @@
-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 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 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,103 +1,103 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendsSelf = exports.createTypeAdapter = exports.createTypeToImportMapper = exports.createTypesToImportsReducer = 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) => { var _a; return (_a = constants_1.SYSTEM_TYPES.get(match)) !== null && _a !== void 0 ? _a : 'any'; });
-        type = /any</.test(type) ? 'any' : type;
-        const { identifier, generics } = generics_1.extractSimpleGenerics(type);
-        return generics.length ? `${identifier}<${generics.join(', ')}>` : 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 createTypesToImportsReducer(solution, namespace) {
-    const mapTypeToImport = createTypeToImportMapper(solution, namespace);
-    return (imports, types) => {
-        types.forEach(({ type, isEnum }) => {
-            const newImport = mapTypeToImport(type, isEnum);
-            if (!newImport)
-                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 = namespace_1.parseNamespace(solution, type);
-        const refs = [removeTypeModifiers(type)];
-        const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
-        const path = constants_1.VOLO_REGEX.test(type)
-            ? '@abp/ng.core'
-            : isEnum
-                ? path_1.relativePathToEnum(namespace, modelNamespace, specifiers[0])
-                : path_1.relativePathToModel(namespace, modelNamespace);
-        return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
-    };
-}
-exports.createTypeToImportMapper = createTypeToImportMapper;
-function createTypeAdapter() {
-    const simplifyType = createTypeSimplifier();
-    return (type) => 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.extendsSelf = exports.createTypeAdapter = exports.createTypeToImportMapper = exports.createTypesToImportsReducer = 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) => { var _a; return (_a = constants_1.SYSTEM_TYPES.get(match)) !== null && _a !== void 0 ? _a : 'any'; });
+        type = /any</.test(type) ? 'any' : type;
+        const { identifier, generics } = generics_1.extractSimpleGenerics(type);
+        return generics.length ? `${identifier}<${generics.join(', ')}>` : 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 createTypesToImportsReducer(solution, namespace) {
+    const mapTypeToImport = createTypeToImportMapper(solution, namespace);
+    return (imports, types) => {
+        types.forEach(({ type, isEnum }) => {
+            const newImport = mapTypeToImport(type, isEnum);
+            if (!newImport)
+                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 = namespace_1.parseNamespace(solution, type);
+        const refs = [removeTypeModifiers(type)];
+        const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
+        const path = constants_1.VOLO_REGEX.test(type)
+            ? '@abp/ng.core'
+            : isEnum
+                ? path_1.relativePathToEnum(namespace, modelNamespace, specifiers[0])
+                : path_1.relativePathToModel(namespace, modelNamespace);
+        return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
+    };
+}
+exports.createTypeToImportMapper = createTypeToImportMapper;
+function createTypeAdapter() {
+    const simplifyType = createTypeSimplifier();
+    return (type) => 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;
 //# sourceMappingURL=type.js.map

package/utils/workspace.d.ts

@@ -1,8 +1,8 @@
-import { workspaces } from '@angular-devkit/core';
-import { Tree } from '@angular-devkit/schematics';
-import { Project } from '../models';
-import { 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 readWorkspaceSchema(tree: Tree): WorkspaceSchema;
-export declare function resolveProject(tree: Tree, name: string): Promise<Project>;
+import { workspaces } from '@angular-devkit/core';
+import { Tree } from '@angular-devkit/schematics';
+import { Project } from '../models';
+import { 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 readWorkspaceSchema(tree: Tree): WorkspaceSchema;
+export declare function resolveProject(tree: Tree, name: string): Promise<Project>;

package/utils/workspace.js

@@ -1,67 +1,67 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveProject = exports.readWorkspaceSchema = exports.readEnvironment = exports.isLibrary = void 0;
-/* eslint-disable no-empty */
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const angular_1 = require("./angular");
-const ast_1 = require("./ast");
-const common_1 = require("./common");
-function isLibrary(project) {
-    return project.extensions['projectType'] === angular_1.ProjectType.Library;
-}
-exports.isLibrary = isLibrary;
-function readEnvironment(tree, project) {
-    if (isLibrary(project))
-        return undefined;
-    const srcPath = project.sourceRoot || `${project.root}/src`;
-    const envPath = srcPath + '/environments/environment.ts';
-    const source = common_1.readFileInTree(tree, envPath);
-    return ast_1.findEnvironmentExpression(source);
-}
-exports.readEnvironment = readEnvironment;
-function readWorkspaceSchema(tree) {
-    if (!tree.exists('/angular.json'))
-        throw new schematics_1.SchematicsException("[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file." /* NoWorkspace */);
-    let workspaceSchema;
-    try {
-        workspaceSchema = angular_1.getWorkspaceSchema(tree);
-    }
-    catch (_) {
-        throw new schematics_1.SchematicsException("[Invalid Workspace] The angular.json should be a valid JSON file." /* InvalidWorkspace */);
-    }
-    return workspaceSchema;
-}
-exports.readWorkspaceSchema = readWorkspaceSchema;
-async function resolveProject(tree, name) {
-    name = name || readWorkspaceSchema(tree).defaultProject;
-    const workspace = await angular_1.getWorkspace(tree);
-    let definition;
-    try {
-        definition = workspace.projects.get(name);
-    }
-    catch (_) { }
-    if (!definition)
-        try {
-            name = core_1.strings.dasherize(name);
-            definition = workspace.projects.get(name);
-        }
-        catch (_) { }
-    if (!definition)
-        try {
-            name = core_1.strings.camelize(name);
-            definition = workspace.projects.get(name);
-        }
-        catch (_) { }
-    if (!definition)
-        try {
-            name = core_1.strings.classify(name);
-            definition = workspace.projects.get(name);
-        }
-        catch (_) { }
-    if (!definition)
-        throw new schematics_1.SchematicsException("[Project Not Found] Either define a default project in your workspace or specify the project name in schematics options." /* NoProject */);
-    return { name, definition };
-}
-exports.resolveProject = resolveProject;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveProject = exports.readWorkspaceSchema = exports.readEnvironment = exports.isLibrary = void 0;
+/* eslint-disable no-empty */
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const angular_1 = require("./angular");
+const ast_1 = require("./ast");
+const common_1 = require("./common");
+function isLibrary(project) {
+    return project.extensions['projectType'] === angular_1.ProjectType.Library;
+}
+exports.isLibrary = isLibrary;
+function readEnvironment(tree, project) {
+    if (isLibrary(project))
+        return undefined;
+    const srcPath = project.sourceRoot || `${project.root}/src`;
+    const envPath = srcPath + '/environments/environment.ts';
+    const source = common_1.readFileInTree(tree, envPath);
+    return ast_1.findEnvironmentExpression(source);
+}
+exports.readEnvironment = readEnvironment;
+function readWorkspaceSchema(tree) {
+    if (!tree.exists('/angular.json'))
+        throw new schematics_1.SchematicsException("[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file." /* NoWorkspace */);
+    let workspaceSchema;
+    try {
+        workspaceSchema = angular_1.getWorkspaceSchema(tree);
+    }
+    catch (_) {
+        throw new schematics_1.SchematicsException("[Invalid Workspace] The angular.json should be a valid JSON file." /* InvalidWorkspace */);
+    }
+    return workspaceSchema;
+}
+exports.readWorkspaceSchema = readWorkspaceSchema;
+async function resolveProject(tree, name) {
+    name = name || readWorkspaceSchema(tree).defaultProject;
+    const workspace = await angular_1.getWorkspace(tree);
+    let definition;
+    try {
+        definition = workspace.projects.get(name);
+    }
+    catch (_) { }
+    if (!definition)
+        try {
+            name = core_1.strings.dasherize(name);
+            definition = workspace.projects.get(name);
+        }
+        catch (_) { }
+    if (!definition)
+        try {
+            name = core_1.strings.camelize(name);
+            definition = workspace.projects.get(name);
+        }
+        catch (_) { }
+    if (!definition)
+        try {
+            name = core_1.strings.classify(name);
+            definition = workspace.projects.get(name);
+        }
+        catch (_) { }
+    if (!definition)
+        throw new schematics_1.SchematicsException("[Project Not Found] Either define a default project in your workspace or specify the project name in schematics options." /* NoProject */);
+    return { name, definition };
+}
+exports.resolveProject = resolveProject;
 //# sourceMappingURL=workspace.js.map