@symbo.ls/scratch 2.11.470 → 2.11.497

package/dist/cjs/utils/sprite.js

@@ -300,6 +300,7 @@ var require_array = __commonJS({
       addItemAfterEveryElement: () => addItemAfterEveryElement,
       arrayContainsOtherArray: () => arrayContainsOtherArray,
       arraysEqual: () => arraysEqual,
+      checkIfStringIsInArray: () => checkIfStringIsInArray,
       cutArrayAfterValue: () => cutArrayAfterValue,
       cutArrayBeforeValue: () => cutArrayBeforeValue,
       filterArrays: () => filterArrays,
@@ -346,11 +347,11 @@ var require_array = __commonJS({
     var joinArrays = (...arrays) => {
       return [].concat(...arrays);
     };
-    var mergeArray = (arr, excludeFrom = []) => {
-      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
+    var mergeArray = (arr, exclude = []) => {
+      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, { exclude }), exclude), {});
     };
     var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
+      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
     };
     var cutArrayBeforeValue = (arr, value) => {
       const index = arr.indexOf(value);
@@ -419,6 +420,11 @@ var require_array = __commonJS({
       const excludeSet = new Set(excludeArr);
       return sourceArr.filter((item) => !excludeSet.has(item));
     };
+    var checkIfStringIsInArray = (string, arr) => {
+      if (!string)
+        return;
+      return arr.filter((v) => string.includes(v)).length;
+    };
   }
 });
 
@@ -473,14 +479,15 @@ var require_string = __commonJS({
       2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
       3: /\{\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}\}/g
     };
