harmonyc 0.17.0 → 0.18.1

package/code_generator/VitestGenerator.js

@@ -134,11 +134,14 @@ export class VitestGenerator {
             return this.saveToVariable(p.saveToVariable);
         }
         const name = p.toSingleLineString();
-        this.tf.print(`(context.task.meta.phrases.push(${str(p.toString())}),`, p.start, name);
+        this.tf.print(`(context.task.meta.phrases.push(${str(p.toString())}),`);
         if (p instanceof Response && p.saveToVariable) {
             this.saveToVariable(p.saveToVariable, '');
         }
-        this.tf.print(`await ${f}.${functionName(p)}(${args.join(', ')}));`, p.start, name);
+        this.tf.printn(`await ${f}.`);
+        this.tf.write(`${functionName(p)}(${args.join(', ')})`, p.start, name);
+        this.tf.write(`);`);
+        this.tf.nl();
     }
     setVariable(action) {
         this.tf.print(`(context.task.meta.variables ??= {})[${str(action.variableName)}] = ${action.value.toCode(this)};`);

package/code_generator/outFile.d.ts

@@ -3,25 +3,18 @@ import { Location } from '../model/model.ts';
 export declare class OutFile {
     name: string;
     sourceFile: string;
-    lines: string[];
     level: number;
     sm: SourceNode;
     indentSpaces: number;
     constructor(name: string, sourceFile: string);
     indent(fn: () => void): void;
+    private get currentIndent();
     clear(): void;
-    append(s: string): void;
-    print(line: string, start?: Location, name?: string, end?: Location): this;
-    loc(location: Location | undefined, name?: string): this;
+    printn(line: string, start?: Location, name?: string, end?: Location): void;
+    print(line: string, start?: Location, name?: string, end?: Location): void;
+    write(line: string, start?: Location, name?: string, end?: Location): void;
+    nl(): void;
     get sourceMap(): import("source-map-js").RawSourceMap;
     get valueWithoutSourceMap(): string;
     get value(): string;
-    get currentLineEnd(): {
-        line: number;
-        column: number;
-    };
-    get currentLineStart(): {
-        line: number;
-        column: number;
-    };
 }

package/code_generator/outFile.js

@@ -3,7 +3,6 @@ export class OutFile {
     constructor(name, sourceFile) {
         this.name = name;
         this.sourceFile = sourceFile;
-        this.lines = [];
         this.level = 0;
         this.indentSpaces = 2;
         this.sm = new SourceNode(0, 0, sourceFile);
@@ -17,17 +16,20 @@ export class OutFile {
             this.level--;
         }
     }
+    get currentIndent() {
+        return ' '.repeat(this.level * this.indentSpaces);
+    }
     clear() {
         this.sm = new SourceNode(0, 0, this.sourceFile);
     }
-    append(s) {
-        if (this.lines.length === 0)
-            this.lines.push('');
-        this.lines[this.lines.length - 1] += s;
+    printn(line, start, name, end) {
+        this.write(this.currentIndent + line, start, name, end);
     }
     print(line, start, name, end) {
-        const chunk = ' '.repeat(this.level * this.indentSpaces) + line + '\n';
-        this.lines.push(chunk);
+        this.write(this.currentIndent + line + '\n', start, name, end);
+    }
+    write(line, start, name, end) {
+        const chunk = line;
         if (start) {
             this.sm.add(new SourceNode(start.line, start.column, this.sourceFile, chunk, name));
         }
@@ -37,12 +39,9 @@ export class OutFile {
         if (end) {
             this.sm.add(new SourceNode(end.line, end.column, this.sourceFile));
         }
-        return this;
     }
-    loc(location, name) {
-        if (!location)
-            return this;
-        return this;
+    nl() {
+        this.write('\n');
     }
     get sourceMap() {
         return this.sm.toStringWithSourceMap({ file: this.name }).map.toJSON();
@@ -58,18 +57,4 @@ export class OutFile {
                 `ceMappingURL=data:application/json,${encodeURIComponent(map.toString())}`;
         return res;
     }
-    get currentLineEnd() {
-        var _a, _b;
-        return {
-            line: this.lines.length,
-            column: (_b = (_a = this.lines.at(-1)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0,
-        };
-    }
-    get currentLineStart() {
-        var _a, _b, _c;
-        return {
-            line: this.lines.length + 1,
-            column: (_c = (_b = (_a = this.lines.at(-1)) === null || _a === void 0 ? void 0 : _a.match(/^\s*/)) === null || _b === void 0 ? void 0 : _b[0].length) !== null && _c !== void 0 ? _c : 0,
-        };
-    }
 }

package/package.json

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