Release: common@3

.changeset/beige-penguins-pump.md

@@ -0,0 +1,5 @@
+---
+'@openfn/language-common': major
+---
+
+Remove `map()`

.changeset/cold-lions-turn.md

@@ -0,0 +1,7 @@
+---
+'@openfn/language-progres': major
+---
+
+- Migrate from `common.http` to `common.request`.
+- Remove `axios` and `nock` from progres.
+- Remove exportation of `http` from `common`, and the exportation of `axios`.

.changeset/eleven-meals-bow.md

@@ -0,0 +1,5 @@
+---
+'@openfn/language-common': major
+---
+
+- Delete deprecated `expandReferences` from common and use `expandReferences` from `common.util`

.changeset/nasty-geckos-cover.md

@@ -0,0 +1,19 @@
+---
+'@openfn/language-googlehealthcare': patch
+'@openfn/language-khanacademy': patch
+'@openfn/language-medicmobile': patch
+'@openfn/language-resourcemap': patch
+'@openfn/language-salesforce': patch
+'@openfn/language-surveycto': patch
+'@openfn/language-telerivet': patch
+'@openfn/language-dynamics': patch
+'@openfn/language-facebook': patch
+'@openfn/language-rapidpro': patch
+'@openfn/language-beyonic': patch
+'@openfn/language-cartodb': patch
+'@openfn/language-mailgun': patch
+'@openfn/language-mongodb': patch
+---
+
+- Migrate from the deprecated `expandReferences` in `common` to the new `expandReferences` from common.util
+- Use `workspace:*` common version.

.changeset/silver-pets-dance.md

@@ -0,0 +1,5 @@
+---
+'@openfn/language-mogli': minor
+---
+
+Removed map() function, exported from common

.changeset/six-crabs-remember.md

@@ -0,0 +1,8 @@
+---
+'@openfn/language-rapidpro': major
+---
+
+- Update `rapidPro` to not use deprecated `common-http`.
+- Remove support and export of `axios` 
+- Remove export of `http` namesepace from `common`
+

packages/beyonic/src/Adaptor.js

@@ -1,9 +1,7 @@
-import {
-  execute as commonExecute,
-  expandReferences,
-} from '@openfn/language-common';
+import { execute as commonExecute } from '@openfn/language-common';
 import { post } from './Client';
 import { resolve as resolveUrl } from 'url';
