pxt-arcade 2.0.12 → 2.0.14

package/built/editor.js

@@ -89,6 +89,10 @@ var pxt;
                 const usedVariables = pxt.U.toArray(statementsRoot.querySelectorAll("block[type=variables_get]"));
                 paramValues.forEach(value => {
                     let oldVariableName = "";
+                    const handlerVarShadow = getShadow(value, "variables_get_reporter");
+                    if (!handlerVarShadow) {
+                        return;
+                    }
                     const connectedVarBlock = getChildBlock(value, "variables_get");
                     if (connectedVarBlock) {
                         // A variable is connected to the shadow variable reporter; use the name for
@@ -97,7 +101,6 @@ var pxt;
                         oldVariableName = connectedVarField.textContent;
                         value.removeChild(connectedVarBlock);
                     }
-                    const handlerVarShadow = getShadow(value, "variables_get_reporter");
                     const handlerVarField = getField(handlerVarShadow, "VAR");
                     const argReporterName = handlerVarField.textContent;
                     oldVariableName = oldVariableName || argReporterName;
@@ -274,6 +277,35 @@ var pxt;
                         .forEach(node => node.setAttribute("name", "height"));
                 }
             }
+            if (pxt.semver.strcmp(pkgTargetVersion || "0.0.0", "1.0.0") < 0) {
+                // At some point Sprite.z switched from being a getter/setter to a property
+                pxt.U.toArray(dom.querySelectorAll("block[type=Sprite_blockCombine_set]>field[name=property]"))
+                    .forEach(node => {
+                    if (node.textContent.trim() === "Sprite.z@set") {
+                        node.textContent = "Sprite.z";
+                    }
+                });
+                // The kind field used by the legacy animation editor switched to including the numerical
+                // enum value in the field (e.g. Walking -> 0Walking)
+                const actionKinds = pxt.U.toArray(dom.querySelectorAll("variable[type=ActionKind]"));
+                if (actionKinds.length) {
+                    pxt.U.toArray(dom.querySelectorAll("block[type=action_enum_shim]>field[name=MEMBER]"))
+                        .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=action_enum_shim]>field[name=MEMBER]")))
+                        .forEach(node => {
+                        const value = node.textContent;
+                        if (!/^\d/.test(value)) {
+                            // The correct numerical value will be in the variables
+                            for (const kind of actionKinds) {
+                                const match = /^\d+(.*)/.exec(kind.textContent);
+                                if ((match === null || match === void 0 ? void 0 : match[1]) === value) {
+                                    node.textContent = kind.textContent;
+                                    break;
+                                }
+                            }
+                        }
+                    });
+                }
+            }
         }
         function swapFieldIfNotMatching(eventRoot, fieldAName, fieldBName, fieldAShouldStartWith) {
             const fieldA = eventRoot.querySelector(`field[name=${fieldAName}]`);