@igniteui/angular-templates 18.1.1400-beta.2 → 18.1.1400-beta.3

package/AngularTypeScriptFileUpdate.d.ts

@@ -1,15 +1,16 @@
+import * as ts from 'typescript';
 import { KeyValuePair, FormatSettings, PropertyAssignment, TemplateDependency, TypeScriptFileUpdate, RouteEntry } from '@igniteui/cli-core';
 import { AngularRouteLike } from './types';
 export declare class AngularTypeScriptFileUpdate extends TypeScriptFileUpdate {
-    protected filePath: string;
-    private standalone;
+    readonly filePath: string;
+    readonly standalone: boolean;
     protected formatSettings?: FormatSettings;
     /**
      * Creates a new AngularTypeScriptFileUpdate instance for the given file.
      * @param standalone Whether the file is a standalone component.
      * @param formatSettings Custom formatting settings to apply.
      */
-    constructor(filePath: string, standalone?: boolean, formatSettings?: FormatSettings);
+    constructor(filePath: string, standalone?: boolean, formatSettings?: FormatSettings, compilerOptions?: ts.CompilerOptions);
     /**
      * Adds a route entry to the Angular routing module's routes variable instance.
      * @param route The route to add.
@@ -34,6 +35,13 @@ export declare class AngularTypeScriptFileUpdate extends TypeScriptFileUpdate {
      * @param multiline Whether to format the new entry as multiline.
      */
     addNgModuleMeta(dep: TemplateDependency, variables?: KeyValuePair<string>, multiline?: boolean): void;
+    /**
+     * Adds metadata to the arguments provided in `TestBed.configureTestingModule`.
+     * @param dep The dependency to add to the testing module's metadata.
+     * @param variables Variables to replace in the dependency strings.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    addTestingModuleMeta(dep: TemplateDependency, variables?: KeyValuePair<string>, multiline?: boolean): void;
     /**
      * Includes `{ bindToComponentInputs: true }` for a `forRoot` call in an `NgModule`'s `imports` member.
      *
@@ -67,6 +75,15 @@ export declare class AngularTypeScriptFileUpdate extends TypeScriptFileUpdate {
      * @param multiline Whether to format the new entry as multiline.
      */
     private mutateNgDecoratorMeta;
+    /**
+     * Updates Angular's metadata related to NgModules, Standalone Components or TestingModules.
+     * @param target The name of the target metadata property to update.
+     * @param targetMetaProp The property that is to be updated.
+     * @param identifiers The identifiers to add.
+     * @param visitorCondition The condition to find the object literal that contains the target property.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    private mutateNgMeta;
     /**
      * Checks if a node has an ancestor with a specific decorator.
      * @param name The name of the decorator.
@@ -80,4 +97,11 @@ export declare class AngularTypeScriptFileUpdate extends TypeScriptFileUpdate {
      * @param node The node to start checking from.
      */
     private findNgDecoratorProperty;
+    /**
+     * Calls `forRoot` on a module identifier.
+     * @param dep The dependency to add to the module's metadata.
+     * @param copy The copy of the module's metadata.
+     * @param args The arguments to pass to the `forRoot` call.
+     */
+    private addRootToModule;
 }

package/AngularTypeScriptFileUpdate.js

@@ -10,8 +10,8 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
      * @param standalone Whether the file is a standalone component.
      * @param formatSettings Custom formatting settings to apply.
      */
