@abtnode/models 1.16.30-beta-b7f31b10 → 1.16.30-beta-b80c7bcd

package/lib/migrate.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSchemaMigration = void 0;
+exports.doSchemaMigration = doSchemaMigration;
 /* eslint-disable import/prefer-default-export */
 const umzug_1 = require("umzug");
 const logger_1 = __importDefault(require("@abtnode/logger"));
@@ -25,4 +25,3 @@ async function doSchemaMigration(dbFile, group) {
     });
     return umzug.up();
 }
-exports.doSchemaMigration = doSchemaMigration;

package/lib/models/access-key.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAccessKeyModel = void 0;
+exports.createAccessKeyModel = createAccessKeyModel;
 const sequelize_1 = require("sequelize");
 function createAccessKeyModel() {
     var _a;
@@ -53,4 +53,3 @@ function createAccessKeyModel() {
         },
         _a;
 }
-exports.createAccessKeyModel = createAccessKeyModel;

package/lib/models/account.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAccountModel = void 0;
+exports.createAccountModel = createAccountModel;
 // Storage for multi-queue job storage
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -53,4 +53,3 @@ function createAccountModel() {
         },
         _a;
 }
-exports.createAccountModel = createAccountModel;

package/lib/models/audit-log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuditLogModel = void 0;
+exports.createAuditLogModel = createAuditLogModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createAuditLogModel() {
@@ -77,4 +77,3 @@ function createAuditLogModel() {
         },
         _a;
 }
-exports.createAuditLogModel = createAuditLogModel;

package/lib/models/backup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBackupModel = void 0;
+exports.createBackupModel = createBackupModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createBackupModel() {
@@ -78,4 +78,3 @@ function createBackupModel() {
         },
         _a;
 }
-exports.createBackupModel = createBackupModel;

package/lib/models/blocklet-extra.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBlockletExtraModel = void 0;
+exports.createBlockletExtraModel = createBlockletExtraModel;
 const sequelize_1 = require("sequelize");
 function createBlockletExtraModel() {
     var _a;
@@ -60,4 +60,3 @@ function createBlockletExtraModel() {
         },
         _a;
 }
-exports.createBlockletExtraModel = createBlockletExtraModel;

package/lib/models/blocklet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBlockletModel = void 0;
+exports.createBlockletModel = createBlockletModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createBlockletModel() {
@@ -119,4 +119,3 @@ function createBlockletModel() {
         },
         _a;
 }
-exports.createBlockletModel = createBlockletModel;

package/lib/models/cache.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCacheModel = void 0;
+exports.createCacheModel = createCacheModel;
 // A simple persistent key-value storage
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -41,4 +41,3 @@ function createCacheModel() {
         },
         _a;
 }
-exports.createCacheModel = createCacheModel;

package/lib/models/certificate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCertificateModel = void 0;
+exports.createCertificateModel = createCertificateModel;
 // Storage for multi-queue job storage
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -70,4 +70,3 @@ function createCertificateModel() {
         },
         _a;
 }
-exports.createCertificateModel = createCertificateModel;

