quidproquo-dev-server 0.0.228 → 0.0.229

package/lib/commonjs/allServiceConfig.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllServiceConfigs = void 0;
 const quidproquo_1 = require("quidproquo");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore - Special webpack loader
-const quidproquo_dynamic_loader_1 = require("quidproquo-dynamic-loader");
 // Create an async function to fetch all services
 function getAllServiceConfigs(devServerConfig) {
+    // Clone it
+    const allServices = JSON.parse(JSON.stringify(devServerConfig.qpqConfigs));
     // Iterate over each enum value and dynamically import the corresponding infrastructure
-    const allServices = quidproquo_dynamic_loader_1.qpqConfigs;
     const rootDomain = `${devServerConfig.serverDomain}:${devServerConfig.serverPort}`;
     // TODO: Make this pure
     // Overload the domain settings to represent the local env

package/lib/commonjs/main.d.ts

@@ -1,2 +1,2 @@
 import { DevServerConfig } from './types';
-export declare const spinUpService: (devServerConfig: DevServerConfig) => Promise<void>;
+export declare const startDevServer: (devServerConfig: DevServerConfig) => Promise<void>;

package/lib/commonjs/main.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spinUpService = void 0;
+exports.startDevServer = void 0;
 /* eslint-disable no-console */
 const body_parser_1 = __importDefault(require("body-parser"));
 const express_1 = __importDefault(require("express"));
@@ -22,7 +22,6 @@ const path_1 = __importDefault(require("path"));
 const quidproquo_1 = require("quidproquo");
 const route_1 = require("./entry/route");
 const allServiceConfig_1 = require("./allServiceConfig");
-const dynamicModuleLoader_1 = require("./dynamicModuleLoader");
 const getServiceBaseDomain = (qpqConfig, devServerConfig) => quidproquo_1.qpqWebServerUtils.getDomainRoot(`${devServerConfig.serverDomain}:${devServerConfig.serverPort}`, quidproquo_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig), quidproquo_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig));
 const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
     const baseDomain = getServiceBaseDomain(qpqConfig, devServerConfig);
@@ -39,11 +38,11 @@ const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
     }));
     return apiDomains;
 };
-const getDynamicModuleLoader = (qpqConfig) => {
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
     const serviceName = quidproquo_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    return (runtime) => __awaiter(void 0, void 0, void 0, function* () { return (0, dynamicModuleLoader_1.dynamicModuleLoader)(serviceName, runtime); });
+    return (runtime) => __awaiter(void 0, void 0, void 0, function* () { return devServerConfig.dynamicModuleLoader(serviceName, runtime); });
 };
-const spinUpService = (devServerConfig) => __awaiter(void 0, void 0, void 0, function* () {
+const startDevServer = (devServerConfig) => __awaiter(void 0, void 0, void 0, function* () {
     const allServiceConfig = yield (0, allServiceConfig_1.getAllServiceConfigs)(devServerConfig);
     const app = (0, express_1.default)();
     app.use((0, multer_1.default)().any());
@@ -89,7 +88,7 @@ const spinUpService = (devServerConfig) => __awaiter(void 0, void 0, void 0, fun
         let runtimeModule = quidproquo_1.askProcessEvent;
         if (serviceLog.runtimeType === quidproquo_1.QpqRuntimeType.EXECUTE_STORY) {
             const [srcEntry, module] = serviceLog.tags[0].split('::');
-            const loadedModule = yield (0, dynamicModuleLoader_1.dynamicModuleLoader)(serviceLog.moduleName, srcEntry);
+            const loadedModule = yield devServerConfig.dynamicModuleLoader(serviceLog.moduleName, srcEntry);
             runtimeModule = loadedModule[module];
         }
         const result = yield (0, quidproquo_1.qpqExecuteLog)(serviceLog, runtimeModule);
@@ -119,7 +118,7 @@ const spinUpService = (devServerConfig) => __awaiter(void 0, void 0, void 0, fun
                     mimetype: file.mimetype,
                 }));
             }
-            const response = yield (0, route_1.route)(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig));
+            const response = yield (0, route_1.route)(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig));
             for (const [header, value] of Object.entries(response.headers)) {
                 res.set(header, value);
             }
