@openfn/language-mssql 5.1.0 → 5.2.0

package/ast.json

@@ -1273,6 +1273,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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   alterState: () => import_language_common2.alterState,
+  as: () => import_language_common2.as,
   combine: () => import_language_common2.combine,
   cursor: () => import_language_common2.cursor,
   dataPath: () => import_language_common2.dataPath,
@@ -54,6 +55,7 @@ module.exports = __toCommonJS(src_exports);
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
   alterState: () => import_language_common2.alterState,
+  as: () => import_language_common2.as,
   combine: () => import_language_common2.combine,
   cursor: () => import_language_common2.cursor,
   dataPath: () => import_language_common2.dataPath,
@@ -81,6 +83,7 @@ __export(Adaptor_exports, {
   upsertMany: () => upsertMany
 });
 var import_language_common = require("@openfn/language-common");
+var import_util = require("@openfn/language-common/util");
 
 // src/util.js
 var util_exports = {};
@@ -214,7 +217,8 @@ function sql(params) {
   return (state) => {
     const { connection } = state;
     try {
-      const { query, options } = (0, import_language_common.expandReferences)(params)(state);
+      const [resolvedParams] = (0, import_util.expandReferences)(state, params);
+      const { query, options } = resolvedParams;
       console.log(`Preparing to execute sql statement: ${query}`);
       return queryHandler(state, query, composeNextState, options);
     } catch (e) {
@@ -252,8 +256,8 @@ function findValue(filter) {
   return (state) => {
     const { connection } = state;
     const { uuid, relation, where, operator } = filter;
-    const whereData = (0, import_language_common.expandReferences)(where)(state);
-    const operatorData = (0, import_language_common.expandReferences)(operator)(state);
+    const [whereData] = (0, import_util.expandReferences)(state, where);
+    const [operatorData] = (0, import_util.expandReferences)(state, operator);
     let conditionsArray = [];
     for (let key in whereData) {
       const escapedValue = escape(whereData[key]);
@@ -295,7 +299,7 @@ function insert(table, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = (0, import_language_common.expandReferences)(record)(state);
+      const [recordData] = (0, import_util.expandReferences)(state, record);
       const columns = Object.keys(recordData).sort();
       const values = columns.map((key) => escape(recordData[key])).join("', '");
       const query = handleValues(
@@ -320,7 +324,7 @@ function insertMany(table, records, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = (0, import_language_common.expandReferences)(records)(state);
+      const [recordData] = (0, import_util.expandReferences)(state, records);
       const columns = Object.keys(recordData[0]);
       const valueSets = recordData.map(
         (x) => `('${escape(Object.values(x)).join("', '")}')`
@@ -349,7 +353,7 @@ function upsert(table, uuid, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = (0, import_language_common.expandReferences)(record)(state);
+      const [recordData] = (0, import_util.expandReferences)(state, record);
       const columns = Object.keys(recordData).sort();
       const selectValues = columns.map((key) => `'${escape(recordData[key])}' AS ${key}`).join(", ");
       const updateValues = columns.map((key) => `[Target].${key}='${escape(recordData[key])}'`).join(", ");
@@ -395,9 +399,9 @@ function upsertIf(logical, table, uuid, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = (0, import_language_common.expandReferences)(record)(state);
+      const [recordData] = (0, import_util.expandReferences)(state, record);
       const columns = Object.keys(recordData).sort();
-      const logicalData = (0, import_language_common.expandReferences)(logical)(state);
+      const [logicalData] = (0, import_util.expandReferences)(state, logical);
       return new Promise((resolve, reject) => {
         if (!logicalData) {
           console.log(`Skipping upsert for ${uuid}.`);
@@ -447,7 +451,7 @@ function upsertMany(table, uuid, records, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = (0, import_language_common.expandReferences)(records)(state);
+      const [recordData] = (0, import_util.expandReferences)(state, records);
       return new Promise((resolve, reject) => {
         if (!recordData || recordData.length === 0) {
           console.log("No records provided; skipping upsert.");
@@ -498,7 +502,7 @@ function upsertMany(table, uuid, records, options) {
 function describeTable(tableName, options) {
   return (state) => {
     const { connection } = state;
-    const name = (0, import_language_common.expandReferences)(tableName)(state);
+    const [name] = (0, import_util.expandReferences)(state, tableName);
     try {
       const query = `SELECT column_name
           FROM information_schema.columns 
@@ -516,7 +520,7 @@ function insertTable(tableName, columns, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const data = (0, import_language_common.expandReferences)(columns)(state);
+      const [data] = (0, import_util.expandReferences)(state, columns);
       return new Promise((resolve, reject) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table creation.");
@@ -542,7 +546,7 @@ function modifyTable(tableName, columns, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const data = (0, import_language_common.expandReferences)(columns)(state);
+      const [data] = (0, import_util.expandReferences)(state, columns);
       return new Promise((resolve, reject) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table modification.");
@@ -568,6 +572,7 @@ var src_default = Adaptor_exports;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   alterState,
+  as,
   combine,
   cursor,
   dataPath,

package/dist/index.js

@@ -8,6 +8,7 @@ var __export = (target, all) => {
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
   alterState: () => alterState,
+  as: () => as,
   combine: () => combine,
   cursor: () => cursor,
   dataPath: () => dataPath,
@@ -34,10 +35,8 @@ __export(Adaptor_exports, {
   upsertIf: () => upsertIf,
   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";
 
 // src/util.js
 var util_exports = {};
@@ -70,7 +69,8 @@ import {
   lastReferenceValue,
   cursor,
   merge,
-  sourceValue
+  sourceValue,
+  as
 } from "@openfn/language-common";
 function createConnection(state) {
   const {
@@ -187,7 +187,8 @@ function sql(params) {
   return (state) => {
     const { connection } = state;
     try {
-      const { query, options } = expandReferences(params)(state);
+      const [resolvedParams] = expandReferences(state, params);
+      const { query, options } = resolvedParams;
       console.log(`Preparing to execute sql statement: ${query}`);
       return queryHandler(state, query, composeNextState, options);
     } catch (e) {
@@ -225,8 +226,8 @@ function findValue(filter) {
   return (state) => {
     const { connection } = state;
     const { uuid, relation, where, operator } = filter;
-    const whereData = expandReferences(where)(state);
-    const operatorData = expandReferences(operator)(state);
+    const [whereData] = expandReferences(state, where);
+    const [operatorData] = expandReferences(state, operator);
     let conditionsArray = [];
     for (let key in whereData) {
       const escapedValue = escape(whereData[key]);
@@ -268,7 +269,7 @@ function insert(table, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = expandReferences(record)(state);
+      const [recordData] = expandReferences(state, record);
       const columns = Object.keys(recordData).sort();
       const values = columns.map((key) => escape(recordData[key])).join("', '");
       const query = handleValues(
@@ -293,7 +294,7 @@ function insertMany(table, records, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = expandReferences(records)(state);
+      const [recordData] = expandReferences(state, records);
       const columns = Object.keys(recordData[0]);
       const valueSets = recordData.map(
         (x) => `('${escape(Object.values(x)).join("', '")}')`
@@ -322,7 +323,7 @@ function upsert(table, uuid, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = expandReferences(record)(state);
+      const [recordData] = expandReferences(state, record);
       const columns = Object.keys(recordData).sort();
       const selectValues = columns.map((key) => `'${escape(recordData[key])}' AS ${key}`).join(", ");
       const updateValues = columns.map((key) => `[Target].${key}='${escape(recordData[key])}'`).join(", ");
@@ -368,9 +369,9 @@ function upsertIf(logical, table, uuid, record, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = expandReferences(record)(state);
+      const [recordData] = expandReferences(state, record);
       const columns = Object.keys(recordData).sort();
-      const logicalData = expandReferences(logical)(state);
+      const [logicalData] = expandReferences(state, logical);
       return new Promise((resolve, reject) => {
         if (!logicalData) {
           console.log(`Skipping upsert for ${uuid}.`);
@@ -420,7 +421,7 @@ function upsertMany(table, uuid, records, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const recordData = expandReferences(records)(state);
+      const [recordData] = expandReferences(state, records);
       return new Promise((resolve, reject) => {
         if (!recordData || recordData.length === 0) {
           console.log("No records provided; skipping upsert.");
@@ -471,7 +472,7 @@ function upsertMany(table, uuid, records, options) {
 function describeTable(tableName, options) {
   return (state) => {
     const { connection } = state;
-    const name = expandReferences(tableName)(state);
+    const [name] = expandReferences(state, tableName);
     try {
       const query = `SELECT column_name
           FROM information_schema.columns 
@@ -489,7 +490,7 @@ function insertTable(tableName, columns, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const data = expandReferences(columns)(state);
+      const [data] = expandReferences(state, columns);
       return new Promise((resolve, reject) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table creation.");
@@ -515,7 +516,7 @@ function modifyTable(tableName, columns, options) {
   return (state) => {
     const { connection } = state;
     try {
-      const data = expandReferences(columns)(state);
+      const [data] = expandReferences(state, columns);
       return new Promise((resolve, reject) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table modification.");
@@ -540,6 +541,7 @@ function modifyTable(tableName, columns, options) {
 var src_default = Adaptor_exports;
 export {
   alterState,
+  as,
   combine,
   cursor,
   dataPath,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/language-mssql",
   "label": "MSSQL",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "A Microsoft SQL language pack for OpenFn",
   "exports": {
     ".": {
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "tedious": "18.6.1",
-    "@openfn/language-common": "2.5.0"
+    "@openfn/language-common": "3.0.0"
   },
   "devDependencies": {
     "assertion-error": "2.0.0",

package/types/Adaptor.d.ts

@@ -170,4 +170,4 @@ export function insertTable(tableName: string, columns: any[], options: object):
  * @returns {Operation}
  */
 export function modifyTable(tableName: string, columns: any[], options: object): Operation;
-export { alterState, combine, dataPath, dataValue, dateFns, each, field, fields, fn, fnIf, http, lastReferenceValue, cursor, merge, sourceValue } from "@openfn/language-common";
+export { alterState, combine, dataPath, dataValue, dateFns, each, field, fields, fn, fnIf, http, lastReferenceValue, cursor, merge, sourceValue, as } from "@openfn/language-common";