@jayfong/x-server 1.10.2 → 1.11.1

package/lib/cli/deploy_util.js

@@ -1,51 +1,47 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeployUtil = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const vtils_1 = require("vtils");
-const node_ssh_1 = require("node-ssh");
-class DeployUtil {
-    static async deploy(options) {
-        const pkgContent = await fs_extra_1.default.readJson(path_1.default.join(options.cwd, 'package.json'));
-        const appFile = path_1.default.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
-        if (!(await fs_extra_1.default.pathExists(appFile))) {
-            throw new Error('请先构建');
-        }
-        const ssh = new node_ssh_1.NodeSSH();
-        await ssh.connect({
-            host: options.host,
-            username: options.user,
-            privateKey: options.key,
-        });
-        const appName = pkgContent.name;
-        const appDir = `./${appName}`;
-        await ssh.execCommand((0, vtils_1.dedent) `
+import fs from 'fs-extra';
+import path from 'path';
+import { dedent } from 'vtils';
+import { NodeSSH } from 'node-ssh';
+export class DeployUtil {
+  static async deploy(options) {
+    const pkgContent = await fs.readJson(path.join(options.cwd, 'package.json'));
+    const appFile = path.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
+
+    if (!(await fs.pathExists(appFile))) {
+      throw new Error('请先构建');
+    }
+
+    const ssh = new NodeSSH();
+    await ssh.connect({
+      host: options.host,
+      username: options.user,
+      privateKey: options.key
+    });
+    const appName = pkgContent.name;
+    const appDir = `./${appName}`;
+    await ssh.execCommand(dedent`
         set -ex
         mkdir -p app_files/${appName}
         rm -rf ${appDir}
         mkdir ${appDir}
       `, {
-            cwd: options.dir,
-            onStdout: buf => console.log(buf.toString()),
-            onStderr: buf => console.log(buf.toString()),
-        });
-        const remoteAppFile = `${options.dir}/app_files/${appName}/${path_1.default.basename(appFile)}`;
-        await ssh.putFile(appFile, remoteAppFile);
-        await ssh.execCommand((0, vtils_1.dedent) `
+      cwd: options.dir,
+      onStdout: buf => console.log(buf.toString()),
+      onStderr: buf => console.log(buf.toString())
+    });
+    const remoteAppFile = `${options.dir}/app_files/${appName}/${path.basename(appFile)}`;
+    await ssh.putFile(appFile, remoteAppFile);
+    await ssh.execCommand(dedent`
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         pm2 startOrReload pm2.config.js
       `, {
-            cwd: options.cwd,
-            onStdout: buf => console.log(buf.toString()),
-            onStderr: buf => console.log(buf.toString()),
-        });
-        ssh.dispose();
-    }
-}
-exports.DeployUtil = DeployUtil;
+      cwd: options.cwd,
+      onStdout: buf => console.log(buf.toString()),
+      onStderr: buf => console.log(buf.toString())
+    });
+    ssh.dispose();
+  }
+
+}

package/lib/cli/env_util.js

