@nattyjs/common 0.0.1-beta.10 → 0.0.1-beta.12

package/dist/index.cjs

@@ -4,6 +4,8 @@ const fs = require('fs');
 const dotenv = require('dotenv');
 const dotenvExpand = require('dotenv-expand');
 const path = require('path');
+const child_process = require('child_process');
+const getPortPlease = require('get-port-please');
 
 function _interopNamespaceCompat(e) {
     if (e && typeof e === 'object' && 'default' in e) return e;
@@ -28,8 +30,11 @@ const commonContainer = new class {
     this.types = {};
   }
   registerType(type) {
-    for (const key of Object.keys(type))
-      this.types[key] = type[key];
+    if (type) {
+      if (typeof type === "string")
+        type = JSON.parse(type);
+      this.types[type.name] = type;
+    }
   }
   setupCliConfig(config) {
     this.nattyCliConfig = config;
@@ -233,20 +238,29 @@ function getPath(pathCollection, isIncludeRoot = true, isCreateFolder = false) {
   return currentPath;
 }
 
+function resolvePath(path$1) {
+  return path.resolve(commonContainer.buildOptions.rootDir, path$1);
+}
+
 async function readEnv() {
-  let filePath = getPath([ENVIRONMENTS, commonContainer.buildOptions.mode && commonContainer.buildOptions.mode !== "dev" ? `.env.${commonContainer.buildOptions.mode}` : `.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 = {};
-  if (fs.existsSync(filePath)) {
+  let parsedEnv = commonContainer.nattyCliConfig.env?.dictionary;
+  if (!parsedEnv && filePath && fs.existsSync(filePath)) {
     const { parsed, error } = dotenv__namespace.config({
       debug: !!process.env.DEBUG || void 0,
       path: filePath
     });
-    const info = getEnvTsDefinition(parsed);
-    parsedEnvTsDefinition = info.parsedEnvTsDefinition;
-    commonContainer.setEnvTsDefinition(parsedEnvTsDefinition);
-    commonContainer.setEnvValueInfo(info.envVariableValueInfo);
-    dotenvExpand__namespace.expand({ parsed });
+    parsedEnv = parsed;
   }
+  const info = getEnvTsDefinition(parsedEnv);
+  parsedEnvTsDefinition = info.parsedEnvTsDefinition;
+  commonContainer.setEnvTsDefinition(parsedEnvTsDefinition);
+  commonContainer.setEnvValueInfo(info.envVariableValueInfo);
+  dotenvExpand__namespace.expand({ parsed: parsedEnv });
   return parsedEnvTsDefinition;
 }
 
@@ -587,7 +601,53 @@ function registerType(type) {
   commonContainer.registerType(type);
 }
 
+class AbstractRunner {
+  async exec(command, args, cwd = process.cwd()) {
+    const options = {
+      cwd,
+      stdio: "pipe",
+      shell: true
+    };
+    return new Promise((resolve, reject) => {
+      const child = child_process.spawn(
+        `${command}`,
+        [...args],
+        options
+      );
+      child.stdout.on(
+        "data",
+        (data) => {
+          const writeData = data.toString().replace(/\r\n|\n/, "");
+          if (writeData.indexOf("[NATTYJS]") > -1) {
+            console.log(writeData);
+          }
+        }
+      );
+      child.on("close", (code) => {
+        if (code === 0) {
+          resolve(null);
+        } else {
+          console.error(
+            `${command} ${args}`
+          );
+          reject();
+        }
+      });
+    });
+  }
+}
+
+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)] });
+  commonContainer.nattyConfig.port = port;
+  return port;
+}
+
 exports.ALLOW_METHODS = ALLOW_METHODS;
+exports.AbstractRunner = AbstractRunner;
 exports.ActionFilter = ActionFilter;
 exports.AuthenticationFilter = AuthenticationFilter;
 exports.AuthorizationFilter = AuthorizationFilter;
@@ -618,6 +678,7 @@ exports.commonContainer = commonContainer;
 exports.createPath = createPath;
 exports.createTestServer = createTestServer;
 exports.getPath = getPath;
+exports.getPort = getPort;
 exports.isConstructor = isConstructor;
 exports.isEqual = isEqual;
 exports.isFunction = isFunction;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RequestRouteInfo, IHttpResult, IModelBindingContext, ProblemDetail, IExceptionContext, HttpResponseInit, NattyTestModule, ModelBinding, NattyCliConfig, BuildOptions, TypesInfo, ClassTypeInfo } from '@nattyjs/types';
+import { RequestRouteInfo, IHttpResult, IModelBindingContext, ProblemDetail, IExceptionContext, HttpResponseInit, NattyTestModule, ModelBinding, BuildOptions, TypesInfo, ClassTypeInfo } from '@nattyjs/types';
 
 interface ClassType<T> extends Function {
     new (...args: any[]): T;
@@ -53,6 +53,14 @@ interface GlobalConfig {
     onException?: ClassType<ExceptionFilter>;
 }
 
+interface CorsConfig {
+    origin: string[];
+    methods: string;
+    preflightContinue: boolean;
+    optionsSuccessStatus: number;
+    credentials: boolean;
+}
+
 interface NattyConfig {
     app: any;
     testModule?: NattyTestModule;
@@ -62,6 +70,35 @@ interface NattyConfig {
     modelBinding?: ModelBinding;
     global?: GlobalConfig;
     autoGeneratePort?: boolean;
+    port?: number;
+    cors?: CorsConfig;
+}
+
+declare abstract class AbstractRunner {
+    abstract run(): void;
+    protected exec(command: string, args: any[], cwd?: string): Promise<null | string>;
+}
+
+interface EnvConfig {
+    path: string;
+    dictionary: {
+        [key: string]: any;
+    };
+}
+
+interface PackageJsonConfig {
+    addExports: string[];
+}
+
+interface LibraryConfig {
+    packageJson: PackageJsonConfig;
+}
+
+interface NattyCliConfig {
+    library?: Partial<LibraryConfig>;
+    env?: Partial<EnvConfig>;
+    runner?: ClassType<AbstractRunner>;
+    port?: number;
 }
 
 declare const commonContainer: {
@@ -87,6 +124,7 @@ declare const commonContainer: {
     getMetadataValue(key: string, propName: string): any;
     get globalConfig(): GlobalConfig;
     registerType(type: TypesInfo): void;
+    types: TypesInfo;
 };
 
 declare const typeContainer: {
@@ -224,4 +262,6 @@ interface NattyAppConfig extends NattyConfig {
 
 declare function registerType(type: TypesInfo): void;
 
-export { ALLOW_METHODS, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, Claim, ClassType, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, GlobalConfig, HTTP_METHOD_ROUTES, IActionExecutedContext, IActionExecutingContext, IExecutionContext, IGNORE_METHODS, List, MetaConfigProps, Middleware, NattyAppConfig, NattyConfig, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, commonContainer, createPath, createTestServer, getPath, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer };
+declare function getPort(): Promise<number>;
+
+export { ALLOW_METHODS, AbstractRunner, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, Claim, ClassType, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, GlobalConfig, HTTP_METHOD_ROUTES, IActionExecutedContext, IActionExecutingContext, IExecutionContext, IGNORE_METHODS, List, MetaConfigProps, Middleware, NattyAppConfig, NattyCliConfig, NattyConfig, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, commonContainer, createPath, createTestServer, getPath, getPort, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer };

package/dist/index.mjs

@@ -3,6 +3,9 @@ import { existsSync } from 'fs';
 import * as dotenv from 'dotenv';
 import * as dotenvExpand from 'dotenv-expand';
 import * as path from 'path';
+import { resolve } from 'path';
+import { spawn } from 'child_process';
+import { getPort as getPort$1 } from 'get-port-please';
 
 const commonContainer = new class {
   constructor() {
@@ -10,8 +13,11 @@ const commonContainer = new class {
     this.types = {};
   }
   registerType(type) {
-    for (const key of Object.keys(type))
-      this.types[key] = type[key];
+    if (type) {
+      if (typeof type === "string")
+        type = JSON.parse(type);
+      this.types[type.name] = type;
+    }
   }
   setupCliConfig(config) {
     this.nattyCliConfig = config;
@@ -215,20 +221,29 @@ function getPath(pathCollection, isIncludeRoot = true, isCreateFolder = false) {
   return currentPath;
 }
 
+function resolvePath(path) {
+  return resolve(commonContainer.buildOptions.rootDir, path);
+}
+
 async function readEnv() {
-  let filePath = getPath([ENVIRONMENTS, commonContainer.buildOptions.mode && commonContainer.buildOptions.mode !== "dev" ? `.env.${commonContainer.buildOptions.mode}` : `.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 = {};
-  if (existsSync(filePath)) {
+  let parsedEnv = commonContainer.nattyCliConfig.env?.dictionary;
+  if (!parsedEnv && filePath && existsSync(filePath)) {
     const { parsed, error } = dotenv.config({
       debug: !!process.env.DEBUG || void 0,
       path: filePath
     });
-    const info = getEnvTsDefinition(parsed);
-    parsedEnvTsDefinition = info.parsedEnvTsDefinition;
-    commonContainer.setEnvTsDefinition(parsedEnvTsDefinition);
-    commonContainer.setEnvValueInfo(info.envVariableValueInfo);
-    dotenvExpand.expand({ parsed });
+    parsedEnv = parsed;
   }
+  const info = getEnvTsDefinition(parsedEnv);
+  parsedEnvTsDefinition = info.parsedEnvTsDefinition;
+  commonContainer.setEnvTsDefinition(parsedEnvTsDefinition);
+  commonContainer.setEnvValueInfo(info.envVariableValueInfo);
+  dotenvExpand.expand({ parsed: parsedEnv });
   return parsedEnvTsDefinition;
 }
 
@@ -569,4 +584,49 @@ function registerType(type) {
   commonContainer.registerType(type);
 }
 
-export { ALLOW_METHODS, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, HTTP_METHOD_ROUTES, IGNORE_METHODS, List, MetaConfigProps, Middleware, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, commonContainer, createPath, createTestServer, getPath, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer };
+class AbstractRunner {
+  async exec(command, args, cwd = process.cwd()) {
+    const options = {
+      cwd,
+      stdio: "pipe",
+      shell: true
+    };
+    return new Promise((resolve, reject) => {
+      const child = spawn(
+        `${command}`,
+        [...args],
+        options
+      );
+      child.stdout.on(
+        "data",
+        (data) => {
+          const writeData = data.toString().replace(/\r\n|\n/, "");
+          if (writeData.indexOf("[NATTYJS]") > -1) {
+            console.log(writeData);
+          }
+        }
+      );
+      child.on("close", (code) => {
+        if (code === 0) {
+          resolve(null);
+        } else {
+          console.error(
+            `${command} ${args}`
+          );
+          reject();
+        }
+      });
+    });
+  }
+}
+
+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)] });
+  commonContainer.nattyConfig.port = port;
+  return port;
+}
+
+export { ALLOW_METHODS, AbstractRunner, ActionFilter, AuthenticationFilter, AuthorizationFilter, BACK_SLASH_REGEX, BLANK, CONTROLLER, DEFAULT_ACTIONS, DEFAULT_CHILD_PATH, DELETE, ENVIRONMENTS, ExceptionFilter, FrameworkType, GET, HTTP_METHOD_ROUTES, IGNORE_METHODS, List, MetaConfigProps, Middleware, POST, PUT, RIGHT_SLASH, ROUTE_INSTANCES, ROUTE_METHODS, ROUTE_PATHS, TS_EXTENSION, UserIdentity, commonContainer, createPath, createTestServer, getPath, getPort, isConstructor, isEqual, isFunction, isObject, readEnv, readEnvKey, registerType, typeContainer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/common",
-  "version": "0.0.1-beta.10",
+  "version": "0.0.1-beta.12",
   "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>",
@@ -16,11 +16,12 @@
   },
   "dependencies": {
     "dotenv": "16.3.1",
-    "dotenv-expand": "10.0.0"
+    "dotenv-expand": "10.0.0",
+    "get-port-please": "3.1.1"
   },
   "devDependencies": {
     "@types/node": "20.3.1",
-    "@nattyjs/types": "0.0.1-beta.10",
+    "@nattyjs/types": "0.0.1-beta.12",
     "unbuild": "1.2.1"
   }
 }