pxt-core 8.5.38 → 8.5.39

package/built/pxt.js

@@ -107133,6 +107133,14 @@ var pxt;
             return {};
         }
         gallery_1.parseTemplateProjectJSON = parseTemplateProjectJSON;
+        function parseSimThemeJSON(md) {
+            const pm = /```simtheme\s+([\s\S]*?)```/i.exec(md);
+            if (pm) {
+                return pxt.tutorial.parseSimThemeJson(pm[1]);
+            }
+            return {};
+        }
+        gallery_1.parseSimThemeJSON = parseSimThemeJSON;
         function parseExampleMarkdown(name, md) {
             if (!md)
                 return undefined;
@@ -107144,6 +107152,7 @@ var pxt;
             const source = m[2];
             const features = parseFeaturesFromMarkdown(md);
             const jres = parseJResFromMarkdown(md);
+            const simTheme = parseSimThemeJSON(md);
             const prj = {
                 name,
                 filesOverride: {
@@ -107153,7 +107162,8 @@ var pxt;
                 dependencies,
                 features,
                 snippetType,
-                source
+                source,
+                simTheme
             };
             prj.filesOverride = Object.assign(Object.assign({}, prj.filesOverride), parseTemplateProjectJSON(md));
             if (jres) {
@@ -118518,7 +118528,7 @@ var pxt;
             if (!steps)
                 return undefined; // error parsing steps
             // collect code and infer editor
-            const { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr } = computeBodyMetadata(body);
+            const { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr, simThemeJson } = computeBodyMetadata(body);
             // parses tutorial rules string into a map of rules and enablement flag
             let tutorialValidationRules;
             if (metadata.tutorialCodeValidation) {
@@ -118534,6 +118544,7 @@ var pxt;
                 diffify(steps, activities);
             }
             const assetFiles = parseAssetJson(assetJson);
+            const simTheme = parseSimThemeJson(simThemeJson);
             const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
             const globalValidationConfig = parseTutorialValidationConfig("global", tutorialmd);
             // strip hidden snippets
@@ -118557,12 +118568,13 @@ var pxt;
                 customTs,
                 tutorialValidationRules,
                 globalBlockConfig,
-                globalValidationConfig
+                globalValidationConfig,
+                simTheme
             };
         }
         tutorial.parseTutorial = parseTutorial;
         function getMetadataRegex() {
-            return /``` *(sim|block|blocks|filterblocks|spy|ghost|typescript|ts|js|javascript|template|python|jres|assetjson|customts|tutorialValidationRules|requiredTutorialBlock)\s*\n([\s\S]*?)\n```/gmi;
+            return /``` *(sim|block|blocks|filterblocks|spy|ghost|typescript|ts|js|javascript|template|python|jres|assetjson|customts|tutorialValidationRules|requiredTutorialBlock|simtheme)\s*\n([\s\S]*?)\n```/gmi;
         }
         tutorial.getMetadataRegex = getMetadataRegex;
         function computeBodyMetadata(body) {
@@ -118576,6 +118588,7 @@ var pxt;
             let idx = 0;
             let assetJson;
             let customTs;
+            let simThemeJson;
             let tutorialValidationRulesStr;
             // Concatenate all blocks in separate code blocks and decompile so we can detect what blocks are used (for the toolbox)
             body
@@ -118614,6 +118627,9 @@ var pxt;
                     case "assetjson":
                         assetJson = m2;
                         break;
+                    case "simtheme":
+                        simThemeJson = m2;
+                        break;
                     case "customts":
                         customTs = m2;
                         m2 = "";
@@ -118628,7 +118644,17 @@ var pxt;
             });
             // default to blocks
             editor = editor || pxt.BLOCKS_PROJECT_NAME;
