@versori/run 0.2.0-alpha.9 → 0.2.1-alpha.0

package/script/src/dsl/tasks/HttpTask.js

@@ -1,9 +1,19 @@
 "use strict";
-var _a;
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _a, _HttpContextImpl_dynamicFetcher, _HttpContextImpl_staticFetcher, _HttpContextImpl_inner;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpContextImpl = exports.HttpTaskImpl = void 0;
 exports.http = http;
-const Context_js_1 = require("../../context/Context.js");
 const ensureTask_js_1 = require("../ensureTask.js");
 const types_js_1 = require("../http/types.js");
 const Task_js_1 = require("../Task.js");
@@ -62,11 +72,8 @@ class HttpTaskImpl {
 }
 exports.HttpTaskImpl = HttpTaskImpl;
 _a = Task_js_1.TaskType;
-class HttpContextImpl extends Context_js_1.ContextImpl {
+class HttpContextImpl {
     constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
-        // We need to cast ctx to InternalContext to access kvp
-        const internalCtx = ctx;
-        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,
@@ -80,32 +87,46 @@ class HttpContextImpl extends Context_js_1.ContextImpl {
             value: void 0
         });
         // ideally only one of these should be set to a value
-        Object.defineProperty(this, "dynamicFetcher", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "staticFetcher", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        _HttpContextImpl_dynamicFetcher.set(this, void 0);
+        _HttpContextImpl_staticFetcher.set(this, void 0);
+        _HttpContextImpl_inner.set(this, void 0);
+        __classPrivateFieldSet(this, _HttpContextImpl_inner, ctx, "f");
         this.pageParams = pageParams;
         this.connectionVariables = connectionVars;
-        this.dynamicFetcher = dynamicFetcher;
-        this.staticFetcher = staticFetcher;
+        __classPrivateFieldSet(this, _HttpContextImpl_dynamicFetcher, dynamicFetcher, "f");
+        __classPrivateFieldSet(this, _HttpContextImpl_staticFetcher, staticFetcher, "f");
+    }
+    get log() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").log;
+    }
+    get executionId() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").executionId;
+    }
+    get startTime() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").startTime;
+    }
+    get activation() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation;
+    }
+    get data() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").data;
+    }
+    openKv(scope) {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").openKv(scope);
+    }
+    credentials() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").credentials();
     }
     get fetch() {
         // This is maybe hard to read.
-        return this.dynamicFetcher && this.activation ? (0, types_js_1.wrapDynamicFetcher)(this.dynamicFetcher, this.activation) : this.staticFetcher ?? globalThis.fetch;
+        return __classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f") && __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation ? (0, types_js_1.wrapDynamicFetcher)(__classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f"), __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation) : __classPrivateFieldGet(this, _HttpContextImpl_staticFetcher, "f") ?? globalThis.fetch;
     }
     async nextPage(nextParams) {
         throw new Error("Method not implemented.");
     }
 }
 exports.HttpContextImpl = HttpContextImpl;
+_HttpContextImpl_dynamicFetcher = new WeakMap(), _HttpContextImpl_staticFetcher = new WeakMap(), _HttpContextImpl_inner = new WeakMap();
 function http(taskId, opts, fn) {
     return new HttpTaskImpl(taskId, opts, fn);
 }

package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,YAAY,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,oBAAoB,EAAE,eAAe,CAAC;IACtC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAA;AAED,qBAAa,iBAAiB;IAOtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAbjC,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY;WASlC,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IA8C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AACA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,YAAY,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,oBAAoB,EAAE,eAAe,CAAC;IACtC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAA;AAED,qBAAa,iBAAiB;IAOtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAbjC,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY;WASlC,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IA8C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoJtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryInterpreter = void 0;
+const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const express_1 = __importDefault(require("express"));
 const rxjs_1 = require("rxjs");
 const ContextProvider_js_1 = require("../../context/ContextProvider.js");
