@kubb/plugin-ts 5.0.14 → 5.0.16

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { Exclude, Group, Include, Output, OutputOptions, Override, PluginType, Resolver, ResolverPatch, ast } from "kubb/kit";
 import { KubbReactNode } from "kubb/jsx";
-import ts from "typescript";
+import ts from "@typescript/typescript6";
 //#region src/printers/printerTs.d.ts
 /**
  * Partial map of node-type overrides for the TypeScript printer.
@@ -388,7 +388,7 @@ type Options = OutputOptions & {
    *
    * @example Use the JavaScript `Date` object for date schemas
    * ```ts
-   * import ts from 'typescript'
+   * import ts from '@typescript/typescript6'
    * pluginTs({
    *   printer: {
    *     nodes: {
@@ -762,7 +762,7 @@ type FunctionPrinterOptions = {
  * ```
  */
 export declare function functionPrinter(options: FunctionPrinterOptions): {
-  name: "functionParameters";
+  name: 'functionParameters';
   options: FunctionPrinterOptions;
   print(node: FunctionParametersNode): string;
 };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Exclude, Group, Include, Output, OutputOptions, Override, PluginType, Resolver, ResolverPatch, ast } from "kubb/kit";
 import { KubbReactNode } from "kubb/jsx";
-import ts from "typescript";
+import ts from "@typescript/typescript6";
 //#region src/printers/printerTs.d.ts
 /**
  * Partial map of node-type overrides for the TypeScript printer.
@@ -388,7 +388,7 @@ type Options = OutputOptions & {
    *
    * @example Use the JavaScript `Date` object for date schemas
    * ```ts
-   * import ts from 'typescript'
+   * import ts from '@typescript/typescript6'
    * pluginTs({
    *   printer: {
    *     nodes: {
@@ -762,7 +762,7 @@ type FunctionPrinterOptions = {
  * ```
  */
 export declare function functionPrinter(options: FunctionPrinterOptions): {
-  name: "functionParameters";
+  name: 'functionParameters';
   options: FunctionPrinterOptions;
   print(node: FunctionParametersNode): string;
 };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import { parserTs } from "@kubb/parser-ts";
 import { File, jsxRenderer } from "kubb/jsx";
