create-astrale-domain 0.1.5 → 0.1.6

package/dist/index.js

@@ -792,22 +792,22 @@ var ORIGIN_PLACEHOLDER = "astrale-domain.example.dev";
 var INSTANCE_PLACEHOLDER = "my-instance-slug";
 var LINK_TARGETS = {
   "@astrale-os/sdk": "sdk",
-  "@astrale-os/devkit": "sdk/devkit",
   "@astrale-os/adapter-cloudflare": "sdk/adapter-cloudflare",
+  "@astrale-os/adapter-astrale": "sdk/adapter-astrale",
   "@astrale-os/kernel-core": "kernel/core",
   "@astrale-os/kernel-dsl": "kernel/dsl"
 };
+var BODY_PACKAGE = "@astrale-os/adapter-cloudflare";
 var ADAPTER_PACKAGES = {
-  astrale: "@astrale-os/adapter-cloudflare",
+  astrale: "@astrale-os/adapter-astrale",
   cloudflare: "@astrale-os/adapter-cloudflare"
 };
-function templateDir(adapter) {
-  const pkg = ADAPTER_PACKAGES[adapter];
-  if (!pkg) throw new Error(`No template package registered for adapter "${adapter}".`);
+var ADAPTER_DEP_RANGE = ">=0.1.0 <1.0.0";
+function templateDir(pkg) {
   return join(dirname(require2.resolve(`${pkg}/package.json`)), "template");
 }
 async function scaffold(opts) {
-  const src = templateDir(opts.adapter);
+  const src = templateDir(BODY_PACKAGE);
   if (!existsSync(src)) {
     throw new Error(`Template not found at ${src}.`);
   }
@@ -819,8 +819,8 @@ async function scaffold(opts) {
     recursive: true,
     filter: (s) => !/\/(node_modules|\.astrale|dist-client|\.wrangler)(\/|$)/.test(`/${relative(src, s)}`)
   });
+  await materializeAdapter(opts);
   await stampOrigin(opts.dir, opts.origin);
-  await stampAdapter(opts);
   await rewritePackageJson(opts.dir, opts.name, opts.link);
   await writeFile(
     join(opts.dir, ".env.dev"),
@@ -843,32 +843,23 @@ async function stampOrigin(dir, origin) {
   const config = join(dir, "astrale.config.ts");
   await replaceInFile(config, ORIGIN_PLACEHOLDER, origin);
 }
-async function stampAdapter(opts) {
+async function materializeAdapter(opts) {
+  if (opts.adapter !== "astrale") return;
   const config = join(opts.dir, "astrale.config.ts");
-  if (opts.adapter === "astrale") {
-    if (opts.instance)
-      await replaceInFile(config, `'${INSTANCE_PLACEHOLDER}'`, `'${opts.instance}'`);
-    return;
-  }
-  await replaceInFile(
-    config,
-    "import { astrale } from '@astrale-os/adapter-cloudflare'",
-    "import { cloudflare } from '@astrale-os/adapter-cloudflare'"
-  );
-  await replaceInFile(config, "adapter: astrale({", "adapter: cloudflare({");
-  await replaceInFile(
-    config,
-    /\n    \/\/ Managed deploy:[\s\S]*?prod: \{ instance: '[^']*' \},\n    \/\/ Author secrets[\s\S]*?omit = keep, `\{\}` = clear\)\.\n/,
-    `
-    // Custom-domain prod. Drop \`route\` to ship to *.workers.dev instead.
-    prod: { route: '${opts.origin}', secrets: '.env.prod' },
-`
-  );
-  await replaceInFile(
-    config,
-    /\/\/ Have your own Cloudflare account[\s\S]*?\/\/   \}\),\n/,
-    "// No Cloudflare account? Swap the adapter for the Astrale-managed one \u2014 it\n// publishes the same bundle THROUGH the platform and installs it on your\n// instance as a managed service (auth = your `astrale auth login` session):\n//\n//   import { astrale } from '@astrale-os/adapter-cloudflare'\n//   adapter: astrale({\n//     dev: { secrets: '.env.dev' },              // local wrangler dev, unchanged\n//     prod: { instance: '<your-instance-slug>' } // pnpm prod \u2192 managed deploy\n//   }),\n"
+  await cp(join(templateDir(ADAPTER_PACKAGES.astrale), "astrale.config.ts"), config);
+  await setAdapterDep(opts.dir, "@astrale-os/adapter-cloudflare", "@astrale-os/adapter-astrale");
+  if (opts.instance) await replaceInFile(config, `'${INSTANCE_PLACEHOLDER}'`, `'${opts.instance}'`);
+}
+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;
+  delete pkg.dependencies[from];
+  pkg.dependencies[to] = ADAPTER_DEP_RANGE;
+  pkg.dependencies = Object.fromEntries(
+    Object.entries(pkg.dependencies).sort(([a], [b3]) => a.localeCompare(b3))
   );
+  await writeFile(path, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function rewritePackageJson(dir, name, link) {
   const path = join(dir, "package.json");
@@ -907,18 +898,53 @@ export {}
     `import { defineSchema, KernelSchema } from '@astrale-os/kernel-core'
 
 export const schema = defineSchema('${origin}', {
+  interfaces: {},
+  classes: {},
   imports: [KernelSchema],
 })
 `
   );
   await writeFile(
-    join(dir, "methods", "index.ts"),
+    join(dir, "env.ts"),
+    `/**
+ * Worker runtime env. The adapter injects \`WORKER_URL\` and the bindings; your
+ * handlers receive this (mapped by deps.ts) as \`ctx.deps\`. Secrets from
+ * \`.env.<env>\` arrive as extra string fields here. Add typed fields as you
+ * reference new secrets/vars.
+ */
+export interface Env {
+  WORKER_URL?: string
+  ASSETS?: { fetch(request: Request): Promise<Response> }
+  SELF?: { fetch(request: Request): Promise<Response> }
+  VIEW_DEV_URL?: string
+  [key: string]: unknown
+}
+`
+  );
+  await writeFile(
+    join(dir, "deps.ts"),
+    `/**
+ * env \u2192 handler dependency container (the seam \`defineDomain({ deps })\` mounts).
+ * Passthrough by default; transform here the moment a handler should depend on a
+ * PORT (built from \`integrations/\`) instead of raw env.
+ */
+import type { Env } from './env'
+
+export interface Deps extends Env {}
+
+export function deps(env: Env): Deps {
+  return env
+}
+`
+  );
+  await writeFile(
+    join(dir, "runtime", "index.ts"),
     `import type { SchemaMethodsImpl } from '@astrale-os/sdk'
 
-import type { Env } from '../env'
+import type { Deps } from '../deps'
 import { schema } from '../schema'
 
-export const methods: SchemaMethodsImpl<typeof schema, Env> = {}
+export const methods: SchemaMethodsImpl<typeof schema, Deps> = { class: {} }
 `
   );
   await writeFile(join(dir, "functions", "index.ts"), `export const functions = {}
@@ -926,12 +952,12 @@ export const methods: SchemaMethodsImpl<typeof schema, Env> = {}
   await writeFile(join(dir, "views", "index.ts"), `export const views = {}
 `);
   await rm(join(dir, "schema", "compiled.ts"), { force: true });
-  await rm(join(dir, "methods", "note.ts"), { force: true });
-  await rm(join(dir, "functions", "seed.ts"), { force: true });
+  await rm(join(dir, "core"), { recursive: true, force: true });
+  await rm(join(dir, "integrations"), { recursive: true, force: true });
   await rm(join(dir, "views", "welcome.ts"), { force: true });
   await rm(join(dir, "views", "note.ts"), { force: true });
   await replaceInFile(
-    join(dir, "astrale.config.ts"),
+    join(dir, "domain.ts"),
     /\n\s*postInstall: `\/:\$\{schema\.domain\}:class\.Note:seed`,/,
     ""
   );
@@ -943,7 +969,7 @@ async function replaceInFile(path, from, to) {
   if (next !== text) await writeFile(path, next);
 }
 function workspaceAvailable() {
-  return existsSync(join(WORKSPACE_ROOT, "sdk", "devkit", "package.json"));
+  return existsSync(join(WORKSPACE_ROOT, "sdk", "package.json"));
 }
 
 // src/index.ts
@@ -1132,10 +1158,10 @@ var prodStep = (pm, adapter, instance) => {
   return `${cmd}                         ${hint}`;
 };
 function installStep(pm) {
-  if (astraleOnPath()) return "astrale instance install <url>    # mount it on an instance";
+  if (astraleOnPath()) return "astrale domain install <url> --direct    # mount it on an instance";
   return [
     "# astrale CLI not found on PATH \u2014 run it on demand (no install):",
-    `${DLX[pm]} @astrale-os/astrale instance install <url>`,
+    `${DLX[pm]} @astrale-os/astrale domain install <url> --direct`,
     "# or install it globally: npm i -g @astrale-os/astrale"
   ].join("\n");
 }

package/package.json

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