@cldmv/slothlet 2.7.1 → 2.9.0

package/dist/lib/helpers/utilities.mjs

@@ -0,0 +1,121 @@
+/*
+	Copyright 2025 CLDMV/Shinrai
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+
+
+
+
+
+export function safeDefine(obj, key, value, enumerable = false, config = null) {
+	const desc = Object.getOwnPropertyDescriptor(obj, key);
+	if (!desc) {
+		Object.defineProperty(obj, key, {
+			value,
+			writable: true,
+			configurable: true,
+			enumerable
+		});
+	} else if (desc.configurable) {
+		Object.defineProperty(obj, key, {
+			value,
+			writable: true,
+			configurable: true,
+			enumerable
+		});
+	} else if (config && config.debug) {
+		console.warn(`Could not redefine boundApi.${key}: not configurable`);
+	}
+}
+
+
+export function deepMerge(target, source) {
+	if (!source || typeof source !== "object" || Array.isArray(source)) {
+		return source;
+	}
+
+	for (const key in source) {
+		if (!Object.prototype.hasOwnProperty.call(source, key)) {
+			continue;
+		}
+
+		
+		if (key === "__proto__" || key === "prototype" || key === "constructor") {
+			continue;
+		}
+
+		const sourceValue = source[key];
+		const targetValue = target[key];
+
+		if (sourceValue && typeof sourceValue === "object" && !Array.isArray(sourceValue)) {
+			target[key] = deepMerge(
+				targetValue && typeof targetValue === "object" && !Array.isArray(targetValue) ? targetValue : {},
+				sourceValue
+			);
+		} else {
+			target[key] = sourceValue;
+		}
+	}
+
+	return target;
+}
+
+
+export function mutateLiveBindingFunction(target, source) {
+	if (typeof source === "function") {
+		target._impl = (...args) => source(...args);
+		
+		for (const key of Object.keys(target)) {
+			if (key !== "_impl" && key !== "__ctx") delete target[key];
+		}
+		
+		for (const key of Object.getOwnPropertyNames(source)) {
+			if (key !== "length" && key !== "name" && key !== "prototype" && key !== "_impl" && key !== "__ctx") {
+				try {
+					target[key] = source[key];
+				} catch {
+					
+				}
+			}
+		}
+	} else if (typeof source === "object" && source !== null) {
+		
+		for (const key of Object.keys(target)) {
+			if (key !== "_impl" && key !== "__ctx") delete target[key];
+		}
+		
+		for (const [key, value] of Object.entries(source)) {
+			if (key !== "__ctx") {
+				target[key] = value;
+			}
+		}
+		
+		const managementMethods = ["shutdown", "addApi", "describe"];
+		for (const method of managementMethods) {
+			const desc = Object.getOwnPropertyDescriptor(source, method);
+			if (desc) {
+				try {
+					Object.defineProperty(target, method, desc);
+				} catch {
+					
+				}
+			}
+		}
+		
+		if (typeof source._impl === "function") {
+			target._impl = source._impl;
+		}
+	}
+}

package/dist/lib/runtime/runtime-asynclocalstorage.mjs

@@ -28,6 +28,9 @@ const als = new AsyncLocalStorage();
 export const sharedALS = new AsyncLocalStorage();
 
 
+export const requestALS = new AsyncLocalStorage();
+
+
 enableAlsForEventEmitters(als);
 
 
@@ -42,17 +45,21 @@ export const runWithCtx = (ctx, fn, thisArg, args) => {
 	}
 
 	
+	const requestContext = requestALS.getStore();
+	const mergedCtx = requestContext ? { ...ctx, context: { ...ctx.context, ...requestContext } } : ctx;
+
+	
 	const path = fn.__slothletPath;
 
 	
 	const runtime_runInALS = () => {
 		try {
 			
-			const beforeResult = ctx.hookManager.executeBeforeHooks(path, args);
+			const beforeResult = mergedCtx.hookManager.executeBeforeHooks(path, args);
 
 			
 			if (beforeResult.cancelled) {
-				ctx.hookManager.executeAlwaysHooks(path, beforeResult.value, []);
+				mergedCtx.hookManager.executeAlwaysHooks(path, beforeResult.value, []);
 				return beforeResult.value;
 			}
 
@@ -67,20 +74,20 @@ export const runWithCtx = (ctx, fn, thisArg, args) => {
 				return result.then(
 					(resolvedResult) => {
 						
-						const finalResult = ctx.hookManager.executeAfterHooks(path, resolvedResult);
-						ctx.hookManager.executeAlwaysHooks(path, finalResult, []);
+						const finalResult = mergedCtx.hookManager.executeAfterHooks(path, resolvedResult);
+						mergedCtx.hookManager.executeAlwaysHooks(path, finalResult, []);
 						return finalResult;
 					},
 					(error) => {
 						
-						if (!ctx.hookManager.reportedErrors.has(error)) {
-							ctx.hookManager.reportedErrors.add(error);
-							ctx.hookManager.executeErrorHooks(path, error, { type: "function" });
+						if (!mergedCtx.hookManager.reportedErrors.has(error)) {
+							mergedCtx.hookManager.reportedErrors.add(error);
+							mergedCtx.hookManager.executeErrorHooks(path, error, { type: "function" });
 						}
 						
-						ctx.hookManager.executeAlwaysHooks(path, undefined, [error]);
+						mergedCtx.hookManager.executeAlwaysHooks(path, undefined, [error]);
 						
-						if (!ctx.hookManager.suppressErrors) {
+						if (!mergedCtx.hookManager.suppressErrors) {
 							throw error;
 						}
 						return undefined; 
@@ -89,26 +96,26 @@ export const runWithCtx = (ctx, fn, thisArg, args) => {
 			}
 
 			
-			const finalResult = ctx.hookManager.executeAfterHooks(path, result);
-			ctx.hookManager.executeAlwaysHooks(path, finalResult, []);
+			const finalResult = mergedCtx.hookManager.executeAfterHooks(path, result);
+			mergedCtx.hookManager.executeAlwaysHooks(path, finalResult, []);
 			return finalResult;
 		} catch (error) {
 			
-			if (!ctx.hookManager.reportedErrors.has(error)) {
-				ctx.hookManager.reportedErrors.add(error);
-				ctx.hookManager.executeErrorHooks(path, error, { type: "function" });
+			if (!mergedCtx.hookManager.reportedErrors.has(error)) {
+				mergedCtx.hookManager.reportedErrors.add(error);
+				mergedCtx.hookManager.executeErrorHooks(path, error, { type: "function" });
 			}
 			
-			ctx.hookManager.executeAlwaysHooks(path, undefined, [error]);
+			mergedCtx.hookManager.executeAlwaysHooks(path, undefined, [error]);
 			
-			if (!ctx.hookManager.suppressErrors) {
+			if (!mergedCtx.hookManager.suppressErrors) {
 				throw error;
 			}
 			return undefined; 
 		}
 	};
 
-	return als.run(ctx, runtime_runInALS);
+	return als.run(mergedCtx, runtime_runInALS);
 };
 
 
@@ -477,6 +484,26 @@ function runtime_createLiveBinding(contextKey) {
 			
 
 			
+			if (contextKey === "context") {
+				const ctx = getCtx();
+				const baseContext = ctx?.context || {};
+				const requestContext = requestALS.getStore() || {};
+
+				
+				
+				const isDeepMerge = ctx?.config?.scope?.merge === "deep";
+
+				if (isDeepMerge && Object.keys(requestContext).length > 0) {
+					
+					return requestContext[prop];
+				}
+
+				
+				const merged = { ...baseContext, ...requestContext };
+				return merged[prop];
+			}
+
+			
 			runtime_syncWithContext();
 			return target[prop];
 		},

package/dist/lib/runtime/runtime-livebindings.mjs

@@ -18,6 +18,7 @@
 
 
 
+import { AsyncLocalStorage } from "node:async_hooks";
 import {
 	detectCurrentInstanceId,
 	getInstanceData,
@@ -26,6 +27,9 @@ import {
 } from "@cldmv/slothlet/helpers/instance-manager";
 
 
+export const requestALS = new AsyncLocalStorage();
+
+
 function getCurrentInstanceContext() {
 	
 	
@@ -122,10 +126,21 @@ export const context = new Proxy(
 	{
 		get(target, prop) {
 			const ctx = getCurrentInstanceContext();
-			if (ctx && ctx.context) {
-				return ctx.context[prop];
+			const baseContext = ctx?.context || {};
+			const requestContext = requestALS.getStore() || {};
+
+			
+			
+			const isDeepMerge = ctx?.config?.scope?.merge === "deep";
+
+			if (isDeepMerge && Object.keys(requestContext).length > 0) {
+				
+				return requestContext[prop];
 			}
-			return undefined;
+
+			
+			const merged = { ...baseContext, ...requestContext };
+			return merged[prop];
 		},
 
 		set(target, prop, value) {

package/dist/lib/runtime/runtime.mjs

@@ -18,11 +18,11 @@
 
 
 
-import { detectCurrentInstanceId, getInstanceData } from "../helpers/instance-manager.mjs";
+import { detectCurrentInstanceId, getInstanceData } from "@cldmv/slothlet/helpers/instance-manager";
 
 
-const asyncRuntime = await import("./runtime-asynclocalstorage.mjs");
-const liveBindingsRuntime = await import("./runtime-livebindings.mjs");
+const asyncRuntime = await import("@cldmv/slothlet/runtime/async");
+const liveBindingsRuntime = await import("@cldmv/slothlet/runtime/live");
 
 
 function detectRuntimeType() {