sjrd · sjrd · Dec 4, 2017 · Dec 3, 2017 · Dec 3, 2017 · Dec 3, 2017
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ target/
 .classpath
 .project
 .settings/
+/node_modules
+/package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,24 @@ scala: 2.12.3
 
 jdk: oraclejdk8
 
-script: sbt ++$TRAVIS_SCALA_VERSION samples/compile test
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION samples/compile test
+  - $(npm bin)/tsc samples/*.d.ts
 
 before_cache:
   # See http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html
   # Tricks to avoid unnecessary cache updates
   - find $HOME/.sbt -name "*.lock" | xargs rm
   - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
 
+install:
+  - . $HOME/.nvm/nvm.sh
+  - nvm install 8
+  - nvm use 8
+  - npm install typescript@2.6.2
+
 cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot
+    - node_modules
diff --git a/samples/assets/module.d.ts b/samples/assets/module.d.ts
@@ -0,0 +1,10 @@
+declare module "module" {
+    const value: any;
+    export const Single: any;
+    export const First: any;
+    export const Second: any;
+    export const Third: any;
+    export const Fourth: any;
+    export const Fifth: any;
+    export default value;
+}
diff --git a/samples/export.ts → samples/export.d.ts b/samples/export.ts → samples/export.d.ts
diff --git a/samples/export.ts.scala → samples/export.d.ts.scala b/samples/export.ts.scala → samples/export.d.ts.scala
diff --git a/samples/exportidentifier.ts → samples/exportidentifier.d.ts b/samples/exportidentifier.ts → samples/exportidentifier.d.ts
diff --git a/samples/exportidentifier.ts.scala → samples/exportidentifier.d.ts.scala b/samples/exportidentifier.ts.scala → samples/exportidentifier.d.ts.scala
diff --git a/samples/extendsobject.ts → samples/extendsobject.d.ts b/samples/extendsobject.ts → samples/extendsobject.d.ts
@@ -1,5 +1,4 @@
 // copy from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/index.d.ts
 declare interface LoDashStatic {
   at<T extends object>();
-};
-
+}
diff --git a/samples/extendsobject.ts.scala → samples/extendsobject.d.ts.scala b/samples/extendsobject.ts.scala → samples/extendsobject.d.ts.scala
diff --git a/samples/import.d.ts b/samples/import.d.ts
@@ -0,0 +1,16 @@
+/// <reference path="./assets/module" />
+// Import variants from https://www.typescriptlang.org/docs/handbook/modules.html#import
+
+import Default from "module";
+import { Single } from "module";
+import { Single as Renamed } from "module";
+import { First, Second } from "module";
+import { Third as T, Fourth } from "module";
+import * as validator from "module";
+import "./assets/module";
+
+declare const hello: String;
+
+declare module mod {
+    export function f(x: Number): String;
+}
diff --git a/samples/import.ts.scala → samples/import.d.ts.scala b/samples/import.ts.scala → samples/import.d.ts.scala
diff --git a/samples/import.ts b/samples/import.ts
diff --git a/samples/intersectiontype.ts → samples/intersectiontype.d.ts b/samples/intersectiontype.ts → samples/intersectiontype.d.ts
diff --git a/samples/intersectiontype.ts.scala → samples/intersectiontype.d.ts.scala b/samples/intersectiontype.ts.scala → samples/intersectiontype.d.ts.scala
diff --git a/samples/jsglobal.ts → samples/jsglobal.d.ts b/samples/jsglobal.ts → samples/jsglobal.d.ts
diff --git a/samples/jsglobal.ts.scala → samples/jsglobal.d.ts.scala b/samples/jsglobal.ts.scala → samples/jsglobal.d.ts.scala
diff --git a/samples/keyof.ts → samples/keyof.d.ts b/samples/keyof.ts → samples/keyof.d.ts
diff --git a/samples/keyof.ts.scala → samples/keyof.d.ts.scala b/samples/keyof.ts.scala → samples/keyof.d.ts.scala
diff --git a/samples/modifiers.ts → samples/modifiers.d.ts b/samples/modifiers.ts → samples/modifiers.d.ts
diff --git a/samples/modifiers.ts.scala → samples/modifiers.d.ts.scala b/samples/modifiers.ts.scala → samples/modifiers.d.ts.scala
diff --git a/samples/nestedobjectliteraltypes.ts → samples/nestedobjectliteraltypes.d.ts b/samples/nestedobjectliteraltypes.ts → samples/nestedobjectliteraltypes.d.ts
diff --git a/samples/nestedobjectliteraltypes.ts.scala → samples/nestedobjectliteraltypes.d.ts.scala b/samples/nestedobjectliteraltypes.ts.scala → samples/nestedobjectliteraltypes.d.ts.scala
diff --git a/samples/never.ts → samples/never.d.ts b/samples/never.ts → samples/never.d.ts
diff --git a/samples/never.ts.scala → samples/never.d.ts.scala b/samples/never.ts.scala → samples/never.d.ts.scala
diff --git a/samples/numberlit.ts → samples/numberlit.d.ts b/samples/numberlit.ts → samples/numberlit.d.ts
diff --git a/samples/numberlit.ts.scala → samples/numberlit.d.ts.scala b/samples/numberlit.ts.scala → samples/numberlit.d.ts.scala
diff --git a/samples/overrides.ts → samples/overrides.d.ts b/samples/overrides.ts → samples/overrides.d.ts
@@ -10,7 +10,7 @@ declare module overrides {
     toString(): string;
   }
 
-  export class B extends BLike {
+  export class B implements BLike {
     equals(other: any): boolean;
     clone(): BLike;
     toString(): string;

diff --git a/samples/overrides.ts.scala → samples/overrides.d.ts.scala b/samples/overrides.ts.scala → samples/overrides.d.ts.scala
diff --git a/samples/stringlit.ts → samples/stringlit.d.ts b/samples/stringlit.ts → samples/stringlit.d.ts
diff --git a/samples/stringlit.ts.scala → samples/stringlit.d.ts.scala b/samples/stringlit.ts.scala → samples/stringlit.d.ts.scala
diff --git a/samples/then.ts → samples/then.d.ts b/samples/then.ts → samples/then.d.ts
diff --git a/samples/then.ts.scala → samples/then.d.ts.scala b/samples/then.ts.scala → samples/then.d.ts.scala
diff --git a/samples/thistype.ts → samples/thistype.d.ts b/samples/thistype.ts → samples/thistype.d.ts
diff --git a/samples/thistype.ts.scala → samples/thistype.d.ts.scala b/samples/thistype.ts.scala → samples/thistype.d.ts.scala