iab-vast-parser - npm Package Compare versions

Comparing version 0.5.1 to 0.6.0

lib/xml/unmarshaler.js

@@ -98,4 +98,6 @@ 'use strict';
         var prop = toProperty(childName);
-        if (_this._isFreeform(parentName, childName)) {
-          _this._addFreeformChild(child, prop, node);
+        if (_this._isFreeformParent(parentName)) {
+          if (_this._isFreeformChild(parentName, childName)) {
+            _this._addFreeformChild(child, prop, node);
+          }
         } else {
@@ -136,4 +138,9 @@ _this._addNodeChild(child, prop, node, parentName, childName);
   }, {
-    key: '_isFreeform',
-    value: function _isFreeform(parentName, childName) {
+    key: '_isFreeformParent',
+    value: function _isFreeformParent(name) {
+      return this._freeforms[name] != null;
+    }
+  }, {
+    key: '_isFreeformChild',
+    value: function _isFreeformChild(parentName, childName) {
       return hasPair(this._freeforms, parentName, childName);
@@ -147,2 +154,2 @@ }
 exports.default = Unmarshaler;
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["xml/unmarshaler.js"],"names":["toProperty","re","insert","m","length","toLowerCase","substr","charAt","str","replace","hasPair","map","parentName","childName","indexOf","Unmarshaler","collections","freeforms","types","_collections","_freeforms","_types","xml","_createNode","node","Object","create","_value","_convertPropertyValue","nodeName","_copyAttributes","_createCollections","_createChildren","i","attributes","attrNode","name","rawValue","nodeValue","forEach","child","prop","_isFreeform","_addFreeformChild","_addNodeChild","parentNode","childNode","_isCollection","push","Error","_createFreeformNode","value","property","typeId"],"mappings":"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","file":"xml/unmarshaler.js","sourcesContent":["import {getText, getChildren, isElement} from './dom'\nimport convertors from './convertors'\n\nconst toProperty = (() => {\n  const re = /^[A-Z]+/\n  const insert = (m) => (m.length === 1) ? m.toLowerCase()\n    : m.substr(0, m.length - 1).toLowerCase() + m.charAt(m.length - 1)\n  return (str) => str.replace(re, insert)\n})()\n\nconst hasPair = (map, parentName, childName) => {\n  return (map[parentName] != null && ~map[parentName].indexOf(childName))\n}\n\nexport default class Unmarshaler {\n  constructor ({collections, freeforms, types}) {\n    this._collections = collections\n    this._freeforms = freeforms\n    this._types = types\n  }\n\n  unmarshal (xml) {\n    return this._createNode(xml)\n  }\n\n  _createNode (xml) {\n    const node = Object.create(null)\n    node._value = this._convertPropertyValue(getText(xml), xml.nodeName, '_value')\n    this._copyAttributes(node, xml)\n    this._createCollections(node, xml)\n    this._createChildren(node, xml)\n    return node\n  }\n\n  _createFreeformNode (xml) {\n    const node = Object.create(null)\n    this._copyAttributes(node, xml)\n    node._value = xml\n    return node\n  }\n\n  _copyAttributes (node, xml) {\n    const parentName = xml.nodeName\n    for (let i = 0; i < xml.attributes.length; ++i) {\n      const attrNode = xml.attributes[i]\n      const name = attrNode.nodeName\n      const rawValue = attrNode.nodeValue\n      node[name] = this._convertPropertyValue(rawValue, parentName, name)\n    }\n  }\n\n  _createCollections (node, xml) {\n    if (this._collections[xml.nodeName] != null) {\n      this._collections[xml.nodeName].forEach((childName) => {\n        node[toProperty(childName)] = []\n      })\n    }\n  }\n\n  _createChildren (node, xml) {\n    const parentName = xml.nodeName\n    getChildren(xml, isElement).forEach((child) => {\n      const childName = child.nodeName\n      const prop = toProperty(childName)\n      if (this._isFreeform(parentName, childName)) {\n        this._addFreeformChild(child, prop, node)\n      } else {\n        this._addNodeChild(child, prop, node, parentName, childName)\n      }\n    })\n  }\n\n  _addNodeChild (child, prop, parentNode, parentName, childName) {\n    const childNode = this._createNode(child)\n    if (parentNode[prop] == null) {\n      parentNode[prop] = childNode\n    } else if (this._isCollection(parentName, childName)) {\n      parentNode[prop].push(childNode)\n    } else {\n      throw new Error(`Multiple values for ${parentName}.${childName}`)\n    }\n  }\n\n  _addFreeformChild (child, prop, parentNode) {\n    parentNode[prop] = parentNode[prop] || []\n    parentNode[prop].push(this._createFreeformNode(child))\n  }\n\n  _convertPropertyValue (value, parentName, property) {\n    const typeId = (this._types[parentName] != null) ? this._types[parentName][property] : null\n    return (typeId != null) ? convertors[typeId](value) : value\n  }\n\n  _isCollection (parentName, childName) {\n    return hasPair(this._collections, parentName, childName)\n  }\n\n  _isFreeform (parentName, childName) {\n    return hasPair(this._freeforms, parentName, childName)\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["xml/unmarshaler.js"],"names":["toProperty","re","insert","m","length","toLowerCase","substr","charAt","str","replace","hasPair","map","parentName","childName","indexOf","Unmarshaler","collections","freeforms","types","_collections","_freeforms","_types","xml","_createNode","node","Object","create","_value","_convertPropertyValue","nodeName","_copyAttributes","_createCollections","_createChildren","i","attributes","attrNode","name","rawValue","nodeValue","forEach","child","prop","_isFreeformParent","_isFreeformChild","_addFreeformChild","_addNodeChild","parentNode","childNode","_isCollection","push","Error","_createFreeformNode","value","property","typeId"],"mappings":"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","file":"xml/unmarshaler.js","sourcesContent":["import {getText, getChildren, isElement} from './dom'\nimport convertors from './convertors'\n\nconst toProperty = (() => {\n  const re = /^[A-Z]+/\n  const insert = (m) => (m.length === 1) ? m.toLowerCase()\n    : m.substr(0, m.length - 1).toLowerCase() + m.charAt(m.length - 1)\n  return (str) => str.replace(re, insert)\n})()\n\nconst hasPair = (map, parentName, childName) =>\n  (map[parentName] != null && ~map[parentName].indexOf(childName))\n\nexport default class Unmarshaler {\n  constructor ({collections, freeforms, types}) {\n    this._collections = collections\n    this._freeforms = freeforms\n    this._types = types\n  }\n\n  unmarshal (xml) {\n    return this._createNode(xml)\n  }\n\n  _createNode (xml) {\n    const node = Object.create(null)\n    node._value = this._convertPropertyValue(getText(xml), xml.nodeName, '_value')\n    this._copyAttributes(node, xml)\n    this._createCollections(node, xml)\n    this._createChildren(node, xml)\n    return node\n  }\n\n  _createFreeformNode (xml) {\n    const node = Object.create(null)\n    this._copyAttributes(node, xml)\n    node._value = xml\n    return node\n  }\n\n  _copyAttributes (node, xml) {\n    const parentName = xml.nodeName\n    for (let i = 0; i < xml.attributes.length; ++i) {\n      const attrNode = xml.attributes[i]\n      const name = attrNode.nodeName\n      const rawValue = attrNode.nodeValue\n      node[name] = this._convertPropertyValue(rawValue, parentName, name)\n    }\n  }\n\n  _createCollections (node, xml) {\n    if (this._collections[xml.nodeName] != null) {\n      this._collections[xml.nodeName].forEach((childName) => {\n        node[toProperty(childName)] = []\n      })\n    }\n  }\n\n  _createChildren (node, xml) {\n    const parentName = xml.nodeName\n    getChildren(xml, isElement).forEach((child) => {\n      const childName = child.nodeName\n      const prop = toProperty(childName)\r\n      if (this._isFreeformParent(parentName)) {\r\n        if (this._isFreeformChild(parentName, childName)) {\r\n          this._addFreeformChild(child, prop, node)\r\n        }\r\n      } else {\r\n        this._addNodeChild(child, prop, node, parentName, childName)\r\n      }\r\n    })\n  }\n\n  _addNodeChild (child, prop, parentNode, parentName, childName) {\n    const childNode = this._createNode(child)\n    if (parentNode[prop] == null) {\n      parentNode[prop] = childNode\n    } else if (this._isCollection(parentName, childName)) {\n      parentNode[prop].push(childNode)\n    } else {\n      throw new Error(`Multiple values for ${parentName}.${childName}`)\n    }\n  }\n\n  _addFreeformChild (child, prop, parentNode) {\n    parentNode[prop] = parentNode[prop] || []\n    parentNode[prop].push(this._createFreeformNode(child))\n  }\n\n  _convertPropertyValue (value, parentName, property) {\n    const typeId = (this._types[parentName] != null) ? this._types[parentName][property] : null\n    return (typeId != null) ? convertors[typeId](value) : value\n  }\n\n  _isCollection (parentName, childName) {\n    return hasPair(this._collections, parentName, childName)\n  }\r\n\r\n  _isFreeformParent (name) {\r\n    return (this._freeforms[name] != null)\r\n  }\n\n  _isFreeformChild (parentName, childName) {\n    return hasPair(this._freeforms, parentName, childName)\n  }\n}\n"]}

package.json

 {
   "name": "iab-vast-parser",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Parses IAB VAST tags into iab-vast-model objects.",
@@ -5,0 +5,0 @@ "main": "index.js",

src/xml/unmarshaler.js

@@ -11,5 +11,4 @@ import {getText, getChildren, isElement} from './dom'
 
-const hasPair = (map, parentName, childName) => {
-  return (map[parentName] != null && ~map[parentName].indexOf(childName))
-}
+const hasPair = (map, parentName, childName) =>
+  (map[parentName] != null && ~map[parentName].indexOf(childName))
 
@@ -66,4 +65,6 @@ export default class Unmarshaler {
       const prop = toProperty(childName)
-      if (this._isFreeform(parentName, childName)) {
-        this._addFreeformChild(child, prop, node)
+      if (this._isFreeformParent(parentName)) {
+        if (this._isFreeformChild(parentName, childName)) {
+          this._addFreeformChild(child, prop, node)
+        }
       } else {
@@ -100,5 +101,9 @@ this._addNodeChild(child, prop, node, parentName, childName)
 
-  _isFreeform (parentName, childName) {
+  _isFreeformParent (name) {
+    return (this._freeforms[name] != null)
+  }
+
+  _isFreeformChild (parentName, childName) {
     return hasPair(this._freeforms, parentName, childName)
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

141197

increased by0.56%

Lines of code

1997

increased by0.66%

No dependency changes