@vue.ts/complex-types 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/astro.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/astro.ts

package/dist/esbuild.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createEsbuildPlugin } from "unplugin";
 
 //#region src/esbuild.ts

package/dist/farm.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createFarmPlugin } from "unplugin";
 
 //#region src/farm.ts

package/dist/index.js

@@ -1,3 +1,3 @@
-import { src_default, unplugin, unpluginFactory } from "./src-CI8-WIu4.js";
+import { src_default, unplugin, unpluginFactory } from "./src-k-9RVLWt.js";
 
 export { src_default as default, unplugin, unpluginFactory };

package/dist/nuxt.js

@@ -1,6 +1,6 @@
-import "./src-CI8-WIu4.js";
-import { vite_default } from "./vite-Dyi1m2wg.js";
-import { webpack_default } from "./webpack-CFfuQfGw.js";
+import "./src-k-9RVLWt.js";
+import { vite_default } from "./vite-D_E5rjeG.js";
+import { webpack_default } from "./webpack-BQtMUXaQ.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 
 //#region src/nuxt.ts

package/dist/rolldown.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createRolldownPlugin } from "unplugin";
 
 //#region src/rolldown.ts

package/dist/rollup.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createRollupPlugin } from "unplugin";
 
 //#region src/rollup.ts

package/dist/rspack.js

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createRspackPlugin } from "unplugin";
 
 //#region src/rspack.ts

package/dist/{src-CI8-WIu4.js → src-k-9RVLWt.js}

@@ -55,7 +55,8 @@ var Printer = class {
 		const parts = ["{"];
 		const isMapped = ts.isMappedTypeNode(node);
 		for (const property of properties) {
-			const questionToken = isMapped ? node.questionToken?.getText() ?? "" : property.flags & ts.SymbolFlags.Optional ? "?" : "";
+			const isOptional = property.flags & ts.SymbolFlags.Optional;
+			const questionToken = isMapped ? node.questionToken?.getText() ?? "" : isOptional ? "?" : "";
 			const valueType = this.checker.getTypeOfSymbol(property);
 			const stringValueType = this.typeToString(this.getBaseType(valueType));
 			parts.push(`${this.checker.symbolToString(property)}${questionToken}: ${stringValueType}`);
@@ -174,6 +175,11 @@ var Printer = class {
 		return `[${elements.join(", ")}]`;
 	}
 	printConditionalTypeNode(node) {
+		const conditionalType = this.checker.getTypeAtLocation(node);
+		if (conditionalType && !(conditionalType.flags & ts.TypeFlags.Conditional)) {
+			const resolvedTypeString = this.typeToString(conditionalType);
+			if (resolvedTypeString !== node.getText()) return resolvedTypeString;
+		}
 		const checkType = this.print(node.checkType);
 		const extendsType = this.print(node.extendsType);
 		const trueType = this.print(node.trueType);

package/dist/{vite-Dyi1m2wg.js → vite-D_E5rjeG.js}

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/vite.ts

package/dist/vite.js

@@ -1,4 +1,4 @@
-import "./src-CI8-WIu4.js";
-import { vite_default } from "./vite-Dyi1m2wg.js";
+import "./src-k-9RVLWt.js";
+import { vite_default } from "./vite-D_E5rjeG.js";
 
 export { vite_default as default };

package/dist/{webpack-CFfuQfGw.js → webpack-BQtMUXaQ.js}

@@ -1,4 +1,4 @@
-import { unpluginFactory } from "./src-CI8-WIu4.js";
+import { unpluginFactory } from "./src-k-9RVLWt.js";
 import { createWebpackPlugin } from "unplugin";
 
 //#region src/webpack.ts

package/dist/webpack.js

@@ -1,4 +1,4 @@
-import "./src-CI8-WIu4.js";
-import { webpack_default } from "./webpack-CFfuQfGw.js";
+import "./src-k-9RVLWt.js";
+import { webpack_default } from "./webpack-BQtMUXaQ.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue.ts/complex-types",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Resolve complex types in Vue SFCs.",
@@ -65,8 +65,8 @@
     "@nuxt/kit": "^3.17.6",
     "magic-string": "^0.30.17",
     "unplugin": "^2.3.5",
-    "@vue.ts/language": "1.0.0-beta.1",
-    "@vue.ts/common": "1.0.0-beta.1"
+    "@vue.ts/common": "1.0.0-beta.2",
+    "@vue.ts/language": "1.0.0-beta.2"
   },
   "devDependencies": {
     "@nuxt/schema": "^3.17.6",