@jayfong/x-server 2.50.1 → 2.51.1

package/lib/_cjs/cli/build_util.js

@@ -141,6 +141,13 @@ class BuildUtil {
       const distPrismaSchemaFile = _nodePath.default.join(distDir, _nodePath.default.basename(prismaSchemaFile));
       await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile);
 
+      // 多 schema 文件兼容
+      const multipleSchemaDir = _nodePath.default.join(options.cwd, 'src/db/schema');
+      if (await _fsExtra.default.pathExists(multipleSchemaDir)) {
+        const distMultipleSchemaDir = _nodePath.default.join(distDir, _nodePath.default.basename(multipleSchemaDir));
+        await _fsExtra.default.copy(multipleSchemaDir, distMultipleSchemaDir);
+      }
+
       // 复制查询引擎
       const libqueryEngineFiles = await (0, _globby.default)('libquery_engine-*', {
         cwd: _nodePath.default.join(options.cwd, 'node_modules/.prisma/client'),

package/lib/_cjs/cli/cli.js

@@ -2,8 +2,10 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _path = _interopRequireDefault(require("path"));
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _execa = _interopRequireDefault(require("execa"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 var _vtils = require("vtils");
 var _yargs = _interopRequireDefault(require("yargs"));
@@ -142,7 +144,13 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   // 之所以能成功是因为 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'], {
+
+  // 多 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 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], {
     cwd: process.cwd(),
     stdio: 'inherit'
   });

package/lib/_cjs/core/server.js

@@ -139,6 +139,9 @@ class Server {
         });
       }
 
+      // 静态文件服务
+      this.applyStatic();
+
       // 接口统一入口
       fastify.route({
         method: 'POST',
@@ -170,12 +173,40 @@ class Server {
               return 'ping:success';
             } else if (payload.type === 'updateEnv') {
               Object.assign(_x.x.env, payload.data);
+
+              // 更新静态文件服务
+              this.applyStatic();
             }
           }
         }
       });
     });
   }
+  async applyStatic() {
+    if (Array.isArray(_x.x.env.APP_STATIC_CONTENT)) {
+      const staticContent = _x.x.env.APP_STATIC_CONTENT;
+      for (const item of staticContent) {
+        if (!item.method) {
+          item.method = 'GET';
+        }
+        if (!this.fastify.hasRoute({
+          method: item.method,
+          url: item.path
+        })) {
+          this.fastify.route({
+            method: item.method,
+            url: item.path,
+            handler: async (_req, res) => {
+              if (!item.contentType && typeof item.content === 'string') {
+                res.header('Content-Type', 'plain/text');
+              }
+              return item.content;
+            }
+          });
+        }
+      }
+    }
+  }
   async startCrons() {
     // @ts-ignore
     await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('.x/crons')));

package/lib/cli/build_util.js

@@ -135,6 +135,13 @@ export class BuildUtil {
       const distPrismaSchemaFile = path.join(distDir, path.basename(prismaSchemaFile));
       await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
 
+      // 多 schema 文件兼容
+      const multipleSchemaDir = path.join(options.cwd, 'src/db/schema');
+      if (await fs.pathExists(multipleSchemaDir)) {
+        const distMultipleSchemaDir = path.join(distDir, path.basename(multipleSchemaDir));
+        await fs.copy(multipleSchemaDir, distMultipleSchemaDir);
+      }
+
       // 复制查询引擎
       const libqueryEngineFiles = await globby('libquery_engine-*', {
         cwd: path.join(options.cwd, 'node_modules/.prisma/client'),

package/lib/cli/cli.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
+import path from '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 yargs from 'yargs';
@@ -139,7 +141,13 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
-  await execa('tnpx', ['prisma', ...argv._.slice(1), '--schema', 'src/db/schema.prisma'], {
+
+  // 多 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.join(process.cwd(), 'src/db/schema');
+  const isMultipleFiles = await fs.pathExists(schemaDir);
+  const schemaArg = isMultipleFiles ? 'src/db' : 'src/db/schema.prisma';
+  await execa('tnpx', ['prisma', ...argv._.slice(1), '--schema', schemaArg], {
     cwd: process.cwd(),
     stdio: 'inherit'
   });

package/lib/core/server.d.ts

@@ -14,6 +14,7 @@ export declare class Server {
     private applyServices;
     private applyPlugins;
     private applyRoutes;
+    private applyStatic;
     private startCrons;
     private applyAutoClose;
 }

package/lib/core/server.js

@@ -133,6 +133,9 @@ export class Server {
         });
       }
 
+      // 静态文件服务
+      this.applyStatic();
+
       // 接口统一入口
       fastify.route({
         method: 'POST',
@@ -164,12 +167,40 @@ export class Server {
               return 'ping:success';
             } else if (payload.type === 'updateEnv') {
               Object.assign(x.env, payload.data);
+
+              // 更新静态文件服务
+              this.applyStatic();
             }
           }
         }
       });
     });
   }
+  async applyStatic() {
+    if (Array.isArray(x.env.APP_STATIC_CONTENT)) {
+      const staticContent = x.env.APP_STATIC_CONTENT;
+      for (const item of staticContent) {
+        if (!item.method) {
+          item.method = 'GET';
+        }
+        if (!this.fastify.hasRoute({
+          method: item.method,
+          url: item.path
+        })) {
+          this.fastify.route({
+            method: item.method,
+            url: item.path,
+            handler: async (_req, res) => {
+              if (!item.contentType && typeof item.content === 'string') {
+                res.header('Content-Type', 'plain/text');
+              }
+              return item.content;
+            }
+          });
+        }
+      }
+    }
+  }
   async startCrons() {
     // @ts-ignore
     await import('.x/crons');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.50.1",
+  "version": "2.51.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",