-    var replaceLiteralsWithObjectFields = (str, state, options = {}) => {
+    function replaceLiteralsWithObjectFields(str, options = {}, forcedState) {
       if (!str.includes(options.bracketsLength === 3 ? "{{{" : "{{"))
         return str;
       const reg = brackRegex[options.bracketsLength || 2];
+      const obj = forcedState || this.state || {};
       return str.replace(reg, (_, parentPath, variable) => {
         if (parentPath) {
           const parentLevels = parentPath.match(options.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
-          let parentState = state;
+          let parentState = obj;
           for (let i = 0; i < parentLevels; i++) {
             parentState = parentState.parent;
             if (!parentState) {
@@ -490,11 +497,11 @@ var require_string = __commonJS({
           const value = parentState[variable.trim()];
           return value !== void 0 ? `${value}` : "";
         } else {
-          const value = state[variable.trim()];
+          const value = obj[variable.trim()];
           return value !== void 0 ? `${value}` : "";
         }
       });
-    };
+    }
     var lowercaseFirstLetter = (inputString) => {
       return `${inputString.charAt(0).toLowerCase()}${inputString.slice(1)}`;
     };
@@ -599,8 +606,6 @@ var require_object = __commonJS({
       createNestedObject: () => createNestedObject,
       createObjectWithoutPrototype: () => createObjectWithoutPrototype,
       deepClone: () => deepClone2,
-      deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -694,78 +699,56 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneExclude = (obj, excludeFrom = []) => {
-      if ((0, import_types.isArray)(obj)) {
-        return obj.map((x) => deepCloneExclude(x, excludeFrom));
-      }
-      const o = {};
-      for (const k in obj) {
-        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, k);
-        if (!hasOwnProperty2 || excludeFrom.includes(k) || k.startsWith("__"))
-          continue;
-        let v = obj[k];
-        if (k === "extend" && (0, import_types.isArray)(v)) {
-          v = mergeArrayExclude(v, excludeFrom);
-        }
-        if ((0, import_types.isArray)(v)) {
-          o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
-        } else if ((0, import_types.isObject)(v)) {
-          o[k] = deepCloneExclude(v, excludeFrom);
-        } else
-          o[k] = v;
-      }
-      return o;
-    };
-    var mergeArrayExclude = (arr, excl = []) => {
-      return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
+    var mergeArrayExclude = (arr, exclude = []) => {
+      return arr.reduce((acc, curr) => deepMerge2(acc, deepClone2(curr, { exclude })), {});
     };
-    var deepClone2 = (obj, exclude = [], cleanUndefined = false, visited = /* @__PURE__ */ new WeakMap()) => {
-      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj))
+    var deepClone2 = (obj, options = {}) => {
+      const {
+        exclude = [],
+        cleanUndefined = false,
+        cleanNull = false,
+        window: targetWindow,
+        visited = /* @__PURE__ */ new WeakMap(),
+        handleExtend = false
+      } = options;
+      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj)) {
         return obj;
-      if (visited.has(obj))
+      }
+      if (visited.has(obj)) {
         return visited.get(obj);
-      const clone2 = (0, import_types.isArray)(obj) ? [] : {};
+      }
+      const clone2 = targetWindow ? (0, import_types.isArray)(obj) ? new targetWindow.Array() : new targetWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
       visited.set(obj, clone2);
       for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
-          const value = obj[key];
-          if ((0, import_node.isDOMNode)(value)) {
-            clone2[key] = value;
-          } else if (key === "extend" && (0, import_types.isArray)(value)) {
-            clone2[key] = (0, import_array.mergeArray)(value, exclude);
-          } else if ((0, import_types.isObjectLike)(value)) {
-            clone2[key] = deepClone2(value, exclude, cleanUndefined, visited);
-          } else {
-            clone2[key] = value;
-          }
-        }
-      }
-      return clone2;
-    };
-    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
-      if ((0, import_types.isObjectLike)(obj)) {
-        if (visited.has(obj)) {
-          return obj;
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+          continue;
+        if (exclude.includes(key) || key.startsWith("__") || key === "__proto__")
+          continue;
+        const value = obj[key];
+        if (cleanUndefined && (0, import_types.isUndefined)(value) || cleanNull && (0, import_types.isNull)(value))
+          continue;
+        if ((0, import_node.isDOMNode)(value)) {
+          clone2[key] = value;
+          continue;
         }
-        visited.add(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))
+        if (handleExtend && key === "extend" && (0, import_types.isArray)(value)) {
+          clone2[key] = (0, import_array.mergeArray)(value, exclude);
           continue;
-        const objProp = obj[prop];
-        if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
+        }
+        if ((0, import_types.isFunction)(value) && targetWindow) {
+          clone2[key] = targetWindow.eval("(" + value.toString() + ")");
           continue;
         }
-        if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
-        } else if ((0, import_types.isFunction)(objProp) && options.window) {
-          o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
+        if ((0, import_types.isObjectLike)(value)) {
+          clone2[key] = deepClone2(value, {
+            ...options,
+            visited
+          });
         } else {
-          o[prop] = objProp;
+          clone2[key] = value;
         }
       }
-      return o;
+      return clone2;
     };
     var deepStringify = (obj, stringified = {}) => {
       var _a, _b;
@@ -1675,6 +1658,7 @@ var require_component = __commonJS({
       checkIfKeyIsProperty: () => checkIfKeyIsProperty,
       checkIfSugar: () => checkIfSugar,
       extendizeByKey: () => extendizeByKey,
+      extractComponentKeyFromKey: () => extractComponentKeyFromKey,
       getCapitalCaseKeys: () => getCapitalCaseKeys,
       getChildrenComponentsByKey: () => getChildrenComponentsByKey,
       getExtendsInElement: () => getExtendsInElement,
@@ -1731,11 +1715,14 @@ var require_component = __commonJS({
       }
       return !hasComponentAttrs || childProps || extendProps || children || childExtends;
     };
+    var extractComponentKeyFromKey = (key) => {
+      return key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
+    };
     var extendizeByKey = (element, parent, key) => {
       const { context } = parent;
       const { tag, extend, childExtends } = element;
       const isSugar = checkIfSugar(element, parent, key);
-      const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
+      const extendFromKey = extractComponentKeyFromKey(key);
       const isExtendKeyComponent = context && context.components[extendFromKey];
       if (element === isExtendKeyComponent)
         return element;
@@ -1784,7 +1771,7 @@ var require_component = __commonJS({
         if (newChild === null)
           assignChild(null);
         else if (!childElem)
-          assignChild((0, import__.deepCloneWithExtend)(newChild));
+          assignChild((0, import__.deepClone)(newChild));
         else {
           const isSugarChildElem = checkIfSugar(childElem, parent, key);
           if (isSugarChildElem)
@@ -1855,7 +1842,7 @@ var require_component = __commonJS({
             if (checkIfKeyIsComponent(key)) {
               result.push(key);
             }
-            if (key === "extend") {
+            if (key === "extend" || key === "extends") {
               if (typeof o[key] === "string") {
                 result.push(o[key]);
               } else if (Array.isArray(o[key])) {