@workos/oagen 0.24.5 → 0.25.0

package/dist/cli/index.mjs

@@ -5780,11 +5780,44 @@ function deriveMethodName(op, _service) {
 	return `${verb}_${verb === "list" ? resource : noun}`;
 }
 /**
+* Resolve a service name to its mount target.
+*
+* Rule keys are either exact service names or trailing-`*` prefix patterns
+* (e.g. `UserManagement*`). Precedence:
+*
+*   1. An exact key always wins.
+*   2. Otherwise the wildcard with the longest prefix wins, so
+*      `UserManagementOrganizationMembership*` beats `UserManagement*`.
+*
+* Matching is plain string comparison (`startsWith`) — `*` is only recognised
+* as the final character and no regex is ever built from rule keys.
+*
+* @param name - The IR service name to resolve.
+* @param mounts - Exact-name or trailing-`*` pattern → target service mappings.
+* @returns The mount target, or `name` unchanged when no rule matches.
+*/
+function resolveMountTarget(name, mounts) {
+	const exact = mounts[name];
+	if (exact !== void 0) return exact;
+	let best;
+	let bestLen = -1;
+	for (const [pattern, target] of Object.entries(mounts)) {
+		if (!pattern.endsWith("*")) continue;
+		const prefix = pattern.slice(0, -1);
+		if (name.startsWith(prefix) && prefix.length > bestLen) {
+			best = target;
+			bestLen = prefix.length;
+		}
+	}
+	return best ?? name;
+}
+/**
 * Resolve all operations in the spec, applying hints and mount rules.
 *
 * @param spec - The parsed API spec
 * @param hints - Per-operation overrides keyed by "METHOD /path"
-* @param mountRules - Service name → target service mappings
+* @param mountRules - Service name → target service mappings; keys may be
+*   exact names or trailing-`*` prefix patterns (see {@link resolveMountTarget})
 * @returns Resolved operations ready for emitter consumption
 */
 function resolveOperations(spec, hints, mountRules) {
@@ -5794,7 +5827,7 @@ function resolveOperations(spec, hints, mountRules) {
 	for (const service of spec.services) for (const op of service.operations) {
 		const hint = hintMap[`${op.httpMethod.toUpperCase()} ${op.path}`];
 		const methodName = hint?.name ?? deriveMethodName(op, service);
-		const mountOn = hint?.mountOn ?? mounts[service.name] ?? service.name;
+		const mountOn = hint?.mountOn ?? resolveMountTarget(service.name, mounts);
 		let wrappers;
 		if (hint?.split) wrappers = hint.split.map((sh) => ({
 			name: sh.name,
@@ -5840,16 +5873,18 @@ function resolveResponseModelName(op) {
 *
 * Matching is on the POST-MOUNT name. Mount resolution never mutates
 * `spec.services` — the post-mount target lives on `ResolvedOperation.mountOn`
-* (`mountOn = hint?.mountOn ?? mountRules[service.name] ?? service.name`) — so the
-* post-mount name of a source service is derived here as
-* `mountRules[service.name] ?? service.name`. Selecting a target (e.g.
+* (`mountOn = hint?.mountOn ?? resolveMountTarget(service.name, mountRules)`) — so
+* the post-mount name of a source service is derived here with the same
+* `resolveMountTarget` (exact rules and trailing-`*` prefix rules, longest
+* prefix wins). Selecting a target (e.g.
 * `DirectorySync`) is valid because every source tag that mounts into it
 * (`DirectoryUsers`, `DirectoryGroups`, …) shares that post-mount name, and the
 * emitters group resources by mount, so all siblings emit together.
 *
 * @param spec - The parsed API spec (never mutated; never filtered).
 * @param selected - Post-mount service names from `--services` (normalized/trimmed).
-* @param mountRules - Source-service-name → post-mount-target mappings.
+* @param mountRules - Source-service-name (exact or trailing-`*` prefix pattern)
+*   → post-mount-target mappings.
 * @returns The validated selection as a `Set` of post-mount names.
 * @throws A `ConfigError` listing valid post-mount names when a selection is
 *   unknown — scoped generation never silently emits the wrong set.
@@ -5867,8 +5902,7 @@ function canonicalServiceKey(name) {
 }
 function resolveScopedServices(spec, selected, mountRules) {
 	const mounts = mountRules ?? {};
-	const postMountName = (name) => mounts[name] ?? name;
-	const validPostMount = new Set(spec.services.map((s) => postMountName(s.name)));
+	const validPostMount = new Set(spec.services.map((s) => resolveMountTarget(s.name, mounts)));
 	const selectedSet = new Set(selected);
 	const unknown = [...selectedSet].filter((s) => !validPostMount.has(s));
 	if (unknown.length > 0) {
@@ -6304,7 +6338,7 @@ async function readManifest(dir) {
 	}
 	try {
 		const parsed = JSON.parse(raw);
-		if (typeof parsed.version !== "number" || typeof parsed.language !== "string" || typeof parsed.generatedAt !== "string" || !Array.isArray(parsed.files) || !parsed.files.every((p) => typeof p === "string")) return null;
+		if (typeof parsed.version !== "number" || typeof parsed.language !== "string" || !Array.isArray(parsed.files) || !parsed.files.every((p) => typeof p === "string")) return null;
 		if (parsed.version > MANIFEST_VERSION) {
 			console.warn(`[oagen] ${MANIFEST_FILENAME} schema version ${parsed.version} is newer than supported (${MANIFEST_VERSION}); ignoring for pruning.`);
 			return null;
@@ -6321,7 +6355,6 @@ async function writeManifest(dir, opts) {
 		version: MANIFEST_VERSION,
 		language: opts.language,
 		...opts.sdkName !== void 0 ? { sdkName: opts.sdkName } : {},
-		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		...opts.specSha !== void 0 ? { specSha: opts.specSha } : {},
 		...opts.specPath !== void 0 ? { specPath: opts.specPath } : {},
 		...opts.emitterSha !== void 0 ? { emitterSha: opts.emitterSha } : {},
@@ -6331,16 +6364,9 @@ async function writeManifest(dir, opts) {
 		files: [...new Set(opts.files)].sort(),
 		...opts.operations !== void 0 ? { operations: opts.operations } : {}
 	};
-	const previous = await readManifest(dir);
-	if (previous && sameManifestExceptGeneratedAt(previous, manifest)) manifest.generatedAt = previous.generatedAt;
 	await fs.mkdir(dir, { recursive: true });
 	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
 }
-function sameManifestExceptGeneratedAt(a, b) {
-	const { generatedAt: _aGeneratedAt, ...aComparable } = a;
-	const { generatedAt: _bGeneratedAt, ...bComparable } = b;
-	return JSON.stringify(aComparable) === JSON.stringify(bComparable);
-}
 /** Return the set of previous paths no longer present in the current emission. */
 function computeStalePaths(prev, currentPaths) {
 	const current = new Set(currentPaths);