@abtnode/models 1.16.15-beta-12f50442 → 1.16.15-beta-d649cecc

package/lib/migrations/blocklet/20230827000000-tagging.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const models_1 = require("../../models");
+const models = (0, models_1.getBlockletModels)();
+const up = async ({ context }) => {
+    await context.createTable('tags', models.Tag.GENESIS_ATTRIBUTES);
+    await context.createTable('tagging', models.Tagging.GENESIS_ATTRIBUTES);
+    await context.addIndex('tags', ['title'], { unique: true });
+    await context.addIndex('tagging', ['tagId', 'taggableId'], { unique: true });
+};
+exports.up = up;
+const down = async ({ context }) => {
+    await context.dropTable('tags');
+    await context.dropTable('tagging');
+};
+exports.down = down;

package/lib/migrations/server/20230827000000-tagging.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const models_1 = require("../../models");
+const models = (0, models_1.getBlockletModels)();
+const up = async ({ context }) => {
+    await context.createTable('tags', models.Tag.GENESIS_ATTRIBUTES);
+    await context.createTable('tagging', models.Tagging.GENESIS_ATTRIBUTES);
+    await context.addIndex('tags', ['title'], { unique: true });
+    await context.addIndex('tagging', ['tagId', 'taggableId'], { unique: true });
+};
+exports.up = up;
+const down = async ({ context }) => {
+    await context.dropTable('tags');
+    await context.dropTable('tagging');
+};
+exports.down = down;

package/lib/models/index.d.ts

@@ -23,6 +23,8 @@ export * from './connection';
 export * from './backup';
 export * from './traffic-insight';
 export * from './runtime-insight';