@@ -140,4 +139,4 @@ const spinUpService = (devServerConfig) => __awaiter(void 0, void 0, void 0, fun
         console.log(`⚡️⚡️⚡️[Qpq - Dev Server]⚡️⚡️⚡️: Server is running at [http://${baseDomain}]`);
     });
 });
-exports.spinUpService = spinUpService;
+exports.startDevServer = startDevServer;

package/lib/commonjs/types/DevServerConfig.d.ts

@@ -1,4 +1,7 @@
+import { QPQConfig, QpqFunctionRuntime } from 'quidproquo-core';
 export type DevServerConfig = {
     serverDomain: 'localhost';
     serverPort: 8080;
+    dynamicModuleLoader: <T = any>(serviceName: string, modulePath: QpqFunctionRuntime) => Promise<T>;
+    qpqConfigs: QPQConfig[];
 };

package/lib/esm/allServiceConfig.js

@@ -1,11 +1,9 @@
 import { qpqCoreUtils, qpqWebServerUtils } from 'quidproquo';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore - Special webpack loader
-import { qpqConfigs } from 'quidproquo-dynamic-loader';
 // Create an async function to fetch all services
 export function getAllServiceConfigs(devServerConfig) {
+    // Clone it
+    const allServices = JSON.parse(JSON.stringify(devServerConfig.qpqConfigs));
     // Iterate over each enum value and dynamically import the corresponding infrastructure
-    const allServices = qpqConfigs;
     const rootDomain = `${devServerConfig.serverDomain}:${devServerConfig.serverPort}`;
     // TODO: Make this pure
     // Overload the domain settings to represent the local env

package/lib/esm/main.d.ts

@@ -1,2 +1,2 @@
 import { DevServerConfig } from './types';
-export declare const spinUpService: (devServerConfig: DevServerConfig) => Promise<void>;
+export declare const startDevServer: (devServerConfig: DevServerConfig) => Promise<void>;

package/lib/esm/main.js

@@ -7,7 +7,6 @@ import path from 'path';
 import { askProcessEvent, qpqCoreUtils, qpqExecuteLog, QpqRuntimeType, qpqWebServerUtils, } from 'quidproquo';
 import { route } from './entry/route';
 import { getAllServiceConfigs } from './allServiceConfig';
-import { dynamicModuleLoader } from './dynamicModuleLoader';
 const getServiceBaseDomain = (qpqConfig, devServerConfig) => qpqWebServerUtils.getDomainRoot(`${devServerConfig.serverDomain}:${devServerConfig.serverPort}`, qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig), qpqCoreUtils.getApplicationModuleFeature(qpqConfig));
 const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
     const baseDomain = getServiceBaseDomain(qpqConfig, devServerConfig);
@@ -24,11 +23,11 @@ const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
     }));
     return apiDomains;
 };
-const getDynamicModuleLoader = (qpqConfig) => {
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
     const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    return async (runtime) => dynamicModuleLoader(serviceName, runtime);
+    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
 };
-export const spinUpService = async (devServerConfig) => {
+export const startDevServer = async (devServerConfig) => {
     const allServiceConfig = await getAllServiceConfigs(devServerConfig);
     const app = express();
     app.use(multer().any());
@@ -74,7 +73,7 @@ export const spinUpService = async (devServerConfig) => {
         let runtimeModule = askProcessEvent;
         if (serviceLog.runtimeType === QpqRuntimeType.EXECUTE_STORY) {
             const [srcEntry, module] = serviceLog.tags[0].split('::');
-            const loadedModule = await dynamicModuleLoader(serviceLog.moduleName, srcEntry);
+            const loadedModule = await devServerConfig.dynamicModuleLoader(serviceLog.moduleName, srcEntry);
             runtimeModule = loadedModule[module];
         }
         const result = await qpqExecuteLog(serviceLog, runtimeModule);
@@ -104,7 +103,7 @@ export const spinUpService = async (devServerConfig) => {
                     mimetype: file.mimetype,
                 }));
             }
