refactor: simplify pass on the owned-copy tooling

Share one findOwned and the codegen directory name in the Maven plugin, compute the identical
set once in Python undo, reuse the config-name and api-prefix constants, and collapse a
duplicated list in the TypeScript undo.

Author: dmealing

server/java/maven-plugin/src/main/java/com/metaobjects/mojo/MetaDataEjectMojo.java

@@ -123,7 +123,7 @@ public class MetaDataEjectMojo extends AbstractMojo {
     @Parameter(property = "undo", defaultValue = "false")
     boolean undo;
 
-    private static final String CODEGEN_DIR = "codegen";
+    static final String CODEGEN_DIR = "codegen";
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -881,7 +881,7 @@ private String ownedSupportRows(Path codegenRoot) {
 
     /** The owned copy named {@code filename} under {@code codegen/src/main/<lang>}, or
      *  {@code null}. It may live under ANY package the adopter chose. */
-    private static Path findOwned(Path codegenRoot, String langDir, String filename) throws IOException {
+    static Path findOwned(Path codegenRoot, String langDir, String filename) throws IOException {
         if (codegenRoot == null) return null;
         Path srcRoot = codegenRoot.resolve("src/main/" + langDir);
         if (!Files.isDirectory(srcRoot)) return null;

server/java/maven-plugin/src/main/java/com/metaobjects/mojo/MetaDataGeneratorMojo.java

@@ -137,7 +137,7 @@ private void noteOwnedStock() {
         if (project == null || project.getBasedir() == null) return;
         try {
             String line = OwnedStock.notice(OwnedStock.find(
-                    project.getBasedir().toPath().resolve("codegen"),
+                    project.getBasedir().toPath().resolve(MetaDataEjectMojo.CODEGEN_DIR),
                     OwnedStock.classpath(getClass().getClassLoader())));
             if (line != null) getLog().info("MetaData Mojo > " + line);
         } catch (IOException | RuntimeException ignored) {

server/java/maven-plugin/src/main/java/com/metaobjects/mojo/OwnedStock.java

@@ -83,7 +83,7 @@ static List<Copy> find(Path codegenRoot, Reader reader) throws IOException {
         for (EjectSupport.Entry e : EjectSupport.allEntries()) {
             if (e.resourcePath == null) continue;
             String langDir = e.port == EjectSupport.Port.KOTLIN ? "kotlin" : "java";
-            Path found = findOwned(codegenRoot, langDir, e.simpleName() + "." + e.port.extension);
+            Path found = MetaDataEjectMojo.findOwned(codegenRoot, langDir, e.simpleName() + "." + e.port.extension);
             if (found == null) continue;
             Path srcRoot = codegenRoot.resolve("src/main/" + langDir);
             String ownedPackage = srcRoot.relativize(found.getParent()).toString()
@@ -131,7 +131,7 @@ private static List<String> shared(Path codegenRoot, EjectSupport.Entry e, Reade
         if (e.port == EjectSupport.Port.JAVA) {
             for (String source : e.sources()) {
                 for (String simple : EjectSupport.supportFor(reader.read(e.resourceOf(source)))) {
-                    if (findOwned(codegenRoot, "java", simple + ".java") != null) out.add(simple);
+                    if (MetaDataEjectMojo.findOwned(codegenRoot, "java", simple + ".java") != null) out.add(simple);
                 }
             }
             out.addAll(e.runtime);
@@ -157,14 +157,6 @@ static String notice(List<Copy> copies) {
                 + "`mvn metaobjects:eject -Dundo=true`.";
     }
 
-    private static Path findOwned(Path codegenRoot, String langDir, String filename) throws IOException {
-        Path srcRoot = codegenRoot.resolve("src/main/" + langDir);
-        if (!Files.isDirectory(srcRoot)) return null;
-        try (var walk = Files.walk(srcRoot)) {
-            return walk.filter(p -> p.getFileName().toString().equals(filename)).findFirst().orElse(null);
-        }
-    }
-
     private static void fold(int[] totals, List<String> differing, String name, EjectSupport.Comparison cmp) {
         totals[0] += cmp.behind;
         totals[1] += cmp.ownedOnly;

server/python/src/metaobjects/cli.py

@@ -1322,7 +1322,7 @@ def _cmd_init(args: argparse.Namespace) -> int:
     wrote: list[str] = []
     kept: list[str] = []
     for rel, text in (
-        ("metaobjects.config.yaml", config),
+        (_CONFIG_NAME, config),
         ("metaobjects/meta.app.yaml", _INIT_METADATA),
     ):
         path = root / rel
@@ -1336,7 +1336,7 @@ def _cmd_init(args: argparse.Namespace) -> int:
         print(f"wrote {rel}")
     for rel in kept:
         print(f"kept {rel} (already exists)")
-    if args.with_docs and "metaobjects.config.yaml" in kept:
+    if args.with_docs and _CONFIG_NAME in kept:
         print("note: add the docs target yourself: `docs: {outDir: docs, generators: [api-docs]}`")
     print("next: describe your entities in metaobjects/, then run `metaobjects gen`.")
     return 0

server/python/src/metaobjects/codegen/eject.py

@@ -79,10 +79,7 @@ def owned_token(entry: GeneratorEntry) -> str:
 
 
 def packaged_source(entry: GeneratorEntry) -> str:
-    assert entry.source_module is not None
-    module = importlib.import_module(entry.source_module)
-    assert module.__file__ is not None
-    return Path(module.__file__).read_text(encoding="utf-8")
+    return packaged_module_path(entry).read_text(encoding="utf-8")
 
 
 def ejected_source(entry: GeneratorEntry) -> str:
@@ -211,7 +208,8 @@ def undo(names: list[str], root: Path, *, force: bool = False) -> EjectResult:
 
     if names:
         chosen = [known[n] for n in names]
-        differing = [e for e in chosen if e not in identical_owned(root)]
+        identical = identical_owned(root)
+        differing = [e for e in chosen if e not in identical]
         if differing and not force:
             return EjectResult(2, [], [
                 f"{e.name} differs from the shipped generator; nothing removed. Inspect: "

server/python/src/metaobjects/codegen/runtime/api_docs_builder.py

@@ -38,6 +38,7 @@
     FieldShape,
 )
 from metaobjects.codegen import type_map
+from metaobjects.codegen.config import DEFAULT_API_PREFIX
 from metaobjects.codegen.model_walk import package_of
 from .m2m_codegen import (
     build_object_index,
@@ -94,7 +95,7 @@ def _is_email_kind(tmpl: MetaData) -> bool:
 class PythonApiModelBuilder:
     """Builds the :class:`ApiModel` SDK-surface IR from a loaded ``MetaRoot``."""
 
-    def __init__(self, api_prefix: str = "/api") -> None:
+    def __init__(self, api_prefix: str = DEFAULT_API_PREFIX) -> None:
         #: The path the documented routes mount under (``apiPrefix``; ``""`` = at the root).
         self.api_prefix = api_prefix
 

server/typescript/packages/cli/src/commands/eject.ts

@@ -719,29 +719,25 @@ async function undoCommand(names: readonly string[], force: boolean, cwd: string
   const stillReached = new Set(remaining.flatMap((r) => closureOf(r.name).templates.map((f) => f.path)));
   const removed: string[] = [];
   const keptCompanions: string[] = [];
-  const toRemove: string[] = [];
 
-  for (const r of targets) toRemove.push(`${OWNED_GENERATORS_DIR}/${r.name}.ts`);
+  for (const r of targets) removed.push(`${OWNED_GENERATORS_DIR}/${r.name}.ts`);
   const templateRows = await templateCopyStatus(cwd, packagedTemplates());
   const dropTemplates = new Set(targets.flatMap((r) => (r.templates ?? []).map((t) => t.path)));
   for (const row of templateRows) {
     if (!dropTemplates.has(row.path) || stillReached.has(row.path)) continue;
-    if (row.verdict === "identical" || row.verdict === "reformatted") toRemove.push(row.path);
+    if (row.verdict === "identical" || row.verdict === "reformatted") removed.push(row.path);
     else keptCompanions.push(row.path);
   }
   // The adapter source is one shared tree: it goes only when nothing left in the project emits
   // code that imports it.
   const adapterDropped = targets.some((r) => ejectsRuntime(r.name)) && !remaining.some((r) => ejectsRuntime(r.name));
   if (adapterDropped) {
     for (const row of await runtimeCopyStatus(cwd)) {
-      if (row.verdict === "identical" || row.verdict === "reformatted") toRemove.push(row.path);
+      if (row.verdict === "identical" || row.verdict === "reformatted") removed.push(row.path);
       else keptCompanions.push(row.path);
     }
   }
-  for (const rel of toRemove) {
-    await rm(join(cwd, rel), { force: true });
-    removed.push(rel);
-  }
+  for (const rel of removed) await rm(join(cwd, rel), { force: true });
   await pruneEmptyDirs(cwd, [OWNED_TEMPLATES_DIR, OWNED_RUNTIME_DIR, OWNED_GENERATORS_DIR]);
 
   const undone: UndoneRow[] = targets.map((r) => {