Merge pull request #1064 from OpenFn/ignore-rules

feat: ignore top objects in several transforms

Author: josephjclark

packages/compiler/src/transform-ignore.ts

@@ -0,0 +1,20 @@
+import { namedTypes as n } from 'ast-types';
+import { NodePath } from 'ast-types/lib/node-path';
+
+const IgnoreRules = (path: NodePath<n.Expression>) => {
+  return {
+    check: n.ObjectExpression.check(path.node),
+    shouldSkip: () => {
+      if (
+        n.VariableDeclarator.check(path.parentPath.node) &&
+        n.VariableDeclaration.check(path.parentPath.parentPath.node) &&
+        n.Program.check(path.parentPath.parentPath.parentPath.parentPath.node)
+      ) {
+        return true;
+      }
+      return false;
+    },
+  };
+};
+
+export default IgnoreRules;

packages/compiler/src/transforms/lazy-state.ts

@@ -9,6 +9,7 @@
 import { builders as b, namedTypes as n } from 'ast-types';
 import type { NodePath } from 'ast-types/lib/node-path';
 import type { Transformer } from '../transform';
+import IgnoreRules from '../transform-ignore';
 
 // Walk up the AST and work out where the parent arrow function should go
 const ensureParentArrow = (path: NodePath<n.MemberExpression>) => {
@@ -80,15 +81,9 @@ const isOpenFunction = (path: NodePath) => {
 
 function visitor(path: NodePath<n.MemberExpression>) {
   // if it was called for an ObjectExpression
-  if (n.ObjectExpression.check(path.node)) {
-    if (
-      n.VariableDeclarator.check(path.parentPath.node) &&
-      n.VariableDeclaration.check(path.parentPath.parentPath.node) &&
-      n.Program.check(path.parentPath.parentPath.parentPath.parentPath.node)
-    ) {
-      return true;
-    }
-    return false;
+  const ignoreRule = IgnoreRules(path);
+  if (ignoreRule.check) {
+    return ignoreRule.shouldSkip();
   }
   let first = path.node.object;
   while (first.hasOwnProperty('object')) {

packages/compiler/src/transforms/promises.ts

@@ -1,6 +1,7 @@
 import { namedTypes as n, builders as b } from 'ast-types';
 
 import type { NodePath } from 'ast-types/lib/node-path';
+import IgnoreRules from '../transform-ignore';
 
 const NO_DEFER_DECLARATION_ERROR = 'No defer declaration found';
 
@@ -146,6 +147,10 @@ const isTopScope = (path: NodePath<any>) => {
 };
 
 const visitor = (path: NodePath<n.CallExpression>) => {
+  const ignoreRule = IgnoreRules(path);
+  if (ignoreRule.check) {
+    return ignoreRule.shouldSkip();
+  }
   let root: NodePath<any> = path;
   while (!n.Program.check(root.node)) {
     root = root.parent;
@@ -166,7 +171,7 @@ const visitor = (path: NodePath<n.CallExpression>) => {
 
 export default {
   id: 'promises',
-  types: ['CallExpression'],
+  types: ['CallExpression', 'ObjectExpression'],
   visitor,
   // this should run before top-level operations are moved into the exports array
   order: 0,