@lucca-front/ng 10.0.0 → 10.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucca-front/ng",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "A library of icons made by the team @Lucca",
   "repository": {
     "type": "git",
@@ -29,8 +29,8 @@
     "@angular/common": "^14.0.0",
     "@angular/core": "^14.0.0",
     "@angular/cdk": "^14.0.0",
-    "@lucca-front/icons": "v10.0.0",
-    "@lucca-front/scss": "v10.0.0",
+    "@lucca-front/icons": "v10.0.1",
+    "@lucca-front/scss": "v10.0.1",
     "rxjs": "^6.0.0 || ^7.0.0"
   },
   "bugs": {

package/schematics/lib/html-ast.js

@@ -58,8 +58,13 @@ function updateCssClassNames(content, oldClassToNewClass, lib) {
     const updates = [];
     const root = new HtmlAst(content, lib);
     const classesToFind = Object.keys(oldClassToNewClass);
+    const visitedAttributes = new Set();
     root.visitAttribute('class', (classAttr) => {
         const offset = classAttr.valueSpan?.start.offset;
+        if (visitedAttributes.has(classAttr)) {
+            return;
+        }
+        visitedAttributes.add(classAttr);
         if (classesToFind.some((cl) => classAttr.value.includes(cl)) && offset !== undefined) {
             updates.push({
                 position: offset,
@@ -70,6 +75,10 @@ function updateCssClassNames(content, oldClassToNewClass, lib) {
     });
     for (const cl of classesToFind) {
         root.visitBoundAttribute(cl, (boundAttr) => {
+            if (visitedAttributes.has(boundAttr)) {
+                return;
+            }
+            visitedAttributes.add(boundAttr);
             updates.push({
                 position: boundAttr.keySpan.start.offset,
                 oldContent: boundAttr.keySpan.details || '',
@@ -81,6 +90,10 @@ function updateCssClassNames(content, oldClassToNewClass, lib) {
         if (!(boundAttr.value instanceof lib.ASTWithSource)) {
             return;
         }
+        if (visitedAttributes.has(boundAttr)) {
+            return;
+        }
+        visitedAttributes.add(boundAttr);
         const { source } = boundAttr.value;
         if (classesToFind.some((cl) => source?.includes(cl))) {
             updates.push({
@@ -96,7 +109,7 @@ exports.updateCssClassNames = updateCssClassNames;
 function extractAllCssClassNames(content, lib) {
     const allClasses = new Set();
     const root = new HtmlAst(content, lib);
-    root.visitAttribute('class', (classAttr) => allClasses.add(classAttr.value));
+    root.visitAttribute('class', (classAttr) => classAttr.value.split(' ').forEach((cls) => allClasses.add(cls)));
     root.visitBoundAttribute(/.*/, (boundAttr) => {
         if (boundAttr.keySpan.details?.startsWith('class.')) {
             allClasses.add(boundAttr.name);

package/schematics/migrations/css-vars/css-class-registry.js

@@ -44,7 +44,7 @@ const classWithImports = [
     { cssClass: 'section', cssImport: '@lucca-front/scss/src/components/section' },
     { cssClass: 'switch', cssImport: '@lucca-front/scss/src/components/switch' },
     { cssClass: 'table', cssImport: '@lucca-front/scss/src/components/table' },
-    { cssClass: /^mod-layoutFixed-*/, cssImport: '@lucca-front/scss/src/components/tableFixed' },
+    { cssClass: /^mod-layoutFixed-.*/, cssImport: '@lucca-front/scss/src/components/tableFixed' },
     { cssClass: 'mod-sortable', cssImport: '@lucca-front/scss/src/components/tableSorted' },
     { cssClass: 'table-head-row-cell-sortableButton', cssImport: '@lucca-front/scss/src/components/tableSorted' },
     { cssClass: 'mod-stickyColumn', cssImport: '@lucca-front/scss/src/components/tableSticked' },
@@ -53,9 +53,9 @@ const classWithImports = [
     { cssClass: 'textfield', cssImport: '@lucca-front/scss/src/components/textfield' },
     { cssClass: 'timeline', cssImport: '@lucca-front/scss/src/components/timeline' },
     { cssClass: 'title', cssImport: '@lucca-front/scss/src/components/title' },
-    { cssClass: 'toasts', cssImport: '@lucca-front/scss/src/components/toasts' },
+    { cssClass: 'toasts', cssImport: '@lucca-front/scss/src/components/toast' },
     { cssClass: 'tableOfContent', cssImport: '@lucca-front/scss/src/components/tableOfContent' },
-    { cssClass: /^u-/, cssImport: '@lucca-front/scss/src/components/util' },
+    { cssClass: /^u-.*/, cssImport: '@lucca-front/scss/src/components/util' },
 ];
 function getCssImports(allVisitedClasses) {
     const exactCssClasses = {};
@@ -71,7 +71,7 @@ function getCssImports(allVisitedClasses) {
     }
     const imports = new Set();
     for (const visitedClass of allVisitedClasses) {
-        const newImport = exactCssClasses[visitedClass] || regexpCssTests.map((test) => test(visitedClass))[0];
+        const newImport = exactCssClasses[visitedClass] || regexpCssTests.map((test) => test(visitedClass)).find(Boolean);
         if (newImport) {
             imports.add(newImport);
         }

package/schematics/migrations/css-vars/migration.spec.js

@@ -110,16 +110,20 @@ describe('CSS Vars Migration', () => {
     it('should add optimized global imports', async () => {
         const tree = new testing_1.UnitTestTree(schematics_1.Tree.empty());
         tree.create('app.component.html', '<button type="button" class="button">Test</button>');
-        tree.create('table.component.html', '<table class="table" [class.mod-stickyColumn]="true"></table>');
+        tree.create('table.component.html', '<table class="table mod-sortable" [class.mod-stickyColumn]="true"></table>');
+        tree.create('util.component.html', '<div class="u-marginTopStandard">LOL</div>');
         tree.create('styles.scss', "@import '@lucca-front/scss/src/main.overridable';");
         const schematicRunner = new testing_1.SchematicTestRunner('migrations', collectionPath);
         // migration-v10-css-vars is the name of the migration, which is defined in the migration.json file
         await schematicRunner.runSchematicAsync('migration-v10-css-vars', { skipInstallation: true }, tree).toPromise();
         const expectedImports = [
+            `@forward '@lucca-front/icons/src/main';`,
             `@forward '@lucca-front/scss/src/main';`,
             `@forward '@lucca-front/scss/src/components/button';`,
             `@forward '@lucca-front/scss/src/components/table';`,
+            `@forward '@lucca-front/scss/src/components/tableSorted';`,
             `@forward '@lucca-front/scss/src/components/tableSticked';`,
+            `@forward '@lucca-front/scss/src/components/util';`,
         ];
         expect(tree.readContent('styles.scss')).toBe(expectedImports.join('\n'));
     });

package/schematics/migrations/css-vars/updaters/main-import.js

@@ -30,6 +30,7 @@ function updateMainImport(root, postCss, postCssValueParser) {
         }
     });
     if (hasMainScss) {
+        (0, scss_ast_js_1.addForwardRule)(root, '@lucca-front/icons/src/main', postCss);
         (0, scss_ast_js_1.addForwardRule)(root, '@lucca-front/scss/src/main', postCss);
     }
     if (hasMainNg) {