@mcpher/gas-fakes 1.0.21 → 1.0.23

package/src/support/syncit.js

@@ -1,49 +1,54 @@
 // this one is locally patched for now
 // import makeSynchronous from 'make-synchronous';
-import path from 'path'
-import { Auth } from "./auth.js"
-import { randomUUID } from 'node:crypto'
-import mime from 'mime';
-import { minFields } from './helpers.js'
-import { mergeParamStrings } from './utils.js'
-import { improveFileCache, checkResponse, getFromFileCache } from "./filecache.js"
-import { checkResponseCacher } from './fetchcacher.js';
-import { docsCacher } from "./docscacher.js"
-import { gmailCacher } from './gmailcacher.js';
-import { formsCacher } from './formscacher.js';
-import { slidesCacher } from './slidescacher.js';
-import { sheetsCacher } from './sheetscacher.js';
-import is from '@sindresorhus/is';
-import { callSync } from './workersync/synchronizer.js';
-
-
-const manifestDefaultPath = './appsscript.json'
-const claspDefaultPath = "./.clasp.json"
-const settingsDefaultPath = "./gasfakes.json"
-const propertiesDefaultPath = "/tmp/gas-fakes/properties"
-const cacheDefaultPath = "/tmp/gas-fakes/cache"
+import path from "path";
+import { Auth } from "./auth.js";
+import { randomUUID } from "node:crypto";
+import mime from "mime";
+import { minFields } from "./helpers.js";
+import { mergeParamStrings } from "./utils.js";
+import {
+  improveFileCache,
+  checkResponse,
+  getFromFileCache,
+} from "./filecache.js";
+import { checkResponseCacher } from "./fetchcacher.js";
+import { docsCacher } from "./docscacher.js";
+import { gmailCacher } from "./gmailcacher.js";
+import { formsCacher } from "./formscacher.js";
+import { slidesCacher } from "./slidescacher.js";
+import { sheetsCacher } from "./sheetscacher.js";
+import is from "@sindresorhus/is";
+import { callSync } from "./workersync/synchronizer.js";
+
+const manifestDefaultPath = "./appsscript.json";
+const claspDefaultPath = "./.clasp.json";
+const settingsDefaultPath = "./gasfakes.json";
+const propertiesDefaultPath = "/tmp/gas-fakes/properties";
+const cacheDefaultPath = "/tmp/gas-fakes/cache";
 // note that functions like Sheets.newGridRange() etc create objects that contain get and set functions
 // the makesynchronous functions need data that can be serialized. so we need to string/parse to normlaize them
-const normalizeSerialization = (ob) => is.nullOrUndefined(ob) || !is.object(ob) ? ob : JSON.parse(JSON.stringify(ob))
-
+const normalizeSerialization = (ob) =>
+  is.nullOrUndefined(ob) || !is.object(ob)
+    ? ob
+    : JSON.parse(JSON.stringify(ob));
 
 /**
  * check and register a result in cache
  * @param {import('./sxdrive.js').SxResult} the result of a sync api call
- * @return {import('./sxdrive.js').SxResult} 
+ * @return {import('./sxdrive.js').SxResult}
  */
 const registerSx = (result, allow404 = false, fields) => {
-  const { data, response } = result
-  checkResponse(data?.id, response, allow404)
+  const { data, response } = result;
+  checkResponse(data?.id, response, allow404);
   if (data?.id) {
     return {
       ...result,
-      data: improveFileCache(data.id, data, fields)
-    }
+      data: improveFileCache(data.id, data, fields),
+    };
   } else {
-    return result
+    return result;
   }
-}
+};
 
 const register = (id, cacher, result, allow404 = false, params) => {
   const { data, response } = result;
@@ -56,8 +61,7 @@ const register = (id, cacher, result, allow404 = false, params) => {
   } else {
     return result;
   }
-}
-
+};
 
 /**
  * sync a call to Drive api to stream a download
@@ -71,21 +75,28 @@ const register = (id, cacher, result, allow404 = false, params) => {
  * @param {object} [p.params] any extra params
  * @return {import('./sxdrive.js').SxResult} from the drive api
  */
