@jayfong/x-server 2.12.7 → 2.12.15

package/lib/_cjs/cli/api_generator.js

@@ -1,41 +1,29 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 exports.__esModule = true;
 exports.ApiGenerator = void 0;
-
 var parseComment = _interopRequireWildcard(require("comment-parser"));
-
 var ts = _interopRequireWildcard(require("ts-morph"));
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _nodePath = _interopRequireDefault(require("node:path"));
-
 var _http_method = require("../core/http_method");
-
 var _vtils = require("vtils");
-
 class ApiGenerator {
   constructor() {
     this.debug = (0, _debug.default)('api');
     this.cwd = process.cwd();
+    // cwd = '/Users/admin/Documents/jfWorks/x-server-test'
     this.project = void 0;
   }
-
   getTypeBySymbol(symbol) {
     return symbol.getTypeAtLocation(symbol.getDeclarations()[0] || symbol.getValueDeclarationOrThrow());
   }
-
   getComment(declaration) {
     var _declaration$getLeadi;
-
-    const text = ((declaration == null ? void 0 : (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
+    const text = ((declaration == null || (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
     const comment = parseComment.parse(text)[0];
     const description = (comment == null ? void 0 : comment.description) || '';
     const tags = new Map();
@@ -48,16 +36,12 @@ class ApiGenerator {
       tags: tags
     };
   }
-
   getCommentBySymbol(symbol) {
     var _this$getComment;
-
     return ((_this$getComment = this.getComment(symbol.getDeclarations()[0])) == null ? void 0 : _this$getComment.description) || '';
   }
-
   typeToApiData(type, _symbol) {
     var _type$getSymbol, _type$getSymbol2, _type$getSymbol3;
-
     // ws
     if (((_type$getSymbol = type.getSymbol()) == null ? void 0 : _type$getSymbol.getName()) === 'SocketStream') {
       return {
@@ -68,12 +52,11 @@ class ApiGenerator {
         children: [],
         enum: []
       };
-    } // XFile
-
+    }
 
+    // XFile
     if (((_type$getSymbol2 = type.getSymbol()) == null ? void 0 : _type$getSymbol2.getName()) === 'MultipartFile') {
       const symbol = _symbol || type.getSymbol();
-
       return {
         name: 'file',
         desc: symbol && this.getCommentBySymbol(symbol) || '',
@@ -83,25 +66,22 @@ class ApiGenerator {
         enum: []
       };
     }
-
     let isRequired = true;
     let isUnion = type.isUnion();
     const unionTypes = isUnion ? type.getUnionTypes().filter(item => !item.isBooleanLiteral() && !item.isNull() && !item.isUndefined()) : [];
     isUnion = !!unionTypes.length;
-
     if (isUnion) {
       if (unionTypes.length === 1 && !unionTypes[0].isLiteral()) {
         isUnion = false;
-      } // 兼容 prisma 生成的类型用 null 表示可选
-
-
-      isRequired = unionTypes.length === type.getUnionTypes().length; // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
-
+      }
+      // 兼容 prisma 生成的类型用 null 表示可选
+      isRequired = unionTypes.length === type.getUnionTypes().length;
+      // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
       type = unionTypes[0].getBaseTypeOfLiteralType();
     }
-
     const isEnum = type.isEnum();
-    const enumData = isEnum ? // @ts-ignore
+    const enumData = isEnum ?
+    // @ts-ignore
     type.compilerType.types.reduce((res, item) => {
       res[item.getSymbol().getName()] = item.value;
       return res;
@@ -114,11 +94,10 @@ class ApiGenerator {
     const isString = isEnum ? typeof enumValues[0] === 'string' : type.isString() || ['Date'].includes(((_type$getSymbol3 = type.getSymbol()) == null ? void 0 : _type$getSymbol3.getName()) || '');
     const isNumber = isEnum ? typeof enumValues[0] === 'number' : type.isNumber();
     const isBoolean = type.isBoolean() || type.isUnion() && type.getUnionTypes().some(item => item.isBooleanLiteral()) && type.getUnionTypes().every(item => item.isBooleanLiteral() || item.isNull() || item.isUndefined());
-    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() || // 将交集类型视为对象
+    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() ||
+    // 将交集类型视为对象
     isIntersection;
-
     const symbol = _symbol || type.getSymbol();
-
     const apiName = (symbol == null ? void 0 : symbol.getName()) || '__type';
     const apiDesc = [symbol && this.getCommentBySymbol(symbol), isEnum && `枚举：${enumKeys.map((key, index) => `${key}->${enumValues[index]}`).join('; ')}`].filter(Boolean).join('\n');
     const apiEnum = isUnion ? unionTypes.map(t => t.getLiteralValue()) : isEnum ? enumValues : [];
@@ -129,20 +108,21 @@ class ApiGenerator {
       const compilerFactory = context.compilerFactory;
       const rawChecker = type.compilerType.checker;
       let symbols = [];
-
       if (intersectionTypes) {
         // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType)) // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType))
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
         .map(symbol => compilerFactory.getSymbol(symbol));
       } else {
         // symbols = type.getApparentProperties()
         // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType]) // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType])
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
         .map(symbol => compilerFactory.getSymbol(symbol));
       }
-
       return symbols.map(symbol => {
-        return this.typeToApiData(!symbol.compilerSymbol.declarations ? // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
+        return this.typeToApiData(!symbol.compilerSymbol.declarations ?
+        // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
         compilerFactory.getType(symbol.compilerSymbol.type) : this.getTypeBySymbol(symbol), symbol);
       });
     }) : [];
@@ -155,10 +135,8 @@ class ApiGenerator {
       children: apiChildren
     };
   }
-
   apiDataToJsonSchema(apiData, jsonSchema = {}) {
     jsonSchema.description = apiData.desc;
-
     if (apiData.type === 'object') {
       jsonSchema.type = 'object';
       jsonSchema.properties = apiData.children.reduce((res, item) => {
@@ -172,18 +150,14 @@ class ApiGenerator {
       jsonSchema.items = apiData.children.map(item => this.apiDataToJsonSchema(item))[0];
     } else {
       jsonSchema.type = apiData.type;
-
       if (apiData.enum.length) {
         jsonSchema.enum = apiData.enum;
       }
     }
-
     return jsonSchema;
   }
-
   genYApiData(handles) {
     const data = {};
-
     for (const handle of handles) {
       data[handle.category] = data[handle.category] || [];
       data[handle.category].push(handle.handlerMethod === 'GET' ? {
@@ -237,14 +211,12 @@ class ApiGenerator {
         res_body: JSON.stringify(handle.responseDataJsonSchema)
       });
     }
-
     return Object.keys(data).map(cat => ({
       name: cat,
       desc: cat,
       list: data[cat]
     }));
   }
-
   async generate() {
     this.debug('启动项目...');
     this.project = new ts.Project({
@@ -256,11 +228,9 @@ class ApiGenerator {
     const handlerGroup = sourceFile.getExportSymbols();
     const handles = [];
     this.debug('生成API文档...');
-
     for (const handlerList of handlerGroup) {
       const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
       const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => (0, _vtils.snakeCase)(v)).join('/')}/`.replace(/\/{2,}/g, '/');
-
       for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
         // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
         handler.getDeclarations().forEach(exp => {
@@ -271,12 +241,10 @@ class ApiGenerator {
         this.debug('生成接口: %s ...', handlerPath);
         const [requestType, responseType, methodType] = handlerExp.getType().getTypeArguments();
         const handlerComment = this.getComment(handlerExp.getParent().getParent());
-
         if (handlerComment.tags.has('private')) {
           this.debug('跳过生成接口: %s', `${handlerPath}`);
           continue;
         }
-
         const handlerCategory = (0, _vtils.pascalCase)(basePath) || 'Index';
         const handlerName = handlerComment.description || handlerPath;
         const handlerMethod = methodType.getLiteralValueOrThrow();
@@ -298,7 +266,6 @@ class ApiGenerator {
         });
       }
     }
-
     this.debug('写入文件...');
     await Promise.all([_fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, 'temp/api.json'), handles, {
       spaces: 2
@@ -306,8 +273,7 @@ class ApiGenerator {
       spaces: 2
     })]);
   }
+}
 
-} // new ApiGenerator().generate()
-
-
+// new ApiGenerator().generate()
 exports.ApiGenerator = ApiGenerator;

package/lib/_cjs/cli/build_util.js

@@ -1,60 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 exports.__esModule = true;
 exports.BuildUtil = void 0;
-
 var esbuild = _interopRequireWildcard(require("esbuild"));
-
 var _compressing = _interopRequireDefault(require("compressing"));
-
 var _execa = _interopRequireDefault(require("execa"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _globby = _interopRequireDefault(require("globby"));
-
 var _nodePath = _interopRequireDefault(require("node:path"));
-
 var _vtils = require("vtils");
-
 class BuildUtil {
   static async build(options) {
     var _options$minify, _options$inlineEnvs;
-
     const mainFile = _nodePath.default.join(options.cwd, 'src/main.ts');
-
     const pkgFile = _nodePath.default.join(options.cwd, 'package.json');
-
     const pkgContent = await _fsExtra.default.readJson(pkgFile);
-
     const distDir = _nodePath.default.join(options.cwd, 'dist');
-
     const tempDir = _nodePath.default.join(options.cwd, 'temp');
-
     const distMainFile = _nodePath.default.join(distDir, 'main.js');
-
     const distPkgFile = _nodePath.default.join(distDir, 'package.json');
-
     const distPm2File = _nodePath.default.join(distDir, 'pm2.config.js');
-
     const distNoInstallFile = _nodePath.default.join(distDir, 'no_install.lock');
-
     const distBundleFile = _nodePath.default.join(tempDir, `app.${pkgContent.version}.tgz`);
-
     await _fsExtra.default.ensureDir(distDir);
-    await _fsExtra.default.ensureDir(tempDir); // 处理 external
+    await _fsExtra.default.ensureDir(tempDir);
 
+    // 处理 external
     const external = (0, _vtils.uniq)(options.external || []);
     const externalWithVersions = (await Promise.all(external.map(async item => {
       try {
         // 为何不用 require.resolve:
         // Package subpath './package.json' is not defined by "exports"
         const itemPkgFile = _nodePath.default.join(process.cwd(), `node_modules/${item}/package.json`);
-
         const itemPkgContent = await _fsExtra.default.readJson(itemPkgFile);
         return {
           name: item,
@@ -66,17 +45,17 @@ class BuildUtil {
           version: ''
         };
       }
-    }))).filter(item => !!item.version); // fix: hexoid 构建问题
+    }))).filter(item => !!item.version);
 
+    // fix: hexoid 构建问题
     try {
       const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
-
       const pkg = await _fsExtra.default.readJson(hexoidPackageJsonFile);
       delete pkg.module;
       await _fsExtra.default.writeJson(hexoidPackageJsonFile, pkg);
-    } catch {} // 构建
-
+    } catch {}
 
+    // 构建
     await _fsExtra.default.emptyDir(distDir);
     await esbuild.build({
       entryPoints: [mainFile],
@@ -102,7 +81,6 @@ class BuildUtil {
       },
       plugins: [{
         name: 'extract-assets',
-
         setup(build) {
           build.onLoad({
             filter: /\/svg-captcha\/lib\/option-manager\.js$/
@@ -130,11 +108,8 @@ class BuildUtil {
             filter: /\/vm2\/lib\/vm\.js$/
           }, async args => {
             let js = await _fsExtra.default.readFile(args.path, 'utf-8');
-
             const jsDir = _nodePath.default.dirname(args.path);
-
             const assetsDir = _nodePath.default.join(distDir, 'assets/vm2');
-
             await _fsExtra.default.ensureDir(assetsDir);
             js = js.replace(/__dirname/g, '"./assets/vm2"');
             await Promise.all([_fsExtra.default.copyFile(_nodePath.default.join(jsDir, 'bridge.js'), _nodePath.default.join(assetsDir, 'bridge.js')), _fsExtra.default.copyFile(_nodePath.default.join(jsDir, 'setup-sandbox.js'), _nodePath.default.join(assetsDir, 'setup-sandbox.js'))]);
@@ -144,31 +119,29 @@ class BuildUtil {
             };
           });
         }
-
       }]
-    }); // 兼容 prisma
+    });
 
+    // 兼容 prisma
     const prismaSchemaFile = _nodePath.default.join(options.cwd, 'src/db/schema.prisma');
-
     if (await _fsExtra.default.pathExists(prismaSchemaFile)) {
       // 复制 schema.prisma
       const distPrismaSchemaFile = _nodePath.default.join(distDir, _nodePath.default.basename(prismaSchemaFile));
+      await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile);
 
-      await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile); // 复制查询引擎
-
+      // 复制查询引擎
       const libqueryEngineFiles = await (0, _globby.default)('libquery_engine-*', {
         cwd: _nodePath.default.join(options.cwd, 'node_modules/.prisma/client'),
         ignore: ['libquery_engine-{darwin,windows}*'],
         onlyFiles: true,
         absolute: true
       });
-
       for (const libqueryEngineFile of libqueryEngineFiles) {
         await _fsExtra.default.copyFile(libqueryEngineFile, _nodePath.default.join(distDir, _nodePath.default.basename(libqueryEngineFile)));
       }
-    } // 写入 pkg
-
+    }
 
+    // 写入 pkg
     const deps = externalWithVersions.reduce((res, item) => {
       res[item.name] = item.version;
       return res;
@@ -178,8 +151,9 @@ class BuildUtil {
       version: pkgContent.version,
       dependencies: deps
     };
-    await _fsExtra.default.writeJSON(distPkgFile, distPkgContent); // 写入 pm2 配置
+    await _fsExtra.default.writeJSON(distPkgFile, distPkgContent);
 
+    // 写入 pm2 配置
     await _fsExtra.default.writeFile(distPm2File, (0, _vtils.dedent)`
         module.exports = {
           apps: [
@@ -191,7 +165,6 @@ class BuildUtil {
           ],
         }
       `);
-
     if (externalWithVersions.length) {
       if (options.noInstall) {
         await _fsExtra.default.writeFile(distNoInstallFile, '');
@@ -208,12 +181,10 @@ class BuildUtil {
           }
         });
       }
-    } // 打包为 tgz
-
+    }
 
+    // 打包为 tgz
     await _compressing.default.tgz.compressDir(distDir, distBundleFile);
   }
-
 }
-
 exports.BuildUtil = BuildUtil;

package/lib/_cjs/cli/cli.js

@@ -2,27 +2,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _chokidar = _interopRequireDefault(require("chokidar"));
-
 var _execa = _interopRequireDefault(require("execa"));
-
 var _yargs = _interopRequireDefault(require("yargs"));
-
 var _api_generator = require("./api_generator");
-
 var _build_util = require("./build_util");
-
 var _vtils = require("vtils");
-
 var _deploy_util = require("./deploy_util");
-
 var _env_util = require("./env_util");
-
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
-
 var _template_util = require("./template_util");
-
 _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'i',
   describe: '额外需要生成的索引文件',
@@ -34,14 +23,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
-
   const run = () => {
-    lastRun = (0, _execa.default)('node', ['-r', require.resolve("./register"), 'src/main.ts'], {
+    lastRun = (0, _execa.default)('tsx', ['src/main.ts'], {
       cwd: process.cwd(),
       stdio: 'inherit'
     });
   };
-
   if (argv.npc) {
     const [server, vkey] = argv.npc.split('@');
     (0, _execa.default)('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
@@ -49,25 +36,21 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   }
-
   await _template_util.TemplateUtil.init(process.cwd());
-
   const watcher = _chokidar.default.watch(['src', '.env', '.env.*'], {
-    cwd: process.cwd()
+    cwd: process.cwd(),
+    ignored: '**/*.test.*'
   });
-
   watcher.on('all', (0, _vtils.debounce)(async () => {
     await _env_util.EnvUtil.importFile({
       cwd: process.cwd(),
       file: '.env'
     });
-
     _env_util.EnvUtil.outputTypes({
       cwd: process.cwd(),
       file: '.env',
       outFile: 'env.d.ts'
     });
-
     (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
       cwd: process.cwd(),
       patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
@@ -76,7 +59,6 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         console.log(`✔️ 索引文件已更新: ${filePath}`);
       }
     });
-
     if (lastRun) {
       console.log('==== 重启服务中 ====');
       lastRun.kill();
@@ -142,15 +124,14 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'
-  }); // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
+  });
+  // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
-
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   await (0, _execa.default)('tnpx', ['prisma', ...argv._.slice(1), '--schema', 'src/db/schema.prisma'], {
     cwd: process.cwd(),
     stdio: 'inherit'
   });
-
   if (!argv.production) {
     await _template_util.TemplateUtil.initModels(process.cwd());
   }
@@ -169,14 +150,13 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     file: '.env'
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
-
   if (!argv.script) {
     await (0, _execa.default)('tnpx', ['select-run'], {
       cwd: process.cwd(),
       stdio: 'inherit'
     });
   } else {
-    await (0, _execa.default)('node', ['-r', require.resolve("./register"), argv.script], {
+    await (0, _execa.default)('tsx', [argv.script], {
       cwd: process.cwd(),
       stdio: 'inherit'
     });
@@ -190,7 +170,6 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     cwd: process.cwd(),
     file: '.env.deploy'
   });
-
   if (argv.type === 'env') {
     const appEnv = await _env_util.EnvUtil.parseFileAsMap({
       cwd: process.cwd(),

package/lib/_cjs/cli/deploy_util.js

@@ -1,28 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.DeployUtil = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _vtils = require("vtils");
-
 var _nodeSsh = require("node-ssh");
-
 class DeployUtil {
   static async deploy(options) {
     const pkgContent = await _fsExtra.default.readJson(_path.default.join(options.cwd, 'package.json'));
-
     const appFile = _path.default.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
-
     if (!(await _fsExtra.default.pathExists(appFile))) {
       throw new Error('请先构建');
     }
-
     const ssh = new _nodeSsh.NodeSSH();
     await ssh.connect({
       host: options.host,
@@ -56,7 +47,6 @@ class DeployUtil {
     });
     ssh.dispose();
   }
-
   static async deployEnv(options) {
     const ssh = new _nodeSsh.NodeSSH();
     await ssh.connect({
@@ -80,7 +70,5 @@ class DeployUtil {
     });
     ssh.dispose();
   }
-
 }
-
 exports.DeployUtil = DeployUtil;