@next-core/editor-bricks-helper 0.32.36 → 0.33.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.33.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.32.36...@next-core/editor-bricks-helper@0.33.0) (2021-12-23)
+
+
+### Features
+
+* display brick alias/id/dataset.testid/brick.name in order ([3645841](https://github.com/easyops-cn/next-core/commit/3645841ccf12f8ca3fe74f673a541ec75ff45d1c))
+
+
+
+
+
 ## [0.32.36](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.32.35...@next-core/editor-bricks-helper@0.32.36) (2021-12-17)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper

package/dist/index.bundle.js

@@ -414,10 +414,11 @@
     }
   }
 
-  var nodeIgnoreFields = ["parent", "children", "graphInfo", "mountPoint"];
-  function getBuilderNode(nodeData, nodeUid, isTemplateInternalNode) {
-    var _nodeData$alias;
+  var nodeIgnoreFields = ["parent", "children", "graphInfo", "mountPoint"]; // Match evaluations and placeholders,
+  // E.g.: `<% QUERY.x %>` or `${QUERY.x}`.
 
+  var computationRegExp = /[<{]/;
+  function getBuilderNode(nodeData, nodeUid, isTemplateInternalNode) {
     var matchedSelectors = [];
 
     if (nodeData.brick) {
@@ -427,19 +428,29 @@
     var normalized = brickUtils.normalizeBuilderNode(nodeData);
     var jsonFieldsInBrick = ["properties", "events", "lifeCycle"];
     var parsedFields = [];
+    var parsedId;
+    var parsedTestId;
 
     for (var field of jsonFieldsInBrick) {
       var parsed = lodash.cloneDeep(normalized === null || normalized === void 0 ? void 0 : normalized[field]);
       parsedFields.push(["$$parsed".concat(lodash.upperFirst(field)), parsed !== null && parsed !== void 0 ? parsed : {}]);
 
-      if (field === "properties" && parsed !== null && parsed !== void 0 && parsed.id && typeof parsed.id === "string" && // Ignore evaluations and placeholders,
-      // E.g.: `<% QUERY.x %>` or `${QUERY.x}`.
-      !/[<{]/.test(parsed.id)) {
-        matchedSelectors.push("#".concat(parsed.id));
+      if (field === "properties") {
+        var _parsed$dataset;
+
+        var tempParsedId = void 0;
+        var tempParsedTestId = void 0;
+
+        if ((tempParsedId = parsed === null || parsed === void 0 ? void 0 : parsed.id, typeof tempParsedId === "string") && !computationRegExp.test(tempParsedId)) {
+          parsedId = tempParsedId;
+          matchedSelectors.push("#".concat(parsedId));
+        } else if ((tempParsedTestId = parsed === null || parsed === void 0 ? void 0 : (_parsed$dataset = parsed.dataset) === null || _parsed$dataset === void 0 ? void 0 : _parsed$dataset.testid, typeof tempParsedTestId === "string") && !computationRegExp.test(tempParsedTestId)) {
+          parsedTestId = tempParsedTestId;
+        }
       }
     }
 
-    return Object.fromEntries(Object.entries(nodeData).filter(entry => !nodeIgnoreFields.includes(entry[0])).concat([["alias", (_nodeData$alias = nodeData.alias) !== null && _nodeData$alias !== void 0 ? _nodeData$alias : brickUtils.isBrickNode(nodeData) ? nodeData.brick.split(".").pop() : undefined], ["$$uid", nodeUid], ["$$matchedSelectors", matchedSelectors], ["$$isTemplateInternalNode", isTemplateInternalNode], ["$$normalized", normalized]]).concat(parsedFields));
+    return Object.fromEntries(Object.entries(nodeData).filter(entry => !nodeIgnoreFields.includes(entry[0])).concat([["alias", nodeData.alias || (brickUtils.isBrickNode(nodeData) ? parsedId || parsedTestId || nodeData.brick.split(".").pop() : undefined)], ["$$uid", nodeUid], ["$$matchedSelectors", matchedSelectors], ["$$isTemplateInternalNode", isTemplateInternalNode], ["$$normalized", normalized]]).concat(parsedFields));
   }
 
   function getAppendingNodesAndEdges(nodeData, nodeUid, templateSourceMap) {