diff -Nru node-source-map-support-0.5.13+ds/debian/changelog node-source-map-support-0.5.16+ds/debian/changelog --- node-source-map-support-0.5.13+ds/debian/changelog 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/changelog 2020-01-29 15:17:58.000000000 +0000 @@ -1,3 +1,15 @@ +node-source-map-support (0.5.16+ds-1) unstable; urgency=medium + + * Team Upload. + * Use pkg-js-tools auto install + * Enable tests, with autopkgtest-pkg-nodejs + * Add upstream/metadata + * Add "Rules-Requires-Root: no" + * Fix permission of an executable + * Bump standards version to 4.5.0 + + -- Nilesh Wed, 29 Jan 2020 20:47:58 +0530 + node-source-map-support (0.5.13+ds-1) unstable; urgency=medium * New upstream release. diff -Nru node-source-map-support-0.5.13+ds/debian/control node-source-map-support-0.5.16+ds/debian/control --- node-source-map-support-0.5.13+ds/debian/control 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/control 2020-01-29 15:17:58.000000000 +0000 @@ -1,22 +1,27 @@ Source: node-source-map-support -Section: javascript -Priority: optional Maintainer: Debian Javascript Maintainers Uploaders: Julien Puydt +Section: javascript +Testsuite: autopkgtest-pkg-nodejs +Priority: optional Build-Depends: debhelper-compat (= 12), - nodejs, - mocha , - node-assert , - node-source-map -Standards-Version: 4.4.0 -Homepage: https://github.com/evanw/node-source-map-support -Vcs-Git: https://salsa.debian.org/js-team/node-source-map-support.git + nodejs, + mocha , + node-assert , + node-source-map , + pkg-js-tools (>= 0.9.20~) +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/js-team/node-source-map-support +Vcs-Git: https://salsa.debian.org/js-team/node-source-map-support.git +Homepage: https://github.com/evanw/node-source-map-support +Rules-Requires-Root: no Package: node-source-map-support Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, nodejs, node-source-map +Depends: ${misc:Depends}, + nodejs, + node-source-map Description: Fixes stack traces for files with source maps This module uses source-map to replace the paths and line numbers of source-mapped files with their original counterparts in the real diff -Nru node-source-map-support-0.5.13+ds/debian/gbp.conf node-source-map-support-0.5.16+ds/debian/gbp.conf --- node-source-map-support-0.5.13+ds/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/gbp.conf 2020-01-29 15:17:58.000000000 +0000 @@ -0,0 +1,5 @@ +[DEFAULT] +pristine-tar = True + +[import-orig] +filter = [ '.gitignore', '.travis.yml', '.git*' ] diff -Nru node-source-map-support-0.5.13+ds/debian/install node-source-map-support-0.5.16+ds/debian/install --- node-source-map-support-0.5.13+ds/debian/install 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -package.json usr/lib/nodejs/source-map-support/ -source-map-support.js usr/lib/nodejs/source-map-support/ diff -Nru node-source-map-support-0.5.13+ds/debian/rules node-source-map-support-0.5.16+ds/debian/rules --- node-source-map-support-0.5.13+ds/debian/rules 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/rules 2020-01-29 15:17:58.000000000 +0000 @@ -1,14 +1,8 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with nodejs -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES))) -override_dh_auto_test: - mocha -R spec test.js -else -override_dh_auto_test: - @echo '**********************************************************' - @echo 'Skip test suite ' - @echo '**********************************************************' -endif +override_dh_fixperms: + dh_fixperms + chmod +x debian/node-source-map-support/usr/share/nodejs/source-map-support/build.js diff -Nru node-source-map-support-0.5.13+ds/debian/tests/control node-source-map-support-0.5.16+ds/debian/tests/control --- node-source-map-support-0.5.13+ds/debian/tests/control 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Tests: require -Depends: node-source-map-support, nodejs (>= 6) - -Tests: runtestsuite -Depends: node-source-map-support, nodejs (>= 6), - mocha (>= 1.18.2), - node-assert - diff -Nru node-source-map-support-0.5.13+ds/debian/tests/pkg-js/test node-source-map-support-0.5.16+ds/debian/tests/pkg-js/test --- node-source-map-support-0.5.13+ds/debian/tests/pkg-js/test 1970-01-01 00:00:00.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/tests/pkg-js/test 2020-01-29 15:17:58.000000000 +0000 @@ -0,0 +1 @@ +mocha -R spec test.js diff -Nru node-source-map-support-0.5.13+ds/debian/tests/require node-source-map-support-0.5.16+ds/debian/tests/require --- node-source-map-support-0.5.13+ds/debian/tests/require 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/tests/require 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -node -e "require('source-map-support');" diff -Nru node-source-map-support-0.5.13+ds/debian/tests/runtestsuite node-source-map-support-0.5.16+ds/debian/tests/runtestsuite --- node-source-map-support-0.5.13+ds/debian/tests/runtestsuite 2019-08-11 19:39:27.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/tests/runtestsuite 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh -set -e -# notice the / at end in order to load this module -PACKAGE='source-map-support' -SEDCMD="s,require\s*[(]\s*(['\"])[.]/?([^'\"]*)(['\"])\s*[)],require(\1$PACKAGE\3),g" - -tmpdir=$(mktemp -d) -trap 'rm -rf "$tmpdir"' EXIT INT TERM HUP - -cp -r test.js "$tmpdir" -cd "$tmpdir" -ln -s /usr/lib/nodejs/source-map-support/source-map-support.js source-map-support.js -mocha -R spec test.js diff -Nru node-source-map-support-0.5.13+ds/debian/upstream/metadata node-source-map-support-0.5.16+ds/debian/upstream/metadata --- node-source-map-support-0.5.13+ds/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ node-source-map-support-0.5.16+ds/debian/upstream/metadata 2020-01-29 15:17:58.000000000 +0000 @@ -0,0 +1,6 @@ +--- +Archive: GitHub +Bug-Database: https://github.com/evanw/node-source-map-support/issues +Repository: https://github.com/evanw/node-source-map-support.git +Repository-Browse: https://github.com/evanw/node-source-map-support +Bug-Submit: https://github.com/evanw/node-source-map-support/issues/new diff -Nru node-source-map-support-0.5.13+ds/package.json node-source-map-support-0.5.16+ds/package.json --- node-source-map-support-0.5.13+ds/package.json 2019-07-31 09:30:54.000000000 +0000 +++ node-source-map-support-0.5.16+ds/package.json 2019-10-29 22:58:18.000000000 +0000 @@ -1,7 +1,7 @@ { "name": "source-map-support", "description": "Fixes stack traces for files with source maps", - "version": "0.5.13", + "version": "0.5.16", "main": "./source-map-support.js", "scripts": { "build": "node build.js", diff -Nru node-source-map-support-0.5.13+ds/package-lock.json node-source-map-support-0.5.16+ds/package-lock.json --- node-source-map-support-0.5.13+ds/package-lock.json 2019-07-31 09:30:54.000000000 +0000 +++ node-source-map-support-0.5.16+ds/package-lock.json 2019-10-29 22:58:18.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "source-map-support", - "version": "0.5.13", + "version": "0.5.16", "lockfileVersion": 1, "requires": true, "dependencies": { diff -Nru node-source-map-support-0.5.13+ds/source-map-support.js node-source-map-support-0.5.16+ds/source-map-support.js --- node-source-map-support-0.5.13+ds/source-map-support.js 2019-07-31 09:30:54.000000000 +0000 +++ node-source-map-support-0.5.16+ds/source-map-support.js 2019-10-29 22:58:18.000000000 +0000 @@ -335,8 +335,13 @@ return object; } -function wrapCallSite(frame) { +function wrapCallSite(frame, state) { + // provides interface backward compatibility + if (state === undefined) { + state = { nextPosition: null, curPosition: null } + } if(frame.isNative()) { + state.curPosition = null; return frame; } @@ -350,7 +355,11 @@ // Fix position in Node where some (internal) code is prepended. // See https://github.com/evanw/node-source-map-support/issues/36 - var headerLength = 62; + // Header removed in node at ^10.16 || >=11.11.0 + // v11 is not an LTS candidate, we can just test the one version with it. + // Test node versions for: 10.16-19, 10.20+, 12-19, 20-99, 100+, or 11.11 + var noHeader = /^v(10\.1[6-9]|10\.[2-9][0-9]|10\.[0-9]{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/; + var headerLength = noHeader.test(process.version) ? 0 : 62; if (line === 1 && column > headerLength && !isInBrowser() && !frame.isEval()) { column -= headerLength; } @@ -360,9 +369,15 @@ line: line, column: column }); + state.curPosition = position; frame = cloneCallSite(frame); var originalFunctionName = frame.getFunctionName; - frame.getFunctionName = function() { return position.name || originalFunctionName(); }; + frame.getFunctionName = function() { + if (state.nextPosition == null) { + return originalFunctionName(); + } + return state.nextPosition.name || originalFunctionName(); + }; frame.getFileName = function() { return position.source; }; frame.getLineNumber = function() { return position.line; }; frame.getColumnNumber = function() { return position.column + 1; }; @@ -395,9 +410,14 @@ var message = error.message || ''; var errorString = name + ": " + message; - return errorString + stack.map(function(frame) { - return '\n at ' + wrapCallSite(frame); - }).join(''); + var state = { nextPosition: null, curPosition: null }; + var processedStack = []; + for (var i = stack.length - 1; i >= 0; i--) { + processedStack.push('\n at ' + wrapCallSite(stack[i], state)); + state.nextPosition = state.curPosition; + } + state.curPosition = state.nextPosition = null; + return errorString + processedStack.reverse().join(''); } // Generate position and snippet of original source with pointer @@ -561,7 +581,7 @@ retrieveFileHandlers = originalRetrieveFileHandlers.slice(0); retrieveMapHandlers = originalRetrieveMapHandlers.slice(0); - + retrieveSourceMap = handlerExec(retrieveMapHandlers); retrieveFile = handlerExec(retrieveFileHandlers); } diff -Nru node-source-map-support-0.5.13+ds/test.js node-source-map-support-0.5.16+ds/test.js --- node-source-map-support-0.5.13+ds/test.js 2019-07-31 09:30:54.000000000 +0000 +++ node-source-map-support-0.5.16+ds/test.js 2019-10-29 22:58:18.000000000 +0000 @@ -269,7 +269,7 @@ compareStackTrace(createMultiLineSourceMap(), [ 'throw new Function(")");' ], [ - 'SyntaxError: Unexpected token )', + /SyntaxError: Unexpected token '?\)'?/, ]); }); @@ -331,7 +331,12 @@ generated: { line: 2, column: 8 }, original: { line: 1000, column: 10 }, source: '.original.js', - name: 'myOriginalName' + }); + sourceMap.addMapping({ + generated: { line: 4, column: 0 }, + original: { line: 1002, column: 1 }, + source: ".original.js", + name: "myOriginalName" }); compareStackTrace(sourceMap, [ 'function foo() {', @@ -341,7 +346,7 @@ ], [ 'Error: test', /^ at myOriginalName \((?:.*[/\\])?\.original.js:1000:11\)$/, - /^ at Object\.exports\.test \((?:.*[/\\])?\.generated.js:4:1\)$/ + /^ at Object\.exports\.test \((?:.*[/\\])?\.original.js:1002:2\)$/ ]); });