@jayfong/x-server 2.75.0 → 2.76.0

package/lib/_cjs/cli/build_util.js

@@ -137,6 +137,21 @@ class BuildUtil {
               loader: 'js'
             };
           });
+
+          // 支持构建时排除文件
+          if (options.excludeFiles?.length) {
+            const excludeRegExps = options.excludeFiles.map(item => new RegExp(item));
+            build.onLoad({
+              filter: /\.ts$/
+            }, async args => {
+              if (excludeRegExps.some(re => re.test(args.path))) {
+                return {
+                  contents: 'export {}',
+                  loader: 'js'
+                };
+              }
+            });
+          }
         }
       },
       // @ts-ignore

package/lib/_cjs/cli/cli.js

@@ -151,6 +151,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建完是否部署',
   type: 'boolean',
   default: false
+}).positional('exclude', {
+  alias: 'x',
+  describe: '构建时排除的文件',
+  type: 'string',
+  array: true
 }), async argv => {
   await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -179,7 +184,13 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         inlineEnvs: envMap,
         minify: argv.minify,
         noInstall: argv['no-install'],
-        channel: channel
+        channel: channel,
+        excludeFiles: argv.exclude?.map(item => {
+          return (0, _vtils.escapeRegExp)(_vtils.StringTemplate.render(item, envMap, {
+            code: true,
+            onlyCode: true
+          }));
+        })
       });
       console.log('构建成功');
       if (argv.deploy) {

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

@@ -1,68 +1,68 @@
-import * as handlers from './handlers'
-import { Handler, XServer } from '@jayfong/x-server'
+import { Handler, XServer } from '@jayfong/x-server';
+import * as handlers from './handlers';
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `['${(f.path+'/').replace(/@dev/g, '').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
-]
+];
 
 // https://stackoverflow.com/questions/50374908/transform-union-type-to-intersection-type
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   k: infer I,
 ) => void
   ? I
-  : never
+  : never;
 type RouteMap = {
   // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
   // @endindex
-}
+};
 export type HandlerMap = UnionToIntersection<
   {
     [K in keyof RouteMap]: {
       [X in keyof RouteMap[K]]: {
-        [Y in `${K}${X & string}`]: RouteMap[K][X]
-      }
-    }[keyof RouteMap[K]]
+        [Y in `${K}${X & string}`]: RouteMap[K][X];
+      };
+    }[keyof RouteMap[K]];
   }[keyof RouteMap]
->
-export type HandlerPath = keyof HandlerMap
+>;
+export type HandlerPath = keyof HandlerMap;
 export type HandlerMetaMap = {
   [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, infer Y, infer Z>
     ? {
-        payload: X
-        result: Y
-        method: Z
+        payload: X;
+        result: Y;
+        method: Z;
       }
-    : {}
-}
+    : {};
+};
 export type HandlerPayloadMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['payload']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['payload'];
+};
 export type HandlerResultMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['result']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['result'];
+};
 export type HandlerMethodMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['method']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['method'];
+};
 
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<
   XServer.Route[]
 >((res, item) => {
   const validHandlerNames = Object.keys(item[1]).filter(
     name => !name.startsWith('_') && name !== 'default',
-  )
+  );
   for (const handlerName of validHandlerNames) {
-    const path = item[1][handlerName].options.requestPath || handlerName
-    const paths = Array.isArray(path) ? path : [path]
+    const path = item[1][handlerName].options.requestPath || handlerName;
+    const paths = Array.isArray(path) ? path : [path];
     for (const path of paths) {
       res.push({
         path: `${item[0]}${path}`,
         handler: item[1][handlerName],
-      })
+      });
     }
   }
-  return res
-}, [])
+  return res;
+}, []);

package/lib/cli/build_util.d.ts

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

package/lib/cli/build_util.js

@@ -131,6 +131,21 @@ export class BuildUtil {
               loader: 'js'
             };
           });
+
+          // 支持构建时排除文件
+          if (options.excludeFiles?.length) {
+            const excludeRegExps = options.excludeFiles.map(item => new RegExp(item));
+            build.onLoad({
+              filter: /\.ts$/
+            }, async args => {
+              if (excludeRegExps.some(re => re.test(args.path))) {
+                return {
+                  contents: 'export {}',
+                  loader: 'js'
+                };
+              }
+            });
+          }
         }
       },
       // @ts-ignore

package/lib/cli/cli.js

@@ -4,7 +4,8 @@ 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 { castArray, debounce, escapeRegExp } from 'vtils';
+import { StringTemplate } from 'vtils';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
@@ -148,6 +149,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建完是否部署',
   type: 'boolean',
   default: false
+}).positional('exclude', {
+  alias: 'x',
+  describe: '构建时排除的文件',
+  type: 'string',
+  array: true
 }), async argv => {
   await EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -176,7 +182,13 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         inlineEnvs: envMap,
         minify: argv.minify,
         noInstall: argv['no-install'],
-        channel: channel
+        channel: channel,
+        excludeFiles: argv.exclude?.map(item => {
+          return escapeRegExp(StringTemplate.render(item, envMap, {
+            code: true,
+            onlyCode: true
+          }));
+        })
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/cli/templates/routes.ts

@@ -1,68 +1,68 @@
-import * as handlers from './handlers'
-import { Handler, XServer } from '@jayfong/x-server'
+import { Handler, XServer } from '@jayfong/x-server';
+import * as handlers from './handlers';
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `['${(f.path+'/').replace(/@dev/g, '').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
-]
+];
 
 // https://stackoverflow.com/questions/50374908/transform-union-type-to-intersection-type
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   k: infer I,
 ) => void
   ? I
-  : never
+  : never;
 type RouteMap = {
   // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**', '!**/*.test.*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
   // @endindex
-}
+};
 export type HandlerMap = UnionToIntersection<
   {
     [K in keyof RouteMap]: {
       [X in keyof RouteMap[K]]: {
-        [Y in `${K}${X & string}`]: RouteMap[K][X]
-      }
-    }[keyof RouteMap[K]]
+        [Y in `${K}${X & string}`]: RouteMap[K][X];
+      };
+    }[keyof RouteMap[K]];
   }[keyof RouteMap]
->
-export type HandlerPath = keyof HandlerMap
+>;
+export type HandlerPath = keyof HandlerMap;
 export type HandlerMetaMap = {
   [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, infer Y, infer Z>
     ? {
-        payload: X
-        result: Y
-        method: Z
+        payload: X;
+        result: Y;
+        method: Z;
       }
-    : {}
-}
+    : {};
+};
 export type HandlerPayloadMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['payload']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['payload'];
+};
 export type HandlerResultMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['result']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['result'];
+};
 export type HandlerMethodMap = {
   // @ts-ignore
-  [K in HandlerPath]: HandlerMetaMap[K]['method']
-}
+  [K in HandlerPath]: HandlerMetaMap[K]['method'];
+};
 
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<
   XServer.Route[]
 >((res, item) => {
   const validHandlerNames = Object.keys(item[1]).filter(
     name => !name.startsWith('_') && name !== 'default',
-  )
+  );
   for (const handlerName of validHandlerNames) {
-    const path = item[1][handlerName].options.requestPath || handlerName
-    const paths = Array.isArray(path) ? path : [path]
+    const path = item[1][handlerName].options.requestPath || handlerName;
+    const paths = Array.isArray(path) ? path : [path];
     for (const path of paths) {
       res.push({
         path: `${item[0]}${path}`,
         handler: item[1][handlerName],
-      })
+      });
     }
   }
-  return res
-}, [])
+  return res;
+}, []);

package/package.json

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