@openfn/language-mysql 2.1.5 → 2.2.0

package/ast.json

@@ -925,6 +925,60 @@
         ]
       },
       "valid": false
+    },
+    {
+      "name": "as",
+      "params": [
+        "key",
+        "operation"
+      ],
+      "docs": {
+        "description": "Run an operation and save the result to a custom key in state instead of overwriting state.data.",
+        "tags": [
+          {
+            "title": "public",
+            "description": null,
+            "type": null
+          },
+          {
+            "title": "function",
+            "description": null,
+            "name": null
+          },
+          {
+            "title": "example",
+            "description": "as('cceData', collections.get('cce-data-dhis2', { key: `*:*:${$.syncedAt}*` }));",
+            "caption": "Fetch cce-data from collections and store them under state.cceData"
+          },
+          {
+            "title": "param",
+            "description": "The state key to assign the result of the operation to.",
+            "type": {
+              "type": "NameExpression",
+              "name": "string"
+            },
+            "name": "key"
+          },
+          {
+            "title": "param",
+            "description": " An operation that returns a new state object with a `data` property",
+            "type": {
+              "type": "NameExpression",
+              "name": "function"
+            },
+            "name": "operation"
+          },
+          {
+            "title": "returns",
+            "description": null,
+            "type": {
+              "type": "NameExpression",
+              "name": "Operation"
+            }
+          }
+        ]
+      },
+      "valid": true
     }
   ]
 }

package/dist/index.cjs

