@breakside/jskit 2022.22.2 → 2022.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/Frameworks/DOM.jsframework/Info.json +2 -2
  2. package/Frameworks/DOM.jsframework/JS/XMLSerializer.js +9 -4
  3. package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js +2 -2
  4. package/Frameworks/DOM.jsframework/sources.json +10 -3
  5. package/Frameworks/FontKit.jsframework/Info.json +2 -2
  6. package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js +2 -2
  7. package/Frameworks/FontKit.jsframework/sources.json +34 -2
  8. package/Frameworks/Foundation.jsframework/Info.json +2 -2
  9. package/Frameworks/Foundation.jsframework/JS/JSAttributedString.js +347 -25
  10. package/Frameworks/Foundation.jsframework/JS/JSFont.js +39 -15
  11. package/Frameworks/Foundation.jsframework/JS/JSFontDescriptor+HTML.js +8 -0
  12. package/Frameworks/Foundation.jsframework/JS/JSFontDescriptor.js +105 -27
  13. package/Frameworks/Foundation.jsframework/JS/JSParagraphStyle.js +71 -0
  14. package/Frameworks/Foundation.jsframework/JS/JSTextAttachment.js +1 -1
  15. package/Frameworks/Foundation.jsframework/JS/JSTextContainer.js +56 -29
  16. package/Frameworks/Foundation.jsframework/JS/JSTextFrame.js +2 -32
  17. package/Frameworks/Foundation.jsframework/JS/JSTextFramesetter.js +125 -22
  18. package/Frameworks/Foundation.jsframework/JS/JSTextLayoutManager.js +11 -3
  19. package/Frameworks/Foundation.jsframework/JS/JSTextLine.js +4 -3
  20. package/Frameworks/Foundation.jsframework/JS/JSTextRun.js +5 -3
  21. package/Frameworks/Foundation.jsframework/JS/JSTextTypesetter.js +41 -25
  22. package/Frameworks/Foundation.jsframework/JS/String+JS.js +69 -0
  23. package/Frameworks/Foundation.jsframework/JS/UnicodeChar.js +8 -0
  24. package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js +2 -2
  25. package/Frameworks/Foundation.jsframework/sources.json +170 -8
  26. package/Frameworks/SecurityKit.jsframework/Info.json +2 -2
  27. package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js +2 -2
  28. package/Frameworks/SecurityKit.jsframework/sources.json +43 -2
  29. package/Info.json +2 -2
  30. package/Node/Builder.js +20 -9
  31. package/Node/FrameworkBuilder.js +22 -2
  32. package/Node/Project.js +22 -2
  33. package/Node/io.breakside.jskit-bundle.js +2 -2
  34. package/Node/jskit +8 -7
  35. package/Root/Frameworks/APIKit/Info.yaml +1 -1
  36. package/Root/Frameworks/APIKitTesting/Info.yaml +1 -1
  37. package/Root/Frameworks/AuthKit/Info.yaml +1 -1
  38. package/Root/Frameworks/CSSOM/Info.yaml +1 -1
  39. package/Root/Frameworks/ChartKit/CHAxis.js +5 -5
  40. package/Root/Frameworks/ChartKit/CHPieChart.js +1 -1
  41. package/Root/Frameworks/ChartKit/Info.yaml +1 -1
  42. package/Root/Frameworks/ConferenceKit/Info.yaml +1 -1
  43. package/Root/Frameworks/DBKit/Info.yaml +1 -1
  44. package/Root/Frameworks/DOM/Info.yaml +1 -1
  45. package/Root/Frameworks/DOM/XMLSerializer.js +9 -4
  46. package/Root/Frameworks/Dispatch/Info.yaml +1 -1
  47. package/Root/Frameworks/FontKit/Info.yaml +1 -1
  48. package/Root/Frameworks/Foundation/Info.yaml +1 -1
  49. package/Root/Frameworks/Foundation/JSAttributedString.js +347 -25
  50. package/Root/Frameworks/Foundation/JSFont.js +39 -15
  51. package/Root/Frameworks/Foundation/JSFontDescriptor+HTML.js +8 -0
  52. package/Root/Frameworks/Foundation/JSFontDescriptor.js +105 -27
  53. package/Root/Frameworks/Foundation/JSParagraphStyle.js +71 -0
  54. package/Root/Frameworks/Foundation/JSTextAttachment.js +1 -1
  55. package/Root/Frameworks/Foundation/JSTextContainer.js +56 -29
  56. package/Root/Frameworks/Foundation/JSTextFrame.js +2 -32
  57. package/Root/Frameworks/Foundation/JSTextFramesetter.js +125 -22
  58. package/Root/Frameworks/Foundation/JSTextLayoutManager.js +11 -3
  59. package/Root/Frameworks/Foundation/JSTextLine.js +4 -3
  60. package/Root/Frameworks/Foundation/JSTextRun.js +5 -3
  61. package/Root/Frameworks/Foundation/JSTextTypesetter.js +41 -25
  62. package/Root/Frameworks/Foundation/String+JS.js +69 -0
  63. package/Root/Frameworks/Foundation/UnicodeChar.js +8 -0
  64. package/Root/Frameworks/ImageKit/Info.yaml +1 -1
  65. package/Root/Frameworks/MediaKit/Info.yaml +1 -1
  66. package/Root/Frameworks/MediaKitUI/Info.yaml +1 -1
  67. package/Root/Frameworks/NotificationKit/Info.yaml +1 -1
  68. package/Root/Frameworks/PDFKit/Info.yaml +1 -1
  69. package/Root/Frameworks/QRKit/Info.yaml +1 -1
  70. package/Root/Frameworks/SearchKit/Info.yaml +1 -1
  71. package/Root/Frameworks/SecurityKit/Info.yaml +1 -1
  72. package/Root/Frameworks/ServerKit/Info.yaml +1 -1
  73. package/Root/Frameworks/ServerKitTesting/Info.yaml +1 -1
  74. package/Root/Frameworks/TestKit/Info.yaml +1 -1
  75. package/Root/Frameworks/UIKit/Info.yaml +1 -1
  76. package/Root/Frameworks/UIKit/UIHTMLContentEditableTextInputManager.js +36 -0
  77. package/Root/Frameworks/UIKit/UIHTMLDisplayServer.js +1 -1
  78. package/Root/Frameworks/UIKit/UIHTMLTextField.js +1 -1
  79. package/Root/Frameworks/UIKit/UIHTMLTextFrame.js +19 -91
  80. package/Root/Frameworks/UIKit/UIHTMLTextFramesetter.js +52 -9
  81. package/Root/Frameworks/UIKit/UIHTMLTextLine.js +95 -30
  82. package/Root/Frameworks/UIKit/UIHTMLTextRun.js +22 -9
  83. package/Root/Frameworks/UIKit/UIHTMLTextTypesetter.js +334 -459
  84. package/Root/Frameworks/UIKit/UIHTMLWindowServer.js +16 -0
  85. package/Root/Frameworks/UIKit/UILabel.js +43 -10
  86. package/Root/Frameworks/UIKit/UIScrollView.js +12 -0
  87. package/Root/Frameworks/UIKit/UISegmentedControl.js +6 -6
  88. package/Root/Frameworks/UIKit/UITextAttachmentView.js +1 -1
  89. package/Root/Frameworks/UIKit/UITextEditor.js +210 -25
  90. package/Root/Frameworks/UIKit/UITextField.js +58 -31
  91. package/Root/Frameworks/UIKit/UITextInput.js +3 -1
  92. package/Root/Frameworks/UIKit/UITextInputManager.js +2 -2
  93. package/Root/Frameworks/UIKit/UITextLayer.js +39 -26
  94. package/Root/Frameworks/UIKit/UITokenField.js +4 -4
  95. package/Root/Frameworks/UIKit/UIView.js +3 -1
  96. package/Root/Frameworks/UIKit/UIWindow.js +16 -3
  97. package/Root/Frameworks/UIKitTesting/Info.yaml +1 -1
  98. package/package.json +1 -1
