harmonyc 0.14.0 → 0.15.0

package/package.json

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

package/parser/parser.js

@@ -36,15 +36,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 +58,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;

package/vitest/index.js

@@ -1,11 +1,9 @@
 import { watchFiles } from "../cli/watch.js";
 import c from 'tinyrainbow';
+import { compileFiles } from "../compiler/compiler.js";
 export default function harmonyPlugin({ watchDir, }) {
     return {
         name: 'harmony',
-        configureServer(server) {
-            watchFiles([`${watchDir}/**/*.harmony`]);
-        },
         config(config) {
             var _a, _b;
             var _c;
@@ -16,6 +14,16 @@ export default function harmonyPlugin({ watchDir, }) {
             }
             config.test.reporters.splice(0, 0, new HarmonyReporter());
         },
+        async configureServer(server) {
+            const isWatchMode = server.config.server.watch !== null;
+            const patterns = [`${watchDir}/**/*.harmony`];
+            if (isWatchMode) {
+                await watchFiles(patterns);
+            }
+            else {
+                await compileFiles(patterns);
+            }
+        },
     };
 }
 class HarmonyReporter {