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

package/utils/model.js

@@ -1,212 +1,218 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveSelfGenericProps = exports.resolveAbpPackages = exports.parseBaseTypeWithGenericTypes = exports.createRefToImportReducerCreator = exports.createImportRefToInterfaceReducerCreator = exports.createImportRefsToModelReducer = void 0;
-const models_1 = require("../models");
-const generics_1 = require("./generics");
-const namespace_1 = require("./namespace");
-const path_1 = require("./path");
-const text_1 = require("./text");
-const tree_1 = require("./tree");
-const type_1 = require("./type");
-const constants_1 = require("../constants");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const shouldQuote = require('should-quote');
-function createImportRefsToModelReducer(params) {
-    const reduceImportRefsToInterfaces = createImportRefToInterfaceReducerCreator(params);
-    const createRefToImportReducer = createRefToImportReducerCreator(params);
-    const { solution, types } = params;
-    return (models, importRefs) => {
-        const enums = [];
-        const interfaces = importRefs.reduce(reduceImportRefsToInterfaces, []);
-        sortInterfaces(interfaces);
-        interfaces.forEach(_interface => {
-            if (constants_1.VOLO_REGEX.test(_interface.ref) || constants_1.VOLO_PACKAGE_PROXY_IMPORTS.has(_interface.ref))
-                return;
-            if (types[_interface.ref].isEnum) {
-                if (!enums.includes(_interface.ref))
-                    enums.push(_interface.ref);
-                return;
-            }
-            const index = models.findIndex(m => m.namespace === _interface.namespace);
-            if (index > -1) {
-                if (models[index].interfaces.some(i => i.identifier === _interface.identifier))
-                    return;
-                models[index].interfaces.push(_interface);
-            }
-            else {
-                const { namespace } = _interface;
-                models.push(new models_1.Model({
-                    interfaces: [_interface],
-                    namespace,
-                    path: (0, path_1.relativePathToModel)(namespace, namespace),
-                }));
-            }
-        });
-        models.forEach(model => {
-            const toBeImported = [];
-            model.interfaces.forEach(_interface => {
-                const { baseType } = types[_interface.ref];
-                if (baseType && (0, namespace_1.parseNamespace)(solution, baseType) !== model.namespace) {
-                    const baseTypeWithGenericParams = parseBaseTypeWithGenericTypes(baseType);
-                    baseTypeWithGenericParams.forEach(t => {
-                        toBeImported.push({
-                            type: t,
-                            isEnum: false,
-                        });
-                    });
-                }
-                [..._interface.properties, ..._interface.generics].forEach(prop => {
-                    prop.refs.forEach(ref => {
-                        const propType = types[ref];
-                        if (!propType) {
-                            return;
-                        }
-                        if (propType.isEnum) {
-                            toBeImported.push({ type: ref, isEnum: true });
-                        }
-                        else if ((0, namespace_1.parseNamespace)(solution, ref) !== model.namespace) {
-                            toBeImported.push({ type: ref, isEnum: false });
-                        }
-                    });
-                });
-            });
-            if (!toBeImported.length)
-                return;
-            const reduceRefToImport = createRefToImportReducer(model.namespace);
-            reduceRefToImport(model.imports, toBeImported);
-        });
-        return models;
-    };
-}
-exports.createImportRefsToModelReducer = createImportRefsToModelReducer;
-function sortInterfaces(interfaces) {
-    interfaces.sort((a, b) => (a.identifier > b.identifier ? 1 : -1));
-}
-function createImportRefToInterfaceReducerCreator(params) {
-    const { solution, types } = params;
-    const parseType = (0, type_1.createTypeParser)(type_1.removeTypeModifiers);
-    const simplifyType = (0, type_1.createTypeSimplifier)();
-    const getIdentifier = (type) => (0, type_1.removeTypeModifiers)(simplifyType(type));
-    const genericsCollector = new generics_1.GenericsCollector(getIdentifier);
-    return reduceRefsToInterfaces;
-    function reduceRefsToInterfaces(interfaces, ref) {
-        const typeDef = types[ref];
-        if (!typeDef)
-            return interfaces;
-        const namespace = (0, namespace_1.parseNamespace)(solution, ref);
-        let { baseType: base, genericArguments } = typeDef;
-        genericArguments = genericArguments || [];
-        let identifier = getIdentifier(ref);
-        identifier = (0, generics_1.replacePlaceholdersWithGenerics)(identifier, genericArguments, genericsCollector);
-        if (base) {
-            if ((0, type_1.extendsSelf)(ref, base)) {
-                genericsCollector.collect((0, generics_1.extractGenerics)(base).generics, genericArguments);
-                return reduceRefsToInterfaces(interfaces, (0, generics_1.generateRefWithPlaceholders)(base));
-            }
-            else {
-                base = getIdentifier(base);
-            }
-        }
-        const { generics } = genericsCollector;
-        const _interface = new models_1.Interface({ identifier, base, namespace, ref, generics });
-        genericsCollector.reset();
-        typeDef.properties?.forEach(prop => {
-            let name = prop.jsonName || (0, text_1.camel)(prop.name);
-            name = shouldQuote(name) ? `'${name}'` : name;
-            let type = simplifyType(prop.typeSimple);
-            if (prop.typeSimple.includes('enum')) {
-                type = simplifyType(prop.type);
-            }
-            if (prop.isNullable) {
-                type = `${type} | null`;
-            }
-            const refs = parseType(prop.type).reduce((acc, r) => acc.concat((0, tree_1.parseGenerics)(r).toGenerics()), []);
-            const property = new models_1.Property({ name, type, refs });
-            property.setOptional(isOptionalProperty(prop));
-            _interface.properties.push(property);
-        });
-        interfaces.push(_interface);
-        return [..._interface.properties, ..._interface.generics]
-            .reduce((refs, prop) => {
-            prop.refs.forEach(type => {
-                if (types[type]?.isEnum)
-                    return;
-                if (interfaces.some(i => i.ref === type))
-                    return;
-                refs.push(type);
-            });
-            return refs;
-        }, [])
-            .concat(base ? (0, tree_1.parseGenerics)(typeDef.baseType).toGenerics() : [])
-            .reduce(reduceRefsToInterfaces, interfaces);
-    }
-}
-exports.createImportRefToInterfaceReducerCreator = createImportRefToInterfaceReducerCreator;
-function createRefToImportReducerCreator(params) {
-    const { solution } = params;
-    return (namespace) => (0, type_1.createTypesToImportsReducer)(solution, namespace);
-}
-exports.createRefToImportReducerCreator = createRefToImportReducerCreator;
-function isOptionalProperty(prop) {
-    return !prop.isRequired;
-}
-function parseBaseTypeWithGenericTypes(type) {
-    const parsedTypeNode = (0, tree_1.parseGenerics)(type);
-    const nodeToText = (node, acc = []) => {
-        acc.push(node.data);
-        if (node.children && node.children.length > 0) {
-            node.children.forEach(child => {
-                nodeToText(child, acc);
-            });
-        }
-        return acc;
-    };
-    return nodeToText(parsedTypeNode);
-}
-exports.parseBaseTypeWithGenericTypes = parseBaseTypeWithGenericTypes;
-function resolveAbpPackages(models) {
-    for (const model of models) {
-        renamePropForTenant(model.interfaces);
-        model.imports.forEach((imp, i) => {
-            for (const ref of imp.refs) {
-                const path = constants_1.VOLO_PACKAGE_PROXY_IMPORTS.get(ref);
-                if (path) {
-                    model.imports[i] = new models_1.Import({ ...imp, path });
-                }
-            }
-        });
-    }
-}
-exports.resolveAbpPackages = resolveAbpPackages;
-function renamePropForTenant(interfaces) {
-    for (const inters of interfaces) {
-        for (const prop of inters.properties) {
-            const isTenant = prop.name.toLocaleLowerCase().includes(constants_1.TENANT_KEY);
-            const isSaasDto = prop.refs.filter(f => f.startsWith(constants_1.SAAS_NAMESPACE)).length > 0;
-            if (isTenant && isSaasDto && !prop.type.startsWith('Saas')) {
-                prop.type = 'Saas' + prop.type;
-            }
-        }
-    }
-}
-function resolveSelfGenericProps(params) {
-    const { types, solution } = params;
-    if (!types || !solution) {
-        return;
-    }
-    Object.keys(types)
-        .filter(f => f.startsWith(solution))
-        .forEach(key => {
-        const type = types[key];
-        if (type.genericArguments?.length) {
-            type.properties?.map(prop => {
-                if (prop.type.includes('<>')) {
-                    prop.type = prop.type.replace('<>', `<${type.genericArguments.join(', ')}>`);
-                    prop.typeSimple = prop.typeSimple.replace('<>', `<${type.genericArguments.join(', ')}>`);
-                }
-            });
-        }
-    });
-}
-exports.resolveSelfGenericProps = resolveSelfGenericProps;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createImportRefsToModelReducer = createImportRefsToModelReducer;
+exports.createImportRefToInterfaceReducerCreator = createImportRefToInterfaceReducerCreator;
+exports.createRefToImportReducerCreator = createRefToImportReducerCreator;
+exports.parseBaseTypeWithGenericTypes = parseBaseTypeWithGenericTypes;
+exports.resolveAbpPackages = resolveAbpPackages;
+exports.resolveSelfGenericProps = resolveSelfGenericProps;
+const models_1 = require("../models");
+const generics_1 = require("./generics");
+const namespace_1 = require("./namespace");
+const path_1 = require("./path");
+const text_1 = require("./text");
+const tree_1 = require("./tree");
+const type_1 = require("./type");
+const constants_1 = require("../constants");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const shouldQuote = require('should-quote');
+function createImportRefsToModelReducer(params) {
+    const reduceImportRefsToInterfaces = createImportRefToInterfaceReducerCreator(params);
+    const createRefToImportReducer = createRefToImportReducerCreator(params);
+    const { solution, types } = params;
+    return (models, importRefs) => {
+        const enums = [];
+        const interfaces = importRefs.reduce(reduceImportRefsToInterfaces, []);
+        sortInterfaces(interfaces);
+        interfaces.forEach(_interface => {
+            if (constants_1.VOLO_REGEX.test(_interface.ref) || constants_1.VOLO_PACKAGE_PROXY_IMPORTS.has(_interface.ref))
+                return;
+            if (types[_interface.ref].isEnum) {
+                if (!enums.includes(_interface.ref))
+                    enums.push(_interface.ref);
+                return;
+            }
+            const index = models.findIndex(m => m.namespace === _interface.namespace);
+            if (index > -1) {
+                if (models[index].interfaces.some(i => i.identifier === _interface.identifier))
+                    return;
+                models[index].interfaces.push(_interface);
+            }
+            else {
+                const { namespace } = _interface;
+                models.push(new models_1.Model({
+                    interfaces: [_interface],
+                    namespace,
+                    path: (0, path_1.relativePathToModel)(namespace, namespace),
+                }));
+            }
+        });
+        models.forEach(model => {
+            const toBeImported = [];
+            model.interfaces.forEach(_interface => {
+                const { baseType } = types[_interface.ref];
+                if (baseType && (0, namespace_1.parseNamespace)(solution, baseType) !== model.namespace) {
+                    const baseTypeWithGenericParams = parseBaseTypeWithGenericTypes(baseType);
+                    baseTypeWithGenericParams.forEach(t => {
+                        // A generic argument of the base type (e.g. T in PagedResultDto<T>) may live in the
+                        // same namespace as this model, which means it is generated into the same models.ts
+                        // file. Importing it would produce an invalid self-import (`from './models'`), so we
+                        // skip same-namespace types here, mirroring the property handling below. See #25080.
+                        if ((0, namespace_1.parseNamespace)(solution, t) === model.namespace) {
+                            return;
+                        }
+                        toBeImported.push({
+                            type: t,
+                            isEnum: false,
+                        });
+                    });
+                }
+                [..._interface.properties, ..._interface.generics].forEach(prop => {
+                    prop.refs.forEach(ref => {
+                        const propType = types[ref];
+                        if (!propType) {
+                            return;
+                        }
+                        if (propType.isEnum) {
+                            toBeImported.push({ type: ref, isEnum: true });
+                        }
+                        else if ((0, namespace_1.parseNamespace)(solution, ref) !== model.namespace) {
+                            toBeImported.push({ type: ref, isEnum: false });
+                        }
+                    });
+                });
+            });
+            if (!toBeImported.length)
+                return;
+            const reduceRefToImport = createRefToImportReducer(model.namespace);
+            reduceRefToImport(model.imports, toBeImported);
+        });
+        return models;
+    };
+}
+function sortInterfaces(interfaces) {
+    interfaces.sort((a, b) => (a.identifier > b.identifier ? 1 : -1));
+}
+function createImportRefToInterfaceReducerCreator(params) {
+    const { solution, types } = params;
+    const parseType = (0, type_1.createTypeParser)(type_1.removeTypeModifiers);
+    const simplifyType = (0, type_1.createTypeSimplifier)();
+    const getIdentifier = (type) => (0, type_1.removeTypeModifiers)(simplifyType(type));
+    const genericsCollector = new generics_1.GenericsCollector(getIdentifier);
+    return reduceRefsToInterfaces;
+    function reduceRefsToInterfaces(interfaces, ref) {
+        const typeDef = types[ref];
+        if (!typeDef)
+            return interfaces;
+        const namespace = (0, namespace_1.parseNamespace)(solution, ref);
+        let { baseType: base, genericArguments } = typeDef;
+        genericArguments = genericArguments || [];
+        let identifier = getIdentifier(ref);
+        identifier = (0, generics_1.replacePlaceholdersWithGenerics)(identifier, genericArguments, genericsCollector);
+        if (base) {
+            if ((0, type_1.extendsSelf)(ref, base)) {
+                genericsCollector.collect((0, generics_1.extractGenerics)(base).generics, genericArguments);
+                return reduceRefsToInterfaces(interfaces, (0, generics_1.generateRefWithPlaceholders)(base));
+            }
+            else {
+                base = getIdentifier(base);
+            }
+        }
+        const { generics } = genericsCollector;
+        const _interface = new models_1.Interface({ identifier, base, namespace, ref, generics });
+        genericsCollector.reset();
+        typeDef.properties?.forEach(prop => {
+            let name = prop.jsonName || (0, text_1.camel)(prop.name);
+            name = shouldQuote(name) ? `'${name}'` : name;
+            let type = simplifyType(prop.typeSimple);
+            if (prop.typeSimple.includes('enum')) {
+                type = simplifyType(prop.type);
+            }
+            if (prop.isNullable) {
+                type = `${type} | null`;
+            }
+            const refs = parseType(prop.type).reduce((acc, r) => acc.concat((0, tree_1.parseGenerics)(r).toGenerics()), []);
+            const property = new models_1.Property({ name, type, refs });
+            property.setOptional(isOptionalProperty(prop));
+            _interface.properties.push(property);
+        });
+        interfaces.push(_interface);
+        return [..._interface.properties, ..._interface.generics]
+            .reduce((refs, prop) => {
+            prop.refs.forEach(type => {
+                if (types[type]?.isEnum)
+                    return;
+                if (interfaces.some(i => i.ref === type))
+                    return;
+                refs.push(type);
+            });
+            return refs;
+        }, [])
+            .concat(base ? (0, tree_1.parseGenerics)(typeDef.baseType).toGenerics() : [])
+            .reduce(reduceRefsToInterfaces, interfaces);
+    }
+}
+function createRefToImportReducerCreator(params) {
+    const { solution } = params;
+    return (namespace) => (0, type_1.createTypesToImportsReducer)(solution, namespace);
+}
+function isOptionalProperty(prop) {
+    return !prop.isRequired;
+}
+function parseBaseTypeWithGenericTypes(type) {
+    const parsedTypeNode = (0, tree_1.parseGenerics)(type);
+    const nodeToText = (node, acc = []) => {
+        acc.push(node.data);
+        if (node.children && node.children.length > 0) {
+            node.children.forEach(child => {
+                nodeToText(child, acc);
+            });
+        }
+        return acc;
+    };
+    return nodeToText(parsedTypeNode);
+}
+function resolveAbpPackages(models) {
+    for (const model of models) {
+        renamePropForTenant(model.interfaces);
+        model.imports.forEach((imp, i) => {
+            for (const ref of imp.refs) {
+                const path = constants_1.VOLO_PACKAGE_PROXY_IMPORTS.get(ref);
+                if (path) {
+                    model.imports[i] = new models_1.Import({ ...imp, path });
+                }
+            }
+        });
+    }
+}
+function renamePropForTenant(interfaces) {
+    for (const inters of interfaces) {
+        for (const prop of inters.properties) {
+            const isTenant = prop.name.toLocaleLowerCase().includes(constants_1.TENANT_KEY);
+            const isSaasDto = prop.refs.filter(f => f.startsWith(constants_1.SAAS_NAMESPACE)).length > 0;
+            if (isTenant && isSaasDto && !prop.type.startsWith('Saas')) {
+                prop.type = 'Saas' + prop.type;
+            }
+        }
+    }
+}
+function resolveSelfGenericProps(params) {
+    const { types, solution } = params;
+    if (!types || !solution) {
+        return;
+    }
+    Object.keys(types)
+        .filter(f => f.startsWith(solution))
+        .forEach(key => {
+        const type = types[key];
+        if (type.genericArguments?.length) {
+            type.properties?.map(prop => {
+                if (prop.type.includes('<>')) {
+                    prop.type = prop.type.replace('<>', `<${type.genericArguments.join(', ')}>`);
+                    prop.typeSimple = prop.typeSimple.replace('<>', `<${type.genericArguments.join(', ')}>`);
+                }
+            });
+        }
+    });
+}
 //# sourceMappingURL=model.js.map

