create-astrale-domain 0.2.11 → 0.2.13

package/dist/index.js

@@ -781,7 +781,7 @@ import { delimiter, join as join2, relative as relative2, resolve as resolve2 }
 
 // src/scaffold.ts
 import { existsSync, readFileSync } from "node:fs";
-import { cp, readFile, rm, writeFile } from "node:fs/promises";
+import { cp, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -857,6 +857,20 @@ function packageRoot(pkg) {
     entry.error === void 0 ? void 0 : { cause: entry.error }
   );
 }
+function installedPackageRange(pkg) {
+  const manifestPath = join(packageRoot(pkg), "package.json");
+  const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
+  if (typeof manifest.version !== "string") {
+    throw new Error(`Could not determine ${pkg}'s version from ${manifestPath}.`);
+  }
+  const match = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/.exec(
+    manifest.version
+  );
+  if (!match) {
+    throw new Error(`Could not derive a compatibility range for ${pkg}@${manifest.version}.`);
+  }
+  return `>=${manifest.version} <${Number(match[1]) + 1}.0.0`;
+}
 function templateDir(pkg) {
   return join(packageRoot(pkg), "template");
 }
@@ -886,16 +900,28 @@ async function writeProject(opts) {
       `/${relative(src, s)}`
     )
   });
+  await materializeGitignores(opts.dir);
   await materializeAdapter(opts);
   await stampOrigin(opts.dir, opts.origin);
   await rewritePackageJson(opts.dir, opts.name, opts.link);
   await rewriteWorkspaceMember(join(opts.dir, "client", "package.json"), opts.link);
-  if (!opts.link) await writeReleaseAgePolicy(opts.dir);
+  if (opts.link) await writeLinkedZodOverride(opts.dir);
+  else await writeReleaseAgePolicy(opts.dir);
   await writeFile(
     join(opts.dir, ".env.dev"),
     "# Dev secrets \u2014 the ENTIRE file is injected into the local runtime by `pnpm dev`.\n# Gitignored. See .env.example.\n"
   );
 }
+async function materializeGitignores(dir) {
+  for (const path of [join(dir, ".gitignore"), join(dir, "client", ".gitignore")]) {
+    const packagedPath = `${path}.template`;
+    if (existsSync(packagedPath)) {
+      await rename(packagedPath, path);
+    } else if (!existsSync(path)) {
+      throw new Error(`Template is missing packaged Git ignore file ${packagedPath}.`);
+    }
+  }
+}
 function assertSafeToDelete(dir) {
   const target = resolve(dir);
   const rel = relative(target, resolve(process.cwd()));
@@ -921,8 +947,12 @@ async function materializeAdapter(opts) {
 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];
+  if (!pkg.dependencies || !(from in pkg.dependencies)) {
+    throw new Error(
+      `Could not materialize ${to}: the scaffold body does not declare its ${from} dependency.`
+    );
+  }
+  const range = installedPackageRange(to);
   delete pkg.dependencies[from];
   pkg.dependencies[to] = range;
   pkg.dependencies = Object.fromEntries(
@@ -941,15 +971,6 @@ async function rewritePackageJson(dir, name, link) {
   const pkg = JSON.parse(await readFile(path, "utf-8"));
   pkg.name = name;
   rewriteAstraleDeps(pkg, link);
-  if (link) {
-    pkg.pnpm = {
-      ...pkg.pnpm,
-      overrides: {
-        ...pkg.pnpm?.overrides,
-        zod: sdkZodVersion()
-      }
-    };
-  }
   await writeFile(path, JSON.stringify(pkg, null, 2) + "\n");
 }
 function rewriteAstraleDeps(pkg, link) {
@@ -969,6 +990,21 @@ function rewriteAstraleDeps(pkg, link) {
   return changed;
 }
 var FIRST_PARTY_SCOPES = ["@astrale-domains/*", "@astrale-os/*"];
+async function writeLinkedZodOverride(dir) {
+  const workspace = join(dir, "pnpm-workspace.yaml");
+  if (!existsSync(workspace)) return;
+  const start = "# create-astrale-domain: linked overrides";
+  const end = "# /create-astrale-domain";
+  const block = `
+${start}
+overrides:
+  zod: ${sdkZodVersion()}
+${end}
+`;
+  const text = await readFile(workspace, "utf-8");
+  const pattern = new RegExp(`\\n?${escapeRegExp(start)}[\\s\\S]*?${escapeRegExp(end)}\\n?`);
+  await writeFile(workspace, text.replace(pattern, "\n").trimEnd() + block);
+}
 async function writeReleaseAgePolicy(dir) {
   const workspace = join(dir, "pnpm-workspace.yaml");
   if (!existsSync(workspace)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astrale-domain",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Scaffold a standalone Astrale domain — npm create astrale-domain",
   "keywords": [
     "astrale",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@clack/prompts": "^0.11.0",
     "@astrale-os/adapter-astrale": "^0.4.1",
-    "@astrale-os/adapter-cloudflare": "^0.4.9"
+    "@astrale-os/adapter-cloudflare": "^0.4.10"
   },
   "devDependencies": {
     "@astrale-os/ox": ">=0.1.0 <1.0.0",