@jayfong/x-server 2.103.0 → 2.105.0

package/lib/_cjs/cli/api_generator.js

@@ -4,7 +4,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.ApiGenerator = void 0;
-var _path = _interopRequireDefault(require("path"));
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _debug = _interopRequireDefault(require("debug"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _tsMorph = _interopRequireWildcard(require("ts-morph"));
@@ -32,9 +32,9 @@ class ApiGenerator {
   }
   async start() {
     this.debug('启动项目...');
-    const tsConfigPath = _path.default.join(this.cwd, 'tsconfig.json');
-    const handlersPath = _path.default.join(this.cwd, 'node_modules/.x/handlers.ts');
-    const entryFile = _path.default.join(this.cwd, 'src/generated/handlers.ts');
+    const tsConfigPath = _nodePath.default.join(this.cwd, 'tsconfig.json');
+    const handlersPath = _nodePath.default.join(this.cwd, 'node_modules/.x/handlers.ts');
+    const entryFile = _nodePath.default.join(this.cwd, 'src/generated/handlers.ts');
 
     // 仅使用 ts-morph 初始化项目
     const moProject = new _tsMorph.default.Project({
@@ -62,7 +62,7 @@ class ApiGenerator {
       const categorySourceFilePath = categorySourceFile.fileName;
 
       // 忽略仅开发时生效的路由
-      if (/@dev[\/\.]/.test(categorySourceFilePath)) continue;
+      if (/@dev[/.]/.test(categorySourceFilePath)) continue;
 
       // 支持 include, exclude
       if (this.options.include?.length) {
@@ -148,11 +148,11 @@ class ApiGenerator {
     }
     this.debug('写入文件...');
     const prefix = this.options.name ? `${this.options.name}_` : '';
-    await Promise.all([_fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}api.json`), apiData, {
+    await Promise.all([_fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, `temp/${prefix}api.json`), apiData, {
       spaces: 2
-    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}yapi.json`), this.apiDataToYApiData(apiData), {
+    }), _fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, `temp/${prefix}yapi.json`), this.apiDataToYApiData(apiData), {
       spaces: 2
-    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}openapi31.json`), this.apiDataToOpenAPI31Data(apiData), {
+    }), _fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, `temp/${prefix}openapi31.json`), this.apiDataToOpenAPI31Data(apiData), {
       spaces: 2
     })]);
   }

package/lib/_cjs/cli/build_util.js

@@ -9,7 +9,6 @@ var _compressing = _interopRequireDefault(require("compressing"));
 var esbuild = _interopRequireWildcard(require("esbuild"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-var _globby = _interopRequireDefault(require("globby"));
 var _vtils = require("vtils");
 class BuildUtil {
   static async build(options) {
@@ -132,7 +131,7 @@ class BuildUtil {
 
           // 支持仅开发时生效的路由
           build.onLoad({
-            filter: /@dev[\/\.]/
+            filter: /@dev[/.]/
           }, async () => {
             return {
               contents: 'module.exports = {}',
@@ -156,9 +155,7 @@ class BuildUtil {
             });
           }
         }
-      },
-      // @ts-ignore
-      macrosPlugin()],
+      }, macrosPlugin()],
       loader: {
         // 兼容 x-text-render 在服务端使用
         // dev 时用 css_register 兼容
@@ -180,30 +177,6 @@ class BuildUtil {
         const distMultipleSchemaDir = _nodePath.default.join(distDir, _nodePath.default.basename(multipleSchemaDir));
         await _fsExtra.default.copy(multipleSchemaDir, distMultipleSchemaDir);
       }
-      if (options.noPrismaEngine) {
-        const prismaEngineFiles = await (0, _globby.default)('libquery_engine-*', {
-          cwd: distDir,
-          onlyFiles: true,
-          absolute: true
-        });
-        await Promise.all(prismaEngineFiles.map(file => _fsExtra.default.remove(file)));
-      } else {
-        // 复制查询引擎
-        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
-        });
-        const prismaCliBinaryTargets = options.prismaCliBinaryTargets?.split(',') || [];
-        for (const libqueryEngineFile of libqueryEngineFiles) {
-          const libqueryEngineFileBaseName = _nodePath.default.basename(libqueryEngineFile);
-          if (prismaCliBinaryTargets.length && prismaCliBinaryTargets.every(prismaCliBinaryTarget => !libqueryEngineFile.includes(prismaCliBinaryTarget))) {
-            continue;
-          }
-          await _fsExtra.default.copyFile(libqueryEngineFile, _nodePath.default.join(distDir, libqueryEngineFileBaseName));
-        }
-      }
     }
 
     // 写入 pkg
@@ -232,9 +205,9 @@ class BuildUtil {
             {
               name: ${JSON.stringify(distPkgContent.name)},
               script: './main.js',
+              interpreter: 'node',
+              interpreter_args: ${JSON.stringify(options.pm2NodeArgs || [])},
               ${hasNvmrc ? `
-                      interpreter: 'node',
-                      interpreter_args: [],
                       env: {
                         PATH: \`\${require('child_process').execSync('fnm exec which node').toString().trim().replace(/\\/node$/, '')}:\${process.env.PATH}\`,
                       },

package/lib/_cjs/cli/cli.js

@@ -3,7 +3,7 @@
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _path = _interopRequireDefault(require("path"));
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
@@ -96,7 +96,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         });
       }
       await _template_util.TemplateUtil.init(process.cwd());
-      const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
+      const xsignoreFile = _nodePath.default.join(process.cwd(), '.xsignore');
       const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
       const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
         cwd: process.cwd(),
@@ -167,12 +167,6 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建时排除的文件',
   type: 'string',
   array: true
-})
-// 注意：不要加 no 前缀，其会自动处理
-.positional('prisma-engine', {
-  describe: '是否包含 Prisma 引擎',
-  type: 'boolean',
-  default: true
 }).positional('empty-dist-dir', {
   describe: '是否清空构建目录',
   type: 'boolean',
@@ -225,11 +219,10 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
             onlyCode: true
           });
         }),
-        prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS,
-        noPrismaEngine: argv['prisma-engine'] === false,
         noEmptyDistDir: argv['empty-dist-dir'] === false,
         pm2MaxMemoryRestart: deployEnv.MEMORY,
-        pm2CronRestart: deployEnv.CRON
+        pm2CronRestart: deployEnv.CRON,
+        pm2NodeArgs: deployEnv.NODE_ARGS
       });
       console.log('构建成功');
       if (argv.deploy) {
@@ -305,7 +298,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 
       // 多 schema 文件兼容
       // https://www.prisma.io/docs/orm/prisma-schema/overview/location#how-to-use-existing-prisma-cli-commands-with-multiple-prisma-schema-files
-      const schemaDir = _path.default.join(process.cwd(), 'src/db/schema');
+      const schemaDir = _nodePath.default.join(process.cwd(), 'src/db/schema');
       const isMultipleFiles = await _fsExtra.default.pathExists(schemaDir);
       const schemaArg = isMultipleFiles ? 'src/db' : 'src/db/schema.prisma';
       await (0, _execa.default)('tnpx', ['prisma', ...argv._.slice(1), '--schema', schemaArg], {
@@ -376,7 +369,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     channel: '_',
     cb: async channel => {
       if (channel && argv.file) {
-        await _fsExtra.default.writeFile(_path.default.join(process.cwd(), argv.file), channel);
+        await _fsExtra.default.writeFile(_nodePath.default.join(process.cwd(), argv.file), channel);
       }
       console.log(channel || '');
     }

package/lib/_cjs/cli/deploy_util.js

@@ -3,14 +3,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.DeployUtil = void 0;
-var _path = _interopRequireDefault(require("path"));
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _nodeSsh = require("node-ssh");
 var _vtils = require("vtils");
 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${options.channel ? `/${options.channel}` : ''}/app.${pkgContent.version}.tgz`);
+    const pkgContent = await _fsExtra.default.readJson(_nodePath.default.join(options.cwd, 'package.json'));
+    const appFile = _nodePath.default.join(options.cwd, `temp${options.channel ? `/${options.channel}` : ''}/app.${pkgContent.version}.tgz`);
     if (!(await _fsExtra.default.pathExists(appFile))) {
       throw new Error('请先构建');
     }
@@ -32,7 +32,7 @@ class DeployUtil {
       onStdout: buf => console.log(buf.toString()),
       onStderr: buf => console.log(buf.toString())
     });
-    const remoteAppFile = `${options.dir}/app_files/${appName}/${options.channel || 'dist'}/${_path.default.basename(appFile)}`;
+    const remoteAppFile = `${options.dir}/app_files/${appName}/${options.channel || 'dist'}/${_nodePath.default.basename(appFile)}`;
     await ssh.putFile(appFile, remoteAppFile);
     await ssh.execCommand((0, _vtils.dedent)`
         set -ex

package/lib/_cjs/cli/env_util.js

@@ -206,7 +206,6 @@ class EnvUtil {
       process.env[env.key] = env.value;
     }
     process.env.X_SERVER_ENVS = JSON.stringify({
-      // @ts-ignore
       ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
       ...envsObj
     });

package/lib/_cjs/cli/template_util.js

@@ -3,9 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.TemplateUtil = void 0;
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
-var _path = _interopRequireDefault(require("path"));
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 var _vtils = require("vtils");
 class TemplateUtil {
@@ -20,10 +20,9 @@ class TemplateUtil {
    * 初始化辅助包。
    */
   static async initHelperPackage(cwd) {
-    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
-    const fromDir = _path.default.join(__dirname, 'templates');
-    const toDir = _path.default.join(cwd, 'node_modules/.x');
-    const hasDb = await _fsExtra.default.pathExists(_path.default.join(cwd, 'src/db/schema.prisma'));
+    const fromDir = _nodePath.default.join(__dirname, 'templates');
+    const toDir = _nodePath.default.join(cwd, 'node_modules/.x');
+    const hasDb = await _fsExtra.default.pathExists(_nodePath.default.join(cwd, 'src/db/schema.prisma'));
     const fromFiles = await (0, _globby.default)('*', {
       cwd: fromDir,
       onlyFiles: true,
@@ -37,7 +36,7 @@ class TemplateUtil {
         await _fsExtra.default.writeFile(toFile, 'export {}');
       } else {
         let fromFileContent = await _fsExtra.default.readFile(fromFile, 'utf-8');
-        fromFileContent = fromFileContent.replaceAll('../.prisma/client/index.d.ts', _path.default.relative(toDir, prismaClientFile)).replaceAll('../../src', _path.default.relative(toDir, `${cwd}/src`));
+        fromFileContent = fromFileContent.replaceAll('../../src', _nodePath.default.relative(toDir, `${cwd}/src`));
         await _fsExtra.default.writeFile(toFile, fromFileContent);
       }
     }));
@@ -52,8 +51,8 @@ class TemplateUtil {
    * 初始化任务。
    */
   static async initTasks(cwd) {
-    const tasksDir = _path.default.join(cwd, 'src/tasks');
-    const tasksIndexFile = _path.default.join(tasksDir, 'index.ts');
+    const tasksDir = _nodePath.default.join(cwd, 'src/tasks');
+    const tasksIndexFile = _nodePath.default.join(tasksDir, 'index.ts');
     if (!(await _fsExtra.default.pathExists(tasksIndexFile))) {
       await _fsExtra.default.outputFile(tasksIndexFile, (0, _vtils.dedent)`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
@@ -66,16 +65,16 @@ class TemplateUtil {
    * 初始化模型。
    */
   static async initModels(cwd) {
-    const modelsDir = _path.default.join(cwd, 'src/models');
-    const indexFile = _path.default.join(modelsDir, 'index.ts');
-    const indexFile2 = _path.default.join(cwd, 'node_modules/.x/models.ts');
-    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
+    const modelsDir = _nodePath.default.join(cwd, 'src/models');
+    const indexFile = _nodePath.default.join(modelsDir, 'index.ts');
+    const indexFile2 = _nodePath.default.join(cwd, 'node_modules/.x/models.ts');
+    const prismaClientFile = _nodePath.default.join(cwd, 'node_modules/.x/prisma/internal/prismaNamespace.ts');
     const prismaClientFileContent = await _fsExtra.default.readFile(prismaClientFile, 'utf8');
-    const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => (0, _vtils.camelCase)(match[1]));
+    const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => (0, _vtils.camelCase)(match[1]));
     await Promise.all(modelNames.map(async modelName => {
       const model_name = (0, _vtils.snakeCase)(modelName);
       const ModelName = (0, _vtils.upperFirst)(modelName);
-      const modelFile = _path.default.join(modelsDir, `${model_name}.ts`);
+      const modelFile = _nodePath.default.join(modelsDir, `${model_name}.ts`);
       if (!(await _fsExtra.default.pathExists(modelFile))) {
         await _fsExtra.default.outputFile(modelFile, (0, _vtils.dedent)`
               import { ${ModelName}BaseModel } from '@jayfong/x-server'
@@ -98,14 +97,5 @@ class TemplateUtil {
       replaceFile: true
     });
   }
-  static getPrismaClientTypeFile() {
-    // const prismaClientFile = path.join(
-    //   cwd,
-    //   'node_modules/.prisma/client/index.d.ts',
-    // )
-    // 用 require.resolve 以兼容 pnpm
-    const prismaClientFile = require.resolve('@prisma/client/package.json').replace('@prisma/client/package.json', '.prisma/client/index.d.ts');
-    return prismaClientFile;
-  }
 }
 exports.TemplateUtil = TemplateUtil;

package/lib/_cjs/cli/templates/models.ts

@@ -1,23 +1,33 @@
+import { URL } from 'node:url';
 import { x } from '@jayfong/x-server';
-import { Prisma, PrismaClient } from '@prisma/client';
+import { PrismaMariaDb } from '@prisma/adapter-mariadb';
+import { type Prisma, PrismaClient } from './prisma/client';
 
-export const prismaClient = new PrismaClient();
+const dbUri = new URL(process.env.DATABASE_URL!);
+const adapter = new PrismaMariaDb({
+  host: dbUri.hostname,
+  port: +dbUri.port,
+  user: dbUri.username,
+  password: dbUri.password,
+  database: dbUri.pathname.slice(1),
+});
+export const prismaClient = new PrismaClient({ adapter });
 
 x.dispose.add(() => prismaClient.$disconnect());
 
 type ModelName =
-  // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
+  // @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
   '';
 // @endindex
 
-function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
+function _makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
     public query = prismaClient[name];
 
     public transactionClient: Prisma.TransactionClient | null = null;
 
     public transactionify = (tx: Prisma.TransactionClient) => {
-      // @ts-ignore
+      // @ts-expect-error
       return new (class extends this.constructor {
         public query = tx[name];
 
@@ -37,10 +47,10 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   };
 }
 
-// @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
+// @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = _makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
 
-export * from '@prisma/client';
+export * from './prisma/client';
 
 export const startTransaction = <T>(
   cb: (
@@ -49,11 +59,11 @@ export const startTransaction = <T>(
     },
   ) => Promise<T>,
 ): Promise<T> => {
-  return prismaClient.$transaction(async tx => {
+  return prismaClient.$transaction(async _tx => {
     const _models = require('../../src/models');
-    const cache = Object.create(null);
+    const _cache = Object.create(null);
     return cb({
-      // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return cache.${_.camel(m[1])} || (cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(tx)) }, `)
+      // @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return _cache.${_.camel(m[1])} || (_cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(_tx)) }, `)
       // @endindex
     });
   });

package/lib/cli/api_generator.d.ts

@@ -1,9 +1,9 @@
 import createDebug from 'debug';
-import { type JSONSchema4 } from 'json-schema';
-import { type OpenAPIV3_1 } from 'openapi-types';
+import type { JSONSchema4 } from 'json-schema';
+import type { OpenAPIV3_1 } from 'openapi-types';
 import { ts } from 'ts-morph';
-import { LiteralUnion } from 'vtils/types';
-import { type XHandler } from '../core/types';
+import type { LiteralUnion } from 'vtils/types';
+import type { XHandler } from '../core/types';
 /** 注释 */
 type Comment = {
     existing: boolean;

package/lib/cli/api_generator.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import createDebug from 'debug';
 import fs from 'fs-extra';
 import mo, { ts } from 'ts-morph';
@@ -57,7 +57,7 @@ export class ApiGenerator {
       const categorySourceFilePath = categorySourceFile.fileName;
 
       // 忽略仅开发时生效的路由
-      if (/@dev[\/\.]/.test(categorySourceFilePath)) continue;
+      if (/@dev[/.]/.test(categorySourceFilePath)) continue;
 
       // 支持 include, exclude
       if (this.options.include?.length) {

package/lib/cli/build_util.d.ts

@@ -7,11 +7,10 @@ export interface BuildOptions {
     noInstall?: boolean;
     channel?: string;
     excludeFiles?: string[];
-    prismaCliBinaryTargets?: string;
-    noPrismaEngine?: boolean;
     noEmptyDistDir?: boolean;
     pm2MaxMemoryRestart?: string;
     pm2CronRestart?: string;
+    pm2NodeArgs?: string | string[];
 }
 export declare class BuildUtil {
     static build(options: BuildOptions): Promise<void>;

package/lib/cli/build_util.js

@@ -3,7 +3,6 @@ import compressing from 'compressing';
 import * as esbuild from 'esbuild';
 import exec from 'execa';
 import fs from 'fs-extra';
-import globby from 'globby';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
@@ -126,7 +125,7 @@ export class BuildUtil {
 
           // 支持仅开发时生效的路由
           build.onLoad({
-            filter: /@dev[\/\.]/
+            filter: /@dev[/.]/
           }, async () => {
             return {
               contents: 'module.exports = {}',
@@ -150,9 +149,7 @@ export class BuildUtil {
             });
           }
         }
-      },
-      // @ts-ignore
-      macrosPlugin()],
+      }, macrosPlugin()],
       loader: {
         // 兼容 x-text-render 在服务端使用
         // dev 时用 css_register 兼容
@@ -174,30 +171,6 @@ export class BuildUtil {
         const distMultipleSchemaDir = path.join(distDir, path.basename(multipleSchemaDir));
         await fs.copy(multipleSchemaDir, distMultipleSchemaDir);
       }
-      if (options.noPrismaEngine) {
-        const prismaEngineFiles = await globby('libquery_engine-*', {
-          cwd: distDir,
-          onlyFiles: true,
-          absolute: true
-        });
-        await Promise.all(prismaEngineFiles.map(file => fs.remove(file)));
-      } else {
-        // 复制查询引擎
-        const libqueryEngineFiles = await globby('libquery_engine-*', {
-          cwd: path.join(options.cwd, 'node_modules/.prisma/client'),
-          ignore: ['libquery_engine-{darwin,windows}*'],
-          onlyFiles: true,
-          absolute: true
-        });
-        const prismaCliBinaryTargets = options.prismaCliBinaryTargets?.split(',') || [];
-        for (const libqueryEngineFile of libqueryEngineFiles) {
-          const libqueryEngineFileBaseName = path.basename(libqueryEngineFile);
-          if (prismaCliBinaryTargets.length && prismaCliBinaryTargets.every(prismaCliBinaryTarget => !libqueryEngineFile.includes(prismaCliBinaryTarget))) {
-            continue;
-          }
-          await fs.copyFile(libqueryEngineFile, path.join(distDir, libqueryEngineFileBaseName));
-        }
-      }
     }
 
     // 写入 pkg
@@ -226,9 +199,9 @@ export class BuildUtil {
             {
               name: ${JSON.stringify(distPkgContent.name)},
               script: './main.js',
+              interpreter: 'node',
+              interpreter_args: ${JSON.stringify(options.pm2NodeArgs || [])},
               ${hasNvmrc ? `
-                      interpreter: 'node',
-                      interpreter_args: [],
                       env: {
                         PATH: \`\${require('child_process').execSync('fnm exec which node').toString().trim().replace(/\\/node$/, '')}:\${process.env.PATH}\`,
                       },

package/lib/cli/cli.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
-import path from 'path';
+import path from 'node:path';
 import chokidar from 'chokidar';
 import execa from 'execa';
 import fs from 'fs-extra';
 import { generateManyIndex } from 'vscode-generate-index-standalone';
-import { castArray, debounce } from 'vtils';
-import { StringTemplate } from 'vtils';
 import * as vtils from 'vtils';
+import { castArray, debounce, StringTemplate } from 'vtils';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
@@ -164,12 +163,6 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建时排除的文件',
   type: 'string',
   array: true
-})
-// 注意：不要加 no 前缀，其会自动处理
-.positional('prisma-engine', {
-  describe: '是否包含 Prisma 引擎',
-  type: 'boolean',
-  default: true
 }).positional('empty-dist-dir', {
   describe: '是否清空构建目录',
   type: 'boolean',
@@ -222,11 +215,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
             onlyCode: true
           });
         }),
-        prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS,
-        noPrismaEngine: argv['prisma-engine'] === false,
         noEmptyDistDir: argv['empty-dist-dir'] === false,
         pm2MaxMemoryRestart: deployEnv.MEMORY,
-        pm2CronRestart: deployEnv.CRON
+        pm2CronRestart: deployEnv.CRON,
+        pm2NodeArgs: deployEnv.NODE_ARGS
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/cli/deploy_util.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import fs from 'fs-extra';
 import { NodeSSH } from 'node-ssh';
 import { dedent } from 'vtils';

package/lib/cli/env_util.js

@@ -201,7 +201,6 @@ export class EnvUtil {
       process.env[env.key] = env.value;
     }
     process.env.X_SERVER_ENVS = JSON.stringify({
-      // @ts-ignore
       ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
       ...envsObj
     });

package/lib/cli/template_util.d.ts

@@ -15,5 +15,4 @@ export declare class TemplateUtil {
      * 初始化模型。
      */
     static initModels(cwd: string): Promise<void>;
-    static getPrismaClientTypeFile(): string;
 }

package/lib/cli/template_util.js

@@ -1,6 +1,6 @@
+import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
-import path from 'path';
 import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { camelCase, dedent, snakeCase, upperFirst } from 'vtils';
 export class TemplateUtil {
@@ -15,7 +15,6 @@ export class TemplateUtil {
    * 初始化辅助包。
    */
   static async initHelperPackage(cwd) {
-    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const fromDir = path.join(__dirname, 'templates');
     const toDir = path.join(cwd, 'node_modules/.x');
     const hasDb = await fs.pathExists(path.join(cwd, 'src/db/schema.prisma'));
@@ -32,7 +31,7 @@ export class TemplateUtil {
         await fs.writeFile(toFile, 'export {}');
       } else {
         let fromFileContent = await fs.readFile(fromFile, 'utf-8');
-        fromFileContent = fromFileContent.replaceAll('../.prisma/client/index.d.ts', path.relative(toDir, prismaClientFile)).replaceAll('../../src', path.relative(toDir, `${cwd}/src`));
+        fromFileContent = fromFileContent.replaceAll('../../src', path.relative(toDir, `${cwd}/src`));
         await fs.writeFile(toFile, fromFileContent);
       }
     }));
@@ -64,9 +63,9 @@ export class TemplateUtil {
     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 = TemplateUtil.getPrismaClientTypeFile();
+    const prismaClientFile = path.join(cwd, 'node_modules/.x/prisma/internal/prismaNamespace.ts');
     const prismaClientFileContent = await fs.readFile(prismaClientFile, 'utf8');
-    const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => camelCase(match[1]));
+    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);
@@ -93,13 +92,4 @@ export class TemplateUtil {
       replaceFile: true
     });
   }
-  static getPrismaClientTypeFile() {
-    // const prismaClientFile = path.join(
-    //   cwd,
-    //   'node_modules/.prisma/client/index.d.ts',
-    // )
-    // 用 require.resolve 以兼容 pnpm
-    const prismaClientFile = require.resolve('@prisma/client/package.json').replace('@prisma/client/package.json', '.prisma/client/index.d.ts');
-    return prismaClientFile;
-  }
 }

package/lib/cli/templates/models.ts

@@ -1,23 +1,33 @@
+import { URL } from 'node:url';
 import { x } from '@jayfong/x-server';
-import { Prisma, PrismaClient } from '@prisma/client';
+import { PrismaMariaDb } from '@prisma/adapter-mariadb';
+import { type Prisma, PrismaClient } from './prisma/client';
 
-export const prismaClient = new PrismaClient();
+const dbUri = new URL(process.env.DATABASE_URL!);
+const adapter = new PrismaMariaDb({
+  host: dbUri.hostname,
+  port: +dbUri.port,
+  user: dbUri.username,
+  password: dbUri.password,
+  database: dbUri.pathname.slice(1),
+});
+export const prismaClient = new PrismaClient({ adapter });
 
 x.dispose.add(() => prismaClient.$disconnect());
 
 type ModelName =
-  // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
+  // @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
   '';
 // @endindex
 
-function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
+function _makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
     public query = prismaClient[name];
 
     public transactionClient: Prisma.TransactionClient | null = null;
 
     public transactionify = (tx: Prisma.TransactionClient) => {
-      // @ts-ignore
+      // @ts-expect-error
       return new (class extends this.constructor {
         public query = tx[name];
 
@@ -37,10 +47,10 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   };
 }
 
-// @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
+// @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = _makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
 
-export * from '@prisma/client';
+export * from './prisma/client';
 
 export const startTransaction = <T>(
   cb: (
@@ -49,11 +59,11 @@ export const startTransaction = <T>(
     },
   ) => Promise<T>,
 ): Promise<T> => {
-  return prismaClient.$transaction(async tx => {
+  return prismaClient.$transaction(async _tx => {
     const _models = require('../../src/models');
-    const cache = Object.create(null);
+    const _cache = Object.create(null);
     return cb({
-      // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return cache.${_.camel(m[1])} || (cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(tx)) }, `)
+      // @index('./prisma/internal/prismaNamespace.ts', /(?<=const ModelName).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return _cache.${_.camel(m[1])} || (_cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(_tx)) }, `)
       // @endindex
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.103.0",
+  "version": "2.105.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -27,7 +27,8 @@
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
-    "@prisma/client": "^6.3.1",
+    "@prisma/adapter-mariadb": "^6.17.0",
+    "@prisma/client": "^6.17.0",
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^1.8.2",
     "@types/jsonwebtoken": "^8.5.8",
@@ -65,7 +66,7 @@
     "pino-pretty": "^10.0.1",
     "pinyin-pro": "^3.26.0",
     "pirates": "^4.0.6",
-    "prisma": "^6.3.1",
+    "prisma": "^6.17.0",
     "select-run": "^1.1.2",
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",