fix: #117 兼容 ATextNode 直接为 interpolation 的情况

baidu · Aug 9, 2021 · 7a2dd9a · 7a2dd9a
1 parent 6023025
commit 7a2dd9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ vendor/
 /dist/
 test/cases/*/ssr.js
 test/cases/*/ssr.php
-.vscode
+.vscode
+/example
diff --git a/src/compilers/anode-compiler.ts b/src/compilers/anode-compiler.ts
@@ -64,7 +64,8 @@ export class ANodeCompiler<T extends 'none' | 'typed'> {
     }
 
     private * compileText (aNode: ATextNode): Generator<Statement> {
-        const shouldEmitComment = TypeGuards.isExprTextNode(aNode.textExpr) && aNode.textExpr.original && !this.ssrOnly && !this.inScript
+        const shouldEmitComment = (TypeGuards.isExprTextNode(aNode.textExpr) || TypeGuards.isExprInterpNode(aNode.textExpr)) &&
+            aNode.textExpr.original && !this.ssrOnly && !this.inScript
         const outputType = this.inScript ? OutputType.HTML : OutputType.ESCAPE_HTML
         if (shouldEmitComment) yield createHTMLLiteralAppend('<!--s-text-->')
         yield createHTMLExpressionAppend(sanExpr(aNode.textExpr, outputType))

diff --git a/types/san.d.ts b/types/san.d.ts
@@ -251,7 +251,7 @@ declare namespace San {
     interface ANode {
         isText?: boolean;
         text?: string;
-        textExpr?: ExprTextNode | ExprStringNode | ExprAccessorNode;
+        textExpr?: ExprInterpNode | ExprTextNode | ExprStringNode | ExprAccessorNode;
         children?: ANode[];
         props: ANodeProperty[];
         events: SanIndexedList<ExprNode>;
@@ -264,7 +264,7 @@ declare namespace San {
     }
 
     interface ATextNode extends ANode {
-        textExpr: ExprTextNode | ExprStringNode | ExprAccessorNode;
+        textExpr: ExprInterpNode | ExprTextNode | ExprStringNode | ExprAccessorNode;
     }
 
     interface ATemplateNode extends ANode {