@kubb/plugin-ts 5.0.0-beta.15 → 5.0.0-beta.22

package/dist/index.cjs

@@ -906,7 +906,7 @@ const printerTs = _kubb_core.ast.definePrinter((options) => {
 			date: dateOrStringNode,
 			time: dateOrStringNode,
 			ref(node) {
-				if (!node.name) return;
+				if (!node.name) return null;
 				const refName = node.ref ? _kubb_core.ast.extractRefName(node.ref) ?? node.name : node.name;
 				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);
 			},
@@ -943,16 +943,16 @@ const printerTs = _kubb_core.ast.definePrinter((options) => {
 				return createIntersectionDeclaration({
 					withParentheses: true,
 					nodes: buildMemberNodes(node.members, this.transform)
-				}) ?? void 0;
+				}) ?? null;
 			},
 			array(node) {
 				return createArrayDeclaration({
 					nodes: (node.items ?? []).map((item) => this.transform(item)).filter(isNonNullable),
 					arrayType: this.options.arrayType
-				}) ?? void 0;
+				}) ?? null;
 			},
 			tuple(node) {
-				return buildTupleNode(node, this.transform);
+				return buildTupleNode(node, this.transform) ?? null;
 			},
 			object(node) {
 				const { transform, options } = this;
@@ -979,21 +979,22 @@ const printerTs = _kubb_core.ast.definePrinter((options) => {
 		},
 		print(node) {
 			const { name, syntaxType = "type", description, keysToOmit } = this.options;
-			let base = this.transform(node);
-			if (!base) return null;
+			const transformed = this.transform(node);
+			if (!transformed) return null;
 			const meta = _kubb_core.ast.syncSchemaRef(node);
 			if (!name) {
-				if (meta.nullable) base = createUnionDeclaration({ nodes: [base, keywordTypeNodes.null] });
-				if ((meta.nullish || meta.optional) && addsUndefined) base = createUnionDeclaration({ nodes: [base, keywordTypeNodes.undefined] });
-				return (0, _kubb_parser_ts.safePrint)(base);
+				const withNullable = meta.nullable ? createUnionDeclaration({ nodes: [transformed, keywordTypeNodes.null] }) : transformed;
+				return (0, _kubb_parser_ts.safePrint)((meta.nullish || meta.optional) && addsUndefined ? createUnionDeclaration({ nodes: [withNullable, keywordTypeNodes.undefined] }) : withNullable);
 			}
-			let inner = keysToOmit?.length ? createOmitDeclaration({
-				keys: keysToOmit,
-				type: base,
-				nonNullable: true
-			}) : base;
-			if (meta.nullable) inner = createUnionDeclaration({ nodes: [inner, keywordTypeNodes.null] });
-			if (meta.nullish || meta.optional) inner = createUnionDeclaration({ nodes: [inner, keywordTypeNodes.undefined] });
+			const inner = (() => {
+				const omitted = keysToOmit?.length ? createOmitDeclaration({
+					keys: keysToOmit,
+					type: transformed,
+					nonNullable: true
+				}) : transformed;
+				const withNullable = meta.nullable ? createUnionDeclaration({ nodes: [omitted, keywordTypeNodes.null] }) : omitted;
+				return meta.nullish || meta.optional ? createUnionDeclaration({ nodes: [withNullable, keywordTypeNodes.undefined] }) : withNullable;
+			})();
 			const useTypeGeneration = syntaxType === "type" || inner.kind === syntaxKind.union || !!keysToOmit?.length;
 			return (0, _kubb_parser_ts.safePrint)(createTypeDeclaration({
 				name,
@@ -1028,10 +1029,10 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 	renderer: _kubb_renderer_jsx.jsxRendererSync,
 	schema(node, ctx) {
 		const { enumType, enumTypeSuffix, enumKeyCasing, syntaxType, optionalType, arrayType, output, group, printer } = ctx.options;
-		const { adapter, config, resolver, root, inputNode } = ctx;
+		const { adapter, config, resolver, root } = ctx;
 		if (!node.name) return;
 		const mode = ctx.getMode(output);
-		const enumSchemaNames = new Set(inputNode.schemas.filter((s) => _kubb_core.ast.narrowSchema(s, _kubb_core.ast.schemaTypes.enum) && s.name).map((s) => s.name));
+		const enumSchemaNames = new Set(ctx.meta.enumNames);
 		function resolveImportName(schemaName) {
 			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
 			return resolver.resolveTypeName(schemaName);
@@ -1075,11 +1076,11 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -1105,7 +1106,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 	},
 	operation(node, ctx) {
 		const { enumType, enumTypeSuffix, enumKeyCasing, optionalType, arrayType, syntaxType, paramsCasing, group, output, printer } = ctx.options;
-		const { adapter, config, resolver, root, inputNode } = ctx;
+		const { adapter, config, resolver, root } = ctx;
 		const mode = ctx.getMode(output);
 		const params = _kubb_core.ast.caseParams(node.parameters, paramsCasing);
 		const meta = { file: resolver.resolveFile({
@@ -1118,7 +1119,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 			output,
 			group
 		}) };
-		const enumSchemaNames = new Set(inputNode.schemas.filter((s) => _kubb_core.ast.narrowSchema(s, _kubb_core.ast.schemaTypes.enum) && s.name).map((s) => s.name));
+		const enumSchemaNames = new Set(ctx.meta.enumNames);
 		function resolveImportName(schemaName) {
 			if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
 			return resolver.resolveTypeName(schemaName);
@@ -1257,11 +1258,11 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),