@kubb/plugin-ts 5.0.0-alpha.30 → 5.0.0-alpha.32
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 +19 -18
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.js +15 -14
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/src/components/Enum.tsx +1 -1
- package/src/generators/typeGenerator.tsx +6 -6
- package/src/generators/typeGeneratorLegacy.tsx +4 -4
- package/src/printers/functionPrinter.ts +6 -5
- package/src/printers/printerTs.ts +1 -1
package/dist/index.cjs
CHANGED
|
@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
enumerable: true
|
|
22
22
|
}) : target, mod));
|
|
23
23
|
//#endregion
|
|
24
|
-
let
|
|
24
|
+
let _kubb_parser_ts = require("@kubb/parser-ts");
|
|
25
25
|
let _kubb_react_fabric = require("@kubb/react-fabric");
|
|
26
26
|
let _kubb_ast = require("@kubb/ast");
|
|
27
27
|
let remeda = require("remeda");
|
|
@@ -544,13 +544,13 @@ function Enum({ node, enumType, enumTypeSuffix, enumKeyCasing, resolver }) {
|
|
|
544
544
|
isExportable: true,
|
|
545
545
|
isIndexable: true,
|
|
546
546
|
isTypeOnly: false,
|
|
547
|
-
children: (0,
|
|
547
|
+
children: (0, _kubb_parser_ts.safePrint)(nameNode)
|
|
548
548
|
}), /* @__PURE__ */ (0, _kubb_react_fabric_jsx_runtime.jsx)(_kubb_react_fabric.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
|
|
@@ -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);
|
|
@@ -929,11 +929,11 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
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
|
}),
|
|
@@ -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);
|
|
@@ -1061,11 +1061,11 @@ const typeGenerator = (0, _kubb_core.defineGenerator)({
|
|
|
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.32";
|
|
1086
1086
|
//#endregion
|
|
1087
1087
|
//#region src/resolvers/resolverTs.ts
|
|
1088
1088
|
/**
|
|
@@ -1399,11 +1399,11 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
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
|
}),
|
|
@@ -1539,11 +1539,11 @@ const typeGeneratorLegacy = (0, _kubb_core.defineGenerator)({
|
|
|
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);
|