pxt-core 8.5.13 → 8.5.14

package/built/cli.js

@@ -5497,7 +5497,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: {} };
+                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {} };
                     const blockIdRegex = /<\s*block(?:[^>]*)? type="([^ ]*)"/ig;
                     for (let i = 0; i < decompiled.length; i++) {
                         const blocksXml = decompiled[i];
@@ -5507,6 +5507,7 @@ function internalCacheUsedBlocksAsync() {
                                 builtInfo.snippetBlocks[snippetHash] = {};
                             builtInfo.snippetBlocks[snippetHash][m1] = 1;
                             builtInfo.usedBlocks[m1] = 1;
+                            //TODO: Fill builtInfo.HighlightedBlocks
                             return m0;
                         });
                     }

package/built/pxt.js

@@ -100364,7 +100364,8 @@ var ts;
                         res.tutorialInfo[key] = {
                             hash: built.hash,
                             usedBlocks: Object.assign({}, built.usedBlocks),
-                            snippetBlocks: Object.assign({}, built.snippetBlocks)
+                            snippetBlocks: Object.assign({}, built.snippetBlocks),
+                            highlightBlocks: Object.assign({}, built.highlightBlocks)
                         };
                     }
                 }
@@ -103215,7 +103216,7 @@ var pxt;
             }
             static createAsync() {
                 function openAsync() {
-                    const idbWrapper = new pxt.BrowserUtils.IDBWrapper(TutorialInfoIndexedDb.dbName(), 2, (ev, r) => {
+                    const idbWrapper = new pxt.BrowserUtils.IDBWrapper(TutorialInfoIndexedDb.dbName(), 3, (ev, r) => {
                         const db = r.result;
                         db.createObjectStore(TutorialInfoIndexedDb.TABLE, { keyPath: TutorialInfoIndexedDb.KEYPATH });
                     }, () => {
@@ -103245,13 +103246,13 @@ var pxt;
                     return undefined;
                 });
             }
-            setAsync(filename, snippets, code, branch) {
+            setAsync(filename, snippets, code, highlights, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
-                return this.setWithHashAsync(filename, snippets, hash);
+                return this.setWithHashAsync(filename, snippets, hash, highlights);
             }
-            setWithHashAsync(filename, snippets, hash, branch) {
+            setWithHashAsync(filename, snippets, hash, highlights, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
@@ -103265,7 +103266,8 @@ var pxt;
                     time: pxt.Util.now(),
                     hash,
                     snippets,
-                    blocks
+                    blocks,
+                    highlightBlocks: highlights,
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
@@ -111401,6 +111403,125 @@ var pxt;
     })(storage = pxt.storage || (pxt.storage = {}));
 })(pxt || (pxt = {}));
 var pxt;
+(function (pxt) {
+    function getSectionsFromMarkdownMetadata(text) {
+        const lines = text.split("\n");
+        let sections = [];
+        let currentSection = null;
+        let currentKey = null;
+        let currentValue = null;
+        let listStack = [];
+        let currentIndent = 0;
+        for (const line of lines) {
+            if (!line.trim()) {
+                if (currentValue) {
+                    currentValue += "\n";
+                }
+                continue;
+            }
+            if (line.startsWith("#")) {
+                const headerMatch = /^(#+)\s*(.+)$/.exec(line);
+                if (headerMatch) {
+                    pushSection();
+                    currentSection = {
+                        headerKind: headerMatch[1].length === 1 ? "single" :
+                            (headerMatch[1].length === 2 ? "double" : "triple"),
+                        header: headerMatch[2],
+                        attributes: {}
+                    };
+                    currentKey = null;
+                    currentValue = null;
+                    currentIndent = 0;
+                    continue;
+                }
+            }
+            if (currentSection) {
+                const indent = countIndent(line);
+                const trimmedLine = line.trim();
+                const keyMatch = /^[*-]\s+(?:([^:]+):)?(.*)$/.exec(trimmedLine);
+                if (!keyMatch)
+                    continue;
+                // We ignore indent changes of 1 space to make the list authoring a little
+                // bit friendlier. Likewise, indents can be any length greater than 1 space
+                if (Math.abs(indent - currentIndent) > 1 && currentKey) {
+                    if (indent > currentIndent) {
+                        const newList = {
+                            key: currentKey,
+                            items: []
+                        };
+                        if (listStack.length) {
+                            listStack[listStack.length - 1].items.push(newList);
+                        }
+                        else {
+                            if (!currentSection.listAttributes)
+                                currentSection.listAttributes = {};
+                            currentSection.listAttributes[currentKey] = newList;
+                        }
+                        currentKey = null;
+                        listStack.push(newList);
+                    }
+                    else {
+                        const prev = listStack.pop();
+                        if (currentKey && currentValue) {
+                            prev === null || prev === void 0 ? void 0 : prev.items.push((currentKey + ":" + currentValue).trim());
+                            currentValue = null;
+                        }
+                    }
+                    currentIndent = indent;
+                }
+                if (keyMatch) {
+                    if (keyMatch[1]) {
+                        if (currentKey && currentValue) {
+                            if (listStack.length) {
+                                listStack[listStack.length - 1].items.push((currentKey + ":" + currentValue).trim());
+                            }
+                            else {
+                                currentSection.attributes[currentKey] = currentValue.trim();
+                            }
+                        }
+                        currentKey = keyMatch[1].toLowerCase();
+                        currentValue = keyMatch[2];
+                    }
+                    else if (currentKey) {
+                        currentValue += keyMatch[2];
+                    }
+                }
+            }
+        }
+        pushSection();
+        return sections;
+        function pushSection() {
+            if (currentSection) {
+                if (currentKey && currentValue) {
+                    if (listStack.length) {
+                        listStack[listStack.length - 1].items.push((currentKey + ":" + currentValue).trim());
+                    }
+                    else {
+                        currentSection.attributes[currentKey] = currentValue.trim();
+                    }
+                }
+                sections.push(currentSection);
+            }
+            listStack = [];
+        }
+    }
+    pxt.getSectionsFromMarkdownMetadata = getSectionsFromMarkdownMetadata;
+    // Handles tabs and spaces, but a mix of them might end up with strange results. Not much
+    // we can do about that so just treat 1 tab as 4 spaces
+    function countIndent(line) {
+        let indent = 0;
+        for (let i = 0; i < line.length; i++) {
+            if (line.charAt(i) === " ")
+                indent++;
+            else if (line.charAt(i) === "\t")
+                indent += 4;
+            else
+                return indent;
+        }
+        return 0;
+    }
+})(pxt || (pxt = {}));
+var pxt;
 (function (pxt) {
     var multiplayer;
     (function (multiplayer) {
@@ -118220,6 +118341,7 @@ var pxt;
             }
             const assetFiles = parseAssetJson(assetJson);
             const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
+            const globalValidationConfig = parseTutorialValidationConfig("global", tutorialmd);
             // strip hidden snippets
             steps.forEach(step => {
                 step.contentMd = stripHiddenSnippets(step.contentMd);
@@ -118240,7 +118362,8 @@ var pxt;
                 assetFiles,
                 customTs,
                 tutorialValidationRules,
-                globalBlockConfig
+                globalBlockConfig,
+                globalValidationConfig
             };
         }
         tutorial.parseTutorial = parseTutorial;
@@ -118422,6 +118545,7 @@ ${code}
                 step = step.trim();
                 let { header, hint, requiredBlocks } = parseTutorialHint(step, metadata && metadata.explicitHints, metadata.tutorialCodeValidation);
                 const blockConfig = parseTutorialBlockConfig("local", step);
+                const validationConfig = parseTutorialValidationConfig("local", step);
                 // if title is not hidden ("{TITLE HERE}"), strip flags
                 const title = !flags.match(/^\{.*\}$/)
                     ? flags.replace(/@(fullscreen|unplugged|showdialog|showhint|tutorialCompleted|resetDiff)/gi, "").trim()
@@ -118430,7 +118554,8 @@ ${code}
                     title,
                     contentMd: step,
                     headerContentMd: header,
-                    localBlockConfig: blockConfig
+                    localBlockConfig: blockConfig,
+                    localValidationConfig: validationConfig
                 };
                 if (/@(fullscreen|unplugged|showdialog|showhint)/i.test(flags))
                     info.showHint = true;
@@ -118497,6 +118622,28 @@ ${code}
             });
             return blockConfig;
         }
+        function parseTutorialValidationConfig(scope, content) {
+            let markdown;
+            const regex = new RegExp(`\`\`\`\\s*validation\\.${scope}\\s*\\n([\\s\\S]*?)\\n\`\`\``, "gmi");
+            content.replace(regex, (m0, m1) => {
+                markdown = m1;
+                return "";
+            });
+            if (!markdown || markdown == "") {
+                return null;
+            }
+            const validationSections = pxt.getSectionsFromMarkdownMetadata(markdown);
+            const sectionedMetadata = validationSections.map((v) => {
+                return {
+                    validatorType: v.header,
+                    properties: v.attributes,
+                };
+            });
+            return {
+                validatorsMetadata: sectionedMetadata,
+                validators: undefined
+            };
+        }
         function categorizingValidationRules(listOfRules, title) {
             const ruleNames = Object.keys(listOfRules);
             for (let i = 0; i < ruleNames.length; i++) {
@@ -118512,7 +118659,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -118595,7 +118742,8 @@ ${code}
                 assetFiles: tutorialInfo.assetFiles,
                 customTs: tutorialInfo.customTs,
                 tutorialValidationRules: tutorialInfo.tutorialValidationRules,
-                globalBlockConfig: tutorialInfo.globalBlockConfig
+                globalBlockConfig: tutorialInfo.globalBlockConfig,
+                globalValidationConfig: tutorialInfo.globalValidationConfig
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }
@@ -118609,13 +118757,13 @@ ${code}
                 if (id && cachedInfo[id]) {
                     const info = cachedInfo[id];
                     if (info.usedBlocks && info.hash)
-                        db.setWithHashAsync(id, info.snippetBlocks, info.hash);
+                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks);
                 }
                 else {
                     for (let key of Object.keys(cachedInfo)) {
                         const info = cachedInfo[key];
                         if (info.usedBlocks && info.hash)
-                            db.setWithHashAsync(key, info.snippetBlocks, info.hash);
+                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks);
                     }
                 }
             }).catch((err) => { });
