@vue/compiler-sfc 3.2.25 → 3.2.29

package/dist/compiler-sfc.cjs.js

@@ -109,7 +109,8 @@ function sum (o) {
 var hashSum = sum;
 
 const CSS_VARS_HELPER = `useCssVars`;
-const cssVarRE = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g;
+// match v-bind() with max 2-levels of nested parens.
+const cssVarRE = /v-bind\s*\(((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*)\)/g;
 function genCssVarsFromList(vars, id, isProd) {
     return `{\n  ${vars
         .map(key => `"${genVarName(id, key, isProd)}": (${key})`)
@@ -123,6 +124,14 @@ function genVarName(id, raw, isProd) {
         return `${id}-${raw.replace(/([^\w-])/g, '_')}`;
     }
 }
+function noramlizeExpression(exp) {
+    exp = exp.trim();
+    if ((exp[0] === `'` && exp[exp.length - 1] === `'`) ||
+        (exp[0] === `"` && exp[exp.length - 1] === `"`)) {
+        return exp.slice(1, -1);
+    }
+    return exp;
+}
 function parseCssVars(sfc) {
     const vars = [];
     sfc.styles.forEach(style => {
@@ -130,7 +139,7 @@ function parseCssVars(sfc) {
         // ignore v-bind() in comments /* ... */
         const content = style.content.replace(/\/\*([\s\S]*?)\*\//g, '');
         while ((match = cssVarRE.exec(content))) {
-            const variable = match[1] || match[2] || match[3];
+            const variable = noramlizeExpression(match[1]);
             if (!vars.includes(variable)) {
                 vars.push(variable);
             }
@@ -145,8 +154,8 @@ const cssVarsPlugin = opts => {
         Declaration(decl) {
             // rewrite CSS variables
             if (cssVarRE.test(decl.value)) {
-                decl.value = decl.value.replace(cssVarRE, (_, $1, $2, $3) => {
-                    return `var(--${genVarName(id, $1 || $2 || $3, isProd)})`;
+                decl.value = decl.value.replace(cssVarRE, (_, $1) => {
+                    return `var(--${genVarName(id, noramlizeExpression($1), isProd)})`;
                 });
             }
         }
@@ -3288,7 +3297,7 @@ function compileScript(sfc, options) {
     let { script, scriptSetup, source, filename } = sfc;
     // feature flags
     // TODO remove support for deprecated options when out of experimental
-    const enableRefTransform = !!options.reactivityTransform ||
+    const enableReactivityTransform = !!options.reactivityTransform ||
         !!options.refSugar ||
         !!options.refTransform;
     const enablePropsTransform = !!options.reactivityTransform || !!options.propsDestructureTransform;
@@ -3308,6 +3317,7 @@ function compileScript(sfc, options) {
         scriptLang === 'tsx' ||
         scriptSetupLang === 'ts' ||
         scriptSetupLang === 'tsx';
+    // resolve parser plugins
     const plugins = [];
     if (!isTS || scriptLang === 'tsx' || scriptSetupLang === 'tsx') {
         plugins.push('jsx');
@@ -3332,7 +3342,7 @@ function compileScript(sfc, options) {
                 sourceType: 'module'
             }).program;
             const bindings = analyzeScriptBindings(scriptAst.body);
-            if (enableRefTransform && reactivityTransform.shouldTransform(content)) {
+            if (enableReactivityTransform && reactivityTransform.shouldTransform(content)) {
                 const s = new MagicString__default(source);
                 const startOffset = script.loc.start.offset;
                 const endOffset = script.loc.end.offset;
@@ -3799,10 +3809,10 @@ function compileScript(sfc, options) {
                 walkDeclaration(node, scriptBindings, userImportAlias);
             }
         }
-        // apply ref transform
-        if (enableRefTransform && reactivityTransform.shouldTransform(script.content)) {
-            const { rootRefs: rootVars, importedHelpers } = reactivityTransform.transformAST(scriptAst, s, scriptStartOffset);
-            refBindings = rootVars;
+        // apply reactivity transform
+        if (enableReactivityTransform && reactivityTransform.shouldTransform(script.content)) {
+            const { rootRefs, importedHelpers } = reactivityTransform.transformAST(scriptAst, s, scriptStartOffset);
+            refBindings = rootRefs;
             for (const h of importedHelpers) {
                 helperImports.add(h);
             }
@@ -3987,8 +3997,10 @@ function compileScript(sfc, options) {
             }
         }
     }
-    // 3. Apply ref sugar transform
-    if ((enableRefTransform && reactivityTransform.shouldTransform(scriptSetup.content)) ||
+    // 3. Apply reactivity transform
+    if ((enableReactivityTransform &&
+        // normal <script> had ref bindings that maybe used in <script setup>
+        (refBindings || reactivityTransform.shouldTransform(scriptSetup.content))) ||
         propsDestructureDecl) {
         const { rootRefs, importedHelpers } = reactivityTransform.transformAST(scriptSetupAst, s, startOffset, refBindings, propsDestructuredBindings);
         refBindings = refBindings ? [...refBindings, ...rootRefs] : rootRefs;

package/dist/compiler-sfc.d.ts

@@ -208,7 +208,7 @@ export declare interface SFCScriptCompileOptions {
      */
     propsDestructureTransform?: boolean;
     /**
-     * @deprecated use `refTransform` instead.
+     * @deprecated use `reactivityTransform` instead.
      */
     refSugar?: boolean;
     /**

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

@@ -302,8 +302,20 @@ const SVG_TAGS = 'svg,animate,animateMotion,animateTransform,circle,clipPath,col
     'polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,' +
     'text,textPath,title,tspan,unknown,use,view';
 const VOID_TAGS = 'area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr';
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `true` flag.
+ */
 const isHTMLTag = /*#__PURE__*/ makeMap(HTML_TAGS);
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `true` flag.
+ */
 const isSVGTag = /*#__PURE__*/ makeMap(SVG_TAGS);
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `true` flag.
+ */
 const isVoidTag = /*#__PURE__*/ makeMap(VOID_TAGS);
 
 const escapeRE = /["'&<>]/;
@@ -16849,7 +16861,7 @@ function parseAttributes(context, type) {
         }
         const attr = parseAttribute(context, attributeNames);
         // Trim whitespace between class
-        // https://github.com/vuejs/vue-next/issues/4251
+        // https://github.com/vuejs/core/issues/4251
         if (attr.type === 6 /* ATTRIBUTE */ &&
             attr.value &&
             attr.name === 'class') {
@@ -17074,7 +17086,7 @@ function parseTextData(context, length, mode) {
     advanceBy(context, length);
     if (mode === 2 /* RAWTEXT */ ||
         mode === 3 /* CDATA */ ||
-        rawText.indexOf('&') === -1) {
+        !rawText.includes('&')) {
         return rawText;
     }
     else {
@@ -22201,7 +22213,7 @@ function isReferenced(node, parent, grandparent) {
         // no: NODE.target
         case 'MetaProperty':
             return false;
-        // yes: type X = { somePropert: NODE }
+        // yes: type X = { someProperty: NODE }
         // no: type X = { NODE: OtherType }
         case 'ObjectTypeProperty':
             return parent.key !== node;
@@ -22708,6 +22720,7 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
         const renderExp = createCallExpression(helper(RENDER_LIST), [
             forNode.source
         ]);
+        const isTemplate = isTemplateNode(node);
         const memo = findDir(node, 'memo');
         const keyProp = findProp(node, `key`);
         const keyExp = keyProp &&
@@ -22715,15 +22728,17 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
                 ? createSimpleExpression(keyProp.value.content, true)
                 : keyProp.exp);
         const keyProperty = keyProp ? createObjectProperty(`key`, keyExp) : null;
-        if (context.prefixIdentifiers &&
-            keyProperty &&
-            keyProp.type !== 6 /* ATTRIBUTE */) {
-            // #2085 process :key expression needs to be processed in order for it
-            // to behave consistently for <template v-for> and <div v-for>.
-            // In the case of `<template v-for>`, the node is discarded and never
-            // traversed so its key expression won't be processed by the normal
-            // transforms.
-            keyProperty.value = processExpression(keyProperty.value, context);
+        if (isTemplate) {
+            // #2085 / #5288 process :key and v-memo expressions need to be
+            // processed on `<template v-for>`. In this case the node is discarded
+            // and never traversed so its binding expressions won't be processed
+            // by the normal transforms.
+            if (memo) {
+                memo.exp = processExpression(memo.exp, context);
+            }
+            if (keyProperty && keyProp.type !== 6 /* ATTRIBUTE */) {
+                keyProperty.value = processExpression(keyProperty.value, context);
+            }
         }
         const isStableFragment = forNode.source.type === 4 /* SIMPLE_EXPRESSION */ &&
             forNode.source.constType > 0 /* NOT_CONSTANT */;
@@ -22737,7 +22752,6 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
         return () => {
             // finish the codegen now that all children have been traversed
             let childBlock;
-            const isTemplate = isTemplateNode(node);
             const { children } = forNode;
             // check <template v-for> key placement
             if (isTemplate) {
@@ -27648,7 +27662,8 @@ function sum (o) {
 var hashSum = sum;
 
 const CSS_VARS_HELPER = `useCssVars`;
-const cssVarRE = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g;
+// match v-bind() with max 2-levels of nested parens.
+const cssVarRE = /v-bind\s*\(((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*)\)/g;
 function genCssVarsFromList(vars, id, isProd) {
     return `{\n  ${vars
         .map(key => `"${genVarName(id, key, isProd)}": (${key})`)
@@ -27662,6 +27677,14 @@ function genVarName(id, raw, isProd) {
         return `${id}-${raw.replace(/([^\w-])/g, '_')}`;
     }
 }
+function noramlizeExpression(exp) {
+    exp = exp.trim();
+    if ((exp[0] === `'` && exp[exp.length - 1] === `'`) ||
+        (exp[0] === `"` && exp[exp.length - 1] === `"`)) {
+        return exp.slice(1, -1);
+    }
+    return exp;
+}
 function parseCssVars(sfc) {
     const vars = [];
     sfc.styles.forEach(style => {
@@ -27669,7 +27692,7 @@ function parseCssVars(sfc) {
         // ignore v-bind() in comments /* ... */
         const content = style.content.replace(/\/\*([\s\S]*?)\*\//g, '');
         while ((match = cssVarRE.exec(content))) {
-            const variable = match[1] || match[2] || match[3];
+            const variable = noramlizeExpression(match[1]);
             if (!vars.includes(variable)) {
                 vars.push(variable);
             }
@@ -27684,8 +27707,8 @@ const cssVarsPlugin = opts => {
         Declaration(decl) {
             // rewrite CSS variables
             if (cssVarRE.test(decl.value)) {
-                decl.value = decl.value.replace(cssVarRE, (_, $1, $2, $3) => {
-                    return `var(--${genVarName(id, $1 || $2 || $3, isProd)})`;
+                decl.value = decl.value.replace(cssVarRE, (_, $1) => {
+                    return `var(--${genVarName(id, noramlizeExpression($1), isProd)})`;
                 });
             }
         }
@@ -33404,17 +33427,16 @@ function createSSRCompilerError(code, loc) {
     return createCompilerError(code, loc, SSRErrorMessages);
 }
 const SSRErrorMessages = {
-    [61 /* X_SSR_CUSTOM_DIRECTIVE_NO_TRANSFORM */]: `Custom directive is missing corresponding SSR transform and will be ignored.`,
-    [62 /* X_SSR_UNSAFE_ATTR_NAME */]: `Unsafe attribute name for SSR.`,
-    [63 /* X_SSR_NO_TELEPORT_TARGET */]: `Missing the 'to' prop on teleport element.`,
-    [64 /* X_SSR_INVALID_AST_NODE */]: `Invalid AST node during SSR transform.`
+    [61 /* X_SSR_UNSAFE_ATTR_NAME */]: `Unsafe attribute name for SSR.`,
+    [62 /* X_SSR_NO_TELEPORT_TARGET */]: `Missing the 'to' prop on teleport element.`,
+    [63 /* X_SSR_INVALID_AST_NODE */]: `Invalid AST node during SSR transform.`
 };
 
 // Note: this is a 2nd-pass codegen transform.
 function ssrProcessTeleport(node, context) {
     const targetProp = findProp(node, 'to');
     if (!targetProp) {
-        context.onError(createSSRCompilerError(63 /* X_SSR_NO_TELEPORT_TARGET */, node.loc));
+        context.onError(createSSRCompilerError(62 /* X_SSR_NO_TELEPORT_TARGET */, node.loc));
         return;
     }
     let target;
@@ -33426,7 +33448,7 @@ function ssrProcessTeleport(node, context) {
         target = targetProp.exp;
     }
     if (!target) {
-        context.onError(createSSRCompilerError(63 /* X_SSR_NO_TELEPORT_TARGET */, targetProp.loc));
+        context.onError(createSSRCompilerError(62 /* X_SSR_NO_TELEPORT_TARGET */, targetProp.loc));
         return;
     }
     const disabledProp = findProp(node, 'disabled', false, true /* allow empty */);
@@ -33527,7 +33549,7 @@ function ssrProcessTransitionGroup(node, context) {
 
 // We need to construct the slot functions in the 1st pass to ensure proper
 // scope tracking, but the children of each slot cannot be processed until
-// the 2nd pass, so we store the WIP slot functions in a weakmap during the 1st
+// the 2nd pass, so we store the WIP slot functions in a weakMap during the 1st
 // pass and complete them in the 2nd pass.
 const wipMap$1 = new WeakMap();
 const componentTypeMap = new WeakMap();
@@ -33840,14 +33862,10 @@ const ssrTransformElement = (node, context) => {
                         node.children = [createInterpolation(prop.exp, prop.loc)];
                     }
                 }
-                else {
+                else if (!hasDynamicVBind) {
                     // Directive transforms.
                     const directiveTransform = context.directiveTransforms[prop.name];
-                    if (!directiveTransform) {
-                        // no corresponding ssr directive transform found.
-                        context.onError(createSSRCompilerError(61 /* X_SSR_CUSTOM_DIRECTIVE_NO_TRANSFORM */, prop.loc));
-                    }
-                    else if (!hasDynamicVBind) {
+                    if (directiveTransform) {
                         const { props, ssrTagParts } = directiveTransform(prop, node, context);
                         if (ssrTagParts) {
                             openTag.push(...ssrTagParts);
@@ -33887,7 +33905,7 @@ const ssrTransformElement = (node, context) => {
                                         ]));
                                     }
                                     else {
-                                        context.onError(createSSRCompilerError(62 /* X_SSR_UNSAFE_ATTR_NAME */, key.loc));
+                                        context.onError(createSSRCompilerError(61 /* X_SSR_UNSAFE_ATTR_NAME */, key.loc));
                                     }
                                 }
                             }
@@ -34082,7 +34100,7 @@ function processChildren(children, context, asFragment = false, disableNestedFra
                         // TODO
                         break;
                     default:
-                        context.onError(createSSRCompilerError(64 /* X_SSR_INVALID_AST_NODE */, child.loc));
+                        context.onError(createSSRCompilerError(63 /* X_SSR_INVALID_AST_NODE */, child.loc));
                         // make sure we exhaust all possible types
                         const exhaustiveCheck = child;
                         return exhaustiveCheck;
@@ -34114,7 +34132,7 @@ function processChildren(children, context, asFragment = false, disableNestedFra
                 // `transformText` is not used during SSR compile.
                 break;
             default:
-                context.onError(createSSRCompilerError(64 /* X_SSR_INVALID_AST_NODE */, child.loc));
+                context.onError(createSSRCompilerError(63 /* X_SSR_INVALID_AST_NODE */, child.loc));
                 // make sure we exhaust all possible types
                 const exhaustiveCheck = child;
                 return exhaustiveCheck;
@@ -34757,33 +34775,7 @@ function transformAST(ast, s, offset = 0, knownRefs, knownProps) {
     function walkScope(node, isRoot = false) {
         for (const stmt of node.body) {
             if (stmt.type === 'VariableDeclaration') {
-                if (stmt.declare)
-                    continue;
-                for (const decl of stmt.declarations) {
-                    let refCall;
-                    const isCall = decl.init &&
-                        decl.init.type === 'CallExpression' &&
-                        decl.init.callee.type === 'Identifier';
-                    if (isCall &&
-                        (refCall = isRefCreationCall(decl.init.callee.name))) {
-                        processRefDeclaration(refCall, decl.id, decl.init);
-                    }
-                    else {
-                        const isProps = isRoot &&
-                            isCall &&
-                            decl.init.callee.name === 'defineProps';
-                        for (const id of extractIdentifiers(decl.id)) {
-                            if (isProps) {
-                                // for defineProps destructure, only exclude them since they
-                                // are already passed in as knownProps
-                                excludedIds.add(id);
-                            }
-                            else {
-                                registerBinding(id);
-                            }
-                        }
-                    }
-                }
+                walkVariableDeclaration(stmt, isRoot);
             }
             else if (stmt.type === 'FunctionDeclaration' ||
                 stmt.type === 'ClassDeclaration') {
@@ -34791,6 +34783,47 @@ function transformAST(ast, s, offset = 0, knownRefs, knownProps) {
                     continue;
                 registerBinding(stmt.id);
             }
+            else if ((stmt.type === 'ForOfStatement' || stmt.type === 'ForInStatement') &&
+                stmt.left.type === 'VariableDeclaration') {
+                walkVariableDeclaration(stmt.left);
+            }
+            else if (stmt.type === 'ExportNamedDeclaration' &&
+                stmt.declaration &&
+                stmt.declaration.type === 'VariableDeclaration') {
+                walkVariableDeclaration(stmt.declaration, isRoot);
+            }
+            else if (stmt.type === 'LabeledStatement' &&
+                stmt.body.type === 'VariableDeclaration') {
+                walkVariableDeclaration(stmt.body, isRoot);
+            }
+        }
+    }
+    function walkVariableDeclaration(stmt, isRoot = false) {
+        if (stmt.declare) {
+            return;
+        }
+        for (const decl of stmt.declarations) {
+            let refCall;
+            const isCall = decl.init &&
+                decl.init.type === 'CallExpression' &&
+                decl.init.callee.type === 'Identifier';
+            if (isCall &&
+                (refCall = isRefCreationCall(decl.init.callee.name))) {
+                processRefDeclaration(refCall, decl.id, decl.init);
+            }
+            else {
+                const isProps = isRoot && isCall && decl.init.callee.name === 'defineProps';
+                for (const id of extractIdentifiers(decl.id)) {
+                    if (isProps) {
+                        // for defineProps destructure, only exclude them since they
+                        // are already passed in as knownProps
+                        excludedIds.add(id);
+                    }
+                    else {
+                        registerBinding(id);
+                    }
+                }
+            }
         }
     }
     function processRefDeclaration(method, id, call) {
@@ -35041,6 +35074,7 @@ function transformAST(ast, s, offset = 0, knownRefs, knownProps) {
                 walkScope(node);
                 return;
             }
+            // skip type nodes
             if (parent &&
                 parent.type.startsWith('TS') &&
                 parent.type !== 'TSAsExpression' &&
@@ -35120,7 +35154,7 @@ function warnOnce$1(msg) {
     }
 }
 function warn$1(msg) {
-    console.warn(`\x1b[1m\x1b[33m[@vue/ref-transform]\x1b[0m\x1b[33m ${msg}\x1b[0m\n`);
+    console.warn(`\x1b[1m\x1b[33m[@vue/reactivity-transform]\x1b[0m\x1b[33m ${msg}\x1b[0m\n`);
 }
 
 // Special compiler macros
@@ -35140,7 +35174,7 @@ function compileScript(sfc, options) {
     let { script, scriptSetup, source, filename } = sfc;
     // feature flags
     // TODO remove support for deprecated options when out of experimental
-    const enableRefTransform = !!options.reactivityTransform ||
+    const enableReactivityTransform = !!options.reactivityTransform ||
         !!options.refSugar ||
         !!options.refTransform;
     const enablePropsTransform = !!options.reactivityTransform || !!options.propsDestructureTransform;
@@ -35160,6 +35194,7 @@ function compileScript(sfc, options) {
         scriptLang === 'tsx' ||
         scriptSetupLang === 'ts' ||
         scriptSetupLang === 'tsx';
+    // resolve parser plugins
     const plugins = [];
     if (!isTS || scriptLang === 'tsx' || scriptSetupLang === 'tsx') {
         plugins.push('jsx');
@@ -35184,7 +35219,7 @@ function compileScript(sfc, options) {
                 sourceType: 'module'
             }).program;
             const bindings = analyzeScriptBindings(scriptAst.body);
-            if (enableRefTransform && shouldTransform(content)) {
+            if (enableReactivityTransform && shouldTransform(content)) {
                 const s = new MagicString(source);
                 const startOffset = script.loc.start.offset;
                 const endOffset = script.loc.end.offset;
@@ -35651,10 +35686,10 @@ function compileScript(sfc, options) {
                 walkDeclaration(node, scriptBindings, userImportAlias);
             }
         }
-        // apply ref transform
-        if (enableRefTransform && shouldTransform(script.content)) {
-            const { rootRefs: rootVars, importedHelpers } = transformAST(scriptAst, s, scriptStartOffset);
-            refBindings = rootVars;
+        // apply reactivity transform
+        if (enableReactivityTransform && shouldTransform(script.content)) {
+            const { rootRefs, importedHelpers } = transformAST(scriptAst, s, scriptStartOffset);
+            refBindings = rootRefs;
             for (const h of importedHelpers) {
                 helperImports.add(h);
             }
@@ -35839,8 +35874,10 @@ function compileScript(sfc, options) {
             }
         }
     }
-    // 3. Apply ref sugar transform
-    if ((enableRefTransform && shouldTransform(scriptSetup.content)) ||
+    // 3. Apply reactivity transform
+    if ((enableReactivityTransform &&
+        // normal <script> had ref bindings that maybe used in <script setup>
+        (refBindings || shouldTransform(scriptSetup.content))) ||
         propsDestructureDecl) {
         const { rootRefs, importedHelpers } = transformAST(scriptSetupAst, s, startOffset, refBindings, propsDestructuredBindings);
         refBindings = refBindings ? [...refBindings, ...rootRefs] : rootRefs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.2.25",
+  "version": "3.2.29",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-next.git",
+    "url": "git+https://github.com/vuejs/core.git",
     "directory": "packages/compiler-sfc"
   },
   "keywords": [
@@ -28,16 +28,16 @@
   "author": "Evan You",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/vuejs/vue-next/issues"
+    "url": "https://github.com/vuejs/core/issues"
   },
-  "homepage": "https://github.com/vuejs/vue-next/tree/master/packages/compiler-sfc#readme",
+  "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
     "@babel/parser": "^7.16.4",
-    "@vue/compiler-core": "3.2.25",
-    "@vue/compiler-dom": "3.2.25",
-    "@vue/compiler-ssr": "3.2.25",
-    "@vue/reactivity-transform": "3.2.25",
-    "@vue/shared": "3.2.25",
+    "@vue/compiler-core": "3.2.29",
+    "@vue/compiler-dom": "3.2.29",
+    "@vue/compiler-ssr": "3.2.29",
+    "@vue/reactivity-transform": "3.2.29",
+    "@vue/shared": "3.2.29",
     "estree-walker": "^2.0.2",
     "magic-string": "^0.25.7",
     "source-map": "^0.6.1",