-            return { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr };
+            return {
+                code,
+                templateCode,
+                editor,
+                language,
+                jres,
+                assetJson,
+                customTs,
+                tutorialValidationRulesStr,
+                simThemeJson
+            };
             function checkTutorialEditor(expected) {
                 if (editor && editor != expected) {
                     pxt.debug(`tutorial ambiguous: contains snippets of different types`);
@@ -118850,7 +118876,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|simtheme|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -118934,7 +118960,8 @@ ${code}
                 customTs: tutorialInfo.customTs,
                 tutorialValidationRules: tutorialInfo.tutorialValidationRules,
                 globalBlockConfig: tutorialInfo.globalBlockConfig,
-                globalValidationConfig: tutorialInfo.globalValidationConfig
+                globalValidationConfig: tutorialInfo.globalValidationConfig,
+                simTheme: tutorialInfo.simTheme,
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }
@@ -118991,6 +119018,20 @@ ${code}
             };
         }
         tutorial.parseAssetJson = parseAssetJson;
+        function parseSimThemeJson(json) {
+            const pxtJson = pxt.Util.jsonTryParse(json);
+            if (!pxtJson)
+                return undefined;
+            const res = {};
+            if (pxtJson.theme) {
+                res.theme = pxtJson.theme;
+            }
+            if (pxtJson.palette) {
+                res.palette = pxtJson.palette;
+            }
+            return res;
+        }
+        tutorial.parseSimThemeJson = parseSimThemeJson;
     })(tutorial = pxt.tutorial || (pxt.tutorial = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -129293,12 +129334,10 @@ ${output}</xml>`;
                                 return pxtc.Util.lf("Tagged templates only supported in custom fields with param.fieldOptions.taggedTemplate set");
                             }
                             const tag = unwrapNode(e.tag);
-                            if (tag.kind !== SK.Identifier) {
-                                return pxtc.Util.lf("Tagged template literals must use an identifier as the tag");
-                            }
                             const tagText = tag.getText();
-                            if (tagText.trim() != tagName.trim()) {
-                                return pxtc.Util.lf("Function only supports template literals with tag '{0}'", tagName);
+                            const possibleTags = tagName.split(";").map(t => t.trim());
+                            if (possibleTags.indexOf(tagText) === -1) {
+                                return pxtc.Util.lf("Function only supports template literals with tag '{0}'", possibleTags.join(", "));
                             }
                             const template = e.template;
                             if (template.kind !== SK.NoSubstitutionTemplateLiteral) {
@@ -155418,6 +155457,7 @@ var pxsim;
                 single: opts.single,
                 dependencies: opts.dependencies,
                 activePlayer: opts.activePlayer,
+                theme: opts.theme,
             };
             this.start();
         }

package/built/pxtcompiler.js

@@ -6455,12 +6455,10 @@ ${output}</xml>`;
                                 return pxtc.Util.lf("Tagged templates only supported in custom fields with param.fieldOptions.taggedTemplate set");
                             }
                             const tag = unwrapNode(e.tag);
-                            if (tag.kind !== SK.Identifier) {
-                                return pxtc.Util.lf("Tagged template literals must use an identifier as the tag");
-                            }
                             const tagText = tag.getText();
-                            if (tagText.trim() != tagName.trim()) {
-                                return pxtc.Util.lf("Function only supports template literals with tag '{0}'", tagName);
+                            const possibleTags = tagName.split(";").map(t => t.trim());
+                            if (possibleTags.indexOf(tagText) === -1) {
+                                return pxtc.Util.lf("Function only supports template literals with tag '{0}'", possibleTags.join(", "));
                             }
                             const template = e.template;
                             if (template.kind !== SK.NoSubstitutionTemplateLiteral) {

package/built/pxteditor.d.ts

@@ -110,6 +110,7 @@ declare namespace pxt.editor {
         preferredEditor?: string;
         extensionUnderTest?: string;
         skillmapProject?: boolean;
+        simTheme?: Partial<pxt.PackageConfig>;
     }
     interface ExampleImportOptions {
         name: string;

package/built/pxtlib.d.ts

@@ -1132,6 +1132,7 @@ declare namespace pxt.gallery {
         filesOverride: pxt.Map<string>;
         dependencies: pxt.Map<string>;
         features?: string[];
+        simTheme?: Partial<pxt.PackageConfig>;
     }
     function parsePackagesFromMarkdown(md: string): pxt.Map<string>;
     function parseFeaturesFromMarkdown(md: string): string[];
@@ -1140,6 +1141,7 @@ declare namespace pxt.gallery {
         ts: string;
     };
     function parseTemplateProjectJSON(md: string): pxt.Map<string>;
+    function parseSimThemeJSON(md: string): Partial<pxt.PackageConfig>;
     function parseExampleMarkdown(name: string, md: string): GalleryProject;
     function parseCodeCards(md: string): pxt.CodeCard[];
     function parseCodeCardsHtml(el: HTMLElement): CodeCard[];
@@ -2965,6 +2967,7 @@ declare namespace pxt.tutorial {
     function parseCachedTutorialInfo(json: string, id?: string): Promise<void>;
     function resolveLocalizedMarkdown(ghid: pxt.github.ParsedRepo, files: pxt.Map<string>, fileName?: string): string;
     function parseAssetJson(json: string): pxt.Map<string>;
+    function parseSimThemeJson(json: string): Partial<pxt.PackageConfig>;
 }
 declare namespace pxt.tutorial {
     interface TutorialRuleStatus {

package/built/pxtlib.js

@@ -9447,6 +9447,14 @@ var pxt;
             return {};
         }
         gallery_1.parseTemplateProjectJSON = parseTemplateProjectJSON;
+        function parseSimThemeJSON(md) {
+            const pm = /```simtheme\s+([\s\S]*?)```/i.exec(md);
+            if (pm) {
+                return pxt.tutorial.parseSimThemeJson(pm[1]);
+            }
+            return {};
+        }
+        gallery_1.parseSimThemeJSON = parseSimThemeJSON;
         function parseExampleMarkdown(name, md) {
             if (!md)
                 return undefined;
@@ -9458,6 +9466,7 @@ var pxt;
             const source = m[2];
             const features = parseFeaturesFromMarkdown(md);
             const jres = parseJResFromMarkdown(md);
+            const simTheme = parseSimThemeJSON(md);
             const prj = {
                 name,
                 filesOverride: {
@@ -9467,7 +9476,8 @@ var pxt;
                 dependencies,
                 features,
                 snippetType,
-                source
+                source,
+                simTheme
             };
             prj.filesOverride = Object.assign(Object.assign({}, prj.filesOverride), parseTemplateProjectJSON(md));
             if (jres) {
@@ -20832,7 +20842,7 @@ var pxt;
             if (!steps)
                 return undefined; // error parsing steps
             // collect code and infer editor
-            const { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr } = computeBodyMetadata(body);
+            const { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr, simThemeJson } = computeBodyMetadata(body);
             // parses tutorial rules string into a map of rules and enablement flag
             let tutorialValidationRules;
             if (metadata.tutorialCodeValidation) {
@@ -20848,6 +20858,7 @@ var pxt;
                 diffify(steps, activities);
             }
             const assetFiles = parseAssetJson(assetJson);
+            const simTheme = parseSimThemeJson(simThemeJson);
             const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
             const globalValidationConfig = parseTutorialValidationConfig("global", tutorialmd);
             // strip hidden snippets
@@ -20871,12 +20882,13 @@ var pxt;
                 customTs,
                 tutorialValidationRules,
                 globalBlockConfig,
-                globalValidationConfig
+                globalValidationConfig,
+                simTheme
             };
         }
         tutorial.parseTutorial = parseTutorial;
         function getMetadataRegex() {
-            return /``` *(sim|block|blocks|filterblocks|spy|ghost|typescript|ts|js|javascript|template|python|jres|assetjson|customts|tutorialValidationRules|requiredTutorialBlock)\s*\n([\s\S]*?)\n```/gmi;
+            return /``` *(sim|block|blocks|filterblocks|spy|ghost|typescript|ts|js|javascript|template|python|jres|assetjson|customts|tutorialValidationRules|requiredTutorialBlock|simtheme)\s*\n([\s\S]*?)\n```/gmi;
         }
         tutorial.getMetadataRegex = getMetadataRegex;
         function computeBodyMetadata(body) {
@@ -20890,6 +20902,7 @@ var pxt;
             let idx = 0;
             let assetJson;
             let customTs;
+            let simThemeJson;
             let tutorialValidationRulesStr;
             // Concatenate all blocks in separate code blocks and decompile so we can detect what blocks are used (for the toolbox)
             body
@@ -20928,6 +20941,9 @@ var pxt;
                     case "assetjson":
                         assetJson = m2;
                         break;
+                    case "simtheme":
+                        simThemeJson = m2;
+                        break;
                     case "customts":
                         customTs = m2;
                         m2 = "";
@@ -20942,7 +20958,17 @@ var pxt;
             });
             // default to blocks
             editor = editor || pxt.BLOCKS_PROJECT_NAME;
-            return { code, templateCode, editor, language, jres, assetJson, customTs, tutorialValidationRulesStr };
+            return {
+                code,
+                templateCode,
+                editor,
+                language,
+                jres,
+                assetJson,
+                customTs,
+                tutorialValidationRulesStr,
+                simThemeJson
+            };
             function checkTutorialEditor(expected) {
                 if (editor && editor != expected) {
                     pxt.debug(`tutorial ambiguous: contains snippets of different types`);
@@ -21164,7 +21190,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|simtheme|customts|blockconfig\.local|blockconfig\.global|validation\.local|validation\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -21248,7 +21274,8 @@ ${code}
                 customTs: tutorialInfo.customTs,
                 tutorialValidationRules: tutorialInfo.tutorialValidationRules,
                 globalBlockConfig: tutorialInfo.globalBlockConfig,
-                globalValidationConfig: tutorialInfo.globalValidationConfig
+                globalValidationConfig: tutorialInfo.globalValidationConfig,
+                simTheme: tutorialInfo.simTheme,
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }
@@ -21305,6 +21332,20 @@ ${code}
             };
         }
         tutorial.parseAssetJson = parseAssetJson;
+        function parseSimThemeJson(json) {
+            const pxtJson = pxt.Util.jsonTryParse(json);
+            if (!pxtJson)
+                return undefined;
+            const res = {};
+            if (pxtJson.theme) {
+                res.theme = pxtJson.theme;
+            }
+            if (pxtJson.palette) {
+                res.palette = pxtJson.palette;
+            }
+            return res;
+        }
+        tutorial.parseSimThemeJson = parseSimThemeJson;
     })(tutorial = pxt.tutorial || (pxt.tutorial = {}));
 })(pxt || (pxt = {}));
 var pxt;

