@jayfong/x-server 2.80.4 → 2.81.1

package/lib/_cjs/cli/build_util.js

@@ -186,8 +186,13 @@ class BuildUtil {
         onlyFiles: true,
         absolute: true
       });
+      const prismaCliBinaryTargets = options.prismaCliBinaryTargets?.split(',') || [];
       for (const libqueryEngineFile of libqueryEngineFiles) {
-        await _fsExtra.default.copyFile(libqueryEngineFile, _nodePath.default.join(distDir, _nodePath.default.basename(libqueryEngineFile)));
+        const libqueryEngineFileBaseName = _nodePath.default.basename(libqueryEngineFile);
+        if (prismaCliBinaryTargets.length && prismaCliBinaryTargets.every(prismaCliBinaryTarget => !libqueryEngineFile.includes(prismaCliBinaryTarget))) {
+          break;
+        }
+        await _fsExtra.default.copyFile(libqueryEngineFile, _nodePath.default.join(distDir, libqueryEngineFileBaseName));
       }
     }
 

package/lib/_cjs/cli/cli.js

@@ -154,6 +154,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建完是否部署',
   type: 'boolean',
   default: false
+}).positional('concurrency', {
+  alias: 'c',
+  describe: '同时构建的数量',
+  type: 'number',
+  default: 1
 }).positional('exclude', {
   alias: 'x',
   describe: '构建时排除的文件',
@@ -163,6 +168,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
     channel: argv.channel,
+    concurrency: argv.concurrency,
     cb: async channel => {
       process.env.NODE_ENV = 'production';
       const externals = (0, _vtils.castArray)(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
@@ -195,7 +201,8 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
             onlyCode: true,
             beforeReplace: v => (0, _vtils.escapeRegExp)(v)
           });
-        })
+        }),
+        prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/_cjs/cli/env_util.js

@@ -38,23 +38,51 @@ class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
+    const successChannels = [];
+    const failedChannels = [];
     if (options.channel?.startsWith('_')) {
       const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
       const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
-      await options.cb(channel);
+      try {
+        await options.cb(channel);
+        successChannels.push(channel);
+      } catch (err) {
+        console.error(err);
+        failedChannels.push(channel);
+      }
     } else if (options.channel?.startsWith('@')) {
       const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
       const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
-      for (const channel of channels) {
+      await Promise.all(channels.map((0, _vtils.asyncLimit)(async channel => {
         console.log(`========= ${channel} =========`);
-        await options.cb(channel);
-      }
+        try {
+          await options.cb(channel);
+          successChannels.push(channel);
+        } catch (err) {
+          console.error(err);
+          failedChannels.push(channel);
+        }
+      }, {
+        concurrency: options.concurrency || 1
+      })));
     } else {
       if (options.channel) {
         console.log(`========= ${options.channel} =========`);
       }
-      await options.cb(options.channel);
+      try {
+        await options.cb(options.channel);
+        options.channel && successChannels.push(options.channel);
+      } catch (err) {
+        console.error(err);
+        options.channel && failedChannels.push(options.channel);
+      }
+    }
+    if (successChannels.length) {
+      console.log(`✅(${successChannels.length})：${JSON.stringify(successChannels)}`);
+    }
+    if (failedChannels.length) {
+      console.log(`❌(${failedChannels.length})：${JSON.stringify(failedChannels)}`);
     }
   }
   static getFile(env, channel, noBase) {

package/lib/cli/build_util.d.ts

@@ -7,6 +7,7 @@ export interface BuildOptions {
     noInstall?: boolean;
     channel?: string;
     excludeFiles?: string[];
+    prismaCliBinaryTargets?: string;
 }
 export declare class BuildUtil {
     static build(options: BuildOptions): Promise<void>;

package/lib/cli/build_util.js

@@ -180,8 +180,13 @@ export class BuildUtil {
         onlyFiles: true,
         absolute: true
       });
+      const prismaCliBinaryTargets = options.prismaCliBinaryTargets?.split(',') || [];
       for (const libqueryEngineFile of libqueryEngineFiles) {
-        await fs.copyFile(libqueryEngineFile, path.join(distDir, path.basename(libqueryEngineFile)));
+        const libqueryEngineFileBaseName = path.basename(libqueryEngineFile);
+        if (prismaCliBinaryTargets.length && prismaCliBinaryTargets.every(prismaCliBinaryTarget => !libqueryEngineFile.includes(prismaCliBinaryTarget))) {
+          break;
+        }
+        await fs.copyFile(libqueryEngineFile, path.join(distDir, libqueryEngineFileBaseName));
       }
     }
 

package/lib/cli/cli.js

@@ -152,6 +152,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建完是否部署',
   type: 'boolean',
   default: false
+}).positional('concurrency', {
+  alias: 'c',
+  describe: '同时构建的数量',
+  type: 'number',
+  default: 1
 }).positional('exclude', {
   alias: 'x',
   describe: '构建时排除的文件',
@@ -161,6 +166,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   await EnvUtil.withChannel({
     cwd: process.cwd(),
     channel: argv.channel,
+    concurrency: argv.concurrency,
     cb: async channel => {
       process.env.NODE_ENV = 'production';
       const externals = castArray(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
@@ -193,7 +199,8 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
             onlyCode: true,
             beforeReplace: v => escapeRegExp(v)
           });
-        })
+        }),
+        prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/cli/env_util.d.ts

@@ -14,6 +14,7 @@ export declare class EnvUtil {
     static withChannel(options: {
         cwd: string;
         channel?: string;
+        concurrency?: number;
         cb: (channel: string | undefined) => any;
     }): Promise<void>;
     static getFile(env?: string, channel?: string, noBase?: boolean): string[];

package/lib/cli/env_util.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
 import inquirer from 'inquirer';
-import { dedent, difference, escapeRegExp, isPlainObject, uniq } from 'vtils';
+import { asyncLimit, dedent, difference, escapeRegExp, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static async getAllChannel(cwd, excludeChannels) {
@@ -33,23 +33,51 @@ export class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
+    const successChannels = [];
+    const failedChannels = [];
     if (options.channel?.startsWith('_')) {
       const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
       const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
-      await options.cb(channel);
+      try {
+        await options.cb(channel);
+        successChannels.push(channel);
+      } catch (err) {
+        console.error(err);
+        failedChannels.push(channel);
+      }
     } else if (options.channel?.startsWith('@')) {
       const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
       const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
-      for (const channel of channels) {
+      await Promise.all(channels.map(asyncLimit(async channel => {
         console.log(`========= ${channel} =========`);
-        await options.cb(channel);
-      }
+        try {
+          await options.cb(channel);
+          successChannels.push(channel);
+        } catch (err) {
+          console.error(err);
+          failedChannels.push(channel);
+        }
+      }, {
+        concurrency: options.concurrency || 1
+      })));
     } else {
       if (options.channel) {
         console.log(`========= ${options.channel} =========`);
       }
-      await options.cb(options.channel);
+      try {
+        await options.cb(options.channel);
+        options.channel && successChannels.push(options.channel);
+      } catch (err) {
+        console.error(err);
+        options.channel && failedChannels.push(options.channel);
+      }
+    }
+    if (successChannels.length) {
+      console.log(`✅(${successChannels.length})：${JSON.stringify(successChannels)}`);
+    }
+    if (failedChannels.length) {
+      console.log(`❌(${failedChannels.length})：${JSON.stringify(failedChannels)}`);
     }
   }
   static getFile(env, channel, noBase) {

package/package.json

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