@breakside/jskit 2023.9.0 → 2023.10.0

package/Frameworks/Foundation.jsframework/JS/JSXMLParser.js

@@ -14,25 +14,58 @@
 // limitations under the License.
 
 // #import "JSObject.js"
+// #import "JSProtocol.js"
+// #import "String+JS.js"
 'use strict';
 
 (function(){
 
+JSProtocol("JSXMLParserDelegate", JSProtocol, {
+
+    xmlParserDidBeginDocument: function(parser){},
+    xmlParserDidEndDocument: function(parser){},
+    xmlParserFoundDocumentType: function(parser, name, publicId, systemId){},
+    xmlParserFoundProcessingInstruction: function(parser, name, data){},
+    xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){},
+    xmlParserDidEndElement: function(parser, name, prefix, namespace){},
+    xmlParserFoundComment: function(parser, text){},
+    xmlParserFoundCDATA: function(parser, text){},
+    xmlParserFoundText: function(parser, text){},
+    xmlParserErrorOccurred: function(parser, error){}
+
+});
+
 JSClass("JSXMLParser", JSObject, {
 
-    isHTML: false,
+    initWithData: function(data, encoding){
+        if (encoding === undefined){
+            encoding = String.Encoding.utf8;
+        }
+        var xml = String.initWithData(data, encoding);
+        this.initWithString(xml);
+    },
+
+    initWithString: function(str){
+        this.xml = str;
+    },
 
-    state: null,
+    mode: "xml",
+
+    xml: null,
+    error: null,
     isStopped: false,
 
     stop: function(){
         this.isStopped = true;
     },
 
-    parse: function(input, listener){
+    parse: function(){
+        this.isStopped = false;
+        this.error = null;
+        var input = this.xml;
         var length = input.length;
         var offset = 0;
-        var isHTML = this.isHTML;
+        var isHTML = this.mode === JSXMLParser.Mode.html;
         var c;
         var lineNumber = 1;
         var lineOffset;
@@ -309,13 +342,13 @@ JSClass("JSXMLParser", JSObject, {
                 name: resolved.name,
                 prefix: resolved.prefix,
                 namespace: resolved.namespace,
-                attributes: []
+                attributes: JSXMLAttributeMap()
             };
             for (i = 0, l = attributes.length; i < l; ++i){
                 attr = attributes[i];
                 if (!attr.name.startsWith("xmlns:") && attr.name != "xmlns"){
                     resolved = resolveNamespace(attr.name, true);
-                    element.attributes.push({
+                    element.attributes.add({
                         name: resolved.name,
                         prefix: resolved.prefix,
                         namespace: resolved.namespace,
@@ -325,110 +358,125 @@ JSClass("JSXMLParser", JSObject, {
             }
             return element;
         };
-
-        var obj;
-        if (isHTML){
-            readWhitespace();
-        }else{
+        try{
+            var obj;
+            if (isHTML){
+                readWhitespace();
+            }else{
+                obj = readObject();
+                if (obj === null || obj.kind != 'PI' || obj.name != 'xml'){
+                    throw new Error("Expecting <?xml at start of document");
+                }
+            }
             obj = readObject();
-            if (obj === null || obj.kind != 'PI' || obj.name != 'xml'){
-                throw new Error("Expecting <?xml at start of document");
+            var elementStack = [];
+            var namespaces = {
+                ':default:': null,
+                'xml': 'http://www.w3.org/XML/1998/namespace'
+            };
+            var namespacesStack = [];
+            var hasDocumentElement = false;
+            var hasSentDoctype = false;
+            var element;
+            if (this.delegate && this.delegate.xmlParserDidBeginDocument){
+                this.delegate.xmlParserDidBeginDocument(this);
             }
-        }
-        obj = readObject();
-        var elementNameStack = [];
-        var namespaces = {
-            ':default:': null,
-            'xml': 'http://www.w3.org/XML/1998/namespace'
-        };
-        var namespacesStack = [];
-        var hasDocumentElement = false;
-        var hasSentDoctype = false;
-        if (listener.beginDocument){
-            listener.beginDocument();
-        }
-        while (!this.isStopped && obj !== null){
-            if (obj.kind == 'Doctype'){
-                if (hasSentDoctype){
-                    throw new Error("Only one doctype allowed");
-                }
-                if (hasDocumentElement){
-                    throw new Error("Doctype must come before the document element");
-                }
-                if (elementNameStack.length > 0){
-                    throw new Error("Doctype only allowed at document root");
-                }
-                if (listener.handleDocumentType){
-                    listener.handleDocumentType(obj.name, obj.publicId || null, obj.systemId || null);
-                }
-                hasSentDoctype = true;
-            }else if (obj.kind == "PI"){
-                if (elementNameStack.length > 0){
-                    throw new Error("Processing instructions only allowed at document root");
-                }
-                if (listener.handleProcessingInstruction){
-                    listener.handleProcessingInstruction(obj.name, obj.value);
-                }
-            }else if (obj.kind == 'CDATA'){
-                if (elementNameStack.length === 0){
-                    throw new Error("CDATA not allowed at document root");
-                }
-                if (listener.handleCDATA){
-                    listener.handleCDATA(obj.value);
-                }
-            }else if (obj.kind == 'Comment'){
-                if (listener.handleComment){
-                    listener.handleComment(obj.value);
-                }
-            }else if (obj.kind == 'ElementStart'){
-                if (elementNameStack.length === 0){
-                    hasDocumentElement = true;
-                }
-                elementNameStack.push(obj.name);
-                namespacesStack.push(namespaces);
-                namespaces = Object.create(namespaces);
-                var element = resolveElementNamespace(obj.name, obj.attributes);
-                if (listener.beginElement){
-                    listener.beginElement(element.name, element.prefix, element.namespace, element.attributes, obj.isClosed);
-                }
-                var elementIsClosed = obj.isClosed;
-                if (obj.rawContents !== null){
-                    if (!this.isStopped && listener.handleText && obj.rawContents.length > 0){
-                        listener.handleText(obj.rawContents);
+            while (!this.isStopped && obj !== null){
+                if (obj.kind == 'Doctype'){
+                    if (hasSentDoctype){
+                        throw new Error("Only one doctype allowed");
                     }
-                    if (!this.isStopped && listener.endElement){
-                        listener.endElement();
+                    if (hasDocumentElement){
+                        throw new Error("Doctype must come before the document element");
                     }
-                    elementIsClosed = true;
-                }
-                if (elementIsClosed){
-                    elementNameStack.pop();
+                    if (elementStack.length > 0){
+                        throw new Error("Doctype only allowed at document root");
+                    }
+                    if (this.delegate && this.delegate.xmlParserFoundDocumentType){
+                        this.delegate.xmlParserFoundDocumentType(this, obj.name, obj.publicId || null, obj.systemId || null);
+                    }
+                    hasSentDoctype = true;
+                }else if (obj.kind == "PI"){
+                    if (elementStack.length > 0){
+                        throw new Error("Processing instructions only allowed at document root");
+                    }
+                    if (this.delegate && this.delegate.xmlParserFoundProcessingInstruction){
+                        this.delegate.xmlParserFoundProcessingInstruction(this, obj.name, obj.value);
+                    }
+                }else if (obj.kind == 'CDATA'){
+                    if (elementStack.length === 0){
+                        throw new Error("CDATA not allowed at document root");
+                    }
+                    if (this.delegate && this.delegate.xmlParserFoundCDATA){
+                        this.delegate.xmlParserFoundCDATA(this, obj.value);
+                    }
+                }else if (obj.kind == 'Comment'){
+                    if (this.delegate && this.delegate.xmlParserFoundComment){
+                        this.delegate.xmlParserFoundComment(this, obj.value);
+                    }
+                }else if (obj.kind == 'ElementStart'){
+                    if (elementStack.length === 0){
+                        hasDocumentElement = true;
+                    }
+                    namespacesStack.push(namespaces);
+                    namespaces = Object.create(namespaces);
+                    element = resolveElementNamespace(obj.name, obj.attributes);
+                    elementStack.push(element);
+                    if (this.delegate && this.delegate.xmlParserDidBeginElement){
+                        this.delegate.xmlParserDidBeginElement(this, element.name, element.prefix, element.namespace, element.attributes);
+                    }
+                    var elementIsClosed = obj.isClosed;
+                    if (obj.rawContents !== null){
+                        if (!this.isStopped && this.delegate.xmlParserFoundText && obj.rawContents.length > 0){
+                            this.delegate.xmlParserFoundText(this, obj.rawContents);
+                        }
+                        elementIsClosed = true;
+                    }
+                    if (elementIsClosed){
+                        if (!this.isStopped && this.delegate.xmlParserDidEndElement){
+                            this.delegate.xmlParserDidEndElement(this, element.name, element.prefix, element.namespace);
+                        }
+                        elementStack.pop();
+                        namespaces = namespacesStack.pop();
+                    }
+                }else if (obj.kind == 'Text'){
+                    if (elementStack.length === 0){
+                        if (!obj.value.match(/^[\r\n\t ]*$/)){
+                            throw new Error("Text not allowed at the document root");
+                        }
+                    }else{
+                        if (this.delegate && this.delegate.xmlParserFoundText){
+                            this.delegate.xmlParserFoundText(this, obj.value);
+                        }
+                    }
+                }else if (obj.kind == 'ElementEnd'){
+                    element = elementStack.pop();
                     namespaces = namespacesStack.pop();
-                }
-            }else if (obj.kind == 'Text'){
-                if (elementNameStack.length === 0){
-                    if (!obj.value.match(/^[\r\n\t ]*$/)){
-                        throw new Error("Text not allowed at the document root");
+                    if (element.prefix !== null){
+                        if (obj.name != element.prefix + ":" + element.name){
+                            throw new Error("Mismatched end tag");
+                        }
+                    }else{
+                        if (obj.name != element.name){
+                            throw new Error("Mismatched end tag");
+                        }
                     }
-                }else{
-                    if (listener.handleText){
-                        listener.handleText(obj.value);
+                    if (this.delegate && this.delegate.xmlParserDidEndElement){
+                        this.delegate.xmlParserDidEndElement(this, element.name, element.prefix, element.namespace);
                     }
                 }
-            }else if (obj.kind == 'ElementEnd'){
-                var name = elementNameStack.pop();
-                namespaces = namespacesStack.pop();
-                if (obj.name != name){
-                    throw new Error("Mismatched end tag");
-                }
-                if (listener.endElement){
-                    listener.endElement();
-                }
+                obj = readObject();
+            }
+            if (!this.isStopped && this.delegate.xmlParserDidEndDocument){
+                this.delegate.xmlParserDidEndDocument(this);
+            }
+        }catch (e){
+            this.isStopped = true;
+            if (this.delegate && this.delegate.xmlParserErrorOccurred){
+                this.delegate.xmlParserErrorOccurred(this, e);
+            }else{
+                throw e;
             }
-            obj = readObject();
-        }
-        if (!this.isStopped && listener.endDocument){
-            listener.endDocument();
         }
     }
 
@@ -518,4 +566,61 @@ var htmlElements = {
     raw: new Set(['script', 'style'])
 };
 
+JSXMLParser.Mode = {
+    xml: "xml",
+    html: "html"
+};
+
+JSGlobalObject.JSXMLAttributeMap = function(){
+    if (this === undefined){
+        return new JSXMLAttributeMap();
+    }
+    this.namespaces = {};
+    this.noNamespace = {};
+    this.attributes = [];
+};
+
+JSXMLAttributeMap.prototype = {
+
+    namespaces: null,
+    noNamespace: null,
+    attributes: null,
+
+    add: function(attr){
+        this.attributes.push(attr);
+        var map = this.noNamespace;
+        if (attr.namespace){
+            map = this.namespaces[attr.namespace];
+            if (!map){
+                map = this.namespaces[attr.namespace] = {};
+            }
+        }
+        map[attr.name] = attr;
+    },
+
+    all: function(){
+        return this.attributes;
+    },
+
+    contains: function(name, namespace){
+        var map = namespace ? this.namespaces[namespace] : this.noNamespace;
+        if (map){
+            return name in map;
+        }
+        return false;
+    },
+
+    get: function(name, namespace){
+        var map = namespace ? this.namespaces[namespace] : this.noNamespace;
+        if (map){
+            var attr = map[name];
+            if (attr){
+                return attr.value;
+            }
+        }
+        return null;
+    },
+
+};
+
 })();

package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-    "JSBundleVersion": "2023.9.0",
+    "JSBundleVersion": "2023.10.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
       "node": "Foundation+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
+    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
   },
   "Resources": [
     {

package/Frameworks/Foundation.jsframework/sources.json

@@ -189,7 +189,9 @@
       "JSURLSession",
       "JSURLResponse",
       "JSURLResponseError",
+      "JSXMLParserDelegate",
       "JSXMLParser",
+      "JSXMLAttributeMap",
       "JSImage",
       "_JSResourceImage",
       "_JSDataImage",

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2023.9.0",
+  "JSBundleVersion": "2023.10.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "SecurityKit+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
+  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
 }

package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-    "JSBundleVersion": "2023.9.0",
+    "JSBundleVersion": "2023.10.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
       "node": "SecurityKit+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
+    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
   },
   "Resources": [],
   "ResourceLookup": {

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2023.9.0",
+  "JSBundleVersion": "2023.10.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
+  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
 }

package/Node/Resources.js

@@ -382,9 +382,9 @@ var addMetadata = {
         metadata.image = {
             vector: true
         };
-        var parser = JSXMLParser.init();
-        parser.parse(xml, {
-            beginElement: function(name, prefix, namespace, attributes, isClosed){
+        var parser = JSXMLParser.initWithString(xml);
+        parser.delegate  = {
+            xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
                 var multiple = {
                     'em': 12,
                     'ex': 24,
@@ -414,25 +414,22 @@ var addMetadata = {
                     return multiple[unit] * n;
                 };
                 if (namespace == 'http://www.w3.org/2000/svg' && name.toLowerCase() == 'svg'){
-                    var attrs = {};
-                    for (let i = 0, l = attributes.length; i < l; ++i){
-                        let attr = attributes[i];
-                        if (attr.namespace === null){
-                            attrs[attr.name] = attr.value;
-                        }
-                    }
-                    if (attrs.width && attrs.height){
-                        metadata.image.width = px(attrs.width);
-                        metadata.image.height = px(attrs.height);
-                    }else if (attrs.viewBox){
-                        var box = attrs.viewBox.split(/\s+/).map(n => parseInt(n));
+                    let width = attributes.get("width");
+                    let height = attributes.get("height");
+                    let viewBox = attributes.get("viewBox");
+                    if (width && height){
+                        metadata.image.width = px(width);
+                        metadata.image.height = px(height);
+                    }else if (viewBox){
+                        var box = viewBox.split(/\s+/).map(n => parseInt(n));
                         metadata.image.width = box[2];
                         metadata.image.height = box[3];
                     }
                 }
                 parser.stop();
             }
-        });
+        };
+        parser.parse();
     },
 
     '.ttf': async function(name, contents, metadata){

package/Node/io.breakside.jskit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2023.9.0",
+    "JSBundleVersion": "2023.10.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
+    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

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

package/Root/Frameworks/APIKitTesting/Info.yaml

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

package/Root/Frameworks/AuthKit/Info.yaml

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

package/Root/Frameworks/CSSOM/Info.yaml

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

package/Root/Frameworks/ChartKit/CHPieChart.js

@@ -28,7 +28,7 @@ JSClass("CHPieChart", CHChart, {
         this.valueFormatter = JSNumberFormatter.init();
         this.valueFormatter.format = "0%";
         this.valueFormatter.multiplier = 100;
-        this.labelFont = JSFont.systemFontOfSize(JSFont.Size.normal).fontWithWeight(JSFont.Weight.bold);
+        this.labelFont = JSFont.systemFontOfSize(JSFont.Size.normal).bolderFont();
         this.labelTextColor = JSColor.white;
         this.labelShadowColor = JSColor.black.colorWithAlpha(0.4);
         this.labelShadowOffset = JSPoint(1, 1);

package/Root/Frameworks/ChartKit/Info.yaml

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

package/Root/Frameworks/ConferenceKit/Info.yaml

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

package/Root/Frameworks/DBKit/Info.yaml

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