@kubb/plugin-ts 5.0.0-alpha.23 → 5.0.0-alpha.24

package/dist/index.cjs

@@ -434,8 +434,7 @@ function getEnumNames({ node, enumType, enumTypeSuffix, resolver }) {
 	const resolved = resolver.default(node.name, "type");
 	return {
 		enumName: enumType === "asPascalConst" ? resolved : camelCase(node.name),
-		typeName: ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) ? resolver.resolveEnumKeyName(node, enumTypeSuffix) : resolved,
-		refName: resolved
+		typeName: ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) ? resolver.resolveEnumKeyName(node, enumTypeSuffix) : resolved
 	};
 }
 /**
@@ -616,7 +615,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => {
 			ref(node) {
 				if (!node.name) return;
 				const refName = node.ref ? node.ref.split("/").at(-1) ?? node.name : node.name;
-				return createTypeReferenceNode(node.ref ? this.options.resolver.default(refName, "type") : refName, void 0);
+				return createTypeReferenceNode(node.ref && ENUM_TYPES_WITH_KEY_SUFFIX.has(this.options.enumType) && this.options.enumTypeSuffix && this.options.enumSchemaNames?.has(refName) ? this.options.resolver.resolveEnumKeyName({ name: refName }, this.options.enumTypeSuffix) : node.ref ? this.options.resolver.default(refName, "type") : refName, void 0);
 			},
 			enum(node) {
 				const values = node.namedEnumValues?.map((v) => v.value) ?? node.enumValues ?? [];
@@ -716,7 +715,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => {
 });
 //#endregion
 //#region src/components/Type.tsx
-function Type({ name, node, keysToOmit, optionalType, arrayType, syntaxType, enumType, enumTypeSuffix, enumKeyCasing, description, resolver }) {
+function Type({ name, node, keysToOmit, optionalType, arrayType, syntaxType, enumType, enumTypeSuffix, enumKeyCasing, description, resolver, enumSchemaNames }) {
 	const resolvedDescription = description || node?.description;
 	const enumSchemaNodes = (0, _kubb_ast.collect)(node, { schema(n) {
 		const enumNode = (0, _kubb_ast.narrowSchema)(n, _kubb_ast.schemaTypes.enum);
@@ -731,7 +730,8 @@ function Type({ name, node, keysToOmit, optionalType, arrayType, syntaxType, enu
 		syntaxType,
 		description: resolvedDescription,
 		keysToOmit,
-		resolver
+		resolver,
+		enumSchemaNames
 	}).print(node);
 	if (!output) return;
 	const enums = [...new Map(enumSchemaNodes.map((n) => [n.name, n])).values()].map((node) => {
@@ -888,11 +888,16 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 			group
 		});
 		const params = (0, _kubb_ast.caseParams)(node.parameters, paramsCasing);
+		const enumSchemaNames = new Set((adapter.rootNode?.schemas ?? []).filter((s) => (0, _kubb_ast.narrowSchema)(s, _kubb_ast.schemaTypes.enum) && s.name).map((s) => s.name));
+		function resolveImportName(schemaName) {
+			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
+			return resolver.default(schemaName, "type");
+		}
 		function renderSchemaType({ node: schemaNode, name, description, keysToOmit }) {
 			if (!schemaNode) return null;
 			const transformedNode = (0, _kubb_ast.transform)(schemaNode, (0, _kubb_ast.composeTransformers)(...transformers));
 			const imports = adapter.getImports(transformedNode, (schemaName) => ({
-				name: resolver.default(schemaName, "type"),
+				name: resolveImportName(schemaName),
 				path: resolver.resolveFile({
 					name: schemaName,
 					extname: ".ts"
@@ -922,7 +927,8 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 				arrayType,
 				syntaxType,
 				resolver,
-				keysToOmit
+				keysToOmit,
+				enumSchemaNames
 			})] });
 		}
 		const paramTypes = params.map((param) => renderSchemaType({
@@ -994,8 +1000,13 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 		const mode = (0, _kubb_core.getMode)(node_path.default.resolve(root, output.path));
 		if (!node.name) return;
 		const transformedNode = (0, _kubb_ast.transform)(node, (0, _kubb_ast.composeTransformers)(...transformers));
+		const enumSchemaNames = new Set((adapter.rootNode?.schemas ?? []).filter((s) => (0, _kubb_ast.narrowSchema)(s, _kubb_ast.schemaTypes.enum) && s.name).map((s) => s.name));
+		function resolveImportName(schemaName) {
+			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
+			return resolver.default(schemaName, "type");
+		}
 		const imports = adapter.getImports(transformedNode, (schemaName) => ({
-			name: resolver.default(schemaName, "type"),
+			name: resolveImportName(schemaName),
 			path: resolver.resolveFile({
 				name: schemaName,
 				extname: ".ts"
@@ -1047,7 +1058,8 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 				optionalType,
 				arrayType,
 				syntaxType,
-				resolver
+				resolver,
+				enumSchemaNames
 			})]
 		});
 	}