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

package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js

@@ -1,77 +1,115 @@
-"use strict";
-
-var _url = _interopRequireDefault(require("url"));
-
-var _spr = require("../spr");
-
-var _util = require("../util");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-describe('test spr util functions', () => {
-  it('should return value correctly', () => {
-    expect((0, _util.connectFactor)('bar', 'foo')).toBe('bar-foo');
-    expect((0, _util.fname)(1)).toBe('f1');
-    expect((0, _util.namespaceHash)('modern', '!@#$%^&')).toBe('modern/!@#$%^&');
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+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());
+  });
+};
+var import_url = __toESM(require("url"));
+var import_spr = require("../spr");
+var import_util = require("../util");
+describe("test spr util functions", () => {
+  it("should return value correctly", () => {
+    expect((0, import_util.connectFactor)("bar", "foo")).toBe("bar-foo");
+    expect((0, import_util.fname)(1)).toBe("f1");
+    expect((0, import_util.namespaceHash)("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
   });
-  it('should create or destroy instance correctly', () => {
-    const ins1 = (0, _spr.createCache)();
-    const ins2 = (0, _spr.createCache)();
+  it("should create or destroy instance correctly", () => {
+    const ins1 = (0, import_spr.createCache)();
+    const ins2 = (0, import_spr.createCache)();
     expect(ins1 === ins2).toBe(true);
-    (0, _spr.destroyCache)();
-    const ins3 = (0, _spr.createCache)();
+    (0, import_spr.destroyCache)();
+    const ins3 = (0, import_spr.createCache)();
     expect(ins1 === ins3).toBe(false);
     expect(ins2 === ins3).toBe(false);
   });
-  it('should return function correctly', () => {
-    const urlParams = (() => new _url.default.URLSearchParams())();
-
-    urlParams.set('name', 'modern');
-    const getParam = (0, _util.valueFactory)(urlParams);
-    expect(getParam('name')).toBe('modern');
-    const headers = {
-      age: '12345'
-    };
-    const getHeader = (0, _util.valueFactory)(headers);
-    expect(getHeader('age')).toBe('12345');
+  it("should return function correctly", () => {
+    const urlParams = (() => new import_url.default.URLSearchParams())();
+    urlParams.set("name", "modern");
+    const getParam = (0, import_util.valueFactory)(urlParams);
+    expect(getParam("name")).toBe("modern");
+    const headers = { age: "12345" };
+    const getHeader = (0, import_util.valueFactory)(headers);
+    expect(getHeader("age")).toBe("12345");
   });
-  it('should add target html content', () => {
-    const contentNoHead = '<div>123</div>';
-    const html = (0, _util.cacheAddition)(contentNoHead, Math.random().toString());
+  it("should add target html content", () => {
+    const contentNoHead = "<div>123</div>";
+    const html = (0, import_util.cacheAddition)(contentNoHead, Math.random().toString());
     expect(html).toBe(contentNoHead);
-    const contentWithHead = '<head></head><div>123</div>';
+    const contentWithHead = "<head></head><div>123</div>";
     const hash = Math.random().toString();
-    const htmlWithHead = (0, _util.cacheAddition)(contentWithHead, hash);
-    expect(htmlWithHead).toBe(`<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`);
+    const htmlWithHead = (0, import_util.cacheAddition)(contentWithHead, hash);
+    expect(htmlWithHead).toBe(
+      `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
+    );
   });
-  it('should only invoke func one time', async () => {
+  it("should only invoke func one time", () => __async(exports, null, function* () {
     let index = 0;
-    const fn = (0, _util.withCoalescedInvoke)(async () => new Promise(resolve => {
-      setTimeout(() => {
-        index += 1;
-        resolve(index);
-      }, 500);
-    }));
-    const key = 'test';
-    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
+    const fn = (0, import_util.withCoalescedInvoke)(
+      () => __async(exports, null, function* () {
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            index += 1;
+            resolve(index);
+          }, 500);
+        });
+      })
+    );
+    const key = "test";
+    const [res1, res2] = yield Promise.all([fn(key, []), fn(key, [])]);
     expect(res1.isOrigin && res2.isOrigin).toBe(false);
     expect(res1.isOrigin || res2.isOrigin).toBe(true);
     expect(res1.value).toBe(1);
     expect(res2.value).toBe(1);
-  });
-  it('should invoke sync or async', async () => {
-    const foo = '';
-    const async = await (0, _util.maybeSync)(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(false);
+  }));
+  it("should invoke sync or async", () => __async(exports, null, function* () {
+    const foo = "";
+    const async = yield (0, import_util.maybeSync)(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(false);
     expect(async).toBeUndefined();
-    const sync = await (0, _util.maybeSync)(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(true);
+    const sync = yield (0, import_util.maybeSync)(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(true);
     expect(sync).toBe(foo);
-  });
-});
+  }));
+});

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

@@ -1,20 +1,44 @@
-"use strict";
-
-var _spr = require("../spr");
-
-var _errorConfiguration = require("./error-configuration");
-
-var _cacheable = require("./cacheable");
-
-var _matchedCache = require("./matched-cache");
-
-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; }
-
-const createCacheConfig = (config = {}) => _objectSpread({
+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());
+  });
+};
+var import_spr = require("../spr");
+var import_error_configuration = require("./error-configuration");
+var import_cacheable = require("./cacheable");
+var import_matched_cache = require("./matched-cache");
+const createCacheConfig = (config = {}) => __spreadValues({
   excludes: null,
   includes: null,
   interval: 10,
@@ -23,198 +47,181 @@ const createCacheConfig = (config = {}) => _objectSpread({
   fallback: false,
   matches: null
 }, config);
-
-jest.setTimeout(60000);
-describe('cache', () => {
-  it('should cache correctly', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+jest.setTimeout(6e4);
+describe("cache", () => {
+  it("should cache correctly", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
-    const content = 'hello';
+    const content = "hello";
     const cacheConfig = createCacheConfig();
-    await cache.set(context, content, cacheConfig, true);
-    const cacheResult = await cache.get(context);
+    yield cache.set(context, content, cacheConfig, true);
+    const cacheResult = yield cache.get(context);
     expect(cacheResult).not.toBe(null);
-    expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe('hello');
-  });
-  it('should ignore cache set when cache config not exist', async () => {
-    (0, _spr.destroyCache)();
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+    expect(cacheResult == null ? void 0 : cacheResult.content).toBe("hello");
+  }));
+  it("should ignore cache set when cache config not exist", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
-    const content = 'hello';
-    const shouldCache = await cache.set(context, content, null, true);
+    const content = "hello";
+    const shouldCache = yield cache.set(context, content, null, true);
     expect(shouldCache).toBe(false);
-  });
-  it('should calcual cache key error', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
-    const content = 'hello';
-
-    for (const config of _errorConfiguration.errorConfiguration) {
+  }));
+  it("should calcual cache key error", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
+    const content = "hello";
+    for (const config of import_error_configuration.errorConfiguration) {
       const cacheConfig = createCacheConfig(config);
       const tmpEntry = Math.random().toString();
       const context = {
         entry: tmpEntry,
-        pathname: '',
+        pathname: "",
         query: {},
         headers: {}
       };
-      const shouldCache = await cache.set(context, content, cacheConfig);
+      const shouldCache = yield cache.set(context, content, cacheConfig);
       expect(shouldCache).toBe(false);
     }
-  });
-  it('should get nothing for diff requestKey', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+  }));
+  it("should get nothing for diff requestKey", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
-    const content = 'hello';
+    const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: {
-        query: ['name']
-      }
+      includes: { query: ["name"] }
     });
-    await cache.set(context, content, cacheConfig, true);
+    yield cache.set(context, content, cacheConfig, true);
     const context_req = {
-      entry: '',
-      pathname: '/home',
+      entry: "",
+      pathname: "/home",
       query: {},
       headers: {}
     };
-    const cacheResult = await cache.get(context_req);
+    const cacheResult = yield cache.get(context_req);
     expect(cacheResult).toBe(null);
-  });
-  it('should get nothing for diff cacheHash', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+  }));
+  it("should get nothing for diff cacheHash", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
-    const content = 'hello';
+    const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: {
-        query: ['name']
-      }
+      includes: { query: ["name"] }
     });
-    await cache.set(context, content, cacheConfig, true);
+    yield cache.set(context, content, cacheConfig, true);
     const context_req = {
-      entry: '',
-      pathname: '',
-      query: {
-        name: 'zll'
-      },
+      entry: "",
+      pathname: "",
+      query: { name: "zll" },
       headers: {}
     };
-    const cacheResult = await cache.get(context_req);
+    const cacheResult = yield cache.get(context_req);
     expect(cacheResult).toBe(null);
-  });
-  it('should get cache correctly', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
-
-    for (const cacheable of _cacheable.cacheabelAry) {
+  }));
+  it("should get cache correctly", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
+    for (const cacheable of import_cacheable.cacheabelAry) {
       const context = {
-        entry: '',
+        entry: "",
         pathname: cacheable.requestOpt.url,
         query: cacheable.requestOpt.query || {},
         headers: cacheable.requestOpt.headers || {}
       };
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
-      await cache.set(context, cacheable.content, cacheConfig, true);
-      const cacheResult = await cache.get(context);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
+      yield cache.set(context, cacheable.content, cacheConfig, true);
+      const cacheResult = yield cache.get(context);
+      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(cacheable.content);
     }
-  });
-  it('should match cache correctly', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
-
-    for (const cacheable of _matchedCache.matchedCacheableAry) {
+  }));
+  it("should match cache correctly", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
+    for (const cacheable of import_matched_cache.matchedCacheableAry) {
       const [baseCacheable, matchOne, ...other] = cacheable;
-      const {
-        requestOpt = {},
-        cacheConfig,
-        content
-      } = baseCacheable;
+      const { requestOpt = {}, cacheConfig, content } = baseCacheable;
       const context = {
-        entry: '',
+        entry: "",
         pathname: requestOpt.url,
         query: requestOpt.query,
         headers: requestOpt.headers
       };
-      await cache.set(context, content, createCacheConfig(cacheConfig), true);
+      yield cache.set(context, content, createCacheConfig(cacheConfig), true);
       const matchContext = {
-        entry: '',
+        entry: "",
         pathname: matchOne.url,
         query: matchOne.query,
         headers: matchOne.headers
       };
-      const cacheResult = await cache.get(matchContext);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
-
+      const cacheResult = yield cache.get(matchContext);
+      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
-          entry: '',
+          entry: "",
           pathname: notMatch.url,
           query: notMatch.query,
           headers: notMatch.headers
         };
-        const nothing = await cache.get(notMatchContext);
+        const nothing = yield cache.get(notMatchContext);
         expect(nothing).toBe(null);
       }
     }
-  });
-  it('should stale cache correctly', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+  }));
+  it("should stale cache correctly", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
-    const config = createCacheConfig({
-      interval: 5
-    });
-    const content = 'hello';
-    const shouldCache = await cache.set(context, content, config, true);
+    const config = createCacheConfig({ interval: 5 });
+    const content = "hello";
+    const shouldCache = yield cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
-    const freshResult = await cache.get(context);
-    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
-    await new Promise(resolve => {
+    const freshResult = yield cache.get(context);
+    expect(freshResult == null ? void 0 : freshResult.isStale).toBe(false);
+    yield new Promise((resolve) => {
       setTimeout(() => {
         resolve();
-      }, 6000);
+      }, 6e3);
     });
-    const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
-  });
-  it('should garbage cache correctly', async () => {
-    (0, _spr.destroyCache)();
-    const cache = (0, _spr.createCache)();
+    const staleResult = yield cache.get(context);
+    expect(staleResult == null ? void 0 : staleResult.isStale).toBe(true);
+  }));
+  it("should garbage cache correctly", () => __async(exports, null, function* () {
+    (0, import_spr.destroyCache)();
+    const cache = (0, import_spr.createCache)();
     const context = {
-      entry: '',
-      pathname: '',
+      entry: "",
+      pathname: "",
       query: {},
       headers: {}
     };
@@ -222,17 +229,17 @@ describe('cache', () => {
       interval: 3,
       staleLimit: 8
     });
-    const content = 'hello';
-    const shouldCache = await cache.set(context, content, config, true);
+    const content = "hello";
+    const shouldCache = yield cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
-    const freshResult = await cache.get(context);
-    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
-    await new Promise(resolve => {
+    const freshResult = yield cache.get(context);
+    expect(freshResult == null ? void 0 : freshResult.isGarbage).toBe(false);
+    yield new Promise((resolve) => {
       setTimeout(() => {
         resolve();
-      }, 10000);
+      }, 1e4);
     });
-    const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
-  });
-});
+    const staleResult = yield cache.get(context);
+    expect(staleResult == null ? void 0 : staleResult.isGarbage).toBe(true);
+  }));
+});