@adobe/helix-google-support 3.0.50 → 3.1.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.1.1](https://github.com/adobe/helix-google-support/compare/v3.1.0...v3.1.1) (2024-05-16)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-onedrive-support to v11.3.23 ([5ffa9cf](https://github.com/adobe/helix-google-support/commit/5ffa9cfdca3acae1625fe597fc09a16efd13e139))
+
+# [3.1.0](https://github.com/adobe/helix-google-support/compare/v3.0.50...v3.1.0) (2024-05-14)
+
+
+### Features
+
+* add getUncachedItemFromId ([#361](https://github.com/adobe/helix-google-support/issues/361)) ([acc94f7](https://github.com/adobe/helix-google-support/commit/acc94f7a75c6c05766314784fb38d077ad962b52))
+
 ## [3.0.50](https://github.com/adobe/helix-google-support/compare/v3.0.49...v3.0.50) (2024-05-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "3.0.50",
+  "version": "3.1.1",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -31,7 +31,7 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "dependencies": {
-    "@adobe/helix-onedrive-support": "11.3.22",
+    "@adobe/helix-onedrive-support": "11.3.23",
     "googleapis": "137.1.0",
     "lru-cache": "10.2.2"
   },

package/src/GoogleClient.d.ts

@@ -120,6 +120,14 @@ declare class GoogleClient {
    */
   getItemFromPath(parentId:string, path:string, type?:string):Promise<DriveItemInfo>;
 
+  /**
+   * Returns the (uncached) item for the given id or {@code null} if the item cannot be found.
+   *
+   * @param {string} fileId file id
+   * @returns {Promise<DriveItemInfo>}
+   */
+  getUncachedItemFromId(fileId:string):Promise<DriveItemInfo>;
+
   /**
    * Returns an (uncached) file directly via the google api
    * @param {string} fileId
@@ -168,21 +176,21 @@ declare class GoogleClient {
 
 
    /**
-    * 
-    * @param {string} spreadsheetId 
-    * @param {string} sheetName 
-    * @param {object} worksheetData 
-    * 
+    *
+    * @param {string} spreadsheetId
+    * @param {string} sheetName
+    * @param {object} worksheetData
+    *
     * @returns {Promise<string>} sheetId or {@code null}
     */
    updateSheet(spreadsheetId:string, sheetName:string, worksheetData:object, create:boolean):Promise<string>;
 
 
    /**
-    * 
-    * @param spreadsheetId 
+    *
+    * @param spreadsheetId
     * @param sheetName sheetName to delete in the spreadsheet
-    * 
+    *
     * @returns {Promise<void>}
     */
    deleteSheet(spreadsheetId:string, sheetName:string):Promise<void>;

package/src/GoogleClient.js

@@ -411,39 +411,22 @@ export class GoogleClient {
    */
   async getItemFromPath(parentId, path, type) {
     if (!path) {
-      try {
-        let item = lru.get(parentId);
+      let item = lru.get(parentId);
+      if (!item) {
+        item = await this.getUncachedItemFromId(parentId);
         if (!item) {
-          const { data } = (await this.drive.files.get({
-            fileId: parentId,
-            fields: [
-              'name',
-              'parents',
-              'mimeType',
-              'modifiedTime',
-            ].join(','),
-            supportsAllDrives: true,
-          }));
-          item = addFields({
-            id: parentId,
-            path: `/${data.name}`,
-          }, data);
-          // todo: extend caching to all items ?
-          Object.defineProperty(item, 'invalidate', {
-            enumerable: false,
-            value() {
-              lru.delete(parentId);
-            },
-          });
-          lru.set(parentId, item);
-        }
-        return item;
-      } catch (e) {
-        if (e.response && e.response.status === 404) {
           return null;
         }
-        throw e;
+        // todo: extend caching to all items ?
+        Object.defineProperty(item, 'invalidate', {
+          enumerable: false,
+          value() {
+            lru.delete(parentId);
+          },
+        });
+        lru.set(parentId, item);
       }
+      return item;
     }
 
     const segs = createPathSegments(path);
@@ -455,6 +438,36 @@ export class GoogleClient {
     return item;
   }
 
+  /**
+   * Returns the (uncached) item for the given id or {@code null} if the item cannot be found.
+   *
+   * @param {string} fileId file id
+   * @returns {Promise<DriveItemInfo>}
+   */
+  async getUncachedItemFromId(fileId) {
+    try {
+      const { data } = (await this.drive.files.get({
+        fileId,
+        fields: [
+          'name',
+          'parents',
+          'mimeType',
+          'modifiedTime',
+        ].join(','),
+        supportsAllDrives: true,
+      }));
+      return addFields({
+        id: fileId,
+        path: `/${data.name}`,
+      }, data);
+    } catch (e) {
+      if (e.response && e.response.status === 404) {
+        return null;
+      }
+      throw e;
+    }
+  }
+
   /**
    * Returns an (uncached) file directly via the google api
    * @param {string} fileId