@lwrjs/server 0.9.0-alpha.8 → 0.9.0

package/build/cjs/common/abstract-internal-app-server.cjs

@@ -34,7 +34,7 @@ var AbstractInternalAppServer = class {
   getInternalRequestKey() {
     return this.internalRequestKey;
   }
-  isMetadataRequest(headers) {
+  isSiteGenerationRequest(headers) {
     const metadataRequestHeader = headers["lwr-metadata-request"];
     return metadataRequestHeader === this.internalRequestKey;
   }

package/build/cjs/common/abstract-request.cjs

@@ -0,0 +1,66 @@
+var __defProp = Object.defineProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+
+// packages/@lwrjs/server/src/common/abstract-request.ts
+__markAsModule(exports);
+__export(exports, {
+  AbstractMiddlewareRequest: () => AbstractMiddlewareRequest
+});
+var AbstractMiddlewareRequest = class {
+  constructor(isSiteGenerationRequest) {
+    this.isSiteGenerationRequest = isSiteGenerationRequest || false;
+  }
+  cookie(key) {
+    const rawCookies = (this.headers.cookie?.split(";") || []).map((c) => c.trim());
+    const rawCookie = rawCookies.find((c) => c.startsWith(`${key}=`));
+    return rawCookie ? decodeURIComponent(rawCookie.replace(`${key}=`, "")) : void 0;
+  }
+  isSiteGeneration() {
+    return this.isSiteGenerationRequest;
+  }
+  hasJsonParam() {
+    return this.query.json !== void 0;
+  }
+  isJsonRequest() {
+    const acceptHeader = this.headers?.accept || "";
+    const hasJsonHeader = acceptHeader.indexOf("application/json") >= 0;
+    return hasJsonHeader || this.query.json !== void 0;
+  }
+  validateJsonRequest() {
+    const hasJsonQueryParam = this.hasJsonParam();
+    const hasAcceptHeader = this.headers?.accept !== void 0;
+    const hasJsonAcceptHeader = hasAcceptHeader && this.headers?.accept?.includes("application/json");
+    return !hasAcceptHeader && !hasJsonQueryParam || hasJsonQueryParam !== hasAcceptHeader || hasJsonQueryParam === hasJsonAcceptHeader;
+  }
+  validateEnvironmentRequest(config) {
+    const targetEnvironment = this.params.environment;
+    const defaultEnvironment = config.environment.default;
+    const supportedEnvironments = config.environment.supported || [];
+    return !targetEnvironment || targetEnvironment === defaultEnvironment || supportedEnvironments?.includes(targetEnvironment);
+  }
+  getRuntimeContext(defaultRuntimeEnvironment) {
+    const {format, apiVersion, compat, locale, environment, bundleSpecifier} = this.params;
+    const debug = this.query.debug !== void 0;
+    const bundle = !!bundleSpecifier;
+    const runtimeEnvironment = {
+      ...defaultRuntimeEnvironment,
+      format: format || defaultRuntimeEnvironment.format,
+      compat: compat || defaultRuntimeEnvironment.compat,
+      debug: debug || defaultRuntimeEnvironment.debug,
+      apiVersion: apiVersion || defaultRuntimeEnvironment.apiVersion,
+      bundle: bundle || defaultRuntimeEnvironment.bundle
+    };
+    const runtimeParams = {
+      locale: locale || this.locale || defaultRuntimeEnvironment.defaultLocale,
+      environment
+    };
+    return {
+      runtimeEnvironment,
+      runtimeParams
+    };
+  }
+};

package/build/cjs/express/express-request.cjs

@@ -1,19 +1,36 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {get: all[name], enumerable: true});
 };
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
 
 // packages/@lwrjs/server/src/express/express-request.ts
 __markAsModule(exports);
 __export(exports, {
   default: () => express_request_default
 });
