@next-core/brick-kit 2.70.2 → 2.72.0

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.72.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.71.0...@next-core/brick-kit@2.72.0) (2021-09-27)
+
+
+### Features
+
+* expose StoryboardFunctionRegistryFactory ([c7079e8](https://github.com/easyops-cn/next-core/commit/c7079e838a37350264ca3bf210527e1b09a542f7))
+
+
+
+
+
+# [2.71.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.70.4...@next-core/brick-kit@2.71.0) (2021-09-23)
+
+
+### Bug Fixes
+
+* refine inject marking ([01675a8](https://github.com/easyops-cn/next-core/commit/01675a8b26fb0ab0e97de89a83c4618ccb4e7127))
+
+
+### Features
+
+* **LocationContext:** handlePageLoad dispatch page.load event on window for e2e testing usage ([d9bb07b](https://github.com/easyops-cn/next-core/commit/d9bb07b0395fbf769d485768bbb64e035b72c743))
+
+
+
+
+
+## [2.70.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.70.3...@next-core/brick-kit@2.70.4) (2021-09-23)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+## [2.70.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.70.2...@next-core/brick-kit@2.70.3) (2021-09-22)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 ## [2.70.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.70.1...@next-core/brick-kit@2.70.2) (2021-09-22)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -778,9 +778,13 @@
 
         if (Array.isArray(value)) {
           value.forEach(recursiveMarkAsInjected);
-        } else if (value.constructor === Object) {
+        } else {
           // Only mark pure objects.
-          Object.values(value).forEach(recursiveMarkAsInjected);
+          var proto = Object.getPrototypeOf(value);
+
+          if (!proto || proto.constructor === Object) {
+            Object.values(value).forEach(recursiveMarkAsInjected);
+          }
         }
       }
     }
@@ -2317,58 +2321,77 @@
     }
   }
 
-  var registeredFunctions = new Map();
-  // Use `Proxy` with a frozen target, to make a readonly function registry.
-  var storyboardFunctions = new Proxy(Object.freeze({}), {
-    get(target, key) {
-      return getStoryboardFunction(key);
+  /** @internal */
+
+  /** @internal */
+  function StoryboardFunctionRegistryFactory() {
+    var registeredFunctions = new Map(); // Use `Proxy` with a frozen target, to make a readonly function registry.
+
+    var storyboardFunctions = new Proxy(Object.freeze({}), {
+      get(target, key) {
+        return getStoryboardFunction(key);
+      }
+
+    });
+
+    function registerStoryboardFunctions(functions) {
+      registeredFunctions.clear();
+
+      if (Array.isArray(functions)) {
+        for (var fn of functions) {
+          registeredFunctions.set(fn.name, {
+            source: fn.source,
+            typescript: fn.typescript
+          });
+        }
+      }
     }
 
-  });
-  function registerStoryboardFunctions(storyboard) {
-    var _storyboard$meta;
+    function getStoryboardFunction(name) {
+      var fn = registeredFunctions.get(name);
 
-    registeredFunctions.clear();
+      if (!fn) {
+        return undefined;
+      }
 
-    if (Array.isArray((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions)) {
-      for (var fn of storyboard.meta.functions) {
-        registeredFunctions.set(fn.name, {
-          source: fn.source,
+      if (!fn.processed) {
+        var precooked = brickUtils.precookFunction(fn.source, {
           typescript: fn.typescript
         });
+        fn.cooked = brickUtils.cook(precooked.function, fn.source, {
+          rules: {
+            noVar: true
+          },
+          globalVariables: supply(precooked.attemptToVisitGlobals, {
+            // Functions can call other functions.
+            FN: storyboardFunctions
+          })
+        });
+        fn.processed = true;
       }
-    }
-  }
-  function getStoryboardFunctions() {
-    return storyboardFunctions;
-  }
 
-  function getStoryboardFunction(name) {
-    var fn = registeredFunctions.get(name);
-
-    if (!fn) {
-      throw new ReferenceError("Function not found: ".concat(name));
+      return fn.cooked;
     }
 
-    if (!fn.processed) {
-      var precooked = brickUtils.precookFunction(fn.source, {
-        typescript: fn.typescript
+    function updateStoryboardFunction(name, data) {
+      registeredFunctions.set(name, {
+        source: data.source,
+        typescript: data.typescript
       });
-      fn.cooked = brickUtils.cook(precooked.function, fn.source, {
-        rules: {
-          noVar: true
-        },
-        globalVariables: supply(precooked.attemptToVisitGlobals, {
-          // Functions can call other functions.
-          FN: storyboardFunctions
-        })
-      });
-      fn.processed = true;
     }
 
-    return fn.cooked;
+    return {
+      storyboardFunctions,
+      registerStoryboardFunctions,
+      updateStoryboardFunction
+    };
   }
 
+  var {
+    storyboardFunctions,
+    registerStoryboardFunctions
+  } = StoryboardFunctionRegistryFactory();
+
   var symbolForRaw = Symbol.for("pre.evaluated.raw");
   var symbolForContext = Symbol.for("pre.evaluated.context");
   function isPreEvaluated(raw) {
@@ -2584,7 +2607,7 @@
     }
 
     if (attemptToVisitGlobals.has("FN")) {
-      globalVariables.FN = getStoryboardFunctions();
+      globalVariables.FN = storyboardFunctions;
     }
 
     try {
@@ -7889,7 +7912,10 @@
     }
 
     handlePageLoad() {
-      this.dispatchLifeCycleEvent(new CustomEvent("page.load"), this.pageLoadHandlers);
+      var event = new CustomEvent("page.load");
+      this.dispatchLifeCycleEvent(event, this.pageLoadHandlers); // Currently only for e2e testing
+
+      window.dispatchEvent(event);
     }
 
     handleBeforePageLeave(detail) {
@@ -8579,6 +8605,8 @@
         var storyboard = locationContext.matchStoryboard(_this3.kernel.bootstrapData.storyboards);
 
         if (storyboard) {
+          var _storyboard$meta;
+
           yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
 
           brickUtils.restoreDynamicTemplates(storyboard); // 预加载权限信息
@@ -8594,7 +8622,7 @@
 
           _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
 
-          registerStoryboardFunctions(storyboard);
+          registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions);
         }
 
         var {
@@ -10663,6 +10691,7 @@
   exports.ForwardRefSingleBrickAsComponent = ForwardRefSingleBrickAsComponent;
   exports.ModalElement = ModalElement;
   exports.SingleBrickAsComponent = SingleBrickAsComponent;
+  exports.StoryboardFunctionRegistryFactory = StoryboardFunctionRegistryFactory;
   exports.UpdatingElement = UpdatingElement;
   exports.authenticate = authenticate;
   exports.checkIf = checkIf;