create-astrale-domain 0.2.5 → 0.2.7

package/dist/index.js

@@ -804,19 +804,35 @@ var ADAPTER_PACKAGES = {
   astrale: "@astrale-os/adapter-astrale",
   cloudflare: "@astrale-os/adapter-cloudflare"
 };
-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 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 packageRoot(pkg) {
-  const direct = tryResolve(`${pkg}/package.json`);
-  if (direct) return dirname(direct);
-  const entry = tryResolve(pkg);
-  if (entry) {
-    let dir = dirname(entry);
+  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)) {
@@ -830,13 +846,31 @@ function packageRoot(pkg) {
       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}").`
+    );
   }
-  throw new Error(`Could not locate the ${pkg} package.`);
+  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(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}.`);
@@ -933,26 +967,16 @@ function rewriteAstraleDeps(pkg, link) {
   }
   return changed;
 }
+var FIRST_PARTY_SCOPES = ["@astrale-domains/*", "@astrale-os/*"];
 async function writeReleaseAgePolicy(dir) {
   const workspace = join(dir, "pnpm-workspace.yaml");
   if (!existsSync(workspace)) return;
-  const names = /* @__PURE__ */ new Set();
-  for (const pkgPath of [join(dir, "package.json"), join(dir, "client", "package.json")]) {
-    if (!existsSync(pkgPath)) continue;
-    const pkg = JSON.parse(await readFile(pkgPath, "utf-8"));
-    for (const group of [pkg.dependencies, pkg.devDependencies]) {
-      for (const [name, spec] of Object.entries(group ?? {})) {
-        if (name.startsWith("@astrale-os/") && !spec.startsWith("link:")) names.add(name);
-      }
-    }
-  }
-  if (names.size === 0) return;
-  const start = "# create-astrale-domain: exact first-party deps";
+  const start = "# create-astrale-domain: first-party scopes";
   const end = "# /create-astrale-domain";
   const block = `
 ${start}
 minimumReleaseAgeExclude:
-` + [...names].sort().map((name) => `  - '${name}'`).join("\n") + `
+` + FIRST_PARTY_SCOPES.map((scope) => `  - '${scope}'`).join("\n") + `
 ${end}
 `;
   const text = await readFile(workspace, "utf-8");
@@ -1105,7 +1129,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.5",
+  "version": "0.2.7",
   "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-cloudflare": "^0.4.2",
-    "@astrale-os/adapter-astrale": "^0.4.0"
+    "@astrale-os/adapter-astrale": "^0.4.0",
+    "@astrale-os/adapter-cloudflare": "^0.4.4"
   },
   "devDependencies": {
     "@astrale-os/ox": ">=0.1.0 <1.0.0",