@did-space/core 1.1.9 → 1.1.11

package/dist/cjs/space/object-space.js

@@ -213,10 +213,7 @@ class ObjectSpace extends events_1.default {
             }
             debug('listsOneLevel.$parentTree', JSON.stringify(parentTree, null, 2));
             const trees = yield this.options.treeRepository.findAll({
-                where: {
-                    spaceDid: this.options.spaceDid,
-                    parentId: parentTree.id,
-                },
+                where: Object.assign({ spaceDid: this.options.spaceDid, parentId: parentTree.id }, (options.ignoreDirectories ? { type: model_1.TreeModelType.FILE } : {})),
                 include: this.options.objectRepository,
             });
             return Promise.all(trees.map((x) => __awaiter(this, void 0, void 0, function* () {
@@ -253,18 +250,29 @@ class ObjectSpace extends events_1.default {
     listsRecursiveAsOwner(options) {
         return __awaiter(this, void 0, void 0, function* () {
             debug('listsRecursiveAsOwner.before', JSON.stringify(options));
-            const where = {
-                spaceDid: this.options.spaceDid,
-                key: {
+            const where = Object.assign({ spaceDid: this.options.spaceDid, key: {
                     [sequelize_1.Op.like]: `${options.key}%`,
-                },
-                type: model_1.TreeModelType.FILE,
-            };
+                } }, (options.ignoreDirectories ? { type: model_1.TreeModelType.FILE } : {}));
             const trees = yield this.options.treeRepository.findAll({
                 where,
                 include: this.options.objectRepository,
             });
-            return trees.map((x) => {
+            return Promise.all(trees.map((x) => __awaiter(this, void 0, void 0, function* () {
+                const absolutePath = (0, path_1.join)(x.spaceDid, x.key);
+                if (x.type === model_1.TreeModelType.FOLDER) {
+                    const { size, lastModified } = yield this.getStatusAsOwner(x.key);
+                    return {
+                        key: x.key,
+                        name: (0, path_1.basename)(x.key),
+                        isDir: true,
+                        size,
+                        lastModified: lastModified || new Date(x.updatedAt).getTime(),
+                        editable: true,
+                        mimeType: null,
+                        absolutePath,
+                        metadata: x.meta,
+                    };
+                }
                 return {
                     key: x.key,
                     name: (0, path_1.basename)(x.key),
@@ -274,10 +282,10 @@ class ObjectSpace extends events_1.default {
                     editable: true,
                     mimeType: x.Object.meta.mimeType,
                     hash: x.objectId,
-                    absolutePath: (0, path_1.join)(x.spaceDid, x.key),
+                    absolutePath,
                     metadata: x.meta,
                 };
-            });
+            })));
         });
     }
     /**
@@ -296,14 +304,10 @@ class ObjectSpace extends events_1.default {
             if (!options.recursive) {
                 return this.listsOneLevelAsOwner(options);
             }
-            if (options.recursive && options.ignoreDirectories) {
-                const objects = yield this.listsRecursiveAsOwner(options);
-                return objects.map((x) => {
-                    return Object.assign(Object.assign({}, x), { key: x.key.replace(options.key, '/') });
-                });
-            }
-            debug('lists.after', JSON.stringify(options));
-            throw new Error(`Filter methods not yet supported:\n ${JSON.stringify(options, null, 2)}`);
+            const objects = yield this.listsRecursiveAsOwner(options);
+            return objects.map((x) => {
+                return Object.assign(Object.assign({}, x), { key: x.key.replace(options.key, '/') });
+            });
         });
     }
     /**

package/dist/es/space/object-space.js

@@ -182,6 +182,7 @@ export class ObjectSpace extends EventEmitter {
             where: {
                 spaceDid: this.options.spaceDid,
                 parentId: parentTree.id,
+                ...(options.ignoreDirectories ? { type: TreeModelType.FILE } : {}),
             },
             include: this.options.objectRepository,
         });
@@ -222,13 +223,28 @@ export class ObjectSpace extends EventEmitter {
             key: {
                 [Op.like]: `${options.key}%`,
             },
-            type: TreeModelType.FILE,
+            ...(options.ignoreDirectories ? { type: TreeModelType.FILE } : {}),
         };
         const trees = await this.options.treeRepository.findAll({
             where,
             include: this.options.objectRepository,
         });
-        return trees.map((x) => {
+        return Promise.all(trees.map(async (x) => {
+            const absolutePath = join(x.spaceDid, x.key);
+            if (x.type === TreeModelType.FOLDER) {
+                const { size, lastModified } = await this.getStatusAsOwner(x.key);
+                return {
+                    key: x.key,
+                    name: basename(x.key),
+                    isDir: true,
+                    size,
+                    lastModified: lastModified || new Date(x.updatedAt).getTime(),
+                    editable: true,
+                    mimeType: null,
+                    absolutePath,
+                    metadata: x.meta,
+                };
+            }
             return {
                 key: x.key,
                 name: basename(x.key),
@@ -238,10 +254,10 @@ export class ObjectSpace extends EventEmitter {
                 editable: true,
                 mimeType: x.Object.meta.mimeType,
                 hash: x.objectId,
-                absolutePath: join(x.spaceDid, x.key),
+                absolutePath,
                 metadata: x.meta,
             };
-        });
+        }));
     }
     /**
      * @description 后续改名为 listsAsOwner 更合适
@@ -258,17 +274,13 @@ export class ObjectSpace extends EventEmitter {
         if (!options.recursive) {
             return this.listsOneLevelAsOwner(options);
         }
-        if (options.recursive && options.ignoreDirectories) {
-            const objects = await this.listsRecursiveAsOwner(options);
-            return objects.map((x) => {
-                return {
-                    ...x,
-                    key: x.key.replace(options.key, '/'),
-                };
-            });
-        }
-        debug('lists.after', JSON.stringify(options));
-        throw new Error(`Filter methods not yet supported:\n ${JSON.stringify(options, null, 2)}`);
+        const objects = await this.listsRecursiveAsOwner(options);
+        return objects.map((x) => {
+            return {
+                ...x,
+                key: x.key.replace(options.key, '/'),
+            };
+        });
     }
     /**
      * @FIXME: 接口的功能实际应该是 listAsOwner 实现的，属于技术债 @jianchao

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "publishConfig": {
     "access": "public"
   },
@@ -111,7 +111,7 @@
     "@arcblock/did": "^1.21.0",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/validator": "^1.21.0",
-    "@did-space/constants": "^1.1.9",
+    "@did-space/constants": "^1.1.11",
     "dayjs": "^1.11.13",
     "debug": "^4.4.1",
     "destroy": "^1.2.0",
@@ -142,5 +142,5 @@
     "vite": "^7.0.0",
     "vitest": "^3.2.4"
   },
-  "gitHead": "bd9b34e418120bba6a198a924adadb016d8ad2c5"
+  "gitHead": "15de6ef2b864293e7aabfa115637e8bfafe62ee4"
 }