vue-jsx-vapor 2.5.4-beta.1 → 2.6.1

package/dist/index.js

@@ -1,148 +1 @@
-import * as Vue from "vue";
-import { EffectScope, Fragment, VaporFragment, createComponent as createComponent$1, createComponentWithFallback as createComponentWithFallback$1, createTextNode, insert, isFragment, isVaporComponent, proxyRefs, remove, renderEffect, shallowRef as useRef, toRefs, useAttrs } from "vue";
-
-//#region src/core/runtime.ts
-function isBlock(val) {
-	return val instanceof Node || Array.isArray(val) || isVaporComponent(val) || isFragment(val);
-}
-function getCurrentInstance() {
-	return Vue.currentInstance || Vue.getCurrentInstance();
-}
-const createProxyComponent = (createComponent$2, type, props, ...args) => {
-	if (type === Fragment) {
-		type = (_, { slots }) => slots.default();
-		props = null;
-	}
-	if (Vue.currentInstance && Vue.currentInstance.appContext.vapor) typeof type === "function" && (type.__vapor = true);
-	return createComponent$2(type, props, ...args);
-};
-const createComponent = (type, ...args) => {
-	return createProxyComponent(createComponent$1, type, ...args);
-};
-const createComponentWithFallback = (type, ...args) => createProxyComponent(createComponentWithFallback$1, type, ...args);
-/**
-* Returns the props of the current component instance.
-*
-* @example
-* ```tsx
-* import { useProps } from 'vue-jsx-vapor'
-*
-* defineComponent(({ foo = '' })=>{
-*   const props = useProps() // { foo: '' }
-* })
-* ```
-*/
-function useProps() {
-	const i = getCurrentInstance();
-	return i.props;
-}
-/**
-* Returns the merged props and attrs of the current component.\
-* Equivalent to `useProps()` + `useAttrs()`.
-*
-* @example
-* ```tsx
-* import { useFullProps } from 'vue-jsx-vapor'
-*
-* defineComponent((props) => {
-*   const fullProps = useFullProps() // = useAttrs() + useProps()
-* })
-*/
-function useFullProps() {
-	return proxyRefs({
-		...toRefs(useProps()),
-		...toRefs(useAttrs())
-	});
-}
-function createFragment(nodes, anchor = document.createTextNode("")) {
-	const frag = new VaporFragment(nodes);
-	frag.anchor = anchor;
-	return frag;
-}
-function normalizeNode$1(node, anchor) {
-	if (node instanceof Node || isFragment(node)) {
-		anchor && (anchor.textContent = "");
-		return node;
-	} else if (isVaporComponent(node)) {
-		anchor && (anchor.textContent = "");
-		return createFragment(node, anchor);
-	} else if (Array.isArray(node)) {
-		anchor && (anchor.textContent = "");
-		return createFragment(node.map((i) => normalizeNode$1(i)), anchor);
-	} else {
-		const result = node == null || typeof node === "boolean" ? "" : String(node);
-		if (anchor) {
-			anchor.textContent = result;
-			return anchor;
-		} else return document.createTextNode(result);
-	}
-}
-function resolveValue(current, value, _anchor) {
-	const node = normalizeNode$1(value, _anchor);
-	if (current) {
-		if (isFragment(current)) {
-			const { anchor } = current;
-			if (anchor && anchor.parentNode) {
-				remove(current.nodes, anchor.parentNode);
-				insert(node, anchor.parentNode, anchor);
-				!_anchor && anchor.parentNode.removeChild(anchor);
-			}
-		} else if (current instanceof Node) {
-			if (isFragment(node) && current.parentNode) {
-				insert(node, current.parentNode, current);
-				current.parentNode.removeChild(current);
-			} else if (node instanceof Node) {
-				if (current.nodeType === 3 && node.nodeType === 3) {
-					current.textContent = node.textContent;
-					return current;
-				} else if (current.parentNode) current.parentNode.replaceChild(node, current);
-			}
-		}
-	}
-	return node;
-}
-function resolveValues(values = [], _anchor) {
-	const nodes = [];
-	const frag = createFragment(nodes, _anchor);
-	const scopes = [];
-	for (const [index, value] of values.entries()) {
-		const anchor = index === values.length - 1 ? _anchor : void 0;
-		if (typeof value === "function") renderEffect(() => {
-			if (scopes[index]) scopes[index].stop();
-			scopes[index] = new EffectScope();
-			nodes[index] = scopes[index].run(() => resolveValue(nodes[index], value(), anchor));
-		});
-		else nodes[index] = resolveValue(nodes[index], value, anchor);
-	}
-	return frag;
-}
-function setNodes(anchor, ...values) {
-	const resolvedValues = resolveValues(values, anchor);
-	anchor.parentNode && insert(resolvedValues, anchor.parentNode, anchor);
-}
-function createNodes(...values) {
-	return resolveValues(values);
-}
-
-//#endregion
-//#region src/core/h.ts
-function normalizeNode(node) {
-	if (node == null || typeof node === "boolean") return [];
-	else if (Array.isArray(node) && node.length) return node.map(normalizeNode);
-	else if (isBlock(node)) return node;
-	else return createTextNode(String(node));
-}
-function h(type, propsOrChildren, children) {
-	const l = arguments.length;
-	if (l === 2) if (typeof propsOrChildren === "object" && !Array.isArray(propsOrChildren)) {
-		if (isBlock(propsOrChildren)) return createComponentWithFallback(type, null, { default: () => normalizeNode(propsOrChildren) });
-		return createComponentWithFallback(type, propsOrChildren ? { $: [() => propsOrChildren] } : null);
-	} else return createComponentWithFallback(type, null, { default: () => normalizeNode(propsOrChildren) });
-	else {
-		if (l > 3) children = Array.prototype.slice.call(arguments, 2);
-		return createComponentWithFallback(type, propsOrChildren ? { $: [() => propsOrChildren] } : null, children ? typeof children === "object" && !Array.isArray(children) ? children : { default: () => normalizeNode(children) } : void 0);
-	}
-}
-
-//#endregion
-export { createComponent, createComponentWithFallback, createNodes, getCurrentInstance, h, isBlock, setNodes, useFullProps, useProps, useRef };
+export * from "@vue-jsx-vapor/runtime"

