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

package/commands/change-theme/index.js

@@ -1,411 +1,414 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateIndexHtml = exports.adjustProvideAbpThemeShared = exports.cleanEmptyExpressions = exports.formatFile = exports.styleCompareFn = exports.removeThemeBasedStyles = exports.getProjectTargetOptions = exports.getImportPaths = exports.createSourceFile = exports.insertProviders = exports.insertImports = exports.insertHelperImports = exports.removeProviderFromNgModuleMetadata = exports.removeImportsFromStandaloneProviders = exports.removeImportFromNgModuleMetadata = exports.removeImportPath = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const ts = require("typescript");
-const style_map_1 = require("./style-map");
-const utils_1 = require("../../utils");
-const theme_options_enum_1 = require("./theme-options.enum");
-const ast_utils_1 = require("../../utils/angular/ast-utils");
-const util_1 = require("../../utils/angular/standalone/util");
-function default_1(_options) {
-    return async () => {
-        const targetThemeName = _options.name;
-        const selectedProject = _options.targetProject;
-        if (!targetThemeName) {
-            throw new schematics_1.SchematicsException('The theme name does not selected');
-        }
-        return (0, schematics_1.chain)([
-            (0, utils_1.updateWorkspace)(storedWorkspace => {
-                updateProjectStyle(selectedProject, storedWorkspace, targetThemeName);
-            }),
-            updateAppModule(selectedProject, targetThemeName),
-        ]);
-    };
-}
-exports.default = default_1;
-function updateProjectStyle(projectName, workspace, targetThemeName) {
-    const project = workspace.projects.get(projectName);
-    if (!project) {
-        throw new schematics_1.SchematicsException('The target project does not selected');
-    }
-    if ((0, utils_1.isLibrary)(project)) {
-        throw new schematics_1.SchematicsException('The library project does not supported');
-    }
-    const targetOption = getProjectTargetOptions(project, 'build');
-    const styles = targetOption.styles;
-    const sanitizedStyles = removeThemeBasedStyles(styles);
-    const newStyles = style_map_1.styleMap.get(targetThemeName);
-    if (!newStyles) {
-        throw new schematics_1.SchematicsException('The theme does not found');
-    }
-    targetOption.styles = [...newStyles, ...sanitizedStyles];
-}
-function updateAppModule(selectedProject, targetThemeName) {
-    return async (host) => {
-        const mainFilePath = await (0, util_1.getMainFilePath)(host, selectedProject);
-        const isStandalone = (0, utils_1.isStandaloneApp)(host, mainFilePath);
-        const appModulePath = isStandalone
-            ? (0, utils_1.getAppConfigPath)(host, mainFilePath)
-            : (0, utils_1.getAppModulePath)(host, mainFilePath);
-        return (0, schematics_1.chain)([
-            removeImportPath(appModulePath, targetThemeName),
-            ...(!isStandalone ? [removeImportFromNgModuleMetadata(appModulePath, targetThemeName)] : []),
-            isStandalone
-                ? removeImportsFromStandaloneProviders(appModulePath, targetThemeName)
-                : removeProviderFromNgModuleMetadata(appModulePath, targetThemeName),
-            insertHelperImports(appModulePath, targetThemeName),
-            insertImports(selectedProject, targetThemeName),
-            insertProviders(selectedProject, targetThemeName),
-            adjustProvideAbpThemeShared(appModulePath, targetThemeName),
-            updateIndexHtml(selectedProject, targetThemeName),
-            cleanEmptyExpressions(appModulePath, isStandalone),
-        ]);
-    };
-}
-function removeImportPath(filePath, selectedTheme) {
-    return (host) => {
-        const buffer = host.read(filePath);
-        if (!buffer)
-            return host;
-        const sourceText = buffer.toString('utf-8');
-        const source = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
-        const recorder = host.beginUpdate(filePath);
-        const impMap = getImportPaths(selectedTheme, true);
-        const nodes = (0, ast_utils_1.findNodes)(source, ts.isImportDeclaration);
-        const filteredNodes = nodes.filter(node => {
-            const importPath = node.moduleSpecifier.text;
-            const namedBindings = node.importClause?.namedBindings;
-            return impMap.some(({ path, importName }) => {
-                const symbol = importName.split('.')[0];
-                const matchesPath = !!path && importPath === path;
-                const matchesSymbol = !!namedBindings &&
-                    ts.isNamedImports(namedBindings) &&
-                    namedBindings.elements.some(e => e.name.text === symbol);
-                return matchesPath || matchesSymbol;
-            });
-        });
-        for (const node of filteredNodes) {
-            recorder.remove(node.getStart(), node.getWidth());
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.removeImportPath = removeImportPath;
-function removeImportFromNgModuleMetadata(appModulePath, selectedTheme) {
-    return (host) => {
-        const recorder = host.beginUpdate(appModulePath);
-        const source = createSourceFile(host, appModulePath);
-        const impMap = getImportPaths(selectedTheme, true);
-        const node = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0] || {};
-        if (!node) {
-            throw new schematics_1.SchematicsException('The app module does not found');
-        }
-        const matchingProperties = (0, ast_utils_1.getMetadataField)(node, 'imports');
-        const assignment = matchingProperties[0];
-        const assignmentInit = assignment.initializer;
-        const elements = assignmentInit.elements;
-        if (!elements || elements.length < 1) {
-            throw new schematics_1.SchematicsException(`Elements could not found: ${elements}`);
-        }
-        const filteredElements = elements.filter(f => impMap.some(s => f.getText().match(s.importName)));
-        if (!filteredElements || filteredElements.length < 1) {
-            return;
-        }
-        filteredElements.map(willRemoveModule => recorder.remove(willRemoveModule.getStart(), willRemoveModule.getWidth() + 1));
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.removeImportFromNgModuleMetadata = removeImportFromNgModuleMetadata;
-function removeImportsFromStandaloneProviders(mainPath, selectedTheme) {
-    return (host) => {
-        const buffer = host.read(mainPath);
-        if (!buffer)
-            return host;
-        const sourceText = buffer.toString('utf-8');
-        const source = ts.createSourceFile(mainPath, sourceText, ts.ScriptTarget.Latest, true);
-        const recorder = host.beginUpdate(mainPath);
-        const impMap = getImportPaths(selectedTheme, true);
-        const callExpressions = (0, ast_utils_1.findNodes)(source, ts.isCallExpression);
-        for (const expr of callExpressions) {
-            const exprText = expr.getText();
-            if (expr.expression.getText() === 'importProvidersFrom') {
-                const args = expr.arguments;
-                let modules = [];
-                if (args.length === 1 && ts.isArrayLiteralExpression(args[0])) {
-                    modules = args[0].elements;
-                }
-                else {
-                    modules = args;
-                }
-                const elementsToRemove = modules.filter(el => impMap.some(({ importName }) => el.getText().includes(importName)));
-                if (elementsToRemove.length) {
-                    for (const removeEl of elementsToRemove) {
-                        const start = removeEl.getFullStart();
-                        const end = removeEl.getEnd();
-                        const nextChar = sourceText.slice(end, end + 1);
-                        const prevChar = sourceText.slice(start - 1, start);
-                        if (nextChar === ',') {
-                            recorder.remove(start, end - start + 1);
-                        }
-                        else if (prevChar === ',') {
-                            recorder.remove(start - 1, end - start + 1);
-                        }
-                        else {
-                            recorder.remove(start, end - start);
-                        }
-                    }
-                }
-                const remaining = modules.filter(el => !elementsToRemove.includes(el));
-                if (remaining.length === 0) {
-                    const start = expr.getFullStart();
-                    const end = expr.getEnd();
-                    const nextChar = sourceText.slice(end, end + 1);
-                    const prevChar = sourceText.slice(start - 1, start);
-                    if (nextChar === ',') {
-                        recorder.remove(start, end - start + 1);
-                    }
-                    else if (prevChar === ',') {
-                        recorder.remove(start - 1, end - start + 1);
-                    }
-                    else {
-                        recorder.remove(start, end - start);
-                    }
-                }
-            }
-            else {
-                const match = impMap.find(({ importName, provider }) => {
-                    const moduleSymbol = importName?.split('.')[0];
-                    return ((moduleSymbol && exprText.includes(moduleSymbol)) ||
-                        (provider && exprText.includes(provider)));
-                });
-                if (match) {
-                    const start = expr.getFullStart();
-                    const end = expr.getEnd();
-                    const nextChar = sourceText.slice(end, end + 1);
-                    const prevChar = sourceText.slice(start - 1, start);
-                    if (nextChar === ',') {
-                        recorder.remove(start, end - start + 1);
-                    }
-                    else if (prevChar === ',') {
-                        recorder.remove(start - 1, end - start + 1);
-                    }
-                    else {
-                        recorder.remove(start, end - start);
-                    }
-                }
-            }
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.removeImportsFromStandaloneProviders = removeImportsFromStandaloneProviders;
-function removeProviderFromNgModuleMetadata(appModulePath, selectedTheme) {
-    return (host) => {
-        const recorder = host.beginUpdate(appModulePath);
-        const source = createSourceFile(host, appModulePath);
-        const impMap = getImportPaths(selectedTheme, true);
-        const node = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
-        if (!node) {
-            throw new schematics_1.SchematicsException('The app module does not found');
-        }
-        const providersProperty = (0, ast_utils_1.getMetadataField)(node, 'providers')[0];
-        const providersArray = providersProperty.initializer;
-        if (!providersArray.elements.length)
-            return host;
-        for (const element of providersArray.elements) {
-            const elementText = element.getText();
-            const match = impMap.find(({ provider }) => {
-                if (!provider)
-                    return false;
-                const providerName = provider.replace(/\(\s*\)$/, '').trim();
-                return provider && elementText.includes(providerName);
-            });
-            if (match) {
-                const start = element.getFullStart();
-                const end = element.getEnd();
-                const nextChar = source.text.slice(end, end + 1);
-                const prevChar = source.text.slice(start - 1, start);
-                if (nextChar === ',') {
-                    recorder.remove(start, end - start + 1);
-                }
-                else if (prevChar === ',') {
-                    recorder.remove(start - 1, end - start + 1);
-                }
-                else {
-                    recorder.remove(start, end - start);
-                }
-            }
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.removeProviderFromNgModuleMetadata = removeProviderFromNgModuleMetadata;
-function insertHelperImports(filePath, selectedTheme) {
-    return (host) => {
-        const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
-        const helpers = selectedThemeImports?.filter(s => !s.doNotImport && s.importName && s.path && !s.expression && !s.provider);
-        if (!helpers || helpers.length === 0) {
-            return host;
-        }
-        const buffer = host.read(filePath);
-        if (!buffer)
-            return host;
-        const sourceText = buffer.toString('utf-8');
-        const source = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
-        const recorder = host.beginUpdate(filePath);
-        for (const { importName, path } of helpers) {
-            const existingImport = (0, ast_utils_1.findNodes)(source, ts.isImportDeclaration).find(node => {
-                const moduleSpecifier = node.moduleSpecifier.text;
-                const namedBindings = node.importClause?.namedBindings;
-                if (moduleSpecifier === path && namedBindings && ts.isNamedImports(namedBindings)) {
-                    return namedBindings.elements.some(e => e.name.text === importName);
-                }
-                return false;
-            });
-            if (!existingImport) {
-                const importStatement = `import { ${importName} } from '${path}';\n`;
-                recorder.insertLeft(0, importStatement);
-            }
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.insertHelperImports = insertHelperImports;
-function insertImports(projectName, selectedTheme) {
-    const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
-    const selected = selectedThemeImports?.filter(s => !s.doNotImport && !!s.expression);
-    if (!selected || selected.length === 0) {
-        return () => { };
-    }
-    return (0, utils_1.addRootImport)(projectName, code => {
-        const expressions = selected.map(({ importName, path, expression }) => {
-            if (importName && path) {
-                code.external(importName, path);
-            }
-            return expression.trim();
-        });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatFile = exports.styleCompareFn = void 0;
+exports.default = default_1;
+exports.removeImportPath = removeImportPath;
+exports.removeImportFromNgModuleMetadata = removeImportFromNgModuleMetadata;
+exports.removeImportsFromStandaloneProviders = removeImportsFromStandaloneProviders;
+exports.removeProviderFromNgModuleMetadata = removeProviderFromNgModuleMetadata;
+exports.insertHelperImports = insertHelperImports;
+exports.insertImports = insertImports;
+exports.insertProviders = insertProviders;
+exports.createSourceFile = createSourceFile;
+exports.getImportPaths = getImportPaths;
+exports.getProjectTargetOptions = getProjectTargetOptions;
+exports.removeThemeBasedStyles = removeThemeBasedStyles;
+exports.cleanEmptyExpressions = cleanEmptyExpressions;
+exports.adjustProvideAbpThemeShared = adjustProvideAbpThemeShared;
+exports.updateIndexHtml = updateIndexHtml;
+const tslib_1 = require("tslib");
+const schematics_1 = require("@angular-devkit/schematics");
+const ts = tslib_1.__importStar(require("typescript"));
+const style_map_1 = require("./style-map");
+const utils_1 = require("../../utils");
+const theme_options_enum_1 = require("./theme-options.enum");
+const ast_utils_1 = require("../../utils/angular/ast-utils");
+const util_1 = require("../../utils/angular/standalone/util");
+function default_1(_options) {
+    return async () => {
+        const targetThemeName = _options.name;
+        const selectedProject = _options.targetProject;
+        if (!targetThemeName) {
+            throw new schematics_1.SchematicsException('The theme name does not selected');
+        }
+        return (0, schematics_1.chain)([
+            (0, utils_1.updateWorkspace)(storedWorkspace => {
+                updateProjectStyle(selectedProject, storedWorkspace, targetThemeName);
+            }),
+            updateAppModule(selectedProject, targetThemeName),
+        ]);
+    };
+}
+function updateProjectStyle(projectName, workspace, targetThemeName) {
+    const project = workspace.projects.get(projectName);
+    if (!project) {
+        throw new schematics_1.SchematicsException('The target project does not selected');
+    }
+    if ((0, utils_1.isLibrary)(project)) {
+        throw new schematics_1.SchematicsException('The library project does not supported');
+    }
+    const targetOption = getProjectTargetOptions(project, 'build');
+    const styles = targetOption.styles;
+    const sanitizedStyles = removeThemeBasedStyles(styles);
+    const newStyles = style_map_1.styleMap.get(targetThemeName);
+    if (!newStyles) {
+        throw new schematics_1.SchematicsException('The theme does not found');
+    }
+    targetOption.styles = [...newStyles, ...sanitizedStyles];
+}
+function updateAppModule(selectedProject, targetThemeName) {
+    return async (host) => {
+        const mainFilePath = await (0, util_1.getMainFilePath)(host, selectedProject);
+        const isStandalone = (0, utils_1.isStandaloneApp)(host, mainFilePath);
+        const appModulePath = isStandalone
+            ? (0, utils_1.getAppConfigPath)(host, mainFilePath)
+            : (0, utils_1.getAppModulePath)(host, mainFilePath);
+        return (0, schematics_1.chain)([
+            removeImportPath(appModulePath, targetThemeName),
+            ...(!isStandalone ? [removeImportFromNgModuleMetadata(appModulePath, targetThemeName)] : []),
+            isStandalone
+                ? removeImportsFromStandaloneProviders(appModulePath, targetThemeName)
+                : removeProviderFromNgModuleMetadata(appModulePath, targetThemeName),
+            insertHelperImports(appModulePath, targetThemeName),
+            insertImports(selectedProject, targetThemeName),
+            insertProviders(selectedProject, targetThemeName),
+            adjustProvideAbpThemeShared(appModulePath, targetThemeName),
+            updateIndexHtml(selectedProject, targetThemeName),
+            cleanEmptyExpressions(appModulePath, isStandalone),
+        ]);
+    };
+}
+function removeImportPath(filePath, selectedTheme) {
+    return (host) => {
+        const buffer = host.read(filePath);
+        if (!buffer)
+            return host;
+        const sourceText = buffer.toString('utf-8');
+        const source = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
+        const recorder = host.beginUpdate(filePath);
+        const impMap = getImportPaths(selectedTheme, true);
+        const nodes = (0, ast_utils_1.findNodes)(source, ts.isImportDeclaration);
+        const filteredNodes = nodes.filter(node => {
+            const importPath = node.moduleSpecifier.text;
+            const namedBindings = node.importClause?.namedBindings;
+            return impMap.some(({ path, importName }) => {
+                const symbol = importName.split('.')[0];
+                const matchesPath = !!path && importPath === path;
+                const matchesSymbol = !!namedBindings &&
+                    ts.isNamedImports(namedBindings) &&
+                    namedBindings.elements.some(e => e.name.text === symbol);
+                return matchesPath || matchesSymbol;
+            });
+        });
+        for (const node of filteredNodes) {
+            recorder.remove(node.getStart(), node.getWidth());
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function removeImportFromNgModuleMetadata(appModulePath, selectedTheme) {
+    return (host) => {
+        const recorder = host.beginUpdate(appModulePath);
+        const source = createSourceFile(host, appModulePath);
+        const impMap = getImportPaths(selectedTheme, true);
+        const node = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0] || {};
+        if (!node) {
+            throw new schematics_1.SchematicsException('The app module does not found');
+        }
+        const matchingProperties = (0, ast_utils_1.getMetadataField)(node, 'imports');
+        const assignment = matchingProperties[0];
+        const assignmentInit = assignment.initializer;
+        const elements = assignmentInit.elements;
+        if (!elements || elements.length < 1) {
+            throw new schematics_1.SchematicsException(`Elements could not found: ${elements}`);
+        }
+        const filteredElements = elements.filter(f => impMap.some(s => f.getText().match(s.importName)));
+        if (!filteredElements || filteredElements.length < 1) {
+            return;
+        }
+        filteredElements.map(willRemoveModule => recorder.remove(willRemoveModule.getStart(), willRemoveModule.getWidth() + 1));
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function removeImportsFromStandaloneProviders(mainPath, selectedTheme) {
+    return (host) => {
+        const buffer = host.read(mainPath);
+        if (!buffer)
+            return host;
+        const sourceText = buffer.toString('utf-8');
+        const source = ts.createSourceFile(mainPath, sourceText, ts.ScriptTarget.Latest, true);
+        const recorder = host.beginUpdate(mainPath);
+        const impMap = getImportPaths(selectedTheme, true);
+        const callExpressions = (0, ast_utils_1.findNodes)(source, ts.isCallExpression);
+        for (const expr of callExpressions) {
+            const exprText = expr.getText();
+            if (expr.expression.getText() === 'importProvidersFrom') {
+                const args = expr.arguments;
+                let modules = [];
+                if (args.length === 1 && ts.isArrayLiteralExpression(args[0])) {
+                    modules = args[0].elements;
+                }
+                else {
+                    modules = args;
+                }
+                const elementsToRemove = modules.filter(el => impMap.some(({ importName }) => el.getText().includes(importName)));
+                if (elementsToRemove.length) {
+                    for (const removeEl of elementsToRemove) {
+                        const start = removeEl.getFullStart();
+                        const end = removeEl.getEnd();
+                        const nextChar = sourceText.slice(end, end + 1);
+                        const prevChar = sourceText.slice(start - 1, start);
+                        if (nextChar === ',') {
+                            recorder.remove(start, end - start + 1);
+                        }
+                        else if (prevChar === ',') {
+                            recorder.remove(start - 1, end - start + 1);
+                        }
+                        else {
+                            recorder.remove(start, end - start);
+                        }
+                    }
+                }
+                const remaining = modules.filter(el => !elementsToRemove.includes(el));
+                if (remaining.length === 0) {
+                    const start = expr.getFullStart();
+                    const end = expr.getEnd();
+                    const nextChar = sourceText.slice(end, end + 1);
+                    const prevChar = sourceText.slice(start - 1, start);
+                    if (nextChar === ',') {
+                        recorder.remove(start, end - start + 1);
+                    }
+                    else if (prevChar === ',') {
+                        recorder.remove(start - 1, end - start + 1);
+                    }
+                    else {
+                        recorder.remove(start, end - start);
+                    }
+                }
+            }
+            else {
+                const match = impMap.find(({ importName, provider }) => {
+                    const moduleSymbol = importName?.split('.')[0];
+                    return ((moduleSymbol && exprText.includes(moduleSymbol)) ||
+                        (provider && exprText.includes(provider)));
+                });
+                if (match) {
+                    const start = expr.getFullStart();
+                    const end = expr.getEnd();
+                    const nextChar = sourceText.slice(end, end + 1);
+                    const prevChar = sourceText.slice(start - 1, start);
+                    if (nextChar === ',') {
+                        recorder.remove(start, end - start + 1);
+                    }
+                    else if (prevChar === ',') {
+                        recorder.remove(start - 1, end - start + 1);
+                    }
+                    else {
+                        recorder.remove(start, end - start);
+                    }
+                }
+            }
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function removeProviderFromNgModuleMetadata(appModulePath, selectedTheme) {
+    return (host) => {
+        const recorder = host.beginUpdate(appModulePath);
+        const source = createSourceFile(host, appModulePath);
+        const impMap = getImportPaths(selectedTheme, true);
+        const node = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
+        if (!node) {
+            throw new schematics_1.SchematicsException('The app module does not found');
+        }
+        const providersProperty = (0, ast_utils_1.getMetadataField)(node, 'providers')[0];
+        const providersArray = providersProperty.initializer;
+        if (!providersArray.elements.length)
+            return host;
+        for (const element of providersArray.elements) {
+            const elementText = element.getText();
+            const match = impMap.find(({ provider }) => {
+                if (!provider)
+                    return false;
+                const providerName = provider.replace(/\(\s*\)$/, '').trim();
+                return provider && elementText.includes(providerName);
+            });
+            if (match) {
+                const start = element.getFullStart();
+                const end = element.getEnd();
+                const nextChar = source.text.slice(end, end + 1);
+                const prevChar = source.text.slice(start - 1, start);
+                if (nextChar === ',') {
+                    recorder.remove(start, end - start + 1);
+                }
+                else if (prevChar === ',') {
+                    recorder.remove(start - 1, end - start + 1);
+                }
+                else {
+                    recorder.remove(start, end - start);
+                }
+            }
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function insertHelperImports(filePath, selectedTheme) {
+    return (host) => {
+        const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
+        const helpers = selectedThemeImports?.filter(s => !s.doNotImport && s.importName && s.path && !s.expression && !s.provider);
+        if (!helpers || helpers.length === 0) {
+            return host;
+        }
+        const buffer = host.read(filePath);
+        if (!buffer)
+            return host;
+        const sourceText = buffer.toString('utf-8');
+        const source = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
+        const recorder = host.beginUpdate(filePath);
+        for (const { importName, path } of helpers) {
+            const existingImport = (0, ast_utils_1.findNodes)(source, ts.isImportDeclaration).find(node => {
+                const moduleSpecifier = node.moduleSpecifier.text;
+                const namedBindings = node.importClause?.namedBindings;
+                if (moduleSpecifier === path && namedBindings && ts.isNamedImports(namedBindings)) {
+                    return namedBindings.elements.some(e => e.name.text === importName);
+                }
+                return false;
+            });
+            if (!existingImport) {
+                const importStatement = `import { ${importName} } from '${path}';\n`;
+                recorder.insertLeft(0, importStatement);
+            }
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function insertImports(projectName, selectedTheme) {
+    const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
+    const selected = selectedThemeImports?.filter(s => !s.doNotImport && !!s.expression);
+    if (!selected || selected.length === 0) {
+        return () => { };
+    }
+    return (0, utils_1.addRootImport)(projectName, code => {
+        const expressions = selected.map(({ importName, path, expression }) => {
+            if (importName && path) {
+                code.external(importName, path);
+            }
+            return expression.trim();
+        });
         return code.code `
-${expressions.join(',\n')}`;
-    });
-}
-exports.insertImports = insertImports;
-function insertProviders(projectName, selectedTheme) {
-    const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
-    const selected = selectedThemeImports?.filter(s => !s.doNotImport && !!s.provider);
-    if (!selected || selected.length === 0) {
-        return () => { };
-    }
-    return (0, utils_1.addRootProvider)(projectName, code => {
-        const providers = selected.map(({ provider, path, importName }) => {
-            code.external(importName, path);
-            return provider;
-        });
+${expressions.join(',\n')}`;
+    });
+}
+function insertProviders(projectName, selectedTheme) {
+    const selectedThemeImports = style_map_1.importMap.get(selectedTheme);
+    const selected = selectedThemeImports?.filter(s => !s.doNotImport && !!s.provider);
+    if (!selected || selected.length === 0) {
+        return () => { };
+    }
+    return (0, utils_1.addRootProvider)(projectName, code => {
+        const providers = selected.map(({ provider, path, importName }) => {
+            code.external(importName, path);
+            return provider;
+        });
         return code.code `
-${providers.join(',\n')}`;
-    });
-}
-exports.insertProviders = insertProviders;
-function createSourceFile(host, appModulePath) {
-    const buffer = host.read(appModulePath);
-    if (!buffer || buffer.length === 0) {
-        throw new schematics_1.SchematicsException(`${appModulePath} file could not be read.`);
-    }
-    const sourceText = buffer.toString('utf-8');
-    return ts.createSourceFile(appModulePath, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-}
-exports.createSourceFile = createSourceFile;
-/**
- * Returns all import paths except the selected theme
- * @param selectedTheme The selected theme
- * @param getAll If true, returns all import paths
- */
-function getImportPaths(selectedTheme, getAll = false) {
-    if (getAll) {
-        return Array.from(style_map_1.importMap.values()).reduce((acc, val) => [...acc, ...val], []);
-    }
-    return Array.from(style_map_1.importMap.values())
-        .filter(f => f !== style_map_1.importMap.get(selectedTheme))
-        .reduce((acc, val) => [...acc, ...val], []);
-}
-exports.getImportPaths = getImportPaths;
-function getProjectTargetOptions(project, buildTarget) {
-    const options = project.targets?.get(buildTarget)?.options;
-    if (!options) {
-        throw new schematics_1.SchematicsException(`Cannot determine project target configuration for: ${buildTarget}.`);
-    }
-    return options;
-}
-exports.getProjectTargetOptions = getProjectTargetOptions;
-function removeThemeBasedStyles(styles) {
-    return styles.filter(s => !style_map_1.allStyles.some(x => (0, exports.styleCompareFn)(s, x)));
-}
-exports.removeThemeBasedStyles = removeThemeBasedStyles;
-const styleCompareFn = (item1, item2) => {
-    const type1 = typeof item1;
-    const type2 = typeof item1;
-    if (type1 !== type2) {
-        return false;
-    }
-    if (type1 === 'string') {
-        return item1 === item2;
-    }
-    const o1 = item1;
-    const o2 = item2;
-    return o1.bundleName && o2.bundleName && o1.bundleName == o2.bundleName;
-};
-exports.styleCompareFn = styleCompareFn;
-const formatFile = (filePath) => {
-    return (tree) => {
-        const buffer = tree.read(filePath);
-        if (!buffer)
-            return tree;
-        const source = ts.createSourceFile(filePath, buffer.toString(), ts.ScriptTarget.Latest, true);
-        const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
-        const formatted = printer.printFile(source);
-        tree.overwrite(filePath, formatted);
-        return tree;
-    };
-};
-exports.formatFile = formatFile;
-function cleanEmptyExpressions(modulePath, isStandalone) {
-    return (host) => {
-        const buffer = host.read(modulePath);
-        if (!buffer)
-            throw new schematics_1.SchematicsException(`Cannot read ${modulePath}`);
-        const source = ts.createSourceFile(modulePath, buffer.toString('utf-8'), ts.ScriptTarget.Latest, true);
-        const recorder = host.beginUpdate(modulePath);
-        if (isStandalone) {
-            (0, utils_1.cleanEmptyExprFromProviders)(source, recorder);
-        }
-        else {
-            (0, utils_1.cleanEmptyExprFromModule)(source, recorder);
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.cleanEmptyExpressions = cleanEmptyExpressions;
-function adjustProvideAbpThemeShared(appModulePath, selectedTheme) {
-    return (host) => {
-        const source = createSourceFile(host, appModulePath);
-        const recorder = host.beginUpdate(appModulePath);
-        const sourceText = source.getText();
-        const callExpressions = findProvideAbpThemeSharedCalls(source);
-        for (const expr of callExpressions) {
-            const exprStart = expr.getStart();
-            const exprEnd = expr.getEnd();
-            const originalText = sourceText.substring(exprStart, exprEnd);
-            let newText = originalText;
-            const hasHttpErrorConfig = originalText.includes('withHttpErrorConfig');
-            const hasValidationBluePrint = originalText.includes('withValidationBluePrint');
-            if (selectedTheme === theme_options_enum_1.ThemeOptionsEnum.LeptonX) {
-                if (!hasHttpErrorConfig) {
+${providers.join(',\n')}`;
+    });
+}
+function createSourceFile(host, appModulePath) {
+    const buffer = host.read(appModulePath);
+    if (!buffer || buffer.length === 0) {
+        throw new schematics_1.SchematicsException(`${appModulePath} file could not be read.`);
+    }
+    const sourceText = buffer.toString('utf-8');
+    return ts.createSourceFile(appModulePath, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+}
+/**
+ * Returns all import paths except the selected theme
+ * @param selectedTheme The selected theme
+ * @param getAll If true, returns all import paths
+ */
+function getImportPaths(selectedTheme, getAll = false) {
+    if (getAll) {
+        return Array.from(style_map_1.importMap.values()).reduce((acc, val) => [...acc, ...val], []);
+    }
+    return Array.from(style_map_1.importMap.values())
+        .filter(f => f !== style_map_1.importMap.get(selectedTheme))
+        .reduce((acc, val) => [...acc, ...val], []);
+}
+function getProjectTargetOptions(project, buildTarget) {
+    const options = project.targets?.get(buildTarget)?.options;
+    if (!options) {
+        throw new schematics_1.SchematicsException(`Cannot determine project target configuration for: ${buildTarget}.`);
+    }
+    return options;
+}
+function removeThemeBasedStyles(styles) {
+    return styles.filter(s => !style_map_1.allStyles.some(x => (0, exports.styleCompareFn)(s, x)));
+}
+const styleCompareFn = (item1, item2) => {
+    const type1 = typeof item1;
+    const type2 = typeof item1;
+    if (type1 !== type2) {
+        return false;
+    }
+    if (type1 === 'string') {
+        return item1 === item2;
+    }
+    const o1 = item1;
+    const o2 = item2;
+    return o1.bundleName && o2.bundleName && o1.bundleName == o2.bundleName;
+};
+exports.styleCompareFn = styleCompareFn;
+const formatFile = (filePath) => {
+    return (tree) => {
+        const buffer = tree.read(filePath);
+        if (!buffer)
+            return tree;
+        const source = ts.createSourceFile(filePath, buffer.toString(), ts.ScriptTarget.Latest, true);
+        const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+        const formatted = printer.printFile(source);
+        tree.overwrite(filePath, formatted);
+        return tree;
+    };
+};
+exports.formatFile = formatFile;
+function cleanEmptyExpressions(modulePath, isStandalone) {
+    return (host) => {
+        const buffer = host.read(modulePath);
+        if (!buffer)
+            throw new schematics_1.SchematicsException(`Cannot read ${modulePath}`);
+        const source = ts.createSourceFile(modulePath, buffer.toString('utf-8'), ts.ScriptTarget.Latest, true);
+        const recorder = host.beginUpdate(modulePath);
+        if (isStandalone) {
+            (0, utils_1.cleanEmptyExprFromProviders)(source, recorder);
+        }
+        else {
+            (0, utils_1.cleanEmptyExprFromModule)(source, recorder);
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function adjustProvideAbpThemeShared(appModulePath, selectedTheme) {
+    return (host) => {
+        const source = createSourceFile(host, appModulePath);
+        const recorder = host.beginUpdate(appModulePath);
+        const sourceText = source.getText();
+        const callExpressions = findProvideAbpThemeSharedCalls(source);
+        for (const expr of callExpressions) {
+            const exprStart = expr.getStart();
+            const exprEnd = expr.getEnd();
+            const originalText = sourceText.substring(exprStart, exprEnd);
+            let newText = originalText;
+            const hasHttpErrorConfig = originalText.includes('withHttpErrorConfig');
+            const hasValidationBluePrint = originalText.includes('withValidationBluePrint');
+            if (selectedTheme === theme_options_enum_1.ThemeOptionsEnum.LeptonX) {
+                if (!hasHttpErrorConfig) {
                     newText = newText.replace('(', `(
   withHttpErrorConfig({
     errorScreen: {
@@ -413,74 +416,72 @@ function adjustProvideAbpThemeShared(appModulePath, selectedTheme) {
       forWhichErrors: [401, 403, 404, 500],
       hideCloseIcon: true
     }
-  }),`);
-                }
-            }
-            else {
-                if (hasHttpErrorConfig) {
-                    newText = newText.replace(/withHttpErrorConfig\([^)]*\),?/, '');
-                }
-            }
-            if (!hasValidationBluePrint) {
+  }),`);
+                }
+            }
+            else {
+                if (hasHttpErrorConfig) {
+                    newText = newText.replace(/withHttpErrorConfig\([^)]*\),?/, '');
+                }
+            }
+            if (!hasValidationBluePrint) {
                 newText = newText.replace('(', `(
   withValidationBluePrint({
     wrongPassword: 'Please choose 1q2w3E*'
-  }),`);
-            }
-            if (newText && newText !== originalText) {
-                recorder.remove(exprStart, exprEnd - exprStart);
-                recorder.insertLeft(exprStart, newText);
-            }
-        }
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
-exports.adjustProvideAbpThemeShared = adjustProvideAbpThemeShared;
-function findProvideAbpThemeSharedCalls(source) {
-    const result = [];
-    const visit = (node) => {
-        if (ts.isCallExpression(node)) {
-            const expressionText = node.expression.getText();
-            if (expressionText.includes('provideAbpThemeShared')) {
-                result.push(node);
-            }
-        }
-        ts.forEachChild(node, visit);
-    };
-    visit(source);
-    return result;
-}
-function updateIndexHtml(projectName, themeName) {
-    return async (host) => {
-        const workspace = await (0, utils_1.getWorkspace)(host);
-        const project = workspace.projects.get(projectName);
-        if (!project) {
-            throw new Error(`Project "${projectName}" not found in workspace.`);
-        }
-        const buildOptions = project.targets.get('build')?.options;
-        const indexPath = buildOptions?.index;
-        if (!indexPath || !host.exists(indexPath)) {
-            throw new Error(`index.html not found at path: ${indexPath}`);
-        }
-        const buffer = host.read(indexPath);
-        if (!buffer)
-            return;
-        const content = buffer.toString('utf-8');
-        const loaderDiv = `<div id="lp-page-loader"></div>`;
-        let updatedContent = content;
-        if (themeName === theme_options_enum_1.ThemeOptionsEnum.LeptonX) {
-            if (!content.includes(loaderDiv)) {
-                updatedContent = content.replace(/<body([^>]*)>/i, `<body$1>\n  ${loaderDiv}`);
-            }
-        }
-        else {
-            if (content.includes(loaderDiv)) {
-                updatedContent = content.replace(loaderDiv, '');
-            }
-        }
-        host.overwrite(indexPath, updatedContent);
-    };
-}
-exports.updateIndexHtml = updateIndexHtml;
+  }),`);
+            }
+            if (newText && newText !== originalText) {
+                recorder.remove(exprStart, exprEnd - exprStart);
+                recorder.insertLeft(exprStart, newText);
+            }
+        }
+        host.commitUpdate(recorder);
+        return host;
+    };
+}
+function findProvideAbpThemeSharedCalls(source) {
+    const result = [];
+    const visit = (node) => {
+        if (ts.isCallExpression(node)) {
+            const expressionText = node.expression.getText();
+            if (expressionText.includes('provideAbpThemeShared')) {
+                result.push(node);
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return result;
+}
+function updateIndexHtml(projectName, themeName) {
+    return async (host) => {
+        const workspace = await (0, utils_1.getWorkspace)(host);
+        const project = workspace.projects.get(projectName);
+        if (!project) {
+            throw new Error(`Project "${projectName}" not found in workspace.`);
+        }
+        const buildOptions = project.targets.get('build')?.options;
+        const indexPath = buildOptions?.index;
+        if (!indexPath || !host.exists(indexPath)) {
+            throw new Error(`index.html not found at path: ${indexPath}`);
+        }
+        const buffer = host.read(indexPath);
+        if (!buffer)
+            return;
+        const content = buffer.toString('utf-8');
+        const loaderDiv = `<div id="lp-page-loader"></div>`;
+        let updatedContent = content;
+        if (themeName === theme_options_enum_1.ThemeOptionsEnum.LeptonX) {
+            if (!content.includes(loaderDiv)) {
+                updatedContent = content.replace(/<body([^>]*)>/i, `<body$1>\n  ${loaderDiv}`);
+            }
+        }
+        else {
+            if (content.includes(loaderDiv)) {
+                updatedContent = content.replace(loaderDiv, '');
+            }
+        }
+        host.overwrite(indexPath, updatedContent);
+    };
+}
 //# sourceMappingURL=index.js.map