@@ -164633,7 +164781,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: {} };
+                    let builtInfo = builtTututorialInfo[hash] || { usedBlocks: {}, snippetBlocks: {}, highlightBlocks: {} };
                     const blockIdRegex = /<\s*block(?:[^>]*)? type="([^ ]*)"/ig;
                     for (let i = 0; i < decompiled.length; i++) {
                         const blocksXml = decompiled[i];
@@ -164643,6 +164791,7 @@ function internalCacheUsedBlocksAsync() {
                                 builtInfo.snippetBlocks[snippetHash] = {};
                             builtInfo.snippetBlocks[snippetHash][m1] = 1;
                             builtInfo.usedBlocks[m1] = 1;
+                            //TODO: Fill builtInfo.HighlightedBlocks
                             return m0;
                         });
                     }

package/built/pxtlib.d.ts

@@ -826,10 +826,11 @@ declare namespace pxt.BrowserUtils {
         hash: string;
         blocks: Map<number>;
         snippets: Map<Map<number>>;
+        highlightBlocks: Map<Map<number>>;
     }
     export interface ITutorialInfoDb {
         getAsync(filename: string, code: string[], branch?: string): Promise<TutorialInfoIndexedDbEntry>;
-        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], branch?: string): Promise<void>;
+        setAsync(filename: string, snippets: Map<Map<number>>, code: string[], highlights: Map<Map<number>>, 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[], branch?: string): Promise<void>;
-        setWithHashAsync(filename: string, snippets: Map<Map<number>>, hash: string, branch?: string): Promise<void>;
+        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>;
         clearAsync(): Promise<void>;
     }
     export function tutorialInfoDbAsync(): Promise<TutorialInfoIndexedDb>;