@@ -48,23 +48,24 @@
48
48
  "JSXMLParser.js",
49
49
  "JSImage.js",
50
50
  "JSTextAttachment.js",
51
- "JSAttributedString.js",
52
- "JSSpec.js",
53
- "JSArrayController.js",
54
- "JSSparseArrayController.js",
55
- "JSColorSpace.js",
56
- "JSColor.js",
57
- "JSGradient.js",
58
51
  "Huffman.js",
59
52
  "Deflate.js",
60
53
  "Adler32.js",
61
54
  "Zlib.js",
62
55
  "JSFontDescriptor.js",
63
56
  "JSFont.js",
57
+ "JSColorSpace.js",
58
+ "JSColor.js",
59
+ "JSAttributedString.js",
60
+ "JSSpec.js",
61
+ "JSArrayController.js",
62
+ "JSSparseArrayController.js",
63
+ "JSGradient.js",
64
64
  "JSPath.js",
65
65
  "JSContext.js",
66
66
  "JSDateFormatter.js",
67
67
  "JSNumberFormatter.js",
68
+ "JSParagraphStyle.js",
68
69
  "JSTextLayoutManager.js",
69
70
  "JSTextRun.js",
70
71
  "JSTextLine.js",
@@ -122,6 +123,149 @@
122
123
  "setInterval",
