@stacksjs/buddy 0.70.248 → 0.70.250

package/dist/commands/publish.js

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync } from "node:fs";
 import { cp, readdir, stat } from "node:fs/promises";
-import { dirname, resolve } from "node:path";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
 import process from "node:process";
 import { italic, log, onUnknownSubcommand } from "@stacksjs/cli";
 import { path } from "@stacksjs/path";
@@ -16,6 +17,9 @@ export function publish(buddy) {
     core: "Publish a framework package source from node_modules/@stacksjs/<pkg>/ into storage/framework/core/<pkg>/ for editing",
     unpublishCore: "Drop a vendored storage/framework/core/<pkg>/ and go back to the installed @stacksjs/<pkg>",
     all: "Unvendor the whole framework: remove storage/framework/core and resolve every @stacksjs package from the `stacks` dependency in package.json",
+    publishAll: "Vendor the whole framework: copy storage/framework/core out of a local Stacks checkout and wire it up as a Bun workspace",
+    frameworkPath: "The Stacks checkout to vendor from (defaults to $STACKS_FRAMEWORK_PATH, ../stacks, then ~/Code/stacks)",
+    coreStatus: "Report whether this project runs on a vendored storage/framework/core or on the published packages",
     name: "The name of the resource to publish (e.g. Cart, User)",
     pkg: "The name of the framework package (e.g. router, orm, faker \u2014 without @stacksjs/ prefix)",
     force: "Overwrite an existing userland file",
@@ -58,9 +62,20 @@ export function publish(buddy) {
       force: !!options.force
     });
   });
