@cldmv/slothlet 2.10.0 → 2.11.0

package/dist/lib/modes/slothlet_lazy.mjs

@@ -161,7 +161,8 @@ export async function create(dir, maxDepth = Infinity, currentDepth = 0) {
 				depth,
 				maxDepth,
 				pathParts: [key],
-				runWithCtx
+				runWithCtx,
+				existingContent: parent[key] 
 			});
 			parent[key] = proxy;
 		}
@@ -173,6 +174,28 @@ export async function create(dir, maxDepth = Infinity, currentDepth = 0) {
 
 function replacePlaceholder(parent, key, placeholder, value, instance, depth) {
 	if (!parent || !key) return;
+
+	
+	if (
+		parent[key] !== placeholder &&
+		parent[key] &&
+		typeof parent[key] === "object" &&
+		typeof value === "object" &&
+		!Array.isArray(parent[key]) &&
+		!Array.isArray(value)
+	) {
+		if (instance?.config?.debug) {
+			console.log(`[lazy] MERGE CASE DETECTED for '${key}' - existing:`, Object.keys(parent[key]), "new:", Object.keys(value));
+			console.log(`[lazy] Before merge - parent[${key}]:`, parent[key]);
+		}
+		
+		Object.assign(parent[key], value);
+		if (instance?.config?.debug) {
+			console.log(`[lazy] After merge - parent[${key}]:`, Object.keys(parent[key]));
+		}
+		return;
+	}
+
 	if (parent[key] !== placeholder) return; 
 
 	
@@ -215,9 +238,43 @@ function replacePlaceholder(parent, key, placeholder, value, instance, depth) {
 	}
 
 	try {
-		Object.defineProperty(parent, finalKey, { value, writable: true, enumerable: true, configurable: true });
+		
+		if (
+			parent[finalKey] &&
+			typeof parent[finalKey] === "object" &&
+			typeof value === "object" &&
+			!Array.isArray(parent[finalKey]) &&
+			!Array.isArray(value)
+		) {
+			if (instance?.config?.debug) {
+				console.log(`[lazy] Merging subdirectory '${finalKey}' - existing:`, Object.keys(parent[finalKey]), "new:", Object.keys(value));
+			}
+			
+			Object.assign(parent[finalKey], value);
+		} else {
+			Object.defineProperty(parent, finalKey, { value, writable: true, enumerable: true, configurable: true });
+		}
 	} catch {
-		parent[finalKey] = value; 
+		
+		if (
+			parent[finalKey] &&
+			typeof parent[finalKey] === "object" &&
+			typeof value === "object" &&
+			!Array.isArray(parent[finalKey]) &&
+			!Array.isArray(value)
+		) {
+			if (instance?.config?.debug) {
+				console.log(
+					`[lazy] Merging subdirectory '${finalKey}' (fallback) - existing:`,
+					Object.keys(parent[finalKey]),
+					"new:",
+					Object.keys(value)
+				);
+			}
+			Object.assign(parent[finalKey], value);
+		} else {
+			parent[finalKey] = value; 
+		}
 	}
 	if (instance?.config?.debug) {
 		console.log(`[lazy][materialize] replaced ${key}${finalKey !== key ? ` -> ${finalKey}` : ""} (${typeof value})`);
@@ -228,7 +285,7 @@ function replacePlaceholder(parent, key, placeholder, value, instance, depth) {
 }
 
 
-function createFolderProxy({ subDirPath, key, parent, instance, depth, maxDepth, pathParts, runWithCtx }) {
+function createFolderProxy({ subDirPath, key, parent, instance, depth, maxDepth, pathParts, runWithCtx, existingContent }) {
 	let materialized = null;
 	let inFlight = null;
 
@@ -243,6 +300,7 @@ function createFolderProxy({ subDirPath, key, parent, instance, depth, maxDepth,
 				currentDepth: depth,
 				maxDepth,
 				mode: "lazy",
+				existingApi: parent, 
 				subdirHandler: ({ subDirPath: nestedPath, key: nestedKey, categoryModules, currentDepth: cd, maxDepth: md }) =>
 					createFolderProxy({
 						subDirPath: nestedPath,
@@ -256,6 +314,29 @@ function createFolderProxy({ subDirPath, key, parent, instance, depth, maxDepth,
 					})
 			});
 			materialized = value;
+
+			
+			if (
+				existingContent &&
+				typeof existingContent === "object" &&
+				typeof materialized === "object" &&
+				!Array.isArray(existingContent) &&
+				!Array.isArray(materialized)
+			) {
+				if (instance?.config?.debug) {
+					console.log(
+						`[lazy] Merging existing content with materialized subdirectory '${key}' - existing:`,
+						Object.keys(existingContent),
+						"new:",
+						Object.keys(materialized)
+					);
+				}
+				
+				materialized = Object.assign({}, existingContent, materialized);
+			} else if (existingContent && !materialized) {
+				
+				materialized = existingContent;
+			}
 			if (instance?.config?.debug) {
 				try {
 					const infoKeys = materialized && typeof materialized === "object" ? Object.keys(materialized) : [];

package/dist/slothlet.mjs

@@ -148,7 +148,17 @@ const slothletObject = {
 	reference: {},
 	mode: "singleton",
 	loaded: false,
-	config: { lazy: false, apiDepth: Infinity, debug: DEBUG, dir: null, sanitize: null, allowApiOverwrite: true },
+	config: {
+		lazy: false,
+		apiDepth: Infinity,
+		debug: DEBUG,
+		dir: null,
+		sanitize: null,
+		allowApiOverwrite: true,
+		enableModuleOwnership: false
+	},
+	
+	_moduleOwnership: new Map(), 
 	_dispose: null,
 	_boundAPIShutdown: null,
 	instanceId: null, 
@@ -396,7 +406,7 @@ const slothletObject = {
 
 	
 	async _buildCategory(categoryPath, options = {}) {
-		const { currentDepth = 0, maxDepth = Infinity, mode = "eager", subdirHandler } = options;
+		const { currentDepth = 0, maxDepth = Infinity, mode = "eager", subdirHandler, existingApi } = options;
 
 		
 		return buildCategoryStructure(categoryPath, {
@@ -404,7 +414,8 @@ const slothletObject = {
 			maxDepth,
 			mode,
 			subdirHandler,
-			instance: this
+			instance: this,
+			existingApi
 		});
 	},
 
@@ -694,8 +705,45 @@ const slothletObject = {
 	},
 
 	
-	async addApi(apiPath, folderPath, metadata = {}) {
-		return addApiFromFolder({ apiPath, folderPath, instance: this, metadata });
+	_registerApiOwnership(apiPath, moduleId) {
+		if (!this.config.enableModuleOwnership) return;
+		this._moduleOwnership.set(apiPath, moduleId);
+		if (this.config.debug) {
+			console.log(`[DEBUG] Registered ownership: ${apiPath} -> ${moduleId}`);
+		}
+	},
+
+	
+	_getApiOwnership(apiPath) {
+		if (!this.config.enableModuleOwnership) return null;
+		return this._moduleOwnership.get(apiPath) || null;
+	},
+
+	
+	_validateModuleOwnership(apiPath, moduleId, forceOverwrite) {
+		if (!this.config.enableModuleOwnership || !forceOverwrite) return false;
+
+		const existingOwner = this._getApiOwnership(apiPath);
+		if (!existingOwner) {
+			
+			return true;
+		}
+
+		
+		if (existingOwner === moduleId) {
+			return true;
+		}
+
+		
+		if (this.config.debug) {
+			console.log(`[DEBUG] Ownership conflict: ${apiPath} owned by ${existingOwner}, attempted by ${moduleId}`);
+		}
+		return false;
+	},
+
+	
+	async addApi(apiPath, folderPath, metadata = {}, options = {}) {
+		return addApiFromFolder({ apiPath, folderPath, instance: this, metadata, options });
 	},