@symbo.ls/scratch 2.11.410 → 2.11.429

package/dist/cjs/utils/color.js

@@ -378,10 +378,10 @@ var require_array = __commonJS({
       return [].concat(...arrays);
     };
     var mergeArray = (arr, excludeFrom = []) => {
-      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
+      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
     };
     var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
+      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
     };
     var cutArrayBeforeValue = (arr, value) => {
       const index = arr.indexOf(value);
@@ -487,6 +487,8 @@ var require_string = __commonJS({
     __export2(string_exports, {
       customDecodeURIComponent: () => customDecodeURIComponent,
       customEncodeURIComponent: () => customEncodeURIComponent,
+      decodeNewlines: () => decodeNewlines,
+      encodeNewlines: () => encodeNewlines,
       findKeyPosition: () => findKeyPosition,
       lowercaseFirstLetter: () => lowercaseFirstLetter,
       replaceLiteralsWithObjectFields: () => replaceLiteralsWithObjectFields,
@@ -590,6 +592,12 @@ var require_string = __commonJS({
         return char;
       });
     };
+    var encodeNewlines = (str) => {
+      return str.split("\n").join("/////n").split("`").join("/////tilde").split("$").join("/////dlrsgn");
+    };
+    var decodeNewlines = (encodedStr) => {
+      return encodedStr.split("/////n").join("\n").split("/////tilde").join("`").split("/////dlrsgn").join("$");
+    };
     var customEncodeURIComponent = (str) => {
       return str.split("").map((char) => {
         if (/[^a-zA-Z0-9\s]/.test(char)) {
@@ -768,7 +776,7 @@ var require_object = __commonJS({
       return o;
     };
     var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
-      const o = (0, import_types.isArray)(obj) ? [] : {};
+      const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
         if (!Object.prototype.hasOwnProperty.call(obj, prop))
           continue;
@@ -1022,7 +1030,7 @@ var require_object = __commonJS({
     };
     var overwriteDeep = (obj, params, excludeFrom = []) => {
       for (const e in params) {
-        if (e === "__proto__")
+        if (e === "__ref")
           continue;
         if (excludeFrom.includes(e) || e.startsWith("__"))
           continue;
@@ -1144,6 +1152,12 @@ var require_object = __commonJS({
         if (foundString || foundInArray)
           return el;
       }
+      if (el.parent && el.parent.childExtend) {
+        const foundString = (0, import_types.isString)(el.parent.childExtend) && el.parent.childExtend === key;
+        const foundInArray = (0, import_types.isArray)(el.parent.childExtend) && el.parent.childExtend.filter((v) => v === key).length;
+        if (foundString || foundInArray)
+          return el;
+      }
     };
     var getExtendsInElement = (obj) => {
       let result = [];