@next-core/brick-utils 2.33.1 → 2.35.0

package/dist/index.esm.js

@@ -21429,14 +21429,14 @@ var {
   convertUnitValueByPrecision: convertValueByPrecision
 } = utils;
 
-var CTX$1 = "CTX";
 function resolveContextConcurrently(_x, _x2) {
   return _resolveContextConcurrently.apply(this, arguments);
 }
 
 function _resolveContextConcurrently() {
   _resolveContextConcurrently = _asyncToGenerator(function* (contextConfs, resolveContext) {
-    var dependencyMap = getDependencyMapOfContext(contextConfs);
+    var keyword = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "CTX";
+    var dependencyMap = getDependencyMapOfContext(contextConfs, keyword);
     var pendingDeps = new Set(Array.from(dependencyMap.keys()).map(contextConf => contextConf.name));
     var includesComputed = Array.from(dependencyMap.values()).some(stats => stats.includesComputed);
     var processed = new WeakSet();
@@ -21469,10 +21469,7 @@ function _resolveContextConcurrently() {
 
     function _scheduleNext() {
       _scheduleNext = _asyncToGenerator(function* () {
-        var readyContexts = Array.from(dependencyMap.entries()).filter((entry, index) => // When contexts contain computed CTX accesses, it implies a dynamic dependency map.
-        // So make them process sequentially, keep the same behavior as before.
-        scheduleAsSerial ? index === 0 : // A context is ready when it has no pending dependencies.
-        !entry[1].dependencies.some(dep => pendingDeps.has(dep))).map(entry => entry[0]).filter(contextConf => !processed.has(contextConf));
+        var readyContexts = Array.from(dependencyMap.entries()).filter(predicateNextResolveFactory(pendingDeps, scheduleAsSerial)).map(entry => entry[0]).filter(contextConf => !processed.has(contextConf));
         yield Promise.all(readyContexts.map(wrapResolve));
       });
       return _scheduleNext.apply(this, arguments);
@@ -21487,7 +21484,7 @@ function _resolveContextConcurrently() {
 
     if (dependencyMap.size > 0) {
       // This will throw if circular contexts detected.
-      detectCircularContexts(dependencyMap);
+      detectCircularContexts(dependencyMap, keyword);
       scheduleAsSerial = true;
       yield scheduleNext();
     }
@@ -21495,28 +21492,76 @@ function _resolveContextConcurrently() {
   return _resolveContextConcurrently.apply(this, arguments);
 }
 
+function syncResolveContextConcurrently(contextConfs, resolveContext) {
+  var keyword = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "CTX";
+  var dependencyMap = getDependencyMapOfContext(contextConfs, keyword);
+  var pendingDeps = new Set(Array.from(dependencyMap.keys()).map(contextConf => contextConf.name));
+  var includesComputed = Array.from(dependencyMap.values()).some(stats => stats.includesComputed);
+  var scheduleAsSerial = includesComputed;
+
+  function scheduleNext() {
+    var dep = Array.from(dependencyMap.entries()).find(predicateNextResolveFactory(pendingDeps, scheduleAsSerial));
+
+    if (dep) {
+      var [_contextConf] = dep;
+      var resolved = resolveContext(_contextConf);
+      dependencyMap.delete(_contextConf);
+
+      if (resolved) {
+        if (!pendingDeps.delete(_contextConf.name)) {
+          throw new Error("Duplicated context defined: ".concat(_contextConf.name));
+        }
+      }
+
+      scheduleNext();
+    }
+  }
+
+  scheduleNext(); // If there are still contexts left, it implies one of these situations:
+  //   - Circular contexts.
+  //     Such as: a depends on b, while b depends on a.
+  //   - Related contexts are all ignored.
+  //     Such as: a depends on b,
+  //     while both them are ignore by a falsy result of `if`.
+
+  if (dependencyMap.size > 0) {
+    // This will throw if circular contexts detected.
+    detectCircularContexts(dependencyMap, keyword);
+    scheduleAsSerial = true;
+    scheduleNext();
+  }
+}
+
+function predicateNextResolveFactory(pendingDeps, scheduleAsSerial) {
+  return (entry, index) => // When contexts contain computed CTX accesses, it implies a dynamic dependency map.
+  // So make them process sequentially, keep the same behavior as before.
+  scheduleAsSerial ? index === 0 : // A context is ready when it has no pending dependencies.
+  !entry[1].dependencies.some(dep => pendingDeps.has(dep));
+}
+
 function getDependencyMapOfContext(contextConfs) {
+  var keyword = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "CTX";
   var depsMap = new Map();
 
-  for (var _contextConf of contextConfs) {
+  for (var _contextConf2 of contextConfs) {
     var stats = {
       dependencies: [],
       includesComputed: false
     };
 
-    if (!_contextConf.property) {
-      visitStoryboardExpressions([_contextConf.if, _contextConf.value, _contextConf.resolve], beforeVisitContextFactory(stats), CTX$1);
+    if (!_contextConf2.property) {
+      visitStoryboardExpressions([_contextConf2.if, _contextConf2.value, _contextConf2.resolve], beforeVisitContextFactory(stats, keyword), keyword);
     }
 
-    depsMap.set(_contextConf, stats);
+    depsMap.set(_contextConf2, stats);
   }
 
   return depsMap;
 }
 
-function beforeVisitContextFactory(stats) {
+function beforeVisitContextFactory(stats, keyword) {
   return function beforeVisitContext(node, parent) {
-    if (node.name === CTX$1) {
+    if (node.name === keyword) {
       var memberParent = parent[parent.length - 1];
 
       if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
@@ -21539,17 +21584,17 @@ function beforeVisitContextFactory(stats) {
   };
 }
 
-function detectCircularContexts(dependencyMap) {
+function detectCircularContexts(dependencyMap, keyword) {
   var duplicatedMap = new Map(dependencyMap);
   var pendingDeps = new Set(Array.from(duplicatedMap.keys()).map(contextConf => contextConf.name));
 
   var next = () => {
     var processedAtLeastOne = false;
 
-    for (var [_contextConf2, stats] of duplicatedMap.entries()) {
+    for (var [_contextConf3, stats] of duplicatedMap.entries()) {
       if (!stats.dependencies.some(dep => pendingDeps.has(dep))) {
-        duplicatedMap.delete(_contextConf2);
-        pendingDeps.delete(_contextConf2.name);
+        duplicatedMap.delete(_contextConf3);
+        pendingDeps.delete(_contextConf3.name);
         processedAtLeastOne = true;
       }
     }
@@ -21562,7 +21607,7 @@ function detectCircularContexts(dependencyMap) {
   next();
 
   if (duplicatedMap.size > 0) {
-    throw new ReferenceError("Circular CTX detected: ".concat(Array.from(duplicatedMap.keys()).map(contextConf => contextConf.name).join(", ")));
+    throw new ReferenceError("Circular ".concat(keyword, " detected: ").concat(Array.from(duplicatedMap.keys()).map(contextConf => contextConf.name).join(", ")));
   }
 }
 
@@ -21701,23 +21746,24 @@ var jsonFieldsInBrick = ["properties", "events", "lifeCycle", "params", "if", "t
 
 var yamlFieldsInBrick = ["permissionsPreCheck", "transformFrom"]; // Fields started with `_` will be removed by default.
 
-var fieldsToRemoveInRoute = ["appId", "children", "creator", "ctime", "id", "instanceId", "graphInfo", "modifier", "mountPoint", "mtime", "org", "parent", "sort", "name", "providersBak", "providers_bak", "deleteAuthorizers", "readAuthorizers", "updateAuthorizers"];
-var fieldsToRemoveInBrick = fieldsToRemoveInRoute.concat("type", "alias"); // Those fields can be disposed if value is null.
+var baseFieldsToRemove = ["appId", "children", "creator", "ctime", "id", "graphInfo", "modifier", "mountPoint", "mtime", "org", "parent", "sort", "name", "providersBak", "providers_bak", "deleteAuthorizers", "readAuthorizers", "updateAuthorizers"];
+var fieldsToRemoveInRoute = baseFieldsToRemove.concat("instanceId");
+var fieldsToRemoveInBrick = baseFieldsToRemove.concat("type", "alias"); // Those fields can be disposed if value is null.
 
 var disposableNullFields = ["alias", "documentId", "hybrid", "bg", "context", "exports", "ref", "portal", "analyticsData"];
 function normalizeBuilderNode(node) {
   if (isBrickNode(node)) {
-    return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick, false);
+    return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick, "brick");
   }
 
   if (isRouteNode(node)) {
-    return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, true);
+    return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, "route");
   }
 
   return null;
 }
 
-function normalize(node, fieldsToRemove, jsonFields, yamlFields, cleanUpSegues) {
+function normalize(node, fieldsToRemove, jsonFields, yamlFields, type) {
   return Object.fromEntries(Object.entries(node) // Remove unused fields from CMDB.
   // Consider fields started with `_` as unused.
   .filter(_ref => {
@@ -21726,7 +21772,7 @@ function normalize(node, fieldsToRemove, jsonFields, yamlFields, cleanUpSegues)
   }) // Parse specific fields.
   .map(_ref2 => {
     var [key, value] = _ref2;
-    return [key, cleanUpSegues && key === "segues" ? getCleanSegues(value) : jsonFields.includes(key) ? safeJsonParse(value) : yamlFields.includes(key) ? safeYamlParse(value) : cloneDeep(value)];
+    return [key === "instanceId" ? "iid" : key, type === "route" && key === "segues" ? getCleanSegues(value) : jsonFields.includes(key) ? safeJsonParse(value) : yamlFields.includes(key) ? safeYamlParse(value) : cloneDeep(value)];
   }));
 } // Clear `segue._view` which is for development only.
 
@@ -21808,8 +21854,6 @@ function deepFreeze(object) {
   return Object.freeze(object);
 }
 
-var TRACK_CONTEXT = "track context";
-var CTX = "CTX";
 /**
  * Get tracking CTX for an evaluable expression in `track context` mode.
  *
@@ -21838,7 +21882,14 @@ var CTX = "CTX";
  */
 
 function trackContext(raw) {
-  if (raw.includes(TRACK_CONTEXT)) {
+  return track(raw, "track context", "CTX");
+}
+function trackState(raw) {
+  return track(raw, "track state", "STATE");
+}
+
+function track(raw, trackText, variableName) {
+  if (raw.includes(trackText)) {
     var contexts = new Set();
     var {
       expression
@@ -21846,7 +21897,7 @@ function trackContext(raw) {
       withParent: true,
       hooks: {
         beforeVisitGlobal(node, parent) {
-          if (node.name === CTX) {
+          if (node.name === variableName) {
             var memberParent = parent[parent.length - 1];
 
             if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
@@ -21865,12 +21916,12 @@ function trackContext(raw) {
     });
     var trackCtxExp;
 
-    if (expression.type === "SequenceExpression" && (trackCtxExp = expression.expressions[0]) && trackCtxExp.type === "Literal" && trackCtxExp.value === TRACK_CONTEXT) {
+    if (expression.type === "SequenceExpression" && (trackCtxExp = expression.expressions[0]) && trackCtxExp.type === "Literal" && trackCtxExp.value === trackText) {
       if (contexts.size > 0) {
         return Array.from(contexts);
       } else {
         // eslint-disable-next-line no-console
-        console.warn("You are using \"".concat(TRACK_CONTEXT, "\" but no CTX usage found in your expression: \"").concat(raw, "\""));
+        console.warn("You are using \"".concat(trackText, "\" but no `").concat(variableName, "` usage found in your expression: ").concat(JSON.stringify(raw)));
       }
     }
   }
@@ -21878,5 +21929,5 @@ function trackContext(raw) {
   return false;
 }
 
-export { JsonStorage, PrecookFunctionVisitor, PrecookVisitor, asyncProcessBrick, asyncProcessStoryboard, computeRealRoutePath, convertValueByPrecision, cook, createProviderClass, deepFreeze, formatValue, getDependencyMapOfContext, getDepsOfTemplates, getDllAndDepsByResource, getDllAndDepsOfBricks, getDllAndDepsOfStoryboard, getTemplateDepsOfStoryboard, hasOwnProperty$1 as hasOwnProperty, inject, isBrickNode, isCustomTemplateNode, isEvaluable, isObject, isRouteNode, isSnippetNode, lint, loadScript, mapCustomApisToNameAndNamespace, matchPath, normalizeBuilderNode, normalizeMenu, parseForAnalysis, precook, precookFunction, preevaluate, prefetchScript, resolveContextConcurrently, restoreDynamicTemplates, scanBricksInBrickConf, scanBricksInStoryboard, scanCustomApisInStoryboard, scanI18NInAny, scanI18NInStoryboard, scanPermissionActionsInAny, scanPermissionActionsInStoryboard, scanProcessorsInAny, scanProcessorsInStoryboard, scanRouteAliasInStoryboard, scanStoryboard, scanTemplatesInBrick, scanTemplatesInStoryboard, shouldAllowRecursiveEvaluations, smartDisplayForEvaluableString, toPath, tokTypes_1 as tokTypes, trackContext, transform, transformAndInject, visitStoryboardExpressions, visitStoryboardFunctions };
+export { JsonStorage, PrecookFunctionVisitor, PrecookVisitor, asyncProcessBrick, asyncProcessStoryboard, computeRealRoutePath, convertValueByPrecision, cook, createProviderClass, deepFreeze, formatValue, getDependencyMapOfContext, getDepsOfTemplates, getDllAndDepsByResource, getDllAndDepsOfBricks, getDllAndDepsOfStoryboard, getTemplateDepsOfStoryboard, hasOwnProperty$1 as hasOwnProperty, inject, isBrickNode, isCustomTemplateNode, isEvaluable, isObject, isRouteNode, isSnippetNode, lint, loadScript, mapCustomApisToNameAndNamespace, matchPath, normalizeBuilderNode, normalizeMenu, parseForAnalysis, precook, precookFunction, preevaluate, prefetchScript, resolveContextConcurrently, restoreDynamicTemplates, scanBricksInBrickConf, scanBricksInStoryboard, scanCustomApisInStoryboard, scanI18NInAny, scanI18NInStoryboard, scanPermissionActionsInAny, scanPermissionActionsInStoryboard, scanProcessorsInAny, scanProcessorsInStoryboard, scanRouteAliasInStoryboard, scanStoryboard, scanTemplatesInBrick, scanTemplatesInStoryboard, shouldAllowRecursiveEvaluations, smartDisplayForEvaluableString, syncResolveContextConcurrently, toPath, tokTypes_1 as tokTypes, trackContext, trackState, transform, transformAndInject, visitStoryboardExpressions, visitStoryboardFunctions };
 //# sourceMappingURL=index.esm.js.map