@next-core/brick-kit 2.104.4 → 2.105.0

package/dist/index.esm.js

@@ -1980,17 +1980,38 @@ class StoryboardContextWrapper {
 
     return _asyncToGenerator$4(function* () {
       if (Array.isArray(contextConfs)) {
-        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, coreContext, _this, brick));
+        var {
+          mergedContext,
+          keyword
+        } = _this.getResolveOptions(coreContext);
+
+        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, mergedContext, _this, brick), keyword);
       }
     })();
   }
 
   syncDefine(contextConfs, coreContext, brick) {
     if (Array.isArray(contextConfs)) {
-      syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, coreContext, this, brick));
+      var {
+        mergedContext,
+        keyword
+      } = this.getResolveOptions(coreContext);
+      syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, mergedContext, this, brick), keyword);
     }
   }
 
+  getResolveOptions(coreContext) {
+    return this.tplContextId ? {
+      mergedContext: _objectSpread(_objectSpread({}, coreContext), {}, {
+        tplContextId: this.tplContextId
+      }),
+      keyword: "STATE"
+    } : {
+      mergedContext: coreContext,
+      keyword: "CTX"
+    };
+  }
+
 }
 
 function resolveStoryboardContext(_x, _x2, _x3, _x4) {
@@ -2025,23 +2046,23 @@ function resolveNormalStoryboardContext(_x5, _x6, _x7, _x8) {
 }
 
 function _resolveNormalStoryboardContext() {
-  _resolveNormalStoryboardContext = _asyncToGenerator$4(function* (contextConf, coreContext, storyboardContextWrapper, brick) {
-    if (!looseCheckIf(contextConf, coreContext)) {
+  _resolveNormalStoryboardContext = _asyncToGenerator$4(function* (contextConf, mergedContext, storyboardContextWrapper, brick) {
+    if (!looseCheckIf(contextConf, mergedContext)) {
       return false;
     }
 
     var isResolve = false;
-    var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+    var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
     if (value === undefined) {
       if (contextConf.resolve) {
-        if (looseCheckIf(contextConf.resolve, coreContext)) {
+        if (looseCheckIf(contextConf.resolve, mergedContext)) {
           isResolve = true;
           var valueConf = {};
           yield _internalApiGetResolver().resolveOne("reference", _objectSpread({
             transform: "value",
             transformMapArray: false
-          }, contextConf.resolve), valueConf, null, coreContext);
+          }, contextConf.resolve), valueConf, null, mergedContext);
           value = valueConf.value;
         } else if (!hasOwnProperty(contextConf, "value")) {
           return false;
@@ -2049,18 +2070,18 @@ function _resolveNormalStoryboardContext() {
       }
 
       if (!isResolve && contextConf.value !== undefined) {
-        value = computeRealValue(contextConf.value, coreContext, true);
+        value = computeRealValue(contextConf.value, mergedContext, true);
       }
     }
 
-    resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
     return true;
   });
   return _resolveNormalStoryboardContext.apply(this, arguments);
 }
 
-function syncResolveStoryboardContext(contextConf, coreContext, storyboardContextWrapper, brick) {
-  if (!looseCheckIf(contextConf, coreContext)) {
+function syncResolveStoryboardContext(contextConf, mergedContext, storyboardContextWrapper, brick) {
+  if (!looseCheckIf(contextConf, mergedContext)) {
     return false;
   }
 
@@ -2068,23 +2089,23 @@ function syncResolveStoryboardContext(contextConf, coreContext, storyboardContex
     throw new Error("resolve is not allowed here");
   }
 
-  var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+  var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
   if (value === undefined) {
-    value = computeRealValue(contextConf.value, coreContext, true);
+    value = computeRealValue(contextConf.value, mergedContext, true);
   }
 
-  resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+  resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
   return true;
 }
 
-function getDefinedTemplateState(contextConf, storyboardContextWrapper, brick) {
-  if (storyboardContextWrapper.tplContextId && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
+function getDefinedTemplateState(isTemplateState, contextConf, brick) {
+  if (isTemplateState && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
     return brick.properties[contextConf.name];
   }
 }
 
-function resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick) {
+function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick) {
   var newContext = {
     type: "free-variable",
     value,
@@ -2094,13 +2115,7 @@ function resolveFreeVariableValue(value, contextConf, coreContext, storyboardCon
 
   if (contextConf.onChange) {
     for (var handler of [].concat(contextConf.onChange)) {
-      if (storyboardContextWrapper.tplContextId) {
-        newContext.eventTarget.addEventListener("state.change", listenerFactory(handler, _objectSpread(_objectSpread({}, coreContext), {}, {
-          tplContextId: storyboardContextWrapper.tplContextId
-        }), brick));
-      } else {
-        newContext.eventTarget.addEventListener("context.change", listenerFactory(handler, coreContext, brick));
-      }
+      newContext.eventTarget.addEventListener(storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
     }
   }
 
@@ -2278,6 +2293,7 @@ function evaluate(raw) {
     sys,
     flags,
     hash,
+    pathname,
     segues,
     storyboardContext
   } = _internalApiGetCurrentContext();
@@ -2318,6 +2334,9 @@ function evaluate(raw) {
       case "HASH":
         return hash;
 
+      case "PATH_NAME":
+        return pathname;
+
       case "INSTALLED_APPS":
         return {
           has: (appId, matchVersion) => getRuntime().hasInstalledApp(appId, matchVersion)
@@ -8493,6 +8512,7 @@ class LocationContext {
     var auth = getAuth();
     var context = {
       hash: this.location.hash,
+      pathname: this.location.pathname,
       query: this.query,
       match,
       app: this.kernel.nextApp,
@@ -10130,7 +10150,9 @@ function propertyMergeAllOfArray(_ref, object) {
   // Use an approach like template-literal's quasis:
   // `quasi0${0}quais1${1}quasi2...`
   // Every quasi can be merged with multiple items.
-  var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true) : [];
+  var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true, {
+    $$lazyForUseBrick: true
+  }) : [];
   var quasis = [];
   var size = computedBaseValue.length + 1;
 
@@ -10520,7 +10542,7 @@ function getTagNameOfCustomTemplate(brick, appId) {
   return false;
 }
 
-function handleProxyOfCustomTemplate(brick, reRun) {
+function handleProxyOfCustomTemplate(brick) {
   // Ignore non-tpl bricks.
   if (!brick.proxyRefs) {
     return;
@@ -10534,17 +10556,18 @@ function handleProxyOfCustomTemplate(brick, reRun) {
 
       return (_brick$proxyRefs$get$ = brick.proxyRefs.get(ref).brick) === null || _brick$proxyRefs$get$ === void 0 ? void 0 : _brick$proxyRefs$get$.element;
     }
-  } // For usages of `targetRef: "..."`.
-  // `tpl.$$getElementByRef(ref)` will return the ref element inside a custom template.
+  }
 
+  var firstRun = !node.$$getElementByRef; // For usages of `targetRef: "..."`.
+  // `tpl.$$getElementByRef(ref)` will return the ref element inside a custom template.
 
-  if (!reRun) {
+  if (firstRun) {
     Object.defineProperty(node, "$$getElementByRef", {
       value: getElementByRef
     });
   }
 
-  if (!reRun && brick.stateNames) {
+  if (firstRun && brick.stateNames) {
     (function () {
       // Define properties from state for tpl.
       var getState = () => getCustomTemplateContext(brick.tplContextId).state;
@@ -11204,7 +11227,7 @@ var handleProxyOfParentTemplate = (brick, tplContextId) => {
       handleProxyOfCustomTemplate(_objectSpread(_objectSpread({}, tplBrick), {}, {
         proxyRefs: singleRefBrickProxyMap,
         proxy: getFilterProxy(tplBrick.proxy, brick.ref)
-      }), true);
+      }));
       setRealProperties(tplBrick.element, tplBrick.properties || {});
     }
   }