pxt-core 8.4.6 → 8.4.8

package/built/pxt.js

@@ -97886,7 +97886,6 @@ var pxt;
                 this.initialUserPreferences_ = undefined;
                 this.initialAuthCheck_ = undefined;
                 this.patchQueue = [];
-                pxt.Util.assert(!_client);
                 // Set global instance.
                 _client = this;
             }
@@ -121790,8 +121789,9 @@ var pxt;
         }
         Cloud.getUserId = getUserId;
         function parseScriptId(uri) {
+            var _a;
             const target = pxt.appTarget;
-            if (!uri || !target.appTheme || !target.cloud || !target.cloud.sharing)
+            if (!uri || !target.appTheme || !((_a = target.cloud) === null || _a === void 0 ? void 0 : _a.sharing))
                 return undefined;
             let domains = ["makecode.com"];
             if (target.appTheme.embedUrl)
@@ -121799,14 +121799,14 @@ var pxt;
             if (target.appTheme.shareUrl)
                 domains.push(target.appTheme.shareUrl);
             domains = Util.unique(domains, d => d).map(d => Util.escapeForRegex(Util.stripUrlProtocol(d).replace(/\/$/, '')).toLowerCase());
-            const rx = `^((https:\/\/)?(?:${domains.join('|')})\/)?(?:v[0-9]+\/)?(api\/oembed\?url=.*%2F([^&]*)&.*?|([a-z0-9\-_]+))$`;
-            const m = new RegExp(rx, 'i').exec(uri.trim());
-            const scriptid = m && (!m[1] || domains.indexOf(Util.escapeForRegex(m[1].replace(/https:\/\//, '').replace(/\/$/, '')).toLowerCase()) >= 0) && (m[3] || m[4]) ? (m[3] ? m[3] : m[4]) : null;
-            if (!scriptid)
-                return undefined;
-            if (scriptid[0] == "_" && scriptid.length == 13)
-                return scriptid;
-            if (scriptid.length == 23 && /^[0-9\-]+$/.test(scriptid) || scriptid.length == 24 && /^S[0-9\-]+$/.test(scriptid))
+            const domainCheck = `(?:(?:https:\/\/)?(?:${domains.join('|')})\/)`;
+            const versionRefCheck = "(?:v[0-9]+\/)";
+            const oembedCheck = "api\/oembed\\?url=.*%2F([^&#]*)&.*";
+            const sharePageCheck = "([a-z0-9\\-_]+)(?:[#?&].*)?";
+            const scriptIdCheck = `^${domainCheck}?${versionRefCheck}?(?:(?:${oembedCheck})|(?:${sharePageCheck}))$`;
+            const m = new RegExp(scriptIdCheck, 'i').exec(uri.trim());
+            const scriptid = (m === null || m === void 0 ? void 0 : m[1] /** oembed res **/) || (m === null || m === void 0 ? void 0 : m[2]) /** share page res **/;
+            if (/^(_.{12}|S?[0-9\-]{23})$/.test(scriptid))
                 return scriptid;
             return undefined;
         }
@@ -152867,6 +152867,27 @@ var pxsim;
             return output;
         }
         U.delay = delay;
+        // Returns a function, that, as long as it continues to be invoked, will only
+        // trigger every N milliseconds. If `immediate` is passed, trigger the
+        // function on the leading edge, instead of the trailing.
+        function throttle(func, wait, immediate) {
+            let timeout;
+            return function () {
+                let context = this;
+                let args = arguments;
+                let later = function () {
+                    timeout = null;
+                    if (!immediate)
+                        func.apply(context, args);
+                };
+                let callNow = immediate && !timeout;
+                if (!timeout)
+                    timeout = setTimeout(later, wait);
+                if (callNow)
+                    func.apply(context, args);
+            };
+        }
+        U.throttle = throttle;
         function promiseMapAll(values, mapper) {
             return Promise.all(values.map(v => mapper(v)));
         }
@@ -154645,18 +154666,8 @@ var pxsim;
             }
         }
         postMessageCore(frame, msg) {
-            var _a, _b;
-            frame.contentWindow.postMessage(msg, frame.dataset['origin']);
-            if (pxsim.U.isLocalHostDev() && ((_a = pxt === null || pxt === void 0 ? void 0 : pxt.appTarget) === null || _a === void 0 ? void 0 : _a.id)) {
-                // If using the production simulator on local serve, the domain might have been
-                // redirected by the CLI server. Also send to the production domain just in case
-                try {
-                    frame.contentWindow.postMessage(msg, `https://trg-${(_b = pxt === null || pxt === void 0 ? void 0 : pxt.appTarget) === null || _b === void 0 ? void 0 : _b.id}.userpxt.io/---simulator`);
-                }
-                catch (e) {
-                    // Ignore exceptions if the target origin doesn't match
-                }
-            }
+            const origin = pxsim.U.isLocalHostDev() ? "*" : frame.dataset["origin"];
+            frame.contentWindow.postMessage(msg, origin);
         }
         createFrame(url) {
             var _a, _b, _c;

package/built/pxtlib.js

@@ -200,7 +200,6 @@ var pxt;
                 this.initialUserPreferences_ = undefined;
                 this.initialAuthCheck_ = undefined;
                 this.patchQueue = [];
-                pxt.Util.assert(!_client);
                 // Set global instance.
                 _client = this;
             }
@@ -24104,8 +24103,9 @@ var pxt;
         }
         Cloud.getUserId = getUserId;
         function parseScriptId(uri) {
+            var _a;
             const target = pxt.appTarget;
-            if (!uri || !target.appTheme || !target.cloud || !target.cloud.sharing)
+            if (!uri || !target.appTheme || !((_a = target.cloud) === null || _a === void 0 ? void 0 : _a.sharing))
                 return undefined;
             let domains = ["makecode.com"];
             if (target.appTheme.embedUrl)
@@ -24113,14 +24113,14 @@ var pxt;
             if (target.appTheme.shareUrl)
                 domains.push(target.appTheme.shareUrl);
             domains = Util.unique(domains, d => d).map(d => Util.escapeForRegex(Util.stripUrlProtocol(d).replace(/\/$/, '')).toLowerCase());
-            const rx = `^((https:\/\/)?(?:${domains.join('|')})\/)?(?:v[0-9]+\/)?(api\/oembed\?url=.*%2F([^&]*)&.*?|([a-z0-9\-_]+))$`;
-            const m = new RegExp(rx, 'i').exec(uri.trim());
-            const scriptid = m && (!m[1] || domains.indexOf(Util.escapeForRegex(m[1].replace(/https:\/\//, '').replace(/\/$/, '')).toLowerCase()) >= 0) && (m[3] || m[4]) ? (m[3] ? m[3] : m[4]) : null;
-            if (!scriptid)
-                return undefined;
-            if (scriptid[0] == "_" && scriptid.length == 13)
-                return scriptid;
-            if (scriptid.length == 23 && /^[0-9\-]+$/.test(scriptid) || scriptid.length == 24 && /^S[0-9\-]+$/.test(scriptid))
+            const domainCheck = `(?:(?:https:\/\/)?(?:${domains.join('|')})\/)`;
+            const versionRefCheck = "(?:v[0-9]+\/)";
+            const oembedCheck = "api\/oembed\\?url=.*%2F([^&#]*)&.*";
+            const sharePageCheck = "([a-z0-9\\-_]+)(?:[#?&].*)?";
+            const scriptIdCheck = `^${domainCheck}?${versionRefCheck}?(?:(?:${oembedCheck})|(?:${sharePageCheck}))$`;
+            const m = new RegExp(scriptIdCheck, 'i').exec(uri.trim());
+            const scriptid = (m === null || m === void 0 ? void 0 : m[1] /** oembed res **/) || (m === null || m === void 0 ? void 0 : m[2]) /** share page res **/;
+            if (/^(_.{12}|S?[0-9\-]{23})$/.test(scriptid))
                 return scriptid;
             return undefined;
         }

package/built/pxtsim.d.ts

@@ -986,6 +986,7 @@ declare namespace pxsim {
         function nextTick(f: () => void): void;
         function delay<T>(duration: number, value: T): Promise<T>;
         function delay(duration: number): Promise<void>;
+        function throttle(func: (...args: any[]) => any, wait: number, immediate?: boolean): any;
         function promiseMapAll<T, V>(values: T[], mapper: (obj: T) => Promise<V>): Promise<V[]>;
         function promiseMapAllSeries<T, V>(values: T[], mapper: (obj: T) => Promise<V>): Promise<V[]>;
         function promisePoolAsync<T, V>(maxConcurrent: number, inputValues: T[], handler: (input: T) => Promise<V>): Promise<V[]>;

package/built/pxtsim.js

@@ -4523,6 +4523,27 @@ var pxsim;
             return output;
         }
         U.delay = delay;
+        // Returns a function, that, as long as it continues to be invoked, will only
+        // trigger every N milliseconds. If `immediate` is passed, trigger the
+        // function on the leading edge, instead of the trailing.
+        function throttle(func, wait, immediate) {
+            let timeout;
+            return function () {
+                let context = this;
+                let args = arguments;
+                let later = function () {
+                    timeout = null;
+                    if (!immediate)
+                        func.apply(context, args);
+                };
+                let callNow = immediate && !timeout;
+                if (!timeout)
+                    timeout = setTimeout(later, wait);
+                if (callNow)
+                    func.apply(context, args);
+            };
+        }
+        U.throttle = throttle;
         function promiseMapAll(values, mapper) {
             return Promise.all(values.map(v => mapper(v)));
         }
@@ -6301,18 +6322,8 @@ var pxsim;
             }
         }
         postMessageCore(frame, msg) {
-            var _a, _b;
-            frame.contentWindow.postMessage(msg, frame.dataset['origin']);
-            if (pxsim.U.isLocalHostDev() && ((_a = pxt === null || pxt === void 0 ? void 0 : pxt.appTarget) === null || _a === void 0 ? void 0 : _a.id)) {
-                // If using the production simulator on local serve, the domain might have been
-                // redirected by the CLI server. Also send to the production domain just in case
-                try {
-                    frame.contentWindow.postMessage(msg, `https://trg-${(_b = pxt === null || pxt === void 0 ? void 0 : pxt.appTarget) === null || _b === void 0 ? void 0 : _b.id}.userpxt.io/---simulator`);
-                }
-                catch (e) {
-                    // Ignore exceptions if the target origin doesn't match
-                }
-            }
+            const origin = pxsim.U.isLocalHostDev() ? "*" : frame.dataset["origin"];
+            frame.contentWindow.postMessage(msg, origin);
         }
         createFrame(url) {
             var _a, _b, _c;