@vue-jsx-vapor/macros 3.1.20 → 3.1.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/volar.cjs +4 -3
  2. package/dist/volar.js +4 -3
  3. package/package.json +2 -2
package/dist/volar.cjs CHANGED
@@ -9,7 +9,8 @@ function transformDefineComponent(node, parent, options) {
9
9
  const { codes, ast, ts } = options;
10
10
  const [comp, compOptions] = node.arguments;
11
11
  codes.replaceRange(comp.end, node.end - 1);
12
- const isFnComponent = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length || node.expression.getText(ast).includes("defineVapor");
12
+ const isFnComponent = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length;
13
+ const isVaporComponent = node.expression.getText(ast).includes("defineVapor");
13
14
  codes.replaceRange(node.getStart(ast), node.expression.end, ts.isExpressionStatement(parent) ? ";" : "", isFnComponent ? "" : `(() => {
14
15
  const __setup = `);
15
16
  if (isFnComponent) {
@@ -23,7 +24,7 @@ const __setup = `);
23
24
  type __Exposed = Parameters<__Setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`, "\n return ", [node.expression.getText(ast), node.expression.getStart(ast)], `({\n ...{} as {
24
25
  setup: (props: __Props) => __Exposed,
25
26
  render: () => ReturnType<__Setup>
26
- slots: import('vue').SlotsType<__Slots>
27
+ slots: ${isVaporComponent ? "__Slots" : `import('vue').SlotsType<__Slots>`}
27
28
  },`, ...compOptions ? ["...", [compOptions.getText(ast), compOptions.getStart(ast)]] : [], `})`, `\n})()`);
28
29
  }
29
30
 
@@ -190,7 +191,7 @@ return {} as {
190
191
  props: {${props.join(", ")}},
191
192
  context: ${root.parameters[1]?.type ? `${root.parameters[1].type.getText(ast)} & ` : ""}{
192
193
  slots: ${macros.defineSlots ?? "{}"},
193
- expose: (exposed: ${macros.defineExpose ?? "Record<string, any>"}) => void,
194
+ expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "Record<string, any>"}>) => void,
194
195
  attrs: Record<string, any>
195
196
  },
196
197
  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __rndr${isDefineComponent ? ">" : ""}
package/dist/volar.js CHANGED
@@ -7,7 +7,8 @@ function transformDefineComponent(node, parent, options) {
7
7
  const { codes, ast, ts } = options;
8
8
  const [comp, compOptions] = node.arguments;
9
9
  codes.replaceRange(comp.end, node.end - 1);
10
- const isFnComponent = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length || node.expression.getText(ast).includes("defineVapor");
10
+ const isFnComponent = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length;
11
+ const isVaporComponent = node.expression.getText(ast).includes("defineVapor");
11
12
  codes.replaceRange(node.getStart(ast), node.expression.end, ts.isExpressionStatement(parent) ? ";" : "", isFnComponent ? "" : `(() => {
12
13
  const __setup = `);
13
14
  if (isFnComponent) {
@@ -21,7 +22,7 @@ const __setup = `);
21
22
  type __Exposed = Parameters<__Setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`, "\n return ", [node.expression.getText(ast), node.expression.getStart(ast)], `({\n ...{} as {
22
23
  setup: (props: __Props) => __Exposed,
23
24
  render: () => ReturnType<__Setup>
24
- slots: import('vue').SlotsType<__Slots>
25
+ slots: ${isVaporComponent ? "__Slots" : `import('vue').SlotsType<__Slots>`}
25
26
  },`, ...compOptions ? ["...", [compOptions.getText(ast), compOptions.getStart(ast)]] : [], `})`, `\n})()`);
26
27
  }
27
28
 
@@ -188,7 +189,7 @@ return {} as {
188
189
  props: {${props.join(", ")}},
189
190
  context: ${root.parameters[1]?.type ? `${root.parameters[1].type.getText(ast)} & ` : ""}{
190
191
  slots: ${macros.defineSlots ?? "{}"},
191
- expose: (exposed: ${macros.defineExpose ?? "Record<string, any>"}) => void,
192
+ expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "Record<string, any>"}>) => void,
192
193
  attrs: Record<string, any>
193
194
  },
194
195
  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __rndr${isDefineComponent ? ">" : ""}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@vue-jsx-vapor/macros",
3
3
  "type": "module",
4
- "version": "3.1.20",
4
+ "version": "3.1.22",
5
5
  "description": "Macros for Vue JSX Vapor",
6
6
  "license": "MIT",
7
7
  "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",
@@ -151,7 +151,7 @@
151
151
  "@nuxt/schema": "^3.21.0",
152
152
  "@types/hash-sum": "^1.0.2",
153
153
  "ast-kit": "^2.2.0",
154
- "vue": "3.6.0-beta.5"
154
+ "vue": "3.6.0-beta.6"
155
155
  },
156
156
  "scripts": {
157
157
  "build": "tsdown",