feature: goldstein: update fixtures

packages/goldstein/index.js

@@ -4,9 +4,8 @@ import {parse} from './parser.js';
 import estreeToBabel from 'estree-to-babel';
 
 export * from './parser.js';
-
 export const compile = (source, options = {}) => {
-    const ast = estreeToBabel(parse(source));
+    const ast = estreeToBabel(parse(source, options));
 
     transform(ast, source, {
         rules: {
@@ -19,12 +18,10 @@ export const compile = (source, options = {}) => {
         ],
     });
 
-    const {keywords} = options;
-
-    return fixEmpty(print(ast, {keywords}));
+    return fixEmpty(print(ast));
 };
 
-const fixEmpty = (source) => {
-    return source.replace(';;', ';');
+export const fixEmpty = (source) => {
+    return source.replace(/;(\s+)?;/g, ';');
 };
 

packages/goldstein/parser.js

@@ -27,7 +27,10 @@ const defaultKeywords = {
 
 export const keywords = defaultKeywords;
 
-export const parse = (source, options, keywords = defaultKeywords) => {
-    const {parse} = extendParser(Object.values(keywords));
+export const parse = (source, options = {}, keywords = defaultKeywords) => {
+    const {parse} = extendParser(Object.values({
+        ...options.keywords,
+        ...keywords,
+    }));
     return parse(source);
 };

packages/keyword-arrow/fixture/arrow.js

@@ -1,2 +1,3 @@
 function hello() {}
-function world() {}
+
+function world() {}

packages/keyword-curry/fixture/curry.js

@@ -1 +1 @@
-const inc = currify(sum, (1, 2));
+const inc = currify(sum, (1, 2));

packages/keyword-fn/fixture/export.js

@@ -1 +1 @@
-export function hello() {}
+export function hello() {}

packages/keyword-fn/fixture/fn.js

@@ -1 +1 @@
-function hello() {}
+function hello() {}

packages/keyword-fn/fixture/other-export.js

@@ -1 +1 @@
-export function hello() {}
+export function hello() {}

packages/keyword-freeze/fixture/array-freeze.js

@@ -1,5 +1,5 @@
 freeze([{
-    'test': true
+    "test": true,
 }, {
-    'example': 'Hello World!'
-}]);;
+    "example": "Hello World!",
+}]);

packages/keyword-freeze/fixture/freeze.js

@@ -1,3 +1,3 @@
 freeze({
-    'test': true
-});;
+    "test": true,
+});

packages/keyword-guard/fixture/guard.js

@@ -1,7 +1,6 @@
 function hello() {
-    if (!(text !== 'world')) {
-        return '';
+    if (!text !== "world") {
+        return "";
     }
-
-    return 'Hello ' + text;
-}
+    return "Hello " + text;
+}

packages/keyword-guard/fixture/no-parens.js

@@ -1,7 +1,6 @@
 function hello() {
-    if (!(text !== 'world')) {
-        return '';
+    if (!text !== "world") {
+        return "";
     }
-
-    return 'Hello ' + text;
-}
+    return "Hello " + text;
+}

packages/keyword-if/fixture/if.js

@@ -1,7 +1,6 @@
-if (a > 3)
-    {}
+if (a > 3) {}
 
 if (a > 3)
     hello();
 else
-    world();
+    world();

packages/keyword-import/fixture/import.js

@@ -1 +1 @@
-import f from './hello.js';
+import f from './hello.js';

packages/keyword-should/fixture/await-should.js

@@ -1,3 +1,3 @@
 try {
     await hello();
-} catch {};
+} catch {};

packages/keyword-should/fixture/should.js

@@ -1,3 +1,3 @@
 try {
     hello();
-} catch {};
+} catch {};

packages/keyword-throw/fixture/throw-statement.js

@@ -1,3 +1,3 @@
 const a = () => {
     throw 'hello';
-};
+};

packages/keyword-throw/fixture/throw.js

@@ -1,3 +1,3 @@
 const a = () => {
     throw 'hello';
-};
+};

packages/keyword-try/fixture/await.js

@@ -1 +1 @@
-await tryToCatch(hello);
+await tryToCatch(hello);

packages/keyword-try/fixture/try-catch.js

@@ -4,4 +4,5 @@ try {
 
 try {
     hello();
-} catch (error) {} finally {}
+} catch (error) {} finally {}
+

packages/keyword-try/fixture/try.js

@@ -1 +1 @@
-tryCatch(hello);
+tryCatch(hello);

packages/keyword-try/fixture/var.js

@@ -1 +1 @@
-const [error, result] = await tryToCatch(hello);;
+const [error, result] = await tryToCatch(hello);

packages/string-interpolation/fixture/number.gs

@@ -1 +1 @@
-const x = 5;
+const x = 5;

packages/string-interpolation/fixture/simple.js

@@ -1,2 +1,2 @@
 let what = 'String Interpolation';
-let str = `This is a ${what.toUpperCase()}`;
+let str = `This is a ${what.toUpperCase()}`;

packages/test/index.js

@@ -9,10 +9,13 @@ import {
 } from 'path';
 
 import {extend} from 'supertape';
-import {extendParser} from '../parser/index.js';
 import {print} from 'putout';
 
 import tryCatch from 'try-catch';
+import estreeToBabel from 'estree-to-babel';
+
+import {extendParser} from '../parser/index.js';
+import {fixEmpty} from '../goldstein/index.js';
 
 const {stringify} = JSON;
 const {UPDATE, AST} = process.env;
@@ -45,12 +48,12 @@ const compile = ({dir, parser}) => (t) => (name) => {
     const fromData = readFileSync(from, 'utf8');
     const toData = readFileSync(to, 'utf8');
 
-    const ast = parser.parse(fromData);
+    const ast = estreeToBabel(parser.parse(fromData));
 
     if (AST === '1')
         process.stdout.write(stringify(ast, null, 4));
 
-    const result = print(ast);
+    const result = fixEmpty(print(ast));
 
     if (UPDATE === '1')
         writeFileSync(to, result);
@@ -62,12 +65,12 @@ const noCompile = ({dir, parser}) => (t) => (name) => {
     const from = join(dir, 'fixture', `${name}.gs`);
     const fromData = readFileSync(from, 'utf8');
 
-    const ast = parser.parse(fromData);
+    const ast = estreeToBabel(parser.parse(fromData));
 
     if (AST === '1')
         process.stdout.write(stringify(ast, null, 4));
 
-    const result = print(ast);
+    const result = fixEmpty(print(ast));
 
     return t.equal(result, fromData);
 };