package/lib/models/connected-account.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConnectedAccountModel = void 0;
+exports.createConnectedAccountModel = createConnectedAccountModel;
 const sequelize_1 = require("sequelize");
 function createConnectedAccountModel() {
     var _a;
@@ -23,7 +23,7 @@ function createConnectedAccountModel() {
                 });
             }
             static associate(models) {
-                ConnectedAccount.belongsTo(models.User, {
+                _a.belongsTo(models.User, {
                     foreignKey: 'userDid',
                     as: 'user',
                 });
@@ -65,4 +65,3 @@ function createConnectedAccountModel() {
         },
         _a;
 }
-exports.createConnectedAccountModel = createConnectedAccountModel;

package/lib/models/connection-v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConnectionV2Model = void 0;
+exports.createConnectionV2Model = createConnectionV2Model;
 // Storage for did-connect sessions
 const sequelize_1 = require("sequelize");
 function createConnectionV2Model() {
@@ -108,4 +108,3 @@ function createConnectionV2Model() {
         },
         _a;
 }
-exports.createConnectionV2Model = createConnectionV2Model;

package/lib/models/connection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConnectionModel = void 0;
+exports.createConnectionModel = createConnectionModel;
 // Storage for did-connect sessions
 const sequelize_1 = require("sequelize");
 function createConnectionModel() {
@@ -89,4 +89,3 @@ function createConnectionModel() {
         },
         _a;
 }
-exports.createConnectionModel = createConnectionModel;

package/lib/models/http-challenge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHttpChallengeModel = void 0;
+exports.createHttpChallengeModel = createHttpChallengeModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createHttpChallengeModel() {
@@ -45,4 +45,3 @@ function createHttpChallengeModel() {
         },
         _a;
 }
-exports.createHttpChallengeModel = createHttpChallengeModel;

package/lib/models/index.js

@@ -14,7 +14,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.existsColumn = exports.setupModels = exports.getConnectModels = exports.getServerModels = exports.getBlockletModels = exports.getCertificateManagerModels = exports.getServiceModels = exports.destroySequelize = exports.createSequelize = void 0;
+exports.createSequelize = createSequelize;
+exports.destroySequelize = destroySequelize;
+exports.getServiceModels = getServiceModels;
+exports.getCertificateManagerModels = getCertificateManagerModels;
+exports.getBlockletModels = getBlockletModels;
+exports.getServerModels = getServerModels;
+exports.getConnectModels = getConnectModels;
+exports.setupModels = setupModels;
+exports.existsColumn = existsColumn;
 const sequelize_1 = require("sequelize");
 const message_1 = require("./message");
 const account_1 = require("./account");
@@ -95,21 +103,18 @@ function createSequelize(dbPath, config = {
     instances.set(dbPath, sequelize);
     return instances.get(dbPath);
 }
-exports.createSequelize = createSequelize;
 function destroySequelize(dbPath) {
     if (instances.has(dbPath)) {
         instances.get(dbPath).close();
         instances.delete(dbPath);
     }
 }
-exports.destroySequelize = destroySequelize;
 function getServiceModels() {
     const models = {
         Message: (0, message_1.createMessageModel)(),
     };
     return models;
 }
-exports.getServiceModels = getServiceModels;
 function getCertificateManagerModels() {
     const models = {
         Account: (0, account_1.createAccountModel)(),
@@ -119,7 +124,6 @@ function getCertificateManagerModels() {
     };
     return models;
 }
-exports.getCertificateManagerModels = getCertificateManagerModels;
 function getBlockletModels() {
     const models = {
         User: (0, user_1.createUserModel)(),
@@ -136,7 +140,6 @@ function getBlockletModels() {
     };
     return models;
 }
-exports.getBlockletModels = getBlockletModels;
 function getServerModels() {
     const models = {
         AccessKey: (0, access_key_1.createAccessKeyModel)(),
@@ -164,7 +167,6 @@ function getServerModels() {
     };
     return models;
 }
-exports.getServerModels = getServerModels;
 function getConnectModels() {
     const models = {
         Connection: (0, connection_1.createConnectionModel)(),
@@ -172,7 +174,6 @@ function getConnectModels() {
     };
     return models;
 }
-exports.getConnectModels = getConnectModels;
 function setupModels(models, sequelize) {
     Object.keys(models).forEach((x) => {
         models[x].initialize(sequelize);
@@ -183,9 +184,7 @@ function setupModels(models, sequelize) {
         }
     });
 }
-exports.setupModels = setupModels;
 async function existsColumn(context, tableName, columnName) {
     const columnsDescription = await context.describeTable(tableName);
     return columnName in columnsDescription;
 }
-exports.existsColumn = existsColumn;

package/lib/models/job.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createJobModel = void 0;
+exports.createJobModel = createJobModel;
 // Storage for multi-queue job storage
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -59,4 +59,3 @@ function createJobModel() {
         },
         _a;
 }
-exports.createJobModel = createJobModel;

package/lib/models/message.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMessageModel = void 0;
+exports.createMessageModel = createMessageModel;
 // Storage for event hub messages
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -51,4 +51,3 @@ function createMessageModel() {
         },
         _a;
 }
-exports.createMessageModel = createMessageModel;

package/lib/models/migration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMigrationModel = void 0;
+exports.createMigrationModel = createMigrationModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createMigrationModel() {
@@ -50,4 +50,3 @@ function createMigrationModel() {
         },
         _a;
 }
-exports.createMigrationModel = createMigrationModel;

package/lib/models/notification.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNotificationModel = void 0;
+exports.createNotificationModel = createNotificationModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createNotificationModel() {
@@ -74,4 +74,3 @@ function createNotificationModel() {
         },
         _a;
 }
-exports.createNotificationModel = createNotificationModel;

package/lib/models/passport.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPassportModel = void 0;
+exports.createPassportModel = createPassportModel;
 const sequelize_1 = require("sequelize");
 function createPassportModel() {
     var _a;
@@ -17,7 +17,7 @@ function createPassportModel() {
                 });
             }
             static associate(models) {
-                Passport.belongsTo(models.User, {
+                _a.belongsTo(models.User, {
                     foreignKey: 'userDid',
                     as: 'user',
                 });
@@ -87,4 +87,3 @@ function createPassportModel() {
         },
         _a;
 }
-exports.createPassportModel = createPassportModel;

package/lib/models/project.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectModel = void 0;
+exports.createProjectModel = createProjectModel;
 const sequelize_1 = require("sequelize");
 function createProjectModel() {
     var _a;
@@ -93,4 +93,3 @@ function createProjectModel() {
         },
         _a;
 }
-exports.createProjectModel = createProjectModel;

package/lib/models/rbac.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRbacModel = void 0;
+exports.createRbacModel = createRbacModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createRbacModel() {
@@ -62,4 +62,3 @@ function createRbacModel() {
         },
         _a;
 }
-exports.createRbacModel = createRbacModel;

package/lib/models/release.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReleaseModel = void 0;
+exports.createReleaseModel = createReleaseModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createReleaseModel() {
@@ -74,4 +74,3 @@ function createReleaseModel() {
         },
         _a;
 }
-exports.createReleaseModel = createReleaseModel;

package/lib/models/runtime-insight.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRuntimeInsightModel = void 0;
+exports.createRuntimeInsightModel = createRuntimeInsightModel;
 const sequelize_1 = require("sequelize");
 function createRuntimeInsightModel() {
     var _a;
@@ -54,4 +54,3 @@ function createRuntimeInsightModel() {
         },
         _a;
 }
-exports.createRuntimeInsightModel = createRuntimeInsightModel;

package/lib/models/server.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerModel = void 0;
+exports.createServerModel = createServerModel;
 const sequelize_1 = require("sequelize");
 function createServerModel() {
     var _a;
@@ -140,4 +140,3 @@ function createServerModel() {
         },
         _a;
 }
-exports.createServerModel = createServerModel;

package/lib/models/session.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSessionModel = void 0;
+exports.createSessionModel = createSessionModel;
 // Storage for multi-step conversations or long running tasks
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
@@ -51,4 +51,3 @@ function createSessionModel() {
         },
         _a;
 }
-exports.createSessionModel = createSessionModel;

package/lib/models/site.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSiteModel = void 0;
+exports.createSiteModel = createSiteModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createSiteModel() {
@@ -63,4 +63,3 @@ function createSiteModel() {
         },
         _a;
 }
-exports.createSiteModel = createSiteModel;

package/lib/models/tag.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTagModel = void 0;
+exports.createTagModel = createTagModel;
 const sequelize_1 = require("sequelize");
 function createTagModel() {
     var _a;
@@ -17,7 +17,7 @@ function createTagModel() {
                 });
             }
             static associate(models) {
-                Tag.belongsToMany(models.User, {
+                _a.belongsToMany(models.User, {
                     through: {
                         model: models.Tagging,
                         scope: {
@@ -64,4 +64,3 @@ function createTagModel() {
         },
         _a;
 }
-exports.createTagModel = createTagModel;

package/lib/models/tagging.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTaggingModel = void 0;
+exports.createTaggingModel = createTaggingModel;
 const sequelize_1 = require("sequelize");
 function createTaggingModel() {
     var _a;
@@ -34,4 +34,3 @@ function createTaggingModel() {
         },
         _a;
 }
-exports.createTaggingModel = createTaggingModel;

package/lib/models/traffic-insight.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTrafficInsightModel = void 0;
+exports.createTrafficInsightModel = createTrafficInsightModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createTrafficInsightModel() {
@@ -94,4 +94,3 @@ function createTrafficInsightModel() {
         },
         _a;
 }
-exports.createTrafficInsightModel = createTrafficInsightModel;

package/lib/models/user-session.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUserSessionModel = void 0;
+exports.createUserSessionModel = createUserSessionModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createUserSessionModel() {
@@ -18,7 +18,7 @@ function createUserSessionModel() {
                 });
             }
             static associate(models) {
-                UserSession.belongsTo(models.User, {
+                _a.belongsTo(models.User, {
                     foreignKey: 'userDid',
                     targetKey: 'did',
                     as: 'user',
@@ -81,4 +81,3 @@ function createUserSessionModel() {
         },
         _a;
 }
-exports.createUserSessionModel = createUserSessionModel;

package/lib/models/user.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUserModel = void 0;
+exports.createUserModel = createUserModel;
 const sequelize_1 = require("sequelize");
 function createUserModel() {
     var _a;
@@ -34,23 +34,23 @@ function createUserModel() {
                 });
             }
             static associate(models) {
-                User.hasMany(models.UserSession, {
+                _a.hasMany(models.UserSession, {
                     foreignKey: 'userDid',
                     sourceKey: 'did',
                     onDelete: 'CASCADE',
                     as: 'userSessions',
                 });
-                User.hasMany(models.Passport, {
+                _a.hasMany(models.Passport, {
                     foreignKey: 'userDid',
                     onDelete: 'CASCADE',
                     as: 'passports',
                 });
-                User.hasMany(models.ConnectedAccount, {
+                _a.hasMany(models.ConnectedAccount, {
                     foreignKey: 'userDid',
                     onDelete: 'CASCADE',
                     as: 'connectedAccounts',
                 });
-                User.belongsToMany(models.Tag, {
+                _a.belongsToMany(models.Tag, {
                     through: {
                         model: models.Tagging,
                         scope: {
@@ -131,4 +131,3 @@ function createUserModel() {
         },
         _a;
 }
-exports.createUserModel = createUserModel;

package/lib/models/webhook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebHookModel = void 0;
+exports.createWebHookModel = createWebHookModel;
 const sequelize_1 = require("sequelize");
 const util_1 = require("../util");
 function createWebHookModel() {
@@ -44,4 +44,3 @@ function createWebHookModel() {
         },
         _a;
 }
-exports.createWebHookModel = createWebHookModel;

package/lib/states/base.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { ModelDefined } from 'sequelize';
 import { MakeNullishOptional } from 'sequelize/types/utils';

package/lib/states/factory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStateFactory = void 0;
+exports.createStateFactory = createStateFactory;
 // eslint-disable-next-line import/prefer-default-export
 function createStateFactory(initializer, models) {
     const states = {};
@@ -19,4 +19,3 @@ function createStateFactory(initializer, models) {
         },
     });
 }
-exports.createStateFactory = createStateFactory;

package/lib/util.js

@@ -3,14 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatParams = exports.formatSelection = exports.formatOrder = exports.formatConditions = exports.generateRandomString = exports.generateId = void 0;
+exports.generateId = generateId;
+exports.generateRandomString = generateRandomString;
+exports.formatConditions = formatConditions;
+exports.formatOrder = formatOrder;
+exports.formatSelection = formatSelection;
+exports.formatParams = formatParams;
 const uuid_1 = require("uuid");
 const sequelize_1 = require("sequelize");
 const lodash_isempty_1 = __importDefault(require("lodash.isempty"));
 function generateId() {
     return (0, uuid_1.v4)();
 }
-exports.generateId = generateId;
 function generateRandomString(length = 6, characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
     let randomString = '';
     for (let i = 0; i < length; i++) {
@@ -19,7 +23,6 @@ function generateRandomString(length = 6, characters = '0123456789abcdefghijklmn
     }
     return randomString;
 }
-exports.generateRandomString = generateRandomString;
 function formatConditions(conditions) {
     if (conditions.where || conditions.include) {
         return conditions;
@@ -78,7 +81,6 @@ function formatConditions(conditions) {
     }
     return { where };
 }
-exports.formatConditions = formatConditions;
 function formatOrder(sort) {
     const order = [];
     for (const [field, value] of Object.entries(sort)) {
@@ -94,7 +96,6 @@ function formatOrder(sort) {
     }
     return order;
 }
-exports.formatOrder = formatOrder;
 function formatSelection(selection) {
     const attributes = [];
     for (const [field, value] of Object.entries(selection)) {
@@ -107,11 +108,9 @@ function formatSelection(selection) {
     }
     return attributes;
 }
-exports.formatSelection = formatSelection;
 function formatParams(params) {
     if ((0, lodash_isempty_1.default)(params.attributes)) {
         delete params.attributes;
     }
     return params;
 }
-exports.formatParams = formatParams;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.30-beta-b7f31b10",
+  "version": "1.16.30-beta-b80c7bcd",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -33,8 +33,8 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/logger": "1.16.30-beta-b7f31b10",
-    "@abtnode/types": "1.16.30-beta-b7f31b10",
+    "@abtnode/logger": "1.16.30-beta-b80c7bcd",
+    "@abtnode/types": "1.16.30-beta-b80c7bcd",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "sequelize": "^6.35.0",
@@ -54,5 +54,5 @@
     "typescript": "^5.0.4"
   },
   "resolutions": {},
-  "gitHead": "2d429b619b7b54b5603fb05761d3acd9ff674c2c"
+  "gitHead": "9d68833290b1a59357b7c362018416b82b5d1503"
 }