Use packaged module for node

Makefile

@@ -0,0 +1,2 @@
+all:
+	yarn prepare

cli/src/cli.ts

@@ -1,13 +1,13 @@
 import * as tf from '@tensorflow/tfjs'
 import * as fs from 'fs'
-import * as U from '../src/util'
 import * as path from 'path'
 import * as child_process from 'child_process'
-import { option, program as commander } from "commander"
-import { compileModel, compileModelAndFullValidate } from '../src/driver'
-import { Options } from '../src/compiler'
-import { sampleModel, testAllModels } from '../src/main'
-import { testFloatConv } from '../src/float16'
+import { program as commander } from "commander"
+import {
+    compileModel, compileModelAndFullValidate,
+    Options, sampleModel, testAllModels,
+    testFloatConv
+} from '../..'
 
 interface CmdOptions {
     debug?: boolean
@@ -211,3 +211,5 @@ export async function mainCli() {
         console.error(e.stack)
     }
 }
+
+if (require.main === module) mainCli()

cli/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "es2017",
+    "module": "commonjs",
+    "lib": ["es2015", "es2016", "es2017"],
+    "strict": false,
+    "sourceMap": true,
+    "declaration": true,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "preserveConstEnums": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noImplicitReturns": true,
+    "outDir": "../built/cli",
+    "newLine": "LF",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  }
+}

package.json

@@ -3,23 +3,32 @@
   "version": "1.1.1",
   "description": "",
   "scripts": {
-    "build": "node node_modules/typescript/bin/tsc",
+    "prepare": "node node_modules/rollup/dist/bin/rollup -c rollup.config.ts && node node_modules/typescript/bin/tsc --project cli",
     "test": "node ml4f -T",
-    "watch-cli": "node node_modules/typescript/bin/tsc --watch",
+    "watch-cli": "node node_modules/typescript/bin/tsc --watch --project cli",
     "watch": "node node_modules/rollup/dist/bin/rollup -c rollup.config.ts -w"
   },
   "author": "",
   "license": "MIT",
+  "bin": "./ml4f",
+  "types": "./built/ml4f.d.ts",
+  "main": "./built/ml4f",
+  "files": [
+    "./built"
+  ],
+  "devDependencies": {
+    "rollup": "^2.26.4",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-dts": "^1.4.13",
+    "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-sourcemaps": "^0.6.2",
+    "rollup-plugin-typescript2": "^0.27.2",
+    "typescript": "^4.0.3"
+  },
   "dependencies": {
     "@tensorflow/tfjs": "^2.3.0",
     "@tensorflow/tfjs-node": "^2.3.0",
     "@tensorflow/tfjs-vis": "^1.4.3",
-    "commander": "^6.1.0",
-    "rollup": "^2.26.4",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-sourcemaps": "^0.6.2",
-    "rollup-plugin-typescript2": "^0.27.2",
-    "typescript": "^3.9.7"
+    "commander": "^6.1.0"
   }
 }

rollup.config.ts

@@ -1,6 +1,7 @@
 import commonjs from 'rollup-plugin-commonjs';
 import typescript from 'rollup-plugin-typescript2';
 import json from 'rollup-plugin-json'
+import dts from "rollup-plugin-dts";
 
 export default [
   { src: 'src/main.ts', dst: 'built/ml4f.js' }
@@ -14,7 +15,6 @@ export default [
       tsconfigOverride: {
         compilerOptions: {
           module: 'ES2015',
-          declaration: false
         }
       }
     }),
@@ -39,4 +39,8 @@ export default [
 
     console.warn(warning.code, warning.message)
   }
-}))
+})).concat([{
+  input: "./built/main.d.ts",
+  output: [{ file: "built/ml4f.d.ts", format: "es" }],
+  plugins: [dts()],
+}])

src/main.ts

@@ -4,3 +4,4 @@ export * from "./library"
 export * from "./driver"
 export * from "./util"
 export * from "./testing"
+export * from "./float16"

tsconfig.json

@@ -5,7 +5,6 @@
     "module": "commonjs",
     "lib": ["es2015", "es2016", "es2017"],
     "strict": false,
-    "jsx": "react",
     "sourceMap": true,
     "declaration": true,
     "allowSyntheticDefaultImports": true,
@@ -23,7 +22,5 @@
       "node_modules/@types"
     ]
   },
-  "include": [
-    "src", "cli"
-  ]
+  "include": [ "src" ]
 }