Merge branch '16.1.x' of https://github.com/IgniteUI/igniteui-angular into simeonoff/sass-build

kdinev · kdinev · commit cadcf11fbbe6 · 2023-10-04T16:20:19.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "fflate": "^0.7.3",
     "hammerjs": "^2.0.8",
     "igniteui-theming": "^3.1.1",
-    "igniteui-trial-watermark": "^2.0.0",
+    "igniteui-trial-watermark": "^3.0.2",
     "lodash-es": "^4.17.21",
     "rxjs": "^6.6.7",
     "tslib": "^2.3.0",
diff --git a/projects/igniteui-angular/migrations/common/ServerHost.ts b/projects/igniteui-angular/migrations/common/ServerHost.ts
@@ -47,13 +47,13 @@ export class ServerHost implements ts.server.ServerHost {
     public watchFile(_path: string, _callback: ts.FileWatcherCallback, _pollingInterval?: number):
         ts.FileWatcher {
         // return ts.sys.watchFile(path, callback, pollingInterval);
-        return undefined;
+        return { close: () => {} };
     }
 
     public watchDirectory(_path: string, _callback: ts.DirectoryWatcherCallback, _recursive?: boolean):
         ts.FileWatcher {
         // return ts.sys.watchDirectory(path, callback, recursive);
-        return undefined;
+        return { close: () => {} };
     }
     //#endregion
 
@@ -106,7 +106,7 @@ export class ServerHost implements ts.server.ServerHost {
         // check directory contents in Tree (w/ relative paths)
         path = pathFs.relative(this.getCurrentDirectory(), path);
         // return directory contents w/ absolute paths for LS
-        return this.host.getDir(path).subdirs.map(e => pathFs.resolve(e));
+        return this.host.getDir(path).subdirs.map(e => pathFs.resolve(path, e));
     }
 
     /**
@@ -116,7 +116,7 @@ export class ServerHost implements ts.server.ServerHost {
         // check directory contents in Tree (w/ relative paths)
         path = pathFs.relative(this.getCurrentDirectory(), path);
         // return directory contents w/ absolute paths for LS
-        return this.host.getDir(path).subfiles.map(e => pathFs.resolve(e));
+        return this.host.getDir(path).subfiles.map(e => pathFs.resolve(path, e));
     }
 
     public require(initialPath: string, moduleName: string) {
diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import * as ts from 'typescript';
 import * as tss from 'typescript/lib/tsserverlibrary';
 import { SchematicContext, Tree, FileVisitor } from '@angular-devkit/schematics';
-import { WorkspaceSchema, WorkspaceProject, ProjectType } from '@schematics/angular/utility/workspace-models';
+import type { WorkspaceSchema } from '@schematics/angular/utility/workspace-models';
 import {
     ClassChanges, BindingChanges, SelectorChange,
     SelectorChanges, ThemeChanges, ImportsChanges, MemberChanges, ThemeChange, ThemeType
@@ -59,13 +59,13 @@ export class UpdateChanges {
             // Force Angular service to compile project on initial load w/ configure project
             // otherwise if the first compilation occurs on an HTML file the project won't have proper refs
             // and no actual angular metadata will be resolved for the rest of the migration
-            const wsProject = this.resolveWorkspaceProject();
-            if (!wsProject) {
+
+            // TODO: this patter/issue might be obsolete; if so, should be safe to return _projectService directly
+            const mainRelPath = this.getWorkspaceProjectEntryPath();
+            if (!mainRelPath) {
                 return null;
             }
-            const mainRelPath = wsProject.architect?.build?.options['main'] ?
-                path.join(wsProject.root, wsProject.architect?.build?.options['main']) :
-                `src/main.ts`;
+
             // patch TSConfig so it includes angularOptions.strictTemplates
             // ivy ls requires this in order to function properly on templates
             this.patchTsConfig();
@@ -74,8 +74,14 @@ export class UpdateChanges {
             this._projectService.openClientFile(scriptInfo.fileName);
 
 
-            const project = this._projectService.findProject(scriptInfo.containingProjects[0].projectName);
-            project.getLanguageService().getSemanticDiagnostics(mainAbsPath);
+            try {
+                const project = this._projectService.findProject(scriptInfo.containingProjects[0].projectName);
+                project.getLanguageService().getSemanticDiagnostics(mainAbsPath);
+            } catch (err) {
+                this.context.logger.warn(
+                    "An error occurred during TypeScript project service setup. Some migrations relying on language services might not be applied."
+                );
+            }
         }
 
         return this._projectService;
@@ -829,22 +835,26 @@ export class UpdateChanges {
         return project;
     }
 
-    private resolveWorkspaceProject(): WorkspaceProject<ProjectType> | null {
-        let wsProject = this.workspace.projects[0];
-        if (!wsProject) {
-            const projectKeys = Object.keys(this.workspace.projects);
-            if (!projectKeys.length) {
-                this.context
-                    .logger
-                    .info(
+    private getWorkspaceProjectEntryPath(): string | null {
+        const projectKeys = Object.keys(this.workspace.projects);
+        if (!projectKeys.length) {
+            this.context.logger.info(
 `Could not resolve project from directory ${this.serverHost.getCurrentDirectory()}. Some migrations may not be applied.`);
-                return null;
+            return null;
+        }
+
+        // grab the first possible main path:
+        for (const key of projectKeys) {
+            const wsProject = this.workspace.projects[key];
+            // intentionally compare against string values of the enum to avoid hard import
+            if (wsProject.projectType == "application" && wsProject.architect?.build?.options['main']) {
+                return wsProject.architect.build.options['main'];
+            } else if (wsProject.projectType == "library") {
+                // TODO: attempt to resolve from project ng-package.json or tsConfig
             }
-            // get the first configured project in the workspace
-            wsProject = this.workspace.projects[projectKeys[0]];
         }
 
-        return wsProject;
+        return null;
     }
 }
 
diff --git a/projects/igniteui-angular/migrations/common/tsUtils.ts b/projects/igniteui-angular/migrations/common/tsUtils.ts
@@ -260,7 +260,12 @@ const getTypeDefinitions = (langServ: tss.LanguageService, entryPath: string, po
  */
 export const getTypeDefinitionAtPosition =
     (langServ: tss.LanguageService, entryPath: string, position: number): MemberInfo | null => {
-        const definition = langServ.getDefinitionAndBoundSpan(entryPath, position)?.definitions[0];
+        let definition;
+        try {
+            definition = langServ.getDefinitionAndBoundSpan(entryPath, position)?.definitions[0];
+        } catch (err) {
+            return null;
+        }
         if (!definition) {
             return null;
         }
@@ -352,7 +357,12 @@ export const isMemberIgniteUI =
             matchPosition = langServ.getBraceMatchingAtPosition(entryPath, matchPosition - 1)[0]?.start ?? matchPosition;
         }
 
-        const typeDef = getTypeDefinitionAtPosition(langServ, entryPath, matchPosition);
+        let typeDef;
+        try {
+            typeDef = getTypeDefinitionAtPosition(langServ, entryPath, matchPosition);
+        } catch (err) {
+            false;
+        }
         if (!typeDef) {
             return false;
         }
diff --git a/projects/igniteui-angular/migrations/common/util.ts b/projects/igniteui-angular/migrations/common/util.ts
@@ -5,6 +5,9 @@ import { WorkspaceSchema, WorkspaceProject } from '@schematics/angular/utility/w
 import { execSync } from 'child_process';
 import {
     Attribute,
+    Block,
+    BlockGroup,
+    BlockParameter,
     Comment,
     Element,
     Expansion,
@@ -245,10 +248,10 @@ class SerializerVisitor implements Visitor {
 
     public visitElement(element: Element, _context: any): any {
         if (this.getHtmlTagDefinition(element.name).isVoid) {
-            return `<${element.name}${this._visitAll(element.attrs, ' ')}/>`;
+            return `<${element.name}${this._visitAll(element.attrs, ' ', ' ')}/>`;
         }
 
-        return `<${element.name}${this._visitAll(element.attrs, ' ')}>${this._visitAll(element.children)}</${element.name}>`;
+        return `<${element.name}${this._visitAll(element.attrs, ' ', ' ')}>${this._visitAll(element.children)}</${element.name}>`;
     }
 
     public visitAttribute(attribute: Attribute, _context: any): any {
@@ -271,11 +274,21 @@ class SerializerVisitor implements Visitor {
         return ` ${expansionCase.value} {${this._visitAll(expansionCase.expression)}}`;
     }
 
-    private _visitAll(nodes: Node[], join = ''): string {
-        if (nodes.length === 0) {
-            return '';
-        }
-        return join + nodes.map(a => a.visit(this, null)).join(join);
+    public visitBlock(block: Block, _context: any) {
+        const params =
+            block.parameters.length === 0 ? ' ' : ` (${this._visitAll(block.parameters, ';', ' ')}) `;
+        return `@${block.name}${params}{${this._visitAll(block.children)}}`;
+    }
+
+    public visitBlockParameter(parameter: BlockParameter, _context: any) {
+        return parameter.expression;
+    }
+
+    // XXX: This **HAS** to be removed in the next major release of Angular (v17) as it will error out again
+    public visitBlockGroup(_group: BlockGroup, _context: any) { }
+
+    private _visitAll(nodes: Node[], separator = '', prefix = ''): string {
+        return nodes.length > 0 ? prefix + nodes.map(a => a.visit(this, null)).join(separator) : '';
     }
 }
 
@@ -286,7 +299,7 @@ export const serializeNodes = (nodes: Node[], getHtmlTagDefinition: (tagName: st
 
 export const makeNgIf = (name: string, value: string) => name.startsWith('[') && value !== 'true';
 
-export const stringifyAttriutes = (attributes: Attribute[]) => {
+export const stringifyAttributes = (attributes: Attribute[]) => {
     let stringAttributes = '';
     attributes.forEach(element => {
         // eslint-disable-next-line max-len
diff --git a/projects/igniteui-angular/migrations/update-12_1_0/index.ts b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
@@ -1,8 +1,10 @@
 import { Element } from '@angular/compiler';
 import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
-import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile,
-        serializeNodes, makeNgIf, stringifyAttriutes } from '../common/util';
+import {
+  FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile,
+  serializeNodes, makeNgIf, stringifyAttributes
+} from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
 
 const version = '12.1.0';
@@ -19,7 +21,7 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
   const warnMsg = `\n<!-- Auto migrated template content. Please, check your bindings! -->\n`;
   const deprecatedToken = 'IgxGridTransaction';
   const providerWarnMsg = `/* Injection token 'IgxGridTransaction' has been deprecated. ` +
-  `Please refer to the update guide for more details. */`;
+    `Please refer to the update guide for more details. */`;
   const templateNames = [];
 
   const applyChanges = () => {
@@ -64,7 +66,7 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
     const paginatorTemplate = ngTemplates.filter(template => hasAttribute(template as Element, `#${paginationTemplateName?.value}`))[0];
     if (paginatorTemplate && checkForPaginatorInTemplate(path, paginationTemplateName?.value)) {
       const pgCmpt = findElementNodes((paginatorTemplate as Element).children, 'igx-paginator')[0];
-      return `\n<igx-paginator${isChildGrid ? ' *igxPaginator' : ''}${stringifyAttriutes((pgCmpt as Element).attrs)}></igx-paginator>`;
+      return `\n<igx-paginator${isChildGrid ? ' *igxPaginator' : ''}${stringifyAttributes((pgCmpt as Element).attrs)}></igx-paginator>`;
     } else {
       // eslint-disable-next-line max-len
       return `\n<igx-paginator${isChildGrid ? ' *igxPaginator' : ''}${makeNgIf(propName, value) ? ` *ngIf="${value}"` : ''}>${moveTemplate(paginatorTemplate)}</igx-paginator>`;
diff --git a/projects/igniteui-angular/migrations/update-16_1_0/index.spec.ts b/projects/igniteui-angular/migrations/update-16_1_0/index.spec.ts
@@ -47,7 +47,7 @@ describe(`Update to ${version}`, () => {
             public title: IgxStepSubTitleDirective;
         }
         `);
-        const tree = await schematicRunner.runSchematicAsync(migrationName, { shouldInvokeLS: false }, appTree).toPromise();
+        const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
 
         const expectedContent = `import { Component, ViewChild } from '@angular/core';
         import { IgxStepSubtitleDirective } from 'igniteui-angular';
@@ -72,18 +72,18 @@ describe(`Update to ${version}`, () => {
             `<igx-stepper>
                 <igx-step>
                    <p igxStepTitle>Home</p>
-                   <p igxStepSubTitle>Home Sub Title</p>                   
+                   <p igxStepSubTitle>Home Sub Title</p>
                 </igx-step>
             </igx-stepper>`);
 
-        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
-            .toPromise();
+        const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
+
         expect(tree.readContent('/testSrc/appPrefix/component/test.component.html'))
             .toEqual(
             `<igx-stepper>
                 <igx-step>
                    <p igxStepTitle>Home</p>
-                   <p igxStepSubtitle>Home Sub Title</p>                   
+                   <p igxStepSubtitle>Home Sub Title</p>
                 </igx-step>
             </igx-stepper>`);
 
@@ -108,9 +108,7 @@ describe(`Update to ${version}`, () => {
         }
         `);
 
-        const tree = await schematicRunner
-            .runSchematicAsync(migrationName, {}, appTree)
-            .toPromise();
+        const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
 
         expect(
             tree.readContent('/testSrc/appPrefix/component/test.component.ts')
@@ -133,7 +131,7 @@ describe(`Update to ${version}`, () => {
         );
     });
 
-    it('Should remove multiSelection property set to "true" and replace it with selectionMode property set to "multi"', async () => {
+    it('Should remove button-group multiSelection property set to "true" and replace it with selectionMode property set to "multi"', async () => {
         appTree.create(
             `/testSrc/appPrefix/component/test.component.html`,
             `<igx-buttongroup [multiSelection]="true">
@@ -145,9 +143,8 @@ describe(`Update to ${version}`, () => {
                 </button>
             </igx-buttongroup>`);
 
-        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
-            .toPromise();
-    
+        const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
+
         expect(tree.readContent('/testSrc/appPrefix/component/test.component.html'))
             .toEqual(
             `<igx-buttongroup [selectionMode]="'multi'">
@@ -160,7 +157,7 @@ describe(`Update to ${version}`, () => {
             </igx-buttongroup>`);
     });
 
-    it('Should remove multiSelection property set to "false"', async () => {
+    it('Should remove button-group multiSelection property set to "false"', async () => {
         appTree.create(
             '/testSrc/appPrefix/component/test.component.html',
             `<igx-buttongroup [multiSelection]="false">
@@ -172,8 +169,7 @@ describe(`Update to ${version}`, () => {
                 </button>
             </igx-buttongroup>`);
 
-        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
-            .toPromise();
+        const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
 
         expect(tree.readContent('/testSrc/appPrefix/component/test.component.html'))
             .toEqual(
@@ -186,4 +182,26 @@ describe(`Update to ${version}`, () => {
                 </button>
             </igx-buttongroup>`);
     });
+
+    it('Should not update button-group without multiSelection prop', async () => {
+        const content = `<igx-buttongroup alignment="horizontal">
+                <button igxButton>
+                    Button 1
+                </button>
+                <button igxButton>
+                    Button 2
+                </button>
+            </igx-buttongroup>
+            <igx-buttongroup>
+                <button igxButton>
+                    Button 1
+                </button>
+            </igx-buttongroup>`;
+
+        appTree.create(`/testSrc/appPrefix/component/test.component.html`, content);
+
+        const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
+
+        expect(tree.readContent('/testSrc/appPrefix/component/test.component.html')).toEqual(content);
+    });
 });
diff --git a/projects/igniteui-angular/migrations/update-16_1_0/index.ts b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
@@ -4,7 +4,7 @@ import {
     Tree
 } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
-import { FileChange, findElementNodes, getAttribute, getSourceOffset, parseFile } from '../common/util';
+import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
 import { Element } from '@angular/compiler';
 
@@ -23,11 +23,11 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
     const applyChanges = () => {
         for (const [path, change] of changes.entries()) {
           let buffer = host.read(path).toString();
-    
+
           change.sort((c, c1) => c.position - c1.position)
             .reverse()
             .forEach(c => buffer = c.apply(buffer));
-    
+
           host.overwrite(path, buffer);
         }
       };
@@ -42,7 +42,9 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
 
     for (const path of update.templateFiles) {
         const buttonGroups = findElementNodes(parseFile(new HtmlParser(), host, path), 'igx-buttongroup');
-        buttonGroups.map(node => getSourceOffset(node as Element))
+        buttonGroups
+            .filter(node => hasAttribute(node as Element, prop))
+            .map(node => getSourceOffset(node as Element))
             .forEach(offset => {
                 const { startTag, file, node } = offset;
                 const { name, value } = getAttribute(node, prop)[0];
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -73,7 +73,7 @@
         "hammerjs": "^2.0.8",
         "fflate": "^0.7.3",
         "tslib": "^2.3.0",
-        "igniteui-trial-watermark": "^1.0.3",
+        "igniteui-trial-watermark": "^3.0.2",
         "lodash-es": "^4.17.21",
         "uuid": "^9.0.0",
         "igniteui-theming": "^3.1.1",
diff --git a/projects/igniteui-angular/src/lib/buttonGroup/buttonGroup.component.ts b/projects/igniteui-angular/src/lib/buttonGroup/buttonGroup.component.ts
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
