@jayfong/x-server 2.47.0 → 2.48.0

package/lib/_cjs/cli/build_util.js

@@ -159,7 +159,8 @@ class BuildUtil {
 
     // .nvmrc
     const nvmrcFile = _nodePath.default.join(options.cwd, '.nvmrc');
-    if (await _fsExtra.default.pathExists(nvmrcFile)) {
+    const hasNvmrc = await _fsExtra.default.pathExists(nvmrcFile);
+    if (hasNvmrc) {
       await _fsExtra.default.writeFile(distNvmrcFile, await _fsExtra.default.readFile(nvmrcFile));
     }
 
@@ -170,6 +171,10 @@ class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(${JSON.stringify(hasNvmrc ? {
+      interpreter: 'fnm',
+      interpreter_args: 'exec node'
+    } : {})}),
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],

package/lib/_cjs/cli/deploy_util.js

@@ -38,7 +38,6 @@ class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
-        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/_cjs/index.js

@@ -205,11 +205,11 @@ Object.keys(_sms).forEach(function (key) {
   if (key in exports && exports[key] === _sms[key]) return;
   exports[key] = _sms[key];
 });
-var _index = require("./types/index");
-Object.keys(_index).forEach(function (key) {
+var _dto = require("./types/dto");
+Object.keys(_dto).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _index[key]) return;
-  exports[key] = _index[key];
+  if (key in exports && exports[key] === _dto[key]) return;
+  exports[key] = _dto[key];
 });
 var _x = require("./x");
 Object.keys(_x).forEach(function (key) {

package/lib/cli/build_util.js

@@ -153,7 +153,8 @@ export class BuildUtil {
 
     // .nvmrc
     const nvmrcFile = path.join(options.cwd, '.nvmrc');
-    if (await fs.pathExists(nvmrcFile)) {
+    const hasNvmrc = await fs.pathExists(nvmrcFile);
+    if (hasNvmrc) {
       await fs.writeFile(distNvmrcFile, await fs.readFile(nvmrcFile));
     }
 
@@ -164,6 +165,10 @@ export class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(${JSON.stringify(hasNvmrc ? {
+      interpreter: 'fnm',
+      interpreter_args: 'exec node'
+    } : {})}),
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],

package/lib/cli/deploy_util.js

@@ -33,7 +33,6 @@ export class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
-        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/index.d.ts

@@ -32,6 +32,6 @@ export * from './services/rate_limit';
 export * from './services/redis';
 export * from './services/sensitive_words';
 export * from './services/sms';
-export * from './types/index';
+export * from './types/dto';
 export * from './x';
 export * from '.x/models';

package/lib/index.js

@@ -33,7 +33,7 @@ export * from "./services/rate_limit";
 export * from "./services/redis";
 export * from "./services/sensitive_words";
 export * from "./services/sms";
-export * from "./types/index";
+export * from "./types/dto";
 export * from "./x";
 // @endindex
 

package/lib/types/{index.d.ts → dto.d.ts}

@@ -1,4 +1,5 @@
 import { Merge, OmitStrict, PartialBy, RequiredBy, RequiredDeep, Simplify } from 'vtils/types';
+/** 选中的必填，同时能将部分选填，并能覆盖 */
 export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TPartialKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends {
     [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any;
 } = never> = Simplify<Merge<PartialBy<Pick<RequiredDeep<TRawData>, [
@@ -6,6 +7,7 @@ export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends
 ] extends [never] ? keyof TRawData : TPickKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 没排除的必填，同时能将部分选填，并能覆盖 */
 export type MakeDtoRequiredByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<PartialBy<Omit<RequiredDeep<TRawData>, [
@@ -13,6 +15,7 @@ export type MakeDtoRequiredByExclude<TRawData extends Record<any, any>, TExclude
 ] extends [never] ? never : TExcludeKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 选中的选填，同时能将部分必填，并能覆盖 */
 export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TRequiredKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends {
     [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any;
 } = never> = Simplify<Merge<RequiredBy<Pick<Partial<TRawData>, [
@@ -20,6 +23,7 @@ export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends k
 ] extends [never] ? keyof TRawData : TPickKey>, TRequiredKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 没排除的选填，同时能将部分必填，并能覆盖 */
 export type MakeDtoPartialByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<RequiredBy<Omit<Partial<TRawData>, [
@@ -27,41 +31,49 @@ export type MakeDtoPartialByExclude<TRawData extends Record<any, any>, TExcludeK
 ] extends [never] ? never : TExcludeKey>, TRequiredKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 排除选中的，并能覆盖 */
 export type MakeDtoExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<OmitStrict<TRawData, TExcludeKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分必填，并能覆盖 */
 export type MakeDtoExcludeWithRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分选填，并能覆盖 */
 export type MakeDtoExcludeWithPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<PartialBy<OmitStrict<TRawData, TExcludeKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分必填然后选填，并能覆盖 */
 export type MakeDtoExcludeWithRequiredAndPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TPartialKey extends Exclude<Exclude<keyof TRawData, TExcludeKey>, TRequiredKey> = never, TOverride extends {
     [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
 } = never> = Simplify<Merge<PartialBy<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 包含选中的，并能覆盖 */
 export type MakeDtoInclude<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TOverride extends {
     [K in TIncludeKey]?: any;
 } = never> = Simplify<Merge<Pick<TRawData, TIncludeKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分必填，并能覆盖 */
 export type MakeDtoIncludeWithRequired<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TOverride extends {
     [K in TIncludeKey]?: any;
 } = never> = Simplify<Merge<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分选填，并能覆盖 */
 export type MakeDtoIncludeWithPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TPartialKey extends TIncludeKey = never, TOverride extends {
     [K in TIncludeKey]?: any;
 } = never> = Simplify<Merge<PartialBy<Pick<TRawData, TIncludeKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分必填然后选填，并能覆盖 */
 export type MakeDtoIncludeWithRequiredAndPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TPartialKey extends Exclude<TIncludeKey, TRequiredKey> = never, TOverride extends {
     [K in TIncludeKey]?: any;
 } = never> = Simplify<Merge<PartialBy<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, TPartialKey>, [

package/package.json

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