Merge pull request #91 from venikx/master

feat(parse): add switches and params for src-block
rasendubi · Nov 2, 2023 · a3f058b · a3f058b
2 parents c47bbd1 + 041eb97
commit a3f058b
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 1 deletion.
diff --git a/.changeset/nasty-scissors-reply.md b/.changeset/nasty-scissors-reply.md
@@ -0,0 +1,5 @@
+---
+'uniorg-parse': minor
+---
+
+Add support for switches and parameters in src-blocks.
diff --git a/packages/uniorg-parse/src/__snapshots__/parser.spec.ts.snap b/packages/uniorg-parse/src/__snapshots__/parser.spec.ts.snap
@@ -44,6 +44,8 @@ children:
   - type: "src-block"
     affiliated:
       NAME: "hi"
+    switches: null
+    parameters: null
     value: ""
 `;
 
@@ -94,6 +96,8 @@ children:
     affiliated:
       NAME: "source"
     language: "org"
+    switches: null
+    parameters: null
     value: "some paragraph\\n"
 `;
 
@@ -128,6 +132,8 @@ children:
   - type: "src-block"
     affiliated: {}
     language: "org"
+    switches: null
+    parameters: null
     value: "#+ escaped\\n"
 `;
 
@@ -158,6 +164,8 @@ children:
   - type: "src-block"
     affiliated: {}
     language: "org"
+    switches: null
+    parameters: null
     value: ",,* two commas escaped\\n"
 `;
 
@@ -179,6 +187,8 @@ children:
   - type: "src-block"
     affiliated: {}
     language: "c"
+    switches: null
+    parameters: null
     value: "*a = 0;\\n"
 `;
 
@@ -288,6 +298,8 @@ children:
   - type: "src-block"
     affiliated: {}
     language: "org"
+    switches: null
+    parameters: null
     value: ",# nont escaped\\n"
 `;
 
@@ -299,6 +311,8 @@ children:
   - type: "src-block"
     affiliated: {}
     language: "org"
+    switches: null
+    parameters: null
     value: "* not a headline;\\n"
 `;
 
@@ -370,9 +384,50 @@ contentsEnd: 27
 children:
   - type: "src-block"
     affiliated: {}
+    switches: null
+    parameters: null
     value: "hello\\n"
 `;
 
+exports[`org/parser blocks src block with parameters 1`] = `
+type: "org-data"
+contentsBegin: 0
+contentsEnd: 52
+children:
+  - type: "src-block"
+    affiliated: {}
+    language: "js"
+    switches: null
+    parameters: ":exports none"
+    value: "const t = 10\\n"
+`;
+
+exports[`org/parser blocks src block with switches 1`] = `
+type: "org-data"
+contentsBegin: 0
+contentsEnd: 44
+children:
+  - type: "src-block"
+    affiliated: {}
+    language: "js"
+    switches: "+n 10"
+    parameters: null
+    value: "const t = 10\\n"
+`;
+
+exports[`org/parser blocks src block with switches and parameters 1`] = `
+type: "org-data"
+contentsBegin: 0
+contentsEnd: 58
+children:
+  - type: "src-block"
+    affiliated: {}
+    language: "js"
+    switches: "+n 10"
+    parameters: ":exports none"
+    value: "const t = 10\\n"
+`;
+
 exports[`org/parser blocks src in list 1`] = `
 type: "org-data"
 contentsBegin: 0
@@ -402,6 +457,8 @@ children:
                 value: "example:\\n"
           - type: "src-block"
             affiliated: {}
+            switches: null
+            parameters: null
             value: "  blah\\n"
 `;
 
@@ -3200,6 +3257,8 @@ children:
           - type: "src-block"
             affiliated: {}
             language: "c"
+            switches: null
+            parameters: null
             value: "  x\\n\\n\\n  y\\n"
 `;
 

diff --git a/packages/uniorg-parse/src/parser.spec.ts b/packages/uniorg-parse/src/parser.spec.ts
@@ -532,6 +532,30 @@ hello
   #+end_src`
     );
 
+    itParses(
+      'src block with switches',
+      `
+#+begin_src js +n 10
+const t = 10
+#+end_src`
+    );
+
+    itParses(
+      'src block with parameters',
+      `
+#+begin_src js :exports none
+const t = 10
+#+end_src`
+    );
+
+    itParses(
+      'src block with switches and parameters',
+      `
+#+begin_src js +n 10 :exports none
+const t = 10
+#+end_src`
+    );
+
     itParses(
       'quote block',
       `#+begin_quote

diff --git a/packages/uniorg-parse/src/parser.ts b/packages/uniorg-parse/src/parser.ts
@@ -902,7 +902,14 @@ class Parser {
     this.parseEmptyLines();
     const _end = this.r.offset();
 
-    return u('src-block', { affiliated, language, value });
+    return u('src-block', {
+      affiliated,
+      language,
+      switches: switches?.trim() ?? null,
+      // using || to convert empty strings to null as well
+      parameters: parameters.trim() || null,
+      value,
+    });
   }
 
   private parseExampleBlock(