package/dist/nuxt.d.ts

@@ -1,8 +1,8 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as _nuxt_schema0 from "@nuxt/schema";
+import * as _nuxt_schema10 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts
 interface ModuleOptions extends Options {}
-declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema10.NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/rolldown.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as rollup1 from "rollup";
+import * as rollup7 from "rollup";
 
 //#region src/rolldown.d.ts
-declare const _default: (options?: Options | undefined) => rollup1.Plugin<any> | rollup1.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup7.Plugin<any> | rollup7.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rolldown.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as rollup10 from "rollup";
+import * as rollup12 from "rollup";
 
 //#region src/rolldown.d.ts
-declare const _default: (options?: Options | undefined) => rollup10.Plugin<any> | rollup10.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup12.Plugin<any> | rollup12.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rollup.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as rollup6 from "rollup";
+import * as rollup3 from "rollup";
 
 //#region src/rollup.d.ts
-declare const _default: (options?: Options | undefined) => rollup6.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup3.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rollup.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as rollup7 from "rollup";
+import * as rollup5 from "rollup";
 
 //#region src/rollup.d.ts
-declare const _default: (options?: Options | undefined) => rollup7.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup5.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/unplugin.d.cts

@@ -1,9 +1,9 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as unplugin8 from "unplugin";
+import * as unplugin5 from "unplugin";
 import { UnpluginFactory } from "unplugin";
 
 //#region src/unplugin.d.ts
 declare const unpluginFactory: UnpluginFactory<Options | undefined, true>;
-declare const unplugin: unplugin8.UnpluginInstance<Options | undefined, true>;
+declare const unplugin: unplugin5.UnpluginInstance<Options | undefined, true>;
 //#endregion
 export { Options, unplugin as default, unplugin, unpluginFactory };

package/dist/unplugin.d.ts

@@ -1,9 +1,9 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as unplugin3 from "unplugin";
+import * as unplugin9 from "unplugin";
 import { UnpluginFactory } from "unplugin";
 
 //#region src/unplugin.d.ts
 declare const unpluginFactory: UnpluginFactory<Options | undefined, true>;
-declare const unplugin: unplugin3.UnpluginInstance<Options | undefined, true>;
+declare const unplugin: unplugin9.UnpluginInstance<Options | undefined, true>;
 //#endregion
 export { Options, unplugin as default, unplugin, unpluginFactory };

package/dist/vite.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as vite5 from "vite";
+import * as vite3 from "vite";
 
 //#region src/vite.d.ts
-declare const _default: (options?: Options | undefined) => vite5.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => vite3.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/volar.cjs

