graphology-gexf - npm Package Compare versions

Comparing version 0.3.1 to 0.4.0

browser/parser.js

@@ -1,2 +0,1 @@
-/* eslint no-self-compare: 0 */
 /**
@@ -8,339 +7,4 @@ * Graphology Browser GEXF Parser
  */
-var isGraphConstructor = require('graphology-utils/is-graph-constructor'),
-    helpers = require('../common/helpers.js');
+var createParserFunction = require('../common/parser.js');
 
-var cast = helpers.cast;
-
-/**
- * Function checking whether the given value is a NaN.
- *
- * @param  {any} value - Value to test.
- * @return {boolean}
- */
-function isReallyNaN(value) {
-  return value !== value;
-}
-
-/**
- * Function used to convert a viz:color attribute into a CSS rgba? string.
- *
- * @param  {Node}   element - DOM element.
- * @return {string}
- */
-function toRGBString(element) {
-  var a = element.getAttribute('a'),
-      r = element.getAttribute('r'),
-      g = element.getAttribute('g'),
-      b = element.getAttribute('b');
-
-  return a ?
-    ('rgba(' + r + ',' + g + ',' + b + ',' + a + ')') :
-    ('rgb(' + r + ',' + g + ',' + b + ')');
-}
-
-/**
- * Function returning the first matching tag of the `viz` namespace matching
- * the desired tag name.
- *
- * @param  {Node}   element - Target DOM element.
- * @param  {string} name    - Tag name.
- * @return {Node}
- */
-function getFirstMatchingVizTag(element, name) {
-  var vizElement = element.getElementsByTagName('viz:' + name)[0];
-
-  if (!vizElement)
-    vizElement = element.getElementsByTagNameNS('viz', name)[0];
-
-  if (!vizElement)
-    vizElement = element.getElementsByTagName(name)[0];
-
-  return vizElement;
-}
-
-/**
- * Function used to collect meta information.
- *
- * @param  {Array<Node>} elements - Target DOM element.
- * @return {object}
- */
-function collectMeta(elements) {
-  var meta = {},
-      element;
-
-  for (var i = 0, l = elements.length; i < l; i++) {
-    element = elements[i];
-
-    if (element.nodeName === '#text')
-      continue;
-
-    meta[element.tagName.toLowerCase()] = element.textContent;
-  }
-
-  return meta;
-}
-
-/**
- * Function used to extract the model from the right elements.
- *
- * @param  {Array<Node>} elements - Target DOM elements.
- * @return {array}                - The model & default attributes.
- */
-function extractModel(elements) {
-  var model = {},
-      defaults = {},
-      element,
-      defaultElement,
-      id;
-
-  for (var i = 0, l = elements.length; i < l; i++) {
-    element = elements[i];
-    id = element.getAttribute('id') || element.getAttribute('for');
-
-    model[id] = {
-      id: id,
-      type: element.getAttribute('type') || 'string',
-      title: !isReallyNaN(+id) ?
-        (element.getAttribute('title') || id) :
-        id
-    };
-
-    // Default?
-    defaultElement = element.getElementsByTagName('default')[0];
-
-    if (defaultElement)
-      defaults[model[id].title] = cast(
-        model[id].type,
-        defaultElement.textContent
-      );
-  }
-
-  return [model, defaults];
-}
-
-/**
- * Function used to collect an element's attributes.
- *
- * @param  {object} model   - Data model to use.
- * @param  {Node}   element - Target DOM element.
- * @return {object}         - The collected attributes.
- */
-function collectAttributes(model, element) {
-  var data = {},
-      label = element.getAttribute('label'),
-      weight = element.getAttribute('weight');
-
-  if (label)
-    data.label = label;
-
-  if (weight)
-    data.weight = +weight;
-
-  var valueElements = element.getElementsByTagName('attvalue'),
-      valueElement,
-      id;
-
-  for (var i = 0, l = valueElements.length; i < l; i++) {
-    valueElement = valueElements[i];
-    id = (
-      valueElement.getAttribute('id') ||
-      valueElement.getAttribute('for')
-    );
-
-    data[model[id].title] = cast(
-      model[id].type,
-      valueElement.getAttribute('value')
-    );
-  }
-
-  // TODO: shortcut here to avoid viz when namespace is not set
-
-  // Attempting to find viz namespace tags
-
-  //-- 1) Color
-  var vizElement = getFirstMatchingVizTag(element, 'color');
-
-  if (vizElement)
-    data.color = toRGBString(vizElement);
-
-  //-- 2) Size
-  vizElement = getFirstMatchingVizTag(element, 'size');
-
-  if (vizElement)
-    data.size = +vizElement.getAttribute('value');
-
-  //-- 3) Position
-  var x, y, z;
-
-  vizElement = getFirstMatchingVizTag(element, 'position');
-
-  if (vizElement) {
-    x = vizElement.getAttribute('x');
-    y = vizElement.getAttribute('y');
-    z = vizElement.getAttribute('z');
-
-    if (x)
-      data.x = +x;
-    if (y)
-      data.y = +y;
-    if (z)
-      data.z = +z;
-  }
-
-  //-- 4) Shape
-  vizElement = getFirstMatchingVizTag(element, 'shape');
-
-  if (vizElement)
-    data.shape = vizElement.getAttribute('value');
-
-  //-- 5) Thickness
-  vizElement = getFirstMatchingVizTag(element, 'thickness');
-
-  if (vizElement)
-    data.thickness = +vizElement.getAttribute('value');
-
-  return data;
-}
-
-/**
- * Function taking either a string or a document and returning a
- * graphology instance.
- *
- * @param  {function}        Graph  - A graphology constructor.
- * @param  {string|Document} source - The source to parse.
- */
-
-// TODO: option to map the data to the attributes for customization, nodeModel, edgeModel, nodeReducer, edgeReducer
-// TODO: option to disable the model mapping heuristic
-module.exports = function parse(Graph, source) {
-  var xmlDoc = source;
-
-  var element,
-      result,
-      type,
-      attributes,
-      id,
-      s,
-      t,
-      i,
-      l;
-
-  if (!isGraphConstructor(Graph))
-    throw new Error('graphology-gexf/browser/parser: invalid Graph constructor.');
-
-  // If source is a string, we are going to parse it
-  if (typeof source === 'string')
-    xmlDoc = (new DOMParser()).parseFromString(source, 'application/xml');
-
-  if (!(xmlDoc instanceof Document))
-    throw new Error('graphology-gexf/browser/parser: source should either be a XML document or a string.');
-
-  // Finding useful elements
-  var GRAPH_ELEMENT = xmlDoc.getElementsByTagName('graph')[0],
-      META_ELEMENT = xmlDoc.getElementsByTagName('meta')[0],
-      META_ELEMENTS = (META_ELEMENT && META_ELEMENT.childNodes) || [],
-      NODE_ELEMENTS = xmlDoc.getElementsByTagName('node'),
-      EDGE_ELEMENTS = xmlDoc.getElementsByTagName('edge'),
-      MODEL_ELEMENTS = xmlDoc.getElementsByTagName('attributes'),
-      NODE_MODEL_ELEMENTS = [],
-      EDGE_MODEL_ELEMENTS = [];
-
-  for (i = 0, l = MODEL_ELEMENTS.length; i < l; i++) {
-    element = MODEL_ELEMENTS[i];
-
-    if (element.getAttribute('class') === 'node')
-      NODE_MODEL_ELEMENTS = element.getElementsByTagName('attribute');
-    else if (element.getAttribute('class') === 'edge')
-      EDGE_MODEL_ELEMENTS = element.getElementsByTagName('attribute');
-  }
-
-  // Information
-  var DEFAULT_EDGE_TYPE = GRAPH_ELEMENT.getAttribute('defaultedgetype') || 'undirected';
-
-  if (DEFAULT_EDGE_TYPE === 'mutual')
-    DEFAULT_EDGE_TYPE = 'undirected';
-
-  // Computing models
-  result = extractModel(NODE_MODEL_ELEMENTS);
-
-  var NODE_MODEL = result[0],
-      NODE_DEFAULT_ATTRIBUTES = result[1];
-
-  result = extractModel(EDGE_MODEL_ELEMENTS);
-
-  var EDGE_MODEL = result[0],
-      EDGE_DEFAULT_ATTRIBUTES = result[1];
-
-  // Polling the first edge to guess the type of the edges
-  var graphType = EDGE_ELEMENTS[0] ?
-    (EDGE_ELEMENTS[0].getAttribute('type') || DEFAULT_EDGE_TYPE) :
-    'mixed';
-
-  // Instantiating our graph
-  var graph = new Graph({
-    type: graphType,
-    defaultNodeAttributes: NODE_DEFAULT_ATTRIBUTES,
-    defaultEdgeAttributes: EDGE_DEFAULT_ATTRIBUTES
-  });
-
-  // Collecting meta
-  var meta = collectMeta(META_ELEMENTS),
-      lastModifiedDate = META_ELEMENT && META_ELEMENT.getAttribute('lastmodifieddate');
-
-  graph.replaceAttributes(meta);
-
-  if (lastModifiedDate)
-    graph.setAttribute('lastModifiedDate', lastModifiedDate);
-
-  // Adding nodes
-  for (i = 0, l = NODE_ELEMENTS.length; i < l; i++) {
-    element = NODE_ELEMENTS[i];
-
-    graph.addNode(
-      element.getAttribute('id'),
-      collectAttributes(NODE_MODEL, element)
-    );
-  }
-
-  // Adding edges
-  for (i = 0, l = EDGE_ELEMENTS.length; i < l; i++) {
-    element = EDGE_ELEMENTS[i];
-
-    id = element.getAttribute('id');
-    type = element.getAttribute('type') || DEFAULT_EDGE_TYPE;
-    s = element.getAttribute('source');
-    t = element.getAttribute('target');
-    attributes = collectAttributes(EDGE_MODEL, element);
-
-    // If we encountered an edge with a different type, we upgrade the graph
-    if (type !== graph.type && graph.type !== 'mixed') {
-      graph.upgradeToMixed();
-    }
-
-    // If we encountered twice the same edge, we upgrade the graph
-    if (
-      !graph.multi &&
-      (
-        (type === 'directed' && graph.hasDirectedEdge(s, t)) ||
-        (graph.hasUndirectedEdge(s, t))
-      )
-    ) {
-      graph.upgradeToMulti();
-    }
-
-    if (id) {
-      if (type === 'directed')
-        graph.addDirectedEdgeWithKey(id, s, t, attributes);
-      else
-        graph.addUndirectedEdgeWithKey(id, s, t, attributes);
-    }
-    else {
-      if (type === 'directed')
-        graph.addDirectedEdge(s, t, attributes);
-      else
-        graph.addUndirectedEdge(s, t, attributes);
-    }
-  }
-
-  return graph;
-};
+module.exports = createParserFunction(DOMParser, Document);

