@breakside/jskit 2021.44.0 → 2022.3.0

package/Root/Frameworks/ImageKit/IKColorSpace.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 
 // #import Foundation
+// #import "IKColorProfile.js"
 'use strict';
 
 (function(){
@@ -23,220 +24,70 @@ var logger = JSLog("imagekit", "colorspace");
 JSClass("IKColorSpace", JSColorSpace, {
 
     initWithProfileData: function(data){
-        this._data = data;
-        this._dataView = data.dataView();
-        try{
-            this._readHeader();
-            this._readTags();
-            this._createConnectionSpace();
-        }catch (e){
-            logger.error(e);
-            return null;
-        }
+        var profile = IKColorProfile.initWithData(data);
+        return this.initWithProfile(profile);
     },
 
-    data: JSReadOnlyProperty('_data', null),
-    _dataView: null,
-
-    preferredCMM: 0,
-    version: 0,
-    profileClass: null,
-    type: null,
-    connectionType: null,
-    createdDate: null,
-    signature: null,
-    platform: null,
-    manufacturer: null,
-    embedded: false,
-    independent: false,
-    model: null,
-    renderingIntent: 0,
-    creator: 0,
-    id: null,
-
-    _readHeader: function(){
-        if (this._data.length < 128){
-            throw new Error("Invalid profile, not enough data for header");
-        }
-        var data = this._data;
-        var dataView = this._dataView;
-        if (dataView.getUint32(0) != data.length){
-            throw new Error("Invalid profile, size does not match data length");
+    initWithProfile: function(profile){
+        if (profile === undefined || profile === null){
+            return null;
         }
-        this.preferredCMM = dataView.getUint32(4);
-        this.version = dataView.getUint32(8);
-        this.profileClass = String.initWithData(data.subdataInRange(JSRange(12, 4)), String.Encoding.latin1);
-        this.type = String.initWithData(data.subdataInRange(JSRange(16, 4)), String.Encoding.latin1);
-        this.connectionType = String.initWithData(data.subdataInRange(JSRange(20, 4)), String.Encoding.latin1);
-        this.createdDate = JSCalendar.gregorian.dateFromComponents({
-            year: dataView.getUint16(24),
-            month: dataView.getUint16(26),
-            day: dataView.getUint16(28),
-            hour: dataView.getUint16(30),
-            minute: dataView.getUint16(32),
-            second: dataView.getUint16(34)
-        });
-        this.signature = String.initWithData(data.subdataInRange(JSRange(36, 4)), String.Encoding.latin1);
-        this.platform = String.initWithData(data.subdataInRange(JSRange(40, 4)), String.Encoding.latin1);
-        var flags = dataView.getUint32(44);
-        this.embedded = (flags & 0x01) === 0x01;
-        this.independent = (flags & 0x02) === 0x02;
-        this.manufacturer = dataView.getUint32(48);
-        this.model = dataView.getUint32(52);
-        // attributes1:    dataView.getUint32(56),
-        // attributes2:    dataView.getUint32(60),
-        this.renderingIntent = dataView.getUint32(64);
-        this.connectionWhitepoint = XYZ32(dataView.getUint32(68), dataView.getUint32(72), dataView.getUint32(76));
-        this.creator = dataView.getUint32(80);
-        this.id = data.subdataInRange(JSRange(84, 16)).hexStringRepresentation();
-    },
-
-    _tags: null,
-
-    _readTags: function(){
-        if (this._data.length < 128){
-            throw new Error("Invalid profile, not enough data for tag count");
+        if (profile.profileClass === IKColorProfile.ProfileClass.deviceLink){
+            logger.warn("color profile must not be a device link class");
+            return null;
         }
-        var tagCount = this._dataView.getUint32(128);
-        if (this._data.length < 132 + tagCount * 12){
-            throw new Error("Invalid profile, not enough data for tag table");
+        if (profile.connectionWhitepoint !== JSColorSpace.Whitepoint.D50){
+            logger.warn("color profile must use the D50 pcs illuminant");
+            return null;
         }
-        var offset = 132;
-        this._tags = {};
-        var tag;
-        for (var i = 0; i < tagCount; ++i){
-            tag = {
-                name: String.initWithData(this._data.subdataInRange(JSRange(offset, 4)), String.Encoding.latin1),
-                range: JSRange(this._dataView.getUint32(offset + 4), this._dataView.getUint32(offset + 8))
-            };
-            if (tag.range.end > this._data.length){
-                throw new Error("Invalid profile, not enough data for tag %s at %d (%d)".sprintf(tag.name, tag.range.location, tag.range.length));
-            }
-            this._tags[tag.name.trim()] = tag;
-            offset += 12;
+        if (profile.connectionSpace === IKColorProfile.ColorSpace.lab){
+            this._connectionSpace = JSColorSpace.lab;
+        }else if (profile.connectionSpace === IKColorProfile.ColorSpace.xyz){
+            this._connectionSpace = JSColorSpace.xyz;
+        }else{
+            logger.warn("color profile must have a Lab or XYZ connection space");
+            return null;
         }
-    },
-
-    connectionSpace: null,
-    connectionWhitepoint: null,
-
-    _createConnectionSpace: function(){
-        if (this._header.connectionType == IKColorSpace.Type.lab){
-            this.connectionSpace = JSLabColorSpace.initWithWhitepoint(this.mediaWhitepoint);
-        }else if (this._header.connectionType == IKColorSpace.Type.xyz){
-            this.connectionSpace = JSXYZColorSpace.initWithWhitepoint(this.mediaWhitepoint, JSColorSpace.Whitepoint.D50);
+        if (profile.numberOfComponents === 1 && profile.grayToneReproductionCurve !== null){
+            this._componentConverter = IKColorProfileCurveComponentConverter.initWithCurve(profile.grayToneReproductionCurve.fn);
+        }else if (profile.aToB0 !== null && profile.bToA0 !== null){
+            this._componentConverter = IKColorProfileLookupComponentConverter.initWithLookupTables(profile.aToB0, profile.bToA0, profile.connectionSpace);
+        }else if (profile.redToneReproductionCurve !== null && profile.greenToneReproductionCurve !== null && profile.blueToneReproductionCurve !== null && profile.redMatrixColumn !== null && profile.greenMatrixColumn !== null && profile.blueMatrixColumn !== null){
+            var matrix = [
+                [profile.redMatrixColumn.value[0], profile.greenMatrixColumn.value[0], profile.blueMatrixColumn.value[0]],
+                [profile.redMatrixColumn.value[1], profile.greenMatrixColumn.value[1], profile.blueMatrixColumn.value[1]],
+                [profile.redMatrixColumn.value[2], profile.greenMatrixColumn.value[2], profile.blueMatrixColumn.value[2]]
+            ];
+            var curves = [
+                profile.redToneReproductionCurve.fn,
+                profile.greenToneReproductionCurve.fn,
+                profile.blueToneReproductionCurve.fn
+            ];
+            this._componentConverter = IKColorProfileMatrixComponentConverter.initWithMatrix(matrix, curves);
         }else{
-            throw new Error("Invalid profile, connection space must be Lab or XYZ");
+            logger.warn("color profile does not contain supported conversion tags");
+            return null;
         }
+        // TODO: anything with media white point?
+        this._profile = profile;
+        this.numberOfComponents = profile.numberOfComponents;
+        this.name = "icc-%s".sprintf(profile.colorSpace.trim());
     },
 
+    profile: JSReadOnlyProperty("_profile", null),
+    connectionSpace:JSReadOnlyProperty("_connectionSpace", null),
+    _componentConverter: null,
+
     xyzFromComponents: function(components){
-        var connectionComponents = this.connectionComponentsFromComponents(components);
-        return this.connectionSpace.xyzFromComponents(connectionComponents);
+        var connectionComponents = this._componentConverter.connectionComponentsFromComponents(components);
+        return this._connectionSpace.xyzFromComponents(connectionComponents);
     },
 
     componentsFromXYZ: function(xyz){
-        var connectionComponents = this.connectionSpace.componentsFromXYZ(xyz);
-        return this.componentsFromConnectionComponents(connectionComponents);
-    },
-
-    connectionComponentsFromComponents: function(components){
-        // TODO:
+        var connectionComponents = this._connectionSpace.componentsFromXYZ(xyz);
+        return this._componentConverter.componentsFromConnectionComponents(connectionComponents);
     },
 
-    componentsFromConnectionComponents: function(connectionComponents){
-        // TODO:
-    },
-
-    mediaWhitepoint: JSLazyInitProperty("_readMediaWhitepoint"),
-
-    _readMediaWhitepoint: function(){
-        var tag = this.tags.wtpt;
-        if (!tag){
-            throw new Error("wtpt tag not found");
-        }
-        return XYZ32(
-            this._dataView.getUint32(tag.offset + 8),
-            this._dataView.getUint32(tag.offset + 12),
-            this._dataView.getUint32(tag.offset + 16)
-        );
-    }
-
 });
 
-var s15Fixed16 = function(i){
-    var f = ((i & 0x7FFF0000) >> 16) + ((i & 0xFFFF) / 65536.0);
-    if (i & (0x80000000) != 0){
-        return -f;
-    }
-    return f;
-};
-
-var u8Fixed8 = function(i){
-    return (i >> 8) + ((i & 0xFF) / 256.0);
-};
-
-var XYZ32 = function(x, y, z){
-    if (x == 0x0000F6D6 && y == 0x00010000 && z == 0x0000D32D){
-        return JSColorSpace.Whitepoint.D50;
-    }
-    return [
-        s15Fixed16(x),
-        s15Fixed16(y),
-        s15Fixed16(z)
-    ];
-};
-
-IKColorSpace.ProfileClass = {
-    input: "scnr",
-    display: "mntr",
-    output: "prtr",
-    deviceLink: "link",
-    colorSpace: "spac",
-    abstract: "abst",
-    namedColor: "nmcl"
-};
-
-IKColorSpace.Type = {
-    xyz: "XYZ ",
-    lab: "Lab ",
-    luv: "Luv ",
-    ycbcr: "YCbr",
-    yxy: "Yxy ",
-    rgb: "RGB",
-    gray: "GRAY",
-    hsv: "HSV ",
-    hls: "HLS ",
-    cmyk: "CMYK",
-    cmy: "CMY ",
-    twoColor: "2CLR",
-    threeColor: "3CLR",
-    fourColor: "4CLR",
-    fiveColor: "5CLR",
-    sixColor: "6CLR",
-    sevenColor: "7CLR",
-    eightColor: "8CLR",
-    nineColor: "9CLR",
-    tenColor: "ACLR",
-    elevenColor: "BCLR",
-    twelveColor: "CCLR",
-    thirteenColor: "DCLR",
-    fourteenColor: "ECLR",
-    fifteenColor: "FCLR"
-};
-
-IKColorSpace.Platform = {
-    apple: "APPL",
-    microsoft: "MSFT",
-    siliconGraphics: "SGI ",
-    sunMicrosystems: "SUNW"
-};
-
-IKColorSpace.RenderingIntent = {
-    perceptual: 0,
-    mediaRelative: 1,
-    saturation: 2,
-    absolute: 3
-};
-
 })();

package/Root/Frameworks/ImageKit/IKDecoderPNG.js

@@ -701,9 +701,7 @@ var IKDecoderPNGError = function(code, byteOffset, msg){
     this.code = code;
     this.byteOffset = byteOffset;
     this.msg = msg;
-    if (Error.captureStackTrace){
-        Error.captureStackTrace(this, IKDecoderPNGError);
-    }
+    Error.captureStackTrace(this, IKDecoderPNGError);
 };
 
 IKDecoderPNGError.prototype = Object.create(Error.prototype);

package/Root/Frameworks/ImageKit/IKMatrix.js

@@ -0,0 +1,124 @@
+// // Copyright 2022 Breakside Inc.
+//
+// Licensed under the Breakside Public License, Version 1.0 (the "License");
+// you may not use this file except in compliance with the License.
+// If a copy of the License was not distributed with this file, you may
+// obtain a copy at
+//
+//     http://breakside.io/licenses/LICENSE-1.0.txt
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// #import Foundation
+'use strict';
+
+JSGlobalObject.IKMatrix = function(m){
+    Object.defineProperties(m, {
+        rows: {
+            configurable: true,
+            enumerable: false,
+            value: m.length
+        },
+        columns: {
+            configurable: true,
+            enumerable: false,
+            value: m.length > 0 ? m[0].length : 0
+        },
+        determinant: {
+            configurable: true,
+            enumerable: false,
+            value: function(){
+                if (m.rows === 2 && m.columns === 2){
+                    return m[0][0] * m[1][1] - m[0][1] * m[1][0];
+                }
+                if (m.rows === 3 && m.columns === 3){
+                    return m[0][0] * m[1][1] * m[2][2] -
+                        m[0][0] * m[1][2] * m[2][1] -
+                        m[0][1] * m[1][0] * m[2][2] +
+                        m[0][1] * m[1][2] * m[2][0] +
+                        m[0][2] * m[1][0] * m[2][1] -
+                        m[0][2] * m[1][1] * m[2][0];
+                }
+                throw new Error("Unable to compute %dx%d determinant".sprintf(m.rows, m.columns));
+            }
+        },
+        inverse: {
+            configurable: true,
+            enumerable: false,
+            value: function(){
+                if (m.rows === 2 && m.columns === 2){
+                    return IKMatrix([
+                        [m[1][1], -m[0][1]],
+                        [-m[1][0], m[0][0]]
+                    ]).multiplied(1.0 / m.determinant());
+                }
+                if (m.rows === 3 && m.columns === 3){
+                    return IKMatrix([
+                        [
+                            IKMatrix([
+                                [m[1][1], m[1][2]],
+                                [m[2][1], m[2][2]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][2], m[0][1]],
+                                [m[2][2], m[2][1]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][1], m[0][2]],
+                                [m[1][1], m[1][2]]
+                            ]).determinant()
+                        ],
+                        [
+                            IKMatrix([
+                                [m[1][2], m[1][0]],
+                                [m[2][2], m[2][0]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][0], m[0][2]],
+                                [m[2][0], m[2][2]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][2], m[0][0]],
+                                [m[1][2], m[1][0]]
+                            ]).determinant()
+                        ],
+                        [
+                            IKMatrix([
+                                [m[1][0], m[1][1]],
+                                [m[2][0], m[2][1]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][1], m[0][0]],
+                                [m[2][1], m[2][0]]
+                            ]).determinant(),
+                            IKMatrix([
+                                [m[0][0], m[0][1]],
+                                [m[1][0], m[1][1]]
+                            ]).determinant()
+                        ]
+                    ]).multiplied(1.0 / m.determinant());
+                }
+                throw new Error("Unable to compute %dx%d inverse".sprintf(m.rows, m.columns));
+            }
+        },
+        multiplied: {
+            configurable: true,
+            enumerable: false,
+            value: function(x){
+                var result = IKMatrix(JSDeepCopy(m));
+                var row, col;
+                for (row = 0; row < result.rows; ++row){
+                    for (col = 0; col < result.columns; ++col){
+                        result[row][col] *= x;
+                    }
+                }
+                return result;
+            }
+        }
+    });
+    return m;
+};

package/Root/Frameworks/ImageKit/ImageKit.js

@@ -21,4 +21,6 @@
 // #import "IKEncoderJPEG.js"
 // #import "IKEncoderPNG.js"
 // #import "IKColorSpace.js"
+// #import "IKColorProfile.js"
+// #import "IKMatrix.js"
 // #import "JSImage+IKBitmap.js"

package/Root/Frameworks/ImageKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ImageKit
-JSBundleVersion: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.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: 2021.44.0
+JSBundleVersion: 2022.3.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKit/SKFileJobQueue.js

@@ -49,7 +49,9 @@ JSClass("SKFileJobQueue", SKJobQueue, {
     },
 
     handleChange: function(eventType, filename){
-        if (fs.existsSync(filename)){
+        let url = JSURL.initWithString(filename, this.queueURL);
+        let path = this.fileManager.pathForURL(url);
+        if (fs.existsSync(path)){
             this.notifyConsumer(this);
         }
     },

package/Root/Frameworks/ServerKit/SKHTTPError.js

@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// #import Foundation
 'use strict';
 
 JSGlobalObject.SKHTTPError = function(statusCode, message, object){
@@ -28,9 +29,7 @@ JSGlobalObject.SKHTTPError = function(statusCode, message, object){
         this.message = message;
         this.object = object || null;
     }
-    if (Error.captureStackTrace){
-        Error.captureStackTrace(this, SKHTTPError);
-    }
+    Error.captureStackTrace(this, SKHTTPError);
 };
 
 JSGlobalObject.SKHTTPError.prototype = Object.create(Error.prototype);

package/Root/Frameworks/ServerKit/SKHTTPRequest.js

@@ -16,6 +16,7 @@
 // #import Foundation
 // #import "SKHTTPResponse.js"
 // #import "SKValidatingObject.js"
+// #import "SKUserAgent.js"
 'use strict';
 
 JSClass("SKHTTPRequest", JSObject, {
@@ -299,4 +300,10 @@ JSClass("SKHTTPRequest", JSObject, {
         return null;
     },
 
+    userAgent: JSReadOnlyProperty(),
+
+    getUserAgent: function(){
+        return SKUserAgent.initWithString(this.headerMap.get("User-Agent", null));
+    },
+
 });

package/Root/Frameworks/ServerKit/SKHTTPResponder.js

@@ -197,16 +197,20 @@ JSClass("SKHTTPResponder", JSObject, {
         return Promise.reject(new Error("not implemented"));
     },
 
-    addAllowedOrigin: function(origin, methods, headers){
+    addAllowedOrigin: function(origin, methods, headers, credentials){
         if (methods === undefined){
             methods = ["*"];
         }
         if (headers === undefined){
             headers = ["Authorization", "Content-Type"];
         }
+        if (credentials === undefined){
+            credentials = false;
+        }
         this.allowedOrigins[origin] = {
             methods: methods,
-            headers: headers
+            headers: headers,
+            credentials: credentials
         };
     },
 
@@ -229,6 +233,9 @@ JSClass("SKHTTPResponder", JSObject, {
                 if (this.request.headerMap.get('Access-Control-Request-Headers', null) !== null){
                     this.response.headerMap.set("Access-Control-Allow-Headers", allowed.headers.join(", "));
                 }
+                if (allowed.credentials){
+                    this.response.headerMap.set("Access-Control-Allow-Credentials", "true");
+                }
                 if (this.request.method == "OPTIONS"){
                     this.response.headerMap.set("Access-Control-Max-Age", 60 * 60);
                 }