@nativescript/core 9.0.0-alpha.13 → 9.0.0-alpha.13-next-11-05-2025-19118999729

package/inspector_modules.js

@@ -2,21 +2,12 @@ import './globals';
 import './debugger/webinspector-network';
 import './debugger/webinspector-dom';
 import './debugger/webinspector-css';
-// require('./debugger/webinspector-network');
-// require('./debugger/webinspector-dom');
-// require('./debugger/webinspector-css');
-/**
- * Source map remapping for stack traces for the runtime in-flight error displays
- * Currently this is very slow. Need to find much faster way to remap stack traces.
- * NOTE: This likely should not be in core because errors can happen on boot before core is fully loaded. Ideally the runtime should provide this in full but unsure.
- */
 import { File, knownFolders } from './file-system';
 // import/destructure style helps commonjs/esm build issues
 import * as sourceMapJs from 'source-map-js';
 const { SourceMapConsumer } = sourceMapJs;
-// note: webpack config can by default use 'source-map' files with runtimes v9+
+// note: bundlers can by default use 'source-map' files with runtimes v9+
 // helps avoid having to decode the inline base64 source maps
-// currently same performance on inline vs file source maps so file source maps may just be cleaner
 const usingSourceMapFiles = true;
 let loadedSourceMaps;
 let consumerCache;
@@ -26,50 +17,121 @@ function getConsumer(mapPath, sourceMap) {
     }
     let c = consumerCache.get(mapPath);
     if (!c) {
-        // parse once
-        c = new SourceMapConsumer(sourceMap);
-        consumerCache.set(mapPath, c);
+        try {
+            c = new SourceMapConsumer(sourceMap);
+            consumerCache.set(mapPath, c);
+        }
+        catch (error) {
+            // Keep quiet in production-like console; failures just fall back to original stack
+            console.debug && console.debug(`SourceMapConsumer failed for ${mapPath}:`, error);
+            return null;
+        }
     }
     return c;
 }
