npm - @modern-js/prod-server - Versions diffs - 2.0.0-beta.3 → 2.0.0-beta.6 - Mend

@modern-js/prod-server 2.0.0-beta.3 → 2.0.0-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (130) hide show

package/CHANGELOG.md +139 -0
package/dist/js/modern/constants.js +32 -25
package/dist/js/modern/index.js +11 -6
package/dist/js/modern/libs/context/context.js +52 -84
package/dist/js/modern/libs/context/index.js +5 -2
package/dist/js/modern/libs/hook-api/index.js +44 -35
package/dist/js/modern/libs/hook-api/route.js +6 -7
package/dist/js/modern/libs/hook-api/template.js +20 -34
package/dist/js/modern/libs/loadConfig.js +45 -24
package/dist/js/modern/libs/metrics.js +3 -4
package/dist/js/modern/libs/proxy.js +68 -37
package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js +112 -67
package/dist/js/modern/libs/render/cache/__tests__/cache.test.js +246 -216
package/dist/js/modern/libs/render/cache/__tests__/cacheable.js +43 -49
package/dist/js/modern/libs/render/cache/__tests__/error-configuration.js +36 -34
package/dist/js/modern/libs/render/cache/__tests__/matched-cache.js +83 -113
package/dist/js/modern/libs/render/cache/index.js +88 -54
package/dist/js/modern/libs/render/cache/page-caches/index.js +31 -8
package/dist/js/modern/libs/render/cache/page-caches/lru.js +6 -6
package/dist/js/modern/libs/render/cache/spr.js +133 -117
package/dist/js/modern/libs/render/cache/type.js +0 -1
package/dist/js/modern/libs/render/cache/util.js +71 -39
package/dist/js/modern/libs/render/index.js +76 -56
package/dist/js/modern/libs/render/measure.js +38 -27
package/dist/js/modern/libs/render/reader.js +65 -62
package/dist/js/modern/libs/render/ssr.js +50 -32
package/dist/js/modern/libs/render/static.js +50 -33
package/dist/js/modern/libs/render/type.js +9 -6
package/dist/js/modern/libs/route/index.js +8 -15
package/dist/js/modern/libs/route/matcher.js +20 -34
package/dist/js/modern/libs/route/route.js +9 -18
package/dist/js/modern/libs/serve-file.js +33 -20
package/dist/js/modern/server/index.js +150 -145
package/dist/js/modern/server/modern-server-split.js +46 -12
package/dist/js/modern/server/modern-server.js +384 -422
package/dist/js/modern/type.js +0 -1
package/dist/js/modern/utils.js +62 -43
package/dist/js/modern/worker-server.js +34 -14
package/dist/js/node/constants.js +53 -30
package/dist/js/node/index.js +37 -57
package/dist/js/node/libs/context/context.js +83 -94
package/dist/js/node/libs/context/index.js +28 -13
package/dist/js/node/libs/hook-api/index.js +76 -48
package/dist/js/node/libs/hook-api/route.js +26 -11
package/dist/js/node/libs/hook-api/template.js +41 -39
package/dist/js/node/libs/loadConfig.js +73 -35
package/dist/js/node/libs/metrics.js +25 -9
package/dist/js/node/libs/proxy.js +89 -44
package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js +99 -56
package/dist/js/node/libs/render/cache/__tests__/cache.test.js +147 -128
package/dist/js/node/libs/render/cache/__tests__/cacheable.js +65 -55
package/dist/js/node/libs/render/cache/__tests__/error-configuration.js +58 -40
package/dist/js/node/libs/render/cache/__tests__/matched-cache.js +105 -119
package/dist/js/node/libs/render/cache/index.js +110 -64
package/dist/js/node/libs/render/cache/page-caches/index.js +54 -14
package/dist/js/node/libs/render/cache/page-caches/lru.js +33 -12
package/dist/js/node/libs/render/cache/spr.js +161 -129
package/dist/js/node/libs/render/cache/type.js +15 -5
package/dist/js/node/libs/render/cache/util.js +99 -45
package/dist/js/node/libs/render/index.js +106 -67
package/dist/js/node/libs/render/measure.js +58 -31
package/dist/js/node/libs/render/reader.js +95 -70
package/dist/js/node/libs/render/ssr.js +80 -47
package/dist/js/node/libs/render/static.js +79 -40
package/dist/js/node/libs/render/type.js +31 -12
package/dist/js/node/libs/route/index.js +31 -26
package/dist/js/node/libs/route/matcher.js +40 -41
package/dist/js/node/libs/route/route.js +29 -22
package/dist/js/node/libs/serve-file.js +66 -32
package/dist/js/node/server/index.js +168 -160
package/dist/js/node/server/modern-server-split.js +72 -22
package/dist/js/node/server/modern-server.js +403 -445
package/dist/js/node/type.js +15 -3
package/dist/js/node/utils.js +85 -52
package/dist/js/node/worker-server.js +57 -21
package/dist/js/treeshaking/constants.js +26 -25
package/dist/js/treeshaking/index.js +10 -10
package/dist/js/treeshaking/libs/context/context.js +268 -237
package/dist/js/treeshaking/libs/context/index.js +3 -3
package/dist/js/treeshaking/libs/hook-api/index.js +267 -143
package/dist/js/treeshaking/libs/hook-api/route.js +65 -30
package/dist/js/treeshaking/libs/hook-api/template.js +121 -85
package/dist/js/treeshaking/libs/loadConfig.js +80 -37
package/dist/js/treeshaking/libs/metrics.js +4 -10
package/dist/js/treeshaking/libs/proxy.js +240 -76
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js +288 -121
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.test.js +772 -455
package/dist/js/treeshaking/libs/render/cache/__tests__/cacheable.js +65 -51
package/dist/js/treeshaking/libs/render/cache/__tests__/error-configuration.js +45 -35
package/dist/js/treeshaking/libs/render/cache/__tests__/matched-cache.js +144 -118
package/dist/js/treeshaking/libs/render/cache/index.js +337 -175
package/dist/js/treeshaking/libs/render/cache/page-caches/index.js +151 -27
package/dist/js/treeshaking/libs/render/cache/page-caches/lru.js +80 -42
package/dist/js/treeshaking/libs/render/cache/spr.js +470 -340
package/dist/js/treeshaking/libs/render/cache/type.js +1 -1
package/dist/js/treeshaking/libs/render/cache/util.js +271 -92
package/dist/js/treeshaking/libs/render/index.js +228 -95
package/dist/js/treeshaking/libs/render/measure.js +142 -57
package/dist/js/treeshaking/libs/render/reader.js +325 -177
package/dist/js/treeshaking/libs/render/ssr.js +220 -95
package/dist/js/treeshaking/libs/render/static.js +210 -78
package/dist/js/treeshaking/libs/render/type.js +7 -6
package/dist/js/treeshaking/libs/route/index.js +125 -89
package/dist/js/treeshaking/libs/route/matcher.js +132 -107
package/dist/js/treeshaking/libs/route/route.js +40 -26
package/dist/js/treeshaking/libs/serve-file.js +177 -68
package/dist/js/treeshaking/server/index.js +493 -327
package/dist/js/treeshaking/server/modern-server-split.js +352 -144
package/dist/js/treeshaking/server/modern-server.js +1048 -909
package/dist/js/treeshaking/type.js +1 -1
package/dist/js/treeshaking/utils.js +138 -81
package/dist/js/treeshaking/worker-server.js +176 -55
package/dist/types/index.d.ts +2 -0
package/dist/types/libs/context/context.d.ts +4 -1
package/dist/types/libs/loadConfig.d.ts +1 -0
package/dist/types/libs/render/cache/index.d.ts +2 -0
package/dist/types/libs/render/cache/spr.d.ts +2 -0
package/dist/types/libs/route/route.d.ts +0 -1
package/dist/types/server/index.d.ts +3 -0
package/dist/types/utils.d.ts +1 -1
package/dist/types/worker-server.d.ts +1 -2
package/package.json +7 -14
package/dist/js/modern/libs/render/modern/browser-list.js +0 -7
package/dist/js/modern/libs/render/modern/index.js +0 -37
package/dist/js/node/libs/render/modern/browser-list.js +0 -14
package/dist/js/node/libs/render/modern/index.js +0 -46
package/dist/js/treeshaking/libs/render/modern/browser-list.js +0 -7
package/dist/js/treeshaking/libs/render/modern/index.js +0 -39
package/dist/types/libs/render/modern/browser-list.d.ts +0 -1
package/dist/types/libs/render/modern/index.d.ts +0 -3

