@wavemaker/angular-codegen 11.15.6-rc.647667 → 11.16.0-rc.269

package/angular-app/src/framework/services/component-ref-provider.service.ts

@@ -1,4 +1,4 @@
-import { ComponentFactoryResolver, Injectable, Inject } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 
 import { ComponentRefProvider, ComponentType } from '@wm/runtime/base';
 import { LazyComponentRefProviderService } from './lazy-component-ref-provider.service';
@@ -16,7 +16,7 @@ export class ComponentRefProviderService extends ComponentRefProvider {
         componentRefCache.get(type).set(name, {ref: ref, componentFactory: componentFactory});
     }
 
-    constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(LazyComponentRefProviderService) private lazyComponentRef) {
+    constructor(@Inject(LazyComponentRefProviderService) private lazyComponentRef) {
         super();
     }
 
@@ -36,8 +36,13 @@ export class ComponentRefProviderService extends ComponentRefProvider {
         if (!value) {
             return Promise.resolve(null);
         }
+        // Angular 22 removed ComponentFactoryResolver / ComponentFactory-based createComponent()
+        // entirely — value.ref is already a component class (registered via
+        // ComponentRefProviderService.registerComponentRef), which the new
+        // ViewContainerRef.createComponent(Type, options) API accepts directly. No factory
+        // resolution step needed at all anymore.
         if (!value.componentFactory) {
-            value.componentFactory = this.componentFactoryResolver.resolveComponentFactory(value.ref);
+            value.componentFactory = value.ref;
         }
         return Promise.resolve(value.componentFactory);
     }

package/angular-app/src/framework/services/lazy-component-ref-provider.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, ComponentFactoryResolver } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { PartialRefProvider } from '@wm/core';
 import { ComponentType } from '@wm/runtime/base';
 import { partialLazyModules, prefabLazyModules, prefabPartialLazyModules } from '../util/lazy-module-routes';
