plist 3.0.6 → 3.1.1

package/lib/build.js

@@ -117,6 +117,9 @@ function walk_obj(next, next_child) {
     tag_type = (next % 1 === 0) ? 'integer' : 'real';
     next_child.ele(tag_type).txt(next.toString());
 
+  } else if ('BigInt' == name) {
+    next_child.ele('integer').txt(next);
+
   } else if ('Date' == name) {
     next_child.ele('date').txt(ISODateString(new Date(next)));
 

package/lib/parse.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var DOMParser = require('./xmldom/dom-parser').DOMParser;
+const { DOMParser } = require("@xmldom/xmldom");
 
 /**
  * Module exports.
@@ -14,7 +14,6 @@ var TEXT_NODE = 3;
 var CDATA_NODE = 4;
 var COMMENT_NODE = 8;
 
-
 /**
  * We ignore raw text (usually whitespace), <!-- xml comments -->,
  * and raw CDATA nodes.
@@ -24,10 +23,12 @@ var COMMENT_NODE = 8;
  * @api private
  */
 
-function shouldIgnoreNode (node) {
-  return node.nodeType === TEXT_NODE
-    || node.nodeType === COMMENT_NODE
-    || node.nodeType === CDATA_NODE;
+function shouldIgnoreNode(node) {
+  return (
+    node.nodeType === TEXT_NODE ||
+    node.nodeType === COMMENT_NODE ||
+    node.nodeType === CDATA_NODE
+  );
 }
 
 /**
@@ -40,8 +41,8 @@ function shouldIgnoreNode (node) {
  * @returns {Boolean}
  * @api private
  */
-function isEmptyNode(node){
-  if(!node.childNodes || node.childNodes.length === 0) {
+function isEmptyNode(node) {
+  if (!node.childNodes || node.childNodes.length === 0) {
     return true;
   } else {
     return false;
@@ -62,11 +63,11 @@ function invariant(test, message) {
  * @api public
  */
 
-function parse (xml) {
-  var doc = new DOMParser().parseFromString(xml);
+function parse(xml) {
+  var doc = new DOMParser().parseFromString(xml, "text/xml");
   invariant(
-    doc.documentElement.nodeName === 'plist',
-    'malformed document. First element should be <plist>'
+    doc.documentElement.nodeName === "plist",
+    "malformed document. First element should be <plist>",
   );
   var plist = parsePlistXML(doc.documentElement);
 
@@ -85,143 +86,123 @@ function parse (xml) {
  * @api private
  */
 
-function parsePlistXML (node) {
+function parsePlistXML(node) {
   var i, new_obj, key, val, new_arr, res, counter, type;
 
-  if (!node)
-    return null;
+  if (!node) return null;
 
-  if (node.nodeName === 'plist') {
+  if (node.nodeName === "plist") {
     new_arr = [];
     if (isEmptyNode(node)) {
       return new_arr;
     }
-    for (i=0; i < node.childNodes.length; i++) {
+    for (i = 0; i < node.childNodes.length; i++) {
       if (!shouldIgnoreNode(node.childNodes[i])) {
-        new_arr.push( parsePlistXML(node.childNodes[i]));
+        new_arr.push(parsePlistXML(node.childNodes[i]));
       }
     }
     return new_arr;
-  } else if (node.nodeName === 'dict') {
+  } else if (node.nodeName === "dict") {
     new_obj = {};
     key = null;
     counter = 0;
     if (isEmptyNode(node)) {
       return new_obj;
     }
-    for (i=0; i < node.childNodes.length; i++) {
+    for (i = 0; i < node.childNodes.length; i++) {
       if (shouldIgnoreNode(node.childNodes[i])) continue;
       if (counter % 2 === 0) {
         invariant(
-          node.childNodes[i].nodeName === 'key',
-          'Missing key while parsing <dict/>.'
+          node.childNodes[i].nodeName === "key",
+          "Missing key while parsing <dict/>.",
         );
         key = parsePlistXML(node.childNodes[i]);
       } else {
         invariant(
-          node.childNodes[i].nodeName !== 'key',
-          'Unexpected key "'
-            + parsePlistXML(node.childNodes[i])
-            + '" while parsing <dict/>.'
+          node.childNodes[i].nodeName !== "key",
+          'Unexpected key "' +
+            parsePlistXML(node.childNodes[i]) +
+            '" while parsing <dict/>.',
         );
         new_obj[key] = parsePlistXML(node.childNodes[i]);
       }
       counter += 1;
     }
     if (counter % 2 === 1) {
-      new_obj[key] = '';
+      new_obj[key] = "";
     }
-    
-    return new_obj;
 
-  } else if (node.nodeName === 'array') {
+    return new_obj;
+  } else if (node.nodeName === "array") {
     new_arr = [];
     if (isEmptyNode(node)) {
       return new_arr;
     }
-    for (i=0; i < node.childNodes.length; i++) {
+    for (i = 0; i < node.childNodes.length; i++) {
       if (!shouldIgnoreNode(node.childNodes[i])) {
         res = parsePlistXML(node.childNodes[i]);
         if (null != res) new_arr.push(res);
       }
     }
     return new_arr;
-
-  } else if (node.nodeName === '#text') {
+  } else if (node.nodeName === "#text") {
     // TODO: what should we do with text types? (CDATA sections)
-
-  } else if (node.nodeName === 'key') {
+  } else if (node.nodeName === "key") {
     if (isEmptyNode(node)) {
-      return '';
+      return "";
     }
 
     invariant(
-      node.childNodes[0].nodeValue !== '__proto__',
-      '__proto__ keys can lead to prototype pollution. More details on CVE-2022-22912'
+      node.childNodes[0].nodeValue !== "__proto__",
+      "__proto__ keys can lead to prototype pollution. More details on CVE-2022-22912",
     );
 
     return node.childNodes[0].nodeValue;
-  } else if (node.nodeName === 'string') {
-    res = '';
+  } else if (node.nodeName === "string") {
+    res = "";
     if (isEmptyNode(node)) {
       return res;
     }
-    for (i=0; i < node.childNodes.length; i++) {
+    for (i = 0; i < node.childNodes.length; i++) {
       var type = node.childNodes[i].nodeType;
       if (type === TEXT_NODE || type === CDATA_NODE) {
         res += node.childNodes[i].nodeValue;
       }
     }
     return res;
-
-  } else if (node.nodeName === 'integer') {
-    invariant(
-      !isEmptyNode(node),
-      'Cannot parse "" as integer.'
-    );
+  } else if (node.nodeName === "integer") {
+    invariant(!isEmptyNode(node), 'Cannot parse "" as integer.');
     return parseInt(node.childNodes[0].nodeValue, 10);
-
-  } else if (node.nodeName === 'real') {
-    invariant(
-      !isEmptyNode(node),
-      'Cannot parse "" as real.'
-    );
-    res = '';
-    for (i=0; i < node.childNodes.length; i++) {
+  } else if (node.nodeName === "real") {
+    invariant(!isEmptyNode(node), 'Cannot parse "" as real.');
+    res = "";
+    for (i = 0; i < node.childNodes.length; i++) {
       if (node.childNodes[i].nodeType === TEXT_NODE) {
         res += node.childNodes[i].nodeValue;
       }
     }
     return parseFloat(res);
-
-  } else if (node.nodeName === 'data') {
-    res = '';
+  } else if (node.nodeName === "data") {
+    res = "";
     if (isEmptyNode(node)) {
-      return Buffer.from(res, 'base64');
+      return Buffer.from(res, "base64");
     }
-    for (i=0; i < node.childNodes.length; i++) {
+    for (i = 0; i < node.childNodes.length; i++) {
       if (node.childNodes[i].nodeType === TEXT_NODE) {
-        res += node.childNodes[i].nodeValue.replace(/\s+/g, '');
+        res += node.childNodes[i].nodeValue.replace(/\s+/g, "");
       }
     }
-    return Buffer.from(res, 'base64');
-
-  } else if (node.nodeName === 'date') {
-    invariant(
-      !isEmptyNode(node),
-      'Cannot parse "" as Date.'
-    )
+    return Buffer.from(res, "base64");
+  } else if (node.nodeName === "date") {
+    invariant(!isEmptyNode(node), 'Cannot parse "" as Date.');
     return new Date(node.childNodes[0].nodeValue);
-
-  } else if (node.nodeName === 'null') {
+  } else if (node.nodeName === "null") {
     return null;
-
-  } else if (node.nodeName === 'true') {
+  } else if (node.nodeName === "true") {
     return true;
-
-  } else if (node.nodeName === 'false') {
+  } else if (node.nodeName === "false") {
     return false;
   } else {
-    throw new Error('Invalid PLIST tag ' + node.nodeName);
+    throw new Error("Invalid PLIST tag " + node.nodeName);
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "plist",
   "description": "Apple's property list parser/builder for Node.js and browsers",
-  "version": "3.0.6",
+  "version": "3.1.1",
   "author": "Nathan Rajlich <nathan@tootallnate.net>",
   "contributors": [
     "Hans Huebner <hans.huebner@gmail.com>",
@@ -25,19 +25,19 @@
   ],
   "main": "index.js",
   "dependencies": {
+    "@xmldom/xmldom": "^0.9.10",
     "base64-js": "^1.5.1",
     "xmlbuilder": "^15.1.1"
   },
   "devDependencies": {
     "browserify": "^17.0.0",
-    "mocha": "^9.2.2",
-    "multiline": "^2.0.0",
+    "mocha": "^10.2.0",
     "zuul": "3.12.0"
   },
   "scripts": {
     "test": "make test"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10.4.0"
   }
 }

package/.travis.yml

@@ -1,22 +0,0 @@
-dist: xenial
-os: linux
-language: node_js
-node_js:
-- '6'
-- '7'
-- '8'
-- '9'
-
-env:
-  global:
-  - secure: R4tCAipsC0KdBPin8+rWedqptn0RXksLM20yZ0w8En0hhaglWCiIxA5uKt/6njXp9Q8FEKkVOyWF+yjq74jB6+KUu0dSK30pbmaAHhlXsL5kTWmY9vd7rxwcn1Hdf1sW15NqRX4hvWuIC32cA7vDr+58VPyum+A+yvPJICvgIlw=
-  - secure: sfEwCcmUrfFPIRPV8UwdJymRZ8YY20fuJiAlWfOUQSOccNGWB4RbUsD+iyc9XW5qB1kdOqxVkvZ0sKrYo3Uc4k8mhar7+yhP04hfNj4CWAigG3rtTugbar9kSQjwi/yEaTrb4kdP8HRYs5yjrEX/CGwjm3iHGOSyUw5du0PQfbk=
-
-jobs:
-  include:
-  - node_js: '8'
-    env: BROWSER_NAME=chrome BROWSER_VERSION=latest
-  - node_js: '8'
-    env: BROWSER_NAME=firefox BROWSER_VERSION=latest
-  - node_js: '8'
-    env: BROWSER_NAME=ie BROWSER_VERSION=11

package/lib/xmldom/dom-parser.js

@@ -1,253 +0,0 @@
-function DOMParser(options){
-	this.options = options ||{locator:{}};
-}
-
-DOMParser.prototype.parseFromString = function(source,mimeType){
-	var options = this.options;
-	var sax =  new XMLReader();
-	var domBuilder = options.domBuilder || new DOMHandler();//contentHandler and LexicalHandler
-	var errorHandler = options.errorHandler;
-	var locator = options.locator;
-	var defaultNSMap = options.xmlns||{};
-	var isHTML = /\/x?html?$/.test(mimeType);//mimeType.toLowerCase().indexOf('html') > -1;
-  	var entityMap = isHTML?htmlEntity.entityMap:{'lt':'<','gt':'>','amp':'&','quot':'"','apos':"'"};
-	if(locator){
-		domBuilder.setDocumentLocator(locator)
-	}
-
-	sax.errorHandler = buildErrorHandler(errorHandler,domBuilder,locator);
-	sax.domBuilder = options.domBuilder || domBuilder;
-	if(isHTML){
-		defaultNSMap['']= 'http://www.w3.org/1999/xhtml';
-	}
-	defaultNSMap.xml = defaultNSMap.xml || 'http://www.w3.org/XML/1998/namespace';
-	if(source && typeof source === 'string'){
-		sax.parse(source,defaultNSMap,entityMap);
-	}else{
-		sax.errorHandler.error("invalid doc source");
-	}
-	return domBuilder.doc;
-}
-function buildErrorHandler(errorImpl,domBuilder,locator){
-	if(!errorImpl){
-		if(domBuilder instanceof DOMHandler){
-			return domBuilder;
-		}
-		errorImpl = domBuilder ;
-	}
-	var errorHandler = {}
-	var isCallback = errorImpl instanceof Function;
-	locator = locator||{}
-	function build(key){
-		var fn = errorImpl[key];
-		if(!fn && isCallback){
-			fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl;
-		}
-		errorHandler[key] = fn && function(msg){
-			fn('[xmldom '+key+']\t'+msg+_locator(locator));
-		}||function(){};
-	}
-	build('warning');
-	build('error');
-	build('fatalError');
-	return errorHandler;
-}
-
-//console.log('#\n\n\n\n\n\n\n####')
-/**
- * +ContentHandler+ErrorHandler
- * +LexicalHandler+EntityResolver2
- * -DeclHandler-DTDHandler
- *
- * DefaultHandler:EntityResolver, DTDHandler, ContentHandler, ErrorHandler
- * DefaultHandler2:DefaultHandler,LexicalHandler, DeclHandler, EntityResolver2
- * @link http://www.saxproject.org/apidoc/org/xml/sax/helpers/DefaultHandler.html
- */
-function DOMHandler() {
-    this.cdata = false;
-}
-function position(locator,node){
-	node.lineNumber = locator.lineNumber;
-	node.columnNumber = locator.columnNumber;
-}
-/**
- * @see org.xml.sax.ContentHandler#startDocument
- * @link http://www.saxproject.org/apidoc/org/xml/sax/ContentHandler.html
- */
-DOMHandler.prototype = {
-	startDocument : function() {
-    	this.doc = new DOMImplementation().createDocument(null, null, null);
-    	if (this.locator) {
-        	this.doc.documentURI = this.locator.systemId;
-    	}
-	},
-	startElement:function(namespaceURI, localName, qName, attrs) {
-		var doc = this.doc;
-	    var el = doc.createElementNS(namespaceURI, qName||localName);
-	    var len = attrs.length;
-	    appendElement(this, el);
-	    this.currentElement = el;
-
-		this.locator && position(this.locator,el)
-	    for (var i = 0 ; i < len; i++) {
-	        var namespaceURI = attrs.getURI(i);
-	        var value = attrs.getValue(i);
-	        var qName = attrs.getQName(i);
-			var attr = doc.createAttributeNS(namespaceURI, qName);
-			this.locator &&position(attrs.getLocator(i),attr);
-			attr.value = attr.nodeValue = value;
-			el.setAttributeNode(attr)
-	    }
-	},
-	endElement:function(namespaceURI, localName, qName) {
-		var current = this.currentElement
-		var tagName = current.tagName;
-		this.currentElement = current.parentNode;
-	},
-	startPrefixMapping:function(prefix, uri) {
-	},
-	endPrefixMapping:function(prefix) {
-	},
-	processingInstruction:function(target, data) {
-	    var ins = this.doc.createProcessingInstruction(target, data);
-	    this.locator && position(this.locator,ins)
-	    appendElement(this, ins);
-	},
-	ignorableWhitespace:function(ch, start, length) {
-	},
-	characters:function(chars, start, length) {
-		chars = _toString.apply(this,arguments)
-		//console.log(chars)
-		if(chars){
-			if (this.cdata) {
-				var charNode = this.doc.createCDATASection(chars);
-			} else {
-				var charNode = this.doc.createTextNode(chars);
-			}
-			if(this.currentElement){
-				this.currentElement.appendChild(charNode);
-			}else if(/^\s*$/.test(chars)){
-				this.doc.appendChild(charNode);
-				//process xml
-			}
-			this.locator && position(this.locator,charNode)
-		}
-	},
-	skippedEntity:function(name) {
-	},
-	endDocument:function() {
-		this.doc.normalize();
-	},
-	setDocumentLocator:function (locator) {
-	    if(this.locator = locator){// && !('lineNumber' in locator)){
-	    	locator.lineNumber = 0;
-	    }
-	},
-	//LexicalHandler
-	comment:function(chars, start, length) {
-		chars = _toString.apply(this,arguments)
-	    var comm = this.doc.createComment(chars);
-	    this.locator && position(this.locator,comm)
-	    appendElement(this, comm);
-	},
-
-	startCDATA:function() {
-	    //used in characters() methods
-	    this.cdata = true;
-	},
-	endCDATA:function() {
-	    this.cdata = false;
-	},
-
-	startDTD:function(name, publicId, systemId) {
-		var impl = this.doc.implementation;
-	    if (impl && impl.createDocumentType) {
-	        var dt = impl.createDocumentType(name, publicId, systemId);
-	        this.locator && position(this.locator,dt)
-	        appendElement(this, dt);
-	    }
-	},
-	/**
-	 * @see org.xml.sax.ErrorHandler
-	 * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html
-	 */
-	warning:function(error) {
-		console.warn('[xmldom warning]\t'+error,_locator(this.locator));
-	},
-	error:function(error) {
-		console.error('[xmldom error]\t'+error,_locator(this.locator));
-	},
-	fatalError:function(error) {
-		throw new ParseError(error, this.locator);
-	}
-}
-function _locator(l){
-	if(l){
-		return '\n@'+(l.systemId ||'')+'#[line:'+l.lineNumber+',col:'+l.columnNumber+']'
-	}
-}
-function _toString(chars,start,length){
-	if(typeof chars == 'string'){
-		return chars.substr(start,length)
-	}else{//java sax connect width xmldom on rhino(what about: "? && !(chars instanceof String)")
-		if(chars.length >= start+length || start){
-			return new java.lang.String(chars,start,length)+'';
-		}
-		return chars;
-	}
-}
-
-/*
- * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/LexicalHandler.html
- * used method of org.xml.sax.ext.LexicalHandler:
- *  #comment(chars, start, length)
- *  #startCDATA()
- *  #endCDATA()
- *  #startDTD(name, publicId, systemId)
- *
- *
- * IGNORED method of org.xml.sax.ext.LexicalHandler:
- *  #endDTD()
- *  #startEntity(name)
- *  #endEntity(name)
- *
- *
- * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/DeclHandler.html
- * IGNORED method of org.xml.sax.ext.DeclHandler
- * 	#attributeDecl(eName, aName, type, mode, value)
- *  #elementDecl(name, model)
- *  #externalEntityDecl(name, publicId, systemId)
- *  #internalEntityDecl(name, value)
- * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/EntityResolver2.html
- * IGNORED method of org.xml.sax.EntityResolver2
- *  #resolveEntity(String name,String publicId,String baseURI,String systemId)
- *  #resolveEntity(publicId, systemId)
- *  #getExternalSubset(name, baseURI)
- * @link http://www.saxproject.org/apidoc/org/xml/sax/DTDHandler.html
- * IGNORED method of org.xml.sax.DTDHandler
- *  #notationDecl(name, publicId, systemId) {};
- *  #unparsedEntityDecl(name, publicId, systemId, notationName) {};
- */
-"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(key){
-	DOMHandler.prototype[key] = function(){return null}
-})
-
-/* Private static helpers treated below as private instance methods, so don't need to add these to the public API; we might use a Relator to also get rid of non-standard public properties */
-function appendElement (hander,node) {
-    if (!hander.currentElement) {
-        hander.doc.appendChild(node);
-    } else {
-        hander.currentElement.appendChild(node);
-    }
-}//appendChild and setAttributeNS are preformance key
-
-//if(typeof require == 'function'){
-var htmlEntity = require('./entities');
-var sax = require('./sax');
-var XMLReader = sax.XMLReader;
-var ParseError = sax.ParseError;
-var DOMImplementation = exports.DOMImplementation = require('./dom').DOMImplementation;
-exports.XMLSerializer = require('./dom').XMLSerializer ;
-exports.DOMParser = DOMParser;
-exports.__DOMHandler = DOMHandler;
-//}