@modern-js/prod-server 1.21.6 → 2.0.0-alpha.0

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

@@ -1,53 +1,47 @@
-export const cacheabelAry = [{
-  requestOpt: {
-    url: '/'
+const cacheabelAry = [
+  {
+    requestOpt: { url: "/" },
+    cacheConfig: {},
+    content: "level0"
   },
-  cacheConfig: {},
-  content: 'level0'
-}, {
-  requestOpt: {
-    url: '/level-one',
-    query: {
-      name: 'modern'
-    }
-  },
-  cacheConfig: {
-    level: 1,
-    includes: {
-      query: ['name']
-    }
-  },
-  content: 'level1'
-}, {
-  requestOpt: {
-    url: '/level-two',
-    headers: {
-      age: '18'
-    }
-  },
-  cacheConfig: {
-    level: 2,
-    includes: {
-      header: ['age']
-    }
-  },
-  content: 'level2'
-}, {
-  requestOpt: {
-    url: '/level-three',
-    query: {
-      name: 'modern'
+  {
+    requestOpt: {
+      url: "/level-one",
+      query: { name: "modern" }
+    },
+    cacheConfig: {
+      level: 1,
+      includes: { query: ["name"] }
     },
-    headers: {
-      age: '18'
-    }
+    content: "level1"
   },
-  cacheConfig: {
-    level: 3,
-    includes: {
-      query: ['name'],
-      header: ['age']
-    }
+  {
+    requestOpt: {
+      url: "/level-two",
+      headers: { age: "18" }
+    },
+    cacheConfig: {
+      level: 2,
+      includes: { header: ["age"] }
+    },
+    content: "level2"
   },
-  content: 'level3'
-}];
+  {
+    requestOpt: {
+      url: "/level-three",
+      query: { name: "modern" },
+      headers: { age: "18" }
+    },
+    cacheConfig: {
+      level: 3,
+      includes: {
+        query: ["name"],
+        header: ["age"]
+      }
+    },
+    content: "level3"
+  }
+];
+export {
+  cacheabelAry
+};

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

@@ -1,35 +1,37 @@
-export const errorConfiguration = [{
-  level: 1
-}, {
-  level: 1,
-  includes: {}
-}, {
-  level: 1,
-  includes: {
-    query: []
+const errorConfiguration = [
+  { level: 1 },
+  {
+    level: 1,
+    includes: {}
+  },
+  {
+    level: 1,
+    includes: { query: [] }
+  },
+  {
+    level: 2,
+    includes: {}
+  },
+  {
+    level: 2,
+    includes: { header: [] }
+  },
+  {
+    level: 3,
+    includes: { header: [] }
+  },
+  {
+    level: 3,
+    includes: { query: [] }
+  },
+  {
+    level: 3,
+    includes: {
+      query: [],
+      header: []
+    }
   }
-}, {
-  level: 2,
-  includes: {}
-}, {
-  level: 2,
-  includes: {
-    header: []
-  }
-}, {
-  level: 3,
-  includes: {
-    header: []
-  }
-}, {
-  level: 3,
-  includes: {
-    query: []
-  }
-}, {
-  level: 3,
-  includes: {
-    query: [],
-    header: []
-  }
-}];
+];
+export {
+  errorConfiguration
+};

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

@@ -1,121 +1,91 @@
-export const matchedCacheableAry = [[{
-  requestOpt: {
-    url: '/level-one',
-    headers: {},
-    query: {
-      name: 'byted'
-    }
-  },
-  cacheConfig: {
-    level: 1,
-    includes: {
-      query: ['name']
+const matchedCacheableAry = [
+  [
+    {
+      requestOpt: {
+        url: "/level-one",
+        headers: {},
+        query: { name: "byted" }
+      },
+      cacheConfig: {
+        level: 1,
+        includes: { query: ["name"] },
+        matches: { query: { name: { weixin: "^byted" } } }
+      },
+      content: "level1"
     },
-    matches: {
-      query: {
-        name: {
-          weixin: '^byted'
-        }
-      }
-    }
-  },
-  content: 'level1'
-}, {
-  url: '/level-one',
-  headers: {},
-  query: {
-    name: 'byted_likely'
-  }
-}, {
-  url: '/level-one',
-  headers: {},
-  query: {
-    name: 'not_byted'
-  }
-}], [{
-  requestOpt: {
-    url: '/level-two',
-    query: {},
-    headers: {
-      age: '17'
-    }
-  },
-  cacheConfig: {
-    level: 2,
-    includes: {
-      header: ['age']
+    {
+      url: "/level-one",
+      headers: {},
+      query: { name: "byted_likely" }
     },
-    matches: {
-      header: {
-        age: {
-          one: '^1'
-        }
-      }
+    {
+      url: "/level-one",
+      headers: {},
+      query: { name: "not_byted" }
     }
-  },
-  content: 'level2'
-}, {
-  url: '/level-two',
-  query: {},
-  headers: {
-    age: '11'
-  }
-}, {
-  url: '/level-two',
-  query: {},
-  headers: {
-    age: '22'
-  }
-}], [{
-  requestOpt: {
-    url: '/level-three',
-    headers: {
-      age: '17'
+  ],
+  [
+    {
+      requestOpt: {
+        url: "/level-two",
+        query: {},
+        headers: { age: "17" }
+      },
+      cacheConfig: {
+        level: 2,
+        includes: { header: ["age"] },
+        matches: { header: { age: { one: "^1" } } }
+      },
+      content: "level2"
     },
-    query: {
-      name: 'byted'
-    }
-  },
-  cacheConfig: {
-    level: 3,
-    includes: {
-      query: ['name'],
-      header: ['age']
+    {
+      url: "/level-two",
+      query: {},
+      headers: { age: "11" }
     },
-    matches: {
-      query: {
-        name: {
-          weixin: '^byted'
-        }
+    {
+      url: "/level-two",
+      query: {},
+      headers: { age: "22" }
+    }
+  ],
+  [
+    {
+      requestOpt: {
+        url: "/level-three",
+        headers: { age: "17" },
+        query: { name: "byted" }
       },
-      header: {
-        age: {
-          one: '^1'
+      cacheConfig: {
+        level: 3,
+        includes: {
+          query: ["name"],
+          header: ["age"]
+        },
+        matches: {
+          query: { name: { weixin: "^byted" } },
+          header: { age: { one: "^1" } }
         }
-      }
+      },
+      content: "level3"
+    },
+    {
+      url: "/level-three",
+      query: { name: "byted_likely" },
+      headers: { age: "19" }
+    },
+    {
+      url: "/level-three",
+      query: { name: "byted_likely" },
+      headers: {}
+    },
+    {
+      url: "/level-three",
+      query: { name: "not_byted" },
+      headers: { age: "19" }
     }
-  },
-  content: 'level3'
-}, {
-  url: '/level-three',
-  query: {
-    name: 'byted_likely'
-  },
-  headers: {
-    age: '19'
-  }
-}, {
-  url: '/level-three',
-  query: {
-    name: 'byted_likely'
-  },
-  headers: {}
-}, {
-  url: '/level-three',
-  query: {
-    name: 'not_byted'
-  },
-  headers: {
-    age: '19'
-  }
-}]];
+  ]
+];
+export {
+  matchedCacheableAry
+};

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

@@ -1,72 +1,115 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { Transform } from "stream";
 import { ERROR_DIGEST } from "../../../constants";
 import { createCache } from "./spr";
 import { namespaceHash, withCoalescedInvoke } from "./util";
-export default ((renderFn, ctx) => {
+var cache_default = (renderFn, ctx) => {
   const sprCache = createCache();
-
-  const doRender = async context => {
-    const cacheContext = _objectSpread({
+  const doRender = (context) => __async(void 0, null, function* () {
+    const cacheContext = __spreadValues({
       entry: context.entryName
     }, context.request);
-
-    const cacheFile = await sprCache.get(cacheContext); // no cache, render sync
-
+    const cacheFile = yield sprCache.get(cacheContext);
+    function afterRender(source, onAfterRender) {
+      return __async(this, null, function* () {
+        if (!source) {
+          return "";
+        }
+        if (typeof source === "string") {
+          yield onAfterRender(source);
+          return source;
+        } else {
+          let htmlForStream = "";
+          const cacheStream = new Transform({
+            write(chunk, _, callback) {
+              htmlForStream += chunk.toString();
+              this.push(chunk);
+              callback();
+            }
+          });
+          cacheStream.on("close", () => onAfterRender(htmlForStream));
+          return source(cacheStream);
+        }
+      });
+    }
+    function saveHtmlIntoCache(html) {
+      return __async(this, null, function* () {
+        const { cacheConfig } = context;
+        if (html && cacheConfig) {
+          yield sprCache.set(cacheContext, html, cacheConfig);
+        }
+      });
+    }
     if (!cacheFile) {
-      const html = await renderFn(context);
-      const {
-        cacheConfig
-      } = context;
-
-      if (html && cacheConfig) {
-        await sprCache.set(cacheContext, html, cacheConfig);
-      }
-
-      return html;
+      const renderResult = yield renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
     }
-
-    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash; // completely expired
-
+    const cacheHash = cacheFile == null ? void 0 : cacheFile.hash;
     if (cacheFile.isGarbage) {
-      const html = await renderFn(context);
-      const {
-        cacheConfig
-      } = context;
-
-      if (html && cacheConfig) {
-        await sprCache.set(cacheContext, html, cacheConfig);
-      }
-
-      return html;
+      const renderResult = yield renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
     } else if (cacheFile.isStale) {
-      // if file is stale, request async
-      const render = withCoalescedInvoke(() => renderFn(context)).bind(null, namespaceHash('render', cacheFile.hash), []);
-      render().then(res => {
+      const render = withCoalescedInvoke(() => renderFn(context)).bind(
+        null,
+        namespaceHash("render", cacheFile.hash),
+        []
+      );
+      render().then((res) => __async(void 0, null, function* () {
         if (res.value && res.isOrigin) {
-          const {
-            cacheConfig
-          } = context;
-
+          const { cacheConfig } = context;
           if (cacheConfig) {
-            sprCache.set(cacheContext, res.value, cacheConfig);
+            afterRender(res.value, (html) => __async(void 0, null, function* () {
+              sprCache.set(cacheContext, html, cacheConfig);
+            }));
           } else {
             sprCache.del(cacheContext, cacheHash);
           }
         }
-      }).catch(e => {
+      })).catch((e) => {
         sprCache.del(cacheContext, cacheHash);
         ctx.error(ERROR_DIGEST.ERENDER, e);
       });
     }
-
-    ctx.res.setHeader('x-modern-spr', '1');
+    ctx.res.setHeader("x-modern-spr", "1");
     return cacheFile.content;
-  };
-
+  });
   return doRender;
-});
+};
+export {
+  cache_default as default
+};

package/dist/js/modern/libs/render/cache/page-caches/index.js

@@ -1,9 +1,32 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 import { LRUCaches } from "./lru";
-export async function createPageCaches(max) {
-  const constructorOptions = {
-    max
-  };
-  const cacheInstance = new LRUCaches(constructorOptions);
-  await cacheInstance.init();
-  return cacheInstance;
-}
+function createPageCaches(max) {
+  return __async(this, null, function* () {
+    const constructorOptions = { max };
+    const cacheInstance = new LRUCaches(constructorOptions);
+    yield cacheInstance.init();
+    return cacheInstance;
+  });
+}
+export {
+  createPageCaches
+};

package/dist/js/modern/libs/render/cache/page-caches/lru.js

@@ -1,39 +1,29 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import LRU from 'lru-cache';
-export class LRUCaches {
+import LRU from "lru-cache";
+class LRUCaches {
   constructor(options) {
-    _defineProperty(this, "caches", void 0);
-
-    _defineProperty(this, "max", void 0);
-
     this.max = options.max;
     this.caches = new LRU(this.max);
   }
-
   init() {
     return Promise.resolve();
   }
-
   keys() {
     return this.caches.keys();
   }
-
   get(key) {
     return Promise.resolve(this.caches.get(key) || null);
   }
-
   peek(key) {
     return this.caches.peek(key) || null;
   }
-
   set(key, cache) {
     this.caches.set(key, cache);
     return Promise.resolve();
   }
-
   del(key) {
     this.caches.del(key);
   }
-
-}
+}
+export {
+  LRUCaches
+};