@nextera.one/axis-server-sdk 2.2.3 → 2.2.4

package/dist/index.js

@@ -267,17 +267,76 @@ var init_intent_policy_decorator = __esm({
   }
 });
 
-// src/decorators/handler.decorator.ts
-function Handler(intent) {
+// src/decorators/handler-sensors.decorator.ts
+function HandlerSensors(sensors) {
   return (target) => {
-    Reflect.defineMetadata(HANDLER_METADATA_KEY, { intent }, target);
+    Reflect.defineMetadata(HANDLER_SENSORS_KEY, sensors, target);
   };
 }
-var import_reflect_metadata4, HANDLER_METADATA_KEY;
-var init_handler_decorator = __esm({
-  "src/decorators/handler.decorator.ts"() {
+var import_reflect_metadata4, HANDLER_SENSORS_KEY;
+var init_handler_sensors_decorator = __esm({
+  "src/decorators/handler-sensors.decorator.ts"() {
     import_reflect_metadata4 = require("reflect-metadata");
-    HANDLER_METADATA_KEY = "axis:handler";
+    HANDLER_SENSORS_KEY = "axis:handler:sensors";
+  }
+});
+
+// src/decorators/observer.decorator.ts
+function isBindingOptions(value) {
+  return !!value && typeof value === "object" && "use" in value;
+}
+function isDefinitionOptions(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && !isBindingOptions(value);
+}
+function toObserverBinding(input) {
+  if (!input) return null;
+  if (isBindingOptions(input)) {
+    const refs = Array.isArray(input.use) ? input.use : [input.use];
+    return { refs, tags: input.tags, events: input.events };
+  }
+  if (Array.isArray(input)) {
+    return { refs: input };
+  }
+  if (typeof input === "function" || typeof input === "string") {
+    return { refs: [input] };
+  }
+  return null;
+}
+function Observer(input) {
+  return ((target, propertyKey) => {
+    const binding = toObserverBinding(input);
+    if (binding) {
+      if (propertyKey !== void 0) {
+        const existing2 = Reflect.getMetadata(OBSERVER_BINDINGS_KEY, target, propertyKey) || [];
+        existing2.push(binding);
+        Reflect.defineMetadata(
+          OBSERVER_BINDINGS_KEY,
+          existing2,
+          target,
+          propertyKey
+        );
+        return;
+      }
+      const existing = Reflect.getMetadata(OBSERVER_BINDINGS_KEY, target) || [];
+      existing.push(binding);
+      Reflect.defineMetadata(OBSERVER_BINDINGS_KEY, existing, target);
+      return;
+    }
+    if (propertyKey !== void 0) {
+      throw new Error(
+        "@Observer method usage must reference one or more observer classes or names"
+      );
+    }
+    const definition = isDefinitionOptions(input) ? input : {};
+    Reflect.defineMetadata(OBSERVER_METADATA_KEY, definition, target);
+  });
+}
+var import_reflect_metadata5, OBSERVER_METADATA_KEY, OBSERVER_BINDINGS_KEY;
+var init_observer_decorator = __esm({
+  "src/decorators/observer.decorator.ts"() {
+    import_reflect_metadata5 = require("reflect-metadata");
+    OBSERVER_METADATA_KEY = "axis:observer";
+    OBSERVER_BINDINGS_KEY = "axis:observer:bindings";
   }
 });
 
@@ -287,15 +346,30 @@ function IntentBody(decoder) {
     Reflect.defineMetadata(INTENT_BODY_KEY, decoder, target, propertyKey);
   };
 }
-var import_reflect_metadata5, INTENT_BODY_KEY;
+var import_reflect_metadata6, INTENT_BODY_KEY;
 var init_intent_body_decorator = __esm({
   "src/decorators/intent-body.decorator.ts"() {
-    import_reflect_metadata5 = require("reflect-metadata");
+    import_reflect_metadata6 = require("reflect-metadata");
     INTENT_BODY_KEY = "axis:intent:body";
   }
 });
 
 // src/decorators/intent.decorator.ts
+function isIntentSensorBindingOptions(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && "use" in value;
+}
+function toIntentSensorBinding(input) {
+  if (isIntentSensorBindingOptions(input)) {
+    return {
+      ref: input.use,
+      when: input.when || "before"
+    };
+  }
+  return {
+    ref: input,
+    when: "before"
+  };
+}
 function Intent(action, options) {
   return (target, propertyKey) => {
     const metadata = { intent: action, ...options };
@@ -333,10 +407,10 @@ function Intent(action, options) {
     Reflect.defineMetadata(INTENT_ROUTES_KEY, routes, target.constructor);
   };
 }
-var import_reflect_metadata6, INTENT_METADATA_KEY, INTENT_ROUTES_KEY;
+var import_reflect_metadata7, INTENT_METADATA_KEY, INTENT_ROUTES_KEY;
 var init_intent_decorator = __esm({
   "src/decorators/intent.decorator.ts"() {
-    import_reflect_metadata6 = require("reflect-metadata");
+    import_reflect_metadata7 = require("reflect-metadata");
     init_intent_body_decorator();
     init_intent_policy_decorator();
     INTENT_METADATA_KEY = "axis:intent";
@@ -344,90 +418,62 @@ var init_intent_decorator = __esm({
   }
 });
 
-// src/decorators/intent-sensors.decorator.ts
-function IntentSensors(sensors) {
-  return (target, propertyKey) => {
-    Reflect.defineMetadata(INTENT_SENSORS_KEY, sensors, target, propertyKey);
-  };
-}
-var import_reflect_metadata7, INTENT_SENSORS_KEY;
-var init_intent_sensors_decorator = __esm({
-  "src/decorators/intent-sensors.decorator.ts"() {
-    import_reflect_metadata7 = require("reflect-metadata");
-    INTENT_SENSORS_KEY = "axis:intent:sensors";
-  }
-});
-
-// src/decorators/observer.decorator.ts
-function isBindingOptions(value) {
-  return !!value && typeof value === "object" && "use" in value;
-}
-function isDefinitionOptions(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value) && !isBindingOptions(value);
-}
-function toBinding(input) {
-  if (!input) return null;
-  if (isBindingOptions(input)) {
-    const refs = Array.isArray(input.use) ? input.use : [input.use];
-    return { refs, tags: input.tags, events: input.events };
-  }
-  if (Array.isArray(input)) {
-    return { refs: input };
-  }
-  if (typeof input === "function" || typeof input === "string") {
-    return { refs: [input] };
-  }
-  return null;
-}
-function Observer(input) {
-  return ((target, propertyKey) => {
-    const binding = toBinding(input);
-    if (binding) {
-      if (propertyKey !== void 0) {
-        const existing2 = Reflect.getMetadata(OBSERVER_BINDINGS_KEY, target, propertyKey) || [];
-        existing2.push(binding);
-        Reflect.defineMetadata(
-          OBSERVER_BINDINGS_KEY,
-          existing2,
-          target,
-          propertyKey
-        );
-        return;
-      }
-      const existing = Reflect.getMetadata(OBSERVER_BINDINGS_KEY, target) || [];
-      existing.push(binding);
-      Reflect.defineMetadata(OBSERVER_BINDINGS_KEY, existing, target);
-      return;
+// src/decorators/handler.decorator.ts
+function Handler(intentOrOptions, options) {
+  return (target) => {
+    const intent = typeof intentOrOptions === "string" ? intentOrOptions : void 0;
+    const handlerOptions = typeof intentOrOptions === "string" ? options : intentOrOptions;
+    const sensorBindings = Array.isArray(handlerOptions?.is) ? handlerOptions.is.map(
+      (input) => toIntentSensorBinding(input)
+    ) : [];
+    const observerBindings = Array.isArray(
+      handlerOptions?.observe
+    ) ? handlerOptions.observe.map((input) => toObserverBinding(input)).filter((binding) => !!binding) : [];
+    Reflect.defineMetadata(
+      HANDLER_METADATA_KEY,
+      { intent, ...handlerOptions || {} },
+      target
+    );
+    if (sensorBindings.length > 0) {
+      const existing = Reflect.getMetadata(HANDLER_SENSORS_KEY, target) || [];
+      Reflect.defineMetadata(
+        HANDLER_SENSORS_KEY,
+        [...existing, ...sensorBindings],
+        target
+      );
     }
-    if (propertyKey !== void 0) {
-      throw new Error(
-        "@Observer method usage must reference one or more observer classes or names"
+    if (observerBindings.length > 0) {
+      const existing = Reflect.getMetadata(OBSERVER_BINDINGS_KEY, target) || [];
+      Reflect.defineMetadata(
+        OBSERVER_BINDINGS_KEY,
+        [...existing, ...observerBindings],
+        target
       );
     }
-    const definition = isDefinitionOptions(input) ? input : {};
-    Reflect.defineMetadata(OBSERVER_METADATA_KEY, definition, target);
-  });
+  };
 }
-var import_reflect_metadata8, OBSERVER_METADATA_KEY, OBSERVER_BINDINGS_KEY;
-var init_observer_decorator = __esm({
-  "src/decorators/observer.decorator.ts"() {
+var import_reflect_metadata8, HANDLER_METADATA_KEY;
+var init_handler_decorator = __esm({
+  "src/decorators/handler.decorator.ts"() {
     import_reflect_metadata8 = require("reflect-metadata");
-    OBSERVER_METADATA_KEY = "axis:observer";
-    OBSERVER_BINDINGS_KEY = "axis:observer:bindings";
+    init_handler_sensors_decorator();
+    init_observer_decorator();
+    init_intent_decorator();
+    HANDLER_METADATA_KEY = "axis:handler";
   }
 });
 
-// src/decorators/handler-sensors.decorator.ts
-function HandlerSensors(sensors) {
-  return (target) => {
-    Reflect.defineMetadata(HANDLER_SENSORS_KEY, sensors, target);
+// src/decorators/intent-sensors.decorator.ts
+function IntentSensors(sensors) {
+  return (target, propertyKey) => {
+    Reflect.defineMetadata(INTENT_SENSORS_KEY, sensors, target, propertyKey);
   };
 }
-var import_reflect_metadata9, HANDLER_SENSORS_KEY;
-var init_handler_sensors_decorator = __esm({
-  "src/decorators/handler-sensors.decorator.ts"() {
+var import_reflect_metadata9, INTENT_SENSORS_KEY;
+var init_intent_sensors_decorator = __esm({
+  "src/decorators/intent-sensors.decorator.ts"() {
     import_reflect_metadata9 = require("reflect-metadata");
-    HANDLER_SENSORS_KEY = "axis:handler:sensors";
+    INTENT_SENSORS_KEY = "axis:intent:sensors";
   }
 });
 
@@ -2254,15 +2300,19 @@ function observerRefKey(ref) {
 function sensorRefKey(ref) {
   return typeof ref === "string" ? ref : ref.name;
 }
-function mergeIntentSensorRefs(...sensorGroups) {
+function sensorBindingKey(binding) {
+  return `${binding.when}:${sensorRefKey(binding.ref)}`;
+}
+function mergeIntentSensorBindings(...sensorGroups) {
   const merged = /* @__PURE__ */ new Map();
   for (const group of sensorGroups) {
     if (!Array.isArray(group)) continue;
-    for (const ref of group) {
-      const key = sensorRefKey(ref);
+    for (const input of group) {
+      const binding = toIntentSensorBinding(input);
+      const key = sensorBindingKey(binding);
       const existing = merged.get(key);
-      if (!existing || typeof existing === "string" && typeof ref !== "string") {
-        merged.set(key, ref);
+      if (!existing || typeof existing.ref === "string" && typeof binding.ref !== "string") {
+        merged.set(key, binding);
       }
     }
   }
@@ -2566,9 +2616,9 @@ var init_intent_router = __esm({
             if (!handler) {
               throw new Error(`Intent not found: ${intent}`);
             }
-            const sensorRefs = this.intentSensors.get(intent);
-            if (sensorRefs && sensorRefs.length > 0) {
-              await this.runIntentSensors(sensorRefs, intent, frame);
+            const sensorBindings = this.intentSensors.get(intent);
+            if (sensorBindings && sensorBindings.length > 0) {
+              await this.runIntentSensors(sensorBindings, intent, frame, "before");
             }
             const decoder = this.intentDecoders.get(intent);
             let decodedBody = frame.body;
@@ -2610,6 +2660,12 @@ var init_intent_router = __esm({
                 );
               }
             }
+            if (sensorBindings && sensorBindings.length > 0) {
+              await this.runIntentSensors(sensorBindings, intent, frame, "after", {
+                decodedBody,
+                effect
+              });
+            }
           }
           await this.emitIntentObservers(observerBindings, {
             event: "intent.completed",
@@ -2653,7 +2709,7 @@ var init_intent_router = __esm({
           methodName
         );
         const meta = Reflect.getMetadata(INTENT_METADATA_KEY, proto, methodName);
-        const combined = mergeIntentSensorRefs(
+        const combined = mergeIntentSensorBindings(
           handlerSensors,
           Array.isArray(intentSensors) ? intentSensors : void 0,
           Array.isArray(meta?.is) ? meta.is : void 0
@@ -2795,8 +2851,10 @@ var init_intent_router = __esm({
         if (!this.observerDispatcher || bindings.length === 0) return;
         await this.observerDispatcher.dispatch(bindings, context);
       }
-      async runIntentSensors(sensorRefs, intent, frame) {
-        for (const sensorRef of sensorRefs) {
+      async runIntentSensors(sensorBindings, intent, frame, stage, extras) {
+        for (const binding of sensorBindings) {
+          if (binding.when !== stage && binding.when !== "both") continue;
+          const sensorRef = binding.ref;
           const sensor = this.resolveIntentSensor(sensorRef);
           const sensorName = sensorRefKey(sensorRef);
           if (!sensor) {
@@ -2813,9 +2871,12 @@ var init_intent_router = __esm({
             frameBody: frame.body,
             metadata: {
               phase: "intent",
+              stage,
               intent,
               schema: this.getSchema(intent),
-              validators: this.getValidators(intent)
+              validators: this.getValidators(intent),
+              decodedBody: extras?.decodedBody,
+              effect: extras?.effect
             }
           };
           if (sensor.supports && !sensor.supports(sensorInput)) continue;
@@ -12661,6 +12722,8 @@ __export(index_exports, {
   startStage: () => startStage,
   tieKnot: () => tieKnot,
   tlv: () => tlv,
+  toIntentSensorBinding: () => toIntentSensorBinding,
+  toObserverBinding: () => toObserverBinding,
   u64be: () => u64be,
   unpackPasskeyLoginOptionsReq: () => unpackPasskeyLoginOptionsReq,
   unpackPasskeyLoginVerifyReq: () => unpackPasskeyLoginVerifyReq,
@@ -12693,6 +12756,7 @@ var init_index = __esm({
     init_intent_body_decorator();
     init_intent_sensors_decorator();
     init_observer_decorator();
+    init_observer_decorator();
     init_handler_sensors_decorator();
     init_sensor_decorator();
     import_tlv_field2 = __toESM(require_tlv_field_decorator());
@@ -13044,6 +13108,8 @@ init_index();
   startStage,
   tieKnot,
   tlv,
+  toIntentSensorBinding,
+  toObserverBinding,
   u64be,
   unpackPasskeyLoginOptionsReq,
   unpackPasskeyLoginVerifyReq,