@vue/compiler-sfc 3.4.0-rc.2 → 3.4.0-rc.3

package/dist/compiler-sfc.cjs.js

@@ -2019,7 +2019,7 @@ function generateSourceMap(filename, source, generated, sourceRoot, lineOffset,
             generatedLine,
             generatedColumn: i,
             source: filename,
-            // @ts-ignore
+            // @ts-expect-error
             name: null
           });
         }
@@ -17862,7 +17862,7 @@ function innerResolveTypeElements(ctx, node, scope, typeParameters) {
             );
           }
           if (
-            // @ts-ignore
+            // @ts-expect-error
             SupportedBuiltinsSet.has(typeName)
           ) {
             return resolveBuiltin(
@@ -17964,7 +17964,7 @@ function mergeElements(maps, type) {
           baseProps[key].key,
           {
             type,
-            // @ts-ignore
+            // @ts-expect-error
             types: [baseProps[key], props[key]]
           },
           baseProps[key]._ownerScope,
@@ -19094,33 +19094,38 @@ function processDefineModel(ctx, node, declId) {
   if (ctx.modelDecls[modelName]) {
     ctx.error(`duplicate model name ${JSON.stringify(modelName)}`, node);
   }
-  const optionsString = options && ctx.getString(options);
-  ctx.modelDecls[modelName] = {
-    type,
-    options: optionsString,
-    identifier: declId && declId.type === "Identifier" ? declId.name : void 0
-  };
-  ctx.bindingMetadata[modelName] = "props";
+  let optionsString = options && ctx.getString(options);
   let runtimeOptions = "";
+  let transformOptions = "";
   if (options) {
     if (options.type === "ObjectExpression") {
-      const local = options.properties.find(
-        (p) => p.type === "ObjectProperty" && (p.key.type === "Identifier" && p.key.name === "local" || p.key.type === "StringLiteral" && p.key.value === "local")
-      );
-      if (local) {
-        runtimeOptions = `{ ${ctx.getString(local)} }`;
-      } else {
-        for (const p of options.properties) {
-          if (p.type === "SpreadElement" || p.computed) {
-            runtimeOptions = optionsString;
-            break;
-          }
+      for (let i = options.properties.length - 1; i >= 0; i--) {
+        const p = options.properties[i];
+        if (p.type === "SpreadElement" || p.computed) {
+          runtimeOptions = optionsString;
+          break;
         }
+        if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
+          transformOptions = ctx.getString(p) + ", " + transformOptions;
+          const offset = p.start - options.start;
+          const next = options.properties[i + 1];
+          const end = (next ? next.start : options.end - 1) - options.start;
+          optionsString = optionsString.slice(0, offset) + optionsString.slice(end);
+        }
+      }
+      if (!runtimeOptions && transformOptions) {
+        runtimeOptions = `{ ${transformOptions} }`;
       }
     } else {
       runtimeOptions = optionsString;
     }
   }
+  ctx.modelDecls[modelName] = {
+    type,
+    options: optionsString,
+    identifier: declId && declId.type === "Identifier" ? declId.name : void 0
+  };
+  ctx.bindingMetadata[modelName] = "props";
   ctx.s.overwrite(
     ctx.startOffset + node.start,
     ctx.startOffset + node.end,
@@ -19158,6 +19163,11 @@ function genModelProps(ctx) {
     }
     modelPropsDecl += `
     ${JSON.stringify(name)}: ${decl},`;
+    const modifierPropName = JSON.stringify(
+      name === "modelValue" ? `modelModifiers` : `${name}Modifiers`
+    );
+    modelPropsDecl += `
+    ${modifierPropName}: {},`;
   }
   return `{${modelPropsDecl}
   }`;
@@ -20567,7 +20577,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.0-rc.2";
+const version = "3.4.0-rc.3";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.d.ts

@@ -221,7 +221,7 @@ export interface SFCParseResult {
     descriptor: SFCDescriptor;
     errors: (CompilerError | SyntaxError)[];
 }
-export declare function parse(source: string, { sourceMap, filename, sourceRoot, pad, ignoreEmpty, compiler, parseExpressions }?: SFCParseOptions): SFCParseResult;
+export declare function parse(source: string, { sourceMap, filename, sourceRoot, pad, ignoreEmpty, compiler, parseExpressions, }?: SFCParseOptions): SFCParseResult;
 
 type PreprocessLang = 'less' | 'sass' | 'scss' | 'styl' | 'stylus';
 

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

@@ -18752,7 +18752,6 @@ function createRootCodegen(root, context) {
       true,
       void 0,
       false
-      /* isComponent */
     );
   } else ;
 }
@@ -22264,7 +22263,7 @@ function createCodegenContext(ast, {
       generatedLine: context.line,
       generatedColumn: context.column - 1,
       source: filename,
-      // @ts-ignore it is possible to be null
+      // @ts-expect-error it is possible to be null
       name
     });
   }
@@ -23457,7 +23456,6 @@ const transformFor = createStructuralDirectiveTransform(
             true,
             void 0,
             false
-            /* isComponent */
           );
         } else {
           childBlock = children[0].codegenNode;
@@ -23514,7 +23512,6 @@ const transformFor = createStructuralDirectiveTransform(
               createForLoopParams(forNode.parseResult),
               childBlock,
               true
-              /* force newline */
             )
           );
         }
