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

package/angular-app/build-scripts/build.js

@@ -1,4 +1,5 @@
 const { spawnSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
 
 let processArgs = process.argv;
@@ -7,6 +8,21 @@ if (processArgs.findIndex(arg => arg.startsWith('--max-old-space-size')) !== -1)
     console.log("Setting node options: ", process.env.NODE_OPTIONS);
 }
 
+// Patch lives only in build-scripts/ (next to this file), shipped in @wavemaker-ai/angular-app.
+const patchPath = path.join(__dirname, 'ngx-bootstrap-patch.mjs');
+if (!fs.existsSync(patchPath)) {
+    console.error('Cannot find ngx-bootstrap-patch.mjs at', patchPath);
+    process.exit(1);
+}
+console.log('Using ngx-bootstrap patch at:', patchPath);
+console.log("\x1b[36m", "Patching ngx-bootstrap ESM files...\x1b[0m");
+const patchProcess = spawnSync('node', [patchPath], { stdio: 'inherit' });
+
+if (patchProcess.status !== 0) {
+    console.error('Error patching ngx-bootstrap:', patchProcess.error || patchProcess.stderr);
+    process.exit(1);
+}
+
 const args = processArgs.slice(2);
 const ngBuildArgs = ['build', ...args];
 console.log("\x1b[33m", "Angular build params: ", ngBuildArgs);
@@ -23,7 +39,8 @@ if (ngBuildProcess.status === 0) {
     process.exit(1);
 }
 
-const ngPostBuildArgs = ['build-scripts/post-build.js', ...args];
+const postBuildPath = path.join(__dirname, 'post-build.js');
+const ngPostBuildArgs = [postBuildPath, ...args];
 console.log("Post build params - ", ngPostBuildArgs);
 
 const ngPostBuildProcess = spawnSync('node', ngPostBuildArgs, { stdio: 'inherit' });

package/angular-app/build-scripts/ng-circle-progress-patch.mjs

