package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtslint",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "Runs tests on TypeScript definition files",
   "files": [
     "bin",

src/rules/noDeclareCurrentPackageRule.ts

@@ -6,7 +6,7 @@ import { failure, getCommonDirectoryName } from "../util";
 export class Rule extends Lint.Rules.TypedRule {
     static metadata: Lint.IRuleMetadata = {
         ruleName: "no-declare-current-package",
-        description: "Don't use an ambient module declaration of the current package; use an external module.",
+        description: "Don't use an ambient module declaration of the current package; use a normal module.",
         optionsDescription: "Not configurable.",
         options: null,
         type: "functionality",

src/rules/noSingleDeclareModuleRule.ts

@@ -6,7 +6,7 @@ import { failure } from "../util";
 export class Rule extends Lint.Rules.AbstractRule {
     static metadata: Lint.IRuleMetadata = {
         ruleName: "no-single-declare-module",
-        description: "Don't use an ambient module declaration if you can use an external module file.",
+        description: "Don't use an ambient module declaration if there's just one -- write it as a normal module.",
         rationale: "Cuts down on nesting",
         optionsDescription: "Not configurable.",
         options: null,
@@ -16,7 +16,7 @@ export class Rule extends Lint.Rules.AbstractRule {
 
     static FAILURE_STRING = failure(
         Rule.metadata.ruleName,
-        "File has only 1 module declaration — write it as an external module.");
+        "File has only 1 ambient module declaration. Move the contents outside the ambient module block, rename the file to match the ambient module name, and remove the block.");
 
     apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
         return this.applyWithFunction(sourceFile, walk);
@@ -34,6 +34,11 @@ function walk(ctx: Lint.WalkContext<void>): void {
     let moduleDecl: ts.ModuleDeclaration | undefined;
     for (const statement of sourceFile.statements) {
         if (ts.isModuleDeclaration(statement) && ts.isStringLiteral(statement.name)) {
+            if (statement.name.text.indexOf('*') !== -1) {
+                // Ignore wildcard module declarations
+                return;
+            }
+
             if (moduleDecl === undefined) {
                 moduleDecl = statement;
             } else {

test/no-single-declare-module/wildcard.d.ts.lint

@@ -0,0 +1 @@
+declare module "*.svg" {}

test/no-single-declare-module/wrong.d.ts.lint

@@ -1,5 +1,5 @@
 declare module "foo" {}
-~~~~~~~~~~~~~~~~~~~~~~~  [File has only 1 module declaration — write it as an external module. See: https://github.com/Microsoft/dtslint/blob/master/docs/no-single-declare-module.md]
+~~~~~~~~~~~~~~~~~~~~~~~  [File has only 1 ambient module declaration. Move the contents outside the ambient module block, rename the file to match the ambient module name, and remove the block. See: https://github.com/Microsoft/dtslint/blob/master/docs/no-single-declare-module.md]
 
 // Other global declarations don't affect this. They should go in "declare global".
 interface I {}