From 6a7a50720312d732b8011daa5e3d538442cc6ce9 Mon Sep 17 00:00:00 2001
From: mistlog <mistlog@outlook.com>
Date: Fri, 24 Jul 2020 16:53:44 +0800
Subject: [PATCH] revert #22: keep inline context order to support nested dsl
 merge

---
 src/code-object/inline-context.tsx          | 6 ++----
 src/code-object/module.tsx                  | 5 ++++-
 test/plug-in/__snapshots__/dsl.test.ts.snap | 2 --
 test/plug-in/dsl.test.ts                    | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/code-object/inline-context.tsx b/src/code-object/inline-context.tsx
index d3af9d7..b177361 100644
--- a/src/code-object/inline-context.tsx
+++ b/src/code-object/inline-context.tsx
@@ -22,13 +22,11 @@ export class InlineContext {
 
 <InlineContext /> +
     function Resolve(this: InlineContext & IInlineContext, dsl: IDSL) {
-        const resolved = dsl.Transcribe(this.ToStatements(), this.m_Path);
         if (dsl.m_Merge) {
-            this.m_Path.insertAfter(resolved);
+            this.m_Path.replaceWithMultiple(dsl.Transcribe(this.ToStatements(), this.m_Path));
         } else {
-            this.m_Path.insertAfter(blockStatement(resolved));
+            this.m_Code.body = dsl.Transcribe(this.ToStatements(), this.m_Path);
         }
-        this.m_Path.remove();
     };
 
 <InlineContext /> +
diff --git a/src/code-object/module.tsx b/src/code-object/module.tsx
index a8d1d63..1cc9634 100644
--- a/src/code-object/module.tsx
+++ b/src/code-object/module.tsx
@@ -35,7 +35,10 @@ export type Draft = Array<ExportClassCode | MethodCode | LocalContext | InlineCo
                     if (expression.isStringLiteral()) {
                         const literal = expression.node.value.trim();
                         if (literal.startsWith("use") && path.parentPath.isBlockStatement()) {
-                            draft.push(new InlineContext(path.parentPath));
+                            /**
+                             * inline context should be resolved from deepest
+                             */
+                            draft.unshift(new InlineContext(path.parentPath));
                         }
                     }
                 },
diff --git a/test/plug-in/__snapshots__/dsl.test.ts.snap b/test/plug-in/__snapshots__/dsl.test.ts.snap
index 3de0449..eef2896 100644
--- a/test/plug-in/__snapshots__/dsl.test.ts.snap
+++ b/test/plug-in/__snapshots__/dsl.test.ts.snap
@@ -41,8 +41,6 @@ exports[`nested dsl 1`] = `
 exports[`nested dsl: merge 1`] = `
 "export function Main() {
   $: {
-    \\"use watch\\";
-
     if (value === \\"a\\") {
       console.log(\\"value is a\\");
     }
diff --git a/test/plug-in/dsl.test.ts b/test/plug-in/dsl.test.ts
index c3b0283..b548a67 100644
--- a/test/plug-in/dsl.test.ts
+++ b/test/plug-in/dsl.test.ts
@@ -133,7 +133,8 @@ test("nested dsl: merge", () => {
             this.m_Merge = true;
         }
         Transcribe(block: Array<Statement>): Array<Statement> {
-            return [labeledStatement(identifier("$"), blockStatement(block))];
+            const [use_watch, ...rest] = block;
+            return [labeledStatement(identifier("$"), blockStatement(rest))];
         }
     }