Only use dir name from file path

jj-ivx · jj-ivx · commit bf60e7b05410 · 2019-08-30T14:34:01.000+02:00
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const getPackages = require('get-monorepo-packages');
-const { relative, sep, resolve, isAbsolute } = require('path');
+const { dirname, relative, sep, resolve, isAbsolute } = require('path');
 
 const isSubPath = (parent, path) => {
   const relativePath = relative(parent, path);
@@ -16,7 +16,7 @@ const getImport = (context, callback) => ({
   ImportDeclaration: node => {
     if (node.source.type === 'Literal') {
       const { value, range } = node.source;
-      const path = resolve(context.getFilename(), value);
+      const path = resolve(dirname(context.getFilename()), value);
       const [start, end] = range;
       callback({ node, value, path, start, end });
     }
diff --git a/tests/rules/no-cross-imports.js b/tests/rules/no-cross-imports.js
@@ -13,28 +13,28 @@ ruleTester.run('no-cross-imports', rule, {
     'someFunction();',
     {
       options: [{ allow: '@test/workspace' }],
-      filename: '/some/path',
+      filename: '/some/path.js',
       code: "import '@test/workspace';",
     },
     {
       options: [{ allow: ['@test/workspace', '@test/another-workspace'] }],
-      filename: '/some/path',
+      filename: '/some/path.js',
       code: "import '@test/workspace';import '@test/another-workspace';",
     },
     {
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       code: "import '@test/workspace';",
     },
     {
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       code: "import './some/thing'",
     },
   ],
 
   invalid: [
     {
       code: "import workspace from '@test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -43,7 +43,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import('@test/workspace');",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -52,7 +52,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "require('@test/workspace');",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -61,7 +61,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import workspace from '@test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -70,7 +70,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import '@test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -79,7 +79,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import '@test/workspace/some/path';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -88,7 +88,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import '../../test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -97,7 +97,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import '../../test/workspace/some/path';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -106,7 +106,7 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       code: "import '@test/workspace';import '@test/another-workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
@@ -120,7 +120,7 @@ ruleTester.run('no-cross-imports', rule, {
     {
       code: "import '@test/workspace';import '@test/another-workspace';",
       options: [{ allow: '@test/workspace' }],
-      filename: '/some/path',
+      filename: '/some/path.js',
       errors: [
         {
           message:
@@ -130,13 +130,23 @@ ruleTester.run('no-cross-imports', rule, {
     },
     {
       options: [{ allow: '@test/workspacetest' }],
-      filename: '/some/path',
+      filename: '/some/path.js',
       code: "import '@test/workspace';",
       errors: [
         {
           message: 'Import from package "@test/workspace" is not allowed',
         },
       ],
     },
+    {
+      filename: '/test/workspace/test.js',
+      code: "import '../another-workspace/test'",
+      errors: [
+        {
+          message:
+            'Import from package "@test/another-workspace" is not allowed',
+        },
+      ],
+    },
   ],
 });
diff --git a/tests/rules/no-relative-imports.js b/tests/rules/no-relative-imports.js
@@ -12,23 +12,23 @@ ruleTester.run('no-relative-imports', rule, {
     "import '../some/relative/path';",
     'someFunction();',
     {
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       code: "import '../workspace';",
     },
     {
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       code: "import './some/path';",
     },
     {
-      filename: '/test/workspace/some/path',
+      filename: '/test/workspace/some/path.js',
       code: "import '../another/path';",
     },
   ],
 
   invalid: [
     {
       code: "import workspace from '../../test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       output: "import workspace from '@test/workspace';",
       errors: [
         {
@@ -38,7 +38,7 @@ ruleTester.run('no-relative-imports', rule, {
     },
     {
       code: "require('../../test/workspace');",
-      filename: '/some/path',
+      filename: '/some/path.js',
       output: "require('@test/workspace');",
       errors: [
         {
@@ -48,7 +48,7 @@ ruleTester.run('no-relative-imports', rule, {
     },
     {
       code: "import('../../test/workspace');",
-      filename: '/some/path',
+      filename: '/some/path.js',
       output: "import('@test/workspace');",
       errors: [
         {
@@ -58,7 +58,7 @@ ruleTester.run('no-relative-imports', rule, {
     },
     {
       code: "import '../../test/workspace';",
-      filename: '/some/path',
+      filename: '/some/path.js',
       output: "import '@test/workspace';",
       errors: [
         {
@@ -68,7 +68,7 @@ ruleTester.run('no-relative-imports', rule, {
     },
     {
       code: "import workspace from '../another-workspace';",
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       output: "import workspace from '@test/another-workspace';",
       errors: [
         {
@@ -78,7 +78,7 @@ ruleTester.run('no-relative-imports', rule, {
     },
     {
       code: "import workspace from '../another-workspace/testing';",
-      filename: '/test/workspace',
+      filename: '/test/workspace/test.js',
       output: "import workspace from '@test/another-workspace/testing';",
       errors: [
         {

Original file line number	Diff line number	Diff line change
`@@ -13,28 +13,28 @@ ruleTester.run('no-cross-imports', rule, {`
`13`	`13`	`'someFunction();',`
`14`	`14`	`{`
`15`	`15`	`options: [{ allow: '@test/workspace' }],`
`16`		`- filename: '/some/path',`
	`16`	`+ filename: '/some/path.js',`
`17`	`17`	`code: "import '@test/workspace';",`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`options: [{ allow: ['@test/workspace', '@test/another-workspace'] }],`
`21`		`- filename: '/some/path',`
	`21`	`+ filename: '/some/path.js',`
`22`	`22`	`code: "import '@test/workspace';import '@test/another-workspace';",`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- filename: '/test/workspace',`
	`25`	`+ filename: '/test/workspace/test.js',`
`26`	`26`	`code: "import '@test/workspace';",`
`27`	`27`	`},`
`28`	`28`	`{`
`29`		`- filename: '/test/workspace',`
	`29`	`+ filename: '/test/workspace/test.js',`
`30`	`30`	`code: "import './some/thing'",`
`31`	`31`	`},`
`32`	`32`	`],`
`33`	`33`
`34`	`34`	`invalid: [`
`35`	`35`	`{`
`36`	`36`	`code: "import workspace from '@test/workspace';",`
`37`		`- filename: '/some/path',`
	`37`	`+ filename: '/some/path.js',`
`38`	`38`	`errors: [`
`39`	`39`	`{`
`40`	`40`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -43,7 +43,7 @@ ruleTester.run('no-cross-imports', rule, {`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`code: "import('@test/workspace');",`
`46`		`- filename: '/some/path',`
	`46`	`+ filename: '/some/path.js',`
`47`	`47`	`errors: [`
`48`	`48`	`{`
`49`	`49`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -52,7 +52,7 @@ ruleTester.run('no-cross-imports', rule, {`
`52`	`52`	`},`
`53`	`53`	`{`
`54`	`54`	`code: "require('@test/workspace');",`
`55`		`- filename: '/some/path',`
	`55`	`+ filename: '/some/path.js',`
`56`	`56`	`errors: [`
`57`	`57`	`{`
`58`	`58`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -61,7 +61,7 @@ ruleTester.run('no-cross-imports', rule, {`
`61`	`61`	`},`
`62`	`62`	`{`
`63`	`63`	`code: "import workspace from '@test/workspace';",`
`64`		`- filename: '/some/path',`
	`64`	`+ filename: '/some/path.js',`
`65`	`65`	`errors: [`
`66`	`66`	`{`
`67`	`67`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -70,7 +70,7 @@ ruleTester.run('no-cross-imports', rule, {`
`70`	`70`	`},`
`71`	`71`	`{`
`72`	`72`	`code: "import '@test/workspace';",`
`73`		`- filename: '/some/path',`
	`73`	`+ filename: '/some/path.js',`
`74`	`74`	`errors: [`
`75`	`75`	`{`
`76`	`76`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -79,7 +79,7 @@ ruleTester.run('no-cross-imports', rule, {`
`79`	`79`	`},`
`80`	`80`	`{`
`81`	`81`	`code: "import '@test/workspace/some/path';",`
`82`		`- filename: '/some/path',`
	`82`	`+ filename: '/some/path.js',`
`83`	`83`	`errors: [`
`84`	`84`	`{`
`85`	`85`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -88,7 +88,7 @@ ruleTester.run('no-cross-imports', rule, {`
`88`	`88`	`},`
`89`	`89`	`{`
`90`	`90`	`code: "import '../../test/workspace';",`
`91`		`- filename: '/some/path',`
	`91`	`+ filename: '/some/path.js',`
`92`	`92`	`errors: [`
`93`	`93`	`{`
`94`	`94`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -97,7 +97,7 @@ ruleTester.run('no-cross-imports', rule, {`
`97`	`97`	`},`
`98`	`98`	`{`
`99`	`99`	`code: "import '../../test/workspace/some/path';",`
`100`		`- filename: '/some/path',`
	`100`	`+ filename: '/some/path.js',`
`101`	`101`	`errors: [`
`102`	`102`	`{`
`103`	`103`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -106,7 +106,7 @@ ruleTester.run('no-cross-imports', rule, {`
`106`	`106`	`},`
`107`	`107`	`{`
`108`	`108`	`code: "import '@test/workspace';import '@test/another-workspace';",`
`109`		`- filename: '/some/path',`
	`109`	`+ filename: '/some/path.js',`
`110`	`110`	`errors: [`
`111`	`111`	`{`
`112`	`112`	`message: 'Import from package "@test/workspace" is not allowed',`
`@@ -120,7 +120,7 @@ ruleTester.run('no-cross-imports', rule, {`
`120`	`120`	`{`
`121`	`121`	`code: "import '@test/workspace';import '@test/another-workspace';",`
`122`	`122`	`options: [{ allow: '@test/workspace' }],`
`123`		`- filename: '/some/path',`
	`123`	`+ filename: '/some/path.js',`
`124`	`124`	`errors: [`
`125`	`125`	`{`
`126`	`126`	`message:`
`@@ -130,13 +130,23 @@ ruleTester.run('no-cross-imports', rule, {`
`130`	`130`	`},`
`131`	`131`	`{`
`132`	`132`	`options: [{ allow: '@test/workspacetest' }],`
`133`		`- filename: '/some/path',`
	`133`	`+ filename: '/some/path.js',`
`134`	`134`	`code: "import '@test/workspace';",`
`135`	`135`	`errors: [`
`136`	`136`	`{`
`137`	`137`	`message: 'Import from package "@test/workspace" is not allowed',`
`138`	`138`	`},`
`139`	`139`	`],`
`140`	`140`	`},`
	`141`	`+ {`
	`142`	`+ filename: '/test/workspace/test.js',`
	`143`	`+ code: "import '../another-workspace/test'",`
	`144`	`+ errors: [`
	`145`	`+ {`
	`146`	`+ message:`
	`147`	`+ 'Import from package "@test/another-workspace" is not allowed',`
	`148`	`+ },`
	`149`	`+ ],`
	`150`	`+ },`
`141`	`151`	`],`
`142`	`152`	`});`
Original file line number	Diff line number	Diff line change
`@@ -12,23 +12,23 @@ ruleTester.run('no-relative-imports', rule, {`
`12`	`12`	`"import '../some/relative/path';",`
`13`	`13`	`'someFunction();',`
`14`	`14`	`{`
`15`		`- filename: '/test/workspace',`
	`15`	`+ filename: '/test/workspace/test.js',`
`16`	`16`	`code: "import '../workspace';",`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- filename: '/test/workspace',`
	`19`	`+ filename: '/test/workspace/test.js',`
`20`	`20`	`code: "import './some/path';",`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- filename: '/test/workspace/some/path',`
	`23`	`+ filename: '/test/workspace/some/path.js',`
`24`	`24`	`code: "import '../another/path';",`
`25`	`25`	`},`
`26`	`26`	`],`
`27`	`27`
`28`	`28`	`invalid: [`
`29`	`29`	`{`
`30`	`30`	`code: "import workspace from '../../test/workspace';",`
`31`		`- filename: '/some/path',`
	`31`	`+ filename: '/some/path.js',`
`32`	`32`	`output: "import workspace from '@test/workspace';",`
`33`	`33`	`errors: [`
`34`	`34`	`{`
`@@ -38,7 +38,7 @@ ruleTester.run('no-relative-imports', rule, {`
`38`	`38`	`},`
`39`	`39`	`{`
`40`	`40`	`code: "require('../../test/workspace');",`
`41`		`- filename: '/some/path',`
	`41`	`+ filename: '/some/path.js',`
`42`	`42`	`output: "require('@test/workspace');",`
`43`	`43`	`errors: [`
`44`	`44`	`{`
`@@ -48,7 +48,7 @@ ruleTester.run('no-relative-imports', rule, {`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`code: "import('../../test/workspace');",`
`51`		`- filename: '/some/path',`
	`51`	`+ filename: '/some/path.js',`
`52`	`52`	`output: "import('@test/workspace');",`
`53`	`53`	`errors: [`
`54`	`54`	`{`
`@@ -58,7 +58,7 @@ ruleTester.run('no-relative-imports', rule, {`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`code: "import '../../test/workspace';",`
`61`		`- filename: '/some/path',`
	`61`	`+ filename: '/some/path.js',`
`62`	`62`	`output: "import '@test/workspace';",`
`63`	`63`	`errors: [`
`64`	`64`	`{`
`@@ -68,7 +68,7 @@ ruleTester.run('no-relative-imports', rule, {`
`68`	`68`	`},`
`69`	`69`	`{`
`70`	`70`	`code: "import workspace from '../another-workspace';",`
`71`		`- filename: '/test/workspace',`
	`71`	`+ filename: '/test/workspace/test.js',`
`72`	`72`	`output: "import workspace from '@test/another-workspace';",`
`73`	`73`	`errors: [`
`74`	`74`	`{`
`@@ -78,7 +78,7 @@ ruleTester.run('no-relative-imports', rule, {`
`78`	`78`	`},`
`79`	`79`	`{`
`80`	`80`	`code: "import workspace from '../another-workspace/testing';",`
`81`		`- filename: '/test/workspace',`
	`81`	`+ filename: '/test/workspace/test.js',`
`82`	`82`	`output: "import workspace from '@test/another-workspace/testing';",`
`83`	`83`	`errors: [`
`84`	`84`	`{`