@celerity-sdk/core 0.5.0 → 0.7.0

package/dist/index.d.cts

@@ -1220,6 +1220,7 @@ type ModuleNode = {
     providers: (Type | (Provider & {
         provide: InjectionToken;
     }))[];
+    layers: (CelerityLayer | Type<CelerityLayer>)[];
 };
 type ModuleGraph = Map<Type, ModuleNode>;
 /**

package/dist/index.d.ts

@@ -1220,6 +1220,7 @@ type ModuleNode = {
     providers: (Type | (Provider & {
         provide: InjectionToken;
     }))[];
+    layers: (CelerityLayer | Type<CelerityLayer>)[];
 };
 type ModuleGraph = Map<Type, ModuleNode>;
 /**

package/dist/index.js

@@ -1327,8 +1327,15 @@ var HandlerRegistry = class {
 function matchRoute(pattern, actual) {
   const patternParts = pattern.split("/").filter(Boolean);
   const actualParts = actual.split("/").filter(Boolean);
-  if (patternParts.length !== actualParts.length) return false;
-  return patternParts.every((part, i) => part.startsWith("{") || part === actualParts[i]);
+  for (let i = 0; i < patternParts.length; i++) {
+    const part = patternParts[i];
+    if (part.startsWith("{") && part.endsWith("+}")) {
+      return actualParts.length >= patternParts.length;
+    }
+    if (part.startsWith("{")) continue;
+    if (part !== actualParts[i]) return false;
+  }
+  return patternParts.length === actualParts.length;
 }
 __name(matchRoute, "matchRoute");
 
@@ -1364,7 +1371,8 @@ function buildModuleGraph(rootModule) {
         controllers: [],
         functionHandlers: [],
         guards: [],
-        providers: []
+        providers: [],
+        layers: []
       });
       return;
     }
@@ -1406,7 +1414,8 @@ function buildModuleGraph(rootModule) {
       controllers,
       functionHandlers: metadata.functionHandlers ?? [],
       guards,
-      providers
+      providers,
+      layers: metadata.layers ?? []
     });
   }
   __name(walk, "walk");
@@ -1550,10 +1559,10 @@ var debug5 = createDebug5("celerity:core:scanner:http");
 async function scanHttpHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler(controllerClass, container, registry);
+      await scanClassHandler(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler(fnHandler, registry);
+      scanFunctionHandler(fnHandler, registry, node.layers);
     }
   }
 }
@@ -1577,7 +1586,7 @@ async function scanModule(moduleClass, container, registry) {
   await scanHttpGuards(graph, container, registry);
 }
 __name(scanModule, "scanModule");
-async function scanClassHandler(controllerClass, container, registry) {
+async function scanClassHandler(controllerClass, container, registry, moduleLayers) {
   const controllerMeta = Reflect.getOwnMetadata(CONTROLLER_METADATA, controllerClass);
   if (!controllerMeta) return;
   const prototype = controllerClass.prototype;
@@ -1598,6 +1607,7 @@ async function scanClassHandler(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1627,10 +1637,11 @@ async function scanClassHandler(controllerClass, container, registry) {
   }
 }
 __name(scanClassHandler, "scanClassHandler");
-function scanFunctionHandler(definition, registry) {
+function scanFunctionHandler(definition, registry, moduleLayers) {
   if (definition.type !== "http") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -1767,15 +1778,15 @@ var debug6 = createDebug6("celerity:core:scanner:websocket");
 async function scanWebSocketHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler2(controllerClass, container, registry);
+      await scanClassHandler2(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler2(fnHandler, registry);
+      scanFunctionHandler2(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanWebSocketHandlers, "scanWebSocketHandlers");
-async function scanClassHandler2(controllerClass, container, registry) {
+async function scanClassHandler2(controllerClass, container, registry, moduleLayers) {
   const isWsController = Reflect.getOwnMetadata(WEBSOCKET_CONTROLLER_METADATA, controllerClass);
   if (!isWsController) return;
   const prototype = controllerClass.prototype;
@@ -1794,6 +1805,7 @@ async function scanClassHandler2(controllerClass, container, registry) {
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     debug6("scanClassHandler: %s %s (%s.%s)", eventMeta.eventType, eventMeta.route, controllerClass.name, methodName);
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1820,10 +1832,11 @@ async function scanClassHandler2(controllerClass, container, registry) {
   }
 }
 __name(scanClassHandler2, "scanClassHandler");
-function scanFunctionHandler2(definition, registry) {
+function scanFunctionHandler2(definition, registry, moduleLayers) {
   if (definition.type !== "websocket") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -1855,15 +1868,15 @@ var debug7 = createDebug7("celerity:core:scanner:consumer");
 async function scanConsumerHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler3(controllerClass, container, registry);
+      await scanClassHandler3(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler3(fnHandler, registry);
+      scanFunctionHandler3(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanConsumerHandlers, "scanConsumerHandlers");
-async function scanClassHandler3(controllerClass, container, registry) {
+async function scanClassHandler3(controllerClass, container, registry, moduleLayers) {
   const consumerMeta = Reflect.getOwnMetadata(CONSUMER_METADATA, controllerClass);
   if (!consumerMeta) return;
   const prototype = controllerClass.prototype;
@@ -1880,6 +1893,7 @@ async function scanClassHandler3(controllerClass, container, registry) {
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const handlerTag = consumerMeta.source ? `${consumerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1905,11 +1919,12 @@ async function scanClassHandler3(controllerClass, container, registry) {
   }
 }
 __name(scanClassHandler3, "scanClassHandler");
-function scanFunctionHandler3(definition, registry) {
+function scanFunctionHandler3(definition, registry, moduleLayers) {
   if (definition.type !== "consumer") return;
   const meta = definition.metadata;
   const handlerTag = definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.messageSchema) {
@@ -1939,15 +1954,15 @@ var debug8 = createDebug8("celerity:core:scanner:schedule");
 async function scanScheduleHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler4(controllerClass, container, registry);
+      await scanClassHandler4(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler4(fnHandler, registry);
+      scanFunctionHandler4(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanScheduleHandlers, "scanScheduleHandlers");
-async function scanClassHandler4(controllerClass, container, registry) {
+async function scanClassHandler4(controllerClass, container, registry, moduleLayers) {
   const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -1962,6 +1977,7 @@ async function scanClassHandler4(controllerClass, container, registry) {
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const handlerTag = handlerMeta.source ? `${handlerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1993,11 +2009,12 @@ async function scanClassHandler4(controllerClass, container, registry) {
   }
 }
 __name(scanClassHandler4, "scanClassHandler");
-function scanFunctionHandler4(definition, registry) {
+function scanFunctionHandler4(definition, registry, moduleLayers) {
   if (definition.type !== "schedule") return;
   const meta = definition.metadata;
   const handlerTag = meta.source ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2032,15 +2049,15 @@ var debug9 = createDebug9("celerity:core:scanner:custom");
 async function scanCustomHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler5(controllerClass, container, registry);
+      await scanClassHandler5(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler5(fnHandler, registry);
+      scanFunctionHandler5(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanCustomHandlers, "scanCustomHandlers");
-async function scanClassHandler5(controllerClass, container, registry) {
+async function scanClassHandler5(controllerClass, container, registry, moduleLayers) {
   const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -2054,6 +2071,7 @@ async function scanClassHandler5(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -2079,11 +2097,12 @@ async function scanClassHandler5(controllerClass, container, registry) {
   }
 }
 __name(scanClassHandler5, "scanClassHandler");
-function scanFunctionHandler5(definition, registry) {
+function scanFunctionHandler5(definition, registry, moduleLayers) {
   if (definition.type !== "custom") return;
   const meta = definition.metadata;
   const name = meta.name ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {