diff --git a/src/lib/generated-grammar.ts b/src/lib/generated-grammar.ts
index b556c1f..3c5ad02 100644
--- a/src/lib/generated-grammar.ts
+++ b/src/lib/generated-grammar.ts
@@ -3,6 +3,21 @@
// Bypasses TS6133. Allow declared but unused functions.
// @ts-ignore
function id(d: any[]): any { return d[0]; }
+
+ const nothing = () => null;
+
+ const nonNull = (x) => (x !== null && x !== '')
+
+ const nonNullArray = (d) => {
+ let output = [d[2]];
+
+ for (let i in d[3]) {
+ output.push(d[3][i][3]);
+ }
+
+ return output;
+}
+
interface NearleyToken {
value: any;
@@ -34,26 +49,27 @@ interface Grammar {
const grammar: Grammar = {
Lexer: undefined,
ParserRules: [
- {"name": "Gram$ebnf$1", "symbols": ["Record"], "postprocess": id},
+ {"name": "Gram$ebnf$1$subexpression$1", "symbols": ["Record", "_"]},
+ {"name": "Gram$ebnf$1", "symbols": ["Gram$ebnf$1$subexpression$1"], "postprocess": id},
{"name": "Gram$ebnf$1", "symbols": [], "postprocess": () => null},
+ {"name": "Gram$ebnf$2", "symbols": []},
{"name": "Gram$ebnf$2$subexpression$1", "symbols": ["Pattern", "_"]},
- {"name": "Gram$ebnf$2", "symbols": ["Gram$ebnf$2$subexpression$1"]},
- {"name": "Gram$ebnf$2$subexpression$2", "symbols": ["Pattern", "_"]},
- {"name": "Gram$ebnf$2", "symbols": ["Gram$ebnf$2", "Gram$ebnf$2$subexpression$2"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Gram", "symbols": ["Gram$ebnf$1", "Gram$ebnf$2"]},
+ {"name": "Gram$ebnf$2", "symbols": ["Gram$ebnf$2", "Gram$ebnf$2$subexpression$1"], "postprocess": (d) => d[0].concat([d[1]])},
+ {"name": "Gram", "symbols": ["Gram$ebnf$1", "Gram$ebnf$2"], "postprocess": ([record, patterns]) => `(gram ${record ? record : ""} ${patterns.filter(nonNull).join(",")})`},
{"name": "Pattern$ebnf$1", "symbols": []},
{"name": "Pattern$ebnf$1$subexpression$1", "symbols": ["_", {"literal":","}, "_", "PatternElement"]},
{"name": "Pattern$ebnf$1", "symbols": ["Pattern$ebnf$1", "Pattern$ebnf$1$subexpression$1"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Pattern", "symbols": ["PatternElement", "Pattern$ebnf$1"]},
+ {"name": "Pattern", "symbols": ["PatternElement", "Pattern$ebnf$1"], "postprocess": ([p1, ps]) => `(pattern ${p1})`},
{"name": "PatternElement$ebnf$1", "symbols": []},
{"name": "PatternElement$ebnf$1$subexpression$1", "symbols": ["Annotation", "_"]},
{"name": "PatternElement$ebnf$1", "symbols": ["PatternElement$ebnf$1", "PatternElement$ebnf$1$subexpression$1"], "postprocess": (d) => d[0].concat([d[1]])},
{"name": "PatternElement$subexpression$1", "symbols": ["Subject"]},
{"name": "PatternElement$subexpression$1", "symbols": ["Path"]},
- {"name": "PatternElement", "symbols": ["PatternElement$ebnf$1", "PatternElement$subexpression$1"]},
+ {"name": "PatternElement$subexpression$1", "symbols": ["Reference"]},
+ {"name": "PatternElement", "symbols": ["PatternElement$ebnf$1", "PatternElement$subexpression$1"], "postprocess": ([anno, el]) => `${anno.filter(nonNull).join("@")}${el}?`},
{"name": "Subject$ebnf$1", "symbols": ["Association"], "postprocess": id},
{"name": "Subject$ebnf$1", "symbols": [], "postprocess": () => null},
- {"name": "Subject", "symbols": [{"literal":"["}, "_", "Attributes", "_", "Subject$ebnf$1", {"literal":"]"}]},
+ {"name": "Subject", "symbols": [{"literal":"["}, "_", "Attributes", "_", "Subject$ebnf$1", {"literal":"]"}], "postprocess": () => `(subject)`},
{"name": "Association$ebnf$1$subexpression$1$ebnf$1", "symbols": ["Labels"], "postprocess": id},
{"name": "Association$ebnf$1$subexpression$1$ebnf$1", "symbols": [], "postprocess": () => null},
{"name": "Association$ebnf$1$subexpression$1$ebnf$2", "symbols": ["Record"], "postprocess": id},
@@ -61,16 +77,10 @@ const grammar: Grammar = {
{"name": "Association$ebnf$1$subexpression$1", "symbols": ["Association$ebnf$1$subexpression$1$ebnf$1", "Association$ebnf$1$subexpression$1$ebnf$2", "_", {"literal":"|"}]},
{"name": "Association$ebnf$1", "symbols": ["Association$ebnf$1$subexpression$1"], "postprocess": id},
{"name": "Association$ebnf$1", "symbols": [], "postprocess": () => null},
- {"name": "Association$ebnf$2", "symbols": []},
- {"name": "Association$ebnf$2$subexpression$1", "symbols": ["_", {"literal":","}, "_", "AssociationMember"]},
- {"name": "Association$ebnf$2", "symbols": ["Association$ebnf$2", "Association$ebnf$2$subexpression$1"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Association", "symbols": [{"literal":"|"}, "Association$ebnf$1", "_", "AssociationMember", "Association$ebnf$2"]},
- {"name": "AssociationMember$subexpression$1", "symbols": ["PatternElement"]},
- {"name": "AssociationMember$subexpression$1", "symbols": ["Reference"]},
- {"name": "AssociationMember", "symbols": ["AssociationMember$subexpression$1"]},
- {"name": "Reference", "symbols": ["Identity"]},
- {"name": "Path", "symbols": ["Node"]},
- {"name": "Path", "symbols": ["Relationship"]},
+ {"name": "Association", "symbols": [{"literal":"|"}, "Association$ebnf$1", "_", "Pattern"]},
+ {"name": "Reference", "symbols": ["Identity"], "postprocess": () => `(reference)`},
+ {"name": "Path", "symbols": ["Node"], "postprocess": () => `(node)`},
+ {"name": "Path", "symbols": ["Relationship"], "postprocess": () => `(relationship)`},
{"name": "Node", "symbols": [{"literal":"("}, "_", "Attributes", "_", {"literal":")"}]},
{"name": "Relationship", "symbols": ["Node", "Arrow", "Path"]},
{"name": "Annotation$subexpression$1$subexpression$1", "symbols": [{"literal":"("}, "Value", {"literal":")"}]},
@@ -131,15 +141,13 @@ const grammar: Grammar = {
{"name": "Attributes$ebnf$3", "symbols": ["Record"], "postprocess": id},
{"name": "Attributes$ebnf$3", "symbols": [], "postprocess": () => null},
{"name": "Attributes", "symbols": ["Attributes$ebnf$1", "Attributes$ebnf$2", "Attributes$ebnf$3"]},
- {"name": "Identity", "symbols": ["Value"]},
+ {"name": "Identity", "symbols": ["Key"]},
{"name": "Labels$ebnf$1$subexpression$1$subexpression$1", "symbols": ["Define"]},
{"name": "Labels$ebnf$1$subexpression$1$subexpression$1", "symbols": ["Declare"]},
- {"name": "Labels$ebnf$1$subexpression$1$subexpression$1", "symbols": ["Annotate"]},
{"name": "Labels$ebnf$1$subexpression$1", "symbols": ["Labels$ebnf$1$subexpression$1$subexpression$1", "Key"]},
{"name": "Labels$ebnf$1", "symbols": ["Labels$ebnf$1$subexpression$1"]},
{"name": "Labels$ebnf$1$subexpression$2$subexpression$1", "symbols": ["Define"]},
{"name": "Labels$ebnf$1$subexpression$2$subexpression$1", "symbols": ["Declare"]},
- {"name": "Labels$ebnf$1$subexpression$2$subexpression$1", "symbols": ["Annotate"]},
{"name": "Labels$ebnf$1$subexpression$2", "symbols": ["Labels$ebnf$1$subexpression$2$subexpression$1", "Key"]},
{"name": "Labels$ebnf$1", "symbols": ["Labels$ebnf$1", "Labels$ebnf$1$subexpression$2"], "postprocess": (d) => d[0].concat([d[1]])},
{"name": "Labels", "symbols": ["Labels$ebnf$1"]},
@@ -147,17 +155,17 @@ const grammar: Grammar = {
{"name": "Record$ebnf$1", "symbols": []},
{"name": "Record$ebnf$1$subexpression$1", "symbols": [{"literal":","}, "_", "Property"]},
{"name": "Record$ebnf$1", "symbols": ["Record$ebnf$1", "Record$ebnf$1$subexpression$1"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Record", "symbols": [{"literal":"{"}, "_", "Property", "Record$ebnf$1", {"literal":"}"}]},
+ {"name": "Record", "symbols": [{"literal":"{"}, "_", "Property", "Record$ebnf$1", {"literal":"}"}], "postprocess": (d) => `(record ${(d.length > 2) ? d[2] : ""})`},
{"name": "Property$subexpression$1", "symbols": ["Define"]},
{"name": "Property$subexpression$1", "symbols": ["Declare"]},
- {"name": "Property$subexpression$1", "symbols": ["Annotate"]},
- {"name": "Property", "symbols": ["Key", "_", "Property$subexpression$1", "_", "Value"]},
+ {"name": "Property", "symbols": ["Key", "_", "Property$subexpression$1", "_", "Value"], "postprocess": ([key, _1, binder, _2, value]) => `(property ${key} ${value})`},
{"name": "Define", "symbols": [{"literal":":"}]},
{"name": "Declare$string$1", "symbols": [{"literal":":"}, {"literal":":"}], "postprocess": (d) => d.join('')},
{"name": "Declare", "symbols": ["Declare$string$1"]},
{"name": "Annotate", "symbols": [{"literal":"@"}]},
{"name": "Key$subexpression$1", "symbols": ["Symbol"]},
{"name": "Key$subexpression$1", "symbols": ["StringLiteral"]},
+ {"name": "Key$subexpression$1", "symbols": ["Integer"]},
{"name": "Key", "symbols": ["Key$subexpression$1"]},
{"name": "Value", "symbols": ["Null"]},
{"name": "Value", "symbols": ["Boolean"]},
@@ -181,8 +189,8 @@ const grammar: Grammar = {
{"name": "Boolean$string$2", "symbols": [{"literal":"f"}, {"literal":"a"}, {"literal":"l"}, {"literal":"s"}, {"literal":"e"}], "postprocess": (d) => d.join('')},
{"name": "Boolean", "symbols": ["Boolean$string$2"]},
{"name": "Symbol$ebnf$1", "symbols": []},
- {"name": "Symbol$ebnf$1", "symbols": ["Symbol$ebnf$1", /[0-9a-zA-Z_\-]/], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Symbol", "symbols": [/[a-zA-Z_]/, "Symbol$ebnf$1"]},
+ {"name": "Symbol$ebnf$1", "symbols": ["Symbol$ebnf$1", /[0-9a-zA-Z_\-@]/], "postprocess": (d) => d[0].concat([d[1]])},
+ {"name": "Symbol", "symbols": [/[a-zA-Z_]/, "Symbol$ebnf$1"], "postprocess": (d) => `(symbol)`},
{"name": "Range$string$1", "symbols": [{"literal":"."}, {"literal":"."}], "postprocess": (d) => d.join('')},
{"name": "Range", "symbols": ["NumericLiteral", "Range$string$1", "NumericLiteral"]},
{"name": "Range$string$2", "symbols": [{"literal":"."}, {"literal":"."}, {"literal":"."}], "postprocess": (d) => d.join('')},
@@ -200,24 +208,22 @@ const grammar: Grammar = {
{"name": "Integer$ebnf$1", "symbols": [], "postprocess": () => null},
{"name": "Integer$ebnf$2", "symbols": [/[0-9]/]},
{"name": "Integer$ebnf$2", "symbols": ["Integer$ebnf$2", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Integer", "symbols": ["Integer$ebnf$1", "Integer$ebnf$2"]},
+ {"name": "Integer", "symbols": ["Integer$ebnf$1", "Integer$ebnf$2"], "postprocess": (d) => `(integer)`},
{"name": "Decimal$ebnf$1", "symbols": [{"literal":"-"}], "postprocess": id},
{"name": "Decimal$ebnf$1", "symbols": [], "postprocess": () => null},
{"name": "Decimal$ebnf$2", "symbols": [/[0-9]/]},
{"name": "Decimal$ebnf$2", "symbols": ["Decimal$ebnf$2", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Decimal$ebnf$3$subexpression$1$ebnf$1", "symbols": [/[0-9]/]},
- {"name": "Decimal$ebnf$3$subexpression$1$ebnf$1", "symbols": ["Decimal$ebnf$3$subexpression$1$ebnf$1", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Decimal$ebnf$3$subexpression$1", "symbols": [{"literal":"."}, "Decimal$ebnf$3$subexpression$1$ebnf$1"]},
+ {"name": "Decimal$subexpression$1$ebnf$1", "symbols": [/[0-9]/]},
+ {"name": "Decimal$subexpression$1$ebnf$1", "symbols": ["Decimal$subexpression$1$ebnf$1", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
+ {"name": "Decimal$subexpression$1", "symbols": [{"literal":"."}, "Decimal$subexpression$1$ebnf$1"]},
+ {"name": "Decimal$ebnf$3$subexpression$1$ebnf$1", "symbols": [/[+-]/], "postprocess": id},
+ {"name": "Decimal$ebnf$3$subexpression$1$ebnf$1", "symbols": [], "postprocess": () => null},
+ {"name": "Decimal$ebnf$3$subexpression$1$ebnf$2", "symbols": [/[0-9]/]},
+ {"name": "Decimal$ebnf$3$subexpression$1$ebnf$2", "symbols": ["Decimal$ebnf$3$subexpression$1$ebnf$2", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
+ {"name": "Decimal$ebnf$3$subexpression$1", "symbols": [/[eE]/, "Decimal$ebnf$3$subexpression$1$ebnf$1", "Decimal$ebnf$3$subexpression$1$ebnf$2"]},
{"name": "Decimal$ebnf$3", "symbols": ["Decimal$ebnf$3$subexpression$1"], "postprocess": id},
{"name": "Decimal$ebnf$3", "symbols": [], "postprocess": () => null},
- {"name": "Decimal$ebnf$4$subexpression$1$ebnf$1", "symbols": [/[+-]/], "postprocess": id},
- {"name": "Decimal$ebnf$4$subexpression$1$ebnf$1", "symbols": [], "postprocess": () => null},
- {"name": "Decimal$ebnf$4$subexpression$1$ebnf$2", "symbols": [/[0-9]/]},
- {"name": "Decimal$ebnf$4$subexpression$1$ebnf$2", "symbols": ["Decimal$ebnf$4$subexpression$1$ebnf$2", /[0-9]/], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "Decimal$ebnf$4$subexpression$1", "symbols": [/[eE]/, "Decimal$ebnf$4$subexpression$1$ebnf$1", "Decimal$ebnf$4$subexpression$1$ebnf$2"]},
- {"name": "Decimal$ebnf$4", "symbols": ["Decimal$ebnf$4$subexpression$1"], "postprocess": id},
- {"name": "Decimal$ebnf$4", "symbols": [], "postprocess": () => null},
- {"name": "Decimal", "symbols": ["Decimal$ebnf$1", "Decimal$ebnf$2", "Decimal$ebnf$3", "Decimal$ebnf$4"]},
+ {"name": "Decimal", "symbols": ["Decimal$ebnf$1", "Decimal$ebnf$2", "Decimal$subexpression$1", "Decimal$ebnf$3"], "postprocess": (d) => `(decimal)`},
{"name": "Hexadecimal$ebnf$1", "symbols": [{"literal":"-"}], "postprocess": id},
{"name": "Hexadecimal$ebnf$1", "symbols": [], "postprocess": () => null},
{"name": "Hexadecimal$string$1", "symbols": [{"literal":"0"}, {"literal":"x"}], "postprocess": (d) => d.join('')},
@@ -229,8 +235,8 @@ const grammar: Grammar = {
{"name": "Octal$ebnf$2", "symbols": [/[0-7]/]},
{"name": "Octal$ebnf$2", "symbols": ["Octal$ebnf$2", /[0-7]/], "postprocess": (d) => d[0].concat([d[1]])},
{"name": "Octal", "symbols": ["Octal$ebnf$1", {"literal":"0"}, "Octal$ebnf$2"]},
- {"name": "Measurement", "symbols": ["Decimal", "Symbol"]},
- {"name": "Percentage", "symbols": ["Decimal", {"literal":"%"}]},
+ {"name": "Measurement", "symbols": ["NumericLiteral", "Symbol"]},
+ {"name": "Percentage", "symbols": ["NumericLiteral", {"literal":"%"}]},
{"name": "StringLiteral", "symbols": ["DoubleQuotedLiteral"]},
{"name": "StringLiteral", "symbols": ["SingleQuotedLiteral"]},
{"name": "StringLiteral", "symbols": ["BacktickStringLiteral"]},
@@ -264,10 +270,10 @@ const grammar: Grammar = {
{"name": "EscapedChars", "symbols": [{"literal":"u"}, /[a-fA-F0-9]/, /[a-fA-F0-9]/, /[a-fA-F0-9]/, /[a-fA-F0-9]/]},
{"name": "_$ebnf$1", "symbols": []},
{"name": "_$ebnf$1", "symbols": ["_$ebnf$1", "wschar"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "_", "symbols": ["_$ebnf$1"]},
+ {"name": "_", "symbols": ["_$ebnf$1"], "postprocess": nothing},
{"name": "__$ebnf$1", "symbols": ["wschar"]},
{"name": "__$ebnf$1", "symbols": ["__$ebnf$1", "wschar"], "postprocess": (d) => d[0].concat([d[1]])},
- {"name": "__", "symbols": ["__$ebnf$1"]},
+ {"name": "__", "symbols": ["__$ebnf$1"], "postprocess": nothing},
{"name": "wschar", "symbols": [/[ \t\n\v\f]/]}
],
ParserStart: "Gram",
diff --git a/src/lib/gram-global-record.spec.ts b/src/lib/gram-global-record.spec.ts
index a3cc4aa..d206058 100644
--- a/src/lib/gram-global-record.spec.ts
+++ b/src/lib/gram-global-record.spec.ts
@@ -1,8 +1,15 @@
-import * as Effect from "effect/Micro"
-import * as Either from "effect/Either"
+
+import { Effect, Either, Exit, Cause } from "effect"
import { parse } from './nearley-gram';
+import { Parser } from "nearley";
+const debugExit = (x:Exit.Exit
) => Exit.match(x,
+ {
+ onSuccess: (success) => JSON.stringify(success.results),
+ onFailure: (error) => Cause.pretty(error)
+ }
+)
describe('global record', () => {
test.each([
@@ -28,7 +35,8 @@ describe('global record', () => {
('can define values like %s, which is %s', async (gram, description) => {
const task = parse(gram);
const result = await Effect.runPromiseExit(task)
- expect(Either.isRight(result)).toBeTruthy();
+ if (Exit.isFailure(result)) console.error(debugExit(result))
+ expect(Exit.isSuccess(result)).toBeTruthy();
})
test.each([
@@ -38,13 +46,15 @@ describe('global record', () => {
('can define multiple values like: %s', async (gram) => {
const task = parse(gram);
const result = await Effect.runPromiseExit(task)
- expect(Either.isRight(result)).toBeTruthy();
+ if (Exit.isFailure(result)) console.error(debugExit(result))
+ expect(Exit.isSuccess(result)).toBeTruthy();
})
- it('cannot appear twice', async () => {
- const gram = `{k:1} {k:2}`;
+ it('can not appear twice', async () => {
+ const gram = `{k:1} {k:2} {k:3} {k:4}`;
const task = parse(gram);
const result = await Effect.runPromiseExit(task)
- expect(Either.isLeft(result)).toBeTruthy();
+ if (Exit.isSuccess(result)) console.error(debugExit(result))
+ expect(Exit.isFailure(result)).toBeTruthy();
})
@@ -54,6 +64,6 @@ describe('global record', () => {
('can declare multiple keys like: %s', async (gram) => {
const task = parse(gram);
const result = await Effect.runPromiseExit(task)
- expect(Either.isRight(result)).toBeTruthy();
+ expect(Exit.isSuccess(result)).toBeTruthy();
})
})
diff --git a/src/lib/gram-nodes.spec.ts b/src/lib/gram-nodes.spec.ts
index afaffd1..69236a1 100644
--- a/src/lib/gram-nodes.spec.ts
+++ b/src/lib/gram-nodes.spec.ts
@@ -29,7 +29,6 @@ describe('node identifiers', () => {
'(a-b-k)',
'("a sentence of words")',
'(1)',
- '(0xBE)',
])
('can be: %s', async (gram) => {
const task = parse(gram);
@@ -39,6 +38,9 @@ describe('node identifiers', () => {
test.each([
'(-)',
'(*)',
+ '(@abk)',
+ '(@@metabk)',
+ '(0xBE)',
])
('can not be: %s', async (gram) => {
const task = parse(gram);
@@ -53,7 +55,8 @@ describe('node labels', () => {
'(ab:Aye:Bee)',
'(a:"A few words with whitespace")',
"(a:'Words within single quotes')",
- "(a:`Words within backticks`)"
+ "(a:`Words within backticks`)",
+ '(a:1)',
])
('can be Symbols like: %s', async (gram) => {
const task = parse(gram);
@@ -82,7 +85,6 @@ describe('node labels', () => {
test.each([
'(a:)',
- '(a:1)',
`(a:0x1337)`
])
('can not be things like: %s', async (gram) => {