Allow libraries prefixed with rxjs (#74)

* test: Add test for library prefixed with rxjs * fix: Only examine submodule imports of rxjs
cartant · Jan 28, 2019 · 1c5b13f · 1c5b13f
1 parent bfb82fc
commit 1c5b13f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/rules/rxjsNoCompatRule.ts b/source/rules/rxjsNoCompatRule.ts
@@ -27,12 +27,12 @@ export class Rule extends Lint.Rules.AbstractRule {
         const failures: Lint.RuleFailure[] = [];
         const importDeclarations = tsquery(
             sourceFile,
-            `ImportDeclaration:has(StringLiteral[value=/^rxjs/])`
+            `ImportDeclaration:has(StringLiteral[value=/^rxjs\\u002f/])`
         );
         importDeclarations.forEach(node => {
             const importDeclaration = node as ts.ImportDeclaration;
             const { moduleSpecifier } = importDeclaration;
-            if (!/^['"]rxjs(\/(ajax|operators|testing|webSocket))?['"]$/.test(moduleSpecifier.getText())) {
+            if (!/^['"]rxjs\/(ajax|operators|testing|webSocket)['"]$/.test(moduleSpecifier.getText())) {
                 failures.push(new Lint.RuleFailure(
                     sourceFile,
                     moduleSpecifier.getStart(),

diff --git a/test/v6/fixtures/no-compat/default/fixture.ts.lint b/test/v6/fixtures/no-compat/default/fixture.ts.lint
@@ -3,6 +3,7 @@ import { ajax } from "rxjs/ajax";
 import { concatMap } from "rxjs/operators";
 import { TestScheduler } from "rxjs/testing";
 import { webSocket } from "rxjs/webSocket";
+import * from "rxjs-prefixed-package";
 
 import * as Rx from "rxjs/Rx";
                     ~~~~~~~~~                       [no-compat]