@kubb/plugin-ts 5.0.0-beta.85 → 5.0.0-beta.86

package/dist/index.js

@@ -192,7 +192,7 @@ const reservedWords = /* @__PURE__ */ new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
-	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
+	return isIdentifier(name);
 }
 /**
 * Returns `name` when it's a syntactically valid JavaScript variable name,
@@ -214,6 +214,22 @@ function ensureValidVarName(name) {
 	if (!name || isValidVarName(name)) return name;
 	return `_${name}`;
 }
+/**
+* Returns `true` when `name` is syntactically a valid identifier, ignoring reserved words.
+*
+* Reserved words and globals (`class`, `name`, `Date`, …) are valid as bare object-literal keys
+* even though they are not valid variable names, so use this (not {@link isValidVarName}) when
+* deciding whether an object key needs quoting.
+*
+* @example
+* ```ts
+* isIdentifier('name')   // true
+* isIdentifier('x-total')// false
+* ```
+*/
+function isIdentifier(name) {
+	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
+}
 //#endregion
 //#region ../../internals/utils/src/strings.ts
 /**
@@ -1413,6 +1429,15 @@ const printerTs = ast.createPrinter((options) => {
 //#endregion
 //#region src/generators/typeGenerator.tsx
 /**
+* Resolves the imported type name for a referenced schema. An enum schema emitted
+* as a `const` object imports its suffixed key alias (e.g. `StatusKey`); every other
+* schema imports its plain resolved name.
+*/
+function resolveImportName({ schemaName, enumOptions, enumSchemaNames, resolver }) {
+	if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumOptions.type) && enumOptions.typeSuffix && enumSchemaNames.has(schemaName)) return resolver.enum.keyName({ name: schemaName }, enumOptions.typeSuffix);
+	return resolver.name(schemaName);
+}
+/**
 * Built-in generator for `@kubb/plugin-ts`. Emits one TypeScript file per
 * schema in the spec plus per-operation request, response, and parameter
 * types. Drop-replace with a custom `Generator<PluginTs>` to change how
@@ -1426,12 +1451,13 @@ const typeGenerator = defineGenerator({
 		const { adapter, config, resolver, root } = ctx;
 		if (!node.name) return;
 		const enumSchemaNames = new Set(ctx.meta.enumNames);
-		function resolveImportName(schemaName) {
-			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumOptions.type) && enumOptions.typeSuffix && enumSchemaNames.has(schemaName)) return resolver.enum.keyName({ name: schemaName }, enumOptions.typeSuffix);
-			return resolver.name(schemaName);
-		}
 		const imports = adapter.getImports(node, (schemaName) => ({
-			name: resolveImportName(schemaName),
+			name: resolveImportName({
+				schemaName,
+				enumOptions,
+				enumSchemaNames,
+				resolver
+			}),
 			path: resolver.file({
 				name: schemaName,
 				extname: ".ts",
@@ -1516,14 +1542,15 @@ const typeGenerator = defineGenerator({
 			group: group ?? void 0
 		}) };
 		const enumSchemaNames = new Set(ctx.meta.enumNames);
-		function resolveImportName(schemaName) {
-			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumOptions.type) && enumOptions.typeSuffix && enumSchemaNames.has(schemaName)) return resolver.enum.keyName({ name: schemaName }, enumOptions.typeSuffix);
-			return resolver.name(schemaName);
-		}
 		function renderSchemaType({ schema, name, keysToOmit }) {
 			if (!schema) return null;
 			const imports = adapter.getImports(schema, (schemaName) => ({
-				name: resolveImportName(schemaName),
+				name: resolveImportName({
+					schemaName,
+					enumOptions,
+					enumSchemaNames,
+					resolver
+				}),
 				path: resolver.file({
 					name: schemaName,
 					extname: ".ts",
@@ -1652,7 +1679,12 @@ const typeGenerator = defineGenerator({
 			const responseName = resolver.response.response(node);
 			const responsesWithSchema = node.responses.filter(hasSchema);
 			if (new Set(responsesWithSchema.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
-				name: resolveImportName(schemaName),
+				name: resolveImportName({
+					schemaName,
+					enumOptions,
+					enumSchemaNames,
+					resolver
+				}),
 				path: ""
 			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(responseName)) return null;
 			return renderSchemaType({