123
124
  "ArrayBuffer",
124
125
  "Uint8Array"
126
+ ],
127
+ "globals": [
128
+ "JSCopy",
129
+ "JSDeepCopy",
130
+ "JSResolveDottedName",
131
+ "JSSetDottedName",
132
+ "JSSize",
133
+ "JSPoint",
134
+ "JSInsets",
135
+ "JSRect",
136
+ "JSAffineTransform",
137
+ "JSRange",
138
+ "JSConstraintBox",
139
+ "JSLineBreakMode",
140
+ "JSTextAlignment",
141
+ "UnicodeProperties",
142
+ "UnicodeChar",
143
+ "JSData",
144
+ "Promise",
145
+ "JSMath",
146
+ "JSCubicBezier",
147
+ "JSBinarySearcher",
148
+ "JSIndexRange",
149
+ "JSIndexSet",
150
+ "JSIndexPath",
151
+ "JSIndexPathRange",
152
+ "JSIndexPathSet",
153
+ "UUID",
154
+ "JSClass",
155
+ "JSCustomProperty",
156
+ "JSDynamicProperty",
157
+ "JSReadOnlyProperty",
158
+ "JSLazyInitProperty",
159
+ "JSOutlet",
160
+ "JSProtocol",
161
+ "JSIsNullValueTransformer",
162
+ "JSIsNotNullValueTransformer",
163
+ "JSIsEmptyValueTransformer",
164
+ "JSIsNotEmptyValueTransformer",
165
+ "JSNegateBooleanValueTransformer",
166
+ "JSCommaSeparatedListValueTransformer",
167
+ "JSObject",
168
+ "JSLog",
169
+ "JSObjectGraphLoading",
170
+ "JSObjectGraph",
171
+ "JSDate",
172
+ "JSTimeZone",
173
+ "JSTimeInterval",
174
+ "JSCalendar",
175
+ "JSGregorianCalendar",
176
+ "JSLocale",
177
+ "JSMediaType",
178
+ "JSFile",
179
+ "JSDataFile",
180
+ "JSBundle",
181
+ "JSBundleResourceFile",
182
+ "JSFormFieldMap",
183
+ "JSFormField",
184
+ "JSURL",
185
+ "JSMIMEHeaderMap",
186
+ "JSMIMEHeader",
187
+ "JSURLRequest",
188
+ "JSURLSession",
189
+ "JSURLResponse",
190
+ "JSURLResponseError",
191
+ "JSXMLParser",
192
+ "JSImage",
193
+ "_JSResourceImage",
194
+ "_JSDataImage",
195
+ "_JSURLImage",
196
+ "JSTextAttachment",
197
+ "HuffmanTree",
198
+ "DeflateStream",
199
+ "Deflate",
200
+ "Adler32",
201
+ "Zlib",
202
+ "ZlibStream",
203
+ "JSFontDescriptor",
204
+ "JSDataFontDescriptor",
205
+ "JSResourceFontDescriptor",
206
+ "JSURLFontDescriptor",
207
+ "JSTestFontDescriptor",
208
+ "JSFont",
209
+ "JSColorSpace",
210
+ "JSXYZColorSpace",
211
+ "JSXYZScaledColorSpace",
212
+ "JSLabColorSpace",
213
+ "JSRGBColorSpace",
214
+ "JSGrayColorSpace",
215
+ "JSDerivedColorSpace",
216
+ "JSMappedColorSpace",
217
+ "JSIndexedColorSpace",
218
+ "JSNamedColorSpace",
219
+ "JSColor",
220
+ "JSAttributedString",
221
+ "JSSpec",
222
+ "JSArrayController",
223
+ "JSSparseArrayController",
224
+ "JSGradient",
225
+ "JSPath",
226
+ "JSContext",
227
+ "JSDateFormatter",
228
+ "JSNumberFormatter",
229
+ "JSParagraphStyle",
230
+ "JSTextLayoutManager",
231
+ "JSTextRun",
232
+ "JSTextLine",
233
+ "JSTextTypesetterDelegate",
234
+ "JSTextTypesetter",
235
+ "JSTextFrame",
236
+ "JSTextFramesetter",
237
+ "JSTextContainer",
238
+ "JSTextLayoutManagerDelegate",
239
+ "JSTextStorage",
240
+ "JSTimer",
241
+ "JSRunLoop",
242
+ "JSIPAddress",
243
+ "JSURLSessionTask",
244
+ "JSURLSessionDataTask",
245
+ "JSURLSessionUploadTask",
246
+ "JSURLSessionStreamTask",
247
+ "JSURLSessionDelegate",
248
+ "JSURLSessionStreamTaskDelegate",
249
+ "JSHTTPResponseParserDelegate",
250
+ "JSHTTPResponseParser",
251
+ "JSHTTPWebSocketParser",
252
+ "JSHTTPWebSocketParserDelegate",
253
+ "JSNotification",
254
+ "JSNotificationCenter",
255
+ "JSFileManager",
256
+ "JSFileEnumerator",
257
+ "JSFileArrayFileEnumerator",
258
+ "JSUserDefaults",
259
+ "JSUndoManager",
260
+ "JSDistributedNotificationCenter",
261
+ "JSSynchronizer",
262
+ "JSCRC32",
263
+ "JSZip",
264
+ "JSIterativeHash",
265
+ "JSSHA1Hash",
266
+ "JSMD5Hash",
267
+ "JSArguments",
268
+ "JSEnvironment"
125
269
  ]
