@jayfong/x-server 2.4.2 → 2.5.0

package/lib/x.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { BaseService } from './services/base';
 import './services/dispose';
+import './services/emoji';
 import './services/log';
-import './services/template_renderer';
 export interface X {
     readonly appId: string;
     readonly env: NodeJS.ProcessEnv;

package/lib/x.js

@@ -2,8 +2,8 @@ import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import { DisposeService } from "./services/dispose";
+import { EmojiService } from "./services/emoji";
 import { LogService } from "./services/log";
-import { TemplateRendererService } from "./services/template_renderer";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
   appId: env.APP_ID,
@@ -19,4 +19,4 @@ export const x = {
 fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
-}), new LogService(), new TemplateRendererService());
+}), new LogService(), new EmojiService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -72,7 +72,7 @@
     "ts-morph": "^12.2.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.67.1",
+    "vtils": "^4.75.0",
     "yargs": "^17.4.1"
   },
   "devDependencies": {
@@ -81,6 +81,7 @@
     "@types/ioredis": "^4.28.10",
     "@types/json-schema": "^7.0.11",
     "@types/lz-string": "^1.3.34",
+    "axios": "^1.4.0",
     "eslint": "^7.32.0",
     "haoma": "^3.6.4",
     "husky": "^4.3.8",

package/lib/_cjs/services/template_renderer.js

@@ -1,37 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.TemplateRendererService = void 0;
-
-class TemplateRendererService {
-  constructor() {
-    this.serviceName = 'templateRenderer';
-  }
-
-  render(text, data, options) {
-    const enableCode = !!(options != null && options.code);
-    const keys = Object.keys(data);
-
-    for (const key of keys) {
-      text = typeof data[key] === 'function' ? text.replace(new RegExp(`\\{${key}(:.+?)?\\}`, 'g'), (_, params) => {
-        return data[key].call(null, ...(params ? params.substring(1) : '').split(','));
-      }) : enableCode ? text.replace(new RegExp(`(?<!\\$)\\{${key}\\}`, 'g'), data[key]) : text.replaceAll(`{${key}}`, data[key]);
-    }
-
-    if (enableCode) {
-      text = text.replace(/\{\{(.+?)\}\}/g, (_, code) => {
-        return eval(`
-          (() => {
-            const {${keys.join(',')}} = arguments[1];
-            return ${code};
-          })()
-        `);
-      });
-    }
-
-    return text;
-  }
-
-}
-
-exports.TemplateRendererService = TemplateRendererService;

package/lib/services/template_renderer.d.ts

@@ -1,14 +0,0 @@
-import { BaseService } from './base';
-export interface TemplateRendererServiceRenderOptions {
-    /** 是否启用代码渲染 */
-    code?: boolean;
-}
-export declare class TemplateRendererService implements BaseService {
-    serviceName: string;
-    render(text: string, data: Record<string, any>, options?: TemplateRendererServiceRenderOptions): string;
-}
-declare module '../x' {
-    interface X {
-        templateRenderer: TemplateRendererService;
-    }
-}

package/lib/services/template_renderer.js

@@ -1,30 +0,0 @@
-export class TemplateRendererService {
-  constructor() {
-    this.serviceName = 'templateRenderer';
-  }
-
-  render(text, data, options) {
-    const enableCode = !!(options != null && options.code);
-    const keys = Object.keys(data);
-
-    for (const key of keys) {
-      text = typeof data[key] === 'function' ? text.replace(new RegExp(`\\{${key}(:.+?)?\\}`, 'g'), (_, params) => {
-        return data[key].call(null, ...(params ? params.substring(1) : '').split(','));
-      }) : enableCode ? text.replace(new RegExp(`(?<!\\$)\\{${key}\\}`, 'g'), data[key]) : text.replaceAll(`{${key}}`, data[key]);
-    }
-
-    if (enableCode) {
-      text = text.replace(/\{\{(.+?)\}\}/g, (_, code) => {
-        return eval(`
-          (() => {
-            const {${keys.join(',')}} = arguments[1];
-            return ${code};
-          })()
-        `);
-      });
-    }
-
-    return text;
-  }
-
-}