@taiga-ui/cdk 4.2.0 → 4.4.0-canary.6e6e993

package/schematics/ng-update/v4/steps/migrate-root.js

@@ -53,7 +53,8 @@ function addProviders(callExpression, fileSystem) {
     array.addElement('NG_EVENT_PLUGINS');
     (0, add_unique_import_1.addUniqueImport)(array.getSourceFile().getFilePath(), 'NG_EVENT_PLUGINS', '@taiga-ui/event-plugins');
     (0, ng_morph_1.getActiveProject)();
-    const proprietary = (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary-core');
+    const proprietary = (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary-core') ||
+        (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary');
     if (proprietary) {
         array.addElement('TBANK_PROVIDERS');
         (0, add_unique_import_1.addUniqueImport)(array.getSourceFile().getFilePath(), 'TBANK_PROVIDERS', '@taiga-ui/proprietary');

package/schematics/ng-update/v4/steps/migrate-templates.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateTemplates = void 0;
 const constants_1 = require("../../../constants");
+const add_import_to_closest_module_1 = require("../../../utils/add-import-to-closest-module");
 const colored_log_1 = require("../../../utils/colored-log");
 const progress_1 = require("../../../utils/progress");
 const get_component_templates_1 = require("../../../utils/templates/get-component-templates");
@@ -64,6 +65,8 @@ function migrateTemplates(fileSystem, options) {
             action({ resource, fileSystem, recorder });
         });
     });
+    fileSystem.commitEdits();
+    (0, add_import_to_closest_module_1.saveAddedImports)();
     !options['skip-logs'] &&
         (0, colored_log_1.successLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} templates migrated \n`);
 }

package/schematics/ng-update/v4/steps/remove-duplicates.d.ts

@@ -0,0 +1,2 @@
+import type { TuiSchema } from '../../../ng-add/schema';
+export declare function removeDuplicates(options: TuiSchema): void;

package/schematics/ng-update/v4/steps/remove-duplicates.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeDuplicates = void 0;
+const ng_morph_1 = require("ng-morph");
+const constants_1 = require("../../../constants");
+const colored_log_1 = require("../../../utils/colored-log");
+function removeDuplicates(options) {
+    !options['skip-logs'] &&
+        (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} removing duplicates...`);
+    const classes = (0, ng_morph_1.getClasses)(constants_1.ALL_TS_FILES);
+    const modules = (0, ng_morph_1.getDecorators)(classes, { name: 'NgModule' });
+    const components = (0, ng_morph_1.getDecorators)(classes, { name: 'Component' });
+    [...modules, ...components].forEach((decorator) => {
+        const [metadata] = decorator.getArguments();
+        if (!metadata || !ng_morph_1.Node.isObjectLiteralExpression(metadata)) {
+            return;
+        }
+        const property = metadata.getProperty('imports');
+        if (!ng_morph_1.Node.isPropertyAssignment(property)) {
+            return;
+        }
+        const importsInitializer = property.getInitializer();
+        if (!importsInitializer || !ng_morph_1.Node.isArrayLiteralExpression(importsInitializer)) {
+            return;
+        }
+        const indexToRemove = [];
+        const existingImports = new Set();
+        importsInitializer.getElements().forEach((el, index) => {
+            if (existingImports.has(el.getText())) {
+                indexToRemove.push(index);
+            }
+            else {
+                existingImports.add(el.getText());
+            }
+        });
+        indexToRemove.forEach((index, i) => importsInitializer.removeElement(index - i));
+    });
+    !options['skip-logs'] &&
+        (0, colored_log_1.successLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} duplicates removed \n`);
+}
+exports.removeDuplicates = removeDuplicates;

package/schematics/ng-update/v4/steps/templates/migrate-badge.js

@@ -59,9 +59,10 @@ function migrateBadgeValue({ valueAttr, sourceCodeLocation, recorder, templateOf
     if (!attrValue || !insertTo) {
         return;
     }
+    const closeTag = selfClosing ? '</tui-badge>' : '';
     recorder.insertRight(insertTo + templateOffset, valueAttr.name === 'value'
-        ? attrValue
-        : `{{ ${attrValue} }}${selfClosing ? '</tui-badge>' : ''}`);
+        ? `${attrValue}${closeTag}`
+        : `{{ ${attrValue} }}${closeTag}`);
     const attrOffset = (_c = sourceCodeLocation === null || sourceCodeLocation === void 0 ? void 0 : sourceCodeLocation.attrs) === null || _c === void 0 ? void 0 : _c[valueAttr.name];
     if (attrOffset) {
         const { startOffset, endOffset } = attrOffset;

package/schematics/ng-update/v4/steps/templates/migrate-money.js

@@ -12,7 +12,7 @@ function migrateMoney({ resource, recorder, fileSystem, }) {
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
     const elements = (0, elements_1.findElementsByTagName)(template, 'tui-money');
     elements.forEach(({ attrs, sourceCodeLocation }) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (!sourceCodeLocation) {
             return;
         }
@@ -21,15 +21,16 @@ function migrateMoney({ resource, recorder, fileSystem, }) {
         const decimalAttr = (0, inputs_1.findAttr)(attrs, 'decimal');
         const precisionAttr = (0, inputs_1.findAttr)(attrs, 'precision');
         const signAttr = (0, inputs_1.findAttr)(attrs, 'sign');
+        const selfClosing = !(sourceCodeLocation === null || sourceCodeLocation === void 0 ? void 0 : sourceCodeLocation.endTag);
         if (!valueAttr) {
             return;
         }
-        const insertTo = (_b = (_a = sourceCodeLocation === null || sourceCodeLocation === void 0 ? void 0 : sourceCodeLocation.endTag) === null || _a === void 0 ? void 0 : _a.startOffset) !== null && _b !== void 0 ? _b : 0;
+        const insertTo = (_b = (_a = sourceCodeLocation === null || sourceCodeLocation === void 0 ? void 0 : sourceCodeLocation.startTag) === null || _a === void 0 ? void 0 : _a.endOffset) !== null && _b !== void 0 ? _b : 0;
         const value = (0, inputs_1.isBinding)(valueAttr) ? valueAttr.value : `'${valueAttr.value}'`;
         const currency = currencyAttr && (0, inputs_1.isBinding)(currencyAttr)
             ? currencyAttr === null || currencyAttr === void 0 ? void 0 : currencyAttr.value
             : `'${currencyAttr === null || currencyAttr === void 0 ? void 0 : currencyAttr.value}'`;
-        recorder.insertRight(templateOffset + insertTo, `{{ ${value} | tuiAmount ${currencyAttr ? `: ${currency}` : ': "RUB"'} | async }}`);
+        recorder.insertRight(templateOffset + insertTo, `{{ ${value} | tuiAmount ${currencyAttr ? `: ${currency}` : ': "RUB"'} | async }}${selfClosing ? '</span>' : ''}`);
         if (decimalAttr || precisionAttr) {
             (0, add_import_to_closest_module_1.addImportToClosestModule)(resource.componentPath, 'TuiNumberFormat', '@taiga-ui/core');
             const format = JSON.stringify((0, clean_object_1.cleanObject)({
@@ -48,6 +49,10 @@ function migrateMoney({ resource, recorder, fileSystem, }) {
             signAttr,
         ].filter((attr) => attr !== undefined);
         (0, remove_attrs_1.removeAttrs)(attrsToRemove, sourceCodeLocation, recorder, templateOffset);
+        if (selfClosing) {
+            recorder.remove(templateOffset + ((_e = (_d = sourceCodeLocation.startTag) === null || _d === void 0 ? void 0 : _d.endOffset) !== null && _e !== void 0 ? _e : 2) - 2, 1);
+        }
+        (0, add_import_to_closest_module_1.addImportToClosestModule)(resource.componentPath, 'AsyncPipe', '@angular/common');
     });
 }
 exports.migrateMoney = migrateMoney;

package/schematics/ng-update/v4/steps/update-packages.d.ts

@@ -1,4 +1,8 @@
 /// <reference lib="es2021" />
 import type { DevkitFileSystem } from 'ng-morph';
 import type { TuiSchema } from '../../../ng-add/schema';
+export declare const TUI_POLYMORPHEUS_VERSION = "^4.6.4";
+export declare const TUI_DOMPURIFY_VERSION = "^4.1.2";
+export declare const TUI_EVENT_PLUGINS_VERSION = "^4.0.1";
+export declare const TUI_EDITOR_VERSION = "^2.5.0";
 export declare function updatePackages({ tree }: DevkitFileSystem, _: TuiSchema): void;

package/schematics/ng-update/v4/steps/update-packages.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updatePackages = void 0;
+exports.updatePackages = exports.TUI_EDITOR_VERSION = exports.TUI_EVENT_PLUGINS_VERSION = exports.TUI_DOMPURIFY_VERSION = exports.TUI_POLYMORPHEUS_VERSION = void 0;
 const ng_morph_1 = require("ng-morph");
 const version_1 = require("../../../../constants/version");
 const constants_1 = require("../../../constants");
 const steps_1 = require("../../steps");
+exports.TUI_POLYMORPHEUS_VERSION = '^4.6.4';
+exports.TUI_DOMPURIFY_VERSION = '^4.1.2';
+exports.TUI_EVENT_PLUGINS_VERSION = '^4.0.1';
+exports.TUI_EDITOR_VERSION = '^2.5.0';
 function updatePackages({ tree }, _) {
     const packagesToRemove = ['@taiga-ui/addon-tablebars', '@taiga-ui/addon-preview'];
     packagesToRemove.forEach((pkg) => {
@@ -12,36 +16,40 @@ function updatePackages({ tree }, _) {
     });
     (0, steps_1.replacePackageName)('@tinkoff/ng-polymorpheus', {
         name: '@taiga-ui/polymorpheus',
-        version: '^4.6.4',
+        version: exports.TUI_POLYMORPHEUS_VERSION,
     }, tree);
     (0, steps_1.replacePackageName)('@tinkoff/ng-dompurify', {
         name: '@taiga-ui/dompurify',
-        version: '^4.1.2',
+        version: exports.TUI_DOMPURIFY_VERSION,
     }, tree);
     (0, steps_1.replacePackageName)('@tinkoff/ng-event-plugins', {
         name: '@taiga-ui/event-plugins',
-        version: '^4.0.1',
+        version: exports.TUI_EVENT_PLUGINS_VERSION,
     }, tree);
     (0, steps_1.replacePackageName)('@tinkoff/tui-editor', {
         name: '@taiga-ui/editor',
-        version: '^2.5.0',
+        version: exports.TUI_EDITOR_VERSION,
     }, tree);
+    const cdk = (0, ng_morph_1.getPackageJsonDependency)(tree, '@taiga-ui/cdk');
     if (!(0, ng_morph_1.getPackageJsonDependency)(tree, '@taiga-ui/event-plugins')) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: '@taiga-ui/event-plugins',
-            version: '^4.0.1',
+            version: exports.TUI_EVENT_PLUGINS_VERSION,
+            type: cdk === null || cdk === void 0 ? void 0 : cdk.type,
         });
     }
     if ((0, ng_morph_1.getImports)(constants_1.ALL_TS_FILES, { moduleSpecifier: '@taiga-ui/layout' }).length) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: '@taiga-ui/layout',
             version: version_1.TUI_VERSION,
+            type: cdk === null || cdk === void 0 ? void 0 : cdk.type,
         });
     }
     if ((0, ng_morph_1.getImports)(constants_1.ALL_TS_FILES, { moduleSpecifier: '@taiga-ui/legacy' }).length) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: '@taiga-ui/legacy',
             version: version_1.TUI_VERSION,
+            type: cdk === null || cdk === void 0 ? void 0 : cdk.type,
         });
     }
 }

package/schematics/utils/add-import-to-closest-module.d.ts

@@ -1 +1,2 @@
 export declare function addImportToClosestModule(componentPath: string, moduleName: string, moduleSpecifier: string): void;
+export declare function saveAddedImports(): void;

package/schematics/utils/add-import-to-closest-module.js

@@ -1,25 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addImportToClosestModule = void 0;
+exports.saveAddedImports = exports.addImportToClosestModule = void 0;
 const ng_morph_1 = require("ng-morph");
 const file_globs_1 = require("../constants/file-globs");
 const add_unique_import_1 = require("./add-unique-import");
+const importsToAdd = [];
 function addImportToClosestModule(componentPath, moduleName, moduleSpecifier) {
-    const [ngComponent] = (0, ng_morph_1.getNgComponents)(componentPath);
-    if (!ngComponent) {
-        return;
-    }
-    if ((0, ng_morph_1.isStandaloneComponent)(ngComponent)) {
-        (0, ng_morph_1.addImportToComponent)(ngComponent, moduleName, { unique: true });
-        (0, add_unique_import_1.addUniqueImport)(ngComponent.getSourceFile().getFilePath(), moduleName, moduleSpecifier);
-        return;
-    }
-    const ngModule = (0, ng_morph_1.findNgModule)(ngComponent, file_globs_1.ALL_TS_FILES);
-    if (ngModule) {
-        (0, ng_morph_1.addImportToNgModule)(ngModule, moduleName, {
-            unique: true,
-        });
-        (0, add_unique_import_1.addUniqueImport)(ngModule.getSourceFile().getFilePath(), moduleName, moduleSpecifier);
-    }
+    importsToAdd.push({ componentPath, moduleName, moduleSpecifier });
 }
 exports.addImportToClosestModule = addImportToClosestModule;
+function saveAddedImports() {
+    importsToAdd.forEach(({ componentPath, moduleName, moduleSpecifier }) => {
+        const [ngComponent] = (0, ng_morph_1.getNgComponents)(componentPath);
+        if (!ngComponent) {
+            return;
+        }
+        if ((0, ng_morph_1.isStandaloneComponent)(ngComponent)) {
+            (0, ng_morph_1.addImportToComponent)(ngComponent, moduleName, { unique: true });
+            (0, add_unique_import_1.addUniqueImport)(ngComponent.getSourceFile().getFilePath(), moduleName, moduleSpecifier);
+            return;
+        }
+        const ngModule = (0, ng_morph_1.findNgModule)(ngComponent, file_globs_1.ALL_TS_FILES);
+        if (ngModule) {
+            (0, ng_morph_1.addImportToNgModule)(ngModule, moduleName, {
+                unique: true,
+            });
+            (0, add_unique_import_1.addUniqueImport)(ngModule.getSourceFile().getFilePath(), moduleName, moduleSpecifier);
+        }
+    });
+}
+exports.saveAddedImports = saveAddedImports;

package/schematics/utils/add-unique-import.js

@@ -19,12 +19,14 @@ function addUniqueImport(filePath, namedImport, moduleSpecifier) {
             .map((namedImport) => namedImport.getText());
         (0, ng_morph_1.editImports)(existingDeclaration[0], () => ({
             namedImports: [...modules, namedImport],
+            isTypeOnly: false,
         }));
         return;
     }
     (0, ng_morph_1.addImports)(filePath, {
         moduleSpecifier,
         namedImports: [namedImport],
+        isTypeOnly: false,
     });
 }
 exports.addUniqueImport = addUniqueImport;

package/schematics/utils/create-angular-json.d.ts

@@ -1,4 +1,3 @@
 export declare function createAngularJson({ stylesExist }?: {
     stylesExist: boolean;
 }): void;
-export declare function createAngularJsonWithAssets(): void;

package/schematics/utils/create-angular-json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAngularJsonWithAssets = exports.createAngularJson = void 0;
+exports.createAngularJson = void 0;
 const ng_morph_1 = require("ng-morph");
 function createAngularJson({ stylesExist } = { stylesExist: false }) {
     (0, ng_morph_1.createSourceFile)('angular.json', `
@@ -27,29 +27,3 @@ function createAngularJson({ stylesExist } = { stylesExist: false }) {
 }`, { overwrite: true });
 }
 exports.createAngularJson = createAngularJson;
-function createAngularJsonWithAssets() {
-    (0, ng_morph_1.createSourceFile)('angular.json', `
-{
-  "version": 1,
-  "projects": {
-    "demo": {
-        "root": "",
-        "architect": {
-          "build": {
-            "options": {
-              "main": "test/main.ts",
-              "assets": [
-              {
-                "glob": "**/*",
-                "input": "node_modules/@taiga-ui/icons/src",
-                "output": "assets/taiga-ui/icons"
-              }
-            ]
-            }
-          }
-        }
-    }
-  }
-}`, { overwrite: true });
-}
-exports.createAngularJsonWithAssets = createAngularJsonWithAssets;

package/tokens/fallback-value.d.ts

@@ -1,4 +1,3 @@
 import type { ValueProvider } from '@angular/core';
-import { InjectionToken } from '@angular/core';
-export declare const TUI_FALLBACK_VALUE: InjectionToken<unknown>;
+export declare const TUI_FALLBACK_VALUE: import("@angular/core").InjectionToken<any>;
 export declare function tuiFallbackValueProvider<T>(useValue: T): ValueProvider;

package/utils/miscellaneous/count-filled-controls.d.ts

@@ -0,0 +1,2 @@
+import type { AbstractControl } from '@angular/forms';
+export declare function tuiCountFilledControls(control: AbstractControl): number;

package/utils/miscellaneous/index.d.ts

@@ -2,6 +2,7 @@ export * from './array-remove';
 export * from './array-shallow-equals';
 export * from './array-toggle';
 export * from './change-date-separator';
+export * from './count-filled-controls';
 export * from './create-token';
 export * from './default-sort';
 export * from './directive-binding';
@@ -10,6 +11,7 @@ export * from './distance-between-touches';
 export * from './ease-in-out-quad';
 export * from './flat-length';
 export * from './get-original-array-from-query-list';
+export * from './is-control-empty';
 export * from './is-falsy';
 export * from './is-number';
 export * from './is-object';

package/utils/miscellaneous/is-control-empty.d.ts

@@ -0,0 +1,2 @@
+import type { AbstractControl } from '@angular/forms';
+export declare function tuiIsControlEmpty({ value }: AbstractControl): boolean;