-const fxStreamUpMedia = ({ file = {}, blob, fields = "", method = "create", fileId, params = {} }) => {
+const fxStreamUpMedia = ({
+  file = {},
+  blob,
+  fields = "",
+  method = "create",
+  fileId,
+  params = {},
+}) => {
   // merge the required fields with the minimum
-  fields = mergeParamStrings(minFields, fields)
-  const result = callSync('sxStreamUpMedia', {
+  fields = mergeParamStrings(minFields, fields);
+  const result = callSync("sxStreamUpMedia", {
     resource: file,
     bytes: blob ? blob.getBytes() : null,
     fields,
     method,
     mimeType: file.mimeType || blob?.getContentType(),
     fileId,
-    params
-  })
+    params,
+  });
   // check result and register in cache
-  return registerSx(result, false, fields)
-}
+  return registerSx(result, false, fields);
+};
 
 /**
  * sync a call to Drive api
@@ -96,29 +107,37 @@ const fxStreamUpMedia = ({ file = {}, blob, fields = "", method = "create", file
  * @return {DriveResponse} from the drive api
  */
 const fxDrive = ({ prop, method, params, options }) => {
-  return callSync('sxDrive', {
+  return callSync("sxDrive", {
     prop,
     method,
     params: normalizeSerialization(params),
-    options: normalizeSerialization(options)
+    options: normalizeSerialization(options),
   });
-}
+};
 
-const fxGeneric = ({ serviceName, prop, subProp, method, params, options, cacher, idField }) => {
+const fxGeneric = ({
+  serviceName,
+  prop,
+  subProp,
+  method,
+  params,
+  options,
+  cacher,
+  idField,
+}) => {
   const { [idField]: resourceId, ...otherParams } = params;
 
-  if (method === 'get') {
+  if (method === "get") {
     const data = cacher.getEntry(resourceId, otherParams);
     if (data) {
       return {
         data,
         response: {
           status: 200,
-          fromCache: true
-        }
-      }
+          fromCache: true,
+        },
+      };
     }
-
   }
 
   const result = callSync(`sx${serviceName}`, {
@@ -126,20 +145,18 @@ const fxGeneric = ({ serviceName, prop, subProp, method, params, options, cacher
     prop,
     method,
     params: normalizeSerialization(params),
-    options: normalizeSerialization(options)
-  })
+    options: normalizeSerialization(options),
+  });
 
-  if (method === 'get') {
-    return register(resourceId, cacher, result, false, otherParams)
+  if (method === "get") {
+    return register(resourceId, cacher, result, false, otherParams);
   }
 
   if (resourceId) {
-    cacher.clear(resourceId)
+    cacher.clear(resourceId);
   }
-  return result
-}
-
-
+  return result;
+};
 
 /**
  * sync a call to Drive api get
@@ -150,38 +167,43 @@ const fxGeneric = ({ serviceName, prop, subProp, method, params, options, cacher
  * @param {object} p.params the params to add to the request
  * @return {DriveResponse} from the drive api
  */
-const fxDriveGet = ({ id, params, allow404 = false, allowCache = true, options }) => {
-
+const fxDriveGet = ({
+  id,
+  params,
+  allow404 = false,
+  allowCache = true,
+  options,
+}) => {
   // fixup the fields param
   // we'll fiddle with the scopes to populate cache
-  params.fields = mergeParamStrings(minFields, params.fields || "")
-  params.fileId = id
+  params.fields = mergeParamStrings(minFields, params.fields || "");
+  params.fileId = id;
 
   // now we check if it's in cache and already has the necessary fields
   // the cache will check the fields it already has against those requested
   if (allowCache) {
-    const { cachedFile, good } = getFromFileCache(id, params.fields)
-    if (good) return {
-
-      data: cachedFile,
-      // fake a good sxresponse
-      response: {
-        status: 200,
-        fromCache: true
-      }
-    }
+    const { cachedFile, good } = getFromFileCache(id, params.fields);
+    if (good)
+      return {
+        data: cachedFile,
+        // fake a good sxresponse
+        response: {
+          status: 200,
+          fromCache: true,
+        },
+      };
   }
 
   // so we have to hit the API
-  const result = callSync('sxDriveGet', {
+  const result = callSync("sxDriveGet", {
     id,
     params: normalizeSerialization(params),
-    options: normalizeSerialization(options)
+    options: normalizeSerialization(options),
   });
 
   // check result and register in cache
-  return registerSx(result, allow404, params.fields)
-}
+  return registerSx(result, allow404, params.fields);
+};
 
 /**
  * zipper
@@ -190,26 +212,24 @@ const fxDriveGet = ({ id, params, allow404 = false, allowCache = true, options }
  * @returns {FakeBlob} a combined zip file
  */
 const fxZipper = ({ blobs }) => {
-
-  const dupCheck = new Set()
+  const dupCheck = new Set();
   const blobsContent = blobs.map((f, i) => {
-    const ext = mime.getExtension(f.getContentType())
-    const name = f.getName() || `Untitled${i + 1}${ext ? "." + ext : ""}`
+    const ext = mime.getExtension(f.getContentType());
+    const name = f.getName() || `Untitled${i + 1}${ext ? "." + ext : ""}`;
     if (dupCheck.has(name)) {
-      throw new Error(`Duplicate filename ${name} not allowed in zip`)
+      throw new Error(`Duplicate filename ${name} not allowed in zip`);
     }
-    dupCheck.add(name)
+    dupCheck.add(name);
     return {
       name,
-      bytes: f.getBytes()
-    }
-  })
-
-  return callSync('sxZipper', {
-    blobsContent
-  })
+      bytes: f.getBytes(),
+    };
+  });
 
-}
+  return callSync("sxZipper", {
+    blobsContent,
+  });
+};
 
 /**
  * Unzipper
@@ -218,16 +238,15 @@ const fxZipper = ({ blobs }) => {
  * @returns {FakeBlob[]} each of the files unzipped
  */
 const fxUnzipper = ({ blob }) => {
-
   const blobContent = {
     name: blob.getName(),
-    bytes: blob.getBytes()
-  }
+    bytes: blob.getBytes(),
+  };
 
