Fix type definitions

package.json

@@ -21,7 +21,7 @@
     "test": "jest",
     "test:all": "npm run lint && npm run test:typescript && npm run test",
     "test:coverage": "covert test/*.js",
-    "test:typescript": "cd ./typings/tests && npm install-test"
+    "test:typescript": "tsc -P typings"
   },
   "files": [
     "README.md",
@@ -54,6 +54,7 @@
     "ora": "^0.3.0",
     "ramda": "^0.22.1",
     "standard": "^10.0.2",
+    "typescript": "^4.9.5",
     "underscore": "^1.8.3"
   },
   "jest": {

typings/fast-memoize.d.ts

@@ -1,9 +1,5 @@
 type Func = (...args: any[]) => any;
 
-export interface Cache<K, V> {
-  create: CacheCreateFunc<K, V>
-}
-
 interface CacheCreateFunc<K, V> {
   (): {
     get(key: K): V;
@@ -12,25 +8,29 @@ interface CacheCreateFunc<K, V> {
    }
 }
 
-export type Serializer = (args: any[]) => string;
+declare namespace memoize {
+  interface Cache<K, V> {
+    create: CacheCreateFunc<K, V>
+  }
 
-export interface Options<F extends Func> {
-  cache?: Cache<string, ReturnType<F>>;
-  serializer?: Serializer;
-  strategy?: MemoizeFunc;
-}
+  type Serializer = (args: any[]) => string;
 
-export interface MemoizeFunc {
-  <F extends Func>(fn: F, options?: Options<F>): F;
-}
+  interface Options<F extends Func> {
+    cache?: Cache<string, ReturnType<F>>;
+    serializer?: Serializer;
+    strategy?: MemoizeFunc;
+  }
+
+  interface MemoizeFunc {
+    <F extends Func>(fn: F, options?: Options<F>): F;
+  }
 
-interface Memoize extends MemoizeFunc {
-  strategies: {
+  const strategies: {
     variadic: MemoizeFunc;
     monadic: MemoizeFunc;
-  };
+  }
 }
 
-declare const memoize: Memoize;
+declare function memoize<F extends Func>(fn: F, options?: memoize.Options<F>): F;
 
-export default memoize;
+export = memoize;

typings/tests/fast-memoize.test.ts → typings/fast-memoize.test.ts

@@ -1,10 +1,10 @@
-import memoize, { Options, Cache, Serializer } from "fast-memoize";
+import memoize = require("fast-memoize");
 
 function add(a: number, b: number): number {
   return a + b;
 }
 
-const cache: Cache<string, number> = {
+const cache: memoize.Cache<string, number> = {
   create: () => {
     const storage = new Map<string, number>();
       return {
@@ -29,9 +29,9 @@ const cache: Cache<string, number> = {
 
 };
 
-const serializer: Serializer = (args: any[]) => args.join("-");
+const serializer: memoize.Serializer = (args: any[]) => args.join("-");
 
-const options: Options<typeof add> = {
+const options: memoize.Options<typeof add> = {
   cache,
   serializer,
   strategy: memoize.strategies.variadic

typings/tests/tsconfig.json → typings/tsconfig.json

@@ -1,14 +1,16 @@
 {
   "compilerOptions": {
     "target": "es6",
-    "module": "es2015",
+    "module": "commonjs",
     "noEmit": true,
-    "jsx": "react",
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "paths": {
+      "fast-memoize": ["./fast-memoize"]
+    }
   }
 }