@mcpher/gas-fakes 1.2.32 → 2.0.1

package/src/services/slidesapp/fakepresentation.js

@@ -17,10 +17,10 @@ export class FakePresentation {
   constructor(resource) {
     this.__id = resource.presentationId;
   }
-  get __file () {
+  get __file() {
     return DriveApp.getFileById(this.__id);
   }
-  get __resource () {
+  get __resource() {
     return Slides.Presentations.get(this.__id);
   }
   saveAndClose() {
@@ -73,14 +73,20 @@ export class FakePresentation {
    * @returns {FakeSlide} The new slide.
    */
   appendSlide(layout) {
+    const objectId = `slide_${Math.random().toString(36).substring(2, 11)}`;
     const requests = [{
       createSlide: {
+        objectId,
         slideLayoutReference: layout ? { predefinedLayout: layout } : { predefinedLayout: 'BLANK' }
       }
     }];
-    const result = Slides.Presentations.batchUpdate(requests, this.getId());
-    const newObjectId = result.replies[0].createSlide.objectId;
-    return this.getSlideById(newObjectId);
+    try {
+      Slides.Presentations.batchUpdate(requests, this.getId());
+    } catch (err) {
+      // If it already exists, it means a previous attempt succeeded but timed out
+      if (!err?.message?.includes('already exists')) throw err;
+    }
+    return this.getSlideById(objectId);
   }
 
   /**
@@ -90,15 +96,20 @@ export class FakePresentation {
    * @returns {FakeSlide} The new slide.
    */
   insertSlide(index, layout) {
+    const objectId = `slide_${Math.random().toString(36).substring(2, 11)}`;
     const requests = [{
       createSlide: {
+        objectId,
         insertionIndex: index,
         slideLayoutReference: layout ? { predefinedLayout: layout } : { predefinedLayout: 'BLANK' }
       }
     }];
-    const result = Slides.Presentations.batchUpdate(requests, this.getId());
-    const newObjectId = result.replies[0].createSlide.objectId;
-    return this.getSlideById(newObjectId);
+    try {
+      Slides.Presentations.batchUpdate(requests, this.getId());
+    } catch (err) {
+      if (!err?.message?.includes('already exists')) throw err;
+    }
+    return this.getSlideById(objectId);
   }
 
   toString() {

package/src/services/slidesapp/fakeslide.js

@@ -91,11 +91,16 @@ export class FakeSlide {
    */
   remove() {
     const presentationId = this.__presentation.getId();
-    Slides.Presentations.batchUpdate([{
-      deleteObject: {
-        objectId: this.getObjectId()
-      }
-    }], presentationId);
+    try {
+      Slides.Presentations.batchUpdate([{
+        deleteObject: {
+          objectId: this.getObjectId()
+        }
+      }], presentationId);
+    } catch (err) {
+      // If not found, it's already deleted (perhaps on a previous timeouted attempt)
+      if (!err?.message?.includes('not found')) throw err;
+    }
   }
 
   /**
@@ -111,8 +116,10 @@ export class FakeSlide {
     // Default size and position if not provided
     // shapeType should be string e.g. TEXT_BOX
     const presentationId = this.__presentation.getId();
-    const result = Slides.Presentations.batchUpdate([{
+    const objectId = `shape_${Math.random().toString(36).substring(2, 11)}`;
+    const requests = [{
       createShape: {
+        objectId,
         shapeType: shapeType,
         elementProperties: {
           pageObjectId: this.getObjectId(),
@@ -129,10 +136,13 @@ export class FakeSlide {
           }
         }
       }
-    }], presentationId);
+    }];
 
-    // The result contains the new object ID
-    const newObjectId = result.replies[0].createShape.objectId;
+    try {
+      Slides.Presentations.batchUpdate(requests, presentationId);
+    } catch (err) {
+      if (!err?.message?.includes('already exists')) throw err;
+    }
 
     // We assume the shape is added to the slide and we can retrieve it
     // Wait, we need to return a FakeShape.
@@ -152,7 +162,7 @@ export class FakeSlide {
     // So subsequent access should be fresh.
 
     const elements = this.getPageElements();
-    const newElement = elements.find(e => e.getObjectId() === newObjectId);
+    const newElement = elements.find(e => e.getObjectId() === objectId);
     if (!newElement) throw new Error('New shape not found');
     return newElement.asShape();
   }
@@ -168,8 +178,10 @@ export class FakeSlide {
    */
   insertLine(lineCategory, left = 0, top = 0, width = 100, height = 100) {
     const presentationId = this.__presentation.getId();
-    const result = Slides.Presentations.batchUpdate([{
+    const objectId = `line_${Math.random().toString(36).substring(2, 11)}`;
+    const requests = [{
       createLine: {
+        objectId,
         lineCategory: lineCategory,
         elementProperties: {
           pageObjectId: this.getObjectId(),
@@ -186,28 +198,41 @@ export class FakeSlide {
           }
         }
       }
-    }], presentationId);
+    }];
+
+    try {
+      Slides.Presentations.batchUpdate(requests, presentationId);
+    } catch (err) {
+      if (!err?.message?.includes('already exists')) throw err;
+    }
 
-    const newObjectId = result.replies[0].createLine.objectId;
     const elements = this.getPageElements();
-    const newElement = elements.find(e => e.getObjectId() === newObjectId);
+    const newElement = elements.find(e => e.getObjectId() === objectId);
     if (!newElement) throw new Error('New line not found');
     return newElement.asLine();
   }
 
   duplicate() {
     const presentationId = this.__presentation.getId();
-    const result = Slides.Presentations.batchUpdate([{
+    const objectId = `slide_${Math.random().toString(36).substring(2, 11)}`;
+    const requests = [{
       duplicateObject: {
-        objectId: this.getObjectId()
+        objectId: this.getObjectId(),
+        objectIds: {
+          [this.getObjectId()]: objectId
+        }
       }
-    }], presentationId);
+    }];
+
+    try {
+      Slides.Presentations.batchUpdate(requests, presentationId);
+    } catch (err) {
+      if (!err?.message?.includes('already exists')) throw err;
+    }
 
-    // The result contains the new object ID
-    const newObjectId = result.replies[0].duplicateObject.objectId;
     // We need to get the updated presentation to find the new slide resource
     const updatedPresentation = Slides.Presentations.get(presentationId);
-    const newSlideResource = updatedPresentation.slides.find(s => s.objectId === newObjectId);
+    const newSlideResource = updatedPresentation.slides.find(s => s.objectId === objectId);
     return newFakeSlide(newSlideResource, this.__presentation);
   }
 

package/src/services/spreadsheetapp/fakesheet.js

@@ -16,7 +16,7 @@ import { newFakeProtection } from "./fakeprotection.js";
 import { newFakeOverGridImage } from "./fakeovergridimage.js";
 
 import { XMLParser } from "fast-xml-parser";
-import {slogger } from "../../support/slogger.js";
+import { slogger } from "../../support/slogger.js";
 const { is, isEnum } = Utils;
 
 export const newFakeSheet = (properties, parent) => {
@@ -1075,12 +1075,14 @@ export class FakeSheet {
     const unzipped = Utilities.unzip(blob);
     const xmlObj = unzipped.reduce((o, b) => {
       const filename = b.getName();
-      const parser = new XMLParser({ ignoreAttributes: false });
-      try {
-        const p = parser.parse(b.getDataAsString());
-        o[filename] = p;
-      } catch (err) {
-          slogger.error(err)
+      if (filename.endsWith('.xml') || filename.endsWith('.rels')) {
+        const parser = new XMLParser({ ignoreAttributes: false });
+        try {
+          const p = parser.parse(b.getDataAsString());
+          o[filename] = p;
+        } catch (err) {
+          slogger.error(`Error parsing ${filename}: ${err.message}`);
+        }
       }
       return o;
     }, {});

package/src/services/stores/fakestores.js

@@ -6,7 +6,7 @@ import { storeModels } from './gasflex.js'
 import { newCacheDropin } from '@mcpher/gas-flex-cache'
 import { notYetImplemented } from '../../support/helpers.js'
 const { is } = Utils
-import {slogger } from "../../support/slogger.js";
+import { slogger } from "../../support/slogger.js";
 /**
  * what these props mean
  * store_type = currently upstash or file - it defines the back end and maps to env variable
@@ -87,7 +87,7 @@ const validateProp = (prop, vob, name = '') => {
 // this checks to see if we want to override a service with gas-flex-cache
 const whichCache = () => {
   // this will return the actual value of the enum, not the property name
-  const type = validateProp (process.env.STORE_TYPE || "file", StoreType, 'store_type')
+  const type = validateProp(process.env.STORE_TYPE || "file", StoreType, 'store_type')
   if (type === StoreType.UPSTASH) {
     const url = process.env.UPSTASH_REDIS_REST_URL
     const token = process.env.UPSTASH_REDIS_REST_TOKEN
@@ -136,7 +136,7 @@ class FakePropertiesService {
    * @returns {FakeProperties}
    */
   getScriptProperties() {
-     return selectCache(StoreDomain.SCRIPT, this.kind)
+    return selectCache(StoreDomain.SCRIPT, this.kind)
   }
 }
 
@@ -145,7 +145,7 @@ class FakePropertiesService {
  */
 class FakeCacheService {
   constructor(type) {
-    this.kind =  ServiceKind.CACHE
+    this.kind = ServiceKind.CACHE
     this.type = type
   }
 
@@ -164,7 +164,7 @@ class FakeCacheService {
    * @returns {FakeCache}
    */
   getUserCache() {
-    return selectCache(StoreDomain.USER, this.kind,DEFAULT_CACHE_EXPIRY)
+    return selectCache(StoreDomain.USER, this.kind, DEFAULT_CACHE_EXPIRY)
   }
 
   /**
@@ -172,7 +172,7 @@ class FakeCacheService {
    * @returns {FakeCache}
    */
   getScriptCache() {
-     return selectCache(StoreDomain.SCRIPT, this.kind, DEFAULT_CACHE_EXPIRY)
+    return selectCache(StoreDomain.SCRIPT, this.kind, DEFAULT_CACHE_EXPIRY)
   }
 }
 
@@ -182,28 +182,30 @@ class FakeCacheService {
  * @returns {FakePropertiesService | FakeCacheService}
  */
 export const newFakeService = (kind) => {
-  kind = validateProp (kind, ServiceKind, 'service_kind')
-  const w = whichCache ()
-  slogger.log (`...${kind} store service is using store type ${w.type} as backend`)
+  kind = validateProp(kind, ServiceKind, 'service_kind')
+  const w = whichCache()
+  slogger.log(`...${kind} store service is using store type ${w.type} as backend`)
   return Proxies.guard(kind === ServiceKind.CACHE ? new FakeCacheService(w.type) : new FakePropertiesService(w.type))
 }
 
 const selectCache = (domain, kind, defaultExpirationSeconds) => {
   // actually we might be overriding the type of service
-  domain = validateProp (domain, StoreDomain, 'store_domain')
+  domain = validateProp(domain, StoreDomain, 'store_domain')
   const which = whichCache()
   if (which.type === "UPSTASH") {
     const model = storeModels[domain]
     if (!model) {
-      throw new Error(`invalid store type model for ${cacheType}`) 
+      throw new Error(`invalid store type model for ${cacheType}`)
     }
-    return newCacheDropin ({ creds: {
-      ...model,
-      ...which,
-      type: "upstash",
-      kind: kind.toLowerCase(),
-      defaultExpirationSeconds
-    }})
+    return newCacheDropin({
+      creds: {
+        ...model,
+        ...which,
+        type: "upstash",
+        kind: kind.toLowerCase(),
+        defaultExpirationSeconds
+      }
+    })
   } else if (which.type === StoreType.FILE) {
     const store = kind === ServiceKind.CACHE ? FakeCache : FakeProperties
     return Proxies.guard(new store(domain))

package/src/services/stores/gasflex.js

@@ -1,18 +1,17 @@
-import {Auth} from '../../support/auth.js'
-import { getUserIdFromToken} from '@mcpher/gas-flex-cache'
+import { Auth } from '../../support/auth.js'
+import { getUserIdFromToken } from '@mcpher/gas-flex-cache'
 
 // these are the default models to match live apps script
 export const storeModels = {
-    SCRIPT: {
-        scriptId: ScriptApp.getScriptId()
-    },
-    USER: {
-        scriptId: ScriptApp.getScriptId(),
-        userId: getUserIdFromToken(ScriptApp.getOAuthToken())
-    },
-    DOCUMENT: {
-        scriptId: ScriptApp.getScriptId(),
-        documentId: Auth.getDocumentId()
-    }
+  SCRIPT: {
+    scriptId: ScriptApp.getScriptId()
+  },
+  USER: {
+    scriptId: ScriptApp.getScriptId(),
+    userId: getUserIdFromToken(ScriptApp.getOAuthToken())
+  },
+  DOCUMENT: {
+    scriptId: ScriptApp.getScriptId(),
+    documentId: Auth.getDocumentId()
+  }
 }
-

package/src/services/urlfetchapp/app.js

@@ -86,8 +86,8 @@ const fetch = (url, options = {}) => {
     'rawBody'
   ]
 
-  const response = Syncit.fxFetch(url, options, responseFields)
-  return responsify(response)
+  const { data } = Syncit.fxFetch(url, options, responseFields)
+  return responsify(data)
 }
 
 // this has been syncified
@@ -102,7 +102,7 @@ const fetchAll = (requests) => {
   ]
 
   const responses = Syncit.fxFetchAll(requests, responseFields)
-  return responses.map(r => responsify(r))
+  return responses.map(({ data }) => responsify(data))
 }