@adobe/helix-onedrive-support 7.0.1 → 7.1.2

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [7.1.2](https://github.com/adobe/helix-onedrive-support/compare/v7.1.1...v7.1.2) (2022-04-10)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v3.0.9 ([#262](https://github.com/adobe/helix-onedrive-support/issues/262)) ([62cca57](https://github.com/adobe/helix-onedrive-support/commit/62cca577cf8288b673b38f0f778961efd45f1772))
+
+## [7.1.1](https://github.com/adobe/helix-onedrive-support/compare/v7.1.0...v7.1.1) (2022-04-02)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v3.0.8 ([0035641](https://github.com/adobe/helix-onedrive-support/commit/0035641545b9c4a0deef5de7f3e1bab0f961b0ff))
+
+# [7.1.0](https://github.com/adobe/helix-onedrive-support/compare/v7.0.1...v7.1.0) (2022-04-01)
+
+
+### Features
+
+* speed up fuzzyItem lookup ([#259](https://github.com/adobe/helix-onedrive-support/issues/259)) ([5963fa6](https://github.com/adobe/helix-onedrive-support/commit/5963fa6389329d0cf737f64724688593b9291923)), closes [#258](https://github.com/adobe/helix-onedrive-support/issues/258)
+
 ## [7.0.1](https://github.com/adobe/helix-onedrive-support/compare/v7.0.0...v7.0.1) (2022-03-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "7.0.1",
+  "version": "7.1.2",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
-    "@adobe/helix-fetch": "3.0.7",
+    "@adobe/helix-fetch": "3.0.9",
     "adal-node": "https://github.com/adobe-rnd/azure-activedirectory-library-for-nodejs.git#adobe",
     "jose": "4.6.0"
   },
@@ -31,14 +31,14 @@
     "@adobe/eslint-config-helix": "1.3.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "ajv": "8.10.0",
+    "ajv": "8.11.0",
     "codecov": "3.8.3",
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "16.0.0",
-    "eslint": "8.11.0",
+    "eslint": "8.13.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-import": "2.26.0",
     "jsdoc-to-markdown": "7.1.1",
     "junit-report-builder": "3.0.0",
     "lint-staged": "12.3.7",

package/src/OneDrive.d.ts

@@ -227,16 +227,17 @@ export declare class OneDrive extends EventEmitter {
    * - replace all non-alphanumeric characters with a dash
    * - remove all consecutive dashes
    * - remove all leading and trailing dashes
-   * - extensions are ignored, if the given path doesn't have one
+   * - extensions are ignored, if the given path doesn't have one or if ignoreExtension is true
    *
    * The result is an array of drive items that match the given path. They are ordered by the edit
    * distance to the original name and then alphanumerically.
    *
    * @param folderItem
    * @param relPath
+   * @param ignoreExtension
    * @returns {Promise<DriveItem[]>}
    */
-  fuzzyGetDriveItem(folderItem: DriveItem, relPath?: string): Promise<DriveItem[]>;
+  fuzzyGetDriveItem(folderItem: DriveItem, relPath?: string, ignoreExtension?: boolean): Promise<DriveItem[]>;
 
   downloadDriveItem(driveItem: DriveItem): Promise<GraphResult>;
 

package/src/OneDrive.js

@@ -502,22 +502,39 @@ class OneDrive extends EventEmitter {
    * - convert to lower case
    * - replace all non-alphanumeric characters with a dash
    * - remove all consecutive dashes
-   * - extensions are ignored, if the given path doesn't have one
+   * - extensions are ignored, if the given path doesn't have one or if ignoreExtension is true
    *
    * The result is an array of drive items that match the given path. They are ordered by the edit
    * distance to the original name and then alphanumerically.
    *
    * @param {DriveItem} folderItem
-   * @param {string} relPath
+   * @param {string} [relPath = '']
+   * @param {boolean} [ignoreExtension = false]
    * @returns {Promise<DriveItem[]>}
    */
-  async fuzzyGetDriveItem(folderItem, relPath = '') {
-    const idx = relPath.lastIndexOf('/');
-    if (idx < 0) {
-      const ret = await this.getDriveItem(folderItem, '', false);
-      // todo: add extra extension
-      return [ret.value];
+  async fuzzyGetDriveItem(folderItem, relPath = '', ignoreExtension = false) {
+    if (relPath && !relPath.startsWith('/')) {
+      throw new Error('relPath must be empty or start with /');
+    }
+
+    // first try to get item directly
+    try {
+      const ret = await this.getDriveItem(folderItem, relPath, false);
+      if (relPath) {
+        // eslint-disable-next-line prefer-destructuring
+        ret.extension = splitByExtension(relPath)[1];
+      }
+      this.log.info(`fetched drive item directly: /drives/${folderItem.parentReference.driveId}/items/${folderItem.id}:${relPath}`);
+      return [ret];
+    } catch (e) {
+      this.log.info(`fetched drive item directly failed: /drives/${folderItem.parentReference.driveId}/items/${folderItem.id}:${relPath} (${e.statusCode})`);
+      // if no 404 or no relPath, propagate error
+      if (e.statusCode !== 404 || !relPath) {
+        throw e;
+      }
     }
+
+    const idx = relPath.lastIndexOf('/');
     const folderRelPath = relPath.substring(0, idx);
     const name = relPath.substring(idx + 1);
     const [baseName, ext] = splitByExtension(name);
@@ -541,7 +558,7 @@ class OneDrive extends EventEmitter {
       }
     } while (query.$skiptoken);
 
-    this.log.debug(`loaded ${fileList.length} children from ${relPath}`);
+    this.log.info(`loaded ${fileList.length} children from /drives/${folderItem.parentReference.driveId}/items/${folderItem.id}:${relPath}`);
     const items = fileList.filter((item) => {
       if (!item.file) {
         return false;
@@ -550,7 +567,7 @@ class OneDrive extends EventEmitter {
       // remember extension
       // eslint-disable-next-line no-param-reassign
       item.extension = itemExt;
-      if (ext && ext !== itemExt) {
+      if (ext && ext !== itemExt && !ignoreExtension) {
         // only match extension if given via relPath
         return false;
       }

package/src/OneDriveMock.js

@@ -239,6 +239,9 @@ class OneDriveMock extends OneDrive {
     const url = new URL(`https://dummy.org${uri}`);
     if (url.pathname in this.driveItems) {
       const result = this.driveItems[url.pathname];
+      if (result instanceof Error) {
+        throw result;
+      }
       if (!Array.isArray(result.value)) {
         return result;
       }