-import { Resolver, addGenerator, assertPluginOption, ast, createResolver, defineExtension, defineGenerator, isStringType, setMacros, setResolver, syncSchemaRef } from "kubb/kit";
+import { Resolver, addGenerator, ast, createResolver, defineExtension, defineGenerator, isStringType, setMacros, setResolver, syncSchemaRef } from "kubb/kit";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -27,12 +27,23 @@ var __exportAll = (all, no_symbols) => {
 *
 * When `pascal` is `true` the first word is also capitalized (PascalCase), otherwise only subsequent words are.
 */
-function toCamelOrPascal(text, pascal) {
+function convert(text, pascal) {
 	return text.trim().replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/(\d)([a-z])/g, "$1 $2").split(/[\s\-_./\\:]+/).filter(Boolean).map((word, i) => {
 		if (word.length > 1 && word === word.toUpperCase()) return word;
 		return (i === 0 && !pascal ? word.charAt(0).toLowerCase() : word.charAt(0).toUpperCase()) + word.slice(1);
 	}).join("").replace(/[^a-zA-Z0-9]/g, "");
 }
+const cache = /* @__PURE__ */ new Map();
+const cacheLimit = 1e4;
+function toCamelOrPascal(text, pascal) {
+	const key = `${pascal ? "P" : "c"}${text}`;
+	const cached = cache.get(key);
+	if (cached !== void 0) return cached;
+	const result = convert(text, pascal);
+	if (cache.size >= cacheLimit) cache.clear();
+	cache.set(key, result);
+	return result;
+}
 /**
 * Converts `text` to camelCase.
 *
@@ -257,29 +268,16 @@ function stringify(value) {
 	return `'${JSON.stringify(trimQuotes(value.toString())).slice(1, -1).replace(/\\"/g, "\"").replace(/'/g, "\\'")}'`;
 }
 /**
-* Escapes characters that are not allowed inside JS string literals, covering quotes, backslashes,
-* and the Unicode line terminators U+2028 and U+2029.
-*
-* @see http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
+* Escapes an `@` at the start of a line, so a multi-line description can't start a new JSDoc tag.
+* Editors render `\@` as `@` in hovers.
 *
 * @example
 * ```ts
-* jsStringEscape('say "hi"\nbye') // 'say \\"hi\\"\\nbye'
+* jsDocEscape('intro\n@example value') // 'intro\n\\@example value'
 * ```
 */
-function jsStringEscape(input) {
-	return `${input}`.replace(/["'\\\n\r\u2028\u2029]/g, (character) => {
-		switch (character) {
-			case "\"":
-			case "'":
-			case "\\": return `\\${character}`;
-			case "\n": return "\\n";
-			case "\r": return "\\r";
-			case "\u2028": return "\\u2028";
-			case "\u2029": return "\\u2029";
-			default: return "";
-		}
-	});
+function jsDocEscape(input) {
+	return `${input}`.replace(/^(\s*)@/gm, "$1\\@");
 }
 //#endregion
 //#region ../../internals/utils/src/fs.ts
@@ -336,7 +334,7 @@ var factory_exports = /* @__PURE__ */ __exportAll({
 * Loaded with `require`, not `import`. When ESM imports a CommonJS package, Node keeps a second
 * copy of its source to detect named exports, and for TypeScript that copy is about 9 MB.
 */
-const typescript = createRequire(import.meta.url)("typescript");
+const typescript = createRequire(import.meta.url)("@typescript/typescript6");
 const { SyntaxKind, factory } = typescript;
 function isNumber(value) {
 	return typeof value === "number" && !Number.isNaN(value);
@@ -434,7 +432,7 @@ function createPropertySignature({ readOnly, modifiers = [], name, questionToken
 function appendJSDocToNode({ node, comments }) {
 	const filteredComments = comments.filter(Boolean);
 	if (!filteredComments.length) return node;
-	const text = filteredComments.reduce((acc = "", comment = "") => {
+	const text = filteredComments.flatMap((comment = "") => comment.split(/\r?\n/)).reduce((acc = "", comment = "") => {
 		return `${acc}\n * ${comment.replaceAll("*/", "*\\/")}`;
 	}, "*");
 	return typescript.addSyntheticLeadingComment(node, typescript.SyntaxKind.MultiLineCommentTrivia, `${text || "*"}\n`, true);
@@ -1115,7 +1113,7 @@ function buildPropertyJSDocComments(schema, optional) {
 	const formatComment = meta && "format" in meta && meta.format ? hasDescription ? [" ", `Format: \`${meta.format}\``] : ["@description", `Format: \`${meta.format}\``] : [];
 	const exampleValues = meta?.examples ?? [];
 	const comments = [
-		hasDescription ? `@description ${jsStringEscape(meta.description)}` : null,
+		hasDescription ? `@description ${jsDocEscape(meta.description)}` : null,
 		...formatComment,
 		meta && "deprecated" in meta && meta.deprecated ? "@deprecated" : null,
 		!isArray && meta && "min" in meta && meta.min !== void 0 ? `@minLength ${meta.min}` : null,
@@ -1640,7 +1638,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.0.14";
+var version = "5.0.16";
 //#endregion
 //#region src/resolvers/resolverTs.ts
 /**
@@ -1686,53 +1684,6 @@ const resolverTs = createResolver({
 * cross-plugin dependency references.
 */
 const pluginTsName = "plugin-ts";
-const allowedEnumTypes = [
-	"asConst",
-	"enum",
-	"constEnum",
-	"literal",
-	"inlineLiteral"
-];
-const allowedSyntaxTypes = ["type", "interface"];
-const allowedArrayTypes = ["array", "generic"];
-const allowedOptionalTypes = [
-	"questionToken",
-	"undefined",
-	"questionTokenAndUndefined"
-];
-/**
-* Throws when an enum-like option holds a value outside its allowed set. Options left out are skipped.
-*/
-function assertEnumLikeOptions({ prefix, options }) {
-	const checks = [
-		{
-			option: "enum.type",
-			value: options.enum?.type,
-			allowed: allowedEnumTypes
-		},
-		{
-			option: "syntaxType",
-			value: options.syntaxType,
-			allowed: allowedSyntaxTypes
-		},
-		{
-			option: "arrayType",
-			value: options.arrayType,
-			allowed: allowedArrayTypes
-		},
-		{
-			option: "optionalType",
-			value: options.optionalType,
-			allowed: allowedOptionalTypes
-		}
-	];
-	for (const { option, value, allowed } of checks) if (value !== void 0) assertPluginOption({
-		plugin: pluginTsName,
-		option: `${prefix}${option}`,
-		value,
-		allowed
-	});
-}
 /**
 * Generates TypeScript `type` aliases and `interface` declarations from an
 * OpenAPI spec. The foundation that every other Kubb plugin builds on:
@@ -1775,19 +1726,6 @@ const pluginTs = defineExtension({
 			typeSuffix: enumOptions.typeSuffix ?? "Key",
 			keyCasing: enumOptions.keyCasing ?? "none"
 		};
-		assertEnumLikeOptions({
-			prefix: "",
-			options: {
-				enum: resolvedEnum,
-				syntaxType,
-				arrayType,
-				optionalType
-			}
-		});
-		for (const [index, entry] of override.entries()) assertEnumLikeOptions({
-			prefix: `override[${index}].options.`,
-			options: entry.options
-		});
 		setResolver(userResolver ? Resolver.merge(resolverTs, userResolver) : resolverTs);
 		if (userMacros?.length) setMacros(userMacros);
 		addGenerator(typeGenerator);