-    constructor(filePath, standalone = false, formatSettings) {
-        super(filePath, formatSettings);
+    constructor(filePath, standalone = false, formatSettings, compilerOptions) {
+        super(filePath, formatSettings, compilerOptions);
         this.filePath = filePath;
         this.standalone = standalone;
         this.formatSettings = formatSettings;
@@ -74,12 +74,48 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
         if (dep.from) {
             this.addImportDeclarationForDependency(copy, dep.from, variables);
         }
-        if (dep.root && copy.imports.length > 0) {
-            // add forRoot to the module
-            copy.imports = copy.imports.map((i) => this.astTransformer.printer.printNode(ts.EmitHint.Unspecified, this.astTransformer.createCallExpression(i, cli_core_1.NG_FOR_ROOT_IDENTIFIER_NAME), this.astTransformer.sourceFile));
-        }
+        this.addRootToModule(dep, copy);
         this.applyDecoratorMutations(cli_core_1.NG_MODULE_DECORATOR_NAME, copy, multiline);
     }
+    /**
+     * Adds metadata to the arguments provided in `TestBed.configureTestingModule`.
+     * @param dep The dependency to add to the testing module's metadata.
+     * @param variables Variables to replace in the dependency strings.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    addTestingModuleMeta(dep, variables, multiline = false) {
+        const copy = {
+            imports: this.asArray(dep.import || [], variables || {}),
+            declarations: this.asArray(dep.declare || [], variables || {}),
+            providers: this.asArray(dep.provide || [], variables || {}),
+            exports: this.asArray(dep.export || [], variables || {}),
+            schemas: this.asArray(dep.schema || [], variables || {}),
+        };
+        if (dep.from) {
+            this.addImportDeclarationForDependency(copy, dep.from, variables);
+        }
+        if (!this.standalone) {
+            this.addRootToModule(dep, copy);
+        }
+        const parentIsConfigureTestingModule = (node) => {
+            return !!this.astTransformer.findNodeAncestor(node, (_node) => {
+                return (ts.isCallExpression(_node) &&
+                    ts.isPropertyAccessExpression(_node.expression) &&
+                    ts.isIdentifier(_node.expression.name) &&
+                    _node.expression.name.text === cli_core_1.NG_CONFIG_TESTING_MODULE);
+            });
+        };
+        const findTargetMetaProp = (propName) => this.astTransformer.findPropertyAssignment((node) => ts.isIdentifier(node.name) &&
+            node.name.text === propName &&
+            parentIsConfigureTestingModule(node));
+        for (const key of Object.keys(copy)) {
+            const targetMetaProp = findTargetMetaProp(key);
+            const identifiers = copy[key].map(ts.factory.createIdentifier);
+            if (copy[key].length > 0) {
+                this.mutateNgMeta(key, targetMetaProp, identifiers, parentIsConfigureTestingModule, multiline);
+            }
+        }
+    }
     /**
      * Includes `{ bindToComponentInputs: true }` for a `forRoot` call in an `NgModule`'s `imports` member.
      *
@@ -227,10 +263,21 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
     mutateNgDecoratorMeta(name, meta, target, multiline = false) {
         const identifiers = meta.map(ts.factory.createIdentifier);
         const targetMetaProp = this.findNgDecoratorProperty(name, target);
+        this.mutateNgMeta(target, targetMetaProp, identifiers, (node) => this.checkNgDecorator(name, node), multiline);
+    }
+    /**
+     * Updates Angular's metadata related to NgModules, Standalone Components or TestingModules.
+     * @param target The name of the target metadata property to update.
+     * @param targetMetaProp The property that is to be updated.
+     * @param identifiers The identifiers to add.
+     * @param visitorCondition The condition to find the object literal that contains the target property.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    mutateNgMeta(target, targetMetaProp, identifiers, visitorCondition, multiline) {
         const value = targetMetaProp && !ts.isArrayLiteralExpression(targetMetaProp.initializer)
             ? [targetMetaProp.initializer, ...identifiers]
             : identifiers;
-        this.astTransformer.requestNewMemberInObjectLiteral((node) => this.checkNgDecorator(name, node), target, this.astTransformer.createArrayLiteralExpression(value, multiline), multiline);
+        this.astTransformer.requestNewMemberInObjectLiteral(visitorCondition, target, this.astTransformer.createArrayLiteralExpression(value, multiline), multiline);
     }
     /**
      * Checks if a node has an ancestor with a specific decorator.
@@ -256,8 +303,8 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
      * @param node The node to start checking from.
      */
     findNgDecoratorProperty(decoratorName, propName) {
-        const ngDecoratorExists = (node) => !!this.astTransformer.findNodeAncestor(node, (node) => {
-            const nodeExpressionToken = ts.isDecorator(node) && node.expression.getFirstToken();
+        const ngDecoratorExists = (node) => !!this.astTransformer.findNodeAncestor(node, (_node) => {
+            const nodeExpressionToken = ts.isDecorator(_node) && _node.expression.getFirstToken();
             return (ts.isIdentifier(nodeExpressionToken) &&
                 nodeExpressionToken.text === decoratorName);
         });
@@ -265,5 +312,26 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
             node.name.text === propName &&
             ngDecoratorExists(node));
     }
+    /**
+     * Calls `forRoot` on a module identifier.
+     * @param dep The dependency to add to the module's metadata.
+     * @param copy The copy of the module's metadata.
+     * @param args The arguments to pass to the `forRoot` call.
+     */
+    addRootToModule(dep, copy, args) {
+        if (dep.root && copy.imports.length > 0) {
+            // add forRoot to the module
+            let forRootArgs = [
+                this.astTransformer.createArrayLiteralExpression([]),
+            ];
+            if (args) {
+                forRootArgs = Array.isArray(args)
+                    ? args
+                    : [this.astTransformer.createArrayLiteralExpression([args])];
+            }
+            copy.imports = copy.imports.map((i) => this.astTransformer.printer.printNode(ts.EmitHint.Unspecified, this.astTransformer.createCallExpression(i, cli_core_1.NG_FOR_ROOT_IDENTIFIER_NAME, undefined, // type args
+            forRootArgs), this.astTransformer.sourceFile));
+        }
+    }
 }
 exports.AngularTypeScriptFileUpdate = AngularTypeScriptFileUpdate;

package/igx-ts/autocomplete/autocomplete-extended/files/src/app/__path__/__filePrefix__.component.spec.ts

@@ -5,8 +5,8 @@ import { IgxAutocompleteModule, IgxDropDownModule, IgxInputGroupModule, IgxToast
 import {
   <%=ClassName%>Component,
   <%=ClassName%>PipeStartsWith,
-  <%=ClassName%>RegionContains }
-from './<%=filePrefix%>.component';
+  <%=ClassName%>RegionContains
+} from './<%=filePrefix%>.component';
 
 describe('<%=ClassName%>Component', () => {
   let component: <%=ClassName%>Component;
@@ -14,8 +14,17 @@ describe('<%=ClassName%>Component', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [<%=ClassName%>Component, <%=ClassName%>PipeStartsWith, <%=ClassName%>RegionContains],
-      imports: [FormsModule, IgxDropDownModule, IgxAutocompleteModule, NoopAnimationsModule, IgxInputGroupModule, IgxToastModule]
+      imports: [
+        <%=ClassName%>Component,
+        <%=ClassName%>PipeStartsWith,
+        <%=ClassName%>RegionContains,
+        FormsModule,
+        IgxDropDownModule,
+        IgxAutocompleteModule,
+        IgxInputGroupModule,
+        IgxToastModule,
+        NoopAnimationsModule
+      ]
     })
       .compileComponents();
   }));

