From 36777d2a5f4f8da938edf9290fb74e381bfdb644 Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 10 Feb 2014 21:14:53 +0100 Subject: [PATCH] module: test for directories, fix require with .. Given my home-directory is `/Users/rocko` - and I have a file named `npm.json` in it and also a repository with name `npm`, which is a folder for the node-module. When try to require the `/Users/rocko/npm/index.js` two direcotry levels down in the npm folder (e.g. `/Users/rocko/npm/test/tap`) with require("../../") node will load `/Users/rocko/npm/index.json`. When I use require("../..") node will load `/Users/rocko/npm.json` which is fixed by this commit. PR-URL: https://github.com/iojs/io.js/pull/58 Reviewed-By: Ben Noordhuis Reviewed-by: Chris Dickinson Reviewed-By: Rod Vagg --- lib/module.js | 11 +++---- .../module-stub.json | 1 + .../module-stub/index.js | 22 ++++++++++++++ .../one-trailing-slash/two/three.js | 22 ++++++++++++++ .../module-stub/one/two/three.js | 22 ++++++++++++++ .../module-stub/package.json | 7 +++++ ...ons-same-filename-as-dir-trailing-slash.js | 29 +++++++++++++++++++ ...require-extensions-same-filename-as-dir.js | 29 +++++++++++++++++++ 8 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 test/fixtures/json-with-directory-name-module/module-stub.json create mode 100644 test/fixtures/json-with-directory-name-module/module-stub/index.js create mode 100644 test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js create mode 100644 test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js create mode 100644 test/fixtures/json-with-directory-name-module/module-stub/package.json create mode 100644 test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js create mode 100644 test/simple/test-require-extensions-same-filename-as-dir.js diff --git a/lib/module.js b/lib/module.js index 6dab4919df4858..8662b4ee90cc5c 100644 --- a/lib/module.js +++ b/lib/module.js @@ -172,19 +172,20 @@ Module._findPath = function(request, paths) { var filename; if (!trailingSlash) { + var stats = statPath(basePath); // try to join the request to the path filename = tryFile(basePath); - if (!filename && !trailingSlash) { + if (!filename && stats && stats.isDirectory()) { + filename = tryPackage(basePath, exts); + } + + if (!filename) { // try it with each of the extensions filename = tryExtensions(basePath, exts); } } - if (!filename) { - filename = tryPackage(basePath, exts); - } - if (!filename) { // try it with each of the extensions at "index" filename = tryExtensions(path.resolve(basePath, 'index'), exts); diff --git a/test/fixtures/json-with-directory-name-module/module-stub.json b/test/fixtures/json-with-directory-name-module/module-stub.json new file mode 100644 index 00000000000000..472a445adbedab --- /dev/null +++ b/test/fixtures/json-with-directory-name-module/module-stub.json @@ -0,0 +1 @@ +{"rocko": "artischocko"} diff --git a/test/fixtures/json-with-directory-name-module/module-stub/index.js b/test/fixtures/json-with-directory-name-module/module-stub/index.js new file mode 100644 index 00000000000000..5cbb00b63c1ad5 --- /dev/null +++ b/test/fixtures/json-with-directory-name-module/module-stub/index.js @@ -0,0 +1,22 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +module.exports = "hello from module-stub!" diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js new file mode 100644 index 00000000000000..a02399ef8be629 --- /dev/null +++ b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js @@ -0,0 +1,22 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +module.exports = require('../../'); diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js new file mode 100644 index 00000000000000..19025cdc74e20e --- /dev/null +++ b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js @@ -0,0 +1,22 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +module.exports = require('../..'); diff --git a/test/fixtures/json-with-directory-name-module/module-stub/package.json b/test/fixtures/json-with-directory-name-module/module-stub/package.json new file mode 100644 index 00000000000000..4c380f620bf44f --- /dev/null +++ b/test/fixtures/json-with-directory-name-module/module-stub/package.json @@ -0,0 +1,7 @@ +{ + "version": "1.1.12", + "name": "module-stub", + "main": "./index.js", + "description": "A stub for node tests", + "author": "Robert Kowalski " +} diff --git a/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js b/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js new file mode 100644 index 00000000000000..6469d14ffd4a84 --- /dev/null +++ b/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js @@ -0,0 +1,29 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var content = require(common.fixturesDir + + '/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js'); + +assert.notEqual(content.rocko, 'artischocko'); +assert.equal(content, 'hello from module-stub!'); diff --git a/test/simple/test-require-extensions-same-filename-as-dir.js b/test/simple/test-require-extensions-same-filename-as-dir.js new file mode 100644 index 00000000000000..fbfba3b9bc3c0b --- /dev/null +++ b/test/simple/test-require-extensions-same-filename-as-dir.js @@ -0,0 +1,29 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var content = require(common.fixturesDir + + '/json-with-directory-name-module/module-stub/one/two/three.js'); + +assert.notEqual(content.rocko, 'artischocko'); +assert.equal(content, 'hello from module-stub!');