Bring back types by shimming a fix for typescript to work around importing tfjs

Author: Kevin Scott

.npmignore

@@ -7,4 +7,4 @@ tslint.json
 yarn.lock
 rollup.config.js
 config
-tests
+__tests__

package.json

@@ -1,15 +1,15 @@
 {
   "name": "ml-classifier",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A machine learning engine for quickly training image classification models in your browser",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "repository": "https://github.com/thekevinscott/ml-classifier",
   "scripts": {
     "clean": "rimraf dist/*",
     "watch": "npm run build -- --watch",
-    "make": "npm run clean && rollup -c",
-    "prepublish": "npm run build",
+    "build": "npm run clean && rollup -c",
+    "publish": "npm run build && npm publish",
     "test": "jest"
   },
   "keywords": [

rollup.config.js

@@ -10,6 +10,12 @@ export default {
   },
   plugins: [
     typescript({
+      tsconfig: 'tsconfig.json',
+      verbosity: 1,
+      exclude: [
+        '*.d.ts',
+        '**/*.d.ts',
+      ],
     }),
   ],
 };

src/__mocks__/@tensorflow/tfjs.ts

@@ -24,7 +24,8 @@ export { DataType } from './types';
 class MLClassifier {
   // private pretrainedModel: typeof tf.model;
   private pretrainedModel: any;
-  private model: tf.Sequential;
+  // private model: tf.Sequential;
+  private model: any;
   private callbacks: Function[] = [];
   private data: IData = {
     classes: {},
@@ -178,4 +179,5 @@ class MLClassifier {
     return await this.model.save(handlerOrURL || getDefaultDownloadHandler(this.data.classes));
   }
 }
+
 export default MLClassifier;

src/index.ts

@@ -7,26 +7,28 @@
     "lib": ["esnext", "dom"],
     "sourceMap": true,
     "allowJs": false,
-    "declaration": false,
+    "declaration": true,
     "moduleResolution": "node",
     "rootDir": "src",
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
+    "noUnusedLocals": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
     "suppressImplicitAnyIndexErrors": true,
     "paths": {
       "*": [
         "src/*"
       ]
-    },
-    "noUnusedLocals": true
+    }
   },
   "include": [
     "src/**/*"
   ],
   "exclude": [
+    "__tests__",
+    "__mocks__",
     "**/*.test.ts",
     "node_modules"
   ]

tsconfig.json

@@ -3722,7 +3722,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.1.7, resolve@^1.3.2, resolve@^1.7.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -3744,16 +3744,16 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   dependencies:
     glob "^7.0.5"
 
-"rollup-plugin-typescript2@https://github.com/ezolenko/rollup-plugin-typescript2":
-  version "0.16.0"
-  resolved "https://github.com/ezolenko/rollup-plugin-typescript2#f0e466c89f288f5b7434a513370201ef9da56aff"
+rollup-plugin-typescript2@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.15.1.tgz#7b35d0eaa6ad5a54a253ed158a565b99d8f15372"
   dependencies:
     fs-extra "^5.0.0"
-    resolve "^1.8.1"
-    rollup-pluginutils "^2.3.0"
-    tslib "1.9.3"
+    resolve "^1.7.1"
+    rollup-pluginutils "^2.0.1"
+    tslib "1.9.2"
 
-rollup-pluginutils@^2.3.0:
+rollup-pluginutils@^2.0.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
   dependencies:
@@ -4194,7 +4194,11 @@ ts-loader@^2.3.7:
     loader-utils "^1.0.2"
     semver "^5.0.1"
 
-tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1:
+tslib@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
+
+tslib@^1.8.0, tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"