harmonyc 0.12.2 → 0.14.0

package/code_generator/VitestGenerator.js

@@ -1,6 +1,11 @@
 import { basename } from 'path';
 import { Arg, Response, Word, } from "../model/model.js";
 export class VitestGenerator {
+    static error(message) {
+        return `const e = new SyntaxError(${str(message)});
+    e.stack = undefined;
+    throw e;`;
+    }
     constructor(tf, sf) {
         this.tf = tf;
         this.sf = sf;
@@ -15,7 +20,12 @@ export class VitestGenerator {
         const fn = (this.currentFeatureName = pascalCase(feature.name));
         this.phraseFns = new Map();
         if (this.framework === 'vitest') {
-            this.tf.print(`import { describe, test, expect } from 'vitest';`);
+            this.tf.print(`import { describe, test, expect } from "vitest";`);
+        }
+        if (feature.tests.length === 0) {
+            this.tf.print('');
+            this.tf.print(`describe.todo(${str(feature.name)});`);
+            return;
         }
         this.tf.print(`import ${fn}Phrases from ${str(phrasesModule)};`);
         this.tf.print(``);

package/compiler/compiler.js

@@ -2,18 +2,21 @@ import glob from 'fast-glob';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { compileFeature } from "./compile.js";
+import { testFileName } from "../filenames/filenames.js";
+import { VitestGenerator } from "../code_generator/VitestGenerator.js";
 export async function compileFiles(pattern) {
     var _a;
     const fns = await glob(pattern);
     if (!fns.length)
         throw new Error(`No files found for pattern: ${String(pattern)}`);
     const results = await Promise.allSettled(fns.map((fn) => compileFile(fn)));
-    const features = results.flatMap((r) => r.status === 'fulfilled' ? [r.value] : []);
-    const errors = results.flatMap((r) => r.status === 'rejected' ? [r.reason] : []);
-    for (const error of errors) {
-        console.log((_a = error.message) !== null && _a !== void 0 ? _a : error);
+    const compiled = results.flatMap((r) => r.status === 'fulfilled' ? [r.value] : []);
+    const errored = results.flatMap((r) => r.status === 'rejected' && r.reason ? [r.reason] : []);
+    for (const error of errored) {
+        console.error((_a = error.message) !== null && _a !== void 0 ? _a : error);
     }
-    console.log(`Compiled ${fns.length} file${fns.length === 1 ? '' : 's'}.`);
+    console.log(`Compiled ${compiled.length} file${compiled.length === 1 ? '' : 's'}.`);
+    const features = compiled.filter((f) => f !== undefined);
     const generated = features.filter((f) => f.phrasesFileAction === 'generated');
     if (generated.length) {
         console.log(`Generated ${generated.length} phrases file${generated.length === 1 ? '' : 's'}.`);
@@ -21,17 +24,25 @@ export async function compileFiles(pattern) {
     return { fns, outFns: features.map((f) => f.outFile.name) };
 }
 export async function compileFile(fn) {
+    var _a;
     fn = resolve(fn);
     const src = readFileSync(fn, 'utf8')
         .toString()
         .replace(/\r\n/g, '\n')
         .replace(/\r/g, '\n');
-    const { outFile, phrasesFile } = compileFeature(fn, src);
-    writeFileSync(outFile.name, outFile.value);
-    let phrasesFileAction = 'ignored';
-    if (!existsSync(phrasesFile.name)) {
-        phrasesFileAction = 'generated';
-        writeFileSync(phrasesFile.name, phrasesFile.value);
+    try {
+        const { outFile, phrasesFile } = compileFeature(fn, src);
+        writeFileSync(outFile.name, outFile.value);
+        let phrasesFileAction = 'ignored';
+        if (!existsSync(phrasesFile.name)) {
+            phrasesFileAction = 'generated';
+            writeFileSync(phrasesFile.name, phrasesFile.value);
+        }
+        return { phrasesFileAction, outFile, phrasesFile };
+    }
+    catch (e) {
+        const outFileName = testFileName(fn);
+        writeFileSync(outFileName, VitestGenerator.error((_a = e.message) !== null && _a !== void 0 ? _a : `${e}`));
+        return undefined;
     }
-    return { phrasesFileAction, outFile, phrasesFile };
 }

package/package.json

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

package/parser/parser.js

@@ -1,25 +1,48 @@
-import { alt_sc, apply, expectEOF, expectSingleResult, kright, opt_sc, rep_sc, seq, tok, list_sc, kleft, kmid, fail, nil, } from 'typescript-parsec';
+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";
 export function parse(input, production = TEST_DESIGN) {
     const tokens = lexer.parse(input);
     return expectSingleResult(expectEOF(production.parse(tokens)));
 }
+function anythingBut(kind) {
+    return {
+        parse(token) {
+            if (token === undefined)
+                return { successful: false, error: unableToConsumeToken(token) };
+            if (token.kind === kind)
+                return { successful: false, error: unableToConsumeToken(token) };
+            return {
+                candidates: [
+                    {
+                        firstToken: token,
+                        nextToken: token.next,
+                        result: token,
+                    },
+                ],
+                successful: true,
+                error: undefined,
+            };
+        },
+    };
+}
 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,
         isFork: seqOrFork.kind === T.Plus,
     };
-}), LINE = apply(seq(DENTS, BRANCH), ([{ dent, isFork }, branch], [start, end]) => ({
+}), NODE = apply(seq(DENTS, BRANCH), ([{ dent, isFork }, branch], [start, end]) => ({
     dent,
     branch: branch.setFork(isFork),
-})), TEST_DESIGN = kmid(rep_sc(NEWLINES), apply(opt_sc(list_sc(apply(LINE, (line, [start, end]) => ({ line, start, end })), NEWLINES)), (lines) => {
+})), 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;
     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) {
             throw new Error(`invalid odd indent of ${d * 2} at line ${start.pos.rowBegin}`);