@kotori-bot/loader 1.4.0 → 1.4.2

package/README.md

@@ -1,27 +1,27 @@
-# @kotori-bot/core
-
-```typescript
-interface Context {
-  readonly baseDir: Runner['baseDir'];
-  readonly options: Runner['options'];
-  readonly [Symbols.modules]: Runner[typeof Symbols.modules];
-  loadAll(): void;
-  watcher(): void;
-  logger: Logger;
-  /* Service */
-  server: Server;
-  db: Database;
-  file: File;
-}
-```
-
-- Loader
-- Runner
-- Server
-- Database
-- File
-- log
-
-## Reference
-
-- [Kotori Docs](https://kotori.js.org/)
+# @kotori-bot/core
+
+```typescript
+interface Context {
+  readonly baseDir: Runner['baseDir'];
+  readonly options: Runner['options'];
+  readonly [Symbols.modules]: Runner[typeof Symbols.modules];
+  loadAll(): void;
+  watcher(): void;
+  logger: Logger;
+  /* Service */
+  server: Server;
+  db: Database;
+  file: File;
+}
+```
+
+- Loader
+- Runner
+- Server
+- Database
+- File
+- log
+
+## Reference
+
+- [Kotori Docs](https://kotori.js.org/)

package/lib/consts.js

@@ -7,5 +7,5 @@ exports.DEV_CODE_DIRS = './src/';
 exports.DEV_IMPORT = `${exports.DEV_CODE_DIRS}index.ts`;
 exports.BUILD_CONFIG_NAME = 'kotori.yml';
 exports.DEV_CONFIG_NAME = 'kotori.dev.yml';
-exports.SUPPORTS_VERSION = /(1\.1\.0)|(1\.2\.0)/;
+exports.SUPPORTS_VERSION = /(1\.1\.0)|(1\.2\.0)|(1\.3\.(.*?))/;
 exports.SUPPORTS_HALF_VERSION = /(x\.x\.(.*?))/;

package/lib/loader.d.ts

@@ -2,7 +2,7 @@ import { Container, Symbols } from '@kotori-bot/core';
 import Logger from '@kotori-bot/logger';
 import Runner from './runner';
 import Server from './service/server';
-import Database from './service/database';
+import type Database from './service/database';
 import File from './service/file';
 declare module '@kotori-bot/core' {
     interface Context {

package/lib/loader.js

@@ -32,7 +32,7 @@ exports.Loader = void 0;
  * @Blog: https://hotaru.icu
  * @Date: 2023-06-24 15:12:55
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-21 11:35:04
+ * @LastEditTime: 2024-02-24 19:11:35
  */
 const core_1 = require("@kotori-bot/core");
 const path_1 = __importDefault(require("path"));
@@ -42,7 +42,6 @@ const runner_1 = __importStar(require("./runner"));
 const log_1 = __importDefault(require("./log"));
 const consts_1 = require("./consts");
 const server_1 = __importDefault(require("./service/server"));
-const database_1 = __importDefault(require("./service/database"));
 const file_1 = __importDefault(require("./service/file"));
 function getRunnerConfig(file, dir) {
     const handle = (root) => {
@@ -215,7 +214,6 @@ class Loader extends core_1.Container {
     }
     setPreService() {
         this.ctx.service('server', new server_1.default(this.ctx.extends(), { port: this.ctx.config.global.port }));
-        this.ctx.service('db', new database_1.default(this.ctx.extends()));
         this.ctx.service('file', new file_1.default(this.ctx.extends()));
     }
     loadAllModules() {

package/lib/log.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadInfo = void 0;
 function loadInfo(info, ctx) {
     process.stdout.write('Kotori Bot is loading...');
-    process.stdout.write(`
-██╗  ██╗ ██████╗ ████████╗ ██████╗ ██████╗ ██╗
-██║ ██╔╝██╔═══██╗╚══██╔══╝██╔═══██╗██╔══██╗██║
-█████╔╝ ██║   ██║   ██║   ██║   ██║██████╔╝██║
-██╔═██╗ ██║   ██║   ██║   ██║   ██║██╔══██╗██║
-██║  ██╗╚██████╔╝   ██║   ╚██████╔╝██║  ██║██║
-╚═╝  ╚═╝ ╚═════╝    ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚═╝
+    process.stdout.write(`
+██╗  ██╗ ██████╗ ████████╗ ██████╗ ██████╗ ██╗
+██║ ██╔╝██╔═══██╗╚══██╔══╝██╔═══██╗██╔══██╗██║
+█████╔╝ ██║   ██║   ██║   ██║   ██║██████╔╝██║
+██╔═██╗ ██║   ██║   ██║   ██║   ██║██╔══██╗██║
+██║  ██╗╚██████╔╝   ██║   ╚██████╔╝██║  ██║██║
+╚═╝  ╚═╝ ╚═════╝    ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚═╝
 `);
     ctx.logger.info('loader base dir:', ctx.baseDir.root);
     ctx.logger.info(`Kotori Bot Version: ${info.version} License: ${info.license}`);

package/lib/service/database.d.ts

@@ -1,12 +1,11 @@
-import { Context, Service } from '@kotori-bot/core';
-import knex from 'knex';
-export declare class Database extends Service {
+import { Service } from '@kotori-bot/core';
+import type knex from 'knex';
+export interface Database extends Service {
     internal: ReturnType<typeof knex>;
     select: ReturnType<typeof knex>['select'];
     delete: ReturnType<typeof knex>['delete'];
     update: ReturnType<typeof knex>['update'];
     insert: ReturnType<typeof knex>['insert'];
     schema: ReturnType<typeof knex>['schema'];
-    constructor(ctx: Context);
 }
 export default Database;

package/lib/service/database.js

@@ -1,43 +1,2 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Database = void 0;
-const core_1 = require("@kotori-bot/core");
-const knex_1 = __importDefault(require("knex"));
-const path_1 = require("path");
-class Database extends core_1.Service {
-    internal;
-    select;
-    delete;
-    update;
-    insert;
-    schema;
-    constructor(ctx) {
-        super(ctx, {}, 'database');
-        this.internal = (0, knex_1.default)({
-            client: 'sqlite',
-            connection: {
-                filename: (0, path_1.resolve)(this.ctx.baseDir.root, 'kotori.db')
-            },
-            useNullAsDefault: true
-        } /*  {
-          client: 'mysql',
-          connection: {
-            host: '127.0.0.1',
-            port: 3306,
-            user: 'kotori',
-            password: 'kotori',
-            database: 'kotori'
-          }
-        } */);
-        this.select = this.internal.select.bind(this.internal);
-        this.delete = this.internal.delete.bind(this.internal);
-        this.update = this.internal.update.bind(this.internal);
-        this.insert = this.internal.insert.bind(this.internal);
-        this.schema = this.internal.schema;
-    }
-}
-exports.Database = Database;
-exports.default = Database;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/loader",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Loader For KotoriBot",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -26,9 +26,8 @@
   "dependencies": {
     "express": "^4.18.2",
     "knex": "^3.1.0",
-    "sqlite3": "^5.1.7",
-    "@kotori-bot/logger": "^1.1.1",
-    "@kotori-bot/core": "^1.3.0"
+    "@kotori-bot/core": "^1.3.0",
+    "@kotori-bot/logger": "^1.2.0"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",