Merge pull request #2 from thekevinscott/rollup

Set up a rollup pipeline

Author: Kevin Scott

.npmignore

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

__tests__/index.test.ts

@@ -0,0 +1,22 @@
+import MLClassifier from '../dist/index';
+
+describe('Integration test', () => {
+  test('that it initializes', () => {
+    const mlClassifier = new MLClassifier();
+    expect(mlClassifier).toBeDefined();
+  });
+
+  test('that it demands images', () => {
+    const mlClassifier = new MLClassifier();
+    return mlClassifier.addData().catch(err => {
+      expect(err.message).toEqual('You must supply images');
+    });
+  });
+
+  test('that it demands labels', () => {
+    const mlClassifier = new MLClassifier();
+    return mlClassifier.addData([]).catch(err => {
+      expect(err.message).toEqual('You must supply labels');
+    });
+  });
+});

package.json

@@ -1,14 +1,14 @@
 {
   "name": "ml-classifier",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "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",
-    "build": "npm run clean && tsc --project tsconfig.json",
+    "make": "npm run clean && rollup -c",
     "prepublish": "npm run build",
     "test": "jest"
   },
@@ -19,6 +19,7 @@
   "license": "MIT",
   "jest": {
     "testMatch": [
+      "<rootDir>__tests__/**/*.(j|t)s?(x)",
       "<rootDir>/src/**/__tests__/**/*.(j|t)s?(x)",
       "<rootDir>/src/**/?(*.)(spec|test).(j|t)s?(x)"
     ],
@@ -56,12 +57,13 @@
     "jest": "22.4.2",
     "regenerator-runtime": "^0.12.0",
     "rimraf": "^2.6.2",
+    "rollup": "^0.62.0",
+    "rollup-plugin-typescript2": "^0.15.1",
     "ts-jest": "22.0.1",
     "ts-loader": "^2.3.7",
     "tslint": "^5.7.0",
     "tslint-config-prettier": "^1.10.0",
     "typescript": "^2.9.2"
   },
-  "dependencies": {
-  }
+  "dependencies": {}
 }

rollup.config.js

@@ -0,0 +1,16 @@
+// rollup.config.js
+import typescript from 'rollup-plugin-typescript2';
+
+export default {
+  entry: './src/index.ts',
+  output: {
+    name: 'MLClassifier',
+    file: './dist/index.js',
+    format: 'umd',
+  },
+  plugins: [
+    typescript({
+    }),
+  ],
+};
+

src/index.ts

@@ -72,11 +72,13 @@ class MLClassifier {
   public getModel = () => this.model;
 
   public addData = async (images: tf.Tensor3D[], labels: string[], dataType: DataType = DataType.TRAIN) => {
+    if (!images) {
+      throw new Error('You must supply images');
+    }
+    if (!labels) {
+      throw new Error('You must supply labels');
+    }
     if (dataType === DataType.TRAIN || dataType === DataType.EVAL) {
-      if (!labels) {
-        throw new Error(`You must provide labels when supplying ${dataType} data`);
-      }
-
       const activatedImages = await Promise.all(images.map(async (image: tf.Tensor3D, idx: number) => {
         return await this.cropAndActivateImage(image);
       }));

tsconfig.json

@@ -5,11 +5,9 @@
     "module": "esnext",
     "target": "es5",
     "lib": ["esnext", "dom"],
-
     "sourceMap": true,
     "allowJs": false,
-    "declaration": true,
-    "jsx": "react",
+    "declaration": false,
     "moduleResolution": "node",
     "rootDir": "src",
     "forceConsistentCasingInFileNames": true,

yarn.lock

@@ -836,12 +836,6 @@
   version "0.6.7"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.6.7.tgz#aa4f994c4104a8cf3f93b5e13ab051685c092c80"
 
-"@tensorflow/tfjs-node@^0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-0.1.7.tgz#76b827c32504efed9cbd9b1b1394e4ec53e45fe5"
-  dependencies:
-    bindings "~1.3.0"
-
 "@tensorflow/tfjs@^0.11.7":
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.11.7.tgz#5b5fe7b17bca2d2088fdd01aea0660517364b752"
@@ -850,6 +844,10 @@
     "@tensorflow/tfjs-core" "0.11.9"
     "@tensorflow/tfjs-layers" "0.6.7"
 
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+
 "@types/jest@^23.1.1":
   version "23.1.3"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.1.3.tgz#4db19b2e7627dc254bbed5781b5609c621b5ad8e"
@@ -858,6 +856,10 @@
   version "3.0.32"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
 
+"@types/node@*":
+  version "10.5.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707"
+
 "@types/node@^10.3.4":
   version "10.5.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
@@ -1317,10 +1319,6 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-bindings@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1786,6 +1784,10 @@ estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
+estree-walker@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -1996,6 +1998,14 @@ fs-extra@4.0.3:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -2094,13 +2104,6 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-haikunator@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/haikunator/-/haikunator-2.0.0.tgz#db740d7eff50e2e9c2f030ad15b195b4a6cbec3c"
-  dependencies:
-    lodash.defaults "^4.2.0"
-    random-seed "^0.3.0"
-
 handlebars@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
@@ -2861,7 +2864,7 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -2958,10 +2961,6 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash.defaults@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -3519,12 +3518,6 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
-random-seed@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/random-seed/-/random-seed-0.3.0.tgz#d945f2e1f38f49e8d58913431b8bf6bb937556cd"
-  dependencies:
-    json-stringify-safe "^5.0.1"
-
 randomatic@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
@@ -3729,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.1.7, resolve@^1.3.2, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -3751,6 +3744,29 @@ 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"
+  dependencies:
+    fs-extra "^5.0.0"
+    resolve "^1.8.1"
+    rollup-pluginutils "^2.3.0"
+    tslib "1.9.3"
+
+rollup-pluginutils@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
+  dependencies:
+    estree-walker "^0.5.2"
+    micromatch "^2.3.11"
+
+rollup@^0.62.0:
+  version "0.62.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.62.0.tgz#4ca8b3c9582195dc9341ff8a1375f58319b95bfc"
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "*"
+
 rsvp@^3.3.3:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
@@ -4178,7 +4194,7 @@ ts-loader@^2.3.7:
     loader-utils "^1.0.2"
     semver "^5.0.1"
 
-tslib@^1.8.0, tslib@^1.8.1:
+tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"