@swf2es/player-hosts 0.1.7 → 0.1.10

package/dist/thread/player/display/textobjects.js

@@ -65,9 +65,10 @@ export class TextObject extends DisplayObject {
     embedFonts = false;
     autoSize = "none";
     /**
-     * A script set the size of a field that fits itself: as in Flash, the fit
-     * waits for its size to be asked, its transform to change or the frame to
-     * be drawn, and a wordWrap set meanwhile wraps at the size set (adl).
+     * A script set the size or the autoSize of a field that fits itself: as
+     * in Flash, the fit waits for its size to be asked, its transform to
+     * change or the frame to be drawn, and a wordWrap set meanwhile wraps at
+     * the size the field has (adl).
      */
     fitPending = false;
     selectable = true;
@@ -201,24 +202,24 @@ export class TextObject extends DisplayObject {
         this.height = height;
         this.invalidate(CONTENT);
     }
-    /** A script set its size: under autoSize, the fit waits (fitPending). */
-    sizeSet() {
-        if (this.autoSize !== "none") {
+    /** A script set its size or its autoSize: under autoSize, the fit waits (fitPending). */
+    deferFit() {
+        if (this.autoSize !== "none" && !this.fitPending) {
             this.fitPending = true;
             pendingFits.add(this);
         }
     }
-    /** The fit a set size left pending, applied: its size asked, its transform changed, the frame drawn. */
+    /**
+     * The fit left pending, applied: as its position, size or bounds are
+     * asked, its transform is set, or the frame is drawn; not as its scale,
+     * its rotation or its text metrics are asked, or its alpha set (adl).
+     */
     settle() {
         if (this.fitPending) {
             this.fitPending = false;
             this.fit();
         }
     }
-    touch() {
-        super.touch();
-        this.settle();
-    }
     /** The text, \r between its lines. */
     get text() {
         return this.model.text;

package/dist/thread/player/playerglobal/flash/display/DisplayObject.js

@@ -144,6 +144,10 @@ function spriteOnly(traits) {
 }
 /** Move a display object, by a copy of its matrix, and have it drawn again. */
 function transform(d, change) {
+    // A field's pending fit first, so that what is set is where it stays.
+    if (d instanceof TextObject) {
+        d.settle();
+    }
     const m = { ...d.matrix };
     change(m);
     d.matrix = m;
@@ -191,6 +195,10 @@ export function displayObjectNatives(s) {
             }
         }
         get x() {
+            // A field's pending fit moves a centred or right-aligned one (adl).
+            if (this.$display instanceof TextObject) {
+                this.$display.settle();
+            }
             return withOffset(this.$display.matrix.tx, fieldOffset(this.$display)[0]);
         }
         // A NaN position is 0, as Flash has it (the corpus's `displayobject_invalid_floats`), and
@@ -207,6 +215,9 @@ export function displayObjectNatives(s) {
             });
         }
         get y() {
+            if (this.$display instanceof TextObject) {
+                this.$display.settle();
+            }
             return withOffset(this.$display.matrix.ty, fieldOffset(this.$display)[1]);
         }
         set y(v) {
@@ -340,7 +351,7 @@ export function displayObjectNatives(s) {
             if (d instanceof TextObject) {
                 d.width = value / (Math.abs(d.scaleX) || 1);
                 d.invalidate(CONTENT);
-                d.sizeSet();
+                d.deferFit();
                 return;
             }
             const r = bounds(d, true);
@@ -375,7 +386,7 @@ export function displayObjectNatives(s) {
             if (d instanceof TextObject) {
                 d.height = value / (Math.abs(d.scaleY) || 1);
                 d.invalidate(CONTENT);
-                d.sizeSet();
+                d.deferFit();
                 return;
             }
             const r = bounds(d, true);

package/dist/thread/player/playerglobal/flash/text/Font.js

@@ -9,8 +9,11 @@ function style(font) {
     }
     return font.italic ? "italic" : "regular";
 }
-/** The fonts enumerateFonts lists: the running code's SWF's, with layout or no glyphs, and those registered. */
-export function embeddedFonts(s) {
+/**
+ * The fonts enumerateFonts lists: the running code's SWF's, with layout or
+ * no glyphs, and, unless `registered` is false, those registered.
+ */
+export function embeddedFonts(s, registered = true) {
     const fonts = [];
     const library = s.code.codeLibrary();
     if (library) {
@@ -21,7 +24,9 @@ export function embeddedFonts(s) {
             }
         }
     }
-    fonts.push(...s.symbols.registeredFonts.values());
+    if (registered) {
+        fonts.push(...s.symbols.registeredFonts.values());
+    }
     return fonts;
 }
 export function fontNatives(s) {
@@ -57,15 +62,28 @@ export function fontNatives(s) {
             }
             return true;
         }
+        /**
+         * The fonts as Font objects, by name: a registered font an instance of
+         * the class it was registered by, as Flash makes it, so that its class
+         * name finds that class again; the SWF's own a plain Font, as Flash
+         * makes those though a class is bound to them.
+         */
         static enumerateFonts(_enumerateDeviceFonts) {
-            const cls = s.rt.classNamed("flash.text::Font");
-            const fonts = embeddedFonts(s);
+            const plain = s.rt.classNamed("flash.text::Font");
+            const fonts = [];
+            for (const font of embeddedFonts(s, false)) {
+                fonts.push({ font, cls: plain });
+            }
+            for (const [cls, font] of s.symbols.registeredFonts) {
+                fonts.push({ font, cls });
+            }
+            // Stable: a SWF's own font before one registered of the same name, as adl lists them.
             fonts.sort((a, b) => {
-                const first = a.name.toLowerCase();
-                const second = b.name.toLowerCase();
+                const first = a.font.name.toLowerCase();
+                const second = b.font.name.toLowerCase();
                 return first < second ? -1 : first > second ? 1 : 0;
             });
-            return s.rt.array(fonts.map((font) => {
+            return s.rt.array(fonts.map(({ font, cls }) => {
                 const object = s.rt.construct(cls);
                 object.$font = font;
                 return object;

package/dist/thread/player/playerglobal/flash/text/TextField.js

@@ -342,7 +342,8 @@ export function textFieldNatives(s) {
         }
         set autoSize(v) {
             this.$display.autoSize = choice(v, ["none", "left", "right", "center"], "autoSize");
-            this.$display.fit();
+            // Its fit waits for its size to be asked, or the frame, as one a set width leaves (adl).
+            this.$display.deferFit();
         }
         get antiAliasType() {
             return this.$display.antiAliasType;

package/dist/thread/runtime/avm2/natives/xml/parser.js

@@ -39,14 +39,18 @@ export class XMLTag {
         this.attributes = [];
     }
 }
-/** The entities XMLParser knows: the XML ones, and nbsp. */
+/**
+ * The entities XMLParser knows: the XML ones, and nbsp, which avmplus
+ * makes U+FFA0 rather than U+00A0, as avmshell and Flash Player give it: its
+ * table's 0xA0 is a signed char, widened to -96.
+ */
 const ENTITIES = {
     amp: "&",
     quot: '"',
     apos: "'",
     lt: "<",
     gt: ">",
-    nbsp: "\u00a0",
+    nbsp: "\uffa0",
 };
 export class XMLParser {
     pos = 0;
@@ -244,19 +248,20 @@ export class XMLParser {
         return OK;
     }
     /**
-     * As XMLParser::unescape: [start, last) with its entity and character
+     * As XMLParser::unescape: [from, to) with its entity and character
      * references decoded: &#dd; and &#xhh; up to 0xFFFF, and ENTITIES. An &
      * without a ; ends the decoding; one that is not a known reference is
-     * kept as it is.
+     * kept as it is. Searched within the value alone: a search of the text
+     * past it, for an & or a ; it would not use, made a document of many
+     * values without them take a scan of the rest of it for each.
      */
-    unescape(start, last) {
-        const str = this.text;
-        if (start === last) {
-            return "";
-        }
-        let bgn = str.indexOf("&", start);
-        if (bgn < 0 || bgn >= last) {
-            return str.slice(start, last);
+    unescape(from, to) {
+        const str = this.text.slice(from, to);
+        const start = 0;
+        const last = str.length;
+        let bgn = str.indexOf("&");
+        if (bgn < 0) {
+            return str;
         }
         let dest = "";
         let end = start;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swf2es/player-hosts",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "Optional Node and WebSocket transports, worker threads, an IndexedDB module cache and precompiled modules for the swf2es player",
   "keywords": [
     "swf",
@@ -60,6 +60,6 @@
     "LICENSE.third-party"
   ],
   "dependencies": {
-    "@swf2es/player": "0.1.7"
+    "@swf2es/player": "0.1.10"
   }
 }