@vue-jsx-vapor/runtime 3.2.2 → 3.2.3

package/dist/props.cjs

@@ -37,9 +37,37 @@ function useProps() {
 */
 /* @__NO_SIDE_EFFECTS__ */
 function useFullProps() {
-	return (0, vue.proxyRefs)({
-		...(0, vue.toRefs)(/* @__PURE__ */ useProps()),
-		...(0, vue.toRefs)((0, vue.useAttrs)())
+	const attrs = (0, vue.useAttrs)();
+	if (!(/* @__PURE__ */ getCurrentInstance()).type.props) return attrs;
+	const props = /* @__PURE__ */ useProps();
+	const fullProps = (0, vue.computed)(() => ({
+		...props,
+		...attrs
+	}));
+	return new Proxy({}, {
+		get(_, p, receiver) {
+			return (0, vue.unref)(Reflect.get(fullProps.value, p, receiver));
+		},
+		set(_, p, value) {
+			if ((0, vue.isRef)(fullProps.value[p]) && !(0, vue.isRef)(value)) fullProps.value[p].value = value;
+			else fullProps.value[p] = value;
+			return true;
+		},
+		deleteProperty(_, p) {
+			return Reflect.deleteProperty(fullProps.value, p);
+		},
+		has(_, p) {
+			return Reflect.has(fullProps.value, p);
+		},
+		ownKeys() {
+			return Object.keys(fullProps.value);
+		},
+		getOwnPropertyDescriptor() {
+			return {
+				enumerable: true,
+				configurable: true
+			};
+		}
 	});
 }
 

package/dist/props.d.cts

@@ -29,8 +29,6 @@ declare function useProps(): {
  *   const fullProps = useFullProps() // = useAttrs() + useProps()
  * })
  */
-declare function useFullProps(): vue0.ShallowUnwrapRef<{
-  [x: string]: vue0.Ref<unknown, unknown>;
-}>;
+declare function useFullProps(): {};
 //#endregion
 export { getCurrentInstance, useFullProps, useProps };

package/dist/props.d.ts

@@ -29,8 +29,6 @@ declare function useProps(): {
  *   const fullProps = useFullProps() // = useAttrs() + useProps()
  * })
  */
-declare function useFullProps(): vue0.ShallowUnwrapRef<{
-  [x: string]: vue0.Ref<unknown, unknown>;
-}>;
+declare function useFullProps(): {};
 //#endregion
 export { getCurrentInstance, useFullProps, useProps };

package/dist/props.js

@@ -1,5 +1,5 @@
 import * as Vue from "vue";
-import { proxyRefs, toRefs, useAttrs } from "vue";
+import { computed, isRef, unref, useAttrs } from "vue";
 
 //#region src/props.ts
 /* @__NO_SIDE_EFFECTS__ */
@@ -36,9 +36,37 @@ function useProps() {
 */
 /* @__NO_SIDE_EFFECTS__ */
 function useFullProps() {
-	return proxyRefs({
-		...toRefs(/* @__PURE__ */ useProps()),
-		...toRefs(useAttrs())
+	const attrs = useAttrs();
+	if (!(/* @__PURE__ */ getCurrentInstance()).type.props) return attrs;
+	const props = /* @__PURE__ */ useProps();
+	const fullProps = computed(() => ({
+		...props,
+		...attrs
+	}));
+	return new Proxy({}, {
+		get(_, p, receiver) {
+			return unref(Reflect.get(fullProps.value, p, receiver));
+		},
+		set(_, p, value) {
+			if (isRef(fullProps.value[p]) && !isRef(value)) fullProps.value[p].value = value;
+			else fullProps.value[p] = value;
+			return true;
+		},
+		deleteProperty(_, p) {
+			return Reflect.deleteProperty(fullProps.value, p);
+		},
+		has(_, p) {
+			return Reflect.has(fullProps.value, p);
+		},
+		ownKeys() {
+			return Object.keys(fullProps.value);
+		},
+		getOwnPropertyDescriptor() {
+			return {
+				enumerable: true,
+				configurable: true
+			};
+		}
 	});
 }
 

package/dist/raw.cjs

@@ -1,6 +1,6 @@
 
 //#region src/props.ts?raw
-var props_default = "import { proxyRefs, toRefs, useAttrs } from \"vue\";\nimport * as Vue from \"vue\";\n// @__NO_SIDE_EFFECTS__\nexport function getCurrentInstance() {\n  return Vue.currentInstance || Vue.getCurrentInstance();\n}\n// @__NO_SIDE_EFFECTS__\nexport function useProps() {\n  const i = /* @__PURE__ */ getCurrentInstance();\n  return i.props;\n}\n// @__NO_SIDE_EFFECTS__\nexport function useFullProps() {\n  return proxyRefs({\n    ...toRefs(/* @__PURE__ */ useProps()),\n    ...toRefs(useAttrs())\n  });\n}\n";
+var props_default = "import { computed, isRef, unref, useAttrs } from \"vue\";\nimport * as Vue from \"vue\";\n// @__NO_SIDE_EFFECTS__\nexport function getCurrentInstance() {\n  return Vue.currentInstance || Vue.getCurrentInstance();\n}\n// @__NO_SIDE_EFFECTS__\nexport function useProps() {\n  const i = /* @__PURE__ */ getCurrentInstance();\n  return i.props;\n}\n// @__NO_SIDE_EFFECTS__\nexport function useFullProps() {\n  const attrs = useAttrs();\n  const i = /* @__PURE__ */ getCurrentInstance();\n  if (!i.type.props) {\n    return attrs;\n  }\n  const props = /* @__PURE__ */ useProps();\n  const fullProps = computed(() => ({ ...props, ...attrs }));\n  return new Proxy(\n    {},\n    {\n      get(_, p, receiver) {\n        return unref(Reflect.get(fullProps.value, p, receiver));\n      },\n      set(_, p, value) {\n        if (isRef(fullProps.value[p]) && !isRef(value))\n          fullProps.value[p].value = value;\n        else fullProps.value[p] = value;\n        return true;\n      },\n      deleteProperty(_, p) {\n        return Reflect.deleteProperty(fullProps.value, p);\n      },\n      has(_, p) {\n        return Reflect.has(fullProps.value, p);\n      },\n      ownKeys() {\n        return Object.keys(fullProps.value);\n      },\n      getOwnPropertyDescriptor() {\n        return {\n          enumerable: true,\n          configurable: true\n        };\n      }\n    }\n  );\n}\n";
 
 //#endregion
 //#region src/ssr.ts?raw
@@ -12,7 +12,7 @@ var vapor_default = "import {\n  EffectScope,\n  Fragment,\n  getCurrentInstance
 
 //#endregion
 //#region src/vdom.ts?raw
-var vdom_default = "import {\n  cloneVNode,\n  Comment,\n  createBlock,\n  createElementBlock,\n  createVNode,\n  Fragment,\n  getCurrentInstance,\n  isVNode,\n  openBlock,\n  Text\n} from \"vue\";\nconst cacheMap = /* @__PURE__ */ new WeakMap();\nexport function createVNodeCache(index) {\n  const i = getCurrentInstance();\n  if (i) {\n    if (!cacheMap.has(i)) cacheMap.set(i, []);\n    const caches = cacheMap.get(i);\n    return caches[index] || (caches[index] = []);\n  } else {\n    return [];\n  }\n}\nexport function normalizeVNode(value = \" \", flag = 1) {\n  let create = createVNode;\n  const isFunction = typeof value === \"function\";\n  if (isFunction) {\n    openBlock();\n    create = createBlock;\n    value = value();\n  }\n  return isVNode(value) ? isFunction ? createBlock(cloneIfMounted(value)) : cloneIfMounted(value) : Array.isArray(value) ? createElementBlock(\n    Fragment,\n    null,\n    value.map(\n      (n) => normalizeVNode(typeof n === \"function\" ? n.toString() : () => n)\n    )\n  ) : value == null || typeof value === \"boolean\" ? create(Comment) : create(Text, null, String(value), flag);\n}\nfunction cloneIfMounted(child) {\n  return child.el === null && child.patchFlag !== -1 || // @ts-ignore\n  child.memo ? child : cloneVNode(child);\n}\n";
+var vdom_default = "import {\n  cloneVNode,\n  Comment,\n  createBlock,\n  createElementBlock,\n  createVNode,\n  Fragment,\n  getCurrentInstance,\n  isVNode,\n  openBlock,\n  Text\n} from \"vue\";\nconst cacheMap = /* @__PURE__ */ new WeakMap();\nexport function createVNodeCache(key) {\n  const i = getCurrentInstance();\n  if (i) {\n    if (!cacheMap.has(i)) cacheMap.set(i, {});\n    const caches = cacheMap.get(i);\n    return caches[key] || (caches[key] = []);\n  } else {\n    return [];\n  }\n}\nexport function normalizeVNode(value = \" \", flag = 1) {\n  let create = createVNode;\n  const isFunction = typeof value === \"function\";\n  if (isFunction) {\n    openBlock();\n    create = createBlock;\n    value = value();\n  }\n  return isVNode(value) ? isFunction ? createBlock(cloneIfMounted(value)) : cloneIfMounted(value) : Array.isArray(value) ? createElementBlock(\n    Fragment,\n    null,\n    value.map(\n      (n) => normalizeVNode(typeof n === \"function\" ? n.toString() : () => n)\n    )\n  ) : value == null || typeof value === \"boolean\" ? create(Comment) : create(Text, null, String(value), flag);\n}\nfunction cloneIfMounted(child) {\n  return child.el === null && child.patchFlag !== -1 || // @ts-ignore\n  child.memo ? child : cloneVNode(child);\n}\n";
 
 //#endregion
 //#region src/raw.ts

package/dist/raw.js

@@ -1,5 +1,5 @@
 //#region src/props.ts?raw
-var props_default = "import { proxyRefs, toRefs, useAttrs } from \"vue\";\nimport * as Vue from \"vue\";\n// @__NO_SIDE_EFFECTS__\nexport function getCurrentInstance() {\n  return Vue.currentInstance || Vue.getCurrentInstance();\n}\n// @__NO_SIDE_EFFECTS__\nexport function useProps() {\n  const i = /* @__PURE__ */ getCurrentInstance();\n  return i.props;\n}\n// @__NO_SIDE_EFFECTS__\nexport function useFullProps() {\n  return proxyRefs({\n    ...toRefs(/* @__PURE__ */ useProps()),\n    ...toRefs(useAttrs())\n  });\n}\n";
+var props_default = "import { computed, isRef, unref, useAttrs } from \"vue\";\nimport * as Vue from \"vue\";\n// @__NO_SIDE_EFFECTS__\nexport function getCurrentInstance() {\n  return Vue.currentInstance || Vue.getCurrentInstance();\n}\n// @__NO_SIDE_EFFECTS__\nexport function useProps() {\n  const i = /* @__PURE__ */ getCurrentInstance();\n  return i.props;\n}\n// @__NO_SIDE_EFFECTS__\nexport function useFullProps() {\n  const attrs = useAttrs();\n  const i = /* @__PURE__ */ getCurrentInstance();\n  if (!i.type.props) {\n    return attrs;\n  }\n  const props = /* @__PURE__ */ useProps();\n  const fullProps = computed(() => ({ ...props, ...attrs }));\n  return new Proxy(\n    {},\n    {\n      get(_, p, receiver) {\n        return unref(Reflect.get(fullProps.value, p, receiver));\n      },\n      set(_, p, value) {\n        if (isRef(fullProps.value[p]) && !isRef(value))\n          fullProps.value[p].value = value;\n        else fullProps.value[p] = value;\n        return true;\n      },\n      deleteProperty(_, p) {\n        return Reflect.deleteProperty(fullProps.value, p);\n      },\n      has(_, p) {\n        return Reflect.has(fullProps.value, p);\n      },\n      ownKeys() {\n        return Object.keys(fullProps.value);\n      },\n      getOwnPropertyDescriptor() {\n        return {\n          enumerable: true,\n          configurable: true\n        };\n      }\n    }\n  );\n}\n";
 
 //#endregion
 //#region src/ssr.ts?raw
@@ -11,7 +11,7 @@ var vapor_default = "import {\n  EffectScope,\n  Fragment,\n  getCurrentInstance
 
 //#endregion
 //#region src/vdom.ts?raw
-var vdom_default = "import {\n  cloneVNode,\n  Comment,\n  createBlock,\n  createElementBlock,\n  createVNode,\n  Fragment,\n  getCurrentInstance,\n  isVNode,\n  openBlock,\n  Text\n} from \"vue\";\nconst cacheMap = /* @__PURE__ */ new WeakMap();\nexport function createVNodeCache(index) {\n  const i = getCurrentInstance();\n  if (i) {\n    if (!cacheMap.has(i)) cacheMap.set(i, []);\n    const caches = cacheMap.get(i);\n    return caches[index] || (caches[index] = []);\n  } else {\n    return [];\n  }\n}\nexport function normalizeVNode(value = \" \", flag = 1) {\n  let create = createVNode;\n  const isFunction = typeof value === \"function\";\n  if (isFunction) {\n    openBlock();\n    create = createBlock;\n    value = value();\n  }\n  return isVNode(value) ? isFunction ? createBlock(cloneIfMounted(value)) : cloneIfMounted(value) : Array.isArray(value) ? createElementBlock(\n    Fragment,\n    null,\n    value.map(\n      (n) => normalizeVNode(typeof n === \"function\" ? n.toString() : () => n)\n    )\n  ) : value == null || typeof value === \"boolean\" ? create(Comment) : create(Text, null, String(value), flag);\n}\nfunction cloneIfMounted(child) {\n  return child.el === null && child.patchFlag !== -1 || // @ts-ignore\n  child.memo ? child : cloneVNode(child);\n}\n";
+var vdom_default = "import {\n  cloneVNode,\n  Comment,\n  createBlock,\n  createElementBlock,\n  createVNode,\n  Fragment,\n  getCurrentInstance,\n  isVNode,\n  openBlock,\n  Text\n} from \"vue\";\nconst cacheMap = /* @__PURE__ */ new WeakMap();\nexport function createVNodeCache(key) {\n  const i = getCurrentInstance();\n  if (i) {\n    if (!cacheMap.has(i)) cacheMap.set(i, {});\n    const caches = cacheMap.get(i);\n    return caches[key] || (caches[key] = []);\n  } else {\n    return [];\n  }\n}\nexport function normalizeVNode(value = \" \", flag = 1) {\n  let create = createVNode;\n  const isFunction = typeof value === \"function\";\n  if (isFunction) {\n    openBlock();\n    create = createBlock;\n    value = value();\n  }\n  return isVNode(value) ? isFunction ? createBlock(cloneIfMounted(value)) : cloneIfMounted(value) : Array.isArray(value) ? createElementBlock(\n    Fragment,\n    null,\n    value.map(\n      (n) => normalizeVNode(typeof n === \"function\" ? n.toString() : () => n)\n    )\n  ) : value == null || typeof value === \"boolean\" ? create(Comment) : create(Text, null, String(value), flag);\n}\nfunction cloneIfMounted(child) {\n  return child.el === null && child.patchFlag !== -1 || // @ts-ignore\n  child.memo ? child : cloneVNode(child);\n}\n";
 
 //#endregion
 //#region src/raw.ts

package/dist/vdom.cjs

@@ -3,12 +3,12 @@ let vue = require("vue");
 
 //#region src/vdom.ts
 const cacheMap = /* @__PURE__ */ new WeakMap();
-function createVNodeCache(index) {
+function createVNodeCache(key) {
 	const i = (0, vue.getCurrentInstance)();
 	if (i) {
-		if (!cacheMap.has(i)) cacheMap.set(i, []);
+		if (!cacheMap.has(i)) cacheMap.set(i, {});
 		const caches = cacheMap.get(i);
-		return caches[index] || (caches[index] = []);
+		return caches[key] || (caches[key] = []);
 	} else return [];
 }
 function normalizeVNode(value = " ", flag = 1) {

package/dist/vdom.d.cts

@@ -1,7 +1,7 @@
 import { VNode } from "vue";
 
 //#region src/vdom.d.ts
-declare function createVNodeCache(index: number): any;
+declare function createVNodeCache(key: string): any;
 declare function normalizeVNode(value?: any, flag?: number): VNode;
 //#endregion
 export { createVNodeCache, normalizeVNode };

package/dist/vdom.d.ts

@@ -1,7 +1,7 @@
 import { VNode } from "vue";
 
 //#region src/vdom.d.ts
-declare function createVNodeCache(index: number): any;
+declare function createVNodeCache(key: string): any;
 declare function normalizeVNode(value?: any, flag?: number): VNode;
 //#endregion
 export { createVNodeCache, normalizeVNode };

package/dist/vdom.js

@@ -2,12 +2,12 @@ import { Comment, Fragment, Text, cloneVNode, createBlock, createElementBlock, c
 
 //#region src/vdom.ts
 const cacheMap = /* @__PURE__ */ new WeakMap();
-function createVNodeCache(index) {
+function createVNodeCache(key) {
 	const i = getCurrentInstance();
 	if (i) {
-		if (!cacheMap.has(i)) cacheMap.set(i, []);
+		if (!cacheMap.has(i)) cacheMap.set(i, {});
 		const caches = cacheMap.get(i);
-		return caches[index] || (caches[index] = []);
+		return caches[key] || (caches[key] = []);
 	} else return [];
 }
 function normalizeVNode(value = " ", flag = 1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vue-jsx-vapor/runtime",
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "Vue JSX Vapor Runtime",
   "license": "MIT",
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",