pxt-core 8.2.4 → 8.2.5

package/built/pxtlib.d.ts

@@ -878,6 +878,10 @@ declare namespace pxt.cloud {
     };
 }
 declare namespace pxt.commands {
+    interface RecompileOptions {
+        recompile: boolean;
+        useVariants: string[];
+    }
     interface DeployOptions {
         reportError: (e: string) => void;
         showNotification: (msg: string) => void;
@@ -899,6 +903,7 @@ declare namespace pxt.commands {
         helpUrl: string;
     };
     let showUploadInstructionsAsync: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>, saveonly?: boolean) => Promise<void>;
+    let showProgramTooLargeErrorAsync: (variants: string[], confirmAsync: (options: any) => Promise<number>) => Promise<RecompileOptions>;
     let saveProjectAsync: (project: pxt.cpp.HexFile) => Promise<void>;
     let electronDeployAsync: (r: ts.pxtc.CompileResult) => Promise<void>;
     let webUsbPairDialogAsync: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;
@@ -3400,6 +3405,7 @@ declare namespace ts.pxtc.assembler {
         opcode: number;
         stack: number;
         isLong: boolean;
+        ldlitLabel: string;
         constructor(bin: File, text: string);
         getOpExt(): string;
         getOp(): string;
@@ -3437,10 +3443,17 @@ declare namespace ts.pxtc.assembler {
         disablePeepHole: boolean;
         stackAtLabel: pxt.Map<number>;
         private prevLabel;
+        codeSizeStats: boolean;
+        private labelToObject;
+        private idToObject;
+        private objSuspendStart;
+        private currObject;
+        private labelsToObjectDone;
         protected emitShort(op: number): void;
         protected emitOpCode(op: number): void;
         location(): number;
         pc(): number;
+        useLabel(name: string): void;
         parseOneInt(s: string): number;
         private looksLikeLabel;
         private scopedName;
@@ -3461,6 +3474,7 @@ declare namespace ts.pxtc.assembler {
         private prepLines;
         private iterLines;
         getSourceMap(): pxt.Map<number[]>;
+        getCodeSizeStats(): string;
         getSource(clean: boolean, numStmts?: number, flashSize?: number): string;
         private peepHole;
         private clearLabels;

package/built/pxtlib.js

@@ -8713,6 +8713,7 @@ var pxt;
         docs.prepTemplate = prepTemplate;
         function setupRenderer(renderer) {
             renderer.image = function (href, title, text) {
+                var _a, _b;
                 const endpointName = "makecodeprodmediaeastus-usea";
                 if (href.startsWith("youtube:")) {
                     let out = '<div class="tutorial-video-embed"><iframe class="yt-embed" src="https://www.youtube.com/embed/' + href.split(":").pop()
@@ -8720,7 +8721,24 @@ var pxt;
                     return out;
                 }
                 else if (href.startsWith("azuremedia:")) {
-                    let out = `<div class="tutorial-video-embed"><video class="ams-embed" controls src="https://${endpointName}.streaming.media.azure.net/` + href.split(":").pop() + '/manifest(format=mpd-time-cmaf)" /></div>';
+                    let videoID = href.split(":")[1];
+                    const flagsSplit = videoID.split("?");
+                    let startTime;
+                    let endTime;
+                    if (flagsSplit[1]) {
+                        videoID = flagsSplit[0];
+                        const passedParameters = flagsSplit[1];
+                        startTime = (_a = /start(?:time)?=(\d+)/i.exec(passedParameters)) === null || _a === void 0 ? void 0 : _a[1];
+                        endTime = (_b = /end(?:time)?=(\d+)/i.exec(passedParameters)) === null || _b === void 0 ? void 0 : _b[1];
+                    }
+                    const url = new URL(`https://${endpointName}.streaming.media.azure.net/${videoID}/manifest(format=mpd-time-csf).mpd`);
+                    if (startTime) {
+                        url.hash = `t=${startTime}`;
+                    }
+                    if (endTime) {
+                        url.searchParams.append("endTime", endTime);
+                    }
+                    let out = `<div class="tutorial-video-embed"><video class="ams-embed" controls src="${url.toString()}" /></div>`;
                     return out;
                 }
                 else {
@@ -14275,7 +14293,7 @@ var pxt;
                         // and pulls from master
                         const modtag = (modid === null || modid === void 0 ? void 0 : modid.tag) || ((_a = mod.config) === null || _a === void 0 ? void 0 : _a.version);
                         const vertag = verid.tag;
-                        // if there is no tag on the current dependency, 
+                        // if there is no tag on the current dependency,
                         // assume same as existing module version if any
                         if (modtag && !vertag) {
                             pxt.debug(`unversioned ${ver}, using ${modtag}`);
@@ -14734,6 +14752,8 @@ var pxt;
                     opts.otherMultiVariants.push(etarget);
                 }
                 else {
+                    etarget.target.isNative = opts.target.isNative;
+                    opts.target = etarget.target;
                     ext = einfo;
                     opts.otherMultiVariants = [];
                 }
@@ -15689,7 +15709,12 @@ var ts;
                 const left = param.substr(0, dotIdx);
                 let right = param.substr(dotIdx + 1);
                 right = pxtc.U.snakify(right).toUpperCase();
-                return `${left}.${right}`;
+                if (left) {
+                    return `${left}.${right}`;
+                }
+                else {
+                    return right;
+                }
             }
             return param;
         }
@@ -21603,6 +21628,18 @@ var ts;
                 }
             }
             assembler.Line = Line;
+            const MAX_OBJ_USERS = 5;
+            class AsmObject {
+                constructor(id, description) {
+                    this.id = id;
+                    this.description = description;
+                    this.sizeAdj = 0;
+                    this.users = [];
+                }
+                get size() {
+                    return (this.endLocation - this.startLocation) - this.sizeAdj;
+                }
+            }
             // File is the center of the action: parsing a file into a sequence of Lines
             // and also emitting the binary (buf)
             class File {
@@ -21627,6 +21664,11 @@ var ts;
                     this.throwOnError = false;
                     this.disablePeepHole = false;
                     this.stackAtLabel = {};
+                    this.codeSizeStats = false;
+                    this.labelToObject = {};
+                    this.idToObject = {};
+                    this.objSuspendStart = 0;
+                    this.labelsToObjectDone = false;
                     this.currLine = new Line(this, "<start>");
                     this.currLine.lineNo = 0;
                     this.ei = ei;
@@ -21646,6 +21688,15 @@ var ts;
                 pc() {
                     return this.location() + this.baseOffset;
                 }
+                useLabel(name) {
+                    if (!this.currObject || name[0] == '.' || this.objSuspendStart)
+                        return;
+                    const obj = pxtc.U.lookup(this.labelToObject, name);
+                    if (!obj || obj == this.currObject)
+                        return;
+                    if (obj.users.length < MAX_OBJ_USERS && obj.users.indexOf(this.currObject) < 0)
+                        obj.users.push(this.currObject);
+                }
                 // parsing of an "integer", well actually much more than
                 // just that
                 parseOneInt(s) {
@@ -21775,6 +21826,7 @@ var ts;
                         return name;
                 }
                 lookupLabel(name, direct = false) {
+                    this.useLabel(name);
                     let v = null;
                     let scoped = this.scopedName(name);
                     if (this.labels.hasOwnProperty(scoped)) {
@@ -21933,6 +21985,37 @@ var ts;
                     };
                     let num0;
                     switch (words[0]) {
+                        case ".object":
+                            if (!this.codeSizeStats) {
+                                // do nothing
+                            }
+                            else if (words[1] == "PUSH") {
+                                this.objSuspendStart = this.location();
+                            }
+                            else if (words[1] == "POP") {
+                                if (this.objSuspendStart)
+                                    this.currObject.sizeAdj += this.location() - this.objSuspendStart;
+                                this.objSuspendStart = 0;
+                            }
+                            else {
+                                if (this.currObject)
+                                    this.currObject.endLocation = this.location();
+                                this.currObject = pxtc.U.lookup(this.idToObject, words[1]);
+                                if (!this.currObject) {
+                                    const str = l.text.replace(/^[^"]*/, "");
+                                    let parsed = words[1];
+                                    if (words.length > 2) {
+                                        parsed = parseString(str.trim());
+                                        if (parsed == null)
+                                            this.directiveError(lf("expecting string in .object"));
+                                    }
+                                    this.currObject = new AsmObject(words[1], parsed);
+                                    this.idToObject[words[1]] = this.currObject;
+                                }
+                                this.currObject.sizeAdj = 0;
+                                this.currObject.startLocation = this.location();
+                            }
+                            break;
                         case ".ascii":
                         case ".asciz":
                         case ".string":
@@ -22127,6 +22210,8 @@ var ts;
                     }
                 }
                 handleOneInstruction(ln, instr) {
+                    if (this.codeSizeStats && ln.ldlitLabel)
+                        this.useLabel(ln.ldlitLabel);
                     let op = instr.emit(ln);
                     if (!op.error) {
                         this.stack += op.stack;
@@ -22235,6 +22320,8 @@ var ts;
                         if (l.words.length == 0)
                             return;
                         if (l.type == "label") {
+                            if (this.currObject && !this.labelsToObjectDone && l.words[0][0] != '.')
+                                this.labelToObject[l.words[0]] = this.currObject;
                             let lblname = this.scopedName(l.words[0]);
                             this.prevLabel = lblname;
                             if (this.finalEmit) {
@@ -22275,6 +22362,8 @@ var ts;
                             pxtc.oops();
                         }
                     });
+                    this.labelsToObjectDone = true;
+                    this.currObject = null;
                 }
                 getSourceMap() {
                     const sourceMap = {};
@@ -22307,6 +22396,22 @@ var ts;
                     }
                     return sourceMap;
                 }
+                getCodeSizeStats() {
+                    if (!this.codeSizeStats)
+                        return "";
+                    const objs = pxtc.U.values(this.idToObject);
+                    objs.sort((a, b) => b.size - a.size);
+                    let r = ";\n; Code size:\n;\n";
+                    for (const obj of objs) {
+                        r += `; ${("         " + obj.size).slice(-6)} ${obj.description} [${obj.id}]\n`;
+                        if (obj.users.length >= MAX_OBJ_USERS)
+                            r += `;        by many, including ${obj.users[0].description}\n`;
+                        else
+                            for (const x of obj.users)
+                                r += `;        by ${x.description} [${x.id}]\n`;
+                    }
+                    return r;
+                }
                 getSource(clean, numStmts = 1, flashSize = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {
@@ -22322,8 +22427,11 @@ var ts;
                     let lenLiterals = size("_literals_end");
                     let lenAllCode = lenPrev;
                     let totalSize = (lenTotal + this.baseOffset) & 0xffffff;
-                    if (flashSize && totalSize > flashSize)
-                        pxtc.U.userError(lf("program too big by {0} bytes!", totalSize - flashSize));
+                    if (flashSize && totalSize > flashSize) {
+                        const e = new Error(lf("program too big by {0} bytes!", totalSize - flashSize));
+                        e.ksErrorCode = 9283;
+                        throw e;
+                    }
                     flashSize = flashSize || 128 * 1024;
                     let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalSize, (100 * totalSize / flashSize).toFixed(1), (flashSize / 1024).toFixed(1), flashSize - totalSize);
                     let res = 
@@ -22331,7 +22439,7 @@ var ts;
                     lf("; generated code sizes (bytes): {0} (incl. {1} user, {2} helpers, {3} vtables, {4} lits); src size {5}\n", lenAllCode, lenCode, lenHelpers, lenVtables, lenLiterals, lenTotal - lenAllCode) +
                         lf("; assembly: {0} lines; density: {1} bytes/stmt; ({2} stmts)\n", this.lines.length, Math.round(100 * lenCode / numStmts) / 100, numStmts) +
                         totalInfo + "\n" +
-                        this.stats + "\n\n";
+                        this.stats + this.getCodeSizeStats() + "\n\n";
                     let skipOne = false;
                     this.lines.forEach((ln, i) => {
                         if (ln.words[0] == "_stored_program") {