pxt-core 13.2.16 → 13.2.18

package/built/pxtlib.js

@@ -1510,6 +1510,8 @@ const lf = ts.pxtc.Util.lf;
                     let parts = k.split(".");
                     for (let i = 0; i < parts.length; ++i) {
                         let part = parts[i];
+                        if (part === "__proto__" || part === "constructor" || part === "prototype")
+                            Util.userError("Invalid configuration key: " + k);
                         if (i == parts.length - 1)
                             ptr[part] = v[k];
                         else {
@@ -7804,10 +7806,11 @@ var pxt;
                 if (!inEnum)
                     return;
                 // parse the enum case, with lots of optional stuff (?)
-                let mm = /^\s*(\w+)\s*(=\s*(.*?))?,?\s*$/.exec(lnNC);
+                const enumLine = lnNC.trim().replace(/,$/, "").trim();
+                let mm = /^(\w+)(?:\s*=(.*))?$/.exec(enumLine);
                 if (mm) {
                     let nm = mm[1];
-                    let v = mm[3];
+                    let v = mm[2] && mm[2].trim();
                     let opt = "";
                     if (v) {
                         // user-supplied value
@@ -7845,23 +7848,26 @@ var pxt;
             }
             function parseArg(parsedAttrs, s) {
                 s = s.trim();
-                let m = /(.*)=\s*(-?\w+)$/.exec(s);
+                const equals = s.lastIndexOf("=");
+                const m = equals < 0 ? null : /^\s*(-?\w+)$/.exec(s.slice(equals + 1));
                 let defl = "";
                 let qm = "";
                 if (m) {
-                    defl = m[2];
+                    defl = m[1];
                     qm = "?";
-                    s = m[1].trim();
+                    s = s.slice(0, equals).trim();
                 }
-                m = /^(.*?)(\w+)$/.exec(s);
-                if (!m) {
+                let nameStart = s.length;
+                while (nameStart > 0 && /\w/.test(s.charAt(nameStart - 1)))
+                    --nameStart;
+                if (nameStart == s.length || /[\r\n\u2028\u2029]/.test(s.slice(0, nameStart))) {
                     err("invalid argument: " + s);
                     return {
                         name: "???",
                         type: "int"
                     };
                 }
-                let argName = m[2];
+                let argName = s.slice(nameStart);
                 if (parsedAttrs.paramDefl[argName]) {
                     defl = parsedAttrs.paramDefl[argName];
                     qm = "?";
@@ -7876,7 +7882,7 @@ var pxt;
                 }
                 return {
                     name: argName + qm,
-                    type: m[1]
+                    type: s.slice(0, nameStart)
                 };
             }
             function parseCpp(src, isHeader) {
@@ -7886,9 +7892,28 @@ var pxt;
                 inDocComment = false;
                 let indexedInstanceAttrs;
                 let indexedInstanceIdx = -1;
-                // replace #if 0 .... #endif with newlines
-                src = src.replace(/^(\s*#\s*if\s+(\w+)\s*$)([^]*?)(^\s*#\s*(elif|else|endif)\s*$)/mg, (f, _if, arg, middle, _endif) => hash_if_options.indexOf(arg) >= 0 && !cpp_options[arg] ?
-                    _if + middle.replace(/[^\n]/g, "") + _endif : f);
+                // Match directives one line at a time so unterminated blocks cannot rescan the source.
+                const lines = src.split(/\r?\n/);
+                let ifStart = -1;
+                let ifArg = "";
+                lines.forEach((ln, i) => {
+                    const directive = /^#\s*(?:if\s+(\w+)|(elif|else|endif))$/.exec(ln.trim());
+                    if (!directive)
+                        return;
+                    if (ifStart < 0) {
+                        if (directive[1]) {
+                            ifStart = i;
+                            ifArg = directive[1];
+                        }
+                    }
+                    else if (directive[2]) {
+                        if (hash_if_options.indexOf(ifArg) >= 0 && !cpp_options[ifArg]) {
+                            for (let j = ifStart + 1; j < i; ++j)
+                                lines[j] = "";
+                        }
+                        ifStart = -1;
+                    }
+                });
                 // special handling of C++ namespace that ends with Methods (e.g. FooMethods)
                 // such a namespace will be converted into a TypeScript interface
                 // this enables simple objects with methods to be defined. See, for example:
@@ -7966,10 +7991,14 @@ var pxt;
                             return "T";
                         case "String":
                             return "S";
-                        default:
+                        default: {
                             if (U.lookup(knownEnums, tp))
                                 return "I";
-                            return "_" + tp.replace(/[\*_]+$/, "");
+                            let typeEnd = tp.length;
+                            while (typeEnd > 0 && /[\*_]/.test(tp.charAt(typeEnd - 1)))
+                                --typeEnd;
+                            return "_" + tp.slice(0, typeEnd);
+                        }
                     }
                 }
                 function generateVMWrapper(fi, argTypes) {
@@ -8051,7 +8080,7 @@ var pxt;
                 enumVal = 0;
                 enumsDTS.setNs("");
                 shimsDTS.setNs("");
-                src.split(/\r?\n/).forEach(ln => {
+                lines.forEach(ln => {
                     ++lineNo;
                     // remove comments (NC = no comments)
                     let lnNC = stripComments(ln);
@@ -27237,12 +27266,20 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
             strong: 1,
             em: 1,
         };
+        /** Keeps metadata and token-only HTML out of the translation catalog. */
+        function isNonTranslatable(text) {
+            if (text.startsWith("IE=edge,") || text.startsWith("width=device-width"))
+                return true;
+            // Remove URLs, template placeholders, and spacing entities to look for prose.
+            const prose = text.replace(/(?:https?:\/\/|\/)[\w@\/.]+|@[-\w]+@|\{[^{}]+\}|&nbsp;/g, "");
+            return !/[a-zA-Z]/.test(prose);
+        }
         function translate(html, locale) {
             const missing = {};
             function translateOne(toTranslate) {
                 let spm = /^(\s*)([^]*?)(\s*)$/.exec(toTranslate);
                 let text = spm[2].replace(/\s+/g, " ");
-                if (text == "" || /^((IE=edge,.*|width=device-width.*|(https?:\/\/|\/)[\w@\/\.]+|@[\-\w]+@|\{[^\{\}]+\}|[^a-zA-Z]*|(&nbsp;)+)\s*)+$/.test(text))
+                if (isNonTranslatable(text))
                     return null;
                 let v = U.lookup(locale, text);
                 if (v)

package/built/pxtservices/editorDriver.d.ts

@@ -36,6 +36,7 @@ export declare class EditorDriver extends IframeDriver {
     redo(): Promise<void>;
     setHighContrast(on: boolean): Promise<void>;
     showThemePicker(): Promise<void>;
+    showExtensions(): Promise<void>;
     toggleHighContrast(): Promise<void>;
     toggleGreenScreen(): Promise<void>;
     toggleAccessibleBlocks(): Promise<void>;