@@ -101,7 +102,7 @@ class MemoryInterpreter {
         const compiler = options.compiler || new ObservableCompiler_js_1.ObservableCompiler();
         const roundTripperFactory = options.skipVersoriCredentials
             ? new default_js_1.DefaultRoundTripperFactory()
-            : roundtripper_js_1.VersoriRoundTripperFactory.fromEnv(log);
+            : roundtripper_js_1.VersoriCredentialsFactory.fromEnv(log);
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
@@ -110,7 +111,7 @@ class MemoryInterpreter {
         const kvp = await (options.skipVersoriCredentials
             ? new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider()
             : NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv());
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
+        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -148,6 +149,13 @@ class MemoryInterpreter {
         const port = Deno.env.get('PORT') || 3000;
         const app = (0, express_1.default)();
         app.use(express_1.default.json()); // Add JSON body parser middleware
+        const xml2jsDefaults = {
+            explicitArray: false,
+            normalize: false,
+            normalizeTags: false,
+            trim: true,
+        };
+        app.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         // Add health check route
         this.router.get("/health", (_req, res) => {
             res.json({ status: "healthy" });

package/script/src/interpreter/memory/compilers/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAsF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

package/script/src/interpreter/memory/compilers/schedule.js

@@ -50,7 +50,7 @@ function compileSchedule(ctx, trigger, signal) {
                 res.status(200).json({ status: 'triggered' });
             }
             catch (error) {
-                executionCtx.log.error('execution error inside schedule', { error });
+                ctx.log.error('execution error inside schedule', { error });
                 res.status(500).json({ error: 'Failed to trigger schedule' });
             }
         });

package/script/src/interpreter/memory/compilers/webhook.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCompiler = void 0;
 // In src/interpreter/memory/compilers/webhook.ts
 const cors_1 = __importDefault(require("cors"));
-const rxjs_1 = require("rxjs");
 const promises_1 = require("node:stream/promises");
+const rxjs_1 = require("rxjs");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,

package/script/src/kv/nats/NatsKeyValueProvider.d.ts

@@ -19,6 +19,7 @@ export declare class NatsKeyValueProvider implements KeyValueProvider, AsyncDisp
     private constructor();
     static newInstance(opts?: Partial<NatsKeyValueProviderOptions>): Promise<NatsKeyValueProvider>;
     static fromEnv(): Promise<NatsKeyValueProvider>;
+    [Symbol.asyncDispose](): PromiseLike<void>;
     kv(options: KVOptions): KeyValue;
     destroy(options: DestroyOptions): Promise<void>;
     private subjectPrefix;

package/script/src/kv/nats/NatsKeyValueProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAQ/C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}
+{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAI/C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}

package/script/src/observability/logging/ConsoleLogger.d.ts

@@ -10,6 +10,7 @@ export declare class ConsoleLogger implements Logger {
     constructor(level: LogLevel, fields?: Record<string, unknown>);
     debug(message: string, fields?: Record<string, unknown>): void;
     info(message: string, fields?: Record<string, unknown>): void;
+    error(message: string, err?: Error, fields?: Record<string, unknown>): void;
     error(message: string, fields?: Record<string, unknown>): void;
     child(fields: {
         [key: string]: string;

package/script/src/observability/logging/ConsoleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAmF/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}

package/script/src/observability/logging/ConsoleLogger.js

@@ -25,41 +25,132 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 const log = __importStar(require("../../../deps/jsr.io/@std/log/0.224.14/mod.js"));
-function valueOfUnknown(obj, idx) {
-    switch (typeof obj) {
+function isObjectLiteral(obj) {
+    return Object.getPrototypeOf(obj) === Object.prototype;
+}
+function formatError(err) {
+    if (Symbol.toPrimitive in err) {
+        const toPrimitive = err[Symbol.toPrimitive];
+        if (typeof toPrimitive === 'function') {
+            return toPrimitive();
+        }
+    }
+    const ret = {
+        error: err.message,
+    };
+    if (err.cause) {
+        if (err.cause instanceof Error) {
+            ret.cause = formatError(err.cause);
+        }
+        else {
+            // potential place to Deno.inspect?
+            ret.cause = formatArg(err.cause);
+        }
+    }
+    if (err.stack) {
+        ret.stacktrace = err.stack;
+    }
+    return ret;
+}
+// deno-lint-ignore ban-types
+function formatFunction(fn) {
+    const str = fn.toString();
+    return {
+        [`<fn:${fn.name}>`]: str.length > 40 ? `${str.substring(0, 40)}...` : str,
+    };
+}
+function formatArg(arg, nested = false) {
+    switch (typeof arg) {
         case 'object':
-            if (obj instanceof Object) {
-                const valueOf = obj.valueOf();
-                if (typeof valueOf === 'object' && !Array.isArray(valueOf)) {
-                    return valueOf;
+            if (arg === null) {
+                return null;
+            }
+            if (Array.isArray(arg)) {
+                return arg.map((arg) => formatArg(arg));
+            }
+            if (arg instanceof Date) {
+                return arg.toISOString();
+            }
+            if (Symbol.toPrimitive in arg) {
+                const toPrimitive = arg[Symbol.toPrimitive];
+                if (typeof toPrimitive === 'function') {
+                    return toPrimitive();
+                }
+            }
+            if (arg instanceof Error) {
+                if (nested) {
+                    return formatError(arg);
                 }
-                return {
-                    [`arg${idx}`]: obj,
-                };
+                return arg;
             }
-            if (obj === null) {
-                return {
-                    [`arg${idx}`]: null,
-                };
+            if (isObjectLiteral(arg)) {
+                // object literal or directly created by `new Object()`, not subclasses of Object.
+                return Object.entries(arg).reduce((acc, [key, value]) => ({
+                    ...acc,
+                    [key]: formatArg(value, true),
+                }), {});
             }
-            return obj;
+            return Deno.inspect(arg);
         case 'undefined':
-            return {
-                [`arg${idx}`]: undefined,
-            };
+            return '<undefined>';
         case 'function':
-            return {
-                [`arg${idx}`]: obj.valueOf(),
-            };
+            return formatFunction(arg);
         default:
-            return {
-                [`arg${idx}`]: obj,
-            };
+            return arg;
+    }
+}
+function formatArgs(args) {
+    if (args.length === 0) {
+        return {};
+    }
+    if (args.length === 1) {
+        const formatted = formatArg(args[0]);
+        if (formatted instanceof Error) {
+            return formatError(formatted);
+        }
+        if (typeof formatted === 'object' && formatted !== null) {
+            return formatted;
+        }
+        return {
+            arg0: formatted,
+        };
+    }
+    const errors = [];
+    const others = [];
+    for (const arg of args) {
+        const formatted = formatArgs([arg]);
+        if (arg instanceof Error) {
+            // formatted isn't an instanceof Error after `formatArgs()`, so check original `arg`.
+            errors.push(formatted);
+        }
+        else {
+            others.push(formatted);
+        }
+    }
+    const othersMerged = others.length === 1
+        ? others[0]
+        : others.reduce((acc, value, idx) => ({
+            ...acc,
+            [`arg${idx}`]: value,
+        }), {});
+    if (errors.length === 1) {
+        return {
+            ...othersMerged,
+            // if there's only one error, we want to splat 'error', 'cause' and 'stacktrace' over
+            // all other merged fields.
+            ...errors[0],
+        };
     }
+    return {
+        ...othersMerged,
+        // array of errors.
+        errors: errors,
+    };
 }
 log.setup({
     handlers: {
         default: new log.ConsoleHandler('DEBUG', {
+            useColors: false,
             formatter: (record) => {
                 // log.formatters.jsonFormatter bugs me:
                 // - time is in unix milliseconds
@@ -72,12 +163,7 @@ log.setup({
                         time: record.datetime.toISOString(),
                         ...(record.loggerName ? { name: record.loggerName } : {}),
                         msg: record.msg,
-                        ...(Array.isArray(record.args)
-                            ? (record.args.reduce((acc, next, idx) => ({
-                                ...acc,
-                                ...(valueOfUnknown(next, idx)),
-                            }), {}))
-                            : {}),
+                        ...formatArgs(record.args),
                     });
                 }
                 catch (err) {
@@ -138,9 +224,17 @@ class ConsoleLogger {
             ...fields,
         });
     }
-    error(message, fields) {
+    error(message, fieldsOrError, fields) {
+        if (fieldsOrError instanceof Error) {
+            this.log.error(message, fieldsOrError, {
+                ...this.fields,
+                ...fields,
+            });
+            return;
+        }
         this.log.error(message, {
             ...this.fields,
+            ...fieldsOrError,
             ...fields,
         });
     }