package/dist/js/modern/libs/hook-api/template.js CHANGED Viewed

@@ -1,18 +1,16 @@
-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 { Transform } from 'stream';
+import { Transform } from "stream";
 const RegList = {
   before: {
-    head: '<head>',
-    body: '<body>'
+    head: "<head>",
+    body: "<body>"
   },
   after: {
-    head: '</head>',
-    body: '</body>'
+    head: "</head>",
+    body: "</body>"
   }
 };
-export class TemplateAPI {
+class TemplateAPI {
   constructor(content) {
-    _defineProperty(this, "content", void 0);
     this.content = content;
   }
   get() {
@@ -22,34 +20,26 @@ export class TemplateAPI {
     this.content = content;
   }
   prependHead(fragment) {
-    const {
-      head
-    } = RegList.before;
+    const { head } = RegList.before;
     return this.replace(head, `${head}${fragment}`);
   }
   appendHead(fragment) {
-    const {
-      head
-    } = RegList.after;
+    const { head } = RegList.after;
     return this.replace(head, `${fragment}${head}`);
   }
   prependBody(fragment) {
-    const {
-      body
-    } = RegList.before;
+    const { body } = RegList.before;
     return this.replace(body, `${body}${fragment}`);
   }
   appendBody(fragment) {
-    const {
-      body
-    } = RegList.after;
+    const { body } = RegList.after;
     return this.replace(body, `${fragment}${body}`);
   }
   replace(reg, text) {
     this.content = this.content.replace(reg, text);
   }
 }
-export const templateInjectableStream = ({
+const templateInjectableStream = ({
   prependHead,
   appendHead,
   prependBody,
@@ -58,30 +48,26 @@ export const templateInjectableStream = ({
   write(chunk, _, callback) {
     let chunk_str = chunk.toString();
     if (prependHead) {
-      const {
-        head
-      } = RegList.before;
+      const { head } = RegList.before;
       chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
     }
     if (appendHead) {
-      const {
-        head
-      } = RegList.after;
+      const { head } = RegList.after;
       chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
     }
     if (prependBody) {
-      const {
-        body
-      } = RegList.before;
+      const { body } = RegList.before;
       chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
     }
     if (appendBody) {
-      const {
-        body
-      } = RegList.after;
+      const { body } = RegList.after;
       chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
     }
     this.push(chunk_str);
     callback();
   }
-});
+});
+export {
+  TemplateAPI,
+  templateInjectableStream
+};

package/dist/js/modern/libs/loadConfig.js CHANGED Viewed

@@ -1,41 +1,62 @@
-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; }
-import * as path from 'path';
-import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
-import mergeDeep from 'merge-deep';
-export const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import * as path from "path";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import mergeDeep from "merge-deep";
+const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
   const serverConfigPath = path.join(distDirectory, serverConfigFile);
   return `${serverConfigPath}.js`;
 };
-export const requireConfig = serverConfigPath => {
+const requireConfig = (serverConfigPath) => {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
   }
   return {};
 };
-/**
- * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
- * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
- * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
- */
-export const loadConfig = ({
+const loadConfig = ({
   cliConfig,
   serverConfig,
   resolvedConfigPath
 }) => {
   let config = null;
-  if (process.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === "production") {
     const resolvedConfig = requireConfig(resolvedConfigPath);
-    // cli config has a higher priority,because it's an argument passed in.
-    config = mergeDeep(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
-      plugins: [] // filter cli plugins
-    }), serverConfig, cliConfig);
+    config = mergeDeep(
+      __spreadProps(__spreadValues({}, resolvedConfig), {
+        plugins: []
+      }),
+      serverConfig,
+      cliConfig
+    );
   } else {
-    config = mergeDeep(_objectSpread(_objectSpread({}, cliConfig), {}, {
-      plugins: []
-    }), serverConfig);
+    config = mergeDeep(
+      __spreadProps(__spreadValues({}, cliConfig), {
+        plugins: []
+      }),
+      serverConfig
+    );
   }
   return config;
-};
+};
+export {
+  getServerConfigPath,
+  loadConfig,
+  requireConfig
+};

package/dist/js/modern/libs/metrics.js CHANGED Viewed

@@ -1,12 +1,11 @@
 const metrics = {
   gauges() {
-    // no impl
   },
   emitCounter() {
-    // no impl
   },
   emitTimer() {
-    // no impl
   }
 };
-export { metrics };
+export {
+  metrics
+};

package/dist/js/modern/libs/proxy.js CHANGED Viewed

@@ -1,61 +1,92 @@
-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; }
-import { createProxyMiddleware } from 'http-proxy-middleware';
+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 { createProxyMiddleware } from "http-proxy-middleware";
 import { debug } from "../utils";
