@nativescript/vite 8.0.0-alpha.1 → 8.0.0-alpha.3

package/helpers/nativeclass-transformer-plugin.js

@@ -1,49 +1,188 @@
+import ts from 'typescript';
 import { transformNativeClassSource } from './nativeclass-transform.js';
+/**
+ * Post-phase cleanup for NativeClass decorators.
+ * Strips __decorate([NativeClass()], X) and downlevels ES6 classes to ES5
+ * so the NativeScript runtime can detect native class inheritance via __extends.
+ *
+ * Exported separately for testability.
+ */
+export function postCleanupNativeClass(code, bareId, verbose = false) {
+    if (!code)
+        return null;
+    if (!code.includes('__decorate') || !code.includes('NativeClass'))
+        return null;
+    // Collect class names that have NativeClass in their __decorate call
+    const decorateRe = /(\w+)\s*=\s*(?:\w+\s*=\s*)?__decorate\(\s*\[\s*NativeClass\(\)\s*\]\s*,\s*(\w+)\s*\)/g;
+    const classNamesToDownlevel = new Set();
+    let m;
+    while ((m = decorateRe.exec(code)) !== null) {
+        classNamesToDownlevel.add(m[2]);
+    }
+    if (!classNamesToDownlevel.size)
+        return null;
+    // Strip NativeClass from __decorate arrays: __decorate([NativeClass()], X) → X
+    let output = code.replace(decorateRe, '$1 = $2');
+    // Now downlevel any ES6 class expression that extends a native base.
+    // Angular's re-compilation may have emitted:
+    //   var AppDelegate = class AppDelegate extends UIResponder { ... };
+    // or with _1 alias:
+    //   var PDFViewDelegateImpl = PDFViewDelegateImpl_1 = class PDFViewDelegateImpl extends NSObject { ... };
+    // We need to find these and downlevel them to ES5 with __extends so the
+    // NativeScript runtime can detect native class inheritance.
+    for (const className of Array.from(classNamesToDownlevel)) {
+        try {
+            // Use TypeScript AST to find and extract the class expression reliably
+            const sf = ts.createSourceFile(bareId + '.js', output, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+            let classNode;
+            let baseName = '';
+            let varDeclStart = -1;
+            let varDeclEnd = -1;
+            let aliasName = ''; // e.g. PDFViewDelegateImpl_1
+            const findClass = (node) => {
+                if (classNode)
+                    return;
+                // Match: var X = class X extends Y { ... }
+                // or: var X = X_1 = class X extends Y { ... }
+                if (ts.isVariableStatement(node)) {
+                    for (const decl of node.declarationList.declarations) {
+                        if (ts.isIdentifier(decl.name) && decl.name.text === className && decl.initializer) {
+                            let classExpr = decl.initializer;
+                            // Handle alias: X = X_1 = class X extends Y { ... }
+                            if (ts.isBinaryExpression(classExpr) && classExpr.operatorToken.kind === ts.SyntaxKind.EqualsToken) {
+                                if (ts.isIdentifier(classExpr.left)) {
+                                    aliasName = classExpr.left.text;
+                                }
+                                classExpr = classExpr.right;
+                            }
+                            if (ts.isClassExpression(classExpr) && classExpr.heritageClauses?.length) {
+                                const extendsClause = classExpr.heritageClauses.find((h) => h.token === ts.SyntaxKind.ExtendsKeyword);
+                                if (extendsClause?.types[0]) {
+                                    baseName = output.slice(extendsClause.types[0].expression.getStart(sf), extendsClause.types[0].expression.getEnd());
+                                    classNode = classExpr;
+                                    varDeclStart = node.getStart(sf);
+                                    varDeclEnd = node.getEnd();
+                                }
+                            }
+                        }
+                    }
+                }
+                ts.forEachChild(node, findClass);
+            };
+            findClass(sf);
+            if (!classNode || !baseName)
+                continue;
+            // Extract just the class as a declaration for ts.transpileModule
+            const classText = output.slice(classNode.getStart(sf), classNode.getEnd());
+            // Convert class expression to declaration for proper downlevel
+            const classAsDecl = classText.replace(/^class\b/, `class`);
+            const toDownlevel = `class ${className} extends ${baseName} ${classAsDecl.slice(classAsDecl.indexOf('{'))}`;
+            const downleveled = ts
+                .transpileModule(toDownlevel, {
+                compilerOptions: {
+                    module: ts.ModuleKind.ESNext,
+                    target: ts.ScriptTarget.ES5,
+                    experimentalDecorators: true,
+                    emitDecoratorMetadata: false,
+                    noEmitHelpers: true,
+                    useDefineForClassFields: false,
+                },
+            })
+                .outputText.replace(/enumerable:\s*false/g, 'enumerable: true')
+                .replace(/export \{\};?\s*$/m, '')
+                .trim();
+            // The downleveled output is a var statement: var ClassName = (function(_super) { ... })(Base);
+            // Build the replacement, preserving any alias assignment
+            let replacement = downleveled;
+            if (aliasName) {
+                // Original was: var X = X_1 = class X extends Y {...};
+                // Downlevel produces: var X = (function(_super){...})(Y);
+                // We need: var X = X_1 = (function(_super){...})(Y);
+                replacement = replacement.replace(`var ${className} =`, `var ${className} = ${aliasName} =`);
+            }
+            output = output.slice(0, varDeclStart) + replacement + output.slice(varDeclEnd);
+            if (verbose) {
+                console.log(`[ns-nativeclass-post] Downleveled ES6 class "${className}" to ES5 with __extends in ${bareId}`);
+            }
+        }
+        catch (e) {
+            if (verbose) {
+                console.warn(`[ns-nativeclass-post] Failed to downlevel class "${className}" in ${bareId}:`, e);
+            }
+            // If downleveling fails, the decorator is at least stripped
+        }
+    }
+    if (output !== code) {
+        if (verbose) {
+            console.log(`[ns-nativeclass-post] Cleaned __decorate NativeClass from ${bareId}`);
+        }
+        return { code: output, map: null };
+    }
+    return null;
+}
 /**
  * Wraps NativeClass TS transformer into a Vite plugin.
  */
 export function createNativeClassTransformerPlugin() {
     const verbose = !!process.env.NS_DEBUG_NATIVECLASS;
-    return {
-        name: 'ns-nativeclass-transformer',
-        enforce: 'pre',
-        async transform(code, id) {
-            if (!code)
-                return null;
-            const bareId = id.split('?')[0];
-            const isTSFile = /\.(ts|tsx)$/.test(bareId);
-            const isJSFile = /\.(js|mjs|cjs)$/.test(bareId);
-            const isVueTSBlock = !isTSFile && /[?&]lang\.(ts|tsx)\b/.test(id);
-            if (!isTSFile && !isVueTSBlock && !isJSFile)
-                return null;
-            const hasDecoratorSyntax = code.includes('@NativeClass');
-            const hasNativeClassIdentifier = code.includes('NativeClass');
-            const hasDecorateCall = isJSFile && code.includes('__decorate');
-            // Most modules never contain NativeClass decorations.
-            // Skip the heavier TS-based helper unless the source has one of the patterns it can actually rewrite.
-            if (!hasDecoratorSyntax && !hasNativeClassIdentifier && !hasDecorateCall) {
-                return null;
-            }
-            if (verbose && (hasDecoratorSyntax || hasNativeClassIdentifier)) {
-                console.log(`[ns-nativeclass] Processing file with NativeClass: ${bareId}`);
-            }
-            const res = transformNativeClassSource(code, bareId);
-            if (verbose && (hasDecoratorSyntax || hasNativeClassIdentifier)) {
-                if (res) {
-                    const stillHas = /\bNativeClass\b/.test(res.code);
-                    if (stillHas) {
-                        console.warn(`[ns-nativeclass] WARNING: NativeClass still present after transform in ${bareId}`);
+    return [
+        {
+            name: 'ns-nativeclass-transformer',
+            enforce: 'pre',
+            async transform(code, id) {
+                if (!code)
+                    return null;
+                const bareId = id.split('?')[0];
+                const isTSFile = /\.(ts|tsx)$/.test(bareId);
+                const isJSFile = /\.(js|mjs|cjs)$/.test(bareId);
+                const isVueTSBlock = !isTSFile && /[?&]lang\.(ts|tsx)\b/.test(id);
+                if (!isTSFile && !isVueTSBlock && !isJSFile)
+                    return null;
+                const hasDecoratorSyntax = code.includes('@NativeClass');
+                const hasNativeClassIdentifier = code.includes('NativeClass');
+                const hasDecorateCall = isJSFile && code.includes('__decorate');
+                // Most modules never contain NativeClass decorations.
+                // Skip the heavier TS-based helper unless the source has one of the patterns it can actually rewrite.
+                if (!hasDecoratorSyntax && !hasNativeClassIdentifier && !hasDecorateCall) {
+                    return null;
+                }
+                if (verbose && (hasDecoratorSyntax || hasNativeClassIdentifier)) {
+                    console.log(`[ns-nativeclass] Processing file with NativeClass: ${bareId}`);
+                }
+                const res = transformNativeClassSource(code, bareId);
+                if (verbose && (hasDecoratorSyntax || hasNativeClassIdentifier)) {
+                    if (res) {
+                        const stillHas = /\bNativeClass\b/.test(res.code);
+                        if (stillHas) {
+                            console.warn(`[ns-nativeclass] WARNING: NativeClass still present after transform in ${bareId}`);
+                        }
+                        else {
+                            console.log(`[ns-nativeclass] Successfully transformed ${bareId}`);
+                        }
                     }
                     else {
-                        console.log(`[ns-nativeclass] Successfully transformed ${bareId}`);
+                        console.log(`[ns-nativeclass] Transform returned null for ${bareId} (may be skipped due to platform filter)`);
                     }
                 }
-                else {
-                    console.log(`[ns-nativeclass] Transform returned null for ${bareId} (may be skipped due to platform filter)`);
-                }
-            }
-            return res;
+                return res;
+            },
+        },
+        // Post-phase cleanup: the Angular plugin (normal phase) may re-compile TypeScript from its
+        // own compilation pipeline, re-introducing __decorate([NativeClass()], ...) after the pre-phase
+        // transformer already stripped @NativeClass. This post-phase pass catches those survivors.
+        // In addition to stripping the decorator, we must also downlevel any ES6 class that was
+        // decorated with NativeClass to ES5 (using __extends) so the NativeScript runtime can
+        // detect native class inheritance and register ObjC classes.
+        {
+            name: 'ns-nativeclass-post-cleanup',
+            enforce: 'post',
+            transform(code, id) {
+                const bareId = id.split('?')[0];
+                if (!/\.(ts|tsx|js|mjs)$/.test(bareId))
+                    return null;
+                return postCleanupNativeClass(code, bareId, verbose);
+            },
         },
-    };
+    ];
 }
 //# sourceMappingURL=nativeclass-transformer-plugin.js.map

package/helpers/nativeclass-transformer-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeclass-transformer-plugin.js","sourceRoot":"","sources":["../../../../packages/vite/helpers/nativeclass-transformer-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE;;GAEG;AACH,MAAM,UAAU,kCAAkC;IACjD,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAEnD,OAAO;QACN,IAAI,EAAE,4BAA4B;QAClC,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,EAAU;YACvC,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YACvB,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,YAAY,GAAG,CAAC,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAEzD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACzD,MAAM,wBAAwB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAEhE,sDAAsD;YACtD,sGAAsG;YACtG,IAAI,CAAC,kBAAkB,IAAI,CAAC,wBAAwB,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1E,OAAO,IAAI,CAAC;YACb,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,kBAAkB,IAAI,wBAAwB,CAAC,EAAE,CAAC;gBACjE,OAAO,CAAC,GAAG,CAAC,sDAAsD,MAAM,EAAE,CAAC,CAAC;YAC7E,CAAC;YAED,MAAM,GAAG,GAAG,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAErD,IAAI,OAAO,IAAI,CAAC,kBAAkB,IAAI,wBAAwB,CAAC,EAAE,CAAC;gBACjE,IAAI,GAAG,EAAE,CAAC;oBACT,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAClD,IAAI,QAAQ,EAAE,CAAC;wBACd,OAAO,CAAC,IAAI,CAAC,0EAA0E,MAAM,EAAE,CAAC,CAAC;oBAClG,CAAC;yBAAM,CAAC;wBACP,OAAO,CAAC,GAAG,CAAC,6CAA6C,MAAM,EAAE,CAAC,CAAC;oBACpE,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,OAAO,CAAC,GAAG,CAAC,gDAAgD,MAAM,0CAA0C,CAAC,CAAC;gBAC/G,CAAC;YACF,CAAC;YAED,OAAO,GAAG,CAAC;QACZ,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"nativeclass-transformer-plugin.js","sourceRoot":"","sources":["../../../../packages/vite/helpers/nativeclass-transformer-plugin.ts"],"names":[],"mappings":"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"}

package/hmr/client/css-handler.js

@@ -1,22 +1,63 @@
-import { Application, Frame } from '@nativescript/core';
 const VERBOSE = !!globalThis.__NS_ENV_VERBOSE__;
-// CSS helper function
+function getPreferredCssApplier() {
+    try {
+        const applier = globalThis.__NS_HMR_APPLY_CSS__;
+        if (typeof applier === 'function') {
+            return applier;
+        }
+    }
+    catch { }
+    return null;
+}
+function getCore(name) {
+    try {
+        const g = globalThis;
+        const reg = g.__nsVendorRegistry;
+        if (reg && reg.has('@nativescript/core')) {
+            const ns = reg.get('@nativescript/core');
+            return ns?.[name] || (ns?.default ?? ns)?.[name];
+        }
+        const req = g.__nsVendorRequire || g.__nsRequire || g.require;
+        if (typeof req === 'function') {
+            const ns = req('@nativescript/core');
+            return ns?.[name] || (ns?.default ?? ns)?.[name];
+        }
+    }
+    catch { }
+    return globalThis[name];
+}
+// CSS helper: apply CSS and refresh the current page so new styles render
 export function applyCssText(cssText) {
     if (typeof cssText !== 'string' || !cssText.length)
         return;
     try {
-        if (Application.addCss) {
-            Application.addCss(cssText);
+        const applyInHttpCoreRealm = getPreferredCssApplier();
+        if (applyInHttpCoreRealm) {
+            applyInHttpCoreRealm(cssText, true);
             if (VERBOSE)
-                console.info('[ns-hmr] Applied app CSS');
+                console.info('[ns-hmr] CSS applied through HTTP core realm');
+            return;
         }
-        else {
-            const topFrame = Frame.topmost?.();
-            const curPage = topFrame?.currentPage;
-            curPage.addCss(cssText);
-            if (VERBOSE)
-                console.info('[ns-hmr] Applied page CSS');
+        const Application = getCore('Application');
+        if (Application && Application.addCss) {
+            Application.addCss(cssText);
+            console.info('[ns-hmr] CSS applied, refreshing view');
+        }
+        // Trigger a view refresh so the new styles are rendered.
+        // NativeScript caches computed styles — addCss alone won't repaint.
+        try {
+            const rootView = Application?.getRootView?.();
+            if (rootView && typeof rootView._onCssStateChange === 'function') {
+                rootView._onCssStateChange();
+            }
+            else if (rootView) {
+                // Force a style recalculation by toggling the root's class
+                const cls = rootView.className || '';
+                rootView.className = cls + ' ';
+                rootView.className = cls;
+            }
         }
+        catch { }
     }
     catch (e) {
         console.warn('[ns-hmr] CSS apply failed:', e?.message || String(e));
@@ -30,7 +71,6 @@ export async function fetchText(url) {
             const res = await g.fetch(url);
             return await res.text();
         }
-        // Fallback to NativeScript Http if available
         const Http = g.Http;
         if (Http && Http.getString) {
             return await Http.getString(url);
@@ -46,17 +86,17 @@ export async function fetchText(url) {
 }
 // Handle CSS updates from Vite
 export async function handleCssUpdates(cssUpdates, httpOrigin) {
+    if (VERBOSE)
+        console.info('[ns-hmr] handleCssUpdates called, updates:', cssUpdates?.length, 'origin:', httpOrigin);
     for (const update of cssUpdates) {
         try {
-            const path = update.path || update.acceptedPath || '';
-            if (!path || !httpOrigin)
+            const cssPath = update.path || update.acceptedPath || '';
+            if (!cssPath || !httpOrigin)
                 continue;
-            // Compose URL like the Vite client (ensure raw content and cache-bust)
-            const hasQuery = path.includes('?');
-            const tParam = `t=${encodeURIComponent(String(update.timestamp || Date.now()))}`;
-            const directParam = hasQuery ? '&direct=1' : '?direct=1';
-            const tSuffix = (hasQuery ? '&' : '?') + tParam;
-            const url = httpOrigin + path + directParam + tSuffix;
+            // Build URL: origin + path + ?direct=1&t=<timestamp>
+            const timestamp = update.timestamp || Date.now();
+            const sep = cssPath.includes('?') ? '&' : '?';
+            const url = `${httpOrigin}${cssPath}${sep}direct=1&t=${timestamp}`;
             if (VERBOSE)
                 console.info('[ns-hmr] Fetching CSS:', url);
             const cssText = await fetchText(url);

package/hmr/client/css-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"css-handler.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/css-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"css-handler.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/css-handler.ts"],"names":[],"mappings":"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"}