fix: 根元素为组件时，s-data 不正确的问题

baidu · Jul 27, 2020 · fd87852 · fd87852
1 parent c3341e6
commit fd87852
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/bin/auto-complete b/bin/auto-complete
@@ -18,5 +18,5 @@ function _test {
     _arguments -C \
         "-h[Show help information]" \
         "--h[Show help information]" \
-        "1: :($(ls test/cases))"
+        "1: :($(ls node_modules/san-html-cases/src))"
 }
diff --git a/src/runtime/underscore.ts b/src/runtime/underscore.ts
@@ -4,6 +4,10 @@ const BASE_PROPS = {
     'id': 1
 }
 
+interface Context {
+    owner?: Context
+}
+
 function extend (target: object, source: object) {
     if (!source) return target
     Object.keys(source).forEach(function (key) {
@@ -109,6 +113,11 @@ function createFromPrototype (proto: object) {
     return new (Creator as any)()
 }
 
+function getRootCtx (ctx: Context) {
+    while (ctx.owner) ctx = ctx.owner
+    return ctx
+}
+
 export const _ = {
-    escapeHTML, defaultStyleFilter, boolAttrFilter, attrFilter, extend, includes, _classFilter, _styleFilter, _xstyleFilter, _xclassFilter, createFromPrototype
+    escapeHTML, defaultStyleFilter, boolAttrFilter, attrFilter, extend, includes, _classFilter, _styleFilter, _xstyleFilter, _xclassFilter, createFromPrototype, getRootCtx
 }
diff --git a/src/target-js/compilers/expr-compiler.ts b/src/target-js/compilers/expr-compiler.ts
@@ -43,8 +43,8 @@ function tertiary (e: ExprTertiaryNode) {
 }
 
 // 生成数据访问表达式代码
-export function dataAccess (accessorExpr?: ExprAccessorNode): string {
-    let code = 'ctx.data'
+export function dataAccess (accessorExpr?: ExprAccessorNode, contextVariableName: string = 'ctx'): string {
+    let code = `${contextVariableName}.data`
     if (!accessorExpr) return code
     for (const path of accessorExpr.paths) {
         code += TypeGuards.isExprStringNode(path) && isValidIdentifier(path.value)

diff --git a/src/target-js/compilers/renderer-compiler.ts b/src/target-js/compilers/renderer-compiler.ts
@@ -46,6 +46,7 @@ export class RendererCompiler {
         emitter.writeLine('var html = "";')
 
         this.genComponentContextCode(info)
+        // TODO remove
         emitter.writeLine(`var currentCtx = ctx;`)
 
         // instance preraration

diff --git a/src/target-js/js-emitter.ts b/src/target-js/js-emitter.ts
@@ -21,7 +21,8 @@ export class JSEmitter extends Emitter {
     }
 
     public writeDataComment () {
-        this.writeHTMLExpression(`"<!--s-data:" + JSON.stringify(${dataAccess()}) + "-->"`)
+        this.writeLine('var rootCtx = _.getRootCtx(ctx);')
+        this.writeHTMLExpression(`"<!--s-data:" + JSON.stringify(${dataAccess(undefined, 'rootCtx')}) + "-->"`)
     }
 
     public writeHTMLLiteral (str: string) {