@openfn/language-msgraph 0.3.2 → 0.3.4

package/dist/index.cjs

@@ -68,6 +68,7 @@ var import_util = require("@openfn/language-common/util");
 
 // src/Utils.js
 var import_undici = require("undici");
+var import_node_stream = require("stream");
 var import_language_common = require("@openfn/language-common");
 function assertDrive(state, driveName) {
   if (!state.drives[driveName]) {
@@ -97,11 +98,30 @@ function isValidHttpUrl(string) {
 function getAuth(token) {
   return token ? { headers: { Authorization: `Bearer ${token}` } } : null;
 }
+var isStream = (value) => {
+  if (value && typeof value == "object") {
+    if (value instanceof import_node_stream.Readable || value instanceof import_node_stream.Writable) {
+      return true;
+    }
+    if (value.pipeTo || value.pipe) {
+      return true;
+    }
+  }
+  return false;
+};
 function handleResponse(response, state, callback) {
-  const nextState = {
-    ...(0, import_language_common.composeNextState)(state, response),
-    response
-  };
+  let nextState;
+  if (isStream(response)) {
+    nextState = {
+      ...state,
+      data: response
+    };
+  } else {
+    nextState = {
+      ...(0, import_language_common.composeNextState)(state, response),
+      response
+    };
+  }
   if (callback)
     return callback(nextState);
   return nextState;
@@ -121,8 +141,9 @@ function handleResponseError(response, data, method) {
 var request = async (urlString, params = {}, method = "GET") => {
   let url = urlString;
   const defaultHeaders = { "Content-Type": "application/json" };
-  const { headers } = params;
+  const { headers, parseAs } = params;
   const setHeaders = { ...headers, ...defaultHeaders };
+  delete params.parseAs;
   delete params.headers;
   let options = {
     method,
@@ -135,7 +156,15 @@ var request = async (urlString, params = {}, method = "GET") => {
   }
   const response = await (0, import_undici.fetch)(url, options);
   const contentType = response.headers.get("Content-Type");
-  const data = (contentType == null ? void 0 : contentType.includes("application/json")) ? await response.json() : await response.text();
+  let data;
+  if (parseAs) {
+    if (parseAs === "json")
+      data = await response.json();
+    if (parseAs === "text")
+      data = await response.text();
+  } else {
+    data = (contentType == null ? void 0 : contentType.includes("application/json")) ? await response.json() : response.body;
+  }
   handleResponseError(response, data, method);
   return data;
 };
@@ -249,11 +278,11 @@ function getFolder(pathOrId, options, callback = (s) => s) {
   };
 }
 function getFile(pathOrId, options, callback = (s) => s) {
+  const defaultOptions = {
+    driveName: "default",
+    metadata: false
+  };
   return async (state) => {
-    const defaultOptions = {
-      driveName: "default",
-      metadata: false
-    };
     const { accessToken, apiVersion } = state.configuration;
     const [resolvedPathOrId, resolvedOptions] = (0, import_util.expandReferences)(
       state,
@@ -279,9 +308,11 @@ function getFile(pathOrId, options, callback = (s) => s) {
     }
     const url = getUrl(resource, apiVersion);
     const auth = getAuth(accessToken);
-    return request(url, { ...auth }).then(
-      (response) => handleResponse(response, state, callback)
-    );
+    const response = await request(url, {
+      ...auth,
+      parseAs: metadata ? "json" : "text"
+    });
+    return handleResponse(response, state, callback);
   };
 }
 

package/dist/index.js

@@ -31,6 +31,7 @@ import { expandReferences } from "@openfn/language-common/util";
 
 // src/Utils.js
 import { fetch } from "undici";
+import { Readable, Writable } from "stream";
 import { composeNextState } from "@openfn/language-common";
 function assertDrive(state, driveName) {
   if (!state.drives[driveName]) {
@@ -60,11 +61,30 @@ function isValidHttpUrl(string) {
 function getAuth(token) {
   return token ? { headers: { Authorization: `Bearer ${token}` } } : null;
 }
+var isStream = (value) => {
+  if (value && typeof value == "object") {
+    if (value instanceof Readable || value instanceof Writable) {
+      return true;
+    }
+    if (value.pipeTo || value.pipe) {
+      return true;
+    }
+  }
+  return false;
+};
 function handleResponse(response, state, callback) {
-  const nextState = {
-    ...composeNextState(state, response),
-    response
-  };
+  let nextState;
+  if (isStream(response)) {
+    nextState = {
+      ...state,
+      data: response
+    };
+  } else {
+    nextState = {
+      ...composeNextState(state, response),
+      response
+    };
+  }
   if (callback)
     return callback(nextState);
   return nextState;
@@ -84,8 +104,9 @@ function handleResponseError(response, data, method) {
 var request = async (urlString, params = {}, method = "GET") => {
   let url = urlString;
   const defaultHeaders = { "Content-Type": "application/json" };
-  const { headers } = params;
+  const { headers, parseAs } = params;
   const setHeaders = { ...headers, ...defaultHeaders };
+  delete params.parseAs;
   delete params.headers;
   let options = {
     method,
@@ -98,7 +119,15 @@ var request = async (urlString, params = {}, method = "GET") => {
   }
   const response = await fetch(url, options);
   const contentType = response.headers.get("Content-Type");
-  const data = (contentType == null ? void 0 : contentType.includes("application/json")) ? await response.json() : await response.text();
+  let data;
+  if (parseAs) {
+    if (parseAs === "json")
+      data = await response.json();
+    if (parseAs === "text")
+      data = await response.text();
+  } else {
+    data = (contentType == null ? void 0 : contentType.includes("application/json")) ? await response.json() : response.body;
+  }
   handleResponseError(response, data, method);
   return data;
 };
@@ -224,11 +253,11 @@ function getFolder(pathOrId, options, callback = (s) => s) {
   };
 }
 function getFile(pathOrId, options, callback = (s) => s) {
+  const defaultOptions = {
+    driveName: "default",
+    metadata: false
+  };
   return async (state) => {
-    const defaultOptions = {
-      driveName: "default",
-      metadata: false
-    };
     const { accessToken, apiVersion } = state.configuration;
     const [resolvedPathOrId, resolvedOptions] = expandReferences(
       state,
@@ -254,9 +283,11 @@ function getFile(pathOrId, options, callback = (s) => s) {
     }
     const url = getUrl(resource, apiVersion);
     const auth = getAuth(accessToken);
-    return request(url, { ...auth }).then(
-      (response) => handleResponse(response, state, callback)
-    );
+    const response = await request(url, {
+      ...auth,
+      parseAs: metadata ? "json" : "text"
+    });
+    return handleResponse(response, state, callback);
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-msgraph",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Microsoft Graph Language Pack for OpenFn",
   "type": "module",
   "exports": {
@@ -19,8 +19,8 @@
     "configuration-schema.json"
   ],
   "dependencies": {
-    "@openfn/language-common": "^1.10.1",
-    "undici": "^5.22.1"
+    "undici": "^5.22.1",
+    "@openfn/language-common": "1.10.3"
   },
   "devDependencies": {
     "@openfn/buildtools": "^1.0.2",