pxt-core 9.1.13 → 9.1.14

package/built/cli.js

@@ -1830,10 +1830,8 @@ async function buildSemanticUIAsync(parsed) {
         // This is just to support the local skillmap/cra-app serve for development
         nodeutil.cp("built/web/react-common-skillmap.css", "node_modules/pxt-core/skillmap/public/blb");
         nodeutil.cp("built/web/react-common-authcode.css", "node_modules/pxt-core/authcode/public/blb");
-        nodeutil.cp("built/web/react-common-multiplayer.css", "node_modules/pxt-core/multiplayer/public/blb");
         nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/skillmap/public/blb");
         nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/authcode/public/blb");
-        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/multiplayer/public/blb");
     }
 }
 async function linkFontAsync(font, semCss, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
@@ -1913,13 +1911,6 @@ function buildSkillMapAsync(parsed) {
 function buildAuthcodeAsync(parsed) {
     return buildReactAppAsync("authcode", parsed, { copyAssets: false });
 }
-function buildMultiplayerAsync(parsed) {
-    return buildReactAppAsync("multiplayer", parsed, {
-        copyAssets: false,
-        includePxtSim: true,
-        expandedPxtTarget: true
-    });
-}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -5521,7 +5512,7 @@ function internalCacheUsedBlocksAsync() {
                 const decompiled = pxtc.decompileSnippets(pxtc.getTSProgram(opts), opts, false);
                 if ((decompiled === null || decompiled === void 0 ? void 0 : decompiled.length) > 0) {
                     // scrape block IDs matching <block type="block_id">
-                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {} };
+                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {}, validateBlocks: {} };
                     const blockIdRegex = /<\s*block(?:[^>]*)? type="([^ ]*)"/ig;
                     for (let i = 0; i < decompiled.length; i++) {
                         const blocksXml = decompiled[i];
@@ -5531,7 +5522,7 @@ function internalCacheUsedBlocksAsync() {
                                 builtInfo.snippetBlocks[snippetHash] = {};
                             builtInfo.snippetBlocks[snippetHash][m1] = 1;
                             builtInfo.usedBlocks[m1] = 1;
-                            //TODO: Fill builtInfo.HighlightedBlocks
+                            //TODO: Fill builtInfo.HighlightedBlocks and builtInfo.validateBlocks
                             return m0;
                         });
                     }
@@ -6348,22 +6339,6 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             }
         }
     }, buildAuthcodeAsync);
-    p.defineCommand({
-        name: "buildmultiplayer",
-        aliases: ["multiplayer", "mp"],
-        advanced: true,
-        help: "Serves the multiplayer webapp",
-        flags: {
-            serve: {
-                description: "Serve the multiplayer app locally after building (npm start)"
-            },
-            docs: {
-                description: "Path to local docs folder to copy into multiplayer",
-                type: "string",
-                argument: "docs"
-            }
-        }
-    }, buildMultiplayerAsync);
     advancedCommand("augmentdocs", "test markdown docs replacements", augmnetDocsAsync, "<temlate.md> <doc.md>");
     advancedCommand("crowdin", "upload, download, clean, stats files to/from crowdin", pc => crowdin.execCrowdinAsync.apply(undefined, pc.args), "<cmd> <path> [output]");
     advancedCommand("hidlist", "list HID devices", hid.listAsync);

package/built/pxt.js

@@ -100493,7 +100493,8 @@ var ts;
                             hash: built.hash,
                             usedBlocks: Object.assign({}, built.usedBlocks),
                             snippetBlocks: Object.assign({}, built.snippetBlocks),
-                            highlightBlocks: Object.assign({}, built.highlightBlocks)
+                            highlightBlocks: Object.assign({}, built.highlightBlocks),
+                            validateBlocks: Object.assign({}, built.validateBlocks),
                         };
                     }
                 }
@@ -103383,13 +103384,13 @@ var pxt;
                     return undefined;
                 });
             }
-            setAsync(filename, snippets, code, highlights, branch) {
+            setAsync(filename, snippets, code, highlights, codeValidationMap, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
-                return this.setWithHashAsync(filename, snippets, hash, highlights);
+                return this.setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap);
             }