package/built/pxtrunner.js

@@ -1764,6 +1764,7 @@ var pxt;
         // iff matches and truthy, reuse existing simdriver
         let currDriverId;
         function initDriverAndOptions(container, simOptions, compileInfo) {
+            var _a;
             if (!simDriver || !simOptions.embedId || currDriverId !== simOptions.embedId) {
                 simDriver = new pxsim.SimulatorDriver(container);
                 currDriverId = simOptions.embedId;
@@ -1791,6 +1792,7 @@ var pxt;
                 autofocus: simOptions.autofocus,
                 queryParameters: simOptions.additionalQueryParameters,
                 mpRole: simOptions.mpRole,
+                theme: (_a = runner.mainPkg.config) === null || _a === void 0 ? void 0 : _a.theme,
             };
             if (pxt.appTarget.simulator && !simOptions.fullScreen)
                 runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio

package/built/pxtsim.d.ts

@@ -341,6 +341,7 @@ declare namespace pxsim {
         single?: boolean;
         traceDisabled?: boolean;
         activePlayer?: 1 | 2 | 3 | 4 | undefined;
+        theme?: string | pxt.Map<string>;
     }
     interface SimulatorInstructionsMessage extends SimulatorMessage {
         type: "instructions";
@@ -1335,6 +1336,7 @@ declare namespace pxsim {
         queryParameters?: string;
         mpRole?: "server" | "client";
         activePlayer?: 1 | 2 | 3 | 4 | undefined;
+        theme?: string | pxt.Map<string>;
     }
     interface HwDebugger {
         postMessage: (msg: pxsim.SimulatorMessage) => void;

package/built/pxtsim.js

@@ -6572,6 +6572,7 @@ var pxsim;
                 single: opts.single,
                 dependencies: opts.dependencies,
                 activePlayer: opts.activePlayer,
+                theme: opts.theme,
             };
             this.start();
         }