package/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.component.spec.ts

@@ -19,7 +19,6 @@ describe('<%=ClassName%>Component', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [],
       imports: [
         FormsModule,
         BrowserAnimationsModule,

package/igx-ts/projects/_base/files/src/app/app.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { RouterModule } from '@angular/router';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  let component: AppComponent;
+  let fixture: ComponentFixture<AppComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [ AppComponent, RouterModule.forRoot([]) ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AppComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/igx-ts/projects/_base_with_home/files/src/app/home/home.component.spec.ts

@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { RouterModule } from '@angular/router';
 import { HomeComponent } from './home.component';
 
 describe('HomeComponent', () => {
@@ -8,8 +8,7 @@ describe('HomeComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [ RouterTestingModule ],
-      declarations: [ HomeComponent ]
+      imports: [ HomeComponent, RouterModule.forRoot([]) ]
     })
     .compileComponents();
   }));

package/igx-ts/projects/side-nav/files/src/app/app.component.spec.ts

@@ -1,12 +1,13 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { RouterModule } from '@angular/router';
 import { IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule } from 'igniteui-angular';
 import { AppComponent } from './app.component';
+
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        RouterTestingModule,
+        RouterModule.forRoot([]),
         IgxLayoutModule,
         IgxNavbarModule,
         IgxNavigationDrawerModule,
@@ -15,6 +16,7 @@ describe('AppComponent', () => {
       ]
     }).compileComponents();
   }));
+
   it('should create the app', waitForAsync(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;

package/igx-ts/projects/side-nav-auth/files/src/app/app.component.spec.ts

@@ -1,15 +1,16 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
+import { RouterModule } from '@angular/router';
 import { IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule } from 'igniteui-angular';
 import { AppComponent } from './app.component';
 import { AuthenticationModule } from './authentication';
+
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
         IgxNavigationDrawerModule,
         AuthenticationModule,
         IgxNavbarModule,
@@ -19,6 +20,7 @@ describe('AppComponent', () => {
       ]
     }).compileComponents();
   }));
+
   it('should create the app', waitForAsync(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;

package/igx-ts-legacy/projects/_base/files/angular.json

@@ -99,7 +99,6 @@
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
             "inlineStyleLanguage": "scss",
             "styles": [
               "src/styles.scss"

package/igx-ts-legacy/projects/_base/files/src/app/app.component.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  let component: AppComponent;
+  let fixture: ComponentFixture<AppComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AppComponent ],
+      imports: [ RouterTestingModule ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AppComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/igx-ts-legacy/projects/_base_with_home/files/src/app/home/home.component.spec.ts

@@ -8,8 +8,8 @@ describe('HomeComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [ RouterTestingModule ],
-      declarations: [ HomeComponent ]
+      declarations: [ HomeComponent ],
+      imports: [ RouterTestingModule ]
     })
     .compileComponents();
   }));

package/igx-ts-legacy/projects/side-nav/files/src/app/app.component.spec.ts

@@ -2,6 +2,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule } from 'igniteui-angular';
 import { AppComponent } from './app.component';
+
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -17,6 +18,7 @@ describe('AppComponent', () => {
       ],
     }).compileComponents();
   }));
+
   it('should create the app', waitForAsync(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;

package/igx-ts-legacy/projects/side-nav-auth/files/src/app/app.component.spec.ts

@@ -4,6 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule } from 'igniteui-angular';
 import { AppComponent } from './app.component';
 import { AuthenticationModule } from './authentication';
+
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -21,6 +22,7 @@ describe('AppComponent', () => {
       ],
     }).compileComponents();
   }));
+
   it('should create the app', waitForAsync(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "18.1.1400-beta.2",
+  "version": "18.1.1400-beta.3",
   "description": "Templates for Ignite UI for Angular projects and components",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "author": "Infragistics",
   "license": "MIT",
   "dependencies": {
-    "@igniteui/cli-core": "~14.0.0-beta.2",
+    "@igniteui/cli-core": "~14.0.0-beta.3",
     "typescript": "~5.4.3"
   }
 }