@rn-org/react-native-thread 0.4.0 → 0.6.0

package/lib/module/index.js

@@ -5,6 +5,12 @@ import ReactNativeThread from "./NativeReactNativeThread.js";
 const _emitter = new NativeEventEmitter(ReactNativeThread);
 const RN_THREAD_MESSAGE_EVENT = 'RNThreadMessage';
 const _registry = new Map();
+function _findByName(name) {
+  for (const info of _registry.values()) {
+    if (info.name === name) return info;
+  }
+  return undefined;
+}
 function _register(id, name) {
   _registry.set(id, {
     id,
@@ -14,20 +20,52 @@ function _register(id, name) {
 function _unregister(id) {
   _registry.delete(id);
 }
+function _isBytecode(src) {
+  return src.includes('[bytecode]') || /^\s*function\s*\(\)\s*\{\s*bytecode\s*\}/.test(src);
+}
+function _serializeValue(value) {
+  if (value === undefined) return 'undefined';
+  if (value === null) return 'null';
+  if (typeof value === 'function') {
+    const src = value.toString();
+    if (_isBytecode(src)) {
+      if (__DEV__) {
+        console.warn('[react-native-thread] A function param returned a Hermes bytecode placeholder. ' + "Add the Babel plugin: plugins: ['@rn-org/react-native-thread/babel-plugin']");
+      }
+      return 'undefined';
+    }
+    return src;
+  }
+  if (typeof value === 'string') return JSON.stringify(value);
+  if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+  if (Array.isArray(value)) return '[' + value.map(_serializeValue).join(',') + ']';
+  if (typeof value === 'object') {
+    const rec = value;
+    if (typeof rec.__rnThreadFn === 'string') {
+      return rec.__rnThreadFn;
+    }
+    const entries = Object.entries(rec).map(([k, v]) => `${JSON.stringify(k)}:${_serializeValue(v)}`).join(',');
+    return '{' + entries + '}';
+  }
+  return String(value);
+}
+function _wrapWithErrorHandler(code) {
+  return `try { ${code} } catch(__e__) { resolveThreadMessage(JSON.stringify({ __rnThreadError: true, message: __e__.message || String(__e__), stack: __e__.stack || '' })); }`;
+}
 function toCode(task, params) {
   if (typeof task === 'string') {
-    const paramsJson = params !== undefined ? JSON.stringify(params) : 'undefined';
-    return `var __params__ = ${paramsJson};\n${task}`;
+    const paramsCode = params !== undefined ? _serializeValue(params) : 'undefined';
+    return _wrapWithErrorHandler(`var __params__ = ${paramsCode};\n${task}`);
   }
   const src = task.toString();
-  if (src.includes('[bytecode]') || /^\s*function\s*\(\)\s*\{\s*bytecode\s*\}/.test(src)) {
+  if (_isBytecode(src)) {
     if (__DEV__) {
       console.warn('[react-native-thread] fn.toString() returned a Hermes bytecode placeholder. ' + "Add the Babel plugin: plugins: ['@rn-org/react-native-thread/babel-plugin']");
     }
     return '/* bytecode: no-op */';
   }
-  const argsStr = params !== undefined ? JSON.stringify(params) : '';
-  return `(${src})(${argsStr})`;
+  const argsStr = params !== undefined ? _serializeValue(params) : '';
+  return _wrapWithErrorHandler(`(${src})(${argsStr})`);
 }
 const SHARED_THREAD_NAME = 'RNOrgThread';
 let _sharedThreadId = null;
@@ -42,6 +80,12 @@ export function runOnJS(task, params) {
   ReactNativeThread.runOnThread(getSharedThread(), toCode(task, params));
 }
 export function runOnNewJS(task, params, name) {
+  if (name != null) {
+    const existing = _findByName(name);
+    if (existing) {
+      return createThreadHandle(existing.id, existing.name);
+    }
+  }
   const id = ReactNativeThread.createThread();
   const resolvedName = name ?? `RNThread-${id}`;
   _register(id, resolvedName);
@@ -49,6 +93,12 @@ export function runOnNewJS(task, params, name) {
   return createThreadHandle(id, resolvedName);
 }
 export function createThread(name) {
+  if (name != null) {
+    const existing = _findByName(name);
+    if (existing) {
+      return createThreadHandle(existing.id, existing.name);
+    }
+  }
   const id = ReactNativeThread.createThread();
   const resolvedName = name ?? `RNThread-${id}`;
   _register(id, resolvedName);
@@ -104,6 +154,9 @@ export function onMessage(handler) {
     });
   });
 }
+function _isThreadError(data) {
+  return typeof data === 'object' && data !== null && data.__rnThreadError === true;
+}
 function createThreadHandle(id, name) {
   return {
     id,
@@ -114,18 +167,34 @@ function createThreadHandle(id, name) {
     onMessage: function (handler) {
       if (handler) {
         return onMessage((data, threadId) => {
-          if (threadId === id) handler(data);
+          if (threadId === id && !_isThreadError(data)) handler(data);
         });
       }
-      return new Promise(resolve => {
+      return new Promise((resolve, reject) => {
         const unsub = onMessage((data, threadId) => {
           if (threadId === id) {
             unsub();
-            resolve(data);
+            if (_isThreadError(data)) {
+              const err = new Error(data.message);
+              err.stack = data.stack;
+              reject(err);
+            } else {
+              resolve(data);
+            }
           }
         });
       });
     },
+    onError(handler) {
+      return onMessage((data, threadId) => {
+        if (threadId === id && _isThreadError(data)) {
+          handler({
+            message: data.message,
+            stack: data.stack
+          });
+        }
+      });
+    },
     destroy() {
       destroyThread(id);
     }

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeEventEmitter","ReactNativeThread","_emitter","RN_THREAD_MESSAGE_EVENT","_registry","Map","_register","id","name","set","_unregister","delete","toCode","task","params","paramsJson","undefined","JSON","stringify","src","toString","includes","test","__DEV__","console","warn","argsStr","SHARED_THREAD_NAME","_sharedThreadId","getSharedThread","createThread","runOnJS","runOnThread","runOnNewJS","resolvedName","createThreadHandle","getThreads","Array","from","values","destroyThread","idOrName","targetId","has","info","onMessage","handler","sub","addListener","event","parsed","data","parse","threadId","remove","Promise","resolve","run","unsub","destroy"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NativeEventEmitter","ReactNativeThread","_emitter","RN_THREAD_MESSAGE_EVENT","_registry","Map","_findByName","name","info","values","undefined","_register","id","set","_unregister","delete","_isBytecode","src","includes","test","_serializeValue","value","toString","__DEV__","console","warn","JSON","stringify","String","Array","isArray","map","join","rec","__rnThreadFn","entries","Object","k","v","_wrapWithErrorHandler","code","toCode","task","params","paramsCode","argsStr","SHARED_THREAD_NAME","_sharedThreadId","getSharedThread","createThread","runOnJS","runOnThread","runOnNewJS","existing","createThreadHandle","resolvedName","getThreads","from","destroyThread","idOrName","targetId","has","onMessage","handler","sub","addListener","event","parsed","data","parse","threadId","remove","Promise","resolve","_isThreadError","__rnThreadError","run","reject","unsub","err","Error","message","stack","onError","destroy"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/index.d.ts

@@ -3,12 +3,17 @@ export type ThreadInfo = {
     readonly id: number;
     readonly name: string;
 };
+export type ThreadError = {
+    message: string;
+    stack: string;
+};
 export type ThreadHandle = {
     readonly id: number;
     readonly name: string;
     run(task: ThreadTask, params?: unknown): void;
     onMessage(handler: (data: unknown) => void): () => void;
     onMessage(): Promise<unknown>;
+    onError(handler: (error: ThreadError) => void): () => void;
     destroy(): void;
 };
 export declare function runOnJS(task: ThreadTask, params?: unknown): void;

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAGA,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9C,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACxD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC;AAmDF,wBAAgB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAEhE;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,UAAU,EAChB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,MAAM,GACZ,YAAY,CAMd;AAED,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAKxD;AAED,wBAAgB,UAAU,IAAI,UAAU,EAAE,CAEzC;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0B7D;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GACjD,MAAM,IAAI,CAAC;AACd,wBAAgB,SAAS,IAAI,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAGA,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9C,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACxD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC3D,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC;AAoGF,wBAAgB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAEhE;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,UAAU,EAChB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,MAAM,GACZ,YAAY,CAYd;AAED,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAWxD;AAED,wBAAgB,UAAU,IAAI,UAAU,EAAE,CAEzC;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0B7D;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GACjD,MAAM,IAAI,CAAC;AACd,wBAAgB,SAAS,IAAI,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rn-org/react-native-thread",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Run JavaScript on real background threads in React Native — no Workers, no Worklets. Uses JavaScriptCore on iOS and Mozilla Rhino on Android. Built as a New Architecture TurboModule.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/babel-plugin.js

@@ -1,10 +1,299 @@
 'use strict';
 
+const nodePath = require('path');
+const fs = require('fs');
+
 const TOP_LEVEL_API = new Set(['runOnJS', 'runOnNewJS']);
 
 const METHOD_API = new Set(['run']);
 
-module.exports = function reactNativeThreadPlugin({ types: t }) {
+const SKIP_KEYS = new Set([
+  'type',
+  'start',
+  'end',
+  'loc',
+  'leadingComments',
+  'trailingComments',
+  'innerComments',
+  'extra',
+  'range',
+]);
+
+module.exports = function reactNativeThreadPlugin({ types: t, ...babel }) {
+  const parser = (babel.parser && babel.parser) || require('@babel/parser');
+
+  // ── Cross-module import resolution ─────────────────────────────
+
+  const RESOLVE_EXTS = ['.ts', '.tsx', '.js', '.jsx', ''];
+
+  /**
+   * Given a relative import source (e.g. './Utility') and the
+   * filename of the importing file, try to resolve, read, parse,
+   * and extract the source of the named export `exportName`.
+   *
+   * Returns the raw function source string or null.
+   */
+  function resolveImportedFnSource(importSource, exportName, state) {
+    const currentFile = state.filename || state.file.opts.filename;
+    if (!currentFile || !importSource.startsWith('.')) return null;
+
+    const dir = nodePath.dirname(currentFile);
+    let resolvedFile = null;
+
+    for (const ext of RESOLVE_EXTS) {
+      const candidate = nodePath.resolve(dir, importSource + ext);
+      if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
+        resolvedFile = candidate;
+        break;
+      }
+    }
+    if (!resolvedFile) {
+      // Try as directory with index file
+      for (const ext of RESOLVE_EXTS) {
+        const candidate = nodePath.resolve(dir, importSource, 'index' + ext);
+        if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
+          resolvedFile = candidate;
+          break;
+        }
+      }
+    }
+    if (!resolvedFile) return null;
+
+    let source;
+    try {
+      source = fs.readFileSync(resolvedFile, 'utf8');
+    } catch {
+      return null;
+    }
+
+    let ast;
+    try {
+      ast = parser.parse(source, {
+        sourceType: 'module',
+        plugins: ['typescript', 'jsx'],
+      });
+    } catch {
+      return null;
+    }
+
+    // Walk top-level statements to find the exported function
+    for (const stmt of ast.program.body) {
+      // export function foo() { ... }
+      if (t.isExportNamedDeclaration(stmt) && stmt.declaration) {
+        if (
+          t.isFunctionDeclaration(stmt.declaration) &&
+          stmt.declaration.id &&
+          stmt.declaration.id.name === exportName
+        ) {
+          const raw = source.slice(
+            stmt.declaration.start,
+            stmt.declaration.end
+          );
+          return transpileForThread(raw, { filename: resolvedFile });
+        }
+        // export const foo = () => { ... }
+        if (t.isVariableDeclaration(stmt.declaration)) {
+          for (const decl of stmt.declaration.declarations) {
+            if (
+              t.isVariableDeclarator(decl) &&
+              t.isIdentifier(decl.id) &&
+              decl.id.name === exportName &&
+              decl.init &&
+              (t.isFunctionExpression(decl.init) ||
+                t.isArrowFunctionExpression(decl.init))
+            ) {
+              const raw = source.slice(decl.init.start, decl.init.end);
+              return transpileForThread(raw, { filename: resolvedFile });
+            }
+          }
+        }
+      }
+    }
+
+    return null;
+  }
+
+  // ── AST helpers ────────────────────────────────────────────────
+
+  /** Collect all identifiers that appear in reference position inside `node`. */
+  function collectReferencedIds(node) {
+    const ids = new Set();
+    function walk(n, skipId) {
+      if (!n || typeof n !== 'object') return;
+      if (Array.isArray(n)) {
+        n.forEach((el) => walk(el, false));
+        return;
+      }
+      if (!n.type) return;
+      if (t.isIdentifier(n) && !skipId) {
+        ids.add(n.name);
+        return;
+      }
+      if (t.isMemberExpression(n)) {
+        walk(n.object, false);
+        if (n.computed) walk(n.property, false);
+        return;
+      }
+      if (t.isObjectProperty(n)) {
+        if (n.computed) walk(n.key, false);
+        walk(n.value, false);
+        return;
+      }
+      if (
+        t.isFunctionExpression(n) ||
+        t.isArrowFunctionExpression(n) ||
+        t.isFunctionDeclaration(n)
+      ) {
+        return;
+      }
+      for (const key of Object.keys(n)) {
+        if (SKIP_KEYS.has(key)) continue;
+        walk(n[key], false);
+      }
+    }
+    walk(node, false);
+    return ids;
+  }
+
+  /** Collect names declared locally inside a function (params + body). */
+  function collectLocalNames(fnNode) {
+    const names = new Set();
+    if (fnNode.params) {
+      for (const p of fnNode.params) {
+        if (t.isIdentifier(p)) names.add(p.name);
+        if (t.isAssignmentPattern(p) && t.isIdentifier(p.left))
+          names.add(p.left.name);
+        if (t.isRestElement(p) && t.isIdentifier(p.argument))
+          names.add(p.argument.name);
+      }
+    }
+    if (fnNode.id && t.isIdentifier(fnNode.id)) names.add(fnNode.id.name);
+    function walk(n) {
+      if (!n || typeof n !== 'object') return;
+      if (Array.isArray(n)) {
+        n.forEach(walk);
+        return;
+      }
+      if (!n.type) return;
+      if (t.isVariableDeclarator(n) && t.isIdentifier(n.id))
+        names.add(n.id.name);
+      if (t.isFunctionDeclaration(n) && n.id) {
+        names.add(n.id.name);
+        return;
+      }
+      if (t.isFunctionExpression(n) || t.isArrowFunctionExpression(n)) return;
+      for (const key of Object.keys(n)) {
+        if (SKIP_KEYS.has(key)) continue;
+        walk(n[key]);
+      }
+    }
+    if (fnNode.body) walk(fnNode.body);
+    return names;
+  }
+
+  /**
+   * For each free variable in `fnNode`, try to resolve it to a
+   * compile-time value (literal or function) via scope bindings.
+   * Handles transitive closures: if a captured function itself has
+   * free variables, those are captured too.
+   *
+   * Returns an array of source strings like `"var b = 3;"` or
+   * `"var add = (x) => x + b;"`.
+   */
+  function getCaptureDecls(fnNode, scope, state) {
+    const captures = [];
+    const seen = new Set();
+
+    function capture(targetFnNode) {
+      const referenced = collectReferencedIds(targetFnNode.body);
+      const locals = collectLocalNames(targetFnNode);
+
+      for (const name of referenced) {
+        if (locals.has(name) || seen.has(name)) continue;
+        seen.add(name);
+
+        const binding = scope.getBinding(name);
+        if (!binding) continue;
+
+        const bNode = binding.path.node;
+
+        // const/let/var x = <literal>
+        if (
+          t.isVariableDeclarator(bNode) &&
+          bNode.init &&
+          t.isLiteral(bNode.init)
+        ) {
+          const initSrc = state.file.code.slice(
+            bNode.init.start,
+            bNode.init.end
+          );
+          captures.push('var ' + name + ' = ' + initSrc + ';');
+          continue;
+        }
+
+        // const/let/var x = <arrow / function expression>
+        if (
+          t.isVariableDeclarator(bNode) &&
+          bNode.init &&
+          (t.isFunctionExpression(bNode.init) ||
+            t.isArrowFunctionExpression(bNode.init))
+        ) {
+          // Recursively capture the inner function's free vars first
+          capture(bNode.init);
+          const initSrc = state.file.code.slice(
+            bNode.init.start,
+            bNode.init.end
+          );
+          captures.push(
+            'var ' + name + ' = ' + transpileForThread(initSrc, state) + ';'
+          );
+          continue;
+        }
+
+        // function declaration
+        if (t.isFunctionDeclaration(bNode)) {
+          capture(bNode);
+          const fnSrc = state.file.code.slice(bNode.start, bNode.end);
+          captures.push(transpileForThread(fnSrc, state));
+          continue;
+        }
+      }
+    }
+
+    capture(fnNode);
+    return captures;
+  }
+
+  // ── Core transform helpers ─────────────────────────────────────
+
+  /**
+   * Transpile extracted source for the thread engine.  Always downlevels
+   * to ES5 (for Rhino).  Also strips TypeScript when the host file is TS.
+   */
+  function transpileForThread(code, state) {
+    try {
+      const babelCore = require('@babel/core');
+      const fn =
+        state.filename || (state.file.opts && state.file.opts.filename) || '';
+      const isTS = /\.tsx?$/.test(fn);
+      const plugins = isTS
+        ? [['@babel/plugin-transform-typescript', { isTSX: true }]]
+        : [];
+      const result = babelCore.transformSync(code, {
+        presets: [
+          ['@babel/preset-env', { targets: { ie: '11' }, modules: false }],
+        ],
+        plugins,
+        configFile: false,
+        babelrc: false,
+        filename: isTS ? 'thread.tsx' : 'thread.js',
+      });
+      return ((result && result.code) || code).replace(/;\s*$/, '');
+    } catch {
+      return code;
+    }
+  }
+
   function maybeTransformArg(callPath, state, argNode, index) {
     if (
       !t.isArrowFunctionExpression(argNode) &&
@@ -14,12 +303,126 @@ module.exports = function reactNativeThreadPlugin({ types: t }) {
     }
 
     const originalCode = state.file.code;
-    const fnSource = originalCode.slice(argNode.start, argNode.end);
+    const fnSource = transpileForThread(
+      originalCode.slice(argNode.start, argNode.end),
+      state
+    );
     const iife = `(${fnSource})(__params__)`;
 
     callPath.node.arguments[index] = t.stringLiteral(iife);
   }
 
+  /**
+   * Resolve a node to its function source **and** any captured free-variable
+   * declarations.  Returns the ready-to-eval source string, or null.
+   */
+  function extractFnSource(node, callPath, state) {
+    let fnNode = null;
+    let fnSource = null;
+    let isImported = false;
+
+    if (t.isFunctionExpression(node) || t.isArrowFunctionExpression(node)) {
+      fnNode = node;
+      fnSource = state.file.code.slice(node.start, node.end);
+    } else if (t.isIdentifier(node)) {
+      const binding = callPath.scope.getBinding(node.name);
+      if (!binding) return null;
+      const bNode = binding.path.node;
+      if (t.isFunctionDeclaration(bNode)) {
+        fnNode = bNode;
+        fnSource = state.file.code.slice(bNode.start, bNode.end);
+      } else if (t.isVariableDeclarator(bNode) && bNode.init) {
+        if (
+          t.isFunctionExpression(bNode.init) ||
+          t.isArrowFunctionExpression(bNode.init)
+        ) {
+          fnNode = bNode.init;
+          fnSource = state.file.code.slice(bNode.init.start, bNode.init.end);
+        }
+      } else if (
+        t.isImportSpecifier(bNode) ||
+        t.isImportDefaultSpecifier(bNode)
+      ) {
+        // Cross-module import: resolve the source file and extract the function
+        const importDecl = binding.path.parentPath.node;
+        const importSource = importDecl.source.value;
+        const exportName =
+          t.isImportSpecifier(bNode) && bNode.imported
+            ? t.isIdentifier(bNode.imported)
+              ? bNode.imported.name
+              : bNode.imported.value
+            : 'default';
+        const imported = resolveImportedFnSource(
+          importSource,
+          exportName,
+          state
+        );
+        if (imported) {
+          fnSource = imported;
+          isImported = true;
+        }
+      }
+    }
+
+    if (!fnSource) return null;
+
+    // For imported functions we already have the full source (no local AST node
+    // to walk for captures — the function must be self-contained or only depend
+    // on its own module's scope which was already inlined).
+    if (isImported) return fnSource;
+
+    if (!fnNode) return null;
+
+    fnSource = transpileForThread(fnSource, state);
+
+    const captures = getCaptureDecls(fnNode, callPath.scope, state);
+    if (captures.length > 0) {
+      fnSource =
+        '(function(){' + captures.join('\n') + '\nreturn ' + fnSource + ';})()';
+    }
+
+    return fnSource;
+  }
+
+  function tagFnValue(source) {
+    return t.objectExpression([
+      t.objectProperty(t.identifier('__rnThreadFn'), t.stringLiteral(source)),
+    ]);
+  }
+
+  function maybeTransformParams(callPath, state, paramsNode) {
+    if (!t.isObjectExpression(paramsNode)) return;
+    for (const prop of paramsNode.properties) {
+      if (!t.isObjectProperty(prop)) continue;
+      const fnSrc = extractFnSource(prop.value, callPath, state);
+      if (fnSrc) {
+        prop.value = tagFnValue(fnSrc);
+        prop.shorthand = false;
+      } else if (t.isObjectExpression(prop.value)) {
+        maybeTransformParams(callPath, state, prop.value);
+      } else if (t.isArrayExpression(prop.value)) {
+        maybeTransformArrayParams(callPath, state, prop.value);
+      }
+    }
+  }
+
+  function maybeTransformArrayParams(callPath, state, arrNode) {
+    for (let i = 0; i < arrNode.elements.length; i++) {
+      const el = arrNode.elements[i];
+      if (!el) continue;
+      const fnSrc = extractFnSource(el, callPath, state);
+      if (fnSrc) {
+        arrNode.elements[i] = tagFnValue(fnSrc);
+      } else if (t.isObjectExpression(el)) {
+        maybeTransformParams(callPath, state, el);
+      } else if (t.isArrayExpression(el)) {
+        maybeTransformArrayParams(callPath, state, el);
+      }
+    }
+  }
+
+  // ── Visitor ────────────────────────────────────────────────────
+
   return {
     name: 'react-native-thread',
     visitor: {
@@ -30,6 +433,9 @@ module.exports = function reactNativeThreadPlugin({ types: t }) {
           if (args.length >= 1) {
             maybeTransformArg(path, state, args[0], 0);
           }
+          if (args.length >= 2) {
+            maybeTransformParams(path, state, args[1]);
+          }
           return;
         }
 
@@ -42,6 +448,9 @@ module.exports = function reactNativeThreadPlugin({ types: t }) {
           if (args.length >= 1) {
             maybeTransformArg(path, state, args[0], 0);
           }
+          if (args.length >= 2) {
+            maybeTransformParams(path, state, args[1]);
+          }
         }
       },
     },