@breakside/jskit 2022.7.0 → 2022.11.0

package/Root/Frameworks/Foundation/JSXMLParser.js

@@ -36,6 +36,7 @@ JSClass("JSXMLParser", JSObject, {
         var c;
         var lineNumber = 1;
         var lineOffset;
+        var entityMap = JSCopy(defaultEntityMap);
         var readToken = function(){
             if (offset >= length){
                 return null;
@@ -131,8 +132,77 @@ JSClass("JSXMLParser", JSObject, {
                 return {kind: 'PI', name: name, value: readUntil('?>')};
             }
             if (token == '<!DOCTYPE'){
-                var parts = readUntil('>').trim().split(' ');
-                return {kind: 'Doctype', name: parts[0], publicId: parts[1], systemId: parts[2]};
+                readWhitespace();
+                name = readName();
+                readWhitespace();
+                var doctype = {kind: 'Doctype', name: name, publicId: null, systemId: null, entities: {}};
+                if (offset < length && input[offset] !== '>'){
+                    if (input[offset] != '['){
+                        name = readName();
+                        readWhitespace();
+                        if (name == "SYSTEM"){
+                            if (offset < length && (input[offset] == "'" || input[offset] == '"')){
+                                doctype.systemId = readAttributeValue();
+                                readWhitespace();
+                            }else{
+                                throw new Error("Expecting quote at " + lineNumber  + ':' + (offset - lineOffset));
+                            }
+                        }else if (name === "PUBLIC"){
+                            if (offset < length && (input[offset] == "'" || input[offset] == '"')){
+                                doctype.publicId = readAttributeValue();
+                                readWhitespace();
+                                if (offset < length && (input[offset] == "'" || input[offset] == '"')){
+                                    doctype.systemId = readAttributeValue();
+                                    readWhitespace();
+                                }else{
+                                    throw new Error("Expecting quote at " + lineNumber  + ':' + (offset - lineOffset));
+                                }
+                            }else{
+                                throw new Error("Expecting quote at " + lineNumber  + ':' + (offset - lineOffset));
+                            }
+                        }else{
+                            throw new Error("Expecting SYSTEM or PUBLIC at " + lineNumber  + ':' + (offset - lineOffset));
+                        }
+                    }
+                    if (offset < length && input[offset] == '['){
+                        ++offset;
+                        readWhitespace();
+                        while (offset < length && input[offset] !== ']'){
+                            token = readToken();
+                            if (token == '<!'){
+                                name = readName();
+                                if (name === "ENTITY"){
+                                    readWhitespace();
+                                    if (offset >= length){
+                                        throw new Error("Expecting ENTITY name at " + lineNumber  + ':' + (offset - lineOffset));
+                                    }
+                                    name = readName();
+                                    readWhitespace();
+                                    if (offset >= length){
+                                        throw new Error("Expecting ENTITY value at " + lineNumber  + ':' + (offset - lineOffset));
+                                    }
+                                    entityMap[name] = readAttributeValue();
+                                }
+                                readUntil('>');
+                            }else if (token == '<?'){
+                                readUntil('?>');
+                            }else if (token == '<!--'){
+                                readUntil('-->');
+                            }
+                            readWhitespace();
+                        }
+                        if (offset >= length || input[offset] !== ']'){
+                            throw new Error("Expecting ] at end of DOCTYPE at " + lineNumber  + ':' + (offset - lineOffset));
+                        }
+                        ++offset;
+                        readWhitespace();
+                    }
+                }
+                if (offset >= length || input[offset] !== '>'){
+                    throw new Error("Expecting > at end of DOCTYPE at " + lineNumber  + ':' + (offset - lineOffset));
+                }
+                ++offset;
+                return doctype;
             }
             if (token == '<![CDATA['){
                 return {kind: 'CDATA', value: readUntil(']]>')};
@@ -154,7 +224,7 @@ JSClass("JSXMLParser", JSObject, {
                     if (offset < length && input[offset] == '='){
                         ++offset;
                         readWhitespace();
-                        attributes.push({name: attrName, value: textByDecodingEntities(readAttributeValue())});
+                        attributes.push({name: attrName, value: textByDecodingEntities(readAttributeValue(), entityMap)});
                     }else{
                         attributes.push({name: attrName, value: null});
                     }
@@ -189,7 +259,7 @@ JSClass("JSXMLParser", JSObject, {
                 ++offset;
                 return {kind: 'ElementEnd', name: name};
             }
-            return {kind: 'Text', value: textByDecodingEntities(token)};
+            return {kind: 'Text', value: textByDecodingEntities(token, entityMap)};
         };
         var readUntil = function(token){
             var index = input.indexOf(token, offset);
@@ -267,7 +337,10 @@ JSClass("JSXMLParser", JSObject, {
         }
         obj = readObject();
         var elementNameStack = [];
-        var namespaces = {':default:': null};
+        var namespaces = {
+            ':default:': null,
+            'xml': 'http://www.w3.org/XML/1998/namespace'
+        };
         var namespacesStack = [];
         var hasDocumentElement = false;
         var hasSentDoctype = false;
@@ -361,7 +434,7 @@ JSClass("JSXMLParser", JSObject, {
 
 });
 
-var textByDecodingEntities = function(text){
+var textByDecodingEntities = function(text, map){
     var index = text.indexOf('&');
     var length = text.length;
     var end;
@@ -390,7 +463,7 @@ var textByDecodingEntities = function(text){
                     value = String.fromCharCode(code);
                 }
             }else{
-                value = entityMap[entity] || null;
+                value = map[entity] || null;
                 if (value === null){
                     throw new Error("Cannot lookup entity: &" + entity + ';');
                 }
@@ -404,7 +477,7 @@ var textByDecodingEntities = function(text){
     return text;
 };
 
-var entityMap = {
+var defaultEntityMap = {
     'lt': '<',
     'LT': '<',
     'gt': '>',

package/Root/Frameworks/ImageKit/Info.yaml

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

package/Root/Frameworks/MediaKit/Info.yaml

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

package/Root/Frameworks/MediaKitUI/Info.yaml

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

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2022.7.0
+JSBundleVersion: 2022.11.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/PDFKit/Info.yaml

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

package/Root/Frameworks/QRKit/Info.yaml

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

package/Root/Frameworks/SearchKit/Info.yaml

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

package/Root/Frameworks/SecurityKit/Info.yaml

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

package/Root/Frameworks/ServerKit/Info.yaml

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

package/Root/Frameworks/ServerKit/SKHTTPServer+Node.js

@@ -85,6 +85,10 @@ SKHTTPServer.definePropertiesFromExtensions({
     _handleNodeRequest: function(nodeRequest, nodeResponse){
         try{
             var request = SKNodeHTTPRequest.initWithNodeRequest(nodeRequest, nodeResponse);
+            if (request === null){
+                nodeRequest.socket.destroy();
+                return;
+            }
             if (this.tlsCertificate && this.tlsPrivateKey){
                 request.url.scheme = "https";
             }
@@ -98,6 +102,10 @@ SKHTTPServer.definePropertiesFromExtensions({
     _handleNodeUpgrade: function(nodeRequest, socket, headPacket){
         try{
             var request = SKNodeHTTPRequest.initWithNodeRequest(nodeRequest, null);
+            if (request === null){
+                nodeRequest.socket.destroy();
+                return;
+            }
             this.handleUpgrade(request);
         }catch(e){
             nodeRequest.socket.destroy();

package/Root/Frameworks/ServerKit/SKHTTPServer.js

@@ -148,7 +148,7 @@ JSClass("SKHTTPServer", JSObject, {
                 if (this.delegate && this.delegate.serverRouteNotFoundForRequest){
                     this.delegate.serverRouteNotFoundForRequest(this, request);
                 }
-                request.logger.warn("%{public} %{public} No route for request", request.method, request.url.path);
+                request.logger.info("%{public} %{public} No route for request", request.method, request.url.path);
                 throw new SKHTTPError(SKHTTPResponse.StatusCode.notFound);
             }
 

package/Root/Frameworks/ServerKit/SKNodeHTTPRequest.js

@@ -25,6 +25,9 @@ JSClass("SKNodeHTTPRequest", SKHTTPRequest, {
 
     initWithNodeRequest: function(nodeRequest, nodeResponse){
         var url = JSURL.initWithString(nodeRequest.url);
+        if (url === null){
+            return null;
+        }
         if (url.pathComponents.length === 0){
             url.path = "/";
         }

package/Root/Frameworks/ServerKitTesting/Info.yaml

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

package/Root/Frameworks/TestKit/Info.yaml

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

package/Root/Frameworks/UIKit/Info.yaml

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

package/Root/Frameworks/UIKit/UIApplication.js

@@ -126,7 +126,7 @@ JSClass('UIApplication', UIResponder, {
                 JSFont.Size[size] = Math.round(JSFont.Size[size] * 1.2);
             }
         }
-        this.windowServer.displayServer.registerFontDescriptors(descriptors, function(error){
+        this.registerFontDescriptors(descriptors, function(error){
             completion.call(target, error);
         }, this);
     },
@@ -427,9 +427,23 @@ JSClass('UIApplication', UIResponder, {
         this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
     },
 
+    // MARK: - Fonts
+
+    registerFontDescriptor: function(descriptor, completion, target){
+        return this.registerFontDescriptors([descriptor], completion, target);
+    },
+
+    registerFontDescriptors: function(descriptors, completion, target){
+        return this.windowServer.displayServer.registerFontDescriptors(descriptors, completion, target);
+    },
+
+    // MARK: - URLs
+
     openURL: function(url, options){
     },
 
+    // MARK: - Environment
+
     getenv: function(name, defaultValue){
         return this.environment.get(name, defaultValue);
     },

package/Root/Frameworks/UIKit/UICollectionView.js

@@ -19,6 +19,8 @@
 // #import "UICollectionViewLayout.js"
 "use strict";
 
+(function(){
+
 JSProtocol("UICollectionViewDelegate", JSProtocol, {
 
     // Selection
@@ -286,12 +288,12 @@ JSClass("UICollectionView", UIScrollView, {
     },
 
     reloadCellsAtIndexPaths: function(indexPaths, animator){
+        if (this._needsReload){
+            return;
+        }
         if (this._visibleElements.length === 0){
             return;
         }
-        var firstVisibleElement = this._visibleElements[0];
-        var lastVisibleElement = this._visibleElements[this._visibleElements.length - 1];
-        var searcher = JSBinarySearcher(this._visibleElements, VisibleElement.indexPathCompare);
 
         indexPaths = JSCopy(indexPaths);
         indexPaths.sort(function(a, b){
@@ -301,28 +303,25 @@ JSClass("UICollectionView", UIScrollView, {
         var i, l;
         var indexPath;
         var comparison;
-        var elementIndex;
+        var elementIndex = 0;
+        var elementCount = this._visibleElements.length;
         var cell;
         var element;
 
         for (i = 0, l = indexPaths.length; i < l; ++i){
             indexPath = indexPaths[i];
-            comparison = VisibleElement.indexPathCompare(indexPath, lastVisibleElement);
-            if (comparison <= 0){
-                comparison = VisibleElement.indexPathCompare(indexPath, firstVisibleElement);
-                if (comparison >= 0){
-                    elementIndex = searcher.indexMatchingValue(indexPath);
-                    if (elementIndex !== null){
-                        element = this._visibleElements[elementIndex];
-                        cell = element.view;
-                        this._enqueueReusableCell(cell);
-                        cell = this._createCellWithAttributes(element.attributes);
-                        if (cell !== element.view){
-                            this._elementsContainerView.insertSubviewBelowSibling(cell, element.view);
-                            element.view.removeFromSuperview();
-                            element.view = cell;
-                        }
-                    }
+            while (elementIndex < elementCount && !this._visibleElements[elementIndex].indexPath.isEqual(indexPath)){
+                ++elementIndex;
+            }
+            if (elementIndex < elementCount){
+                element = this._visibleElements[elementIndex];
+                cell = element.view;
+                this._enqueueReusableCell(cell);
+                cell = this._createCellWithAttributes(element.attributes);
+                if (cell !== element.view){
+                    this._elementsContainerView.insertSubviewBelowSibling(cell, element.view);
+                    element.view.removeFromSuperview();
+                    element.view = cell;
                 }
             }
         }
@@ -1226,15 +1225,7 @@ VisibleElement.prototype = Object.create(Function.prototype, {
     indexPath: { value: null, writable: true },
     rect: { value: null, writable: true, configurable: true },
     kind: { value: null, writable: true },
-    view: {
-        configurable: true,
-        set: function(view){
-            Object.defineProperty(this, 'view', {value: view});
-        },
-        get: function(){
-            return null;
-        }
-    },
+    view: { value: null, writable: true },
     state: { value: null, writable: true },
     animation: { value: null, writable: true },
 
@@ -1249,6 +1240,4 @@ VisibleElement.prototype = Object.create(Function.prototype, {
 
 });
 
-VisibleElement.indexPathCompare = function VisibleElement_indexPathCompare(indexPath, element){
-    return indexPath.compare(element.indexPath);
-};
+})();

package/Root/Frameworks/UIKit/UIScene.js

@@ -56,6 +56,10 @@ JSClass("UIScene", JSObject, {
     },
 
     show: function(){
+        if (UIScene._visible !== null){
+            UIScene._visible.close();
+        }
+        UIScene._visible = this;
         if (this.menuBar){
             this.application.windowServer.menuBar = this.menuBar;
         }
@@ -67,7 +71,6 @@ JSClass("UIScene", JSObject, {
         if (window !== null){
             window.makeKey();
         }
-        UIScene._visible = this;
     },
 
     close: function(){
@@ -80,6 +83,7 @@ JSClass("UIScene", JSObject, {
             window = windowServer.windowStack[i];
             window.close();
         }
+        UIScene._visible = null;
     },
 
 });

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -37,16 +37,19 @@ JSClass('UIScrollView', UIView, {
     initWithSpec: function(spec){
         UIScrollView.$super.initWithSpec.call(this, spec);
 
-        // 1. If any subviews were added directly to this view, we'll move them
-        //    to the contentView once it's ready
-        var contentSubviews = JSCopy(this.subviews);
-
-        // 2. If the content view and scrollers are specified in the spec, create them
-        //    before doing the _commonScrollViewInit, so it won't try to create them itself.
-        //    These properties are optional in the spec, and are typically only provided if
-        //    the user wants to provide specialized customization
+        var contentSubviews = [];
+
+        // If the content view and scrollers are specified in the spec, create them
+        // before doing the _commonScrollViewInit, so it won't try to create them itself.
+        // These properties are optional in the spec, and are typically only provided if
+        // the user wants to provide specialized customization
         if (spec.containsKey('contentView')){
             this._contentView = spec.valueForKey("contentView", UIView);
+        }else{
+            // If any subviews were added directly to this view, and a 
+            // contentView was not provided, treat the subviews as children
+            // of the contentView
+            contentSubviews = JSCopy(this.subviews);
         }
         if (spec.containsKey('verticalScroller')){
             this._verticalScroller = spec.valueForKey("verticalScroller", UIScroller);
@@ -59,13 +62,13 @@ JSClass('UIScrollView', UIView, {
         }
         this._commonScrollViewInit();
 
-        // 3. Finish the work from step #1 after _commonScrollViewInit, when we can be sure that
-        //    a contentView has been created
+        // Finish the contentSubvies work after _commonScrollViewInit,
+        // when we can be sure that a contentView has been created
         for (var i = 0, l = contentSubviews.length; i < l; ++i){
             this._contentView.addSubview(contentSubviews[i]);
         }
 
-        // 4. Handle all the other properties
+        // Handle all the other properties
         if (spec.containsKey('contentInsets')){
             this.contentInsets = spec.valueForKey("contentInsets", JSInsets);
         }
@@ -105,7 +108,7 @@ JSClass('UIScrollView', UIView, {
         this._maxContentOffset = JSPoint.Zero;
         this._horizontalScroller.addAction("_horizontalScrollerValueChanged", this, UIControl.Event.valueChanged);
         this._verticalScroller.addAction("_verticalScrollerValueChanged", this, UIControl.Event.valueChanged);
-        this.addSubview(this._contentView);
+        this.insertSubviewAtIndex(this._contentView, 0);
         this.addSubview(this._verticalScroller);
         this.addSubview(this._horizontalScroller);
         this._updateScrollers();

package/Root/Frameworks/UIKit/UISegmentedControl.js

@@ -769,6 +769,21 @@ JSClass("UISegmentedControlDefaultStyler", UISegmentedControlStyler, {
         }
     },
 
+    sizeControlToFitSize: function(control, maxSize){
+        var intrinsicSize = this.intrinsicSizeOfControl(control);
+        var size = JSSize(control.bounds.size);
+        if (maxSize.width < Number.MAX_VALUE){
+            size.width = maxSize.width;
+        }
+        if (intrinsicSize.width < maxSize.width){
+            size.width = intrinsicSize.width;
+        }
+        if (intrinsicSize.height < maxSize.height){
+            size.height = intrinsicSize.height;
+        }
+        control.bounds = JSRect(JSPoint.Zero, size);
+    },
+
     intrinsicSizeOfControl: function(control){
         var itemView;
         var size = JSSize.Zero;

package/Root/Frameworks/UIKit/UITabView.js

@@ -59,16 +59,14 @@ JSClass("UITabView", UIView, {
         if (spec.containsKey('delegate')){
             this.delegate = spec.valueForKey("delegate");
         }
+        if (spec.containsKey("font")){
+            this.font = spec.valueForKey("font", JSFont);
+        }
         if (spec.containsKey('items')){
-            var items = [];
             var specItems = spec.valueForKey('items');
             for (var i = 0, l = specItems.length; i < l; ++i){
-                items.push(specItems.valueForKey(i, UITabViewItem));
+                this.insertItemAtIndex(specItems.valueForKey(i, UITabViewItem), i);
             }
-            this.items = items;
-        }
-        if (spec.containsKey("font")){
-            this.font = spec.valueForKey("font", JSFont);
         }
     },
 
@@ -1067,6 +1065,7 @@ JSClass("UITabViewTablessStyler", UITabViewStyler, {
     showContentViewInTabView: function(contentView, tabView){
         tabView.addSubview(contentView);
         tabView.stylerProperties.contentView = contentView;
+        this.layoutTabView(tabView);
     },
 
     removeContentViewFromTabView: function(contentView, tabView){

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=10.10.0"
   },
   "name": "@breakside/jskit",
-  "version": "2022.7.0",
+  "version": "2022.11.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"