harmonyc 0.14.1 → 0.16.0

package/model/model.js

@@ -81,6 +81,9 @@ export class Branch {
         this.parent = undefined;
         return this;
     }
+    switch(_i) {
+        return this;
+    }
 }
 export class Step extends Branch {
     constructor(action, responses = [], children, isFork = false) {
@@ -115,6 +118,9 @@ export class Step extends Branch {
     get isEmpty() {
         return this.phrases.every((phrase) => phrase.isEmpty);
     }
+    switch(i) {
+        return new Step(this.action.switch(i), this.responses.map((r) => r.switch(i)));
+    }
 }
 export class State {
     constructor(text = '') {
@@ -167,6 +173,44 @@ export class Word extends Part {
         return this.text;
     }
 }
+export class Repeater extends Part {
+    constructor(choices) {
+        super();
+        this.choices = choices;
+    }
+    toString() {
+        return `{${this.choices.map((ps) => ps.join(' ')).join(' & ')}}`;
+    }
+    toSingleLineString() {
+        return `{${this.choices
+            .map((ps) => ps.map((p) => p.toSingleLineString()).join(' '))
+            .join(' & ')}}`;
+    }
+}
+export class Switch extends Part {
+    constructor(choices) {
+        super();
+        this.choices = choices;
+    }
+    toString() {
+        return `{ ${this.choices.join(' / ')} }`;
+    }
+    toSingleLineString() {
+        return `{ ${this.choices.map((c) => c.toSingleLineString()).join(' / ')} }`;
+    }
+}
+export class Router extends Part {
+    constructor(choices) {
+        super();
+        this.choices = choices;
+    }
+    toString() {
+        return `{ ${this.choices.join(' ; ')} }`;
+    }
+    toSingleLineString() {
+        return `{ ${this.choices.map((c) => c.toSingleLineString()).join(' ; ')} }`;
+    }
+}
 export class Arg extends Part {
 }
 export class StringLiteral extends Arg {
@@ -243,6 +287,9 @@ export class Phrase {
     toSingleLineString() {
         return this.parts.map((p) => p.toSingleLineString()).join(' ');
     }
+    switch(i) {
+        return new this.constructor(this.parts.map((p) => (p instanceof Switch ? p.choices[i] : p)));
+    }
 }
 export class Action extends Phrase {
     constructor() {
@@ -306,6 +353,9 @@ export class SaveToVariable extends Part {
     toString() {
         return `\${${this.variableName}}`;
     }
+    get words() {
+        return [];
+    }
 }
 export class Precondition extends Branch {
     constructor(state = '') {
@@ -323,7 +373,7 @@ export function makeTests(root) {
     let ic = routers.getIncompleteCount();
     let newIc;
     do {
-        const newTest = new Test(root, routers.nextWalk());
+        const newTest = new Test(routers.nextWalk());
         newIc = routers.getIncompleteCount();
         if (newIc < ic)
             tests.push(newTest);
@@ -340,12 +390,28 @@ export function makeTests(root) {
     walk(root);
     tests = tests.filter((t) => t.steps.length > 0);
     tests.sort((a, b) => branchIndex.get(a.last) - branchIndex.get(b.last));
+    resolveSwitches(tests);
     tests.forEach((test, i) => (test.testNumber = `T${i + 1}`));
     return tests;
 }
+function resolveSwitches(tests) {
+    for (let i = 0; i < tests.length; ++i) {
+        const test = tests[i];
+        const phrases = test.steps.flatMap((s) => s.phrases);
+        const switches = phrases.flatMap((p) => p.parts.filter((p) => p instanceof Switch));
+        if (switches.length === 0)
+            continue;
+        const count = switches[0].choices.length;
+        if (switches.some((s) => s.choices.length !== count)) {
+            throw new Error(`all switches in a test case must have the same number of choices: ${test.name} has ${switches.map((s) => s.choices.length)} choices`);
+        }
+        const newTests = switches[0].choices.map((_, j) => test.switch(j));
+        tests.splice(i, 1, ...newTests);
+        i += count - 1;
+    }
+}
 export class Test {
-    constructor(root, branches) {
-        this.root = root;
+    constructor(branches) {
         this.branches = branches;
         this.branches = this.branches.filter((b) => !b.isEmpty);
         this.labels = this.branches
@@ -370,6 +436,9 @@ export class Test {
             .map((s) => `  - ${s.headToString()}`)
             .join('\n')}`;
     }
+    switch(j) {
+        return new Test(this.branches.map((b) => b.switch(j)));
+    }
 }
 export function makeGroups(tests) {
     if (tests.length === 0)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harmonyc",
   "description": "Harmony Code - model-driven BDD for Vitest",
-  "version": "0.14.1",
+  "version": "0.16.0",
   "author": "Bernát Kalló",
   "type": "module",
   "bin": {

package/parser/lexer_rules.js

@@ -12,6 +12,11 @@ export var T;
     T["Space"] = "space";
     T["OpeningBracket"] = "[";
     T["ClosingBracket"] = "]";
+    T["OpeningBrace"] = "{";
+    T["ClosingBrace"] = "}";
+    T["And"] = "&";
+    T["Slash"] = "/";
+    T["Semicolon"] = ";";
     T["DoubleQuoteString"] = "double-quote string";
     T["UnclosedDoubleQuoteString"] = "unclosed double-quote string";
     T["BacktickString"] = "backtick string";
@@ -39,6 +44,11 @@ const rules = [
     [true, /:(?=\s*(?:\n|$))/y, T.Colon],
     [true, /\[/y, T.OpeningBracket],
     [true, /\]/y, T.ClosingBracket],
+    [true, /\{/y, T.OpeningBrace],
+    [true, /\}/y, T.ClosingBrace],
+    [true, /\//y, T.Slash],
+    [true, /&/y, T.And],
+    [true, /;/y, T.Semicolon],
     [true, /!!/y, T.ErrorMark],
     [true, /=>/y, T.ResponseArrow],
     [
@@ -59,6 +69,6 @@ const rules = [
     [true, /\$\{[^}\n]*/y, T.UnclosedVariable],
     [true, /\|(?: .*|(?=\n|$))/y, T.MultilineString],
     [true, /\|[^ \n]/y, T.InvalidMultilineStringMark],
-    [true, /.+?(?=[\[\]"`|#]|\/\/|\$\{|$|=>|!!|:\s*$)/my, T.Words],
+    [true, /.+?(?=[\[\]"`|#{}&/;]|\$\{|$|=>|!!|:\s*$)/my, T.Words],
 ];
 export default rules;

package/parser/parser.js

@@ -1,6 +1,6 @@
 import { alt_sc, apply, expectEOF, expectSingleResult, kright, opt_sc, rep_sc, seq, tok, list_sc, kleft, kmid, fail, nil, unableToConsumeToken, } from 'typescript-parsec';
 import { T, lexer } from "./lexer.js";
-import { Action, Response, CodeLiteral, StringLiteral, Section, Step, Docstring, Word, Label, ErrorResponse, SaveToVariable, SetVariable, } from "../model/model.js";
+import { Action, Response, CodeLiteral, StringLiteral, Section, Step, Docstring, Word, Label, ErrorResponse, SaveToVariable, SetVariable, Switch, } from "../model/model.js";
 export function parse(input, production = TEST_DESIGN) {
     const tokens = lexer.parse(input);
     return expectSingleResult(expectEOF(production.parse(tokens)));
@@ -26,7 +26,14 @@ function anythingBut(kind) {
         },
     };
 }
-export const NEWLINES = list_sc(tok(T.Newline), nil()), WORDS = apply(tok(T.Words), ({ text }) => new Word(text.trimEnd().split(/\s+/).join(' '))), DOUBLE_QUOTE_STRING = alt_sc(apply(tok(T.DoubleQuoteString), ({ text }) => new StringLiteral(JSON.parse(text))), seq(tok(T.UnclosedDoubleQuoteString), fail('unclosed double-quote string'))), BACKTICK_STRING = apply(tok(T.BacktickString), ({ text }) => new CodeLiteral(text.slice(1, -1))), DOCSTRING = kright(opt_sc(NEWLINES), apply(list_sc(tok(T.MultilineString), tok(T.Newline)), (lines) => new Docstring(lines.map(({ text }) => text.slice(2)).join('\n')))), ERROR_MARK = tok(T.ErrorMark), VARIABLE = apply(tok(T.Variable), ({ text }) => text.slice(2, -1)), PART = alt_sc(WORDS, DOUBLE_QUOTE_STRING, BACKTICK_STRING, DOCSTRING), PHRASE = rep_sc(PART), ARG = alt_sc(DOUBLE_QUOTE_STRING, BACKTICK_STRING, DOCSTRING), SET_VARIABLE = apply(seq(VARIABLE, ARG), ([variable, value]) => new SetVariable(variable, value)), ACTION = alt_sc(SET_VARIABLE, apply(PHRASE, (parts) => new Action(parts))), RESPONSE = apply(seq(PHRASE, opt_sc(VARIABLE)), ([parts, variable]) => new Response(parts, variable !== undefined ? new SaveToVariable(variable) : undefined)), ERROR_RESPONSE = apply(seq(ERROR_MARK, opt_sc(alt_sc(DOUBLE_QUOTE_STRING, DOCSTRING))), ([, parts]) => new ErrorResponse(parts)), SAVE_TO_VARIABLE = apply(VARIABLE, (variable) => new Response([], new SaveToVariable(variable))), ARROW = kright(opt_sc(NEWLINES), tok(T.ResponseArrow)), RESPONSE_ITEM = kright(ARROW, alt_sc(SAVE_TO_VARIABLE, ERROR_RESPONSE, RESPONSE)), STEP = apply(seq(ACTION, rep_sc(RESPONSE_ITEM)), ([action, responses]) => new Step(action, responses).setFork(true)), LABEL = apply(kleft(list_sc(PART, nil()), tok(T.Colon)), (words) => new Label(words.map((w) => w.toString()).join(' '))), SECTION = apply(LABEL, (text) => new Section(text)), BRANCH = alt_sc(SECTION, STEP), // section first, to make sure there is no colon after step
+export const NEWLINES = list_sc(tok(T.Newline), nil()), WORDS = apply(tok(T.Words), ({ text }) => new Word(text.trimEnd().split(/\s+/).join(' '))), DOUBLE_QUOTE_STRING = alt_sc(apply(tok(T.DoubleQuoteString), ({ text }) => new StringLiteral(JSON.parse(text))), seq(tok(T.UnclosedDoubleQuoteString), fail('unclosed double-quote string'))), BACKTICK_STRING = apply(tok(T.BacktickString), ({ text }) => new CodeLiteral(text.slice(1, -1))), DOCSTRING = kright(opt_sc(NEWLINES), apply(list_sc(tok(T.MultilineString), tok(T.Newline)), (lines) => new Docstring(lines.map(({ text }) => text.slice(2)).join('\n')))), ERROR_MARK = tok(T.ErrorMark), VARIABLE = apply(tok(T.Variable), ({ text }) => text.slice(2, -1)), SIMPLE_PART = alt_sc(WORDS, DOUBLE_QUOTE_STRING, BACKTICK_STRING, DOCSTRING), 
+//REPEATER = apply(
+//list_sc(rep_sc(SIMPLE_PART), tok(T.And)),
+//(cs) => new Repeater(cs)
+//),
+SWITCH = apply(list_sc(SIMPLE_PART, tok(T.Slash)), (cs) => new Switch(cs)), 
+//ROUTER = apply(list_sc(REPEATER, tok(T.Semicolon)), (cs) => new Router(cs)),
+BRACES = kmid(tok(T.OpeningBrace), SWITCH, tok(T.ClosingBrace)), PART = alt_sc(SIMPLE_PART, BRACES), PHRASE = rep_sc(PART), ARG = alt_sc(DOUBLE_QUOTE_STRING, BACKTICK_STRING, DOCSTRING), SET_VARIABLE = apply(seq(VARIABLE, ARG), ([variable, value]) => new SetVariable(variable, value)), ACTION = alt_sc(SET_VARIABLE, apply(PHRASE, (parts) => new Action(parts))), RESPONSE = apply(seq(PHRASE, opt_sc(VARIABLE)), ([parts, variable]) => new Response(parts, variable !== undefined ? new SaveToVariable(variable) : undefined)), ERROR_RESPONSE = apply(seq(ERROR_MARK, opt_sc(alt_sc(DOUBLE_QUOTE_STRING, DOCSTRING))), ([, parts]) => new ErrorResponse(parts)), SAVE_TO_VARIABLE = apply(VARIABLE, (variable) => new Response([], new SaveToVariable(variable))), ARROW = kright(opt_sc(NEWLINES), tok(T.ResponseArrow)), RESPONSE_ITEM = kright(ARROW, alt_sc(SAVE_TO_VARIABLE, ERROR_RESPONSE, RESPONSE)), STEP = apply(seq(ACTION, rep_sc(RESPONSE_ITEM)), ([action, responses]) => new Step(action, responses).setFork(true)), LABEL = apply(kleft(list_sc(PART, nil()), tok(T.Colon)), (words) => new Label(words.map((w) => w.toString()).join(' '))), SECTION = apply(LABEL, (text) => new Section(text)), BRANCH = alt_sc(SECTION, STEP), // section first, to make sure there is no colon after step
 DENTS = apply(alt_sc(tok(T.Plus), tok(T.Minus)), (seqOrFork) => {
     return {
         dent: (seqOrFork.text.length - 2) / 2,
@@ -36,15 +43,19 @@ DENTS = apply(alt_sc(tok(T.Plus), tok(T.Minus)), (seqOrFork) => {
     dent,
     branch: branch.setFork(isFork),
 })), ANYTHING_BUT_NEWLINE = anythingBut(T.Newline), TEXT = apply(seq(tok(T.Words), rep_sc(ANYTHING_BUT_NEWLINE)), () => undefined), LINE = alt_sc(NODE, TEXT), TEST_DESIGN = kmid(rep_sc(NEWLINES), apply(opt_sc(list_sc(apply(LINE, (line, [start, end]) => ({ line, start, end })), NEWLINES)), (lines) => {
-    const startDent = 0;
-    let dent = startDent;
+    let dent;
     const root = new Section(new Label(''));
     let parent = root;
     for (const { line, start } of lines !== null && lines !== void 0 ? lines : []) {
         if (line === undefined)
             continue;
         const { dent: d, branch } = line;
-        if (Math.round(d) !== d) {
+        if (dent === undefined) {
+            if (d !== 0)
+                throw new Error(`invalid indent ${d} at line ${start.pos.rowBegin}: first step must not be indented`);
+            dent = 0;
+        }
+        else if (Math.round(d) !== d) {
             throw new Error(`invalid odd indent of ${d * 2} at line ${start.pos.rowBegin}`);
         }
         else if (d > dent + 1) {
@@ -54,9 +65,6 @@ DENTS = apply(alt_sc(tok(T.Plus), tok(T.Minus)), (seqOrFork) => {
             parent = parent.children[parent.children.length - 1];
             ++dent;
         }
-        else if (d < startDent) {
-            throw new Error(`invalid indent ${d} at line ${start.pos.rowBegin}`);
-        }
         else
             while (d < dent) {
                 parent = parent.parent;