-  buddy.command("publish:core <pkg>", descriptions.core).option("--force", descriptions.force, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (pkg, options) => {
+  buddy.command("publish:core [pkg]", descriptions.core).option("--all", descriptions.publishAll, { default: !1 }).option("--path <path>", descriptions.frameworkPath).option("--force", descriptions.force, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).example("buddy publish:core router").example("buddy publish:core --all").example("buddy publish:core --all --path ../stacks").action(async (pkg, options) => {
+    if (options.all) {
+      await vendorFramework(options.path, !!options.force);
+      return;
+    }
+    if (!pkg) {
+      log.error("Usage: buddy publish:core <pkg>   (or --all to vendor the whole framework as a workspace)");
+      process.exit(ExitCode.FatalError);
+    }
     await publishCorePackage(pkg, !!options.force);
   });
+  buddy.command("core:status", descriptions.coreStatus).alias("publish:core:status").option("--verbose", descriptions.verbose, { default: !1 }).example("buddy core:status").action(async () => {
+    await reportCoreStatus();
+  });
   buddy.command("unpublish:core [pkg]", descriptions.unpublishCore).option("--all", descriptions.all, { default: !1 }).option("--force", descriptions.forceUnpublish, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (pkg, options) => {
     if (options.all) {
       await unvendorFramework(!!options.force);
@@ -184,6 +199,136 @@ async function publishResource(ctx) {
   await fs.promises.copyFile(sourcePath, targetPath);
   log.success(`Published ${kind} ${italic(name)} \u2192 ${italic(targetPath.replace(`${process.cwd()}/`, ""))}`);
 }
+async function vendorFramework(explicitPath, force) {
+  const coreDir = path.frameworkPath("core"), rel = (p) => p.replace(`${process.cwd()}/`, "");
+  if (existsSync(coreDir) && !force) {
+    log.info(`Already vendored: ${italic(rel(coreDir))}`);
+    log.info("Pass --force to replace it with a fresh copy of the checkout.");
+    return;
+  }
+  const framework = resolveFrameworkCheckout(explicitPath);
+  if (!framework) {
+    log.error("No Stacks checkout found to vendor from.");
+    log.info("Pass one with `--path <dir>`, or set STACKS_FRAMEWORK_PATH.");
+    log.info("A checkout is required: the published packages ship `dist` only, so a copy of them would not be editable.");
+    process.exit(ExitCode.FatalError);
+  }
+  const sourceCore = join(framework, "storage/framework/core"), corePkgPath = resolve(sourceCore, "package.json");
+  if (!existsSync(corePkgPath)) {
+    log.error(`${sourceCore} has no package.json \u2014 that does not look like a Stacks checkout.`);
+    process.exit(ExitCode.FatalError);
+  }
+  const depName = JSON.parse(await fs.promises.readFile(corePkgPath, "utf-8")).name ?? "stacks";
+  log.info(`Vendoring the framework from ${italic(framework)}...`);
+  if (existsSync(coreDir))
+    await fs.promises.rm(coreDir, { recursive: !0, force: !0 });
+  const SKIP = new Set(["node_modules", ".bun", ".cache", "tsconfig.tsbuildinfo"]);
+  let copied = 0;
+  await copyTreeFiltered(sourceCore, coreDir, SKIP, () => copied++);
+  const rootPkgPath = resolve(process.cwd(), "package.json"), rootPkg = JSON.parse(await fs.promises.readFile(rootPkgPath, "utf-8")), provided = new Set([depName]);
+  for (const entry of await readdir(coreDir, { withFileTypes: !0 })) {
+    if (!entry.isDirectory())
+      continue;
+    if (existsSync(resolve(coreDir, entry.name, "package.json")))
+      provided.add(`@stacksjs/${entry.name}`);
+  }
+  let repointed = 0;
+  for (const field of ["dependencies", "devDependencies"]) {
+    const deps = rootPkg[field];
+    if (!deps)
+      continue;
+    for (const name of Object.keys(deps)) {
+      if (!provided.has(name) || deps[name].startsWith("workspace:"))
+        continue;
+      deps[name] = "workspace:*";
+      repointed++;
+    }
+  }
+  if (!rootPkg.dependencies?.[depName] && !rootPkg.devDependencies?.[depName])
+    rootPkg.dependencies = { ...rootPkg.dependencies, [depName]: "workspace:*" };
+  const workspaces = rootPkg.workspaces ?? [];
+  let addedGlobs = 0;
+  for (const glob of ["storage/framework/core", "storage/framework/core/*"]) {
+    if (workspaces.some((existing) => existing.replace(/^\.\//, "").replace(/\/$/, "") === glob))
+      continue;
+    workspaces.push(glob);
+    addedGlobs++;
+  }
+  rootPkg.workspaces = workspaces;
+  await fs.promises.writeFile(rootPkgPath, `${JSON.stringify(rootPkg, null, 2)}
+`);
+  const bunfigPath = resolve(process.cwd(), "bunfig.toml");
+  let rewrittenPreloads = 0;
+  if (existsSync(bunfigPath)) {
+    const bunfig = await fs.promises.readFile(bunfigPath, "utf-8"), next = bunfig.replace(/(["'])@stacksjs\/([\w-]+)\/([^"']+?)\.js\1/g, (match, quote, pkgName, subpath) => {
+      if (!provided.has(`@stacksjs/${pkgName}`))
+        return match;
+      rewrittenPreloads++;
+      return `${quote}./storage/framework/core/${pkgName}/${subpath}.ts${quote}`;
+    });
+    if (next !== bunfig)
+      await fs.promises.writeFile(bunfigPath, next);
+  }
+  const tsconfigPath = resolve(process.cwd(), "tsconfig.json");
+  let rewroteTsconfig = !1;
+  if (existsSync(tsconfigPath)) {
+    const raw = await fs.promises.readFile(tsconfigPath, "utf-8"), next = raw.replace(/"extends"\s*:\s*"\.\/storage\/framework\/tsconfig\.app\.json"/, '"extends": "./storage/framework/core/tsconfig.json"');
+    if (next !== raw) {
+      await fs.promises.writeFile(tsconfigPath, next);
+      rewroteTsconfig = !0;
+    }
+  }
+  log.success(`Vendored ${copied} files into ${italic(rel(coreDir))}`);
+  log.info(`package.json now depends on ${depName}@workspace:*`);
+  if (repointed > 0)
+    log.info(`Repointed ${repointed} version range${repointed === 1 ? "" : "s"} to workspace:*`);
+  if (addedGlobs > 0)
+    log.info(`Added ${addedGlobs} workspace glob${addedGlobs === 1 ? "" : "s"} for the vendored packages`);
+  if (rewrittenPreloads > 0)
+    log.info(`Rewrote ${rewrittenPreloads} bunfig.toml preload path${rewrittenPreloads === 1 ? "" : "s"} to the vendored source`);
+  if (rewroteTsconfig)
+    log.info("tsconfig.json now extends storage/framework/core/tsconfig.json");
+  log.info("Linking the workspace...");
+  if (await Bun.spawn(["bun", "install"], { cwd: process.cwd(), stdout: "inherit", stderr: "inherit" }).exited !== 0) {
+    log.error("`bun install` failed. The files are in place; re-run the install once the failure is resolved.");
+    process.exit(ExitCode.FatalError);
+  }
+  log.success("This project now runs on the vendored framework \u2014 edits under storage/framework/core are live.");
+  log.info("Go back to the published packages any time with `buddy unpublish:core --all`.");
+}
+function resolveFrameworkCheckout(explicit) {
+  const candidates = [
+    explicit,
+    process.env.STACKS_FRAMEWORK_PATH,
+    resolve(process.cwd(), "../stacks"),
+    join(homedir(), "Code/stacks")
+  ].filter(Boolean);
+  for (const candidate of candidates) {
+    const full = resolve(candidate);
+    if (full === resolve(process.cwd()))
+      continue;
+    if (existsSync(join(full, "storage/framework/core/package.json")))
+      return full;
+  }
+  return null;
+}
+async function reportCoreStatus() {
+  const coreDir = path.frameworkPath("core"), rel = (p) => p.replace(`${process.cwd()}/`, ""), vendored = existsSync(resolve(coreDir, "package.json")), rootPkgPath = resolve(process.cwd(), "package.json"), rootPkg = existsSync(rootPkgPath) ? JSON.parse(await fs.promises.readFile(rootPkgPath, "utf-8")) : {}, declared = rootPkg.dependencies?.stacks ?? rootPkg.devDependencies?.stacks;
+  if (vendored) {
+    const corePkg = JSON.parse(await fs.promises.readFile(resolve(coreDir, "package.json"), "utf-8")), packages = (await readdir(coreDir, { withFileTypes: !0 })).filter((entry) => entry.isDirectory() && existsSync(resolve(coreDir, entry.name, "package.json")));
+    log.info(`Layout:  vendored \u2014 ${italic(rel(coreDir))} (${packages.length} packages, v${corePkg.version ?? "unknown"})`);
+    log.info(`Declared: stacks@${declared ?? "(not declared)"}`);
+    if (declared && !declared.startsWith("workspace:"))
+      log.warn(`The vendored copy is not linked: stacks is declared as ${declared}, not workspace:*. Run \`buddy publish:core --all --force\` to relink, or \`buddy unpublish:core --all\` to remove it.`);
+    log.info("Move to the published packages with `buddy unpublish:core --all`.");
+    return;
+  }
+  const installed = resolve(process.cwd(), "node_modules/@stacksjs/buddy/package.json"), installedVersion = existsSync(installed) ? JSON.parse(await fs.promises.readFile(installed, "utf-8")).version : void 0;
+  log.info("Layout:  published packages \u2014 no storage/framework/core in this project");
+  log.info(`Declared: stacks@${declared ?? "(not declared)"}`);
+  log.info(`Installed: ${installedVersion ? `v${installedVersion}` : "(run bun install)"}`);
+  log.info("Vendor the framework for local development with `buddy publish:core --all`.");
+}
 async function unpublishCorePackage(pkg, force) {
   const shortName = normalizeCoreName(pkg), targetDir = path.frameworkPath(`core/${shortName}`), rel = (p) => p.replace(`${process.cwd()}/`, "");
   if (!existsSync(targetDir)) {
@@ -273,6 +418,15 @@ async function unvendorFramework(force) {
     if (next !== bunfig)
       await fs.promises.writeFile(bunfigPath, next);
   }
+  const tsconfigPath = resolve(process.cwd(), "tsconfig.json");
+  let rewroteTsconfig = !1;
+  if (existsSync(tsconfigPath)) {
+    const raw = await fs.promises.readFile(tsconfigPath, "utf-8"), next = raw.replace(/"extends"\s*:\s*"\.\/storage\/framework\/core\/tsconfig\.json"/, '"extends": "./storage/framework/tsconfig.app.json"');
+    if (next !== raw) {
+      await fs.promises.writeFile(tsconfigPath, next);
+      rewroteTsconfig = !0;
+    }
+  }
   await fs.promises.rm(coreDir, { recursive: !0, force: !0 });
   const scopedDir = resolve(process.cwd(), "node_modules/@stacksjs");
   let danglingRemoved = 0;
@@ -296,6 +450,8 @@ async function unvendorFramework(force) {
     log.info(`Repointed ${rewrittenScripts} package.json script${rewrittenScripts === 1 ? "" : "s"} to ./buddy`);
   if (rewrittenPreloads > 0)
     log.info(`Rewrote ${rewrittenPreloads} bunfig.toml preload path${rewrittenPreloads === 1 ? "" : "s"} to package specifiers`);
+  if (rewroteTsconfig)
+    log.info("tsconfig.json now extends storage/framework/tsconfig.app.json");
   log.info("Installing the published packages...");
   if (await Bun.spawn(["bun", "install"], { cwd: process.cwd(), stdout: "inherit", stderr: "inherit" }).exited !== 0) {
     log.error("`bun install` failed. package.json and bunfig.toml were updated; re-run the install once the failure is resolved.");

package/dist/lazy-commands.js

@@ -95,6 +95,7 @@ const commandRegistry = {
   "publish:middleware": { path: "./commands/publish.js", exportName: "publish" },
   "publish:action": { path: "./commands/publish.js", exportName: "publish" },
   "publish:core": { path: "./commands/publish.js", exportName: "publish" },
+  "core:status": { path: "./commands/publish.js", exportName: "publish" },
   queue: { path: "./commands/queue.js", exportName: "queue" },
   release: { path: "./commands/release.js", exportName: "release" },
   route: { path: "./commands/route.js", exportName: "route" },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.248",
+  "version": "0.70.250",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [
@@ -88,53 +88,53 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/actions": "^0.70.248",
-    "@stacksjs/ai": "^0.70.248",
-    "@stacksjs/alias": "^0.70.248",
-    "@stacksjs/arrays": "^0.70.248",
-    "@stacksjs/auth": "^0.70.248",
-    "@stacksjs/build": "^0.70.248",
-    "@stacksjs/cache": "^0.70.248",
-    "@stacksjs/cli": "^0.70.248",
+    "@stacksjs/actions": "^0.70.250",
+    "@stacksjs/ai": "^0.70.250",
+    "@stacksjs/alias": "^0.70.250",
+    "@stacksjs/arrays": "^0.70.250",
+    "@stacksjs/auth": "^0.70.250",
+    "@stacksjs/build": "^0.70.250",
+    "@stacksjs/cache": "^0.70.250",
+    "@stacksjs/cli": "^0.70.250",
     "@stacksjs/clapp": "^0.2.12",
-    "@stacksjs/cloud": "^0.70.248",
-    "@stacksjs/collections": "^0.70.248",
-    "@stacksjs/config": "^0.70.248",
-    "@stacksjs/database": "^0.70.248",
-    "@stacksjs/desktop-build": "^0.70.248",
-    "@stacksjs/dns": "^0.70.248",
-    "@stacksjs/email": "^0.70.248",
-    "@stacksjs/enums": "^0.70.248",
-    "@stacksjs/error-handling": "^0.70.248",
-    "@stacksjs/events": "^0.70.248",
-    "@stacksjs/git": "^0.70.248",
+    "@stacksjs/cloud": "^0.70.250",
+    "@stacksjs/collections": "^0.70.250",
+    "@stacksjs/config": "^0.70.250",
+    "@stacksjs/database": "^0.70.250",
+    "@stacksjs/desktop-build": "^0.70.250",
+    "@stacksjs/dns": "^0.70.250",
+    "@stacksjs/email": "^0.70.250",
+    "@stacksjs/enums": "^0.70.250",
+    "@stacksjs/error-handling": "^0.70.250",
+    "@stacksjs/events": "^0.70.250",
+    "@stacksjs/git": "^0.70.250",
     "@stacksjs/gitit": "^0.2.5",
-    "@stacksjs/health": "^0.70.248",
+    "@stacksjs/health": "^0.70.250",
     "@stacksjs/dnsx": "^0.2.3",
     "@stacksjs/httx": "^0.1.10",
-    "@stacksjs/image": "^0.70.248",
-    "@stacksjs/lint": "^0.70.248",
-    "@stacksjs/logging": "^0.70.248",
-    "@stacksjs/notifications": "^0.70.248",
-    "@stacksjs/objects": "^0.70.248",
-    "@stacksjs/orm": "^0.70.248",
-    "@stacksjs/path": "^0.70.248",
-    "@stacksjs/skills": "^0.70.248",
-    "@stacksjs/payments": "^0.70.248",
-    "@stacksjs/realtime": "^0.70.248",
-    "@stacksjs/router": "^0.70.248",
+    "@stacksjs/image": "^0.70.250",
+    "@stacksjs/lint": "^0.70.250",
+    "@stacksjs/logging": "^0.70.250",
+    "@stacksjs/notifications": "^0.70.250",
+    "@stacksjs/objects": "^0.70.250",
+    "@stacksjs/orm": "^0.70.250",
+    "@stacksjs/path": "^0.70.250",
+    "@stacksjs/skills": "^0.70.250",
+    "@stacksjs/payments": "^0.70.250",
+    "@stacksjs/realtime": "^0.70.250",
+    "@stacksjs/router": "^0.70.250",
     "@stacksjs/rpx": "^0.11.42",
-    "@stacksjs/search-engine": "^0.70.248",
-    "@stacksjs/security": "^0.70.248",
-    "@stacksjs/server": "^0.70.248",
-    "@stacksjs/storage": "^0.70.248",
-    "@stacksjs/strings": "^0.70.248",
-    "@stacksjs/testing": "^0.70.248",
-    "@stacksjs/tunnel": "^0.70.248",
-    "@stacksjs/types": "^0.70.248",
-    "@stacksjs/ui": "^0.70.248",
-    "@stacksjs/utils": "^0.70.248",
-    "@stacksjs/validation": "^0.70.248",
+    "@stacksjs/search-engine": "^0.70.250",
+    "@stacksjs/security": "^0.70.250",
+    "@stacksjs/server": "^0.70.250",
+    "@stacksjs/storage": "^0.70.250",
+    "@stacksjs/strings": "^0.70.250",
+    "@stacksjs/testing": "^0.70.250",
+    "@stacksjs/tunnel": "^0.70.250",
+    "@stacksjs/types": "^0.70.250",
+    "@stacksjs/ui": "^0.70.250",
+    "@stacksjs/utils": "^0.70.250",
+    "@stacksjs/validation": "^0.70.250",
     "@stacksjs/ts-cloud": "^0.7.92",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",