@kotori-bot/core 1.4.0 → 1.4.1

package/lib/components/config.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const tsukiko_1 = __importDefault(require("tsukiko"));
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const tools_1 = require("@kotori-bot/tools");
 const global_1 = require("../global");
 const packageInfoSchema = tsukiko_1.default.Object({
@@ -22,7 +22,7 @@ class Config {
     constructor(config = global_1.DEFAULT_CORE_CONFIG) {
         this.config = config;
         /* load package.json */
-        const info = (0, tools_1.loadConfig)((0, path_1.join)(__dirname, '../../package.json'));
+        const info = (0, tools_1.loadConfig)((0, node_path_1.join)(__dirname, '../../package.json'));
         if (!info || Object.values(info).length === 0) {
             process.stderr.write(`Cannot find kotori-bot package.json\n`);
             process.exit();

package/lib/global/constants.d.ts

@@ -6,7 +6,7 @@ export declare const CUSTOM_PREFIX = "kotori-plugin-custom-";
 export declare const DEFAULT_PORT = 720;
 export declare const DEFAULT_CORE_CONFIG: {
     global: {
-        lang: "en_US" | "en_GB" | "en_AU" | "zh_CN" | "zh_HK" | "zh_TW" | "zh_SG" | "es_ES" | "es_MX" | "ar_EG" | "ar_AE" | "ru_RU" | "fr_FR" | "fr_CA" | "de_DE" | "de_CH" | "it_IT" | "it_CH" | "hi_IN" | "pt_BR" | "pt_PT" | "tr_TR" | "ja_JP" | "id_ID" | "uk_UA" | "vi_VN" | "th_TH" | "sv_SE" | "nb_NO" | "da_DK" | "fi_FI" | "he_IL" | "sk_SK" | "bg_BG" | "lt_LT" | "sl_SI" | "sr_RS" | "mk_MK" | "sq_AL" | "et_EE" | "mt_MT";
+        lang: "common" | "en_US" | "en_GB" | "en_AU" | "zh_CN" | "zh_HK" | "zh_TW" | "zh_SG" | "es_ES" | "es_MX" | "ar_EG" | "ar_AE" | "ru_RU" | "fr_FR" | "fr_CA" | "de_DE" | "de_CH" | "it_IT" | "it_CH" | "hi_IN" | "pt_BR" | "pt_PT" | "tr_TR" | "ja_JP" | "id_ID" | "uk_UA" | "vi_VN" | "th_TH" | "sv_SE" | "nb_NO" | "da_DK" | "fi_FI" | "he_IL" | "sk_SK" | "bg_BG" | "lt_LT" | "sl_SI" | "sr_RS" | "mk_MK" | "sq_AL" | "et_EE" | "mt_MT";
         'command-prefix': string;
         port: number;
     };

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './utils/command';
 export * from './utils/error';
 export * from './utils/commandError';
 export * from './utils/container';
+export * from './utils/factory';
 export * from './global';
 export * from './types';
 export * from '@kotori-bot/tools';

package/lib/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./utils/command"), exports);
 __exportStar(require("./utils/error"), exports);
 __exportStar(require("./utils/commandError"), exports);
 __exportStar(require("./utils/container"), exports);
+__exportStar(require("./utils/factory"), exports);
 __exportStar(require("./global"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("@kotori-bot/tools"), exports);

package/lib/service/adapter.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Adapter = void 0;
-const tools_1 = require("@kotori-bot/tools");
 const types_1 = require("../types");
 const elements_1 = __importDefault(require("./elements"));
 const factory_1 = require("../utils/factory");
@@ -44,24 +43,6 @@ function sendMessageFactory(adapter, type, data) {
         adapter.api.sendPrivateMsg(message, data.userId, data.extra);
     };
 }
-function formatFactory(i18n) {
-    return (template, data) => {
-        const params = data;
-        if (Array.isArray(params)) {
-            let str = i18n.locale(template);
-            params.forEach((value, index) => {
-                str = str.replaceAll(`{${index}}`, i18n.locale(typeof value === 'string' ? value : String(value)));
-            });
-            return str;
-        }
-        Object.keys(params).forEach((key) => {
-            if (typeof params[key] !== 'string')
-                params[key] = String(params[key]);
-            params[key] = i18n.locale(params[key]);
-        });
-        return (0, tools_1.stringTemp)(i18n.locale(template), params);
-    };
-}
 function quickFactory(send, i18n) {
     return async (message) => {
         const msg = await message;
@@ -71,7 +52,7 @@ function quickFactory(send, i18n) {
             send(i18n.locale(msg));
             return;
         }
-        send(formatFactory(i18n)(...msg));
+        send((0, factory_1.formatFactory)(i18n)(...msg));
     };
 }
 function isSameSender(adapter, data, session) {
@@ -138,7 +119,7 @@ class Adapter {
     session(type, data) {
         const i18n = this.ctx.i18n.extends(this.config.lang);
         const send = sendMessageFactory(this, type, data);
-        const format = formatFactory(i18n);
+        const format = (0, factory_1.formatFactory)(i18n);
         const quick = quickFactory(send, i18n);
         const prompt = promptFactory(quick, this, data);
         const confirm = confirmFactory(quick, this, data);

package/lib/utils/factory.d.ts

@@ -1,7 +1,10 @@
+import I18n from '@kotori-bot/i18n/src/common';
 import type { Context } from 'fluoro';
+import { CommandArgType } from '..';
 export declare function disposeFactory(ctx: Context, dispose: () => void): void;
 export declare function cancelFactory(): {
     get(): () => void;
     fn(): void;
     value: boolean;
 };
+export declare function formatFactory(i18n: I18n): (template: string, data: Record<string, unknown> | CommandArgType[]) => string;

package/lib/utils/factory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancelFactory = exports.disposeFactory = void 0;
+exports.formatFactory = exports.cancelFactory = exports.disposeFactory = void 0;
+const __1 = require("..");
 function disposeFactory(ctx, dispose) {
     ctx.once('dispose_module', (data) => {
         if ((typeof data.instance === 'object' ? data.instance.name : data.instance) !== ctx.identity) {
@@ -23,3 +24,22 @@ function cancelFactory() {
     };
 }
 exports.cancelFactory = cancelFactory;
+function formatFactory(i18n) {
+    return (template, data) => {
+        const params = data;
+        if (Array.isArray(params)) {
+            let str = i18n.locale(template);
+            params.forEach((value, index) => {
+                str = str.replaceAll(`{${index}}`, i18n.locale(typeof value === 'string' ? value : String(value)));
+            });
+            return str;
+        }
+        Object.keys(params).forEach((key) => {
+            if (typeof params[key] !== 'string')
+                params[key] = String(params[key]);
+            params[key] = i18n.locale(params[key]);
+        });
+        return (0, __1.stringTemp)(i18n.locale(template), params);
+    };
+}
+exports.formatFactory = formatFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/core",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Kotori Core",
   "main": "lib/index.js",
   "license": "GPL-3.0",
@@ -27,9 +27,9 @@
     "@types/minimist": "^1.2.5",
     "minimist": "^1.2.8",
     "tsukiko": "^1.2.1",
-    "@kotori-bot/i18n": "^1.2.1",
-    "@kotori-bot/tools": "^1.3.0",
-    "fluoro": "^1.0.0"
+    "@kotori-bot/i18n": "^1.3.0",
+    "@kotori-bot/tools": "^1.3.1",
+    "fluoro": "^1.0.1"
   },
   "scripts": {
     "build": "tsc --build"