harmonyc 0.8.0 → 0.8.1

package/code_generator/JavaScript.js

@@ -60,6 +60,7 @@ export class NodeTest {
     }
     errorStep(action, errorMessage) {
         var _a;
+        this.declareFeatureVariables([action]);
         this.tf.print(`expect(async () => {`);
         this.tf.indent(() => {
             action.toCode(this);
@@ -67,14 +68,7 @@ export class NodeTest {
         this.tf.print(`}).rejects.toThrow(${(_a = errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.toCode(this)) !== null && _a !== void 0 ? _a : ''});`);
     }
     step(action, responses) {
-        for (const p of [action, ...responses]) {
-            const feature = p.feature.name;
-            let f = this.featureVars.get(feature);
-            if (!f) {
-                f = toId(feature, abbrev, this.featureVars);
-                this.tf.print(`const ${f} = new ${pascalCase(feature)}Phrases();`);
-            }
-        }
+        this.declareFeatureVariables([action, ...responses]);
         if (responses.length === 0) {
             action.toCode(this);
             return;
@@ -94,6 +88,16 @@ export class NodeTest {
             }
         });
     }
+    declareFeatureVariables(phrases) {
+        for (const p of phrases) {
+            const feature = p.feature.name;
+            let f = this.featureVars.get(feature);
+            if (!f) {
+                f = toId(feature, abbrev, this.featureVars);
+                this.tf.print(`const ${f} = new ${pascalCase(feature)}Phrases();`);
+            }
+        }
+    }
     phrase(p) {
         const phrasefn = this.functionName(p);
         if (!this.phraseFns.has(phrasefn))

package/compiler/compiler.js

@@ -16,7 +16,7 @@ export async function compileFiles(pattern) {
     console.log(`Compiled ${fns.length} file${fns.length === 1 ? '' : 's'}.`);
     const generated = features.filter((f) => f.phrasesFileAction === 'generated');
     if (generated.length) {
-        console.log(`Generated ${generated.length} steps file${generated.length === 1 ? '' : 's'}.`);
+        console.log(`Generated ${generated.length} phrases file${generated.length === 1 ? '' : 's'}.`);
     }
     return { fns, outFns: features.map((f) => f.outFile.name) };
 }

package/package.json

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

package/parser/lexer.steps.js

@@ -0,0 +1,9 @@
+export default class LexerSteps {
+    async When__(x) {
+        throw new Error("Pending: When__");
+    }
+    async Then__(x) {
+        throw new Error("Pending: Then__");
+    }
+}
+;

package/parser/lexer_rules.js

@@ -34,7 +34,7 @@ const rules = [
     [true, /^:(?=\s*(?:\n|$))/g, T.Colon],
     [
         true,
-        /^(?!\s|=>|!!|- |\+ |[\[\]"`|]).+?(?=[\[\]"`|]|\n|$|=>|!!|:\s*(?:\n|$)|$)/g,
+        /^(?!\s|=>|!!|- |\+ |[\[\]"`|]|:\s*(?:\n|$)).+?(?=[\[\]"`|]|\n|$|=>|!!|:\s*(?:\n|$)|$)/g,
         T.Words,
     ],
     [true, /^-/g, T.Minus],

package/parser/parser.js

@@ -25,7 +25,7 @@ export const RESPONSE = apply(PHRASE, ([parts, docstring]) => {
 export const ARROW = kmid(seq(opt_sc(NEWLINES), SPACES), tok(T.ResponseArrow), SPACES);
 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), tok(T.Colon)), (words) => new Label(words.map((w) => w.toString()).join(' ')));
+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 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) => {

package/parser/parser.steps.js

@@ -0,0 +1,12 @@
+export default class ParserSteps {
+    async When_production__(x) {
+        throw new Error("Pending: When_production__");
+    }
+    async When__(x) {
+        throw new Error("Pending: When__");
+    }
+    async Then__(x) {
+        throw new Error("Pending: Then__");
+    }
+}
+;