pxt-core 9.1.2 → 9.1.5

package/built/cli.js

@@ -2077,7 +2077,7 @@ async function buildTargetCoreAsync(options = {}) {
     if (pxt.appTarget.cacheusedblocksdirs)
         cfg.tutorialInfo = await internalCacheUsedBlocksAsync();
     await forEachBundledPkgAsync(async (pkg, dirname) => {
-        var _a, _b;
+        var _a, _b, _c;
         pxt.log(`building bundled ${dirname}`);
         let isPrj = /prj$/.test(dirname);
         const isHw = /hw---/.test(dirname);
@@ -2111,12 +2111,12 @@ async function buildTargetCoreAsync(options = {}) {
             }
         }
         // For the projects, we need to save the base HEX file to the offline HEX cache
-        if (isPrj && pxt.appTarget.compile && pxt.appTarget.compile.hasHex) {
+        if (isPrj && ((_a = pxt.appTarget.compile) === null || _a === void 0 ? void 0 : _a.hasHex)) {
             if (!pkgOptions) {
                 pxt.debug(`Failed to extract native image for project ${dirname}`);
                 return;
             }
-            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_a = pkgOptions.otherMultiVariants) === null || _a === void 0 ? void 0 : _a.map(el => el.extinfo)) || [])];
+            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_b = pkgOptions.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
             for (const extinfo of hexFileExtInfo) {
                 // Place the base HEX image in the hex cache if necessary
                 let sha = extinfo.sha;
@@ -2137,24 +2137,25 @@ async function buildTargetCoreAsync(options = {}) {
             // We want to cache a hex file for each of the native packages in case they are added to a project.
             // This won't cover the whole matrix, but handles the common case of projects that add one extra
             // extension in the offline app.
-            const allDeps = pkg.sortedDeps(true).map(dep => path.resolve(path.join(dirname, dep.verArgument())))
+            const allDeps = pkg.sortedDeps(true)
+                .map(dep => path.resolve(path.join(dirname, dep.verArgument())))
                 .map(dep => path.resolve(dep).replace(/---.*/, "")); // keep path format (/ vs \\) consistent, trim --- suffix to avoid duplicate imports.
             const config = nodeutil.readPkgConfig(dirname);
             const host = pkg.host();
             const pkgsToBuildWith = packageDirs.filter(dirname => !allDeps.some(el => el.indexOf(dirname.replace(/---.*/, "")) !== -1));
-            pxt.log(`Dependencies of pkg: ${allDeps}`);
-            pxt.log(`Attemping to bundle necessary hexfiles to compile with: ${pkgsToBuildWith}`);
+            pxt.log(`Dependencies of base pkgs: ${allDeps.map(el => path.basename(el)).join(", ")}`);
             for (const extraPackage of pkgsToBuildWith) {
+                const extraPathBaseName = path.basename(extraPackage);
                 process.chdir(path.join(rootDir, dirname));
-                const deps = Object.assign(Object.assign({}, config.dependencies), { extra: "file:" + path.relative(path.resolve("."), extraPackage) });
+                const deps = Object.assign(Object.assign({}, config.dependencies), { [extraPathBaseName]: "file:" + path.relative(path.resolve("."), extraPackage) });
                 host.fileOverrides["pxt.json"] = JSON.stringify(Object.assign(Object.assign({}, config), { dependencies: deps }));
-                pxt.log(`Building hex cache for ${pkg.config.name} with dependencies:`);
+                pxt.log(`Building hex cache for ${extraPathBaseName} with dependencies:`);
                 console.dir(deps);
                 mainPkg = new pxt.MainPackage(host);
                 try {
                     const extraRes = await testForBuildTargetAsync(true, null);
                     if (extraRes) {
-                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_b = extraRes.options.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
+                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_c = extraRes.options.otherMultiVariants) === null || _c === void 0 ? void 0 : _c.map(el => el.extinfo)) || [])];
                         for (const extinfo of hexFileExtInfo) {
                             // Place the base HEX image in the hex cache if necessary
                             let sha = extinfo.sha;
@@ -2165,7 +2166,7 @@ async function buildTargetCoreAsync(options = {}) {
                             }
                             else {
                                 nodeutil.writeFileSync(hexFile, hex.join(os.EOL));
-                                pxt.debug(`created native image in offline cache for project ${dirname}: ${hexFile}`);
+                                pxt.log(`created native image in offline cache for project ${dirname}: ${hexFile}`);
                             }
                         }
                     }

