@modern-js/prod-server 2.27.0 → 2.29.0

package/dist/cjs/workerServer.js

@@ -23,6 +23,7 @@ const _indexworker = require("./libs/hook-api/index.worker");
 const _logger = require("./libs/logger");
 const _route = require("./libs/route");
 const _metrics = require("./libs/metrics");
+const _reporter = require("./libs/reporter");
 class ReturnResponse {
   /**
   * Iterate a Object
@@ -88,7 +89,7 @@ const createHandler = (manifest) => {
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
   return async (options) => {
-    var _page_serverHooks, _page_serverHooks_afterMatch;
+    var _page_serverHooks_afterMatch, _page_serverHooks, _page;
     const { request, loadableStats, routeManifest } = options;
     const url = new URL(request.url);
     const pageMatch = routeMgr.match(url.pathname);
@@ -101,15 +102,16 @@ const createHandler = (manifest) => {
       level: "warn"
     });
     const metrics = _metrics.metrics;
-    const hookContext = createWorkerHookContext(request.url, logger, metrics);
+    const reporter = _reporter.defaultReporter;
+    const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = (0, _indexworker.createAfterMatchContext)(hookContext, entryName);
-    page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
+    (_page = page) === null || _page === void 0 ? void 0 : (_page_serverHooks = _page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
     if (checkIsSent(hookContext)) {
       return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
     }
     if (page.serverRender) {
       try {
-        var _page_serverHooks1, _page_serverHooks2, _page_serverHooks_afterRender;
+        var _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2;
         const middlewarsHookContext = (0, _indexworker.createMiddlewareContext)(hookContext);
         applyMiddlewares(middlewarsHookContext, (_page_serverHooks1 = page.serverHooks) === null || _page_serverHooks1 === void 0 ? void 0 : _page_serverHooks1.middleware);
         if (checkIsSent(hookContext)) {
@@ -137,9 +139,15 @@ const createHandler = (manifest) => {
           template: page.template,
           entryName: page.entryName,
           logger,
+          reporter: _reporter.defaultReporter,
           metrics,
           // FIXME: pass correctly req & res
           req: request,
+          serverTiming: {
+            addServeTiming() {
+              return this;
+            }
+          },
           res: responseLike
         };
         const body = await page.serverRender(serverRenderContext);
@@ -184,7 +192,7 @@ function createResponse(template) {
     return RESPONSE_NOTFOUND;
   }
 }
-function createWorkerHookContext(url, logger, metrics) {
+function createWorkerHookContext(url, logger, metrics, reporter) {
   const [res, req] = [
     {
       headers: new Headers(),
@@ -198,7 +206,8 @@ function createWorkerHookContext(url, logger, metrics) {
     res,
     req,
     logger,
-    metrics
+    metrics,
+    reporter
   };
 }
 function applyMiddlewares(ctx, middleware) {

package/dist/esm/index.js

@@ -4,6 +4,7 @@ export { ModernServer } from "./server/modernServer";
 export { createProxyHandler } from "./libs/proxy";
 export * from "./type";
 export * from "./constants";
+export { createRenderHandler } from "./libs/render";
 export default function(options) {
   if (options == null) {
     throw new Error("can not start mserver without options");

package/dist/esm/libs/context/context.js

@@ -7,21 +7,27 @@ import qs from "querystring";
 import { Buffer } from "buffer";
 import createEtag from "etag";
 import fresh from "fresh";
+import { cutNameByHyphen } from "@modern-js/utils";
+import { ServerTiming } from "../serverTiming";
+import { defaultReporter } from "../reporter";
 import { headersWithoutCookie } from "../../utils";
 var MOCK_URL_BASE = "https://modernjs.dev/";
 export var ModernServerContext = /* @__PURE__ */ function() {
   "use strict";
   function ModernServerContext2(req, res, options) {
     _class_call_check(this, ModernServerContext2);
+    var _options;
     _define_property(this, "req", void 0);
     _define_property(this, "res", void 0);
     _define_property(this, "params", {});
-    _define_property(this, "serverData", void 0);
+    _define_property(this, "reporter", defaultReporter);
+    _define_property(this, "serverTiming", void 0);
+    _define_property(this, "serverData", {});
     _define_property(this, "options", {});
     this.req = req;
     this.res = res;
     this.options = options || {};
-    this.serverData = {};
+    this.serverTiming = new ServerTiming(res, cutNameByHyphen(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
     this.bind();
   }
   _create_class(ModernServerContext2, [

package/dist/esm/libs/hook-api/index.js

@@ -4,10 +4,11 @@ import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
 import { BaseRequest, BaseResponse } from "./base";
 export var base = function(context) {
-  var res = context.res;
+  var res = context.res, reporter = context.reporter;
   return {
     response: new BaseResponse(res),
     request: new BaseRequest(context),
+    reporter: reporter,
     logger: context.logger,
     metrics: context.metrics
   };

package/dist/esm/libs/hook-api/index.worker.js

@@ -55,7 +55,7 @@ var ServerResponse = /* @__PURE__ */ function() {
   return ServerResponse2;
 }();
 export var base = function(context) {
-  var req = context.req, res = context.res, logger = context.logger, metrics = context.metrics;
+  var req = context.req, res = context.res, logger = context.logger, metrics = context.metrics, reporter = context.reporter;
   var serverResponse = new ServerResponse(res);
   var _ref = new URL(req.url), host = _ref.host, pathname = _ref.pathname, searchParams = _ref.searchParams;
   var headers = {};
@@ -64,6 +64,7 @@ export var base = function(context) {
   });
   return {
     response: new BaseResponse(serverResponse),
+    reporter: reporter,
     request: new BaseRequest({
       url: req.url,
       host: host,

package/dist/esm/libs/render/cache/__tests__/cache.test.js

@@ -21,7 +21,7 @@ var createCacheConfig = function() {
 jest.setTimeout(6e4);
 describe("cache", function() {
   it("should cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, context, content, cacheConfig, cacheResult;
+    var _cacheResult, cache, context, content, cacheConfig, cacheResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -48,7 +48,7 @@ describe("cache", function() {
         case 2:
           cacheResult = _state.sent();
           expect(cacheResult).not.toBe(null);
-          expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe("hello");
+          expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe("hello");
           return [
             2
           ];
@@ -261,7 +261,7 @@ describe("cache", function() {
     });
   }));
   it("should get cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, context, cacheConfig, cacheResult, err;
+    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheResult, context, cacheConfig, cacheResult, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -304,7 +304,7 @@ describe("cache", function() {
           ];
         case 4:
           cacheResult = _state.sent();
-          expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
+          expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(cacheable.content);
           _state.label = 5;
         case 5:
           _iteratorNormalCompletion = true;
@@ -346,7 +346,7 @@ describe("cache", function() {
     });
   }));
   it("should match cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
+    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheResult, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -396,7 +396,7 @@ describe("cache", function() {
           ];
         case 4:
           cacheResult = _state.sent();
-          expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
+          expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(content);
           _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
           _state.label = 5;
         case 5:
@@ -501,7 +501,7 @@ describe("cache", function() {
     });
   }));
   it("should stale cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, context, config, content, shouldCache, freshResult, staleResult;
+    var _freshResult, _staleResult, cache, context, config, content, shouldCache, freshResult, staleResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -530,7 +530,7 @@ describe("cache", function() {
           ];
         case 2:
           freshResult = _state.sent();
-          expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
+          expect((_freshResult = freshResult) === null || _freshResult === void 0 ? void 0 : _freshResult.isStale).toBe(false);
           return [
             4,
             new Promise(function(resolve) {
@@ -547,7 +547,7 @@ describe("cache", function() {
           ];
         case 4:
           staleResult = _state.sent();
-          expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
+          expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isStale).toBe(true);
           return [
             2
           ];
@@ -555,7 +555,7 @@ describe("cache", function() {
     });
   }));
   it("should garbage cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, context, config, content, shouldCache, freshResult, staleResult;
+    var _freshResult, _staleResult, cache, context, config, content, shouldCache, freshResult, staleResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -585,7 +585,7 @@ describe("cache", function() {
           ];
         case 2:
           freshResult = _state.sent();
-          expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
+          expect((_freshResult = freshResult) === null || _freshResult === void 0 ? void 0 : _freshResult.isGarbage).toBe(false);
           return [
             4,
             new Promise(function(resolve) {
@@ -602,7 +602,7 @@ describe("cache", function() {
           ];
         case 4:
           staleResult = _state.sent();
-          expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
+          expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isGarbage).toBe(true);
           return [
             2
           ];

package/dist/esm/libs/render/cache/index.js

@@ -9,7 +9,7 @@ export default function(renderFn, ctx) {
   var sprCache = createCache();
   var doRender = function() {
     var _ref = _async_to_generator(function(context) {
-      var cacheContext, cacheFile, renderResult, cacheHash, renderResult1, render;
+      var _cacheFile, cacheContext, cacheFile, renderResult, cacheHash, renderResult1, render;
       function afterRender(source, onAfterRender) {
         return _afterRender.apply(this, arguments);
       }
@@ -124,7 +124,7 @@ export default function(renderFn, ctx) {
               afterRender(renderResult, saveHtmlIntoCache)
             ];
           case 3:
-            cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
+            cacheHash = (_cacheFile = cacheFile) === null || _cacheFile === void 0 ? void 0 : _cacheFile.hash;
             if (!cacheFile.isGarbage)
               return [
                 3,

package/dist/esm/libs/render/cache/spr.js

@@ -311,11 +311,11 @@ var CacheManager = /* @__PURE__ */ function() {
       value: function del(context, cacheHash) {
         var _this = this;
         return _async_to_generator(function() {
-          var cacheKey, data;
+          var _data, cacheKey, data;
           return _ts_generator(this, function(_state) {
             cacheKey = _this.generateRequestKey(context);
             data = _this.cache.get(cacheKey);
-            data === null || data === void 0 ? void 0 : data.caches.del(cacheHash);
+            (_data = data) === null || _data === void 0 ? void 0 : _data.caches.del(cacheHash);
             return [
               2
             ];

package/dist/esm/libs/render/index.js

@@ -8,10 +8,10 @@ import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
 export var createRenderHandler = function(param) {
-  var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR, nonce = param.nonce, _param_metaName = param.metaName, metaName = _param_metaName === void 0 ? "modern-js" : _param_metaName;
+  var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR, nonce = param.nonce, ssrRender = param.ssrRender, _param_metaName = param.metaName, metaName = _param_metaName === void 0 ? "modern-js" : _param_metaName;
   return function() {
     var _render = _async_to_generator(function(param2) {
-      var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, result1, err;
+      var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, ssrRenderOptions, result1, err;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -67,9 +67,18 @@ export var createRenderHandler = function(param) {
               ,
               7
             ]);
+            ssrRenderOptions = {
+              distDir: distDir,
+              entryName: route.entryName,
+              urlPath: route.urlPath,
+              bundle: route.bundle,
+              template: content.toString(),
+              staticGenerate: staticGenerate,
+              nonce: nonce
+            };
             return [
               4,
-              ssr.render(ctx, {
+              ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx, {
                 distDir: distDir,
                 entryName: route.entryName,
                 urlPath: route.urlPath,

package/dist/esm/libs/render/reader.js

@@ -157,7 +157,7 @@ export var LruReader = /* @__PURE__ */ function() {
 var reader = new LruReader();
 export var readFile = function() {
   var _ref = _async_to_generator(function(filepath) {
-    var file;
+    var _file, file;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -169,7 +169,7 @@ export var readFile = function() {
           file = _state.sent();
           return [
             2,
-            file === null || file === void 0 ? void 0 : file.content
+            (_file = file) === null || _file === void 0 ? void 0 : _file.content
           ];
       }
     });

package/dist/esm/libs/render/ssr.js

@@ -7,7 +7,7 @@ import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
 export var render = function() {
   var _ref = _async_to_generator(function(ctx, renderOptions, runner) {
-    var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, body, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status;
+    var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -17,12 +17,6 @@ export var render = function() {
           loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
           routesManifestUri = path.join(distDir, ROUTE_MANIFEST_FILE);
           routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
-          return [
-            4,
-            getRequestBody(ctx.req)
-          ];
-        case 1:
-          body = _state.sent();
           context = {
             request: {
               baseUrl: urlPath,
@@ -32,7 +26,7 @@ export var render = function() {
               query: ctx.query,
               url: ctx.href,
               headers: ctx.headers,
-              body: body
+              body: ctx.req.body
             },
             response: {
               setHeader: function(key, value) {
@@ -51,6 +45,8 @@ export var render = function() {
             staticGenerate: staticGenerate,
             logger: void 0,
             metrics: void 0,
+            reporter: ctx.reporter,
+            serverTiming: ctx.serverTiming,
             req: ctx.req,
             res: ctx.res,
             enableUnsafeCtx: enableUnsafeCtx,
@@ -63,14 +59,14 @@ export var render = function() {
             4,
             Promise.resolve(require(bundleJS))
           ];
-        case 2:
+        case 1:
           bundleJSContent = _state.sent();
           serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
           return [
             4,
             cache(serverRender, ctx)(context)
           ];
-        case 3:
+        case 2:
           content = _state.sent();
           _context_redirection = context.redirection, url = _context_redirection.url, _context_redirection_status = _context_redirection.status, status = _context_redirection_status === void 0 ? 302 : _context_redirection_status;
           if (url) {
@@ -112,21 +108,3 @@ export var render = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var getRequestBody = function(req) {
-  return new Promise(function(resolve, reject) {
-    if ((req === null || req === void 0 ? void 0 : req.method) && req.method.toLowerCase() !== "get") {
-      var body = "";
-      req.on("data", function(chunk) {
-        body += chunk.toString();
-      });
-      req.on("end", function() {
-        resolve(body);
-      });
-      req.on("error", function(err) {
-        reject(err);
-      });
-    } else {
-      resolve(void 0);
-    }
-  });
-};

package/dist/esm/libs/reporter.js

@@ -0,0 +1,12 @@
+export var defaultReporter = {
+  init: function init() {
+  },
+  reportError: function reportError() {
+  },
+  reportTiming: function reportTiming() {
+  },
+  reportInfo: function reportInfo() {
+  },
+  reportWarn: function reportWarn() {
+  }
+};

package/dist/esm/libs/route/matcher.js

@@ -65,9 +65,9 @@ export var RouteMatcher = /* @__PURE__ */ function() {
           if (!this.urlReg) {
             return this.urlPath.length;
           } else {
-            var _result_;
+            var _result_, _result;
             var result = this.urlReg.exec(pathname);
-            return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
+            return ((_result = result) === null || _result === void 0 ? void 0 : (_result_ = _result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
           }
         }
       )

package/dist/esm/libs/serverTiming.js

@@ -0,0 +1,27 @@
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _create_class } from "@swc/helpers/_/_create_class";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
+var SERVER_TIMING = "Server-Timing";
+export var ServerTiming = /* @__PURE__ */ function() {
+  "use strict";
+  function ServerTiming2(res, meta) {
+    _class_call_check(this, ServerTiming2);
+    _define_property(this, "meta", void 0);
+    _define_property(this, "res", void 0);
+    this.meta = meta;
+    this.res = res;
+  }
+  _create_class(ServerTiming2, [
+    {
+      key: "addServeTiming",
+      value: function addServeTiming(name, dur, desc) {
+        var _name = "bd-".concat(this.meta, "-").concat(name);
+        var serverTiming = this.res.getHeader(SERVER_TIMING) || this.res.getHeader(SERVER_TIMING.toLocaleLowerCase());
+        var value = "".concat(_name, ";").concat(desc ? 'decs="'.concat(desc, '";') : "", " dur=").concat(dur);
+        this.res.setHeader(SERVER_TIMING, serverTiming ? "".concat(serverTiming, ", ").concat(value) : value);
+        return this;
+      }
+    }
+  ]);
+  return ServerTiming2;
+}();

package/dist/esm/renderHtml.js

@@ -11,9 +11,9 @@ import { Readable } from "stream";
 import { Socket } from "net";
 import { Server } from "./server";
 import { isRedirect } from "./utils";
-var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
+var IncomingMessageLike = /* @__PURE__ */ function(Readable1) {
   "use strict";
-  _inherits(IncomingMessageLike2, Readable2);
+  _inherits(IncomingMessageLike2, Readable1);
   var _super = _create_super(IncomingMessageLike2);
   function IncomingMessageLike2(param) {
     var method = param.method, url = param.url, headers = param.headers;
@@ -33,9 +33,9 @@ var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
   }
   return IncomingMessageLike2;
 }(Readable);
-var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
+var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage1) {
   "use strict";
-  _inherits(ServerResponseLike2, OutgoingMessage2);
+  _inherits(ServerResponseLike2, OutgoingMessage1);
   var _super = _create_super(ServerResponseLike2);
   function ServerResponseLike2() {
     _class_call_check(this, ServerResponseLike2);
@@ -60,9 +60,9 @@ var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
   ]);
   return ServerResponseLike2;
 }(OutgoingMessage);
-var CustomServer = /* @__PURE__ */ function(Server2) {
+var CustomServer = /* @__PURE__ */ function(Server1) {
   "use strict";
-  _inherits(CustomServer2, Server2);
+  _inherits(CustomServer2, Server1);
   var _super = _create_super(CustomServer2);
   function CustomServer2() {
     _class_call_check(this, CustomServer2);

package/dist/esm/server/index.js

@@ -210,7 +210,8 @@ export var Server = /* @__PURE__ */ function() {
       key: "listen",
       value: function listen(options, listener) {
         var callback = function() {
-          listener === null || listener === void 0 ? void 0 : listener();
+          var _listener;
+          (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
         };
         if (typeof options === "object") {
           if (process.env.PORT) {
@@ -306,6 +307,7 @@ export var Server = /* @__PURE__ */ function() {
     {
       key: "initAppContext",
       value: function initAppContext() {
+        var _appContext, _appContext1, _appContext2;
         var options = this.options;
         var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
         var serverPlugins = plugins.map(function(p) {
@@ -315,9 +317,9 @@ export var Server = /* @__PURE__ */ function() {
         });
         return {
           appDirectory: appDirectory,
-          apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
-          lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
-          sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
+          apiDirectory: (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory,
+          lambdaDirectory: (_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.lambdaDirectory,
+          sharedDirectory: ((_appContext2 = appContext) === null || _appContext2 === void 0 ? void 0 : _appContext2.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
           distDirectory: path.join(appDirectory, config.output.path || "dist"),
           plugins: serverPlugins
         };