flow-parser 0.318.0 → 0.319.0

package/oxidized/utils/GenID.js.flow

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+const genPrefix = '$$gen$';
+
+export default class GenID {
+  genN: number = 0;
+  +used: Set<string> = new Set();
+  +prefix: string;
+
+  constructor(uniqueTransformPrefix: string) {
+    this.prefix = `${genPrefix}${uniqueTransformPrefix}`;
+  }
+
+  id(): string {
+    let name;
+    do {
+      name = `${this.prefix}${this.genN}`;
+      this.genN++;
+    } while (this.used.has(name));
+    this.used.add(name);
+    return name;
+  }
+
+  addUsage(name: string): void {
+    if (name.startsWith(this.prefix)) {
+      this.used.add(name);
+    }
+  }
+}

package/oxidized/utils/createSyntaxError.js

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSyntaxError = createSyntaxError;
+
+function createSyntaxError(node, err) {
+  const syntaxError = new SyntaxError(err);
+  syntaxError.loc = {
+    line: node.loc.start.line,
+    column: node.loc.start.column
+  };
+  return syntaxError;
+}

package/oxidized/utils/createSyntaxError.js.flow

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ESNode} from 'flow-estree';
+
+export function createSyntaxError(node: ESNode, err: string): SyntaxError {
+  const syntaxError = new SyntaxError(err);
+  // $FlowExpectedError[prop-missing]
+  syntaxError.loc = {
+    line: node.loc.start.line,
+    column: node.loc.start.column,
+  };
+
+  return syntaxError;
+}

package/oxidized/utils/isReservedWord.js

@@ -0,0 +1,53 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = isReservedWord;
+
+function isReservedWord(name) {
+  switch (name) {
+    case 'await':
+    case 'break':
+    case 'case':
+    case 'catch':
+    case 'class':
+    case 'const':
+    case 'continue':
+    case 'debugger':
+    case 'default':
+    case 'delete':
+    case 'do':
+    case 'else':
+    case 'enum':
+    case 'export':
+    case 'extends':
+    case 'false':
+    case 'finally':
+    case 'for':
+    case 'function':
+    case 'if':
+    case 'import':
+    case 'in':
+    case 'instanceof':
+    case 'new':
+    case 'null':
+    case 'return':
+    case 'super':
+    case 'switch':
+    case 'this':
+    case 'throw':
+    case 'true':
+    case 'try':
+    case 'typeof':
+    case 'var':
+    case 'void':
+    case 'while':
+    case 'with':
+    case 'yield':
+      return true;
+
+    default:
+      return false;
+  }
+}

package/oxidized/utils/isReservedWord.js.flow

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+export default function isReservedWord(name: string): boolean {
+  switch (name) {
+    case 'await':
+    case 'break':
+    case 'case':
+    case 'catch':
+    case 'class':
+    case 'const':
+    case 'continue':
+    case 'debugger':
+    case 'default':
+    case 'delete':
+    case 'do':
+    case 'else':
+    case 'enum':
+    case 'export':
+    case 'extends':
+    case 'false':
+    case 'finally':
+    case 'for':
+    case 'function':
+    case 'if':
+    case 'import':
+    case 'in':
+    case 'instanceof':
+    case 'new':
+    case 'null':
+    case 'return':
+    case 'super':
+    case 'switch':
+    case 'this':
+    case 'throw':
+    case 'true':
+    case 'try':
+    case 'typeof':
+    case 'var':
+    case 'void':
+    case 'while':
+    case 'with':
+    case 'yield':
+      return true;
+    default:
+      return false;
+  }
+}

package/oxidized/utils/mutateESTreeASTForPrettier.js

@@ -0,0 +1,85 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = mutate;
+
+var _SimpleTransform = require("../transform/SimpleTransform");
+
+function transformChainExpression(node, comments) {
+  if (comments != null) {
+    var _node$comments;
+
+    const joinedComments = comments.concat((_node$comments = node.comments) != null ? _node$comments : []);
+    node.comments = joinedComments;
+  }
+
+  switch (node.type) {
+    case 'CallExpression':
+      return { ...node,
+        type: 'OptionalCallExpression',
+        callee: transformChainExpression(node.callee)
+      };
+
+    case 'MemberExpression':
+      return { ...node,
+        type: 'OptionalMemberExpression',
+        object: transformChainExpression(node.object)
+      };
+  }
+
+  return node;
+}
+
+function mutate(rootNode, visitorKeys) {
+  _SimpleTransform.SimpleTransform.transform(rootNode, {
+    transform(node) {
+      if (node.parent) {
+        delete node.parent;
+      }
+
+      if (node.type === 'ChainExpression') {
+        return transformChainExpression(node.expression, node == null ? void 0 : node.comments);
+      }
+
+      if (node.type === 'ObjectTypeProperty') {
+        if (node.method === false && node.kind === 'init' && node.range[0] === 1 && node.value.range[0] === 1) {
+          node.value = { ...node.value,
+            range: [2, node.value.range[1]]
+          };
+        }
+
+        return node;
+      }
+
+      if (node.type === 'ImportSpecifier') {
+        if (node.local.name === node.imported.name) {
+          if (node.local.range == null) {
+            node.local.range = [0, 0];
+          }
+
+          node.imported.range = [...node.local.range];
+        }
+
+        return node;
+      }
+
+      if (node.type === 'ExportSpecifier') {
+        if (node.local.name === node.exported.name) {
+          if (node.local.range == null) {
+            node.local.range = [0, 0];
+          }
+
+          node.exported.range = [...node.local.range];
+        }
+
+        return node;
+      }
+
+      return node;
+    },
+
+    visitorKeys
+  });
+}