@@ -6,7 +6,7 @@ const __vue_macros_volar_jsx_ref = require_chunk.__toESM(require("@vue-macros/vo
 const ts_macro = require_chunk.__toESM(require("ts-macro"));
 
 //#region src/volar.ts
-const plugin = (0, ts_macro.createPlugin)((ctx, options = ctx.vueCompilerOptions["vue-jsx-vapor"]) => {
+const plugin = (0, ts_macro.createPlugin)((ctx, options = ctx.vueCompilerOptions?.["vue-jsx-vapor"]) => {
 	return [
 		(0, __vue_macros_volar_jsx_directive.default)()(ctx),
 		options?.ref === false ? [] : (0, __vue_macros_volar_jsx_ref.default)(options?.ref === true ? void 0 : options?.ref)(ctx),

package/dist/volar.js

@@ -4,7 +4,7 @@ import jsxRef from "@vue-macros/volar/jsx-ref";
 import { createPlugin } from "ts-macro";
 
 //#region src/volar.ts
-const plugin = createPlugin((ctx, options = ctx.vueCompilerOptions["vue-jsx-vapor"]) => {
+const plugin = createPlugin((ctx, options = ctx.vueCompilerOptions?.["vue-jsx-vapor"]) => {
 	return [
 		jsxDirective()(ctx),
 		options?.ref === false ? [] : jsxRef(options?.ref === true ? void 0 : options?.ref)(ctx),

package/dist/webpack.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as webpack13 from "webpack";
+import * as webpack8 from "webpack";
 
 //#region src/webpack.d.ts
-declare const _default: (options?: Options | undefined) => webpack13.WebpackPluginInstance;
+declare const _default: (options?: Options | undefined) => webpack8.WebpackPluginInstance;
 //#endregion
 export { _default as default };

package/jsx-runtime/index.cjs

@@ -1,40 +1,52 @@
 //#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 __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));
-
+  if ((from && typeof from === 'object') || typeof from === 'function')
+    for (
+      // eslint-disable-next-line vars-on-top
+      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
-const vue = __toESM(require("vue"));
-const vue_jsx_vapor = __toESM(require("vue-jsx-vapor"));
+const vue = __toESM(require('vue'))
+const vue_jsx_vapor = __toESM(require('vue-jsx-vapor'))
 
-//#region src/jsx-runtime.ts
 function jsx(type, props, key) {
-	const { children, ["v-slots"]: vSlots } = props;
-	delete props.children;
-	delete props["v-slots"];
-	if (arguments.length > 2) props.key = key;
-	return (0, vue_jsx_vapor.h)(type, props, vSlots || children);
+  const { children, ['v-slots']: vSlots } = props
+  delete props.children
+  delete props['v-slots']
+  if (arguments.length > 2) props.key = key
+  return (0, vue_jsx_vapor.h)(type, props, vSlots || children)
 }
 
-//#endregion
-exports.Fragment = vue.Fragment;
-exports.jsx = jsx;
-exports.jsxDEV = jsx;
-exports.jsxs = jsx;
+exports.Fragment = vue.Fragment
+exports.jsx = jsx
+exports.jsxDEV = jsx
+exports.jsxs = jsx

package/jsx-runtime/index.d.ts

@@ -1,25 +1,20 @@
-import { Block, Fragment } from "vue";
-import { NativeElements, ReservedProps, h } from "vue-jsx-vapor";
+import { Fragment, type Block, type VNode } from 'vue'
+import type { h, NativeElements, ReservedProps } from 'vue-jsx-vapor'
 
-//#region src/jsx-runtime.d.ts
-declare function jsx(type: any, props: any, key: any): ReturnType<typeof h>;
+declare function jsx(type: any, props: any, key: any): ReturnType<typeof h>
 declare global {
   namespace JSX {
-    type Element = Block;
-    interface ElementClass {
-      $props: {};
-    }
+    type Element = Block & VNode
     interface ElementAttributesProperty {
-      $props: {};
+      $props
     }
     interface IntrinsicElements extends NativeElements {
-      [name: string]: any;
+      [name: string]: any
     }
     interface IntrinsicAttributes extends ReservedProps {
-      class?: unknown;
-      style?: unknown;
+      class?: unknown
+      style?: unknown
     }
   }
 }
-//#endregion
-export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs };
+export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs }

package/jsx-runtime/index.js

@@ -1,14 +1,12 @@
-import { Fragment } from "vue";
-import { h } from "vue-jsx-vapor";
+import { Fragment } from 'vue'
+import { h } from 'vue-jsx-vapor'
 
-//#region src/jsx-runtime.ts
 function jsx(type, props, key) {
-	const { children, ["v-slots"]: vSlots } = props;
-	delete props.children;
-	delete props["v-slots"];
-	if (arguments.length > 2) props.key = key;
-	return h(type, props, vSlots || children);
+  const { children, ['v-slots']: vSlots } = props
+  delete props.children
+  delete props['v-slots']
+  if (arguments.length > 2) props.key = key
+  return h(type, props, vSlots || children)
 }
 
-//#endregion
-export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs };
+export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-jsx-vapor",
-  "version": "2.5.4-beta.1",
+  "version": "2.6.1",
   "description": "Convert Vue JSX to Vapor",
   "type": "module",
   "keywords": [
@@ -104,13 +104,11 @@
     },
     "./jsx-runtime": {
       "types": "./jsx-runtime/index.d.ts",
-      "jsx-vapor-dev": "./src/jsx-runtime.ts",
       "require": "./jsx-runtime/index.cjs",
       "default": "./jsx-runtime/index.js"
     },
     "./jsx-dev-runtime": {
       "types": "./jsx-runtime/index.d.ts",
-      "jsx-vapor-dev": "./src/jsx-runtime.ts",
       "require": "./jsx-runtime/index.cjs",
       "default": "./jsx-runtime/index.js"
     },
@@ -139,7 +137,7 @@
     "esbuild": "*",
     "rollup": "^3",
     "vite": ">=3",
-    "vue": "^3.6.0",
+    "vue": "^3.6.0-alpha.2",
     "webpack": "^4 || ^5"
   },
   "peerDependenciesMeta": {
@@ -165,25 +163,24 @@
   "dependencies": {
     "@babel/core": "^7.28.0",
     "@babel/plugin-transform-typescript": "^7.28.0",
-    "@vue-macros/jsx-directive": "^3.0.0-beta.17",
-    "@vue-macros/volar": "^3.0.0-beta.17",
+    "@vue-macros/jsx-directive": "^3.0.0-beta.20",
+    "@vue-macros/volar": "^3.0.0-beta.20",
     "@vue/babel-plugin-jsx": "^1.4.0",
     "hash-sum": "^2.0.0",
     "pathe": "^2.0.3",
-    "ts-macro": "^0.2.7",
+    "ts-macro": "^0.3.2",
     "unplugin": "^2.3.5",
     "unplugin-utils": "^0.2.4",
-    "@vue-jsx-vapor/babel": "2.5.4-beta.1",
-    "@vue-jsx-vapor/compiler": "2.5.4-beta.1",
-    "@vue-jsx-vapor/macros": "2.5.4-beta.1"
+    "@vue-jsx-vapor/compiler": "2.6.1",
+    "@vue-jsx-vapor/babel": "2.6.1",
+    "@vue-jsx-vapor/runtime": "2.6.1",
+    "@vue-jsx-vapor/macros": "2.6.1"
   },
   "devDependencies": {
-    "@nuxt/kit": "^3.17.6",
-    "@nuxt/schema": "^3.17.6",
+    "@nuxt/kit": "^3.18.1",
+    "@nuxt/schema": "^3.18.1",
     "@types/babel__core": "^7.20.5",
-    "@types/hash-sum": "^1.0.2",
-    "csstype": "^3.1.3",
-    "vue": "3.6.0-alpha.2"
+    "@types/hash-sum": "^1.0.2"
   },
   "scripts": {
     "build": "tsdown",

package/jsx-runtime/index.d.cts

@@ -1,25 +0,0 @@
-import { Block, Fragment } from "vue";
-import { NativeElements, ReservedProps, h } from "vue-jsx-vapor";
-
-//#region src/jsx-runtime.d.ts
-declare function jsx(type: any, props: any, key: any): ReturnType<typeof h>;
-declare global {
-  namespace JSX {
-    type Element = Block;
-    interface ElementClass {
-      $props: {};
-    }
-    interface ElementAttributesProperty {
-      $props: {};
-    }
-    interface IntrinsicElements extends NativeElements {
-      [name: string]: any;
-    }
-    interface IntrinsicAttributes extends ReservedProps {
-      class?: unknown;
-      style?: unknown;
-    }
-  }
-}
-//#endregion
-export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs };