harmonyc 0.10.1 → 0.10.3

package/code_generator/JavaScript.js

@@ -52,6 +52,7 @@ export class NodeTest {
         this.featureVars.set(new Object(), this.currentFeatureName);
         this.tf.print(`test(${str(t.name)}, async (context) => {`);
         this.tf.indent(() => {
+            this.tf.print(`context.task.meta.phrases ??= [];`);
             for (const step of t.steps) {
                 step.toCode(this);
             }
@@ -69,6 +70,7 @@ export class NodeTest {
     }
     step(action, responses) {
         this.declareFeatureVariables([action, ...responses]);
+        this.tf.print(`context.task.meta.phrases.push(${str(action.toString())});`);
         if (responses.length === 0) {
             action.toCode(this);
             return;
@@ -80,6 +82,7 @@ export class NodeTest {
             try {
                 this.extraArgs = [res];
                 for (const response of responses) {
+                    this.tf.print(`context.task.meta.phrases.push(${str(`=> ${response.toString()}`)});`);
                     response.toCode(this);
                 }
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harmonyc",
   "description": "Harmony Code - model-driven BDD for Vitest",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "author": "Bernát Kalló",
   "type": "module",
   "bin": {
@@ -26,6 +26,9 @@
     "typescript-parsec": "0.3.4",
     "watcher": "^2.3.1"
   },
+  "peerDependencies": {
+    "vitest": "^2.1.0"
+  },
   "license": "MIT",
   "keywords": [
     "unit test",

package/parser/lexer_rules.js

@@ -57,6 +57,6 @@ const rules = [
     [true, /^`[^`]+`/g, T.BacktickString],
     [true, /^`[^`]*/g, T.UnclosedBacktickString],
     [true, /^\|(?: .*|(?=\n|$))/g, T.MultilineString],
-    [true, /^\|[^ ]/g, T.InvalidMultilineStringMark],
+    [true, /^\|[^ \n]/g, T.InvalidMultilineStringMark],
 ];
 export default rules;

package/parser/parser.js

@@ -5,16 +5,16 @@ export function parse(input, production = TEST_DESIGN) {
     const tokens = lexer.parse(input);
     return expectSingleResult(expectEOF(production.parse(tokens)));
 }
-export const SPACES = rep_sc(tok(T.Space));
-export const NEWLINES = list_sc(tok(T.Newline), SPACES); // empty lines can have spaces
+export const S = rep_sc(tok(T.Space));
+export const NEWLINES = list_sc(tok(T.Newline), S); // empty lines can have spaces
 export const WORDS = apply(tok(T.Words), ({ text }) => new Word(text.trimEnd().split(/\s+/).join(' ')));
 export const ERROR_MARK = apply(tok(T.ErrorMark), ({ text }) => new Word(text));
 export const BULLET_POINT_LIKE_WORD = apply(alt_sc(tok(T.Plus), tok(T.Minus)), ({ text }) => new Word(text));
 export const DOUBLE_QUOTE_STRING = alt_sc(apply(tok(T.DoubleQuoteString), ({ text }) => new StringLiteral(JSON.parse(text))), seq(tok(T.UnclosedDoubleQuoteString), fail('unclosed double-quote string')));
 export const BACKTICK_STRING = apply(tok(T.BacktickString), ({ text }) => new CodeLiteral(text.slice(1, -1)));
-export const DOCSTRING = apply(list_sc(tok(T.MultilineString), seq(tok(T.Newline), SPACES)), (lines) => lines.map(({ text }) => text.slice(2)).join('\n'));
+export const DOCSTRING = apply(list_sc(tok(T.MultilineString), seq(tok(T.Newline), S)), (lines) => lines.map(({ text }) => text.slice(2)).join('\n'));
 export const PART = alt_sc(WORDS, ERROR_MARK, BULLET_POINT_LIKE_WORD, DOUBLE_QUOTE_STRING, BACKTICK_STRING);
-export const PHRASE = seq(opt_sc(list_sc(PART, SPACES)), opt_sc(kright(opt_sc(NEWLINES), kright(SPACES, DOCSTRING))));
+export const PHRASE = seq(opt_sc(list_sc(PART, S)), opt_sc(kright(opt_sc(NEWLINES), kright(S, DOCSTRING))));
 export const ACTION = apply(PHRASE, ([parts, docstring]) => new Action(parts, docstring));
 export const RESPONSE = apply(PHRASE, ([parts, docstring]) => {
     if ((parts === null || parts === void 0 ? void 0 : parts[0]) instanceof Word && parts[0].text === '!!') {
@@ -22,13 +22,13 @@ export const RESPONSE = apply(PHRASE, ([parts, docstring]) => {
     }
     return new Response(parts, docstring);
 });
-export const ARROW = kmid(seq(opt_sc(NEWLINES), SPACES), tok(T.ResponseArrow), SPACES);
+export const ARROW = kmid(seq(opt_sc(NEWLINES), S), tok(T.ResponseArrow), S);
 export const RESPONSE_ITEM = kright(ARROW, RESPONSE);
 export const STEP = apply(seq(ACTION, rep_sc(RESPONSE_ITEM)), ([action, responses]) => new Step(action, responses).setFork(true));
-export const LABEL = apply(kleft(list_sc(PART, SPACES), seq(tok(T.Colon), SPACES)), (words) => new Label(words.map((w) => w.toString()).join(' ')));
+export const LABEL = apply(kleft(list_sc(PART, S), seq(tok(T.Colon), S)), (words) => new Label(words.map((w) => w.toString()).join(' ')));
 export const SECTION = apply(LABEL, (text) => new Section(text));
 export const BRANCH = alt_sc(SECTION, STEP); // section first, to make sure there is no colon after step
-export const DENTS = apply(opt_sc(seq(SPACES, alt_sc(tok(T.Plus), tok(T.Minus)), tok(T.Space))), (lineHead) => {
+export const DENTS = apply(opt_sc(seq(S, alt_sc(tok(T.Plus), tok(T.Minus)), tok(T.Space))), (lineHead) => {
     if (!lineHead)
         return { dent: 0, isFork: true };
     const [dents, seqOrFork] = lineHead;
@@ -66,7 +66,7 @@ export const TEST_DESIGN = kmid(rep_sc(NEWLINES), apply(list_sc(apply(LINE, (lin
         parent.addChild(branch);
     }
     return root;
-}), rep_sc(NEWLINES));
+}), seq(rep_sc(NEWLINES), S));
 function inputText(start, end) {
     let text = '';
     let t = start;

package/vitest/index.js

@@ -1,9 +1,61 @@
 import { watchFiles } from "../cli/watch.js";
+import c from 'tinyrainbow';
 export default function harmonyPlugin({ watchDir, }) {
     return {
         name: 'harmony',
         configureServer(server) {
             watchFiles([`${watchDir}/**/*.harmony`]);
         },
+        config(config) {
+            var _a, _b;
+            var _c;
+            (_a = config.test) !== null && _a !== void 0 ? _a : (config.test = {});
+            (_b = (_c = config.test).reporters) !== null && _b !== void 0 ? _b : (_c.reporters = ['default']);
+            if (!Array.isArray(config.test.reporters)) {
+                config.test.reporters = [config.test.reporters];
+            }
+            config.test.reporters.splice(0, 0, new HarmonyReporter());
+        },
     };
 }
+class HarmonyReporter {
+    onInit(ctx) {
+        this.ctx = ctx;
+    }
+    onCollected(files) {
+        this.files = files;
+    }
+    onTaskUpdate(packs) {
+        if (this.files)
+            for (const file of this.files)
+                addPhrases(file);
+    }
+    onFinished(files, errors) {
+        for (const file of files)
+            addPhrases(file);
+    }
+}
+function addPhrases(task, depth = 2) {
+    var _a, _b;
+    if ('tasks' in task) {
+        for (const child of task.tasks)
+            addPhrases(child, depth + 1);
+    }
+    else if (task.type === 'test' &&
+        ((_a = task.result) === null || _a === void 0 ? void 0 : _a.state) === 'fail' &&
+        ((_b = task.meta) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('phrases')) &&
+        task.meta.phrases.length > 0) {
+        const x = task;
+        x.name +=
+            '\n' +
+                task.meta
+                    .phrases.map((step, i, a) => {
+                    const indent = '  '.repeat(depth);
+                    const failed = i === a.length - 1;
+                    const figure = failed ? c.red('×') : c.green('✓');
+                    return `${indent}${figure} ${step}`;
+                })
+                    .join('\n');
+        delete task.meta.phrases; // to make sure not to add them again
+    }
+}