node/index.js

@@ -7,2 +7,11 @@ /**
  */
+var xmldom = require('xmldom'),
+    createParserFunction = require('../common/parser.js');
+
+var doc = (new xmldom.DOMParser()).parseFromString('<t></t>', 'application/xml');
+
+exports.parse = createParserFunction(
+  xmldom.DOMParser,
+  doc.constructor
+);
 exports.write = require('../common/writer.js');

package.json

 {
   "name": "graphology-gexf",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "GEXF parser & writer for graphology.",
@@ -14,2 +14,3 @@ "main": "index.js",
     "lint": "eslint ./**/*.js",
+    "prepublish": "npm run lint && npm test",
     "test:browser": "mocha ./test/browser/endpoint.js",
@@ -37,7 +38,6 @@ "test": "npm run test:browser"
   "devDependencies": {
-    "@yomguithereal/eslint-config": "^3.0.0",
-    "eslint": "^3.5.0",
-    "graphology": "^0.7.0",
-    "mocha": "^3.0.2",
-    "xmldom": "^0.1.27"
+    "@yomguithereal/eslint-config": "^4.0.0",
+    "eslint": "^4.19.1",
+    "graphology": "^0.11.4",
+    "mocha": "^5.2.0"
   },
@@ -51,5 +51,6 @@ "eslintConfig": {
   "dependencies": {
-    "graphology-utils": "^1.1.1",
+    "graphology-utils": "^1.3.0",
+    "xmldom": "^0.1.27",
     "xml-writer": "^1.7.0"
   }
 }

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

25864

increased by3.93%

Dev dependency count

4

decreased by-20%

Number of package files

11

increased by10%

Lines of code

736

increased by2.94%

Worsened metrics

Dependency count

3

increased by50%

Dependency changes

• + Addedxmldom@^0.1.27

• + Addedxmldom@0.1.31(transitive)

• Updatedgraphology-utils@^1.3.0