package/utils/model.js.map

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

package/utils/namespace.d.ts

@@ -1 +1 @@
-export declare function parseNamespace(solution: string, type: string): string;
+export declare function parseNamespace(solution: string, type: string): string;

package/utils/namespace.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNamespace = void 0;
-const type_1 = require("./type");
-function parseNamespace(solution, type) {
-    const parseType = (0, type_1.createTypeParser)(type_1.removeGenerics);
-    let namespace = parseType(type)[0].split('.').slice(0, -1).join('.');
-    if (solution === namespace)
-        return '';
-    solution.split('.').reduceRight((acc, part) => {
-        acc = `${part}\\.${acc}`;
-        const regex = new RegExp(`^${acc}(Controllers\\.)?`);
-        namespace = namespace.replace(regex, '');
-        return acc;
-    }, '');
-    return namespace;
-}
-exports.parseNamespace = parseNamespace;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseNamespace = parseNamespace;
+const type_1 = require("./type");
+function parseNamespace(solution, type) {
+    const parseType = (0, type_1.createTypeParser)(type_1.removeGenerics);
+    let namespace = parseType(type)[0].split('.').slice(0, -1).join('.');
+    if (solution === namespace)
+        return '';
+    solution.split('.').reduceRight((acc, part) => {
+        acc = `${part}\\.${acc}`;
+        const regex = new RegExp(`^${acc}(Controllers\\.)?`);
+        namespace = namespace.replace(regex, '');
+        return acc;
+    }, '');
+    return namespace;
+}
 //# sourceMappingURL=namespace.js.map