-var ExpressRequest = class {
-  constructor(expressRequest, isMetadataRequest) {
+var import_abstract_request = __toModule(require("../common/abstract-request.cjs"));
+var ExpressRequest = class extends import_abstract_request.AbstractMiddlewareRequest {
+  constructor(expressRequest, isSiteGenerationRequest) {
+    super(isSiteGenerationRequest);
     this.req = expressRequest;
-    this.isMetadataRequest = isMetadataRequest || false;
   }
   get params() {
     return this.req.params;
@@ -51,42 +68,5 @@ var ExpressRequest = class {
   get(field) {
     return this.req.get(field);
   }
-  cookie(key) {
-    const rawCookies = (this.req.headers.cookie?.split(";") || []).map((c) => c.trim());
-    const rawCookie = rawCookies.find((c) => c.startsWith(`${key}=`));
-    return rawCookie ? decodeURIComponent(rawCookie.replace(`${key}=`, "")) : void 0;
-  }
-  hasJsonParam() {
-    return this.req.query.json !== void 0;
-  }
-  isJsonRequest() {
-    const acceptHeader = this.req.get("Accept") || "";
-    const hasJsonHeader = acceptHeader.indexOf("application/json") >= 0;
-    return hasJsonHeader || this.hasJsonParam();
-  }
-  isSiteGeneration() {
-    return this.isMetadataRequest;
-  }
-  validateJsonRequest() {
-    return !this.hasJsonParam() || this.req.accepts("json") === "json";
-  }
-  getRuntimeContext(defaultRuntimeEnvironment) {
-    const {format, apiVersion, compat, locale, environment, bundleSpecifier} = this.req.params;
-    const {debug} = this.req.query;
-    return {
-      runtimeEnvironment: {
-        ...defaultRuntimeEnvironment,
-        format: format ? format : defaultRuntimeEnvironment.format,
-        compat: compat !== void 0 ? compat : defaultRuntimeEnvironment.compat,
-        debug: debug !== void 0 ? true : defaultRuntimeEnvironment.debug,
-        apiVersion: apiVersion ? apiVersion : defaultRuntimeEnvironment.apiVersion,
-        bundle: bundleSpecifier !== void 0 ? true : false
-      },
-      runtimeParams: {
-        locale: locale ? locale : this.req.locale ? this.req.locale : defaultRuntimeEnvironment.defaultLocale,
-        environment
-      }
-    };
-  }
 };
 var express_request_default = ExpressRequest;

package/build/cjs/express/express-response.cjs

@@ -11,9 +11,9 @@ __export(exports, {
   default: () => express_response_default
 });
 var ExpressResponse = class {
-  constructor(expressResponse, isMetadataRequest) {
+  constructor(expressResponse, isSiteGenerationRequest) {
     this.res = expressResponse;
-    this.isMetadataRequest = isMetadataRequest || false;
+    this.isSiteGenerationRequest = isSiteGenerationRequest || false;
   }
   set(header) {
     this.res.set(header);
@@ -21,8 +21,8 @@ var ExpressResponse = class {
   setHeader(name, value) {
     this.res.setHeader(name, value);
   }
-  setMetadata(meta) {
-    if (this.isMetadataRequest) {
+  setSiteGenerationMetadata(meta) {
+    if (this.isSiteGenerationRequest) {
       this.metadata = meta;
     }
   }
@@ -31,7 +31,7 @@ var ExpressResponse = class {
     return this;
   }
   send(object) {
-    if (this.isMetadataRequest) {
+    if (this.isSiteGenerationRequest) {
       const context = {
         fs: {
           metadata: this.metadata
@@ -46,7 +46,7 @@ var ExpressResponse = class {
     this.res.sendStatus(httpCode);
   }
   stream(stream) {
-    if (this.isMetadataRequest) {
+    if (this.isSiteGenerationRequest) {
       const context = {
         fs: {
           metadata: this.metadata

package/build/cjs/express/express-server.cjs

@@ -55,7 +55,7 @@ var ExpressInternalServer = class extends import_abstract_internal_app_server.de
   }
   use(middleware) {
     this.expressApp.use(async (req, res, next) => {
-      const metadataRequest = this.isMetadataRequest(req.headers);
+      const metadataRequest = this.isSiteGenerationRequest(req.headers);
       const lwrReq = new import_express_request.default(req, metadataRequest);
       const lwrRes = new import_express_response.default(res, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -63,7 +63,7 @@ var ExpressInternalServer = class extends import_abstract_internal_app_server.de
   }
   all(path, middleware) {
     this.expressApp.use(path, async (req, res, next) => {
-      const metadataRequest = this.isMetadataRequest(req.headers);
+      const metadataRequest = this.isSiteGenerationRequest(req.headers);
       const lwrReq = new import_express_request.default(req, metadataRequest);
       const lwrRes = new import_express_response.default(res, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -71,7 +71,7 @@ var ExpressInternalServer = class extends import_abstract_internal_app_server.de
   }
   get(path, middleware) {
     this.expressApp.get(path, async (req, res, next) => {
-      const metadataRequest = this.isMetadataRequest(req.headers);
+      const metadataRequest = this.isSiteGenerationRequest(req.headers);
       const lwrReq = new import_express_request.default(req, metadataRequest);
       const lwrRes = new import_express_response.default(res, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -79,7 +79,7 @@ var ExpressInternalServer = class extends import_abstract_internal_app_server.de
   }
   post(path, middleware) {
     this.expressApp.post(path, async (req, res, next) => {
-      const metadataRequest = this.isMetadataRequest(req.headers);
+      const metadataRequest = this.isSiteGenerationRequest(req.headers);
       const lwrReq = new import_express_request.default(req, metadataRequest);
       const lwrRes = new import_express_response.default(res, metadataRequest);
       await middleware(lwrReq, lwrRes, next);

package/build/cjs/fs/fs-request.cjs

@@ -34,15 +34,9 @@ var FsRequest = class extends import_koa_request.default {
   acceptsLanguages() {
     return [this.ctx.locale];
   }
-  hasJsonParam() {
-    return this.ctx.isJsonRequest;
-  }
   isJsonRequest() {
     return this.ctx.isJsonRequest;
   }
-  validateJsonRequest() {
-    return true;
-  }
   isSiteGeneration() {
     return true;
   }

package/build/cjs/fs/fs-response.cjs

@@ -30,7 +30,7 @@ var FsResponse = class {
   send(body) {
     this.context.fs.body = body;
   }
-  setMetadata(metadata) {
+  setSiteGenerationMetadata(metadata) {
     this.context.fs.metadata = metadata;
   }
   sendStatus(httpCode) {

package/build/cjs/koa/koa-request.cjs

@@ -1,19 +1,36 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {get: all[name], enumerable: true});
 };
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
 
 // packages/@lwrjs/server/src/koa/koa-request.ts
 __markAsModule(exports);
 __export(exports, {
   default: () => koa_request_default
 });
-var KoaRequest = class {
-  constructor(ctx, isMetadataRequest) {
+var import_abstract_request = __toModule(require("../common/abstract-request.cjs"));
+var KoaRequest = class extends import_abstract_request.AbstractMiddlewareRequest {
+  constructor(ctx, isSiteGenerationRequest) {
+    super(isSiteGenerationRequest);
     this.ctx = ctx;
-    this.isMetadataRequest = isMetadataRequest || false;
   }
   get params() {
     return this.ctx.params || {};
@@ -45,9 +62,6 @@ var KoaRequest = class {
   set locale(l) {
     this.ctx.locale = l;
   }
-  isSiteGeneration() {
-    return this.isMetadataRequest;
-  }
   acceptsLanguages() {
     return this.ctx.request.acceptsLanguages();
   }
@@ -57,34 +71,5 @@ var KoaRequest = class {
   cookie(key) {
     return this.ctx.cookies.get(key);
   }
-  hasJsonParam() {
-    return this.ctx.query.json !== void 0;
-  }
-  isJsonRequest() {
-    const acceptHeader = this.ctx.request.get("Accept") || "";
-    const hasJsonHeader = acceptHeader.indexOf("application/json") >= 0;
-    return hasJsonHeader || this.hasJsonParam();
-  }
-  validateJsonRequest() {
-    return !this.hasJsonParam() || this.ctx.request.accepts("json") === "json";
-  }
-  getRuntimeContext(defaultRuntimeEnvironment) {
-    const {format, apiVersion, compat, locale, environment, bundleSpecifier} = this.params;
-    const {debug} = this.ctx.request.query;
-    return {
-      runtimeEnvironment: {
-        ...defaultRuntimeEnvironment,
-        format: format ? format : defaultRuntimeEnvironment.format,
-        compat: compat !== void 0 ? compat : defaultRuntimeEnvironment.compat,
-        debug: debug !== void 0 ? true : defaultRuntimeEnvironment.debug,
-        apiVersion: apiVersion ? apiVersion : defaultRuntimeEnvironment.apiVersion,
-        bundle: bundleSpecifier !== void 0 ? true : false
-      },
-      runtimeParams: {
-        locale: locale ? locale : this.ctx.locale ? this.ctx.locale : defaultRuntimeEnvironment.defaultLocale,
-        environment
-      }
-    };
-  }
 };
 var koa_request_default = KoaRequest;

package/build/cjs/koa/koa-response.cjs

@@ -28,9 +28,9 @@ __export(exports, {
 });
 var import_stream = __toModule(require("stream"));
 var KoaResponse = class {
-  constructor(ctx, isMetadataRequest) {
+  constructor(ctx, isSiteGenerationRequest) {
     this.ctx = ctx;
-    this.isMetadataRequest = isMetadataRequest || false;
+    this.isSiteGenerationRequest = isSiteGenerationRequest || false;
   }
   set(header) {
     this.ctx.response.set(header);
@@ -42,13 +42,13 @@ var KoaResponse = class {
     this.ctx.response.status = status;
     return this;
   }
-  setMetadata(meta) {
-    if (this.isMetadataRequest) {
+  setSiteGenerationMetadata(meta) {
+    if (this.isSiteGenerationRequest) {
       this.metadata = meta;
     }
   }
   send(object) {
-    if (this.isMetadataRequest) {
+    if (this.isSiteGenerationRequest) {
       const context = {
         fs: {
           metadata: this.metadata
@@ -63,7 +63,7 @@ var KoaResponse = class {
     this.ctx.response.status = httpCode;
   }
   stream(stream) {
-    if (this.isMetadataRequest) {
+    if (this.isSiteGenerationRequest) {
       const context = {
         fs: {
           metadata: this.metadata

package/build/cjs/koa/koa-server.cjs

@@ -48,7 +48,7 @@ var KoaInternalServer = class extends import_abstract_internal_app_server.defaul
   }
   use(middleware) {
     this.koaApp.use(async (ctx, next) => {
-      const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+      const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
       const lwrReq = new import_koa_request.default(ctx, metadataRequest);
       const lwrRes = new import_koa_response.default(ctx, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -56,7 +56,7 @@ var KoaInternalServer = class extends import_abstract_internal_app_server.defaul
   }
   all(path, middleware) {
     this.koaRouter.all(path, async (ctx, next) => {
-      const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+      const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
       const lwrReq = new import_koa_request.default(ctx, metadataRequest);
       const lwrRes = new import_koa_response.default(ctx, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -64,7 +64,7 @@ var KoaInternalServer = class extends import_abstract_internal_app_server.defaul
   }
   get(path, middleware) {
     this.koaRouter.get(path, async (ctx, next) => {
-      const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+      const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
       const lwrReq = new import_koa_request.default(ctx, metadataRequest);
       const lwrRes = new import_koa_response.default(ctx, metadataRequest);
       await middleware(lwrReq, lwrRes, next);
@@ -72,7 +72,7 @@ var KoaInternalServer = class extends import_abstract_internal_app_server.defaul
   }
   post(path, middleware) {
     this.koaRouter.post(path, async (ctx, next) => {
-      const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+      const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
       const lwrReq = new import_koa_request.default(ctx, metadataRequest);
       const lwrRes = new import_koa_response.default(ctx, metadataRequest);
       await middleware(lwrReq, lwrRes, next);

package/build/es/common/abstract-internal-app-server.d.ts

@@ -5,6 +5,6 @@ export default abstract class AbstractInternalAppServer {
     internalRequestKey: string;
     constructor();
     getInternalRequestKey(): string;
-    isMetadataRequest(headers: any): boolean;
+    isSiteGenerationRequest(headers: any): boolean;
 }
 //# sourceMappingURL=abstract-internal-app-server.d.ts.map

package/build/es/common/abstract-internal-app-server.js

@@ -10,7 +10,7 @@ export default class AbstractInternalAppServer {
         return this.internalRequestKey;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    isMetadataRequest(headers) {
+    isSiteGenerationRequest(headers) {
         const metadataRequestHeader = headers['lwr-metadata-request'];
         return metadataRequestHeader === this.internalRequestKey;
     }

package/build/es/common/abstract-request.d.ts

@@ -0,0 +1,24 @@
+import { RuntimeContext, RuntimeEnvironment, Headers, MiddlewareRequest, NormalizedLwrGlobalConfig } from '@lwrjs/types';
+export declare abstract class AbstractMiddlewareRequest implements MiddlewareRequest {
+    isSiteGenerationRequest: boolean;
+    constructor(isSiteGenerationRequest?: boolean);
+    abstract originalUrl: string;
+    abstract path: string;
+    abstract body: any;
+    abstract method: string;
+    abstract protocol: string;
+    abstract params: any;
+    abstract query: any;
+    abstract locale: string;
+    abstract headers: Headers;
+    abstract acceptsLanguages(): string[];
+    abstract get(field: string): string | undefined;
+    cookie(key: string): string | undefined;
+    isSiteGeneration(): boolean;
+    hasJsonParam(): boolean;
+    isJsonRequest(): boolean;
+    validateJsonRequest(): boolean;
+    validateEnvironmentRequest(config: NormalizedLwrGlobalConfig): boolean;
+    getRuntimeContext(defaultRuntimeEnvironment: RuntimeEnvironment): RuntimeContext;
+}
+//# sourceMappingURL=abstract-request.d.ts.map

package/build/es/common/abstract-request.js

@@ -0,0 +1,61 @@
+export class AbstractMiddlewareRequest {
+    constructor(isSiteGenerationRequest) {
+        this.isSiteGenerationRequest = isSiteGenerationRequest || false;
+    }
+    cookie(key) {
+        // Does not require the cookie-parser middleware
+        const rawCookies = (this.headers.cookie?.split(';') || []).map((c) => c.trim());
+        const rawCookie = rawCookies.find((c) => c.startsWith(`${key}=`));
+        return rawCookie ? decodeURIComponent(rawCookie.replace(`${key}=`, '')) : undefined;
+    }
+    isSiteGeneration() {
+        return this.isSiteGenerationRequest;
+    }
+    hasJsonParam() {
+        return this.query.json !== undefined;
+    }
+    isJsonRequest() {
+        const acceptHeader = this.headers?.accept || '';
+        const hasJsonHeader = acceptHeader.indexOf('application/json') >= 0;
+        return hasJsonHeader || this.query.json !== undefined;
+    }
+    validateJsonRequest() {
+        const hasJsonQueryParam = this.hasJsonParam();
+        const hasAcceptHeader = this.headers?.accept !== undefined;
+        const hasJsonAcceptHeader = hasAcceptHeader && this.headers?.accept?.includes('application/json');
+        return ((!hasAcceptHeader && !hasJsonQueryParam) ||
+            hasJsonQueryParam !== hasAcceptHeader ||
+            hasJsonQueryParam === hasJsonAcceptHeader);
+    }
+    validateEnvironmentRequest(config) {
+        const targetEnvironment = this.params.environment;
+        const defaultEnvironment = config.environment.default;
+        const supportedEnvironments = config.environment.supported || [];
+        return (!targetEnvironment ||
+            targetEnvironment === defaultEnvironment ||
+            supportedEnvironments?.includes(targetEnvironment));
+    }
+    getRuntimeContext(defaultRuntimeEnvironment) {
+        const { format, apiVersion, compat, locale, environment, bundleSpecifier } = this.params;
+        const debug = this.query.debug !== undefined;
+        const bundle = !!bundleSpecifier;
+        const runtimeEnvironment = {
+            ...defaultRuntimeEnvironment,
+            // override default runtime environment with request parameters
+            format: format || defaultRuntimeEnvironment.format,
+            compat: compat || defaultRuntimeEnvironment.compat,
+            debug: debug || defaultRuntimeEnvironment.debug,
+            apiVersion: apiVersion || defaultRuntimeEnvironment.apiVersion,
+            bundle: bundle || defaultRuntimeEnvironment.bundle,
+        };
+        const runtimeParams = {
+            locale: locale || this.locale || defaultRuntimeEnvironment.defaultLocale,
+            environment,
+        };
+        return {
+            runtimeEnvironment,
+            runtimeParams,
+        };
+    }
+}
+//# sourceMappingURL=abstract-request.js.map

package/build/es/express/express-request.d.ts

@@ -1,9 +1,9 @@
-import { Request } from 'express';
-import { RuntimeContext, RuntimeEnvironment, MiddlewareRequest, Headers } from '@lwrjs/types';
-export default class ExpressRequest implements MiddlewareRequest {
+import type { Request } from 'express';
+import type { Headers } from '@lwrjs/types';
+import { AbstractMiddlewareRequest } from '../common/abstract-request.js';
+export default class ExpressRequest extends AbstractMiddlewareRequest {
     private req;
-    isMetadataRequest: boolean;
-    constructor(expressRequest: Request, isMetadataRequest?: boolean);
+    constructor(expressRequest: Request, isSiteGenerationRequest?: boolean);
     get params(): any;
     get originalUrl(): string;
     get path(): string;
@@ -16,11 +16,5 @@ export default class ExpressRequest implements MiddlewareRequest {
     set locale(l: string);
     acceptsLanguages(): string[];
     get(field: string): string | undefined;
-    cookie(key: string): string | undefined;
-    hasJsonParam(): boolean;
-    isJsonRequest(): boolean;
-    isSiteGeneration(): boolean;
-    validateJsonRequest(): boolean;
-    getRuntimeContext(defaultRuntimeEnvironment: RuntimeEnvironment): RuntimeContext;
 }
 //# sourceMappingURL=express-request.d.ts.map

package/build/es/express/express-request.js

@@ -1,7 +1,8 @@
-export default class ExpressRequest {
-    constructor(expressRequest, isMetadataRequest) {
+import { AbstractMiddlewareRequest } from '../common/abstract-request.js';
+export default class ExpressRequest extends AbstractMiddlewareRequest {
+    constructor(expressRequest, isSiteGenerationRequest) {
+        super(isSiteGenerationRequest);
         this.req = expressRequest;
-        this.isMetadataRequest = isMetadataRequest || false;
     }
     get params() {
         return this.req.params;
@@ -40,47 +41,5 @@ export default class ExpressRequest {
     get(field) {
         return this.req.get(field);
     }
-    cookie(key) {
-        // Does not require the cookie-parser middleware
-        const rawCookies = (this.req.headers.cookie?.split(';') || []).map((c) => c.trim());
-        const rawCookie = rawCookies.find((c) => c.startsWith(`${key}=`));
-        return rawCookie ? decodeURIComponent(rawCookie.replace(`${key}=`, '')) : undefined;
-    }
-    hasJsonParam() {
-        return this.req.query.json !== undefined;
-    }
-    isJsonRequest() {
-        const acceptHeader = this.req.get('Accept') || '';
-        const hasJsonHeader = acceptHeader.indexOf('application/json') >= 0;
-        return hasJsonHeader || this.hasJsonParam();
-    }
-    isSiteGeneration() {
-        return this.isMetadataRequest;
-    }
-    validateJsonRequest() {
-        return !this.hasJsonParam() || this.req.accepts('json') === 'json';
-    }
-    getRuntimeContext(defaultRuntimeEnvironment) {
-        const { format, apiVersion, compat, locale, environment, bundleSpecifier } = this.req.params;
-        const { debug } = this.req.query;
-        return {
-            runtimeEnvironment: {
-                ...defaultRuntimeEnvironment,
-                format: format ? format : defaultRuntimeEnvironment.format,
-                compat: compat !== undefined ? compat : defaultRuntimeEnvironment.compat,
-                debug: debug !== undefined ? true : defaultRuntimeEnvironment.debug,
-                apiVersion: apiVersion ? apiVersion : defaultRuntimeEnvironment.apiVersion,
-                bundle: bundleSpecifier !== undefined ? true : false, // the absence of a bundle strategy means bundling is off
-            },
-            runtimeParams: {
-                locale: locale
-                    ? locale
-                    : this.req.locale
-                        ? this.req.locale
-                        : defaultRuntimeEnvironment.defaultLocale,
-                environment,
-            },
-        };
-    }
 }
 //# sourceMappingURL=express-request.js.map

package/build/es/express/express-response.d.ts

@@ -5,11 +5,11 @@ import { MiddlewareResponse } from '@lwrjs/types';
 export default class ExpressResponse implements MiddlewareResponse {
     private res;
     private metadata;
-    private isMetadataRequest;
-    constructor(expressResponse: Response, isMetadataRequest?: boolean);
+    private isSiteGenerationRequest;
+    constructor(expressResponse: Response, isSiteGenerationRequest?: boolean);
     set(header: any): void;
     setHeader(name: string, value: string | string[]): void;
-    setMetadata(meta: any): void;
+    setSiteGenerationMetadata(meta: any): void;
     status(status: number): MiddlewareResponse;
     send(object: any): void;
     sendStatus(httpCode: number): void;

package/build/es/express/express-response.js

@@ -1,7 +1,7 @@
 export default class ExpressResponse {
-    constructor(expressResponse, isMetadataRequest) {
+    constructor(expressResponse, isSiteGenerationRequest) {
         this.res = expressResponse;
-        this.isMetadataRequest = isMetadataRequest || false;
+        this.isSiteGenerationRequest = isSiteGenerationRequest || false;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     set(header) {
@@ -11,8 +11,8 @@ export default class ExpressResponse {
         this.res.setHeader(name, value);
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    setMetadata(meta) {
-        if (this.isMetadataRequest) {
+    setSiteGenerationMetadata(meta) {
+        if (this.isSiteGenerationRequest) {
             this.metadata = meta;
         }
     }
@@ -22,7 +22,7 @@ export default class ExpressResponse {
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     send(object) {
-        if (this.isMetadataRequest) {
+        if (this.isSiteGenerationRequest) {
             const context = {
                 fs: {
                     metadata: this.metadata,
@@ -38,7 +38,7 @@ export default class ExpressResponse {
         this.res.sendStatus(httpCode);
     }
     stream(stream) {
-        if (this.isMetadataRequest) {
+        if (this.isSiteGenerationRequest) {
             const context = {
                 fs: {
                     metadata: this.metadata,

package/build/es/express/express-server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Application as ExpressApp } from 'express';
 import http from 'http';
-import { InternalAppServer, InternalAppServerOptions } from '@lwrjs/types';
+import { InternalAppServer, InternalAppServerOptions, MiddlewareFunction } from '@lwrjs/types';
 import AbstractInternalAppServer from '../common/abstract-internal-app-server.js';
 /**
  * Express Server Implementation (https://expressjs.com/)
@@ -13,10 +13,10 @@ export default class ExpressInternalServer extends AbstractInternalAppServer imp
     constructor(options: InternalAppServerOptions);
     getImpl(): ExpressApp;
     createHttpServer(): http.Server;
-    use(middleware: Function): void;
-    all(path: string | Array<string>, middleware: Function): void;
-    get(path: string | Array<string>, middleware: Function): void;
-    post(path: string | Array<string>, middleware: Function): void;
+    use(middleware: MiddlewareFunction): void;
+    all(path: string | Array<string>, middleware: MiddlewareFunction): void;
+    get(path: string | Array<string>, middleware: MiddlewareFunction): void;
+    post(path: string | Array<string>, middleware: MiddlewareFunction): void;
     useCompression(): void;
     getRegexWildcard(): string;
     initRoutes(): void;

package/build/es/express/express-server.js

@@ -31,7 +31,7 @@ export default class ExpressInternalServer extends AbstractInternalAppServer {
     }
     use(middleware) {
         this.expressApp.use(async (req, res, next) => {
-            const metadataRequest = this.isMetadataRequest(req.headers);
+            const metadataRequest = this.isSiteGenerationRequest(req.headers);
             const lwrReq = new ExpressRequest(req, metadataRequest);
             const lwrRes = new ExpressResponse(res, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -39,7 +39,7 @@ export default class ExpressInternalServer extends AbstractInternalAppServer {
     }
     all(path, middleware) {
         this.expressApp.use(path, async (req, res, next) => {
-            const metadataRequest = this.isMetadataRequest(req.headers);
+            const metadataRequest = this.isSiteGenerationRequest(req.headers);
             const lwrReq = new ExpressRequest(req, metadataRequest);
             const lwrRes = new ExpressResponse(res, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -47,7 +47,7 @@ export default class ExpressInternalServer extends AbstractInternalAppServer {
     }
     get(path, middleware) {
         this.expressApp.get(path, async (req, res, next) => {
-            const metadataRequest = this.isMetadataRequest(req.headers);
+            const metadataRequest = this.isSiteGenerationRequest(req.headers);
             const lwrReq = new ExpressRequest(req, metadataRequest);
             const lwrRes = new ExpressResponse(res, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -55,7 +55,7 @@ export default class ExpressInternalServer extends AbstractInternalAppServer {
     }
     post(path, middleware) {
         this.expressApp.post(path, async (req, res, next) => {
-            const metadataRequest = this.isMetadataRequest(req.headers);
+            const metadataRequest = this.isSiteGenerationRequest(req.headers);
             const lwrReq = new ExpressRequest(req, metadataRequest);
             const lwrRes = new ExpressResponse(res, metadataRequest);
             await middleware(lwrReq, lwrRes, next);

package/build/es/fs/fs-request.d.ts

@@ -2,9 +2,7 @@ import KoaRequest from '../koa/koa-request.js';
 export default class FsRequest extends KoaRequest {
     get query(): any;
     acceptsLanguages(): string[];
-    hasJsonParam(): boolean;
     isJsonRequest(): boolean;
-    validateJsonRequest(): boolean;
     isSiteGeneration(): boolean;
 }
 //# sourceMappingURL=fs-request.d.ts.map

package/build/es/fs/fs-request.js

@@ -6,15 +6,9 @@ export default class FsRequest extends KoaRequest {
     acceptsLanguages() {
         return [this.ctx.locale];
     }
-    hasJsonParam() {
-        return this.ctx.isJsonRequest;
-    }
     isJsonRequest() {
         return this.ctx.isJsonRequest;
     }
-    validateJsonRequest() {
-        return true;
-    }
     isSiteGeneration() {
         return true;
     }

package/build/es/fs/fs-response.d.ts

@@ -10,7 +10,7 @@ export default class FsResponse implements MiddlewareResponse {
     setHeader(name: string, value: string | string[]): void;
     status(status: number): MiddlewareResponse;
     send(body: any): void;
-    setMetadata(metadata: any): void;
+    setSiteGenerationMetadata(metadata: any): void;
     sendStatus(httpCode: number): void;
     stream(stream: Readable): void;
     type(type: string): MiddlewareResponse;

package/build/es/fs/fs-response.js

@@ -20,7 +20,7 @@ export default class FsResponse {
         this.context.fs.body = body;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    setMetadata(metadata) {
+    setSiteGenerationMetadata(metadata) {
         this.context.fs.metadata = metadata;
     }
     sendStatus(httpCode) {

package/build/es/koa/koa-request.d.ts

@@ -1,9 +1,9 @@
-import Koa from 'koa';
-import { RuntimeContext, RuntimeEnvironment, MiddlewareRequest, Headers } from '@lwrjs/types';
-export default class KoaRequest implements MiddlewareRequest {
+import type Koa from 'koa';
+import type { Headers } from '@lwrjs/types';
+import { AbstractMiddlewareRequest } from '../common/abstract-request.js';
+export default class KoaRequest extends AbstractMiddlewareRequest {
     protected ctx: Koa.Context;
-    isMetadataRequest: boolean;
-    constructor(ctx: Koa.Context, isMetadataRequest?: boolean);
+    constructor(ctx: Koa.Context, isSiteGenerationRequest?: boolean);
     get params(): any;
     get originalUrl(): string;
     get path(): string;
@@ -14,13 +14,8 @@ export default class KoaRequest implements MiddlewareRequest {
     get headers(): Headers;
     get locale(): string;
     set locale(l: string);
-    isSiteGeneration(): boolean;
     acceptsLanguages(): string[];
     get(field: string): string | undefined;
     cookie(key: string): string | undefined;
-    hasJsonParam(): boolean;
-    isJsonRequest(): boolean;
-    validateJsonRequest(): boolean;
-    getRuntimeContext(defaultRuntimeEnvironment: RuntimeEnvironment): RuntimeContext;
 }
 //# sourceMappingURL=koa-request.d.ts.map

package/build/es/koa/koa-request.js

@@ -1,7 +1,8 @@
-export default class KoaRequest {
-    constructor(ctx, isMetadataRequest) {
+import { AbstractMiddlewareRequest } from '../common/abstract-request.js';
+export default class KoaRequest extends AbstractMiddlewareRequest {
+    constructor(ctx, isSiteGenerationRequest) {
+        super(isSiteGenerationRequest);
         this.ctx = ctx;
-        this.isMetadataRequest = isMetadataRequest || false;
     }
     get params() {
         return this.ctx.params || {};
@@ -33,9 +34,6 @@ export default class KoaRequest {
     set locale(l) {
         this.ctx.locale = l;
     }
-    isSiteGeneration() {
-        return this.isMetadataRequest;
-    }
     acceptsLanguages() {
         return this.ctx.request.acceptsLanguages();
     }
@@ -45,38 +43,5 @@ export default class KoaRequest {
     cookie(key) {
         return this.ctx.cookies.get(key);
     }
-    hasJsonParam() {
-        return this.ctx.query.json !== undefined;
-    }
-    isJsonRequest() {
-        const acceptHeader = this.ctx.request.get('Accept') || '';
-        const hasJsonHeader = acceptHeader.indexOf('application/json') >= 0;
-        return hasJsonHeader || this.hasJsonParam();
-    }
-    validateJsonRequest() {
-        return !this.hasJsonParam() || this.ctx.request.accepts('json') === 'json';
-    }
-    getRuntimeContext(defaultRuntimeEnvironment) {
-        const { format, apiVersion, compat, locale, environment, bundleSpecifier } = this.params;
-        const { debug } = this.ctx.request.query;
-        return {
-            runtimeEnvironment: {
-                ...defaultRuntimeEnvironment,
-                format: format ? format : defaultRuntimeEnvironment.format,
-                compat: compat !== undefined ? compat : defaultRuntimeEnvironment.compat,
-                debug: debug !== undefined ? true : defaultRuntimeEnvironment.debug,
-                apiVersion: apiVersion ? apiVersion : defaultRuntimeEnvironment.apiVersion,
-                bundle: bundleSpecifier !== undefined ? true : false, // the absence of a bundle strategy means bundling is off
-            },
-            runtimeParams: {
-                locale: locale
-                    ? locale
-                    : this.ctx.locale
-                        ? this.ctx.locale
-                        : defaultRuntimeEnvironment.defaultLocale,
-                environment,
-            },
-        };
-    }
 }
 //# sourceMappingURL=koa-request.js.map

package/build/es/koa/koa-response.d.ts

@@ -5,12 +5,12 @@ import { MiddlewareResponse } from '@lwrjs/types';
 export default class KoaResponse implements MiddlewareResponse {
     protected ctx: Koa.Context;
     private metadata;
-    private isMetadataRequest;
-    constructor(ctx: Koa.Context, isMetadataRequest?: boolean);
+    private isSiteGenerationRequest;
+    constructor(ctx: Koa.Context, isSiteGenerationRequest?: boolean);
     set(header: any): void;
     setHeader(name: string, value: string | string[]): void;
     status(status: number): MiddlewareResponse;
-    setMetadata(meta: any): void;
+    setSiteGenerationMetadata(meta: any): void;
     send(object: any): void;
     sendStatus(httpCode: number): void;
     stream(stream: Readable): void;

package/build/es/koa/koa-response.js

@@ -1,8 +1,8 @@
 import { PassThrough } from 'stream';
 export default class KoaResponse {
-    constructor(ctx, isMetadataRequest) {
+    constructor(ctx, isSiteGenerationRequest) {
         this.ctx = ctx;
-        this.isMetadataRequest = isMetadataRequest || false;
+        this.isSiteGenerationRequest = isSiteGenerationRequest || false;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     set(header) {
@@ -16,14 +16,14 @@ export default class KoaResponse {
         return this;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    setMetadata(meta) {
-        if (this.isMetadataRequest) {
+    setSiteGenerationMetadata(meta) {
+        if (this.isSiteGenerationRequest) {
             this.metadata = meta;
         }
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     send(object) {
-        if (this.isMetadataRequest) {
+        if (this.isSiteGenerationRequest) {
             const context = {
                 fs: {
                     metadata: this.metadata,
@@ -39,7 +39,7 @@ export default class KoaResponse {
         this.ctx.response.status = httpCode;
     }
     stream(stream) {
-        if (this.isMetadataRequest) {
+        if (this.isSiteGenerationRequest) {
             const context = {
                 fs: {
                     metadata: this.metadata,

package/build/es/koa/koa-server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import Koa from 'koa';
 import http from 'http';
-import { InternalAppServer, InternalAppServerOptions } from '@lwrjs/types';
+import { InternalAppServer, InternalAppServerOptions, MiddlewareFunction } from '@lwrjs/types';
 import AbstractInternalAppServer from '../common/abstract-internal-app-server.js';
 /**
  * Koa Server Implementation (https://koajs.com/)
@@ -13,10 +13,10 @@ export default class KoaInternalServer extends AbstractInternalAppServer impleme
     constructor(options: InternalAppServerOptions);
     getImpl(): Koa;
     createHttpServer(): http.Server;
-    use(middleware: Function): void;
-    all(path: string | string[], middleware: Function): void;
-    get(path: string | string[], middleware: Function): void;
-    post(path: string | string[], middleware: Function): void;
+    use(middleware: MiddlewareFunction): void;
+    all(path: string | string[], middleware: MiddlewareFunction): void;
+    get(path: string | string[], middleware: MiddlewareFunction): void;
+    post(path: string | string[], middleware: MiddlewareFunction): void;
     useCompression(): void;
     getRegexWildcard(): string;
     initRoutes(): void;

package/build/es/koa/koa-server.js

@@ -23,7 +23,7 @@ export default class KoaInternalServer extends AbstractInternalAppServer {
     }
     use(middleware) {
         this.koaApp.use(async (ctx, next) => {
-            const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+            const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
             const lwrReq = new KoaRequest(ctx, metadataRequest);
             const lwrRes = new KoaResponse(ctx, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -31,7 +31,7 @@ export default class KoaInternalServer extends AbstractInternalAppServer {
     }
     all(path, middleware) {
         this.koaRouter.all(path, async (ctx, next) => {
-            const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+            const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
             const lwrReq = new KoaRequest(ctx, metadataRequest);
             const lwrRes = new KoaResponse(ctx, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -39,7 +39,7 @@ export default class KoaInternalServer extends AbstractInternalAppServer {
     }
     get(path, middleware) {
         this.koaRouter.get(path, async (ctx, next) => {
-            const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+            const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
             const lwrReq = new KoaRequest(ctx, metadataRequest);
             const lwrRes = new KoaResponse(ctx, metadataRequest);
             await middleware(lwrReq, lwrRes, next);
@@ -47,7 +47,7 @@ export default class KoaInternalServer extends AbstractInternalAppServer {
     }
     post(path, middleware) {
         this.koaRouter.post(path, async (ctx, next) => {
-            const metadataRequest = this.isMetadataRequest(ctx.request.headers);
+            const metadataRequest = this.isSiteGenerationRequest(ctx.request.headers);
             const lwrReq = new KoaRequest(ctx, metadataRequest);
             const lwrRes = new KoaResponse(ctx, metadataRequest);
             await middleware(lwrReq, lwrRes, next);

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.8",
+    "version": "0.9.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/server"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -24,8 +24,8 @@
             "require": "./build/cjs/index.cjs"
         },
         "./express": {
-            "import": "./build/es/src/express/express-server.js",
-            "require": "./build/cjs/src/express/express-server.cjs"
+            "import": "./build/es/express/express-server.js",
+            "require": "./build/cjs/express/express-server.cjs"
         }
     },
     "files": [
@@ -34,28 +34,30 @@
         "build/**/*.d.ts"
     ],
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.8",
+        "@lwrjs/types": "0.9.0",
         "@types/koa-compress": "^4.0.1",
         "@types/koa__router": "^8.0.4",
         "jest-express": "^1.12.0"
     },
     "dependencies": {
         "@koa/router": "^10.0.0",
-        "@lwrjs/shared-utils": "0.9.0-alpha.8",
+        "@lwrjs/shared-utils": "0.9.0",
         "@types/compression": "^1.7.2",
-        "@types/express": "^4.17.13",
+        "@types/express": "^4.17.17",
         "@types/koa": "^2.11.7",
         "compression": "^1.7.4",
-        "express": "^4.17.13",
+        "express": "^4.18.2",
         "koa": "^2.13.1",
         "koa-compose": "^4.1.0",
         "koa-compress": "^5.0.1"
     },
     "optionalDependencies": {
-        "shrink-ray-current": "^4.1.2"
+        "iltorb": "^2.4.5",
+        "node-zopfli-es": "^2.0.1",
+        "shrink-ray-current": "^4.1.3"
     },
     "engines": {
-        "node": ">=14.15.4 <19"
+        "node": ">=16.0.0 <20"
     },
-    "gitHead": "013fcee240ff2e1c23ef304e70fc39d6ef13fb8b"
+    "gitHead": "4e42b0dc5453f92b36b42aa8132c5bc281e616b7"
 }