@did-space/core 0.5.50 → 0.5.51

package/dist/constants/index.d.ts

@@ -16,3 +16,4 @@ export declare const APP: {
         FOLDER_PREFIX: string;
     };
 };
+export declare const GLOBAL_SPACE_ROOT = "__GLOBAL__";

package/dist/constants/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP = exports.HEADERS = exports.APP_BACKUP_STATUS = exports.DID_OBJECTS = exports.APPS = void 0;
+exports.GLOBAL_SPACE_ROOT = exports.APP = exports.HEADERS = exports.APP_BACKUP_STATUS = exports.DID_OBJECTS = exports.APPS = void 0;
 exports.APPS = 'apps';
 exports.DID_OBJECTS = '.did-objects';
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -26,3 +26,4 @@ exports.APP = {
         FOLDER_PREFIX: '.components',
     },
 };
+exports.GLOBAL_SPACE_ROOT = '__GLOBAL__';

package/dist/model/app-space-apply.d.ts

@@ -1,3 +1,4 @@
+import { Model } from 'sequelize';
 import type { AppPermissions } from '../meta';
 export interface AppSpaceApplyModel {
     /**
@@ -60,3 +61,15 @@ export interface AppSpaceApplyModel {
  */
 export interface CreationAppSpaceApplyModel extends Omit<AppSpaceApplyModel, 'id'> {
 }
+export declare class AppSpaceApplyRepository extends Model<AppSpaceApplyModel, CreationAppSpaceApplyModel> {
+    id: string;
+    storageDid: string;
+    assetDid: string;
+    ownerDid: string;
+    appDid: string;
+    appName: string;
+    appDescription: string | null;
+    metadata: Record<string, unknown>;
+    createAt: Date;
+    updateAt: Date;
+}

package/dist/model/app-space-apply.js

@@ -1,2 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppSpaceApplyRepository = void 0;
+const sequelize_1 = require("sequelize");
+class AppSpaceApplyRepository extends sequelize_1.Model {
+}
+exports.AppSpaceApplyRepository = AppSpaceApplyRepository;

package/dist/model/did-object-mapping.d.ts

@@ -0,0 +1,8 @@
+import { Model, type InferAttributes } from 'sequelize';
+export declare class DidObjectMappingRepository extends Model<InferAttributes<DidObjectMappingRepository>, InferAttributes<DidObjectMappingRepository>> {
+    did: string;
+    spaceDid: string;
+    appDid: string;
+    key: string;
+    metadata: Record<string, string>;
+}

package/dist/model/did-object-mapping.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DidObjectMappingRepository = void 0;
+/* eslint-disable @typescript-eslint/indent */
+const sequelize_1 = require("sequelize");
+class DidObjectMappingRepository extends sequelize_1.Model {
+}
+exports.DidObjectMappingRepository = DidObjectMappingRepository;

package/dist/schemas/object-space.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetHashOptionsSchema = exports.WriteOptionsSchema = exports.DeleteAsOwnerOptionsSchema = exports.ObjectSpaceOptionsSchema = exports.WriteAsOwnerOptionsSchema = exports.OwnerOperatorKeySchema = void 0;
 const validator_1 = require("@arcblock/validator");
+const constants_1 = require("../constants");
 exports.OwnerOperatorKeySchema = validator_1.Joi.string().regex(/^\//).required();
 const WriteAsOwnerOptionsByFolderSchema = {
     is: validator_1.Joi.string().regex(/\/$/),
@@ -24,7 +25,7 @@ exports.WriteAsOwnerOptionsSchema = validator_1.Joi.object({
 });
 exports.ObjectSpaceOptionsSchema = validator_1.Joi.object({
     driver: validator_1.Joi.any().required(),
-    spaceDid: validator_1.Joi.DID().required(),
+    spaceDid: validator_1.Joi.alternatives().try(validator_1.Joi.DID(), validator_1.Joi.string().valid(constants_1.GLOBAL_SPACE_ROOT)).required(),
     treeRepository: validator_1.Joi.any().required(),
     objectRepository: validator_1.Joi.any().required(),
     objectCollectionRepository: validator_1.Joi.any().required(),

package/dist/space/object-space.d.ts

@@ -5,9 +5,10 @@ import EventEmitter from 'events';
 import { SpaceConfig } from '../configuration';
 import type { Object, Data } from '../meta';
 import { AppSpaceOptions, DeleteOptions, DriverProtocol, GetHashOptions, KeyStatus, ListOptions, ListsOptions, PermissionOptions, ReadAsOwnerOptions, ReadOptions, SpaceProtocol, WriteAsOwnerOptions, WriteOptions } from '../protocols';
-import { ObjectCollectionRepository, ObjectRepository, TreeRepository } from '../model';
+import { ObjectCollectionRepository, ObjectRepository, TreeRepository, type AppSpaceApplyRepository } from '../model';
 import { GlobalSpace } from './global-space';
 import type { SpaceRepository } from '../model/space';
+import type { DidObjectMappingRepository } from '../model/did-object-mapping';
 export type ObjectSpaceOptions = {
     driver: DriverProtocol;
     spaceDid: string;
@@ -15,6 +16,8 @@ export type ObjectSpaceOptions = {
     objectRepository: ObjectRepository;
     objectCollectionRepository: ObjectCollectionRepository;
     spaceRepository: SpaceRepository;
+    appSpaceApplyRepository: typeof AppSpaceApplyRepository;
+    didObjectMappingRepository: typeof DidObjectMappingRepository;
     /**
      * @description 忽略存储容量限制吗?
      * @type {(false | true)}

package/dist/space/object-space.js

@@ -78,6 +78,22 @@ class ObjectSpace extends events_1.default {
     destroySpace() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.deleteAsOwner('/');
+            const { spaceDid } = this.options;
+            yield this.options.appSpaceApplyRepository.destroy({
+                where: {
+                    storageDid: spaceDid,
+                },
+            });
+            yield this.options.didObjectMappingRepository.destroy({
+                where: {
+                    spaceDid,
+                },
+            });
+            yield this.options.spaceRepository.destroy({
+                where: {
+                    did: spaceDid,
+                },
+            });
         });
     }
     getSpaceSize() {
@@ -500,15 +516,14 @@ class ObjectSpace extends events_1.default {
                         },
                     };
                     debug('deleteAsOwner.$whereForDeleteFolder', JSON.stringify(whereForDeleteFolder));
-                    const trees = yield this.options.treeRepository.findAll({
-                        where: whereForDeleteFolder,
-                        attributes: ['objectId'],
-                        raw: true,
+                    yield this.options.objectCollectionRepository.sequelize.query(`INSERT OR REPLACE INTO ${this.options.objectCollectionRepository.tableName} (id, createdAt)
+              SELECT distinct objectId, strftime('%Y-%m-%d %H:%M:%f +00:00',DATETIME('now'))
+              FROM ${this.options.treeRepository.tableName} where spaceDid = '${this.options.spaceDid}' and type = ${model_1.TreeModelType.FILE} and key like '${key}%';`, {
+                        type: sequelize_1.QueryTypes.INSERT,
                     });
                     yield this.options.treeRepository.destroy({
                         where: whereForDeleteFolder,
                     });
-                    yield this.globalSpace.mark(...trees.map((x) => x.objectId));
                 }
                 else {
                     const where = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "0.5.50",
+  "version": "0.5.51",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "mime-types": "^2.1.35",
     "multiformats": "9",
     "p-all": "3.0.0",
-    "sequelize": "^6.37.3",
+    "sequelize": "^6.37.4",
     "xbytes": "^1.9.1"
   },
   "devDependencies": {
@@ -53,7 +53,7 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5",
     "vite": "^5.4.8",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.2"
   },
-  "gitHead": "82b3d7dbece72e3102a743d06d6bc1aefdc3238f"
+  "gitHead": "4da54f9ce03611dc3bdf1ae9e63496dd1d0fe813"
 }