@igniteui/angular-templates 18.0.1400-alpha.4 → 18.0.1400-beta.1

package/AngularTypeScriptFileUpdate.d.ts

@@ -45,6 +45,20 @@ export declare class AngularTypeScriptFileUpdate extends TypeScriptFileUpdate {
      */
     provideHttpClientForStandaloneAppConfig(): void;
     protected buildRouteStructure(route: AngularRouteLike, multiline: boolean): RouteEntry[];
+    /**
+     * Add an imort declaration for the dependency.
+     * @param meta The metadata to use for the import declaration.
+     * @param moduleName The name of the module to import from.
+     * @param variables Variables to replace in the dependency strings.
+     */
+    private addImportDeclarationForDependency;
+    /**
+     * Applies mutations to an Angular decorator's metadata.
+     * @param decoratorName The name of the decorator to update.
+     * @param meta The metadata to use for the mutations.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    private applyDecoratorMutations;
     /**
      * Updates an Angular decorator's metadata.
      * @param name The name of the decorator to update.

package/AngularTypeScriptFileUpdate.js

@@ -46,32 +46,14 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
         if (!this.standalone || !dep.standalone)
             return;
         const copy = {
-            import: this.asArray(dep.import || [], variables || {}),
-            provide: this.asArray(dep.provide || [], variables || {}),
+            imports: this.asArray(dep.import || [], variables || {}),
+            providers: this.asArray(dep.provide || [], variables || {}),
             schemas: this.asArray(dep.schema || [], variables || {}),
         };
         if (dep.from) {
-            // add an import declaration for the dependency
-            const uniqueIdentifiers = new Set([
-                ...copy.import,
-                ...copy.provide,
-                ...copy.schemas,
-            ]);
-            const identifiers = [...uniqueIdentifiers].map((name) => ({ name }));
-            this.astTransformer.requestNewImportDeclaration({
-                identifiers,
-                moduleName: this.applyConfigTransformation(dep.from, variables),
-            });
-        }
-        if (copy.import.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_SA_DECORATOR_NAME, copy.import, types_1.AngularDecoratorMetaTarget.Imports, multiline);
-        }
-        if (copy.provide.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_SA_DECORATOR_NAME, copy.provide, types_1.AngularDecoratorMetaTarget.Providers, multiline);
-        }
-        if (copy.schemas.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_SA_DECORATOR_NAME, copy.schemas, types_1.AngularDecoratorMetaTarget.Schemas, multiline);
+            this.addImportDeclarationForDependency(copy, dep.from, variables);
         }
+        this.applyDecoratorMutations(cli_core_1.NG_SA_DECORATOR_NAME, copy, multiline);
     }
     /**
      * Adds metadata to an NgModule decorator.
@@ -83,46 +65,20 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
         if (this.standalone || dep.standalone)
             return;
         const copy = {
-            import: this.asArray(dep.import || [], variables || {}),
-            declare: this.asArray(dep.declare || [], variables || {}),
-            provide: this.asArray(dep.provide || [], variables || {}),
-            export: this.asArray(dep.export || [], variables || {}),
+            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) {
-            // add an import declaration for the dependency
-            const uniqueIdentifiers = new Set([
-                ...copy.import,
-                ...copy.declare,
-                ...copy.provide,
-                ...copy.export,
-                ...copy.schemas,
-            ]);
-            const identifiers = [...uniqueIdentifiers].map((name) => ({ name }));
-            this.astTransformer.requestNewImportDeclaration({
-                identifiers,
-                moduleName: this.applyConfigTransformation(dep.from, variables),
-            });
+            this.addImportDeclarationForDependency(copy, dep.from, variables);
         }
-        if (dep.root && copy.import.length > 0) {
+        if (dep.root && copy.imports.length > 0) {
             // add forRoot to the module
-            copy.import = copy.import.map((i) => this.astTransformer.printer.printNode(ts.EmitHint.Unspecified, this.astTransformer.createCallExpression(i, cli_core_1.NG_FOR_ROOT_IDENTIFIER_NAME), this.astTransformer.sourceFile));
-        }
-        if (copy.declare.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_MODULE_DECORATOR_NAME, copy.declare, types_1.AngularDecoratorMetaTarget.Declarations, multiline);
-        }
-        if (copy.import.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_MODULE_DECORATOR_NAME, copy.import, types_1.AngularDecoratorMetaTarget.Imports, multiline);
-        }
-        if (copy.provide.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_MODULE_DECORATOR_NAME, copy.provide, types_1.AngularDecoratorMetaTarget.Providers, multiline);
-        }
-        if (copy.export.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_MODULE_DECORATOR_NAME, copy.export, types_1.AngularDecoratorMetaTarget.Exports, multiline);
-        }
-        if (copy.schemas.length > 0) {
-            this.mutateNgDecoratorMeta(cli_core_1.NG_MODULE_DECORATOR_NAME, copy.schemas, types_1.AngularDecoratorMetaTarget.Schemas, multiline);
+            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.applyDecoratorMutations(cli_core_1.NG_MODULE_DECORATOR_NAME, copy, multiline);
     }
     /**
      * Includes `{ bindToComponentInputs: true }` for a `forRoot` call in an `NgModule`'s `imports` member.
@@ -233,6 +189,36 @@ class AngularTypeScriptFileUpdate extends cli_core_1.TypeScriptFileUpdate {
     }
     //#endregion
     //#region Internals
+    /**
+     * Add an imort declaration for the dependency.
+     * @param meta The metadata to use for the import declaration.
+     * @param moduleName The name of the module to import from.
+     * @param variables Variables to replace in the dependency strings.
+     */
+    addImportDeclarationForDependency(meta, moduleName, variables) {
+        // add an import declaration for the dependency
+        const uniqueIdentifiers = new Set(Object.keys(meta)
+            .map((key) => meta[key])
+            .flat());
+        const identifiers = [...uniqueIdentifiers].map((name) => ({ name }));
+        this.astTransformer.requestNewImportDeclaration({
+            identifiers,
+            moduleName: this.applyConfigTransformation(moduleName, variables),
+        });
+    }
+    /**
+     * Applies mutations to an Angular decorator's metadata.
+     * @param decoratorName The name of the decorator to update.
+     * @param meta The metadata to use for the mutations.
+     * @param multiline Whether to format the new entry as multiline.
+     */
+    applyDecoratorMutations(decoratorName, meta, multiline = false) {
+        for (const key of Object.keys(meta)) {
+            if (meta[key].length > 0) {
+                this.mutateNgDecoratorMeta(decoratorName, meta[key], key, multiline);
+            }
+        }
+    }
     /**
      * Updates an Angular decorator's metadata.
      * @param name The name of the decorator to update.

package/igx-ts/projects/_base/files/src/app/app.config.ts

@@ -7,13 +7,13 @@ import { routes } from './app.routes';
 import { GlobalErrorHandlerService } from './error-routing/error/global-error-handler.service';
 import { environment } from '../environments/environment';
 
-const providers: Provider[] = [
+// provide the HAMMER_GESTURE_CONFIG token
+// to override the default settings of the HammerModule
+// { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
+const providers: Provider = [
   provideRouter(routes),
   importProvidersFrom(BrowserModule, HammerModule),
   provideAnimations()
-  // provide the HAMMER_GESTURE_CONFIG token
-  // to override the default settings of the HammerModule
-  // { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
 ];
 
 if (environment.production) {

package/igx-ts/projects/_base_with_home/files/src/app/app.config.ts

@@ -1,8 +1,10 @@
-import { ApplicationConfig } from '@angular/core';
+import { ApplicationConfig, Provider } from '@angular/core';
 import { provideRouter } from '@angular/router';
 
 import { routes } from './app.routes';
 
-export const appConfig: ApplicationConfig = {
-  providers: [provideRouter(routes)]
-};
+const providers: Provider = [
+  provideRouter(routes)
+];
+
+export const appConfig: ApplicationConfig = { providers };

package/igx-ts/projects/empty/files/src/app/app.config.ts

@@ -1,8 +1,10 @@
-import { ApplicationConfig } from '@angular/core';
+import { ApplicationConfig, Provider } from '@angular/core';
 import { provideRouter } from '@angular/router';
 
 import { routes } from './app.routes';
 
-export const appConfig: ApplicationConfig = {
-  providers: [provideRouter(routes)]
-};
+const providers: Provider = [
+  provideRouter(routes)
+];
+
+export const appConfig: ApplicationConfig = { providers };

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

@@ -1,4 +1,4 @@
-import { ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { ApplicationConfig, Provider, importProvidersFrom } from '@angular/core';
 import { provideRouter } from '@angular/router';
 import { BrowserModule, HammerModule } from '@angular/platform-browser';
 import { provideAnimations } from '@angular/platform-browser/animations';
@@ -11,20 +11,20 @@ import {
 
 import { routes } from './app.routes';
 
-export const appConfig: ApplicationConfig = {
-  providers: [
-    provideRouter(routes),
-    importProvidersFrom(
-      BrowserModule,
-      HammerModule,
-      IgxLayoutModule,
-      IgxNavbarModule,
-      IgxNavigationDrawerModule,
-      IgxRippleModule
-    ),
-    provideAnimations()
-    // provide the HAMMER_GESTURE_CONFIG token
-    // to override the default settings of the HammerModule
-    // { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
-  ]
-};
+// provide the HAMMER_GESTURE_CONFIG token
+// to override the default settings of the HammerModule
+// { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
+const providers: Provider = [
+  provideRouter(routes),
+  importProvidersFrom(
+    BrowserModule,
+    HammerModule,
+    IgxLayoutModule,
+    IgxNavbarModule,
+    IgxNavigationDrawerModule,
+    IgxRippleModule
+  ),
+  provideAnimations()
+];
+
+export const appConfig: ApplicationConfig = { providers };

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

@@ -1,4 +1,4 @@
-import { ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { ApplicationConfig, Provider, importProvidersFrom } from '@angular/core';
 import { provideRouter } from '@angular/router';
 import { BrowserModule, HammerModule } from '@angular/platform-browser';
 import { provideAnimations } from '@angular/platform-browser/animations';
@@ -12,22 +12,22 @@ import {
 import { AuthenticationModule, ExternalAuthService } from './authentication';
 import { routes } from './app.routes';
 
-export const appConfig: ApplicationConfig = {
-  providers: [
-    provideRouter(routes),
-    importProvidersFrom(
-      BrowserModule,
-      HammerModule,
-      IgxLayoutModule,
-      IgxNavbarModule,
-      IgxNavigationDrawerModule,
-      IgxRippleModule,
-      AuthenticationModule
-    ),
-    provideAnimations(),
-    ExternalAuthService
-    // provide the HAMMER_GESTURE_CONFIG token
-    // to override the default settings of the HammerModule
-    // { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
-  ]
-};
+// provide the HAMMER_GESTURE_CONFIG token
+// to override the default settings of the HammerModule
+// { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig }
+const providers: Provider = [
+  provideRouter(routes),
+  importProvidersFrom(
+    BrowserModule,
+    HammerModule,
+    IgxLayoutModule,
+    IgxNavbarModule,
+    IgxNavigationDrawerModule,
+    IgxRippleModule,
+    AuthenticationModule
+  ),
+  provideAnimations(),
+  ExternalAuthService
+];
+
+export const appConfig: ApplicationConfig = { providers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "18.0.1400-alpha.4",
+  "version": "18.0.1400-beta.1",
   "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-alpha.4",
+    "@igniteui/cli-core": "~14.0.0-beta.1",
     "typescript": "~5.4.3"
   }
 }

package/types/enumerations/AngularDecoratorMetaTarget.d.ts

@@ -1,8 +1,9 @@
+/** TODO: Unify this with `packages/core/types/TemplateDependency.ts` */
 /** Represents possible meta data members in an Angular decorator. */
-export declare enum AngularDecoratorMetaTarget {
-    Imports = "imports",
-    Declarations = "declarations",
-    Providers = "providers",
-    Exports = "exports",
-    Schemas = "schemas"
+export interface AngularDecoratorMetaTarget {
+    imports?: string[];
+    declarations?: string[];
+    providers?: string[];
+    exports?: string[];
+    schemas?: string[];
 }

package/types/enumerations/AngularDecoratorMetaTarget.js

@@ -1,12 +1,3 @@
 "use strict";
+/** TODO: Unify this with `packages/core/types/TemplateDependency.ts` */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AngularDecoratorMetaTarget = void 0;
-/** Represents possible meta data members in an Angular decorator. */
-var AngularDecoratorMetaTarget;
-(function (AngularDecoratorMetaTarget) {
-    AngularDecoratorMetaTarget["Imports"] = "imports";
-    AngularDecoratorMetaTarget["Declarations"] = "declarations";
-    AngularDecoratorMetaTarget["Providers"] = "providers";
-    AngularDecoratorMetaTarget["Exports"] = "exports";
-    AngularDecoratorMetaTarget["Schemas"] = "schemas";
-})(AngularDecoratorMetaTarget || (exports.AngularDecoratorMetaTarget = AngularDecoratorMetaTarget = {}));