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

package/hmr/server/angular-root-component.js

@@ -0,0 +1,149 @@
+import path from 'path';
+const BOOTSTRAP_APPLICATION_RE = /\bbootstrapApplication\s*\(\s*([A-Za-z_$][\w$]*)/;
+const IMPORT_STATEMENT_RE = /import\s+([^;'"]+?)\s+from\s+['"]([^'"]+)['"]/g;
+const SOURCE_EXTENSION_RE = /\.(?:tsx?|jsx?|mjs|cjs|html?|css|scss|sass|less)$/i;
+function scanImportBindings(source) {
+    const bindings = new Map();
+    IMPORT_STATEMENT_RE.lastIndex = 0;
+    let match;
+    while ((match = IMPORT_STATEMENT_RE.exec(source)) !== null) {
+        const clause = match[1].trim();
+        const specifier = match[2];
+        recordClauseBindings(clause, specifier, bindings);
+    }
+    return bindings;
+}
+function recordClauseBindings(clause, specifier, out) {
+    const namedStart = clause.indexOf('{');
+    if (namedStart !== -1) {
+        const namedEnd = clause.indexOf('}', namedStart);
+        const namedSegment = namedEnd === -1 ? clause.slice(namedStart + 1) : clause.slice(namedStart + 1, namedEnd);
+        for (const raw of namedSegment.split(',')) {
+            const entry = raw.trim();
+            if (!entry)
+                continue;
+            const asMatch = /^(\S+)\s+as\s+(\S+)$/.exec(entry);
+            if (asMatch) {
+                out.set(asMatch[2], { specifier, importedName: asMatch[1] });
+            }
+            else {
+                out.set(entry, { specifier, importedName: entry });
+            }
+        }
+        // Strip the `{ … }` group so a leading default import in the same
+        // statement (`import Foo, { Bar } from '…'`) is still captured below.
+        clause = (clause.slice(0, namedStart) + clause.slice(namedEnd === -1 ? clause.length : namedEnd + 1)).trim();
+    }
+    const namespaceMatch = /^\*\s+as\s+([A-Za-z_$][\w$]*)$/.exec(clause);
+    if (namespaceMatch) {
+        out.set(namespaceMatch[1], { specifier, importedName: '*' });
+        return;
+    }
+    const defaultName = clause.replace(/,\s*$/, '').trim();
+    if (/^[A-Za-z_$][\w$]*$/.test(defaultName)) {
+        out.set(defaultName, { specifier, importedName: 'default' });
+    }
+}
+/**
+ * Resolves a (relative or `~`/`@` aliased) module specifier — as written in
+ * the entry's import — to an extensionless project-relative POSIX path.
+ * Returns `null` for bare/package specifiers (a root component is always a
+ * project-local file).
+ */
+function resolveSpecifierToModuleRel(specifier, entryRel, appRootRel) {
+    const entryDir = path.posix.dirname(normalizeRel(entryRel));
+    if (specifier.startsWith('./') || specifier.startsWith('../')) {
+        return toExtensionlessModuleRel(path.posix.join(entryDir, specifier));
+    }
+    if (specifier.startsWith('~/') || specifier.startsWith('@/')) {
+        const base = normalizeRel(appRootRel || entryDir);
+        return toExtensionlessModuleRel(path.posix.join(base, specifier.slice(2)));
+    }
+    return null;
+}
+function normalizeRel(rel) {
+    let normalized = String(rel || '').replace(/\\/g, '/');
+    if (!normalized.startsWith('/'))
+        normalized = '/' + normalized;
+    return normalized.replace(/\/{2,}/g, '/');
+}
+/**
+ * Normalizes any project-relative path to a leading-slash, extensionless
+ * POSIX key suitable for equality comparison between a `.html`/`.ts` edit
+ * and the resolved root component.
+ */
+export function toExtensionlessModuleRel(rel) {
+    const normalized = normalizeRel(rel);
+    return normalized.replace(SOURCE_EXTENSION_RE, '');
+}
+/** True when two project-relative paths refer to the same module (ignoring extension). */
+export function isSameAngularModuleRel(a, b) {
+    if (!a || !b)
+        return false;
+    return toExtensionlessModuleRel(a) === toExtensionlessModuleRel(b);
+}
+/**
+ * Resolves the bootstrap root component from a dev-server entry module's
+ * source. Returns `null` when the bootstrap shape can't be statically
+ * resolved (callers should then keep their default behavior).
+ */
+export function resolveBootstrapRootComponent(options) {
+    const { entrySource, entryRel } = options;
+    if (!entrySource || !entryRel)
+        return null;
+    const bootstrapMatch = BOOTSTRAP_APPLICATION_RE.exec(entrySource);
+    if (!bootstrapMatch)
+        return null;
+    const localName = bootstrapMatch[1];
+    const binding = scanImportBindings(entrySource).get(localName);
+    if (!binding)
+        return null;
+    const moduleRel = resolveSpecifierToModuleRel(binding.specifier, entryRel, options.appRootRel ?? '');
+    if (!moduleRel)
+        return null;
+    // Prefer the originally-imported name (the declared class) over a local
+    // alias so it lines up with the class name Analog encodes in its id.
+    const className = binding.importedName && binding.importedName !== 'default' && binding.importedName !== '*' ? binding.importedName : localName;
+    return { moduleRel, className };
+}
+/**
+ * Decodes Analog's `angular:component-update` payload `id`
+ * (`encodeURIComponent(relativePath + '@' + className)`) into a normalized,
+ * extensionless module rel plus the class name, so the bridge can compare it
+ * against the resolved root component. Returns `null` for empty/invalid ids.
+ */
+export function decodeAngularComponentUpdateId(id) {
+    if (typeof id !== 'string' || !id)
+        return null;
+    let decoded = id;
+    try {
+        decoded = decodeURIComponent(id);
+    }
+    catch {
+        // Leave as-is — a non-encoded id still splits/normalizes correctly.
+    }
+    // Class names never contain `@`, but scoped paths can — split on the LAST
+    // `@` so `relativePath` keeps any leading `@scope/...` segments intact.
+    const at = decoded.lastIndexOf('@');
+    const pathPart = at >= 0 ? decoded.slice(0, at) : decoded;
+    const className = at >= 0 ? decoded.slice(at + 1) : '';
+    if (!pathPart)
+        return null;
+    return { moduleRel: toExtensionlessModuleRel(pathPart), className };
+}
+/**
+ * True when an Analog `angular:component-update` `id` targets the resolved
+ * root component — matched by module path first (robust to class-name
+ * collisions), then by class name as a fallback.
+ */
+export function isAngularRootComponentUpdate(root, id) {
+    if (!root)
+        return false;
+    const decoded = decodeAngularComponentUpdateId(id);
+    if (!decoded)
+        return false;
+    if (isSameAngularModuleRel(root.moduleRel, decoded.moduleRel))
+        return true;
+    return !!decoded.className && decoded.className === root.className;
+}
+//# sourceMappingURL=angular-root-component.js.map

package/hmr/server/angular-root-component.js.map

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

package/hmr/server/constants.js

@@ -5,15 +5,24 @@ export const QUERY_PATTERN = /\?.*$/;
 // Detect whether Vite's variable dynamic import helper is already inlined
 export const VARIABLE_DYNAMIC_IMPORT_HELPER_PATTERN = /__variableDynamicImportRuntimeHelper\s*=/;
 // Import/export matchers (static and dynamic)
-export const IMPORT_PATTERN_1 = /(?:^|\n)(\s*import\s+[^'";]*?\s+from\s+["'])([^"']+)(["'];?)/g;
-export const IMPORT_PATTERN_2 = /(?:^|\n)(\s*export\s+[^'";]*?\s+from\s+["'])([^"']+)(["'];?)/g;
+//
+// Each pattern's first capture group includes the optional leading anchor
+// (`^|\n`) so the replacement function preserves the line break that would
+// otherwise be silently consumed by the regex engine. Without this, two
+// concatenated patterns like:
+//   `})();\nexport * from "a"\nexport * from "b"`
+// would collapse to:
+//   `})();export * from "a"export * from "b"`
+// because each `(?:^|\n)` ate a newline that no replacement string put back.
+export const IMPORT_PATTERN_1 = /((?:^|\n)\s*import\s+[^'";]*?\s+from\s+["'])([^"']+)(["'];?)/g;
+export const IMPORT_PATTERN_2 = /((?:^|\n)\s*export\s+[^'";]*?\s+from\s+["'])([^"']+)(["'];?)/g;
 export const EXPORT_PATTERN = IMPORT_PATTERN_2;
 export const IMPORT_PATTERN_3 = /(import\(\s*["'])([^"']+)(["']\s*\))/g;
 // Side-effect imports: import "spec" / import 'spec' (no `from`, no bindings)
-export const IMPORT_PATTERN_SIDE_EFFECT = /(?:^|\n)(\s*import\s+["'])([^"']+)(["'];?)/g;
+export const IMPORT_PATTERN_SIDE_EFFECT = /((?:^|\n)\s*import\s+["'])([^"']+)(["'];?)/g;
 // Vue-specific patterns
 export const VUE_FILE_PATTERN = /\.vue(?:\?[^"']*)?$/;
-export const VUE_FILE_IMPORT = /(?:^|\n)(\s*import\s+[^'";]*?\s+from\s+["'])([^"']+\.vue(?:\?[^"']*)?)(["'];?)/g;
+export const VUE_FILE_IMPORT = /((?:^|\n)\s*import\s+[^'";]*?\s+from\s+["'])([^"']+\.vue(?:\?[^"']*)?)(["'];?)/g;
 // Vite/HMR noise cleanup
 export const VITE_CLIENT_IMPORT = /(?:^|\n)\s*import\s+['"](?:\/@vite\/client|@vite\/client)['"];?/g;
 // Strip Vite's injected `import.meta.hot = __vite__createHotContext(...)` assignment.

package/hmr/server/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/constants.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,qGAAqG;AAErG,uBAAuB;AACvB,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC;AAErC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,sCAAsC,GAAG,0CAA0C,CAAC;AAEjG,8CAA8C;AAC9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,+DAA+D,CAAC;AAChG,MAAM,CAAC,MAAM,gBAAgB,GAAG,+DAA+D,CAAC;AAChG,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,uCAAuC,CAAC;AACxE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,0BAA0B,GAAG,6CAA6C,CAAC;AAExF,wBAAwB;AACxB,MAAM,CAAC,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AACtD,MAAM,CAAC,MAAM,eAAe,GAAG,iFAAiF,CAAC;AAEjH,yBAAyB;AACzB,MAAM,CAAC,MAAM,kBAAkB,GAAG,kEAAkE,CAAC;AACrG,sFAAsF;AACtF,wFAAwF;AACxF,2CAA2C;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,sCAAsC,CAAC;AACjF,MAAM,CAAC,MAAM,qBAAqB,GAAG,+DAA+D,CAAC;AAErG,uEAAuE;AACvE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kEAAkE,CAAC;AACpG,MAAM,CAAC,MAAM,qBAAqB,GAAG,sEAAsE,CAAC;AAC5G,MAAM,CAAC,MAAM,qBAAqB,GAAG,+CAA+C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/constants.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,qGAAqG;AAErG,uBAAuB;AACvB,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC;AAErC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,sCAAsC,GAAG,0CAA0C,CAAC;AAEjG,8CAA8C;AAC9C,EAAE;AACF,0EAA0E;AAC1E,2EAA2E;AAC3E,wEAAwE;AACxE,8BAA8B;AAC9B,kDAAkD;AAClD,qBAAqB;AACrB,8CAA8C;AAC9C,6EAA6E;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,+DAA+D,CAAC;AAChG,MAAM,CAAC,MAAM,gBAAgB,GAAG,+DAA+D,CAAC;AAChG,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,uCAAuC,CAAC;AACxE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,0BAA0B,GAAG,6CAA6C,CAAC;AAExF,wBAAwB;AACxB,MAAM,CAAC,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AACtD,MAAM,CAAC,MAAM,eAAe,GAAG,iFAAiF,CAAC;AAEjH,yBAAyB;AACzB,MAAM,CAAC,MAAM,kBAAkB,GAAG,kEAAkE,CAAC;AACrG,sFAAsF;AACtF,wFAAwF;AACxF,2CAA2C;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,sCAAsC,CAAC;AACjF,MAAM,CAAC,MAAM,qBAAqB,GAAG,+DAA+D,CAAC;AAErG,uEAAuE;AACvE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kEAAkE,CAAC;AACpG,MAAM,CAAC,MAAM,qBAAqB,GAAG,sEAAsE,CAAC;AAC5G,MAAM,CAAC,MAAM,qBAAqB,GAAG,+CAA+C,CAAC"}

package/hmr/server/core-sanitize.d.ts

@@ -8,8 +8,8 @@
  *   "@nativescript/core/index.js";
  * This trips the sanitizer's local-core-path detector and breaks HTTP ESM loading.
  *
- * This helper safely maps those literals to:
- *   import "/ns/core?p=index.js";
+ * This helper safely maps those literals to the canonical path form:
+ *   import "/ns/core/<sub>";   // subpath form, no version, no ?p=
  * or, without subpath:
  *   import "/ns/core";
  */
@@ -19,17 +19,95 @@ export declare function normalizeStrayCoreStringLiterals(code: string): string;
  * following side-effect import of the core bridge.
  *
  * Example:
- *   import { A, B } from\nimport "/ns/core?p=index.js";
+ *   import { A, B } from\nimport "/ns/core/index";
  * becomes
- *   import { A, B } from "/ns/core?p=index.js";
+ *   import { A, B } from "/ns/core/index";
  */
 export declare function fixDanglingCoreFrom(code: string): string;
+/**
+ * Run the full "rescue any stray @nativescript/core references" pass over the
+ * code in one call. This is the canonical entry point for NS-M served modules
+ * (and any other consumer that wants the safety net). The three sub-passes
+ * cover progressively rarer pipeline accidents:
+ *
+ *   1. `normalizeStrayCoreStringLiterals` — turns naked `"@nativescript/core/foo";`
+ *      string literals (produced by some upstream transforms that bare-stringify
+ *      side-effect imports) back into proper `import "/ns/core/foo";`.
+ *   2. `fixDanglingCoreFrom` — merges multi-line accidents where a `from`
+ *      clause got separated from its specifier across newlines.
+ *   3. `normalizeAnyCoreSpecToBridge` — final regex sweep that catches any
+ *      remaining `from "...@nativescript/core[/sub]..."` references that escaped
+ *      both the AST normalizer and the import rewriter.
+ *
+ * Centralising the passes here ensures every NS-M emitter applies the same
+ * safety net in the same order; drift between call sites re-introduces the
+ * realm-split bug.
+ *
+ * Returns the (possibly) rewritten code; never throws.
+ */
+export declare function sanitizeStrayCoreReferences(code: string): string;
 /**
  * Fallback: normalize ANY import spec that references '@nativescript/core' (including
  * absolute/relative or resolved forms like '/node_modules/@nativescript/core/index.js?v=...')
  * into the unified '/ns/core' bridge before fast-fail assertions.
  */
 export declare function normalizeAnyCoreSpecToBridge(code: string): string;
+/**
+ * Description of the URL the bridge is currently serving, used to resolve
+ * relative import specifiers (`./x`, `../x`) into absolute `/ns/core/<sub>`
+ * URLs.
+ *
+ * Why this exists: Vite's `vite:import-analysis` pass usually rewrites every
+ * relative specifier to an absolute (`/@fs/...` or `/node_modules/...`) ID
+ * before code reaches us, but for files under `node_modules` some transform
+ * paths leave relatives untouched. When the device fetches such a module at
+ * `http://host/ns/core/utils/layout-helper` (no trailing slash, no `/index`)
+ * V8/iOS apply RFC 3986 URL resolution and treat `layout-helper` as the
+ * *file*, so `./layout-helper-common` becomes
+ * `http://host/ns/core/utils/layout-helper-common` — a sibling that does not
+ * exist (the real file lives at `…/layout-helper/layout-helper-common`).
+ *
+ * Passing a `RelativeBase` lets `rewriteSpec` resolve these specifiers
+ * server-side and emit canonical absolute `/ns/core/<resolved>` URLs, so the
+ * device never has to guess. When omitted, `rewriteSpec` falls back to the
+ * pre-existing behaviour of leaving relatives alone.
+ */
+export type RelativeBase = {
+    /**
+     * Sub-path of the served module, without the leading `/ns/core/`. May be
+     * the empty string for the package main (`/ns/core` itself).
+     */
+    sub: string;
+    /**
+     * `true` when the served file is a directory-index (e.g.
+     * `…/utils/layout-helper/index.android.ts`); in that case `sub` already
+     * names the *directory*, and `./x` resolves to `<sub>/x`.
+     *
+     * `false` for plain file modules (e.g. `…/utils/native-helper.ts`); the
+     * resolution base is the parent directory of `sub`, so `./x` resolves to
+     * `<sub-parent>/x`.
+     */
+    isDirectoryIndex: boolean;
+};
+/**
+ * Detect whether a resolved module path is a directory-index file. Matches
+ * `index.<platform?>.<ext>` shapes used across @nativescript/core (e.g.
+ * `index.js`, `index.android.ts`, `index.ios.mjs`).
+ */
+export declare function isDirectoryIndexFilename(modulePath: string): boolean;
+/**
+ * Resolve a relative specifier (`./x`, `../x`) into a canonical
+ * @nativescript/core sub-path, given the base described by `relBase`.
+ *
+ * `…/index.<platform>.<ext>` files mean `sub` IS the directory (so `./x` →
+ * `<sub>/x`); plain files mean the resolution base is `sub`'s parent.
+ *
+ * Returned sub-path is sanitised by `buildCoreUrlPath`'s convention: trailing
+ * `.(m)?(j|t)s` extensions are stripped so callers can directly emit
+ * `/ns/core/<resolved>` without producing a non-canonical URL that the
+ * bridge would 301-redirect later.
+ */
+export declare function resolveRelativeCoreSub(spec: string, relBase: RelativeBase): string | null;
 /**
  * Minimal specifier rewriter for deep subpath core modules.
  *
@@ -43,14 +121,19 @@ export declare function normalizeAnyCoreSpecToBridge(code: string): string;
  * This replaces the heavy 5-pass pipeline (processCodeForDevice →
  * rewriteImports → deduplicateLinkerImports → CJS wrapping → etc.)
  * for deep subpath core modules where Vite already produces correct ESM.
+ *
+ * When `relBase` is supplied, relative specifiers (`./x`, `../x`) are
+ * resolved server-side into canonical `/ns/core/<resolved>` URLs so the
+ * device never has to guess where a directory-index file's siblings live.
+ * See `RelativeBase` and `rewriteSpec` for the full rationale.
  */
-export declare function rewriteSpecifiersForDevice(code: string, origin: string, ver: number): string;
+export declare function rewriteSpecifiersForDevice(code: string, origin: string, ver: number, relBase?: RelativeBase): string;
 /**
  * Determine whether a `/ns/core` bridge URL points to a real subpath module.
  *
- * Any `/ns/core?p=...` module now serves real ESM content with real named
+ * Any `/ns/core/<sub>` module now serves real ESM content with real named
  * exports via Vite's transform pipeline, except for package-main aliases like
- * `/ns/core?p=index.js`, which should be treated like the main `/ns/core`
+ * `/ns/core/index`, which should be treated like the main `/ns/core`
  * bridge and destructured from its default export.
  * The main proxy bridge (`/ns/core`) still only exports a default Proxy and
  * requires named imports to be destructured from it.