provide expansion for createIf logical

OpenFn · May 27, 2021 · 36044ca · 36044ca
1 parent 85a8969
commit 36044ca
Show file tree

Hide file tree

Showing 8 changed files with 2,741 additions and 237 deletions.
diff --git a/ast.json b/ast.json
diff --git a/lib/Adaptor.js b/lib/Adaptor.js
@@ -365,6 +365,7 @@ const createIf = (0, _lodashFp.curry)(function (logical, sObject, attrs, state)
     connection
   } = state;
   const finalAttrs = (0, _languageCommon.expandReferences)(attrs)(state);
+  logical = (0, _languageCommon.expandReferences)(logical)(state);
 
   if (logical) {
     console.info(`Creating ${sObject}`, finalAttrs);
@@ -615,4 +616,4 @@ function steps(...operations) {
   return (0, _lodashFp.flatten)(operations);
 }
 
-exports.axios = _axios.default;
+exports.axios = _axios.default;
diff --git a/lib/FakeAdaptor.js b/lib/FakeAdaptor.js
@@ -330,4 +330,4 @@ function execute(...operations) {
       console.info('Job failed.');
     });
   };
-}
+}
diff --git a/lib/index.js b/lib/index.js
@@ -13,9 +13,9 @@ var FakeAdaptor = _interopRequireWildcard(require("./FakeAdaptor"));
 
 exports.FakeAdaptor = FakeAdaptor;
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var _default = Adaptor;
-exports.default = _default;
+exports.default = _default;
diff --git a/lib/sourceHelpers.js b/lib/sourceHelpers.js
@@ -56,4 +56,4 @@ function relationship(relationshipName, externalId, dataSource) {
       [externalId]: dataSource
     };
   });
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,9 +5,12 @@
   "homepage": "https://docs.openfn.org",
   "main": "lib/index.js",
   "scripts": {
-    "build": "make",
+    "build": "node_modules/.bin/babel src -d lib && npm run ast",
     "test": "mocha --require @babel/register",
-    "test:watch": "mocha -w --require @babel/register"
+    "test:watch": "mocha -w --require @babel/register",
+    "ast": "simple-ast --adaptor ./src/Adaptor.js --output ast.json",
+    "postversion": "git push && git push --tags",
+    "version": "npm run build && git add -A lib ast.json"
   },
   "author": "Open Function Group",
   "license": "LGPLv3",
@@ -16,7 +19,8 @@
     "url": "git://github.com/OpenFn/language-salesforce.git"
   },
   "files": [
-    "lib/"
+    "lib/",
+    "ast.json"
   ],
   "dependencies": {
     "@openfn/language-common": "1.2.8",
@@ -32,6 +36,7 @@
     "@babel/core": "^7.9.0",
     "@babel/preset-env": "^7.9.5",
     "@babel/register": "^7.9.0",
+    "@openfn/simple-ast": "^0.3.0",
     "assertion-error": "^1.0.1",
     "chai": "^4.2.0",
     "deep-eql": "^4.0.0",
@@ -40,5 +45,17 @@
     "nock": "^13.0.5",
     "sinon": "^9.2.3",
     "type-detect": "^1.0.0"
-  }
+  },
+  "directories": {
+    "lib": "./lib"
+  },
+  "bundledDependencies": [
+    "@openfn/language-common",
+    "axios",
+    "jsforce",
+    "JSONPath",
+    "lodash-fp",
+    "mustache",
+    "yargs"
+  ]
 }
diff --git a/src/Adaptor.js b/src/Adaptor.js
@@ -226,6 +226,8 @@ export const create = curry(function (sObject, attrs, state) {
 export const createIf = curry(function (logical, sObject, attrs, state) {
   let { connection } = state;
   const finalAttrs = expandReferences(attrs)(state);
+  logical = expandReferences(logical)(state);
+
   if (logical) {
     console.info(`Creating ${sObject}`, finalAttrs);
   } else {
@@ -309,7 +311,7 @@ export const upsertIf = curry(function (
   let { connection } = state;
   const finalAttrs = expandReferences(attrs)(state);
   logical = expandReferences(logical)(state);
-  
+
   if (logical) {
     console.info(
       `Upserting ${sObject} with externalId`,