@@ -0,0 +1,38 @@
+/**
+ * ng-circle-progress patching for the UMD (JIT) bundle.
+ *
+ * ng-circle-progress 1.7.1 is compiled against Angular 14.2.12 and its partial declaration
+ * (ɵɵngDeclareComponent) has no `changeDetection` field. The UMD bundle is not run through the
+ * Angular linker, so the browser JIT-compiles that declaration — and Angular 22's JIT path
+ * (compileComponentDeclaration) defaults a missing `changeDetection` to OnPush regardless of the
+ * library's version (the AOT linker only does that for libraries built with Angular >= 22).
+ * As OnPush, <circle-progress> never re-renders when its rxjs animation timer assigns `svg`,
+ * so it renders as an empty `<circle-progress><!----></circle-progress>`.
+ *
+ * Fix: pin `changeDetection: Eager` in the declaration, matching the pre-22 behavior.
+ */
+
+const DECLARATION = /(i0\.ɵɵngDeclareComponent\(\{[^}]*?type: CircleProgressComponent, )/;
+
+export function ngCircleProgressPatchPlugin() {
+    return {
+        name: 'ng-circle-progress-patch',
+        transform(code, id) {
+            if (!id.includes('ng-circle-progress') || !code.includes('ɵɵngDeclareComponent')) {
+                return null;
+            }
+            if (/type: CircleProgressComponent, [^\n]*changeDetection:/.test(code)) {
+                return null;
+            }
+            if (!DECLARATION.test(code)) {
+                throw new Error('[ng-circle-progress-patch] CircleProgressComponent declaration not found — '
+                    + 'ng-circle-progress output changed, re-check whether the Eager pin is still needed.');
+            }
+            console.log('  ✅ ng-circle-progress: pinned CircleProgressComponent changeDetection to Eager');
+            return {
+                code: code.replace(DECLARATION, '$1changeDetection: i0.ChangeDetectionStrategy.Eager, '),
+                map: null
+            };
+        }
+    };
+}

package/angular-app/build-scripts/ngx-bootstrap-patch.mjs

@@ -0,0 +1,308 @@
+/**
+ * ngx-bootstrap patching utilities.
+ * Canonical path: build-scripts/ next to build.js only (angular-app tarball → generated-app/build-scripts/).
+ * Do not rely on a separate copy under config/.
+ *
+ * Provides Rollup plugin for bundling and standalone function for patching ESM files.
+ * Patches: PositioningService (DestroyRef, reopen), ComponentLoader (subscriptions),
+ * Dropdown/Modal (ngx-bootstrap v20 compatibility).
+ *
+ * Copied from feature/angular-22-upgrade (WMS-32451, 21→22 hop on stage-classic) — that branch
+ * carries 4 patch categories (componentLoader, dropdown, modal, typeahead) this repo's own
+ * ngx-bootstrap-patch.mjs never had, tracing back to WMS-29275 (the original 18→20 upgrade).
+ * Confirmed the underlying bugs are real on stage-classic's own installed ngx-bootstrap 22.0.0
+ * before copying — see patterns/runtime.md §12 for per-patch verification evidence.
+ */
+
+import fs from 'fs';
+import path from 'path';
+
+// ============================================
+// Utilities
+// ============================================
+
+const matchesModule = (id, ...modules) =>
+    modules.some(mod => id.includes(`ngx-bootstrap-${mod}`) || id.includes(`ngx-bootstrap/${mod}`));
+
+const applyReplacement = (code, pattern, replacement, logMsg) => {
+    const patched = code.replace(pattern, replacement);
+    const changed = patched !== code;
+    if (changed && logMsg) console.log(`  ✅ ${logMsg}`);
+    return { code: patched, changed };
+};
+
+// ============================================
+// Patch Definitions
+// ============================================
+
+const PATCHES = {
+    positioning: {
+        matcher: (id) => matchesModule(id, 'positioning'),
+        apply: (code) => {
+            let current = code;
+            let anyChanged = false;
+
+            // DestroyRef injection fix (ngx-bootstrap 21: takeUntilDestroyed(__destroyRef) without declaration)
+            if (
+                current.includes('takeUntilDestroyed(__destroyRef)') &&
+                !current.includes('const __destroyRef = i0.inject(i0.DestroyRef)')
+            ) {
+                const r1 = applyReplacement(
+                    current,
+                    /(constructor\s*\(\s*(?:ngZone\s*,\s*)?rendererFactory\s*,\s*platformId\s*\)\s*\{)/,
+                    '$1\n        const __destroyRef = i0.inject(i0.DestroyRef);',
+                    'Patched PositioningService: DestroyRef injection'
+                );
+                current = r1.code;
+                anyChanged = r1.changed || anyChanged;
+            } else if (
+                current.includes('takeUntilDestroyed()') &&
+                !current.includes('const __destroyRef = i0.inject(i0.DestroyRef)')
+            ) {
+                const r1 = applyReplacement(
+                    current,
+                    /(constructor\s*\(\s*(?:ngZone\s*,\s*)?rendererFactory\s*,\s*platformId\s*\)\s*\{)/,
+                    '$1\n        const __destroyRef = i0.inject(i0.DestroyRef);',
+                    null
+                );
+                const r2 = applyReplacement(
+                    r1.code,
+                    /takeUntilDestroyed\(\)/g,
+                    'takeUntilDestroyed(__destroyRef)',
+                    'Patched PositioningService: DestroyRef injection'
+                );
+                current = r2.code;
+                anyChanged = r2.changed || anyChanged;
+            }
+
+            // Repair bad reopen line: a plain replacement string cannot contain literal $$ (see reopen fix below).
+            if (current.includes('this.update$.next')) {
+                const beforeRepair = current;
+                current = current.replace(/this\.update\$\.next\(null\);?/g, () => 'this.update$$.next(null);');
+                if (current !== beforeRepair) {
+                    anyChanged = true;
+                    console.log('  ✅ Patched PositioningService: Repair update$$.next reopen line');
+                }
+            }
+
+            // Reopen fix: pristine addPositionElement only calls set(); gate on that body (not global
+            // this.enable(); / calcPosition’s update$$) so the patch still applies after ngx-bootstrap edits.
+            const needsPositioningReopenFix =
+                /addPositionElement\(options\)\s*\{\s*\n\s*this\.positionElements\.set\(_getHtmlElement\(options\.element\),\s*options\);\s*\n\s*\}/m.test(
+                    current
+                );
+            if (needsPositioningReopenFix) {
+                const result = applyReplacement(
+                    current,
+                    /this\.positionElements\.set\(_getHtmlElement\(options\.element\),\s*options\);/g,
+                    'this.positionElements.set(_getHtmlElement(options.element), options);\n        this.enable();\n        this.update$$$$.next(null);',
+                    'Patched PositioningService: Reopen fix'
+                );
+                current = result.code;
+                anyChanged = result.changed || anyChanged;
+            }
+
+            // BS5: computeAutoPlacement returns hyphenated keys (e.g. bottom-end) not in PlacementForBs5;
+            // lookup is undefined → dataPlacement.split throws during PositioningService Map.forEach (wm-libs).
+            if (!current.includes('PlacementForBs5[data.placement] ?? data.placement')) {
+                const r3 = applyReplacement(
+                    current,
+                    /const dataPlacement = getBsVer\(\)\.isBs5\s*\n\s*\?\s*PlacementForBs5\[data\.placement\]\s*\n\s*:\s*data\.placement;/,
+                    `const dataPlacementRaw = getBsVer().isBs5
+        ? PlacementForBs5[data.placement] ?? data.placement
+        : data.placement;
+    const dataPlacement = dataPlacementRaw ?? '';`,
+                    'Patched updateContainerClass: BS5 placement fallback'
+                );
+                current = r3.code;
+                anyChanged = r3.changed || anyChanged;
+            }
+            if (!current.includes('String(dataPlacement).split(/[\\s-]/)[0]')) {
+                const safeReplaceLine =
+                    'containerClass = containerClass.replace(/left|right|top|bottom|end|start/g, `' +
+                    '${(String(dataPlacement).split(/[\\s-]/)[0] || \'bottom\')}`' +
+                    ');';
+                const r4 = applyReplacement(
+                    current,
+                    /containerClass = containerClass\.replace\(\/left\|right\|top\|bottom\|end\|start\/g, `\$\{dataPlacement\.split\(' '\)\[0\]\}`\);/,
+                    safeReplaceLine,
+                    'Patched updateContainerClass: safe placement primary axis'
+                );
+                current = r4.code;
+                anyChanged = r4.changed || anyChanged;
+            }
+
+            return { code: current, wasPatched: anyChanged };
+        }
+    },
+
+    componentLoader: {
+        matcher: (id) => matchesModule(id, 'component-loader'),
+        apply: (code) => {
+            let current = code;
+            let anyChanged = false;
+
+            const patches = [
+                {
+                    condition: !current.includes('this._onShownSubscription = this.onShown.subscribe'),
+                    pattern: /this\.onShown\.subscribe\(\(\)\s*=>\s*\{/g,
+                    replacement: 'this._onShownSubscription = this.onShown.subscribe(() => {',
+                    msg: 'Patched ComponentLoader: Subscription tracking'
+                },
+                {
+                    condition: !/hide\([^)]*\)\s*\{[\s\S]*?_unsubscribePositioning\(\)[\s\S]*?_posService\.deletePositionElement/.test(current),
+                    pattern: /(hide\([^)]*\)\s*\{\s*\n\s*if\s*\(\s*!this\._componentRef\s*\)\s*\{\s*\n\s*return\s+this;\s*\n\s*\}\s*\n\s*)(this\._posService\.deletePositionElement)/,
+                    replacement: '$1this._unsubscribePositioning();\n        $2',
+                    msg: 'Patched ComponentLoader: Hide cleanup'
+                },
+                {
+                    condition: !current.includes('if (this._onShownSubscription)'),
+                    pattern: /(_unsubscribePositioning\(\)\s*\{\s*\n\s*)(if\s*\(\s*!this\._zoneSubscription\s*\))/,
+                    replacement: `$1if (this._onShownSubscription) {\n            this._onShownSubscription.unsubscribe();\n            this._onShownSubscription = void 0;\n        }\n        $2`,
+                    msg: 'Patched ComponentLoader: Unsubscribe fix'
+                }
+            ];
+
+            for (const { condition, pattern, replacement, msg } of patches) {
+                if (condition) {
+                    const result = applyReplacement(current, pattern, replacement, msg);
+                    current = result.code;
+                    anyChanged = result.changed || anyChanged;
+                }
+            }
+
+            return { code: current, wasPatched: anyChanged };
+        }
+    },
+
+    dropdown: {
+        matcher: (id) => matchesModule(id, 'dropdown'),
+        apply: (code) => {
+            // ngx-bootstrap 20 + Bootstrap 5: host `.show` toggles dropdown visibility. Removing it breaks
+            // datetime timepicker (dropdown menu) and similar `[dropdown]` hosts — restore if stripped.
+            if (
+                code.includes(
+                    'properties: { "class.dropup": "dropup", "class.open": "isOpen", "class.show": "isOpen" }'
+                )
+            ) {
+                return { code, wasPatched: false };
+            }
+            const result = applyReplacement(
+                code,
+                /properties: \{ "class\.dropup": "dropup", "class\.open": "isOpen" \}/,
+                'properties: { "class.dropup": "dropup", "class.open": "isOpen", "class.show": "isOpen" }',
+                'Patched Dropdown: Restore BS5 show class on directive host'
+            );
+            return { code: result.code, wasPatched: result.changed };
+        }
+    },
+
+    modal: {
+        matcher: (id) => matchesModule(id, 'modal'),
+        apply: (code) => {
+            if (!code.includes("SHOW: 'show'")) {
+                return { code, wasPatched: false };
+            }
+            const result = applyReplacement(
+                code,
+                /SHOW: 'show'/g,
+                "SHOW: 'in'",
+                'Patched Modal: SHOW class to in'
+            );
+            return { code: result.code, wasPatched: result.changed };
+        }
+    },
+
+    typeahead: {
+        matcher: (id) => matchesModule(id, 'typeahead'),
+        apply: (code) => {
+            let current = code;
+            let anyChanged = false;
+
+            if (current.includes(':host.dropdown-menu,.dropdown-menu{overflow-y:auto;height:100px}')) {
+                const result = applyReplacement(
+                    current,
+                    /:host\.dropdown-menu,\.dropdown-menu\{overflow-y:auto;height:100px\}/g,
+                    '',
+                    'Patched Typeahead: Remove overflow-y and height styles'
+                );
+                current = result.code;
+                anyChanged = result.changed || anyChanged;
+            }
+
+            return { code: current, wasPatched: anyChanged };
+        }
+    }
+};
+
+// ============================================
+// Rollup Plugin
+// ============================================
+
+export function ngxBootstrapPatchPlugin() {
+    return {
+        name: 'ngx-bootstrap-patch',
+        transform(code, id) {
+            for (const patch of Object.values(PATCHES)) {
+                if (patch.matcher(id)) {
+                    const result = patch.apply(code);
+                    if (result.wasPatched || result.code !== code) {
+                        return { code: result.code, map: null };
+                    }
+                }
+            }
+            return null;
+        }
+    };
+}
+/**
+ * Files to patch in node_modules/ngx-bootstrap (fesm2022 only for Angular 17+)
+ */
+const FILES_TO_PATCH = [
+    { path: 'positioning/fesm2022/ngx-bootstrap-positioning.mjs', patchKey: 'positioning' },
+    { path: 'component-loader/fesm2022/ngx-bootstrap-component-loader.mjs', patchKey: 'componentLoader' },
+    { path: 'dropdown/fesm2022/ngx-bootstrap-dropdown.mjs', patchKey: 'dropdown' },
+    { path: 'modal/fesm2022/ngx-bootstrap-modal.mjs', patchKey: 'modal' },
+    { path: 'typeahead/fesm2022/ngx-bootstrap-typeahead.mjs', patchKey: 'typeahead' }
+];
+
+/**
+ * Patch ngx-bootstrap ESM files directly in node_modules.
+ * Call this from build.js before Angular build.
+ */
+export function patchNgxBootstrapFiles(nodeModulesPath = 'node_modules') {
+    console.log('\n🔧 Patching ngx-bootstrap ESM files...\n');
+
+    const ngxPath = path.join(nodeModulesPath, 'ngx-bootstrap');
+    let totalPatched = 0;
+
+    for (const { path: filePath, patchKey } of FILES_TO_PATCH) {
+        const fullPath = path.join(ngxPath, filePath);
+
+        if (!fs.existsSync(fullPath)) continue;
+
+        const code = fs.readFileSync(fullPath, 'utf-8');
+        const patch = PATCHES[patchKey];
+
+        if (patch) {
+            const result = patch.apply(code);
+            if (result.wasPatched) {
+                fs.writeFileSync(fullPath, result.code, 'utf-8');
+                totalPatched++;
+            }
+        }
+    }
+
+    console.log(
+        totalPatched > 0
+            ? `\n✅ Patched ${totalPatched} ngx-bootstrap file(s)\n`
+            : '\n✓ ngx-bootstrap files already patched or no patches needed\n'
+    );
+
+    return totalPatched;
+}
+
+// CLI entry point
+if (process.argv[1]?.includes('ngx-bootstrap-patch')) {
+    patchNgxBootstrapFiles();
+}

package/angular-app/dependency-report.html

@@ -69,7 +69,7 @@
 <body>
     <div class="header">
         <h1>Angular Project Dependencies Report</h1>
-        <p class="timestamp">Generated on: 7/21/2026, 3:57:42 PM</p>
+        <p class="timestamp">Generated on: 10/17/2026, 2:33:44 PM</p>
     </div>
 
     <div class="section">