-            setWithHashAsync(filename, snippets, hash, highlights, branch) {
+            setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
@@ -103405,6 +103406,7 @@ var pxt;
                     snippets,
                     blocks,
                     highlightBlocks: highlights,
+                    validateBlocks: codeValidationMap
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
@@ -119281,13 +119283,13 @@ ${code}
                 if (id && cachedInfo[id]) {
                     const info = cachedInfo[id];
                     if (info.usedBlocks && info.hash)
-                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks);
+                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks, info.validateBlocks);
                 }
                 else {
                     for (let key of Object.keys(cachedInfo)) {
                         const info = cachedInfo[key];
                         if (info.usedBlocks && info.hash)
-                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks);
+                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks, info.validateBlocks);
                     }
                 }
             }).catch((err) => { });
@@ -119344,6 +119346,25 @@ ${code}
             return entry === null || entry === void 0 ? void 0 : entry.highlightBlocks;
         }
         tutorial_1.getTutorialHighlightedBlocks = getTutorialHighlightedBlocks;
+        async function getTutorialValidateBlocks(tutorial) {
+            const db = await pxt.BrowserUtils.tutorialInfoDbAsync();
+            const entry = await db.getAsync(tutorial.tutorial, tutorial.tutorialCode);
+            return entry === null || entry === void 0 ? void 0 : entry.validateBlocks;
+        }
+        tutorial_1.getTutorialValidateBlocks = getTutorialValidateBlocks;
+        function getRequiredBlockCounts(stepBlocks) {
+            if (!stepBlocks)
+                return undefined;
+            const requiredBlocks = {};
+            const blocks = stepBlocks["validate-exists"];
+            if (blocks) {
+                blocks.forEach(block => {
+                    requiredBlocks[block] = (requiredBlocks[block] || 0) + 1;
+                });
+            }
+            return requiredBlocks;
+        }
+        tutorial_1.getRequiredBlockCounts = getRequiredBlockCounts;
         function getTutorialStepHash(tutorial) {
             const { tutorialStepInfo, tutorialStep } = tutorial;
             const body = tutorialStepInfo[tutorialStep].hintContentMd;
@@ -162259,10 +162280,8 @@ async function buildSemanticUIAsync(parsed) {
         // This is just to support the local skillmap/cra-app serve for development
         nodeutil.cp("built/web/react-common-skillmap.css", "node_modules/pxt-core/skillmap/public/blb");
         nodeutil.cp("built/web/react-common-authcode.css", "node_modules/pxt-core/authcode/public/blb");
-        nodeutil.cp("built/web/react-common-multiplayer.css", "node_modules/pxt-core/multiplayer/public/blb");
         nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/skillmap/public/blb");
         nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/authcode/public/blb");
-        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/multiplayer/public/blb");
     }
 }
 async function linkFontAsync(font, semCss, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
@@ -162342,13 +162361,6 @@ function buildSkillMapAsync(parsed) {
 function buildAuthcodeAsync(parsed) {
     return buildReactAppAsync("authcode", parsed, { copyAssets: false });
 }
-function buildMultiplayerAsync(parsed) {
-    return buildReactAppAsync("multiplayer", parsed, {
-        copyAssets: false,
-        includePxtSim: true,
-        expandedPxtTarget: true
-    });
-}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -165950,7 +165962,7 @@ function internalCacheUsedBlocksAsync() {
                 const decompiled = pxtc.decompileSnippets(pxtc.getTSProgram(opts), opts, false);
                 if ((decompiled === null || decompiled === void 0 ? void 0 : decompiled.length) > 0) {
                     // scrape block IDs matching <block type="block_id">
-                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {} };
+                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {}, validateBlocks: {} };
                     const blockIdRegex = /<\s*block(?:[^>]*)? type="([^ ]*)"/ig;
                     for (let i = 0; i < decompiled.length; i++) {
                         const blocksXml = decompiled[i];
@@ -165960,7 +165972,7 @@ function internalCacheUsedBlocksAsync() {
                                 builtInfo.snippetBlocks[snippetHash] = {};
                             builtInfo.snippetBlocks[snippetHash][m1] = 1;
                             builtInfo.usedBlocks[m1] = 1;
-                            //TODO: Fill builtInfo.HighlightedBlocks
+                            //TODO: Fill builtInfo.HighlightedBlocks and builtInfo.validateBlocks
                             return m0;
                         });
                     }
@@ -166777,22 +166789,6 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             }
         }
     }, buildAuthcodeAsync);
