appos 0.3.19-0 → 0.3.20-0

package/dist/exports/cli/index.mjs

@@ -17,10 +17,11 @@ import { createRequire, register } from "node:module";
 import path, { basename, dirname, join, resolve } from "node:path";
 import fs, { existsSync } from "node:fs";
 import { DBOS } from "@dbos-inc/dbos-sdk";
-import fs$1, { access, cp, glob, mkdir, readFile, readdir, realpath, rm, writeFile } from "node:fs/promises";
+import fs$1, { access, cp, glob, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { isIP, isIPv6 } from "node:net";
 import net, { isIP as isIP$1 } from "net";
+import { fileURLToPath } from "node:url";
 import Stream, { PassThrough, Readable, Writable, pipeline } from "stream";
 import { spawn } from "node:child_process";
 import { stripVTControlCharacters } from "node:util";
@@ -35,7 +36,7 @@ import tty from "tty";
 import crypto2, { createHash as createHash$1, createHmac, createPrivateKey, createPublicKey, randomUUID, sign } from "crypto";
 import fs4, { ReadStream, existsSync as existsSync$1, fstatSync, lstatSync, mkdirSync, promises, readFileSync, readdirSync as readdirSync$1, writeFileSync } from "fs";
 import path2, { dirname as dirname$1, join as join$1, resolve as resolve$1, sep } from "path";
-import { fileURLToPath, format, parse } from "url";
+import { fileURLToPath as fileURLToPath$1, format, parse } from "url";
 import { deprecate, promisify as promisify$1, types } from "util";
 import { Buffer as Buffer$1 } from "buffer";
 import http, { Agent, createServer, request } from "http";
@@ -1475,6 +1476,7 @@ function defineCommand(def) {
 * Runtime externals - needed in production Docker.
 */
 const RUNTIME_EXACT = [
+	"appos",
 	"canvas",
 	"pino",
 	"react",
@@ -1580,95 +1582,99 @@ async function collectEntryPoints() {
 	return entryPoints;
 }
 /**
+* Prefixes of packages to skip when collecting runtime dependencies.
+*/
+const SKIP_PREFIXES = [
+	"@babel",
+	"@esbuild",
+	"@rollup",
+	"@tailwindcss",
+	"@types",
+	"biome",
+	"esbuild",
+	"prettier",
+	"rollup",
+	"tailwindcss",
+	"vite"
+];
+/**
 * Collect runtime dependencies to build/node_modules/.
 *
 * Algorithm:
-* 1. Find node_modules by traversing up from cwd
+* 1. Use import.meta.resolve() to find packages (works with all package managers)
 * 2. Copy RUNTIME externals and their transitive dependencies
 * 3. Prune platform-specific binaries for current arch
 */
 async function collectRuntimeDeps() {
-	let nodeModules = "";
-	let dir = process.cwd();
-	while (dir !== "/") {
-		const candidate = join(dir, "node_modules");
-		if (existsSync(join(candidate, ".bun"))) {
-			nodeModules = candidate;
-			break;
-		}
-		dir = dirname(dir);
-	}
-	if (!nodeModules) throw new Error("Could not find workspace root node_modules");
 	const targetDir = join(process.cwd(), BUILD_DIR, "node_modules");
 	const collected = /* @__PURE__ */ new Set();
 	/**
-	* Collect a package and its transitive dependencies.
+	* Find package.json path for a package using Node.js resolution.
 	*
 	* Algorithm:
-	* 1. If parentNodeModules provided, resolve version via symlink there (bun's resolution)
-	* 2. Otherwise, try direct path or search in .bun/ for any version
-	* 3. Copy package to target and recursively collect dependencies
+	* 1. Try resolving package/package.json directly (works for most packages)
+	* 2. If not found or path doesn't end with package.json (wildcard export issue),
+	*    resolve any export and walk up to find package.json
+	* 3. For packages without root export, try common subpaths (api, cli, web)
 	*/
-	async function collectPackage(name, parentNodeModules) {
-		if (collected.has(name) || [
-			"@babel",
-			"biome",
-			"esbuild",
-			"prettier",
-			"rollup",
-			"vite"
-		].find((p$3) => name.startsWith(p$3)) !== void 0) return;
-		collected.add(name);
-		let pkgDir = "";
-		if (parentNodeModules) {
-			const localDep = join(parentNodeModules, name);
-			if (existsSync(localDep)) pkgDir = await realpath(localDep);
-		}
-		if (!pkgDir) {
-			const directPath = join(nodeModules, name);
-			if (existsSync(directPath)) pkgDir = await realpath(directPath);
-		}
-		if (!pkgDir) {
-			const bunDir = join(nodeModules, ".bun");
-			const prefix = name.startsWith("@") ? name.replace("/", "+") : name;
-			for (const entry of await readdir(bunDir)) if (entry.startsWith(`${prefix}@`)) {
-				const candidate = join(bunDir, entry, "node_modules", name);
+	async function findPackageJson(name) {
+		try {
+			const pkgPath = fileURLToPath(import.meta.resolve(`${name}/package.json`));
+			if (pkgPath.endsWith("package.json") && existsSync(pkgPath)) return pkgPath;
+		} catch {}
+		for (const subpath of [
+			"",
+			"/api",
+			"/cli",
+			"/web",
+			"/index"
+		]) try {
+			let dir = dirname(fileURLToPath(import.meta.resolve(`${name}${subpath}`)));
+			while (dir !== "/" && !dir.endsWith("node_modules")) {
+				const candidate = join(dir, "package.json");
 				if (existsSync(candidate)) {
-					pkgDir = candidate;
-					break;
+					if (JSON.parse(await readFile(candidate, "utf8")).name === name) return candidate;
 				}
+				dir = dirname(dir);
 			}
-		}
-		if (!pkgDir || !existsSync(pkgDir)) return;
-		const pkgJson = JSON.parse(await readFile(join(pkgDir, "package.json"), "utf8"));
+		} catch {}
+		return null;
+	}
+	/**
+	* Collect a package and its transitive dependencies using Node.js native resolution.
+	*
+	* Algorithm:
+	* 1. Find package.json using Node.js resolution (works with npm/yarn/pnpm/bun)
+	* 2. Copy package directory to target
+	* 3. Recursively collect dependencies and non-optional peerDependencies
+	*/
+	async function collectPackage(name) {
+		if (collected.has(name) || SKIP_PREFIXES.some((p$3) => name.startsWith(p$3))) return;
+		collected.add(name);
+		const pkgPath = await findPackageJson(name);
+		if (!pkgPath) return;
+		const pkgDir = dirname(pkgPath);
+		const pkgJson = JSON.parse(await readFile(pkgPath, "utf8"));
 		const destDir = join(targetDir, name);
 		await mkdir(dirname(destDir), { recursive: true });
 		await cp(pkgDir, destDir, {
 			recursive: true,
 			dereference: true
 		});
-		const pkgNodeModules = dirname(pkgDir);
-		for (const dep of Object.keys(pkgJson.dependencies || {})) await collectPackage(dep, pkgNodeModules);
-		const peerMeta = pkgJson.peerDependenciesMeta || {};
-		for (const dep of Object.keys(pkgJson.peerDependencies || {})) if (!peerMeta[dep]?.optional) await collectPackage(dep, pkgNodeModules);
-	}
-	async function collectScopedPackages(prefix) {
-		const scope = prefix.slice(0, -1);
-		const scopeDir = join(nodeModules, scope);
-		if (existsSync(scopeDir)) {
-			for (const pkg of await readdir(scopeDir)) await collectPackage(`${scope}/${pkg}`);
+		if (name === "appos") {
+			for (const dep of Object.keys(pkgJson.dependencies || {})) {
+				const isRuntimeExact = RUNTIME_EXACT.includes(dep);
+				const isRuntimePrefix = RUNTIME_PREFIXES.some((p$3) => dep.startsWith(p$3));
+				if (isRuntimeExact || isRuntimePrefix) await collectPackage(dep);
+			}
 			return;
 		}
-		const bunDir = join(nodeModules, ".bun");
-		const bunPrefix = scope.replace("@", "@").replace("/", "+");
-		for (const entry of await readdir(bunDir)) if (entry.startsWith(`${bunPrefix}+`)) {
-			const match$1 = entry.match(/^(@[^+]+)\+([^@]+)@/);
-			if (match$1) await collectPackage(`${match$1[1]}/${match$1[2]}`);
-		}
+		for (const dep of Object.keys(pkgJson.dependencies || {})) await collectPackage(dep);
+		const peerMeta = pkgJson.peerDependenciesMeta || {};
+		for (const dep of Object.keys(pkgJson.peerDependencies || {})) if (!peerMeta[dep]?.optional) await collectPackage(dep);
 	}
 	await mkdir(targetDir, { recursive: true });
 	for (const pkg of RUNTIME_EXACT) await collectPackage(pkg);
-	for (const prefix of RUNTIME_PREFIXES) await collectScopedPackages(prefix);
 	const arch$1 = process.arch === "x64" ? "x64" : process.arch;
 	const platform$1 = process.platform;
 	const nodeAbi = process.versions.modules;
@@ -1707,7 +1713,7 @@ var build_default = defineCommand({
 		const entryPoints = await collectEntryPoints();
 		const outdir = `./${BUILD_DIR}`;
 		ctx.step(`Found ${entryPoints.length} entry points`);
-		await ctx.spinner("Building production bundle", async () => {
+		await ctx.spinner("Building API production bundle", async () => {
 			if (!hasWebDir) await rm(outdir, {
 				recursive: true,
 				force: true
@@ -1730,7 +1736,7 @@ var build_default = defineCommand({
 			});
 			await cp(`./${APPOS_DIR}/${DATABASES_DIR}`, `${outdir}/${APPOS_DIR}/${DATABASES_DIR}`, { recursive: true });
 		});
-		ctx.success("Built API successfully");
+		ctx.success("Built API production bundle successfully");
 		const count = await ctx.spinner("Collecting runtime dependencies", collectRuntimeDeps);
 		ctx.success(`Collected ${count} runtime packages to "${outdir}/node_modules"`);
 		await ctx.cleanup();
@@ -26682,7 +26688,7 @@ var require_old = __commonJS({ "../node_modules/.pnpm/fs.realpath@1.0.0/node_mod
 		if (cache6) cache6[original] = p6;
 		return p6;
 	};
-	exports2.realpath = function realpath$1(p6, cache6, cb) {
+	exports2.realpath = function realpath(p6, cache6, cb) {
 		if (typeof cb !== "function") {
 			cb = maybeCallback(cache6);
 			cache6 = null;
@@ -26756,12 +26762,12 @@ var require_old = __commonJS({ "../node_modules/.pnpm/fs.realpath@1.0.0/node_mod
 } });
 var require_fs = __commonJS({ "../node_modules/.pnpm/fs.realpath@1.0.0/node_modules/fs.realpath/index.js"(exports2, module$1) {
 	"use strict";
-	module$1.exports = realpath$1;
-	realpath$1.realpath = realpath$1;
-	realpath$1.sync = realpathSync;
-	realpath$1.realpathSync = realpathSync;
-	realpath$1.monkeypatch = monkeypatch;
-	realpath$1.unmonkeypatch = unmonkeypatch;
+	module$1.exports = realpath;
+	realpath.realpath = realpath;
+	realpath.sync = realpathSync;
+	realpath.realpathSync = realpathSync;
+	realpath.monkeypatch = monkeypatch;
+	realpath.unmonkeypatch = unmonkeypatch;
 	var fs11 = __require("fs");
 	var origRealpath = fs11.realpath;
 	var origRealpathSync = fs11.realpathSync;
@@ -26771,7 +26777,7 @@ var require_fs = __commonJS({ "../node_modules/.pnpm/fs.realpath@1.0.0/node_modu
 	function newError(er$1) {
 		return er$1 && er$1.syscall === "realpath" && (er$1.code === "ELOOP" || er$1.code === "ENOMEM" || er$1.code === "ENAMETOOLONG");
 	}
-	function realpath$1(p6, cache6, cb) {
+	function realpath(p6, cache6, cb) {
 		if (ok) return origRealpath(p6, cache6, cb);
 		if (typeof cache6 === "function") {
 			cb = cache6;
@@ -26792,7 +26798,7 @@ var require_fs = __commonJS({ "../node_modules/.pnpm/fs.realpath@1.0.0/node_modu
 		}
 	}
 	function monkeypatch() {
-		fs11.realpath = realpath$1;
+		fs11.realpath = realpath;
 		fs11.realpathSync = realpathSync;
 	}
 	function unmonkeypatch() {
@@ -102303,7 +102309,7 @@ var init_open = __esm({ "../node_modules/.pnpm/open@10.2.0/node_modules/open/ind
 	init_default_browser();
 	init_is_inside_container();
 	execFile5 = promisify$1(childProcess$1.execFile);
-	__dirname2 = path2.dirname(fileURLToPath(import.meta.url));
+	__dirname2 = path2.dirname(fileURLToPath$1(import.meta.url));
 	localXdgOpenPath = path2.join(__dirname2, "xdg-open");
 	({platform: platform2, arch} = process2);
 	pTryEach = async (array2, mapper) => {
@@ -147021,7 +147027,7 @@ var preview_default = defineCommand({
 
 //#endregion
 //#region package.json
-var version = "0.3.19-0";
+var version = "0.3.20-0";
 
 //#endregion
 //#region src/cli/commands/repl.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appos",
-	"version": "0.3.19-0",
+	"version": "0.3.20-0",
 	"type": "module",
 	"scripts": {
 		"release": "release-it",