refactor InlineContext.Resolve to support nested dsl merge

mistlog · Jul 24, 2020 · 287cc14 · 287cc14
1 parent 0f61495
commit 287cc14
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 3 deletions.
diff --git a/src/code-object/inline-context.tsx b/src/code-object/inline-context.tsx
@@ -22,11 +22,13 @@ 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.replaceWithMultiple(dsl.Transcribe(this.ToStatements(), this.m_Path));
+            this.m_Path.insertAfter(resolved);
         } else {
-            this.m_Code.body = dsl.Transcribe(this.ToStatements(), this.m_Path);
+            this.m_Path.insertAfter(blockStatement(resolved));
         }
+        this.m_Path.remove();
     };
 
 <InlineContext /> +
@@ -44,6 +46,12 @@ export interface IInlineContext {
     ToStatements: () => Array<Statement>;
 }
 
-import { BlockStatement, ExpressionStatement, Statement, isStringLiteral } from "@babel/types";
+import {
+    BlockStatement,
+    ExpressionStatement,
+    Statement,
+    isStringLiteral,
+    blockStatement,
+} from "@babel/types";
 import { NodePath } from "@babel/traverse";
 import { IDSL } from "../core/transcriber";
diff --git a/test/plug-in/__snapshots__/dsl.test.ts.snap b/test/plug-in/__snapshots__/dsl.test.ts.snap
@@ -38,6 +38,20 @@ exports[`nested dsl 1`] = `
 }"
 `;
 
+exports[`nested dsl: merge 1`] = `
+"export function Main() {
+  $: {
+    \\"use watch\\";
+
+    if (value === \\"a\\") {
+      console.log(\\"value is a\\");
+    }
+
+    b = value + 1;
+  }
+}"
+`;
+
 exports[`no dsl 1`] = `
 "export function Main() {
   console.log(\\"previous\\");

diff --git a/test/plug-in/dsl.test.ts b/test/plug-in/dsl.test.ts
@@ -125,6 +125,43 @@ test("nested dsl", () => {
     expect(result).toMatchSnapshot();
 });
 
+test("nested dsl: merge", () => {
+    //
+    class Watch implements IDSL {
+        m_Merge: boolean;
+        constructor() {
+            this.m_Merge = true;
+        }
+        Transcribe(block: Array<Statement>): Array<Statement> {
+            return [labeledStatement(identifier("$"), blockStatement(block))];
+        }
+    }
+
+    //
+    const code = `
+            export function Main(){
+                {
+                    "use watch";
+                    {
+                        "use match";
+        
+                        (value: "a") =>
+                        {
+                            console.log("value is a");
+                        };
+                    }
+                    b = value + 1;
+                }
+            }
+        `;
+
+    const transcriber = MakeDefaultTranscriber(code);
+    transcriber.AddDSL("watch", new Watch());
+    transcriber.AddDSL("match", new PatternMatch(true));
+    const result = transcriber.Transcribe();
+    expect(result).toMatchSnapshot();
+});
+
 test("use path param", () => {
     //
     class Foo implements IDSL {