@vue.ts/complex-types 1.0.0-beta.3 → 1.0.0-beta.4

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 Ray <https://github.com/so1ve>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 Ray <https://github.com/so1ve>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -2,7 +2,7 @@
 
 [![NPM version](https://img.shields.io/npm/v/@vue.ts/complex-types?color=a1b858&label=)](https://www.npmjs.com/package/@vue.ts/complex-types)
 
-Use [`@vue/language-core`](https://github.com/vuejs/language-tools/tree/master/packages/language-core) to support complex types for Vue Macros.
+Use [`@vue/language-core`](https://github.com/vuejs/language-tools/tree/master/packages/language-core) to support complex types for Vue's Macros.
 
 For example: fixes https://github.com/vuejs/core/issues/8286.
 

package/dist/astro.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {

package/dist/astro.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/astro.ts

package/dist/esbuild.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as esbuild0 from "esbuild";
 

package/dist/esbuild.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createEsbuildPlugin } from "unplugin";
 
 //#region src/esbuild.ts

package/dist/farm.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as _farmfe_core0 from "@farmfe/core";
 

package/dist/farm.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createFarmPlugin } from "unplugin";
 
 //#region src/farm.ts

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import * as unplugin0 from "unplugin";
 import { UnpluginFactory } from "unplugin";
 

package/dist/index.js

@@ -1,3 +1,3 @@
-import { src_default, unplugin, unpluginFactory } from "./src-C2cWUkxC.js";
+import { src_default, unplugin, unpluginFactory } from "./src-koVD0EYI.js";
 
 export { src_default as default, unplugin, unpluginFactory };

package/dist/nuxt.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as _nuxt_schema0 from "@nuxt/schema";
 

package/dist/nuxt.js

@@ -1,6 +1,6 @@
-import "./src-C2cWUkxC.js";
-import { vite_default } from "./vite-kxApzRU8.js";
-import { webpack_default } from "./webpack-DB3Ln7vl.js";
+import "./src-koVD0EYI.js";
+import { vite_default } from "./vite-DFtk2L0c.js";
+import { webpack_default } from "./webpack-BWJ3ulvy.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 
 //#region src/nuxt.ts

package/dist/rolldown.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as rolldown0 from "rolldown";
 

package/dist/rolldown.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createRolldownPlugin } from "unplugin";
 
 //#region src/rolldown.ts

package/dist/rollup.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as rollup0 from "rollup";
 

package/dist/rollup.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createRollupPlugin } from "unplugin";
 
 //#region src/rollup.ts

package/dist/rspack.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 
 //#region src/rspack.d.ts

package/dist/rspack.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createRspackPlugin } from "unplugin";
 
 //#region src/rspack.ts

package/dist/{src-C2cWUkxC.js → src-koVD0EYI.js}

@@ -4,15 +4,17 @@ import { createFilter, normalizePath } from "@vue.ts/shared";
 import MagicString from "magic-string";
 import ts from "typescript";
 import { join } from "node:path";
+import { defu } from "defu";
 
 //#region src/core/utils.ts
-const resolveOptions = (rawOptions) => ({
-	include: rawOptions.include ?? ["**/*.vue"],
-	exclude: rawOptions.exclude ?? ["node_modules/**"],
-	tsconfigPath: rawOptions.tsconfigPath ?? join(process.cwd(), "tsconfig.json"),
-	defineEmits: rawOptions.defineEmits ?? true,
-	defineProps: rawOptions.defineProps ?? true
-});
+const defaultOptions = {
+	include: ["**/*.vue"],
+	exclude: ["node_modules/**"],
+	tsconfigPath: join(process.cwd(), "tsconfig.json"),
+	defineEmits: true,
+	defineProps: true
+};
+const resolveOptions = (rawOptions) => defu(rawOptions, defaultOptions);
 const quotesReg = /"/g;
 const escapeQuotes = (s) => s.replace(quotesReg, "\\\"");
 
