@breakside/jskit 2023.9.0 → 2023.10.0

package/Root/Frameworks/DOM/DOMParser.js

@@ -22,73 +22,82 @@ JSGlobalObject.DOMParser = function DOMParser(){
 
 DOMParser.prototype = {
 
+    document: null,
+    currentNode: null,
+
     parseFromString: function(str, mimetype){
-        var parser = JSXMLParser.init();
-        var isHTML = mimetype == "text/html";
-        parser.isHTML = isHTML;
-        var document = null;
-        var node = null;
-        var stack = [];
-        parser.parse(str, {
-            beginDocument: function(){
-                document = DOM.createDocument();
-                node = document;
-            },
-            handleDocumentType: function(name, publicId, systemId){
-                var doctype = document.implementation.createDocumentType(name, publicId, systemId);
-                document.appendChild(doctype);
-            },
-            handleProcessingInstruction: function(name, data){
-                var pi = document.createProcessingInstruction(name, data);
-                node.appendChild(pi);
-            },
-            handleComment: function(text){
-                var comment = document.createComment(text);
-                node.appendChild(comment);
-            },
-            handleCDATA: function(text){
-                var cdata = document.createCDATASection(text);
-                node.appendChild(cdata);
-            },
-            beginElement: function(name, prefix, namespace, attributes, isClosed){
-                var element;
-                if (namespace !== null){
-                    if (prefix !== null){
-                        element = document.createElementNS(namespace, prefix + ':' + name);   
-                    }else{
-                        element = document.createElementNS(namespace, name);
-                    }
+        var parser = JSXMLParser.initWithString(str);
+        if (mimetype == "text/html"){
+            parser.mode = JSXMLParser.Mode.html;
+        }
+        this.document = null;
+        this.currentNode = null;
+        parser.delegate = this;
+        parser.parse();
+        return this.document;
+    },
+
+    xmlParserDidBeginDocument: function(parser){
+        this.document = DOM.createDocument();
+        this.currentNode = this.document;
+    },
+
+    xmlParserFoundDocumentType: function(parser, name, publicId, systemId){
+        var doctype = this.document.implementation.createDocumentType(name, publicId, systemId);
+        this.document.appendChild(doctype);
+    },
+
+    xmlParserFoundProcessingInstruction: function(parser, name, data){
+        var pi = this.document.createProcessingInstruction(name, data);
+        this.currentNode.appendChild(pi);
+    },
+
+    xmlParserFoundComment: function(parser, text){
+        var comment = this.document.createComment(text);
+        this.currentNode.appendChild(comment);
+    },
+
+    xmlParserFoundCDATA: function(parser, text){
+        var cdata = this.document.createCDATASection(text);
+        this.currentNode.appendChild(cdata);
+    },
+
+    xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
+        var element;
+        if (namespace !== null){
+            if (prefix !== null){
+                element = this.document.createElementNS(namespace, prefix + ':' + name);   
+            }else{
+                element = this.document.createElementNS(namespace, name);
+            }
+        }else{
+            element = this.document.createElement(name);
+        }
+        var attrs = attributes.all();
+        var attr;
+        for (var i = 0, l = attrs.length; i < l; ++i){
+            attr = attrs[i];
+            if (attr.namespace){
+                if (attr.prefix !== null){
+                    element.setAttributeNS(attr.namespace, attr.prefix + ':' + attr.name, attr.value);
                 }else{
-                    element = document.createElement(name);
-                }
-                var attr;
-                for (var i = 0, l = attributes.length; i < l; ++i){
-                    attr = attributes[i];
-                    if (attr.namespace){
-                        if (attr.prefix !== null){
-                            element.setAttributeNS(attr.namespace, attr.prefix + ':' + attr.name, attr.value);
-                        }else{
-                            element.setAttribute(attr.namespace, attr.name, attr.value);
-                        }
-                    }else{
-                        element.setAttribute(attr.name, attr.value);
-                    }
+                    element.setAttribute(attr.namespace, attr.name, attr.value);
                 }
-                node.appendChild(element);
-                if (!isClosed){
-                    stack.push(node);
-                    node = element;
-                }
-            },
-            handleText: function(text){
-                var textNode = document.createTextNode(text);
-                node.appendChild(textNode);
-            },
-            endElement: function(){
-                node = stack.pop();
+            }else{
+                element.setAttribute(attr.name, attr.value);
             }
-        });
-        return document;
+        }
+        this.currentNode.appendChild(element);
+        this.currentNode = element;
+    },
+
+    xmlParserFoundText: function(parser, text){
+        var textNode = this.document.createTextNode(text);
+        this.currentNode.appendChild(textNode);
+    },
+
+    xmlParserDidEndElement: function(parser){
+        this.currentNode = this.currentNode.parentNode;
     }
 
 };

package/Root/Frameworks/DOM/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.DOM
-JSBundleVersion: 2023.9.0
+JSBundleVersion: 2023.10.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Dispatch/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.Dispatch
-JSBundleVersion: 2023.9.0
+JSBundleVersion: 2023.10.0
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:
   html: Dispatch+HTML.js

package/Root/Frameworks/FontKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.FontKit
-JSBundleVersion: 2023.9.0
+JSBundleVersion: 2023.10.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Foundation/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.Foundation
-JSBundleVersion: 2023.9.0
+JSBundleVersion: 2023.10.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Foundation/JSClass.js

@@ -178,8 +178,6 @@ JSClass.prototype = {
                 if (result instanceof Promise){
                     return result.then(function(promiseResult){
                         return promiseResult || obj;
-                    }, function(){
-                        return null;
                     });
                 }
                 return result;

package/Root/Frameworks/Foundation/JSFont.js

@@ -134,6 +134,14 @@ JSClass("JSFont", JSObject, {
         return JSFont.initWithDescriptor(descriptor, this.pointSize);
     },
 
+    bolderFont: function(){
+        var descriptor = this.descriptor.bolderDescriptor();
+        if (descriptor === null){
+            descriptor = this.descriptor.fontWithWeight(JSFont.Weight.bold);
+        }
+        return JSFont.initWithDescriptor(descriptor, this.pointSize);
+    },
+
     fontWithStyle: function(style){
         if (style == this.descriptor.style){
             return this;

package/Root/Frameworks/Foundation/JSFontDescriptor.js

@@ -43,6 +43,11 @@ JSClass("JSFontDescriptor", JSObject, {
         return JSFontDescriptor.descriptorWithFamily(this.family, weight, this.style) || this;
     },
 
+    bolderDescriptor: function(){
+        var weight = this._weight + 300;
+        return this.descriptorWithWeight(weight);
+    },
+
     descriptorWithStyle: function(style){
         return JSFontDescriptor.descriptorWithFamily(this.family, this.weight, style) || this;
     },

package/Root/Frameworks/Foundation/JSImage.js

@@ -373,10 +373,10 @@ _JSDataImage.sizeFromJPEGData = function(data){
 };
 
 _JSDataImage.sizeFromSVGData = function(data){
-    var parser = JSXMLParser.init();
+    var parser = JSXMLParser.initWithData(data);
     var size = JSSize(1, 1);
-    parser.parse(data.stringByDecodingUTF8(), {
-        beginElement: function(name, prefix, namespace, attributes, isClosed){
+    parser.delegate = {
+        xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
             var multiple = {
                 'em': 12,
                 'ex': 24,
@@ -406,25 +406,22 @@ _JSDataImage.sizeFromSVGData = function(data){
                 return multiple[unit] * n;
             };
             if (namespace == 'http://www.w3.org/2000/svg' && name.toLowerCase() == 'svg'){
-                var attrs = {};
-                for (var i = 0, l = attributes.length; i < l; ++i){
-                    var attr = attributes[i];
-                    if (attr.namespace === null){
-                        attrs[attr.name] = attr.value;
-                    }
-                }
-                if (attrs.width && attrs.height){
-                    size.width = px(attrs.width);
-                    size.height = px(attrs.height);
-                }else if (attrs.viewBox){
-                    var box = attrs.viewBox.split(/\s+/).map(function(n){ return parseInt(n); });
+                var width = attributes.get("width");
+                var height = attributes.get("height");
+                var viewBox = attributes.get("viewBox");
+                if (width && height){
+                    size.width = px(width);
+                    size.height = px(height);
+                }else if (viewBox){
+                    var box = viewBox.split(/\s+/).map(function(n){ return parseInt(n); });
                     size.width = box[2];
                     size.height = box[3];
                 }
             }
             parser.stop();
         }
-    });
+    };
+    parser.parse();
     return size;
 };
 

package/Root/Frameworks/Foundation/JSTextFramesetter.js

@@ -109,11 +109,16 @@ JSClass("JSTextFramesetter", JSObject, {
             if (remianingRange.length > 0 && lineLimit > lines.length + 1){
                 // we got truncated because of height.  Re-run the last line so it
                 // gets broken according to truncation rules rather than word break
+                y = line.origin.y;
                 lineRange = this._typesetter.suggestLineBreak(widthLimit, JSRange(line.range.location, line.range.length + remianingRange.length), paragraphStyle.lineBreakMode);
                 line = this._typesetter.createLine(lineRange);
+                line.origin.y = y;
+                line = line.truncatedLine(widthLimit, undefined, true);
+                lines.push(line);
+            }else{
+                line = line.truncatedLine(widthLimit);
+                lines.push(line);
             }
-            var truncated = line.truncatedLine(widthLimit);
-            lines.push(truncated);
         }
         var frame = this.constructFrame(lines, size);
         this._alignLinesInFrame(frame);

package/Root/Frameworks/Foundation/JSTextLine.js

@@ -191,8 +191,8 @@ JSClass("JSTextLine", JSObject, {
         return line;
     },
 
-    truncatedLine: function(width, token){
-        if (width + 0.1 >= this._size.width){
+    truncatedLine: function(width, token, force){
+        if (width + 0.1 >= this._size.width && force !== true){
             return this;
         }
 

package/Root/Frameworks/Foundation/JSTextTypesetter.js

@@ -335,7 +335,7 @@ JSClass("JSTextTypesetter", JSObject, {
             if (attributes.bold || attributes.italic){
                 attributes = JSCopy(attributes);
                 if (attributes.bold){
-                    attributes.font = attributes.font.fontWithWeight(JSFont.Weight.bold);
+                    attributes.font = attributes.font.bolderFont();
                 }
                 if (attributes.italic){
                     attributes.font = attributes.font.fontWithStyle(JSFont.Style.italic);