@modern-js/prod-server 2.14.0 → 2.16.0

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

@@ -1,7 +1,11 @@
-var import_spr = require("../spr");
-var import_error_configuration = require("./error-configuration");
-var import_cacheable = require("./cacheable");
-var import_matched_cache = require("./matched-cache");
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _spr = require("../spr");
+const _errorconfiguration = require("./error-configuration");
+const _cacheable = require("./cacheable");
+const _matchedcache = require("./matched-cache");
 const createCacheConfig = (config = {}) => ({
   excludes: null,
   includes: null,
@@ -15,8 +19,8 @@ const createCacheConfig = (config = {}) => ({
 jest.setTimeout(6e4);
 describe("cache", () => {
   it("should cache correctly", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
@@ -28,12 +32,12 @@ describe("cache", () => {
     await cache.set(context, content, cacheConfig, true);
     const cacheResult = await cache.get(context);
     expect(cacheResult).not.toBe(null);
-    expect(cacheResult == null ? void 0 : cacheResult.content).toBe("hello");
+    expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe("hello");
   });
   it("should ignore cache set when cache config not exist", async () => {
-    (0, import_spr.destroyCache)();
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
@@ -45,10 +49,10 @@ describe("cache", () => {
     expect(shouldCache).toBe(false);
   });
   it("should calcual cache key error", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const content = "hello";
-    for (const config of import_error_configuration.errorConfiguration) {
+    for (const config of _errorconfiguration.errorConfiguration) {
       const cacheConfig = createCacheConfig(config);
       const tmpEntry = Math.random().toString();
       const context = {
@@ -62,8 +66,8 @@ describe("cache", () => {
     }
   });
   it("should get nothing for diff requestKey", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
@@ -73,7 +77,11 @@ describe("cache", () => {
     const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     });
     await cache.set(context, content, cacheConfig, true);
     const context_req = {
@@ -86,8 +94,8 @@ describe("cache", () => {
     expect(cacheResult).toBe(null);
   });
   it("should get nothing for diff cacheHash", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
@@ -97,22 +105,28 @@ describe("cache", () => {
     const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     });
     await cache.set(context, content, cacheConfig, true);
     const context_req = {
       entry: "",
       pathname: "",
-      query: { name: "zll" },
+      query: {
+        name: "zll"
+      },
       headers: {}
     };
     const cacheResult = await cache.get(context_req);
     expect(cacheResult).toBe(null);
   });
   it("should get cache correctly", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
-    for (const cacheable of import_cacheable.cacheabelAry) {
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
+    for (const cacheable of _cacheable.cacheabelAry) {
       const context = {
         entry: "",
         pathname: cacheable.requestOpt.url,
@@ -122,13 +136,13 @@ describe("cache", () => {
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
       await cache.set(context, cacheable.content, cacheConfig, true);
       const cacheResult = await cache.get(context);
-      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(cacheable.content);
+      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
     }
   });
   it("should match cache correctly", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
-    for (const cacheable of import_matched_cache.matchedCacheableAry) {
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
+    for (const cacheable of _matchedcache.matchedCacheableAry) {
       const [baseCacheable, matchOne, ...other] = cacheable;
       const { requestOpt = {}, cacheConfig, content } = baseCacheable;
       const context = {
@@ -145,7 +159,7 @@ describe("cache", () => {
         headers: matchOne.headers
       };
       const cacheResult = await cache.get(matchContext);
-      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(content);
+      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
           entry: "",
@@ -159,31 +173,33 @@ describe("cache", () => {
     }
   });
   it("should stale cache correctly", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
       query: {},
       headers: {}
     };
-    const config = createCacheConfig({ interval: 5 });
+    const config = createCacheConfig({
+      interval: 5
+    });
     const content = "hello";
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult == null ? void 0 : freshResult.isStale).toBe(false);
+    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 6e3);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult == null ? void 0 : staleResult.isStale).toBe(true);
+    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
   });
   it("should garbage cache correctly", async () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
+    (0, _spr.destroyCache)();
+    const cache = (0, _spr.createCache)();
     const context = {
       entry: "",
       pathname: "",
@@ -198,13 +214,13 @@ describe("cache", () => {
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult == null ? void 0 : freshResult.isGarbage).toBe(false);
+    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 1e4);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult == null ? void 0 : staleResult.isGarbage).toBe(true);
+    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
   });
 });

package/dist/cjs/libs/render/cache/__tests__/cacheable.js

@@ -1,70 +1,74 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cacheable_exports = {};
-__export(cacheable_exports, {
-  cacheabelAry: () => cacheabelAry
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "cacheabelAry", {
+  enumerable: true,
+  get: () => cacheabelAry
 });
-module.exports = __toCommonJS(cacheable_exports);
 const cacheabelAry = [
   {
-    requestOpt: { url: "/" },
+    requestOpt: {
+      url: "/"
+    },
     cacheConfig: {},
     content: "level0"
   },
   {
     requestOpt: {
       url: "/level-one",
-      query: { name: "modern" }
+      query: {
+        name: "modern"
+      }
     },
     cacheConfig: {
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     },
     content: "level1"
   },
   {
     requestOpt: {
       url: "/level-two",
-      headers: { age: "18" }
+      headers: {
+        age: "18"
+      }
     },
     cacheConfig: {
       level: 2,
-      includes: { header: ["age"] }
+      includes: {
+        header: [
+          "age"
+        ]
+      }
     },
     content: "level2"
   },
   {
     requestOpt: {
       url: "/level-three",
-      query: { name: "modern" },
-      headers: { age: "18" }
+      query: {
+        name: "modern"
+      },
+      headers: {
+        age: "18"
+      }
     },
     cacheConfig: {
       level: 3,
       includes: {
-        query: ["name"],
-        header: ["age"]
+        query: [
+          "name"
+        ],
+        header: [
+          "age"
+        ]
       }
     },
     content: "level3"
   }
 ];
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  cacheabelAry
-});

package/dist/cjs/libs/render/cache/__tests__/error-configuration.js

@@ -1,34 +1,24 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var error_configuration_exports = {};
-__export(error_configuration_exports, {
-  errorConfiguration: () => errorConfiguration
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "errorConfiguration", {
+  enumerable: true,
+  get: () => errorConfiguration
 });
-module.exports = __toCommonJS(error_configuration_exports);
 const errorConfiguration = [
-  { level: 1 },
+  {
+    level: 1
+  },
   {
     level: 1,
     includes: {}
   },
   {
     level: 1,
-    includes: { query: [] }
+    includes: {
+      query: []
+    }
   },
   {
     level: 2,
@@ -36,15 +26,21 @@ const errorConfiguration = [
   },
   {
     level: 2,
-    includes: { header: [] }
+    includes: {
+      header: []
+    }
   },
   {
     level: 3,
-    includes: { header: [] }
+    includes: {
+      header: []
+    }
   },
   {
     level: 3,
-    includes: { query: [] }
+    includes: {
+      query: []
+    }
   },
   {
     level: 3,
@@ -54,7 +50,3 @@ const errorConfiguration = [
     }
   }
 ];
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  errorConfiguration
-});

package/dist/cjs/libs/render/cache/__tests__/matched-cache.js

@@ -1,49 +1,51 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var matched_cache_exports = {};
-__export(matched_cache_exports, {
-  matchedCacheableAry: () => matchedCacheableAry
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "matchedCacheableAry", {
+  enumerable: true,
+  get: () => matchedCacheableAry
 });
-module.exports = __toCommonJS(matched_cache_exports);
 const matchedCacheableAry = [
   [
     {
       requestOpt: {
         url: "/level-one",
         headers: {},
-        query: { name: "byted" }
+        query: {
+          name: "byted"
+        }
       },
       cacheConfig: {
         level: 1,
-        includes: { query: ["name"] },
-        matches: { query: { name: { weixin: "^byted" } } }
+        includes: {
+          query: [
+            "name"
+          ]
+        },
+        matches: {
+          query: {
+            name: {
+              weixin: "^byted"
+            }
+          }
+        }
       },
       content: "level1"
     },
     {
       url: "/level-one",
       headers: {},
-      query: { name: "byted_likely" }
+      query: {
+        name: "byted_likely"
+      }
     },
     {
       url: "/level-one",
       headers: {},
-      query: { name: "not_byted" }
+      query: {
+        name: "not_byted"
+      }
     }
   ],
   [
@@ -51,64 +53,102 @@ const matchedCacheableAry = [
       requestOpt: {
         url: "/level-two",
         query: {},
-        headers: { age: "17" }
+        headers: {
+          age: "17"
+        }
       },
       cacheConfig: {
         level: 2,
-        includes: { header: ["age"] },
-        matches: { header: { age: { one: "^1" } } }
+        includes: {
+          header: [
+            "age"
+          ]
+        },
+        matches: {
+          header: {
+            age: {
+              one: "^1"
+            }
+          }
+        }
       },
       content: "level2"
     },
     {
       url: "/level-two",
       query: {},
-      headers: { age: "11" }
+      headers: {
+        age: "11"
+      }
     },
     {
       url: "/level-two",
       query: {},
-      headers: { age: "22" }
+      headers: {
+        age: "22"
+      }
     }
   ],
   [
     {
       requestOpt: {
         url: "/level-three",
-        headers: { age: "17" },
-        query: { name: "byted" }
+        headers: {
+          age: "17"
+        },
+        query: {
+          name: "byted"
+        }
       },
       cacheConfig: {
         level: 3,
         includes: {
-          query: ["name"],
-          header: ["age"]
+          query: [
+            "name"
+          ],
+          header: [
+            "age"
+          ]
         },
         matches: {
-          query: { name: { weixin: "^byted" } },
-          header: { age: { one: "^1" } }
+          query: {
+            name: {
+              weixin: "^byted"
+            }
+          },
+          header: {
+            age: {
+              one: "^1"
+            }
+          }
         }
       },
       content: "level3"
     },
     {
       url: "/level-three",
-      query: { name: "byted_likely" },
-      headers: { age: "19" }
+      query: {
+        name: "byted_likely"
+      },
+      headers: {
+        age: "19"
+      }
     },
     {
       url: "/level-three",
-      query: { name: "byted_likely" },
+      query: {
+        name: "byted_likely"
+      },
       headers: {}
     },
     {
       url: "/level-three",
-      query: { name: "not_byted" },
-      headers: { age: "19" }
+      query: {
+        name: "not_byted"
+      },
+      headers: {
+        age: "19"
+      }
     }
   ]
 ];
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  matchedCacheableAry
-});

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

@@ -1,31 +1,17 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cache_exports = {};
-__export(cache_exports, {
-  default: () => cache_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-module.exports = __toCommonJS(cache_exports);
-var import_stream = require("stream");
-var import_constants = require("../../../constants");
-var import_spr = require("./spr");
-var import_util = require("./util");
-var cache_default = (renderFn, ctx) => {
-  const sprCache = (0, import_spr.createCache)();
+const _stream = require("stream");
+const _constants = require("../../../constants");
+const _spr = require("./spr");
+const _util = require("./util");
+const _default = (renderFn, ctx) => {
+  const sprCache = (0, _spr.createCache)();
   const doRender = async (context) => {
     const cacheContext = {
       entry: context.entryName,
@@ -41,7 +27,7 @@ var cache_default = (renderFn, ctx) => {
         return source;
       } else {
         let htmlForStream = "";
-        const cacheStream = new import_stream.Transform({
+        const cacheStream = new _stream.Transform({
           write(chunk, _, callback) {
             htmlForStream += chunk.toString();
             this.push(chunk);
@@ -62,16 +48,12 @@ var cache_default = (renderFn, ctx) => {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);
     }
-    const cacheHash = cacheFile == null ? void 0 : cacheFile.hash;
+    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
     if (cacheFile.isGarbage) {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);
     } else if (cacheFile.isStale) {
-      const render = (0, import_util.withCoalescedInvoke)(() => renderFn(context)).bind(
-        null,
-        (0, import_util.namespaceHash)("render", cacheFile.hash),
-        []
-      );
+      const render = (0, _util.withCoalescedInvoke)(() => renderFn(context)).bind(null, (0, _util.namespaceHash)("render", cacheFile.hash), []);
       render().then(async (res) => {
         if (res.value && res.isOrigin) {
           const { cacheConfig } = context;
@@ -85,7 +67,7 @@ var cache_default = (renderFn, ctx) => {
         }
       }).catch((e) => {
         sprCache.del(cacheContext, cacheHash);
-        ctx.error(import_constants.ERROR_DIGEST.ERENDER, e);
+        ctx.error(_constants.ERROR_DIGEST.ERENDER, e);
       });
     }
     ctx.res.setHeader("x-modern-spr", "1");
@@ -93,5 +75,3 @@ var cache_default = (renderFn, ctx) => {
   };
   return doRender;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});