ngx-tethys 17.0.0-next.4 → 17.0.0-next.6

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+# [17.0.0-next.6](https://github.com/atinc/ngx-tethys/compare/17.0.0-next.5...17.0.0-next.6) (2024-03-07)
+
+
+### Features
+
+* **schematics:** improve schematics for select and custom-select in template #INFR-11735 ([#3047](https://github.com/atinc/ngx-tethys/issues/3047)) ([acb4f95](https://github.com/atinc/ngx-tethys/commit/acb4f95b05e9fce85b03601f173ea74d7f935039)), closes [#INFR-11735](https://github.com/atinc/ngx-tethys/issues/INFR-11735)
+
+
+
+# [17.0.0-next.5](https://github.com/atinc/ngx-tethys/compare/17.0.0-next.4...17.0.0-next.5) (2024-03-06)
+
+
+### Features
+
+* **schematics:** provide schematics for renaming standalone components and select module in v17 #INFR-11732 ([#3044](https://github.com/atinc/ngx-tethys/issues/3044)) ([90b300e](https://github.com/atinc/ngx-tethys/commit/90b300e2889084a9e11d38183c23a1a7aea020fd)), closes [#INFR-11732](https://github.com/atinc/ngx-tethys/issues/INFR-11732)
+
+
+
 # [17.0.0-next.4](https://github.com/atinc/ngx-tethys/compare/17.0.0-next.3...17.0.0-next.4) (2024-03-05)
 
 

package/esm2022/version.mjs

@@ -1,3 +1,3 @@
 import { Version } from '@angular/core';
-export const VERSION = new Version('17.0.0-next.4');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFeEMsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVmVyc2lvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgY29uc3QgVkVSU0lPTiA9IG5ldyBWZXJzaW9uKCcxNy4wLjAtbmV4dC40Jyk7XG4iXX0=
+export const VERSION = new Version('17.0.0-next.6');
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFeEMsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVmVyc2lvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgY29uc3QgVkVSU0lPTiA9IG5ldyBWZXJzaW9uKCcxNy4wLjAtbmV4dC42Jyk7XG4iXX0=

package/fesm2022/ngx-tethys.mjs

@@ -1,6 +1,6 @@
 import { Version } from '@angular/core';
 
