@vue/compiler-vapor 3.6.0-alpha.1 → 3.6.0-alpha.2

package/dist/compiler-vapor.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-vapor v3.6.0-alpha.1
+* @vue/compiler-vapor v3.6.0-alpha.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -1084,18 +1084,26 @@ function genFor(oper, context) {
     keyProp,
     idMap
   );
-  const patternFrag = [];
+  const selectorDeclarations = [];
+  const selectorSetup = [];
   for (let i = 0; i < selectorPatterns.length; i++) {
     const { selector } = selectorPatterns[i];
     const selectorName = `_selector${id}_${i}`;
-    patternFrag.push(
+    selectorDeclarations.push(`let ${selectorName}`, NEWLINE);
+    if (i === 0) {
+      selectorSetup.push(`({ createSelector }) => {`, INDENT_START);
+    }
+    selectorSetup.push(
       NEWLINE,
-      `const ${selectorName} = `,
-      ...genCall(`n${id}.useSelector`, [
+      `${selectorName} = `,
+      ...genCall(`createSelector`, [
         `() => `,
         ...genExpression(selector, context)
       ])
     );
+    if (i === selectorPatterns.length - 1) {
+      selectorSetup.push(INDENT_END, NEWLINE, "}");
+    }
   }
   const blockFn = context.withId(() => {
     const frag = [];
@@ -1103,25 +1111,25 @@ function genFor(oper, context) {
     if (selectorPatterns.length || keyOnlyBindingPatterns.length) {
       frag.push(
         ...genBlockContent(render, context, false, () => {
-          const patternFrag2 = [];
+          const patternFrag = [];
           for (let i = 0; i < selectorPatterns.length; i++) {
             const { effect } = selectorPatterns[i];
-            patternFrag2.push(
+            patternFrag.push(
               NEWLINE,
               `_selector${id}_${i}(() => {`,
               INDENT_START
             );
             for (const oper2 of effect.operations) {
-              patternFrag2.push(...genOperation(oper2, context));
+              patternFrag.push(...genOperation(oper2, context));
             }
-            patternFrag2.push(INDENT_END, NEWLINE, `})`);
+            patternFrag.push(INDENT_END, NEWLINE, `})`);
           }
           for (const { effect } of keyOnlyBindingPatterns) {
             for (const oper2 of effect.operations) {
-              patternFrag2.push(...genOperation(oper2, context));
+              patternFrag.push(...genOperation(oper2, context));
             }
           }
-          return patternFrag2;
+          return patternFrag;
         })
       );
     } else {
@@ -1143,16 +1151,17 @@ function genFor(oper, context) {
   }
   return [
     NEWLINE,
+    ...selectorDeclarations,
     `const n${id} = `,
     ...genCall(
-      helper("createFor"),
+      [helper("createFor"), "undefined"],
       sourceExpr,
       blockFn,
       genCallback(keyProp),
-      flags ? String(flags) : void 0
+      flags ? String(flags) : void 0,
+      selectorSetup.length ? selectorSetup : void 0
       // todo: hydrationNode
-    ),
-    ...patternFrag
+    )
   ];
   function parseValueDestructure() {
     const map = /* @__PURE__ */ new Map();
@@ -1790,6 +1799,7 @@ function genCreateComponent(operation, context) {
 }
 function getUniqueHandlerName(context, name) {
   const { seenInlineHandlerNames } = context;
+  name = genVarName(name);
   const count = seenInlineHandlerNames[name] || 0;
   seenInlineHandlerNames[name] = count + 1;
   return count === 0 ? name : `${name}${count}`;
@@ -3091,7 +3101,8 @@ const transformText = (node, context) => {
   }
 };
 function processInterpolation(context) {
-  const children = context.parent.node.children;
+  const parentNode = context.parent.node;
+  const children = parentNode.children;
   const nexts = children.slice(context.index);
   const idx = nexts.findIndex((n) => !isTextLike(n));
   const nodes = idx > -1 ? nexts.slice(0, idx) : nexts;
@@ -3099,9 +3110,15 @@ function processInterpolation(context) {
   if (prev && prev.type === 2) {
     nodes.unshift(prev);
   }
+  const values = processTextLikeChildren(nodes, context);
+  if (values.length === 0 && parentNode.type !== 0) {
+    return;
+  }
   context.template += " ";
   const id = context.reference();
-  const values = nodes.map((node) => createTextLikeExpression(node, context));
+  if (values.length === 0) {
+    return;
+  }
   const nonConstantExps = values.filter((v) => !isConstantExpression(v));
   const isStatic = !nonConstantExps.length || nonConstantExps.every(
     (e) => isStaticExpression(e, context.options.bindingMetadata)
@@ -3121,7 +3138,7 @@ function processInterpolation(context) {
   }
 }
 function processTextContainer(children, context) {
-  const values = children.map((child) => createTextLikeExpression(child, context));
+  const values = processTextLikeChildren(children, context);
   const literals = values.map(getLiteralExpressionValue);
   if (literals.every((l) => l != null)) {
     context.childrenTemplate = literals.map((l) => String(l));
@@ -3140,13 +3157,19 @@ function processTextContainer(children, context) {
     });
   }
 }
-function createTextLikeExpression(node, context) {
-  markNonTemplate(node, context);
-  if (node.type === 2) {
-    return compilerDom.createSimpleExpression(node.content, true, node.loc);
-  } else {
-    return node.content;
+function processTextLikeChildren(nodes, context) {
+  const exps = [];
+  for (const node of nodes) {
+    let exp;
+    markNonTemplate(node, context);
+    if (node.type === 2) {
+      exp = compilerDom.createSimpleExpression(node.content, true, node.loc);
+    } else {
+      exp = node.content;
+    }
+    if (exp.content) exps.push(exp);
   }
+  return exps;
 }
 function isTextLike(node) {
   return node.type === 5 || node.type === 2;

package/dist/compiler-vapor.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-vapor v3.6.0-alpha.1
+* @vue/compiler-vapor v3.6.0-alpha.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -33612,18 +33612,26 @@ function genFor(oper, context) {
     keyProp,
     idMap
   );
-  const patternFrag = [];
+  const selectorDeclarations = [];
+  const selectorSetup = [];
   for (let i = 0; i < selectorPatterns.length; i++) {
     const { selector } = selectorPatterns[i];
     const selectorName = `_selector${id}_${i}`;
-    patternFrag.push(
+    selectorDeclarations.push(`let ${selectorName}`, NEWLINE);
+    if (i === 0) {
+      selectorSetup.push(`({ createSelector }) => {`, INDENT_START);
+    }
+    selectorSetup.push(
       NEWLINE,
-      `const ${selectorName} = `,
-      ...genCall(`n${id}.useSelector`, [
+      `${selectorName} = `,
+      ...genCall(`createSelector`, [
         `() => `,
         ...genExpression(selector, context)
       ])
     );
+    if (i === selectorPatterns.length - 1) {
+      selectorSetup.push(INDENT_END, NEWLINE, "}");
+    }
   }
   const blockFn = context.withId(() => {
     const frag = [];
@@ -33631,25 +33639,25 @@ function genFor(oper, context) {
     if (selectorPatterns.length || keyOnlyBindingPatterns.length) {
       frag.push(
         ...genBlockContent(render, context, false, () => {
-          const patternFrag2 = [];
+          const patternFrag = [];
           for (let i = 0; i < selectorPatterns.length; i++) {
             const { effect } = selectorPatterns[i];
-            patternFrag2.push(
+            patternFrag.push(
               NEWLINE,
               `_selector${id}_${i}(() => {`,
               INDENT_START
             );
             for (const oper2 of effect.operations) {
-              patternFrag2.push(...genOperation(oper2, context));
+              patternFrag.push(...genOperation(oper2, context));
             }
-            patternFrag2.push(INDENT_END, NEWLINE, `})`);
+            patternFrag.push(INDENT_END, NEWLINE, `})`);
           }
           for (const { effect } of keyOnlyBindingPatterns) {
             for (const oper2 of effect.operations) {
-              patternFrag2.push(...genOperation(oper2, context));
+              patternFrag.push(...genOperation(oper2, context));
             }
           }
-          return patternFrag2;
+          return patternFrag;
         })
       );
     } else {
@@ -33671,16 +33679,17 @@ function genFor(oper, context) {
   }
   return [
     NEWLINE,
+    ...selectorDeclarations,
     `const n${id} = `,
     ...genCall(
-      helper("createFor"),
+      [helper("createFor"), "undefined"],
       sourceExpr,
       blockFn,
       genCallback(keyProp),
-      flags ? String(flags) : void 0
+      flags ? String(flags) : void 0,
+      selectorSetup.length ? selectorSetup : void 0
       // todo: hydrationNode
-    ),
-    ...patternFrag
+    )
   ];
   function parseValueDestructure() {
     const map = /* @__PURE__ */ new Map();
@@ -34318,6 +34327,7 @@ function genCreateComponent(operation, context) {
 }
 function getUniqueHandlerName(context, name) {
   const { seenInlineHandlerNames } = context;
+  name = genVarName(name);
   const count = seenInlineHandlerNames[name] || 0;
   seenInlineHandlerNames[name] = count + 1;
   return count === 0 ? name : `${name}${count}`;
@@ -35605,7 +35615,8 @@ const transformText = (node, context) => {
   }
 };
 function processInterpolation(context) {
-  const children = context.parent.node.children;
+  const parentNode = context.parent.node;
+  const children = parentNode.children;
   const nexts = children.slice(context.index);
   const idx = nexts.findIndex((n) => !isTextLike(n));
   const nodes = idx > -1 ? nexts.slice(0, idx) : nexts;
@@ -35613,9 +35624,15 @@ function processInterpolation(context) {
   if (prev && prev.type === 2) {
     nodes.unshift(prev);
   }
+  const values = processTextLikeChildren(nodes, context);
+  if (values.length === 0 && parentNode.type !== 0) {
+    return;
+  }
   context.template += " ";
   const id = context.reference();
-  const values = nodes.map((node) => createTextLikeExpression(node, context));
+  if (values.length === 0) {
+    return;
+  }
   const nonConstantExps = values.filter((v) => !isConstantExpression(v));
   const isStatic = !nonConstantExps.length || nonConstantExps.every(
     (e) => isStaticExpression(e, context.options.bindingMetadata)
@@ -35635,7 +35652,7 @@ function processInterpolation(context) {
   }
 }
 function processTextContainer(children, context) {
-  const values = children.map((child) => createTextLikeExpression(child, context));
+  const values = processTextLikeChildren(children, context);
   const literals = values.map(getLiteralExpressionValue);
   if (literals.every((l) => l != null)) {
     context.childrenTemplate = literals.map((l) => String(l));
@@ -35654,13 +35671,19 @@ function processTextContainer(children, context) {
     });
   }
 }
-function createTextLikeExpression(node, context) {
-  markNonTemplate(node, context);
-  if (node.type === 2) {
-    return createSimpleExpression(node.content, true, node.loc);
-  } else {
-    return node.content;
+function processTextLikeChildren(nodes, context) {
+  const exps = [];
+  for (const node of nodes) {
+    let exp;
+    markNonTemplate(node, context);
+    if (node.type === 2) {
+      exp = createSimpleExpression(node.content, true, node.loc);
+    } else {
+      exp = node.content;
+    }
+    if (exp.content) exps.push(exp);
   }
+  return exps;
 }
 function isTextLike(node) {
   return node.type === 5 || node.type === 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-vapor",
-  "version": "3.6.0-alpha.1",
+  "version": "3.6.0-alpha.2",
   "description": "@vue/compiler-vapor",
   "main": "dist/compiler-vapor.cjs.js",
   "module": "dist/compiler-vapor.esm-bundler.js",
@@ -45,7 +45,7 @@
     "@babel/parser": "^7.27.5",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-alpha.1",
-    "@vue/shared": "3.6.0-alpha.1"
+    "@vue/compiler-dom": "3.6.0-alpha.2",
+    "@vue/shared": "3.6.0-alpha.2"
   }
 }