lambder 1.0.138 → 1.0.141

package/Readme.md

@@ -435,7 +435,7 @@ lambder.addApi("getCompanyName", async (ctx, res) => {
     return res.die.status404(data, headers); 
     return res.die.cors(); 
     return res.die.fileBase64(fileBase64, mimeType, headers); 
-    return res.die.file(filePath, headers, fallbackFilePath); 
+    return await res.die.file(filePath, headers, fallbackFilePath); 
     return await res.die.ejsFile(filePath, pageData, headers); 
     return await res.die.ejsTemplate(template, pageData, headers); 
     return res.die.api(payload, { versionExpired, sessionExpired, notAuthorized, message, errorMessage }, headers); 

package/dist/LambderMSW.js

@@ -31,7 +31,8 @@ export default class LambderMSW {
         return this.http.post(this.apiPath, async ({ request }) => {
             let body;
             try {
-                body = await request.json();
+                const clonedRequest = request.clone();
+                body = await clonedRequest.json();
             }
             catch (parseErr) {
                 // If JSON parsing fails, return undefined to let other handlers try
@@ -40,15 +41,12 @@ export default class LambderMSW {
             }
             // Check if body is valid and has apiName
             if (!body || typeof body.apiName !== 'string') {
-                // Invalid request format, let other handlers try
                 return;
             }
-            console.log("LambderMSW called for:", body.apiName, "matching against:", apiName);
-            // Check if this is the API we're mocking
             if (body.apiName !== apiName) {
-                // If this handler doesn't match, return undefined to let MSW try other handlers
                 return;
             }
+            console.log("LambderMSW called for:", body.apiName);
             try {
                 // Add artificial delay if specified
                 if (options?.delay) {

package/dist/LambderResolver.js

@@ -16,7 +16,7 @@ export default class LambderResolver extends LambderResponseBuilder {
             status404: this.autoResolve(this.status404),
             cors: this.autoResolve(this.cors),
             fileBase64: this.autoResolve(this.fileBase64),
-            file: this.autoResolve(this.file),
+            file: this.autoResolvePromise(this.file),
             ejsFile: this.autoResolvePromise(this.ejsFile),
             ejsTemplate: this.autoResolvePromise(this.ejsTemplate),
             api: this.autoResolve(this.api),

package/dist/LambderResponseBuilder.d.ts

@@ -44,7 +44,7 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
     status404(data: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
     cors(): LambderResolverResponse;
     fileBase64(fileBase64: string, mimeType: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
-    file(filePath: string, headers?: Record<string, string | string[]>, fallbackFilePath?: string): LambderResolverResponse;
+    file(filePath: string, headers?: Record<string, string | string[]>, fallbackFilePath?: string): Promise<LambderResolverResponse>;
     ejsTemplate(template: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     ejsFile(filePath: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     api<T = any>(payload: T | null, { versionExpired, sessionExpired, notAuthorized, message, errorMessage, logList, }?: LambderApiResponseConfig, headers?: Record<string, string | string[]>): LambderResolverResponse;

package/dist/LambderResponseBuilder.js

@@ -21,9 +21,9 @@ export default class LambderResponseBuilder {
         this.ctx = ctx;
     }
     ;
-    readPublicFileSync(filePath) {
-        const fs = getFS();
-        const path = getPath();
+    async readPublicFileSync(filePath) {
+        const fs = await getFS();
+        const path = await getPath();
         if (!fs || !path) {
             throw new Error("File system operations are not available in browser environment");
         }
@@ -36,9 +36,9 @@ export default class LambderResponseBuilder {
         return fs.readFileSync(absolutePath);
     }
     ;
-    checkPublicFileExist(filePath) {
-        const fs = getFS();
-        const path = getPath();
+    async checkPublicFileExist(filePath) {
+        const fs = await getFS();
+        const path = await getPath();
         if (!fs || !path) {
             return false;
         }
@@ -144,15 +144,17 @@ export default class LambderResponseBuilder {
         });
     }
     ;
-    file(filePath, headers, fallbackFilePath) {
-        if (!this.checkPublicFileExist(filePath)) {
-            if (fallbackFilePath && this.checkPublicFileExist(fallbackFilePath)) {
-                return this.file(fallbackFilePath, headers);
+    async file(filePath, headers, fallbackFilePath) {
+        const doesFileExist = await this.checkPublicFileExist(filePath);
+        if (!doesFileExist && fallbackFilePath) {
+            const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
+            if (doesFallbackExist) {
+                return await this.file(fallbackFilePath, headers);
             }
             return this.json({ error: "File not found: " + filePath });
         }
         const mimeType = mimeTypeResolver.lookup(filePath);
-        const body = this.readPublicFileSync(filePath);
+        const body = await this.readPublicFileSync(filePath);
         if (body === "forbidden-public-path") {
             throw { error: "Forbidden public path: " + filePath };
         }

package/dist/LambderUtils.js

@@ -6,9 +6,9 @@ export default class LambderUtils {
         this.ejsPath = ejsPath;
     }
     ;
-    readEjsFileSync(filePath) {
-        const fs = getFS();
-        const path = getPath();
+    async readEjsFileSync(filePath) {
+        const fs = await getFS();
+        const path = await getPath();
         if (!fs || !path) {
             throw new Error("File system operations are not available in browser environment");
         }
@@ -24,9 +24,9 @@ export default class LambderUtils {
         return String(fs.readFileSync(absolutePath));
     }
     ;
-    checkEjsFileExist(filePath) {
-        const fs = getFS();
-        const path = getPath();
+    async checkEjsFileExist(filePath) {
+        const fs = await getFS();
+        const path = await getPath();
         if (!fs || !path) {
             return false;
         }
@@ -52,10 +52,11 @@ export default class LambderUtils {
     }
     ;
     async renderEjsFile(filePath, pageData) {
-        if (!this.checkEjsFileExist(filePath)) {
+        const doesFileExist = await this.checkEjsFileExist(filePath);
+        if (!doesFileExist) {
             return "File not found: " + filePath;
         }
-        const template = this.readEjsFileSync(filePath);
+        const template = await this.readEjsFileSync(filePath);
         return this.renderEjs(template, pageData);
     }
     ;

package/dist/node-polyfills.d.ts

@@ -1,2 +1,2 @@
-export declare function getFS(): any;
-export declare function getPath(): any;
+export declare function getFS(): Promise<any>;
+export declare function getPath(): Promise<any>;

package/dist/node-polyfills.js

@@ -2,24 +2,29 @@
 // This file provides optional Node.js modules that fail gracefully in browser environments
 let fs = null;
 let path = null;
-// Try to import Node.js modules if available
-try {
-    // @ts-ignore - conditional import
-    if (typeof process !== 'undefined' && process.versions?.node) {
-        // Use eval to prevent bundlers from trying to resolve these at build time
-        const requireFunc = eval('typeof require !== "undefined" ? require : null');
-        if (requireFunc) {
-            fs = requireFunc('fs');
-            path = requireFunc('path');
+export async function getFS() {
+    try {
+        if (fs) {
+            return fs;
         }
+        fs = await import('fs');
+        return fs;
+    }
+    catch (e) {
+        // Silently fail - we're in a browser environment
+        return null;
     }
 }
-catch (e) {
-    // Silently fail - we're in a browser environment
-}
-export function getFS() {
-    return fs;
-}
-export function getPath() {
-    return path;
+export async function getPath() {
+    try {
+        if (path) {
+            return path;
+        }
+        path = await import('path');
+        return path;
+    }
+    catch (e) {
+        // Silently fail - we're in a browser environment
+        return null;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "1.0.138",
+  "version": "1.0.141",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/LambderMSW.ts

@@ -65,7 +65,8 @@ export default class LambderMSW<TContract extends ApiContractShape = any> {
             let body: any;
             
             try {
-                body = await request.json();
+                const clonedRequest = request.clone();
+                body = await clonedRequest.json();
             } catch (parseErr) {
                 // If JSON parsing fails, return undefined to let other handlers try
                 console.warn("LambderMSW: Failed to parse request body as JSON");
@@ -73,18 +74,10 @@ export default class LambderMSW<TContract extends ApiContractShape = any> {
             }
             
             // Check if body is valid and has apiName
-            if (!body || typeof body.apiName !== 'string') {
-                // Invalid request format, let other handlers try
-                return;
-            }
-            
-            console.log("LambderMSW called for:", body.apiName, "matching against:", apiName);
+            if (!body || typeof body.apiName !== 'string') { return; }
+            if (body.apiName !== apiName) { return; }
             
-            // Check if this is the API we're mocking
-            if (body.apiName !== apiName) {
-                // If this handler doesn't match, return undefined to let MSW try other handlers
-                return;
-            }
+            console.log("LambderMSW called for:", body.apiName);
             
             try {
                 // Add artificial delay if specified

package/src/LambderResolver.ts

@@ -57,7 +57,7 @@ export default class LambderResolver<
             status404: this.autoResolve(this.status404),
             cors: this.autoResolve(this.cors),
             fileBase64: this.autoResolve(this.fileBase64),
-            file: this.autoResolve(this.file),
+            file: this.autoResolvePromise(this.file),
             ejsFile: this.autoResolvePromise(this.ejsFile),
             ejsTemplate: this.autoResolvePromise(this.ejsTemplate),
             api: this.autoResolve(this.api),

package/src/LambderResponseBuilder.ts

@@ -61,9 +61,9 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
         this.ctx = ctx;
     };
 
-    private readPublicFileSync(filePath: string){
-        const fs = getFS();
-        const path = getPath();
+    private async readPublicFileSync(filePath: string){
+        const fs = await getFS();
+        const path = await getPath();
         
         if (!fs || !path) {
             throw new Error("File system operations are not available in browser environment");
@@ -76,13 +76,11 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
         return fs.readFileSync(absolutePath);
     };
 
-    private checkPublicFileExist(filePath: string){
-        const fs = getFS();
-        const path = getPath();
+    private async checkPublicFileExist(filePath: string){
+        const fs = await getFS();
+        const path = await getPath();
         
-        if (!fs || !path) {
-            return false;
-        }
+        if (!fs || !path) { return false; }
         
         const publicPath = path.resolve(this.publicPath);
         const absolutePath = path.join(this.publicPath, filePath);
@@ -199,19 +197,21 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
         });
     };
 
-	file(
+	async file(
         filePath: string, 
         headers?: Record<string, string|string[]>,
         fallbackFilePath?: string,
-    ):LambderResolverResponse{
-        if(!this.checkPublicFileExist(filePath)){
-            if(fallbackFilePath && this.checkPublicFileExist(fallbackFilePath)){
-                return this.file(fallbackFilePath, headers);
+    ):Promise<LambderResolverResponse>{
+        const doesFileExist = await this.checkPublicFileExist(filePath);
+        if(!doesFileExist && fallbackFilePath){
+            const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
+            if(doesFallbackExist){
+                return await this.file(fallbackFilePath, headers);
             }
             return this.json({ error: "File not found: " + filePath })
         }
         const mimeType = mimeTypeResolver.lookup(filePath);
-        const body = this.readPublicFileSync(filePath);
+        const body = await this.readPublicFileSync(filePath);
         if (body === "forbidden-public-path") {
             throw { error: "Forbidden public path: " + filePath };
         }

package/src/LambderUtils.ts

@@ -12,9 +12,9 @@ export default class LambderUtils {
         this.ejsPath = ejsPath;
     };
 
-    private readEjsFileSync(filePath: string){
-        const fs = getFS();
-        const path = getPath();
+    private async readEjsFileSync(filePath: string){
+        const fs = await getFS();
+        const path = await getPath();
         
         if (!fs || !path) {
             throw new Error("File system operations are not available in browser environment");
@@ -27,9 +27,9 @@ export default class LambderUtils {
         return String(fs.readFileSync(absolutePath));
     };
 
-    private checkEjsFileExist(filePath: string){
-        const fs = getFS();
-        const path = getPath();
+    private async checkEjsFileExist(filePath: string){
+        const fs = await getFS();
+        const path = await getPath();
         
         if (!fs || !path) {
             return false;
@@ -59,10 +59,11 @@ export default class LambderUtils {
         filePath: string, 
         pageData: Record<string, any>,
     ):Promise<string>{
-        if(!this.checkEjsFileExist(filePath)){
+        const doesFileExist = await this.checkEjsFileExist(filePath);
+        if(!doesFileExist){
             return "File not found: " + filePath;
         }
-        const template = this.readEjsFileSync(filePath);
+        const template = await this.readEjsFileSync(filePath);
         return this.renderEjs(template, pageData);
     };
 

package/src/node-polyfills.ts

@@ -4,25 +4,24 @@
 let fs: any = null;
 let path: any = null;
 
-// Try to import Node.js modules if available
-try {
-    // @ts-ignore - conditional import
-    if (typeof process !== 'undefined' && process.versions?.node) {
-        // Use eval to prevent bundlers from trying to resolve these at build time
-        const requireFunc = eval('typeof require !== "undefined" ? require : null');
-        if (requireFunc) {
-            fs = requireFunc('fs');
-            path = requireFunc('path');
-        }
+export async function getFS(): Promise<any> {
+    try {
+        if(fs){ return fs; }
+        fs = await import('fs');
+        return fs;
+    } catch (e) {
+        // Silently fail - we're in a browser environment
+        return null;
     }
-} catch (e) {
-    // Silently fail - we're in a browser environment
 }
 
-export function getFS() {
-    return fs;
-}
-
-export function getPath() {
-    return path;
+export async function getPath(): Promise<any> {
+    try {
+        if(path){ return path; }
+        path = await import('path');
+        return path;
+    } catch (e) {
+        // Silently fail - we're in a browser environment
+        return null;
+    }
 }