package/utils/namespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/namespace.ts"],"names":[],"mappings":";;;AAAA,iCAA0D;AAE1D,SAAgB,cAAc,CAAC,QAAgB,EAAE,IAAY;IAC3D,MAAM,SAAS,GAAG,IAAA,uBAAgB,EAAC,qBAAc,CAAC,CAAC;IACnD,IAAI,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEtC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5C,GAAG,GAAG,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;QACrD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,SAAS,CAAC;AACnB,CAAC;AAdD,wCAcC"}
+{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/namespace.ts"],"names":[],"mappings":";;AAEA,wCAcC;AAhBD,iCAA0D;AAE1D,SAAgB,cAAc,CAAC,QAAgB,EAAE,IAAY;IAC3D,MAAM,SAAS,GAAG,IAAA,uBAAgB,EAAC,qBAAc,CAAC,CAAC;IACnD,IAAI,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEtC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5C,GAAG,GAAG,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;QACrD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/utils/ng-module.d.ts

@@ -1,46 +1,46 @@
-import { Tree, UpdateRecorder } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-import { Path } from '@angular-devkit/core';
-/**
- * Checks whether a specific import or provider exists in the specified metadata
- * array (`imports`, `providers`, etc.) of the `NgModule` decorator in the AppModule.
- *
- * This function locates the AppModule file of the given Angular project,
- * parses its AST, and inspects the specified metadata array to determine
- * if it includes an element matching the provided string (e.g., `CommonModule`, `HttpClientModule`).
- *
- * @param host - The virtual file system tree used by Angular schematics.
- * @param projectName - The name of the Angular project.
- * @param metadataFn - The name (string) to match against the elements of the metadata array.
- * @param metadataName - The metadata field to search in (e.g., 'imports', 'providers'). Defaults to 'imports'.
- * @returns A promise that resolves to `true` if the metadata function is found, or `false` otherwise.
- * @throws SchematicsException if the AppModule file or expected metadata is not found or malformed.
- */
-export declare const hasImportInNgModule: (host: Tree, projectName: string, metadataFn: string, metadataName?: string) => Promise<boolean>;
-/**
- * Attempts to locate the path of the `AppRoutingModule` file that is imported
- * within the root AppModule file of an Angular application.
- *
- * This function reads the AppModule file (resolved from the main file path),
- * parses its AST, and searches for an import declaration that imports
- * `AppRoutingModule`. Once found, it resolves the import path to a normalized
- * file path relative to the workspace root.
- *
- * @param tree - The virtual file system tree used by Angular schematics.
- * @param mainFilePath - The path to the main entry file of the Angular application (typically `main.ts`).
- * @returns A normalized workspace-relative path to the AppRoutingModule file if found, or `null` otherwise.
- * @throws If the route file path is resolved but the file does not exist in the tree.
- */
-export declare function findAppRoutesModulePath(tree: Tree, mainFilePath: string): Promise<Path | null>;
-/**
- * Cleans up empty or invalid expressions (e.g., extra commas) from the `imports` and `providers`
- * arrays in the NgModule decorator of an Angular module file.
- *
- * This function parses the source file's AST, locates the `NgModule` decorator, and processes
- * the `imports` and `providers` metadata fields. If these fields contain array literals with
- * empty slots (such as trailing or double commas), they are removed and the array is rewritten.
- *
- * @param source - The TypeScript source file containing the Angular module.
- * @param recorder - The recorder used to apply changes to the source file.
- */
-export declare function cleanEmptyExprFromModule(source: ts.SourceFile, recorder: UpdateRecorder): void;
+import { Tree, UpdateRecorder } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+import { Path } from '@angular-devkit/core';
+/**
+ * Checks whether a specific import or provider exists in the specified metadata
+ * array (`imports`, `providers`, etc.) of the `NgModule` decorator in the AppModule.
+ *
+ * This function locates the AppModule file of the given Angular project,
+ * parses its AST, and inspects the specified metadata array to determine
+ * if it includes an element matching the provided string (e.g., `CommonModule`, `HttpClientModule`).
+ *
+ * @param host - The virtual file system tree used by Angular schematics.
+ * @param projectName - The name of the Angular project.
+ * @param metadataFn - The name (string) to match against the elements of the metadata array.
+ * @param metadataName - The metadata field to search in (e.g., 'imports', 'providers'). Defaults to 'imports'.
+ * @returns A promise that resolves to `true` if the metadata function is found, or `false` otherwise.
+ * @throws SchematicsException if the AppModule file or expected metadata is not found or malformed.
+ */
+export declare const hasImportInNgModule: (host: Tree, projectName: string, metadataFn: string, metadataName?: string) => Promise<boolean>;
+/**
+ * Attempts to locate the path of the `AppRoutingModule` file that is imported
+ * within the root AppModule file of an Angular application.
+ *
+ * This function reads the AppModule file (resolved from the main file path),
+ * parses its AST, and searches for an import declaration that imports
+ * `AppRoutingModule`. Once found, it resolves the import path to a normalized
+ * file path relative to the workspace root.
+ *
+ * @param tree - The virtual file system tree used by Angular schematics.
+ * @param mainFilePath - The path to the main entry file of the Angular application (typically `main.ts`).
+ * @returns A normalized workspace-relative path to the AppRoutingModule file if found, or `null` otherwise.
+ * @throws If the route file path is resolved but the file does not exist in the tree.
+ */
+export declare function findAppRoutesModulePath(tree: Tree, mainFilePath: string): Promise<Path | null>;
+/**
+ * Cleans up empty or invalid expressions (e.g., extra commas) from the `imports` and `providers`
+ * arrays in the NgModule decorator of an Angular module file.
+ *
+ * This function parses the source file's AST, locates the `NgModule` decorator, and processes
+ * the `imports` and `providers` metadata fields. If these fields contain array literals with
+ * empty slots (such as trailing or double commas), they are removed and the array is rewritten.
+ *
+ * @param source - The TypeScript source file containing the Angular module.
+ * @param recorder - The recorder used to apply changes to the source file.
+ */
+export declare function cleanEmptyExprFromModule(source: ts.SourceFile, recorder: UpdateRecorder): void;