@lwc/template-compiler 7.0.0 → 7.0.1

package/dist/codegen/codegen.d.ts

@@ -69,7 +69,7 @@ export default class CodeGen {
     genScopedId(id: string | t.Expression): t.CallExpression;
     genScopedFragId(id: string | t.Expression): t.CallExpression;
     genClassExpression(value: Expression): import("estree").Expression;
-    genNormalizeClassName(className: t.Expression): t.CallExpression;
+    genNormalizeClassName(className: t.Expression): t.CallExpression | t.ConditionalExpression;
     /**
      * Generates childs vnodes when slot content is static.
      * @param slotName

package/dist/index.cjs.js

@@ -10912,6 +10912,138 @@ function validateExpressionAst(rootNode) {
     });
 }
 
+/*
+ * Copyright (c) 2018, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+// https://262.ecma-international.org/12.0/#sec-keywords-and-reserved-words
+// prettier-ignore
+const REVERSED_KEYWORDS = new Set([
+    // Reserved keywords
+    'await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', 'default', 'delete',
+    'do', 'else', 'enum', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if', 'import',
+    'in', 'instanceof', 'new', 'null', 'return', 'super', 'switch', 'this', 'throw', 'true', 'try',
+    'typeof', 'var', 'void', 'while', 'with', 'yield',
+    // Strict mode only reserved keywords
+    'let', 'static', 'implements', 'interface', 'package', 'private', 'protected', 'public'
+]);
+function isReservedES6Keyword(str) {
+    return REVERSED_KEYWORDS.has(str);
+}
+
+/*
+ * Copyright (c) 2018, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+const EXPRESSION_SYMBOL_START = '{';
+const EXPRESSION_SYMBOL_END = '}';
+const POTENTIAL_EXPRESSION_RE = /^.?{.+}.*$/;
+const WHITESPACES_RE = /\s/;
+function isExpression(source) {
+    // Issue #3418: Legacy behavior, previous regex treated "{}" attribute value as non expression
+    return source[0] === '{' && source.slice(-1) === '}' && source.length > 2;
+}
+function isPotentialExpression(source) {
+    return !!source.match(POTENTIAL_EXPRESSION_RE);
+}
+function validateExpression(node, config) {
+    // TODO [#3370]: remove experimental template expression flag
+    if (config.experimentalComplexExpressions) {
+        return validateExpressionAst(node);
+    }
+    const isValidNode = isIdentifier(node) || isMemberExpression(node);
+    errors.invariant(isValidNode, errors.ParserDiagnostics.INVALID_NODE, [node.type]);
+    if (isMemberExpression(node)) {
+        errors.invariant(config.experimentalComputedMemberExpression || !node.computed, errors.ParserDiagnostics.COMPUTED_PROPERTY_ACCESS_NOT_ALLOWED);
+        const { object, property } = node;
+        if (!isIdentifier(object)) {
+            validateExpression(object, config);
+        }
+        if (!isIdentifier(property)) {
+            validateExpression(property, config);
+        }
+    }
+}
+function validateSourceIsParsedExpression(source, parsedExpression) {
+    if (parsedExpression.end === source.length - 1) {
+        return;
+    }
+    let unclosedParenthesisCount = 0;
+    for (let i = 0, n = parsedExpression.start; i < n; i++) {
+        if (source[i] === '(') {
+            unclosedParenthesisCount++;
+        }
+    }
+    // source[source.length - 1] === '}', n = source.length - 1 is to avoid processing '}'.
+    for (let i = parsedExpression.end, n = source.length - 1; i < n; i++) {
+        const character = source[i];
+        if (character === ')') {
+            unclosedParenthesisCount--;
+        }
+        else if (character === ';') {
+            // acorn parseExpressionAt will stop at the first ";", it may be that the expression is not
+            // a multiple expression ({foo;}), but this is a case that we explicitly do not want to support.
+            // in such case, let's fail with the same error as if it were a multiple expression.
+            errors.invariant(false, errors.ParserDiagnostics.MULTIPLE_EXPRESSIONS);
+        }
+        else {
+            errors.invariant(WHITESPACES_RE.test(character), errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, ['Unexpected end of expression']);
+        }
+    }
+    errors.invariant(unclosedParenthesisCount === 0, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, [
+        'Unexpected end of expression',
+    ]);
+}
+function validatePreparsedJsExpressions(ctx) {
+    ctx.preparsedJsExpressions?.forEach(({ parsedExpression, rawText }) => {
+        const acornLoc = parsedExpression.loc;
+        const parse5Loc = {
+            startLine: acornLoc.start.line,
+            startCol: acornLoc.start.column,
+            startOffset: parsedExpression.start,
+            endLine: acornLoc.end.line,
+            endCol: acornLoc.end.column,
+            endOffset: parsedExpression.end,
+        };
+        ctx.withErrorWrapping(() => {
+            validateExpressionAst(parsedExpression);
+        }, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, sourceLocation(parse5Loc), (err) => `Invalid expression ${rawText} - ${err.message}`);
+    });
+}
+function parseExpression(ctx, source, location) {
+    const { ecmaVersion } = ctx;
+    return ctx.withErrorWrapping(() => {
+        const parsed = acorn.parseExpressionAt(source, 1, {
+            ecmaVersion,
+            // TODO [#3370]: remove experimental template expression flag
+            allowAwaitOutsideFunction: ctx.config.experimentalComplexExpressions,
+        });
+        validateSourceIsParsedExpression(source, parsed);
+        validateExpression(parsed, ctx.config);
+        return { ...parsed, location };
+    }, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, location, (err) => `Invalid expression ${source} - ${err.message}`);
+}
+function parseIdentifier(ctx, source, location) {
+    let isValid = true;
+    isValid = acorn.isIdentifierStart(source.charCodeAt(0));
+    for (let i = 1; i < source.length && isValid; i++) {
+        isValid = acorn.isIdentifierChar(source.charCodeAt(i));
+    }
+    if (isValid && !isReservedES6Keyword(source)) {
+        return {
+            ...identifier(source),
+            location,
+        };
+    }
+    else {
+        ctx.throwAtLocation(errors.ParserDiagnostics.INVALID_IDENTIFIER, location, [source]);
+    }
+}
+
 /*
  * Copyright (c) 2023, salesforce.com, inc.
  * All rights reserved.
@@ -11069,14 +11201,19 @@ class TemplateHtmlTokenizer extends Tokenizer {
         }
     }
 }
-function isTemplateExpressionTextNodeValue(value) {
-    return value?.[0] === '{';
+function isTemplateElement(node) {
+    return node.nodeName === 'template';
 }
 function isTextNode(node) {
     return node?.nodeName === '#text';
 }
-function isTemplateExpressionTextNode(node) {
-    return isTextNode(node) && isTemplateExpressionTextNodeValue(node.value);
+function isTemplateExpressionTextNode(node, html) {
+    return (isTextNode(node) &&
+        isTemplateExpressionTextNodeValue(node.value, node.sourceCodeLocation.startOffset, html));
+}
+function isTemplateExpressionTextNodeValue(value, startOffset, html) {
+    return (value.startsWith(EXPRESSION_SYMBOL_START) &&
+        html.startsWith(EXPRESSION_SYMBOL_START, startOffset));
 }
 /**
  * This class extends `parse5`'s internal parser. The heavy lifting is
@@ -11098,11 +11235,12 @@ class TemplateHtmlParser extends Parser {
     _insertCharacters(token) {
         const parentNode = this.openElements.current;
         const previousPeer = parentNode.childNodes.at(-1);
+        const html = this.tokenizer.preprocessor.html;
         if (
         // If we're not dealing with a template expression...
-        !isTemplateExpressionTextNodeValue(token.chars) &&
+        !isTemplateExpressionTextNodeValue(token.chars, token.location.startOffset, html) &&
             // ... and the previous node wasn't a text-node-template-expression...
-            !isTemplateExpressionTextNode(previousPeer)) {
+            !isTemplateExpressionTextNode(previousPeer, html)) {
             // ... concatenate the provided characters with the previous token's characters.
             return super._insertCharacters(token);
         }
@@ -11112,7 +11250,12 @@ class TemplateHtmlParser extends Parser {
             sourceCodeLocation: token.location ? { ...token.location } : null,
             parentNode,
         };
-        parentNode.childNodes.push(textNode);
+        if (isTemplateElement(parentNode)) {
+            parentNode.content.childNodes.push(textNode);
+        }
+        else {
+            parentNode.childNodes.push(textNode);
+        }
     }
 }
 /**
@@ -11217,138 +11360,6 @@ function decodeTextContent(source) {
     return he__namespace.decode(source);
 }
 
-/*
- * Copyright (c) 2018, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: MIT
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
- */
-// https://262.ecma-international.org/12.0/#sec-keywords-and-reserved-words
-// prettier-ignore
-const REVERSED_KEYWORDS = new Set([
-    // Reserved keywords
-    'await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', 'default', 'delete',
-    'do', 'else', 'enum', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if', 'import',
-    'in', 'instanceof', 'new', 'null', 'return', 'super', 'switch', 'this', 'throw', 'true', 'try',
-    'typeof', 'var', 'void', 'while', 'with', 'yield',
-    // Strict mode only reserved keywords
-    'let', 'static', 'implements', 'interface', 'package', 'private', 'protected', 'public'
-]);
-function isReservedES6Keyword(str) {
-    return REVERSED_KEYWORDS.has(str);
-}
-
-/*
- * Copyright (c) 2018, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: MIT
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
- */
-const EXPRESSION_SYMBOL_START = '{';
-const EXPRESSION_SYMBOL_END = '}';
-const POTENTIAL_EXPRESSION_RE = /^.?{.+}.*$/;
-const WHITESPACES_RE = /\s/;
-function isExpression(source) {
-    // Issue #3418: Legacy behavior, previous regex treated "{}" attribute value as non expression
-    return source[0] === '{' && source.slice(-1) === '}' && source.length > 2;
-}
-function isPotentialExpression(source) {
-    return !!source.match(POTENTIAL_EXPRESSION_RE);
-}
-function validateExpression(node, config) {
-    // TODO [#3370]: remove experimental template expression flag
-    if (config.experimentalComplexExpressions) {
-        return validateExpressionAst(node);
-    }
-    const isValidNode = isIdentifier(node) || isMemberExpression(node);
-    errors.invariant(isValidNode, errors.ParserDiagnostics.INVALID_NODE, [node.type]);
-    if (isMemberExpression(node)) {
-        errors.invariant(config.experimentalComputedMemberExpression || !node.computed, errors.ParserDiagnostics.COMPUTED_PROPERTY_ACCESS_NOT_ALLOWED);
-        const { object, property } = node;
-        if (!isIdentifier(object)) {
-            validateExpression(object, config);
-        }
-        if (!isIdentifier(property)) {
-            validateExpression(property, config);
-        }
-    }
-}
-function validateSourceIsParsedExpression(source, parsedExpression) {
-    if (parsedExpression.end === source.length - 1) {
-        return;
-    }
-    let unclosedParenthesisCount = 0;
-    for (let i = 0, n = parsedExpression.start; i < n; i++) {
-        if (source[i] === '(') {
-            unclosedParenthesisCount++;
-        }
-    }
-    // source[source.length - 1] === '}', n = source.length - 1 is to avoid processing '}'.
-    for (let i = parsedExpression.end, n = source.length - 1; i < n; i++) {
-        const character = source[i];
-        if (character === ')') {
-            unclosedParenthesisCount--;
-        }
-        else if (character === ';') {
-            // acorn parseExpressionAt will stop at the first ";", it may be that the expression is not
-            // a multiple expression ({foo;}), but this is a case that we explicitly do not want to support.
-            // in such case, let's fail with the same error as if it were a multiple expression.
-            errors.invariant(false, errors.ParserDiagnostics.MULTIPLE_EXPRESSIONS);
-        }
-        else {
-            errors.invariant(WHITESPACES_RE.test(character), errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, ['Unexpected end of expression']);
-        }
-    }
-    errors.invariant(unclosedParenthesisCount === 0, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, [
-        'Unexpected end of expression',
-    ]);
-}
-function validatePreparsedJsExpressions(ctx) {
-    ctx.preparsedJsExpressions?.forEach(({ parsedExpression, rawText }) => {
-        const acornLoc = parsedExpression.loc;
-        const parse5Loc = {
-            startLine: acornLoc.start.line,
-            startCol: acornLoc.start.column,
-            startOffset: parsedExpression.start,
-            endLine: acornLoc.end.line,
-            endCol: acornLoc.end.column,
-            endOffset: parsedExpression.end,
-        };
-        ctx.withErrorWrapping(() => {
-            validateExpressionAst(parsedExpression);
-        }, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, sourceLocation(parse5Loc), (err) => `Invalid expression ${rawText} - ${err.message}`);
-    });
-}
-function parseExpression(ctx, source, location) {
-    const { ecmaVersion } = ctx;
-    return ctx.withErrorWrapping(() => {
-        const parsed = acorn.parseExpressionAt(source, 1, {
-            ecmaVersion,
-            // TODO [#3370]: remove experimental template expression flag
-            allowAwaitOutsideFunction: ctx.config.experimentalComplexExpressions,
-        });
-        validateSourceIsParsedExpression(source, parsed);
-        validateExpression(parsed, ctx.config);
-        return { ...parsed, location };
-    }, errors.ParserDiagnostics.TEMPLATE_EXPRESSION_PARSING_ERROR, location, (err) => `Invalid expression ${source} - ${err.message}`);
-}
-function parseIdentifier(ctx, source, location) {
-    let isValid = true;
-    isValid = acorn.isIdentifierStart(source.charCodeAt(0));
-    for (let i = 1; i < source.length && isValid; i++) {
-        isValid = acorn.isIdentifierChar(source.charCodeAt(i));
-    }
-    if (isValid && !isReservedES6Keyword(source)) {
-        return {
-            ...identifier(source),
-            location,
-        };
-    }
-    else {
-        ctx.throwAtLocation(errors.ParserDiagnostics.INVALID_IDENTIFIER, location, [source]);
-    }
-}
-
 /*
  * Copyright (c) 2018, salesforce.com, inc.
  * All rights reserved.
@@ -13001,7 +13012,6 @@ function isStaticNode(node, apiVersion) {
             name !== 'slot' &&
             // check for ScopedId
             name !== 'id' &&
-            name !== 'spellcheck' && // spellcheck is specially handled by the vnodes.
             !isIdReferencingAttribute(name) &&
             // svg href needs sanitization.
             !isSvgUseHref(nodeName, name, namespace) &&
@@ -13163,6 +13173,14 @@ function serializeAttrs(element, codeGen) {
                 v += '${0}';
             }
         }
+        // `spellcheck` string values are specially handled to massage them into booleans.
+        // For backwards compat with non-static-optimized templates, we also treat any non-`"false"`
+        // value other than the valueless format (e.g. `<div spellcheck>`) as `"true"`,
+        // even though per MDN, the empty string and `"true"` are equivalent:
+        // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/spellcheck
+        if (name === 'spellcheck' && typeof v === 'string' && !hasExpression) {
+            v = String(v.toLowerCase() !== 'false');
+        }
         if (typeof v === 'string') {
             // Inject a placeholder where the staticPartId will go when an expression occurs.
             // This is only needed for SSR to inject the expression value during serialization.
@@ -13593,14 +13611,14 @@ class CodeGen {
     }
     genClassExpression(value) {
         let classExpression = this.bindExpression(value);
-        const isClassNameObjectBindingEnabled = shared.isAPIFeatureEnabled(11 /* APIFeature.TEMPLATE_CLASS_NAME_OBJECT_BINDING */, this.state.config.apiVersion);
+        const isClassNameObjectBindingEnabled = shared.isAPIFeatureEnabled(10 /* APIFeature.TEMPLATE_CLASS_NAME_OBJECT_BINDING */, this.state.config.apiVersion);
         if (isClassNameObjectBindingEnabled) {
             classExpression = this.genNormalizeClassName(classExpression);
         }
         return classExpression;
     }
     genNormalizeClassName(className) {
-        return this._renderApiCall(RENDER_APIS.normalizeClassName, [className]);
+        return this._renderApiCall(RENDER_APIS.normalizeClassName, [className], className);
     }
     /**
      * Generates childs vnodes when slot content is static.
@@ -13698,13 +13716,19 @@ class CodeGen {
         //       usage of the lwc:inner-html, and in an iteration, usages are dynamically generated.
         return conditionalExpression(binaryExpression('!==', memberExpression(identifier(TEMPLATE_PARAMS.CONTEXT), identifier(`_rawHtml$${instance}`)), assignmentExpression('=', memberExpression(identifier(TEMPLATE_PARAMS.CONTEXT), identifier(`_rawHtml$${instance}`)), expr)), assignmentExpression('=', memberExpression(identifier(TEMPLATE_PARAMS.CONTEXT), identifier(`_sanitizedHtml$${instance}`)), this.genSanitizeHtmlContent(expr)), memberExpression(identifier(TEMPLATE_PARAMS.CONTEXT), identifier(`_sanitizedHtml$${instance}`)));
     }
-    _renderApiCall(primitive, params) {
+    _renderApiCall(primitive, params, fallbackForCompilerEngineVersionMismatch) {
         const { name, alias } = primitive;
         let identifier$1 = this.usedApis[name];
         if (!identifier$1) {
             identifier$1 = this.usedApis[name] = identifier(alias);
         }
-        return callExpression(identifier$1, params);
+        const callExpression$1 = callExpression(identifier$1, params);
+        // Check if the property actually exists before calling, to allow
+        // for older engines to work with newer compilers
+        // TODO [#4313]: remove temporary logic to support v7 compiler + v6 engine
+        return fallbackForCompilerEngineVersionMismatch
+            ? conditionalExpression(identifier$1, callExpression$1, fallbackForCompilerEngineVersionMismatch)
+            : callExpression$1;
     }
     beginScope() {
         this.scope = this.createScope(this.scope);
@@ -14389,6 +14413,7 @@ function transform(codeGen) {
             if (attrName === 'id') {
                 return codeGen.genScopedId(attrValue.value);
             }
+            // `spellcheck` string values are specially handled to massage them into booleans.
             if (attrName === 'spellcheck') {
                 return literal$1(attrValue.value.toLowerCase() !== 'false');
             }
@@ -14655,5 +14680,5 @@ exports.default = compile;
 exports.kebabcaseToCamelcase = kebabcaseToCamelcase;
 exports.parse = parse;
 exports.toPropertyName = toPropertyName;
-/** version: 7.0.0 */
+/** version: 7.0.1 */
 //# sourceMappingURL=index.cjs.js.map