-const VERSION = new Version('17.0.0-next.4');
+const VERSION = new Version('17.0.0-next.6');
 
 /**
  * Generated bundle index. Do not edit.

package/fesm2022/ngx-tethys.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ngx-tethys.mjs","sources":["../../../src/version.ts","../../../src/ngx-tethys.ts"],"sourcesContent":["import { Version } from '@angular/core';\n\nexport const VERSION = new Version('17.0.0-next.4');\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":";;MAEa,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe;;ACFlD;;AAEG;;;;"}
+{"version":3,"file":"ngx-tethys.mjs","sources":["../../../src/version.ts","../../../src/ngx-tethys.ts"],"sourcesContent":["import { Version } from '@angular/core';\n\nexport const VERSION = new Version('17.0.0-next.6');\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":";;MAEa,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe;;ACFlD;;AAEG;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-tethys",
-  "version": "17.0.0-next.4",
+  "version": "17.0.0-next.6",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/atinc/ngx-tethys.git"

package/schematics/ng-update/core/complete.d.ts

@@ -1,4 +1,3 @@
 import { SchematicContext } from '@angular-devkit/schematics';
 import { TargetVersion } from '@angular/cdk/schematics';
 export declare function onMigrationComplete(context: SchematicContext, targetVersion: TargetVersion, hasFailures: boolean): void;
-export declare function onV17MigrationComplete(context: SchematicContext, targetVersion: TargetVersion, hasFailures: boolean): void;

package/schematics/ng-update/core/complete.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onV17MigrationComplete = exports.onMigrationComplete = void 0;
+exports.onMigrationComplete = void 0;
 function onMigrationComplete(context, targetVersion, hasFailures) {
     context.logger.info('');
     context.logger.info(`  ✓  Updated NGX-TETHYS to ${targetVersion}`);
@@ -11,12 +11,3 @@ function onMigrationComplete(context, targetVersion, hasFailures) {
     }
 }
 exports.onMigrationComplete = onMigrationComplete;
-function onV17MigrationComplete(context, targetVersion, hasFailures) {
-    context.logger.info('');
-    context.logger.info(`  ✓  Updated NGX-TETHYS to ${targetVersion}`);
-    context.logger.info('');
-    if (hasFailures) {
-        context.logger.warn('  ⚠  Some issues were detected but could not be fixed automatically. Please check the output above against documentation, fix these issues manually. Especially check the replace input with variable value in template, if it has a corresponding useless variable value, delete it manually. Finally prettier your code please.');
-    }
-}
-exports.onV17MigrationComplete = onV17MigrationComplete;

package/schematics/ng-update/update-17/class-name-migration.d.ts

@@ -0,0 +1,12 @@
+import { ClassNameUpgradeData, Migration, UpgradeData } from '@angular/cdk/schematics';
+import * as ts from 'typescript';
+export declare class ClassNamesMigration extends Migration<UpgradeData> {
+    data: ClassNameUpgradeData[];
+    trustedIdentifiers: Set<string>;
+    trustedNamespaces: Set<string>;
+    enabled: boolean;
+    visitNode(node: ts.Node): void;
+    private visitIdentifier;
+    private isNgxTethysDeclaration;
+    private createFailureWithReplacement;
+}

package/schematics/ng-update/update-17/class-name-migration.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassNamesMigration = void 0;
+const tslib_1 = require("tslib");
+const schematics_1 = require("@angular/cdk/schematics");
+const ts = tslib_1.__importStar(require("typescript"));
+class ClassNamesMigration extends schematics_1.Migration {
+    constructor() {
+        super(...arguments);
+        this.data = (0, schematics_1.getVersionUpgradeData)(this, 'classNames');
+        this.trustedIdentifiers = new Set();
+        this.trustedNamespaces = new Set();
+        this.enabled = this.data.length !== 0;
+    }
+    visitNode(node) {
+        if (ts.isIdentifier(node)) {
+            this.visitIdentifier(node);
+        }
+    }
+    visitIdentifier(identifier) {
+        if (!this.data.some(data => data.replace === identifier.text)) {
+            return;
+        }
+        if ((0, schematics_1.isNamespaceImportNode)(identifier) && this.isNgxTethysDeclaration((0, schematics_1.getImportDeclaration)(identifier))) {
+            this.trustedNamespaces.add(identifier.text);
+            return this.createFailureWithReplacement(identifier);
+        }
+        if ((0, schematics_1.isExportSpecifierNode)(identifier) && this.isNgxTethysDeclaration((0, schematics_1.getExportDeclaration)(identifier))) {
+            return this.createFailureWithReplacement(identifier);
+        }
+        if ((0, schematics_1.isImportSpecifierNode)(identifier) && this.isNgxTethysDeclaration((0, schematics_1.getImportDeclaration)(identifier))) {
+            this.trustedIdentifiers.add(identifier.text);
+            return this.createFailureWithReplacement(identifier);
+        }
+        if (ts.isPropertyAccessExpression(identifier.parent)) {
+            const expression = identifier.parent.expression;
+            if (ts.isIdentifier(expression) && this.trustedNamespaces.has(expression.text)) {
+                return this.createFailureWithReplacement(identifier);
+            }
+        }
+        else if (this.trustedIdentifiers.has(identifier.text)) {
+            return this.createFailureWithReplacement(identifier);
+        }
+    }
+    isNgxTethysDeclaration(declaration) {
+        if (!declaration.moduleSpecifier) {
+            return false;
+        }
+        const ngxTethysModuleSpecifier = 'ngx-tethys';
+        const moduleSpecifier = declaration.moduleSpecifier.getText();
+        return moduleSpecifier.indexOf(ngxTethysModuleSpecifier) !== -1;
+    }
+    createFailureWithReplacement(identifier) {
+        const classData = this.data.find(data => data.replace === identifier.text);
+        const filePath = this.fileSystem.resolve(identifier.getSourceFile().fileName);
+        this.fileSystem
+            .edit(filePath)
+            .remove(identifier.getStart(), identifier.getWidth())
+            .insertRight(identifier.getStart(), classData.replaceWith);
+    }
+}
+exports.ClassNamesMigration = ClassNamesMigration;

package/schematics/ng-update/update-17/index.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular/cdk/schematics");
 const complete_1 = require("../core/complete");
-const data_1 = require("../data");
-const migrations = [];
+const update_data_1 = require("./update-data");
+const class_name_migration_1 = require("./class-name-migration");
+const migrations = [class_name_migration_1.ClassNamesMigration];
 function main() {
-    return (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V17, migrations, data_1.ruleUpgradeData, complete_1.onV17MigrationComplete);
+    return (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V17, migrations, update_data_1.upgradeData, complete_1.onMigrationComplete);
 }
 exports.default = main;

package/schematics/ng-update/update-17/index.spec.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const schematics_1 = require("@angular-devkit/schematics");
 const testing_1 = require("@angular-devkit/schematics/testing");
 const testing_2 = require("../../testing");
 describe('ng-update v17 Schematic', () => {
@@ -20,4 +21,60 @@ describe('ng-update v17 Schematic', () => {
         const packageJSON = JSON.parse(file.content.toString());
         expect(packageJSON['dependencies']['@angular/core']).toContain('^17.');
     }));
+    describe('should provide schematics for v17', () => {
+        let tree;
+        const schematicRunner = new testing_1.SchematicTestRunner('migrations', require.resolve('../migration-collection.json'));
+        const TEST_COMPONENT_PATH = '/projects/update17test/src/app/app.component.ts';
+        const TEST_COMPONENT_CONTENT = `
+                import { ThyButtonComponent } from 'ngx-tethys/button';
+                import { ThyOptionComponent } from 'ngx-tethys/shared';
+                import { ThySelectComponent, ThySelectCustomComponent } from 'ngx-tethys/select';
+
+                @Component({
+                    selector: 'app-root',
+                    standalone: true,
+                    imports: [
+                        CommonModule,
+                        FormsModule,
+                        RouterOutlet,
+                        ThySelectComponent,
+                        ThySelectCustomComponent,
+                        ThyOptionComponent,
+                        ThyButtonComponent
+                    ],
+                    templateUrl: './app.component.html',
+                    styleUrls: ['./app.component.scss'],
+                })
+                export class AppComponent {}
+        `;
+        let workspaceTree;
+        beforeEach(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            const hostTree = new schematics_1.HostTree();
+            tree = yield schematicRunner.runExternalSchematic('@schematics/angular', 'workspace', {
+                name: 'test-workspace',
+                version: '17.0.0',
+                newProjectRoot: 'projects'
+            }, hostTree);
+            yield schematicRunner.runExternalSchematic('@schematics/angular', 'application', { name: 'update17test' }, tree);
+            tree.overwrite(TEST_COMPONENT_PATH, TEST_COMPONENT_CONTENT);
+            workspaceTree = yield schematicRunner.runSchematic('migration-v17', {}, tree);
+        }));
+        it('should remove the Component suffix from standalone components', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            const result = workspaceTree.read(TEST_COMPONENT_PATH).toString();
+            expect(result).not.toContain(`ThyOptionComponent`);
+            expect(result).toContain('ThyOption');
+            expect(result).not.toContain(`ThyButtonComponent`);
+            expect(result).toContain('ThyButton');
+        }));
+        it('should rename ThySelectCustomComponent to ThySelect', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            const result = workspaceTree.read(TEST_COMPONENT_PATH).toString();
+            expect(result).not.toContain('ThySelectComponent');
+            expect(result).toContain('ThyNativeSelect');
+        }));
+        it('should rename ThySelectComponent to ThyNativeSelect', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            const result = workspaceTree.read(TEST_COMPONENT_PATH).toString();
+            expect(result).not.toContain(`ThySelectCustomComponent`);
+            expect(result).toContain('ThySelect');
+        }));
+    });
 });

package/schematics/ng-update/update-17/update-data.d.ts

@@ -0,0 +1,2 @@
+import { UpgradeData } from '@angular/cdk/schematics';
+export declare const upgradeData: UpgradeData;