@workos/oagen 0.8.0 → 0.9.0

package/dist/cli/index.mjs

@@ -4771,8 +4771,7 @@ function generateAllFiles(spec, emitter, ctx) {
 		...emitter.generateClient(spec, ctx),
 		...emitter.generateErrors(ctx),
 		...emitter.generateTypeSignatures?.(reachableSpec, ctx) ?? [],
-		...emitter.generateTests(reachableSpec, ctx),
-		...emitter.generateManifest?.(spec, ctx) ?? []
+		...emitter.generateTests(reachableSpec, ctx)
 	];
 }
 /** Apply file header to generated files, respecting headerPlacement and JSON files. */
@@ -4786,11 +4785,13 @@ function applyFileHeaders(files, header) {
 function generateFiles(spec, emitter, options) {
 	const ctx = buildEmitterContext(spec, options);
 	const files = generateAllFiles(spec, emitter, ctx);
+	const operations = emitter.buildOperationsMap?.(spec, ctx);
 	const header = emitter.fileHeader();
 	return {
 		files: applyFileHeaders(files, header),
 		ctx,
-		header
+		header,
+		operations
 	};
 }
 //#endregion
@@ -5056,7 +5057,8 @@ async function writeManifest(dir, opts) {
 		...opts.emitterVersion !== void 0 ? { emitterVersion: opts.emitterVersion } : {},
 		...opts.configSha !== void 0 ? { configSha: opts.configSha } : {},
 		...opts.compatSchemaVersion !== void 0 ? { compatSchemaVersion: opts.compatSchemaVersion } : {},
-		files: [...new Set(opts.files)].sort()
+		files: [...new Set(opts.files)].sort(),
+		...opts.operations !== void 0 ? { operations: opts.operations } : {}
 	};
 	const manifestPath = path$1.join(dir, MANIFEST_FILENAME);
 	await fs.mkdir(dir, { recursive: true });
@@ -5138,7 +5140,7 @@ async function removeEmptyParents(startDir, stopDir) {
 async function generate(spec, emitter, options) {
 	const targetManifestForCtx = options.target && !options.noPrune ? await readManifest(options.target) : null;
 	const priorTargetManifestPaths = targetManifestForCtx ? new Set(targetManifestForCtx.files) : void 0;
-	const { files: withHeaders, header } = generateFiles(spec, emitter, {
+	const { files: withHeaders, header, operations } = generateFiles(spec, emitter, {
 		...options,
 		priorTargetManifestPaths
 	});
@@ -5164,7 +5166,8 @@ async function generate(spec, emitter, options) {
 		currentPaths: outputEmittedPaths,
 		language: emitter.language,
 		header,
-		noPrune: options.noPrune
+		noPrune: options.noPrune,
+		operations
 	});
 	const allOutputFiles = [...writeResult.written, ...writeResult.merged];
 	if (allOutputFiles.length > 0) await formatTargetFiles(emitter, options.outputDir, allOutputFiles);
@@ -5186,7 +5189,8 @@ async function generate(spec, emitter, options) {
 			currentPaths: targetResult.emittedPaths,
 			language: emitter.language,
 			header,
-			noPrune: options.noPrune
+			noPrune: options.noPrune,
+			operations
 		});
 		const allTargetFiles = [
 			...targetResult.written,
@@ -5202,19 +5206,18 @@ async function generate(spec, emitter, options) {
 * then write the fresh manifest.  Safe on first adoption (no previous manifest).
 */
 async function applyManifestPrune(opts) {
+	const manifestOpts = {
+		language: opts.language,
+		files: opts.currentPaths,
+		operations: opts.operations
+	};
 	if (opts.noPrune) {
-		await writeManifest(opts.dir, {
-			language: opts.language,
-			files: opts.currentPaths
-		});
+		await writeManifest(opts.dir, manifestOpts);
 		return;
 	}
 	if (!opts.prevManifest) {
 		console.log(`${opts.label}: no ${MANIFEST_FILENAME} found — skipping prune (this baseline manifest will be written now).`);
-		await writeManifest(opts.dir, {
-			language: opts.language,
-			files: opts.currentPaths
-		});
+		await writeManifest(opts.dir, manifestOpts);
 		return;
 	}
 	const stale = computeStalePaths(opts.prevManifest, opts.currentPaths);
@@ -5226,10 +5229,7 @@ async function applyManifestPrune(opts) {
 			for (const p of preserved) console.log(`  ${p}`);
 		}
 	}
-	await writeManifest(opts.dir, {
-		language: opts.language,
-		files: opts.currentPaths
-	});
+	await writeManifest(opts.dir, manifestOpts);
 }
 //#endregion
 //#region src/engine/registry.ts
@@ -5740,7 +5740,7 @@ function patchOverlay(overlay, changes, baseline) {
 			if (baseClass && baseClass.methods[methodName]?.length > 0) {
 				const httpKey = overlay.httpKeyByMethod.get(`${className}.${methodName}`);
 				if (!httpKey && overlay.httpKeyByMethod.size === 0 && !warnedManifest) {
-					console.warn("Warning: No smoke-manifest.json available. Method-level violations cannot be auto-patched. Implement generateManifest in your emitter for the self-correcting loop to resolve these.");
+					console.warn("Warning: No operations map in .oagen-manifest.json. Method-level violations cannot be auto-patched. Implement buildOperationsMap in your emitter for the self-correcting loop to resolve these.");
 					warnedManifest = true;
 				}
 				if (httpKey) {
@@ -5774,6 +5774,49 @@ function getExtractor(language) {
 	return extractor;
 }
 //#endregion
+//#region src/engine/manifest-reader.ts
+/**
+* Read the operations map from `.oagen-manifest.json` in the given directory
+* and convert it to `ManifestEntry[]` for the overlay builder.
+*
+* Returns undefined if the manifest is absent or has no operations field.
+*/
+function readManifestSync(dir) {
+	const manifestPath = path$1.join(dir, MANIFEST_FILENAME);
+	if (!existsSync(manifestPath)) return void 0;
+	try {
+		const operations = JSON.parse(readFileSync(manifestPath, "utf-8"))?.operations;
+		if (!operations || typeof operations !== "object") return void 0;
+		return convertOperationsToManifestEntries(operations);
+	} catch {
+		return;
+	}
+}
+/** Convert the operations map from .oagen-manifest.json into ManifestEntry[]. */
+function convertOperationsToManifestEntries(operations) {
+	const entries = [];
+	for (const [httpKey, value] of Object.entries(operations)) {
+		const spaceIdx = httpKey.indexOf(" ");
+		const httpMethod = httpKey.slice(0, spaceIdx);
+		const httpPath = httpKey.slice(spaceIdx + 1);
+		const values = Array.isArray(value) ? value : [value];
+		for (const v of values) {
+			const entry = v;
+			entries.push({
+				operationId: "",
+				sdkResourceProperty: entry.service ?? "",
+				sdkMethodName: entry.sdkMethod ?? "",
+				httpMethod,
+				path: httpPath,
+				pathParams: [],
+				bodyFields: [],
+				queryFields: []
+			});
+		}
+	}
+	return entries;
+}
+//#endregion
 //#region src/cli/overlay-loader.ts
 /**
 * Load an API surface from disk, discover/load the manifest, resolve
@@ -5792,30 +5835,7 @@ function loadOverlayContext(opts) {
 	} catch (err) {
 		throw new ConfigError(`Failed to parse API surface JSON: ${err instanceof Error ? err.message : String(err)}`, `Ensure "${opts.apiSurfacePath}" contains valid JSON. Re-run \`oagen extract\` to regenerate it.`);
 	}
-	let manifest;
-	const resolvedManifestPath = opts.manifestPath ?? path$1.join(opts.outputDir, "smoke-manifest.json");
-	if (opts.manifestPath || existsSync(resolvedManifestPath)) try {
-		const parsed = JSON.parse(readFileSync(resolvedManifestPath, "utf-8"));
-		if (Array.isArray(parsed)) manifest = parsed;
-		else if (typeof parsed === "object" && parsed !== null) manifest = Object.entries(parsed).map(([httpKey, value]) => {
-			const spaceIdx = httpKey.indexOf(" ");
-			const httpMethod = httpKey.slice(0, spaceIdx);
-			const httpPath = httpKey.slice(spaceIdx + 1);
-			const v = value;
-			return {
-				operationId: "",
-				sdkResourceProperty: v.service ?? "",
-				sdkMethodName: v.sdkMethod ?? "",
-				httpMethod,
-				path: httpPath,
-				pathParams: [],
-				bodyFields: [],
-				queryFields: []
-			};
-		});
-	} catch {
-		if (opts.manifestPath) throw new ConfigError(`Failed to read manifest: ${resolvedManifestPath}`, `Verify the manifest file exists and contains valid JSON. If using --manifest, check the path is correct.`);
-	}
+	const manifest = readManifestSync(opts.outputDir);
 	let hints = nodeHints;
 	try {
 		hints = getExtractor(opts.lang).hints;
@@ -5896,7 +5916,6 @@ async function generateCommand(opts) {
 	if (opts.apiSurface && opts.compatCheck !== false) {
 		const ctx = loadOverlayContext({
 			apiSurfacePath: opts.apiSurface,
-			manifestPath: opts.manifest,
 			outputDir: opts.output,
 			lang: opts.lang,
 			spec: ir
@@ -7454,37 +7473,9 @@ function cleanGeneratedFiles(dir) {
 		} catch {}
 	}
 }
-/**
-* Load a smoke-manifest.json from the generated SDK directory and convert
-* it to ManifestEntry[] for the overlay builder.
-*/
-function loadManifestFromDir(outputDir) {
-	const manifestPath = path$1.join(outputDir, "smoke-manifest.json");
-	if (!existsSync(manifestPath)) return void 0;
-	try {
-		const parsed = JSON.parse(readFileSync(manifestPath, "utf-8"));
-		if (Array.isArray(parsed)) return parsed;
-		if (typeof parsed === "object" && parsed !== null) return Object.entries(parsed).map(([httpKey, value]) => {
-			const spaceIdx = httpKey.indexOf(" ");
-			const httpMethod = httpKey.slice(0, spaceIdx);
-			const httpPath = httpKey.slice(spaceIdx + 1);
-			const v = value;
-			return {
-				operationId: "",
-				sdkResourceProperty: v.service ?? "",
-				sdkMethodName: v.sdkMethod ?? "",
-				httpMethod,
-				path: httpPath,
-				pathParams: [],
-				bodyFields: [],
-				queryFields: []
-			};
-		});
-	} catch {}
-}
 async function runOverlayRetryLoop(opts) {
 	const { baseline, parsedSpec, outputDir, lang, maxRetries, namespace, onRetry } = opts;
-	let overlay = buildOverlayLookup(baseline, loadManifestFromDir(outputDir), parsedSpec, getExtractor(lang).hints);
+	let overlay = buildOverlayLookup(baseline, readManifestSync(outputDir), parsedSpec, getExtractor(lang).hints);
 	let prevPreserved = -1;
 	const patchedPerIteration = [];
 	for (let attempt = 0; attempt <= maxRetries; attempt++) {
@@ -8039,8 +8030,8 @@ export const ${`${toCamelCase(lang)}Emitter`}: Emitter = {
     return [];
   },
 
-  generateManifest(_spec: ApiSpec, _ctx: EmitterContext): GeneratedFile[] {
-    return [];
+  buildOperationsMap(_spec: ApiSpec, _ctx: EmitterContext) {
+    return {};
   },
 
   fileHeader(): string {
@@ -8254,7 +8245,7 @@ program.command("parse").description("Parse an OpenAPI spec and output IR as JSO
 	}
 	return parseCommand(opts);
 });
-program.command("generate").description("Run a registered emitter against an OpenAPI spec").option("--spec <path>", "Path to OpenAPI spec file (or set OPENAPI_SPEC_PATH)").requiredOption("--lang <language>", "Target language").requiredOption("--output <dir>", "Output directory").option("--target <dir>", "Target directory for live SDK integration (merged output)").option("--namespace <name>", "SDK namespace/package name").option("--dry-run", "Preview files without writing").option("--api-surface <path>", "Path to baseline API surface JSON for compat overlay").option("--manifest <path>", "Path to smoke-manifest.json for method overlay").option("--no-compat-check", "Skip compat overlay even if --api-surface is provided").option("--no-prune", "Skip deletion of stale files recorded in the previous .oagen-manifest.json").action((opts) => {
+program.command("generate").description("Run a registered emitter against an OpenAPI spec").option("--spec <path>", "Path to OpenAPI spec file (or set OPENAPI_SPEC_PATH)").requiredOption("--lang <language>", "Target language").requiredOption("--output <dir>", "Output directory").option("--target <dir>", "Target directory for live SDK integration (merged output)").option("--namespace <name>", "SDK namespace/package name").option("--dry-run", "Preview files without writing").option("--api-surface <path>", "Path to baseline API surface JSON for compat overlay").option("--no-compat-check", "Skip compat overlay even if --api-surface is provided").option("--no-prune", "Skip deletion of stale files recorded in the previous .oagen-manifest.json").action((opts) => {
 	opts.spec ??= process.env.OPENAPI_SPEC_PATH;
 	if (!opts.spec) {
 		console.error("error: --spec <path> or OPENAPI_SPEC_PATH env var is required");