@vue.ts/complex-types 1.0.0-beta.7 → 1.0.0-beta.9

package/dist/astro.d.ts

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

package/dist/astro.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/astro.ts

package/dist/esbuild.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as esbuild0 from "esbuild";
 
 //#region src/esbuild.d.ts

package/dist/esbuild.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createEsbuildPlugin } from "unplugin";
 
 //#region src/esbuild.ts

package/dist/farm.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as _farmfe_core0 from "@farmfe/core";
 
 //#region src/farm.d.ts

package/dist/farm.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createFarmPlugin } from "unplugin";
 
 //#region src/farm.ts

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,3 +1,3 @@
-import { n as unplugin, r as unpluginFactory, t as src_default } from "./src-BrjMgGhR.js";
+import { n as unplugin, r as unpluginFactory, t as src_default } from "./src-wLNIJnZT.js";
 
 export { src_default as default, unplugin, unpluginFactory };

package/dist/nuxt.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts

package/dist/nuxt.js

@@ -1,6 +1,6 @@
-import "./src-BrjMgGhR.js";
-import { t as vite_default } from "./vite-ji592KVg.js";
-import { t as webpack_default } from "./webpack-BxPL7HeA.js";
+import "./src-wLNIJnZT.js";
+import { t as vite_default } from "./vite-B7R6skxU.js";
+import { t as webpack_default } from "./webpack-CVxLsdbd.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 
 //#region src/nuxt.ts

package/dist/rolldown.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as rolldown0 from "rolldown";
 
 //#region src/rolldown.d.ts

package/dist/rolldown.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createRolldownPlugin } from "unplugin";
 
 //#region src/rolldown.ts

package/dist/rollup.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as rollup0 from "rollup";
 
 //#region src/rollup.d.ts

package/dist/rollup.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createRollupPlugin } from "unplugin";
 
 //#region src/rollup.ts

package/dist/rspack.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;

package/dist/rspack.js

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createRspackPlugin } from "unplugin";
 
 //#region src/rspack.ts

package/dist/{src-BrjMgGhR.js → src-wLNIJnZT.js}

@@ -1,10 +1,12 @@
 import { createUnplugin } from "unplugin";
 import { ensureLanguage, getLanguage } from "@vue.ts/language";
-import { createFilter, normalizePath } from "@vue.ts/shared";
+import { createFilter } from "unplugin-utils";
 import MagicString from "magic-string";
 import ts from "typescript";
 import { join } from "node:path";
 import { defu } from "defu";
