@nattyjs/common 0.0.1-beta.63 → 0.0.1-beta.65

package/dist/index.cjs

@@ -48,11 +48,19 @@ const commonContainer = new class {
         }
       }
     };
-    const secureConfig = { sensitiveProps: ["password", "mobileNo", "email"] };
+    const secureConfig = {};
     this.nattyConfig = { ...{ api: { rootPath: "api" }, ...{ static: { enabled: true } }, autoGeneratePort: true, modelBinding, globalConfig: {}, secure: secureConfig }, ...config };
   }
   setupBuildOptions(options) {
-    this.buildOptions = options;
+    this.buildOptions = {
+      commandName: options.commandName || "dev",
+      mode: options.mode || "dev",
+      port: options.port ?? 0,
+      rootDir: options.rootDir || process.cwd(),
+      outDir: options.outDir || "dist",
+      startupFilePath: options.startupFilePath || "dist/index.js",
+      clearScreen: options.clearScreen ?? false
+    };
   }
   setEnvTsDefinition(tsDefinition) {
     this.envTsDefinition = tsDefinition;
@@ -66,6 +74,9 @@ const commonContainer = new class {
   getMetadataValue(key, propName) {
     return this.metadataConfig[propName].get(key);
   }
+  deleteMetadataValue(key, propName) {
+    this.metadataConfig[propName].delete(key);
+  }
   get globalConfig() {
     return this.nattyConfig.global || {};
   }
@@ -132,6 +143,8 @@ const typeContainer = new class {
     const routes = {};
     for (const key of this.controllerInfo.keys()) {
       const classInfo = this.controllerInfo.get(key);
+      if (!classInfo?.filePath)
+        continue;
       let templateInfo = {
         path: `.${classInfo.filePath.replace(TS_EXTENSION, BLANK).replace(BACK_SLASH_REGEX, RIGHT_SLASH)}`,
         route: this.getControllerRouteName(classInfo),
@@ -252,12 +265,12 @@ function resolvePath(path$1) {
 }
 
 async function readEnv() {
-  const envConfig = commonContainer.nattyCliConfig.env;
+  const envConfig = commonContainer.nattyCliConfig?.env;
   let filePath = envConfig?.dictionary ? void 0 : getPath([ENVIRONMENTS, commonContainer.buildOptions.mode && commonContainer.buildOptions.mode !== "dev" ? `.env.${commonContainer.buildOptions.mode}` : `.env`]);
   if (envConfig && envConfig.path)
     filePath = resolvePath(envConfig.path);
   let parsedEnvTsDefinition = {};
-  let parsedEnv = commonContainer.nattyCliConfig.env?.dictionary;
+  let parsedEnv = envConfig?.dictionary;
   if (!parsedEnv && filePath && fs.existsSync(filePath)) {
     const { parsed, error } = dotenv__namespace.config({
       debug: !!process.env.DEBUG || void 0,
@@ -656,10 +669,11 @@ class AbstractRunner {
 }
 
 async function getPort() {
-  const portNumber = commonContainer.nattyConfig?.port || 3200;
-  if (portNumber)
-    return portNumber;
-  const port = await getPortPlease.getPort({ ports: [portNumber, ...Array(50).fill(3001).map((fillValue, index) => fillValue + index)] });
+  const configuredPort = commonContainer.nattyConfig?.port;
+  if (configuredPort)
+    return configuredPort;
+  const preferredPorts = [3200, ...Array(50).fill(3001).map((fillValue, index) => fillValue + index)];
+  const port = await getPortPlease.getPort({ ports: preferredPorts });
   commonContainer.nattyConfig.port = port;
   return port;
 }

package/dist/index.d.ts

@@ -48,7 +48,7 @@ interface IAuthorizationContext extends IActionExecutingContext {
 }
 
 declare abstract class AuthorizationFilter {
-    abstract onAuthorization(httpContext: IAuthorizationContext): Promise<boolean>;
+    abstract onAuthorization(httpContext: IAuthorizationContext, permissionRequirement: any): Promise<boolean>;
     onFailedAuthorization(): ProblemDetail;
 }
 
@@ -77,6 +77,7 @@ interface PayloadConfig {
 
 interface SecureConfig {
     sensitiveProps?: String[];
+    denyByDefault?: boolean;
 }
 
 interface PreInitEventConfig {
@@ -122,6 +123,12 @@ declare abstract class AbstractRunner {
     protected exec(command: string, args: any[], cwd?: string): Promise<null | string>;
 }
 
+interface DiTransformConfig {
+    decoratorName?: string;
+    markerName?: string;
+    stripPathPrefixes?: string[];
+}
+
 interface EnvConfig {
     path: string;
     dictionary: {
@@ -140,6 +147,7 @@ interface LibraryConfig {
 interface NattyCliConfig {
     library?: Partial<LibraryConfig>;
     env?: Partial<EnvConfig>;
+    di?: DiTransformConfig;
     runner?: ClassType<AbstractRunner>;
     port?: number;
     openapi?: GenerateOpenApiOptions;
@@ -151,7 +159,7 @@ interface NattyCliConfig {
 declare const commonContainer: {
     setupConfig(config?: NattyConfig): void;
     setupCliConfig(config: NattyCliConfig): void;
-    setupBuildOptions(options: BuildOptions): any;
+    setupBuildOptions(options: Partial<BuildOptions>): void;
     get nattyConfig(): NattyConfig;
     get nattyCliConfig(): NattyCliConfig;
     get buildOptions(): BuildOptions;
@@ -169,6 +177,7 @@ declare const commonContainer: {
     }): void;
     setMetadata(key: string, value: any, propName: string): void;
     getMetadataValue(key: string, propName: string): any;
+    deleteMetadataValue(key: string, propName: string): void;
     get globalConfig(): GlobalConfig;
     registerType(type: TypesInfo): void;
     types: TypesInfo;
@@ -323,8 +332,6 @@ declare abstract class AbstractConsoleLogger {
 declare class ConsoleLogger extends AbstractConsoleLogger {
 }
 
-declare function typed(): <T extends {
-    new (...args: any[]): {};
-}>(OriginalClass: T) => T;
+declare function typed(): <T extends new (...args: any[]) => {}>(OriginalClass: T) => T;
 
-export { ALLOW_METHODS, AbstractRunner, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, Claim, ClassType, ConsoleLogger, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, GlobalConfig, HTTP_METHOD_ROUTES, IActionExecutedContext, IActionExecutingContext, IAuthorizationContext, IExecutionContext, IGNORE_METHODS, List, MetaConfigProps, Middleware, NattyAppConfig, NattyCliConfig, NattyConfig, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, WebScheduleConfig, commonContainer, createPath, createTestServer, getPath, getPort, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer, typed };
+export { ALLOW_METHODS, AbstractRunner, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, Claim, ClassType, ConsoleLogger, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, DiTransformConfig, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, GlobalConfig, HTTP_METHOD_ROUTES, IActionExecutedContext, IActionExecutingContext, IAuthorizationContext, IExecutionContext, IGNORE_METHODS, List, MetaConfigProps, Middleware, NattyAppConfig, NattyCliConfig, NattyConfig, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, WebScheduleConfig, commonContainer, createPath, createTestServer, getPath, getPort, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer, typed };

package/dist/index.mjs

@@ -31,11 +31,19 @@ const commonContainer = new class {
         }
       }
     };
-    const secureConfig = { sensitiveProps: ["password", "mobileNo", "email"] };
+    const secureConfig = {};
     this.nattyConfig = { ...{ api: { rootPath: "api" }, ...{ static: { enabled: true } }, autoGeneratePort: true, modelBinding, globalConfig: {}, secure: secureConfig }, ...config };
   }
   setupBuildOptions(options) {
-    this.buildOptions = options;
+    this.buildOptions = {
+      commandName: options.commandName || "dev",
+      mode: options.mode || "dev",
+      port: options.port ?? 0,
+      rootDir: options.rootDir || process.cwd(),
+      outDir: options.outDir || "dist",
+      startupFilePath: options.startupFilePath || "dist/index.js",
+      clearScreen: options.clearScreen ?? false
+    };
   }
   setEnvTsDefinition(tsDefinition) {
     this.envTsDefinition = tsDefinition;
@@ -49,6 +57,9 @@ const commonContainer = new class {
   getMetadataValue(key, propName) {
     return this.metadataConfig[propName].get(key);
   }
+  deleteMetadataValue(key, propName) {
+    this.metadataConfig[propName].delete(key);
+  }
   get globalConfig() {
     return this.nattyConfig.global || {};
   }
@@ -115,6 +126,8 @@ const typeContainer = new class {
     const routes = {};
     for (const key of this.controllerInfo.keys()) {
       const classInfo = this.controllerInfo.get(key);
+      if (!classInfo?.filePath)
+        continue;
       let templateInfo = {
         path: `.${classInfo.filePath.replace(TS_EXTENSION, BLANK).replace(BACK_SLASH_REGEX, RIGHT_SLASH)}`,
         route: this.getControllerRouteName(classInfo),
@@ -235,12 +248,12 @@ function resolvePath(path) {
 }
 
 async function readEnv() {
-  const envConfig = commonContainer.nattyCliConfig.env;
+  const envConfig = commonContainer.nattyCliConfig?.env;
   let filePath = envConfig?.dictionary ? void 0 : getPath([ENVIRONMENTS, commonContainer.buildOptions.mode && commonContainer.buildOptions.mode !== "dev" ? `.env.${commonContainer.buildOptions.mode}` : `.env`]);
   if (envConfig && envConfig.path)
     filePath = resolvePath(envConfig.path);
   let parsedEnvTsDefinition = {};
-  let parsedEnv = commonContainer.nattyCliConfig.env?.dictionary;
+  let parsedEnv = envConfig?.dictionary;
   if (!parsedEnv && filePath && existsSync(filePath)) {
     const { parsed, error } = dotenv.config({
       debug: !!process.env.DEBUG || void 0,
@@ -639,10 +652,11 @@ class AbstractRunner {
 }
 
 async function getPort() {
-  const portNumber = commonContainer.nattyConfig?.port || 3200;
-  if (portNumber)
-    return portNumber;
-  const port = await getPort$1({ ports: [portNumber, ...Array(50).fill(3001).map((fillValue, index) => fillValue + index)] });
+  const configuredPort = commonContainer.nattyConfig?.port;
+  if (configuredPort)
+    return configuredPort;
+  const preferredPorts = [3200, ...Array(50).fill(3001).map((fillValue, index) => fillValue + index)];
+  const port = await getPort$1({ ports: preferredPorts });
   commonContainer.nattyConfig.port = port;
   return port;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/common",
-  "version": "0.0.1-beta.63",
+  "version": "0.0.1-beta.65",
   "description": "Now I’m the model of a modern major general / The venerated Virginian veteran whose men are all / Lining up, to put me up on a pedestal / Writin’ letters to relatives / Embellishin’ my elegance and eloquence / But the elephant is in the room / The truth is in ya face when ya hear the British cannons go / BOOM",
   "keywords": [],
   "author": "ajayojha <ojhaajay@outlook.com>",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/node": "20.3.1",
-    "@nattyjs/types": "0.0.1-beta.63",
+    "@nattyjs/types": "0.0.1-beta.65",
     "unbuild": "1.2.1"
   }
 }