Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat(parse): add switches and params for src-block #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 2, 2023
Merged

feat(parse): add switches and params for src-block #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca27a54
feat(parse): add switches and params for src-block
venikx Oct 31, 2023
6e56df8
refactor(uniorg-parse): don't break current api
venikx Oct 31, 2023
414b9f1
fix(uniorg-parse): make switches/parameters json-serializable
rasendubi Nov 2, 2023
041eb97
refactor: add changeset for switches and parameters
rasendubi Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nasty-scissors-reply.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'uniorg-parse': minor
---

Add support for switches and parameters in src-blocks.
59 changes: 59 additions & 0 deletions packages/uniorg-parse/src/__snapshots__/parser.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ children:
- type: "src-block"
affiliated:
NAME: "hi"
switches: null
parameters: null
value: ""
`;

Expand Down Expand Up @@ -94,6 +96,8 @@ children:
affiliated:
NAME: "source"
language: "org"
switches: null
parameters: null
value: "some paragraph\\n"
`;

Expand Down Expand Up @@ -128,6 +132,8 @@ children:
- type: "src-block"
affiliated: {}
language: "org"
switches: null
parameters: null
value: "#+ escaped\\n"
`;

Expand Down Expand Up @@ -158,6 +164,8 @@ children:
- type: "src-block"
affiliated: {}
language: "org"
switches: null
parameters: null
value: ",,* two commas escaped\\n"
`;

Expand All @@ -179,6 +187,8 @@ children:
- type: "src-block"
affiliated: {}
language: "c"
switches: null
parameters: null
value: "*a = 0;\\n"
`;

Expand Down Expand Up @@ -288,6 +298,8 @@ children:
- type: "src-block"
affiliated: {}
language: "org"
switches: null
parameters: null
value: ",# nont escaped\\n"
`;

Expand All @@ -299,6 +311,8 @@ children:
- type: "src-block"
affiliated: {}
language: "org"
switches: null
parameters: null
value: "* not a headline;\\n"
`;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -402,6 +457,8 @@ children:
value: "example:\\n"
- type: "src-block"
affiliated: {}
switches: null
parameters: null
value: " blah\\n"
`;

Expand Down Expand Up @@ -3200,6 +3257,8 @@ children:
- type: "src-block"
affiliated: {}
language: "c"
switches: null
parameters: null
value: " x\\n\\n\\n y\\n"
`;

Expand Down
24 changes: 24 additions & 0 deletions packages/uniorg-parse/src/parser.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion packages/uniorg-parse/src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down