@fluojs/cli 1.1.0 → 3.0.0

package/dist/fixtures/typegen-react-app.module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typegen-react-app.module.d.ts","sourceRoot":"","sources":["../../src/fixtures/typegen-react-app.module.ts"],"names":[],"mappings":"AAYA,gEAAgE;AAChE,qBAAa,SAAS;CAAG"}

package/dist/fixtures/typegen-react-app.module.js

@@ -0,0 +1,33 @@
+let _initProto, _initClass;
+function _applyDecs(e, t, n, r, o, i) { var a, c, u, s, f, l, p, d = Symbol.metadata || Symbol.for("Symbol.metadata"), m = Object.defineProperty, h = Object.create, y = [h(null), h(null)], v = t.length; function g(t, n, r) { return function (o, i) { n && (i = o, o = e); for (var a = 0; a < t.length; a++) i = t[a].apply(o, r ? [i] : []); return r ? i : o; }; } function b(e, t, n, r) { if ("function" != typeof e && (r || void 0 !== e)) throw new TypeError(t + " must " + (n || "be") + " a function" + (r ? "" : " or undefined")); return e; } function applyDec(e, t, n, r, o, i, u, s, f, l, p) { function d(e) { if (!p(e)) throw new TypeError("Attempted to access private element on non-instance"); } var h = [].concat(t[0]), v = t[3], w = !u, D = 1 === o, S = 3 === o, j = 4 === o, E = 2 === o; function I(t, n, r) { return function (o, i) { return n && (i = o, o = e), r && r(o), P[t].call(o, i); }; } if (!w) { var P = {}, k = [], F = S ? "get" : j || D ? "set" : "value"; if (f ? (l || D ? P = { get: _setFunctionName(function () { return v(this); }, r, "get"), set: function (e) { t[4](this, e); } } : P[F] = v, l || _setFunctionName(P[F], r, E ? "" : F)) : l || (P = Object.getOwnPropertyDescriptor(e, r)), !l && !f) { if ((c = y[+s][r]) && 7 !== (c ^ o)) throw Error("Decorating two elements with the same name (" + P[F].name + ") is not supported yet"); y[+s][r] = o < 3 ? 1 : o; } } for (var N = e, O = h.length - 1; O >= 0; O -= n ? 2 : 1) { var T = b(h[O], "A decorator", "be", !0), z = n ? h[O - 1] : void 0, A = {}, H = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: r, metadata: a, addInitializer: function (e, t) { if (e.v) throw new TypeError("attempted to call addInitializer after decoration was finished"); b(t, "An initializer", "be", !0), i.push(t); }.bind(null, A) }; if (w) c = T.call(z, N, H), A.v = 1, b(c, "class decorators", "return") && (N = c);else if (H.static = s, H.private = f, c = H.access = { has: f ? p.bind() : function (e) { return r in e; } }, j || (c.get = f ? E ? function (e) { return d(e), P.value; } : I("get", 0, d) : function (e) { return e[r]; }), E || S || (c.set = f ? I("set", 0, d) : function (e, t) { e[r] = t; }), N = T.call(z, D ? { get: P.get, set: P.set } : P[F], H), A.v = 1, D) { if ("object" == typeof N && N) (c = b(N.get, "accessor.get")) && (P.get = c), (c = b(N.set, "accessor.set")) && (P.set = c), (c = b(N.init, "accessor.init")) && k.unshift(c);else if (void 0 !== N) throw new TypeError("accessor decorators must return an object with get, set, or init properties or undefined"); } else b(N, (l ? "field" : "method") + " decorators", "return") && (l ? k.unshift(N) : P[F] = N); } return o < 2 && u.push(g(k, s, 1), g(i, s, 0)), l || w || (f ? D ? u.splice(-1, 0, I("get", s), I("set", s)) : u.push(E ? P[F] : b.call.bind(P[F])) : m(e, r, P)), N; } function w(e) { return m(e, d, { configurable: !0, enumerable: !0, value: a }); } return void 0 !== i && (a = i[d]), a = h(null == a ? null : a), f = [], l = function (e) { e && f.push(g(e)); }, p = function (t, r) { for (var i = 0; i < n.length; i++) { var a = n[i], c = a[1], l = 7 & c; if ((8 & c) == t && !l == r) { var p = a[2], d = !!a[3], m = 16 & c; applyDec(t ? e : e.prototype, a, m, d ? "#" + p : _toPropertyKey(p), l, l < 2 ? [] : t ? s = s || [] : u = u || [], f, !!t, d, r, t && d ? function (t) { return _checkInRHS(t) === e; } : o); } } }, p(8, 0), p(0, 0), p(8, 1), p(0, 1), l(u), l(s), c = f, v || w(e), { e: c, get c() { var n = []; return v && [w(e = applyDec(e, [t], r, e.name, 5, n)), g(n, 1)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
+import { defineModule } from '@fluojs/runtime';
+import { Path, ReactModule, Router } from '@fluojs/react';
+let _ProductRouter;
+class ProductRouter {
+  static {
+    ({
+      e: [_initProto],
+      c: [_ProductRouter, _initClass]
+    } = _applyDecs(this, [Router('/products')], [[Path('/'), 2, "index"], [Path('/:productId'), 2, "show"]]));
+  }
+  constructor() {
+    _initProto(this);
+  }
+  index() {}
+  show() {}
+  static {
+    _initClass();
+  }
+}
+
+/** Fixture root module used by CLI React page typegen tests. */
+export class AppModule {}
+defineModule(AppModule, {
+  imports: [ReactModule.forRoot({
+    controllers: [_ProductRouter]
+  })]
+});

package/dist/generate-command.d.ts

@@ -0,0 +1,50 @@
+import type { GeneratorManifestEntry } from './generators/manifest.js';
+import type { GenerateOptions, GeneratorKind } from './types.js';
+/** Describes how one generated artifact would interact with the workspace. */
+export type GeneratePlanAction = 'create' | 'module-create' | 'module-unchanged' | 'module-update' | 'overwrite' | 'skip' | 'unchanged';
+/** One path-level action reported by generate dry-run previews and structured results. */
+export type GeneratePlanEntry = {
+    /** Planned action for this path. */
+    action: GeneratePlanAction;
+    /** Absolute path affected by the plan entry. */
+    path: string;
+};
+/**
+ * Structured result returned by {@link runGenerateCommand} for tooling-friendly automation.
+ *
+ * `generatedFiles` only includes files whose on-disk content changed during the command.
+ * `moduleRegistered` reports whether the target schematic participates in automatic module wiring,
+ * even when the target module file was already up to date.
+ */
+export type GenerateResult = {
+    generatedFiles: string[];
+    moduleRegistered: boolean;
+    modulePath: string | undefined;
+    nextStepHint: string;
+    plannedFiles: GeneratePlanEntry[];
+    wiringBehavior: GeneratorManifestEntry['wiringBehavior'];
+};
+/**
+ * Generates one CLI schematic into a source directory and returns structured wiring metadata.
+ *
+ * The command keeps generation idempotent where possible: unchanged files are not rewritten, and
+ * auto-registered schematics reuse an existing module file when it already contains the required import
+ * and registration entry.
+ *
+ * @example
+ * ```ts
+ * const result = runGenerateCommand('service', 'Post', './src');
+ *
+ * console.log(result.wiringBehavior);
+ * console.log(result.nextStepHint);
+ * ```
+ *
+ * @param kind Generator kind to execute.
+ * @param name Resource name supplied by the caller before normalization.
+ * @param baseDirectory Source directory that should receive the generated domain folder.
+ * @param options Optional generation flags that control overwrites, request DTO feature placement, and sibling-aware templates.
+ * @returns Structured file and wiring metadata for the completed generation run.
+ * @throws {Error} When the resource name is invalid, the generator kind is unknown, or the target module source cannot be updated safely.
+ */
+export declare function runGenerateCommand(kind: GeneratorKind, name: string, baseDirectory: string, options?: GenerateOptions): GenerateResult;
+//# sourceMappingURL=generate-command.d.ts.map

package/dist/generate-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-command.d.ts","sourceRoot":"","sources":["../src/generate-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAkB,MAAM,0BAA0B,CAAC;AAIvF,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAWjE,8EAA8E;AAC9E,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,eAAe,GAAG,kBAAkB,GAAG,eAAe,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;AAExI,0FAA0F;AAC1F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,oCAAoC;IACpC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAyIF;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,cAAc,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;CAC1D,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,cAAc,CAgE1I"}

package/dist/generate-command.js

@@ -0,0 +1,214 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { basename, dirname, join, normalize, relative, resolve, sep } from 'node:path';
+import { findGeneratorDefinition } from './generators/manifest.js';
+import { ensureModuleImport, generateModuleFiles, registerInModule } from './generators/module.js';
+import { toKebabCase, toPascalCase, toPlural } from './generators/utils.js';
+function writeFileIfChanged(filePath, content) {
+  if (existsSync(filePath) && readFileSync(filePath, 'utf8') === content) {
+    return false;
+  }
+  writeFileSync(filePath, content, 'utf8');
+  return true;
+}
+
+/** Describes how one generated artifact would interact with the workspace. */
+
+/** One path-level action reported by generate dry-run previews and structured results. */
+
+function planFileWrite(filePath, content, options) {
+  if (!existsSync(filePath)) {
+    return {
+      action: 'create',
+      path: filePath
+    };
+  }
+  if (!options.force) {
+    return {
+      action: 'skip',
+      path: filePath
+    };
+  }
+  if (readFileSync(filePath, 'utf8') === content) {
+    return {
+      action: 'unchanged',
+      path: filePath
+    };
+  }
+  return {
+    action: 'overwrite',
+    path: filePath
+  };
+}
+function planModuleWrite(modulePath, content) {
+  if (!existsSync(modulePath)) {
+    return {
+      action: 'module-create',
+      path: modulePath
+    };
+  }
+  if (readFileSync(modulePath, 'utf8') === content) {
+    return {
+      action: 'module-unchanged',
+      path: modulePath
+    };
+  }
+  return {
+    action: 'module-update',
+    path: modulePath
+  };
+}
+function createGeneratorOptions(kind, domainDirectory, kebab, options, resolvedBase) {
+  return {
+    ...options,
+    e2eRootModuleImport: options.e2eRootModuleImport ?? (kind === 'e2e' ? resolveE2eRootModuleImport(domainDirectory, resolvedBase) : undefined),
+    hasRepo: options.hasRepo ?? (kind === 'service' ? existsSync(join(domainDirectory, `${kebab}.repo.ts`)) : undefined),
+    hasService: options.hasService ?? (kind === 'controller' ? existsSync(join(domainDirectory, `${kebab}.service.ts`)) : undefined)
+  };
+}
+function toImportSpecifier(path) {
+  const normalized = path.split(sep).join('/');
+  return normalized.startsWith('.') ? normalized : `./${normalized}`;
+}
+function resolveE2eRootModuleImport(domainDirectory, resolvedBase) {
+  return toImportSpecifier(relative(domainDirectory, join(resolvedBase, 'app')));
+}
+function resolveDomainDirectory(kind, resolvedBase, kebab, options) {
+  if (kind === 'e2e') {
+    return basename(resolvedBase) === 'src' ? join(dirname(resolvedBase), 'test') : join(resolvedBase, 'test');
+  }
+  if (kind === 'request-dto' && options.targetFeature !== undefined) {
+    const normalizedFeature = options.targetFeature.trim();
+    const featureKebab = assertValidResourceName(normalizedFeature);
+    const featureDirectory = /^[A-Z]/u.test(normalizedFeature) ? toPlural(featureKebab) : featureKebab;
+    return join(resolvedBase, featureDirectory);
+  }
+  return join(resolvedBase, toPlural(kebab));
+}
+function assertValidResourceName(name) {
+  const kebab = toKebabCase(name);
+  if (name.trim().length === 0) {
+    throw new Error('Invalid resource name: name must not be empty.');
+  }
+  if (kebab !== normalize(kebab) || kebab.includes('/') || kebab.includes('\\') || kebab.includes('..')) {
+    throw new Error(`Invalid resource name "${name}": must not contain path separators or traversal sequences.`);
+  }
+  if (!/^[a-z0-9][a-z0-9-]*$/.test(kebab)) {
+    throw new Error(`Invalid resource name "${name}": use letters, numbers, spaces, underscores, or hyphens only.`);
+  }
+  return kebab;
+}
+function resolveModulePath(domainDirectory, name) {
+  const kebab = toKebabCase(name);
+  return join(domainDirectory, `${kebab}.module.ts`);
+}
+function readOrCreateModuleSource(modulePath, name) {
+  if (existsSync(modulePath)) {
+    return readFileSync(modulePath, 'utf8');
+  }
+  const [moduleFile] = generateModuleFiles(name);
+  if (!moduleFile) {
+    throw new Error(`Unable to generate module file for resource "${name}".`);
+  }
+  return moduleFile.content;
+}
+function buildUpdatedModuleSource(moduleSource, arrayKey, className, importPath) {
+  let source = moduleSource;
+  source = ensureModuleImport(source, className, importPath);
+  source = registerInModule(source, arrayKey, className);
+  return source;
+}
+function prepareModuleUpdate(domainDirectory, normalizedName, kind, classSuffix, arrayKey) {
+  const kebab = toKebabCase(normalizedName);
+  const modulePath = resolveModulePath(domainDirectory, normalizedName);
+  const className = `${toPascalCase(normalizedName)}${classSuffix}`;
+  const importPath = `${kebab}.${kind}`;
+  const moduleSource = readOrCreateModuleSource(modulePath, normalizedName);
+  return {
+    modulePath,
+    source: buildUpdatedModuleSource(moduleSource, arrayKey, className, importPath)
+  };
+}
+
+/**
+ * Structured result returned by {@link runGenerateCommand} for tooling-friendly automation.
+ *
+ * `generatedFiles` only includes files whose on-disk content changed during the command.
+ * `moduleRegistered` reports whether the target schematic participates in automatic module wiring,
+ * even when the target module file was already up to date.
+ */
+
+/**
+ * Generates one CLI schematic into a source directory and returns structured wiring metadata.
+ *
+ * The command keeps generation idempotent where possible: unchanged files are not rewritten, and
+ * auto-registered schematics reuse an existing module file when it already contains the required import
+ * and registration entry.
+ *
+ * @example
+ * ```ts
+ * const result = runGenerateCommand('service', 'Post', './src');
+ *
+ * console.log(result.wiringBehavior);
+ * console.log(result.nextStepHint);
+ * ```
+ *
+ * @param kind Generator kind to execute.
+ * @param name Resource name supplied by the caller before normalization.
+ * @param baseDirectory Source directory that should receive the generated domain folder.
+ * @param options Optional generation flags that control overwrites, request DTO feature placement, and sibling-aware templates.
+ * @returns Structured file and wiring metadata for the completed generation run.
+ * @throws {Error} When the resource name is invalid, the generator kind is unknown, or the target module source cannot be updated safely.
+ */
+export function runGenerateCommand(kind, name, baseDirectory, options = {}) {
+  const normalizedName = name.trim();
+  const kebab = assertValidResourceName(normalizedName);
+  const generator = findGeneratorDefinition(kind);
+  const resolvedBase = resolve(baseDirectory);
+  const domainDirectory = resolveDomainDirectory(kind, resolvedBase, kebab, options);
+  const generatorOptions = createGeneratorOptions(kind, domainDirectory, kebab, options, resolvedBase);
+  const files = generator.factory(normalizedName, generatorOptions);
+  const moduleRegistration = 'moduleRegistration' in generator ? generator.moduleRegistration : undefined;
+  const moduleUpdate = moduleRegistration ? prepareModuleUpdate(domainDirectory, normalizedName, kind, moduleRegistration.classSuffix, moduleRegistration.arrayKey) : undefined;
+  const plannedFiles = files.map(file => planFileWrite(join(domainDirectory, file.path), file.content, options));
+  const modulePlan = moduleUpdate ? planModuleWrite(moduleUpdate.modulePath, moduleUpdate.source) : undefined;
+  if (options.dryRun) {
+    return {
+      generatedFiles: [],
+      moduleRegistered: moduleUpdate !== undefined,
+      modulePath: moduleUpdate?.modulePath,
+      nextStepHint: generator.nextStepHint,
+      plannedFiles: modulePlan ? [...plannedFiles, modulePlan] : plannedFiles,
+      wiringBehavior: generator.wiringBehavior
+    };
+  }
+  mkdirSync(domainDirectory, {
+    recursive: true
+  });
+  const writtenPaths = files.map(file => {
+    const filePath = join(domainDirectory, file.path);
+    if (!options.force && existsSync(filePath)) {
+      return null;
+    }
+    return writeFileIfChanged(filePath, file.content) ? filePath : null;
+  }).filter(filePath => filePath !== null);
+  let moduleRegistered = false;
+  let resolvedModulePath;
+  if (moduleUpdate && writeFileIfChanged(moduleUpdate.modulePath, moduleUpdate.source)) {
+    moduleRegistered = true;
+    resolvedModulePath = moduleUpdate.modulePath;
+    if (!writtenPaths.includes(moduleUpdate.modulePath)) {
+      writtenPaths.push(moduleUpdate.modulePath);
+    }
+  } else if (moduleUpdate) {
+    moduleRegistered = true;
+    resolvedModulePath = moduleUpdate.modulePath;
+  }
+  return {
+    generatedFiles: writtenPaths,
+    moduleRegistered: moduleRegistered,
+    modulePath: resolvedModulePath,
+    nextStepHint: generator.nextStepHint,
+    plannedFiles: modulePlan ? [...plannedFiles, modulePlan] : plannedFiles,
+    wiringBehavior: generator.wiringBehavior
+  };
+}

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-export { runCli, type CliRuntimeOptions } from './run-cli.js';
-export { runGenerateCommand, type GeneratePlanAction, type GeneratePlanEntry, type GenerateResult } from './commands/generate.js';
-export { inspectUsage, runInspectCommand, type InspectCommandRuntimeOptions } from './commands/inspect.js';
-export { newUsage, runNewCommand, type NewCommandRuntimeOptions } from './commands/new.js';
 export { CliPromptCancelledError } from './prompt-cancel.js';
-export type { GenerateOptions, GeneratedFile, GeneratorKind, ModuleRegistration } from './types.js';
+export { type GeneratePlanAction, type GeneratePlanEntry, type GenerateResult, runGenerateCommand } from './public-generate.js';
+export { type InspectCommandRuntimeOptions, inspectUsage, runInspectCommand } from './public-inspect.js';
+export { type NewCommandRuntimeOptions, newUsage, runNewCommand } from './public-new.js';
+export { runTypegenCommand, TYPEGEN_EXIT_CODES, type TypegenCommandRuntimeOptions, typegenUsage } from './public-typegen.js';
+export { type CliRuntimeOptions, runCli } from './run-cli.js';
+export type { GeneratedFile, GenerateOptions, GeneratorKind, ModuleRegistration } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClI,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAC3G,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChI,OAAO,EAAE,KAAK,4BAA4B,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACzG,OAAO,EAAE,KAAK,wBAAwB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,KAAK,4BAA4B,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC7H,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9D,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,5 +1,6 @@
-export { runCli } from './run-cli.js';
-export { runGenerateCommand } from './commands/generate.js';
-export { inspectUsage, runInspectCommand } from './commands/inspect.js';
-export { newUsage, runNewCommand } from './commands/new.js';
-export { CliPromptCancelledError } from './prompt-cancel.js';
+export { CliPromptCancelledError } from './prompt-cancel.js';
+export { runGenerateCommand } from './public-generate.js';
+export { inspectUsage, runInspectCommand } from './public-inspect.js';
+export { newUsage, runNewCommand } from './public-new.js';
+export { runTypegenCommand, TYPEGEN_EXIT_CODES, typegenUsage } from './public-typegen.js';
+export { runCli } from './run-cli.js';

package/dist/new/install.js

@@ -23,7 +23,7 @@ function appendStreamOutput(stream, output) {
 function waitForChildProcess(child, capturedOutput) {
   return new Promise((resolve, reject) => {
     child.on('error', reject);
-    child.on('exit', code => {
+    child.on('close', code => {
       if (code === 0) {
         resolve();
         return;

package/dist/new/package-spec-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-spec-resolver.d.ts","sourceRoot":"","sources":["../../src/new/package-spec-resolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAkhBnD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,qBAAqB,GACnC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgCjC"}
+{"version":3,"file":"package-spec-resolver.d.ts","sourceRoot":"","sources":["../../src/new/package-spec-resolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAshBnD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,qBAAqB,GACnC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAiCjC"}

package/dist/new/package-spec-resolver.js

@@ -3,40 +3,35 @@ import { createHash } from 'node:crypto';
 import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
-const PACKAGE_DIRECTORY_BY_NAME = {
-  '@fluojs/platform-bun': 'platform-bun',
-  '@fluojs/cli': 'cli',
-  '@fluojs/config': 'config',
-  '@fluojs/core': 'core',
-  '@fluojs/di': 'di',
-  '@fluojs/http': 'http',
-  '@fluojs/platform-cloudflare-workers': 'platform-cloudflare-workers',
-  '@fluojs/platform-deno': 'platform-deno',
-  '@fluojs/microservices': 'microservices',
-  '@fluojs/platform-express': 'platform-express',
-  '@fluojs/platform-fastify': 'platform-fastify',
-  '@fluojs/platform-nodejs': 'platform-nodejs',
-  '@fluojs/runtime': 'runtime',
-  '@fluojs/testing': 'testing',
-  '@fluojs/validation': 'validation'
-};
 const LOCAL_PACKAGE_CACHE_DIR = join(tmpdir(), 'fluo-cli-local-packages');
 const LOCAL_PACKAGE_CACHE_STAMP_FILE = 'cache-stamp.json';
 const LOCAL_PACKAGE_CACHE_FORMAT_VERSION = 2;
 function expectedTarballName(packageName, version) {
   return `${packageName.replace(/^@/, '').replace(/\//g, '-')}-${version}.tgz`;
 }
-function readLocalPackageVersion(repoRoot, packageName) {
-  const packageDirectory = PACKAGE_DIRECTORY_BY_NAME[packageName];
-  const packageJson = JSON.parse(readFileSync(join(repoRoot, 'packages', packageDirectory, 'package.json'), 'utf8'));
-  return packageJson.version;
-}
-function readLocalPackageManifest(repoRoot, packageName) {
-  const packageDirectory = PACKAGE_DIRECTORY_BY_NAME[packageName];
-  return JSON.parse(readFileSync(join(repoRoot, 'packages', packageDirectory, 'package.json'), 'utf8'));
+function collectLocalPackages(repoRoot) {
+  const packagesByName = new Map();
+  const packagesRoot = join(repoRoot, 'packages');
+  for (const entry of readdirSync(packagesRoot, {
+    withFileTypes: true
+  })) {
+    const packageJsonPath = join(packagesRoot, entry.name, 'package.json');
+    if (!entry.isDirectory() || !existsSync(packageJsonPath)) {
+      continue;
+    }
+    const manifest = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+    if (typeof manifest.name !== 'string' || typeof manifest.version !== 'string') {
+      continue;
+    }
+    packagesByName.set(manifest.name, {
+      directory: entry.name,
+      manifest
+    });
+  }
+  return packagesByName;
 }
-function collectRequiredLocalPackages(repoRoot, bootstrapPlan) {
-  const pending = [...bootstrapPlan.dependencies.dependencies, ...bootstrapPlan.dependencies.devDependencies].filter(packageName => packageName in PACKAGE_DIRECTORY_BY_NAME);
+function collectRequiredLocalPackages(localPackages, bootstrapPlan) {
+  const pending = [...bootstrapPlan.dependencies.dependencies, ...bootstrapPlan.dependencies.devDependencies].filter(packageName => localPackages.has(packageName));
   const selected = new Set();
   while (pending.length > 0) {
     const packageName = pending.pop();
@@ -44,14 +39,13 @@ function collectRequiredLocalPackages(repoRoot, bootstrapPlan) {
       continue;
     }
     selected.add(packageName);
-    const manifest = readLocalPackageManifest(repoRoot, packageName);
+    const manifest = localPackages.get(packageName)?.manifest;
+    if (!manifest) {
+      continue;
+    }
     for (const section of ['dependencies', 'optionalDependencies', 'peerDependencies']) {
-      const dependencies = manifest[section];
-      if (!dependencies) {
-        continue;
-      }
-      for (const dependencyName of Object.keys(dependencies)) {
-        if (dependencyName in PACKAGE_DIRECTORY_BY_NAME) {
+      for (const dependencyName of Object.keys(manifest[section] ?? {})) {
+        if (localPackages.has(dependencyName)) {
           pending.push(dependencyName);
         }
       }
@@ -59,12 +53,8 @@ function collectRequiredLocalPackages(repoRoot, bootstrapPlan) {
   }
   return Array.from(selected);
 }
-function collectLocalPackageVersions(repoRoot, packageNames) {
-  const packageVersions = new Map();
-  for (const packageName of packageNames) {
-    packageVersions.set(packageName, readLocalPackageVersion(repoRoot, packageName));
-  }
-  return packageVersions;
+function collectLocalPackageVersions(localPackages, packageNames) {
+  return new Map(packageNames.map(packageName => [packageName, localPackages.get(packageName).manifest.version]));
 }
 function getPackageVersionOrThrow(packageVersions, packageName) {
   const packageVersion = packageVersions.get(packageName);
@@ -91,10 +81,10 @@ function runGitCommand(repoRoot, args) {
     return undefined;
   }
 }
-function createPackagePathArguments(packageNames) {
+function createPackagePathArguments(localPackages, packageNames) {
   const packagePaths = new Set();
   for (const packageName of packageNames) {
-    const packageDirectory = PACKAGE_DIRECTORY_BY_NAME[packageName];
+    const packageDirectory = localPackages.get(packageName).directory;
     const packageRoot = join('packages', packageDirectory);
     packagePaths.add(packageRoot);
     packagePaths.add(join(packageRoot, 'src'));
@@ -139,8 +129,8 @@ function collectPackageStagePaths(packageRoot, manifest) {
   }
   return Array.from(stagePaths);
 }
-function stagePackageForPacking(repoRoot, packageName, packageVersions, outputDirectory) {
-  const packageDirectory = PACKAGE_DIRECTORY_BY_NAME[packageName];
+function stagePackageForPacking(repoRoot, localPackages, packageName, packageVersions, outputDirectory) {
+  const packageDirectory = localPackages.get(packageName).directory;
   const packageRoot = join(repoRoot, 'packages', packageDirectory);
   const stageDirectory = join(outputDirectory, `.stage-${packageDirectory}`);
   const manifest = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'));
@@ -158,12 +148,12 @@ function stagePackageForPacking(repoRoot, packageName, packageVersions, outputDi
   writeFileSync(join(stageDirectory, 'package.json'), `${JSON.stringify(manifest, null, 2)}\n`, 'utf8');
   return stageDirectory;
 }
-function computeLocalPackageCacheStamp(repoRoot, packageNames, packageVersions) {
+function computeLocalPackageCacheStamp(repoRoot, localPackages, packageNames, packageVersions) {
   const headCommit = runGitCommand(repoRoot, ['rev-parse', 'HEAD']);
   if (!headCommit) {
     return undefined;
   }
-  const packagePaths = createPackagePathArguments(packageNames);
+  const packagePaths = createPackagePathArguments(localPackages, packageNames);
   const dirtyFingerprint = runGitCommand(repoRoot, ['status', '--porcelain', '--', ...packagePaths]);
   if (dirtyFingerprint === undefined) {
     return undefined;
@@ -246,8 +236,8 @@ function latestModifiedTimeMs(path) {
   }
   return latest;
 }
-function packageHasOutdatedBuildOutput(repoRoot, packageName) {
-  const packageDirectory = PACKAGE_DIRECTORY_BY_NAME[packageName];
+function packageHasOutdatedBuildOutput(repoRoot, localPackages, packageName) {
+  const packageDirectory = localPackages.get(packageName).directory;
   const packageRoot = join(repoRoot, 'packages', packageDirectory);
   const distDirectory = join(packageRoot, 'dist');
   if (!existsSync(distDirectory)) {
@@ -264,8 +254,8 @@ function packageHasOutdatedBuildOutput(repoRoot, packageName) {
   const latestDist = latestModifiedTimeMs(distDirectory);
   return latestDist < latestSource;
 }
-function shouldRunWorkspaceBuild(repoRoot, packageNames) {
-  return packageNames.some(packageName => packageHasOutdatedBuildOutput(repoRoot, packageName));
+function shouldRunWorkspaceBuild(repoRoot, localPackages, packageNames) {
+  return packageNames.some(packageName => packageHasOutdatedBuildOutput(repoRoot, localPackages, packageName));
 }
 function runPackCommand(packageDirectory, outputDirectory) {
   return new Promise((resolvePromise, reject) => {
@@ -299,16 +289,16 @@ function runWorkspaceBuild(repoRoot) {
     });
   });
 }
-async function ensureWorkspaceBuildOutput(repoRoot, packageNames) {
-  if (shouldRunWorkspaceBuild(repoRoot, packageNames)) {
+async function ensureWorkspaceBuildOutput(repoRoot, localPackages, packageNames) {
+  if (shouldRunWorkspaceBuild(repoRoot, localPackages, packageNames)) {
     await runWorkspaceBuild(repoRoot);
   }
 }
-async function packLocalPackages(repoRoot, outputDirectory, packageNames, packageVersions) {
+async function packLocalPackages(repoRoot, localPackages, outputDirectory, packageNames, packageVersions) {
   for (const packageName of packageNames) {
     const packageVersion = getPackageVersionOrThrow(packageVersions, packageName);
     const tarballName = expectedTarballName(packageName, packageVersion);
-    const stageDirectory = stagePackageForPacking(repoRoot, packageName, packageVersions, outputDirectory);
+    const stageDirectory = stagePackageForPacking(repoRoot, localPackages, packageName, packageVersions, outputDirectory);
     try {
       await runPackCommand(stageDirectory, outputDirectory);
     } finally {
@@ -384,15 +374,16 @@ export async function resolvePackageSpecs(options, bootstrapPlan) {
   mkdirSync(outputDirectory, {
     recursive: true
   });
-  const packageNames = collectRequiredLocalPackages(repoRoot, bootstrapPlan);
-  const packageVersions = collectLocalPackageVersions(repoRoot, packageNames);
-  const expectedCacheStamp = computeLocalPackageCacheStamp(repoRoot, packageNames, packageVersions);
+  const localPackages = collectLocalPackages(repoRoot);
+  const packageNames = collectRequiredLocalPackages(localPackages, bootstrapPlan);
+  const packageVersions = collectLocalPackageVersions(localPackages, packageNames);
+  const expectedCacheStamp = computeLocalPackageCacheStamp(repoRoot, localPackages, packageNames, packageVersions);
   const currentCacheStamp = readLocalPackageCacheStamp(cacheStampPath);
   const canReuseCachedTarballs = expectedCacheStamp ? cacheStampMatches(expectedCacheStamp, currentCacheStamp) && cacheContainsTarballs(outputDirectory, packageNames, packageVersions) : false;
   if (!canReuseCachedTarballs) {
-    await ensureWorkspaceBuildOutput(repoRoot, packageNames);
+    await ensureWorkspaceBuildOutput(repoRoot, localPackages, packageNames);
     clearLocalPackageCacheArtifacts(outputDirectory);
-    await packLocalPackages(repoRoot, outputDirectory, packageNames, packageVersions);
+    await packLocalPackages(repoRoot, localPackages, outputDirectory, packageNames, packageVersions);
     if (expectedCacheStamp) {
       writeFileSync(cacheStampPath, `${JSON.stringify(expectedCacheStamp, null, 2)}\n`, 'utf8');
     } else {

package/dist/new/prompt.d.ts

@@ -22,6 +22,7 @@ export interface BootstrapPrompter {
 export interface ResolveBootstrapAnswersOptions {
     completionMessage?: string | ((answers: BootstrapAnswers) => string);
     interactive?: boolean;
+    onInteractivePrompt?: () => void;
     prompt?: BootstrapPrompter;
     stdin?: ReadableStream;
     stdout?: WritableStream;

package/dist/new/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/new/prompt.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGnE,iEAAiE;AACjE,eAAO,MAAM,uBAAuB,EAAE,cAAuB,CAAC;AAI9D,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAQF,iEAAiE;AACjE,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7G,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC;AAED,8EAA8E;AAC9E,MAAM,WAAW,8BAA8B;IAC7C,iBAAiB,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC,CAAC;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAwPD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,GACjB,cAAc,CAIhB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,GACjB,gBAAgB,CAgBlB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,GAAE,8BAAmC,GAC3C,OAAO,CAAC,gBAAgB,CAAC,CA0B3B"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/new/prompt.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnE,iEAAiE;AACjE,eAAO,MAAM,uBAAuB,EAAE,cAAuB,CAAC;AAQ9D,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAaF,iEAAiE;AACjE,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7G,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC;AAED,8EAA8E;AAC9E,MAAM,WAAW,8BAA8B;IAC7C,iBAAiB,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC,CAAC;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAyRD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,GACjB,cAAc,CAIhB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,GACjB,gBAAgB,CAiBlB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,GAAE,8BAAmC,GAC3C,OAAO,CAAC,gBAAgB,CAAC,CA4B3B"}