package/built/pxt.js

@@ -162729,7 +162729,7 @@ async function buildTargetCoreAsync(options = {}) {
     if (pxt.appTarget.cacheusedblocksdirs)
         cfg.tutorialInfo = await internalCacheUsedBlocksAsync();
     await forEachBundledPkgAsync(async (pkg, dirname) => {
-        var _a, _b;
+        var _a, _b, _c;
         pxt.log(`building bundled ${dirname}`);
         let isPrj = /prj$/.test(dirname);
         const isHw = /hw---/.test(dirname);
@@ -162763,12 +162763,12 @@ async function buildTargetCoreAsync(options = {}) {
             }
         }
         // For the projects, we need to save the base HEX file to the offline HEX cache
-        if (isPrj && pxt.appTarget.compile && pxt.appTarget.compile.hasHex) {
+        if (isPrj && ((_a = pxt.appTarget.compile) === null || _a === void 0 ? void 0 : _a.hasHex)) {
             if (!pkgOptions) {
                 pxt.debug(`Failed to extract native image for project ${dirname}`);
                 return;
             }
-            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_a = pkgOptions.otherMultiVariants) === null || _a === void 0 ? void 0 : _a.map(el => el.extinfo)) || [])];
+            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_b = pkgOptions.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
             for (const extinfo of hexFileExtInfo) {
                 // Place the base HEX image in the hex cache if necessary
                 let sha = extinfo.sha;
@@ -162789,24 +162789,25 @@ async function buildTargetCoreAsync(options = {}) {
             // We want to cache a hex file for each of the native packages in case they are added to a project.
             // This won't cover the whole matrix, but handles the common case of projects that add one extra
             // extension in the offline app.
-            const allDeps = pkg.sortedDeps(true).map(dep => path.resolve(path.join(dirname, dep.verArgument())))
+            const allDeps = pkg.sortedDeps(true)
+                .map(dep => path.resolve(path.join(dirname, dep.verArgument())))
                 .map(dep => path.resolve(dep).replace(/---.*/, "")); // keep path format (/ vs \\) consistent, trim --- suffix to avoid duplicate imports.
             const config = nodeutil.readPkgConfig(dirname);
             const host = pkg.host();
             const pkgsToBuildWith = packageDirs.filter(dirname => !allDeps.some(el => el.indexOf(dirname.replace(/---.*/, "")) !== -1));
-            pxt.log(`Dependencies of pkg: ${allDeps}`);
-            pxt.log(`Attemping to bundle necessary hexfiles to compile with: ${pkgsToBuildWith}`);
+            pxt.log(`Dependencies of base pkgs: ${allDeps.map(el => path.basename(el)).join(", ")}`);
             for (const extraPackage of pkgsToBuildWith) {
+                const extraPathBaseName = path.basename(extraPackage);
                 process.chdir(path.join(rootDir, dirname));
-                const deps = Object.assign(Object.assign({}, config.dependencies), { extra: "file:" + path.relative(path.resolve("."), extraPackage) });
+                const deps = Object.assign(Object.assign({}, config.dependencies), { [extraPathBaseName]: "file:" + path.relative(path.resolve("."), extraPackage) });
                 host.fileOverrides["pxt.json"] = JSON.stringify(Object.assign(Object.assign({}, config), { dependencies: deps }));
-                pxt.log(`Building hex cache for ${pkg.config.name} with dependencies:`);
+                pxt.log(`Building hex cache for ${extraPathBaseName} with dependencies:`);
                 console.dir(deps);
                 mainPkg = new pxt.MainPackage(host);
                 try {
                     const extraRes = await testForBuildTargetAsync(true, null);
                     if (extraRes) {
-                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_b = extraRes.options.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
+                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_c = extraRes.options.otherMultiVariants) === null || _c === void 0 ? void 0 : _c.map(el => el.extinfo)) || [])];
                         for (const extinfo of hexFileExtInfo) {
                             // Place the base HEX image in the hex cache if necessary
                             let sha = extinfo.sha;
@@ -162817,7 +162818,7 @@ async function buildTargetCoreAsync(options = {}) {
                             }
                             else {
                                 nodeutil.writeFileSync(hexFile, hex.join(os.EOL));
-                                pxt.debug(`created native image in offline cache for project ${dirname}: ${hexFile}`);
+                                pxt.log(`created native image in offline cache for project ${dirname}: ${hexFile}`);
                             }
                         }
                     }