-            const response = await route(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig));
+            const response = await route(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig));
             for (const [header, value] of Object.entries(response.headers)) {
                 res.set(header, value);
             }

package/lib/esm/types/DevServerConfig.d.ts

@@ -1,4 +1,7 @@
+import { QPQConfig, QpqFunctionRuntime } from 'quidproquo-core';
 export type DevServerConfig = {
     serverDomain: 'localhost';
     serverPort: 8080;
+    dynamicModuleLoader: <T = any>(serviceName: string, modulePath: QpqFunctionRuntime) => Promise<T>;
+    qpqConfigs: QPQConfig[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-dev-server",
-  "version": "0.0.228",
+  "version": "0.0.229",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -30,12 +30,12 @@
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
     "multer": "^1.4.5-lts.1",
-    "quidproquo-core": "0.0.228",
-    "quidproquo-webserver": "0.0.228"
+    "quidproquo-core": "0.0.229",
+    "quidproquo-webserver": "0.0.229"
   },
   "devDependencies": {
     "@types/multer": "^1.4.12",
-    "quidproquo-tsconfig": "0.0.228",
+    "quidproquo-tsconfig": "0.0.229",
     "typescript": "^4.9.3"
   }
 }

package/lib/commonjs/dynamicModuleLoader/dynamicModuleLoader.d.ts

@@ -1,3 +0,0 @@
-import { QPQConfig, QpqFunctionRuntime } from 'quidproquo';
-export declare const dynamicModuleLoader: <T = any>(serviceName: string, runtime: QpqFunctionRuntime) => Promise<T>;
-export declare const getQpqConfigs: () => QPQConfig[];

package/lib/commonjs/dynamicModuleLoader/dynamicModuleLoader.js

@@ -1,17 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQpqConfigs = exports.dynamicModuleLoader = void 0;
-const quidproquo_dynamic_loader_1 = require("quidproquo-dynamic-loader");
-const dynamicModuleLoader = (serviceName, runtime) => __awaiter(void 0, void 0, void 0, function* () { return (0, quidproquo_dynamic_loader_1.qpqDynamicModuleLoaderForService)(serviceName, runtime); });
-exports.dynamicModuleLoader = dynamicModuleLoader;
-const getQpqConfigs = () => quidproquo_dynamic_loader_1.qpqConfigs;
-exports.getQpqConfigs = getQpqConfigs;

package/lib/commonjs/dynamicModuleLoader/index.d.ts

@@ -1 +0,0 @@
-export * from './dynamicModuleLoader';

package/lib/commonjs/dynamicModuleLoader/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./dynamicModuleLoader"), exports);

package/lib/esm/dynamicModuleLoader/dynamicModuleLoader.d.ts

@@ -1,3 +0,0 @@
-import { QPQConfig, QpqFunctionRuntime } from 'quidproquo';
-export declare const dynamicModuleLoader: <T = any>(serviceName: string, runtime: QpqFunctionRuntime) => Promise<T>;
-export declare const getQpqConfigs: () => QPQConfig[];

package/lib/esm/dynamicModuleLoader/dynamicModuleLoader.js

@@ -1,6 +0,0 @@
-import { qpqConfigs, qpqDynamicModuleLoaderForService,
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore - Special webpack loader
- } from 'quidproquo-dynamic-loader';
-export const dynamicModuleLoader = async (serviceName, runtime) => qpqDynamicModuleLoaderForService(serviceName, runtime);
-export const getQpqConfigs = () => qpqConfigs;

package/lib/esm/dynamicModuleLoader/index.d.ts

@@ -1 +0,0 @@
-export * from './dynamicModuleLoader';

package/lib/esm/dynamicModuleLoader/index.js

@@ -1 +0,0 @@
-export * from './dynamicModuleLoader';