@cldmv/slothlet 2.4.3 → 2.5.1

package/dist/lib/helpers/multidefault.mjs

@@ -0,0 +1,197 @@
+/*
+	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.
+*/
+
+
+
+import path from "path";
+
+
+async function multidefault_analyzeModules(moduleFiles, baseDir, debug = false) {
+	const selfReferentialFiles = new Set();
+	const rawModuleCache = new Map();
+	const defaultExportFiles = [];
+	let totalDefaultExports = 0;
+
+	if (debug) {
+		console.log(`[DEBUG] multidefault_analyzeModules: Processing ${moduleFiles.length} files in ${baseDir}`);
+	}
+
+	
+	for (const file of moduleFiles) {
+		const moduleExt = path.extname(file.name);
+		const fileName = path.basename(file.name, moduleExt);
+		const moduleFilePath = path.resolve(baseDir, file.name);
+
+		
+		const rawImport = await import(`file://${moduleFilePath.replace(/\\/g, "/")}`);
+
+		
+		const isCjsFile = moduleExt === ".cjs";
+		const rawMod = isCjsFile ? rawImport.default : rawImport;
+		rawModuleCache.set(file.name, rawMod);
+
+		
+		const hasRealDefault = rawMod && "default" in rawMod;
+		if (hasRealDefault) {
+			totalDefaultExports++; 
+
+			
+			const isSelfReferential = multidefault_isSelfReferential(rawMod);
+
+			if (debug) {
+				console.log(`[DEBUG] multidefault_analyzeModules: Checking ${file.name}`);
+				console.log(`[DEBUG]   - fileName: ${fileName}`);
+				console.log(`[DEBUG]   - has default: ${hasRealDefault}`);
+				console.log(`[DEBUG]   - isSelfReferential: ${isSelfReferential}`);
+			}
+
+			if (!isSelfReferential) {
+				
+				defaultExportFiles.push({ fileName, rawModule: rawMod });
+				if (debug) {
+					console.log(`[DEBUG] Found default export in ${file.name} (non-self-referential)`);
+				}
+			} else {
+				selfReferentialFiles.add(fileName); 
+				if (debug) {
+					console.log(`[DEBUG] Skipped ${file.name} - self-referential default export`);
+				}
+			}
+		} else if (debug) {
+			console.log(`[DEBUG] multidefault_analyzeModules: Checking ${file.name}`);
+			console.log(`[DEBUG]   - fileName: ${fileName}`);
+			console.log(`[DEBUG]   - has default: ${hasRealDefault}`);
+			if (isCjsFile) {
+				console.log(`[DEBUG]   - CJS file unwrapped from Node.js wrapper`);
+			}
+		}
+	}
+
+	
+	const hasMultipleDefaultExports = totalDefaultExports > 1;
+
+	if (debug) {
+		console.log(`[DEBUG] multidefault_analyzeModules results:`);
+		console.log(`[DEBUG]   - selfReferentialFiles:`, Array.from(selfReferentialFiles));
+		console.log(`[DEBUG]   - totalDefaultExports:`, totalDefaultExports);
+		console.log(`[DEBUG]   - hasMultipleDefaultExports:`, hasMultipleDefaultExports);
+		console.log(`[DEBUG]   - defaultExportFiles count:`, defaultExportFiles.length);
+	}
+
+	return {
+		totalDefaultExports,
+		hasMultipleDefaultExports,
+		selfReferentialFiles,
+		rawModuleCache,
+		defaultExportFiles
+	};
+}
+
+
+function multidefault_isSelfReferential(rawModule) {
+	if (!rawModule || !("default" in rawModule)) {
+		return false;
+	}
+
+	
+	return Object.entries(rawModule).some(([key, value]) => key !== "default" && value === rawModule.default);
+}
+
+
+function multidefault_getFlatteningDecision(options) {
+	const {
+		hasMultipleDefaultExports,
+		moduleHasDefault,
+		isSelfReferential,
+		moduleKeys,
+		apiPathKey,
+		totalModuleCount,
+		debug = false
+	} = options;
+
+	if (debug) {
+		console.log(`[DEBUG] multidefault_getFlatteningDecision: Analyzing flattening for ${apiPathKey}`);
+		console.log(`[DEBUG]   - hasMultipleDefaultExports: ${hasMultipleDefaultExports}`);
+		console.log(`[DEBUG]   - moduleHasDefault: ${moduleHasDefault}`);
+		console.log(`[DEBUG]   - isSelfReferential: ${isSelfReferential}`);
+		console.log(`[DEBUG]   - moduleKeys: [${moduleKeys.join(", ")}]`);
+		console.log(`[DEBUG]   - totalModuleCount: ${totalModuleCount}`);
+	}
+
+	
+	if (isSelfReferential) {
+		return {
+			shouldFlatten: false,
+			flattenToRoot: false,
+			preserveAsNamespace: true,
+			reason: "self-referential default export"
+		};
+	}
+
+	
+	if (hasMultipleDefaultExports) {
+		if (moduleHasDefault) {
+			
+			return {
+				shouldFlatten: false,
+				flattenToRoot: false,
+				preserveAsNamespace: true,
+				reason: "multi-default context with default export"
+			};
+		} else {
+			
+			return {
+				shouldFlatten: true,
+				flattenToRoot: true,
+				preserveAsNamespace: false,
+				reason: "multi-default context without default export"
+			};
+		}
+	}
+
+	
+	
+	if (moduleKeys.length === 1 && moduleKeys[0] === apiPathKey) {
+		return {
+			shouldFlatten: true,
+			flattenToRoot: false,
+			preserveAsNamespace: false,
+			reason: "single named export matching filename"
+		};
+	}
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	return {
+		shouldFlatten: false,
+		flattenToRoot: false,
+		preserveAsNamespace: true,
+		reason: "default namespace preservation"
+	};
+}
+
+export { multidefault_analyzeModules, multidefault_isSelfReferential, multidefault_getFlatteningDecision };

