@cloudnux/cli 0.17.0 → 0.19.0

package/dist/cli.mjs

@@ -2044,11 +2044,11 @@ var require_baseGet = __commonJS({
     init_esm_shims();
     var castPath = require_castPath();
     var toKey = require_toKey();
-    function baseGet(object, path14) {
-      path14 = castPath(path14, object);
-      var index = 0, length = path14.length;
+    function baseGet(object, path15) {
+      path15 = castPath(path15, object);
+      var index = 0, length = path15.length;
       while (object != null && index < length) {
-        object = object[toKey(path14[index++])];
+        object = object[toKey(path15[index++])];
       }
       return index && index == length ? object : void 0;
     }
@@ -2062,8 +2062,8 @@ var require_get = __commonJS({
     "use strict";
     init_esm_shims();
     var baseGet = require_baseGet();
-    function get(object, path14, defaultValue) {
-      var result = object == null ? void 0 : baseGet(object, path14);
+    function get(object, path15, defaultValue) {
+      var result = object == null ? void 0 : baseGet(object, path15);
       return result === void 0 ? defaultValue : result;
     }
     module.exports = get;
@@ -2093,11 +2093,11 @@ var require_hasPath = __commonJS({
     var isIndex = require_isIndex();
     var isLength = require_isLength();
     var toKey = require_toKey();
-    function hasPath(object, path14, hasFunc) {
-      path14 = castPath(path14, object);
-      var index = -1, length = path14.length, result = false;
+    function hasPath(object, path15, hasFunc) {
+      path15 = castPath(path15, object);
+      var index = -1, length = path15.length, result = false;
       while (++index < length) {
-        var key = toKey(path14[index]);
+        var key = toKey(path15[index]);
         if (!(result = object != null && hasFunc(object, key))) {
           break;
         }
@@ -2120,8 +2120,8 @@ var require_hasIn = __commonJS({
     init_esm_shims();
     var baseHasIn = require_baseHasIn();
     var hasPath = require_hasPath();
-    function hasIn(object, path14) {
-      return object != null && hasPath(object, path14, baseHasIn);
+    function hasIn(object, path15) {
+      return object != null && hasPath(object, path15, baseHasIn);
     }
     module.exports = hasIn;
   }
@@ -2141,13 +2141,13 @@ var require_baseMatchesProperty = __commonJS({
     var toKey = require_toKey();
     var COMPARE_PARTIAL_FLAG = 1;
     var COMPARE_UNORDERED_FLAG = 2;
-    function baseMatchesProperty(path14, srcValue) {
-      if (isKey(path14) && isStrictComparable(srcValue)) {
-        return matchesStrictComparable(toKey(path14), srcValue);
+    function baseMatchesProperty(path15, srcValue) {
+      if (isKey(path15) && isStrictComparable(srcValue)) {
+        return matchesStrictComparable(toKey(path15), srcValue);
       }
       return function(object) {
-        var objValue = get(object, path14);
-        return objValue === void 0 && objValue === srcValue ? hasIn(object, path14) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+        var objValue = get(object, path15);
+        return objValue === void 0 && objValue === srcValue ? hasIn(object, path15) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
       };
     }
     module.exports = baseMatchesProperty;
@@ -2186,9 +2186,9 @@ var require_basePropertyDeep = __commonJS({
     "use strict";
     init_esm_shims();
     var baseGet = require_baseGet();
-    function basePropertyDeep(path14) {
+    function basePropertyDeep(path15) {
       return function(object) {
-        return baseGet(object, path14);
+        return baseGet(object, path15);
       };
     }
     module.exports = basePropertyDeep;
@@ -2204,8 +2204,8 @@ var require_property = __commonJS({
     var basePropertyDeep = require_basePropertyDeep();
     var isKey = require_isKey();
     var toKey = require_toKey();
-    function property(path14) {
-      return isKey(path14) ? baseProperty(toKey(path14)) : basePropertyDeep(path14);
+    function property(path15) {
+      return isKey(path15) ? baseProperty(toKey(path15)) : basePropertyDeep(path15);
     }
     module.exports = property;
   }
@@ -2306,14 +2306,14 @@ var require_baseSet = __commonJS({
     var isIndex = require_isIndex();
     var isObject = require_isObject();
     var toKey = require_toKey();
-    function baseSet(object, path14, value, customizer) {
+    function baseSet(object, path15, value, customizer) {
       if (!isObject(object)) {
         return object;
       }
-      path14 = castPath(path14, object);
-      var index = -1, length = path14.length, lastIndex = length - 1, nested = object;
+      path15 = castPath(path15, object);
+      var index = -1, length = path15.length, lastIndex = length - 1, nested = object;
       while (nested != null && ++index < length) {
-        var key = toKey(path14[index]), newValue = value;
+        var key = toKey(path15[index]), newValue = value;
         if (key === "__proto__" || key === "constructor" || key === "prototype") {
           return object;
         }
@@ -2321,7 +2321,7 @@ var require_baseSet = __commonJS({
           var objValue = nested[key];
           newValue = customizer ? customizer(objValue, key, nested) : void 0;
           if (newValue === void 0) {
-            newValue = isObject(objValue) ? objValue : isIndex(path14[index + 1]) ? [] : {};
+            newValue = isObject(objValue) ? objValue : isIndex(path15[index + 1]) ? [] : {};
           }
         }
         assignValue(nested, key, newValue);
@@ -2344,9 +2344,9 @@ var require_basePickBy = __commonJS({
     function basePickBy(object, paths, predicate) {
       var index = -1, length = paths.length, result = {};
       while (++index < length) {
-        var path14 = paths[index], value = baseGet(object, path14);
-        if (predicate(value, path14)) {
-          baseSet(result, castPath(path14, object), value);
+        var path15 = paths[index], value = baseGet(object, path15);
+        if (predicate(value, path15)) {
+          baseSet(result, castPath(path15, object), value);
         }
       }
       return result;
@@ -2479,8 +2479,8 @@ var require_pickBy = __commonJS({
         return [prop];
       });
       predicate = baseIteratee(predicate);
-      return basePickBy(object, props, function(value, path14) {
-        return predicate(value, path14[0]);
+      return basePickBy(object, props, function(value, path15) {
+        return predicate(value, path15[0]);
       });
     }
     module.exports = pickBy;
@@ -2493,6 +2493,7 @@ init_esm_shims();
 // src/config/index.ts
 init_esm_shims();
 import fs11 from "node:fs";
+import path14 from "node:path";
 import rechoir from "rechoir";
 import { extensions } from "interpret";
 import findUp from "findup-sync";
@@ -2556,6 +2557,7 @@ var BaseTaskManager = class {
       cloudProvider: this.config.cloudProvider,
       workingDir: path2.resolve(this.config.workingDir, this.environment),
       externalPackages: this.config.externalPackages,
+      services: this.config.services ?? {},
       ...this.taskResults
     };
     delete taskParams.tasks;
@@ -2733,6 +2735,18 @@ var locateModules = {
 init_esm_shims();
 import fs4 from "node:fs/promises";
 import path5 from "node:path";
+
+// src/task-manager/build-service-overrides.ts
+init_esm_shims();
+function buildServiceOverrides(services = {}) {
+  return Object.entries(services).map(([kind, modulePath]) => ({
+    kind,
+    varName: kind.replace(/-([a-z])/g, (_, c) => c.toUpperCase()) + "Override",
+    path: process.platform === "win32" ? modulePath.replace(/\\/g, "/") : modulePath
+  }));
+}
+
+// src/task-manager/tasks/transform-dev-server.ts
 var transformDevServer = {
   title: `Transform Dev Server`,
   skip: () => false,
@@ -2740,12 +2754,14 @@ var transformDevServer = {
     moduleNames,
     devServerTemplateFunc,
     workingDir,
-    port
+    port,
+    services
   }) => {
     const rendered = devServerTemplateFunc({
       source: "./src",
       moduleNames,
-      port
+      port,
+      serviceOverrides: buildServiceOverrides(services)
     });
     await fs4.mkdir(path5.join(workingDir), { recursive: true });
     await fs4.writeFile(path5.join(workingDir, `app.ts`), rendered, "utf-8");
@@ -2787,11 +2803,12 @@ var transformModule = {
   title: ({ moduleName }) => `Transform module ${moduleName}`,
   skip: () => false,
   action: async (params) => {
-    const { workingDir, moduleName, entrypointPath, source, moduleTemplateFunc } = params;
+    const { workingDir, moduleName, entrypointPath, source, moduleTemplateFunc, services } = params;
     const entrypoint = await loadEntrypoint(entrypointPath);
     const rendered = moduleTemplateFunc({
       source: process.platform === "win32" ? source.replace(/\\/g, "/") : source,
       module: moduleName,
+      serviceOverrides: buildServiceOverrides(services),
       ...entrypoint,
       ...helpers
     });
@@ -3033,7 +3050,7 @@ async function getPackageEntryPaths(packagePath) {
       }
       return false;
     }).map(([, value]) => path13.join(pkgDir, value));
-    exportPaths.forEach((path14) => paths.add(path14));
+    exportPaths.forEach((path15) => paths.add(path15));
   }
   return Array.from(paths);
 }
@@ -3155,6 +3172,16 @@ function validateConfig(config2) {
       throw new Error(`Invalid environment configuration for "${envName}"`);
     }
   }
+  if (typedConfig.services !== void 0) {
+    if (typeof typedConfig.services !== "object" || typedConfig.services === null || Array.isArray(typedConfig.services)) {
+      throw new Error("Config.services must be an object mapping a service kind to a module path");
+    }
+    for (const [kind, modulePath] of Object.entries(typedConfig.services)) {
+      if (!isString(modulePath)) {
+        throw new Error(`Config.services.${kind} must be a string path to a module`);
+      }
+    }
+  }
   return true;
 }
 
@@ -3204,6 +3231,17 @@ async function loadConfig(configPath = null) {
         ...rawConfig.environments || {}
       }
     };
+    if (mergedConfig.services) {
+      mergedConfig.services = Object.fromEntries(
+        Object.entries(mergedConfig.services).map(([kind, modulePath]) => {
+          const resolvedPath = path14.resolve(process.cwd(), modulePath);
+          if (!fs11.existsSync(resolvedPath)) {
+            throw new Error(`Config.services.${kind} points to a module that does not exist: ${resolvedPath}`);
+          }
+          return [kind, resolvedPath];
+        })
+      );
+    }
     if (validateConfig(mergedConfig))
       return mergedConfig;
   }

package/dist/index.mjs

@@ -2581,6 +2581,18 @@ var locateModules = {
 init_esm_shims();
 import fs3 from "node:fs/promises";
 import path4 from "node:path";
+
+// src/task-manager/build-service-overrides.ts
+init_esm_shims();
+function buildServiceOverrides(services = {}) {
+  return Object.entries(services).map(([kind, modulePath]) => ({
+    kind,
+    varName: kind.replace(/-([a-z])/g, (_, c) => c.toUpperCase()) + "Override",
+    path: process.platform === "win32" ? modulePath.replace(/\\/g, "/") : modulePath
+  }));
+}
+
+// src/task-manager/tasks/transform-dev-server.ts
 var transformDevServer = {
   title: `Transform Dev Server`,
   skip: () => false,
@@ -2588,12 +2600,14 @@ var transformDevServer = {
     moduleNames,
     devServerTemplateFunc,
     workingDir,
-    port
+    port,
+    services
   }) => {
     const rendered = devServerTemplateFunc({
       source: "./src",
       moduleNames,
-      port
+      port,
+      serviceOverrides: buildServiceOverrides(services)
     });
     await fs3.mkdir(path4.join(workingDir), { recursive: true });
     await fs3.writeFile(path4.join(workingDir, `app.ts`), rendered, "utf-8");
@@ -2635,11 +2649,12 @@ var transformModule = {
   title: ({ moduleName }) => `Transform module ${moduleName}`,
   skip: () => false,
   action: async (params) => {
-    const { workingDir, moduleName, entrypointPath, source, moduleTemplateFunc } = params;
+    const { workingDir, moduleName, entrypointPath, source, moduleTemplateFunc, services } = params;
     const entrypoint = await loadEntrypoint(entrypointPath);
     const rendered = moduleTemplateFunc({
       source: process.platform === "win32" ? source.replace(/\\/g, "/") : source,
       module: moduleName,
+      serviceOverrides: buildServiceOverrides(services),
       ...entrypoint,
       ...helpers
     });

package/dist/templates/cloud/entrypoint-build.ts.ejs

@@ -10,8 +10,11 @@ import {
   } from "@cloudnux/cloud-sdk";
 
 import * as src from "../../../packages/modules/<%=module%>/src";
+<%_ for(const svc of serviceOverrides){ _%>
+import <%=svc.varName%> from "<%-svc.path%>";
+<%_ } _%>
 
-useCloudProvider(awsCloudProvider);
+useCloudProvider(awsCloudProvider<% if (serviceOverrides.length) { %>, { serviceFactories: { <%- serviceOverrides.map(svc => `"${svc.kind}": ${svc.varName}`).join(', ') %> } }<% } %>);
 
 const router = createRouter();
 <%_ for(var [key,entry] of Object.entries(entries)) { _%>

package/dist/templates/local/dev-server.ts.ejs

@@ -6,17 +6,20 @@ import { schedulerPlugin } from "@cloudnux/local-cloud-provider/schedule-plugin"
 import { devConsolePlugin } from "@cloudnux/local-cloud-provider/dev-console-plugin";
 import { websocketsPlugin } from "@cloudnux/local-cloud-provider/websocket-plugin";
 import { invokesPlugin } from "@cloudnux/local-cloud-provider/invoke-plugin";
+<%_ for(const svc of serviceOverrides){ _%>
+import <%=svc.varName%> from "<%-svc.path%>";
+<%_ } _%>
 
 // __dirname is injected by the esbuild banner and resolves to the workingDir/env folder
 process.env.DEV_CLOUD_LOCATION_PATH ??= path.join(__dirname, '.local-location');
 
-useCloudProvider(localCloudProvider);
+useCloudProvider(localCloudProvider<% if (serviceOverrides.length) { %>, { serviceFactories: { <%- serviceOverrides.map(svc => `"${svc.kind}": ${svc.varName}`).join(', ') %> } }<% } %>);
 
 <%_ for(const module of moduleNames){ _%>
 import <%=module%>Entries from "./<%=module%>"
 <%_ } _%>
 
-const router = createRouter({logger : true});
+const router = createRouter();
 
 router.register(queuesPlugin, { prefix: "queues", config: { persistence: { directory: path.join(__dirname, 'queue-data') } } });
 router.register(schedulerPlugin, { prefix: "schedules", config: { persistence: { directory: path.join(__dirname, 'scheduler-data') } } });

package/dist/templates/local/module.ts.ejs

@@ -19,8 +19,9 @@ async function entries(app: RouterInstance) {
         app.route({
           method: "<%= entry.trigger.options.method %>" as any,
           url: `/http<%= $$convertRouteParamstoFastifyRouteTemplate(entry.trigger.options.route) %>`,
+          config: { module: "<%=module%>" },
           handler: async (request, reply) => {
-              await httpHandler(src["<%= entry.handler %>"], request, reply); 
+              await httpHandler(src["<%= entry.handler %>"], request, reply);
           }
     });
     <%_ } _%>

package/dist/types.d.ts

@@ -86,6 +86,13 @@ type Config<TTaskParams extends TaskParamBase = any> = {
      * @default: ["aws-sdk", "@aws-sdk/*"]
      */
     externalPackages: string[];
+    /**
+     * Service overrides: maps a service kind (e.g. "logger", "storage", "event-broker")
+     * to the path of a module whose default export is a factory function for that service.
+     * Paths are resolved relative to the directory the cli is invoked from.
+     * @default undefined
+     */
+    services?: Record<string, string>;
 };
 type Args = {
     inputs: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudnux/cli",
-	"version": "0.17.0",
+	"version": "0.19.0",
 	"license": "MIT",
 	"repository": {
 		"type": "git",