@metaobjectsdev/cli 0.24.4 → 0.24.5

package/src/index.ts

@@ -19,6 +19,8 @@ COMMANDS:
   init --config-only    Write only .metaobjects/config.json — for a Maven- or pip-rooted project
   agent-docs            Scaffold only the agent-context (.metaobjects/ + .claude/skills/) — canonical redirect target for all language ports
   gen [<entity>...]     Codegen TS targets from your declared metadata
+  eject <generator>     Copy a reference generator into codegen/generators/ to own it (any time after init)
+  eject --list          List every ejectable generator name, grouped by package
   types [query]         Search the metadata vocabulary (types, subtypes, @attrs) by name or description
   export                Flatten loaded metadata to one canonical JSON artifact
   docs [<project-root>] --out <dir>  Generate neutral metadata documentation (entity + template pages; --site for HTML site)
@@ -113,6 +115,24 @@ field.enum). Warnings only — it never fails the build. Opt out with --no-antip
 or META_NO_ANTIPATTERNS=1.
 
 NOTE: outDir, dialect, dbImport, extStyle are read from metaobjects.config.ts
+`,
+  eject: `meta eject — copy a reference generator into your repo so you own it
+
+USAGE:
+  meta eject <name>      Copy generator <name> into codegen/generators/<name>.ts
+  meta eject --list      List every ejectable generator name, grouped by package
+
+FLAGS:
+  --list                 List ejectable generators instead of copying one
+  --force                Overwrite an already-ejected file (default: never clobber)
+  --help, -h             Print this help
+
+\`meta init\` copies four generators (entity, queries, routes, barrel) into
+codegen/generators/ automatically (ADR-0034 scaffold-and-own). \`meta eject\` is
+the same operation for ANY generator — one you skipped at init time, a UI-tier
+generator like form/hooks/grid, or one a package gains later. It prints the
+import line to paste into metaobjects.config.ts, and it never overwrites a
+file you already own unless you pass --force.
 `,
   verify: `meta verify — drift gate (templates / DB schema / codegen / migration replay)
 
@@ -374,6 +394,10 @@ export async function run(argv: string[]): Promise<number> {
       const { genCommand } = await import("./commands/gen.js");
       return genCommand(rest, cwd, fmt);
     }
+    case "eject": {
+      const { ejectCommand } = await import("./commands/eject.js");
+      return ejectCommand(rest, cwd);
+    }
     case "export": {
       const { exportCommand } = await import("./commands/export.js");
       return exportCommand(rest, cwd);

package/src/lib/args.ts

@@ -490,3 +490,37 @@ export function parseMigrateArgs(argv: string[]): MigrateFlags {
     applyPending,
   };
 }
+
+// ---------------------------------------------------------------------------
+// eject flags — FR-040 §4.2(a)
+// ---------------------------------------------------------------------------
+
+export interface EjectFlags {
+  /** The generator name to eject; undefined when only --list was given. */
+  name: string | undefined;
+  list: boolean;
+  /** Overwrite an already-ejected file; default false — eject never clobbers. */
+  force: boolean;
+}
+
+export function parseEjectArgs(argv: string[]): EjectFlags {
+  const { values, positionals } = parseArgs({
+    args: argv,
+    options: {
+      "list": { type: "boolean", default: false },
+      "force": { type: "boolean", default: false },
+    },
+    strict: true,
+    allowPositionals: true,
+  });
+
+  if (positionals.length > 1) {
+    throw new Error(`meta eject takes at most one generator name; got: ${positionals.join(", ")}`);
+  }
+
+  return {
+    name: positionals[0],
+    list: !!values.list,
+    force: !!values.force,
+  };
+}

package/src/lib/detect-stack.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { resolveCollection } from "@metaobjectsdev/sdk";
+import { declaredDependencyNames, readPackageManifest } from "./package-manifest.js";
 import {
   detectStack, detectConcerns, makeStack,
   type ServerLang, type ClientFramework, type Stack, type ProjectProbe,
@@ -8,17 +9,9 @@ import {
 } from "@metaobjectsdev/sdk/agent-context";
 
 function depNames(cwd: string): Set<string> {
-  const out = new Set<string>();
-  const pkgPath = join(cwd, "package.json");
-  if (existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(readFileSync(pkgPath, "utf8")) as Record<string, Record<string, string>>;
-      for (const key of ["dependencies", "devDependencies", "peerDependencies"]) {
-        for (const name of Object.keys(pkg[key] ?? {})) out.add(name);
-      }
-    } catch { /* unreadable manifest — treat as no deps */ }
-  }
-  return out;
+  // An unreadable or absent manifest reads as no deps, which is what stack detection
+  // wants: it probes, it does not require.
+  return declaredDependencyNames(readPackageManifest(cwd) ?? {});
 }
 
 // Cheap substring probe, not a metamodel load: matches both canonical JSON's

package/src/lib/package-manifest.ts

@@ -0,0 +1,58 @@
+// One answer to "what does this project declare as a dependency".
+//
+// Three commands ask it — `meta init` (is this package already declared, or must the
+// scaffold add it?), `meta eject` (will the ejected file's imports resolve, or does the
+// adopter's tsc report TS2307?), and stack detection (which frameworks is this project
+// on?). They had three hand-rolled JSON-parse-and-union blocks covering DIFFERENT field
+// sets, and the asymmetry was the cost: `eject` reported a peer-declared package as
+// missing and told the adopter to install what they already had — advice that, followed,
+// adds a second physical copy of a package whose class identity is load-bearing (the
+// ts-poet split in 0.21.6 and the metadata node-guard split are both that bug).
+//
+// A fix to one had no way to find the other two: nothing referenced anything, and no
+// shared name connected them to a grep.
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+/** The dependency-bearing fields of a package.json, all optional. */
+export interface PackageManifest {
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+  optionalDependencies?: Record<string, string>;
+}
+
+/**
+ * Every package name the manifest declares, across ALL FOUR dependency fields.
+ *
+ * All four, because the question every caller is really asking is "will this resolve,
+ * and will their typecheck be happy" — not "is it in one particular field". A library
+ * consuming MetaObjects through `peerDependencies` (the correct declaration for a
+ * package whose consumer supplies the version) has it declared, and so does one using
+ * `optionalDependencies`.
+ */
+export function declaredDependencyNames(pkg: PackageManifest): Set<string> {
+  const out = new Set<string>();
+  for (const field of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"] as const) {
+    for (const name of Object.keys(pkg[field] ?? {})) out.add(name);
+  }
+  return out;
+}
+
+/**
+ * Read and parse `<cwd>/package.json`.
+ *
+ * `undefined` distinguishes "no readable manifest" from "a manifest declaring nothing",
+ * which callers report differently: with no manifest there is nothing to compare
+ * against, so the honest message names what a file needs rather than claiming it is
+ * missing from a list that was never read.
+ */
+export function readPackageManifest(cwd: string): PackageManifest | undefined {
+  const path = join(cwd, "package.json");
+  if (!existsSync(path)) return undefined;
+  try {
+    return JSON.parse(readFileSync(path, "utf8")) as PackageManifest;
+  } catch {
+    return undefined;
+  }
+}