package/built/pxtblockly.js

@@ -13656,6 +13656,53 @@ var pxtblockly;
             if (value === "CREATE") {
                 promptAndCreateKind(this.sourceBlock_.workspace, this.opts, lf("New {0}:", this.opts.memberName), newName => newName && this.setValue(newName));
             }
+            else if (value === "RENAME") {
+                const ws = this.sourceBlock_.workspace;
+                const toRename = ws.getVariable(this.value_, kindType(this.opts.name));
+                const oldName = toRename.name;
+                if (this.opts.initialMembers.indexOf(oldName) !== -1) {
+                    Blockly.alert(lf("The built-in {0} '{1}' cannot be renamed. Try creating a new kind instead!", this.opts.memberName, oldName));
+                    return;
+                }
+                promptAndRenameKind(ws, Object.assign(Object.assign({}, this.opts), { toRename }), lf("Rename '{0}':", oldName), newName => {
+                    // Update the values of all existing field instances
+                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                        && field.getValue() === oldName
+                        && field.opts.name === this.opts.name);
+                    for (const field of allFields) {
+                        field.ref.setValue(newName);
+                    }
+                });
+            }
+            else if (value === "DELETE") {
+                const ws = this.sourceBlock_.workspace;
+                const toDelete = ws.getVariable(this.value_, kindType(this.opts.name));
+                const varName = toDelete.name;
+                if (this.opts.initialMembers.indexOf(varName) !== -1) {
+                    Blockly.alert(lf("The built-in {0} '{1}' cannot be deleted.", this.opts.memberName, varName));
+                    return;
+                }
+                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                    && field.getValue() === varName
+                    && field.opts.name === this.opts.name);
+                if (uses.length > 1) {
+                    Blockly.confirm(lf("Delete {0} uses of the \"{1}\" {2}?", uses.length, varName, this.opts.memberName), response => {
+                        if (!response)
+                            return;
+                        Blockly.Events.setGroup(true);
+                        for (const use of uses) {
+                            use.block.dispose(true);
+                        }
+                        ws.deleteVariableById(toDelete.getId());
+                        this.setValue(this.opts.initialMembers[0]);
+                        Blockly.Events.setGroup(false);
+                    });
+                }
+                else {
+                    ws.deleteVariableById(toDelete.getId());
+                    this.setValue(this.opts.initialMembers[0]);
+                }
+            }
             else {
                 super.onItemSelected_(menu, menuItem);
             }
@@ -13680,7 +13727,7 @@ var pxtblockly;
                         createVariableForKind(ws, this.opts, memberName);
                     }
                 });
-                if (this.getValue() === "CREATE") {
+                if (this.getValue() === "CREATE" || this.getValue() === "RENAME" || this.getValue() === "DELETE") {
                     if (this.opts.initialMembers.length) {
                         this.setValue(this.opts.initialMembers[0]);
                     }
@@ -13704,10 +13751,13 @@ var pxtblockly;
                 opts.initialMembers.forEach((e) => res.push([e, e]));
             }
             res.push([lf("Add a new {0}...", opts.memberName), "CREATE"]);
+            res.push([undefined, "SEPARATOR"]);
+            res.push([lf("Rename {0}...", opts.memberName), "RENAME"]);
+            res.push([lf("Delete {0}...", opts.memberName), "DELETE"]);
             return res;
         };
     }
