@breakside/jskit 2023.7.0 → 2023.9.1

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.7.0
+JSBundleVersion: 2023.9.1
 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.7.0
+JSBundleVersion: 2023.9.1
 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.7.0
+JSBundleVersion: 2023.9.1
 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.7.0
+JSBundleVersion: 2023.9.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

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/JSNumberFormatter.js

@@ -526,23 +526,120 @@ JSClass("JSNumberFormatter", JSObject, {
             if (this._minimumFractionDigits > 0 || fraction !== 0){
                 fraction *= Math.pow(10, this._maximumFractionDigits);
                 fraction = Math.round(fraction);
-                var extras = this._maximumFractionDigits - this._minimumFractionDigits;
-                while (extras > 0 && ((fraction % 10) === 0)){
-                    fraction /= 10;
-                    --extras;
-                }
                 if (this._minimumFractionDigits > 0 || fraction !== 0){
                     str += ".";
                     var fractionString = fraction.toString();
-                    while (fractionString.length < this._minimumFractionDigits){
-                        fractionString += "0";
+                    while (fractionString.length < this._maximumFractionDigits){
+                        fractionString = "0" + fractionString;
+                    }
+                    while (fractionString.length > this._minimumFractionDigits && fractionString[fractionString.length - 1] === "0"){
+                        fractionString = fractionString.substr(0, fractionString.length - 1);
                     }
                     str += fractionString;
                 }
             }
         }
         return prefix + str + suffix;
-    }
+    },
+
+    numberFromString: function(string){
+        var n = 0;
+        var f = 0;
+        var d = 1;
+        var sign = 1;
+        var iterator = string.unicodeIterator();
+        var i = 0;
+        var l = string.length;
+        var c;
+        var canSeeSign = true;
+        var canSeeCurrency = true;
+        var canSeeDecimal = true;
+        var canSeeInteger = true;
+        var canSeeFraction = false;
+        var canSeePercent = false;
+        var canSeeGroup = false;
+        var seenDigit = false;
+        var stringMatches = function(substr){
+            if (substr.length === 0){
+                return false;
+            }
+            return string.substr(i, substr.length) === substr;
+        };
+        while (i < l){
+            c = string.charCodeAt(i);
+            if (c >= 0x30 && c <= 0x39){
+                if (canSeeInteger){
+                    canSeeSign = false;
+                    canSeeGroup = true;
+                    canSeePercent = true;
+                    n *= 10;
+                    n += (c - 0x30);
+                }else if (canSeeFraction){
+                    f *= 10;
+                    f += (c - 0x30);
+                    d *= 10;
+                }else{
+                    return null;
+                }
+                seenDigit = true;
+                ++i;
+            }else if (canSeeSign && stringMatches(this.minusSign)){
+                sign = -1;
+                canSeeSign = false;
+                i += this.minusSign.length;
+            }else if (canSeeSign && stringMatches(this.plusSign)){
+                canSeeSign = false;
+                i += this.plusSign.length;
+            }else if (canSeeCurrency && stringMatches(this.currencySymbol)){
+                canSeeCurrency = false;
+                if (seenDigit){
+                    canSeeInteger = false;
+                    canSeeDecimal = false;
+                    canSeeFraction = false;
+                }
+                i += this.currencySymbol.length;
+            }else if (canSeePercent && stringMatches(this.percentSymbol)){
+                canSeePercent = false;
+                if (seenDigit){
+                    canSeeInteger = false;
+                    canSeeDecimal = false;
+                    canSeeFraction = false;
+                }
+                i += this.percentSymbol.length;
+            }else if (canSeePercent && stringMatches(this.perMilleSymbol)){
+                canSeePercent = false;
+                if (seenDigit){
+                    canSeeInteger = false;
+                    canSeeDecimal = false;
+                    canSeeFraction = false;
+                }
+                i += this.perMilleSymbol.length;
+            }else if (canSeeDecimal && stringMatches(this.decimalSeparator)){
+                canSeeDecimal = false;
+                canSeeGroup = false;
+                canSeeInteger = false;
+                canSeeFraction = true;
+                i += this.decimalSeparator.length;
+            }else if (canSeeGroup && stringMatches(this.groupingSeparator)){
+                i += this.groupingSeparator.length;
+            }else if (c == 0x20){
+                ++i;
+            }else{
+                return null;
+            }
+        }
+        if (!seenDigit){
+            return null;
+        }
+        if (f > 0){
+            n += f / d;
+        }
+        n /= this.multiplier;
+        if (sign < 0){
+            n = -n;
+        }
+        return n;
+    },
 
 });