+export * from './tag';
+export * from './tagging';
 export declare function createSequelize(dbPath: string, config?: Record<string, any>): any;
 export declare function destroySequelize(dbPath: string): void;
 export declare function getServiceModels(): {
@@ -40,6 +42,8 @@ export declare function getBlockletModels(): {
     ConnectedAccount: import("../types").DynamicModel<import("./connected-account").ConnectedAccountState>;
     Session: import("../types").DynamicModel<import("./session").SessionState>;
     Rbac: import("../types").DynamicModel<import("./rbac").RbacState>;
+    Tag: import("../types").DynamicModel<import("@abtnode/types").TTag>;
+    Tagging: import("../types").DynamicModel<import("./tagging").TaggingState>;
 };
 export declare function getServerModels(): {
     AccessKey: import("../types").DynamicModel<import("./access-key").AccessKeyState>;
@@ -61,6 +65,8 @@ export declare function getServerModels(): {
     Backup: import("../types").DynamicModel<import("./backup").BackupState>;
     TrafficInsight: import("../types").DynamicModel<import("./traffic-insight").TrafficInsightState>;
     RuntimeInsight: import("../types").DynamicModel<import("./runtime-insight").RuntimeInsightState>;
+    Tag: import("../types").DynamicModel<import("@abtnode/types").TTag>;
+    Tagging: import("../types").DynamicModel<import("./tagging").TaggingState>;
 };
 export declare function getConnectModels(): {
     Connection: import("../types").DynamicModel<import("./connection").ConnectionState>;

package/lib/models/index.js

@@ -40,6 +40,8 @@ const connection_1 = require("./connection");
 const backup_1 = require("./backup");
 const traffic_insight_1 = require("./traffic-insight");
 const runtime_insight_1 = require("./runtime-insight");
+const tag_1 = require("./tag");
+const tagging_1 = require("./tagging");
 __exportStar(require("./message"), exports);
 __exportStar(require("./account"), exports);
 __exportStar(require("./certificate"), exports);
@@ -64,6 +66,8 @@ __exportStar(require("./connection"), exports);
 __exportStar(require("./backup"), exports);
 __exportStar(require("./traffic-insight"), exports);
 __exportStar(require("./runtime-insight"), exports);
+__exportStar(require("./tag"), exports);
+__exportStar(require("./tagging"), exports);
 const instances = new Map();
 function createSequelize(dbPath, config = {
     logging: !process.env.DISABLE_SQLITE_LOG &&
@@ -114,6 +118,8 @@ function getBlockletModels() {
         ConnectedAccount: (0, connected_account_1.createConnectedAccountModel)(),
         Session: (0, session_1.createSessionModel)(),
         Rbac: (0, rbac_1.createRbacModel)(),
+        Tag: (0, tag_1.createTagModel)(),
+        Tagging: (0, tagging_1.createTaggingModel)(),
     };
     return models;
 }
@@ -139,6 +145,8 @@ function getServerModels() {
         Backup: (0, backup_1.createBackupModel)(),
         TrafficInsight: (0, traffic_insight_1.createTrafficInsightModel)(),
         RuntimeInsight: (0, runtime_insight_1.createRuntimeInsightModel)(),
+        Tag: (0, tag_1.createTagModel)(),
+        Tagging: (0, tagging_1.createTaggingModel)(),
     };
     return models;
 }

package/lib/models/tag.d.ts

@@ -0,0 +1,4 @@
+import { TTag } from '@abtnode/types';
+import { DynamicModel } from '../types';
+export type TagState = TTag;
+export declare function createTagModel(): DynamicModel<TagState>;

package/lib/models/tag.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTagModel = void 0;
+const sequelize_1 = require("sequelize");
+function createTagModel() {
+    var _a;
+    return _a = class Tag extends sequelize_1.Model {
+            static initialize(sequelize) {
+                this.init({
+                    ...this.GENESIS_ATTRIBUTES,
+                }, {
+                    sequelize,
+                    modelName: 'Tag',
+                    tableName: 'tags',
+                    indexes: [{ fields: ['title'], unique: true }],
+                    timestamps: true,
+                });
+            }
+            static associate(models) {
+                Tag.belongsToMany(models.User, {
+                    through: {
+                        model: models.Tagging,
+                        scope: {
+                            taggableType: 'user',
+                        },
+                    },
+                    constraints: false,
+                    foreignKey: 'tagId',
+                    otherKey: 'taggableId',
+                    as: 'users',
+                });
+            }
+        },
+        // CAUTION: do not edit this
+        _a.GENESIS_ATTRIBUTES = {
+            id: {
+                type: sequelize_1.DataTypes.INTEGER,
+                primaryKey: true,
+                autoIncrement: true,
+            },
+            title: {
+                type: sequelize_1.DataTypes.STRING(64),
+                allowNull: false,
+                unique: true,
+            },
+            color: {
+                type: sequelize_1.DataTypes.STRING(8),
+                allowNull: false,
+            },
+            description: {
+                type: sequelize_1.DataTypes.STRING(255),
+                allowNull: true,
+            },
+            createdAt: {
+                type: sequelize_1.DataTypes.DATE,
+                defaultValue: sequelize_1.DataTypes.NOW,
+                index: true,
+            },
+            updatedAt: {
+                type: sequelize_1.DataTypes.DATE,
+                defaultValue: sequelize_1.DataTypes.NOW,
+                index: true,
+            },
+        },
+        _a;
+}
+exports.createTagModel = createTagModel;

package/lib/models/tagging.d.ts

@@ -0,0 +1,6 @@
+import { DynamicModel } from '../types';
+export type TaggingState = {
+    tagId: number;
+    taggableId: string;
+};
+export declare function createTaggingModel(): DynamicModel<TaggingState>;

package/lib/models/tagging.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTaggingModel = void 0;
+const sequelize_1 = require("sequelize");
+function createTaggingModel() {
+    var _a;
+    return _a = class Tagging extends sequelize_1.Model {
+            static initialize(sequelize) {
+                this.init({
+                    ...this.GENESIS_ATTRIBUTES,
+                }, {
+                    sequelize,
+                    modelName: 'Tagging',
+                    tableName: 'tagging',
+                    indexes: [{ fields: ['tagId', 'taggableId'], unique: true }],
+                    timestamps: false,
+                });
+            }
+        },
+        // CAUTION: do not edit this
+        _a.GENESIS_ATTRIBUTES = {
+            tagId: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+            },
+            taggableId: {
+                type: sequelize_1.DataTypes.STRING(40),
+                allowNull: false,
+            },
+            taggableType: {
+                type: sequelize_1.DataTypes.STRING(16),
+                allowNull: false,
+            },
+        },
+        _a;
+}
+exports.createTaggingModel = createTaggingModel;

package/lib/models/user.d.ts

@@ -1,4 +1,4 @@
 import { TUserInfo } from '@abtnode/types';
 import { DynamicModel } from '../types';
-export type UserState = Omit<TUserInfo, 'passports' | 'connectedAccounts' | 'source' | 'extraConfigs'>;
+export type UserState = Omit<TUserInfo, 'passports' | 'connectedAccounts' | 'source' | 'extraConfigs' | 'tags'>;
 export declare function createUserModel(): DynamicModel<UserState>;

package/lib/models/user.js

@@ -27,6 +27,18 @@ function createUserModel() {
                     onDelete: 'CASCADE',
                     as: 'connectedAccounts',
                 });
+                User.belongsToMany(models.Tag, {
+                    through: {
+                        model: models.Tagging,
+                        scope: {
+                            taggableType: 'user',
+                        },
+                    },
+                    constraints: false,
+                    foreignKey: 'taggableId',
+                    otherKey: 'tagId',
+                    as: 'tags',
+                });
             }
         },
         _a.GENESIS_ATTRIBUTES = {

package/lib/states/base.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 import EventEmitter from 'events';
 import { ModelDefined } from 'sequelize';
+import { MakeNullishOptional } from 'sequelize/types/utils';
 import { AnyObject, SelectOptions, SortOptions, UpdateOptions, ConditionOptions, PagingOptions } from '../types';
-export declare class BaseState<T> extends EventEmitter {
+export declare class BaseState<T extends object> extends EventEmitter {
     model: ModelDefined<T, T>;
     jsonAttributes: string[];
     config: AnyObject;
@@ -32,6 +33,7 @@ export declare class BaseState<T> extends EventEmitter {
     sum(field: keyof T, condition?: ConditionOptions<T>): Promise<number>;
     query(query: string): Promise<object[]>;
     reset(): Promise<number>;
+    build(row: MakeNullishOptional<T>): import("sequelize").Model<T, T>;
     loadDatabase(cb?: Function): void;
     closeDatabase(cb?: Function): void;
     compactDatafile(cb?: Function): void;

package/lib/states/base.js

@@ -116,6 +116,9 @@ class BaseState extends events_1.default {
     reset() {
         return this.model.destroy({ truncate: true });
     }
+    build(row) {
+        return this.model.build(row);
+    }
     loadDatabase(cb) {
         if (typeof cb === 'function') {
             setImmediate(() => cb());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.15-beta-12f50442",
+  "version": "1.16.15-beta-d649cecc",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,9 +32,9 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/logger": "1.16.15-beta-12f50442",
-    "@abtnode/types": "1.16.15-beta-12f50442",
-    "@blocklet/constant": "1.16.15-beta-12f50442",
+    "@abtnode/logger": "1.16.15-beta-d649cecc",
+    "@abtnode/types": "1.16.15-beta-d649cecc",
+    "@blocklet/constant": "1.16.15-beta-d649cecc",
     "@nedb/core": "^2.1.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -55,5 +55,5 @@
     "typescript": "^5.0.4"
   },
   "resolutions": {},
-  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd"
+  "gitHead": "56941d1056a9e5f189992ace6e93971aa4226d07"
 }