-function loadAndExtractMap(mapPath) {
+function safeReadText(path) {
+    try {
+        if (File.exists(path)) {
+            return File.fromPath(path).readTextSync();
+        }
+    }
+    catch (_) { }
+    return null;
+}
+function findInlineOrLinkedMapFromJs(jsPath) {
+    const jsText = safeReadText(jsPath);
+    if (!jsText)
+        return null;
+    // Look for the last sourceMappingURL directive
+    // Supports both //# and /*# */ styles; capture up to line end or */
+    const re = /[#@]\s*sourceMappingURL=([^\s*]+)(?:\s*\*\/)?/g;
+    let match = null;
+    let last = null;
+    while ((match = re.exec(jsText)))
+        last = match;
+    if (!last)
+        return null;
+    const url = last[1];
+    if (url.startsWith('data:application/json')) {
+        const base64 = url.split(',')[1];
+        if (!base64)
+            return null;
+        try {
+            const text = atob(base64);
+            return { key: `inline:${jsPath}`, text };
+        }
+        catch (_) {
+            return null;
+        }
+    }
+    // Linked .map file (relative)
+    const jsDir = jsPath.substring(0, jsPath.lastIndexOf('/'));
+    const mapPath = `${jsDir}/${url}`;
+    const text = safeReadText(mapPath);
+    if (text) {
+        return { key: mapPath, text };
+    }
+    return null;
+}
+function loadAndExtractMap(mapPath, fallbackJsPath) {
     // check cache first
     if (!loadedSourceMaps) {
         loadedSourceMaps = new Map();
     }
     let mapText = loadedSourceMaps.get(mapPath);
-    // Note: not sure if separate source map files or inline is better
-    // need to test build times one way or other with webpack, vite and rspack
-    // but this handles either way
     if (mapText) {
         return mapText; // already loaded
     }
     else {
         if (File.exists(mapPath)) {
-            const contents = File.fromPath(mapPath).readTextSync();
-            if (usingSourceMapFiles) {
-                mapText = contents;
+            try {
+                const contents = File.fromPath(mapPath).readTextSync();
+                // Note: we may want to do this, keeping for reference if needed in future.
+                // Check size before processing (skip very large source maps)
+                // const maxSizeBytes = 10 * 1024 * 1024; // 10MB limit
+                // if (contents.length > maxSizeBytes) {
+                // 	console.warn(`Source map ${mapPath} is too large (${contents.length} bytes), skipping...`);
+                // 	return null;
+                // }
+                if (usingSourceMapFiles) {
+                    mapText = contents;
+                }
+                else {
+                    // parse out the inline base64
+                    const match = contents.match(/\/\/[#@] sourceMappingURL=data:application\/json[^,]+,(.+)$/);
+                    if (!match) {
+                        console.warn(`Invalid source map format in ${mapPath}`);
+                        return null;
+                    }
+                    const base64 = match[1];
+                    const binary = atob(base64);
+                    // this is the raw text of the source map
+                    // seems to work without doing decodeURIComponent tricks
+                    mapText = binary;
+                }
             }
-            else {
-                // parse out the inline base64
-                const match = contents.match(/\/\/[#@] sourceMappingURL=data:application\/json[^,]+,(.+)$/);
-                const base64 = match[1];
-                const binary = atob(base64);
-                // this is the raw text of the source map
-                // seems to work without doing the decodeURIComponent trick
-                mapText = binary;
-                // // escape each char code into %XX and let decodeURIComponent build the UTF-8 string
-                // mapText = decodeURIComponent(
-                //   binary
-                //     .split('')
-                //     .map(c => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
-                //     .join('')
-                // );
+            catch (error) {
+                console.debug && console.debug(`Failed to load source map ${mapPath}:`, error);
+                return null;
             }
         }
         else {
-            // no source maps
-            return { source: null, line: 0, column: 0 };
+            // Try fallback: read inline or linked map from the JS file itself
+            if (fallbackJsPath) {
+                const alt = findInlineOrLinkedMapFromJs(fallbackJsPath);
+                if (alt && alt.text) {
+                    mapText = alt.text;
+                    // Cache under both the requested key and the alt key so future lookups are fast
+                    loadedSourceMaps.set(alt.key, alt.text);
+                }
+                else {
+                    return null;
+                }
+            }
+            else {
+                // no source maps
+                return null;
+            }
         }
     }
     loadedSourceMaps.set(mapPath, mapText); // cache it
@@ -77,42 +139,93 @@ function loadAndExtractMap(mapPath) {
 }
 function remapFrame(file, line, column) {
     /**
-     * webpack config can use source map files or inline.
+     * bundlers can use source map files or inline.
      * To use source map files, run with `--env.sourceMap=source-map`.
-     * @nativescript/webpack 5.1 enables `source-map` files by default when using runtimes v9+.
+     * Notes:
+     * Starting with @nativescript/webpack 5.0.25, `source-map` files are used by default when using runtimes v9+.
      */
     const appPath = knownFolders.currentApp().path;
     let sourceMapFileExt = '';
     if (usingSourceMapFiles) {
         sourceMapFileExt = '.map';
     }
-    const mapPath = `${appPath}/${file.replace('file:///app/', '')}${sourceMapFileExt}`;
-    // 3) hand it to the consumer
-    const sourceMap = loadAndExtractMap(mapPath);
+    const rel = file.replace('file:///app/', '');
+    const jsPath = `${appPath}/${rel}`;
+    let mapPath = `${jsPath}${sourceMapFileExt}`; // default: same name + .map
+    // Fallback: if .mjs.map missing, try .js.map
+    if (!File.exists(mapPath) && rel.endsWith('.mjs')) {
+        const jsMapFallback = `${appPath}/${rel.replace(/\.mjs$/, '.js.map')}`;
+        if (File.exists(jsMapFallback)) {
+            mapPath = jsMapFallback;
+        }
+    }
+    const sourceMap = loadAndExtractMap(mapPath, jsPath);
+    if (!sourceMap) {
+        return { source: null, line: 0, column: 0 };
+    }
     const consumer = getConsumer(mapPath, sourceMap);
-    return consumer.originalPositionFor({ line, column });
+    if (!consumer) {
+        return { source: null, line: 0, column: 0 };
+    }
+    try {
+        return consumer.originalPositionFor({ line, column });
+    }
+    catch (error) {
+        console.debug && console.debug(`Remap failed for ${file}:${line}:${column}:`, error);
+        return { source: null, line: 0, column: 0 };
+    }
 }
 function remapStack(raw) {
     const lines = raw.split('\n');
     const out = lines.map((line) => {
-        const m = /\((.+):(\d+):(\d+)\)/.exec(line);
-        if (!m)
-            return line;
-        const [_, file, l, c] = m;
-        const orig = remapFrame(file, +l, +c);
-        if (!orig.source)
-            return line;
-        return line.replace(/\(.+\)/, `(${orig.source}:${orig.line}:${orig.column})`);
+        // 1) Parenthesized frame: at fn (file:...:L:C)
+        let m = /\((.+):(\d+):(\d+)\)/.exec(line);
+        if (m) {
+            try {
+                const [_, file, l, c] = m;
+                const orig = remapFrame(file, +l, +c);
+                if (!orig.source)
+                    return line;
+                return line.replace(/\(.+\)/, `(${orig.source}:${orig.line}:${orig.column})`);
+            }
+            catch (error) {
+                console.debug && console.debug('Remap failed for frame:', line, error);
+                return line;
+            }
+        }
+        // 2) Bare frame: at file:///app/vendor.js:L:C (no parentheses)
+        const bare = /(\s+at\s+)([^\s()]+):(\d+):(\d+)/.exec(line);
+        if (bare) {
+            try {
+                const [, prefix, file, l, c] = bare;
+                const orig = remapFrame(file, +l, +c);
+                if (!orig.source)
+                    return line;
+                const replacement = `${prefix}${orig.source}:${orig.line}:${orig.column}`;
+                return line.replace(bare[0], replacement);
+            }
+            catch (error) {
+                console.debug && console.debug('Remap failed for bare frame:', line, error);
+                return line;
+            }
+        }
+        return line;
     });
     return out.join('\n');
 }
 /**
- * Added in 9.0 runtimes.
- * Allows the runtime to remap stack traces before displaying them in the in-flight error screens.
+ * Added with 9.0 runtimes.
+ * Allows the runtime to remap stack traces before displaying them via in-flight error screens.
  */
 global.__ns_remapStack = (rawStack) => {
-    console.log('Remapping stack trace...');
-    return remapStack(rawStack);
+    // console.log('Remapping stack trace...');
+    try {
+        return remapStack(rawStack);
+    }
+    catch (error) {
+        console.debug && console.debug('Remap failed, returning original:', error);
+        return rawStack; // fallback to original stack trace
+    }
 };
 /**
  * End of source map remapping for stack traces

package/inspector_modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspector_modules.js","sourceRoot":"","sources":["../../../packages/core/inspector_modules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inspector_modules.js","sourceRoot":"","sources":["../../../packages/core/inspector_modules.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,CAAC;AACnB,OAAO,iCAAiC,CAAC;AACzC,OAAO,6BAA6B,CAAC;AACrC,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACnD,2DAA2D;AAC3D,OAAO,KAAK,WAAW,MAAM,eAAe,CAAC;AAC7C,MAAM,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC;AAE1C,yEAAyE;AACzE,6DAA6D;AAC7D,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,IAAI,gBAAkC,CAAC;AACvC,IAAI,aAA+B,CAAC;AAEpC,SAAS,WAAW,CAAC,OAAe,EAAE,SAAc;IACnD,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,CAAC,EAAE,CAAC;QACR,IAAI,CAAC;YACJ,CAAC,GAAG,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACrC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,mFAAmF;YACnF,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,gCAAgC,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC;YAClF,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IACD,OAAO,CAAC,CAAC;AACV,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IACjC,IAAI,CAAC;QACJ,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;QAC3C,CAAC;IACF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IACd,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,2BAA2B,CAAC,MAAc;IAClD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,+CAA+C;IAC/C,oEAAoE;IACpE,MAAM,EAAE,GAAG,gDAAgD,CAAC;IAC5D,IAAI,KAAK,GAA2B,IAAI,CAAC;IACzC,IAAI,IAAI,GAA2B,IAAI,CAAC;IACxC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAAE,IAAI,GAAG,KAAK,CAAC;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,GAAG,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,OAAO,EAAE,GAAG,EAAE,UAAU,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,8BAA8B;IAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,GAAG,KAAK,IAAI,GAAG,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/B,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,cAAuB;IAClE,oBAAoB;IACpB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvB,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IACD,IAAI,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,OAAO,EAAE,CAAC;QACb,OAAO,OAAO,CAAC,CAAC,iBAAiB;IAClC,CAAC;SAAM,CAAC;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;gBAEvD,2EAA2E;gBAC3E,6DAA6D;gBAC7D,uDAAuD;gBACvD,wCAAwC;gBACxC,+FAA+F;gBAC/F,gBAAgB;gBAChB,IAAI;gBAEJ,IAAI,mBAAmB,EAAE,CAAC;oBACzB,OAAO,GAAG,QAAQ,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACP,8BAA8B;oBAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;oBAC5F,IAAI,CAAC,KAAK,EAAE,CAAC;wBACZ,OAAO,CAAC,IAAI,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;wBACxD,OAAO,IAAI,CAAC;oBACb,CAAC;oBACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC5B,yCAAyC;oBACzC,wDAAwD;oBACxD,OAAO,GAAG,MAAM,CAAC;gBAClB,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,6BAA6B,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC/E,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;aAAM,CAAC;YACP,kEAAkE;YAClE,IAAI,cAAc,EAAE,CAAC;gBACpB,MAAM,GAAG,GAAG,2BAA2B,CAAC,cAAc,CAAC,CAAC;gBACxD,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;oBACrB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;oBACnB,gFAAgF;oBAChF,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACP,OAAO,IAAI,CAAC;gBACb,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,iBAAiB;gBACjB,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;IACF,CAAC;IACD,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW;IACnD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,IAAY,EAAE,MAAc;IAC7D;;;;;OAKG;IAEH,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC;IAC/C,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,mBAAmB,EAAE,CAAC;QACzB,gBAAgB,GAAG,MAAM,CAAC;IAC3B,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC;IACnC,IAAI,OAAO,GAAG,GAAG,MAAM,GAAG,gBAAgB,EAAE,CAAC,CAAC,4BAA4B;IAE1E,6CAA6C;IAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;QACvE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,aAAa,CAAC;QACzB,CAAC;IACF,CAAC;IAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAErD,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC;QACJ,OAAO,QAAQ,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,oBAAoB,IAAI,IAAI,IAAI,IAAI,MAAM,GAAG,EAAE,KAAK,CAAC,CAAC;QACrF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC7C,CAAC;AACF,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,+CAA+C;QAC/C,IAAI,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE,CAAC;YACP,IAAI,CAAC;gBACJ,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC;gBAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACvE,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,+DAA+D;QAC/D,MAAM,IAAI,GAAG,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,IAAI,EAAE,CAAC;YACV,IAAI,CAAC;gBACJ,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;gBACpC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC;gBAC9B,MAAM,WAAW,GAAG,GAAG,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC1E,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YAC3C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC5E,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC;AAED;;;GAGG;AACF,MAAc,CAAC,eAAe,GAAG,CAAC,QAAgB,EAAE,EAAE;IACtD,2CAA2C;IAC3C,IAAI,CAAC;QACJ,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC3E,OAAO,QAAQ,CAAC,CAAC,mCAAmC;IACrD,CAAC;AACF,CAAC,CAAC;AACF;;GAEG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/core",
-  "version": "9.0.0-alpha.13",
+  "version": "9.0.0-alpha.13-next-11-05-2025-19118999729",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
   "type": "module",
   "main": "index",

package/references.d.ts

@@ -4,7 +4,7 @@
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts" />
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!DarwinFoundation.d.ts" />
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!Symbols.d.ts" />
-/// <reference path="../types-android/src/lib/android-29.d.ts" />
+/// <reference path="../types-android/src/lib/android-33.d.ts" />
 /// <reference path="./platforms/ios/typings/objc!MaterialComponents.d.ts" />
 /// <reference path="./platforms/ios/typings/objc!NativeScriptUtils.d.ts" />
 /// <reference path="./global-types.d.ts" />

package/timer/index.android.js

@@ -46,21 +46,29 @@ export function clearTimeout(id) {
     }
 }
 export function setInterval(callback, milliseconds = 0, ...args) {
-    // Cast to Number
     milliseconds += 0;
     const id = createHandlerAndGetId();
     const handler = timeoutHandler;
     const invoke = () => callback(...args);
     const zoneBound = zonedCallback(invoke);
-    const startOffset = milliseconds > 0 ? Date.now() % milliseconds : 0;
-    function nextCallMs() {
-        return milliseconds > 0 ? milliseconds - ((Date.now() - startOffset) % milliseconds) : milliseconds;
-    }
+    let nextDueTime = Date.now() + milliseconds;
     const runnable = new java.lang.Runnable({
         run: () => {
+            const executionStart = Date.now();
             zoneBound();
             if (timeoutCallbacks[id]) {
-                handler.postDelayed(runnable, long(nextCallMs()));
+                const executionTime = Date.now() - executionStart;
+                // Update the next due time based on when this callback was supposed to execute
+                nextDueTime += milliseconds;
+                // If the callback took longer than the interval, skip ahead to avoid catch-up
+                const now = Date.now();
+                if (nextDueTime <= now) {
+                    // Calculate how many intervals we should skip
+                    const missedIntervals = Math.floor((now - nextDueTime) / milliseconds);
+                    nextDueTime += (missedIntervals + 1) * milliseconds;
+                }
+                const delay = Math.max(0, nextDueTime - now);
+                handler.postDelayed(runnable, long(delay));
             }
         },
     });
@@ -68,7 +76,7 @@ export function setInterval(callback, milliseconds = 0, ...args) {
         timeoutCallbacks[id] = runnable;
         timeoutCallbacksCb[id] = callback;
     }
-    timeoutHandler.postDelayed(runnable, long(nextCallMs()));
+    handler.postDelayed(runnable, long(milliseconds));
     return id;
 }
 export const clearInterval = clearTimeout;

package/timer/index.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/core/timer/index.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/core/timer/index.android.ts"],"names":[],"mappings":"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"}

package/ui/animation/index.d.ts

@@ -1,3 +1,16 @@
 export type { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationPromise, Cancelable } from './animation-types';
-export { Animation, _resolveAnimationCurve } from './animation';
 export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
+import type { AnimationDefinition, AnimationPromise } from './animation-types';
+
+/**
+ * Defines a animation set.
+ */
+export class Animation {
+	constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
+	public play: (resetOnFinish?: boolean) => AnimationPromise;
+	public cancel: () => void;
+	public isPlaying: boolean;
+	public _resolveAnimationCurve(curve: any): any;
+}
+
+export function _resolveAnimationCurve(curve: any): any;

package/ui/button/index.android.js

@@ -57,6 +57,8 @@ export class Button extends ButtonBase {
     initNativeView() {
         super.initNativeView();
         const nativeView = this.nativeViewProtected;
+        // make consistent with iOS, easier on users given css styling
+        nativeView.setAllCaps(false);
         initializeClickListener();
         const clickListener = new ClickListener(this);
         nativeView.setOnClickListener(clickListener);

package/ui/button/index.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.android.ts"],"names":[],"mappings":"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"}

package/ui/button/index.d.ts

@@ -10,7 +10,7 @@ export class Button extends TextBase {
 	/**
 	 * String value used when hooking to tap event.
 	 *
-	 * @nsEvent {EventData} string;
+	 * @nsEvent {EventData} tap
 	 */
 	public static tapEvent: string;
 

package/ui/button/index.ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.ios.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.ios.ts"],"names":[],"mappings":"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"}