harmonyc 0.6.0-5 → 0.6.0-7

package/compile.js

@@ -4,11 +4,11 @@ import { parse } from './syntax.js';
 import { stepsFileName, testFileName } from './filenames/filenames.js';
 export function compileFeature(fileName, src) {
     const feature = parse({ fileName, src });
-    const outFn = testFileName(fileName);
-    const outFile = new OutFile(outFn);
+    const testFn = testFileName(fileName);
+    const testFile = new OutFile(testFn);
     const stepsFn = stepsFileName(fileName);
     const stepsFile = new OutFile(stepsFn);
-    const cg = new NodeTest(outFile, stepsFile);
+    const cg = new NodeTest(testFile, stepsFile);
     feature.toCode(cg);
-    return { outFile, stepsFile };
+    return { outFile: testFile, stepsFile };
 }

package/filenames/filenames.js

@@ -1,5 +1,5 @@
 import glob from 'fast-glob';
-const { globSync } = glob;
+const { globSync, convertPathToPattern } = glob;
 export function base(fn) {
     return fn.replace(/\.harmony\.md$/i, '');
 }
@@ -7,7 +7,8 @@ export function testFileName(fn) {
     return base(fn) + '.test.mjs';
 }
 export function stepsFileName(fn) {
-    const existing = globSync(base(fn) + '.steps.*');
+    const pattern = convertPathToPattern(base(fn) + '.steps.*');
+    const existing = globSync(pattern);
     if (existing.length) {
         return existing.sort()[0];
     }

package/js_api/js_api.js

@@ -11,7 +11,7 @@ class Definition {
         this.fn = fn;
     }
 }
