@kubb/plugin-faker 5.1.10 → 5.1.11

package/dist/index.js

@@ -1,5 +1,5 @@
 import { posix } from "node:path";
-import { Diagnostics, Resolver, addGenerator, assertPluginOption, ast, containsCircularRef, createResolver, defineExtension, defineGenerator, setMacros, setResolver } from "kubb/kit";
+import { Diagnostics, Resolver, addGenerator, ast, containsCircularRef, createResolver, defineExtension, defineGenerator, setMacros, setResolver } from "kubb/kit";
 import { File, Function, jsxRenderer } from "kubb/jsx";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import { buildParams, enumTypeName, pluginTsName } from "@kubb/plugin-ts";
@@ -396,6 +396,12 @@ const NON_INLINABLE_RESPONSE_TYPES = /* @__PURE__ */ new Set([
 function canOverrideSchema(node) {
 	return !NON_OVERRIDABLE_TYPES.has(node.type);
 }
+/**
+* Follows a ref, including alias chains, to the schema it resolves to. Unresolved refs are returned as is.
+*/
+function resolveRefTarget(node) {
+	return node.type === "ref" && node.schema ? resolveRefTarget(node.schema) : node;
+}
 function shouldInlineSingleResponseSchema(schema) {
 	return !NON_INLINABLE_RESPONSE_TYPES.has(schema.type);
 }
@@ -486,7 +492,7 @@ function resolveFakerTypeUsage(node, typeName, canOverride) {
 	return {
 		dataType,
 		returnType,
-		usesTypeName: dataType.includes(typeName) || Boolean(returnType?.includes(typeName))
+		usesTypeName: canOverride && dataType.includes(typeName) || Boolean(returnType?.includes(typeName))
 	};
 }
 //#endregion
@@ -890,18 +896,22 @@ function parseEnumValue(value) {
 	return value;
 }
 /**
-* Reads the discriminator literal off a variant, or `undefined` when it can't be determined.
+* Reads the discriminator literal off a variant, with whether its property is required, or
+* `undefined` when it can't be determined.
 *
 * A variant carries exactly one discriminator value, so a property resolving to several literals
 * (a `ref` to the enum shared by every branch, say) identifies no branch and narrows nothing.
 */
-function getDiscriminatorValue(member, discriminatorPropertyName) {
+function getDiscriminator(member, discriminatorPropertyName) {
 	for (const property of ast.resolveSchemaProperties({
 		node: member,
 		propertyName: discriminatorPropertyName
 	})) {
 		const values = ast.getSchemaLiteralValues(property.schema);
-		if (values.length === 1) return values[0];
+		if (values.length === 1) return {
+			value: values[0],
+			required: property.required
+		};
 	}
 }
 /**
@@ -973,7 +983,7 @@ const printerFaker = ast.createPrinter((options) => {
 				});
 				if (this.options.schemaName && refName === this.options.schemaName) return this.options.typeName ? `undefined as unknown as ${this.options.typeName}` : "undefined as unknown";
 				const resolvedName = node.ref ? this.options.resolver.name(refName) : refName;
-				if (!this.options.nestedInObject) return `${resolvedName}(data)`;
+				if (!this.options.nestedInObject && canOverrideSchema(resolveRefTarget(node))) return `${resolvedName}(data)`;
 				return `${resolvedName}()`;
 			},
 			enum(node) {
@@ -984,9 +994,10 @@ const printerFaker = ast.createPrinter((options) => {
 				const { discriminatorPropertyName } = node;
 				const baseTypeName = this.options.typeName;
 				return `faker.helpers.arrayElement([${mapSchemaMembers(node, (member) => {
-					const value = discriminatorPropertyName ? getDiscriminatorValue(member, discriminatorPropertyName) : void 0;
-					if (baseTypeName && value !== void 0) {
-						const typeName = `Extract<NonNullable<${baseTypeName}>, { ${JSON.stringify(discriminatorPropertyName)}: ${parseEnumValue(value)} }>`;
+					const discriminator = discriminatorPropertyName ? getDiscriminator(member, discriminatorPropertyName) : void 0;
+					if (baseTypeName && discriminator) {
+						const key = `${JSON.stringify(discriminatorPropertyName)}${discriminator.required ? "" : "?"}`;
+						const typeName = `Extract<NonNullable<${baseTypeName}>, { ${key}: ${parseEnumValue(discriminator.value)} }>`;
 						return printNested(member, {
 							typeName,
 							nestedInObject: true,
@@ -1396,7 +1407,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.1.10";
+var version = "5.1.11";
 //#endregion
 //#region src/resolvers/resolverFaker.ts
 /**
@@ -1464,18 +1475,6 @@ const pluginFaker = defineExtension({
 			path: "mocks",
 			barrel: { type: "named" }
 		}, seed, locale = "en", group, exclude = [], include, override = [], typeMode = "inferred", dateParser = "faker", regexGenerator = "faker", printer, resolver: userResolver, macros: userMacros } = options;
-		assertPluginOption({
-			plugin: pluginFakerName,
-			option: "typeMode",
-			value: typeMode,
-			allowed: ["inferred", "schema"]
-		});
-		assertPluginOption({
-			plugin: pluginFakerName,
-			option: "regexGenerator",
-			value: regexGenerator,
-			allowed: ["faker", "randexp"]
-		});
 		setResolver(userResolver ? Resolver.merge(resolverFaker, userResolver) : resolverFaker);
 		if (userMacros?.length) setMacros(userMacros);
 		addGenerator(fakerGenerator);