@jayfong/x-server 2.51.0 → 2.52.0

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/services/cache.js

@@ -247,7 +247,7 @@ class CacheService {
     }
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(prefix))) {
+        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
           this.memoryCache.delete(k);
         }
       });

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/services/cache.d.ts

@@ -18,11 +18,14 @@ type KeyPathForNumberValue<T extends Data> = {
     [K in keyof T]: T[K] extends (...args: infer X) => number ? IsEmptyArray<X> extends true ? K : [K, ...X] : never;
 }[keyof T];
 type Value<T extends Data, P extends KeyPath<T>> = ReturnType<T[P extends any[] ? P[0] : P]>;
+type KeyPartialPath<T extends Data> = {
+    [K in keyof T]: T[K] extends (...args: infer X) => any ? IsEmptyArray<X> extends true ? K : [K, ...Partial<X>] : never;
+}[keyof T];
 type CacheSetTTL<V> = MsValue | ((data: V, defaultTTL: MsValue) => MsValue);
 type CacheSetOptions<V> = CacheSetTTL<V> | {
     ttl?: CacheSetTTL<V>;
 };
-export declare class CacheService<TData extends Data = Data, TKey extends Key<TData> = any, TKeyPath extends KeyPath<TData> = any, TKeyPathForNumberValue extends KeyPathForNumberValue<TData> = any> implements BaseService {
+export declare class CacheService<TData extends Data = Data, TKey extends Key<TData> = any, TKeyPath extends KeyPath<TData> = any, TKeyPathForNumberValue extends KeyPathForNumberValue<TData> = any, TKeyPartialPath extends KeyPartialPath<TData> = any> implements BaseService {
     options: CacheServiceOptions;
     serviceName: string;
     private prefix;
@@ -118,11 +121,11 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
     /**
      * 清空指定前缀的缓存。
      */
-    clear<K extends TKey>(...prefixes: K[]): Promise<number>;
+    clear(...prefixes: Array<TKey | TKeyPartialPath>): Promise<number>;
     /**
      * 派生出一个指定类型的缓存服务。
      */
-    fork<TNextData extends Data>(options?: Partial<CacheServiceOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>>;
+    fork<TNextData extends Data>(options?: Partial<CacheServiceOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>, KeyPartialPath<TNextData>>;
 }
 declare module '../x' {
     interface X {

package/lib/services/cache.js

@@ -242,7 +242,7 @@ export class CacheService {
     }
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(prefix))) {
+        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
           this.memoryCache.delete(k);
         }
       });

package/package.json

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