-    p.defineCommand({
-        name: "buildmultiplayer",
-        aliases: ["multiplayer", "mp"],
-        advanced: true,
-        help: "Serves the multiplayer webapp",
-        flags: {
-            serve: {
-                description: "Serve the multiplayer app locally after building (npm start)"
-            },
-            docs: {
-                description: "Path to local docs folder to copy into multiplayer",
-                type: "string",
-                argument: "docs"
-            }
-        }
-    }, buildMultiplayerAsync);
     advancedCommand("augmentdocs", "test markdown docs replacements", augmnetDocsAsync, "<temlate.md> <doc.md>");
     advancedCommand("crowdin", "upload, download, clean, stats files to/from crowdin", pc => crowdin.execCrowdinAsync.apply(undefined, pc.args), "<cmd> <path> [output]");
     advancedCommand("hidlist", "list HID devices", hid.listAsync);

package/built/pxtblockly.js

@@ -6525,6 +6525,7 @@ var pxt;
                     newCommentText = newCommentText.replace(/@collapsed/g, '').trim();
                     b.setCollapsed(true);
                 }
+                newCommentText = newCommentText.replace(/@validate-\S+/g, '').trim();
                 if (initialCommentText !== newCommentText && !(opts === null || opts === void 0 ? void 0 : opts.keepMetaComments)) {
                     b.setCommentText(newCommentText || null);
                 }

package/built/pxtblocks.js

@@ -2963,6 +2963,7 @@ var pxt;
                     newCommentText = newCommentText.replace(/@collapsed/g, '').trim();
                     b.setCollapsed(true);
                 }
+                newCommentText = newCommentText.replace(/@validate-\S+/g, '').trim();
                 if (initialCommentText !== newCommentText && !(opts === null || opts === void 0 ? void 0 : opts.keepMetaComments)) {
                     b.setCommentText(newCommentText || null);
                 }

package/built/pxtlib.d.ts

@@ -826,10 +826,11 @@ declare namespace pxt.BrowserUtils {
         blocks: Map<number>;
         snippets: Map<Map<number>>;
         highlightBlocks: Map<Map<number>>;
+        validateBlocks: Map<Map<string[]>>;
     }
     export interface ITutorialInfoDb {
         getAsync(filename: string, code: string[], branch?: string): Promise<TutorialInfoIndexedDbEntry>;
-        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], highlights: Map<Map<number>>, branch?: string): Promise<void>;
+        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], highlights: Map<Map<number>>, codeValidationMap: Map<Map<string[]>>, branch?: string): Promise<void>;
         clearAsync(): Promise<void>;
     }
     class TutorialInfoIndexedDb implements ITutorialInfoDb {
@@ -840,8 +841,8 @@ declare namespace pxt.BrowserUtils {
         static createAsync(): Promise<TutorialInfoIndexedDb>;
         private constructor();
         getAsync(filename: string, code: string[], branch?: string): Promise<TutorialInfoIndexedDbEntry>;
-        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], highlights: Map<Map<number>>, branch?: string): Promise<void>;
-        setWithHashAsync(filename: string, snippets: Map<Map<number>>, hash: string, highlights: Map<Map<number>>, branch?: string): Promise<void>;
+        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], highlights: Map<Map<number>>, codeValidationMap: Map<Map<string[]>>, branch?: string): Promise<void>;
+        setWithHashAsync(filename: string, snippets: Map<Map<number>>, hash: string, highlights: Map<Map<number>>, codeValidationMap: Map<Map<string[]>>, branch?: string): Promise<void>;
         clearAsync(): Promise<void>;
     }
     export function tutorialInfoDbAsync(): Promise<TutorialInfoIndexedDb>;