-    function promptAndCreateKind(ws, opts, message, cb) {
+    function promptForName(ws, opts, message, cb, prompt) {
         Blockly.prompt(message, null, response => {
             if (response) {
                 let nameIsValid = false;
@@ -13720,28 +13770,41 @@ var pxtblockly;
                     }
                 }
                 if (!nameIsValid) {
-                    Blockly.alert(lf("Names must start with a letter and can only contain letters, numbers, '$', and '_'."), () => promptAndCreateKind(ws, opts, message, cb));
+                    Blockly.alert(lf("Names must start with a letter and can only contain letters, numbers, '$', and '_'."), () => promptForName(ws, opts, message, cb, prompt));
                     return;
                 }
-                if (pxt.blocks.isReservedWord(response)) {
-                    Blockly.alert(lf("'{0}' is a reserved word and cannot be used.", response), () => promptAndCreateKind(ws, opts, message, cb));
+                if (pxt.blocks.isReservedWord(response) || response === "CREATE" || response === "RENAME" || response === "DELETE") {
+                    Blockly.alert(lf("'{0}' is a reserved word and cannot be used.", response), () => promptForName(ws, opts, message, cb, prompt));
                     return;
                 }
                 const existing = getExistingKindMembers(ws, opts.name);
                 for (let i = 0; i < existing.length; i++) {
                     const name = existing[i];
                     if (name === response) {
-                        Blockly.alert(lf("A {0} named '{1}' already exists.", opts.memberName, response), () => promptAndCreateKind(ws, opts, message, cb));
+                        Blockly.alert(lf("A {0} named '{1}' already exists.", opts.memberName, response), () => promptForName(ws, opts, message, cb, prompt));
                         return;
                     }
                 }
                 if (response === opts.createFunctionName) {
-                    Blockly.alert(lf("'{0}' is a reserved name.", opts.createFunctionName), () => promptAndCreateKind(ws, opts, message, cb));
+                    Blockly.alert(lf("'{0}' is a reserved name.", opts.createFunctionName), () => promptForName(ws, opts, message, cb, prompt));
                 }
-                cb(createVariableForKind(ws, opts, response));
+                cb(response);
             }
         }, { placeholder: opts.promptHint });
     }
+    function promptAndCreateKind(ws, opts, message, cb) {
+        const responseHandler = (response) => {
+            cb(createVariableForKind(ws, opts, response));
+        };
+        promptForName(ws, opts, message, responseHandler, promptAndCreateKind);
+    }
+    function promptAndRenameKind(ws, opts, message, cb) {
+        const responseHandler = (response) => {
+            ws.getVariableMap().renameVariable(opts.toRename, response);
+            cb(response);
+        };
+        promptForName(ws, opts, message, responseHandler, promptAndRenameKind);
+    }
     function getExistingKindMembers(ws, kindName) {
         const existing = ws.getVariablesOfType(kindType(kindName));
         if (existing && existing.length) {

package/built/pxtblocks.js

@@ -10094,6 +10094,53 @@ var pxtblockly;
             if (value === "CREATE") {
                 promptAndCreateKind(this.sourceBlock_.workspace, this.opts, lf("New {0}:", this.opts.memberName), newName => newName && this.setValue(newName));
             }
+            else if (value === "RENAME") {
+                const ws = this.sourceBlock_.workspace;
+                const toRename = ws.getVariable(this.value_, kindType(this.opts.name));
+                const oldName = toRename.name;
+                if (this.opts.initialMembers.indexOf(oldName) !== -1) {
+                    Blockly.alert(lf("The built-in {0} '{1}' cannot be renamed. Try creating a new kind instead!", this.opts.memberName, oldName));
+                    return;
+                }
+                promptAndRenameKind(ws, Object.assign(Object.assign({}, this.opts), { toRename }), lf("Rename '{0}':", oldName), newName => {
+                    // Update the values of all existing field instances
+                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                        && field.getValue() === oldName
+                        && field.opts.name === this.opts.name);
+                    for (const field of allFields) {
+                        field.ref.setValue(newName);
+                    }
+                });
+            }
+            else if (value === "DELETE") {
+                const ws = this.sourceBlock_.workspace;
+                const toDelete = ws.getVariable(this.value_, kindType(this.opts.name));
+                const varName = toDelete.name;
+                if (this.opts.initialMembers.indexOf(varName) !== -1) {
+                    Blockly.alert(lf("The built-in {0} '{1}' cannot be deleted.", this.opts.memberName, varName));
+                    return;
+                }
+                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                    && field.getValue() === varName
+                    && field.opts.name === this.opts.name);
+                if (uses.length > 1) {
+                    Blockly.confirm(lf("Delete {0} uses of the \"{1}\" {2}?", uses.length, varName, this.opts.memberName), response => {
+                        if (!response)
+                            return;
+                        Blockly.Events.setGroup(true);
+                        for (const use of uses) {
+                            use.block.dispose(true);
+                        }
+                        ws.deleteVariableById(toDelete.getId());
+                        this.setValue(this.opts.initialMembers[0]);
+                        Blockly.Events.setGroup(false);
+                    });
+                }
+                else {
+                    ws.deleteVariableById(toDelete.getId());
+                    this.setValue(this.opts.initialMembers[0]);
+                }
+            }
             else {
                 super.onItemSelected_(menu, menuItem);
             }
