fix(ts-helpers): do not resolve relative paths for default alias, #10

zerkalica · Feb 6, 2019 · 6f35ba5 · 6f35ba5
1 parent 90ef23f
commit 6f35ba5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/ts-helpers/__tests__/ImportPathsResolver.spec.ts b/packages/ts-helpers/__tests__/ImportPathsResolver.spec.ts
@@ -4,6 +4,7 @@ function createResolver(opts?: TSOptions) {
     return new ImportPathsResolver({
         paths: {
             'someRoot/*': ['lib/*/src'],
+            '*': ['./types/*'],
         },
         baseUrl: '.',
         ...opts,
@@ -27,4 +28,12 @@ describe('ImportPathsResolver', () => {
             '../lib/some/src'
         ])
     })
+
+    it('should not resolve relative paths to default alias', () => {
+        const resolver = createResolver()
+        expect(resolver.getImportSuggestions(
+            './some',
+            './bla/index.ts',
+        )).toBeUndefined()
+    })
 })
diff --git a/packages/ts-helpers/src/ImportPathsResolver.ts b/packages/ts-helpers/src/ImportPathsResolver.ts
@@ -18,10 +18,10 @@ export class ImportPathsResolver {
         const paths = opts.paths || {}
         const baseUrl = opts.baseUrl ? opts.baseUrl.replace(winSepRegex, '\/') : null
 
-        const mapBaseUrl = baseUrl
+        const mapBaseUrl: ((v: string) => string) | void = baseUrl
             ? sub => (sub[0] === '/'
                 ? sub
-                : `${baseUrl}/${sub}`
+                : `${baseUrl}/${sub.substring(0, 2) === './' ? sub.substring(2) : sub}`
             )
             : null
 

diff --git a/packages/ts-helpers/src/Tokenizer.ts b/packages/ts-helpers/src/Tokenizer.ts
@@ -20,7 +20,7 @@ export class Tokenizer {
             return '><'
         })
 
-        this.mask = new RegExp('^' + regExpEscape(mask).replace(/\>\</g, '(.*)') + '$')
+        this.mask = new RegExp('^' + regExpEscape(mask).replace(/\>\</g, '(?!\\.\\/)(.*)') + '$')
     }
 
     parse(str: string): string[] | void {