@maravilla-labs/adapter-sveltekit 0.1.13 → 0.1.15

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,eAAe,CAAC;AAEtD,UAAU,cAAc;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAgCD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAoOrE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,eAAe,CAAC;AAEtD,UAAU,cAAc;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAmCD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CA+PrE"}

package/dist/index.js

@@ -21,8 +21,10 @@ async function loadFunctionsAPI() {
         integrateWithManifest: async () => { },
     };
 }
-// Inline worker template to avoid requiring separate worker.js file at runtime
-const INLINE_WORKER_TEMPLATE = `// Maravilla Runtime Worker for SvelteKit\n// This runs inside the Deno isolate with access to platform APIs\n\nimport { Server } from '__SERVER__';\nimport { manifest, prerendered, base } from '__MANIFEST__';\n\n// Initialize the SvelteKit server\nconst server = new Server(manifest);\n\n// Initialize server with platform-specific read function\nconst initialized = server.init({\n  env: globalThis.platform?.env || {},\n  read: async (file) => {\n    // For now, return empty stream for any file read attempts\n    // This is a placeholder until we implement proper static file serving\n    console.log('Read function called for file:', file);\n    \n    // Return an empty ReadableStream to prevent errors\n    return new ReadableStream({\n      start(controller) {\n        // Just close the stream immediately\n        controller.close();\n      }\n    });\n  }\n});\n\n/**\n * Main request handler for the Maravilla runtime\n * This function is called by the runtime for each incoming request\n */\nasync function handleRequest(request) {\n  // Ensure server is initialized\n  await initialized;\n\n  // Convert the incoming request object to a standard Request\n  const url = new URL(request.url, 'http://localhost');\n  \n  // Prepare the body - handle different types\n  let requestBody = undefined;\n  if (request.body !== null && request.body !== undefined) {\n    // If body is already a string, use it directly\n    if (typeof request.body === 'string') {\n      requestBody = request.body;\n    } else {\n      // Otherwise stringify it\n      requestBody = JSON.stringify(request.body);\n    }\n  }\n  \n  // Create a standard Request object\n  const webRequest = new Request(url.toString(), {\n    method: request.method,\n    headers: request.headers || {},\n    body: requestBody\n  });\n\n  // Check if this is a static asset request\n  const pathname = url.pathname;\n  const stripped_pathname = pathname.replace(/\\\/$/, '');\n\n  // Debug: verify URL.pathname setter works for data requests\n  if (pathname.endsWith('/__data.json') || pathname.endsWith('.html__data.json')) {\n    try {\n      const test = new URL(url.toString());\n      const before = test.pathname;\n      const candidate = pathname.endsWith('/__data.json')\n        ? pathname.slice(0, -'/__data.json'.length)\n        : pathname.slice(0, -'.html__data.json'.length) + '.html';\n      test.pathname = candidate;\n      console.log('Data URL normalization test', { before, candidate, after: test.pathname, href: test.href });\n    } catch (e) {\n      console.error('Data URL normalization error', e);\n    }\n  }\n  \n  // Check if path is prerendered\n  if (prerendered.has(pathname)) {\n    // For prerendered pages, we could serve from static storage\n    // but for now, let SvelteKit handle it\n  }\n\n  // Handle trailing slash redirects for prerendered pages\n  const location = pathname.at(-1) === '/' ? stripped_pathname : pathname + '/';\n  if (location && prerendered.has(location)) {\n    return new Response('', {\n      status: 308,\n      headers: {\n        location: location + url.search\n      }\n    });\n  }\n\n  // Let SvelteKit handle the request\n  try {\n    console.log('SvelteKit server.respond called with:', {\n      url: webRequest.url,\n      method: webRequest.method,\n      hasBody: requestBody !== undefined,\n      platform: {\n        hasEnv: !!globalThis.platform?.env,\n        hasKv: !!globalThis.platform?.kv,\n        hasDb: !!globalThis.platform?.db\n      }\n    });\n    \n    const response = await server.respond(webRequest, {\n      platform: {\n        // Expose Maravilla platform APIs to SvelteKit\n        env: globalThis.platform?.env || {},\n        context: {\n          waitUntil: (promise) => {\n            // In Maravilla, we can queue background work\n            if (globalThis.platform?.queue) {\n              globalThis.platform.queue.send({ type: 'background', promise });\n            }\n          },\n          passThroughOnException: () => {\n            // Not applicable in Maravilla runtime\n          }\n        },\n        // Expose platform services\n        kv: globalThis.platform?.kv,\n        db: globalThis.platform?.db,\n        storage: globalThis.platform?.storage,\n        queue: globalThis.platform?.queue\n      },\n      getClientAddress: () => {\n        // Get client IP from request headers\n        const forwarded = webRequest.headers.get('x-forwarded-for');\n        if (forwarded) {\n          return forwarded.split(',')[0].trim();\n        }\n        return request.headers?.['x-real-ip'] || '127.0.0.1';\n      }\n    });\n\n    // Log response details\n    if (response.status >= 400) {\n      console.error('SvelteKit returned error:', {\n        status: response.status,\n        statusText: response.statusText,\n        url: webRequest.url\n      });\n    }\n\n    // Return the response in a format the runtime expects\n    return response;\n  } catch (error) {\n    console.error('Error in server.respond:', error);\n    console.error('Error stack:', error.stack);\n    throw error;\n  }\n}\n\n// Export for the Maravilla runtime\nglobalThis.handleRequest = handleRequest;`;
+// Import the worker template from separate file for maintainability
+import { WORKER_TEMPLATE } from './worker-template.js';
+// Use the imported template
+const INLINE_WORKER_TEMPLATE = WORKER_TEMPLATE;
 export default function adapter(options = {}) {
     const { out = '.maravilla', precompress = false, envPrefix = 'PUBLIC_', polyfill = true, include = [], exclude = [], external = [] } = options;
     return {
@@ -193,9 +195,39 @@ export default function adapter(options = {}) {
             // Integrate functions into manifest if they exist
             if (functionsManifest) {
                 await integrateWithManifest(`${out}/manifest.json`, functionsManifest);
-                // Merge functions bundle into server bundle for unified execution
-                const { mergeFunctions } = await import('./merge-functions.js'); // emitted from TS source merge-functions.ts
+                const { mergeFunctions } = await import('./merge-functions.js');
                 mergeFunctions(out);
+                try {
+                    const fsMod = await import('node:fs');
+                    const pathMod = await import('node:path');
+                    const mPath = pathMod.join(out, 'manifest.json');
+                    const raw = fsMod.readFileSync(mPath, 'utf8');
+                    const m = JSON.parse(raw);
+                    if (m.functions?.routes) {
+                        // Build a map from path -> route object with name/file
+                        const routeMap = new Map(m.functions.routes.map((r) => [r.path, r]));
+                        if (Array.isArray(m.routing?.functions)) {
+                            m.routing.functions = m.routing.functions.map((r) => {
+                                const full = routeMap.get(r.path) || {};
+                                return { ...r, name: full.name, file: full.file };
+                            });
+                        }
+                        else {
+                            // If missing, synthesize from functions.routes
+                            m.routing.functions = m.functions.routes.map((r) => ({
+                                path: r.path,
+                                name: r.name,
+                                methods: r.methods,
+                                file: r.file,
+                                handler: 'function'
+                            }));
+                        }
+                        fsMod.writeFileSync(mPath, JSON.stringify(m, null, 2));
+                    }
+                }
+                catch (e) {
+                    builder.log.warn('Failed to augment routing.functions with name/file: ' + e?.message);
+                }
             }
             builder.log.minor(`Build complete. Output written to ${out}`);
             builder.log.minor('');

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/merge-functions.js

@@ -1,58 +1,22 @@
 import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { join } from 'path';
 /**
- * Merge functions bundle with server bundle
+ * Keep functions separate from server bundle for proper routing
  */
 export function mergeFunctions(buildDir) {
-    const serverPath = join(buildDir, 'server.js');
     const functionsPath = join(buildDir, 'functions.js');
     const manifestPath = join(buildDir, 'manifest.json');
     if (!existsSync(functionsPath)) {
         console.log('No functions bundle found, skipping merge');
         return;
     }
-    const serverCode = readFileSync(serverPath, 'utf8');
-    const functionsCode = readFileSync(functionsPath, 'utf8');
     const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
-    const mergedCode = `
-// === FUNCTIONS BUNDLE START ===
-${functionsCode}
-
-// === SERVER BUNDLE START ===
-${serverCode}
-
-// === FUNCTION ROUTING INTEGRATION ===
-(function() {
-  const originalHandleRequest = (globalThis as any).handleRequest;
-  (globalThis as any).handleRequest = async function(request: Request) {
-    const url = new URL(request.url);
-    const path = url.pathname;
-    const functionRoutes = ${'${JSON.stringify(manifest.functions?.routes || [])}'};
-    for (const route of functionRoutes) {
-      if (path === route.path || path.startsWith(route.path + '/')) {
-        console.log('[Functions] Handling function request:', path);
-        if (typeof (globalThis as any).handleFunctionRequest === 'function') {
-          try {
-            return await (globalThis as any).handleFunctionRequest(request);
-          } catch (error: any) {
-            console.error('[Functions] Error handling function:', error);
-            return new Response(
-              JSON.stringify({ error: 'Function execution failed', message: error.message }),
-              { status: 500, headers: { 'content-type': 'application/json' } }
-            );
-          }
-        }
-      }
-    }
-    return originalHandleRequest(request);
-  };
-})();
-`;
-    writeFileSync(serverPath, mergedCode);
-    console.log('✅ Functions merged into server bundle');
+    // Mark functions as available but NOT integrated into server bundle
     if (manifest.functions) {
-        manifest.functions.integrated = true;
+        manifest.functions.integrated = false;
+        manifest.functions.available = true;
     }
     writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+    console.log('✅ Functions kept separate from server bundle for proper routing');
 }
 //# sourceMappingURL=merge-functions.js.map

package/dist/merge-functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-functions.js","sourceRoot":"","sources":["../src/merge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhE,MAAM,UAAU,GAAG;;EAEnB,aAAa;;;EAGb,UAAU;;;;;;;;6BAQiB,qDAAqD;;;;;;;;;;;;;;;;;;;;CAoBjF,CAAC;IAEA,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACrD,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;QACvB,QAAQ,CAAC,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;IACvC,CAAC;IACD,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"merge-functions.js","sourceRoot":"","sources":["../src/merge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhE,oEAAoE;IACpE,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;QACvB,QAAQ,CAAC,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;QACtC,QAAQ,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;IACtC,CAAC;IAED,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;AACjF,CAAC"}

package/dist/worker-template.js

@@ -0,0 +1,171 @@
+// This file contains the worker template as a proper TypeScript file for easier editing
+// It will be inlined into index.ts during the build
+export const WORKER_TEMPLATE = `// Maravilla Runtime Worker for SvelteKit
+// This runs inside the Deno isolate with access to platform APIs
+
+import { Server } from '__SERVER__';
+import { manifest, prerendered, base } from '__MANIFEST__';
+
+// Initialize the SvelteKit server
+const server = new Server(manifest);
+
+// Initialize server with platform-specific read function
+const initialized = server.init({
+  env: globalThis.platform?.env || {},
+  read: async (file) => {
+    // For now, return empty stream for any file read attempts
+    // This is a placeholder until we implement proper static file serving
+    console.log('Read function called for file:', file);
+    
+    // Return an empty ReadableStream to prevent errors
+    return new ReadableStream({
+      start(controller) {
+        // Just close the stream immediately
+        controller.close();
+      }
+    });
+  }
+});
+
+/**
+ * Main request handler for the Maravilla runtime
+ * This function is called by the runtime for each incoming request
+ */
+async function handleRequest(request) {
+  // Ensure server is initialized
+  await initialized;
+
+  // Check if request is already a Web API Request object
+  let webRequest;
+  if (request instanceof Request) {
+    // It's already a proper Request object from the runtime
+    console.log('Request is already a Web API Request object');
+    webRequest = request;
+  } else {
+    // It's a plain object, convert it to a Request (fallback for older runtime)
+    console.log('Converting plain object to Request');
+    const url = new URL(request.url, 'http://localhost');
+    
+    // Prepare the body - handle different types
+    let requestBody = undefined;
+    if (request.body !== null && request.body !== undefined) {
+      // If body is already a string, use it directly
+      if (typeof request.body === 'string') {
+        requestBody = request.body;
+      } else {
+        // Otherwise stringify it
+        requestBody = JSON.stringify(request.body);
+      }
+    }
+    
+    // Create a standard Request object
+    webRequest = new Request(url.toString(), {
+      method: request.method,
+      headers: request.headers || {},
+      body: requestBody
+    });
+  }
+
+  // Check if this is a static asset request
+  const pathname = new URL(webRequest.url).pathname;
+  const stripped_pathname = pathname.replace(/\\/$/, '');
+
+  // Debug: verify URL.pathname setter works for data requests
+  if (pathname.endsWith('/__data.json') || pathname.endsWith('.html__data.json')) {
+    try {
+      const test = new URL(webRequest.url);
+      const before = test.pathname;
+      const candidate = pathname.endsWith('/__data.json')
+        ? pathname.slice(0, -'/__data.json'.length)
+        : pathname.slice(0, -'.html__data.json'.length) + '.html';
+      test.pathname = candidate;
+      console.log('Data URL normalization test', { before, candidate, after: test.pathname, href: test.href });
+    } catch (e) {
+      console.error('Data URL normalization error', e);
+    }
+  }
+  
+  // Check if path is prerendered
+  if (prerendered.has(pathname)) {
+    // For prerendered pages, we could serve from static storage
+    // but for now, let SvelteKit handle it
+  }
+
+  // Handle trailing slash redirects for prerendered pages
+  const location = pathname.at(-1) === '/' ? stripped_pathname : pathname + '/';
+  if (location && prerendered.has(location)) {
+    const urlObj = new URL(webRequest.url);
+    return new Response('', {
+      status: 308,
+      headers: {
+        location: location + urlObj.search
+      }
+    });
+  }
+
+  // Let SvelteKit handle the request
+  try {
+    console.log('SvelteKit server.respond called with:', {
+      url: webRequest.url,
+      method: webRequest.method,
+      hasBody: webRequest.body !== null,
+      platform: {
+        hasEnv: !!globalThis.platform?.env,
+        hasKv: !!globalThis.platform?.kv,
+        hasDb: !!globalThis.platform?.db
+      }
+    });
+    
+    const response = await server.respond(webRequest, {
+      platform: {
+        // Expose Maravilla platform APIs to SvelteKit
+        env: globalThis.platform?.env || {},
+        context: {
+          waitUntil: (promise) => {
+            // In Maravilla, we can queue background work
+            if (globalThis.platform?.queue) {
+              globalThis.platform.queue.send({ type: 'background', promise });
+            }
+          },
+          passThroughOnException: () => {
+            // Not applicable in Maravilla runtime
+          }
+        },
+        // Expose platform services
+        kv: globalThis.platform?.kv,
+        db: globalThis.platform?.db,
+        storage: globalThis.platform?.storage,
+        queue: globalThis.platform?.queue
+      },
+      getClientAddress: () => {
+        // Get client IP from request headers
+        const forwarded = webRequest.headers.get('x-forwarded-for');
+        if (forwarded) {
+          return forwarded.split(',')[0].trim();
+        }
+        // Fallback for plain object format (shouldn't happen with proper Request)
+        return request.headers?.['x-real-ip'] || '127.0.0.1';
+      }
+    });
+
+    // Log response details
+    if (response.status >= 400) {
+      console.error('SvelteKit returned error:', {
+        status: response.status,
+        statusText: response.statusText,
+        url: webRequest.url
+      });
+    }
+
+    // Return the response in a format the runtime expects
+    return response;
+  } catch (error) {
+    console.error('Error in server.respond:', error);
+    console.error('Error stack:', error.stack);
+    throw error;
+  }
+}
+
+// Export for the Maravilla runtime
+globalThis.handleRequest = handleRequest;`;
+//# sourceMappingURL=worker-template.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maravilla-labs/adapter-sveltekit",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "SvelteKit adapter for Maravilla Runtime",
   "type": "module",
   "main": "dist/index.js",
@@ -12,7 +12,8 @@
     "dist/index.d.ts.map",
     "dist/merge-functions.js",
     "dist/merge-functions.js.map",
-    "dist/worker.js"
+    "dist/worker.js",
+    "worker-template.js"
   ],
   "scripts": {
     "build": "tsc",
@@ -38,7 +39,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^2.0.0"
+    "@sveltejs/kit": "^2.0.0",
+    "@maravilla-labs/functions": "*"
+  },
+  "peerDependenciesMeta": {
+    "@maravilla-labs/functions": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@sveltejs/kit": "^2.0.0",
@@ -47,7 +54,6 @@
     "vitest": "^1.0.0"
   },
   "dependencies": {
-    "@maravilla-labs/functions": "latest",
     "esbuild": "^0.25.0",
     "set-cookie-parser": "^2.6.0"
   }