@breakside/jskit 2023.9.0 → 2023.9.1

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 (44) hide show
  1. package/Frameworks/DOM.jsframework/Info.json +2 -2
  2. package/Frameworks/DOM.jsframework/JS/DOMParser.js +72 -63
  3. package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js +2 -2
  4. package/Frameworks/FontKit.jsframework/Info.json +2 -2
  5. package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js +2 -2
  6. package/Frameworks/Foundation.jsframework/Info.json +2 -2
  7. package/Frameworks/Foundation.jsframework/JS/JSImage.js +13 -16
  8. package/Frameworks/Foundation.jsframework/JS/JSXMLParser.js +206 -101
  9. package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js +2 -2
  10. package/Frameworks/Foundation.jsframework/sources.json +2 -0
  11. package/Frameworks/SecurityKit.jsframework/Info.json +2 -2
  12. package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js +2 -2
  13. package/Info.json +2 -2
  14. package/Node/Resources.js +13 -16
  15. package/Node/io.breakside.jskit-bundle.js +2 -2
  16. package/Root/Frameworks/APIKit/Info.yaml +1 -1
  17. package/Root/Frameworks/APIKitTesting/Info.yaml +1 -1
  18. package/Root/Frameworks/AuthKit/Info.yaml +1 -1
  19. package/Root/Frameworks/CSSOM/Info.yaml +1 -1
  20. package/Root/Frameworks/ChartKit/Info.yaml +1 -1
  21. package/Root/Frameworks/ConferenceKit/Info.yaml +1 -1
  22. package/Root/Frameworks/DBKit/Info.yaml +1 -1
  23. package/Root/Frameworks/DOM/DOMParser.js +72 -63
  24. package/Root/Frameworks/DOM/Info.yaml +1 -1
  25. package/Root/Frameworks/Dispatch/Info.yaml +1 -1
  26. package/Root/Frameworks/FontKit/Info.yaml +1 -1
  27. package/Root/Frameworks/Foundation/Info.yaml +1 -1
  28. package/Root/Frameworks/Foundation/JSImage.js +13 -16
  29. package/Root/Frameworks/Foundation/JSXMLParser.js +206 -101
  30. package/Root/Frameworks/ImageKit/Info.yaml +1 -1
  31. package/Root/Frameworks/MediaKit/Info.yaml +1 -1
  32. package/Root/Frameworks/MediaKitUI/Info.yaml +1 -1
  33. package/Root/Frameworks/NotificationKit/Info.yaml +1 -1
  34. package/Root/Frameworks/PDFKit/Info.yaml +1 -1
  35. package/Root/Frameworks/QRKit/Info.yaml +1 -1
  36. package/Root/Frameworks/SearchKit/Info.yaml +1 -1
  37. package/Root/Frameworks/SecurityKit/Info.yaml +1 -1
  38. package/Root/Frameworks/ServerKit/Info.yaml +1 -1
  39. package/Root/Frameworks/ServerKitTesting/Info.yaml +1 -1
  40. package/Root/Frameworks/TestKit/Info.yaml +1 -1
  41. package/Root/Frameworks/UIKit/Info.yaml +1 -1
  42. package/Root/Frameworks/UIKit/UINavigationController.js +6 -1
  43. package/Root/Frameworks/UIKitTesting/Info.yaml +1 -1
  44. package/package.json +1 -1
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "JSBundleType": "framework",
3
3
  "JSBundleIdentifier": "io.breakside.JSKit.DOM",
4
- "JSBundleVersion": "2023.9.0",
4
+ "JSBundleVersion": "2023.9.1",
5
5
  "JSDevelopmentLanguage": "en",
6
6
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
7
7
  "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
9
9
  "node": "DOM+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": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
12
+ "GitRevision": "1a4e4cfebe3671d6605583e7b24ff9665646b58f"
13
13
  }