126
270
  },
127
271
  "html": {
@@ -156,6 +300,16 @@
156
300
  "FileReader",
157
301
  "URL.createObjectURL",
158
302
  "URL.revokeObjectURL"
303
+ ],
304
+ "globals": [
305
+ "JSHTMLHTTPClient",
306
+ "JSHTMLURLSessionDataTask",
307
+ "JSHTMLURLSessionUploadTask",
308
+ "JSHTMLURLSessionStreamTask",
309
+ "JSHTMLFileManager",
310
+ "JSHTMLFile",
311
+ "JSHTMLFileListFileEnumerator",
312
+ "JSHTMLFileSystemEntryFileEnumerator"
159
313
  ]
160
314
  },
161
315
  "node": {
@@ -175,6 +329,14 @@
175
329
  "JSAMQPNotificationCenter.js",
176
330
  "Foundation+Node.js"
177
331
  ],
178
- "features": []
332
+ "features": [],
333
+ "globals": [
334
+ "JSNodeFileManager",
335
+ "JSNodeHTTPClient",
336
+ "JSNodeURLSessionDataTask",
337
+ "JSNodeURLSessionUploadTask",
338
+ "JSNodeURLSessionStreamTask",
339
+ "JSAMQPNotificationCenter"
340
+ ]
179
341
  }
180
342
  }
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "JSBundleType": "framework",
3
3
  "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
4
- "JSBundleVersion": "2022.22.2",
4
+ "JSBundleVersion": "2022.24.0",
5
5
  "JSDevelopmentLanguage": "en",
6
6
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
7
7
  "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
9
9
  "node": "SecurityKit+Node.js"
10
10
  },
11
11
  "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",
12
- "GitRevision": "a302ede5223899a33db877d1cba370054efd6902"
12
+ "GitRevision": "384e6ac71d317262e4518508066ab61322409ba2"
13
13
  }
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
3
3
  "Info": {
4
4
  "JSBundleType": "framework",
5
5
  "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
6
- "JSBundleVersion": "2022.22.2",
6
+ "JSBundleVersion": "2022.24.0",
7
7
  "JSDevelopmentLanguage": "en",
8
8
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
9
9
  "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
11
11
  "node": "SecurityKit+Node.js"
12
12
  },
13
13
  "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",
14
- "GitRevision": "a302ede5223899a33db877d1cba370054efd6902"
14
+ "GitRevision": "384e6ac71d317262e4518508066ab61322409ba2"
15
15
  },
