@kubb/plugin-ts 3.2.0 → 3.3.1

package/dist/{chunk-OJLL42LQ.js → chunk-2FMMBGL3.js}

@@ -3,7 +3,8 @@ import { jsxs, Fragment, jsx } from '@kubb/react/jsx-runtime';
 import transformers2 from '@kubb/core/transformers';
 import { print } from '@kubb/parser-ts';
 import * as factory from '@kubb/parser-ts/factory';
-import { schemaKeywords, SchemaGenerator, isKeyword } from '@kubb/plugin-oas';
+import { createTypeDeclaration } from '@kubb/parser-ts/factory';
+import { schemaKeywords, isKeyword, SchemaGenerator } from '@kubb/plugin-oas';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -34,9 +35,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@microsoft+api-extractor@7.48.0_@types+node@20.17.10__@swc+core@1.7.22_jiti@2.4.1__hkerfy4gjupxun6rli2ifyvj2q/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_@microsoft+api-extractor@7.48.1_@types+node@20.17.10__@swc+core@1.7.22_jiti@2.4.1__77u6eq5nvhzfov6ddvuxt4wipe/node_modules/tsup/assets/esm_shims.js
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_@microsoft+api-extractor@7.48.0_@types+node@20.17.10__@swc+core@1.7.22_jiti@2.4.1__hkerfy4gjupxun6rli2ifyvj2q/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_@microsoft+api-extractor@7.48.1_@types+node@20.17.10__@swc+core@1.7.22_jiti@2.4.1__77u6eq5nvhzfov6ddvuxt4wipe/node_modules/tsup/assets/esm_shims.js"() {
   }
 });
 
@@ -2215,7 +2216,7 @@ function OasType({ name, typeName, api }) {
 init_esm_shims();
 var import_react3 = __toESM(require_react());
 
-// src/parser/index.ts
+// src/parser.ts
 init_esm_shims();
 var typeKeywordMapper = {
   any: () => factory.keywordTypeNodes.any,
@@ -2423,52 +2424,61 @@ function parse({ parent, current, siblings }, options) {
   }
   return void 0;
 }
-function Type2({ name, typedName, tree, keysToOmit, optionalType, enumType, mapper, description }) {
+function Type2({ name, typedName, tree, keysToOmit, optionalType, syntaxType, enumType, mapper, description }) {
   const typeNodes = [];
   if (!tree.length) {
     return "";
   }
-  const isNullish = tree.some((item) => item.keyword === schemaKeywords.nullish);
-  const isNullable = tree.some((item) => item.keyword === schemaKeywords.nullable);
-  const isOptional = tree.some((item) => item.keyword === schemaKeywords.optional);
+  const schema = tree.find((item) => item.keyword === schemaKeywords.schema);
   let type = tree.map(
-    (schema, _index, siblings) => parse(
-      { parent: void 0, current: schema, siblings },
+    (schema2, _index, siblings) => parse(
+      { parent: void 0, current: schema2, siblings },
       {
         name,
-        typeName: typedName,
+        typedName,
         description,
         keysToOmit,
         optionalType,
         enumType,
-        mapper
+        mapper,
+        syntaxType
       }
     )
   ).filter(Boolean).at(0) || typeKeywordMapper.undefined();
-  if (isNullable) {
-    type = factory.createUnionDeclaration({
-      nodes: [type, factory.keywordTypeNodes.null]
-    });
-  }
-  if (isNullish && ["undefined", "questionTokenAndUndefined"].includes(optionalType)) {
-    type = factory.createUnionDeclaration({
-      nodes: [type, factory.keywordTypeNodes.undefined]
-    });
-  }
-  if (isOptional && ["undefined", "questionTokenAndUndefined"].includes(optionalType)) {
-    type = factory.createUnionDeclaration({
-      nodes: [type, factory.keywordTypeNodes.undefined]
-    });
+  if (schema && isKeyword(schema, schemaKeywords.schema) && schema.args.type !== "object") {
+    const isNullish = tree.some((item) => item.keyword === schemaKeywords.nullish);
+    const isNullable = tree.some((item) => item.keyword === schemaKeywords.nullable);
+    const isOptional = tree.some((item) => item.keyword === schemaKeywords.optional);
+    if (isNullable) {
+      type = factory.createUnionDeclaration({
+        nodes: [type, factory.keywordTypeNodes.null]
+      });
+    }
+    if (isNullish && ["undefined", "questionTokenAndUndefined"].includes(optionalType)) {
+      type = factory.createUnionDeclaration({
+        nodes: [type, factory.keywordTypeNodes.undefined]
+      });
+    }
+    if (isOptional && ["undefined", "questionTokenAndUndefined"].includes(optionalType)) {
+      type = factory.createUnionDeclaration({
+        nodes: [type, factory.keywordTypeNodes.undefined]
+      });
+    }
   }
-  const node = factory.createTypeAliasDeclaration({
-    modifiers: [factory.modifiers.export],
-    name,
-    type: keysToOmit?.length ? factory.createOmitDeclaration({
-      keys: keysToOmit,
-      type,
-      nonNullable: true
-    }) : type
-  });
+  const useTypeGeneration = syntaxType === "type" || [factory.syntaxKind.union].includes(type.kind) || !!keysToOmit?.length;
+  typeNodes.push(
+    createTypeDeclaration({
+      name,
+      isExportable: true,
+      type: keysToOmit?.length ? factory.createOmitDeclaration({
+        keys: keysToOmit,
+        type,
+        nonNullable: true
+      }) : type,
+      syntax: useTypeGeneration ? "type" : "interface",
+      description: description ? transformers2.jsStringEscape(description) : void 0
+    })
+  );
   const enumSchemas = SchemaGenerator.deepSearch(tree, schemaKeywords.enum);
   const enums = [...new Set(enumSchemas)].map((enumSchema) => {
     const name2 = enumType === "asPascalConst" ? transformers2.pascalCase(enumSchema.args.name) : transformers2.camelCase(enumSchema.args.name);
@@ -2486,12 +2496,6 @@ function Type2({ name, typedName, tree, keysToOmit, optionalType, enumType, mapp
       typeName
     };
   });
-  typeNodes.push(
-    factory.appendJSDocToNode({
-      node,
-      comments: [description ? `@description ${transformers2.jsStringEscape(description)}` : void 0].filter(Boolean)
-    })
-  );
   return /* @__PURE__ */ jsxs(import_react3.Fragment, { children: [
     enums.map(({ name: name2, nameNode, typeName, typeNode }, index) => /* @__PURE__ */ jsxs(import_react3.Fragment, { children: [
       nameNode && /* @__PURE__ */ jsx(File.Source, { name: name2, isExportable: true, isIndexable: true, children: print([nameNode]) }),
@@ -2535,5 +2539,5 @@ react/cjs/react.development.js:
 */
 
 export { OasType, Type2 as Type, init_esm_shims };
-//# sourceMappingURL=chunk-OJLL42LQ.js.map
-//# sourceMappingURL=chunk-OJLL42LQ.js.map
+//# sourceMappingURL=chunk-2FMMBGL3.js.map
+//# sourceMappingURL=chunk-2FMMBGL3.js.map