+import { normalizePath } from "@vue.ts/shared";
+import { isReservedProp } from "@vue/shared";
 
 //#region src/core/utils.ts
 const defaultOptions = {
@@ -27,17 +29,17 @@ var Printer = class {
 	typeToString(type) {
 		return this.checker.typeToString(type, void 0, ts.TypeFormatFlags.NoTruncation);
 	}
-	printUnionOrIntersection(type, separator, inner) {
-		return [...new Set(type.types.map((t) => this.printType(t, inner)).filter(Boolean))].join(separator);
+	printUnionOrIntersection(type, separator, isPropertyBlacklisted, inner) {
+		return [...new Set(type.types.map((t) => this.printType(t, isPropertyBlacklisted, inner)).filter(Boolean))].join(separator);
 	}
-	containsUndefined(type) {
-		return type.isUnion() ? type.types.some((t) => t.flags & ts.TypeFlags.Undefined) : !!(type.flags & ts.TypeFlags.Undefined);
+	isSymbolOptional(symbol) {
+		return !!(symbol.flags & ts.SymbolFlags.Optional);
 	}
-	printConditionType(type, inner) {
+	printConditionType(type, isPropertyBlacklisted, inner) {
 		const { trueType, falseType } = type.root.node;
 		const trueTypeNode = this.checker.getTypeAtLocation(trueType);
 		const falseTypeNode = this.checker.getTypeAtLocation(falseType);
-		return `${this.printType(trueTypeNode, inner)} | ${this.printType(falseTypeNode, inner)}`;
+		return `${this.printType(trueTypeNode, isPropertyBlacklisted, inner)} | ${this.printType(falseTypeNode, isPropertyBlacklisted, inner)}`;
 	}
 	printPrimitiveType(type) {
 		if (type.flags & ts.TypeFlags.BooleanLiteral) return "boolean";
@@ -49,9 +51,9 @@ var Printer = class {
 		else if (type.flags & ts.TypeFlags.Null) return "null";
 		return "";
 	}
-	printType(type, inner = false) {
-		if (type.isUnion()) return this.printUnionOrIntersection(type, " | ", inner);
-		else if (type.isIntersection()) return this.printUnionOrIntersection(type, " & ", inner);
+	printType(type, isPropertyBlacklisted, inner = false) {
+		if (type.isUnion()) return this.printUnionOrIntersection(type, " | ", isPropertyBlacklisted, inner);
+		else if (type.isIntersection()) return this.printUnionOrIntersection(type, " & ", isPropertyBlacklisted, inner);
 		if (this.checker.isArrayType(type)) return "Array";
 		else if (type.flags & ts.TypeFlags.Object) {
 			const decl = type.getSymbol()?.declarations?.[0];
@@ -61,9 +63,11 @@ var Printer = class {
 			const props = {};
 			for (const prop of properties) {
 				const propType = this.checker.getTypeOfSymbol(prop);
-				props[prop.getName()] = {
-					value: this.printType(propType, true),
-					isOptional: this.containsUndefined(propType)
+				const name = prop.getName();
+				if (isPropertyBlacklisted(name)) continue;
+				props[name] = {
+					value: this.printType(propType, isPropertyBlacklisted, true),
+					isOptional: this.isSymbolOptional(prop)
 				};
 			}
 			const parts = [];
@@ -74,20 +78,20 @@ var Printer = class {
 			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.printConditionType(type, inner);
+		else if (type.flags & ts.TypeFlags.Conditional) return this.printConditionType(type, isPropertyBlacklisted, inner);
 		else if (type.isTypeParameter()) {
 			const decl = type.getSymbol()?.declarations?.[0];
 			if (!decl || !ts.isTypeParameterDeclaration(decl)) return "";
 			const ref = ts.getEffectiveConstraintOfTypeParameter(decl);
 			if (!ref) return "";
 			const refType = this.checker.getTypeAtLocation(ref);
-			return this.printType(refType, inner);
+			return this.printType(refType, isPropertyBlacklisted, inner);
 		}
 		return this.typeToString(type);
 	}
-	printPropsTypeArg(node) {
+	printPropsTypeArg(node, isPropertyBlacklisted) {
 		const type = this.checker.getTypeAtLocation(node);
-		return this.printType(type);
+		return this.printType(type, isPropertyBlacklisted);
 	}
 	printEventsByCallSignatures(callSignatures) {
 		return callSignatures.map((c) => {
@@ -148,7 +152,7 @@ const transformDefineProps = (printer, s, id) => {
 	const scriptSetupDefinePropsTypeRange = language.parseScriptSetupRanges(scriptSetupAst).defineProps?.typeArg;
 	const virtualFileDefinePropsTypeNode = language.findNodeByName(virtualFileAst, "__VLS_Props");
 	if (!scriptSetupDefinePropsTypeRange || !virtualFileDefinePropsTypeNode) return;
-	const printedType = printer.printPropsTypeArg(virtualFileDefinePropsTypeNode);
+	const printedType = printer.printPropsTypeArg(virtualFileDefinePropsTypeNode, isReservedProp);
 	const offset = scriptSetupBlock.startTagEnd;
 	s.overwrite(offset + scriptSetupDefinePropsTypeRange.start, offset + scriptSetupDefinePropsTypeRange.end, printedType);
 };
@@ -174,18 +178,47 @@ function transform(code, id, options) {
 
 //#endregion
 //#region src/index.ts
+const languageExtRegexp = /\.((?:c|m)?(?:j|t)sx?|d\.ts|vue)$/i;
 const unpluginFactory = (options = {}) => {
 	const resolvedOptions = resolveOptions(options);
 	const filter = createFilter(resolvedOptions.include, resolvedOptions.exclude);
 	return {
 		name: "@vue.ts/complex-types",
 		enforce: "pre",
+		vite: { async handleHotUpdate(ctx) {
+			const { file } = ctx;
+			if (!languageExtRegexp.test(file)) return;
+			const language = getLanguage();
+			const { read } = ctx;
+			async function readAndUpdateLanguage() {
+				const content = await read();
+				language.updateFile(file, content);
+				return content;
+			}
+			if (!filter(file)) {
+				await readAndUpdateLanguage();
+				return;
+			}
+			let cached;
+			ctx.read = async () => {
+				cached ??= (async () => {
+					const code = await readAndUpdateLanguage();
+					return transform(code, file, resolvedOptions)?.code ?? code;
+				})();
+				return cached;
+			};
+			for (const mod of ctx.modules) ctx.server.moduleGraph.invalidateModule(mod);
+			return ctx.modules;
+		} },
 		buildStart() {
 			ensureLanguage(resolveOptions(options).tsconfigPath);
 		},
-		transform(code, id) {
-			if (!filter(id)) return;
-			return transform(code, id, resolvedOptions);
+		transform: {
+			filter: { id: {
+				include: resolvedOptions.include,
+				exclude: resolvedOptions.exclude
+			} },
+			handler: (code, id) => transform(code, id, resolvedOptions)
 		}
 	};
 };

package/dist/{types-DoyG2eeQ.d.ts → types-B0cfnWIB.d.ts}

@@ -1,6 +1,6 @@
+import { FilterPattern } from "unplugin";
 import MagicString from "magic-string";
 import ts from "typescript";
-import { FilterPattern } from "@rollup/pluginutils";
 
 //#region ../shared/src/types.d.ts
 interface BaseOptions {
@@ -14,11 +14,11 @@ declare class Printer {
   constructor(checker: ts.TypeChecker);
   private typeToString;
   private printUnionOrIntersection;
-  private containsUndefined;
+  private isSymbolOptional;
   private printConditionType;
   private printPrimitiveType;
   private printType;
-  printPropsTypeArg(node: ts.Node): string;
+  printPropsTypeArg(node: ts.Node, isPropertyBlacklisted: (prop: string) => boolean): string;
   private printEventsByCallSignatures;
   private printEventsByMembers;
   printEventsRuntimeArg(node: ts.Node): string;

package/dist/types.d.ts

@@ -1,3 +1,3 @@
-import { a as Transformers, i as Transformer, n as ResolvedOptions, o as ValidTransforms, r as TransformOptions, t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { a as Transformers, i as Transformer, n as ResolvedOptions, o as ValidTransforms, r as TransformOptions, t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 export { Options, ResolvedOptions, TransformOptions, Transformer, Transformers, ValidTransforms };

package/dist/{vite-ji592KVg.js → vite-B7R6skxU.js}

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createVitePlugin } from "unplugin";
 
 //#region src/vite.ts

package/dist/vite.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as vite0 from "vite";
 
 //#region src/vite.d.ts

package/dist/vite.js

@@ -1,4 +1,4 @@
-import "./src-BrjMgGhR.js";
-import { t as vite_default } from "./vite-ji592KVg.js";
+import "./src-wLNIJnZT.js";
+import { t as vite_default } from "./vite-B7R6skxU.js";
 
 export { vite_default as default };

package/dist/{webpack-BxPL7HeA.js → webpack-CVxLsdbd.js}

@@ -1,4 +1,4 @@
-import { r as unpluginFactory } from "./src-BrjMgGhR.js";
+import { r as unpluginFactory } from "./src-wLNIJnZT.js";
 import { createWebpackPlugin } from "unplugin";
 
 //#region src/webpack.ts

package/dist/webpack.d.ts

@@ -1,5 +1,5 @@
-import { t as Options } from "./types-DoyG2eeQ.js";
-import "./types-B3d3HWOR.js";
+import { t as Options } from "./types-B0cfnWIB.js";
+import "./types-u_Hr5uXA.js";
 import * as webpack0 from "webpack";
 
 //#region src/webpack.d.ts

package/dist/webpack.js

@@ -1,4 +1,4 @@
-import "./src-BrjMgGhR.js";
-import { t as webpack_default } from "./webpack-BxPL7HeA.js";
+import "./src-wLNIJnZT.js";
+import { t as webpack_default } from "./webpack-CVxLsdbd.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue.ts/complex-types",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.9",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Resolve complex types in Vue SFCs.",
@@ -63,18 +63,20 @@
   },
   "dependencies": {
     "@nuxt/kit": "^4.2.0",
+    "@vue/shared": "^3.5.22",
     "defu": "^6.1.4",
     "magic-string": "^0.30.21",
-    "unplugin": "^2.3.10",
-    "@vue.ts/language": "1.0.0-beta.7",
-    "@vue.ts/shared": "1.0.0-beta.7"
+    "unplugin": "2.3.10",
+    "unplugin-utils": "^0.3.1",
+    "@vue.ts/language": "1.0.0-beta.9",
+    "@vue.ts/shared": "1.0.0-beta.9"
   },
   "devDependencies": {
     "@nuxt/schema": "^4.2.0",
     "@vue-macros/better-define": "^3.1.1",
-    "rolldown": "1.0.0-beta.27",
+    "rolldown": "1.0.0-beta.45",
     "rollup": "^4.52.5",
-    "vite": "^7.1.12",
+    "vite": "7.1.12",
     "webpack": "^5.102.1"
   },
   "peerDependencies": {

package/dist/chunk-tTHiu3lt.js

@@ -1,24 +0,0 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-export {  };