@vesk/compiler 0.2.50-canary.3 → 0.2.50-canary.4

package/dist/module-imports.d.ts

@@ -74,6 +74,31 @@ export declare function resolveImportPath(spec: string, fromDir: string): string
  * `node_modules`) share one cache entry and one module instance.
  */
 export declare function resolveSsrModule(specifier: string, fromDir: string): string | null;
+/**
+ * Resolve a subpath through a package's `exports` map.
+ *
+ * This is what makes a Vesk app work inside an existing pnpm/npm/yarn
+ * workspace. A modern workspace package declares `exports` and often NO `main`
+ * (or points `main` at a CJS build while the app imports ESM), and subpath
+ * imports (`@acme/ui/button`) resolve through the map rather than through the
+ * directory layout. Without this, such a package simply does not resolve, and
+ * the app has to vendor it.
+ *
+ * Conditions are tried in import order: `import`, `module`, `node`, `default`.
+ * A pattern (`./dist/*.js`) is matched with the single `*` capture.
+ */
+export declare function resolveExports(exportsField: unknown, subpath: string): string | null;
+/**
+ * Resolve a bare specifier through a package's `module` field (the ESM entry
+ * in a package that also has a CJS `main`).
+ */
+export declare function resolveViaPackageModuleField(specifier: string, fromDir: string): string | null;
+/**
+ * Resolve a bare specifier through its package's `exports` map, walking
+ * node_modules upwards. Returns null when the package has no map, does not
+ * export the subpath, or cannot be read.
+ */
+export declare function resolveViaPackageExports(specifier: string, fromDir: string): string | null;
 /** Rewrites an ESM program body (imports/exports removed) into CJS statements. */
 export declare function esmToCjs(body: Array<{
     type: string;

package/dist/module-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"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"}

package/dist/module-imports.js

@@ -900,6 +900,21 @@ export function resolveSsrModule(specifier, fromDir) {
         const aliased = resolveAliasModule(specifier, fromDir);
         if (aliased)
             return toRealPath(aliased);
+        // Bare specifier. A package's `exports` map is consulted BEFORE Node's own
+        // resolver: `createRequire.resolve` applies the CJS conditions, so it picks
+        // a `.cjs` build for a package that also ships ESM — and fails outright on
+        // an `import`-only package. Vesk emits ESM, so the `import` condition is
+        // the correct one. Node's resolver stays as the fallback (builtins, exotic
+        // conditions), and the node_modules walk after that.
+        const viaExports = resolveViaPackageExports(specifier, fromDir);
+        if (viaExports)
+            return viaExports;
+        // Same reasoning for the legacy fields: a package declaring both `module`
+        // and `main` wants the ESM build (Vesk emits ESM), while `createRequire`
+        // would take `main` and hand us the CJS one.
+        const viaModuleField = resolveViaPackageModuleField(specifier, fromDir);
+        if (viaModuleField)
+            return viaModuleField;
         // Bare specifier — prefer the native resolver (exports map, conditions,
         // builtins, symlinks), then fall back to a node_modules walk-up.
         const native = nativeResolve(specifier, fromDir);
@@ -983,6 +998,145 @@ function statOrNull(p) {
         return null;
     }
 }
+/**
+ * Resolve a subpath through a package's `exports` map.
+ *
+ * This is what makes a Vesk app work inside an existing pnpm/npm/yarn
+ * workspace. A modern workspace package declares `exports` and often NO `main`
+ * (or points `main` at a CJS build while the app imports ESM), and subpath
+ * imports (`@acme/ui/button`) resolve through the map rather than through the
+ * directory layout. Without this, such a package simply does not resolve, and
+ * the app has to vendor it.
+ *
+ * Conditions are tried in import order: `import`, `module`, `node`, `default`.
+ * A pattern (`./dist/*.js`) is matched with the single `*` capture.
+ */
+export function resolveExports(exportsField, subpath) {
+    const conditions = ['import', 'module', 'node', 'default'];
+    const target = (value) => {
+        if (typeof value === 'string')
+            return value;
+        if (!value || typeof value !== 'object')
+            return null;
+        for (const cond of conditions) {
+            if (cond in value) {
+                const got = target(value[cond]);
+                if (got)
+                    return got;
+            }
+        }
+        return null;
+    };
+    if (typeof exportsField === 'string')
+        return subpath === '.' ? exportsField : null;
+    if (!exportsField || typeof exportsField !== 'object')
+        return null;
+    const map = exportsField;
+    if (subpath in map) {
+        const direct = target(map[subpath]);
+        if (direct)
+            return direct;
+        return null;
+    }
+    // Longest-prefix match for `./*` patterns, as Node does.
+    let best = null;
+    for (const key of Object.keys(map)) {
+        const star = key.indexOf('*');
+        if (star === -1)
+            continue;
+        const prefix = key.slice(0, star);
+        const suffix = key.slice(star + 1);
+        if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
+            continue;
+        if (subpath.length < prefix.length + suffix.length)
+            continue;
+        if (best === null || prefix.length > best.key.length) {
+            best = { key: prefix, star: subpath.slice(prefix.length, subpath.length - suffix.length) };
+        }
+    }
+    if (!best)
+        return null;
+    const pattern = target(map[Object.keys(map).find((k) => k.startsWith(best.key + '*') && k.endsWith(best.key.slice(0, -1)) + '*')] ?? map[`${best.key}*`]);
+    if (pattern === null)
+        return null;
+    return pattern.split('*').join(best.star);
+}
+/**
+ * Resolve a bare specifier through a package's `module` field (the ESM entry
+ * in a package that also has a CJS `main`).
+ */
+export function resolveViaPackageModuleField(specifier, fromDir) {
+    const firstSlash = specifier.indexOf('/');
+    const splitAt = specifier.startsWith('@') ? specifier.indexOf('/', firstSlash + 1) : firstSlash;
+    const pkgName = splitAt > 0 ? specifier.slice(0, splitAt) : specifier;
+    if (splitAt > 0)
+        return null; // a subpath import needs the exports map
+    let dir = fromDir;
+    for (let depth = 0; depth < 64; depth++) {
+        const pkgPath = join(dir, 'node_modules', pkgName, 'package.json');
+        if (statOrNull(pkgPath) !== null) {
+            try {
+                const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+                if (typeof pkg.module === 'string' && pkg.module.length > 0) {
+                    const found = probeFile(resolve(join(dir, 'node_modules', pkgName), pkg.module));
+                    if (found)
+                        return toRealPath(found);
+                }
+            }
+            catch {
+                // malformed package.json — fall through
+            }
+            return null;
+        }
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+/**
+ * Resolve a bare specifier through its package's `exports` map, walking
+ * node_modules upwards. Returns null when the package has no map, does not
+ * export the subpath, or cannot be read.
+ */
+export function resolveViaPackageExports(specifier, fromDir) {
+    // A scoped name (`@acme/ui`) has its slash INSIDE the package name — taking
+    // the first slash as the subpath separator turns it into package `@acme` +
+    // subpath `./ui`, which no `exports` map matches, and the lookup silently
+    // falls through to Node's resolver.
+    const firstSlash = specifier.indexOf('/');
+    const splitAt = specifier.startsWith('@') ? specifier.indexOf('/', firstSlash + 1) : firstSlash;
+    const pkgName = splitAt > 0 ? specifier.slice(0, splitAt) : specifier;
+    const subpath = splitAt > 0 ? '.' + specifier.slice(splitAt) : '.';
+    let dir = fromDir;
+    for (let depth = 0; depth < 64; depth++) {
+        const pkgDir = join(dir, 'node_modules', pkgName);
+        const pkgPath = join(pkgDir, 'package.json');
+        if (statOrNull(pkgPath) !== null) {
+            try {
+                const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+                if (pkg.exports !== undefined) {
+                    const target = resolveExports(pkg.exports, subpath);
+                    if (target) {
+                        const found = probeFile(resolve(pkgDir, target));
+                        if (found)
+                            return toRealPath(found);
+                    }
+                }
+            }
+            catch {
+                // malformed package.json — fall through to the resolvers below
+            }
+            return null;
+        }
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
 function probeFile(base) {
     const st = statOrNull(base);
     if (st && st.isFile())
@@ -993,10 +1147,24 @@ function probeFile(base) {
         if (pkgSt && pkgSt.isFile()) {
             try {
                 const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-                if (typeof pkg.main === 'string' && pkg.main.length > 0) {
-                    const viaMain = probeFile(resolve(base, pkg.main));
-                    if (viaMain)
-                        return viaMain;
+                // `exports` first: it is what the package author intends and what a
+                // workspace package usually ships. `main`/`module` are the legacy
+                // fallbacks.
+                if (pkg.exports !== undefined) {
+                    const viaExports = resolveExports(pkg.exports, '.');
+                    if (viaExports) {
+                        const found = probeFile(resolve(base, viaExports));
+                        if (found)
+                            return found;
+                    }
+                }
+                for (const field of ['module', 'main']) {
+                    const value = pkg[field];
+                    if (typeof value === 'string' && value.length > 0) {
+                        const found = probeFile(resolve(base, value));
+                        if (found)
+                            return found;
+                    }
                 }
             }
             catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.50-canary.3",
+  "version": "0.2.50-canary.4",
   "type": "module",
   "description": "Vesk compiler — lexer, parser, semantic analysis, IR, codegen",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sveltejs/acorn-typescript": "^1.0.0",
-    "@vesk/types": "^0.2.50-canary.3",
+    "@vesk/types": "^0.2.50-canary.4",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",