harmonyc 0.11.2 → 0.12.1

package/code_generator/VitestGenerator.js

@@ -1,5 +1,5 @@
 import { basename } from 'path';
-import { Arg, Word, } from "../model/model.js";
+import { Arg, Response, Word, } from "../model/model.js";
 export class VitestGenerator {
     constructor(tf, sf) {
         this.tf = tf;
@@ -60,14 +60,15 @@ export class VitestGenerator {
         this.tf.print('});');
     }
     errorStep(action, errorResponse) {
-        var _a;
         this.declareFeatureVariables([action]);
         this.tf.print(`context.task.meta.phrases.push(${str(errorResponse.toSingleLineString())});`);
         this.tf.print(`await expect(async () => {`);
         this.tf.indent(() => {
             action.toCode(this);
         });
-        this.tf.print(`}).rejects.toThrow(${(_a = errorResponse === null || errorResponse === void 0 ? void 0 : errorResponse.toCode(this)) !== null && _a !== void 0 ? _a : ''});`);
+        this.tf.print(`}).rejects.toThrow(${(errorResponse === null || errorResponse === void 0 ? void 0 : errorResponse.message) !== undefined
+            ? str(errorResponse.message.text)
+            : ''});`);
     }
     step(action, responses) {
         this.declareFeatureVariables([action, ...responses]);
@@ -113,16 +114,22 @@ export class VitestGenerator {
         const f = this.featureVars.get(p.feature.name);
         const args = p.args.map((a) => a.toCode(this));
         args.push(...this.extraArgs);
+        if (p instanceof Response && p.parts.length === 1 && p.saveToVariable) {
+            return this.saveToVariable(p.saveToVariable);
+        }
         this.tf.print(`(context.task.meta.phrases.push(${str(p.toString())}),`);
+        if (p instanceof Response && p.saveToVariable) {
+            this.saveToVariable(p.saveToVariable, '');
+        }
         this.tf.print(`await ${f}.${functionName(p)}(${args.join(', ')}));`);
     }
     setVariable(action) {
         this.tf.print(`(context.task.meta.variables ??= {})[${str(action.variableName)}] = ${action.value.toCode(this)};`);
     }
-    saveToVariable(s) {
+    saveToVariable(s, what = this.extraArgs[0] + ';') {
         if (this.extraArgs.length !== 1)
             return;
-        this.tf.print(`(context.task.meta.variables ??= {})[${str(s.variableName)}] = ${this.extraArgs[0]};`);
+        this.tf.print(`(context.task.meta.variables ??= {})[${str(s.variableName)}] = ${what}`.trimEnd());
     }
     stringLiteral(text, { withVariables }) {
         if (withVariables && text.match(/\$\{/)) {

package/model/model.js

@@ -256,10 +256,14 @@ export class Action extends Phrase {
     }
 }
 export class Response extends Phrase {
-    constructor() {
-        super(...arguments);
+    constructor(parts, saveToVariable) {
+        super([...parts, ...(saveToVariable ? [saveToVariable] : [])]);
+        this.saveToVariable = saveToVariable;
         this.kind = 'response';
     }
+    get isEmpty() {
+        return this.parts.length === 0 && !this.saveToVariable;
+    }
     toString() {
         return `=> ${super.toString()}`;
     }
@@ -277,6 +281,9 @@ export class ErrorResponse extends Response {
         super(message ? [new DummyKeyword('!!'), message] : [new DummyKeyword('!!')]);
         this.message = message;
     }
+    toCode(cg) {
+        cg.errorStep;
+    }
 }
 export class SetVariable extends Action {
     constructor(variableName, value) {
@@ -288,14 +295,17 @@ export class SetVariable extends Action {
         cg.setVariable(this);
     }
 }
-export class SaveToVariable extends Response {
+export class SaveToVariable extends Part {
     constructor(variableName) {
-        super([new DummyKeyword(`\${${variableName}}`)]);
+        super();
         this.variableName = variableName;
     }
     toCode(cg) {
         cg.saveToVariable(this);
     }
+    toString() {
+        return `\${${this.variableName}}`;
+    }
 }
 export class Precondition extends Branch {
     constructor(state = '') {

package/package.json

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

package/parser/lexer.js

@@ -1,6 +1,6 @@
 import { TokenError } from 'typescript-parsec';
-import rules from "./lexer_rules.js";
-export { T } from "./lexer_rules.js";
+import rules from './lexer_rules.js';
+export { T } from './lexer_rules.js';
 // based on https://github.com/microsoft/ts-parsec/blob/3350fcb/packages/ts-parsec/src/Lexer.ts
 /*
     MIT License

package/parser/parser.js

@@ -5,7 +5,7 @@ export function parse(input, production = TEST_DESIGN) {
     const tokens = lexer.parse(input);
     return expectSingleResult(expectEOF(production.parse(tokens)));
 }
-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(PHRASE, (parts) => new Response(parts)), 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 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)), 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
 DENTS = apply(alt_sc(tok(T.Plus), tok(T.Minus)), (seqOrFork) => {
     return {
         dent: (seqOrFork.text.length - 2) / 2,