@@ -10118,7 +10165,7 @@ var pxtblockly;
                         createVariableForKind(ws, this.opts, memberName);
                     }
                 });
-                if (this.getValue() === "CREATE") {
+                if (this.getValue() === "CREATE" || this.getValue() === "RENAME" || this.getValue() === "DELETE") {
                     if (this.opts.initialMembers.length) {
                         this.setValue(this.opts.initialMembers[0]);
                     }
@@ -10142,10 +10189,13 @@ var pxtblockly;
                 opts.initialMembers.forEach((e) => res.push([e, e]));
             }
             res.push([lf("Add a new {0}...", opts.memberName), "CREATE"]);
+            res.push([undefined, "SEPARATOR"]);
+            res.push([lf("Rename {0}...", opts.memberName), "RENAME"]);
+            res.push([lf("Delete {0}...", opts.memberName), "DELETE"]);
             return res;
         };
     }
-    function promptAndCreateKind(ws, opts, message, cb) {
+    function promptForName(ws, opts, message, cb, prompt) {
         Blockly.prompt(message, null, response => {
             if (response) {
                 let nameIsValid = false;
@@ -10158,28 +10208,41 @@ var pxtblockly;
                     }
                 }
                 if (!nameIsValid) {
-                    Blockly.alert(lf("Names must start with a letter and can only contain letters, numbers, '$', and '_'."), () => promptAndCreateKind(ws, opts, message, cb));
+                    Blockly.alert(lf("Names must start with a letter and can only contain letters, numbers, '$', and '_'."), () => promptForName(ws, opts, message, cb, prompt));
                     return;
                 }
-                if (pxt.blocks.isReservedWord(response)) {
-                    Blockly.alert(lf("'{0}' is a reserved word and cannot be used.", response), () => promptAndCreateKind(ws, opts, message, cb));
+                if (pxt.blocks.isReservedWord(response) || response === "CREATE" || response === "RENAME" || response === "DELETE") {
+                    Blockly.alert(lf("'{0}' is a reserved word and cannot be used.", response), () => promptForName(ws, opts, message, cb, prompt));
                     return;
                 }
                 const existing = getExistingKindMembers(ws, opts.name);
                 for (let i = 0; i < existing.length; i++) {
                     const name = existing[i];
                     if (name === response) {
-                        Blockly.alert(lf("A {0} named '{1}' already exists.", opts.memberName, response), () => promptAndCreateKind(ws, opts, message, cb));
+                        Blockly.alert(lf("A {0} named '{1}' already exists.", opts.memberName, response), () => promptForName(ws, opts, message, cb, prompt));
                         return;
                     }
                 }
                 if (response === opts.createFunctionName) {
-                    Blockly.alert(lf("'{0}' is a reserved name.", opts.createFunctionName), () => promptAndCreateKind(ws, opts, message, cb));
+                    Blockly.alert(lf("'{0}' is a reserved name.", opts.createFunctionName), () => promptForName(ws, opts, message, cb, prompt));
                 }
-                cb(createVariableForKind(ws, opts, response));
+                cb(response);
             }
         }, { placeholder: opts.promptHint });
     }
+    function promptAndCreateKind(ws, opts, message, cb) {
+        const responseHandler = (response) => {
+            cb(createVariableForKind(ws, opts, response));
+        };
+        promptForName(ws, opts, message, responseHandler, promptAndCreateKind);
+    }
+    function promptAndRenameKind(ws, opts, message, cb) {
+        const responseHandler = (response) => {
+            ws.getVariableMap().renameVariable(opts.toRename, response);
+            cb(response);
+        };
+        promptForName(ws, opts, message, responseHandler, promptAndRenameKind);
+    }
     function getExistingKindMembers(ws, kindName) {
         const existing = ws.getVariablesOfType(kindType(kindName));
         if (existing && existing.length) {