@kubb/adapter-oas 5.0.0-beta.43 → 5.0.0-beta.45

package/dist/index.js

@@ -6,6 +6,7 @@ import { access } from "node:fs/promises";
 import { bundle, loadConfig } from "@redocly/openapi-core";
 import OASNormalize from "oas-normalize";
 import swagger2openapi from "swagger2openapi";
+import { childName, enumPropName, extractRefName, findDiscriminator } from "@kubb/ast/utils";
 import { isRef } from "oas/types";
 import { matchesMimeType } from "oas/utils";
 //#region src/constants.ts
@@ -374,6 +375,22 @@ const reservedWords = new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
+	return isIdentifier(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
@@ -1295,7 +1312,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		return ast.createSchema({
 			...buildSchemaNode(schema, name, nullable, defaultValue),
 			type: "ref",
-			name: ast.extractRefName(schema.$ref),
+			name: extractRefName(schema.$ref),
 			ref: schema.$ref,
 			schema: resolvedSchema
 		});
@@ -1339,7 +1356,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const inOneOf = parentUnion.some((oneOfItem) => dialect.isReference(oneOfItem) && oneOfItem.$ref === childRef);
 			const inMapping = Object.values(deref.discriminator.mapping ?? {}).some((v) => v === childRef);
 			if (inOneOf || inMapping) {
-				const discriminatorValue = ast.findDiscriminator(deref.discriminator.mapping, childRef);
+				const discriminatorValue = findDiscriminator(deref.discriminator.mapping, childRef);
 				if (discriminatorValue) filteredDiscriminantValues.push({
 					propertyName: deref.discriminator.propertyName,
 					value: discriminatorValue
@@ -1418,7 +1435,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		if (sharedPropertiesNode || discriminator?.mapping) {
 			const members = unionMembers.map((s) => {
 				const ref = dialect.isReference(s) ? s.$ref : void 0;
-				const discriminatorValue = ast.findDiscriminator(discriminator?.mapping, ref);
+				const discriminatorValue = findDiscriminator(discriminator?.mapping, ref);
 				const memberNode = parseSchema({
 					schema: s,
 					name
@@ -1621,7 +1638,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const propNullable = dialect.isNullable(resolvedPropSchema);
 			const propNode = parseSchema({
 				schema: resolvedPropSchema,
-				name: ast.childName(name, propName)
+				name: childName(name, propName)
 			}, rawOptions);
 			const schemaNode = (() => {
 				const node = ast.setEnumName(propNode, name, propName, options.enumSuffix);
@@ -1666,7 +1683,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		if (dialect.isDiscriminator(schema) && schema.discriminator.mapping) {
 			const discPropName = schema.discriminator.propertyName;
 			const values = Object.keys(schema.discriminator.mapping);
-			const enumName = name ? ast.enumPropName(name, discPropName, options.enumSuffix) : void 0;
+			const enumName = name ? enumPropName(name, discPropName, options.enumSuffix) : void 0;
 			return ast.setDiscriminatorEnum({
 				node: objectNode,
 				propertyName: discPropName,
@@ -1697,7 +1714,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	*/
 	function convertArray({ schema, name, nullable, defaultValue, rawOptions, options }) {
 		const rawItems = schema.items;
-		const itemName = rawItems?.enum?.length && name ? ast.enumPropName(null, name, options.enumSuffix) : name;
+		const itemName = rawItems?.enum?.length && name ? enumPropName(null, name, options.enumSuffix) : name;
 		const items = rawItems ? [parseSchema({
 			schema: rawItems,
 			name: itemName