create-astrale-domain 0.2.3 → 0.2.6

package/dist/index.js

@@ -25,9 +25,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js
+// ../node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
-  "../../node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js"(exports, module) {
+  "../node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js"(exports, module) {
     "use strict";
     var ESC = "\x1B";
     var CSI = `${ESC}[`;
@@ -81,9 +81,9 @@ var require_src = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
+// ../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
-  "../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js"(exports, module) {
+  "../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js"(exports, module) {
     var p2 = process || {};
     var argv = p2.argv || [];
     var env = p2.env || {};
@@ -153,10 +153,10 @@ var require_picocolors = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@clack+prompts@0.11.0/node_modules/@clack/prompts/dist/index.mjs
+// ../node_modules/.pnpm/@clack+prompts@0.11.0/node_modules/@clack/prompts/dist/index.mjs
 import { stripVTControlCharacters as S2 } from "node:util";
 
-// ../../node_modules/.pnpm/@clack+core@0.5.0/node_modules/@clack/core/dist/index.mjs
+// ../node_modules/.pnpm/@clack+core@0.5.0/node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
 var import_picocolors = __toESM(require_picocolors(), 1);
 import { stdin as j, stdout as M } from "node:process";
@@ -548,7 +548,7 @@ var RD = class extends x {
   }
 };
 
-// ../../node_modules/.pnpm/@clack+prompts@0.11.0/node_modules/@clack/prompts/dist/index.mjs
+// ../node_modules/.pnpm/@clack+prompts@0.11.0/node_modules/@clack/prompts/dist/index.mjs
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 var import_sisteransi2 = __toESM(require_src(), 1);
 import y2 from "node:process";
@@ -804,47 +804,73 @@ var ADAPTER_PACKAGES = {
   astrale: "@astrale-os/adapter-astrale",
   cloudflare: "@astrale-os/adapter-cloudflare"
 };
-function packageJson(pkgName) {
-  const rel = LINK_TARGETS[pkgName];
-  if (rel) {
-    const local = join(WORKSPACE_ROOT, rel, "package.json");
-    if (existsSync(local)) return JSON.parse(readFileSync(local, "utf-8"));
-  }
-  const direct = tryPackageJson(require2, pkgName);
-  if (direct) return direct;
-  for (const owner of /* @__PURE__ */ new Set([BODY_PACKAGE, ...Object.values(ADAPTER_PACKAGES)])) {
-    const ownerPkgPath = tryResolve(`${owner}/package.json`);
-    if (!ownerPkgPath) continue;
-    const ownerRequire = createRequire(ownerPkgPath);
-    const nested = tryPackageJson(ownerRequire, pkgName);
-    if (nested) return nested;
-  }
-  throw new Error(`Could not read ${pkgName} package.json.`);
-}
-function tryResolve(id) {
+function resolveModule(id) {
   try {
-    return require2.resolve(id);
-  } catch {
-    return void 0;
+    return { path: require2.resolve(id) };
+  } catch (error) {
+    return { error };
   }
 }
-function tryPackageJson(req, pkgName) {
-  try {
-    return req(`${pkgName}/package.json`);
-  } catch {
-    return void 0;
+function errorText(err) {
+  if (err instanceof Error) return err.message;
+  return err === void 0 ? "" : String(err);
+}
+function errorReport(err) {
+  if (!(err instanceof Error)) return String(err);
+  const cause = err.cause;
+  if (cause !== void 0) {
+    const causeText = cause instanceof Error ? cause.message : String(cause);
+    if (causeText && !err.message.includes(causeText)) {
+      return `${err.message}
+   \u21B3 caused by: ${causeText}`;
+    }
   }
+  return err.message;
 }
-function publishedDepVersion(pkgName) {
-  const pkg = packageJson(pkgName);
-  const version = pkg.version;
-  if (!version) throw new Error(`Could not read ${pkgName} package version.`);
-  return version;
+function packageRoot(pkg) {
+  const direct = resolveModule(`${pkg}/package.json`);
+  if ("path" in direct) return dirname(direct.path);
+  const entry = resolveModule(pkg);
+  if ("path" in entry) {
+    let dir = dirname(entry.path);
+    for (; ; ) {
+      const candidate = join(dir, "package.json");
+      if (existsSync(candidate)) {
+        try {
+          const parsed = JSON.parse(readFileSync(candidate, "utf-8"));
+          if (parsed.name === pkg) return dir;
+        } catch {
+        }
+      }
+      const parent = dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+    throw new Error(
+      `Could not locate the ${pkg} package.json (its entry resolved at ${entry.path}, but no ancestor package.json declares "name": "${pkg}").`
+    );
+  }
+  const reason = errorText(entry.error);
+  throw new Error(
+    `Could not locate the ${pkg} package \u2014 is it installed? (run your package manager's install)` + (reason ? ` The module resolver failed: ${reason}` : ""),
+    entry.error === void 0 ? void 0 : { cause: entry.error }
+  );
 }
 function templateDir(pkg) {
-  return join(dirname(require2.resolve(`${pkg}/package.json`)), "template");
+  return join(packageRoot(pkg), "template");
 }
 async function scaffold(opts) {
+  const preExisting = existsSync(opts.dir);
+  try {
+    await writeProject(opts);
+  } catch (err) {
+    if (!preExisting && existsSync(opts.dir)) {
+      await rm(opts.dir, { recursive: true, force: true });
+    }
+    throw err;
+  }
+}
+async function writeProject(opts) {
   const src = templateDir(BODY_PACKAGE);
   if (!existsSync(src)) {
     throw new Error(`Template not found at ${src}.`);
@@ -855,7 +881,7 @@ async function scaffold(opts) {
   }
   await cp(src, opts.dir, {
     recursive: true,
-    filter: (s) => !/\/(node_modules|\.astrale|\.dist|\.domain-studio|dist-client|\.wrangler|pnpm-lock\.yaml|\.DS_Store)(\/|$)/.test(
+    filter: (s) => !/\/(node_modules|\.agents|\.astrale|\.dist|\.domain-studio|dist-client|\.wrangler|pnpm-lock\.yaml|\.DS_Store)(\/|$)/.test(
       `/${relative(src, s)}`
     )
   });
@@ -895,8 +921,9 @@ async function setAdapterDep(dir, from, to) {
   const path = join(dir, "package.json");
   const pkg = JSON.parse(await readFile(path, "utf-8"));
   if (!pkg.dependencies || !(from in pkg.dependencies)) return;
+  const range = pkg.dependencies[from];
   delete pkg.dependencies[from];
-  pkg.dependencies[to] = publishedDepVersion(to);
+  pkg.dependencies[to] = range;
   pkg.dependencies = Object.fromEntries(
     Object.entries(pkg.dependencies).sort(([a], [b3]) => a.localeCompare(b3))
   );
@@ -925,12 +952,13 @@ async function rewritePackageJson(dir, name, link) {
   await writeFile(path, JSON.stringify(pkg, null, 2) + "\n");
 }
 function rewriteAstraleDeps(pkg, link) {
+  if (!link) return false;
   let changed = false;
   for (const group of [pkg.dependencies, pkg.devDependencies]) {
     if (!group) continue;
     for (const dep of Object.keys(group)) {
-      if (!dep.startsWith("@astrale-os/")) continue;
-      const next = link && LINK_TARGETS[dep] ? `link:${join(WORKSPACE_ROOT, LINK_TARGETS[dep])}` : publishedDepVersion(dep);
+      if (!dep.startsWith("@astrale-os/") || !LINK_TARGETS[dep]) continue;
+      const next = `link:${join(WORKSPACE_ROOT, LINK_TARGETS[dep])}`;
       if (group[dep] !== next) {
         group[dep] = next;
         changed = true;
@@ -1111,7 +1139,7 @@ async function main() {
     s.stop(`Created ${dir}`);
   } catch (err) {
     s.stop("Scaffold failed");
-    xe(err.message);
+    xe(errorReport(err));
     return 1;
   }
   if (link) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astrale-domain",
-  "version": "0.2.3",
+  "version": "0.2.6",
   "description": "Scaffold a standalone Astrale domain — npm create astrale-domain",
   "keywords": [
     "astrale",
@@ -19,8 +19,8 @@
   "type": "module",
   "dependencies": {
     "@clack/prompts": "^0.11.0",
-    "@astrale-os/adapter-astrale": "^0.3.0",
-    "@astrale-os/adapter-cloudflare": "^0.3.2"
+    "@astrale-os/adapter-astrale": "^0.4.0",
+    "@astrale-os/adapter-cloudflare": "^0.4.3"
   },
   "devDependencies": {
     "@astrale-os/ox": ">=0.1.0 <1.0.0",