goldstein 5.0.2 → 5.2.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.02.20, v5.2.0
+
+feature:
+- 5728421 goldstein: improve support of comments
+- 0d997c3 goldstein: printer: visitors: await-expression: maybeVisitor
+
+2024.02.19, v5.1.0
+
+feature:
+- c329ff0 goldstein: printer: visitors: try-statememnt: improve support
+
 2024.02.19, v5.0.2
 
 feature:

package/build/parser.cjs

@@ -5380,6 +5380,75 @@ Parser.acorn = {
   nonASCIIwhitespace
 };
 
+// node_modules/estree-util-attach-comments/lib/index.js
+var own = {}.hasOwnProperty;
+var emptyComments = [];
+function attachComments(tree, comments) {
+  const list = comments ? [...comments].sort(compare) : emptyComments;
+  if (list.length > 0)
+    walk(tree, { comments: list, index: 0 });
+}
+function walk(node, state) {
+  if (state.index === state.comments.length) {
+    return;
+  }
+  const children = [];
+  const comments = [];
+  let key;
+  for (key in node) {
+    if (own.call(node, key)) {
+      const value = node[key];
+      if (value && typeof value === "object" && key !== "comments") {
+        if (Array.isArray(value)) {
+          let index2 = -1;
+          while (++index2 < value.length) {
+            if (value[index2] && typeof value[index2].type === "string") {
+              children.push(value[index2]);
+            }
+          }
+        } else if (typeof value.type === "string") {
+          children.push(value);
+        }
+      }
+    }
+  }
+  children.sort(compare);
+  comments.push(...slice(state, node, false, { leading: true, trailing: false }));
+  let index = -1;
+  while (++index < children.length) {
+    walk(children[index], state);
+  }
+  comments.push(
+    ...slice(state, node, true, {
+      leading: false,
+      trailing: children.length > 0
+    })
+  );
+  if (comments.length > 0) {
+    node.comments = comments;
+  }
+}
+function slice(state, node, compareEnd, fields) {
+  const result = [];
+  while (state.comments[state.index] && compare(state.comments[state.index], node, compareEnd) < 1) {
+    result.push(Object.assign({}, state.comments[state.index++], fields));
+  }
+  return result;
+}
+function compare(left, right, compareEnd) {
+  const field = compareEnd ? "end" : "start";
+  if (left.range && right.range) {
+    return left.range[0] - right.range[compareEnd ? 1 : 0];
+  }
+  if (left.loc && left.loc.start && right.loc && right.loc[field]) {
+    return left.loc.start.line - right.loc[field].line || left.loc.start.column - right.loc[field].column;
+  }
+  if ("start" in left && field in right) {
+    return left.start - right[field];
+  }
+  return Number.NaN;
+}
+
 // packages/parser/index.js
 var extendParser = (keywords3) => {
   const parser = Parser.extend(...keywords3);
@@ -5396,15 +5465,13 @@ var createParse = (parser) => (source) => {
     locations: true,
     comment: true,
     ranges: true,
-    onComment: (a) => {
-      comments.push(a);
-    }
+    onComment: comments
   };
-  const result = parser.parse(source, options);
-  const tokens = Array.from(parser.tokenizer(source, options));
+  const ast = parser.parse(source, options);
+  attachComments(ast, comments);
   return {
-    ...result,
-    tokens,
+    ...ast,
+    tokens: Array.from(parser.tokenizer(source, options)),
     comments
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "5.0.2",
+  "version": "5.2.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",
@@ -37,6 +37,7 @@
     "esbuild": "^0.20.1",
     "esbuild-node-builtins": "^0.1.0",
     "estree-to-babel": "^9.0.0",
+    "estree-util-attach-comments": "^3.0.0",
     "putout": "^35.0.0",
     "try-catch": "^3.0.1"
   },

package/packages/parser/index.js

@@ -1,4 +1,5 @@
 import {Parser} from 'acorn';
+import {attachComments} from 'estree-util-attach-comments';
 
 export const extendParser = (keywords) => {
     const parser = Parser.extend(...keywords);
@@ -17,17 +18,16 @@ const createParse = (parser) => (source) => {
         locations: true,
         comment: true,
         ranges: true,
-        onComment: (a) => {
-            comments.push(a);
-        },
+        onComment: comments,
     };
     
-    const result = parser.parse(source, options);
-    const tokens = Array.from(parser.tokenizer(source, options));
+    const ast = parser.parse(source, options);
+    
+    attachComments(ast, comments);
     
     return {
-        ...result,
-        tokens,
+        ...ast,
+        tokens: Array.from(parser.tokenizer(source, options)),
         comments,
     };
 };

package/packages/printer/visitors/await-expression.js

@@ -1,10 +1,13 @@
-import {visitors as v} from '@putout/printer';
+import {
+    maybeVisitor,
+    visitors as v,
+} from '@putout/printer';
 
 export const AwaitExpression = (path, printer, semantics) => {
     const {print} = printer;
     
     if (!path.node.goldstein)
-        return v.AwaitExpression(path, printer, semantics);
+        return maybeVisitor(v.AwaitExpression, path, printer, semantics);
     
     print('__goldstein');
 };

package/packages/printer/visitors/try-statement.js

@@ -1,11 +1,14 @@
-import {visitors as v} from '@putout/printer';
+import {
+    visitors as v,
+    maybeVisitor,
+} from '@putout/printer';
 
 export const TryStatement = (path, printer, semantics) => {
     const {maybe, print} = printer;
     const {node} = path;
     
     if (!node.expression)
-        return v.TryStatement(path, printer, semantics);
+        return maybeVisitor(v.TryStatement, path, printer, semantics);
     
     print('try ');
     maybe.print(node.async, 'await ');