Change to name exports

Author: pearmini

package.json

@@ -20,6 +20,9 @@
   "keywords": [
     "ML5"
   ],
+  "sideEffects": [
+    "src/index.js"
+  ],
   "author": "ml5",
   "license": "MIT",
   "repository": {

src/BodyPose/index.js

@@ -27,6 +27,7 @@ import handleOptions from "../utils/handleOptions";
 import { handleModelName } from "../utils/handleOptions";
 import objectRenameKey from "../utils/objectRenameKey";
 import { isVideo } from "../utils/handleArguments";
+import p5Utils from "../utils/p5Utils";
 
 /**
  * User provided options object for BodyPose with MoveNet model.
@@ -547,10 +548,7 @@ class BodyPose {
  * @param {function} callback  - A callback function that is called once the model has been loaded.
  * @returns {BodyPose} A BodyPose instance.
  */
-const bodyPose = (...inputs) => {
+export const bodyPose = p5Utils.maybeRegisterPreload((...inputs) => {
   const { string, options = {}, callback } = handleArguments(...inputs);
-  const instance = new BodyPose(string, options, callback);
-  return instance;
-};
-
-export default bodyPose;
+  return new BodyPose(string, options, callback);
+});

src/BodySegmentation/index.js

@@ -16,6 +16,7 @@ import BODYPIX_PALETTE from "./BODYPIX_PALETTE";
 import { mediaReady } from "../utils/imageUtilities";
 import handleOptions from "../utils/handleOptions";
 import { handleModelName } from "../utils/handleOptions";
+import p5Utils from "../utils/p5Utils";
 
 class BodySegmentation {
   /**
@@ -411,10 +412,7 @@ class BodySegmentation {
  * Factory function that returns a Facemesh instance
  * @returns {Object} A new bodySegmentation instance
  */
-const bodySegmentation = (...inputs) => {
+export const bodySegmentation = p5Utils.maybeRegisterPreload((...inputs) => {
   const { string, options = {}, callback } = handleArguments(...inputs);
-  const instance = new BodySegmentation(string, options, callback);
-  return instance;
-};
-
-export default bodySegmentation;
+  return new BodySegmentation(string, options, callback);
+});

src/FaceMesh/index.js

@@ -26,6 +26,7 @@ import { mediaReady } from "../utils/imageUtilities";
 import handleOptions from "../utils/handleOptions";
 import { handleModelName } from "../utils/handleOptions";
 import { UV_COORDS } from "./uv_coords";
+import p5Utils from "../utils/p5Utils";
 
 /**
  * User provided options object for FaceMesh. See config schema below for default and available values.
@@ -375,10 +376,7 @@ class FaceMesh {
  * @param {function} [callback] - A callback to be called when the model is ready.
  * @returns {Object} A new faceMesh instance.
  */
-const faceMesh = (...inputs) => {
+export const faceMesh = p5Utils.maybeRegisterPreload((...inputs) => {
   const { string, options = {}, callback } = handleArguments(...inputs);
-  const instance = new FaceMesh(string, options, callback);
-  return instance;
-};
-
-export default faceMesh;
+  return new FaceMesh(string, options, callback);
+});

src/HandPose/index.js

@@ -27,6 +27,7 @@ import handleOptions from "../utils/handleOptions";
 import { handleModelName } from "../utils/handleOptions";
 import { mediaReady } from "../utils/imageUtilities";
 import objectRenameKey from "../utils/objectRenameKey";
+import p5Utils from "../utils/p5Utils";
 
 /**
  * User provided options object for HandPose. See config schema below for default and available values.
@@ -311,10 +312,7 @@ class HandPose {
  * @param {function} [callback] - A callback function that is called once the model has been loaded.
  * @returns {HandPose} A new handPose instance.
  */
-const handPose = (...inputs) => {
+export const handPose = p5Utils.maybeRegisterPreload((...inputs) => {
   const { string, options = {}, callback } = handleArguments(...inputs);
-  const instance = new HandPose(string, options, callback);
-  return instance;
-};
-
-export default handPose;
+  return new HandPose(string, options, callback);
+});

src/ImageClassifier/index.js

@@ -18,6 +18,7 @@ import callCallback from "../utils/callcallback";
 import { imgToTensor, mediaReady } from "../utils/imageUtilities";
 import handleOptions from "../utils/handleOptions";
 import { handleModelName } from "../utils/handleOptions";
+import p5Utils from "../utils/p5Utils";
 
 const IMAGE_SIZE = 224;
 const MODEL_OPTIONS = ["mobilenet", "darknet", "darknet-tiny", "doodlenet"];
@@ -248,7 +249,10 @@ class ImageClassifier {
       "image",
       "No input image provided. If you want to classify a video, use classifyStart."
     );
-    return callCallback(this.classifyInternal(image, number || this.topk), callback);
+    return callCallback(
+      this.classifyInternal(image, number || this.topk),
+      callback
+    );
   }
 
   /**
@@ -270,8 +274,11 @@ class ImageClassifier {
     const classifyFrame = async () => {
       await mediaReady(image, true);
       // call the callback function
-      await callCallback(this.classifyInternal(image, number || this.topk), callback);
-      
+      await callCallback(
+        this.classifyInternal(image, number || this.topk),
+        callback
+      );
+
       // call recursively for continuous classification
       if (!this.signalStop) {
         requestAnimationFrame(classifyFrame);
@@ -305,13 +312,10 @@ class ImageClassifier {
   }
 }
 
-const imageClassifier = (modelName, optionsOrCallback, cb) => {
-  const args = handleArguments(modelName, optionsOrCallback, cb);
-
-  const { string, options = {}, callback } = args;
-
-  const instance = new ImageClassifier(string, options, callback);
-  return instance;
-};
-
-export default imageClassifier;
+export const imageClassifier = p5Utils.maybeRegisterPreload(
+  (modelName, optionsOrCallback, cb) => {
+    const args = handleArguments(modelName, optionsOrCallback, cb);
+    const { string, options = {}, callback } = args;
+    return new ImageClassifier(string, options, callback);
+  }
+);

src/NeuralNetwork/index.js

@@ -10,6 +10,7 @@ import NeuralNetworkData from "./NeuralNetworkData";
 
 import nnUtils from "./NeuralNetworkUtils";
 import NeuralNetworkVis from "./NeuralNetworkVis";
+import p5Utils from "../utils/p5Utils";
 
 const DEFAULTS = {
   inputs: [],
@@ -1249,23 +1250,22 @@ class DiyNeuralNetwork {
   }
 }
 
-const neuralNetwork = (inputsOrOptions, outputsOrCallback, callback) => {
-  let options;
-  let cb;
-
-  if (inputsOrOptions instanceof Object) {
-    options = inputsOrOptions;
-    cb = outputsOrCallback;
-  } else {
-    options = {
-      inputs: inputsOrOptions,
-      outputs: outputsOrCallback,
-    };
-    cb = callback;
-  }
+export const neuralNetwork = p5Utils.maybeRegisterPreload(
+  (inputsOrOptions, outputsOrCallback, callback) => {
+    let options;
+    let cb;
 
-  const instance = new DiyNeuralNetwork(options, cb);
-  return instance;
-};
+    if (inputsOrOptions instanceof Object) {
+      options = inputsOrOptions;
+      cb = outputsOrCallback;
+    } else {
+      options = {
+        inputs: inputsOrOptions,
+        outputs: outputsOrCallback,
+      };
+      cb = callback;
+    }
 
-export default neuralNetwork;
+    return new DiyNeuralNetwork(options, cb);
+  }
+);

src/Sentiment/index.js

@@ -3,6 +3,8 @@ import callCallback from "../utils/callcallback";
 import modelLoader from "../utils/modelLoader";
 import handleArguments from "../utils/handleArguments";
 import { handleModelName } from "../utils/handleOptions";
+import p5Utils from "../utils/p5Utils";
+
 /**
  * Initializes the Sentiment demo.
  */
@@ -143,10 +145,7 @@ class Sentiment {
   }
 }
 
