@jayfong/x-server 2.1.0 → 2.1.2

package/lib/_cjs/cli/build_util.js

@@ -15,7 +15,7 @@ var _execa = _interopRequireDefault(require("execa"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _os = _interopRequireDefault(require("os"));
+var _globby = _interopRequireDefault(require("globby"));
 
 var _nodePath = _interopRequireDefault(require("node:path"));
 
@@ -134,20 +134,21 @@ class BuildUtil {
     const prismaSchemaFile = _nodePath.default.join(options.cwd, 'src/db/schema.prisma');
 
     if (await _fsExtra.default.pathExists(prismaSchemaFile)) {
-      // 下载 centos (rhel-openssl-1.0.x,rhel-openssl-1.1.x) 的可执行文件
-      await (0, _execa.default)('tbify', ['node', require.resolve('@prisma/engines/scripts/postinstall.js')], {
-        env: {
-          // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
-          // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-          PRISMA_CLI_BINARY_TARGETS: `${_os.default.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x,rhel-openssl-1.1.x`
-        }
-      });
+      // 复制 schema.prisma
+      const distPrismaSchemaFile = _nodePath.default.join(distDir, _nodePath.default.basename(prismaSchemaFile));
 
-      const distPrismaSchemaFile = _nodePath.default.join(distDir, 'schema.prisma');
+      await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile); // 复制查询引擎
 
-      await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile);
-      await _fsExtra.default.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.0.x.so.node'), _nodePath.default.join(distDir, 'libquery_engine-rhel-openssl-1.0.x.so.node'));
-      await _fsExtra.default.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.1.x.so.node'), _nodePath.default.join(distDir, 'libquery_engine-rhel-openssl-1.1.x.so.node'));
+      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
 
 

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

@@ -1,5 +1,5 @@
 import { x, HttpError } from '@jayfong/x-server'
-import { PrismaClient } from '@prisma/client'
+import { PrismaClient, Prisma } from '@prisma/client'
 
 export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
@@ -15,6 +15,13 @@ type ModelName =
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
     public query = prismaClient[name]
+
+    public transactionify = (tx: Prisma.TransactionClient) => {
+      // @ts-ignore
+      return new (class extends this.constructor {
+        public query = tx[name]
+      })() as typeof this
+    }
   }
 }
 

package/lib/cli/build_util.js

@@ -1,9 +1,8 @@
 import * as esbuild from 'esbuild';
 import compressing from 'compressing';
 import exec from 'execa';
-import execa from 'execa';
 import fs from 'fs-extra';
-import os from 'os';
+import globby from 'globby';
 import path from 'node:path';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
@@ -108,18 +107,20 @@ export class BuildUtil {
     const prismaSchemaFile = path.join(options.cwd, 'src/db/schema.prisma');
 
     if (await fs.pathExists(prismaSchemaFile)) {
-      // 下载 centos (rhel-openssl-1.0.x,rhel-openssl-1.1.x) 的可执行文件
-      await execa('tbify', ['node', require.resolve('@prisma/engines/scripts/postinstall.js')], {
-        env: {
-          // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
-          // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-          PRISMA_CLI_BINARY_TARGETS: `${os.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x,rhel-openssl-1.1.x`
-        }
+      // 复制 schema.prisma
+      const distPrismaSchemaFile = path.join(distDir, path.basename(prismaSchemaFile));
+      await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile); // 复制查询引擎
+
+      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 distPrismaSchemaFile = path.join(distDir, 'schema.prisma');
-      await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
-      await fs.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.0.x.so.node'), path.join(distDir, 'libquery_engine-rhel-openssl-1.0.x.so.node'));
-      await fs.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.1.x.so.node'), path.join(distDir, 'libquery_engine-rhel-openssl-1.1.x.so.node'));
+
+      for (const libqueryEngineFile of libqueryEngineFiles) {
+        await fs.copyFile(libqueryEngineFile, path.join(distDir, path.basename(libqueryEngineFile)));
+      }
     } // 写入 pkg
 
 

package/lib/cli/templates/models.ts

@@ -1,5 +1,5 @@
 import { x, HttpError } from '@jayfong/x-server'
-import { PrismaClient } from '@prisma/client'
+import { PrismaClient, Prisma } from '@prisma/client'
 
 export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
@@ -15,6 +15,13 @@ type ModelName =
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
     public query = prismaClient[name]
+
+    public transactionify = (tx: Prisma.TransactionClient) => {
+      // @ts-ignore
+      return new (class extends this.constructor {
+        public query = tx[name]
+      })() as typeof this
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -54,6 +54,7 @@
     "fastify-cors": "^6.0.3",
     "fastify-multipart": "^5.3.1",
     "fs-extra": "^10.0.1",
+    "globby": "^11",
     "got": "^11.8.2",
     "http-errors": "^1.8.1",
     "ioredis": "^4.28.5",