@mcpher/gas-fakes 1.2.7 → 1.2.8

package/README.md

@@ -169,4 +169,5 @@ As I mentioned earlier, to take this further, I'm going to need a lot of help to
 - [named range identity](named-range-identity.md)
 - [adc and restricted scopes](https://ramblings.mcpher.com/how-to-allow-access-to-sensitive-scopes-with-application-default-credentials/)
 - [push test pull](pull-test-push.md)
-- [gas fakes cli](gas-fakes-cli.md)
+- [gas fakes cli](gas-fakes-cli.md)
+- [sharing cache and properties between gas-fakes and live apps script](https://ramblings.mcpher.com/sharing-cache-and-properties-between-gas-fakes-and-live-apps-script/)

package/gas-fakes.js

@@ -27,11 +27,13 @@ program
   )
   .option(
     "-e, --env <path>",
-    "provide path to your .env file for special options."
+    "provide path to your .env file for special options.",
+    "./.env"
   )
   .option(
     "-g, --gfsettings <path>",
-    "provide path to your gasfakes.json file for script options."
+    "provide path to your gasfakes.json file for script options.",
+    "./gasfakes.json"
   )
   .option(
     "-s, --script <string>",
@@ -63,12 +65,22 @@ program
         );
         process.exit();
       }
-      if (gfsettings) {
-        obj.gfSettings = path.resolve(gfsettings);
-      }
+
       if (env) {
-        dotenv.config({ path: path.resolve(env) });
+        const envPath = path.resolve(process.cwd(), env)
+        console.log ('...using env file in', envPath)
+        dotenv.config({ path: envPath, quiet: true});
+      }
+
+      // note this must come after any env file fiddling.
+      if (gfsettings) {
+        const gfPath = path.resolve(process.cwd(), gfsettings )
+        console.log ('...using gasfakes settings file in', gfPath)
+        obj.gfSettings = gfPath;
+        // override whatever is in env
+        process.env.GF_SETTINGS_PATH = gfPath
       }
+
       if (filename) {
         obj.filename = filename;
       }
@@ -177,10 +189,6 @@ function __getImportScript(o) {
   }
   const importScriptAr = [
     `async function runGas() {`,
-    // Pass the settings path to the init function if it's provided
-    gfSettings
-      ? `const settingsPath = "${gfSettings}";`
-      : `const settingsPath = undefined;`,
     `await import("./main.js");`, // This will trigger the fxInit call
     ...gasScriptAr,
     `};`,
@@ -194,6 +202,7 @@ function __getImportScript(o) {
 }
 
 async function loadScript(o) {
+
   const { filename, script, display } = o;
 
   const scriptText = filename ? fs.readFileSync(filename, "utf8") : script;

package/package.json

@@ -28,54 +28,11 @@
   },
   "type": "module",
   "scripts": {
-    "test": "node --env-file=./.env ./test/test.js",
-    "testdrive": "node --env-file=./.env ./test/testdrive.js execute",
-    "testsheetsdatavalidations": "node --env-file=./.env ./test/testsheetsdatavalidations.js execute",
-    "testsheetspermissions": "node --env-file=./.env ./test/testsheetspermissions.js execute",
-    "testsheetsvalues": "node --env-file=./.env ./test/testsheetsvalues.js execute",
-    "testsheets": "node --env-file=./.env ./test/testsheets.js execute",
-    "testfetch": "node --env-file=./.env ./test/testfetch.js execute",
-    "testsession": "node --env-file=./.env ./test/testsession.js execute",
-    "testutilities": "node --env-file=./.env ./test/testutilities.js execute",
-    "teststores": "node --env-file=./.env ./test/teststores.js execute",
-    "testscriptapp": "node --env-file=./.env ./test/testscriptapp.js execute",
-    "testfiddler": "node --env-file=./.env ./test/testfiddler.js execute",
-    "testenums": "node --env-file=./.env ./test/testenums.js execute",
-    "testsheetssets": "node --env-file=./.env ./test/testsheetssets.js execute",
-    "testsheetsvui": "node --env-file=./.env ./test/testsheetsvui.js execute",
-    "testsheetsdeveloper": "node --env-file=./.env ./test/testsheetsdeveloper.js execute",
-    "testsheetsexotics": "node --env-file=./.env ./test/testsheetsexotics.js execute",
-    "testsheetsdata": "node --env-file=./.env ./test/testsheetsdata.js execute",
-    "testdocsadv": "node --env-file=./.env ./test/testdocsadv.js execute",
-    "testslidesadv": "node --env-file=./.env ./test/testslidesadv.js execute",
-    "testform": "node --env-file=./.env ./test/testform.js execute",
-    "testformsadv": "node --env-file=./.env ./test/testformsadv.js execute",
-    "testdocs": "node --env-file=./.env ./test/testdocs.js execute",
-    "testslides": "node --env-file=./.env ./test/testslides.js execute",
-    "testdocsnext": "node --env-file=./.env ./test/testdocsnext.js execute",
-    "testsheetstext": "node --env-file=./.env ./test/testsheetstext.js execute",
-    "testsheetsrange": "node --env-file=./.env ./test/testsheetsrange.js execute",
-    "testdocslistitems": "node --env-file=./.env ./test/testdocslistitems.js execute",
-    "testdocsall": "node --env-file=./.env ./test/testdocsall.js",
-    "testdocsheaders": "node --env-file=./.env ./test/testdocsheaders.js execute",
-    "testdocsfooters": "node --env-file=./.env ./test/testdocsfooters.js execute",
-    "testdocsfootnotes": "node --env-file=./.env ./test/testdocsfootnotes.js execute",
-    "testdocsimages": "node --env-file=./.env ./test/testdocsimages.js execute",
-    "testdocsstyles": "node --env-file=./.env ./test/testdocsstyles.js execute",
-    "testsandbox": "node --trace-warnings ./test/testsandbox.js execute",
-    "testgmail": "node --env-file=./.env ./test/testgmail.js execute",
-    "testlogger": "node --env-file=./.env ./test/testlogger.js execute",
-    "testchat": "node --env-file=./.env ./test/testchat.js execute",
-    "testpeople": "node --env-file=./.env ./test/testpeople.js execute",
-    "testtasks": "node --env-file=./.env ./test/testtasks.js execute",
-    "testcalendar": "node --env-file=./.env ./test/testcalendar.js execute",
-    "testworkspaceevents": "node --env-file=./.env ./test/testworkspaceevents.js execute",
-    "testmimetype": "node --env-file=./.env ./test/testmimetype.js execute",
     "pub": "npm publish --access public"
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "license": "MIT",
   "main": "main.js",
   "description": "A proof of concept implementation of Apps Script Environment on Node",

package/src/support/sxauth.js

@@ -20,13 +20,12 @@ import path from 'path'
  * @param {string} p.authPath import the auth code 
  * @param {string} p.claspPath where to find the clasp file by default
  * @param {string} p.settingsPath where to find the settings file
- * @param {string} p.mainDir the directory the main app is running from
  * @param {string} p.cachePath the cache files
  * @param {string} p.propertiesPath the properties file location
  * @param {string} p.fakeId a fake script id to use if one isnt in the settings
  * @return {object} the finalized vesions of all the above 
  */
-export const sxInit = async ({ manifestPath, claspPath, settingsPath, mainDir, cachePath, propertiesPath, fakeId }) => {
+export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath, propertiesPath, fakeId }) => {
 
 
 
@@ -47,13 +46,11 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, mainDir, c
   }
 
   // files are relative to this main path
+  const settingsDir = path.dirname(settingsPath)
 
-  const settingsFile = path.resolve(mainDir, settingsPath)
-  const settingsDir = path.dirname(settingsFile)
-
-  // syncLog (JSON.stringify({mainDir,settingsPath,settingsDir,settingsFile}))
+  // syncLog (JSON.stringify({settingsPath,settingsDir,settingsPath}))
   // get the setting file if it exists
-  const _settings = await getIfExists(path.resolve(mainDir, settingsFile))
+  const _settings = await getIfExists(settingsPath)
   const settings = { ..._settings }
 
   // the content of the settings file take precedence over whatever is passed as the default
@@ -61,8 +58,8 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, mainDir, c
   settings.manifest = settings.manifest || manifestPath
   settings.clasp = settings.clasp || claspPath
   const [manifest, clasp] = await Promise.all([
-    getIfExists(path.resolve(mainDir, settings.manifest)),
-    getIfExists(path.resolve(mainDir, settings.clasp))
+    getIfExists(path.resolve(settingsDir, settings.manifest)),
+    getIfExists(path.resolve(settingsDir, settings.clasp))
   ])
 
   /// if we dont have a scriptId we need to check in clasp or make a fakeone
@@ -82,8 +79,8 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, mainDir, c
   const strSet = JSON.stringify(settings, null, 2)
   if (JSON.stringify(_settings, null, 2) !== strSet) {
     await mkdir(settingsDir, { recursive: true })
-    syncLog(`...writing to ${settingsFile}`);
-    writeFile(settingsFile, strSet, { flag: 'w' })
+    syncLog(`...writing to ${settingsPath}`);
+    writeFile(settingsPath, strSet, { flag: 'w' })
   }
 
   // get the required scopes and set them

package/src/support/syncit.js

@@ -262,10 +262,11 @@ const fxUnzipper = ({ blob }) => {
 const fxInit = ({
   manifestPath = manifestDefaultPath,
   claspPath = claspDefaultPath,
-  settingsPath = globalThis.settingsPath || settingsDefaultPath,
+  settingsPath = settingsDefaultPath,
   cachePath = cacheDefaultPath,
   propertiesPath = propertiesDefaultPath,
 } = {}) => {
+
   // this is the path of the runing main process
   const mainDir = path.dirname(process.argv[1]);