@adobe/helix-google-support 3.3.4 → 4.0.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [4.0.0](https://github.com/adobe/helix-google-support/compare/v3.3.5...v4.0.0) (2025-09-23)
+
+
+### Bug Fixes
+
+* stop finding item author-friendly after 1000 hits ([#513](https://github.com/adobe/helix-google-support/issues/513)) ([d21c9c5](https://github.com/adobe/helix-google-support/commit/d21c9c57025f9289c52e30ec24d14515f0e0af6e))
+
+
+### BREAKING CHANGES
+
+* flat hierarchies no longer support author-friendly search
+
+## [3.3.5](https://github.com/adobe/helix-google-support/compare/v3.3.4...v3.3.5) (2025-09-16)
+
+
+### Bug Fixes
+
+* decrease log level for not found ([#512](https://github.com/adobe/helix-google-support/issues/512)) ([691b0b6](https://github.com/adobe/helix-google-support/commit/691b0b681f4af82ec9d5cc51e5133186c44cec34))
+
 ## [3.3.4](https://github.com/adobe/helix-google-support/compare/v3.3.3...v3.3.4) (2025-09-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "3.3.4",
+  "version": "4.0.0",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -8,7 +8,7 @@
     ".": "./src/index.js"
   },
   "scripts": {
-    "test": "c8 mocha",
+    "test": "c8 mocha --spec=test/**/*.test.js",
     "lint": "eslint .",
     "semantic-release": "semantic-release",
     "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH",
@@ -40,12 +40,13 @@
     "lru-cache": "^11.0.2"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.9",
+    "@adobe/eslint-config-helix": "3.0.10",
     "@adobe/helix-shared-tokencache": "1.5.0",
     "@eslint/config-helpers": "0.3.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.3",
+    "dotenv": "17.2.2",
     "eslint": "9.4.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.32.0",

package/src/GoogleClient.js

@@ -186,29 +186,23 @@ export class GoogleClient {
   }
 
   /**
-   * @param {string} parentId
-   * @param {string[]} pathSegments
-   * @param {string} parentPath
-   * @param {string} [type] optional file mimetype
-   * @returns {Promise<DriveItemInfo[]>|null}
+   * Get a child item given its base name and extension in an author
+   * friendly way.
+   *
+   * @param {String} parentId parent id
+   * @param {String} basename base name
+   * @param {String} ext extension
+   * @param {String} type mime type of the child
+   * @returns {Object} containing item and whether more than 1000 items were found
    */
-  async getUncachedItemsFromSegments(parentId, pathSegments, parentPath, type) {
+  async #fuzzyGetChild(parentId, basename, ext, type) {
     const { log, drive, googleApiOpts } = this;
-    const name = pathSegments.shift();
-    const [baseName, ext] = splitByExtension(name);
-    const sanitizedName = sanitizeName(baseName);
-
+    const sanitizedName = sanitizeName(basename);
     const items = [];
-    let mimeTypeFilter;
-    // filter for folder if path continues
-    if (pathSegments.length) {
-      mimeTypeFilter = 'and mimeType = \'application/vnd.google-apps.folder\'';
-    } else {
-      mimeTypeFilter = type
-        ? `and mimeType = '${type}'`
-        : 'and mimeType != \'application/vnd.google-apps.folder\'';
-    }
 
+    const mimeTypeFilter = type
+      ? `and mimeType = '${type}'`
+      : 'and mimeType != \'application/vnd.google-apps.folder\'';
     const params = {
       q: [
         `'${parentId}' in parents`,
@@ -221,37 +215,29 @@ export class GoogleClient {
       pageSize: 1000,
     };
 
-    do {
-      // eslint-disable-next-line no-await-in-loop
-      const { data } = await drive.files.list(params, googleApiOpts);
-      if (data.nextPageToken) {
-        params.pageToken = data.nextPageToken;
-      } else {
-        params.pageToken = null;
+    const { data } = await drive.files.list(params, googleApiOpts);
+    log.debug(`fetched ${data.files.length} items below ${parentId}`);
+
+    // find fuzzy match
+    data.files.forEach((item) => {
+      const [itemName, itemExt] = splitByExtension(item.name);
+      // remember extension
+      // eslint-disable-next-line no-param-reassign
+      item.extension = itemExt;
+      /* c8 ignore next 4 */
+      if (ext && ext !== itemExt) {
+        // only match extension if given via relPath
+        return;
       }
-      log.debug(`fetched ${data.files.length} items below ${parentId}. nextPageToken=${params.pageToken ? '****' : 'null'}`);
-
-      // find fuzzy match
-      data.files.forEach((item) => {
-        const [itemName, itemExt] = splitByExtension(item.name);
-        // remember extension
-        // eslint-disable-next-line no-param-reassign
-        item.extension = itemExt;
-        /* c8 ignore next 4 */
-        if (ext && ext !== itemExt) {
-          // only match extension if given via relPath
-          return;
-        }
-        const sanitizedItemName = sanitizeName(itemName);
-        if (sanitizedItemName !== sanitizedName) {
-          return;
-        }
-        // compute edit distance
-        // eslint-disable-next-line no-param-reassign
-        item.fuzzyDistance = editDistance(baseName, itemName);
-        items.push(item);
-      });
-    } while (params.pageToken);
+      const sanitizedItemName = sanitizeName(itemName);
+      if (sanitizedItemName !== sanitizedName) {
+        return;
+      }
+      // compute edit distance
+      // eslint-disable-next-line no-param-reassign
+      item.fuzzyDistance = editDistance(basename, itemName);
+      items.push(item);
+    });
 
     // sort items by edit distance first and 2nd by item name
     items.sort((i0, i1) => {
@@ -264,7 +250,69 @@ export class GoogleClient {
     });
 
     const [item] = items;
+    return {
+      item,
+      tooManyResults: !!data.nextPageToken,
+    };
+  }
+
+  /**
+   * Gets a child directly by looking for its name in a parent folder.
+   *
+   * @param {String} parentId parent Id
+   * @param {String} name child name
+   * @param {String} type child mime type
+   * @returns {Object} item or null
+   */
+  async #getChild(parentId, name, type) {
+    const { drive, googleApiOpts } = this;
+
+    const mimeTypeFilter = type
+      ? `and mimeType = '${type}'`
+      : 'and mimeType != \'application/vnd.google-apps.folder\'';
+    const params = {
+      q: [
+        `'${parentId}' in parents`,
+        `and name = '${name}'`,
+        'and trashed=false',
+        mimeTypeFilter,
+      ].join(' '),
+      fields: 'files(id, name, mimeType, modifiedTime, size)',
+      includeItemsFromAllDrives: true,
+      supportsAllDrives: true,
+      pageSize: 1,
+    };
+
+    const { data } = await drive.files.list(params, googleApiOpts);
+    if (data.files.length !== 1) {
+      return null;
+    }
+    const [item] = data.files;
+    const [, itemExt] = splitByExtension(item.name);
+    item.extension = itemExt;
+    return item;
+  }
 
+  /**
+   * @param {string} parentId
+   * @param {string[]} pathSegments
+   * @param {string} parentPath
+   * @param {string} [type] optional file mimetype
+   * @returns {Promise<DriveItemInfo[]>|null}
+   */
+  async getUncachedItemsFromSegments(parentId, pathSegments, parentPath, type) {
+    const name = pathSegments.shift();
+    const [basename, ext] = splitByExtension(name);
+    const sanitizedName = sanitizeName(basename);
+    const childType = pathSegments.length
+      ? 'application/vnd.google-apps.folder'
+      : type;
+
+    const ret = await this.#fuzzyGetChild(parentId, basename, ext, childType);
+    let { item } = ret;
+    if (!item && ret.tooManyResults) {
+      item = await this.#getChild(parentId, name, childType);
+    }
     if (!item) {
       return null;
     }
@@ -409,7 +457,7 @@ export class GoogleClient {
     } catch (e) {
       const err = processError(e);
       if (err.response && err.response.status === 404) {
-        log.info(`unable to get items for ${fileId}. Not found`);
+        log.debug(`unable to get items for ${fileId}. Not found`);
         return [];
       }
       log.warn(`unable to get items for ${fileId}. ${err}`);