-  return callSync('sxUnzipper', {
-    blobContent
-  })
-}
+  return callSync("sxUnzipper", {
+    blobContent,
+  });
+};
 
 /**
  * initialize all the stuff at the beginning such as manifest content and settings
@@ -238,29 +257,28 @@ const fxUnzipper = ({ blob }) => {
  * @param {string} p.settingsPath where to find the settings file
  * @param {string} p.cachePath the cache files
  * @param {string} p.propertiesPath the properties file location
- * @return {object} the finalized vesions of all the above 
+ * @return {object} the finalized vesions of all the above
  */
 const fxInit = ({
   manifestPath = manifestDefaultPath,
   claspPath = claspDefaultPath,
   settingsPath = settingsDefaultPath,
   cachePath = cacheDefaultPath,
-  propertiesPath = propertiesDefaultPath
+  propertiesPath = propertiesDefaultPath,
 } = {}) => {
-
   // this is the path of the runing main process
-  const mainDir = path.dirname(process.argv[1])
+  const mainDir = path.dirname(process.argv[1]);
 
   // because this is all run in a synced subprocess it's not an async result
-  const synced = callSync('sxInit', {
+  const synced = callSync("sxInit", {
     claspPath,
     settingsPath,
     manifestPath,
     mainDir,
     cachePath,
     propertiesPath,
-    fakeId: randomUUID()
-  })
+    fakeId: randomUUID(),
+  });
 
   const {
     scopes,
@@ -270,24 +288,20 @@ const fxInit = ({
     accessToken,
     settings,
     manifest,
-    clasp
-  } = synced
+    clasp,
+  } = synced;
 
   // set these values from the subprocess for the main project
-  Auth.setProjectId(projectId)
+  Auth.setProjectId(projectId);
   //Auth.setAuth(scopes)
-  Auth.setTokenInfo(tokenInfo)
+  Auth.setTokenInfo(tokenInfo);
   //Auth.setAdcPath(adcPath)
   //Auth.setAccessToken(accessToken)
-  Auth.setSettings(settings)
-  Auth.setClasp(clasp)
-  Auth.setManifest(manifest)
-  return synced
-
-}
-
-
-
+  Auth.setSettings(settings);
+  Auth.setClasp(clasp);
+  Auth.setManifest(manifest);
+  return synced;
+};
 
 /**
  * because we're using a file backed cache we need to syncit
@@ -297,21 +311,17 @@ const fxInit = ({
  * @returns {*}
  */
 const fxStore = (storeArgs, method = "get", ...kvArgs) => {
-
-  return callSync('sxStore', {
+  return callSync("sxStore", {
     method,
     kvArgs,
-    storeArgs
-  })
-}
-
+    storeArgs,
+  });
+};
 
 const fxRefreshToken = () => {
-
-  return callSync('sxRefreshToken');
+  return callSync("sxRefreshToken");
 };
 