@@ -22,73 +22,82 @@ JSGlobalObject.DOMParser = function DOMParser(){
22
22
 
23
23
  DOMParser.prototype = {
24
24
 
25
+ document: null,
26
+ currentNode: null,
27
+
25
28
  parseFromString: function(str, mimetype){
26
- var parser = JSXMLParser.init();
27
- var isHTML = mimetype == "text/html";
28
- parser.isHTML = isHTML;
29
- var document = null;
30
- var node = null;
31
- var stack = [];
32
- parser.parse(str, {
33
- beginDocument: function(){
34
- document = DOM.createDocument();
35
- node = document;
36
- },
37
- handleDocumentType: function(name, publicId, systemId){
38
- var doctype = document.implementation.createDocumentType(name, publicId, systemId);
39
- document.appendChild(doctype);
40
- },
41
- handleProcessingInstruction: function(name, data){
42
- var pi = document.createProcessingInstruction(name, data);
43
- node.appendChild(pi);
44
- },
45
- handleComment: function(text){
46
- var comment = document.createComment(text);
47
- node.appendChild(comment);
48
- },
49
- handleCDATA: function(text){
50
- var cdata = document.createCDATASection(text);
51
- node.appendChild(cdata);
52
- },
53
- beginElement: function(name, prefix, namespace, attributes, isClosed){
54
- var element;
55
- if (namespace !== null){
56
- if (prefix !== null){
57
- element = document.createElementNS(namespace, prefix + ':' + name);
58
- }else{
59
- element = document.createElementNS(namespace, name);
60
- }
29
+ var parser = JSXMLParser.initWithString(str);
30
+ if (mimetype == "text/html"){
31
+ parser.mode = JSXMLParser.Mode.html;
32
+ }
33
+ this.document = null;
34
+ this.currentNode = null;
35
+ parser.delegate = this;
36
+ parser.parse();
37
+ return this.document;
38
+ },
39
+
40
+ xmlParserDidBeginDocument: function(parser){
41
+ this.document = DOM.createDocument();
42
+ this.currentNode = this.document;
43
+ },
44
+
45
+ xmlParserFoundDocumentType: function(parser, name, publicId, systemId){
46
+ var doctype = this.document.implementation.createDocumentType(name, publicId, systemId);
47
+ this.document.appendChild(doctype);
48
+ },
49
+
50
+ xmlParserFoundProcessingInstruction: function(parser, name, data){
51
+ var pi = this.document.createProcessingInstruction(name, data);
52
+ this.currentNode.appendChild(pi);
53
+ },
54
+
55
+ xmlParserFoundComment: function(parser, text){
56
+ var comment = this.document.createComment(text);
57
+ this.currentNode.appendChild(comment);
58
+ },
59
+
60
+ xmlParserFoundCDATA: function(parser, text){
61
+ var cdata = this.document.createCDATASection(text);
62
+ this.currentNode.appendChild(cdata);
63
+ },
64
+
65
+ xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
66
+ var element;
67
+ if (namespace !== null){
68
+ if (prefix !== null){
69
+ element = this.document.createElementNS(namespace, prefix + ':' + name);
70
+ }else{
71
+ element = this.document.createElementNS(namespace, name);
72
+ }
73
+ }else{
74
+ element = this.document.createElement(name);
75
+ }
76
+ var attrs = attributes.all();
77
+ var attr;
78
+ for (var i = 0, l = attrs.length; i < l; ++i){
79
+ attr = attrs[i];
80
+ if (attr.namespace){
81
+ if (attr.prefix !== null){
82
+ element.setAttributeNS(attr.namespace, attr.prefix + ':' + attr.name, attr.value);
61
83
  }else{
62
- element = document.createElement(name);
63
- }
64
- var attr;
65
- for (var i = 0, l = attributes.length; i < l; ++i){
66
- attr = attributes[i];
67
- if (attr.namespace){
68
- if (attr.prefix !== null){
69
- element.setAttributeNS(attr.namespace, attr.prefix + ':' + attr.name, attr.value);
70
- }else{
71
- element.setAttribute(attr.namespace, attr.name, attr.value);
72
- }
73
- }else{
74
- element.setAttribute(attr.name, attr.value);
75
- }
84
+ element.setAttribute(attr.namespace, attr.name, attr.value);
76
85
  }
77
- node.appendChild(element);
78
- if (!isClosed){
79
- stack.push(node);
80
- node = element;
81
- }
82
- },
83
- handleText: function(text){
84
- var textNode = document.createTextNode(text);
85
- node.appendChild(textNode);
86
- },
87
- endElement: function(){
88
- node = stack.pop();
86
+ }else{
87
+ element.setAttribute(attr.name, attr.value);
89
88
  }
90
- });
91
- return document;
89
+ }
90
+ this.currentNode.appendChild(element);
91
+ this.currentNode = element;
92
+ },
93
+
94
+ xmlParserFoundText: function(parser, text){
95
+ var textNode = this.document.createTextNode(text);
96
+ this.currentNode.appendChild(textNode);
97
+ },
98
+
99
+ xmlParserDidEndElement: function(parser){
100
+ this.currentNode = this.currentNode.parentNode;
92
101
  }
93
102
 
94
103
  };
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
3
3
  "Info": {
4
4
  "JSBundleType": "framework",
5
5
  "JSBundleIdentifier": "io.breakside.JSKit.DOM",
6
- "JSBundleVersion": "2023.9.0",
6
+ "JSBundleVersion": "2023.9.1",
7
7
  "JSDevelopmentLanguage": "en",
8
8
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
9
9
  "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
11
11
  "node": "DOM+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": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
14
+ "GitRevision": "1a4e4cfebe3671d6605583e7b24ff9665646b58f"
15
15
  },
16
16
  "Resources": [],
17
17
  "ResourceLookup": {
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "JSBundleType": "framework",
3
3
  "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
4
- "JSBundleVersion": "2023.9.0",
4
+ "JSBundleVersion": "2023.9.1",
5
5
  "JSDevelopmentLanguage": "en",
6
6
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
7
7
  "JSBundleEnvironments": {
8
8
  "html": "FontKit+HTML.js"
9
9
  },
10
10
  "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",
11
- "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
11
+ "GitRevision": "1a4e4cfebe3671d6605583e7b24ff9665646b58f"
12
12
  }
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
3
3
  "Info": {
4
4
  "JSBundleType": "framework",
5
5
  "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
6
- "JSBundleVersion": "2023.9.0",
6
+ "JSBundleVersion": "2023.9.1",
7
7
  "JSDevelopmentLanguage": "en",
8
8
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
9
9
  "JSBundleEnvironments": {
10
10
  "html": "FontKit+HTML.js"
11
11
  },
12
12
  "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",
13
- "GitRevision": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
13
+ "GitRevision": "1a4e4cfebe3671d6605583e7b24ff9665646b58f"
14
14
  },
15
15
  "Resources": [],
16
16
  "ResourceLookup": {
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "JSBundleType": "framework",
3
3
  "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
4
- "JSBundleVersion": "2023.9.0",
4
+ "JSBundleVersion": "2023.9.1",
5
5
  "JSDevelopmentLanguage": "en",
6
6
  "JSCopyright": "Copyright © 2020 Breakside Inc.",
7
7
  "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
9
9
  "node": "Foundation+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": "f5a30c6a66cf6cf8e98d7a10b27a7e972243b75d"
12
+ "GitRevision": "1a4e4cfebe3671d6605583e7b24ff9665646b58f"
13
13
  }
@@ -373,10 +373,10 @@ _JSDataImage.sizeFromJPEGData = function(data){
373
373
  };
374
374
 
375
375
  _JSDataImage.sizeFromSVGData = function(data){
376
- var parser = JSXMLParser.init();
376
+ var parser = JSXMLParser.initWithData(data);
377
377
  var size = JSSize(1, 1);
378
- parser.parse(data.stringByDecodingUTF8(), {
379
- beginElement: function(name, prefix, namespace, attributes, isClosed){
378
+ parser.delegate = {
379
+ xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
380
380
  var multiple = {
381
381
  'em': 12,
382
382
  'ex': 24,
@@ -406,25 +406,22 @@ _JSDataImage.sizeFromSVGData = function(data){
406
406
  return multiple[unit] * n;
407
407
  };
408
408
  if (namespace == 'http://www.w3.org/2000/svg' && name.toLowerCase() == 'svg'){
409
- var attrs = {};
410
- for (var i = 0, l = attributes.length; i < l; ++i){
411
- var attr = attributes[i];
412
- if (attr.namespace === null){
413
- attrs[attr.name] = attr.value;
414
- }
415
- }
416
- if (attrs.width && attrs.height){
417
- size.width = px(attrs.width);
418
- size.height = px(attrs.height);
419
- }else if (attrs.viewBox){
420
- var box = attrs.viewBox.split(/\s+/).map(function(n){ return parseInt(n); });
409
+ var width = attributes.get("width");
410
+ var height = attributes.get("height");
411
+ var viewBox = attributes.get("viewBox");
412
+ if (width && height){
413
+ size.width = px(width);
414
+ size.height = px(height);
415
+ }else if (viewBox){
416
+ var box = viewBox.split(/\s+/).map(function(n){ return parseInt(n); });
421
417
  size.width = box[2];
422
418
  size.height = box[3];
423
419
  }
424
420
  }
425
421
  parser.stop();
426
422
  }
427
- });
423
+ };
424
+ parser.parse();
428
425
  return size;
429
426
  };
430
427
 
@@ -14,25 +14,58 @@
14
14
  // limitations under the License.
15
15
 
16
16
  // #import "JSObject.js"
17
+ // #import "JSProtocol.js"
18
+ // #import "String+JS.js"
17
19
  'use strict';
18
20
 
19
21
  (function(){
20
22
 
23
+ JSProtocol("JSXMLParserDelegate", JSProtocol, {
24
+
25
+ xmlParserDidBeginDocument: function(parser){},
26
+ xmlParserDidEndDocument: function(parser){},
27
+ xmlParserFoundDocumentType: function(parser, name, publicId, systemId){},
28
+ xmlParserFoundProcessingInstruction: function(parser, name, data){},
29
+ xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){},
30
+ xmlParserDidEndElement: function(parser, name, prefix, namespace){},
31
+ xmlParserFoundComment: function(parser, text){},
32
+ xmlParserFoundCDATA: function(parser, text){},
33
+ xmlParserFoundText: function(parser, text){},
34
+ xmlParserErrorOccurred: function(parser, error){}
35
+
36
+ });
37
+
21
38
  JSClass("JSXMLParser", JSObject, {
22
39
 
23
- isHTML: false,
40
+ initWithData: function(data, encoding){
41
+ if (encoding === undefined){
42
+ encoding = String.Encoding.utf8;
43
+ }
44
+ var xml = String.initWithData(data, encoding);
45
+ this.initWithString(xml);
46
+ },
47
+
48
+ initWithString: function(str){
49
+ this.xml = str;
50
+ },
24
51
 
25
- state: null,
52
+ mode: "xml",
53
+
54
+ xml: null,
55
+ error: null,
26
56
  isStopped: false,
27
57
 
28
58
  stop: function(){
29
59
  this.isStopped = true;
30
60
  },
31
61
 
32
- parse: function(input, listener){
62
+ parse: function(){
63
+ this.isStopped = false;
64
+ this.error = null;
65
+ var input = this.xml;
33
66
  var length = input.length;
34
67
  var offset = 0;
35
- var isHTML = this.isHTML;
68
+ var isHTML = this.mode === JSXMLParser.Mode.html;
36
69
  var c;
37
70
  var lineNumber = 1;
38
71
  var lineOffset;
@@ -309,13 +342,13 @@ JSClass("JSXMLParser", JSObject, {
309
342
  name: resolved.name,
310
343
  prefix: resolved.prefix,
311
344
  namespace: resolved.namespace,
312
- attributes: []
345
+ attributes: JSXMLAttributeMap()
313
346
  };
314
347
  for (i = 0, l = attributes.length; i < l; ++i){
315
348
  attr = attributes[i];
316
349
  if (!attr.name.startsWith("xmlns:") && attr.name != "xmlns"){
317
350
  resolved = resolveNamespace(attr.name, true);
318
- element.attributes.push({
351
+ element.attributes.add({
319
352
  name: resolved.name,
320
353
  prefix: resolved.prefix,
321
354
  namespace: resolved.namespace,
@@ -325,110 +358,125 @@ JSClass("JSXMLParser", JSObject, {
325
358
  }
326
359
  return element;
327
360
  };
328
-
329
- var obj;
330
- if (isHTML){
331
- readWhitespace();
332
- }else{
361
+ try{
362
+ var obj;
363
+ if (isHTML){
364
+ readWhitespace();
365
+ }else{
366
+ obj = readObject();
367
+ if (obj === null || obj.kind != 'PI' || obj.name != 'xml'){
368
+ throw new Error("Expecting <?xml at start of document");
369
+ }
370
+ }
333
371
  obj = readObject();
334
- if (obj === null || obj.kind != 'PI' || obj.name != 'xml'){
335
- throw new Error("Expecting <?xml at start of document");
372
+ var elementStack = [];
373
+ var namespaces = {
374
+ ':default:': null,
375
+ 'xml': 'http://www.w3.org/XML/1998/namespace'
376
+ };
377
+ var namespacesStack = [];
378
+ var hasDocumentElement = false;
379
+ var hasSentDoctype = false;
380
+ var element;
381
+ if (this.delegate && this.delegate.xmlParserDidBeginDocument){
382
+ this.delegate.xmlParserDidBeginDocument(this);
336
383
  }
337
- }
338
- obj = readObject();
339
- var elementNameStack = [];
340
- var namespaces = {
341
- ':default:': null,
342
- 'xml': 'http://www.w3.org/XML/1998/namespace'
343
- };
344
- var namespacesStack = [];
345
- var hasDocumentElement = false;
346
- var hasSentDoctype = false;
347
- if (listener.beginDocument){
348
- listener.beginDocument();
349
- }
350
- while (!this.isStopped && obj !== null){
351
- if (obj.kind == 'Doctype'){
352
- if (hasSentDoctype){
353
- throw new Error("Only one doctype allowed");
354
- }
355
- if (hasDocumentElement){
356
- throw new Error("Doctype must come before the document element");
357
- }
358
- if (elementNameStack.length > 0){
359
- throw new Error("Doctype only allowed at document root");
360
- }
361
- if (listener.handleDocumentType){
362
- listener.handleDocumentType(obj.name, obj.publicId || null, obj.systemId || null);
363
- }
364
- hasSentDoctype = true;
365
- }else if (obj.kind == "PI"){
366
- if (elementNameStack.length > 0){
367
- throw new Error("Processing instructions only allowed at document root");
368
- }
369
- if (listener.handleProcessingInstruction){
370
- listener.handleProcessingInstruction(obj.name, obj.value);
371
- }
372
- }else if (obj.kind == 'CDATA'){
373
- if (elementNameStack.length === 0){
374
- throw new Error("CDATA not allowed at document root");
375
- }
376
- if (listener.handleCDATA){
377
- listener.handleCDATA(obj.value);
378
- }
379
- }else if (obj.kind == 'Comment'){
380
- if (listener.handleComment){
381
- listener.handleComment(obj.value);
382
- }
383
- }else if (obj.kind == 'ElementStart'){
384
- if (elementNameStack.length === 0){
385
- hasDocumentElement = true;
386
- }
387
- elementNameStack.push(obj.name);
388
- namespacesStack.push(namespaces);
389
- namespaces = Object.create(namespaces);
390
- var element = resolveElementNamespace(obj.name, obj.attributes);
391
- if (listener.beginElement){
392
- listener.beginElement(element.name, element.prefix, element.namespace, element.attributes, obj.isClosed);
393
- }
394
- var elementIsClosed = obj.isClosed;
395
- if (obj.rawContents !== null){
396
- if (!this.isStopped && listener.handleText && obj.rawContents.length > 0){
397
- listener.handleText(obj.rawContents);
384
+ while (!this.isStopped && obj !== null){
385
+ if (obj.kind == 'Doctype'){
386
+ if (hasSentDoctype){
387
+ throw new Error("Only one doctype allowed");
398
388
  }
399
- if (!this.isStopped && listener.endElement){
400
- listener.endElement();
389
+ if (hasDocumentElement){
390
+ throw new Error("Doctype must come before the document element");
401
391
  }
402
- elementIsClosed = true;
403
- }
404
- if (elementIsClosed){
405
- elementNameStack.pop();
392
+ if (elementStack.length > 0){
393
+ throw new Error("Doctype only allowed at document root");
394
+ }
395
+ if (this.delegate && this.delegate.xmlParserFoundDocumentType){
396
+ this.delegate.xmlParserFoundDocumentType(this, obj.name, obj.publicId || null, obj.systemId || null);
397
+ }
398
+ hasSentDoctype = true;
399
+ }else if (obj.kind == "PI"){
400
+ if (elementStack.length > 0){
401
+ throw new Error("Processing instructions only allowed at document root");
402
+ }
403
+ if (this.delegate && this.delegate.xmlParserFoundProcessingInstruction){
404
+ this.delegate.xmlParserFoundProcessingInstruction(this, obj.name, obj.value);
405
+ }
406
+ }else if (obj.kind == 'CDATA'){
407
+ if (elementStack.length === 0){
408
+ throw new Error("CDATA not allowed at document root");
409
+ }
410
+ if (this.delegate && this.delegate.xmlParserFoundCDATA){
411
+ this.delegate.xmlParserFoundCDATA(this, obj.value);
412
+ }
413
+ }else if (obj.kind == 'Comment'){
414
+ if (this.delegate && this.delegate.xmlParserFoundComment){
415
+ this.delegate.xmlParserFoundComment(this, obj.value);
416
+ }
417
+ }else if (obj.kind == 'ElementStart'){
418
+ if (elementStack.length === 0){
419
+ hasDocumentElement = true;
420
+ }
421
+ namespacesStack.push(namespaces);
422
+ namespaces = Object.create(namespaces);
423
+ element = resolveElementNamespace(obj.name, obj.attributes);
424
+ elementStack.push(element);
425
+ if (this.delegate && this.delegate.xmlParserDidBeginElement){
426
+ this.delegate.xmlParserDidBeginElement(this, element.name, element.prefix, element.namespace, element.attributes);
427
+ }
428
+ var elementIsClosed = obj.isClosed;
429
+ if (obj.rawContents !== null){
430
+ if (!this.isStopped && this.delegate.xmlParserFoundText && obj.rawContents.length > 0){
431
+ this.delegate.xmlParserFoundText(this, obj.rawContents);
432
+ }
433
+ elementIsClosed = true;
434
+ }
435
+ if (elementIsClosed){
436
+ if (!this.isStopped && this.delegate.xmlParserDidEndElement){
437
+ this.delegate.xmlParserDidEndElement(this, element.name, element.prefix, element.namespace);
438
+ }
439
+ elementStack.pop();
440
+ namespaces = namespacesStack.pop();
441
+ }
442
+ }else if (obj.kind == 'Text'){
443
+ if (elementStack.length === 0){
444
+ if (!obj.value.match(/^[\r\n\t ]*$/)){
445
+ throw new Error("Text not allowed at the document root");
446
+ }
447
+ }else{
448
+ if (this.delegate && this.delegate.xmlParserFoundText){
449
+ this.delegate.xmlParserFoundText(this, obj.value);
450
+ }
451
+ }
452
+ }else if (obj.kind == 'ElementEnd'){
453
+ element = elementStack.pop();
406
454
  namespaces = namespacesStack.pop();
407
- }
408
- }else if (obj.kind == 'Text'){
409
- if (elementNameStack.length === 0){
410
- if (!obj.value.match(/^[\r\n\t ]*$/)){
411
- throw new Error("Text not allowed at the document root");
455
+ if (element.prefix !== null){
456
+ if (obj.name != element.prefix + ":" + element.name){
457
+ throw new Error("Mismatched end tag");
458
+ }
459
+ }else{
460
+ if (obj.name != element.name){
461
+ throw new Error("Mismatched end tag");
462
+ }
412
463
  }
413
- }else{
414
- if (listener.handleText){
415
- listener.handleText(obj.value);
464
+ if (this.delegate && this.delegate.xmlParserDidEndElement){
465
+ this.delegate.xmlParserDidEndElement(this, element.name, element.prefix, element.namespace);
416
466
  }
417
467
  }
418
- }else if (obj.kind == 'ElementEnd'){
419
- var name = elementNameStack.pop();
420
- namespaces = namespacesStack.pop();
421
- if (obj.name != name){
422
- throw new Error("Mismatched end tag");
423
- }
424
- if (listener.endElement){
425
- listener.endElement();
426
- }
468
+ obj = readObject();
469
+ }
470
+ if (!this.isStopped && this.delegate.xmlParserDidEndDocument){
471
+ this.delegate.xmlParserDidEndDocument(this);
472
+ }
473
+ }catch (e){
474
+ this.isStopped = true;
475
+ if (this.delegate && this.delegate.xmlParserErrorOccurred){
476
+ this.delegate.xmlParserErrorOccurred(this, e);
477
+ }else{
478
+ throw e;
427
479
  }
428
- obj = readObject();
429
- }
430
- if (!this.isStopped && listener.endDocument){
431
- listener.endDocument();
432
480
  }
433
481
  }
434
482
 
@@ -518,4 +566,61 @@ var htmlElements = {
518
566
  raw: new Set(['script', 'style'])
519
567
  };
520
568
 
569
+ JSXMLParser.Mode = {
570
+ xml: "xml",
571
+ html: "html"
572
+ };
573
+
574
+ JSGlobalObject.JSXMLAttributeMap = function(){
575
+ if (this === undefined){
576
+ return new JSXMLAttributeMap();
577
+ }
578
+ this.namespaces = {};
579
+ this.noNamespace = {};
580
+ this.attributes = [];
581
+ };
582
+
583
+ JSXMLAttributeMap.prototype = {
584
+
585
+ namespaces: null,
586
+ noNamespace: null,
587
+ attributes: null,
588
+
589
+ add: function(attr){
590
+ this.attributes.push(attr);
591
+ var map = this.noNamespace;
592
+ if (attr.namespace){
593
+ map = this.namespaces[attr.namespace];
594
+ if (!map){
595
+ map = this.namespaces[attr.namespace] = {};
596
+ }
597
+ }
598
+ map[attr.name] = attr;
599
+ },
600
+
601
+ all: function(){
602
+ return this.attributes;
603
+ },
604
+
605
+ contains: function(name, namespace){
606
+ var map = namespace ? this.namespaces[namespace] : this.noNamespace;
607
+ if (map){
608
+ return name in map;
609
+ }
610
+ return false;
611
+ },
612
+
613
+ get: function(name, namespace){
614
+ var map = namespace ? this.namespaces[namespace] : this.noNamespace;
615
+ if (map){
616
+ var attr = map[name];
617
+ if (attr){
618
+ return attr.value;
619
+ }
620
+ }
621
+ return null;
622
+ },
623
+
624
+ };
625
+
521
626
  })();