-const features = new Map();
+const featureDefs = new Map();
 class FeatureContext {
     constructor() {
         _FeatureContext_actions.set(this, []);
@@ -65,17 +65,17 @@ class FeatureContext {
 }
 _FeatureContext_actions = new WeakMap(), _FeatureContext_responses = new WeakMap(), _FeatureContext_parameterTypeRegistry = new WeakMap();
 export function Feature(s, fn) {
-    let ctx;
     if (!fn) {
-        ctx = features.get(s);
-        if (!ctx)
+        // instantiate the feature
+        const fn = featureDefs.get(s);
+        if (!fn)
             throw new Error(`Feature not found: ${s}`);
+        const ctx = new FeatureContext();
+        fn(ctx);
+        return ctx;
     }
     else {
-        // redefine the feature
-        ctx = new FeatureContext();
-        features.set(s, ctx);
+        // (re)define the feature
+        featureDefs.set(s, fn);
     }
-    fn === null || fn === void 0 ? void 0 : fn(ctx);
-    return ctx;
 }

package/languages/JavaScript.js

@@ -1,7 +1,7 @@
 import { basename } from 'path';
 export class NodeTest {
-    constructor(of, sf) {
-        this.of = of;
+    constructor(tf, sf) {
+        this.tf = tf;
         this.sf = sf;
         this.framework = 'vitest';
         this.phrases = [];
@@ -10,21 +10,21 @@ export class NodeTest {
         const stepsModule = './' + basename(this.sf.name.replace(/.(js|ts)$/, ''));
         this.phrases = [];
         if (this.framework === 'vitest') {
-            this.of.print(`import { test, expect } from 'vitest';`);
-            this.of.print(`import { Feature } from 'harmonyc/test';`);
-            this.of.print(`import ${JSON.stringify(stepsModule)};`);
+            this.tf.print(`import { test, expect } from 'vitest';`);
+            this.tf.print(`import { Feature } from 'harmonyc/test';`);
+            this.tf.print(`import ${str(stepsModule)};`);
         }
         for (const test of feature.tests) {
             test.toCode(this);
         }
         this.sf.print(`import { Feature } from 'harmonyc/test';`);
         this.sf.print('');
-        this.sf.print(`Feature(${JSON.stringify(feature.name)}, ({ Action, Response }) => {`);
+        this.sf.print(`Feature(${str(feature.name)}, ({ Action, Response }) => {`);
         this.sf.indent(() => {
             for (const phrase of this.phrases) {
-                this.sf.print(`${capitalize(phrase.kind)}(${JSON.stringify(phrase.text)}, () => {`);
+                this.sf.print(`${capitalize(phrase.kind)}(${str(phrase.text)}, () => {`);
                 this.sf.indent(() => {
-                    this.sf.print(`throw new Error(${JSON.stringify(`Pending: ${phrase.text}`)})`);
+                    this.sf.print(`throw new Error(${str(`Pending: ${phrase.text}`)})`);
                 });
                 this.sf.print('})');
             }
@@ -32,22 +32,52 @@ export class NodeTest {
         this.sf.print('})');
     }
     test(t) {
-        this.of.print(`test('${t.name}', async (context) => {`);
-        this.of.indent(() => {
+        this.featureVars = new Map();
+        this.tf.print(`test('${t.name}', async (context) => {`);
+        this.tf.indent(() => {
             for (const step of t.steps) {
                 step.toCode(this);
             }
         });
-        this.of.print('})');
-        this.of.print('');
+        this.tf.print('})');
+        this.tf.print('');
     }
     phrase(p) {
         if (!this.phrases.some((x) => x.text === p.text))
             this.phrases.push(p);
         const feature = p.feature.name;
-        this.of.print(`await Feature(${JSON.stringify(feature)}).${capitalize(p.kind)}(${JSON.stringify(p.text)})`);
+        let f = this.featureVars.get(feature);
+        if (!f) {
+            f = toId(feature, this.featureVars);
+            this.tf.print(`const ${f} = Feature(${str(feature)})`);
+        }
+        this.tf.print(`await ${f}.${capitalize(p.kind)}(${str(p.text)})`);
     }
 }
+function str(s) {
+    let r = JSON.stringify(s);
+    return r;
+}
 function capitalize(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
 }
+function toId(s, previous) {
+    if (previous.has(s))
+        return previous.get(s);
+    let base = pascalCase(s);
+    let id = base;
+    if ([...previous.values()].includes(id)) {
+        let i = 1;
+        while ([...previous.values()].includes(id + i))
+            i++;
+        id = base + i;
+    }
+    previous.set(s, id);
+    return id;
+}
+function pascalCase(s) {
+    return s
+        .split(/[^a-zA-Z0-9]/)
+        .map(capitalize)
+        .join('');
+}

package/outFile.js

@@ -40,7 +40,10 @@ export class OutFile {
         return this;
     }
     get value() {
-        return (this.lines.join('\n') +
-            `\n\n//# sourceMappingURL=data:application/json,${encodeURIComponent(this.sm.toString())}`);
+        let res = this.lines.join('\n');
+        if (this.currentLoc) {
+            res += `\n\n//# sourceMappingURL=data:application/json,${encodeURIComponent(this.sm.toString())}`;
+        }
+        return res;
     }
 }

package/package.json

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

package/run.js

@@ -9,16 +9,18 @@ function args(patterns) {
     return patterns.map((s) => JSON.stringify(s)).join(' ');
 }
 export function run(patterns) {
-    var _a, _b;
+    var _a, _b, _c;
     const cmd = runCommand(patterns);
     const p = exec(cmd, { cwd: process.cwd() });
-    (_a = p.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
-    (_b = p.stderr) === null || _b === void 0 ? void 0 : _b.pipe(process.stderr);
+    (_a = p.stdin) === null || _a === void 0 ? void 0 : _a.pipe(process.stdin);
+    (_b = p.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+    (_c = p.stderr) === null || _c === void 0 ? void 0 : _c.pipe(process.stderr);
 }
 export function runWatch(patterns) {
-    var _a, _b;
+    var _a, _b, _c;
     const cmd = runWatchCommand(patterns);
     const p = exec(cmd, { cwd: process.cwd() });
-    (_a = p.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
-    (_b = p.stderr) === null || _b === void 0 ? void 0 : _b.pipe(process.stderr);
+    (_a = p.stdin) === null || _a === void 0 ? void 0 : _a.pipe(process.stdin);
+    (_b = p.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+    (_c = p.stderr) === null || _c === void 0 ? void 0 : _c.pipe(process.stderr);
 }