@vue-jsx-vapor/macros 2.0.1 → 2.1.0

package/dist/volar.cjs

@@ -10,7 +10,6 @@ var _tsmacro = require('ts-macro');
 
 
 
-var _compilerdom = require('@vue/compiler-dom');
 
 
 // src/volar/define-component.ts
@@ -214,9 +213,7 @@ ${defineStyle}
 type ${_common.HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
 type ${_common.HELPER_PREFIX}PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {};
 // @ts-ignore
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
-// @ts-ignore
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
 }
 
@@ -322,7 +319,7 @@ function getRootMap(options) {
           `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`
         );
       }
-      const id = _compilerdom.toValidAssetId.call(void 0, modelName, `${_common.HELPER_PREFIX}model`);
+      const id = toValidAssetId(modelName, `${_common.HELPER_PREFIX}model`);
       const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
       (rootMap.get(root).defineModel ??= []).push(
         `${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`,
@@ -361,6 +358,11 @@ const ${_common.HELPER_PREFIX}exposed = `
   ts.forEachChild(ast, (node) => walk(node, []));
   return rootMap;
 }
+function toValidAssetId(name, type) {
+  return `_${type}_${name.replaceAll(/\W/g, (searchValue, replaceValue) => {
+    return searchValue === "-" ? "_" : name.charCodeAt(replaceValue).toString();
+  })}`;
+}
 
 // src/volar.ts
 var plugin = _tsmacro.createPlugin.call(void 0, 

package/dist/volar.js

@@ -10,7 +10,6 @@ import { createPlugin } from "ts-macro";
 import {
   HELPER_PREFIX as HELPER_PREFIX4
 } from "@vue-macros/common";
-import { toValidAssetId } from "@vue/compiler-dom";
 import { replaceRange as replaceRange4 } from "ts-macro";
 
 // src/volar/define-component.ts
@@ -214,9 +213,7 @@ ${defineStyle}
 type ${HELPER_PREFIX3}StyleArgs = [style: string, options?: { scoped?: boolean }];
 type ${HELPER_PREFIX3}PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {};
 // @ts-ignore
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
-// @ts-ignore
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
 }
 
@@ -361,6 +358,11 @@ const ${HELPER_PREFIX4}exposed = `
   ts.forEachChild(ast, (node) => walk(node, []));
   return rootMap;
 }
+function toValidAssetId(name, type) {
+  return `_${type}_${name.replaceAll(/\W/g, (searchValue, replaceValue) => {
+    return searchValue === "-" ? "_" : name.charCodeAt(replaceValue).toString();
+  })}`;
+}
 
 // src/volar.ts
 var plugin = createPlugin(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -168,11 +168,10 @@
   },
   "dependencies": {
     "@vue-macros/common": "3.0.0-beta.4",
-    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@ce35a8c",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@ce35a8c",
+    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@34957eb",
     "@vue/language-core": "^2.2.8",
     "hash-sum": "^2.0.0",
-    "ts-macro": "0.1.21",
+    "ts-macro": "^0.1.25",
     "unplugin": "^1.16.1"
   },
   "devDependencies": {
@@ -181,7 +180,7 @@
     "@nuxt/schema": "^3.16.0",
     "@types/hash-sum": "^1.0.2",
     "@vue-macros/test-utils": "3.0.0-beta.4",
-    "vue": "https://pkg.pr.new/vue@ce35a8c"
+    "vue": "https://pkg.pr.new/vue@34957eb"
   },
   "scripts": {
     "build": "tsup",