-
 /**
  * sync a call to Drive api to stream a download
  * @param {object} p pargs
@@ -321,14 +331,10 @@ const fxRefreshToken = () => {
  * @return {DriveResponse} from the drive api
  */
 const fxDriveMedia = ({ id }) => {
-
-  return callSync('sxDriveMedia', {
-    id
+  return callSync("sxDriveMedia", {
+    id,
   });
-}
-
-
-
+};
 
 /**
  * a sync version of fetching
@@ -338,15 +344,46 @@ const fxDriveMedia = ({ id }) => {
  * @returns {reponse} urlfetch style reponse
  */
 const fxFetch = (url, options, responseFields) => {
+  return callSync("sxFetch", url, options, responseFields);
+};
 
-  return callSync('sxFetch', url, options, responseFields);
-}
+const fxSheets = (args) =>
+  fxGeneric({
+    ...args,
+    serviceName: "Sheets",
+    cacher: sheetsCacher,
+    idField: "spreadsheetId",
+  });
+const fxSlides = (args) =>
+  fxGeneric({
+    ...args,
+    serviceName: "Slides",
+    cacher: slidesCacher,
+    idField: "presentationId",
+  });
+const fxDocs = (args) =>
+  fxGeneric({
+    ...args,
+    serviceName: "Docs",
+    cacher: docsCacher,
+    idField: "documentId",
+  });
+const fxForms = (args) =>
+  fxGeneric({
+    ...args,
+    serviceName: "Forms",
+    cacher: formsCacher,
+    idField: "formId",
+  });
+const fxGmail = (args) =>
+  fxGeneric({
+    ...args,
+    serviceName: "Gmail",
+    cacher: gmailCacher,
+    idField: "id",
+  });
 
-const fxSheets = (args) => fxGeneric({ ...args, serviceName: 'Sheets', cacher: sheetsCacher, idField: 'spreadsheetId' });
-const fxSlides = (args) => fxGeneric({ ...args, serviceName: 'Slides', cacher: slidesCacher, idField: 'presentationId' });
-const fxDocs = (args) => fxGeneric({ ...args, serviceName: 'Docs', cacher: docsCacher, idField: 'documentId' });
-const fxForms = (args) => fxGeneric({ ...args, serviceName: 'Forms', cacher: formsCacher, idField: 'formId' });
-const fxGmail = (args) => fxGeneric({ ...args, serviceName: 'Gmail', cacher: gmailCacher, idField: 'id' });
+const fxGetImagesFromXlsx = (args) => callSync("sxGetImagesFromXlsx", args);
 
 export const Syncit = {
   fxFetch,
@@ -364,4 +401,5 @@ export const Syncit = {
   fxDocs,
   fxForms,
   fxGmail,
-}
+  fxGetImagesFromXlsx,
+};