package/dist/lib/modes/slothlet_eager.mjs

@@ -22,165 +22,85 @@
 
 import fs from "node:fs/promises";
 import path from "node:path";
+import { processModuleForAPI } from "@cldmv/slothlet/helpers/api_builder";
+import { multidefault_analyzeModules } from "@cldmv/slothlet/helpers/multidefault";
 
 
 
 
 
-
-export async function create(dir, rootLevel = true, maxDepth = Infinity, currentDepth = 0) {
-	
+export async function create(dir, maxDepth = Infinity, currentDepth = 0) {
 	const entries = await fs.readdir(dir, { withFileTypes: true });
 	const api = {};
+	let rootDefaultFunction = null;
+
 	
-	const rootNamedExports = {};
+	const moduleFiles = entries.filter((e) => this._shouldIncludeFile(e));
+	const defaultExportFiles = [];
 	
-	let rootDefaultFunction = null;
+	const analysis = await multidefault_analyzeModules(moduleFiles, dir, this.config.debug);
 
-	if (rootLevel) {
-		
-		const moduleFiles = entries.filter((e) => this._shouldIncludeFile(e));
-		const defaultExportFiles = [];
+	const { totalDefaultExports, hasMultipleDefaultExports, selfReferentialFiles, defaultExportFiles: analysisDefaults } = analysis;
 
-		
-		for (const entry of moduleFiles) {
-			const ext = path.extname(entry.name);
-			const fileName = path.basename(entry.name, ext);
-			const mod = await this._loadSingleModule(path.join(dir, entry.name), true);
-
-			if (this.config.debug) {
-				console.log(`[DEBUG] First pass - ${fileName}: hasDefault=${mod && "default" in mod}`);
-			}
-
-			if (mod && "default" in mod) {
-				
-				const isSelfReferential = Object.entries(mod).some(([key, value]) => key !== "default" && value === mod.default);
-
-				if (!isSelfReferential) {
-					defaultExportFiles.push({ entry, fileName, mod });
-					if (this.config.debug) {
-						console.log(`[DEBUG] Added ${fileName} to defaultExportFiles (non-self-referential)`);
-					}
-				} else {
-					if (this.config.debug) {
-						console.log(`[DEBUG] Skipped ${fileName} - self-referential default export`);
-					}
-				}
-			}
+	
+	defaultExportFiles.length = 0; 
+	for (const { fileName } of analysisDefaults) {
+		const entry = moduleFiles.find((f) => path.basename(f.name, path.extname(f.name)) === fileName);
+		if (entry) {
+			const mod = await this._loadSingleModule(path.join(dir, entry.name));
+			defaultExportFiles.push({ entry, fileName, mod });
 		}
-		const hasMultipleDefaultExports = defaultExportFiles.length > 1;
+	}
 
-		if (this.config.debug) {
-			console.log(
-				`[DEBUG] Detection result: ${defaultExportFiles.length} default exports found, hasMultipleDefaultExports=${hasMultipleDefaultExports}`
-			);
-			console.log(
-				`[DEBUG] Default export files:`,
-				defaultExportFiles.map((f) => f.fileName)
-			);
-		}
+	if (this.config.debug) {
+		console.log(`[DEBUG] Eager mode: Using shared multidefault utility results`);
+		console.log(
+			`[DEBUG] Detection result: ${totalDefaultExports} total defaults (${defaultExportFiles.length} non-self-referential + ${selfReferentialFiles.size} self-referential), hasMultipleDefaultExports=${hasMultipleDefaultExports}`
+		);
+		console.log(
+			`[DEBUG] Default export files:`,
+			defaultExportFiles.map((f) => f.fileName)
+		);
+	}
+
+	
+	for (const entry of moduleFiles) {
+		const ext = path.extname(entry.name);
+		const fileName = path.basename(entry.name, ext);
+		const apiPathKey = this._toapiPathKey(fileName);
 
 		
-		for (const entry of moduleFiles) {
-			const ext = path.extname(entry.name);
-			const fileName = path.basename(entry.name, ext);
-			const apiKey = this._toApiKey(fileName);
-			const mod = await this._loadSingleModule(path.join(dir, entry.name), true);
-
-			
-			const isSelfReferential =
-				mod && "default" in mod && Object.entries(mod).some(([key, value]) => key !== "default" && value === mod.default);
-
-			if (mod && typeof mod.default === "function") {
-				if (hasMultipleDefaultExports && !isSelfReferential) {
-					
-					api[apiKey] = mod.default;
-
-					
-					for (const [key, value] of Object.entries(mod)) {
-						if (key !== "default") {
-							api[apiKey][key] = value;
-						}
-					}
-
-					if (this.config.debug) {
-						console.log(`[DEBUG] Multi-default in eager mode: using filename '${apiKey}' for default export`);
-					}
-				} else {
-					
-					if (this.config.debug) {
-						console.log(
-							`[DEBUG] Processing traditional default: hasMultipleDefaultExports=${hasMultipleDefaultExports}, isSelfReferential=${isSelfReferential}, rootDefaultFunction=${!!rootDefaultFunction}`
-						);
-					}
-					if ((!hasMultipleDefaultExports || isSelfReferential) && !rootDefaultFunction) {
-						rootDefaultFunction = mod.default;
-						if (this.config.debug) {
-							console.log(`[DEBUG] Set rootDefaultFunction to:`, mod.default.name);
-						}
-					} else {
-						if (this.config.debug) {
-							console.log(`[DEBUG] Skipped setting rootDefaultFunction due to multi-default scenario`);
-						}
-					}
-					for (const [key, value] of Object.entries(mod)) {
-						if (key !== "default") api[key] = value;
-					}
-				}
-			} else {
-				
-				if (this.config.debug) {
-					console.log(`[DEBUG] Processing non-function or named-only exports for ${fileName}`);
-				}
-
-				if (isSelfReferential) {
-					
-					if (this.config.debug) {
-						console.log(`[DEBUG] Self-referential ${fileName}: preserving as namespace`);
-					}
-					api[apiKey] = mod.default; 
-				} else if (hasMultipleDefaultExports) {
-					
-					if (this.config.debug) {
-						console.log(`[DEBUG] Multi-default context: flattening ${fileName} exports to root`);
-					}
-					
-					const eager_addNamedExportsToApi = (exports, api, rootNamedExports) => {
-						for (const [key, value] of Object.entries(exports)) {
-							if (key !== "default") {
-								api[key] = value;
-								rootNamedExports[key] = value;
-							}
-						}
-					};
-
-					if (mod && "default" in mod) {
-						
-						api[apiKey] = mod.default;
-						
-						eager_addNamedExportsToApi(mod, api, rootNamedExports);
-					} else {
-						
-						eager_addNamedExportsToApi(mod, api, rootNamedExports);
-					}
-				} else {
-					
-					if (this.config.debug) {
-						console.log(`[DEBUG] Traditional context: preserving ${fileName} as namespace`);
-					}
-					api[apiKey] = mod;
-					for (const [key, value] of Object.entries(mod)) {
-						rootNamedExports[key] = value;
-					}
-				}
-			}
-		}
+		const moduleResult = await this._loadSingleModule(path.join(dir, entry.name), true);
+		const mod = moduleResult.mod;
+		const analysis = moduleResult.analysis;
+
+		
+		const isSelfReferential = selfReferentialFiles.has(fileName);
+
+		processModuleForAPI({
+			mod,
+			fileName,
+			apiPathKey,
+			hasMultipleDefaultExports,
+			isSelfReferential,
+			api,
+			getRootDefault: () => rootDefaultFunction,
+			setRootDefault: (fn) => {
+				rootDefaultFunction = fn;
+			},
+			context: {
+				debug: this.config.debug,
+				mode: "root",
+				totalModules: moduleFiles.length
+			},
+			originalAnalysis: analysis
+		});
 	}
 
 	for (const entry of entries) {
 		if (entry.isDirectory() && !entry.name.startsWith(".") && currentDepth < maxDepth) {
 			const categoryPath = path.join(dir, entry.name);
-			api[this._toApiKey(entry.name)] = await this._loadCategory(categoryPath, currentDepth + 1, maxDepth);
+			api[this._toapiPathKey(entry.name)] = await this._loadCategory(categoryPath, currentDepth + 1, maxDepth);
 		}
 	}
 
@@ -202,9 +122,5 @@ export async function create(dir, rootLevel = true, maxDepth = Infinity, current
 		}
 	}
 
-	
-	
-	
-
 	return finalApi;
 }

package/dist/lib/modes/slothlet_lazy.mjs

@@ -18,159 +18,94 @@
 
 
 import fs from "node:fs/promises";
+import { readdirSync } from "node:fs";
 import path from "node:path";
 import { runWithCtx } from "@cldmv/slothlet/runtime";
+import { processModuleForAPI } from "@cldmv/slothlet/helpers/api_builder";
+import { multidefault_analyzeModules } from "@cldmv/slothlet/helpers/multidefault";
 
 
-export async function create(dir, rootLevel = true, maxDepth = Infinity, currentDepth = 0) {
+export async function create(dir, maxDepth = Infinity, currentDepth = 0) {
 	const instance = this; 
 	const entries = await fs.readdir(dir, { withFileTypes: true });
 	let api = {};
 	let rootDefaultFn = null;
 
 	
-	if (rootLevel) {
-		
-		const moduleFiles = entries.filter((e) => instance._shouldIncludeFile(e));
-		const defaultExportFiles = [];
-
-		
-		const selfReferentialFiles = new Set(); 
-		const rawModuleCache = new Map(); 
+	
+	const moduleFiles = entries.filter((e) => instance._shouldIncludeFile(e));
+	const defaultExportFiles = [];
 
-		for (const entry of moduleFiles) {
-			const ext = path.extname(entry.name);
-			const fileName = path.basename(entry.name, ext);
+	
+	const analysis = await multidefault_analyzeModules(moduleFiles, dir, instance.config.debug);
 
-			if (instance.config.debug) {
-				console.log(`[DEBUG] First pass processing: ${fileName}`);
-			}
+	const { totalDefaultExports, hasMultipleDefaultExports, selfReferentialFiles, defaultExportFiles: analysisDefaults } = analysis;
 
+	
+	defaultExportFiles.length = 0; 
+	for (const { fileName } of analysisDefaults) {
+		const entry = moduleFiles.find((f) => path.basename(f.name, path.extname(f.name)) === fileName);
+		if (entry) {
 			
-			const modulePath = path.resolve(dir, entry.name);
-			const rawMod = await import(`file://${modulePath.replace(/\\/g, "/")}`);
-			rawModuleCache.set(entry.name, rawMod);
-
-			if (instance.config.debug && fileName === "config") {
-				console.log(`[DEBUG] First pass - raw config keys:`, Object.keys(rawMod || {}));
-				console.log(`[DEBUG] First pass - raw config has default:`, rawMod && "default" in rawMod);
-			}
-
-			if (rawMod && "default" in rawMod) {
-				
-				const isSelfReferential = Object.entries(rawMod).some(([key, value]) => key !== "default" && value === rawMod.default);
-
-				
-				if (instance.config.debug && fileName === "config") {
-					console.log(`[DEBUG] First pass - ${fileName} self-referential check:`);
-					console.log(`[DEBUG] - rawMod.default === rawMod.config: ${rawMod.default === rawMod.config}`);
-					console.log(`[DEBUG] - isSelfReferential result: ${isSelfReferential}`);
-				}
-
-				if (!isSelfReferential) {
-					
-					const mod = await instance._loadSingleModule(path.join(dir, entry.name), true);
-					defaultExportFiles.push({ entry, fileName, mod });
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Added ${fileName} to defaultExportFiles (non-self-referential)`);
-					}
-				} else {
-					selfReferentialFiles.add(fileName); 
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Skipped ${fileName} - self-referential default export`);
-					}
-				}
-			}
+			const moduleResult = await instance._loadSingleModule(path.join(dir, entry.name), true);
+			const mod = moduleResult.mod;
+			const moduleAnalysis = moduleResult.analysis;
+			defaultExportFiles.push({ entry, fileName, mod, analysis: moduleAnalysis });
 		}
+	}
 
-		const hasMultipleDefaultExports = defaultExportFiles.length > 1;
+	if (instance.config.debug) {
+		console.log(`[DEBUG] Lazy mode: Using shared multidefault utility results`);
+		console.log(`[DEBUG]   - totalDefaultExports: ${totalDefaultExports}`);
+		console.log(`[DEBUG]   - hasMultipleDefaultExports: ${hasMultipleDefaultExports}`);
+		console.log(`[DEBUG]   - selfReferentialFiles: ${Array.from(selfReferentialFiles)}`);
+	}
 
-		
-		const processedModuleCache = new Map(); 
+	
+	const processedModuleCache = new Map(); 
 
-		for (const entry of moduleFiles) {
-			const ext = path.extname(entry.name);
-			const fileName = path.basename(entry.name, ext);
-			const apiKey = instance._toApiKey(fileName);
-
-			
-			let mod = null;
-			const existingDefault = defaultExportFiles.find((def) => def.fileName === fileName);
-			if (existingDefault) {
-				mod = existingDefault.mod; 
-			} else {
-				
-				mod = await instance._loadSingleModule(path.join(dir, entry.name), true);
-				processedModuleCache.set(entry.name, mod);
-			}
+	for (const entry of moduleFiles) {
+		const ext = path.extname(entry.name);
+		const fileName = path.basename(entry.name, ext);
+		const apiPathKey = instance._toapiPathKey(fileName);
 
+		
+		let mod = null;
+		let analysis = null;
+		const existingDefault = defaultExportFiles.find((def) => def.fileName === fileName);
+		if (existingDefault) {
+			mod = existingDefault.mod; 
+			analysis = existingDefault.analysis; 
+		} else {
 			
-			const isSelfReferential = selfReferentialFiles.has(fileName);
-
-			if (mod && typeof mod.default === "function") {
-				if (hasMultipleDefaultExports && !isSelfReferential) {
-					
-					api[apiKey] = mod.default;
-
-					
-					for (const [key, value] of Object.entries(mod)) {
-						if (key !== "default") {
-							api[apiKey][key] = value;
-						}
-					}
+			const moduleResult = await instance._loadSingleModule(path.join(dir, entry.name), true);
+			mod = moduleResult.mod;
+			analysis = moduleResult.analysis;
+			processedModuleCache.set(entry.name, mod);
+		}
 
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Multi-default in lazy mode: using filename '${apiKey}' for default export`);
-					}
-				} else if (isSelfReferential) {
-					
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Self-referential default export: preserving ${fileName} as namespace`);
-					}
-					api[apiKey] = mod;
-				} else {
-					
-					
-					if (!hasMultipleDefaultExports && !rootDefaultFn) {
-						rootDefaultFn = mod.default;
-					}
-					for (const [k, v] of Object.entries(mod)) {
-						if (k !== "default") api[k] = v;
-					}
-				}
-			} else {
-				
-				
-				if (instance.config.debug) {
-					console.log(`[DEBUG] Processing non-default exports for ${fileName}`);
-				}
+		
+		const isSelfReferential = selfReferentialFiles.has(fileName);
 
-				if (isSelfReferential) {
-					
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Self-referential: preserving ${fileName} as namespace`);
-					}
-					
-					api[apiKey] = mod[apiKey] || mod;
-				} else if (hasMultipleDefaultExports) {
-					
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Multi-default context: flattening ${fileName} exports to root`);
-					}
-					for (const [k, v] of Object.entries(mod)) {
-						if (k !== "default") {
-							api[k] = v;
-						}
-					}
-				} else {
-					
-					if (instance.config.debug) {
-						console.log(`[DEBUG] Traditional context: preserving ${fileName} as namespace`);
-					}
-					api[apiKey] = mod;
-				}
-			}
-		}
+		
+		processModuleForAPI({
+			mod,
+			fileName,
+			apiPathKey,
+			hasMultipleDefaultExports,
+			isSelfReferential,
+			api,
+			getRootDefault: () => rootDefaultFn,
+			setRootDefault: (fn) => {
+				rootDefaultFn = fn;
+			},
+			context: {
+				debug: instance.config.debug,
+				mode: "root",
+				totalModules: moduleFiles.length
+			},
+			originalAnalysis: analysis
+		});
 	}
 
 	
