@nrwl/angular 13.10.3 → 14.0.0-beta.2

package/src/generators/ng-add/utilities/lib.migrator.js

@@ -0,0 +1,351 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LibMigrator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
+const generators_1 = require("@nrwl/workspace/generators");
+const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const path_1 = require("path");
+const dependencies_1 = require("../../utils/dependencies");
+const project_migrator_1 = require("./project.migrator");
+const validation_logging_1 = require("./validation-logging");
+class LibMigrator extends project_migrator_1.ProjectMigrator {
+    constructor(tree, options, project, logger) {
+        var _a, _b;
+        super(tree, options, project, 'libs', logger);
+        this.supportedBuilders = {
+            build: '@angular-devkit/build-angular:ng-packagr',
+            test: '@angular-devkit/build-angular:karma',
+            lint: '@angular-eslint/builder:lint',
+        };
+        this.targetNames = {};
+        this.collectTargetNames();
+        if (this.targetNames.lint) {
+            this.oldEsLintConfigPath =
+                (_b = (_a = this.projectConfig.targets[this.targetNames.lint].options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
+            this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
+        }
+    }
+    migrate() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.moveProjectFiles();
+            yield this.updateProjectConfiguration();
+            this.updateNgPackageJson();
+            this.updateTsConfigs();
+            this.updateEsLintConfig();
+            this.updateCacheableOperations();
+            (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(this.tree);
+        });
+    }
+    validate() {
+        var _a, _b;
+        const result = [];
+        // check project root
+        if (!this.tree.exists(this.projectConfig.root)) {
+            result.push({
+                message: `The project root "${this.project.oldRoot}" could not be found.`,
+                hint: `Make sure the value for "projects.${this.project.name}.root" is correct ` +
+                    `or remove the project if it is not valid.`,
+            });
+        }
+        // check project source root
+        if (this.projectConfig.sourceRoot &&
+            !this.tree.exists(this.projectConfig.sourceRoot)) {
+            result.push({
+                message: `The project source root "${this.project.oldSourceRoot}" could not be found.`,
+                hint: `Make sure the value for "projects.${this.project.name}.sourceRoot" is correct ` +
+                    `or remove the project if it is not valid.`,
+            });
+        }
+        // check for usage of unsupported builders
+        const allSupportedBuilders = [
+            this.supportedBuilders.build,
+            this.supportedBuilders.test,
+            this.supportedBuilders.lint,
+        ];
+        const unsupportedBuilders = [];
+        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+            if (!allSupportedBuilders.includes(target.executor)) {
+                unsupportedBuilders.push([targetName, target.executor]);
+            }
+        });
+        if (unsupportedBuilders.length) {
+            result.push({
+                messageGroup: {
+                    title: 'Unsupported builders',
+                    messages: unsupportedBuilders.map(([target, builder]) => `The "${target}" target is using an unsupported builder "${builder}".`),
+                },
+                hint: `The supported builders for libraries are: ${(0, validation_logging_1.arrayToString)(allSupportedBuilders)}.`,
+            });
+        }
+        // check for multiple targets for the same type of target
+        const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
+            if (this.supportedBuilders.build === executor) {
+                acc.build.push(target);
+            }
+            else if (this.supportedBuilders.test === executor) {
+                acc.test.push(target);
+            }
+            else if (this.supportedBuilders.lint === executor) {
+                acc.lint.push(target);
+            }
+            return acc;
+        }, { build: [], lint: [], test: [] });
+        ['build', 'lint', 'test'].forEach((targetType) => {
+            if (targetsByType[targetType].length <= 1) {
+                return;
+            }
+            result.push({
+                message: `There is more than one target using a builder that is used to ${targetType} the project (${(0, validation_logging_1.arrayToString)(targetsByType[targetType])}).`,
+                hint: `Make sure the project only has one target with a builder that is used to ${targetType} the project.`,
+            });
+        });
+        return result.length ? result : null;
+    }
+    collectTargetNames() {
+        var _a;
+        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+            if (!this.targetNames.build &&
+                this.supportedBuilders.build === target.executor) {
+                this.targetNames.build = targetName;
+            }
+            else if (!this.targetNames.test &&
+                this.supportedBuilders.test === target.executor) {
+                this.targetNames.test = targetName;
+            }
+            else if (!this.targetNames.lint &&
+                this.supportedBuilders.lint === target.executor) {
+                this.targetNames.lint = targetName;
+            }
+        });
+    }
+    moveProjectFiles() {
+        this.moveDir(this.project.oldRoot, this.project.newRoot);
+    }
+    updateProjectConfiguration() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.projectConfig.root = this.project.newRoot;
+            this.projectConfig.sourceRoot = this.project.newSourceRoot;
+            if (!this.projectConfig.targets ||
+                !Object.keys(this.projectConfig.targets).length) {
+                this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
+            }
+            else {
+                this.updateBuildTargetConfiguration();
+                this.updateLintTargetConfiguration();
+                this.updateTestTargetConfiguration();
+            }
+            (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+            yield (0, generators_1.convertToNxProjectGenerator)(this.tree, {
+                project: this.project.name,
+                skipFormat: true,
+            });
+        });
+    }
+    updateNgPackageJson() {
+        var _a, _b;
+        const buildTarget = (_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a[this.targetNames.build];
+        if (!((_b = buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) === null || _b === void 0 ? void 0 : _b.project) ||
+            !this.tree.exists(buildTarget.options.project)) {
+            // we already logged a warning for these cases, so just return
+            return;
+        }
+        const ngPackageJson = (0, devkit_1.readJson)(this.tree, buildTarget.options.project);
+        const offset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
+        ngPackageJson.$schema =
+            ngPackageJson.$schema &&
+                `${offset}node_modules/ng-packagr/ng-package.schema.json`;
+        ngPackageJson.dest = `${offset}dist/${this.project.name}`;
+        (0, devkit_1.writeJson)(this.tree, buildTarget.options.project, ngPackageJson);
+    }
+    updateTsConfigs() {
+        const rootTsConfigFile = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
+        const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
+        this.updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot);
+        this.updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot);
+    }
+    updateEsLintConfig() {
+        if (!this.targetNames.lint || !this.tree.exists(this.newEsLintConfigPath)) {
+            return;
+        }
+        (0, devkit_1.updateJson)(this.tree, this.newEsLintConfigPath, (json) => {
+            var _a;
+            delete json.root;
+            json.ignorePatterns = ['!**/*'];
+            const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
+            if (Array.isArray(json.extends)) {
+                json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(this.oldEsLintConfigPath, extend));
+                // it might have not been extending from the root config, make sure it does
+                if (!json.extends.includes(rootEsLintConfigRelativePath)) {
+                    json.extends.unshift(rootEsLintConfigRelativePath);
+                }
+            }
+            else {
+                json.extends = rootEsLintConfigRelativePath;
+            }
+            (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
+                var _a;
+                if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
+                    return;
+                }
+                override.parserOptions.project = [
+                    `${this.projectConfig.root}/tsconfig.*?.json`,
+                ];
+            });
+            return json;
+        });
+    }
+    updateCacheableOperations() {
+        var _a;
+        const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(this.tree);
+        Object.keys((_a = workspaceConfig.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
+            var _a;
+            const taskRunner = workspaceConfig.tasksRunnerOptions[taskRunnerName];
+            taskRunner.options.cacheableOperations = Array.from(new Set([
+                ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
+                ...[
+                    this.targetNames.build,
+                    this.targetNames.lint,
+                    this.targetNames.test,
+                ].filter(Boolean),
+            ]));
+        });
+        (0, devkit_1.updateWorkspaceConfiguration)(this.tree, workspaceConfig);
+    }
+    updateBuildTargetConfiguration() {
+        var _a, _b, _c, _d, _e;
+        if (!this.targetNames.build) {
+            this.logger.warn('There is no build target in the project configuration. This might not be an issue. Skipping updating the build configuration.');
+            return;
+        }
+        const buildTarget = this.projectConfig.targets[this.targetNames.build];
+        buildTarget.executor = '@nrwl/angular:package';
+        if (!buildTarget.options &&
+            (!buildTarget.configurations ||
+                !Object.keys(buildTarget.configurations).length)) {
+            this.logger.warn(`The target "${this.targetNames.build}" is not specifying any options or configurations. Skipping updating the target configuration.`);
+            return;
+        }
+        const buildDevTsConfig = (_b = (_a = buildTarget.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = buildTarget.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        if (!buildDevTsConfig) {
+            this.logger.warn(`The "${this.targetNames.build}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
+        }
+        else if (!this.tree.exists(buildDevTsConfig)) {
+            this.logger.warn(`The tsConfig file "${buildDevTsConfig}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the tsConfig file.`);
+        }
+        if (!((_e = buildTarget.options) === null || _e === void 0 ? void 0 : _e.project)) {
+            this.logger.warn(`The "${this.targetNames.build}" target does not have the "project" option configured. Skipping updating the ng-packagr project file ("ng-package.json").`);
+        }
+        else if (!this.tree.exists(buildTarget.options.project)) {
+            this.logger.warn(`The ng-packagr project file "${buildTarget.options.project}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the ng-packagr project file.`);
+        }
+        ['project', 'tsConfig'].forEach((option) => {
+            var _a, _b;
+            if ((_a = buildTarget.options) === null || _a === void 0 ? void 0 : _a[option]) {
+                buildTarget.options[option] = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(buildTarget.options[option]));
+            }
+            for (const configuration of Object.values((_b = buildTarget.configurations) !== null && _b !== void 0 ? _b : {})) {
+                configuration[option] =
+                    configuration[option] &&
+                        (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configuration[option]));
+            }
+        });
+    }
+    updateLintTargetConfiguration() {
+        if (!this.targetNames.lint) {
+            return;
+        }
+        this.projectConfig.targets[this.targetNames.lint].executor =
+            '@nrwl/linter:eslint';
+        const lintOptions = this.projectConfig.targets[this.targetNames.lint].options;
+        if (!lintOptions) {
+            this.logger.warn(`The target "${this.targetNames.lint}" is not specifying any options. Skipping updating the target configuration.`);
+            return;
+        }
+        const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
+        if (!existEsLintConfigPath) {
+            this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
+        }
+        lintOptions.eslintConfig =
+            lintOptions.eslintConfig &&
+                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(lintOptions.eslintConfig));
+        lintOptions.lintFilePatterns =
+            lintOptions.lintFilePatterns &&
+                lintOptions.lintFilePatterns.map((pattern) => this.convertPath(pattern));
+        if (!existEsLintConfigPath) {
+            return;
+        }
+        const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
+        if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
+            lintOptions.hasTypeAwareRules = true;
+        }
+    }
+    updateTestTargetConfiguration() {
+        if (!this.targetNames.test) {
+            return;
+        }
+        const testOptions = this.projectConfig.targets[this.targetNames.test].options;
+        if (!testOptions) {
+            this.logger.warn(`The target "${this.targetNames.test}" is not specifying any options. Skipping updating the target configuration.`);
+            return;
+        }
+        if (!testOptions.tsConfig) {
+            this.logger.warn(`The "${this.targetNames.test}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
+        }
+        else if (!this.tree.exists(testOptions.tsConfig)) {
+            this.logger.warn(`The tsConfig file "${testOptions.tsConfig}" specified in the "${this.targetNames.test}" target could not be found. Skipping updating the tsConfig file.`);
+        }
+        testOptions.main = testOptions.main && this.convertAsset(testOptions.main);
+        testOptions.polyfills =
+            testOptions.polyfills && this.convertAsset(testOptions.polyfills);
+        testOptions.tsConfig =
+            testOptions.tsConfig &&
+                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.tsConfig));
+        testOptions.karmaConfig =
+            testOptions.karmaConfig &&
+                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.karmaConfig));
+        testOptions.assets =
+            testOptions.assets &&
+                testOptions.assets.map((asset) => this.convertAsset(asset));
+        testOptions.styles =
+            testOptions.styles &&
+                testOptions.styles.map((style) => this.convertAsset(style));
+        testOptions.scripts =
+            testOptions.scripts &&
+                testOptions.scripts.map((script) => this.convertAsset(script));
+    }
+    updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
+        var _a, _b, _c, _d;
+        if (!this.targetNames.build) {
+            return;
+        }
+        const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.build].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.build].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        if (!tsConfigPath || !this.tree.exists(tsConfigPath)) {
+            // we already logged a warning for these cases, so just return
+            return;
+        }
+        this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
+        (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
+            var _a, _b;
+            if (!((_a = json.include) === null || _a === void 0 ? void 0 : _a.length) && !((_b = json.files) === null || _b === void 0 ? void 0 : _b.length)) {
+                json.include = ['**/*.ts'];
+            }
+            return json;
+        });
+    }
+    updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot) {
+        var _a;
+        if (!this.targetNames.test) {
+            return;
+        }
+        const tsConfig = (_a = this.projectConfig.targets[this.targetNames.test].options) === null || _a === void 0 ? void 0 : _a.tsConfig;
+        if (!tsConfig || !this.tree.exists(tsConfig)) {
+            // we already logged a warning for these cases, so just return
+            return;
+        }
+        this.updateTsConfigFile(this.projectConfig.targets[this.targetNames.test].options.tsConfig, rootTsConfigFile, projectOffsetFromRoot);
+    }
+}
+exports.LibMigrator = LibMigrator;
+//# sourceMappingURL=lib.migrator.js.map

package/src/generators/ng-add/utilities/lib.migrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/lib.migrator.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,yCAA6D;AAC7D,2DAAyE;AACzE,yEAAqF;AACrF,+BAAgC;AAChC,2DAAoF;AAGpF,yDAAqD;AAErD,6DAAqD;AAErD,MAAa,WAAY,SAAQ,kCAAe;IAc9C,YACE,IAAU,EACV,OAAyB,EACzB,OAAsC,EACtC,MAAe;;QAEf,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAnB/B,sBAAiB,GAAG;YACnC,KAAK,EAAE,0CAA0C;YACjD,IAAI,EAAE,qCAAqC;YAC3C,IAAI,EAAE,8BAA8B;SACrC,CAAC;QACe,gBAAW,GAIxB,EAAE,CAAC;QAYL,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YACzB,IAAI,CAAC,mBAAmB;gBACtB,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,0CACrD,YAAY,mCAChB,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC5D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC3E;IACH,CAAC;IAEK,OAAO;;YACX,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACjC,IAAA,uDAAwC,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC;KAAA;IAED,QAAQ;;QACN,MAAM,MAAM,GAAqB,EAAE,CAAC;QAEpC,qBAAqB;QACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC9C,MAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,qBAAqB,IAAI,CAAC,OAAO,CAAC,OAAO,uBAAuB;gBACzE,IAAI,EACF,qCAAqC,IAAI,CAAC,OAAO,CAAC,IAAI,oBAAoB;oBAC1E,2CAA2C;aAC9C,CAAC,CAAC;SACJ;QAED,4BAA4B;QAC5B,IACE,IAAI,CAAC,aAAa,CAAC,UAAU;YAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAChD;YACA,MAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,4BAA4B,IAAI,CAAC,OAAO,CAAC,aAAa,uBAAuB;gBACtF,IAAI,EACF,qCAAqC,IAAI,CAAC,OAAO,CAAC,IAAI,0BAA0B;oBAChF,2CAA2C;aAC9C,CAAC,CAAC;SACJ;QAED,0CAA0C;QAC1C,MAAM,oBAAoB,GAAG;YAC3B,IAAI,CAAC,iBAAiB,CAAC,KAAK;YAC5B,IAAI,CAAC,iBAAiB,CAAC,IAAI;YAC3B,IAAI,CAAC,iBAAiB,CAAC,IAAI;SAC5B,CAAC;QACF,MAAM,mBAAmB,GAAwC,EAAE,CAAC;QAEpE,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CACtD,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE;YACvB,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;gBACnD,mBAAmB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;aACzD;QACH,CAAC,CACF,CAAC;QAEF,IAAI,mBAAmB,CAAC,MAAM,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACV,YAAY,EAAE;oBACZ,KAAK,EAAE,sBAAsB;oBAC7B,QAAQ,EAAE,mBAAmB,CAAC,GAAG,CAC/B,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CACpB,QAAQ,MAAM,6CAA6C,OAAO,IAAI,CACzE;iBACF;gBACD,IAAI,EAAE,6CAA6C,IAAA,kCAAa,EAC9D,oBAAoB,CACrB,GAAG;aACL,CAAC,CAAC;SACJ;QAED,yDAAyD;QACzD,MAAM,aAAa,GAEf,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CACzD,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC9B,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,KAAK,QAAQ,EAAE;gBAC7C,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACnD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvB;iBAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACnD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvB;YAED,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAClC,CAAC;QACF,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC/C,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;gBACzC,OAAO;aACR;YAED,MAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,iEAAiE,UAAU,iBAAiB,IAAA,kCAAa,EAChH,aAAa,CAAC,UAAU,CAAC,CAC1B,IAAI;gBACL,IAAI,EAAE,4EAA4E,UAAU,eAAe;aAC5G,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAEO,kBAAkB;;QACxB,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CACtD,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE;YACvB,IACE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK;gBACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,KAAK,MAAM,CAAC,QAAQ,EAChD;gBACA,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAC;aACrC;iBAAM,IACL,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI;gBACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,EAC/C;gBACA,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC;aACpC;iBAAM,IACL,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI;gBACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,EAC/C;gBACA,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC;aACpC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAEa,0BAA0B;;YACtC,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC/C,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAE3D,IACE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO;gBAC3B,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,MAAM,EAC/C;gBACA,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0GAA0G,CAC3G,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,8BAA8B,EAAE,CAAC;gBACtC,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBACrC,IAAI,CAAC,6BAA6B,EAAE,CAAC;aACtC;YAED,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;YAEH,MAAM,IAAA,wCAA2B,EAAC,IAAI,CAAC,IAAI,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,mBAAmB;;QACzB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,0CAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzE,IACE,CAAC,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,0CAAE,OAAO,CAAA;YAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAC9C;YACA,8DAA8D;YAC9D,OAAO;SACR;QAED,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,aAAa,CAAC,OAAO;YACnB,aAAa,CAAC,OAAO;gBACrB,GAAG,MAAM,gDAAgD,CAAC;QAC5D,aAAa,CAAC,IAAI,GAAG,GAAG,MAAM,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;IAEO,eAAe;QACrB,MAAM,gBAAgB,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,qBAAqB,GAAG,IAAA,uBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEtE,IAAI,CAAC,mCAAmC,CACtC,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;QACF,IAAI,CAAC,kCAAkC,CACrC,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;IACJ,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACzE,OAAO;SACR;QAED,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE;;YACvD,OAAO,IAAI,CAAC,IAAI,CAAC;YACjB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;YAEhC,MAAM,4BAA4B,GAAG,IAAA,0BAAiB,EACpD,IAAA,uBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EACvC,gBAAgB,CACjB,CAAC;YACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE,CACjD,IAAI,CAAC,kCAAkC,CACrC,IAAI,CAAC,mBAAmB,EACxB,MAAM,CACP,CACF,CAAC;gBAEF,2EAA2E;gBAC3E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE;oBACxD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;iBACpD;aACF;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,4BAA4B,CAAC;aAC7C;YAED,MAAA,IAAI,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;gBACnC,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,aAAa,0CAAE,OAAO,CAAA,EAAE;oBACpC,OAAO;iBACR;gBAED,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG;oBAC/B,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,mBAAmB;iBAC9C,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,yBAAyB;;QAC/B,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAC3D,CAAC,cAAc,EAAE,EAAE;;YACjB,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YACtE,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG,KAAK,CAAC,IAAI,CACjD,IAAI,GAAG,CAAC;gBACN,GAAG,CAAC,MAAA,UAAU,CAAC,OAAO,CAAC,mBAAmB,mCAAI,EAAE,CAAC;gBACjD,GAAG;oBACD,IAAI,CAAC,WAAW,CAAC,KAAK;oBACtB,IAAI,CAAC,WAAW,CAAC,IAAI;oBACrB,IAAI,CAAC,WAAW,CAAC,IAAI;iBACtB,CAAC,MAAM,CAAC,OAAO,CAAC;aAClB,CAAC,CACH,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC;IAEO,8BAA8B;;QACpC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+HAA+H,CAChI,CAAC;YACF,OAAO;SACR;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvE,WAAW,CAAC,QAAQ,GAAG,uBAAuB,CAAC;QAE/C,IACE,CAAC,WAAW,CAAC,OAAO;YACpB,CAAC,CAAC,WAAW,CAAC,cAAc;gBAC1B,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EAClD;YACA,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,IAAI,CAAC,WAAW,CAAC,KAAK,gGAAgG,CACtI,CAAC;YACF,OAAO;SACR;QAED,MAAM,gBAAgB,GACpB,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,QAAQ,mCAC7B,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,WAAW,0CAAE,QAAQ,CAAC;QACpD,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,IAAI,CAAC,WAAW,CAAC,KAAK,+FAA+F,CAC9H,CAAC;SACH;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sBAAsB,gBAAgB,uBAAuB,IAAI,CAAC,WAAW,CAAC,KAAK,mEAAmE,CACvJ,CAAC;SACH;QAED,IAAI,CAAC,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,OAAO,CAAA,EAAE;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,IAAI,CAAC,WAAW,CAAC,KAAK,4HAA4H,CAC3J,CAAC;SACH;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gCAAgC,WAAW,CAAC,OAAO,CAAC,OAAO,uBAAuB,IAAI,CAAC,WAAW,CAAC,KAAK,6EAA6E,CACtL,CAAC;SACH;QAED,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YACzC,IAAI,MAAA,WAAW,CAAC,OAAO,0CAAG,MAAM,CAAC,EAAE;gBACjC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAA,0BAAiB,EAC7C,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CACtC,CAAC;aACH;YAED,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CACvC,MAAA,WAAW,CAAC,cAAc,mCAAI,EAAE,CACjC,EAAE;gBACD,aAAa,CAAC,MAAM,CAAC;oBACnB,aAAa,CAAC,MAAM,CAAC;wBACrB,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAChC,CAAC;aACL;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,6BAA6B;QACnC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAC1B,OAAO;SACR;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ;YACxD,qBAAqB,CAAC;QAExB,MAAM,WAAW,GACf,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC5D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,IAAI,CAAC,WAAW,CAAC,IAAI,8EAA8E,CACnH,CAAC;YACF,OAAO;SACR;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,2BAA2B,IAAI,CAAC,mBAAmB,mDAAmD,CACvG,CAAC;SACH;QAED,WAAW,CAAC,YAAY;YACtB,WAAW,CAAC,YAAY;gBACxB,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,WAAW,CAAC,YAAY,CAAC,CACnC,CAAC;QACJ,WAAW,CAAC,gBAAgB;YAC1B,WAAW,CAAC,gBAAgB;gBAC5B,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3E,IAAI,CAAC,qBAAqB,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnE,IAAI,IAAA,sCAA6B,EAAC,YAAY,CAAC,EAAE;YAC/C,WAAW,CAAC,iBAAiB,GAAG,IAAI,CAAC;SACtC;IACH,CAAC;IAEO,6BAA6B;QACnC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,WAAW,GACf,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC5D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,IAAI,CAAC,WAAW,CAAC,IAAI,8EAA8E,CACnH,CAAC;YACF,OAAO;SACR;QAED,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,+FAA+F,CAC7H,CAAC;SACH;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sBAAsB,WAAW,CAAC,QAAQ,uBAAuB,IAAI,CAAC,WAAW,CAAC,IAAI,mEAAmE,CAC1J,CAAC;SACH;QAED,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC3E,WAAW,CAAC,SAAS;YACnB,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACpE,WAAW,CAAC,QAAQ;YAClB,WAAW,CAAC,QAAQ;gBACpB,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1E,WAAW,CAAC,WAAW;YACrB,WAAW,CAAC,WAAW;gBACvB,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,WAAW,CAAC,WAAW,CAAC,CAClC,CAAC;QACJ,WAAW,CAAC,MAAM;YAChB,WAAW,CAAC,MAAM;gBAClB,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,WAAW,CAAC,MAAM;YAChB,WAAW,CAAC,MAAM;gBAClB,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,WAAW,CAAC,OAAO;YACjB,WAAW,CAAC,OAAO;gBACnB,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAEO,mCAAmC,CACzC,gBAAwB,EACxB,qBAA6B;;QAE7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;YAC3B,OAAO;SACR;QAED,MAAM,YAAY,GAChB,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,0CAAE,QAAQ,mCACpE,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,cAAc,0CAC7D,WAAW,0CAAE,QAAQ,CAAC;QAE5B,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YACpD,8DAA8D;YAC9D,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,CACrB,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;QAEF,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;YAC3C,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,CAAA,EAAE;gBAChD,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;aAC5B;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,kCAAkC,CACxC,gBAAwB,EACxB,qBAA6B;;QAE7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,QAAQ,GACZ,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,0CAAE,QAAQ,CAAC;QACtE,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC5C,8DAA8D;YAC9D,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,CACrB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAClE,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;IACJ,CAAC;CACF;AAhfD,kCAgfC"}

package/src/generators/ng-add/utilities/logger.d.ts

@@ -0,0 +1,8 @@
+export declare class Logger {
+    private project;
+    private message;
+    constructor(project: string);
+    info(message: string): void;
+    warn(message: string): void;
+    error(message: string): void;
+}

package/src/generators/ng-add/utilities/logger.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+const devkit_1 = require("@nrwl/devkit");
+class Logger {
+    constructor(project) {
+        this.project = project;
+        this.message = (_, message) => `[${this.project}] ${message}`;
+    }
+    info(message) {
+        devkit_1.logger.info(this.message `${message}`);
+    }
+    warn(message) {
+        devkit_1.logger.warn(this.message `${message}`);
+    }
+    error(message) {
+        devkit_1.logger.error(this.message `${message}`);
+    }
+}
+exports.Logger = Logger;
+//# sourceMappingURL=logger.js.map

package/src/generators/ng-add/utilities/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/logger.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,MAAa,MAAM;IAIjB,YAAoB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAH3B,YAAO,GAAG,CAAC,CAAuB,EAAE,OAAe,EAAE,EAAE,CAC7D,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;IAEK,CAAC;IAEhC,IAAI,CAAC,OAAe;QACzB,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,eAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;CACF;AAjBD,wBAiBC"}

package/src/generators/ng-add/utilities/normalize-options.js

@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options, projects) {
-    var _a;
-    let npmScope = (_a = options.npmScope) !== null && _a !== void 0 ? _a : options.name;
+    let npmScope = options.npmScope;
     if (npmScope) {
         npmScope = (0, devkit_1.names)(npmScope).fileName;
     }
     else if (projects.libs.length > 0) {
         // try get the scope from any library that have one
         for (const lib of projects.libs) {
+            const packageJsonPath = (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json');
+            if (!tree.exists(packageJsonPath)) {
+                continue;
+            }
             const { name } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json'));
             if (name.startsWith('@')) {
                 npmScope = name.split('/')[0].substring(1);

package/src/generators/ng-add/utilities/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AAIxE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;;IAE3B,IAAI,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC,IAAI,CAAC;IAChD,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,0DAA0D;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC1E;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AA7BD,4CA6BC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AAIxE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;IAE3B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,0DAA0D;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC1E;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AArCD,4CAqCC"}

package/src/generators/ng-add/utilities/project.migrator.d.ts

@@ -1,9 +1,11 @@
-import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
 import { GeneratorOptions } from '../schema';
+import { Logger } from './logger';
 import { MigrationProjectConfiguration, ValidationResult } from './types';
 export declare abstract class ProjectMigrator {
     protected readonly tree: Tree;
     protected readonly options: GeneratorOptions;
+    get projectName(): string;
     protected projectConfig: ProjectConfiguration;
     protected project: {
         name: string;
@@ -12,10 +14,19 @@ export declare abstract class ProjectMigrator {
         newRoot: string;
         newSourceRoot: string;
     };
-    constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string);
+    protected logger: Logger;
+    constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string, logger?: Logger);
     abstract migrate(): Promise<void>;
     abstract validate(): ValidationResult;
+    protected convertAsset(asset: string | any): string | any;
+    protected convertEsLintConfigExtendToNewPath(eslintConfigPath: string, extendPath: string): string;
+    protected convertSourceRootPath(originalPath: string): string;
+    protected convertRootPath(originalPath: string): string;
+    protected convertPath(originalPath: string): string;
+    protected getTargetValuesForOption(target: TargetConfiguration, optionPath: string): any[];
+    protected getValueForOption(options: Record<string, any>, optionPath: string): any;
     protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
     protected moveDir(from: string, to: string): void;
     protected moveFile(from: string, to: string, required?: boolean): void;
+    protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
 }

package/src/generators/ng-add/utilities/project.migrator.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectMigrator = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
+const logger_1 = require("./logger");
 class ProjectMigrator {
-    constructor(tree, options, project, rootDir) {
+    constructor(tree, options, project, rootDir, logger) {
         var _a, _b, _c;
         this.tree = tree;
         this.options = options;
@@ -16,6 +17,76 @@ class ProjectMigrator {
             newRoot: `${rootDir}/${project.name}`,
             newSourceRoot: `${rootDir}/${project.name}/src`,
         };
+        this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.Logger(this.project.name);
+    }
+    get projectName() {
+        return this.project.name;
+    }
+    convertAsset(asset) {
+        if (typeof asset === 'string') {
+            return this.convertSourceRootPath(asset);
+        }
+        else {
+            return Object.assign(Object.assign({}, asset), { input: this.convertSourceRootPath(asset.input) });
+        }
+    }
+    convertEsLintConfigExtendToNewPath(eslintConfigPath, extendPath) {
+        if (!extendPath.startsWith('..')) {
+            // we only need to adjust paths that are on a different directory, files
+            // in the same directory are moved together so their relative paths are
+            // not changed
+            return extendPath;
+        }
+        return (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.project.newRoot), (0, path_1.dirname)(eslintConfigPath), extendPath);
+    }
+    convertSourceRootPath(originalPath) {
+        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot))
+            ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
+            : originalPath;
+    }
+    convertRootPath(originalPath) {
+        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot))
+            ? (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''))
+            : originalPath;
+    }
+    convertPath(originalPath) {
+        if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot)) {
+            return (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''));
+        }
+        if (this.project.oldRoot !== '' &&
+            (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot))) {
+            return (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''));
+        }
+        return originalPath;
+    }
+    getTargetValuesForOption(target, optionPath) {
+        const values = new Set();
+        const value = this.getValueForOption(target.options, optionPath);
+        if (value) {
+            values.add(value);
+        }
+        if (target.configurations) {
+            for (const configuration of Object.values(target.configurations)) {
+                const value = this.getValueForOption(configuration, optionPath);
+                if (value) {
+                    values.add(value);
+                }
+            }
+        }
+        return Array.from(values);
+    }
+    getValueForOption(options, optionPath) {
+        const segments = optionPath.split('.');
+        let value = options;
+        for (const segment of segments) {
+            if (value && value[segment]) {
+                value = value[segment];
+            }
+            else {
+                return null;
+            }
+        }
+        return value;
     }
     moveProjectRootFile(filePath, isRequired = true) {
         if (!filePath) {
@@ -34,12 +105,12 @@ class ProjectMigrator {
     moveFile(from, to, required = true) {
         if (!this.tree.exists(from)) {
             if (required) {
-                console.warn(`Path: ${from} does not exist`);
+                this.logger.warn(`The path "${from}" does not exist. Skipping.`);
             }
         }
         else if (this.tree.exists(to)) {
             if (required) {
-                console.warn(`Path: ${to} already exists`);
+                this.logger.warn(`The path "${to}" already exists. Skipping.`);
             }
         }
         else {
@@ -48,6 +119,15 @@ class ProjectMigrator {
             this.tree.delete(from);
         }
     }
+    updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot) {
+        (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
+            var _a;
+            json.extends = `${projectOffsetFromRoot}${rootTsConfigFile}`;
+            json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
+            return json;
+        });
+    }
 }
 exports.ProjectMigrator = ProjectMigrator;
 //# sourceMappingURL=project.migrator.js.map

package/src/generators/ng-add/utilities/project.migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,+BAAgC;AAIhC,MAAsB,eAAe;IAUnC,YACqB,IAAU,EACV,OAAyB,EAC5C,OAAsC,EACtC,OAAe;;QAHI,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAkB;QAI5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YACtC,aAAa,EACX,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,UAAU,mCAAI,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YAChE,OAAO,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;YACrC,aAAa,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM;SAChD,CAAC;IACJ,CAAC;IAKS,mBAAmB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI;QAC/D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,QAAQ,CAAC;QACtB,MAAM,EAAE,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAES,OAAO,CAAC,IAAY,EAAE,EAAU;QACxC,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,IAAY,EAAE,EAAU,EAAE,WAAoB,IAAI;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC;aAC9C;SACF;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC/B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;IACH,CAAC;CACF;AA9DD,0CA8DC"}
+{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/utilities/types.d.ts

@@ -7,4 +7,16 @@ export declare type WorkspaceProjects = {
     apps: MigrationProjectConfiguration[];
     libs: MigrationProjectConfiguration[];
 };
-export declare type ValidationResult = string | null;
+export declare type WorkspaceCapabilities = {
+    karma: boolean;
+    eslint: boolean;
+};
+export declare type ValidationError = {
+    message?: string;
+    messageGroup?: {
+        title: string;
+        messages: string[];
+    };
+    hint?: string;
+};
+export declare type ValidationResult = ValidationError[] | null;

package/src/generators/ng-add/utilities/validate-projects.d.ts

@@ -0,0 +1,2 @@
+import { ProjectMigrator } from './project.migrator';
+export declare function validateProjects(migrators: ProjectMigrator[]): void;