@lucca-front/ng 21.1.0-rc.1 → 21.1.0-rc.2

package/schematics/lu-button/migration.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateComponent = migrateComponent;
 const change_1 = require("@schematics/angular/utility/change");
-const lib_1 = require("../lib");
+const angular_component_ast_1 = require("../lib/angular-component-ast");
+const angular_template_1 = require("../lib/angular-template");
+const html_ast_js_1 = require("../lib/html-ast.js");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
 function migrateComponent(sourceFile, path, tree) {
     const cssButtons = findCssButtons(sourceFile, path, tree);
     if (cssButtons.length > 0) {
@@ -63,7 +66,7 @@ function migrateComponent(sourceFile, path, tree) {
             }
         });
         // Add import if needed
-        (0, change_1.applyToUpdateRecorder)(tsUpdate, [(0, lib_1.insertTSImportIfNeeded)(sourceFile, path, 'ButtonComponent', '@lucca-front/ng/button'), (0, lib_1.insertAngularImportIfNeeded)(sourceFile, path, 'ButtonComponent')]);
+        (0, change_1.applyToUpdateRecorder)(tsUpdate, [(0, angular_component_ast_1.insertTSImportIfNeeded)(sourceFile, path, 'ButtonComponent', '@lucca-front/ng/button'), (0, angular_component_ast_1.insertAngularImportIfNeeded)(sourceFile, path, 'ButtonComponent')]);
         tree.commitUpdate(tsUpdate);
         if (!isInlineTemplate) {
             tree.commitUpdate(templateUpdate);
@@ -73,11 +76,11 @@ function migrateComponent(sourceFile, path, tree) {
 }
 function findCssButtons(sourceFile, basePath, tree) {
     const buttons = [];
-    const ngTemplates = (0, lib_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
+    const ngTemplates = (0, angular_template_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
     ngTemplates.forEach((template) => {
-        const htmlAst = new lib_1.HtmlAst(template.content);
+        const htmlAst = new html_ast_js_1.HtmlAst(template.content);
         htmlAst.visitNodes((node) => {
-            if ((0, lib_1.isInterestingNode)(node) && ["button", "a"].includes(node.name)) {
+            if (isInterestingNode(node) && ["button", "a"].includes(node.name)) {
                 const classes = node.attributes.find(attr => attr.name === 'class')?.value || "";
                 if (classes.split(" ").includes("button")) {
                     const inputs = {
@@ -118,3 +121,6 @@ function getButtonType(classes) {
     }
     return '';
 }
+function isInterestingNode(node) {
+    return node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement;
+}

package/schematics/lu-button/migration.spec.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const lib_1 = require("../lib");
+const migration_test_js_1 = require("../lib/migration-test.js");
 const collectionPath = path.normalize(path.join(__dirname, '..', 'collection.json'));
 const testsRoot = path.join(__dirname, 'tests');
 describe('luButton Migration', () => {
     it('should handle basic case files', async () => {
         // Arrange
-        const tree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
-        const expectedTree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
+        const tree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
+        const expectedTree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
         // Act
         try {
-            await (0, lib_1.runSchematic)('collection', collectionPath, 'lu-button', { skipInstallation: true }, tree);
+            await (0, migration_test_js_1.runSchematic)('collection', collectionPath, 'lu-button', { skipInstallation: true }, tree);
         }
         catch (error) {
             // eslint-disable-next-line no-console
             console.log(error);
         }
         // Assert
-        (0, lib_1.expectTree)(tree).toMatchTree(expectedTree);
+        (0, migration_test_js_1.expectTree)(tree).toMatchTree(expectedTree);
     });
 });

package/schematics/lu-icon/index.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const typescript_1 = require("typescript");
-const lib_1 = require("../lib");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
+const schematics_1 = require("../lib/schematics");
 const migration_1 = require("./migration");
 // Nx need to see "@angular-devkit/schematics" in order to run this migration correctly (see https://github.com/nrwl/nx/blob/d9fed4b832bf01d1b9a44ae9e486a5e5cd2d2253/packages/nx/src/command-line/migrate/migrate.ts#L1729-L1738)
 require('@angular-devkit/schematics');
 exports.default = (options) => {
     return async (tree, context) => {
-        await lib_1.currentSchematicContext.init(context, options);
+        await lf_schematic_context_1.currentSchematicContext.init(context, options);
         tree.visit((path, entry) => {
             if (path.includes('node_modules') || !entry) {
                 return;
             }
             if (path.endsWith('.ts')) {
-                (0, lib_1.migrateFile)(path, entry, tree, (content) => {
+                (0, schematics_1.migrateFile)(path, entry, tree, (content) => {
                     const sourceFile = (0, typescript_1.createSourceFile)(path, content, typescript_1.ScriptTarget.ESNext);
                     return (0, migration_1.migrateComponent)(sourceFile, path, tree);
                 });

package/schematics/lu-icon/migration.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateComponent = migrateComponent;
 const change_1 = require("@schematics/angular/utility/change");
-const lib_1 = require("../lib");
+const angular_component_ast_1 = require("../lib/angular-component-ast");
+const angular_template_1 = require("../lib/angular-template");
+const html_ast_js_1 = require("../lib/html-ast.js");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
 function migrateComponent(sourceFile, path, tree) {
     const htmlIcons = findHTMLIcons(sourceFile, path, tree);
     if (htmlIcons.length > 0) {
@@ -66,7 +69,7 @@ function migrateComponent(sourceFile, path, tree) {
             }
         });
         // Add import if needed
-        (0, change_1.applyToUpdateRecorder)(tsUpdate, [(0, lib_1.insertTSImportIfNeeded)(sourceFile, path, 'IconComponent', '@lucca-front/ng/icon'), (0, lib_1.insertAngularImportIfNeeded)(sourceFile, path, 'IconComponent')]);
+        (0, change_1.applyToUpdateRecorder)(tsUpdate, [(0, angular_component_ast_1.insertTSImportIfNeeded)(sourceFile, path, 'IconComponent', '@lucca-front/ng/icon'), (0, angular_component_ast_1.insertAngularImportIfNeeded)(sourceFile, path, 'IconComponent')]);
         tree.commitUpdate(tsUpdate);
         if (!isInlineTemplate) {
             tree.commitUpdate(templateUpdate);
@@ -76,11 +79,11 @@ function migrateComponent(sourceFile, path, tree) {
 }
 function findHTMLIcons(sourceFile, basePath, tree) {
     const htmlIcons = [];
-    const ngTemplates = (0, lib_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
+    const ngTemplates = (0, angular_template_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
     ngTemplates.forEach((template) => {
-        const htmlAst = new lib_1.HtmlAst(template.content);
+        const htmlAst = new html_ast_js_1.HtmlAst(template.content);
         htmlAst.visitNodes((node, parent) => {
-            if ((0, lib_1.isInterestingNode)(node)) {
+            if (isInterestingNode(node)) {
                 const classes = node.attributes.find(attr => attr.name === 'class')?.value;
                 if (classes?.includes("lucca-icon")) {
                     const iconClass = classes.split(' ').find(c => c.startsWith('icon-'));
@@ -95,12 +98,12 @@ function findHTMLIcons(sourceFile, basePath, tree) {
                             filePath: template.filePath,
                             componentTS: sourceFile
                         };
-                        const siblings = (0, lib_1.isInterestingNode)(parent) ? parent?.children : htmlAst.nodes;
+                        const siblings = isInterestingNode(parent) ? parent?.children : htmlAst.nodes;
                         if (siblings.length > 0) {
                             const possibleAltSpan = siblings.find(child => {
-                                return (0, lib_1.isInterestingNode)(child) && child !== node;
+                                return isInterestingNode(child) && child !== node;
                             });
-                            if (possibleAltSpan && (0, lib_1.isInterestingNode)(possibleAltSpan)) {
+                            if (possibleAltSpan && isInterestingNode(possibleAltSpan)) {
                                 const childClasses = possibleAltSpan.attributes.find(attr => attr.name === 'class')?.value;
                                 // We know it's one of these types but TS doesn't find that info from the above call so here we go again
                                 if (childClasses === 'pr-u-mask') {
@@ -117,3 +120,6 @@ function findHTMLIcons(sourceFile, basePath, tree) {
     });
     return htmlIcons;
 }
+function isInterestingNode(node) {
+    return node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement;
+}

package/schematics/lu-icon/migration.spec.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const lib_1 = require("../lib");
+const migration_test_js_1 = require("../lib/migration-test.js");
 const collectionPath = path.normalize(path.join(__dirname, '..', 'collection.json'));
 const testsRoot = path.join(__dirname, 'tests');
 describe('lu-icon Migration', () => {
     it('should handle basic case files', async () => {
         // Arrange
-        const tree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
-        const expectedTree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
+        const tree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
+        const expectedTree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
         // Act
         try {
-            await (0, lib_1.runSchematic)('collection', collectionPath, 'lu-icon', { skipInstallation: true }, tree);
+            await (0, migration_test_js_1.runSchematic)('collection', collectionPath, 'lu-icon', { skipInstallation: true }, tree);
         }
         catch (error) {
             // eslint-disable-next-line no-console
             console.log(error);
         }
         // Assert
-        (0, lib_1.expectTree)(tree).toMatchTree(expectedTree);
+        (0, migration_test_js_1.expectTree)(tree).toMatchTree(expectedTree);
     });
 });

package/schematics/lu-select/index.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const typescript_1 = require("typescript");
-const lib_1 = require("../lib");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
+const schematics_1 = require("../lib/schematics");
 const migration_1 = require("./migration");
 // Nx need to see "@angular-devkit/schematics" in order to run this migration correctly (see https://github.com/nrwl/nx/blob/d9fed4b832bf01d1b9a44ae9e486a5e5cd2d2253/packages/nx/src/command-line/migrate/migrate.ts#L1729-L1738)
 require('@angular-devkit/schematics');
 exports.default = (options) => {
     return async (tree, context) => {
-        await lib_1.currentSchematicContext.init(context, options);
+        await lf_schematic_context_1.currentSchematicContext.init(context, options);
         tree.visit((path, entry) => {
             if (path.includes('node_modules') || !entry) {
                 return;
             }
             if (path.endsWith('.ts')) {
-                (0, lib_1.migrateFile)(path, entry, tree, (content) => {
+                (0, schematics_1.migrateFile)(path, entry, tree, (content) => {
                     const sourceFile = (0, typescript_1.createSourceFile)(path, content, typescript_1.ScriptTarget.ESNext);
                     return (0, migration_1.migrateComponent)(sourceFile, path, tree, options?.noComments);
                 });

package/schematics/lu-select/migration.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateComponent = migrateComponent;
-const change_1 = require("@schematics/angular/utility/change");
-const eol_1 = require("@schematics/angular/utility/eol");
+const html_ast_js_1 = require("../lib/html-ast.js");
 const typescript_1 = require("typescript");
-const lib_1 = require("../lib");
-const select_context_1 = require("./model/select-context");
+const angular_component_ast_1 = require("../lib/angular-component-ast");
+const angular_template_1 = require("../lib/angular-template");
 const util_1 = require("./util");
+const select_context_1 = require("./model/select-context");
+const change_1 = require("@schematics/angular/utility/change");
+const eol_1 = require("@schematics/angular/utility/eol");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
 const importSource = {
     LuSimpleSelectInputComponent: '@lucca-front/ng/simple-select',
     LuMultiSelectInputComponent: '@lucca-front/ng/multi-select',
@@ -52,13 +55,13 @@ function migrateComponent(sourceFile, path, tree, noComments = false) {
             // We're not checking using else here because handle** methods can also add a rejection reason
             // We want to handle both cases (before handling and after) here
             if (select.rejection) {
-                lib_1.currentSchematicContext.logFailure(`Couldn't migrate ${select.component} in ${path}: ${util_1.RejectionReason[select.rejection.reason]}`);
+                lf_schematic_context_1.currentSchematicContext.logFailure(`Couldn't migrate ${select.component} in ${path}: ${util_1.RejectionReason[select.rejection.reason]}`);
                 if (!noComments) {
                     insertRejectionComment(templateUpdate, select);
                 }
             }
             else {
-                lib_1.currentSchematicContext.logSuccess(`Migrated ${select.component} in ${path}`);
+                lf_schematic_context_1.currentSchematicContext.logSuccess(`Migrated ${select.component} in ${path}`);
             }
         });
         tree.commitUpdate(tsUpdate);
@@ -96,18 +99,18 @@ function insertRejectionComment(update, select) {
     update.insertLeft(select.nodeOffset + select.node.startSourceSpan.start.offset, `<!-- [lu-select migration] REJECTED: ${detailedReason || util_1.RejectionReason[select.rejection.reason]} -->\n${indentBefore}`);
 }
 function findSelectContexts(sourceFile, basePath, tree) {
-    const imports = (0, lib_1.extractComponentImports)(sourceFile);
+    const imports = (0, angular_component_ast_1.extractComponentImports)(sourceFile);
     if (possibleSelectComponents.some((c) => imports.includes(c))) {
         const selects = [];
-        const template = (0, lib_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath)[0];
-        const htmlAst = new lib_1.HtmlAst(template.content);
+        const template = (0, angular_template_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath)[0];
+        const htmlAst = new html_ast_js_1.HtmlAst(template.content);
         htmlAst.visitNodes((node) => {
-            if (node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstElement) {
+            if (node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement) {
                 const selectComponentClass = selectorToComponentNameRecord[node.name];
                 const multipleInput = node.inputs.find((attr) => attr.name === 'multiple');
-                const unsupportedMultiple = multipleInput?.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource && multipleInput.value.source !== 'true';
+                const unsupportedMultiple = multipleInput?.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource && multipleInput.value.source !== 'true';
                 const multipleAttr = node.attributes.find((attr) => attr.name === 'multiple');
-                const multipleFromInput = multipleInput?.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource && multipleInput.value.source === 'true'
+                const multipleFromInput = multipleInput?.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource && multipleInput.value.source === 'true'
                     ? { start: multipleInput?.sourceSpan?.start?.offset, end: multipleInput?.sourceSpan?.end?.offset + 1 }
                     : null;
                 const multipleFromAttr = multipleAttr && (multipleAttr.value === 'true' || multipleAttr.value === '') ? { start: multipleAttr?.sourceSpan?.start?.offset, end: multipleAttr?.sourceSpan?.end?.offset + 1 } : null;
@@ -142,7 +145,7 @@ function updateImports(sourceFile, selects, path, tree) {
     const imports = new Set(selects.filter((s) => !s.rejection).flatMap((select) => select.requiredImports || []));
     imports.forEach((importToAdd) => {
         if (importSource[importToAdd]) {
-            (0, change_1.applyToUpdateRecorder)(update, [(0, lib_1.insertTSImportIfNeeded)(sourceFile, path, importToAdd, importSource[importToAdd]), (0, lib_1.insertAngularImportIfNeeded)(sourceFile, path, importToAdd)]);
+            (0, change_1.applyToUpdateRecorder)(update, [(0, angular_component_ast_1.insertTSImportIfNeeded)(sourceFile, path, importToAdd, importSource[importToAdd]), (0, angular_component_ast_1.insertAngularImportIfNeeded)(sourceFile, path, importToAdd)]);
         }
         else {
             console.error(`Can't add import for ${importToAdd} because source is unknown`);
@@ -152,11 +155,11 @@ function updateImports(sourceFile, selects, path, tree) {
     const componentsCleanupUpdate = tree.beginUpdate(path);
     // Cleanup unused select component imports
     const updatedSourceFile = (0, typescript_1.createSourceFile)(path, tree.readText(path), typescript_1.ScriptTarget.ESNext);
-    const templatesAfterUpdate = (0, lib_1.extractNgTemplatesIncludingHtml)(updatedSourceFile, tree, path);
+    const templatesAfterUpdate = (0, angular_template_1.extractNgTemplatesIncludingHtml)(updatedSourceFile, tree, path);
     templatesAfterUpdate.forEach((template) => {
         Object.entries(select_context_1.selectorToComponentName).forEach(([selector, className]) => {
             if (!template.content.includes(selector)) {
-                (0, change_1.applyToUpdateRecorder)(componentsCleanupUpdate, [(0, lib_1.removeTSImport)(updatedSourceFile, path, className), (0, lib_1.removeAngularImport)(updatedSourceFile, path, className)]);
+                (0, change_1.applyToUpdateRecorder)(componentsCleanupUpdate, [(0, angular_component_ast_1.removeTSImport)(updatedSourceFile, path, className), (0, angular_component_ast_1.removeAngularImport)(updatedSourceFile, path, className)]);
             }
         });
     });
@@ -175,7 +178,7 @@ function updateImports(sourceFile, selects, path, tree) {
 function handleLuSelectInputComponent(select, update) {
     const dataSource = (0, util_1.getDataSource)(select);
     let hasClearer = false;
-    new lib_1.HtmlAstVisitor(select.node).visitElements(/lu-input-clearer/, (node) => {
+    new html_ast_js_1.HtmlAstVisitor(select.node).visitElements(/lu-input-clearer/, (node) => {
         // Doing the check just in case
         if (node.name === 'lu-input-clearer') {
             hasClearer = true;
@@ -272,14 +275,14 @@ function handleApiSelectInputComponent(select, update) {
         }
     });
     select.node.inputs.forEach((input) => {
-        if (input.name === 'api' && input.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+        if (input.name === 'api' && input.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
             apiEndpoint = input.value?.source || '';
             oldApiInput = {
                 pos: input.sourceSpan.start.offset,
                 length: input.sourceSpan.end.offset - input.sourceSpan.start.offset
             };
         }
-        if (input.name === 'standard' && input.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+        if (input.name === 'standard' && input.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
             apiStandard = (input.value?.source || 'v3');
             oldApiStandard = {
                 pos: input.sourceSpan.start.offset,

package/schematics/lu-select/migration.spec.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const lib_1 = require("../lib");
+const migration_test_js_1 = require("../lib/migration-test.js");
 const collectionPath = path.normalize(path.join(__dirname, '..', 'collection.json'));
 const testsRoot = path.join(__dirname, 'tests');
 describe('lu-select Migration', () => {
     it('should handle basic case files', async () => {
         // Arrange
-        const tree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
-        const expectedTree = (0, lib_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
+        const tree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'input'));
+        const expectedTree = (0, migration_test_js_1.createTreeFromFolder)(path.join(testsRoot, 'output'));
         // Act
         try {
-            await (0, lib_1.runSchematic)('collection', collectionPath, 'lu-select', { skipInstallation: true }, tree);
+            await (0, migration_test_js_1.runSchematic)('collection', collectionPath, 'lu-select', { skipInstallation: true }, tree);
         }
         catch (error) {
             // eslint-disable-next-line no-console
             console.log(error);
         }
         // Assert
-        (0, lib_1.expectTree)(tree).toMatchTree(expectedTree);
+        (0, migration_test_js_1.expectTree)(tree).toMatchTree(expectedTree);
     });
 });

package/schematics/lu-select/util.js

@@ -5,7 +5,9 @@ exports.isRejection = isRejection;
 exports.getCommonMigrationRejectionReason = getCommonMigrationRejectionReason;
 exports.getDataSource = getDataSource;
 exports.getDisplayer = getDisplayer;
-const lib_1 = require("../lib");
+const html_ast_1 = require("../lib/html-ast");
+const angular_component_ast_1 = require("../lib/angular-component-ast");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
 var RejectionReason;
 (function (RejectionReason) {
     RejectionReason[RejectionReason["UNSUPPORTED_ATTRIBUTE"] = 0] = "UNSUPPORTED_ATTRIBUTE";
@@ -26,7 +28,7 @@ function isRejection(value) {
     return value?.reason !== undefined && RejectionReason[value.reason] != undefined;
 }
 function getCommonMigrationRejectionReason(node, sourceFile) {
-    if (node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstElement) {
+    if (node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement) {
         const unsupportedAttr = node.attributes.find((attr) => !allowedAttributes.some((rxp) => rxp.test(attr.name)));
         if (unsupportedAttr) {
             return {
@@ -41,7 +43,7 @@ function getCommonMigrationRejectionReason(node, sourceFile) {
                 details: unsupportedInput.name
             };
         }
-        const providers = (0, lib_1.extractProviders)(sourceFile);
+        const providers = (0, angular_component_ast_1.extractProviders)(sourceFile);
         if (providers.length > 0) {
             switch (node.name) {
                 case 'lu-establishment-select':
@@ -97,7 +99,7 @@ function getDataSource(select) {
     let result = {
         reason: RejectionReason.NO_DATA_SOURCE
     };
-    const htmlAstVisitor = new lib_1.HtmlAstVisitor(select.node);
+    const htmlAstVisitor = new html_ast_1.HtmlAstVisitor(select.node);
     let rejected = false;
     // First of all, check that there's no lu-option-select-all, because this is a rejection reason
     htmlAstVisitor.visitElements(/(lu-option-select-all)|(lu-tree-.*)/, (node) => {
@@ -119,7 +121,7 @@ function getDataSource(select) {
     }
     htmlAstVisitor.visitElements(/lu-option-picker(-advanced)?/, (node) => {
         // If picker doesn't have option as direct child, reject, we can't migrate this kind of custom stuff
-        const luOption = node.children.find((c) => c instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstTemplate && c.tagName === 'lu-option');
+        const luOption = node.children.find((c) => c instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstTemplate && c.tagName === 'lu-option');
         if (luOption === undefined) {
             result = {
                 reason: RejectionReason.CUSTOM_PICKER_CONTENT
@@ -127,20 +129,20 @@ function getDataSource(select) {
         }
         else {
             // TODO Handle advanced option picker
-            if (luOption instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstTemplate && node.name === 'lu-option-picker') {
+            if (luOption instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstTemplate && node.name === 'lu-option-picker') {
                 let valueName = '';
                 let ngForOfName = '';
                 let ngForImplicitVarName = '';
                 // If that's a simple option picker, lu-option should have dataSource in its ngFor
                 luOption.templateAttrs.forEach((attr) => {
-                    if (attr.name === 'ngForOf' && attr.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+                    if (attr.name === 'ngForOf' && attr.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
                         ngForOfName = attr.value.source || '';
                         ngForImplicitVarName = luOption.variables.find((v) => v.value === '$implicit')?.name || '';
                     }
                 });
                 // Grab assigned value to make sure it's a supported one
                 luOption.inputs.forEach((attr) => {
-                    if (attr.name === 'value' && attr.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+                    if (attr.name === 'value' && attr.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
                         valueName = attr.value.source || '';
                     }
                 });
@@ -155,10 +157,10 @@ function getDataSource(select) {
                     // We have found value and it matches, now let's check how it's rendered
                     // Idk why but AST has two levels for a single node in this case
                     const contentHost = luOption.children[0];
-                    if (contentHost instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstElement) {
-                        const templateNodes = contentHost.children.filter(c => c instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstBoundText);
+                    if (contentHost instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement) {
+                        const templateNodes = contentHost.children.filter(c => c instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstBoundText);
                         const firstValue = templateNodes[0];
-                        if (firstValue instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstBoundText && firstValue.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+                        if (firstValue instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstBoundText && firstValue.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
                             const firstTemplateSource = firstValue.value.source?.trim();
                             // First of all, check if it's a basic ?.name approach, in which case we can remove it
                             if ((templateNodes.length === 1 && firstTemplateSource === `{{ ${valueName} }}`) ||
@@ -188,7 +190,7 @@ function getDataSource(select) {
                     }
                 }
                 const comparerAST = node.inputs.find(attr => attr.name === 'option-comparer')?.value;
-                if (comparerAST instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource && comparerAST?.source && !isRejection(result)) {
+                if (comparerAST instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource && comparerAST?.source && !isRejection(result)) {
                     result.comparer = comparerAST?.source;
                 }
             }
@@ -197,23 +199,23 @@ function getDataSource(select) {
     return result;
 }
 function getDisplayer(select) {
-    const displayerHostNode = select.node.children.find((node) => node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstTemplate && node.templateAttrs.some((attr) => attr.name === 'luDisplayer'));
+    const displayerHostNode = select.node.children.find((node) => node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstTemplate && node.templateAttrs.some((attr) => attr.name === 'luDisplayer'));
     if (!displayerHostNode) {
         return {
             canBeRemoved: true
         };
     }
-    if (displayerHostNode instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstTemplate) {
+    if (displayerHostNode instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstTemplate) {
         const displayerVarName = displayerHostNode.variables.find((v) => v.value === '$implicit')?.name;
         const templateNodes = [];
-        new lib_1.HtmlAstVisitor(displayerHostNode.children).visitNodes((c) => {
-            if (c instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstBoundText) {
+        new html_ast_1.HtmlAstVisitor(displayerHostNode.children).visitNodes((c) => {
+            if (c instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstBoundText) {
                 templateNodes.push(c);
             }
         });
         if (templateNodes?.length > 0) {
             const firstValue = templateNodes[0];
-            if (firstValue instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstBoundText && firstValue.value instanceof lib_1.currentSchematicContext.angularCompiler.ASTWithSource) {
+            if (firstValue instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstBoundText && firstValue.value instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.ASTWithSource) {
                 const firstTemplateSource = firstValue.value.source?.trim();
                 if ((templateNodes.length === 1 && firstTemplateSource === `{{ ${displayerVarName} }}`) ||
                     firstTemplateSource === `{{ ${displayerVarName}?.name }}` ||

package/schematics/lu-text-input/index.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const typescript_1 = require("typescript");
-const lib_1 = require("../lib");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
+const schematics_1 = require("../lib/schematics");
 const migration_1 = require("./migration");
 // Nx need to see "@angular-devkit/schematics" in order to run this migration correctly (see https://github.com/nrwl/nx/blob/d9fed4b832bf01d1b9a44ae9e486a5e5cd2d2253/packages/nx/src/command-line/migrate/migrate.ts#L1729-L1738)
 require('@angular-devkit/schematics');
 exports.default = (options) => {
     return async (tree, context) => {
-        await lib_1.currentSchematicContext.init(context, options);
+        await lf_schematic_context_1.currentSchematicContext.init(context, options);
         tree.visit((path, entry) => {
             if (path.includes('node_modules') || !entry) {
                 return;
             }
             if (path.endsWith('.ts')) {
-                (0, lib_1.migrateFile)(path, entry, tree, (content) => {
+                (0, schematics_1.migrateFile)(path, entry, tree, (content) => {
                     const sourceFile = (0, typescript_1.createSourceFile)(path, content, typescript_1.ScriptTarget.ESNext);
                     return (0, migration_1.migrateComponent)(sourceFile, path, tree);
                 });

package/schematics/lu-text-input/migration.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateComponent = migrateComponent;
+const angular_template_1 = require("../lib/angular-template");
+const html_ast_js_1 = require("../lib/html-ast.js");
+const lf_schematic_context_1 = require("../lib/lf-schematic-context");
+const angular_component_ast_1 = require("../lib/angular-component-ast");
 const change_1 = require("@schematics/angular/utility/change");
-const lib_1 = require("../lib");
 function migrateComponent(sourceFile, path, tree) {
     const textfields = findTextfields(sourceFile, path, tree);
     if (textfields.length > 0) {
@@ -21,7 +24,7 @@ function migrateComponent(sourceFile, path, tree) {
                 // Let's remove everything first
                 templateUpdate.remove(field.nodeOffset + field.node.startSourceSpan.start.offset, field.node.sourceSpan.toString().length);
                 // Then forge the new input
-                const textInput = `<lu-text-input ${(0, lib_1.inputValueToHTML)('placeholder', field.inputs.placeholder)} ${(0, lib_1.inputValueToHTML)('formControlName', field.inputs.formControlName)} ${(0, lib_1.inputValueToHTML)('ngModel', field.inputs.ngModel)} />`.replace(/\s{2,}/, " ");
+                const textInput = `<lu-text-input ${(0, angular_component_ast_1.inputValueToHTML)('placeholder', field.inputs.placeholder)} ${(0, angular_component_ast_1.inputValueToHTML)('formControlName', field.inputs.formControlName)} ${(0, angular_component_ast_1.inputValueToHTML)('ngModel', field.inputs.ngModel)} />`.replace(/\s{2,}/, " ");
                 const fieldOpeningTag = `lu-form-field [label]="labelTpl"`.replace(/\s{2,}/, " ").trim();
                 // TODO handle required migration from template-driven to form-driven???
                 const newInput = `<${fieldOpeningTag}>
@@ -35,10 +38,10 @@ function migrateComponent(sourceFile, path, tree) {
         if (updatedStuff) {
             // Add import if needed
             (0, change_1.applyToUpdateRecorder)(tsUpdate, [
-                (0, lib_1.insertTSImportIfNeeded)(sourceFile, path, 'FormFieldComponent', '@lucca-front/ng/form-field'),
-                (0, lib_1.insertAngularImportIfNeeded)(sourceFile, path, 'FormFieldComponent'),
-                (0, lib_1.insertTSImportIfNeeded)(sourceFile, path, 'TextInputComponent', '@lucca-front/ng/forms'),
-                (0, lib_1.insertAngularImportIfNeeded)(sourceFile, path, 'TextInputComponent')
+                (0, angular_component_ast_1.insertTSImportIfNeeded)(sourceFile, path, 'FormFieldComponent', '@lucca-front/ng/form-field'),
+                (0, angular_component_ast_1.insertAngularImportIfNeeded)(sourceFile, path, 'FormFieldComponent'),
+                (0, angular_component_ast_1.insertTSImportIfNeeded)(sourceFile, path, 'TextInputComponent', '@lucca-front/ng/forms'),
+                (0, angular_component_ast_1.insertAngularImportIfNeeded)(sourceFile, path, 'TextInputComponent')
             ]);
             tree.commitUpdate(tsUpdate);
             if (!isInlineTemplate) {
@@ -50,11 +53,11 @@ function migrateComponent(sourceFile, path, tree) {
 }
 function findTextfields(sourceFile, basePath, tree) {
     const fields = [];
-    const ngTemplates = (0, lib_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
+    const ngTemplates = (0, angular_template_1.extractNgTemplatesIncludingHtml)(sourceFile, tree, basePath);
     ngTemplates.forEach((template) => {
-        const htmlAst = new lib_1.HtmlAst(template.content);
+        const htmlAst = new html_ast_js_1.HtmlAst(template.content);
         htmlAst.visitNodes((node) => {
-            if ((0, lib_1.isInterestingNode)(node) && node.name === "label") {
+            if (isInterestingNode(node) && node.name === "label") {
                 const classes = getNodeClasses(node);
                 const inputs = {
                     size: classes.find(c => /mod-(XS|S|M|L|XL|XXL)/.test(c))?.replace('mod-', '')
@@ -68,24 +71,24 @@ function findTextfields(sourceFile, basePath, tree) {
                     classes: classes
                 };
                 if (classes.includes("textfield")) {
-                    if (node.children.filter(el => (0, lib_1.isInterestingNode)(el) || isControlFlowNode(el)).length > 2) {
+                    if (node.children.filter(el => isInterestingNode(el) || isControlFlowNode(el)).length > 2) {
                         field.rejection = "Field contains more than an input + label";
                     }
                     // Find native input and grab params from it
-                    const nativeInput = node.children.find(el => (0, lib_1.isInterestingNode)(el) && el.name === "input");
+                    const nativeInput = node.children.find(el => isInterestingNode(el) && el.name === "input");
                     if (!nativeInput) {
                         field.rejection = "Field doesn't contain a native input[type=text]";
                     }
-                    else if ((0, lib_1.isInterestingNode)(nativeInput)) {
-                        inputs.placeholder = (0, lib_1.getInputValue)(nativeInput, "placeholder");
-                        inputs.formControlName = (0, lib_1.getInputValue)(nativeInput, "formControlName");
-                        inputs.ngModel = (0, lib_1.getInputValue)(nativeInput, "ngModel");
-                        inputs.forceRequired = (0, lib_1.getInputValue)(nativeInput, "aria-required");
+                    else if (isInterestingNode(nativeInput)) {
+                        inputs.placeholder = (0, angular_component_ast_1.getInputValue)(nativeInput, "placeholder");
+                        inputs.formControlName = (0, angular_component_ast_1.getInputValue)(nativeInput, "formControlName");
+                        inputs.ngModel = (0, angular_component_ast_1.getInputValue)(nativeInput, "ngModel");
+                        inputs.forceRequired = (0, angular_component_ast_1.getInputValue)(nativeInput, "aria-required");
                     }
                     // This is a textfield, now let's find if it has everything required for migration
-                    const visitor = new lib_1.HtmlAstVisitor(node);
+                    const visitor = new html_ast_js_1.HtmlAstVisitor(node);
                     visitor.visitElements(/span/, (el) => {
-                        if ((0, lib_1.isInterestingNode)(el) && getNodeClasses(el).includes("textfield-label")) {
+                        if (isInterestingNode(el) && getNodeClasses(el).includes("textfield-label")) {
                             field.label = template.content.slice(el.startSourceSpan.end.offset, el.endSourceSpan?.start?.offset);
                         }
                     });
@@ -102,9 +105,12 @@ function findTextfields(sourceFile, basePath, tree) {
 function getNodeClasses(node) {
     return (node.attributes.find(attr => attr.name === 'class')?.value || "").split(" ");
 }
+function isInterestingNode(node) {
+    return node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstElement;
+}
 function isControlFlowNode(node) {
-    return node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstIfBlock ||
-        node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstForLoopBlock ||
-        node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstSwitchBlock ||
-        node instanceof lib_1.currentSchematicContext.angularCompiler.TmplAstDeferredBlock;
+    return node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstIfBlock ||
+        node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstForLoopBlock ||
+        node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstSwitchBlock ||
+        node instanceof lf_schematic_context_1.currentSchematicContext.angularCompiler.TmplAstDeferredBlock;
 }