@breakside/jskit 2022.22.1 → 2022.23.0

package/Node/FrameworkBuilder.js

@@ -138,9 +138,10 @@ JSClass("FrameworkBuilder", Builder, {
         var genericFrameworks = new Set();
         var genericFiles = new Set();
         var genericFeatures = new Set();
+        var genericGlobals = new Set();
         var sources = {};
         for (let env in this.bundleEnvironments){
-            sources[env] = {frameworks: [], files: [], features: []};
+            sources[env] = {frameworks: [], files: [], features: [], globals: []};
             let imports = this.importsByEnvironment[env];
             for (let i = 0, l = imports.frameworks.length; i < l; ++i){
                 let framework = imports.frameworks[i];
@@ -176,6 +177,15 @@ JSClass("FrameworkBuilder", Builder, {
                     sources[env].features.push(feature);
                 }
             }
+            for (let i = 0, l = imports.globals.length; i < l; ++i){
+                let name = imports.globals[i];
+                if (env == 'generic'){
+                    genericGlobals.add(name);
+                }
+                if (env == 'generic' || !genericGlobals.has(name)){
+                    sources[env].globals.push(name);
+                }
+            }
         }
         return sources;
     },
@@ -185,6 +195,7 @@ JSClass("FrameworkBuilder", Builder, {
         var genericFrameworks = new Set();
         var genericFiles = new Set();
         var genericFeatures = new Set();
+        var genericGlobals = new Set();
         var sources = {};
         var copyright  = this.project.getInfoString("JSCopyright", this.resources);
         var licenseString = await this.project.licenseNoticeString();
@@ -195,7 +206,7 @@ JSClass("FrameworkBuilder", Builder, {
         }
         var header = "%s (%s)\n----\n%s%s".sprintf(this.project.info.JSBundleIdentifier, this.project.info.JSBundleVersion, copyright, licenseString);
         for (let env in this.bundleEnvironments){
-            sources[env] = {frameworks: [], files: [], features: []};
+            sources[env] = {frameworks: [], files: [], features: [], globals: []};
             let filename = this.bundleEnvironments[env];
             let compilation = JavascriptCompilation.initWithName(filename, this.sourcesURL, this.fileManager);
             var fullSourcesURL = this.sourcesURL.appendingPathComponent("_debug", true);
@@ -238,6 +249,15 @@ JSClass("FrameworkBuilder", Builder, {
                     sources[env].features.push(feature);
                 }
             }
+            for (let i = 0, l = imports.globals.length; i < l; ++i){
+                let name = imports.globals[i];
+                if (env == 'generic'){
+                    genericGlobals.add(name);
+                }
+                if (env == 'generic' || !genericGlobals.has(name)){
+                    sources[env].globals.push(name);
+                }
+            }
         }
         return sources;
     },

package/Node/Project.js

@@ -310,7 +310,8 @@ JSClass("Project", JSObject, {
         var result = {
             files: [],
             frameworks: [],
-            features: []
+            features: [],
+            globals: []
         };
         var visited = {
             paths: new Set(),
@@ -359,6 +360,11 @@ JSClass("Project", JSObject, {
                         result.features.push(feature);
                     }
                 }
+                let globals = js.globals();
+                for (let i = 0, l = globals.length; i < l; ++i){
+                    let name = globals[i];
+                    result.globals.push(name);
+                }
             }
         };
 
@@ -443,7 +449,21 @@ JSClass("Project", JSObject, {
                 let url = await this.urlForFrameworkName(name, includeDirectoryURLs);
                 if (url !== null){
                     if (url.fileExtension === '.jsframework'){
-                        // TODO: extract from built framework
+                        let sourcesURL = url.appendingPathComponent("sources.json");
+                        let data = await this.fileManager.contentsAtURL(sourcesURL);
+                        let sources = JSON.parse(data.stringByDecodingUTF8());
+                        if (sources.generic.globals){
+                            for (let name of sources.generic.globals){
+                                globals.push(name);
+                            }
+                        }
+                        for (let env of envs){
+                            if ((env in sources) && sources[env].globals){
+                                for (let name of sources[env].globals){
+                                    globals.push(name);
+                                }
+                            }
+                        }
                     }else{
                         let frameworkProject = Project.initWithURL(url);
                         try{

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

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "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"
   },
   "Resources": [
     {

package/Node/jskit

@@ -49,19 +49,19 @@ require("./../Frameworks/Foundation.jsframework/JS/JSURLResponse.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSXMLParser.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSImage.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSTextAttachment.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSAttributedString.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSSpec.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSArrayController.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSSparseArrayController.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSColorSpace.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSColor.js");
-require("./../Frameworks/Foundation.jsframework/JS/JSGradient.js");
 require("./../Frameworks/Foundation.jsframework/JS/Huffman.js");
 require("./../Frameworks/Foundation.jsframework/JS/Deflate.js");
 require("./../Frameworks/Foundation.jsframework/JS/Adler32.js");
 require("./../Frameworks/Foundation.jsframework/JS/Zlib.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSFontDescriptor.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSFont.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSColorSpace.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSColor.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSAttributedString.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSSpec.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSArrayController.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSSparseArrayController.js");
+require("./../Frameworks/Foundation.jsframework/JS/JSGradient.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSPath.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSContext.js");
 require("./../Frameworks/Foundation.jsframework/JS/JSDateFormatter.js");

package/Root/Frameworks/APIKit/Info.yaml

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

package/Root/Frameworks/DOM/XMLSerializer.js

@@ -113,10 +113,15 @@ XMLSerializer.prototype = {
                     str += " " + node.name;
                 }
                 if (node.publicId.length > 0){
-                    str += " " + node.publicId;
-                }
-                if (node.systemId.length > 0){
-                    str += " " + node.systemId;
+                    value = node.publicId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                    str += ' PUBLIC "%s"'.sprintf(value);
+                    if (node.systemId.length > 0){
+                        value = node.systemId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                        str += ' "%s"'.sprintf(value);
+                    }
+                }else if (node.systemId.length > 0){
+                    value = node.systemId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                    str += ' SYSTEM "%s"'.sprintf(value);
                 }
                 str += ">\n";
             }

package/Root/Frameworks/Dispatch/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.Dispatch
-JSBundleVersion: 2022.22.1
+JSBundleVersion: 2022.23.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: 2022.22.1
+JSBundleVersion: 2022.23.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: 2022.22.1
+JSBundleVersion: 2022.23.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Foundation/JSAttributedString.js

@@ -16,6 +16,8 @@
 // #import "Javascript.js"
 // #import "JSObject.js"
 // #import "JSTextAttachment.js"
+// #import "JSFont.js"
+// #import "JSColor.js"
 'use strict';
 
 (function(){
@@ -40,6 +42,123 @@ JSClass("JSAttributedString", JSObject, {
         this._runs = [run];
     },
 
+    initFromDictionary: function(dictionary){
+        this._string = typeof(dictionary.string) === "string" ? dictionary.string : "";
+        this._runs = [];
+        var i, l;
+        var runDictionary;
+        var run;
+        var attributes;
+        var name;
+        var location = 0;
+        var length;
+        var maxLength = this._string.length;
+        var decodeAttribute = function(name, value){
+            switch (name){
+                case JSAttributedString.Attribute.font:
+                    return JSAttributedString.AttributeDecoder.font(value);
+                case JSAttributedString.Attribute.textColor:
+                case JSAttributedString.Attribute.backgroundColor:
+                    return JSAttributedString.AttributeDecoder.color(value);
+                case JSAttributedString.Attribute.link:
+                    return JSAttributedString.AttributeDecoder.url(value);
+                case JSAttributedString.Attribute.cursor:
+                    return JSAttributedString.AttributeDecoder.skip(value);
+                case JSAttributedString.Attribute.attachment:
+                    // TODO:
+                    return JSAttributedString.AttributeDecoder.skip(value);
+                case JSAttributedString.Attribute.maskCharacter:
+                    return JSAttributedString.AttributeDecoder.string(value);
+                case JSAttributedString.Attribute.bold:
+                case JSAttributedString.Attribute.italic:
+                case JSAttributedString.Attribute.underline:
+                case JSAttributedString.Attribute.strike:
+                    return JSAttributedString.AttributeDecoder.boolean(value);
+                case JSAttributedString.Attribute.lineHeight:
+                case JSAttributedString.Attribute.lineSpacing:
+                    return JSAttributedString.AttributeDecoder.number(value);
+                case JSAttributedString.Attribute.textAlignment:
+                    // TODO: validate
+                case JSAttributedString.Attribute.lineBreakMode:
+                    // TODO: validate
+                default:
+                    return value;
+            }
+            
+        };
+        if (dictionary.runs instanceof Array){
+            for (i = 0, l = dictionary.runs.length; i < l && maxLength > 0; ++i){
+                runDictionary = dictionary.runs[i];
+                attributes = {};
+                length = typeof(runDictionary.length) === "number" ? Math.min(maxLength, Math.floor(runDictionary.length)) : 0;
+                if (length > 0 && typeof(runDictionary.attributes) === "object"){
+                    for (name in runDictionary.attributes){
+                        attributes[name] = decodeAttribute(name, runDictionary.attributes[name]);
+                    }
+                    this._runs.push(JSAttributedStringRun(JSRange(location, length), attributes));
+                }
+                location += length;
+                maxLength -= length;
+            }
+        }
+        if (maxLength > 0){
+            this._runs.push(JSAttributedStringRun(JSRange(location, maxLength), {}));
+        }
+        if (this._runs.length === 0){
+            this._runs.push(JSAttributedStringRun(JSRange(0, 0), {}));
+        }
+    },
+
+    dictionaryRepresentation: function(){
+        var dictionary = {
+            string: this._string,
+            runs: []
+        };
+        var i, l;
+        var run;
+        var name;
+        var runDictionary;
+        var encodeAttribute = function(name, value){
+            switch (name){
+                case JSAttributedString.Attribute.font:
+                    return JSAttributedString.AttributeEncoder.font(value);
+                case JSAttributedString.Attribute.textColor:
+                case JSAttributedString.Attribute.backgroundColor:
+                    return JSAttributedString.AttributeEncoder.color(value);
+                case JSAttributedString.Attribute.link:
+                    return JSAttributedString.AttributeEncoder.url(value);
+                case JSAttributedString.Attribute.cursor:
+                    return JSAttributedString.Attribute.Encoder.skip(value);
+                case JSAttributedString.Attribute.attachment:
+                    // TODO:
+                    return JSAttributedString.Attribute.Encoder.skip(value);
+                case JSAttributedString.Attribute.bold:
+                case JSAttributedString.Attribute.italic:
+                case JSAttributedString.Attribute.underline:
+                case JSAttributedString.Attribute.strike:
+                case JSAttributedString.Attribute.lineHeight:
+                case JSAttributedString.Attribute.lineSpacing:
+                case JSAttributedString.Attribute.textAlignment:
+                case JSAttributedString.Attribute.lineBreakMode:
+                case JSAttributedString.Attribute.maskCharacter:
+                default:
+                    return value;
+            }
+        };
+        for (i = 0, l = this._runs.length; i < l; ++i){
+            run = this._runs[i];
+            runDictionary = {
+                length: run.range.length,
+                attributes: {}
+            };
+            for (name in run.attributes){
+                runDictionary.attributes[name] = encodeAttribute(name, run.attributes[name]);
+            }
+            dictionary.runs.push(runDictionary);
+        }
+        return dictionary;
+    },
+
     initWithAttributedString: function(attributedString, defaultAttributes){
         this._string = attributedString.string;
         this._runs = [];
@@ -294,6 +413,44 @@ JSClass("JSAttributedString", JSObject, {
         return new JSAttributedStringRunIterator(this, index);
     },
 
+    longestRangeOfAttributeAtIndex: function(attributeName, index){
+        return this.longestRangeOfAttributesAtIndex([attributeName], index);
+    },
+
+    longestRangeOfAttributesAtIndex: function(attributeNames, index){
+        var runIndex = this._runIndexForStringIndex(index);
+        var run = this._runs[runIndex];
+        var range = JSRange(run.range);
+        var attributes = {};
+        var i, l;
+        for (i = 0, l = attributeNames.length; i < l; ++i){
+            attributes[attributeNames[i]] = run.attributes[attributeNames[i]];
+        }
+        i = runIndex - 1;
+        while (i >= 0){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = range.end - run.range.location;
+                range.location = run.range.location;
+            }else{
+                break;
+            }
+            --i;
+        }
+        i = runIndex + 1;
+        l = this._runs.length;
+        while (i < l){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = run.range.end - range.location;
+            }else{
+                break;
+            }
+            ++i;
+        }
+        return range;
+    },
+
     // MARK: - Formatting
 
     replaceFormat: function(){
@@ -339,7 +496,7 @@ JSClass("JSAttributedString", JSObject, {
         var runA;
         for (var runIndex = lastRunIndex - 1; runIndex >= expandedRunRange.location; --runIndex){
             runA = this._runs[runIndex];
-            if (runA.hasIdenticalAttributes(runB)){
+            if (runA.onlyContainsEqualAttributes(runB.attributes)){
                 this._runs.splice(runIndex, 1);
                 runB.range.location = runA.range.location;
                 runB.range.length += runA.range.length;
@@ -358,7 +515,7 @@ JSClass("JSAttributedString", JSObject, {
         }
         var runA = this._runs[runIndex - 1];
         var runB = this._runs[runIndex];
-        if (runA.hasIdenticalAttributes(runB)){
+        if (runA.onlyContainsEqualAttributes(runB.attributes)){
             this._runs.splice(runIndex, 1);
             runA.range.length += runB.range.length;
         }
@@ -443,6 +600,31 @@ JSAttributedString.Attribute = {
     link: "link"
 };
 
+JSAttributedString.AttributeEncoder = {
+    skip: function(value){ return undefined; },
+    identity: function(value){ return value; },
+    dataBase64: function(value){ return value.base64StringRepresentation(); },
+    dataBase64URL: function(value){ return value.base64URLStringRepresentation(); },
+    dataHex: function(value){ return value.hexStringRepresentation(); },
+    url: function(value){ return value.encodedString; },
+    font: function(value){ return value.dictionaryRepresentation(); },
+    color: function(value){ return value.dictionaryRepresentation(); },
+};
+
+JSAttributedString.AttributeDecoder = {
+    skip: function(value){ return undefined; },
+    identity: function(value){ return value; },
+    dataBase64: function(value){ return value.dataByDecodingBase64(); },
+    dataBase64URL: function(value){ return value.dataByDecodingBase64URL(); },
+    dataHex: function(value){ return value.dataByDecodingHex(); },
+    url: function(value){ return JSURL.initWithString(value); },
+    font: function(value){ return JSFont.initFromDictionary(value); },
+    color: function(value){ return JSColor.initFromDictionary(value); },
+    boolean: function(value){ return typeof(value) === "boolean" ? value : undefined; },
+    number: function(value){ return typeof(value) === "number" ? value : undefined; },
+    string: function(value){ return typeof(value) === "string" ? value : undefined; },
+};
+
 JSAttributedString.SpecialCharacter = {
     attachment: 0xFFFC,
     attachmentUTF16: "\uFFFC"
@@ -471,35 +653,46 @@ function JSAttributedStringRun(range, attributes){
 
 JSAttributedStringRun.prototype = {
 
-    hasIdenticalAttributes: function(other){
+    containsEqualAttributes: function(attributes){
         var attribute;
         var a, b;
-        for (attribute in this.attributes){
-            if (attribute in other.attributes){
-                a = this.attributes[attribute];
-                b = other.attributes[attribute];
-                if (a.isEqual){
-                    if (!a.isEqual(b)){
-                        return false;
-                    }
-                }else if (b.isEqual){
-                    if (!b.isEqual(a)){
-                        return false;
-                    }
-                }else if (a != b){
+        for (attribute in attributes){
+            a = attributes[attribute];
+            b = this.attributes[attribute];
+            if (a === undefined){
+                if (!!b){
                     return false;
                 }
-            }else{
+            }else if (a === null){
+                if (b !== null && b !== undefined){
+                    return false;
+                }
+            }else if (a.isEqual){
+                if (b === null || b === undefined){
+                    return false;
+                }
+                if (!a.isEqual(b)){
+                    return false;
+                }
+            }else if (a != b){
                 return false;
             }
         }
-        for (attribute in other.attributes){
-            if (!(attribute in this.attributes)){
+        return true;
+    },
+
+    onlyContainsEqualAttributes: function(attributes){
+        if (!this.containsEqualAttributes(attributes)){
+            return false;
+        }
+        var attribute;
+        for (attribute in this.attributes){
+            if (!(attribute in attributes)){
                 return false;
             }
         }
         return true;
-    }
+    },
 
 };