package/oxidized/utils/mutateESTreeASTForPrettier.js.flow

@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ESNode, Program, Comment} from 'flow-estree';
+import type {VisitorKeysType} from '../traverse/getVisitorKeys';
+import {SimpleTransform} from '../transform/SimpleTransform';
+
+// https://github.com/prettier/prettier/blob/d962466a828f8ef51435e3e8840178d90b7ec6cd/src/language-js/parse/postprocess/index.js#L161-L182
+function transformChainExpression(
+  node: ESNode,
+  comments: ?ReadonlyArray<Comment>,
+): ESNode {
+  if (comments != null) {
+    // $FlowExpectedError[prop-missing]
+    const joinedComments = comments.concat(node.comments ?? []);
+    // $FlowExpectedError[prop-missing]
+    // $FlowFixMe[cannot-write]
+    node.comments = joinedComments;
+  }
+  switch (node.type) {
+    case 'CallExpression':
+      // $FlowExpectedError[cannot-spread-interface]
+      return {
+        ...node,
+        type: 'OptionalCallExpression',
+        callee: transformChainExpression(node.callee),
+      };
+
+    case 'MemberExpression':
+      // $FlowExpectedError[cannot-spread-interface]
+      return {
+        ...node,
+        type: 'OptionalMemberExpression',
+        object: transformChainExpression(node.object),
+      };
+    // No default
+  }
+
+  return node;
+}
+
+export default function mutate(
+  rootNode: Program,
+  visitorKeys: ?VisitorKeysType,
+): void {
+  // Since we don't return the result of `transform` we need to be careful not to replace the Program root node.
+  SimpleTransform.transform(rootNode, {
+    transform(node): ESNode | null {
+      // prettier fully expects the parent pointers are NOT set and
+      // certain cases can crash due to prettier infinite-looping
+      // whilst naively traversing the parent property
+      // https://github.com/prettier/prettier/issues/11793
+      // Note: Only needed for prettier V2, this is supported in V3
+      if (node.parent) {
+        // $FlowExpectedError[cannot-write]
+        delete node.parent;
+      }
+
+      // prettier currently relies on the AST being in the old-school, deprecated AST format for optional chaining
+      // so we have to apply their transform to our AST so it can actually format it.
+      // Note: Only needed for prettier V2, this is supported in V3
+      if (node.type === 'ChainExpression') {
+        // $FlowFixMe[prop-missing]
+        return transformChainExpression(node.expression, node?.comments);
+      }
+
+      // Prettier currently relies on comparing the `node` vs `node.value` start positions to know if an
+      // `ObjectTypeProperty` is a method or not (instead of using the `node.method` boolean). To correctly print
+      // the node when its not a method we need the start position to be different from the `node.value`s start
+      // position.
+      if (node.type === 'ObjectTypeProperty') {
+        if (
+          node.method === false &&
+          node.kind === 'init' &&
+          node.range[0] === 1 &&
+          node.value.range[0] === 1
+        ) {
+          // $FlowExpectedError[cannot-write]
+          // $FlowExpectedError[cannot-spread-interface]
+          node.value = {
+            ...node.value,
+            range: [2, node.value.range[1]],
+          };
+        }
+        return node;
+      }
+
+      // Prettier currently relies on comparing the the start positions to know if the import/export specifier should have a
+      // rename (eg `Name` vs `Name as Name`) when the name is exactly the same
+      // So we need to ensure that the range is always the same to avoid the useless code printing
+      if (node.type === 'ImportSpecifier') {
+        if (node.local.name === node.imported.name) {
+          if (node.local.range == null) {
+            // for our TS-ast printing which has no locs
+            // $FlowExpectedError[cannot-write]
+            node.local.range = [0, 0];
+          }
+          // $FlowExpectedError[cannot-write]
+          node.imported.range = [...node.local.range];
+        }
+        return node;
+      }
+
+      if (node.type === 'ExportSpecifier') {
+        if (node.local.name === node.exported.name) {
+          if (node.local.range == null) {
+            // for our TS-ast printing which has no locs
+            // $FlowExpectedError[cannot-write]
+            node.local.range = [0, 0];
+          }
+          // $FlowExpectedError[cannot-write]
+          node.exported.range = [...node.local.range];
+        }
+        return node;
+      }
+
+      return node;
+    },
+    visitorKeys,
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-parser",
-  "version": "0.318.0",
+  "version": "0.319.0",
   "description": "JavaScript parser written in OCaml. Produces ESTree AST",
   "homepage": "https://flow.org",
   "license": "MIT",
@@ -9,7 +9,8 @@
     "email": "flow@fb.com"
   },
   "files": [
-    "flow_parser.js"
+    "flow_parser.js",
+    "oxidized"
   ],
   "main": "flow_parser.js",
   "repository": {
@@ -21,7 +22,9 @@
     "test": "node test/run_tests.js",
     "build": "make js"
   },
-  "dependencies": {},
+  "dependencies": {
+    "flow-estree": "0.319.0"
+  },
   "devDependencies": {
     "@babel/generator": "7.7.4",
     "@babel/parser": "7.7.4",
@@ -29,7 +32,6 @@
     "chalk": "^4.1.2",
     "espree": "9.3.2",
     "flow-enums-runtime": "0.0.6",
-    "flow-estree": "0.0.1",
     "hermes-estree": "0.36.1",
     "hermes-parser": "0.36.1",
     "minimist": ">=1.2.6",