@@ -23772,13 +23769,15 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
               createForLoopParams(parseResult),
               buildDynamicSlot(slotName, slotFunction),
               true
-              /* force newline */
             )
           ])
         );
       } else {
         context.onError(
-          createCompilerError(32, vFor.loc)
+          createCompilerError(
+            32,
+            vFor.loc
+          )
         );
       }
     } else {
@@ -26851,7 +26850,7 @@ function generateSourceMap(filename, source, generated, sourceRoot, lineOffset,
             generatedLine,
             generatedColumn: i,
             source: filename,
-            // @ts-ignore
+            // @ts-expect-error
             name: null
           });
         }
@@ -31367,7 +31366,6 @@ const ssrTransformElement = (node, context) => {
         false,
         false,
         true
-        /* ssr */
       );
       if (props || directives.length) {
         const mergedProps = buildSSRProps(props, directives, context);
@@ -31503,7 +31501,6 @@ const ssrTransformElement = (node, context) => {
                         createSimpleExpression(" " + attrName, true),
                         createSimpleExpression("", true),
                         false
-                        /* no newline */
                       )
                     );
                   } else if (isSSRSafeAttrName(attrName)) {
@@ -31649,7 +31646,6 @@ function ssrTransformTransitionGroup(node, context) {
         true,
         false,
         true
-        /* ssr (skip event listeners) */
       );
       let propsExp = null;
       if (props || directives.length) {
@@ -31872,7 +31868,6 @@ function ssrProcessComponent(node, context, parent) {
           context,
           false,
           true
-          /* withSlotScopeId */
         ),
         vnodeBranch
       );
@@ -32078,7 +32073,9 @@ function processChildren(parent, context, asFragment = false, disableNestedFragm
         break;
       case 5:
         context.pushStringPart(
-          createCallExpression(context.helper(SSR_INTERPOLATE), [child.content])
+          createCallExpression(context.helper(SSR_INTERPOLATE), [
+            child.content
+          ])
         );
         break;
       case 9:
@@ -32148,7 +32145,6 @@ const ssrTransformModel = (dir, node, context) => {
             createSimpleExpression(" selected", true),
             createSimpleExpression("", true),
             false
-            /* no newline */
           )
         );
       }
@@ -32283,7 +32279,6 @@ const ssrTransformShow = (dir, node, context) => {
             )
           ]),
           false
-          /* no newline */
         )
       )
     ]
