@breakside/jskit 2021.37.0 → 2021.39.0

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

@@ -3,22 +3,22 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2021.37.0",
+    "JSBundleVersion": "2021.39.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "b0b3650984092f3c67e582f4b2bbdcf5adad5cec"
+    "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
   },
   "Resources": [
     {
       "path": "doc-default.css",
       "ext": ".css",
-      "byte_size": 8942,
+      "byte_size": 10928,
       "mimetype": "text/css",
-      "hash": "ca4a74732a309d75728efd4a2ef55109c75bc521",
+      "hash": "d8198dd825ddbc89e00cbbbc1c575e08a101ecaa",
       "nodeBundlePath": "Resources/doc-default.css"
     },
     {

package/Resources/doc-default.css

@@ -428,4 +428,90 @@ article.doc > footer > p {
     article.doc > section.topics > section.topic > header > h1{
         margin-bottom: 10px;
     }
+}
+
+@media (prefers-color-scheme: dark){
+    body{
+        background: rgb(38,38,38);
+    }
+
+    article.doc{
+        color: rgb(234,234,234);
+    }
+
+    article.doc a{
+        text-decoration: none;
+        color: rgb(160,160,220);
+    }
+
+    article.doc a:visited{
+        color: rgb(190,190,240);
+    }
+
+    article.doc div.code{
+        border: 1px solid rgb(26,26,26);
+        background: rgb(51,51,51);
+        color: rgb(255,255,255);
+    }
+
+    article.doc code{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > header{
+        border-bottom: 1px solid rgb(72,72,72);
+    }
+
+    article.doc > header > p.type{
+        color: rgb(128,128,128);
+    }
+
+    article.doc > aside.availability > div.versions{
+        color: rgb(128,128,128);
+    }
+
+    article.doc > aside.availability > table.environments > tbody > tr > td.beta > div{
+        border: 1px solid rgb(180,111,51);
+        color: rgb(180,111,51);
+    }
+
+    article.doc > aside.availability > table.environments > tbody > tr > td.available > div{
+        border: 1px solid rgb(64,255,128);
+        color: rgb(64,255,128);
+    }
+
+    article.doc > aside.availability > table.environments > tbody > tr > td.unavailable > div{
+        border: 1px solid rgb(224,224,224);
+        color: rgb(224,224,224);
+    }
+
+    article.doc > aside.availability > table.environments > tbody > tr > td.deprecated > div{
+        border: 1px solid rgb(204,102,0);
+        color: rgb(204,102,0);
+    }
+
+    article.doc > section.parameters > dl > dt{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > section.parameters > dl > dd > dl > dt{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > section.options > dl > dt{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > section.options > dl > dd > dl > dt{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > section.return > dl.promise > dt{
+        color: rgb(255,255,255);
+    }
+
+    article.doc > footer > p {
+        color: rgb(164,164,164);
+    }
+
 }

package/Root/Frameworks/APIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKit
-JSBundleVersion: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ChartKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ChartKit
-JSBundleVersion: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/DOM/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.DOM
-JSBundleVersion: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.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: 2021.37.0
+JSBundleVersion: 2021.39.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Foundation/JSColor+HTML.js

@@ -19,12 +19,21 @@
 JSColor.definePropertiesFromExtensions({
 
     _cachedCSSString: null,
+    _cachedCSSNumber: -1,
 
     cssString: function(){
-        if (this._cachedCSSString === null){
+        if (this._cachedCSSString === null || this._cachedCSSNumber !== JSColorSpace._cssCacheNumber){
             var rgbaColor = this.rgbaColor();
             this._cachedCSSString = 'rgba(%d, %d, %d, %f)'.sprintf(Math.round(rgbaColor.components[0] * 255), Math.round(rgbaColor.components[1] * 255), Math.round(rgbaColor.components[2] * 255), rgbaColor.components[3]);
+            this._cachedCSSNumber = JSColor._cssCacheNumber;
         }
         return this._cachedCSSString;
     }
-});
+
+});
+
+JSColor._cssCacheNumber = 0;
+
+JSColor.invalidateCSSCache = function(){
+    ++JSColor._cssCacheNumber;
+};

package/Root/Frameworks/Foundation/JSColor.js

@@ -16,6 +16,7 @@
 // #import "JSObject.js"
 // #import "CoreTypes.js"
 // #import "JSColorSpace.js"
+/* global JSBundle, JSSpec */
 'use strict';
 
 (function(){
@@ -153,12 +154,19 @@ JSClass('JSColor', JSObject, {
     },
 
     initWithBlendedColor: function(base, otherColor, blendPercentage){
-        otherColor = otherColor.rgbaColor();
-        var original = base.rgbaColor();
-        var r = original.red   + (otherColor.red   - original.red)   * blendPercentage;
-        var g = original.green + (otherColor.green - original.green) * blendPercentage;
-        var b = original.blue  + (otherColor.blue  - original.blue)  * blendPercentage;
-        this.initWithRGBA(r, g, b, original.alpha);
+        while (base._space instanceof JSMappedColorSpace){
+            base = base._space.colorFromComponents(base._components);
+        }
+        while (otherColor._space instanceof JSMappedColorSpace){
+            otherColor = otherColor._space.colorFromComponents(otherColor._components);
+        }
+        if (base.space !== otherColor.space || !base.space.canMixComponents){
+            base = base.rgbaColor();
+            otherColor = otherColor.rgbaColor();
+        }
+        var components = base.space.mixedComponents(base.components, otherColor.components, blendPercentage);
+        components.push(base.alpha);
+        this.initWithSpaceAndComponents(base.space, components);
     },
 
     initWithSpec: function(spec){
@@ -180,12 +188,38 @@ JSClass('JSColor', JSObject, {
             }
             this.initWithRGBA.apply(this, components);
         }else if (spec.containsKey("white")){
-            this.initWithWhite(spec.valueForKey("white"));
+            var white = spec.valueForKey("white");
+            components = white.parseNumberArray();
+            this.initWithWhite.apply(this, components);
         }else if (spec.containsKey("blendBase") && spec.containsKey("with") && spec.containsKey("percent")){
             var base = spec.valueForKey("blendBase", JSColor);
             var otherColor = spec.valueForKey("with", JSColor);
             var blendPercentage = spec.valueForKey("percent") / 100;
             this.initWithBlendedColor(base, otherColor, blendPercentage);
+        }else if (spec.containsKey("space")){
+            var spaceName = spec.valueForKey("space");
+            var space = JSColorSpace[spaceName];
+            if (space === undefined){
+                throw new Error("Unknown color space: %s".sprintf(spaceName));
+            }
+            components = [];
+            for (var componentName in space.componentNames){
+                if (!spec.containsKey(componentName)){
+                    throw new Error("Missing component %s for color in space: %s".sprintf(componentName, spaceName));
+                }
+                components[space.componentNames[componentName]] = spec.valueForKey(componentName);
+            }
+            if (space instanceof JSMappedColorSpace){
+                components.push(1);
+            }
+            var alpha = 1;
+            if (spec.containsKey("alpha")){
+                alpha = spec.valueForKey("alpha");
+            }else if (space instanceof JSMappedColorSpace){
+                alpha = -1;
+            }
+            components.push(alpha);
+            this.initWithSpaceAndComponents(space, components);
         }
     },
 
@@ -196,12 +230,7 @@ JSClass('JSColor', JSObject, {
         if (this._space !== other._space){
             return false;
         }
-        for (var i = 0, l = this._components.length; i < l; ++i){
-            if (Math.round(this._components[i] * 255) != Math.round(other._components[i] * 255)){
-                return false;
-            }
-        }
-        return true;
+        return this._space.compareComponents(this._components, other._components) && Math.round(this.alpha * 255) === Math.round(other.alpha * 255);
     },
 
     toString: function(){
@@ -209,21 +238,29 @@ JSClass('JSColor', JSObject, {
     },
 
     getAlpha: function(){
-        return this.components[this.components.length - 1];
+        var alpha = this._components[this._space.numberOfComponents];
+        if (alpha < 0){
+            alpha = this._space.alphaFromComponents(this._components);
+        }
+        return alpha;
     },
 
     colorWithAlpha: function(alpha){
         var components = JSCopy(this._components);
-        components[components.length - 1] = alpha;
+        components[this._space.numberOfComponents] = alpha;
         return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorDarkenedByPercentage: function(darkenPercentage){
-        return this.rgbaColor().colorByBlendingColor(JSColor.black, darkenPercentage);
+        var components = this._space.componentsDarkenedByPercentage(this._components, darkenPercentage);
+        components.push(this.alpha);
+        return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorLightenedByPercentage: function(lightenPercentage){
-        return this.rgbaColor().colorByBlendingColor(JSColor.white, lightenPercentage);
+        var components = this._space.componentsLightenedByPercentage(this._components, lightenPercentage);
+        components.push(this.alpha);
+        return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorByBlendingColor: function(otherColor, blendPercentage){
@@ -231,7 +268,6 @@ JSClass('JSColor', JSObject, {
     },
 
     rgbaColor: function(){
-        var components;
         if (this._space === JSColorSpace.rgb){
             return this;
         }
@@ -241,7 +277,6 @@ JSClass('JSColor', JSObject, {
     },
 
     grayColor: function(){
-        var components;
         if (this._space === JSColorSpace.gray){
             return this;
         }
@@ -268,7 +303,7 @@ JSClass('JSColor', JSObject, {
         }
         return {
             space: this._space.name,
-            components: JSCopy(this.components)
+            components: JSCopy(this._components)
         };
     },
 
@@ -344,7 +379,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getClearColor(){
             var color = JSColor.initWithRGBA(0, 0, 0, 0);
-            Object.defineProperty(this, 'clear', {value: color});
+            Object.defineProperty(JSColor, 'clear', {value: color});
             return color;
         }
     },
@@ -353,7 +388,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getWhiteColor(){
             var color = JSColor.initWithWhite(1.0);
-            Object.defineProperty(this, 'white', {value: color});
+            Object.defineProperty(JSColor, 'white', {value: color});
             return color;
         }
     },
@@ -362,7 +397,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithWhite(0);
-            Object.defineProperty(this, 'black', {value: color});
+            Object.defineProperty(JSColor, 'black', {value: color});
             return color;
         }
     },
@@ -371,7 +406,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(1.0, 0, 0);
-            Object.defineProperty(this, 'red', {value: color});
+            Object.defineProperty(JSColor, 'red', {value: color});
             return color;
         }
     },
@@ -380,7 +415,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(0, 1.0, 0);
-            Object.defineProperty(this, 'green', {value: color});
+            Object.defineProperty(JSColor, 'green', {value: color});
             return color;
         }
     },
@@ -389,13 +424,14 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(0, 0, 1.0);
-            Object.defineProperty(this, 'blue', {value: color});
+            Object.defineProperty(JSColor, 'blue', {value: color});
             return color;
         }
     },
 
 });
 
+
 JSColor.contentType = "x-jskit/jscolor";
 
 })();