source-map - npm Package Compare versions

Comparing version 0.1.41 to 0.1.42

CHANGELOG.md

 # Change Log
 
+## 0.1.42
+
+* Fix an issue where `SourceNode`s from different versions of the source-map
+  library couldn't be used in conjunction with each other. See issue #142.
+
 ## 0.1.41
@@ -4,0 +9,0 @@

lib/source-map/base64-vlq.js

@@ -69,3 +69,3 @@ /* -*- Mode: js; js-indent-level: 2; -*- */
    * Converts from a two-complement value to a value where the sign bit is
-   * is placed in the least significant bit.  For example, as decimals:
+   * placed in the least significant bit.  For example, as decimals:
    *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
@@ -82,3 +82,3 @@ *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
    * Converts to a two-complement value from a value where the sign bit is
-   * is placed in the least significant bit.  For example, as decimals:
+   * placed in the least significant bit.  For example, as decimals:
    *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
@@ -85,0 +85,0 @@ *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2

lib/source-map/source-node.js

@@ -22,2 +22,7 @@ /* -*- Mode: js; js-indent-level: 2; -*- */
 
+  // Private symbol for identifying `SourceNode`s when multiple versions of
+  // the source-map library are loaded. This MUST NOT CHANGE across
+  // versions!
+  var isSourceNode = "$$$isSourceNode$$$";
+
   /**
@@ -42,2 +47,3 @@ * SourceNodes provide a way to abstract over interpolating/concatenating
     this.name = aName == null ? null : aName;
+    this[isSourceNode] = true;
     if (aChunks != null) this.add(aChunks);
@@ -173,3 +179,3 @@ }
     }
-    else if (aChunk instanceof SourceNode || typeof aChunk === "string") {
+    else if (aChunk[isSourceNode] || typeof aChunk === "string") {
       if (aChunk) {
@@ -199,3 +205,3 @@ this.children.push(aChunk);
     }
-    else if (aChunk instanceof SourceNode || typeof aChunk === "string") {
+    else if (aChunk[isSourceNode] || typeof aChunk === "string") {
       this.children.unshift(aChunk);
@@ -222,3 +228,3 @@ }
       chunk = this.children[i];
-      if (chunk instanceof SourceNode) {
+      if (chunk[isSourceNode]) {
         chunk.walk(aFn);
@@ -268,3 +274,3 @@ }
     var lastChild = this.children[this.children.length - 1];
-    if (lastChild instanceof SourceNode) {
+    if (lastChild[isSourceNode]) {
       lastChild.replaceRight(aPattern, aReplacement);
@@ -302,3 +308,3 @@ }
       for (var i = 0, len = this.children.length; i < len; i++) {
-        if (this.children[i] instanceof SourceNode) {
+        if (this.children[i][isSourceNode]) {
           this.children[i].walkSourceContents(aFn);
@@ -305,0 +311,0 @@ }

package.json

 {
   "name": "source-map",
   "description": "Generates and consumes source maps",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "homepage": "https://github.com/mozilla/source-map",
@@ -33,3 +33,4 @@ "author": "Nick Fitzgerald <[e-mail]>",
     "Chris Montgomery <[e-mail]>",
-    "J. Ryan Stinnett <[e-mail]>"
+    "J. Ryan Stinnett <[e-mail]>",
+    "Jack Herrington <[e-mail]>"
   ],
@@ -36,0 +37,0 @@ "repository": {

test/source-map/test-source-map-consumer.js

@@ -348,7 +348,7 @@ /* -*- Mode: js; js-indent-level: 2; -*- */
 
-    assert(mappings.length, 2);
-    assert(mappings[0].line, 3);
-    assert(mappings[0].column, 2);
-    assert(mappings[1].line, 3);
-    assert(mappings[1].column, 3);
+    assert.equal(mappings.length, 2);
+    assert.equal(mappings[0].line, 3);
+    assert.equal(mappings[0].column, 2);
+    assert.equal(mappings[1].line, 3);
+    assert.equal(mappings[1].column, 3);
   };
@@ -355,0 +355,0 @@

No alert changes

Improved metrics

Total package byte prevSize

197241

increased by0.22%

Lines of code

4636

increased by0.11%

No dependency changes