@@ -1,139 +1,131 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvUtil = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const node_path_1 = __importDefault(require("node:path"));
-const vtils_1 = require("vtils");
-class EnvUtil {
-    static normalizeValue(value) {
-        if (value.includes(' || ')) {
-            const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
-            return (0, vtils_1.devOrProd)(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
-        }
-        return value === 'true'
-            ? true
-            : value === 'false'
-                ? false
-                : (value.startsWith('[') && value.endsWith(']')) ||
-                    (value.startsWith('{') && value.endsWith('}'))
-                    ? JSON.parse(value)
-                    : (0, vtils_1.isNumeric)(value)
-                        ? Number(value)
-                        : value;
+import fs from 'fs-extra';
+import path from 'node:path';
+import { dedent, devOrProd, isNumeric } from 'vtils';
+export class EnvUtil {
+  static normalizeValue(value) {
+    if (value.includes(' || ')) {
+      const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
+      return devOrProd(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
     }
-    static parseContent(src) {
-        const envs = [];
-        // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
-        const multilineLineBreaks = true;
-        // convert Buffers before splitting into lines and processing
-        const lines = src.toString().split(EnvUtil.NEWLINES_MATCH);
-        let lastComment = '';
-        for (let idx = 0; idx < lines.length; idx++) {
-            let line = lines[idx];
-            // matching "KEY' and 'VAL' in 'KEY=VAL'
-            const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL);
-            // matched?
-            if (keyValueArr != null) {
-                const key = keyValueArr[1];
-                // default undefined or missing values to empty string
-                let val = keyValueArr[2] || '';
-                let end = val.length - 1;
-                const isDoubleQuoted = val[0] === '"' && val[end] === '"';
-                const isSingleQuoted = val[0] === "'" && val[end] === "'";
-                const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-                const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'");
-                // if parsing line breaks and the value starts with a quote
-                if (multilineLineBreaks &&
-                    (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
-                    const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
-                    val = val.substring(1);
-                    while (idx++ < lines.length - 1) {
-                        line = lines[idx];
-                        end = line.length - 1;
-                        if (line[end] === quoteChar) {
-                            val += EnvUtil.NEWLINE + line.substring(0, end);
-                            break;
-                        }
-                        val += EnvUtil.NEWLINE + line;
-                    }
-                    val = (0, vtils_1.dedent)(val);
-                    // if single or double quoted, remove quotes
-                }
-                else if (isSingleQuoted || isDoubleQuoted) {
-                    val = val.substring(1, end);
-                    // if double quoted, expand newlines
-                    if (isDoubleQuoted) {
-                        val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
-                    }
-                    val = (0, vtils_1.dedent)(val);
-                }
-                else {
-                    // remove surrounding whitespace
-                    val = (0, vtils_1.dedent)(val).trim();
-                }
-                envs.push({
-                    key: key,
-                    value: EnvUtil.normalizeValue(val),
-                    comment: lastComment,
-                });
-                lastComment = '';
-            }
-            else {
-                const commentArr = line.match(EnvUtil.COMMENT_MATCH);
-                if (commentArr) {
-                    lastComment = commentArr[1];
-                }
+
+    return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : isNumeric(value) ? Number(value) : value;
+  }
+
+  static parseContent(src) {
+    const envs = []; // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
+
+    const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
+
+    const lines = src.toString().split(EnvUtil.NEWLINES_MATCH);
+    let lastComment = '';
+
+    for (let idx = 0; idx < lines.length; idx++) {
+      let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
+
+      const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
+
+      if (keyValueArr != null) {
+        const key = keyValueArr[1]; // default undefined or missing values to empty string
+
+        let val = keyValueArr[2] || '';
+        let end = val.length - 1;
+        const isDoubleQuoted = val[0] === '"' && val[end] === '"';
+        const isSingleQuoted = val[0] === "'" && val[end] === "'";
+        const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
+        const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
+
+        if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
+          const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
+          val = val.substring(1);
+
+          while (idx++ < lines.length - 1) {
+            line = lines[idx];
+            end = line.length - 1;
+
+            if (line[end] === quoteChar) {
+              val += EnvUtil.NEWLINE + line.substring(0, end);
+              break;
             }
+
+            val += EnvUtil.NEWLINE + line;
+          }
+
+          val = dedent(val); // if single or double quoted, remove quotes
+        } else if (isSingleQuoted || isDoubleQuoted) {
+          val = val.substring(1, end); // if double quoted, expand newlines
+
+          if (isDoubleQuoted) {
+            val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
+          }
+
+          val = dedent(val);
+        } else {
+          // remove surrounding whitespace
+          val = dedent(val).trim();
         }
-        return envs;
-    }
-    static async parseFile(options) {
-        const envFile = node_path_1.default.join(options.cwd, options.file);
-        if (await fs_extra_1.default.pathExists(envFile)) {
-            const envContent = await fs_extra_1.default.readFile(envFile, 'utf-8');
-            const envs = EnvUtil.parseContent(envContent);
-            return envs;
+
+        envs.push({
+          key: key,
+          value: EnvUtil.normalizeValue(val),
+          comment: lastComment
+        });
+        lastComment = '';
+      } else {
+        const commentArr = line.match(EnvUtil.COMMENT_MATCH);
+
+        if (commentArr) {
+          lastComment = commentArr[1];
         }
-        return [];
+      }
     }
-    static async importFile(options) {
-        for (const env of await EnvUtil.parseFile(options)) {
-            process.env[env.key] = env.value;
-        }
+
+    return envs;
+  }
+
+  static async parseFile(options) {
+    const envFile = path.join(options.cwd, options.file);
+
+    if (await fs.pathExists(envFile)) {
+      const envContent = await fs.readFile(envFile, 'utf-8');
+      const envs = EnvUtil.parseContent(envContent);
+      return envs;
+    }
+
+    return [];
+  }
+
+  static async importFile(options) {
+    for (const env of await EnvUtil.parseFile(options)) {
+      process.env[env.key] = env.value;
     }
-    static makeTypes(envs) {
-        return (0, vtils_1.dedent) `
+  }
+
+  static makeTypes(envs) {
+    return dedent`
       declare namespace NodeJS {
         interface ProcessEnv {
           /** 当前环境 */
           NODE_ENV: 'development' | 'production';
-          ${envs
-            .map(env => (0, vtils_1.dedent) `
+          ${envs.map(env => dedent`
                 ${env.comment ? `/** ${env.comment} */` : ''}
-                ${env.key}: ${
-        // TODO: 优化类型推断
-        Array.isArray(env.value)
-            ? `Array<${typeof env.value[0]}>`
-            : typeof env.value};
-              `)
-            .join('\n')}
+                ${env.key}: ${// TODO: 优化类型推断
+    Array.isArray(env.value) ? `Array<${typeof env.value[0]}>` : typeof env.value};
+              `).join('\n')}
         }
       }
     `;
-    }
-    static async outputTypes(options) {
-        const envs = await EnvUtil.parseFile(options);
-        const outFile = node_path_1.default.join(options.cwd, options.outFile);
-        const types = EnvUtil.makeTypes(envs);
-        await fs_extra_1.default.outputFile(outFile, types);
-    }
+  }
+
+  static async outputTypes(options) {
+    const envs = await EnvUtil.parseFile(options);
+    const outFile = path.join(options.cwd, options.outFile);
+    const types = EnvUtil.makeTypes(envs);
+    await fs.outputFile(outFile, types);
+  }
+
 }
-exports.EnvUtil = EnvUtil;
 EnvUtil.NEWLINE = '\n';
 EnvUtil.RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;
 EnvUtil.RE_NEWLINES = /\\n/g;
 EnvUtil.NEWLINES_MATCH = /\r\n|\n|\r/;
-EnvUtil.COMMENT_MATCH = /^#\s*(.+?)\s*$/;
+EnvUtil.COMMENT_MATCH = /^#\s*(.+?)\s*$/;

package/lib/cli/register.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_1 = require("esbuild-register/dist/node");
-(0, node_1.register)({
-    hookIgnoreNodeModules: false,
-    hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/'),
-});
+import { register } from 'esbuild-register/dist/node';
+register({
+  hookIgnoreNodeModules: false,
+  hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/')
+});

package/lib/cli/template_util.js

@@ -1,56 +1,57 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateUtil = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const vtils_1 = require("vtils");
-class TemplateUtil {
-    /**
-     * 初始化辅助包。
-     */
-    static async initHelperPackage(cwd) {
-        const fromDir = path_1.default.join(__dirname, 'templates');
-        const toDir = path_1.default.join(cwd, 'node_modules/.x');
-        await fs_extra_1.default.copy(fromDir, toDir, {
-            overwrite: true,
-        });
-    }
-    /**
-     * 初始化模型。
-     */
-    static async initModels(cwd) {
-        const modelsDir = path_1.default.join(cwd, 'src/models');
-        const indexFile = path_1.default.join(modelsDir, 'index.ts');
-        if (!(await fs_extra_1.default.pathExists(indexFile))) {
-            await fs_extra_1.default.outputFile(indexFile, (0, vtils_1.dedent) `
-          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
-          // @endindex
-        `);
-        }
-        const prismaClientFile = path_1.default.join(cwd, 'node_modules/.prisma/client/index.d.ts');
-        const prismaClientFileContent = await fs_extra_1.default.readFile(prismaClientFile, 'utf8');
-        const modelNames = [
-            ...prismaClientFileContent
-                .match(/(?<=const ModelName:).+?(?=\})/s)[0]
-                .matchAll(/(\S+?):/g),
-        ].map(match => (0, vtils_1.camelCase)(match[1]));
-        await Promise.all(modelNames.map(async (modelName) => {
-            const model_name = (0, vtils_1.snakeCase)(modelName);
-            const ModelName = (0, vtils_1.upperFirst)(modelName);
-            const modelFile = path_1.default.join(modelsDir, `${model_name}.ts`);
-            if (!(await fs_extra_1.default.pathExists(modelFile))) {
-                await fs_extra_1.default.outputFile(modelFile, (0, vtils_1.dedent) `
+import fs from 'fs-extra';
+import path from 'path';
+import { camelCase, dedent, snakeCase, upperFirst } from 'vtils';
+import { generateManyIndex } from 'vscode-generate-index-standalone';
+export class TemplateUtil {
+  /**
+   * 初始化辅助包。
+   */
+  static async initHelperPackage(cwd) {
+    const fromDir = path.join(__dirname, 'templates');
+    const toDir = path.join(cwd, 'node_modules/.x');
+    await fs.copy(fromDir, toDir, {
+      overwrite: true
+    });
+  }
+  /**
+   * 初始化模型。
+   */
+
+
+  static async initModels(cwd) {
+    const modelsDir = path.join(cwd, 'src/models');
+    const indexFile = path.join(modelsDir, 'index.ts');
+    const indexFile2 = path.join(cwd, 'node_modules/.x/models.ts');
+    const prismaClientFile = path.join(cwd, 'node_modules/.prisma/client/index.d.ts');
+    const prismaClientFileContent = await fs.readFile(prismaClientFile, 'utf8');
+    const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => camelCase(match[1]));
+    await Promise.all(modelNames.map(async modelName => {
+      const model_name = snakeCase(modelName);
+      const ModelName = upperFirst(modelName);
+      const modelFile = path.join(modelsDir, `${model_name}.ts`);
+
+      if (!(await fs.pathExists(modelFile))) {
+        await fs.outputFile(modelFile, dedent`
               import { ${ModelName}BaseModel } from '@jayfong/x-server'
 
               export class ${ModelName}Model extends ${ModelName}BaseModel {}
               
               export const ${modelName}Model = new ${ModelName}Model()
             `);
-            }
-        }));
+      }
+    }));
+
+    if (!(await fs.pathExists(indexFile))) {
+      await fs.outputFile(indexFile, dedent`
+          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
+          // @endindex
+        `);
     }
-}
-exports.TemplateUtil = TemplateUtil;
+
+    await generateManyIndex({
+      patterns: [indexFile, indexFile2],
+      replaceFile: true
+    });
+  }
+
+}

package/lib/core/define_bus.js

@@ -1,15 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineBus = void 0;
-const node_events_1 = require("node:events");
-class EventBus extends node_events_1.EventEmitter {
-    onReturnOff(event, listener) {
-        this.on(event, listener);
-        return () => this.off(event, listener);
-    }
+import { EventEmitter } from 'node:events';
+
+class EventBus extends EventEmitter {
+  onReturnOff(event, listener) {
+    this.on(event, listener);
+    return () => this.off(event, listener);
+  }
+
 }
-function defineBus() {
-    const eventEmitter = new EventBus();
-    return eventEmitter;
-}
-exports.defineBus = defineBus;
+
+export function defineBus() {
+  const eventEmitter = new EventBus();
+  return eventEmitter;
+} // strict-event-emitter-types
+// https://github.com/bterlson/strict-event-emitter-types/blob/9ed45fc68a69f0b7f85ce4e5fe11ff53cc6a009e/src/index.ts
+// the overridden signatures need to be assignment compatible, but
+// due to how tuple types work[0] it's not possible to be assignment
+// compatible anymore. This hack fixes it with a unique symbol that
+// won't ever show up in parameter help etc.
+//
+// Unfortunately, this has the result of giving a poor error message when
+// you mix up types.
+// 0: https://github.com/Microsoft/TypeScript/issues/26013)

package/lib/core/define_handler.js

@@ -1,41 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineHandler = void 0;
-const handler_1 = require("./handler");
-function defineHandler(options) {
-    const handler = new handler_1.Handler({
-        ...options,
-        requestMethod: 'POST',
-    });
-    return handler;
+import { Handler } from "./handler";
+export function defineHandler(options) {
+  const handler = new Handler({ ...options,
+    requestMethod: 'POST'
+  });
+  return handler;
 }
-exports.defineHandler = defineHandler;
 defineHandler.POST = defineHandler;
-defineHandler.GET = (options) => {
-    const handler = new handler_1.Handler({
-        ...options,
-        requestMethod: 'GET',
-    });
-    return handler;
+
+defineHandler.GET = options => {
+  const handler = new Handler({ ...options,
+    requestMethod: 'GET'
+  });
+  return handler;
 };
-defineHandler.FILE = (options) => {
-    const handler = new handler_1.Handler({
-        ...options,
-        requestMethod: 'FILE',
-    });
-    return handler;
+
+defineHandler.FILE = options => {
+  const handler = new Handler({ ...options,
+    requestMethod: 'FILE'
+  });
+  return handler;
 };
-defineHandler.WS = (options) => {
-    const handler = new handler_1.Handler({
-        ...options,
-        requestMethod: 'WS',
-    });
-    return handler;
-};
-defineHandler.XML = (options) => {
-    const handler = new handler_1.Handler({
-        ...options,
-        requestMethod: 'XML',
-    });
-    return handler;
+
+defineHandler.WS = options => {
+  const handler = new Handler({ ...options,
+    requestMethod: 'WS'
+  });
+  return handler;
 };
+
+defineHandler.XML = options => {
+  const handler = new Handler({ ...options,
+    requestMethod: 'XML'
+  });
+  return handler;
+};

package/lib/core/define_hook.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineHook = void 0;
-const handler_1 = require("./handler");
-function defineHook(hook) {
-    handler_1.Handler.addHook(hook);
-}
-exports.defineHook = defineHook;
+import { Handler } from "./handler";
+export function defineHook(hook) {
+  Handler.addHook(hook);
+}

package/lib/core/define_server.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineServer = void 0;
-const server_1 = require("./server");
-async function defineServer(options) {
-    const server = new server_1.Server(options);
-    await server.start();
-    return server;
-}
-exports.defineServer = defineServer;
+import { Server } from "./server";
+export async function defineServer(options) {
+  const server = new Server(options);
+  await server.start();
+  return server;
+}