pxt-core 8.0.5 → 8.1.3

package/built/pxtcompiler.js

@@ -4926,6 +4926,101 @@ ${output}</xml>`;
                     }
                     return undefined;
                 }
+                /**
+                 * We split up comments according to the following rules:
+                 *      1. If the comment is not top-level:
+                 *          a. Combine it with all comments for the following statement
+                 *          b. If there is no following statement in the current block, group it with the previous statement
+                 *          c. If there are no statements inside the block, group it with the parent block
+                 *          d. If trailing the same line as the statement, group it with the comments for that statement
+                 *      2. If the comment is top-level:
+                 *          b. If the comment is followed by an empty line, it becomes a workspace comment
+                 *          c. If the comment is followed by a multi-line comment, it becomes a workspace comment
+                 *          a. If the comment is a single-line comment, combine it with the next single-line comment
+                 *          d. If the comment is not followed with an empty line, group it with the next statement or event
+                 *          e. All other comments are workspace comments
+                 *
+                 * The below function gathers any comments associated to the Node, and attaches them
+                 * to the StatementNode.
+                 */
+                function getNodeComments(commented, stmt) {
+                    let comments = [];
+                    let current;
+                    for (let i = 0; i < commentMap.length; i++) {
+                        current = commentMap[i];
+                        if (!current.owner && current.start >= commented.pos && current.end <= commented.end) {
+                            current.owner = commented;
+                            current.ownerStatement = stmt;
+                            comments.push(current);
+                        }
+                        if (current.start > commented.end)
+                            break;
+                    }
+                    if (current && current.isTrailingComment) {
+                        const endLine = ts.getLineAndCharacterOfPosition(file, commented.end);
+                        const commentLine = ts.getLineAndCharacterOfPosition(file, current.start);
+                        if (endLine.line === commentLine.line) {
+                            // If the comment is trailing and on the same line as the statement, it probably belongs
+                            // to this statement. Remove it from any statement it's already assigned to and any workspace
+                            // comments
+                            if (current.ownerStatement) {
+                                current.ownerStatement.comment.splice(current.ownerStatement.comment.indexOf(current), 1);
+                                for (const wsComment of workspaceComments) {
+                                    wsComment.comment.splice(wsComment.comment.indexOf(current), 1);
+                                }
+                            }
+                            current.owner = commented;
+                            current.ownerStatement = stmt;
+                            comments.push(current);
+                        }
+                    }
+                    if (comments.length) {
+                        const wsCommentRefs = [];
+                        if (isTopLevelComment(commented)) {
+                            let currentWorkspaceComment = [];
+                            const localWorkspaceComments = [];
+                            comments.forEach((comment, index) => {
+                                let beforeStatement = comment.owner && comment.start < comment.owner.getStart();
+                                if (comment.kind === CommentKind.MultiLine && beforeStatement) {
+                                    if (currentWorkspaceComment.length) {
+                                        localWorkspaceComments.push(currentWorkspaceComment);
+                                        currentWorkspaceComment = [];
+                                    }
+                                    if (index != comments.length - 1) {
+                                        localWorkspaceComments.push([comment]);
+                                        return;
+                                    }
+                                }
+                                currentWorkspaceComment.push(comment);
+                                if (comment.followedByEmptyLine && beforeStatement) {
+                                    localWorkspaceComments.push(currentWorkspaceComment);
+                                    currentWorkspaceComment = [];
+                                }
+                            });
+                            comments = currentWorkspaceComment;
+                            localWorkspaceComments.forEach(comment => {
+                                const refId = getCommentRef();
+                                wsCommentRefs.push(refId);
+                                workspaceComments.push({ comment, refId });
+                            });
+                        }
+                        // Attach comments to StatementNode
+                        if (stmt) {
+                            if (wsCommentRefs.length) {
+                                if (stmt.data)
+                                    stmt.data += ";" + wsCommentRefs.join(";");
+                                else
+                                    stmt.data = wsCommentRefs.join(";");
+                            }
+                            if (comments && comments.length) {
+                                if (stmt.comment)
+                                    stmt.comment = stmt.comment.concat(comments);
+                                else
+                                    stmt.comment = comments;
+                            }
+                        }
+                    }
+                }
                 function getStatementBlock(n, next, parent, asExpression = false, topLevel = false) {
                     const node = n;
                     let stmt;
@@ -5028,7 +5123,7 @@ ${output}</xml>`;
                         }
                     }
                     if (!skipComments) {
-                        getComments(parent || node);
+                        getNodeComments(parent || node, stmt);
                     }
                     return stmt;
                     function getNext() {
@@ -5037,97 +5132,6 @@ ${output}</xml>`;
                         }
                         return undefined;
                     }
-                    /**
-                     * We split up comments according to the following rules:
-                     *      1. If the comment is not top-level:
-                     *          a. Combine it with all comments for the following statement
-                     *          b. If there is no following statement in the current block, group it with the previous statement
-                     *          c. If there are no statements inside the block, group it with the parent block
-                     *          d. If trailing the same line as the statement, group it with the comments for that statement
-                     *      2. If the comment is top-level:
-                     *          b. If the comment is followed by an empty line, it becomes a workspace comment
-                     *          c. If the comment is followed by a multi-line comment, it becomes a workspace comment
-                     *          a. If the comment is a single-line comment, combine it with the next single-line comment
-                     *          d. If the comment is not followed with an empty line, group it with the next statement or event
-                     *          e. All other comments are workspace comments
-                     */
-                    function getComments(commented) {
-                        let comments = [];
-                        let current;
-                        for (let i = 0; i < commentMap.length; i++) {
-                            current = commentMap[i];
-                            if (!current.owner && current.start >= commented.pos && current.end <= commented.end) {
-                                current.owner = commented;
-                                current.ownerStatement = stmt;
-                                comments.push(current);
-                            }
-                            if (current.start > commented.end)
-                                break;
-                        }
-                        if (current && current.isTrailingComment) {
-                            const endLine = ts.getLineAndCharacterOfPosition(file, commented.end);
-                            const commentLine = ts.getLineAndCharacterOfPosition(file, current.start);
-                            if (endLine.line === commentLine.line) {
-                                // If the comment is trailing and on the same line as the statement, it probably belongs
-                                // to this statement. Remove it from any statement it's already assigned to and any workspace
-                                // comments
-                                if (current.ownerStatement) {
-                                    current.ownerStatement.comment.splice(current.ownerStatement.comment.indexOf(current), 1);
-                                    for (const wsComment of workspaceComments) {
-                                        wsComment.comment.splice(wsComment.comment.indexOf(current), 1);
-                                    }
-                                }
-                                current.owner = commented;
-                                current.ownerStatement = stmt;
-                                comments.push(current);
-                            }
-                        }
-                        if (comments.length) {
-                            const wsCommentRefs = [];
-                            if (isTopLevelComment(commented)) {
-                                let currentWorkspaceComment = [];
-                                const localWorkspaceComments = [];
-                                comments.forEach((comment, index) => {
-                                    let beforeStatement = comment.owner && comment.start < comment.owner.getStart();
-                                    if (comment.kind === CommentKind.MultiLine && beforeStatement) {
-                                        if (currentWorkspaceComment.length) {
-                                            localWorkspaceComments.push(currentWorkspaceComment);
-                                            currentWorkspaceComment = [];
-                                        }
-                                        if (index != comments.length - 1) {
-                                            localWorkspaceComments.push([comment]);
-                                            return;
-                                        }
-                                    }
-                                    currentWorkspaceComment.push(comment);
-                                    if (comment.followedByEmptyLine && beforeStatement) {
-                                        localWorkspaceComments.push(currentWorkspaceComment);
-                                        currentWorkspaceComment = [];
-                                    }
-                                });
-                                comments = currentWorkspaceComment;
-                                localWorkspaceComments.forEach(comment => {
-                                    const refId = getCommentRef();
-                                    wsCommentRefs.push(refId);
-                                    workspaceComments.push({ comment, refId });
-                                });
-                            }
-                            if (stmt) {
-                                if (wsCommentRefs.length) {
-                                    if (stmt.data)
-                                        stmt.data += ";" + wsCommentRefs.join(";");
-                                    else
-                                        stmt.data = wsCommentRefs.join(";");
-                                }
-                                if (comments && comments.length) {
-                                    if (stmt.comment)
-                                        stmt.comment = stmt.comment.concat(comments);
-                                    else
-                                        stmt.comment = comments;
-                                }
-                            }
-                        }
-                    }
                 }
                 function getTypeScriptStatementBlock(node, prefix, err) {
                     if (options.errorOnGreyBlocks)
@@ -5897,12 +5901,13 @@ ${output}</xml>`;
                     eventStatements.map(n => getStatementBlock(n, undefined, undefined, false, topLevel)).forEach(emitStatementNode);
                     if (blockStatements.length) {
                         // wrap statement in "on start" if top level
-                        const stmtNode = blockStatements.shift();
-                        const stmt = getStatementBlock(stmtNode, blockStatements, parent, false, topLevel);
+                        const blockNode = blockStatements.shift();
+                        const stmt = getStatementBlock(blockNode, blockStatements, parent, false, topLevel);
                         if (emitOnStart) {
                             // Preserve any variable edeclarations that were never used
-                            let current = stmt;
-                            let currentNode = stmtNode;
+                            // stmt and blockNode will not yet align if there was an auto-declared variable.
+                            let currentStmtNode = stmt;
+                            let currentBlockNode = blockNode;
                             autoDeclarations.forEach(([name, node]) => {
                                 if (varUsages[name] === ReferenceType.InBlocksOnly) {
                                     return;
@@ -5916,17 +5921,21 @@ ${output}</xml>`;
                                     v = getTypeScriptStatementBlock(node, "let ");
                                 }
                                 else {
-                                    v = getVariableSetOrChangeBlock(stmtNode, node.name, node.initializer, false, true);
+                                    v = getVariableSetOrChangeBlock(blockNode, node.name, node.initializer, false, true);
                                 }
-                                v.next = current;
-                                current = v;
-                                currentNode = node;
+                                // Auto-declared variables were not previously inserted into the stmt linked-list.
+                                // Insert auto-declared 'v' as the currentStmtNode.
+                                v.next = currentStmtNode;
+                                currentStmtNode = v;
+                                currentBlockNode = node;
+                                // Attach to currentStmtNode any associated comments
+                                getNodeComments(currentBlockNode.parent, currentStmtNode);
                             });
-                            if (current) {
-                                const r = mkStmt(ts.pxtc.ON_START_TYPE, currentNode);
+                            if (currentStmtNode) {
+                                const r = mkStmt(ts.pxtc.ON_START_TYPE, currentBlockNode);
                                 r.handlers = [{
                                         name: "HANDLER",
-                                        statement: current
+                                        statement: currentStmtNode
                                     }];
                                 return r;
                             }
@@ -18441,6 +18450,7 @@ var ts;
                 let snippet;
                 if (preDefinedSnippet) {
                     snippet = [preDefinedSnippet];
+                    snippetPrefix = undefined;
                 }
                 else {
                     snippet = [fnName];

package/built/pxteditor.js

@@ -1245,8 +1245,8 @@ var pxt;
                 let proj;
                 let id;
                 if (name) {
-                    let id = ts.pxtc.escapeIdentifier(name);
-                    proj = project.getTilemap(id);
+                    id = ts.pxtc.escapeIdentifier(name);
+                    proj = project.getTilemap(id) || project.lookupAssetByName("tilemap" /* Tilemap */, name);
                 }
                 if (!proj) {
                     let tileWidth = 16;

package/built/pxtlib.js

@@ -8698,13 +8698,20 @@ var pxt;
         docs.prepTemplate = prepTemplate;
         function setupRenderer(renderer) {
             renderer.image = function (href, title, text) {
-                let out = '<img class="ui image" src="' + href + '" alt="' + text + '"';
-                if (title) {
-                    out += ' title="' + title + '"';
+                if (href.startsWith("youtube:")) {
+                    let out = '<div class="tutorial-video-embed"><iframe src="https://www.youtube.com/embed/' + href.split(":").pop()
+                        + '" title="' + title + '" frameborder="0" ' + 'allowFullScreen ' + 'allow="autoplay; picture-in-picture"></iframe></div>';
+                    return out;
+                }
+                else {
+                    let out = '<img class="ui image" src="' + href + '" alt="' + text + '"';
+                    if (title) {
+                        out += ' title="' + title + '"';
+                    }
+                    out += ' loading="lazy"';
+                    out += this.options.xhtml ? '/>' : '>';
+                    return out;
                 }
-                out += ' loading="lazy"';
-                out += this.options.xhtml ? '/>' : '>';
-                return out;
             };
             renderer.listitem = function (text) {
                 const m = /^\s*\[( |x)\]/i.exec(text);
@@ -18002,7 +18009,7 @@ var pxt;
                 id,
                 type: "tilemap" /* Tilemap */,
                 meta: {
-                    displayName: id
+                    displayName: name || id
                 },
                 data: data
             });

package/built/pxtrunner.d.ts

@@ -97,6 +97,7 @@ declare namespace pxt.runner {
         dependencies?: string[];
         builtJsInfo?: pxtc.BuiltSimJsInfo;
         single?: boolean;
+        autofocus?: boolean;
     }
     let mainPkg: pxt.MainPackage;
     function initFooter(footer: HTMLElement, shareId?: string): void;

package/built/pxtrunner.js

@@ -1749,7 +1749,8 @@ var pxt;
                 highContrast: simOptions.highContrast,
                 storedState: storedState,
                 light: simOptions.light,
-                single: simOptions.single
+                single: simOptions.single,
+                autofocus: simOptions.autofocus
             };
             if (pxt.appTarget.simulator && !simOptions.fullScreen)
                 runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio

package/built/pxtsim.d.ts

@@ -1268,6 +1268,7 @@ declare namespace pxsim {
         ipc?: boolean;
         dependencies?: Map<string>;
         single?: boolean;
+        autofocus?: boolean;
     }
     interface HwDebugger {
         postMessage: (msg: pxsim.SimulatorMessage) => void;

package/built/pxtsim.js

@@ -6295,6 +6295,7 @@ var pxsim;
             }
         }
         createFrame(url) {
+            var _a;
             const wrapper = document.createElement("div");
             wrapper.className = `simframe ui embed`;
             const frame = document.createElement('iframe');
@@ -6309,6 +6310,8 @@ var pxsim;
             frame.frameBorder = "0";
             frame.dataset['runid'] = this.runId;
             frame.dataset['origin'] = new URL(furl).origin || "*";
+            if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.autofocus)
+                frame.setAttribute("autofocus", "true");
             wrapper.appendChild(frame);
             const i = document.createElement("i");
             i.className = "videoplay xicon icon";
@@ -6562,11 +6565,14 @@ var pxsim;
             return true;
         }
         handleMessage(msg, source) {
+            var _a;
             switch (msg.type || '') {
                 case 'ready': {
                     const frameid = msg.frameid;
                     const frame = document.getElementById(frameid);
                     if (frame) {
+                        if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.autofocus)
+                            frame.focus();
                         this.startFrame(frame);
                         if (this.options.revealElement)
                             this.options.revealElement(frame);

package/built/server.js

@@ -1026,7 +1026,7 @@ function serveAsync(options) {
             return;
         }
         let publicDir = path.join(nodeutil.pxtCoreDir, "webapp/public");
-        if (pathname == "/--embed") {
+        if (pathname == "/--embed" || pathname === "/---embed") {
             sendFile(path.join(publicDir, 'embed.js'));
             return;
         }