-export function formatProxyOptions(proxyOptions) {
+function formatProxyOptions(proxyOptions) {
   const formattedProxy = [];
   if (!Array.isArray(proxyOptions)) {
-    if ('target' in proxyOptions) {
+    if ("target" in proxyOptions) {
       formattedProxy.push(proxyOptions);
     } else {
-      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
-        const option = proxyOptions[source];
-        total.push(_objectSpread({
-          context: source,
-          changeOrigin: true,
-          logLevel: 'warn'
-        }, typeof option === 'string' ? {
-          target: option
-        } : option));
-        return total;
-      }, []));
+      Array.prototype.push.apply(
+        formattedProxy,
+        Object.keys(proxyOptions).reduce(
+          (total, source) => {
+            const option = proxyOptions[source];
+            total.push(__spreadValues({
+              context: source,
+              changeOrigin: true,
+              logLevel: "warn"
+            }, typeof option === "string" ? { target: option } : option));
+            return total;
+          },
+          []
+        )
+      );
     }
   } else {
     formattedProxy.push(...proxyOptions);
   }
   return formattedProxy;
 }
-export const createProxyHandler = proxyOptions => {
-  debug('createProxyHandler', proxyOptions);
+const createProxyHandler = (proxyOptions) => {
+  debug("createProxyHandler", proxyOptions);
   if (!proxyOptions) {
     return null;
   }
-  // If it is not an array, it may be an object that uses the context attribute
-  // or an object in the form of { source: ProxyDetail }
   const formattedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formattedProxy.map(option => {
+  const middlewares = formattedProxy.map((option) => {
     const middleware = createProxyMiddleware(option.context, option);
-    // eslint-disable-next-line consistent-return
-    return async (ctx, next) => {
-      const {
-        req,
-        res
-      } = ctx;
-      const bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null;
-      // only false, no true
-      if (typeof bypassUrl === 'boolean') {
+    return (ctx, next) => __async(void 0, null, function* () {
+      const { req, res } = ctx;
+      const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
+      if (typeof bypassUrl === "boolean") {
         ctx.status = 404;
         return next();
-      } else if (typeof bypassUrl === 'string') {
+      } else if (typeof bypassUrl === "string") {
         ctx.url = bypassUrl;
         return next();
       }
       middleware(req, res, next);
-    };
+    });
   });
   return middlewares;
-};
+};
+export {
+  createProxyHandler,
+  formatProxyOptions
+};

package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js CHANGED Viewed

@@ -1,69 +1,114 @@
-import url from 'url';
-import { createCache, destroyCache } from "../spr";
-import { cacheAddition, connectFactor, fname, maybeSync, namespaceHash, valueFactory, withCoalescedInvoke } from "../util";
-describe('test spr util functions', () => {
-  it('should return value correctly', () => {
-    expect(connectFactor('bar', 'foo')).toBe('bar-foo');
-    expect(fname(1)).toBe('f1');
-    expect(namespaceHash('modern', '!@#$%^&')).toBe('modern/!@#$%^&');
-  });
-  it('should create or destroy instance correctly', () => {
-    const ins1 = createCache();
-    const ins2 = createCache();
-    expect(ins1 === ins2).toBe(true);
-    destroyCache();
-    const ins3 = createCache();
-    expect(ins1 === ins3).toBe(false);
-    expect(ins2 === ins3).toBe(false);
-  });
-  it('should return function correctly', () => {
-    const urlParams = (() => new url.URLSearchParams())();
-    urlParams.set('name', 'modern');
-    const getParam = valueFactory(urlParams);
-    expect(getParam('name')).toBe('modern');
-    const headers = {
-      age: '12345'
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
     };
-    const getHeader = valueFactory(headers);
-    expect(getHeader('age')).toBe('12345');
-  });
-  it('should add target html content', () => {
-    const contentNoHead = '<div>123</div>';
-    const html = cacheAddition(contentNoHead, Math.random().toString());
-    expect(html).toBe(contentNoHead);
-    const contentWithHead = '<head></head><div>123</div>';
-    const hash = Math.random().toString();
-    const htmlWithHead = 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 () => {
-    let index = 0;
-    const fn = withCoalescedInvoke(async () => new Promise(resolve => {
-      setTimeout(() => {
-        index += 1;
-        resolve(index);
-      }, 500);
-    }));
-    const key = 'test';
-    const [res1, res2] = await 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 maybeSync(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(false);
-    expect(async).toBeUndefined();
-    const sync = await maybeSync(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(true);
-    expect(sync).toBe(foo);
+    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 url from "url";
+import { createCache, destroyCache } from "../spr";
+import {
+  cacheAddition,
+  connectFactor,
+  fname,
+  maybeSync,
+  namespaceHash,
+  valueFactory,
+  withCoalescedInvoke
+} from "../util";
+var require_cache_fun_test = __commonJS({
+  "src/libs/render/cache/__tests__/cache.fun.test.ts"(exports) {
+    describe("test spr util functions", () => {
+      it("should return value correctly", () => {
+        expect(connectFactor("bar", "foo")).toBe("bar-foo");
+        expect(fname(1)).toBe("f1");
+        expect(namespaceHash("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
+      });
+      it("should create or destroy instance correctly", () => {
+        const ins1 = createCache();
+        const ins2 = createCache();
+        expect(ins1 === ins2).toBe(true);
+        destroyCache();
+        const ins3 = createCache();
+        expect(ins1 === ins3).toBe(false);
+        expect(ins2 === ins3).toBe(false);
+      });
+      it("should return function correctly", () => {
+        const urlParams = (() => new url.URLSearchParams())();
+        urlParams.set("name", "modern");
+        const getParam = valueFactory(urlParams);
+        expect(getParam("name")).toBe("modern");
+        const headers = { age: "12345" };
+        const getHeader = valueFactory(headers);
+        expect(getHeader("age")).toBe("12345");
+      });
+      it("should add target html content", () => {
+        const contentNoHead = "<div>123</div>";
+        const html = cacheAddition(contentNoHead, Math.random().toString());
+        expect(html).toBe(contentNoHead);
+        const contentWithHead = "<head></head><div>123</div>";
+        const hash = Math.random().toString();
+        const htmlWithHead = 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(exports, null, function* () {
+        let index = 0;
+        const fn = 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(exports, null, function* () {
+        const foo = "";
+        const async = yield maybeSync(
+          () => new Promise((resolve) => {
+            setTimeout(() => {
+              resolve(foo);
+            }, 100);
+          })
+        )(false);
+        expect(async).toBeUndefined();
+        const sync = yield maybeSync(
+          () => new Promise((resolve) => {
+            setTimeout(() => {
+              resolve(foo);
+            }, 100);
+          })
+        )(true);
+        expect(sync).toBe(foo);
+      }));
+    });
+  }
+});
+export default require_cache_fun_test();