react-native-executorch 0.4.6 → 0.4.8

package/android/build.gradle

@@ -103,7 +103,7 @@ dependencies {
   implementation "com.facebook.react:react-android:+"
   implementation 'org.opencv:opencv:4.10.0'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation("com.github.software-mansion:react-native-executorch:v0.4.5")
+	implementation("com.github.software-mansion:react-native-executorch:release~0.4-SNAPSHOT")
   implementation 'org.opencv:opencv:4.10.0'
   implementation("com.squareup.okhttp3:okhttp:4.9.2")
 }

package/lib/module/Error.js

@@ -8,7 +8,7 @@ export let ETError = /*#__PURE__*/function (ETError) {
   ETError[ETError["ModelGenerating"] = 104] = "ModelGenerating";
   ETError[ETError["LanguageNotSupported"] = 105] = "LanguageNotSupported";
   ETError[ETError["InvalidModelSource"] = 255] = "InvalidModelSource";
-  //SpeechToText errors
+  // SpeechToText errors
   ETError[ETError["MultilingualConfiguration"] = 160] = "MultilingualConfiguration";
   ETError[ETError["MissingDataChunk"] = 161] = "MissingDataChunk";
   ETError[ETError["StreamingNotStarted"] = 162] = "StreamingNotStarted";
@@ -38,15 +38,15 @@ export let ETError = /*#__PURE__*/function (ETError) {
 }({});
 export const getError = e => {
   if (typeof e === 'number') {
-    if (e in ETError) return ETError[e];
-    return ETError[ETError.UndefinedError];
+    return ETError[e] ?? ETError[ETError.UndefinedError];
   }
 
   // try to extract number from message (can contain false positives)
   const error = e;
   const errorCode = parseInt(error.message, 10);
-  const message = Number.isNaN(errorCode) ? error.message : ' ' + error.message.slice(`${errorCode}`.length).trimStart();
-  const ETErrorMessage = errorCode in ETError ? ETError[errorCode] : ETError[ETError.UndefinedError];
-  return ETErrorMessage + message;
+  if (Number.isNaN(errorCode)) {
+    return error.message;
+  }
+  return ETError[errorCode] ?? ETError[ETError.UndefinedError];
 };
 //# sourceMappingURL=Error.js.map

package/lib/module/Error.js.map

@@ -1 +1 @@
-{"version":3,"names":["ETError","getError","e","UndefinedError","error","errorCode","parseInt","message","Number","isNaN","slice","length","trimStart","ETErrorMessage"],"sourceRoot":"../../src","sources":["Error.ts"],"mappings":";;AAAA,WAAYA,OAAO,0BAAPA,OAAO;EACjB;EADUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EASjB;EATUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAcjB;EACA;EACA;EAhBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAsBjB;EAtBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EA6BjB;EA7BUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAmCjB;EAnCUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAA,OAAPA,OAAO;AAAA;AAyCnB,OAAO,MAAMC,QAAQ,GAAIC,CAA4B,IAAa;EAChE,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;IACzB,IAAIA,CAAC,IAAIF,OAAO,EAAE,OAAOA,OAAO,CAACE,CAAC,CAAC;IACnC,OAAOF,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;EACxC;;EAEA;EACA,MAAMC,KAAK,GAAGF,CAAU;EACxB,MAAMG,SAAS,GAAGC,QAAQ,CAACF,KAAK,CAACG,OAAO,EAAE,EAAE,CAAC;EAC7C,MAAMA,OAAO,GAAGC,MAAM,CAACC,KAAK,CAACJ,SAAS,CAAC,GACnCD,KAAK,CAACG,OAAO,GACb,GAAG,GAAGH,KAAK,CAACG,OAAO,CAACG,KAAK,CAAC,GAAGL,SAAS,EAAE,CAACM,MAAM,CAAC,CAACC,SAAS,CAAC,CAAC;EAEhE,MAAMC,cAAc,GAClBR,SAAS,IAAIL,OAAO,GAAGA,OAAO,CAACK,SAAS,CAAC,GAAGL,OAAO,CAACA,OAAO,CAACG,cAAc,CACjE;EAEX,OAAOU,cAAc,GAAGN,OAAO;AACjC,CAAC","ignoreList":[]}
+{"version":3,"names":["ETError","getError","e","UndefinedError","error","errorCode","parseInt","message","Number","isNaN"],"sourceRoot":"../../src","sources":["Error.ts"],"mappings":";;AAAA,WAAYA,OAAO,0BAAPA,OAAO;EACjB;EADUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EASjB;EATUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAcjB;EACA;EACA;EAhBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAsBjB;EAtBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EA6BjB;EA7BUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAmCjB;EAnCUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAA,OAAPA,OAAO;AAAA;AAyCnB,OAAO,MAAMC,QAAQ,GAAIC,CAA4B,IAAa;EAChE,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;IACzB,OAAOF,OAAO,CAACE,CAAC,CAAC,IAAIF,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;EACtD;;EAEA;EACA,MAAMC,KAAK,GAAGF,CAAU;EACxB,MAAMG,SAAS,GAAGC,QAAQ,CAACF,KAAK,CAACG,OAAO,EAAE,EAAE,CAAC;EAE7C,IAAIC,MAAM,CAACC,KAAK,CAACJ,SAAS,CAAC,EAAE;IAC3B,OAAOD,KAAK,CAACG,OAAO;EACtB;EAEA,OAAOP,OAAO,CAACK,SAAS,CAAC,IAAIL,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;AAC9D,CAAC","ignoreList":[]}

package/lib/module/modules/general/ExecutorchModule.js

@@ -13,15 +13,15 @@ export class ExecutorchModule extends BaseModule {
     if (!Array.isArray(input)) {
       input = [input];
     }
-    let inputTypeIdentifiers = [];
-    let modelInputs = [];
-    for (let idx = 0; idx < input.length; idx++) {
-      let currentInputTypeIdentifier = getTypeIdentifier(input[idx]);
-      if (currentInputTypeIdentifier === -1) {
+    const inputTypeIdentifiers = [];
+    const modelInputs = [];
+    for (const subInput of input) {
+      const typeIdentifier = getTypeIdentifier(subInput);
+      if (typeIdentifier === -1) {
         throw new Error(getError(ETError.InvalidArgument));
       }
-      inputTypeIdentifiers.push(currentInputTypeIdentifier);
-      modelInputs.push([...input[idx]]);
+      inputTypeIdentifiers.push(typeIdentifier);
+      modelInputs.push(Array.from(subInput, x => Number(x)));
     }
     try {
       return await this.nativeModule.forward(modelInputs, shape, inputTypeIdentifiers);

package/lib/module/modules/general/ExecutorchModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["ETError","getError","ETModuleNativeModule","getTypeIdentifier","BaseModule","ExecutorchModule","nativeModule","load","modelSource","forward","input","shape","Array","isArray","inputTypeIdentifiers","modelInputs","idx","length","currentInputTypeIdentifier","Error","InvalidArgument","push","e","loadMethod","methodName","loadForward"],"sourceRoot":"../../../../src","sources":["modules/general/ExecutorchModule.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,QAAQ,QAAQ,aAAa;AAC/C,SAASC,oBAAoB,QAAQ,kCAAkC;AAGvE,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,UAAU,QAAQ,eAAe;AAE1C,OAAO,MAAMC,gBAAgB,SAASD,UAAU,CAAC;EAC/C,OAA0BE,YAAY,GAAGJ,oBAAoB;EAE7D,aAAsBK,IAAIA,CAACC,WAA2B,EAAE;IACtD,OAAO,MAAM,KAAK,CAACD,IAAI,CAACC,WAAW,CAAC;EACtC;EAEA,aAAsBC,OAAOA,CAACC,KAA0B,EAAEC,KAAiB,EAAE;IAC3E,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,EAAE;MACzBA,KAAK,GAAG,CAACA,KAAK,CAAC;IACjB;IAEA,IAAII,oBAAoB,GAAG,EAAE;IAC7B,IAAIC,WAAW,GAAG,EAAE;IAEpB,KAAK,IAAIC,GAAG,GAAG,CAAC,EAAEA,GAAG,GAAGN,KAAK,CAACO,MAAM,EAAED,GAAG,EAAE,EAAE;MAC3C,IAAIE,0BAA0B,GAAGf,iBAAiB,CAACO,KAAK,CAACM,GAAG,CAAY,CAAC;MACzE,IAAIE,0BAA0B,KAAK,CAAC,CAAC,EAAE;QACrC,MAAM,IAAIC,KAAK,CAAClB,QAAQ,CAACD,OAAO,CAACoB,eAAe,CAAC,CAAC;MACpD;MACAN,oBAAoB,CAACO,IAAI,CAACH,0BAA0B,CAAC;MACrDH,WAAW,CAACM,IAAI,CAAC,CAAC,GAAIX,KAAK,CAACM,GAAG,CAAyB,CAAC,CAAC;IAC5D;IAEA,IAAI;MACF,OAAO,MAAM,IAAI,CAACV,YAAY,CAACG,OAAO,CACpCM,WAAW,EACXJ,KAAK,EACLG,oBACF,CAAC;IACH,CAAC,CAAC,OAAOQ,CAAC,EAAE;MACV,MAAM,IAAIH,KAAK,CAAClB,QAAQ,CAACqB,CAAC,CAAC,CAAC;IAC9B;EACF;EAEA,aAAaC,UAAUA,CAACC,UAAkB,EAAE;IAC1C,IAAI;MACF,MAAM,IAAI,CAAClB,YAAY,CAACiB,UAAU,CAACC,UAAU,CAAC;IAChD,CAAC,CAAC,OAAOF,CAAC,EAAE;MACV,MAAM,IAAIH,KAAK,CAAClB,QAAQ,CAACqB,CAAC,CAAC,CAAC;IAC9B;EACF;EAEA,aAAaG,WAAWA,CAAA,EAAG;IACzB,MAAM,IAAI,CAACF,UAAU,CAAC,SAAS,CAAC;EAClC;AACF","ignoreList":[]}
+{"version":3,"names":["ETError","getError","ETModuleNativeModule","getTypeIdentifier","BaseModule","ExecutorchModule","nativeModule","load","modelSource","forward","input","shape","Array","isArray","inputTypeIdentifiers","modelInputs","subInput","typeIdentifier","Error","InvalidArgument","push","from","x","Number","e","loadMethod","methodName","loadForward"],"sourceRoot":"../../../../src","sources":["modules/general/ExecutorchModule.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,QAAQ,QAAQ,aAAa;AAC/C,SAASC,oBAAoB,QAAQ,kCAAkC;AAGvE,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,UAAU,QAAQ,eAAe;AAE1C,OAAO,MAAMC,gBAAgB,SAASD,UAAU,CAAC;EAC/C,OAA0BE,YAAY,GAAGJ,oBAAoB;EAE7D,aAAsBK,IAAIA,CAACC,WAA2B,EAAE;IACtD,OAAO,MAAM,KAAK,CAACD,IAAI,CAACC,WAAW,CAAC;EACtC;EAEA,aAAsBC,OAAOA,CAACC,KAA0B,EAAEC,KAAiB,EAAE;IAC3E,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,EAAE;MACzBA,KAAK,GAAG,CAACA,KAAK,CAAC;IACjB;IAEA,MAAMI,oBAA8B,GAAG,EAAE;IACzC,MAAMC,WAAuB,GAAG,EAAE;IAElC,KAAK,MAAMC,QAAQ,IAAIN,KAAK,EAAE;MAC5B,MAAMO,cAAc,GAAGd,iBAAiB,CAACa,QAAQ,CAAC;MAClD,IAAIC,cAAc,KAAK,CAAC,CAAC,EAAE;QACzB,MAAM,IAAIC,KAAK,CAACjB,QAAQ,CAACD,OAAO,CAACmB,eAAe,CAAC,CAAC;MACpD;MACAL,oBAAoB,CAACM,IAAI,CAACH,cAAc,CAAC;MACzCF,WAAW,CAACK,IAAI,CAACR,KAAK,CAACS,IAAI,CAACL,QAAQ,EAAGM,CAAkB,IAAKC,MAAM,CAACD,CAAC,CAAC,CAAC,CAAC;IAC3E;IAEA,IAAI;MACF,OAAO,MAAM,IAAI,CAAChB,YAAY,CAACG,OAAO,CACpCM,WAAW,EACXJ,KAAK,EACLG,oBACF,CAAC;IACH,CAAC,CAAC,OAAOU,CAAC,EAAE;MACV,MAAM,IAAIN,KAAK,CAACjB,QAAQ,CAACuB,CAAC,CAAC,CAAC;IAC9B;EACF;EAEA,aAAaC,UAAUA,CAACC,UAAkB,EAAE;IAC1C,IAAI;MACF,MAAM,IAAI,CAACpB,YAAY,CAACmB,UAAU,CAACC,UAAU,CAAC;IAChD,CAAC,CAAC,OAAOF,CAAC,EAAE;MACV,MAAM,IAAIN,KAAK,CAACjB,QAAQ,CAACuB,CAAC,CAAC,CAAC;IAC9B;EACF;EAEA,aAAaG,WAAWA,CAAA,EAAG;IACzB,MAAM,IAAI,CAACF,UAAU,CAAC,SAAS,CAAC;EAClC;AACF","ignoreList":[]}

package/lib/typescript/Error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Error.d.ts","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,oBAAY,OAAO;IAEjB,cAAc,MAAO;IACrB,eAAe,MAAO;IACtB,eAAe,MAAO;IACtB,eAAe,MAAO;IACtB,oBAAoB,MAAO;IAC3B,kBAAkB,MAAO;IAGzB,yBAAyB,MAAO;IAChC,gBAAgB,MAAO;IACvB,mBAAmB,MAAO;IAK1B,EAAE,IAAO;IACT,QAAQ,IAAO;IACf,YAAY,IAAO;IACnB,WAAW,IAAO;IAGlB,YAAY,KAAO;IACnB,cAAc,KAAO;IACrB,eAAe,KAAO;IACtB,WAAW,KAAO;IAClB,eAAe,KAAO;IAGtB,QAAQ,KAAO;IACf,sBAAsB,KAAO;IAC7B,YAAY,KAAO;IACnB,cAAc,KAAO;IAGrB,4BAA4B,KAAO;IACnC,8BAA8B,KAAO;IACrC,qBAAqB,KAAO;CAC7B;AAED,eAAO,MAAM,QAAQ,GAAI,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,KAAG,MAkBvD,CAAC"}
+{"version":3,"file":"Error.d.ts","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,oBAAY,OAAO;IAEjB,cAAc,MAAO;IACrB,eAAe,MAAO;IACtB,eAAe,MAAO;IACtB,eAAe,MAAO;IACtB,oBAAoB,MAAO;IAC3B,kBAAkB,MAAO;IAGzB,yBAAyB,MAAO;IAChC,gBAAgB,MAAO;IACvB,mBAAmB,MAAO;IAK1B,EAAE,IAAO;IACT,QAAQ,IAAO;IACf,YAAY,IAAO;IACnB,WAAW,IAAO;IAGlB,YAAY,KAAO;IACnB,cAAc,KAAO;IACrB,eAAe,KAAO;IACtB,WAAW,KAAO;IAClB,eAAe,KAAO;IAGtB,QAAQ,KAAO;IACf,sBAAsB,KAAO;IAC7B,YAAY,KAAO;IACnB,cAAc,KAAO;IAGrB,4BAA4B,KAAO;IACnC,8BAA8B,KAAO;IACrC,qBAAqB,KAAO;CAC7B;AAED,eAAO,MAAM,QAAQ,GAAI,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,KAAG,MAcvD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-executorch",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "An easy way to run AI models in react native with ExecuTorch",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",

package/src/Error.ts

@@ -7,7 +7,7 @@ export enum ETError {
   LanguageNotSupported = 0x69,
   InvalidModelSource = 0xff,
 
-  //SpeechToText errors
+  // SpeechToText errors
   MultilingualConfiguration = 0xa0,
   MissingDataChunk = 0xa1,
   StreamingNotStarted = 0xa2,
@@ -41,20 +41,16 @@ export enum ETError {
 
 export const getError = (e: unknown | ETError | Error): string => {
   if (typeof e === 'number') {
-    if (e in ETError) return ETError[e] as string;
-    return ETError[ETError.UndefinedError] as string;
+    return ETError[e] ?? ETError[ETError.UndefinedError];
   }
 
   // try to extract number from message (can contain false positives)
   const error = e as Error;
   const errorCode = parseInt(error.message, 10);
-  const message = Number.isNaN(errorCode)
-    ? error.message
-    : ' ' + error.message.slice(`${errorCode}`.length).trimStart();
 
-  const ETErrorMessage = (
-    errorCode in ETError ? ETError[errorCode] : ETError[ETError.UndefinedError]
-  ) as string;
+  if (Number.isNaN(errorCode)) {
+    return error.message;
+  }
 
-  return ETErrorMessage + message;
+  return ETError[errorCode] ?? ETError[ETError.UndefinedError];
 };

package/src/modules/general/ExecutorchModule.ts

@@ -17,16 +17,16 @@ export class ExecutorchModule extends BaseModule {
       input = [input];
     }
 
-    let inputTypeIdentifiers = [];
-    let modelInputs = [];
+    const inputTypeIdentifiers: number[] = [];
+    const modelInputs: number[][] = [];
 
-    for (let idx = 0; idx < input.length; idx++) {
-      let currentInputTypeIdentifier = getTypeIdentifier(input[idx] as ETInput);
-      if (currentInputTypeIdentifier === -1) {
+    for (const subInput of input) {
+      const typeIdentifier = getTypeIdentifier(subInput);
+      if (typeIdentifier === -1) {
         throw new Error(getError(ETError.InvalidArgument));
       }
-      inputTypeIdentifiers.push(currentInputTypeIdentifier);
-      modelInputs.push([...(input[idx] as unknown as number[])]);
+      inputTypeIdentifiers.push(typeIdentifier);
+      modelInputs.push(Array.from(subInput, (x: number | BigInt) => Number(x)));
     }
 
     try {