@@ -2986,6 +2987,8 @@ declare namespace pxt.tutorial {
     function parseAssetJson(json: string): pxt.Map<string>;
     function parseSimThemeJson(json: string): Partial<pxt.PackageConfig>;
     function getTutorialHighlightedBlocks(tutorial: TutorialOptions): Promise<pxt.Map<pxt.Map<number>> | undefined>;
+    function getTutorialValidateBlocks(tutorial: TutorialOptions): Promise<pxt.Map<pxt.Map<string[]>> | undefined>;
+    function getRequiredBlockCounts(stepBlocks: pxt.Map<string[]>): pxt.Map<number>;
     function getTutorialStepHash(tutorial: TutorialOptions): string;
 }
 declare namespace ts.pxtc {

package/built/pxtlib.js

@@ -2807,7 +2807,8 @@ var ts;
                             hash: built.hash,
                             usedBlocks: Object.assign({}, built.usedBlocks),
                             snippetBlocks: Object.assign({}, built.snippetBlocks),
-                            highlightBlocks: Object.assign({}, built.highlightBlocks)
+                            highlightBlocks: Object.assign({}, built.highlightBlocks),
+                            validateBlocks: Object.assign({}, built.validateBlocks),
                         };
                     }
                 }
@@ -5697,13 +5698,13 @@ var pxt;
                     return undefined;
                 });
             }
-            setAsync(filename, snippets, code, highlights, branch) {
+            setAsync(filename, snippets, code, highlights, codeValidationMap, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
-                return this.setWithHashAsync(filename, snippets, hash, highlights);
+                return this.setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap);
             }
-            setWithHashAsync(filename, snippets, hash, highlights, branch) {
+            setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
@@ -5719,6 +5720,7 @@ var pxt;
                     snippets,
                     blocks,
                     highlightBlocks: highlights,
+                    validateBlocks: codeValidationMap
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
@@ -21595,13 +21597,13 @@ ${code}
                 if (id && cachedInfo[id]) {
                     const info = cachedInfo[id];
                     if (info.usedBlocks && info.hash)
-                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks);
+                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks, info.validateBlocks);
                 }
                 else {
                     for (let key of Object.keys(cachedInfo)) {
                         const info = cachedInfo[key];
                         if (info.usedBlocks && info.hash)
-                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks);
+                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks, info.validateBlocks);
                     }
                 }
             }).catch((err) => { });
@@ -21658,6 +21660,25 @@ ${code}
             return entry === null || entry === void 0 ? void 0 : entry.highlightBlocks;
         }
         tutorial_1.getTutorialHighlightedBlocks = getTutorialHighlightedBlocks;
+        async function getTutorialValidateBlocks(tutorial) {
+            const db = await pxt.BrowserUtils.tutorialInfoDbAsync();
+            const entry = await db.getAsync(tutorial.tutorial, tutorial.tutorialCode);
+            return entry === null || entry === void 0 ? void 0 : entry.validateBlocks;
+        }
+        tutorial_1.getTutorialValidateBlocks = getTutorialValidateBlocks;
+        function getRequiredBlockCounts(stepBlocks) {
+            if (!stepBlocks)
+                return undefined;
+            const requiredBlocks = {};
+            const blocks = stepBlocks["validate-exists"];
+            if (blocks) {
+                blocks.forEach(block => {
+                    requiredBlocks[block] = (requiredBlocks[block] || 0) + 1;
+                });
+            }
+            return requiredBlocks;
+        }
+        tutorial_1.getRequiredBlockCounts = getRequiredBlockCounts;
         function getTutorialStepHash(tutorial) {
             const { tutorialStepInfo, tutorialStep } = tutorial;
             const body = tutorialStepInfo[tutorialStep].hintContentMd;

package/built/server.js

@@ -23,8 +23,9 @@ let packagedDir = "";
 let localHexCacheDir = path.join("built", "hexcache");
 let serveOptions;
 const webappNames = [
-    "kiosk"
-    // TODO: Add other webapp names here: "multiplayer", "skillmap", "authcode"
+    "kiosk",
+    "multiplayer"
+    // TODO: Add other webapp names here: "skillmap", "authcode"
 ];
 function setupDocfilesdirs() {
     docfilesdirs = [