package/src/support/workersync/sxfunctions.js

@@ -1,10 +1,11 @@
-export * from '../sxdrive.js';
-export * from '../sxsheets.js';
-export * from '../sxdocs.js';
-export * from '../sxslides.js';
-export * from '../sxforms.js';
-export * from '../sxfetch.js';
-export * from '../sxstore.js';
-export * from '../sxzip.js';
-export * from '../sxauth.js';
-export * from '../sxgmail.js';
+export * from "../sxdrive.js";
+export * from "../sxsheets.js";
+export * from "../sxdocs.js";
+export * from "../sxslides.js";
+export * from "../sxforms.js";
+export * from "../sxfetch.js";
+export * from "../sxstore.js";
+export * from "../sxzip.js";
+export * from "../sxauth.js";
+export * from "../sxgmail.js";
+export * from "../sxxlsx.js";

package/togas.bash

@@ -24,41 +24,10 @@ cp ${SOURCE}/test*.js ${TARGET}/test
 
 
 # find all the copied files and comment/fixes out import and export statements
-# note - this simple version naively expects that to be on 1 line
-# version below only works on linux - the perl version should work on both mac and linux
-#find "${TARGET}" -name "${EXT}" -type f -exec perl -i -pe 'if (/^import\b/) { $in_import=1 } if ($in_import) { s/^/\/\//; if (/['\''"][^'\''"]*['\''"];?\s*$/) { $in_import=0 } }' {} +
-# sed -i 's/^import\s\s*/\/\/import /g' $(find "${TARGET}" -name "${EXT}" -type f) 
-#sed -i 's/^\s*export\s\s*//g' $(find "${TARGET}" -name "${EXT}" -type f)
-
-
-# Perl works consistently across platforms
+# Perl should work across platforms
 find "${TARGET}" -name "${EXT}" -type f -exec perl -i -pe 's/^\s*export\s\s*//g' {} \;
 find "${TARGET}" -name "${EXT}" -type f -exec perl -i -pe 'if (/^import\b/) { $in_import=1 } if ($in_import) { s/^/\/\//; if (/['\''"][^'\''"]*['\''"];?\s*$/) { $in_import=0 } }' {} +
-# sed -i 's/^import\s\s*/\/\/import /g' $(find "${TARGET}" -name "${EXT}" -type f) 
-# replace all process.env.VAR_NAME occurrences with actual value
-# process.env is not usable in apps script
-#for var in $(grep -oP 'process\.env\.\K\w+' "${TARGET}/test/testinit.js"); do
-
-# Use macos + linux version
-vars=($(grep -oE 'process\.env\.\w+' "${TARGET}/test/testinit.js" | sed 's/process\.env\.//'))
-
-for var in "${vars[@]}"; do
-
-    value=$(printenv "$var")  # Get the environment variable value
-
-    # Escape characters for sed, e.g. \n becomes \\n, & becomes \&
-    value=$(printf '%q' "$value")
-
-    # Check if the value contains non-numeric characters (treat as a string)
-    if [[ "$value" =~ [^0-9] ]]; then
-        value="\"$value\""  # Add double quotes
-    fi
 
-    # Replace process.env.VARIABLE_NAME with the actual value
-    #sed -i "s|process.env.$var|$value|g" ${TARGET}/test/testinit.js
-    #macos + linux
-    sed -i "" "s|process.env.$var|$value|g" "${TARGET}/test/testinit.js"
-done
 
 # now go to the target and push and open if required
 if [ "$CLASP" = true ] ; then