@kubb/plugin-ts 5.0.0-alpha.31 → 5.0.0-alpha.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +37 -36
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.js +17 -16
- package/dist/index.js.map +1 -1
- package/package.json +6 -6
- package/src/components/Enum.tsx +4 -4
- package/src/components/Type.tsx +3 -3
- package/src/generators/typeGenerator.tsx +7 -7
- package/src/generators/typeGeneratorLegacy.tsx +5 -5
- package/src/printers/functionPrinter.ts +6 -5
- package/src/printers/printerTs.ts +1 -1
package/dist/index.cjs
CHANGED
|
@@ -21,13 +21,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
enumerable: true
|
|
22
22
|
}) : target, mod));
|
|
23
23
|
//#endregion
|
|
24
|
-
let
|
|
25
|
-
let
|
|
24
|
+
let _kubb_parser_ts = require("@kubb/parser-ts");
|
|
25
|
+
let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
|
|
26
26
|
let _kubb_ast = require("@kubb/ast");
|
|
27
27
|
let remeda = require("remeda");
|
|
28
28
|
let typescript = require("typescript");
|
|
29
29
|
typescript = __toESM(typescript);
|
|
30
|
-
let
|
|
30
|
+
let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
|
|
31
31
|
let _kubb_core = require("@kubb/core");
|
|
32
32
|
//#region ../../internals/utils/src/casing.ts
|
|
33
33
|
/**
|
|
@@ -539,18 +539,18 @@ function Enum({ node, enumType, enumTypeSuffix, enumKeyCasing, resolver }) {
|
|
|
539
539
|
type: enumType,
|
|
540
540
|
enumKeyCasing
|
|
541
541
|
});
|
|
542
|
-
return /* @__PURE__ */ (0,
|
|
542
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [nameNode && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
|
|
543
543
|
name: enumName,
|
|
544
544
|
isExportable: true,
|
|
545
545
|
isIndexable: true,
|
|
546
546
|
isTypeOnly: false,
|
|
547
|
-
children: (0,
|
|
548
|
-
}), /* @__PURE__ */ (0,
|
|
547
|
+
children: (0, _kubb_parser_ts.safePrint)(nameNode)
|
|
548
|
+
}), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
|
|
549
549
|
name: typeName,
|
|
550
550
|
isIndexable: true,
|
|
551
551
|
isExportable: ENUM_TYPES_WITH_RUNTIME_VALUE.has(enumType),
|
|
552
552
|
isTypeOnly: ENUM_TYPES_WITH_TYPE_ONLY.has(enumType),
|
|
553
|
-
children: (0,
|
|
553
|
+
children: (0, _kubb_parser_ts.safePrint)(typeNode)
|
|
554
554
|
})] });
|
|
555
555
|
}
|
|
556
556
|
//#endregion
|
|
@@ -575,13 +575,13 @@ function Type({ name, node, printer, enumType, enumTypeSuffix, enumKeyCasing, re
|
|
|
575
575
|
});
|
|
576
576
|
const shouldExportEnums = enumType !== "inlineLiteral";
|
|
577
577
|
const shouldExportType = enumType === "inlineLiteral" || enums.every((item) => item.typeName !== name);
|
|
578
|
-
return /* @__PURE__ */ (0,
|
|
578
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [shouldExportEnums && enums.map(({ node }) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Enum, {
|
|
579
579
|
node,
|
|
580
580
|
enumType,
|
|
581
581
|
enumTypeSuffix,
|
|
582
582
|
enumKeyCasing,
|
|
583
583
|
resolver
|
|
584
|
-
})), shouldExportType && /* @__PURE__ */ (0,
|
|
584
|
+
})), shouldExportType && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
|
|
585
585
|
name,
|
|
586
586
|
isTypeOnly: true,
|
|
587
587
|
isExportable: true,
|
|
@@ -853,7 +853,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => {
|
|
|
853
853
|
if (!name) {
|
|
854
854
|
if (meta.nullable) base = createUnionDeclaration({ nodes: [base, keywordTypeNodes.null] });
|
|
855
855
|
if ((meta.nullish || meta.optional) && addsUndefined) base = createUnionDeclaration({ nodes: [base, keywordTypeNodes.undefined] });
|
|
856
|
-
return (0,
|
|
856
|
+
return (0, _kubb_parser_ts.safePrint)(base);
|
|
857
857
|
}
|
|
858
858
|
let inner = keysToOmit?.length ? createOmitDeclaration({
|
|
859
859
|
keys: keysToOmit,
|
|
@@ -863,7 +863,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => {
|
|
|
863
863
|
if (meta.nullable) inner = createUnionDeclaration({ nodes: [inner, keywordTypeNodes.null] });
|
|
864
864
|
if (meta.nullish || meta.optional) inner = createUnionDeclaration({ nodes: [inner, keywordTypeNodes.undefined] });
|
|
865
865
|
const useTypeGeneration = syntaxType === "type" || inner.kind === syntaxKind.union || !!keysToOmit?.length;
|
|
866
|
-
return (0,
|
|
866
|
+
return (0, _kubb_parser_ts.safePrint)(createTypeDeclaration({
|
|
867
867
|
name,
|
|
868
868
|
isExportable: true,
|
|
869
869
|
type: inner,
|
|
@@ -885,7 +885,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
885
885
|
const { adapter, config, resolver, root } = this;
|
|
886
886
|
if (!node.name) return;
|
|
887
887
|
const mode = this.getMode(output);
|
|
888
|
-
const enumSchemaNames = new Set((adapter.
|
|
888
|
+
const enumSchemaNames = new Set((adapter.inputNode?.schemas ?? []).filter((s) => (0, _kubb_ast.narrowSchema)(s, _kubb_ast.schemaTypes.enum) && s.name).map((s) => s.name));
|
|
889
889
|
function resolveImportName(schemaName) {
|
|
890
890
|
if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
|
|
891
891
|
return resolver.resolveTypeName(schemaName);
|
|
@@ -925,19 +925,19 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
925
925
|
enumSchemaNames,
|
|
926
926
|
nodes: printer?.nodes
|
|
927
927
|
});
|
|
928
|
-
return /* @__PURE__ */ (0,
|
|
928
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
|
|
929
929
|
baseName: meta.file.baseName,
|
|
930
930
|
path: meta.file.path,
|
|
931
931
|
meta: meta.file.meta,
|
|
932
|
-
banner: resolver.resolveBanner(adapter.
|
|
932
|
+
banner: resolver.resolveBanner(adapter.inputNode, {
|
|
933
933
|
output,
|
|
934
934
|
config
|
|
935
935
|
}),
|
|
936
|
-
footer: resolver.resolveFooter(adapter.
|
|
936
|
+
footer: resolver.resolveFooter(adapter.inputNode, {
|
|
937
937
|
output,
|
|
938
938
|
config
|
|
939
939
|
}),
|
|
940
|
-
children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0,
|
|
940
|
+
children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
|
|
941
941
|
root: meta.file.path,
|
|
942
942
|
path: imp.path,
|
|
943
943
|
name: imp.name,
|
|
@@ -946,7 +946,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
946
946
|
node.name,
|
|
947
947
|
imp.path,
|
|
948
948
|
imp.isTypeOnly
|
|
949
|
-
].join("-"))), /* @__PURE__ */ (0,
|
|
949
|
+
].join("-"))), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Type, {
|
|
950
950
|
name: meta.name,
|
|
951
951
|
node,
|
|
952
952
|
enumType,
|
|
@@ -972,7 +972,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
972
972
|
output,
|
|
973
973
|
group
|
|
974
974
|
}) };
|
|
975
|
-
const enumSchemaNames = new Set((adapter.
|
|
975
|
+
const enumSchemaNames = new Set((adapter.inputNode?.schemas ?? []).filter((s) => (0, _kubb_ast.narrowSchema)(s, _kubb_ast.schemaTypes.enum) && s.name).map((s) => s.name));
|
|
976
976
|
function resolveImportName(schemaName) {
|
|
977
977
|
if (ENUM_TYPES_WITH_KEY_SUFFIX.has(enumType) && enumTypeSuffix && enumSchemaNames.has(schemaName)) return resolver.resolveEnumKeyName({ name: schemaName }, enumTypeSuffix);
|
|
978
978
|
return resolver.resolveTypeName(schemaName);
|
|
@@ -1003,7 +1003,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
1003
1003
|
enumSchemaNames,
|
|
1004
1004
|
nodes: printer?.nodes
|
|
1005
1005
|
});
|
|
1006
|
-
return /* @__PURE__ */ (0,
|
|
1006
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
|
|
1007
1007
|
root: meta.file.path,
|
|
1008
1008
|
path: imp.path,
|
|
1009
1009
|
name: imp.name,
|
|
@@ -1012,7 +1012,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
1012
1012
|
name,
|
|
1013
1013
|
imp.path,
|
|
1014
1014
|
imp.isTypeOnly
|
|
1015
|
-
].join("-"))), /* @__PURE__ */ (0,
|
|
1015
|
+
].join("-"))), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Type, {
|
|
1016
1016
|
name,
|
|
1017
1017
|
node: schema,
|
|
1018
1018
|
enumType,
|
|
@@ -1057,15 +1057,15 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
1057
1057
|
} : null,
|
|
1058
1058
|
name: resolver.resolveResponseName(node)
|
|
1059
1059
|
});
|
|
1060
|
-
return /* @__PURE__ */ (0,
|
|
1060
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
|
|
1061
1061
|
baseName: meta.file.baseName,
|
|
1062
1062
|
path: meta.file.path,
|
|
1063
1063
|
meta: meta.file.meta,
|
|
1064
|
-
banner: resolver.resolveBanner(adapter.
|
|
1064
|
+
banner: resolver.resolveBanner(adapter.inputNode, {
|
|
1065
1065
|
output,
|
|
1066
1066
|
config
|
|
1067
1067
|
}),
|
|
1068
|
-
footer: resolver.resolveFooter(adapter.
|
|
1068
|
+
footer: resolver.resolveFooter(adapter.inputNode, {
|
|
1069
1069
|
output,
|
|
1070
1070
|
config
|
|
1071
1071
|
}),
|
|
@@ -1082,7 +1082,7 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
1082
1082
|
});
|
|
1083
1083
|
//#endregion
|
|
1084
1084
|
//#region package.json
|
|
1085
|
-
var version = "5.0.0-alpha.
|
|
1085
|
+
var version = "5.0.0-alpha.33";
|
|
1086
1086
|
//#endregion
|
|
1087
1087
|
//#region src/resolvers/resolverTs.ts
|
|
1088
1088
|
/**
|
|
@@ -1395,19 +1395,19 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
1395
1395
|
description: node.description,
|
|
1396
1396
|
resolver
|
|
1397
1397
|
});
|
|
1398
|
-
return /* @__PURE__ */ (0,
|
|
1398
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
|
|
1399
1399
|
baseName: meta.file.baseName,
|
|
1400
1400
|
path: meta.file.path,
|
|
1401
1401
|
meta: meta.file.meta,
|
|
1402
|
-
banner: resolver.resolveBanner(adapter.
|
|
1402
|
+
banner: resolver.resolveBanner(adapter.inputNode, {
|
|
1403
1403
|
output,
|
|
1404
1404
|
config
|
|
1405
1405
|
}),
|
|
1406
|
-
footer: resolver.resolveFooter(adapter.
|
|
1406
|
+
footer: resolver.resolveFooter(adapter.inputNode, {
|
|
1407
1407
|
output,
|
|
1408
1408
|
config
|
|
1409
1409
|
}),
|
|
1410
|
-
children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0,
|
|
1410
|
+
children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
|
|
1411
1411
|
root: meta.file.path,
|
|
1412
1412
|
path: imp.path,
|
|
1413
1413
|
name: imp.name,
|
|
@@ -1416,7 +1416,7 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
1416
1416
|
node.name,
|
|
1417
1417
|
imp.path,
|
|
1418
1418
|
imp.isTypeOnly
|
|
1419
|
-
].join("-"))), /* @__PURE__ */ (0,
|
|
1419
|
+
].join("-"))), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Type, {
|
|
1420
1420
|
name: meta.name,
|
|
1421
1421
|
node,
|
|
1422
1422
|
enumType,
|
|
@@ -1466,7 +1466,7 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
1466
1466
|
keysToOmit,
|
|
1467
1467
|
resolver
|
|
1468
1468
|
});
|
|
1469
|
-
return /* @__PURE__ */ (0,
|
|
1469
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
|
|
1470
1470
|
root: meta.file.path,
|
|
1471
1471
|
path: imp.path,
|
|
1472
1472
|
name: imp.name,
|
|
@@ -1475,7 +1475,7 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
1475
1475
|
name,
|
|
1476
1476
|
imp.path,
|
|
1477
1477
|
imp.isTypeOnly
|
|
1478
|
-
].join("-"))), /* @__PURE__ */ (0,
|
|
1478
|
+
].join("-"))), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Type, {
|
|
1479
1479
|
name,
|
|
1480
1480
|
node: schema,
|
|
1481
1481
|
enumType,
|
|
@@ -1535,15 +1535,15 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
1535
1535
|
schema: buildLegacyResponseUnionSchemaNode(node, { resolver }),
|
|
1536
1536
|
name: resolver.resolveResponseName(node)
|
|
1537
1537
|
});
|
|
1538
|
-
return /* @__PURE__ */ (0,
|
|
1538
|
+
return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
|
|
1539
1539
|
baseName: meta.file.baseName,
|
|
1540
1540
|
path: meta.file.path,
|
|
1541
1541
|
meta: meta.file.meta,
|
|
1542
|
-
banner: resolver.resolveBanner(adapter.
|
|
1542
|
+
banner: resolver.resolveBanner(adapter.inputNode, {
|
|
1543
1543
|
output,
|
|
1544
1544
|
config
|
|
1545
1545
|
}),
|
|
1546
|
-
footer: resolver.resolveFooter(adapter.
|
|
1546
|
+
footer: resolver.resolveFooter(adapter.inputNode, {
|
|
1547
1547
|
output,
|
|
1548
1548
|
config
|
|
1549
1549
|
}),
|
|
@@ -1691,7 +1691,7 @@ const kindToHandlerKey = {
|
|
|
1691
1691
|
FunctionParameter: "functionParameter",
|
|
1692
1692
|
ParameterGroup: "parameterGroup",
|
|
1693
1693
|
FunctionParameters: "functionParameters",
|
|
1694
|
-
|
|
1694
|
+
ParamsType: "paramsType"
|
|
1695
1695
|
};
|
|
1696
1696
|
/**
|
|
1697
1697
|
* Creates a function-parameter printer factory.
|
|
@@ -1737,7 +1737,8 @@ const functionPrinter = defineFunctionPrinter((options) => ({
|
|
|
1737
1737
|
name: "functionParameters",
|
|
1738
1738
|
options,
|
|
1739
1739
|
nodes: {
|
|
1740
|
-
|
|
1740
|
+
paramsType(node) {
|
|
1741
|
+
if (node.kind !== "ParamsType") return null;
|
|
1741
1742
|
if (node.variant === "member") return `${node.base}['${node.key}']`;
|
|
1742
1743
|
if (node.variant === "struct") return `{ ${node.properties.map((p) => {
|
|
1743
1744
|
const typeStr = this.transform(p.type);
|