@@ -11,11 +11,6 @@ type Options = {
     providedIn: 'root'
 })
 export class LazyComponentRefProviderService extends PartialRefProvider {
-    constructor(
-        private componentFactoryResolver: ComponentFactoryResolver
-    ) {
-        super();
-    }
 
     private getLazyModule(componentName: string, componentType: ComponentType, options?: Options) {
         if (componentType === ComponentType.PARTIAL && options && options.prefab) {
@@ -46,8 +41,10 @@ export class LazyComponentRefProviderService extends PartialRefProvider {
                 return null;
             }
 
-            // For standalone components, create a component factory
-            return this.componentFactoryResolver.resolveComponentFactory(loadedComponent);
+            // Angular 22 removed ComponentFactoryResolver / ComponentFactory-based createComponent()
+            // entirely — loadedComponent is already a component class, which the new
+            // ViewContainerRef.createComponent(Type, options) API accepts directly.
+            return loadedComponent;
         } catch (e) {
             console.error('Error in getComponentFactoryRef:', e);
             return null;

package/angular-app/src/setup-jest.js

@@ -118,4 +118,30 @@ Object.defineProperty(global.HTMLMediaElement.prototype, 'addTextTrack', {
     value: jest.fn(),
 });
 
+// jsdom has no layout engine: Element.prototype.getClientRects() always returns an
+// empty list, regardless of the element's actual content/attachment. tabbable@6+'s
+// default displayCheck: 'full' treats "zero client rects" as hidden, so under jsdom
+// every element looks invisible and @wavemaker/focus-trap's activate() always throws
+// "must have at least one tabbable node" for any real container (e.g. ngx-bootstrap's
+// bs-datepicker-container). This is a jsdom/tabbable interaction, not app behavior --
+// stub a non-empty rect so tabbable's own attribute-based checks (tabindex, disabled,
+// etc.) decide tabbability instead, matching real-browser behavior for elements that
+// are actually attached and not display:none.
+if (!global.Element.prototype.getClientRects || !global.Element.prototype.getClientRects.__wmStub) {
+    const originalGetClientRects = global.Element.prototype.getClientRects;
+    const stubGetClientRects = function () {
+        const real = originalGetClientRects ? originalGetClientRects.call(this) : [];
+        if (real && real.length) {
+            return real;
+        }
+        const style = global.getComputedStyle(this);
+        if (style.display === 'none' || style.visibility === 'hidden') {
+            return [];
+        }
+        return [{ width: 1, height: 1, top: 0, left: 0, right: 1, bottom: 1, x: 0, y: 0 }];
+    };
+    stubGetClientRects.__wmStub = true;
+    global.Element.prototype.getClientRects = stubGetClientRects;
+}
+
 

package/angular-app/tsconfig.json

@@ -1,6 +1,8 @@
 {
     "compileOnSave": false,
     "compilerOptions": {
+        "ignoreDeprecations": "6.0",
+        "strict": false,
         "baseUrl": "./",
         "downlevelIteration": true,
         "outDir": "./dist/out-tsc",
@@ -8,7 +10,7 @@
         "declaration": false,
         "target": "es2022",
         "module": "es2022",
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "esModuleInterop": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
@@ -89,6 +91,7 @@
     "angularCompilerOptions": {
         "compilationMode": "full",
         "strictMetadataEmit": false,
-        "fullTemplateTypeCheck": false
+        "fullTemplateTypeCheck": false,
+        "strictTemplates": false
     }
 }

package/angular-app/tsconfig.web-app.json

@@ -1,21 +1,24 @@
 {
     "compileOnSave": false,
     "compilerOptions": {
+        "ignoreDeprecations": "6.0",
+        "strict": false,
         "baseUrl": "./",
         "downlevelIteration": true,
         "outDir": "./dist/out-tsc",
         "sourceMap": true,
         "declaration": false,
         "target": "es2022",
-        "module": "es2020",
-        "moduleResolution": "node",
+        "module": "es2022",
+        "moduleResolution": "bundler",
+        "esModuleInterop": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "typeRoots": [
             "node_modules/@types"
         ],
         "lib": [
-            "es2018",
+            "es2022",
             "dom"
         ],
         "paths": {
@@ -73,9 +76,12 @@
             "@wm/runtime/dynamic": [
                 "node_modules/@wavemaker/app-ng-runtime/runtime/dynamic"
             ]
-        }
+        },
+        "useDefineForClassFields": false
     },
     "angularCompilerOptions": {
-        "compilationMode": "full"
+        "compilationMode": "full",
+        "fullTemplateTypeCheck": false,
+        "strictTemplates": false
     }
 }

package/build-angular-app.js

@@ -82,9 +82,9 @@ const processAngularAppPackage = async (sourcePath, targetPath, packageName, isO
         // Install dependencies
         const installPath = isOptimized ? sourcePath : targetPath;
         try {
-            if (global.buildConfigObj.runInspection && !isOptimized && fs.existsSync(path.join(global.buildConfigObj.appSrc, "build-src/package-override.json")) && fs.existsSync(path.join(installPath, 'package.json'))) {
+            if (!isOptimized && fs.existsSync(path.join(global.buildConfigObj.appSrc, "build-src/package-override.json")) && fs.existsSync(path.join(installPath, 'package.json'))) {
                 let packageJson = JSON.parse(fs.readFileSync(path.join(installPath, 'package.json'), 'utf8'));
-                packageJson = await mergePackageJsonWithOverrideJson(global.buildConfigObj.appSrc, packageJson);
+                packageJson = await mergePackageJsonWithOverrideJson(global.buildConfigObj.appSrc, packageJson, global.buildConfigObj.runInspection);
                 fs.writeFileSync(path.join(installPath, 'package.json'), JSON.stringify(packageJson, null, 4));
                 console.log("Successfully updated generated-app package.json with package-override.json");
             }