@@ -45922,7 +45917,7 @@ function innerResolveTypeElements(ctx, node, scope, typeParameters) {
             );
           }
           if (
-            // @ts-ignore
+            // @ts-expect-error
             SupportedBuiltinsSet.has(typeName)
           ) {
             return resolveBuiltin(
@@ -46024,7 +46019,7 @@ function mergeElements(maps, type) {
           baseProps[key].key,
           {
             type,
-            // @ts-ignore
+            // @ts-expect-error
             types: [baseProps[key], props[key]]
           },
           baseProps[key]._ownerScope,
@@ -47069,33 +47064,38 @@ function processDefineModel(ctx, node, declId) {
   if (ctx.modelDecls[modelName]) {
     ctx.error(`duplicate model name ${JSON.stringify(modelName)}`, node);
   }
-  const optionsString = options && ctx.getString(options);
-  ctx.modelDecls[modelName] = {
-    type,
-    options: optionsString,
-    identifier: declId && declId.type === "Identifier" ? declId.name : void 0
-  };
-  ctx.bindingMetadata[modelName] = "props";
+  let optionsString = options && ctx.getString(options);
   let runtimeOptions = "";
+  let transformOptions = "";
   if (options) {
     if (options.type === "ObjectExpression") {
-      const local = options.properties.find(
-        (p) => p.type === "ObjectProperty" && (p.key.type === "Identifier" && p.key.name === "local" || p.key.type === "StringLiteral" && p.key.value === "local")
-      );
-      if (local) {
-        runtimeOptions = `{ ${ctx.getString(local)} }`;
-      } else {
-        for (const p of options.properties) {
-          if (p.type === "SpreadElement" || p.computed) {
-            runtimeOptions = optionsString;
-            break;
-          }
+      for (let i = options.properties.length - 1; i >= 0; i--) {
+        const p = options.properties[i];
+        if (p.type === "SpreadElement" || p.computed) {
+          runtimeOptions = optionsString;
+          break;
+        }
+        if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
+          transformOptions = ctx.getString(p) + ", " + transformOptions;
+          const offset = p.start - options.start;
+          const next = options.properties[i + 1];
+          const end = (next ? next.start : options.end - 1) - options.start;
+          optionsString = optionsString.slice(0, offset) + optionsString.slice(end);
         }
       }
+      if (!runtimeOptions && transformOptions) {
+        runtimeOptions = `{ ${transformOptions} }`;
+      }
     } else {
       runtimeOptions = optionsString;
     }
   }
+  ctx.modelDecls[modelName] = {
+    type,
+    options: optionsString,
+    identifier: declId && declId.type === "Identifier" ? declId.name : void 0
+  };
+  ctx.bindingMetadata[modelName] = "props";
   ctx.s.overwrite(
     ctx.startOffset + node.start,
     ctx.startOffset + node.end,
@@ -47133,6 +47133,11 @@ function genModelProps(ctx) {
     }
     modelPropsDecl += `
     ${JSON.stringify(name)}: ${decl},`;
+    const modifierPropName = JSON.stringify(
+      name === "modelValue" ? `modelModifiers` : `${name}Modifiers`
+    );
+    modelPropsDecl += `
+    ${modifierPropName}: {},`;
   }
   return `{${modelPropsDecl}
   }`;
@@ -48572,7 +48577,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.4.0-rc.2";
+const version = "3.4.0-rc.3";
 const parseCache = parseCache$1;
 const errorMessages = __spreadValues(__spreadValues({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.4.0-rc.2",
+  "version": "3.4.0-rc.3",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -37,10 +37,10 @@
     "magic-string": "^0.30.5",
     "postcss": "^8.4.32",
     "source-map-js": "^1.0.2",
-    "@vue/compiler-core": "3.4.0-rc.2",
-    "@vue/compiler-ssr": "3.4.0-rc.2",
-    "@vue/compiler-dom": "3.4.0-rc.2",
-    "@vue/shared": "3.4.0-rc.2"
+    "@vue/compiler-dom": "3.4.0-rc.3",
+    "@vue/compiler-core": "3.4.0-rc.3",
+    "@vue/shared": "3.4.0-rc.3",
+    "@vue/compiler-ssr": "3.4.0-rc.3"
   },
   "devDependencies": {
     "@babel/types": "^7.23.6",