@@ -25,11 +27,18 @@ var Printer = class {
 	typeToString(type) {
 		return this.checker.typeToString(type, void 0, ts.TypeFormatFlags.NoTruncation);
 	}
-	printOuterUnionOrIntersection(type, separator, inner) {
+	printUnionOrIntersection(type, separator, inner) {
 		return [...new Set(type.types.map((t) => this.printType(t, inner)).filter(Boolean))].join(separator);
 	}
-	isUnionUndefined(union) {
-		return union.types.some((t) => t.flags & ts.TypeFlags.Undefined);
+	containsUndefined(type) {
+		return type.isUnion() ? type.types.some((t) => t.flags & ts.TypeFlags.Undefined) : !!(type.flags & ts.TypeFlags.Undefined);
+	}
+	printConditionTypeNode(type) {
+		const decl = type.root.node;
+		const { trueType, falseType } = decl;
+		const trueTypeNode = this.checker.getTypeAtLocation(trueType);
+		const falseTypeNode = this.checker.getTypeAtLocation(falseType);
+		return `${this.printType(trueTypeNode)} | ${this.printType(falseTypeNode)}`;
 	}
 	printPrimitiveType(type) {
 		if (type.flags & ts.TypeFlags.BooleanLiteral) return "boolean";
@@ -42,9 +51,9 @@ var Printer = class {
 		return "";
 	}
 	printType(type, inner = false) {
-		if (type.isUnion()) return this.printOuterUnionOrIntersection(type, " | ", inner);
-		else if (type.isIntersection()) return this.printOuterUnionOrIntersection(type, " & ", inner);
-		if (this.typeToString(type).endsWith("[]")) return this.typeToString(type);
+		if (type.isUnion()) return this.printUnionOrIntersection(type, " | ", inner);
+		else if (type.isIntersection()) return this.printUnionOrIntersection(type, " & ", inner);
+		if (this.checker.isArrayType(type)) return "Array";
 		else if (type.flags & ts.TypeFlags.Object) {
 			const decl = type.getSymbol()?.declarations?.[0];
 			if (decl && ts.isFunctionTypeNode(decl)) return "Function";
@@ -54,19 +63,19 @@ var Printer = class {
 			for (const prop of properties) {
 				const propType = this.checker.getTypeOfSymbol(prop);
 				props[prop.getName()] = {
-					value: this.printType(this.checker.getTypeOfSymbol(prop), true),
-					isOptional: propType.isUnion() ? this.isUnionUndefined(propType) : !!(propType.flags & ts.TypeFlags.Undefined)
+					value: this.printType(propType, true),
+					isOptional: this.containsUndefined(propType)
 				};
 			}
 			const parts = [];
-			for (const [propName, propData] of Object.entries(props)) {
-				const questionMark = propData.isOptional ? "?" : "";
-				parts.push(`"${propName}"${questionMark}: ${propData.value},`);
+			for (const [propName, { isOptional, value }] of Object.entries(props)) {
+				const questionMark = isOptional ? "?" : "";
+				parts.push(`"${escapeQuotes(propName)}"${questionMark}: ${value},`);
 			}
 			return Object.keys(props).length > 0 ? `{\n${parts.join("\n")}\n}` : "";
 		} else if (type.isLiteral() || type.flags & ts.TypeFlags.BooleanLiteral || type.flags & ts.TypeFlags.String || type.flags & ts.TypeFlags.Number || type.flags & ts.TypeFlags.BigInt || type.flags & ts.TypeFlags.Any || type.flags & ts.TypeFlags.Unknown || type.flags & ts.TypeFlags.Null) return this.printPrimitiveType(type);
 		else if (type.flags & ts.TypeFlags.Undefined) return "";
-		else if (type.flags & ts.TypeFlags.Conditional) return `${this.printType(type.resolvedTrueType)} | ${this.printType(type.resolvedFalseType)}`;
+		else if (type.flags & ts.TypeFlags.Conditional) return this.printConditionTypeNode(type);
 		else if (type.isTypeParameter()) {
 			const symbol = type.getSymbol();
 			const decl = symbol?.declarations?.[0];

package/dist/{types-afZXKowK.d.ts → types-WYBg4JEW.d.ts}

@@ -13,8 +13,9 @@ declare class Printer {
   private checker;
   constructor(checker: ts.TypeChecker);
   private typeToString;
-  private printOuterUnionOrIntersection;
-  private isUnionUndefined;
+  private printUnionOrIntersection;
+  private containsUndefined;
+  private printConditionTypeNode;
   private printPrimitiveType;
   private printType;
   printPropsTypeArg(node: ts.Node): string;

package/dist/types.d.ts

@@ -1,3 +1,3 @@
-import { Options, ResolvedOptions, TransformOptions, Transformer, Transformers, ValidTransforms } from "./types-afZXKowK.js";
+import { Options, ResolvedOptions, TransformOptions, Transformer, Transformers, ValidTransforms } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 export { Options, ResolvedOptions, TransformOptions, Transformer, Transformers, ValidTransforms };

package/dist/{vite-kxApzRU8.js → vite-DFtk2L0c.js}

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/vite.ts

package/dist/vite.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as vite0 from "vite";
 

package/dist/vite.js

@@ -1,4 +1,4 @@
-import "./src-C2cWUkxC.js";
-import { vite_default } from "./vite-kxApzRU8.js";
+import "./src-koVD0EYI.js";
+import { vite_default } from "./vite-DFtk2L0c.js";
 
 export { vite_default as default };

package/dist/{webpack-DB3Ln7vl.js → webpack-BWJ3ulvy.js}

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-C2cWUkxC.js";
+import { unpluginFactory } from "./src-koVD0EYI.js";
 import { createWebpackPlugin } from "unplugin";
 
 //#region src/webpack.ts

package/dist/webpack.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./types-afZXKowK.js";
+import { Options } from "./types-WYBg4JEW.js";
 import "./types-u_Hr5uXA.js";
 import * as webpack0 from "webpack";
 

package/dist/webpack.js

@@ -1,4 +1,4 @@
-import "./src-C2cWUkxC.js";
-import { webpack_default } from "./webpack-DB3Ln7vl.js";
+import "./src-koVD0EYI.js";
+import { webpack_default } from "./webpack-BWJ3ulvy.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue.ts/complex-types",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Resolve complex types in Vue SFCs.",
@@ -62,31 +62,32 @@
     "access": "public"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.17.6",
+    "@nuxt/kit": "^4.0.2",
+    "defu": "^6.1.4",
     "magic-string": "^0.30.17",
     "unplugin": "^2.3.5",
-    "@vue.ts/language": "1.0.0-beta.3",
-    "@vue.ts/shared": "1.0.0-beta.3"
+    "@vue.ts/language": "1.0.0-beta.4",
+    "@vue.ts/shared": "1.0.0-beta.4"
   },
   "devDependencies": {
-    "@nuxt/schema": "^3.17.6",
+    "@nuxt/schema": "^4.0.2",
     "@vue-macros/better-define": "^1.11.4",
     "rolldown": "1.0.0-beta.27",
-    "rollup": "^4.44.2",
+    "rollup": "^4.46.2",
     "vite": "^7.0.4",
-    "webpack": "^5.100.1"
+    "webpack": "^5.101.0"
   },
   "peerDependencies": {
-    "@farmfe/core": ">=1",
-    "@nuxt/kit": "^3 || ^4",
-    "@nuxt/schema": "^3 || ^4",
+    "@farmfe/core": ">=1.7.10",
+    "@nuxt/kit": "^4.0.2",
+    "@nuxt/schema": "^4.0.2",
     "esbuild": "*",
     "rolldown": "*",
-    "rollup": "^3",
-    "typescript": ">=5.5",
-    "vite": ">=3",
-    "vue": ">=3",
-    "webpack": "^4 || ^5"
+    "rollup": "^4.46.2",
+    "typescript": ">=5.9.2",
+    "vite": ">=7.0.6",
+    "vue": ">=3.5.18",
+    "webpack": "^5.101.0"
   },
   "peerDependenciesMeta": {
     "@farmfe/core": {