@breakside/jskit 2022.22.1 → 2022.23.0

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

@@ -18,6 +18,8 @@
 // #import "UnicodeChar.js"
 // #import "Zlib.js"
 // #import "CoreTypes.js"
+// #import "JSURLSession.js"
+/* global JSFont */
 'use strict';
 
 (function(){
@@ -38,11 +40,11 @@ JSClass("JSFontDescriptor", JSObject, {
     unitsPerEM: JSReadOnlyProperty('_unitsPerEM', 0),
 
     descriptorWithWeight: function(weight){
-        return this;
+        return JSFontDescriptor.descriptorWithFamily(this.family, weight, this.style) || this;
     },
 
     descriptorWithStyle: function(style){
-        return this;
+        return JSFontDescriptor.descriptorWithFamily(this.family, this.weight, style) || this;
     },
 
     glyphForCharacter: function(character){
@@ -89,6 +91,29 @@ JSClass("JSFontDescriptor", JSObject, {
 
 });
 
+JSFontDescriptor.system = null;
+
+JSFontDescriptor.descriptorsByFamily = {
+};
+
+JSFontDescriptor.registerDescriptor = function(descriptor){
+    if (!(descriptor._family in JSFontDescriptor.descriptorsByFamily)){
+        JSFontDescriptor.descriptorsByFamily[descriptor._family] = {};
+    }
+    if (!(descriptor._weight in JSFontDescriptor.descriptorsByFamily[descriptor._family])){
+        JSFontDescriptor.descriptorsByFamily[descriptor._family][descriptor._weight] = {};
+    }
+    if (!(descriptor._style in JSFontDescriptor.descriptorsByFamily[descriptor._family][descriptor._weight])){
+        JSFontDescriptor.descriptorsByFamily[descriptor._family][descriptor._weight][descriptor._style] = descriptor;
+    }
+};
+
+JSFontDescriptor.descriptorWithFamily = function(family, weight, style){
+    var weights = JSFontDescriptor.descriptorsByFamily[family] || {};
+    var styles = weights[weight] || {};
+    return styles[style] || null;
+};
+
 JSClass("JSDataFontDescriptor", JSFontDescriptor, {
 
     data: null,
@@ -131,23 +156,6 @@ JSClass("JSResourceFontDescriptor", JSFontDescriptor, {
             widths: null,
         };
         JSResourceFontDescriptor.descriptorsByName[metadata.font.unique_identifier] = this;
-        if (!(this._family in JSResourceFontDescriptor.descriptorsByFamily)){
-            JSResourceFontDescriptor.descriptorsByFamily[this._family] = {};
-        }
-        if (!(this._weight in JSResourceFontDescriptor.descriptorsByFamily[this._family])){
-            JSResourceFontDescriptor.descriptorsByFamily[this._family][this._weight] = {};
-        }
-        if (!(this._style in JSResourceFontDescriptor.descriptorsByFamily[this._family][this._weight])){
-            JSResourceFontDescriptor.descriptorsByFamily[this._family][this._weight][this._style] = this;
-        }
-    },
-
-    descriptorWithWeight: function(weight){
-        return JSResourceFontDescriptor.descriptorWithFamily(this.family, weight, this.style) || this;
-    },
-
-    descriptorWithStyle: function(style){
-        return JSResourceFontDescriptor.descriptorWithFamily(this.family, this.weight, style) || this;
     },
 
     glyphForCharacter: function(character){
@@ -228,17 +236,87 @@ JSClass("JSResourceFontDescriptor", JSFontDescriptor, {
 
 });
 
-JSResourceFontDescriptor.descriptorWithFamily = function(family, weight, style){
-    var weights = JSResourceFontDescriptor.descriptorsByFamily[family] || {};
-    var styles = weights[weight] || {};
-    return styles[style];
+JSResourceFontDescriptor.descriptorsByName = {
 };
 
-JSResourceFontDescriptor.descriptorsByFamily = {
-};
+JSClass("JSURLFontDescriptor", JSFontDescriptor, {
 
-JSResourceFontDescriptor.descriptorsByName = {
-};
+    url: null,
+
+    initWithURL: function(url, family, weight, style){
+        this.url = url;
+        this._family = family;
+        this._weight = weight;
+        this._style = style;
+        this._postScriptName = "%s-%s".sprintf(family.replace(" ", ""), this.face.replce(" ", ""));
+        // this._ascender
+        // this._descender
+        // this._unitsPerEM
+    },
+
+    getData: function(completion, target){
+        if (!completion){
+            completion = Promise.completion(Promise.rejectNonNullSecondArgument);
+        }
+        var session = JSURLSession.shared;
+        var task = session.dataTaskWithURL(this.url, function(error){
+            if (error !== null){
+                completion.call(target, null, error);
+                return;
+            }
+            try{
+                task.response.assertSuccess();
+            }catch (e){
+                completion.call(target, null, e);
+                return;
+            }
+            completion.call(target, task.response.data, null);
+        });
+        task.resume();
+        return completion.promise;
+    },
+
+    face: JSLazyInitProperty(function(){
+        if (this.weight === JSFont.Weight.regular){
+            if (this.style === JSFont.Style.italic){
+                return "Italic";
+            }
+            return "Regular";
+        }
+        var name = "";
+        switch (this.weight){
+            case JSFont.Weight.ultraLight:
+                name = "UltraLight";
+                break;
+            case JSFont.Weight.thin:
+                name = "Thin";
+                break;
+            case JSFont.Weight.light:
+                name = "Light";
+                break;
+            case JSFont.Weight.medium:
+                name = "Medium";
+                break;
+            case JSFont.Weight.semibold:
+                name = "SemiBold";
+                break;
+            case JSFont.Weight.bold:
+                name = "Bold";
+                break;
+            case JSFont.Weight.heavy:
+                name = "Heavy";
+                break;
+            case JSFont.Weight.black:
+                name = "Black";
+                break;
+        }
+        if (this.style === JSFont.Style.italic){
+            name += " Italic";
+        }
+        return name;
+    }),
+
+});
 
 var CMap = function(format, data){
     if (this === undefined){

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

@@ -55,7 +55,12 @@ JSClass("JSTextAttachment", JSObject, {
     },
 
     drawInContextAtPoint: function(context, point){
-        context.drawImage(this._image, JSRect(point, this._size));
+        var rect = JSRect(point, this._size);
+        if (this._image.renderMode === JSImage.RenderMode.template){
+            context.fillMaskedRect(rect, this._image);
+        }else{
+            context.drawImage(this._image, rect);
+        }
     }
 
 });

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

@@ -61,7 +61,10 @@ JSClass("JSTextRun", JSObject, {
         // context.fillEllipseInRect(JSRect(this.origin.x - 2.5, this.origin.y - 2.5, 5, 5));
         // context.restore();
         if (this.attachment){
+            context.save();
+            context.setFillColor(this.attributes.textColor);
             this.attachment.drawInContextAtPoint(context, point);
+            context.restore();
         }else{
             context.save();
             context.translateBy(point.x, point.y + this.font.ascender);

package/Frameworks/Foundation.jsframework/JS/String+JS.js

@@ -359,6 +359,34 @@ Object.defineProperties(String.prototype, {
         }
     },
 
+    utf16be: {
+        configurable: true,
+        enumerable: false,
+        value: function String_utf16be(){
+            var utf16 = JSData.initWithLength(this.length * 2);
+            var dataView = utf16.dataView();
+            var j = 0;
+            for (var i = 0, l = this.length; i < l; ++i, j += 2){
+                dataView.setUint16(j, this.charCodeAt(i));
+            }
+            return utf16;
+        }
+    },
+
+    utf16le: {
+        configurable: true,
+        enumerable: false,
+        value: function String_utf16le(){
+            var utf16 = JSData.initWithLength(this.length * 2);
+            var dataView = utf16.dataView();
+            var j = 0;
+            for (var i = 0, l = this.length; i < l; ++i, j += 2){
+                dataView.setUint16(j, this.charCodeAt(i), true);
+            }
+            return utf16;
+        }
+    },
+
     latin1: {
         enumerable: false,
         value: function String_latin1(){
@@ -387,6 +415,12 @@ Object.defineProperties(String.prototype, {
             if (encoding == String.Encoding.latin1){
                 return this.latin1();
             }
+            if (encoding == String.Encoding.utf16be){
+                return this.utf16be();
+            }
+            if (encoding == String.Encoding.utf16le){
+                return this.utf16le();
+            }
             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": "2022.22.1",
+    "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+    "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
   },
   "Resources": [
     {

package/Frameworks/Foundation.jsframework/sources.json

@@ -48,19 +48,19 @@
       "JSXMLParser.js",
       "JSImage.js",
       "JSTextAttachment.js",
-      "JSAttributedString.js",
-      "JSSpec.js",
-      "JSArrayController.js",
-      "JSSparseArrayController.js",
-      "JSColorSpace.js",
-      "JSColor.js",
-      "JSGradient.js",
       "Huffman.js",
       "Deflate.js",
       "Adler32.js",
       "Zlib.js",
       "JSFontDescriptor.js",
       "JSFont.js",
+      "JSColorSpace.js",
+      "JSColor.js",
+      "JSAttributedString.js",
+      "JSSpec.js",
+      "JSArrayController.js",
+      "JSSparseArrayController.js",
+      "JSGradient.js",
       "JSPath.js",
       "JSContext.js",
       "JSDateFormatter.js",
@@ -122,6 +122,147 @@
       "setInterval",
       "ArrayBuffer",
       "Uint8Array"
+    ],
+    "globals": [
+      "JSCopy",
+      "JSDeepCopy",
+      "JSResolveDottedName",
+      "JSSetDottedName",
+      "JSSize",
+      "JSPoint",
+      "JSInsets",
+      "JSRect",
+      "JSAffineTransform",
+      "JSRange",
+      "JSConstraintBox",
+      "JSLineBreakMode",
+      "JSTextAlignment",
+      "UnicodeProperties",
+      "UnicodeChar",
+      "JSData",
+      "Promise",
+      "JSMath",
+      "JSCubicBezier",
+      "JSBinarySearcher",
+      "JSIndexRange",
+      "JSIndexSet",
+      "JSIndexPath",
+      "JSIndexPathRange",
+      "JSIndexPathSet",
+      "UUID",
+      "JSClass",
+      "JSCustomProperty",
+      "JSDynamicProperty",
+      "JSReadOnlyProperty",
+      "JSLazyInitProperty",
+      "JSOutlet",
+      "JSProtocol",
+      "JSIsNullValueTransformer",
+      "JSIsNotNullValueTransformer",
+      "JSIsEmptyValueTransformer",
+      "JSIsNotEmptyValueTransformer",
+      "JSNegateBooleanValueTransformer",
+      "JSCommaSeparatedListValueTransformer",
+      "JSObject",
+      "JSLog",
+      "JSObjectGraphLoading",
+      "JSObjectGraph",
+      "JSDate",
+      "JSTimeZone",
+      "JSTimeInterval",
+      "JSCalendar",
+      "JSGregorianCalendar",
+      "JSLocale",
+      "JSMediaType",
+      "JSFile",
+      "JSDataFile",
+      "JSBundle",
+      "JSBundleResourceFile",
+      "JSFormFieldMap",
+      "JSFormField",
+      "JSURL",
+      "JSMIMEHeaderMap",
+      "JSMIMEHeader",
+      "JSURLRequest",
+      "JSURLSession",
+      "JSURLResponse",
+      "JSURLResponseError",
+      "JSXMLParser",
+      "JSImage",
+      "_JSResourceImage",
+      "_JSDataImage",
+      "_JSURLImage",
+      "JSTextAttachment",
+      "HuffmanTree",
+      "DeflateStream",
+      "Deflate",
+      "Adler32",
+      "Zlib",
+      "ZlibStream",
+      "JSFontDescriptor",
+      "JSDataFontDescriptor",
+      "JSResourceFontDescriptor",
+      "JSURLFontDescriptor",
+      "JSTestFontDescriptor",
+      "JSFont",
+      "JSColorSpace",
+      "JSXYZColorSpace",
+      "JSXYZScaledColorSpace",
+      "JSLabColorSpace",
+      "JSRGBColorSpace",
+      "JSGrayColorSpace",
+      "JSDerivedColorSpace",
+      "JSMappedColorSpace",
+      "JSIndexedColorSpace",
+      "JSNamedColorSpace",
+      "JSColor",
+      "JSAttributedString",
+      "JSSpec",
+      "JSArrayController",
+      "JSSparseArrayController",
+      "JSGradient",
+      "JSPath",
+      "JSContext",
+      "JSDateFormatter",
+      "JSNumberFormatter",
+      "JSTextLayoutManager",
+      "JSTextRun",
+      "JSTextLine",
+      "JSTextTypesetter",
+      "JSTextFrame",
+      "JSTextFramesetter",
+      "JSTextContainer",
+      "JSTextLayoutManagerDelegate",
+      "JSTextStorage",
+      "JSTimer",
+      "JSRunLoop",
+      "JSIPAddress",
+      "JSURLSessionTask",
+      "JSURLSessionDataTask",
+      "JSURLSessionUploadTask",
+      "JSURLSessionStreamTask",
+      "JSURLSessionDelegate",
+      "JSURLSessionStreamTaskDelegate",
+      "JSHTTPResponseParserDelegate",
+      "JSHTTPResponseParser",
+      "JSHTTPWebSocketParser",
+      "JSHTTPWebSocketParserDelegate",
+      "JSNotification",
+      "JSNotificationCenter",
+      "JSFileManager",
+      "JSFileEnumerator",
+      "JSFileArrayFileEnumerator",
+      "JSUserDefaults",
+      "JSUndoManager",
+      "JSDistributedNotificationCenter",
+      "JSSynchronizer",
+      "JSCRC32",
+      "JSZip",
+      "JSIterativeHash",
+      "JSSHA1Hash",
+      "JSMD5Hash",
+      "JSArguments",
+      "JSEnvironment"
     ]
   },
   "html": {
@@ -156,6 +297,16 @@
       "FileReader",
       "URL.createObjectURL",
       "URL.revokeObjectURL"
+    ],
+    "globals": [
+      "JSHTMLHTTPClient",
+      "JSHTMLURLSessionDataTask",
+      "JSHTMLURLSessionUploadTask",
+      "JSHTMLURLSessionStreamTask",
+      "JSHTMLFileManager",
+      "JSHTMLFile",
+      "JSHTMLFileListFileEnumerator",
+      "JSHTMLFileSystemEntryFileEnumerator"
     ]
   },
   "node": {
@@ -175,6 +326,14 @@
       "JSAMQPNotificationCenter.js",
       "Foundation+Node.js"
     ],
-    "features": []
+    "features": [],
+    "globals": [
+      "JSNodeFileManager",
+      "JSNodeHTTPClient",
+      "JSNodeURLSessionDataTask",
+      "JSNodeURLSessionUploadTask",
+      "JSNodeURLSessionStreamTask",
+      "JSAMQPNotificationCenter"
+    ]
   }
 }

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2022.22.1",
+  "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+  "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
 }

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": "2022.22.1",
+    "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+    "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/SecurityKit.jsframework/sources.json

@@ -23,7 +23,40 @@
       "SECCBOR.js",
       "SecurityKit.js"
     ],
-    "features": []
+    "features": [],
+    "globals": [
+      "SECKey",
+      "SECDataKey",
+      "SECJSONWebAlgorithms",
+      "SECCipher",
+      "SECCipherAESCipherBlockChaining",
+      "SECCipherAESCounter",
+      "SECCipherAESGaloisCounterMode",
+      "SECCipherRC4",
+      "SECHash",
+      "SECVerify",
+      "SECKeychain",
+      "SECHMAC",
+      "SECSign",
+      "SECJSONWebToken",
+      "SECPassword",
+      "SECASN1Value",
+      "SECASN1Boolean",
+      "SECASN1Integer",
+      "SECASN1BitString",
+      "SECASN1OctetString",
+      "SECASN1ObjectIdentifier",
+      "SECASN1Sequence",
+      "SECASN1UTF8String",
+      "SECASN1Optional",
+      "SECASN1Unknown",
+      "SECASN1Parser",
+      "SECOneTimePassword",
+      "SECKeystore",
+      "SECDeviceAuthentication",
+      "SECCBOR",
+      "SECCBORParser"
+    ]
   },
   "html": {
     "frameworks": [],
@@ -42,6 +75,11 @@
     "features": [
       "window.crypto.subtle",
       "window.crypto.subtle"
+    ],
+    "globals": [
+      "SECHTMLKey",
+      "SECHTMLDeviceAuthentication",
+      "SECHTMLPasswordCredentialKeychain"
     ]
   },
   "node": {
@@ -56,6 +94,9 @@
       "SECPassword+Node.js",
       "SecurityKit+Node.js"
     ],
-    "features": []
+    "features": [],
+    "globals": [
+      "SECNodeKey"
+    ]
   }
 }

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2022.22.1",
+  "JSBundleVersion": "2022.23.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+  "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
 }

package/Node/Builder.js

@@ -174,20 +174,31 @@ JSClass("Builder", JSObject, {
                 if (!seen.has(name)){
                     seen.add(name);
                     // If the framework was pre-built, then it can only have
-                    // dependencies on standard frameworks, so that's the only
-                    // place we'll look.
-                    //
+                    // dependencies on other pre-built frameworks, which
+                    // are other .jsframework bundles or JSKit frameworks
+                    // 
                     // If we built the framework, then we already added its
                     // dependencies based on its build reuslts and won't get here.
-                    let candidateURL = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
-                    let exists = await this.fileManager.itemExistsAtURL(candidateURL);
-                    if (!exists){
-                        throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
+                    let includeDirectoryURLs = this.project.includeDirectoryURLs;
+                    let url = null;
+                    for (let i = 0, l = includeDirectoryURLs.length; i < l && url === null; ++i){
+                        let directoryURL = includeDirectoryURLs[i];
+                        let candidateURL = directoryURL.appendingPathComponent(name + '.jsframework', true);
+                        let found = await this.fileManager.itemExistsAtURL(candidateURL);
+                        if (found){
+                            url = candidateURL;
+                        }
+                    }
+                    if (url === null){
+                        url = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
+                        let found = await this.fileManager.itemExistsAtURL(url);
+                        if (!found){
+                            throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
+                        }
                     }
-                    this.printer.print("\nAdding dependency %s\n".sprintf(name));
                     imports.push({
                         name: name,
-                        url: candidateURL
+                        url: url
                     });
                 }
             }