@multiplatform.one/utils 7.84.2 → 7.84.4

package/lib/dev.cjs

@@ -173,7 +173,7 @@ const webConditionOrder = [
 	"require"
 ];
 const skippedConditions = new Set(["types", "react-native"]);
-const tsSourcePattern = /\.(c|m)?tsx?$/;
+const tsSourcePattern = /\.[cm]?tsx?$/;
 function collectExportTargets(target, out) {
 	if (typeof target === "string") {
 		out.push(target);
@@ -213,6 +213,26 @@ function declaredExportTarget(pkgDir, target) {
 	const runtime = candidates.find((c) => !c.endsWith(".d.ts"));
 	return runtime ? node_path.default.resolve(pkgDir, runtime) : void 0;
 }
+function directoryPatternAlias(pkgDir, target) {
+	const targets = [];
+	collectExportTargets(target, targets);
+	const dirTarget = targets.find((t) => t.endsWith("/*"));
+	if (!dirTarget) return void 0;
+	const dir = node_path.default.resolve(pkgDir, dirTarget.slice(0, -2));
+	return node_fs.default.existsSync(dir) && node_fs.default.statSync(dir).isDirectory() ? dir : void 0;
+}
+function subpathAlias(pkgDir, key, target) {
+	if (key === "." || key === "./package.json" || !key.startsWith("./")) return void 0;
+	if (key.endsWith("/*")) {
+		const pattern = key.slice(2, -2);
+		if (pattern.includes("*")) return void 0;
+		const dir = directoryPatternAlias(pkgDir, target);
+		return dir ? [pattern, dir] : void 0;
+	}
+	if (key.includes("*")) return void 0;
+	const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
+	return file ? [key.slice(2), file] : void 0;
+}
 /**
 * Vite `resolve.alias` entries for one package's `exports` subpaths:
 * `<name>/<subpath>` → its source file, and a `./dir/*` pattern → the directory.
@@ -221,21 +241,8 @@ function packageSubpathSourceAliases(pkgName, pkgDir, exportsField) {
 	const aliases = {};
 	if (!exportsField || typeof exportsField !== "object" || Array.isArray(exportsField)) return aliases;
 	for (const [key, target] of Object.entries(exportsField)) {
-		if (key === "." || key === "./package.json" || !key.startsWith("./")) continue;
-		if (key.endsWith("/*")) {
-			const pattern = key.slice(2, -2);
-			if (pattern.includes("*")) continue;
-			const targets = [];
-			collectExportTargets(target, targets);
-			const dirTarget = targets.find((t) => t.endsWith("/*"));
-			if (!dirTarget) continue;
-			const dir = node_path.default.resolve(pkgDir, dirTarget.slice(0, -2));
-			if (node_fs.default.existsSync(dir) && node_fs.default.statSync(dir).isDirectory()) aliases[`${pkgName}/${pattern}`] = dir;
-			continue;
-		}
-		if (key.includes("*")) continue;
-		const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
-		if (file) aliases[`${pkgName}/${key.slice(2)}`] = file;
+		const alias = subpathAlias(pkgDir, key, target);
+		if (alias) aliases[`${pkgName}/${alias[0]}`] = alias[1];
 	}
 	return aliases;
 }

package/lib/dev.mjs

@@ -145,7 +145,7 @@ const webConditionOrder = [
 	"require"
 ];
 const skippedConditions = new Set(["types", "react-native"]);
-const tsSourcePattern = /\.(c|m)?tsx?$/;
+const tsSourcePattern = /\.[cm]?tsx?$/;
 function collectExportTargets(target, out) {
 	if (typeof target === "string") {
 		out.push(target);
@@ -185,6 +185,26 @@ function declaredExportTarget(pkgDir, target) {
 	const runtime = candidates.find((c) => !c.endsWith(".d.ts"));
 	return runtime ? path.resolve(pkgDir, runtime) : void 0;
 }
+function directoryPatternAlias(pkgDir, target) {
+	const targets = [];
+	collectExportTargets(target, targets);
+	const dirTarget = targets.find((t) => t.endsWith("/*"));
+	if (!dirTarget) return void 0;
+	const dir = path.resolve(pkgDir, dirTarget.slice(0, -2));
+	return fs.existsSync(dir) && fs.statSync(dir).isDirectory() ? dir : void 0;
+}
+function subpathAlias(pkgDir, key, target) {
+	if (key === "." || key === "./package.json" || !key.startsWith("./")) return void 0;
+	if (key.endsWith("/*")) {
+		const pattern = key.slice(2, -2);
+		if (pattern.includes("*")) return void 0;
+		const dir = directoryPatternAlias(pkgDir, target);
+		return dir ? [pattern, dir] : void 0;
+	}
+	if (key.includes("*")) return void 0;
+	const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
+	return file ? [key.slice(2), file] : void 0;
+}
 /**
 * Vite `resolve.alias` entries for one package's `exports` subpaths:
 * `<name>/<subpath>` → its source file, and a `./dir/*` pattern → the directory.
@@ -193,21 +213,8 @@ function packageSubpathSourceAliases(pkgName, pkgDir, exportsField) {
 	const aliases = {};
 	if (!exportsField || typeof exportsField !== "object" || Array.isArray(exportsField)) return aliases;
 	for (const [key, target] of Object.entries(exportsField)) {
-		if (key === "." || key === "./package.json" || !key.startsWith("./")) continue;
-		if (key.endsWith("/*")) {
-			const pattern = key.slice(2, -2);
-			if (pattern.includes("*")) continue;
-			const targets = [];
-			collectExportTargets(target, targets);
-			const dirTarget = targets.find((t) => t.endsWith("/*"));
-			if (!dirTarget) continue;
-			const dir = path.resolve(pkgDir, dirTarget.slice(0, -2));
-			if (fs.existsSync(dir) && fs.statSync(dir).isDirectory()) aliases[`${pkgName}/${pattern}`] = dir;
-			continue;
-		}
-		if (key.includes("*")) continue;
-		const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
-		if (file) aliases[`${pkgName}/${key.slice(2)}`] = file;
+		const alias = subpathAlias(pkgDir, key, target);
+		if (alias) aliases[`${pkgName}/${alias[0]}`] = alias[1];
 	}
 	return aliases;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/utils",
-  "version": "7.84.2",
+  "version": "7.84.4",
   "description": "utilities for multiplatform.one",
   "keywords": [
     "multiplatform.one",

package/src/dev.spec.ts

@@ -13,7 +13,9 @@ import {
   lookupProjectRoot,
   lookupTamaguiModules,
   lookupTranspileModules,
+  packageSubpathSourceAliases,
   resolveConfig,
+  resolveExportSource,
   workspaceSourceAliases,
 } from "./dev";
 
@@ -213,3 +215,160 @@ describe("workspaceSourceAliases", () => {
     );
   });
 });
+
+describe("packageSubpathSourceAliases", () => {
+  let pkgDir: string;
+
+  function touch(rel: string): string {
+    const file = path.join(pkgDir, rel);
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, "export {};\n");
+    return file;
+  }
+
+  beforeAll(() => {
+    pkgDir = fs.mkdtempSync(path.join(os.tmpdir(), "mpo-dev-subpaths-"));
+    touch("src/a.ts");
+    touch("src/b.tsx");
+    touch("dist/c.mjs");
+    touch("dist/d.mjs");
+    touch("src/e.mts");
+    touch("styles/f.css");
+    fs.mkdirSync(path.join(pkgDir, "src/icons"), { recursive: true });
+    fs.mkdirSync(path.join(pkgDir, "dist/assets"), { recursive: true });
+    fs.writeFileSync(path.join(pkgDir, "dist/assets/file"), "");
+  });
+
+  afterAll(() => {
+    fs.rmSync(pkgDir, { recursive: true, force: true });
+  });
+
+  it.each([undefined, null, "./index.js", ["./a"], 0])(
+    "returns no aliases for a non-object exports field (%s)",
+    (exportsField) => {
+      expect(packageSubpathSourceAliases("@x/p", pkgDir, exportsField)).toEqual({});
+    },
+  );
+
+  it("skips the root, package.json and keys that are not ./ subpaths", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        ".": "./src/a.ts",
+        "./package.json": "./package.json",
+        "#internal": "./src/a.ts",
+        import: "./src/a.ts",
+      }),
+    ).toEqual({});
+  });
+
+  it("aliases a file subpath to its source condition first", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./a": { source: "./src/a.ts", default: "./dist/c.mjs" },
+      }),
+    ).toEqual({ "@x/p/a": path.join(pkgDir, "src/a.ts") });
+  });
+
+  it("prefers a TypeScript file among the conditions over an earlier built one", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./b": { import: "./dist/c.mjs", default: "./src/b.tsx" },
+        "./e": ["./dist/d.mjs", "./src/e.mts"],
+      }),
+    ).toEqual({
+      "@x/p/b": path.join(pkgDir, "src/b.tsx"),
+      "@x/p/e": path.join(pkgDir, "src/e.mts"),
+    });
+  });
+
+  it("orders web conditions import, default, require and skips types and react-native", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./c": {
+          types: "./src/a.ts",
+          "react-native": "./src/b.tsx",
+          require: "./dist/d.mjs",
+          import: "./dist/c.mjs",
+        },
+      }),
+    ).toEqual({ "@x/p/c": path.join(pkgDir, "dist/c.mjs") });
+  });
+
+  it("falls back to the first existing file when none is TypeScript", () => {
+    expect(packageSubpathSourceAliases("@x/p", pkgDir, { "./f.css": "./styles/f.css" })).toEqual({
+      "@x/p/f.css": path.join(pkgDir, "styles/f.css"),
+    });
+  });
+
+  it("aliases a missing target to its declared runtime path, never a .d.ts", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./missing": { types: "./types/missing.d.ts", default: "./dist/missing.mjs" },
+        "./types-only": "./types/only.d.ts",
+      }),
+    ).toEqual({ "@x/p/missing": path.join(pkgDir, "dist/missing.mjs") });
+  });
+
+  it("aliases a ./dir/* pattern to its existing target directory", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./icons/*": { default: "./src/icons/*" },
+        "./assets/*": ["./dist/assets/*"],
+      }),
+    ).toEqual({
+      "@x/p/icons": path.join(pkgDir, "src/icons"),
+      "@x/p/assets": path.join(pkgDir, "dist/assets"),
+    });
+  });
+
+  it("skips patterns with a missing, non-directory or non-* target, or a nested star", () => {
+    expect(
+      packageSubpathSourceAliases("@x/p", pkgDir, {
+        "./gone/*": "./src/gone/*",
+        "./file/*": "./dist/assets/file/*",
+        "./flat/*": "./src/a.ts",
+        "./a/*/b/*": "./src/*",
+        "./mid*dle": "./src/a.ts",
+      }),
+    ).toEqual({});
+  });
+});
+
+describe("resolveExportSource", () => {
+  it("returns undefined when no candidate exists", () => {
+    expect(resolveExportSource(os.tmpdir(), { default: "./nope-mpo.ts" })).toBeUndefined();
+  });
+
+  it("ignores .d.ts candidates and null targets", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "mpo-dev-source-"));
+    fs.writeFileSync(path.join(dir, "x.d.ts"), "");
+    expect(resolveExportSource(dir, { types: null, default: "./x.d.ts" })).toBeUndefined();
+    fs.rmSync(dir, { recursive: true, force: true });
+  });
+});
+
+describe("resolveExportSource TypeScript preference", () => {
+  it.each(["x.ts", "x.tsx", "x.cts", "x.mts", "x.ctsx", "x.mtsx"])(
+    "prefers %s over an earlier built file",
+    (file) => {
+      const dir = fs.mkdtempSync(path.join(os.tmpdir(), "mpo-dev-ts-"));
+      fs.writeFileSync(path.join(dir, "x.js"), "");
+      fs.writeFileSync(path.join(dir, file), "");
+      expect(resolveExportSource(dir, ["./x.js", `./${file}`])).toBe(path.join(dir, file));
+      fs.rmSync(dir, { recursive: true, force: true });
+    },
+  );
+
+  it.each(["x.js", "x.xts", "x.ts.map", "x.jsx"])(
+    "keeps the first file when %s is last",
+    (file) => {
+      const dir = fs.mkdtempSync(path.join(os.tmpdir(), "mpo-dev-ts-"));
+      fs.writeFileSync(path.join(dir, "first.mjs"), "");
+      fs.writeFileSync(path.join(dir, file), "");
+      expect(resolveExportSource(dir, ["./first.mjs", `./${file}`])).toBe(
+        path.join(dir, "first.mjs"),
+      );
+      fs.rmSync(dir, { recursive: true, force: true });
+    },
+  );
+});

package/src/dev.ts

@@ -104,7 +104,7 @@ export type ExportTarget = string | null | ExportTarget[] | { [condition: string
 
 const webConditionOrder = ["import", "default", "require"];
 const skippedConditions = new Set(["types", "react-native"]);
-const tsSourcePattern = /\.(c|m)?tsx?$/;
+const tsSourcePattern = /\.[cm]?tsx?$/;
 
 function collectExportTargets(target: ExportTarget, out: string[]): void {
   if (typeof target === "string") {
@@ -153,6 +153,32 @@ function declaredExportTarget(pkgDir: string, target: ExportTarget): string | un
   return runtime ? path.resolve(pkgDir, runtime) : undefined;
 }
 
+function directoryPatternAlias(pkgDir: string, target: ExportTarget): string | undefined {
+  const targets: string[] = [];
+  collectExportTargets(target, targets);
+  const dirTarget = targets.find((t) => t.endsWith("/*"));
+  if (!dirTarget) return undefined;
+  const dir = path.resolve(pkgDir, dirTarget.slice(0, -2));
+  return fs.existsSync(dir) && fs.statSync(dir).isDirectory() ? dir : undefined;
+}
+
+function subpathAlias(
+  pkgDir: string,
+  key: string,
+  target: ExportTarget,
+): [string, string] | undefined {
+  if (key === "." || key === "./package.json" || !key.startsWith("./")) return undefined;
+  if (key.endsWith("/*")) {
+    const pattern = key.slice(2, -2);
+    if (pattern.includes("*")) return undefined;
+    const dir = directoryPatternAlias(pkgDir, target);
+    return dir ? [pattern, dir] : undefined;
+  }
+  if (key.includes("*")) return undefined;
+  const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
+  return file ? [key.slice(2), file] : undefined;
+}
+
 /**
  * Vite `resolve.alias` entries for one package's `exports` subpaths:
  * `<name>/<subpath>` → its source file, and a `./dir/*` pattern → the directory.
@@ -167,23 +193,8 @@ export function packageSubpathSourceAliases(
     return aliases;
   }
   for (const [key, target] of Object.entries(exportsField as Record<string, ExportTarget>)) {
-    if (key === "." || key === "./package.json" || !key.startsWith("./")) continue;
-    if (key.endsWith("/*")) {
-      const pattern = key.slice(2, -2);
-      if (pattern.includes("*")) continue;
-      const targets: string[] = [];
-      collectExportTargets(target, targets);
-      const dirTarget = targets.find((t) => t.endsWith("/*"));
-      if (!dirTarget) continue;
-      const dir = path.resolve(pkgDir, dirTarget.slice(0, -2));
-      if (fs.existsSync(dir) && fs.statSync(dir).isDirectory()) {
-        aliases[`${pkgName}/${pattern}`] = dir;
-      }
-      continue;
-    }
-    if (key.includes("*")) continue;
-    const file = resolveExportSource(pkgDir, target) ?? declaredExportTarget(pkgDir, target);
-    if (file) aliases[`${pkgName}/${key.slice(2)}`] = file;
+    const alias = subpathAlias(pkgDir, key, target);
+    if (alias) aliases[`${pkgName}/${alias[0]}`] = alias[1];
   }
   return aliases;
 }

package/types/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CACpC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,6BAAkC,SA0BnD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,2BAAgC,SA2BjD;AAED,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAQrF;AAGD,wBAAgB,iBAAiB,WAYhC;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,YAAY,EAAE,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,CAAC;AAyBlG;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS,CAO5F;AAeD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAyBxB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqDrF;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAiCvE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CASjD;AAED,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CACpC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,6BAAkC,SA0BnD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,2BAAgC,SA2BjD;AAED,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAQrF;AAGD,wBAAgB,iBAAiB,WAYhC;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,YAAY,EAAE,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,CAAC;AAyBlG;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS,CAO5F;AAyCD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUxB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqDrF;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAiCvE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CASjD;AAED,cAAc,QAAQ,CAAC"}