-const sentiment = (...inputs) => {
+export const sentiment = p5Utils.maybeRegisterPreload((...inputs) => {
   const { string, callback } = handleArguments(...inputs);
-  const instance = new Sentiment(string, callback);
-  return instance;
-};
-
-export default sentiment;
+  return new Sentiment(string, callback);
+});

src/SoundClassifier/index.js

@@ -11,6 +11,7 @@ import * as tf from "@tensorflow/tfjs";
 import handleArguments from "../utils/handleArguments";
 import * as speechCommands from "./speechcommands";
 import callCallback from "../utils/callcallback";
+import p5Utils from "../utils/p5Utils";
 
 const MODEL_OPTIONS = ["speechcommands18w"];
 // exporting the sound classifier instance so that the stop/start flags regarding classification state are accessible to speechcommands.js to use
@@ -98,32 +99,31 @@ class SoundClassifier {
   /**
    * Used to stop the continuous classification of a video
    */
-   classifyStop() {
+  classifyStop() {
     if (this.isClassifying) {
       this.signalStop = true;
     }
     this.prevCall = "stop";
   }
 }
 
-const soundClassifier = (modelName, optionsOrCallback, cb) => {
-  const {
-    string,
-    options = {},
-    callback,
-  } = handleArguments(modelName, optionsOrCallback, cb).require(
-    "string",
-    'Please specify a model to use. E.g: "SpeechCommands18w"'
-  );
-
-  let model = string;
+export const soundClassifier = p5Utils.maybeRegisterPreload(
+  (modelName, optionsOrCallback, cb) => {
+    const {
+      string,
+      options = {},
+      callback,
+    } = handleArguments(modelName, optionsOrCallback, cb).require(
+      "string",
+      'Please specify a model to use. E.g: "SpeechCommands18w"'
+    );
+
+    let model = string;
+
+    if (model.indexOf("http") === -1) {
+      model = model.toLowerCase();
+    }
 
-  if (model.indexOf("http") === -1) {
-    model = model.toLowerCase();
+    return new SoundClassifier(model, options, callback);
   }
-
-  instance = new SoundClassifier(model, options, callback);
-  return instance;
-};
-
-export default soundClassifier;
+);

src/index.js

@@ -1,19 +1,24 @@
-import neuralNetwork from "./NeuralNetwork";
-import handPose from "./HandPose";
-import sentiment from "./Sentiment";
-import faceMesh from "./FaceMesh";
-import bodyPose from "./BodyPose";
-import imageClassifier from "./ImageClassifier";
-import soundClassifier from "./SoundClassifier";
+import { neuralNetwork } from "./NeuralNetwork";
+import { handPose } from "./HandPose";
+import { sentiment } from "./Sentiment";
+import { faceMesh } from "./FaceMesh";
+import { bodyPose } from "./BodyPose";
+import { imageClassifier } from "./ImageClassifier";
+import { soundClassifier } from "./SoundClassifier";
+import { bodySegmentation } from "./BodySegmentation";
 import setBackend from "./utils/setBackend";
-import bodySegmentation from "./BodySegmentation";
 import communityStatement from "./utils/communityStatement";
 import * as tf from "@tensorflow/tfjs";
 import * as tfvis from "@tensorflow/tfjs-vis";
 import p5Utils from "./utils/p5Utils";
 import packageInfo from "../package.json";
 
-const withPreload = {
+communityStatement();
+
+const version = packageInfo.version;
+const setP5 = p5Utils.setP5.bind(p5Utils);
+
+export {
   bodyPose,
   bodySegmentation,
   faceMesh,
@@ -22,18 +27,10 @@ const withPreload = {
   neuralNetwork,
   sentiment,
   soundClassifier,
-};
-
-const ml5 = Object.assign({ p5Utils }, withPreload, {
+  p5Utils,
   tf,
   tfvis,
   setBackend,
-  version: packageInfo.version,
-  setP5: p5Utils.setP5.bind(p5Utils),
-});
-
-p5Utils.shouldPreload(ml5, Object.keys(withPreload));
-
-communityStatement();
-
-export default ml5;
+  version,
+  setP5,
+};