16
16
  "Resources": [],
17
17
  "ResourceLookup": {
@@ -23,7 +23,40 @@
23
23
  "SECCBOR.js",
24
24
  "SecurityKit.js"
25
25
  ],
26
- "features": []
26
+ "features": [],
27
+ "globals": [
28
+ "SECKey",
29
+ "SECDataKey",
30
+ "SECJSONWebAlgorithms",
31
+ "SECCipher",
32
+ "SECCipherAESCipherBlockChaining",
33
+ "SECCipherAESCounter",
34
+ "SECCipherAESGaloisCounterMode",
35
+ "SECCipherRC4",
36
+ "SECHash",
37
+ "SECVerify",
38
+ "SECKeychain",
39
+ "SECHMAC",
40
+ "SECSign",
41
+ "SECJSONWebToken",
42
+ "SECPassword",
43
+ "SECASN1Value",
44
+ "SECASN1Boolean",
45
+ "SECASN1Integer",
46
+ "SECASN1BitString",
47
+ "SECASN1OctetString",
48
+ "SECASN1ObjectIdentifier",
49
+ "SECASN1Sequence",
50
+ "SECASN1UTF8String",
51
+ "SECASN1Optional",
52
+ "SECASN1Unknown",
53
+ "SECASN1Parser",
54
+ "SECOneTimePassword",
55
+ "SECKeystore",
56
+ "SECDeviceAuthentication",
57
+ "SECCBOR",
58
+ "SECCBORParser"
59
+ ]
27
60
  },
28
61
  "html": {
29
62
  "frameworks": [],
@@ -42,6 +75,11 @@
42
75
  "features": [
43
76
  "window.crypto.subtle",
44
77
  "window.crypto.subtle"
78
+ ],
79
+ "globals": [
80
+ "SECHTMLKey",
81
+ "SECHTMLDeviceAuthentication",
82
+ "SECHTMLPasswordCredentialKeychain"
45
83
  ]
46
84
  },
47
85
  "node": {
@@ -56,6 +94,9 @@
56
94
  "SECPassword+Node.js",
57
95
  "SecurityKit+Node.js"
58
96
  ],
59
- "features": []
97
+ "features": [],
98
+ "globals": [
99
+ "SECNodeKey"
100
+ ]
60
101
  }
61
102
  }
package/Info.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "JSBundleType": "node",
3
3
  "JSBundleIdentifier": "io.breakside.jskit",
4
- "JSBundleVersion": "2022.22.2",
4
+ "JSBundleVersion": "2022.24.0",
5
5
  "JSExecutableName": "jskit",
6
6
  "NPMOrganization": "breakside",
7
7
  "JSResources": [
8
8
  "Tests/HTMLTestRunner.js",
9
9
  "Tests/NodeTestRunner.js"
10
10
  ],
11
- "GitRevision": "a302ede5223899a33db877d1cba370054efd6902"
11
+ "GitRevision": "384e6ac71d317262e4518508066ab61322409ba2"
12
12
  }
