@workos/oagen 0.24.6 → 0.25.1

package/dist/cli/index.mjs

@@ -2534,13 +2534,14 @@ function flattenDiscriminatedUnionBody(schema) {
 /** Derive a unique variant name for a oneOf inline model. */
 function deriveOneOfVariantName(variant, baseName, existingModels) {
 	if (variant.properties) {
-		for (const [, propSchema] of Object.entries(variant.properties)) if (propSchema?.const && typeof propSchema.const === "string") return toPascalCase(propSchema.const) + baseName.replace(/Request$/, "") + "Request";
+		for (const [, propSchema] of Object.entries(variant.properties)) if (propSchema?.const && typeof propSchema.const === "string") return resolveSchemaName(toPascalCase(propSchema.const) + baseName.replace(/Request$/, "") + "Request");
 	}
 	const existingNames = new Set(existingModels.map((m) => m.name));
-	let name = baseName;
+	const transformedBaseName = resolveSchemaName(baseName);
+	let name = transformedBaseName;
 	let suffix = 2;
 	while (existingNames.has(name)) {
-		name = `${baseName}${suffix}`;
+		name = `${transformedBaseName}${suffix}`;
 		suffix++;
 	}
 	return name;
@@ -5780,11 +5781,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 +5828,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 +5874,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 +5903,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) {