Merge branch 'master' of https://github.com/linkeddata/rdflib.js

linkeddata · Aug 9, 2016 · c04068e · c04068e
2 parents 436a486 + 3482d14
commit c04068e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/dist/rdflib.js b/dist/rdflib.js
@@ -22727,7 +22727,10 @@ var Literal = function (_Node) {
   }, {
     key: 'fromValue',
     value: function fromValue(value) {
-      if (!value || value instanceof Node) {
+      if (value instanceof Node) {
+        return value;
+      }
+      if (typeof value === 'undefined' || value === null) {
         return value;
       }
       switch (typeof value === 'undefined' ? 'undefined' : _typeof(value)) {
@@ -22736,9 +22739,9 @@ var Literal = function (_Node) {
             return Literal.fromDate(value);
           }
         case 'boolean':
-          return new Literal.fromBoolean(value);
+          return Literal.fromBoolean(value);
         case 'number':
-          return new Literal.fromNumber(value);
+          return Literal.fromNumber(value);
         case 'string':
           return new Literal(value);
       }
@@ -24456,7 +24459,10 @@ module.exports = Node;
 Node.fromValue = function fromValue(value) {
   var Collection = require('./collection');
   var Literal = require('./literal');
-  if (!value || value instanceof Node || value instanceof Collection) {
+  if (value instanceof Node || value instanceof Collection) {
+    return value;
+  }
+  if (typeof value === 'undefined' || value === null) {
     return value;
   }
   if (Array.isArray(value)) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "engines": {
     "node": "^6.0"
   },

diff --git a/src/literal.js b/src/literal.js
@@ -102,7 +102,10 @@ class Literal extends Node {
    * @return {Literal}
    */
   static fromValue (value) {
-    if (!value || value instanceof Node) {
+    if (value instanceof Node) {
+      return value
+    }
+    if (typeof value === 'undefined' || value === null) {
       return value
     }
     switch (typeof value) {

diff --git a/src/node.js b/src/node.js
@@ -59,7 +59,10 @@ module.exports = Node
 Node.fromValue = function fromValue (value) {
   const Collection = require('./collection')
   const Literal = require('./literal')
-  if (!value || value instanceof Node || value instanceof Collection) {
+  if (value instanceof Node || value instanceof Collection) {
+    return value
+  }
+  if (typeof value === 'undefined' || value === null) {
     return value
   }
   if (Array.isArray(value)) {