@@ -27,6 +27,7 @@ var src_exports = {};
 __export(src_exports, {
   alterState: () => import_language_common2.alterState,
   arrayToString: () => import_language_common2.arrayToString,
+  as: () => import_language_common2.as,
   combine: () => import_language_common2.combine,
   cursor: () => import_language_common2.cursor,
   dataPath: () => import_language_common2.dataPath,
@@ -56,6 +57,7 @@ var Adaptor_exports = {};
 __export(Adaptor_exports, {
   alterState: () => import_language_common2.alterState,
   arrayToString: () => import_language_common2.arrayToString,
+  as: () => import_language_common2.as,
   combine: () => import_language_common2.combine,
   cursor: () => import_language_common2.cursor,
   dataPath: () => import_language_common2.dataPath,
@@ -78,6 +80,7 @@ __export(Adaptor_exports, {
   upsertMany: () => upsertMany
 });
 var import_language_common = require("@openfn/language-common");
+var import_util = require("@openfn/language-common/util");
 var import_mysql = __toESM(require("mysql"), 1);
 var import_squel = __toESM(require("squel"), 1);
 var import_language_common2 = require("@openfn/language-common");
@@ -119,7 +122,7 @@ function cleanupState(state) {
 function insert(table, fields2) {
   return (state) => {
     let { connection } = state;
-    const valuesObj = (0, import_language_common.expandReferences)(fields2)(state);
+    const [valuesObj] = (0, import_util.expandReferences)(state, fields2);
     const squelMysql = import_squel.default.useFlavour("mysql");
     var sqlParams = squelMysql.insert({
       autoQuoteFieldNames: true
@@ -150,7 +153,7 @@ function insert(table, fields2) {
 function upsert(table, fields2) {
   return (state) => {
     let { connection } = state;
-    const valuesObj = (0, import_language_common.expandReferences)(fields2)(state);
+    const [valuesObj] = (0, import_util.expandReferences)(state, fields2);
     const squelMysql = import_squel.default.useFlavour("mysql");
     var insertParams = squelMysql.insert({
       autoQuoteFieldNames: true
@@ -188,7 +191,7 @@ function upsert(table, fields2) {
 function upsertMany(table, data) {
   return function(state) {
     return new Promise(function(resolve, reject) {
-      const rows = (0, import_language_common.expandReferences)(data)(state);
+      const [rows] = (0, import_util.expandReferences)(state, data);
       if (!rows || rows.length === 0) {
         console.log("No records provided; skipping upsert.");
         resolve(state);
@@ -222,7 +225,7 @@ function upsertMany(table, data) {
 function query(options) {
   return (state) => {
     let { connection } = state;
-    const opts = (0, import_language_common.expandReferences)(options)(state);
+    const [opts] = (0, import_util.expandReferences)(state, options);
     console.log(
       "Executing MySQL statement with options: " + JSON.stringify(opts, 2, null)
     );
@@ -256,6 +259,7 @@ var src_default = Adaptor_exports;
 0 && (module.exports = {
   alterState,
   arrayToString,
+  as,
   combine,
   cursor,
   dataPath,

package/dist/index.js

@@ -9,6 +9,7 @@ var Adaptor_exports = {};
 __export(Adaptor_exports, {
   alterState: () => alterState,
   arrayToString: () => arrayToString,
+  as: () => as,
   combine: () => combine,
   cursor: () => cursor,
   dataPath: () => dataPath,
@@ -30,10 +31,8 @@ __export(Adaptor_exports, {
   upsert: () => upsert,
   upsertMany: () => upsertMany
 });
-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 mysql from "mysql";
 import squel from "squel";
 import {
@@ -52,7 +51,8 @@ import {
   alterState,
   sourceValue,
   arrayToString,
-  lastReferenceValue
+  lastReferenceValue,
+  as
 } from "@openfn/language-common";
 function execute(...operations) {
   const initialState = {
@@ -92,7 +92,7 @@ function cleanupState(state) {
 function insert(table, fields2) {
   return (state) => {
     let { connection } = state;
-    const valuesObj = expandReferences(fields2)(state);
+    const [valuesObj] = expandReferences(state, fields2);
     const squelMysql = squel.useFlavour("mysql");
     var sqlParams = squelMysql.insert({
       autoQuoteFieldNames: true
@@ -123,7 +123,7 @@ function insert(table, fields2) {
 function upsert(table, fields2) {
   return (state) => {
     let { connection } = state;
-    const valuesObj = expandReferences(fields2)(state);
+    const [valuesObj] = expandReferences(state, fields2);
     const squelMysql = squel.useFlavour("mysql");
     var insertParams = squelMysql.insert({
       autoQuoteFieldNames: true
@@ -161,7 +161,7 @@ function upsert(table, fields2) {
 function upsertMany(table, data) {
   return function(state) {
     return new Promise(function(resolve, reject) {
-      const rows = expandReferences(data)(state);
+      const [rows] = expandReferences(state, data);
       if (!rows || rows.length === 0) {
         console.log("No records provided; skipping upsert.");
         resolve(state);
@@ -195,7 +195,7 @@ function upsertMany(table, data) {
 function query(options) {
   return (state) => {
     let { connection } = state;
-    const opts = expandReferences(options)(state);
+    const [opts] = expandReferences(state, options);
     console.log(
       "Executing MySQL statement with options: " + JSON.stringify(opts, 2, null)
     );
@@ -228,6 +228,7 @@ var src_default = Adaptor_exports;
 export {
   alterState,
   arrayToString,
+  as,
   combine,
   cursor,
   dataPath,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/language-mysql",
   "label": "MySQL",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "description": "A MySQL Language Pack for OpenFn",
   "homepage": "https://docs.openfn.org",
   "main": "dist/index.cjs",
@@ -22,7 +22,7 @@
     "mysql": "^2.13.0",
     "squel": "^5.8.0",
     "string-escape": "^0.3.0",
-    "@openfn/language-common": "2.5.0"
+    "@openfn/language-common": "3.0.0"
   },
   "devDependencies": {
     "assertion-error": "^1.0.1",

package/types/Adaptor.d.ts

@@ -66,4 +66,4 @@ export function query(options: object): Operation;
  * @returns {Operation}
  */
 export function sqlString(queryString: string): Operation;
-export { fn, fnIf, each, http, merge, field, fields, cursor, dateFns, combine, dataPath, dataValue, alterState, sourceValue, arrayToString, lastReferenceValue } from "@openfn/language-common";
+export { fn, fnIf, each, http, merge, field, fields, cursor, dateFns, combine, dataPath, dataValue, alterState, sourceValue, arrayToString, lastReferenceValue, as } from "@openfn/language-common";