@next-core/brick-utils 2.28.7 → 2.28.11

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.28.11](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.28.10...@next-core/brick-utils@2.28.11) (2021-10-22)
+
+
+### Bug Fixes
+
+* dispose specific null fields ([0f50281](https://github.com/easyops-cn/next-core/commit/0f502815abf47faf4156bfbf91029125bbda01a4))
+
+
+
+
+
+## [2.28.10](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.28.9...@next-core/brick-utils@2.28.10) (2021-10-21)
+
+**Note:** Version bump only for package @next-core/brick-utils
+
+
+
+
+
+## [2.28.9](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.28.8...@next-core/brick-utils@2.28.9) (2021-10-20)
+
+**Note:** Version bump only for package @next-core/brick-utils
+
+
+
+
+
+## [2.28.8](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.28.7...@next-core/brick-utils@2.28.8) (2021-10-20)
+
+**Note:** Version bump only for package @next-core/brick-utils
+
+
+
+
+
 ## [2.28.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.28.6...@next-core/brick-utils@2.28.7) (2021-10-13)
 
 

package/dist/index.bundle.js

@@ -18589,7 +18589,11 @@
   }
 
   function preevaluate(raw, options) {
-    var source = raw.replace(/^\s*<%~?\s|\s%>\s*$/g, "");
+    var fixes = [];
+    var source = raw.replace(/^\s*<%~?\s|\s%>\s*$/g, m => {
+      fixes.push(m);
+      return "";
+    });
     var expression = parseAsEstreeExpression(source);
     var attemptToVisitGlobals = precook(expression, _objectSpread__default["default"](_objectSpread__default["default"]({}, options), {}, {
       expressionOnly: true
@@ -18597,7 +18601,9 @@
     return {
       expression,
       attemptToVisitGlobals,
-      source
+      source,
+      prefix: fixes[0],
+      suffix: fixes[1]
     };
   }
   function isEvaluable(raw) {
@@ -20405,32 +20411,26 @@
 
   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", "deleteAuthorizers", "readAuthorizers", "updateAuthorizers"];
-  var fieldsToRemoveInBrick = fieldsToRemoveInRoute.concat("type");
+  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 disposableNullFields = ["alias", "documentId", "hybrid", "bg", "context", "exports", "ref", "portal"];
   function normalizeBuilderNode(node) {
     if (isBrickNode(node)) {
-      return normalizeBuilderBrickNode(node);
+      return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick, false);
     }
 
     if (isRouteNode(node)) {
-      return normalizeBuilderRouteNode(node);
+      return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, true);
     }
 
     return null;
   }
 
-  function normalizeBuilderBrickNode(node) {
-    return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick);
-  }
-
-  function normalizeBuilderRouteNode(node) {
-    return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, true);
-  }
-
   function normalize(node, fieldsToRemove, jsonFields, yamlFields, cleanUpSegues) {
     return Object.fromEntries(Object.entries(node) // Remove unused fields from CMDB.
     // Consider fields started with `_` as unused.
-    .filter(([key]) => key[0] !== "_" && !fieldsToRemove.includes(key)) // Parse json fields.
+    .filter(([key, value]) => !(key[0] === "_" || fieldsToRemove.includes(key) || value === null && disposableNullFields.includes(key))) // Parse specific fields.
     .map(([key, value]) => [key, cleanUpSegues && key === "segues" ? getCleanSegues(value) : jsonFields.includes(key) ? safeJsonParse(value) : yamlFields.includes(key) ? safeYamlParse(value) : lodash.cloneDeep(value)]));
   } // Clear `segue._view` which is for development only.