@@ -182,10 +117,37 @@ export async function create(dir, rootLevel = true, maxDepth = Infinity, current
 	
 	for (const entry of entries) {
 		if (entry.isDirectory() && !entry.name.startsWith(".") && currentDepth < maxDepth) {
-			const key = instance._toApiKey(entry.name);
+			const key = instance._toapiPathKey(entry.name);
 			const subDirPath = path.join(dir, entry.name);
 			const parent = api;
 			const depth = 1; 
+
+			
+			try {
+				const subEntries = readdirSync(subDirPath, { withFileTypes: true });
+				const hasFiles = subEntries.some(
+					(subEntry) =>
+						subEntry.isFile() &&
+						!subEntry.name.startsWith(".") &&
+						(subEntry.name.endsWith(".mjs") || subEntry.name.endsWith(".cjs") || subEntry.name.endsWith(".js"))
+				);
+				const hasSubdirs = subEntries.some((subEntry) => subEntry.isDirectory() && !subEntry.name.startsWith("."));
+
+				
+				if (!hasFiles && !hasSubdirs) {
+					if (instance?.config?.debug) {
+						console.log(`[lazy][debug] empty folder detected during traversal: ${subDirPath} -> adding {}`);
+					}
+					parent[key] = {};
+					continue; 
+				}
+			} catch (error) {
+				
+				if (instance?.config?.debug) {
+					console.log(`[lazy][debug] error reading directory ${subDirPath}: ${error.message}, creating lazy proxy`);
+				}
+			}
+
 			const proxy = createFolderProxy({
 				subDirPath,
 				key,