Merge branch 'master' into blockly-keyboard-experiment

Author: microbit-matt-hillsdon

cli/cli.ts

@@ -1946,6 +1946,18 @@ ${gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n')}
                 targetStrings[`{id:hardware-description}${opt.description}`] = opt.description;
         }
     }
+
+    const themeFiles = getThemeFilePaths();
+    for(const themePath of themeFiles) {
+        if (nodeutil.fileExistsSync(themePath)) {
+            const theme = nodeutil.readJson(themePath);
+            const name = theme["name"];
+            if (name) {
+                targetStrings[`{id:color-theme-name}${name}`] = name;
+            }
+        }
+    }
+
     // extract strings from editor
     ["editor", "fieldeditors", "cmds"]
         .filter(d => nodeutil.existsDirSync(d))
@@ -2153,6 +2165,7 @@ function buildReactAppAsync(app: string, parsed: commandParser.ParsedCommand, op
             if (!opts.expandedPxtTarget) {
                 // read pxtarget.json, save into 'pxtTargetBundle' global variable
                 let cfg = readLocalPxTarget();
+                updateColorThemes(cfg);
                 nodeutil.writeFileSync(`${appRoot}/public/blb/target.js`, "// eslint-disable-next-line \n" + targetJsPrefix + JSON.stringify(cfg));
             } else {
                 nodeutil.cp("built/target.js", `${appRoot}/public/blb`);
@@ -2169,6 +2182,7 @@ function buildReactAppAsync(app: string, parsed: commandParser.ParsedCommand, op
 
             nodeutil.cp("targetconfig.json", `${appRoot}/public/blb`);
             nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+            nodeutil.cp("node_modules/pxt-core/built/web/pxtrcdeps.js", `${appRoot}/public/blb`);
             if (opts.includePxtSim) {
                 nodeutil.cp("node_modules/pxt-core/built/pxtsim.js", `${appRoot}/public/blb`);
                 nodeutil.cp("node_modules/pxt-core/built/web/worker.js", `${appRoot}/public/blb`);
@@ -2282,6 +2296,75 @@ function updateTOC(cfg: pxt.TargetBundle) {
     }
 }
 
+function getThemeFilePaths() {
+    const sharedThemeFiles = fs.existsSync("node_modules/pxt-core/theme/color-themes")
+    ? nodeutil
+          .allFiles("node_modules/pxt-core/theme/color-themes", { maxDepth: 1, includeDirs: false })
+          .filter((f) => /\.json$/i.test(f))
+    : [];
+
+    const targetThemeFiles = fs.existsSync("theme/color-themes")
+        ? nodeutil
+            .allFiles("theme/color-themes", { maxDepth: 1, includeDirs: false })
+            .filter((f) => /\.json$/i.test(f))
+        : [];
+
+    // Target takes precedence, so include those at the end (will overwrite shared themes)
+    return sharedThemeFiles.concat(targetThemeFiles);
+}
+
+function updateColorThemes(cfg: pxt.TargetBundle) {
+    pxt.log("Loading color themes...");
+    const themeFiles = getThemeFilePaths();
+
+    for (const themeFile of themeFiles) {
+        const themeFileDir = path.dirname(themeFile);
+        const fileData = fs.readFileSync(themeFile, "utf8");
+        const themeData = JSON.parse(fileData);
+        const theme: pxt.ColorThemeInfo = {
+            id: themeData.id,
+            name: themeData.name,
+            weight: themeData.weight,
+            monacoBaseTheme: themeData.monacoBaseTheme,
+            colors: themeData.colors
+        };
+
+        for (const overrideFile of themeData.overrideFiles ?? []) {
+            if (!overrideFile) {
+                // Skip empty entries
+                continue;
+            }
+
+            // Strip leading slashes, convert \ to /, and lowercase the path
+            const combinedPath = path.join(themeFileDir, overrideFile);
+            let cssText = fs.readFileSync(combinedPath, "utf8");
+            theme.overrideCss = theme.overrideCss ? `${theme.overrideCss}\n${cssText}` : cssText;
+        }
+
+        if (!cfg.colorThemeMap) {
+            cfg.colorThemeMap = {};
+        }
+
+        if (cfg.colorThemeMap[theme.id]) {
+            // Only overwrite specified fields
+            // This allows target themes to be built off of shared base themes and only specify certain changes.
+            const existingTheme = cfg.colorThemeMap[theme.id];
+            cfg.colorThemeMap[theme.id] = {
+                ...existingTheme,
+                ...theme,
+                colors: {
+                    ...existingTheme.colors,
+                    ...theme.colors
+                }
+            };
+        } else {
+            cfg.colorThemeMap[theme.id] = theme;
+        }
+
+        pxt.log(`Loaded theme ${theme.id}`);
+    }
+}
+
 function rebundleAsync() {
     return buildTargetCoreAsync({ quick: true })
         .then(() => buildSimAsync());
@@ -2355,6 +2438,7 @@ async function buildTargetCoreAsync(options: BuildTargetOptions = {}) {
     let cfg = readLocalPxTarget()
     updateDefaultProjects(cfg);
     updateTOC(cfg);
+    updateColorThemes(cfg);
 
     cfg.bundledpkgs = {}
     pxt.setAppTarget(cfg);
@@ -2579,6 +2663,7 @@ async function buildTargetCoreAsync(options: BuildTargetOptions = {}) {
         delete targetlight.compile.compilerExtension;
     const targetlightjson = nodeutil.stringify(targetlight);
     nodeutil.writeFileSync("built/targetlight.json", targetlightjson)
+    nodeutil.writeFileSync("built/targetlight.js", targetJsPrefix + targetlightjson)
     nodeutil.writeFileSync("built/sim.webmanifest", nodeutil.stringify(webmanifest))
 
     console.log("target.json built.");
@@ -7284,10 +7369,10 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
         name: "buildskillmap",
         aliases: ["skillmap"],
         advanced: true,
-        help: "Serves the skill map webapp",
+        help: "Serves the skillmap webapp",
         flags: {
             serve: {
-                description: "Serve the skill map locally after building (npm start)"
+                description: "Serve the skillmap locally after building (npm start)"
             },
             docs: {
                 description: "Path to local docs folder to copy into skillmap",

common-docs/blocks.md

@@ -3,7 +3,8 @@
 ### @description Language constructs for the Block editor.
 
 ## #blocksbase
-Blocks snap into each other to define the program that your @boardname@ will run.
+
+Blocks snap into each other to define the program that will run.
 Blocks can be event (buttons, shake, ...) or need to be snapped into an event to run.
 The [on-start](/blocks/on-start) event runs first.
 

common-docs/javascript/call.md

@@ -1,8 +1,8 @@
 # Call a function
 
-The simplest way to get started in JavaScript with your @boardname@ is to
-call one of the @boardname@'s built-in JavaScript functions. Just like how Blocks
-are organized into categories/drawers, the @boardname@ functions are organized by
+The simplest way to get started in JavaScript is to
+call one of the built-in JavaScript functions. Just like how Blocks
+are organized into categories/drawers, the functions are organized by
 namespaces, with names corresponding to the drawer names.
 
 ```typescript-ignore
@@ -11,6 +11,8 @@ Math.abs(-1)
 
 ### ~ hint
 
+#### Functions in a namespace
+
 If you want to see all functions available in the `Math` namespace, simply type `Math`
 followed by `.` and a list of all the functions will appear. 
 

common-docs/javascript/functions.md

@@ -14,7 +14,9 @@ let sum = add(1, 2);
 
 ### ~ hint
 
-For the @boardname@, you must specify a [type](/javascript/types) for each function parameter. 
+#### Parameter types
+
+You must specify a [type](/javascript/types) for each function parameter. 
 
 ### ~ 
 

common-docs/javascript/operators.md

@@ -1,6 +1,6 @@
 # Operators
 
-The following JavaScript operators are supported for the @boardname@.
+The following JavaScript operators are supported:
 
 ## Assignment, arithmetic and bitwise
 

common-docs/javascript/sequence.md

@@ -36,6 +36,8 @@ doSomething(); // THIS LINE WILL NEVER EXECUTE!
 
 ### ~hint
 
+#### No 'empty' statements
+
 To avoid this problem, we don't allow a program to contain an empty statement, such as shown above. 
 If you really want an empty statement, you need to use curly braces to delimit an empty statement block:
 ```typescript-ignore

common-docs/javascript/statements.md

@@ -1,6 +1,6 @@
 # Statements
 
-The following JavaScript statements are supported for the @boardname@:
+The following JavaScript statements are supported:
 
 ## Variable declarations
 * [`const` statement](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const)

common-docs/python/call.md

@@ -1,16 +1,18 @@
 # Call a function
 
-The simplest way to get started in Python with your @boardname@ is to
-call one of the @boardname@'s built-in Python functions. Just like how Blocks
-are organized into categories/drawers, the @boardname@ functions are organized by
-namespaces, with names corresponding to the drawer names.
+The simplest way to get started in Python is to
+call one of the built-in Python functions. Just like how Blocks
+are organized into categories/drawers, functions are organized by
+namespaces too, with names corresponding to the drawer names.
 
 ```python-ignore
 Math.abs(-1)
 ```
 
 ### ~ hint
 
+#### Functions in a namespace
+
 If you want to see all functions available in the `Math` namespace, simply type `Math`
 followed by `.` and a list of all the functions will appear. 
 

common-docs/python/functions.md

@@ -96,7 +96,7 @@ The default value of `lastName` disappears in the type, only leaving behind the
 Handler functions are functions that take some action when an event or change of state occurs. Usually, some other code saves, or registers, the handler function in a variable in order to call
 it at a later time. When an event happens, like a new input value or an elapsed timer, the handler is called to run a response action.
 
-As an example, the `Thermal` class will check for changes in temperature and run a registered handler when the temperature drops to a set thershold:
+As an example, the `Thermal` class will check for changes in temperature and run a registered handler when the temperature drops to a set threshold:
 
 ```python-ignore
 # the handler function when it's cold...
@@ -122,9 +122,9 @@ thermal.whenCold(whenCold)
 thermal.checkCold()
 ```
 
-## Lamda Functions
+## Lambda Functions
 
-Lamda functions serve as a kind of shortcut to return a result of an expression. A lamda is often saved to a variable and then used like a function to return the expression result:
+Lambda functions serve as a kind of shortcut to return a result of an expression. A lambda is often saved to a variable and then used like a function to return the expression result:
 
 ```python-ignore
 def square(x):

common-docs/python/operators.md

@@ -1,6 +1,6 @@
 # Operators
 
-The following Python operators are supported for the @boardname@.
+The following Python operators are supported:
 
 ## Assignment, arithmetic and bitwise