@cldmv/slothlet 2.11.0 → 3.0.1

package/dist/lib/helpers/resolve-from-caller.mjs

@@ -20,160 +20,166 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
+import { ComponentBase } from "@cldmv/slothlet/factories/component-base";
 
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const SLOTHLET_LIB_ROOT = path.resolve(__dirname, "../..");
+const SLOTHLET_PKG_ROOT = path.normalize(path.resolve(__dirname, "../../..")); 
 
+export class Resolver extends ComponentBase {
+	static slothletProperty = "resolver";
 
-export const toFsPath = (v) => (v && String(v).startsWith("file://") ? fileURLToPath(String(v)) : v ? String(v) : null);
-
-
-export function getStack(skipFn) {
-	const orig = Error.prepareStackTrace;
-	try {
-		Error.prepareStackTrace = (_, s) => s; 
-		const e = new Error("Stack trace");
-		if (skipFn) Error.captureStackTrace(e, skipFn);
-		return e.stack || [];
-	} finally {
-		Error.prepareStackTrace = orig;
+	
+	getStack(skipFn) {
+		const orig = Error.prepareStackTrace;
+		try {
+			Error.prepareStackTrace = (_, s) => s; 
+			const e = new Error("Stack trace");
+			if (skipFn) Error.captureStackTrace(e, skipFn);
+			return e.stack;
+		} finally {
+			Error.prepareStackTrace = orig;
+		}
 	}
-}
-
-const THIS_FILE = fileURLToPath(import.meta.url);
-const THIS_DIR = path.dirname(THIS_FILE);
-
-
-
 
-
-
-
-
-function pickPrimaryBaseFile() {
-	const files = [];
-	for (const cs of getStack(pickPrimaryBaseFile)) {
-		const f = toFsPath(cs?.getFileName?.());
-		if (!f) continue;
-		
-		if (f.startsWith?.("node:")) continue;
-		files.push(f);
+	
+	#getStack() {
+		const originalPrepare = Error.prepareStackTrace;
+		Error.prepareStackTrace = (___, stack) => stack;
+		const stack = new Error().stack;
+		Error.prepareStackTrace = originalPrepare;
+		return stack;
 	}
 
-	console.log(`[DEBUG_RESOLVE] pickPrimaryBaseFile - Total stack frames: ${files.length}`);
-	console.log(`[DEBUG_RESOLVE] ALL stack frames:`);
-	for (let i = 0; i < files.length; i++) {
-		console.log(`[DEBUG_RESOLVE]   [${i}] ${files[i]}`);
+	
+	toFsPath(v) {
+		if (!v) return null;
+		const str = String(v);
+		return str.startsWith("file://") ? fileURLToPath(str) : str;
 	}
 
-	let iSloth = -1;
-	for (let i = 0; i < files.length; i++) {
-		if (path.basename(files[i]).toLowerCase() === "slothlet.mjs") {
-			iSloth = i;
-		}
-	}
+	
+	#isSlothletInternal(filePath) {
+		
+		const normalized = path.normalize(filePath);
+		const normalizedLibRoot = path.normalize(SLOTHLET_LIB_ROOT);
 
-	console.log(`[DEBUG_RESOLVE] Found slothlet.mjs at index: ${iSloth}, total files: ${files.length}`);
-	if (iSloth !== -1) {
-		console.log(`[DEBUG_RESOLVE] Files after slothlet.mjs:`);
-		for (let k = iSloth + 1; k < Math.min(files.length, iSloth + 5); k++) {
-			console.log(`[DEBUG_RESOLVE]   [${k}] ${files[k]}`);
+		
+		if (normalized.startsWith(normalizedLibRoot)) {
+			return true;
 		}
-	}
 
-	if (iSloth !== -1) {
 		
-		let j = iSloth + 1;
-
 		
-function isSlothletInternalFile(filePath) {
-	if (!filePath) return true;
-
-	
-	if (filePath.includes(path.sep + "src" + path.sep + "lib" + path.sep)) return true;
+		
+		
+		
+		const basename = path.basename(normalized);
+		if (basename === "index.mjs" || basename === "index.cjs") {
+			
+			
+			
+			
+			if (path.dirname(normalized) === SLOTHLET_PKG_ROOT) return true;
+		}
 
-	
-	if (path.basename(filePath).toLowerCase() === "slothlet.mjs") return true;
+		return false;
+	}
 
 	
-	if (filePath.startsWith(THIS_DIR + path.sep)) return true;
+	#findCallerBase() {
+		const stack = this.#getStack();
+		const files = stack.map((s) => this.toFsPath(s.getFileName())).filter(Boolean);
 
-	return false;
-}
-
-
-function pickFallbackBaseFile() {
-	console.log("[DEBUG_RESOLVE] pickFallbackBaseFile called");
-	for (const cs of getStack(pickFallbackBaseFile)) {
-		const f = toFsPath(cs?.getFileName?.());
-		if (!f) continue;
 		
-		if (f.startsWith?.("node:")) continue;
-		if (f === THIS_FILE) continue;
-		if (f.startsWith(THIS_DIR + path.sep)) continue; 
-		if (path.basename(f).toLowerCase() === "slothlet.mjs") continue;
-		if (isSlothletInternalFile(f)) {
-			console.log(`[DEBUG_RESOLVE] Fallback skipping internal file: ${f}`);
-			continue; 
+		const slothletIndex = files.findIndex((f) => path.basename(f).toLowerCase() === "slothlet.mjs");
+
+		if (slothletIndex === -1) {
+			
+			for (const file of files) {
+				if (!this.#isSlothletInternal(file)) {
+					return file;
+				}
+			}
+			
+			
+			
+			
+			
+			return null;
 		}
-		console.log(`[DEBUG_RESOLVE] Fallback considering: ${f}`);
-		return f;
-	}
-	
-	
-	console.log(`[DEBUG_RESOLVE] Fallback: No user code found in stack, using process.cwd(): ${process.cwd()}`);
-	return process.cwd();
-}
-
-
-
 
-function resolveWith(rel, makePrimary, exists, makeFallback) {
-	if (typeof rel !== "string") throw new TypeError("rel must be a string");
+		
+		for (let i = slothletIndex + 1; i < files.length; i++) {
+			const file = files[i];
 
-	
-	const primaryBase = pickPrimaryBaseFile() ?? pickFallbackBaseFile();
-	const primary = makePrimary(primaryBase, rel);
-	if (exists(primary)) return primary;
+			
+			if (file.startsWith?.("node:")) continue;
 
-	const fbBase = pickFallbackBaseFile();
-	return makeFallback(fbBase, rel);
-}
+			
+			if (this.#isSlothletInternal(file)) continue;
 
+			
+			return file;
+		}
 
+		
+		
+		
+		
+		
+		
+		for (const file of files) {
+			if (!this.#isSlothletInternal(file)) {
+				return file;
+			}
+		}
 
+		
+		
+		
+		
+		return null;
+	}
 
-export function resolvePathFromCaller(rel) {
 	
-	if (rel.startsWith?.("file://")) return fileURLToPath(rel);
-	if (path.isAbsolute(rel)) return rel;
+	resolvePathFromCaller(rel) {
+		
+		if (rel.startsWith?.("file://")) return fileURLToPath(rel);
+		if (path.isAbsolute(rel)) return rel;
 
-	return resolveWith(
-		rel,
 		
-		(baseFile, r) => path.resolve(path.dirname(baseFile), r),
+		const callerFile = this.#findCallerBase();
+
 		
-		(candidate) => fs.existsSync(candidate),
 		
-		(baseFile, r) => path.resolve(path.dirname(baseFile), r)
-	);
-}
+		
+		
+		if (!callerFile) {
+			
+			return path.resolve(process.cwd(), rel);
+		}
 
+		
+		const callerDir = path.dirname(callerFile);
+		const resolved = path.resolve(callerDir, rel);
 
-export function resolveUrlFromCaller(rel) {
-	
-	if (rel.startsWith?.("file://")) return rel;
-	if (path.isAbsolute(rel)) return pathToFileURL(rel).href;
+		
+		if (fs.existsSync(resolved)) {
+			return resolved;
+		}
 
-	return resolveWith(
-		rel,
 		
-		(baseFile, r) => new URL(r, pathToFileURL(baseFile)).href,
+		const cwdResolved = path.resolve(process.cwd(), rel);
+		if (fs.existsSync(cwdResolved)) {
+			return cwdResolved;
+		}
+
 		
-		(href) => fs.existsSync(fileURLToPath(href)),
 		
-		(baseFile, r) => new URL(r, pathToFileURL(baseFile)).href
-	);
+		return resolved;
+	}
 }
-
-