@codejen/jen 1.0.0 → 1.1.0

package/dist/jen.js

@@ -9,7 +9,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync as existsSync4, mkdtempSync, readFileSync as readFileSync2, readdirSync, rmSync } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { tmpdir } from "node:os";
-import { delimiter, join as join3, resolve as resolve2 } from "node:path";
+import { delimiter, dirname as dirname4, join as join3, resolve as resolve2, sep } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import { parseArgs, styleText as styleText2 } from "node:util";
 
@@ -465,6 +465,7 @@ function dirSource(source, dir) {
     };
   });
 }
+var FIRST_PARTY_SCOPE = "@codejen";
 var PACK_RE = /^(?:jen-pack-|@[^/]+\/pack-)(.+)$/;
 var packPrefix = (name) => PACK_RE.exec(name)?.[1] ?? name;
 function readPackageJson(dir) {
@@ -476,6 +477,28 @@ function readPackageJson(dir) {
     fail(`${file}: ${e.message}`);
   }
 }
+function discoverGlobal(re) {
+  const names = [];
+  for (let dir = dirname4(import.meta.filename); dirname4(dir) !== dir; dir = dirname4(dir)) {
+    if (!dir.endsWith(`${sep}node_modules`) || dir.startsWith(ROOT + sep)) continue;
+    let children;
+    try {
+      children = readdirSync(dir);
+    } catch {
+      continue;
+    }
+    for (const child of children) {
+      if (child.startsWith("@")) {
+        const scoped = readdirSync(join3(dir, child)).map((n) => `${child}/${n}`);
+        names.push(...scoped);
+      } else {
+        names.push(child);
+      }
+    }
+  }
+  return names.filter((n) => re.test(n));
+}
+var defaultBases = () => [join3(ROOT, "package.json"), join3(USER_DIR, "package.json"), import.meta.filename];
 function discoverDeps(dir, re) {
   const pkg = readPackageJson(dir);
   const names = [
@@ -485,7 +508,7 @@ function discoverDeps(dir, re) {
   ];
   return names.filter((n) => re.test(n));
 }
-async function packSource(name, bases = [join3(ROOT, "package.json"), import.meta.filename]) {
+async function packSource(name, bases = defaultBases()) {
   for (const base of bases) {
     let file;
     try {
@@ -507,7 +530,7 @@ async function packSource(name, bases = [join3(ROOT, "package.json"), import.met
 }
 var YEOMAN_RE = /^(?:generator-|@[^/]+\/generator-)(.+)$/;
 var yeomanShortName = (name) => YEOMAN_RE.exec(name)?.[1] ?? name;
-async function yeomanSource(name, bases = [join3(ROOT, "package.json"), import.meta.filename]) {
+async function yeomanSource(name, bases = defaultBases()) {
   for (const base of bases) {
     let file;
     try {
@@ -575,8 +598,9 @@ async function fetchFrom(spec) {
 }
 async function collect() {
   const extra = (process.env.JEN_PATH ?? "").split(delimiter).filter(Boolean);
-  const packs = [.../* @__PURE__ */ new Set([...discoverDeps(ROOT, PACK_RE), ...discoverDeps(USER_DIR, PACK_RE)])];
-  const yeomanGenerators = [.../* @__PURE__ */ new Set([...discoverDeps(ROOT, YEOMAN_RE), ...discoverDeps(USER_DIR, YEOMAN_RE)])];
+  const discover = (re) => [.../* @__PURE__ */ new Set([...discoverDeps(ROOT, re), ...discoverDeps(USER_DIR, re), ...discoverGlobal(re)])];
+  const packs = discover(PACK_RE);
+  const yeomanGenerators = discover(YEOMAN_RE);
   const entries = [
     ...dirSource("project", PROJECT_JEN),
     ...dirSource("user", USER_DIR),
@@ -598,6 +622,35 @@ function find(entries, query) {
     (e) => e.name === name && (prefix === null || e.prefix === prefix || e.source === prefix || e.source.startsWith(`${prefix} `))
   );
 }
+function unknownPackPrefix(entries, query) {
+  const colon = query.indexOf(":");
+  if (colon < 0) return null;
+  const prefix = query.slice(0, colon);
+  const known = entries.some((e) => e.prefix === prefix || e.source === prefix || e.source.startsWith(`${prefix} `));
+  return !known && /^[a-z0-9][a-z0-9-]*$/.test(prefix) ? prefix : null;
+}
+function notFound(entries, query) {
+  const prefix = unknownPackPrefix(entries, query);
+  const lines = [`Generator "${query}" not found \u2013 jen --list shows all.`];
+  if (prefix) lines.push(`If "${prefix}" is a pack you haven't installed, try: jen --from ${FIRST_PARTY_SCOPE}/pack-${prefix} ${query}`);
+  return fail(lines.join("\n"));
+}
+async function fetchFallback(entries, query) {
+  const prefix = unknownPackPrefix(entries, query);
+  if (!prefix || process.env.JEN_NO_FETCH) return void 0;
+  let fetched;
+  try {
+    fetched = await fetchFrom(`${FIRST_PARTY_SCOPE}/pack-${prefix}`);
+  } catch {
+    return void 0;
+  }
+  const entry = find(fetched.entries, query);
+  if (!entry) {
+    fetched.cleanup();
+    return void 0;
+  }
+  return { entry, cleanup: fetched.cleanup };
+}
 async function list(entries) {
   const seen = /* @__PURE__ */ new Set();
   for (const e of entries) {
@@ -658,7 +711,7 @@ async function main() {
   const { values, positionals } = parseArgs({ allowPositionals: true, strict: false, options: FLAGS });
   if (values.help) return void console.log(HELP);
   if (values.where) setRoot(resolve2(process.cwd(), String(values.where)));
-  const fetched = values.from ? await fetchFrom(String(values.from)) : void 0;
+  let fetched = values.from ? await fetchFrom(String(values.from)) : void 0;
   try {
     const entries = fetched ? fetched.entries : await collect();
     if (values.list) return void await list(entries);
@@ -668,7 +721,13 @@ async function main() {
       process.exitCode = 1;
       return;
     }
-    const entry = find(entries, query) ?? fail(`Generator "${query}" not found \u2013 jen --list shows all.`);
+    let entry = find(entries, query);
+    if (!entry) {
+      const fallback = fetched ? void 0 : await fetchFallback(entries, query);
+      if (!fallback) notFound(entries, query);
+      entry = fallback.entry;
+      fetched = { entries: [], cleanup: fallback.cleanup };
+    }
     const gen = await entry.load();
     console.log(dim(`${qualified(entry)} (${entry.source})${gen.description ? ` \u2013 ${gen.description}` : ""}`));
     const given = Object.fromEntries(Object.entries(values).filter(([k]) => !(k in FLAGS)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codejen/jen",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "type": "module",
   "bin": {