package/Node/Builder.js CHANGED
@@ -174,20 +174,31 @@ JSClass("Builder", JSObject, {
174
174
  if (!seen.has(name)){
175
175
  seen.add(name);
176
176
  // If the framework was pre-built, then it can only have
177
- // dependencies on standard frameworks, so that's the only
178
- // place we'll look.
179
- //
177
+ // dependencies on other pre-built frameworks, which
178
+ // are other .jsframework bundles or JSKit frameworks
179
+ //
180
180
  // If we built the framework, then we already added its
181
181
  // dependencies based on its build reuslts and won't get here.
182
- let candidateURL = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
183
- let exists = await this.fileManager.itemExistsAtURL(candidateURL);
184
- if (!exists){
185
- throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
182
+ let includeDirectoryURLs = this.project.includeDirectoryURLs;
183
+ let url = null;
184
+ for (let i = 0, l = includeDirectoryURLs.length; i < l && url === null; ++i){
185
+ let directoryURL = includeDirectoryURLs[i];
186
+ let candidateURL = directoryURL.appendingPathComponent(name + '.jsframework', true);
187
+ let found = await this.fileManager.itemExistsAtURL(candidateURL);
188
+ if (found){
189
+ url = candidateURL;
190
+ }
191
+ }
192
+ if (url === null){
193
+ url = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
194
+ let found = await this.fileManager.itemExistsAtURL(url);
195
+ if (!found){
196
+ throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
197
+ }
186
198
  }
187
- this.printer.print("\nAdding dependency %s\n".sprintf(name));
188
199
  imports.push({
189
200
  name: name,
190
- url: candidateURL
201
+ url: url
191
202
  });
192
203
  }
193
204
  }
@@ -138,9 +138,10 @@ JSClass("FrameworkBuilder", Builder, {
138
138
  var genericFrameworks = new Set();
139
139
  var genericFiles = new Set();
140
140
  var genericFeatures = new Set();
141
+ var genericGlobals = new Set();
141
142
  var sources = {};
142
143
  for (let env in this.bundleEnvironments){
143
- sources[env] = {frameworks: [], files: [], features: []};
144
+ sources[env] = {frameworks: [], files: [], features: [], globals: []};
144
145
  let imports = this.importsByEnvironment[env];
145
146
  for (let i = 0, l = imports.frameworks.length; i < l; ++i){
146
147
  let framework = imports.frameworks[i];
@@ -176,6 +177,15 @@ JSClass("FrameworkBuilder", Builder, {
176
177
  sources[env].features.push(feature);
177
178
  }
178
179
  }
180
+ for (let i = 0, l = imports.globals.length; i < l; ++i){
181
+ let name = imports.globals[i];
182
+ if (env == 'generic'){
183
+ genericGlobals.add(name);
184
+ }
185
+ if (env == 'generic' || !genericGlobals.has(name)){
186
+ sources[env].globals.push(name);
187
+ }
188
+ }
179
189
  }
180
190
  return sources;
181
191
  },
@@ -185,6 +195,7 @@ JSClass("FrameworkBuilder", Builder, {
185
195
  var genericFrameworks = new Set();
186
196
  var genericFiles = new Set();
187
197
  var genericFeatures = new Set();
198
+ var genericGlobals = new Set();
188
199
  var sources = {};
189
200
  var copyright = this.project.getInfoString("JSCopyright", this.resources);
190
201
  var licenseString = await this.project.licenseNoticeString();
@@ -195,7 +206,7 @@ JSClass("FrameworkBuilder", Builder, {
195
206
  }
196
207
  var header = "%s (%s)\n----\n%s%s".sprintf(this.project.info.JSBundleIdentifier, this.project.info.JSBundleVersion, copyright, licenseString);
197
208
  for (let env in this.bundleEnvironments){
198
- sources[env] = {frameworks: [], files: [], features: []};
209
+ sources[env] = {frameworks: [], files: [], features: [], globals: []};
199
210
  let filename = this.bundleEnvironments[env];
200
211
  let compilation = JavascriptCompilation.initWithName(filename, this.sourcesURL, this.fileManager);
201
212
  var fullSourcesURL = this.sourcesURL.appendingPathComponent("_debug", true);
@@ -238,6 +249,15 @@ JSClass("FrameworkBuilder", Builder, {
238
249
  sources[env].features.push(feature);
239
250
  }
240
251
  }
252
+ for (let i = 0, l = imports.globals.length; i < l; ++i){
253
+ let name = imports.globals[i];
254
+ if (env == 'generic'){
255
+ genericGlobals.add(name);
256
+ }
257
+ if (env == 'generic' || !genericGlobals.has(name)){
258
+ sources[env].globals.push(name);
259
+ }
260
+ }
241
261
  }
242
262
  return sources;
243
263
  },
package/Node/Project.js CHANGED
@@ -310,7 +310,8 @@ JSClass("Project", JSObject, {
310
310
  var result = {
311
311
  files: [],
312
312
  frameworks: [],
313
- features: []
313
+ features: [],
314
+ globals: []
314
315
  };
315
316
  var visited = {
316
317
  paths: new Set(),
@@ -359,6 +360,11 @@ JSClass("Project", JSObject, {
359
360
  result.features.push(feature);
360
361
  }
361
362
  }
363
+ let globals = js.globals();
364
+ for (let i = 0, l = globals.length; i < l; ++i){
365
+ let name = globals[i];
366
+ result.globals.push(name);
367
+ }
362
368
  }
363
369
  };
364
370
 
@@ -443,7 +449,21 @@ JSClass("Project", JSObject, {
443
449
  let url = await this.urlForFrameworkName(name, includeDirectoryURLs);
444
450
  if (url !== null){
445
451
  if (url.fileExtension === '.jsframework'){
446
- // TODO: extract from built framework
452
+ let sourcesURL = url.appendingPathComponent("sources.json");
453
+ let data = await this.fileManager.contentsAtURL(sourcesURL);
454
+ let sources = JSON.parse(data.stringByDecodingUTF8());
455
+ if (sources.generic.globals){
456
+ for (let name of sources.generic.globals){
457
+ globals.push(name);
458
+ }
459
+ }
460
+ for (let env of envs){
461
+ if ((env in sources) && sources[env].globals){
462
+ for (let name of sources[env].globals){
463
+ globals.push(name);
464
+ }
465
+ }
466
+ }
447
467
  }else{
448
468
  let frameworkProject = Project.initWithURL(url);
449
469
  try{
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
3
3
  "Info": {
4
4
  "JSBundleType": "node",
5
5
  "JSBundleIdentifier": "io.breakside.jskit",
6
- "JSBundleVersion": "2022.22.2",
6
+ "JSBundleVersion": "2022.24.0",
7
7
  "JSExecutableName": "jskit",
8
8
  "NPMOrganization": "breakside",
9
9
  "JSResources": [
10
10
  "Tests/HTMLTestRunner.js",
11
11
  "Tests/NodeTestRunner.js"
12
12
  ],
13
- "GitRevision": "a302ede5223899a33db877d1cba370054efd6902"
13
+ "GitRevision": "384e6ac71d317262e4518508066ab61322409ba2"
14
14
  },
15
15
  "Resources": [
16
16
  {
package/Node/jskit CHANGED
@@ -49,23 +49,24 @@ require("./../Frameworks/Foundation.jsframework/JS/JSURLResponse.js");
49
49
  require("./../Frameworks/Foundation.jsframework/JS/JSXMLParser.js");
50
50
  require("./../Frameworks/Foundation.jsframework/JS/JSImage.js");
51
51
  require("./../Frameworks/Foundation.jsframework/JS/JSTextAttachment.js");
52
- require("./../Frameworks/Foundation.jsframework/JS/JSAttributedString.js");
53
- require("./../Frameworks/Foundation.jsframework/JS/JSSpec.js");
54
- require("./../Frameworks/Foundation.jsframework/JS/JSArrayController.js");
55
- require("./../Frameworks/Foundation.jsframework/JS/JSSparseArrayController.js");
56
- require("./../Frameworks/Foundation.jsframework/JS/JSColorSpace.js");
57
- require("./../Frameworks/Foundation.jsframework/JS/JSColor.js");
58
- require("./../Frameworks/Foundation.jsframework/JS/JSGradient.js");
59
52
  require("./../Frameworks/Foundation.jsframework/JS/Huffman.js");
60
53
  require("./../Frameworks/Foundation.jsframework/JS/Deflate.js");
61
54
  require("./../Frameworks/Foundation.jsframework/JS/Adler32.js");
62
55
  require("./../Frameworks/Foundation.jsframework/JS/Zlib.js");
63
56
  require("./../Frameworks/Foundation.jsframework/JS/JSFontDescriptor.js");
64
57
  require("./../Frameworks/Foundation.jsframework/JS/JSFont.js");
58
+ require("./../Frameworks/Foundation.jsframework/JS/JSColorSpace.js");
59
+ require("./../Frameworks/Foundation.jsframework/JS/JSColor.js");
60
+ require("./../Frameworks/Foundation.jsframework/JS/JSAttributedString.js");
61
+ require("./../Frameworks/Foundation.jsframework/JS/JSSpec.js");
62
+ require("./../Frameworks/Foundation.jsframework/JS/JSArrayController.js");
63
+ require("./../Frameworks/Foundation.jsframework/JS/JSSparseArrayController.js");
64
+ require("./../Frameworks/Foundation.jsframework/JS/JSGradient.js");
65
65
  require("./../Frameworks/Foundation.jsframework/JS/JSPath.js");
66
66
  require("./../Frameworks/Foundation.jsframework/JS/JSContext.js");
67
67
  require("./../Frameworks/Foundation.jsframework/JS/JSDateFormatter.js");
68
68
  require("./../Frameworks/Foundation.jsframework/JS/JSNumberFormatter.js");
69
+ require("./../Frameworks/Foundation.jsframework/JS/JSParagraphStyle.js");
69
70
  require("./../Frameworks/Foundation.jsframework/JS/JSTextLayoutManager.js");
70
71
  require("./../Frameworks/Foundation.jsframework/JS/JSTextRun.js");
71
72
  require("./../Frameworks/Foundation.jsframework/JS/JSTextLine.js");
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.APIKit
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSIncludeDirectories:
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.APIKitTesting
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSLicenseNotice: |
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.AuthKit
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSLicenseNotice: |
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.CSSOM
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSBundleEnvironments:
@@ -178,14 +178,14 @@ JSClass("CHAxis", JSObject, {
178
178
  var labelInsets = JSInsets(this.style.labelInsets);
179
179
  var labelTextFrame;
180
180
  if (this.edge === CHAxis.Edge.leading){
181
- this.framesetter.attributes.textAlignment = JSTextAlignment.right;
181
+ this.framesetter.defaultParagraphStyle.textAlignment = JSTextAlignment.right;
182
182
  labelInsets.bottom += Math.max(this.style.lineWidth / 2, majorTickMarkLength, minorTickMarkLength);
183
183
  }else{
184
- this.framesetter.attributes.textAlignment = JSTextAlignment.left;
184
+ this.framesetter.defaultParagraphStyle.textAlignment = JSTextAlignment.left;
185
185
  labelInsets.top += Math.max(this.style.lineWidth / 2, majorTickMarkLength, minorTickMarkLength);
186
186
  }
187
187
  var labelOrigin = JSPoint(0, rect.origin.y + this.style.labelInsets.top);
188
- this.framesetter.attributes.textAlignment = JSTextAlignment.left;
188
+ this.framesetter.defaultParagraphStyle.textAlignment = JSTextAlignment.left;
189
189
  for (i = 0, l = labels.length; i < l; ++i){
190
190
  if (labels[i] !== null && labels[i] !== undefined && labels[i] !== ""){
191
191
  this.framesetter.attributedString = JSAttributedString.initWithString(labels[i], {
@@ -303,10 +303,10 @@ JSClass("CHAxis", JSObject, {
303
303
  var labelInsets = JSInsets(this.style.labelInsets);
304
304
  var labelTextFrame;
305
305
  if (this.edge === CHAxis.Edge.leading){
306
- this.framesetter.attributes.textAlignment = JSTextAlignment.right;
306
+ this.framesetter.defaultParagraphStyle.textAlignment = JSTextAlignment.right;
307
307
  labelInsets.right += Math.max(this.style.lineWidth / 2, majorTickMarkLength, minorTickMarkLength);
308
308
  }else{
309
- this.framesetter.attributes.textAlignment = JSTextAlignment.left;
309
+ this.framesetter.defaultParagraphStyle.textAlignment = JSTextAlignment.left;
310
310
  labelInsets.left += Math.max(this.style.lineWidth / 2, majorTickMarkLength, minorTickMarkLength);
311
311
  }
312
312
  var maxLabelSize = JSSize(rect.size.width - this.style.labelInsets.width, 0);
@@ -168,7 +168,7 @@ JSClass("CHPieChart", CHChart, {
168
168
 
169
169
  // draw labels
170
170
  if (this.showNames || this.showValues){
171
- this.framesetter.attributes.textAlignment = this.labelTextAlignment;
171
+ this.framesetter.defaultParagraphStyle.textAlignment = this.labelTextAlignment;
172
172
  context.save();
173
173
  context.translateBy(rect.center.x, rect.center.y);
174
174
  if (this.labelShadowColor !== null){
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.ChartKit
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2021 Breakside Inc.
6
6
  # JSBundleEnvironments:
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.ConferenceKit
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSBundleEnvironments:
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.DBKit
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSBundleEnvironments:
@@ -1,6 +1,6 @@
1
1
  JSBundleType: framework
2
2
  JSBundleIdentifier: io.breakside.JSKit.DOM
3
- JSBundleVersion: 2022.22.2
3
+ JSBundleVersion: 2022.24.0
4
4
  JSDevelopmentLanguage: en
5
5
  JSCopyright: Copyright © 2020 Breakside Inc.
6
6
  JSBundleEnvironments: