@mcpher/gas-fakes 2.3.18 → 2.5.2

package/src/services/spreadsheetapp/fakespreadsheet.js

@@ -35,13 +35,14 @@ export class FakeSpreadsheet {
   constructor(file) {
     // when we insert/delete sheets row/cols we update this metadata too
     this.__meta = file;
+    this.__activeRange = null;
+    this.__activeSheet = null;
 
     // may of these props can be picked up from the Drive API, so we'll look as a file too
     this.__file = DriveApp.getFileById(file.spreadsheetId);
 
     const props = [
       "getSpreadsheetTheme",
-      "setActiveSheet",
 
       "getBandings",
       "getDataSources",
@@ -102,12 +103,7 @@ export class FakeSpreadsheet {
       "isReadable",
       "isWritable",
       "getSelection",
-      "setActiveRangeList",
-      "setActiveRange",
       "getActiveRangeList",
-      "getCurrentCell",
-      "setCurrentCell",
-      "getActiveRange",
       "deleteRow",
       "hideRow",
       "appendRow",
@@ -133,9 +129,7 @@ export class FakeSpreadsheet {
       "getFrozenColumns",
       "unhideColumn",
       "insertColumnsBefore",
-      "setActiveSelection",
       "getDataSourceFormulas",
-      "insertImage",
       "getSheetPermissions",
       "insertColumnBefore",
 
@@ -160,16 +154,79 @@ export class FakeSpreadsheet {
         return notYetImplemented(f);
       };
     });
+  }
 
+  setActiveRange(range) {
+    this.__activeRange = range;
+    this.__activeSheet = range.getSheet();
+    this.__currentCell = range.getCell(1, 1);
+    
+    // Sync with SpreadsheetApp if this is the active spreadsheet
+    const app = SpreadsheetApp;
+    if (app && app.getActiveSpreadsheet() === this) {
+       app.setActiveSpreadsheet(this);
+    }
+    return range;
+  }
+
+  setActiveRangeList(rangeList) {
+    const ranges = rangeList.getRanges();
+    if (ranges && ranges.length > 0) {
+      this.setActiveRange(ranges[ranges.length - 1]);
+    }
+    return rangeList;
+  }
+  
+  setActiveSelection(rangeOrA1Notation) {
+    const { nargs, matchThrow } = signatureArgs(arguments, "Spreadsheet.setActiveSelection");
+    if (nargs !== 1) matchThrow();
+    
+    let range;
+    if (is.string(rangeOrA1Notation)) {
+        range = this.getRange(rangeOrA1Notation);
+    } else {
+        range = rangeOrA1Notation;
+    }
+    return this.setActiveRange(range);
+  }
+
+  getActiveRange() {
+    return this.__activeRange || this.getActiveSheet().getRange('A1');
+  }
+  
+  getCurrentCell() {
+    return this.__currentCell || this.getActiveSheet().getRange('A1');
+  }
+  
+  setCurrentCell(cell) {
+    this.__currentCell = cell;
+    this.__activeSheet = cell.getSheet();
+    // Setting current cell does not change the active range, just the cell within it.
+    // However, if there is no active range, it becomes the active range.
+    if (!this.__activeRange) {
+        this.__activeRange = cell;
+    }
+    return cell;
+  }
+
+  setActiveSheet(sheet, restoreSelection) {
+    const { nargs, matchThrow } = signatureArgs(arguments, "Spreadsheet.setActiveSheet");
+    if (nargs < 1 || nargs > 2) matchThrow();
+    this.__activeSheet = sheet;
+    return sheet;
   }
 
-  // note this is a workaround as we don't have the concept of active sheet in a non bound document
-  // so instead we'll just get the first sheet for now
-  // TODO - something better
   getActiveSheet() {
+    if (this.__activeSheet) return this.__activeSheet;
     return this.__getFirstSheet();
   }
 
+  insertImage(blobSourceOrUrl, column, row, offsetX, offsetY) {
+    const { nargs, matchThrow } = signatureArgs(arguments, "Spreadsheet.insertImage");
+    if (nargs < 3 || nargs > 5) matchThrow();
+    return this.getActiveSheet().insertImage(blobSourceOrUrl, column, row, offsetX, offsetY);
+  }
+
   addViewer(emailAddress) {
     this.__file.addViewer(emailAddress);
     return this;

package/src/services/spreadsheetapp/fakespreadsheetapp.js

@@ -16,6 +16,7 @@ import { newFakeConditionalFormatRuleBuilder } from "./fakeconditionalformatrule
 import { newFakeDataSourceSpecBuilder } from "./fakedatasourcespecbuilder.js";
 import { newFakeTextFinder } from "./faketextfinder.js";
 import { newFakeCellImageBuilder } from "./fakecellimagebuilder.js";
+import { newFakeUi } from "../common/fakeui.js";
 
 import * as Enums from "../enums/sheetsenums.js";
 
@@ -81,16 +82,8 @@ export class FakeSpreadsheetApp {
 
     const props = [
       "getActive",
-      "getActiveSheet",
-      "getCurrentCell",
-      "getActiveRange",
       "getActiveRangeList",
       "getSelection",
-      "setActiveSheet",
-      "setCurrentCell",
-      "setActiveRange",
-      "setActiveRangeList",
-      "getUi",
 
       "ChartAggregationType",
       "ChartTransformationType",
@@ -102,6 +95,11 @@ export class FakeSpreadsheetApp {
       };
     });
   }
+
+  getUi() {
+    return newFakeUi();
+  }
+
   toString() {
     return "SpreadsheetApp";
   }
@@ -124,8 +122,11 @@ export class FakeSpreadsheetApp {
     if (this.__activeSpreadsheet) return this.__activeSpreadsheet;
     // because this is a faked container bound app, we need to get the documentId from the config file
     const documentId = Auth.getDocumentId();
+    console.log('Worker Auth.getDocumentId():', documentId);
     if (documentId) {
-      return this.openById(documentId);
+      const ss = this.openById(documentId);
+      //console.log('Worker openById result:', ss);
+      return ss;
     }
     return null;
   }
@@ -135,6 +136,24 @@ export class FakeSpreadsheetApp {
     return this;
   }
 
+  getActiveSheet() {
+    const ss = this.getActiveSpreadsheet();
+    if (ss) return ss.getActiveSheet();
+    return null;
+  }
+
+  setActiveSheet(sheet, restoreSelection) {
+    const { nargs, matchThrow } = signatureArgs(arguments, "SpreadsheetApp.setActiveSheet");
+    if (nargs < 1 || nargs > 2) matchThrow();
+    
+    // According to GAS docs, setActiveSheet on SpreadsheetApp also sets the active spreadsheet
+    const ss = sheet.getParent();
+    if (ss) {
+      this.setActiveSpreadsheet(ss);
+      ss.setActiveSheet(sheet, restoreSelection);
+    }
+    return sheet;
+  }
 
   enableBigQueryExecution() {
     const { nargs, matchThrow } = signatureArgs(
@@ -145,6 +164,48 @@ export class FakeSpreadsheetApp {
     // This is a no-op in the fake environment, as there's no real execution to enable.
   }
 
+  getActiveRange() {
+    const ss = this.getActiveSpreadsheet();
+    if (ss) return ss.getActiveRange();
+    return null;
+  }
+  
+  setActiveRange(range) {
+    const ss = range.getSheet().getParent();
+    if (ss) {
+       this.setActiveSpreadsheet(ss);
+       return ss.setActiveRange(range);
+    }
+    return range;
+  }
+  
+  setActiveRangeList(rangeList) {
+    const ranges = rangeList.getRanges();
+    if (ranges && ranges.length > 0) {
+      const ss = ranges[0].getSheet().getParent();
+      if (ss) {
+         this.setActiveSpreadsheet(ss);
+         return ss.setActiveRangeList(rangeList);
+      }
+    }
+    return rangeList;
+  }
+  
+  getCurrentCell() {
+    const ss = this.getActiveSpreadsheet();
+    if (ss) return ss.getCurrentCell();
+    return null;
+  }
+  
+  setCurrentCell(cell) {
+    const ss = cell.getSheet().getParent();
+    if (ss) {
+       this.setActiveSpreadsheet(ss);
+       return ss.setCurrentCell(cell);
+    }
+    return cell;
+  }
+
   enableAllDataSourcesExecution() {
     const { nargs, matchThrow } = signatureArgs(
       arguments,

package/src/services/stores/fakestores.js

@@ -111,6 +111,7 @@ class FakePropertiesService {
   constructor(type) {
     this.kind = ServiceKind.PROPERTIES
     this.type = type
+    Syncit.fxGetAccessTokenInfo();
   }
 
   /**
@@ -147,6 +148,7 @@ class FakeCacheService {
   constructor(type) {
     this.kind = ServiceKind.CACHE
     this.type = type
+    Syncit.fxGetAccessTokenInfo();
   }
 
   /**
@@ -191,6 +193,11 @@ export const newFakeService = (kind) => {
 const selectCache = (domain, kind, defaultExpirationSeconds) => {
   // actually we might be overriding the type of service
   domain = validateProp(domain, StoreDomain, 'store_domain')
+  
+  if (domain === StoreDomain.USER && !Auth.getUserId()) {
+    throw new Error('User Properties/Cache requested, but no authenticated user identity was found. Ensure you have authenticated via \'gas-fakes auth\'.');
+  }
+
   const which = whichCache()
   if (which.type === "UPSTASH") {
     const models = getStoreModels()

package/src/support/auth.js

@@ -6,6 +6,7 @@ import { clearFileCache } from "./filecache.js";
 
 // Multi-identity storage
 export const _identities = new Map();
+
 // Prefer 'google' as the default platform if it is authorized in the environment
 let _platform = process.env.GF_PLATFORM_AUTH ? (process.env.GF_PLATFORM_AUTH.includes('google') ? 'google' : process.env.GF_PLATFORM_AUTH.split(',')[0]) : 'google';
 let _manifest = null;
@@ -361,6 +362,7 @@ export const Auth = {
   getAuthedScopes,
   getScriptId,
   getDocumentId,
+  getSettings,
   setSettings,
   getCachePath,
   getPropertiesPath,

package/src/support/proxies.js

@@ -78,7 +78,7 @@ const registerProxy = (name, getApp) => {
   Object.defineProperty(globalThis, name, {
     value,
     enumerable: true,
-    configurable: false,
+    configurable: true,
     writable: false,
   });
 }

package/src/support/sxauth.js

@@ -52,6 +52,8 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
     getIfExists(claspFile)
   ])
 
+  const manifestExists = Object.keys(manifest).length > 0;
+
   // Emulate manifest scopes from .env if missing or empty
   if (!manifest.oauthScopes || manifest.oauthScopes.length === 0) {
     const envScopes = Array.from(new Set([
@@ -65,10 +67,18 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
         manifest.timeZone = process.env.GF_TIMEZONE || "America/New_York";
       }
       if (!_loggedSummary) {
-        syncLog(`...appsscript.json missing or missing scopes. Emulating manifest using scopes from .env file`);
+        if (manifestExists) {
+          syncLog(`...appsscript.json found but 'oauthScopes' is missing. Emulating scopes from .env file`);
+        } else {
+          syncLog(`...appsscript.json missing. Emulating manifest using scopes from .env file`);
+        }
       }
     } else if (!_loggedSummary) {
-      syncWarn(`...Warning: No appsscript.json found and .env file missing or no DEFAULT_SCOPES/EXTRA_SCOPES defined in .env. Downstream API calls may fail with 'insufficient authentication scopes'.`);
+      if (manifestExists) {
+        syncWarn(`...Warning: appsscript.json found but 'oauthScopes' is missing, and no DEFAULT_SCOPES/EXTRA_SCOPES defined in .env. Downstream API calls may fail with 'insufficient authentication scopes'.`);
+      } else {
+        syncWarn(`...Warning: No appsscript.json found and no DEFAULT_SCOPES/EXTRA_SCOPES defined in .env. Downstream API calls may fail with 'insufficient authentication scopes'.`);
+      }
     }
   }
 
@@ -84,6 +94,7 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
   const identities = {};
 
   // --- Google Auth Block ---
+  let finalScopes = [];
   if (platforms.includes('google')) {
     try {
       // Ensure platform is set for info discovery
@@ -97,7 +108,7 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
       ]
       const scopeSet = new Set(scopes)
       mandatoryScopes.forEach(scope => scopeSet.add(scope))
-      const finalScopes = Array.from(scopeSet)
+      finalScopes = Array.from(scopeSet)
 
       // Check for file-type scopes that also require Drive scope
       const hasWorkspaceFileScope = finalScopes.some(s => 
@@ -153,27 +164,24 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
 
       // Provide guidance for Domain Wide Delegation issues
       if (err.message.includes('unauthorized_client')) {
-        const clientId = Auth.getClientId();
         const msg = [
           "",
           "=".repeat(80),
           "GOOGLE AUTHENTICATION ERROR: unauthorized_client",
-          "This usually means Domain-Wide Delegation (DWD) is missing for one or more scopes.",
-          "",
-          `Your Service Account Client ID is: ${clientId || 'unknown (check your service account JSON file)'}`,
+          "The scopes defined in your appsscript.json are not currently authorized.",
           "",
-          "The following scopes should be authorized in the Google Admin Console:",
+          "The following scopes are required:",
           finalScopes.join(","),
           "",
           "To fix this:",
-          "1. Go to https://admin.google.com",
-          "2. Security -> Access and data control -> API controls",
-          "3. Manage Domain Wide Delegation",
-          "4. Find/Add your Client ID and ensure the list of scopes above matches exactly.",
+          "1. Run 'gas-fakes init'",
+          "2. Run 'gas-fakes auth' to re-authenticate and sync your appsscript.json scopes.",
+          "3. If this is a Service Account with Domain-Wide Delegation (DWD), ensure these scopes are also added in the Google Admin Console (Security -> API Controls).",
           "=".repeat(80),
           ""
         ].join("\n");
         console.error(msg);
+        process.exit(1);
       }
 
       if (!platforms.includes('ksuite') && !platforms.includes('msgraph')) throw err;