@metaobjectsdev/cli 0.24.0 → 0.24.1

package/src/index.ts

@@ -21,7 +21,7 @@ COMMANDS:
   gen [<entity>...]     Codegen TS targets from your declared metadata
   types [query]         Search the metadata vocabulary (types, subtypes, @attrs) by name or description
   export                Flatten loaded metadata to one canonical JSON artifact
-  docs <metadata> --out <dir>  Generate neutral metadata documentation (entity + template pages; --site for HTML site)
+  docs [<project-root>] --out <dir>  Generate neutral metadata documentation (entity + template pages; --site for HTML site)
   verify                Drift gate — subverbs: --templates / --db / --codegen (bare = --templates)
   upgrade               Rewrite retired metadata vocabulary (previews; --apply writes)
   prompt-snapshot       Snapshot rendered template.* output; --check gates drift
@@ -42,9 +42,11 @@ EXPORT FLAGS:
   --out <file>          Write output to a file (default: stdout)
 
 DOCS FLAGS:
-  <metadata>            Project root to resolve metadata from; passing it SCOPES the run (default: cwd)
+  [<project-root>]      PROJECT ROOT to resolve metadata from — the directory that CONTAINS
+                        your metadata, NOT the metadata directory. Passing it SCOPES the run
+                        (default: cwd)
   --out <dir>, -o       Output directory for the pages (default: ./docs)
-  --templates <dir>     Project root to resolve adopter templates/ overrides (default: <metadata>)
+  --templates <dir>     Project root to resolve adopter templates/ overrides (default: <project-root>)
   --prompts <dir>       Extra dir holding prompt .mustache sources for --site (e.g. data/templates/)
 
 VERIFY FLAGS (ADR-0021 D2 — explicit subverbs; combine any; exit 1 on ANY drift):
@@ -163,12 +165,15 @@ FLAGS:
   docs: `meta docs — generate neutral metadata documentation (entity + template pages)
 
 USAGE:
-  meta docs [<metadata>] [flags]
+  meta docs [<project-root>] [flags]
 
 FLAGS:
-  <metadata>            Project root to resolve metadata from. Passing it SCOPES the run to
-                        that directory's own sources; no ancestor .metaobjects/config.json is
-                        consulted. Omitted (default), the project is discovered by walking up.
+  [<project-root>]      PROJECT ROOT to resolve metadata from — the directory that CONTAINS
+                        your metadata, NOT the metadata directory itself. (The Python and C#
+                        'docs' positionals mean the metadata dir; this one does not.) Passing
+                        it SCOPES the run to that directory's own sources; no ancestor
+                        .metaobjects/config.json is consulted. Omitted (default), the project
+                        is discovered by walking up.
   --out <dir>, -o       Output directory for the pages (default: ./docs)
   --model               Emit the markdown model surface (entity + template pages)
   --api                 Emit the markdown api surface (generated SDK reference)
@@ -177,7 +182,7 @@ FLAGS:
   --metamodel           Document the built-in metamodel vocabulary (no metadata needed)
   --site                Generate the browsable HTML documentation site (<out>/site/)
   --scaffold-site       Copy the site's templates + assets into codegen/docs-site/ to own (theme) them
-  --templates <dir>     Project root to resolve adopter templates/ overrides (default: <metadata>)
+  --templates <dir>     Project root to resolve adopter templates/ overrides (default: <project-root>)
   --prompts <dir>       Extra dir holding prompt .mustache sources (for --site) when they
                         live outside the metadata sources or templates/ (e.g. data/templates/)
   --help, -h            Print this help

package/src/lib/load-metaobjects-config.ts

@@ -6,6 +6,7 @@ import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 import { createJiti } from "jiti";
 import type { MetaDataTypeProvider, MetaobjectsGenConfig } from "@metaobjectsdev/codegen-ts";
+import { resolveCollection, type Collection } from "@metaobjectsdev/sdk";
 
 const CONFIG_FILE = "metaobjects.config.ts";
 
@@ -212,6 +213,50 @@ export function resolveGenConfigDir(startDir: string, fallback: string): string
   return fallback;
 }
 
+/**
+ * The collection a TypeScript package GENERATES FROM (#340).
+ *
+ * #326/#327 established that the two config files answer different questions, and gave
+ * `metaobjects.config.ts` its own walk. This is the remaining half of the same split:
+ * a sub-project whose TS config sits below the collection root was still LOADING the
+ * ancestor's whole source set, so its `src/generated` absorbed metadata belonging to
+ * unrelated parts of the repository — one adopter's web app went from 376 files to 831,
+ * the surplus being another module's server-side prompt payload DTOs. It fails OPEN
+ * (`tsc` passes, tests pass), so the only symptom is a directory that quietly doubled.
+ *
+ * The rule: an ancestor `.metaobjects/config.json` is the DEFAULT for a package that
+ * declares no sources of its own, never an ADDITION to one that does. So when the TS
+ * config sits somewhere the collection did not, that directory is re-resolved as a
+ * collection in its own right, and it wins if it actually resolves any metadata.
+ *
+ * It can only ever NARROW, and only in a shape that could not have worked before:
+ *   - the two directories coincide (every `meta init` project, and every run from a
+ *     project root) — returns the original, untouched, without a second resolve;
+ *   - the sub-project declares no sources — the pinned resolve throws
+ *     `ERR_SOURCE_UNRESOLVED` or comes back empty, and the ancestor stands, so a
+ *     package that genuinely lives off an ancestor tree keeps working;
+ *   - the sub-project has its own metadata — it generates from exactly that, which is
+ *     what it did before source resolution learned to walk upward.
+ *
+ * Deliberately NOT applied to `.metaobjects/` STATE. Migrations, snapshots and the
+ * operational block stay keyed on the discovered collection's directory (#326 settled
+ * that); this narrows what is LOADED, and nothing about where state lives.
+ */
+export async function resolveGenCollection(
+  collection: Collection,
+  genConfigDir: string,
+): Promise<Collection> {
+  if (resolve(genConfigDir) === resolve(collection.configDir)) return collection;
+  try {
+    const pinned = await resolveCollection(genConfigDir, { explicitDir: genConfigDir });
+    return pinned.files.length > 0 ? pinned : collection;
+  } catch {
+    // The sub-project declares nothing resolvable of its own — inherit, exactly as a
+    // package with no config always has.
+    return collection;
+  }
+}
+
 export async function loadMetaobjectsConfig(projectRoot: string): Promise<MetaobjectsGenConfig> {
   const fullPath = resolve(projectRoot, CONFIG_FILE);
   if (!existsSync(fullPath)) {