+import { expandReferences } from '@openfn/language-common/util';
 
 /**
  * Execute a sequence of operations.
@@ -34,7 +32,7 @@ export function execute(...operations) {
  */
 export function createPayment(data) {
   return state => {
-    const body = expandReferences(data)(state);
+    const [body] = expandReferences(state, data);
 
     const { apiUrl, apiToken } = state.configuration;
 
@@ -61,7 +59,7 @@ export function createPayment(data) {
  */
 export function createContact(data) {
   return state => {
-    const body = expandReferences(data)(state);
+    const [body] = expandReferences(state, data);
 
     const { apiUrl, apiToken } = state.configuration;
 
@@ -88,7 +86,7 @@ export function createContact(data) {
  */
 export function createCollectionRequest(data) {
   return state => {
-    const body = expandReferences(data)(state);
+    const [body] = expandReferences(state, data);
 
     const { apiUrl, apiToken } = state.configuration;
 

packages/cartodb/src/Adaptor.js

@@ -1,7 +1,5 @@
-import {
-  execute as commonExecute,
-  expandReferences,
-} from '@openfn/language-common';
+import { execute as commonExecute } from '@openfn/language-common';
+import { expandReferences } from '@openfn/language-common/util';
 import { post } from './Client';
 import jsonSqlPkg from 'json-sql';
 
@@ -65,7 +63,7 @@ export function sql(sqlQuery) {
  */
 export function addRow(table, rowData) {
   return state => {
-    const dataObject = expandReferences(rowData)(state);
+    const [dataObject] = expandReferences(state, rowData);
 
     const sql = jsonSql.build({
       type: 'insert',

packages/common/ast.json

@@ -1694,69 +1694,6 @@
         ]
       },
       "valid": true
-    },
-    {
-      "name": "map",
-      "params": [
-        "path",
-        "operation",
-        "state"
-      ],
-      "docs": {
-        "description": "Scopes an array of data based on a JSONPath.\nUseful when the source data has `n` items you would like to map to\nan operation.\nThe operation will receive a slice of the data based of each item\nof the JSONPath provided.",
-        "tags": [
-          {
-            "title": "public",
-            "description": null,
-            "type": null
-          },
-          {
-            "title": "function",
-            "description": null,
-            "name": null
-          },
-          {
-            "title": "example",
-            "description": "map(\"$.[*]\",\n  create(\"SObject\",\n    field(\"FirstName\", sourceValue(\"$.firstName\"))\n  )\n)"
-          },
-          {
-            "title": "param",
-            "description": "JSONPath referencing a point in `state.data`.",
-            "type": {
-              "type": "NameExpression",
-              "name": "string"
-            },
-            "name": "path"
-          },
-          {
-            "title": "param",
-            "description": "The operation needed to be repeated.",
-            "type": {
-              "type": "NameExpression",
-              "name": "function"
-            },
-            "name": "operation"
-          },
-          {
-            "title": "param",
-            "description": "Runtime state.",
-            "type": {
-              "type": "NameExpression",
-              "name": "State"
-            },
-            "name": "state"
-          },
-          {
-            "title": "returns",
-            "description": null,
-            "type": {
-              "type": "NameExpression",
-              "name": "State"
-            }
-          }
-        ]
-      },
-      "valid": true
     }
   ],
   "exports": [],

packages/common/src/Adaptor.js

@@ -11,7 +11,7 @@ import { Readable } from 'node:stream';
 import { request } from 'undici';
 import dateFns from 'date-fns';
 
-import { expandReferences as newExpandReferences, parseDate } from './util';
+import { expandReferences, parseDate } from './util';
 
 const schemaCache = {};
 
@@ -78,7 +78,7 @@ export function fn(func) {
  */
 export function fnIf(condition, operation) {
   return state => {
-    const [resolvedCondition] = newExpandReferences(state, condition);
+    const [resolvedCondition] = expandReferences(state, condition);
 
     return resolvedCondition ? operation(state) : state;
   };
@@ -196,41 +196,6 @@ export function lastReferenceValue(path) {
   return sourceValue(lastReferencePath);
 }
 
-/**
- * Scopes an array of data based on a JSONPath.
- * Useful when the source data has `n` items you would like to map to
- * an operation.
- * The operation will receive a slice of the data based of each item
- * of the JSONPath provided.
- * @public
- * @function
- * @example
- * map("$.[*]",
- *   create("SObject",
- *     field("FirstName", sourceValue("$.firstName"))
- *   )
- * )
- * @param {string} path - JSONPath referencing a point in `state.data`.
- * @param {function} operation - The operation needed to be repeated.
- * @param {State} state - Runtime state.
- * @returns {State}
- */
-export const map = curry(function (path, operation, state) {
-  switch (typeof path) {
-    case 'string':
-      source(path)(state).map(function (data) {
-        return operation({ data, references: state.references });
-      });
-      return state;
-
-    case 'object':
-      path.map(function (data) {
-        return operation({ data, references: state.references });
-      });
-      return state;
-  }
-});
-
 /**
  * Simple switcher allowing other expressions to use either a JSONPath or
  * object literals as a data source.
@@ -356,35 +321,6 @@ export function join(targetPath, sourcePath, targetKey) {
   };
 }
 
-/**
- * Recursively resolves objects that have resolvable values (functions).
- * @public
- * @function
- * @param {object} value - data
- * @param {Function} [skipFilter] - a function which returns true if a value should be skipped
- * @returns {Operation}
- */
-export function expandReferences(value, skipFilter) {
-  return state => {
-    if (skipFilter && skipFilter(value)) return value;
-
-    if (Array.isArray(value)) {
-      return value.map(v => expandReferences(v)(state));
-    }
-
-    if (typeof value == 'object' && !!value) {
-      return Object.keys(value).reduce((acc, key) => {
-        return { ...acc, [key]: expandReferences(value[key])(state) };
-      }, {});
-    }
-
-    if (typeof value == 'function') {
-      return expandReferences(value(state))(state);
-    }
-    return value;
-  };
-}
-
 /**
  * Returns a key, value pair in an array.
  * @public
@@ -431,7 +367,7 @@ export function fields(...fields) {
 export function merge(dataSource, fields) {
   return state => {
     const initialData = source(dataSource)(state);
-    const additionalData = expandReferences(fields)(state);
+    const [additionalData] = expandReferences(state, fields);
 
     return initialData.reduce((acc, dataItem) => {
       return [...acc, { ...dataItem, ...additionalData }];
@@ -460,7 +396,7 @@ export function merge(dataSource, fields) {
  */
 export function group(arrayOfObjects, keyPath, callback = s => s) {
   return state => {
-    const [resolvedArray, resolvedKeyPath] = newExpandReferences(
+    const [resolvedArray, resolvedKeyPath] = expandReferences(
       state,
       arrayOfObjects,
       keyPath
@@ -677,7 +613,7 @@ export function parseCsv(csvData, parsingOptions = {}, callback) {
   };
 
   return async state => {
-    const [resolvedCsvData, resolvedParsingOptions] = newExpandReferences(
+    const [resolvedCsvData, resolvedParsingOptions] = expandReferences(
       state,
       csvData,
       parsingOptions
@@ -798,7 +734,7 @@ export function validate(schema = 'schema', data = 'data') {
     // Schema can be a url, jsonpath or object; or a function resolving to any of these
     async function resolveSchema() {
       // TODO hmm, I don't really want to expand schema if it's an object
-      const [schemaOrUrl] = newExpandReferences(state, schema);
+      const [schemaOrUrl] = expandReferences(state, schema);
 
       if (typeof schemaOrUrl === 'string') {
         try {
@@ -823,7 +759,7 @@ export function validate(schema = 'schema', data = 'data') {
 
     // data can be a jsonpath or object; or function resolving to any of these
     function resolveData() {
-      const [d] = newExpandReferences(state, data);
+      const [d] = expandReferences(state, data);
 
       if (typeof d === 'string') {
         return JSONPath({ path: d, json: state })[0];
@@ -860,7 +796,7 @@ let cursorKey = 'cursor';
 export function cursor(value, options = {}) {
   return state => {
     const { format, ...optionsWithoutFormat } = options;
-    const [resolvedValue, resolvedOptions] = newExpandReferences(
+    const [resolvedValue, resolvedOptions] = expandReferences(
       state,
       value,
       optionsWithoutFormat
@@ -916,7 +852,7 @@ export function cursor(value, options = {}) {
  */
 export function assert(expression, errorMessage) {
   return state => {
-    const [resolvedValue, resolvedErrorMessage] = newExpandReferences(
+    const [resolvedValue, resolvedErrorMessage] = expandReferences(
       state,
       expression,
       errorMessage
@@ -949,7 +885,7 @@ export function assert(expression, errorMessage) {
  */
 export function log(...args) {
   return state => {
-    const [resolvedArgs] = newExpandReferences(state, args);
+    const [resolvedArgs] = expandReferences(state, args);
     console.log(...resolvedArgs);
     return state;
   };
@@ -972,7 +908,7 @@ export function log(...args) {
  */
 export function debug(...args) {
   return state => {
-    const [resolvedArgs] = newExpandReferences(state, args);
+    const [resolvedArgs] = expandReferences(state, args);
     console.debug(...resolvedArgs);
     return state;
   };