fsd-oss 0.13.2 → 0.14.0

package/lib/index.js

@@ -117,7 +117,7 @@ class OSSAdapter {
         try {
             position = await this.size(path);
         }
-        catch (e) { }
+        catch (_e) { }
         await this._oss.append(p, data, { position });
     }
     async createReadStream(path, options) {
@@ -143,7 +143,7 @@ class OSSAdapter {
     }
     async createWriteStream(path, options) {
         debug('createWriteStream %s', path);
-        if (options === null || options === void 0 ? void 0 : options.start)
+        if (options?.start)
             throw new Error('fsd-oss read stream does not support start options');
         const { root } = this._options;
         let p = slash(Path.join(root, path)).substring(1);
@@ -152,7 +152,6 @@ class OSSAdapter {
         return stream;
     }
     async unlink(path) {
-        var _a;
         debug('unlink %s', path);
         const { root } = this._options;
         let p = slash(Path.join(root, path)).substring(1);
@@ -165,7 +164,7 @@ class OSSAdapter {
                     maxKeys: 1000
                 });
                 continuationToken = list.NextContinuationToken;
-                if ((_a = list.Contents) === null || _a === void 0 ? void 0 : _a.length) {
+                if (list.Contents?.length) {
                     let objects = list.Contents.map((o) => o.Key);
                     await this._oss.deleteMulti(objects, {
                         quiet: true
@@ -204,8 +203,10 @@ class OSSAdapter {
         }
         const { root } = this._options;
         let p = slash(Path.join(root, path)).substring(1);
-        let results = [];
+        let results = Object.create(null);
         let continuationToken = '';
+        let hasContents = false;
+        let hasCommonPrefixes = false;
         do {
             let list = await this._oss.list({
                 prefix: p,
@@ -216,6 +217,7 @@ class OSSAdapter {
             debug('list: %O', list);
             continuationToken = list.NextContinuationToken;
             if (list.Contents) {
+                hasContents = true;
                 list.Contents.forEach((object) => {
                     let relative = slash(Path.relative(p, object.Key));
                     if (!relative)
@@ -224,17 +226,34 @@ class OSSAdapter {
                         relative += '/';
                     if (pattern && pattern !== '**/*' && !minimatch(relative, pattern))
                         return;
-                    results.push({
+                    results[relative] = {
                         name: relative,
                         metadata: {
                             size: object.Size,
                             lastModified: new Date(object.LastModified)
                         }
-                    });
+                    };
+                });
+            }
+            if (list.CommonPrefixes) {
+                hasCommonPrefixes = true;
+                list.CommonPrefixes.forEach((prefix) => {
+                    let relative = slash(Path.relative(p, prefix.Prefix));
+                    if (!relative)
+                        return;
+                    relative += '/';
+                    results[relative] = {
+                        name: relative
+                    };
                 });
             }
         } while (continuationToken);
-        return results;
+        if (hasContents && hasCommonPrefixes) {
+            return Object.keys(results)
+                .sort()
+                .map((key) => results[key]);
+        }
+        return Object.values(results);
     }
     async createUrl(path, options) {
         debug('createUrl %s', path);
@@ -265,7 +284,6 @@ class OSSAdapter {
         return url;
     }
     async copy(path, dest) {
-        var _a;
         debug('copy %s to %s', path, dest);
         if (!(await this.exists(path)))
             throw new Error('The source path is not exists!');
@@ -283,7 +301,7 @@ class OSSAdapter {
                 });
                 debug('list result: %O', list);
                 continuationToken = list.NextContinuationToken;
-                if ((_a = list.Contents) === null || _a === void 0 ? void 0 : _a.length) {
+                if (list.Contents?.length) {
                     await eachLimit(list.Contents, 10, async (object) => {
                         debug(' -> copy %s', object.Key);
                         let relative = slash(Path.relative(from, object.Key));
@@ -322,7 +340,7 @@ class OSSAdapter {
             await this._oss.head(p);
             return true;
         }
-        catch (e) {
+        catch (_e) {
             return false;
         }
     }
@@ -334,7 +352,7 @@ class OSSAdapter {
             await this._oss.head(p);
             return true;
         }
-        catch (e) {
+        catch (_e) {
             return false;
         }
     }
@@ -345,7 +363,7 @@ class OSSAdapter {
             await this._oss.head(p);
             return true;
         }
-        catch (e) {
+        catch (_e) {
             return false;
         }
     }

package/lib/simple-oss-client.js

@@ -86,6 +86,10 @@ class SimpleOSSClient {
                 content.Size = parseInt(content.Size);
             });
         }
+        if (res.CommonPrefixes) {
+            if (!Array.isArray(res.CommonPrefixes))
+                res.CommonPrefixes = [res.CommonPrefixes];
+        }
         return res;
     }
     del(name, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -12,15 +12,15 @@
   "author": "Liang <liang@miaomo.cc> (https://github.com/liangxingchen)",
   "license": "MIT",
   "dependencies": {
-    "@alicloud/pop-core": "^1.7.13",
-    "akita": "^1.0.4",
+    "@alicloud/pop-core": "^1.8.0",
+    "akita": "^1.1.0",
     "async": "*",
-    "crypto-js": "^4.1.1",
-    "debug": "^4.3.4",
+    "crypto-js": "^4.2.0",
+    "debug": "^4.4.0",
     "mime-types": "^2.1.35",
     "minimatch": "^3.1.2",
     "slash": "^3.0.0",
     "xml2js": "^0.6.2"
   },
-  "gitHead": "f5aaaca713f514d3a8fb65bc2eecd1e8df8fd5c8"
+  "gitHead": "74e32bf47242909f040eb6012dda56e5c5a668a0"
 }

package/simple-oss-client.d.ts

@@ -105,6 +105,7 @@ export interface ListResult extends Result {
   KeyCount: number;
   NextContinuationToken?: string;
   Contents: ListResultContent[];
+  CommonPrefixes: ListResultCommonPrefixes[];
 }
 
 export interface ListResultContent {
@@ -119,6 +120,10 @@ export interface ListResultContent {
   };
 }
 
+export interface ListResultCommonPrefixes {
+  Prefix: string;
+}
+
 export interface DeleteMultiOptions extends RequestOptions {
   quiet?: boolean;
 }