@@ -1779,6 +1780,19 @@ declare namespace pxt.storage.shared {
     function setAsync(container: string, key: string, val: any): Promise<void>;
     function delAsync(container: string, key: string): Promise<void>;
 }
+declare namespace pxt {
+    interface MarkdownSection {
+        headerKind: "single" | "double" | "triple";
+        header: string;
+        attributes: pxt.Map<string>;
+        listAttributes?: pxt.Map<MarkdownList>;
+    }
+    interface MarkdownList {
+        key: string;
+        items: (string | MarkdownList)[];
+    }
+    function getSectionsFromMarkdownMetadata(text: string): MarkdownSection[];
+}
 declare namespace pxt.multiplayer {
     const SHORT_LINKS: {
         PROD: string;

package/built/pxtlib.js

@@ -2678,7 +2678,8 @@ var ts;
                         res.tutorialInfo[key] = {
                             hash: built.hash,
                             usedBlocks: Object.assign({}, built.usedBlocks),
-                            snippetBlocks: Object.assign({}, built.snippetBlocks)
+                            snippetBlocks: Object.assign({}, built.snippetBlocks),
+                            highlightBlocks: Object.assign({}, built.highlightBlocks)
                         };
                     }
                 }
@@ -5529,7 +5530,7 @@ var pxt;
             }
             static createAsync() {
                 function openAsync() {
-                    const idbWrapper = new pxt.BrowserUtils.IDBWrapper(TutorialInfoIndexedDb.dbName(), 2, (ev, r) => {
+                    const idbWrapper = new pxt.BrowserUtils.IDBWrapper(TutorialInfoIndexedDb.dbName(), 3, (ev, r) => {
                         const db = r.result;
                         db.createObjectStore(TutorialInfoIndexedDb.TABLE, { keyPath: TutorialInfoIndexedDb.KEYPATH });
                     }, () => {
@@ -5559,13 +5560,13 @@ var pxt;
                     return undefined;
                 });
             }
-            setAsync(filename, snippets, code, branch) {
+            setAsync(filename, snippets, code, highlights, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
-                return this.setWithHashAsync(filename, snippets, hash);
+                return this.setWithHashAsync(filename, snippets, hash, highlights);
             }
-            setWithHashAsync(filename, snippets, hash, branch) {
+            setWithHashAsync(filename, snippets, hash, highlights, branch) {
                 pxt.perf.measureStart("tutorial info db setAsync");
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
@@ -5579,7 +5580,8 @@ var pxt;
                     time: pxt.Util.now(),
                     hash,
                     snippets,
-                    blocks
+                    blocks,
+                    highlightBlocks: highlights,
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
@@ -13715,6 +13717,125 @@ var pxt;
     })(storage = pxt.storage || (pxt.storage = {}));
 })(pxt || (pxt = {}));
 var pxt;
+(function (pxt) {
+    function getSectionsFromMarkdownMetadata(text) {
+        const lines = text.split("\n");
+        let sections = [];
+        let currentSection = null;
+        let currentKey = null;
+        let currentValue = null;
+        let listStack = [];
+        let currentIndent = 0;
+        for (const line of lines) {
+            if (!line.trim()) {
+                if (currentValue) {
+                    currentValue += "\n";
+                }
+                continue;
+            }
+            if (line.startsWith("#")) {
+                const headerMatch = /^(#+)\s*(.+)$/.exec(line);
+                if (headerMatch) {
+                    pushSection();
+                    currentSection = {
+                        headerKind: headerMatch[1].length === 1 ? "single" :
+                            (headerMatch[1].length === 2 ? "double" : "triple"),
+                        header: headerMatch[2],
+                        attributes: {}
+                    };
+                    currentKey = null;
+                    currentValue = null;
+                    currentIndent = 0;
+                    continue;
+                }
+            }
+            if (currentSection) {
+                const indent = countIndent(line);
+                const trimmedLine = line.trim();
+                const keyMatch = /^[*-]\s+(?:([^:]+):)?(.*)$/.exec(trimmedLine);
+                if (!keyMatch)
+                    continue;
+                // We ignore indent changes of 1 space to make the list authoring a little
+                // bit friendlier. Likewise, indents can be any length greater than 1 space
+                if (Math.abs(indent - currentIndent) > 1 && currentKey) {
+                    if (indent > currentIndent) {
+                        const newList = {
+                            key: currentKey,
+                            items: []
+                        };
+                        if (listStack.length) {
+                            listStack[listStack.length - 1].items.push(newList);
+                        }
+                        else {
+                            if (!currentSection.listAttributes)
+                                currentSection.listAttributes = {};
+                            currentSection.listAttributes[currentKey] = newList;
+                        }
+                        currentKey = null;
+                        listStack.push(newList);
+                    }
+                    else {
+                        const prev = listStack.pop();
+                        if (currentKey && currentValue) {
+                            prev === null || prev === void 0 ? void 0 : prev.items.push((currentKey + ":" + currentValue).trim());
+                            currentValue = null;
+                        }
+                    }
+                    currentIndent = indent;
+                }
+                if (keyMatch) {
+                    if (keyMatch[1]) {
+                        if (currentKey && currentValue) {
+                            if (listStack.length) {
+                                listStack[listStack.length - 1].items.push((currentKey + ":" + currentValue).trim());
+                            }
+                            else {
+                                currentSection.attributes[currentKey] = currentValue.trim();
+                            }
+                        }
+                        currentKey = keyMatch[1].toLowerCase();
+                        currentValue = keyMatch[2];
+                    }
+                    else if (currentKey) {
+                        currentValue += keyMatch[2];
+                    }
+                }
+            }
+        }
+        pushSection();
+        return sections;
+        function pushSection() {
+            if (currentSection) {
+                if (currentKey && currentValue) {
+                    if (listStack.length) {
+                        listStack[listStack.length - 1].items.push((currentKey + ":" + currentValue).trim());
+                    }
+                    else {
+                        currentSection.attributes[currentKey] = currentValue.trim();
+                    }
+                }
+                sections.push(currentSection);
+            }
+            listStack = [];
+        }
+    }
+    pxt.getSectionsFromMarkdownMetadata = getSectionsFromMarkdownMetadata;
+    // Handles tabs and spaces, but a mix of them might end up with strange results. Not much
+    // we can do about that so just treat 1 tab as 4 spaces
+    function countIndent(line) {
+        let indent = 0;
+        for (let i = 0; i < line.length; i++) {
+            if (line.charAt(i) === " ")
+                indent++;
+            else if (line.charAt(i) === "\t")
+                indent += 4;
+            else
+                return indent;
+        }
+        return 0;
+    }
+})(pxt || (pxt = {}));
+var pxt;
 (function (pxt) {
     var multiplayer;
     (function (multiplayer) {
@@ -20534,6 +20655,7 @@ var pxt;
             }
             const assetFiles = parseAssetJson(assetJson);
             const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
+            const globalValidationConfig = parseTutorialValidationConfig("global", tutorialmd);
             // strip hidden snippets
             steps.forEach(step => {
                 step.contentMd = stripHiddenSnippets(step.contentMd);
@@ -20554,7 +20676,8 @@ var pxt;
                 assetFiles,
                 customTs,
                 tutorialValidationRules,
-                globalBlockConfig
+                globalBlockConfig,
+                globalValidationConfig
             };
         }
         tutorial.parseTutorial = parseTutorial;
@@ -20736,6 +20859,7 @@ ${code}
                 step = step.trim();
                 let { header, hint, requiredBlocks } = parseTutorialHint(step, metadata && metadata.explicitHints, metadata.tutorialCodeValidation);
                 const blockConfig = parseTutorialBlockConfig("local", step);
+                const validationConfig = parseTutorialValidationConfig("local", step);
                 // if title is not hidden ("{TITLE HERE}"), strip flags
                 const title = !flags.match(/^\{.*\}$/)
                     ? flags.replace(/@(fullscreen|unplugged|showdialog|showhint|tutorialCompleted|resetDiff)/gi, "").trim()
@@ -20744,7 +20868,8 @@ ${code}
                     title,
                     contentMd: step,
                     headerContentMd: header,
-                    localBlockConfig: blockConfig
+                    localBlockConfig: blockConfig,
+                    localValidationConfig: validationConfig
                 };
                 if (/@(fullscreen|unplugged|showdialog|showhint)/i.test(flags))
                     info.showHint = true;
@@ -20811,6 +20936,28 @@ ${code}
             });
             return blockConfig;
         }
+        function parseTutorialValidationConfig(scope, content) {
+            let markdown;
+            const regex = new RegExp(`\`\`\`\\s*validation\\.${scope}\\s*\\n([\\s\\S]*?)\\n\`\`\``, "gmi");
+            content.replace(regex, (m0, m1) => {
+                markdown = m1;
+                return "";
+            });
+            if (!markdown || markdown == "") {
+                return null;
+            }
+            const validationSections = pxt.getSectionsFromMarkdownMetadata(markdown);
+            const sectionedMetadata = validationSections.map((v) => {
+                return {
+                    validatorType: v.header,
+                    properties: v.attributes,
+                };
+            });
+            return {
+                validatorsMetadata: sectionedMetadata,
+                validators: undefined
+            };
+        }
         function categorizingValidationRules(listOfRules, title) {
             const ruleNames = Object.keys(listOfRules);
             for (let i = 0; i < ruleNames.length; i++) {
@@ -20826,7 +20973,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -20909,7 +21056,8 @@ ${code}
                 assetFiles: tutorialInfo.assetFiles,
                 customTs: tutorialInfo.customTs,
                 tutorialValidationRules: tutorialInfo.tutorialValidationRules,
-                globalBlockConfig: tutorialInfo.globalBlockConfig
+                globalBlockConfig: tutorialInfo.globalBlockConfig,
+                globalValidationConfig: tutorialInfo.globalValidationConfig
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }
@@ -20923,13 +21071,13 @@ ${code}
                 if (id && cachedInfo[id]) {
                     const info = cachedInfo[id];
                     if (info.usedBlocks && info.hash)
-                        db.setWithHashAsync(id, info.snippetBlocks, info.hash);
+                        db.setWithHashAsync(id, info.snippetBlocks, info.hash, info.highlightBlocks);
                 }
                 else {
                     for (let key of Object.keys(cachedInfo)) {
                         const info = cachedInfo[key];
                         if (info.usedBlocks && info.hash)
-                            db.setWithHashAsync(key, info.snippetBlocks, info.hash);
+                            db.setWithHashAsync(key, info.snippetBlocks, info.hash, info.highlightBlocks);
                     }
                 }
             }).catch((err) => { });