@qvac/sdk 0.21.0 → 0.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (167) hide show
  1. package/NOTICE +35 -1
  2. package/README.md +167 -24
  3. package/dist/examples/abot-world.js +1 -1
  4. package/dist/examples/advisory-model-fit.d.ts +0 -58
  5. package/dist/examples/advisory-model-fit.js +23 -150
  6. package/dist/examples/asr/moss-transcribe-filesystem.d.ts +2 -0
  7. package/dist/examples/asr/moss-transcribe-filesystem.js +84 -0
  8. package/dist/examples/asr/moss-transcribe-fit.d.ts +2 -0
  9. package/dist/examples/asr/moss-transcribe-fit.js +40 -0
  10. package/dist/examples/asr/nemotron-diarization-filesystem.d.ts +2 -0
  11. package/dist/examples/asr/nemotron-diarization-filesystem.js +64 -0
  12. package/dist/examples/asr/parakeet-ctc-filesystem.js +2 -2
  13. package/dist/examples/asr/parakeet-indic-conformer-filesystem.js +2 -2
  14. package/dist/examples/asr/parakeet-microphone-record.js +1 -1
  15. package/dist/examples/asr/parakeet-microphone-stream.js +1 -1
  16. package/dist/examples/asr/parakeet-nemotron-filesystem.js +3 -3
  17. package/dist/examples/asr/parakeet-sortformer-streaming.js +2 -2
  18. package/dist/examples/asr/parakeet-sortformer.js +1 -1
  19. package/dist/examples/asr/parakeet-tdt-filesystem-chunked.js +2 -2
  20. package/dist/examples/asr/parakeet-tdt-filesystem.js +2 -2
  21. package/dist/examples/asr/parakeet-unified-coreml.js +2 -2
  22. package/dist/examples/asr/parakeet-unified-filesystem.js +2 -2
  23. package/dist/examples/asr/whispercpp-filesystem-streaming.js +1 -1
  24. package/dist/examples/asr/whispercpp-filesystem.js +1 -1
  25. package/dist/examples/asr/whispercpp-microphone-record.js +1 -1
  26. package/dist/examples/asr/whispercpp-prompt.js +1 -1
  27. package/dist/examples/assess-model-fit.js +3 -6
  28. package/dist/examples/audiogen/edit-music.js +2 -2
  29. package/dist/examples/audiogen/generate-cover.js +2 -2
  30. package/dist/examples/audiogen/generate-music-minimax.js +1 -1
  31. package/dist/examples/audiogen/generate-music.js +1 -1
  32. package/dist/examples/audiogen/understand-music.js +2 -2
  33. package/dist/examples/batch-completion.d.ts +1 -1
  34. package/dist/examples/batch-completion.js +1 -1
  35. package/dist/examples/bci/bci-filesystem-streaming.js +2 -2
  36. package/dist/examples/bci/bci-filesystem.js +2 -2
  37. package/dist/examples/concurrent-completion-collision.js +1 -1
  38. package/dist/examples/config-reload.js +1 -1
  39. package/dist/examples/decisions.d.ts +2 -0
  40. package/dist/examples/decisions.js +38 -0
  41. package/dist/examples/diffusion-esrgan-upscale.js +1 -1
  42. package/dist/examples/diffusion-flux2-klein-img2img.js +1 -1
  43. package/dist/examples/diffusion-img2img.js +1 -1
  44. package/dist/examples/diffusion-img2vid-ltx.js +1 -1
  45. package/dist/examples/diffusion-img2vid-minimax-h3.d.ts +2 -0
  46. package/dist/examples/diffusion-img2vid-minimax-h3.js +72 -0
  47. package/dist/examples/diffusion-img2vid.js +1 -1
  48. package/dist/examples/llamacpp-filesystem.js +1 -1
  49. package/dist/examples/llamacpp-multi-gpu.js +2 -2
  50. package/dist/examples/llamacpp-structured-output.js +1 -1
  51. package/dist/examples/mcp-websearch.d.ts +2 -2
  52. package/dist/examples/mcp-websearch.js +3 -3
  53. package/dist/examples/model-fit-ui/server.d.ts +1 -1
  54. package/dist/examples/model-fit-ui/server.js +1 -1
  55. package/dist/examples/multi-job-completion.d.ts +1 -1
  56. package/dist/examples/multi-job-completion.js +1 -1
  57. package/dist/examples/ocr-fasttext.js +1 -1
  58. package/dist/examples/tools/llamacpp-tools-auto-dialect.js +1 -1
  59. package/dist/examples/tools/llamacpp-tools-gemma4.js +1 -1
  60. package/dist/examples/tools/llamacpp-tools-qwen35.js +1 -1
  61. package/dist/examples/tts/llm-to-tts-streaming.d.ts +2 -2
  62. package/dist/examples/tts/llm-to-tts-streaming.js +2 -2
  63. package/dist/examples/tts/moss-sound-effect-controls.d.ts +2 -0
  64. package/dist/examples/tts/moss-sound-effect-controls.js +88 -0
  65. package/dist/examples/tts/moss-sound-effect.d.ts +2 -0
  66. package/dist/examples/tts/moss-sound-effect.js +86 -0
  67. package/dist/examples/tts/moss-speech-audio.d.ts +2 -0
  68. package/dist/examples/tts/moss-speech-audio.js +159 -0
  69. package/dist/examples/tts/moss-speech.d.ts +2 -0
  70. package/dist/examples/tts/moss-speech.js +70 -0
  71. package/dist/examples/vla-groot.js +2 -2
  72. package/dist/examples/vla-pi05.js +2 -2
  73. package/dist/examples/vla-smolvla.js +2 -2
  74. package/dist/examples/voice-assistant/voice-assistant.js +1 -1
  75. package/dist/scripts/contract/build-contract.d.ts +3 -1
  76. package/dist/scripts/contract/build-contract.js +40 -2
  77. package/dist/scripts/contract/build-model-type-maps.d.ts +6 -1
  78. package/dist/scripts/contract/build-model-type-maps.js +3 -2
  79. package/dist/scripts/contract/constants-registry.d.ts +4 -0
  80. package/dist/scripts/contract/constants-registry.js +3 -1
  81. package/dist/scripts/contract/method-shapes.d.ts +1 -0
  82. package/dist/scripts/contract/method-shapes.js +1 -0
  83. package/dist/scripts/export-contract.js +20 -7
  84. package/dist/scripts/run-unit-tests.js +10 -5
  85. package/dist/src/client/api/assess-model-fit.d.ts +5 -5
  86. package/dist/src/client/api/assess-model-fit.js +5 -6
  87. package/dist/src/client/api/audio-edit.d.ts +14 -2
  88. package/dist/src/client/api/audio-edit.js +14 -2
  89. package/dist/src/client/api/audio-gen.d.ts +10 -2
  90. package/dist/src/client/api/audio-gen.js +10 -2
  91. package/dist/src/client/api/audio-understand.d.ts +1 -1
  92. package/dist/src/client/api/audio-understand.js +1 -1
  93. package/dist/src/client/api/batch-completion.js +1 -1
  94. package/dist/src/client/api/completion-stream.js +1 -1
  95. package/dist/src/client/api/decide.d.ts +31 -0
  96. package/dist/src/client/api/decide.js +29 -0
  97. package/dist/src/client/api/index.d.ts +1 -0
  98. package/dist/src/client/api/index.js +1 -0
  99. package/dist/src/client/api/load-model.d.ts +1 -0
  100. package/dist/src/client/api/text-to-speech.d.ts +1 -0
  101. package/dist/src/client/api/text-to-speech.js +15 -22
  102. package/dist/src/client/api/transcribe.js +5 -2
  103. package/dist/src/client/api/video-request.d.ts +5 -5
  104. package/dist/src/client/api/video.d.ts +23 -3
  105. package/dist/src/client/api/video.js +23 -3
  106. package/dist/src/commands/bundle/bare-pack.d.ts +8 -0
  107. package/dist/src/commands/bundle/bare-pack.js +28 -5
  108. package/dist/src/commands/bundle/constants.js +2 -0
  109. package/dist/src/commands/bundle/index.d.ts +7 -6
  110. package/dist/src/commands/bundle/index.js +126 -43
  111. package/dist/src/commands/bundle/manifest.d.ts +2 -0
  112. package/dist/src/commands/bundle/manifest.js +3 -2
  113. package/dist/src/commands/host-prebuilds/index.d.ts +15 -7
  114. package/dist/src/commands/host-prebuilds/index.js +35 -16
  115. package/dist/src/commands/index.d.ts +1 -1
  116. package/dist/src/commands/index.js +1 -1
  117. package/dist/src/commands/verify/addon-source.d.ts +12 -0
  118. package/dist/src/commands/verify/addon-source.js +36 -3
  119. package/dist/src/commands/verify/bare-kit-runtimes.js +2 -1
  120. package/dist/src/commands/verify/node-modules-source.js +10 -1
  121. package/dist/src/{expo/plugins/patches/qvac-platform-addons.d.ts → commands/verify/platform-addons.d.ts} +6 -10
  122. package/dist/src/{expo/plugins/patches/qvac-platform-addons.js → commands/verify/platform-addons.js} +2 -45
  123. package/dist/src/commands/verify/prebuilds.d.ts +7 -10
  124. package/dist/src/commands/verify/prebuilds.js +43 -34
  125. package/dist/src/expo/plugins/get-project-root.d.ts +1 -1
  126. package/dist/src/expo/plugins/link-addons.d.ts +18 -0
  127. package/dist/src/expo/plugins/link-addons.js +65 -0
  128. package/dist/src/expo/plugins/withAndroidArchitecture.d.ts +1 -1
  129. package/dist/src/expo/plugins/withAndroidNdkVersion.d.ts +1 -1
  130. package/dist/src/expo/plugins/withDeviceInfo.d.ts +1 -1
  131. package/dist/src/expo/plugins/withMobileBundle.d.ts +11 -21
  132. package/dist/src/expo/plugins/withMobileBundle.js +22 -112
  133. package/dist/src/expo/plugins/withOpenCL.d.ts +1 -1
  134. package/dist/src/expo/plugins/withQvacSDK.d.ts +1 -1
  135. package/dist/src/index.d.ts +3 -3
  136. package/dist/src/index.js +2 -2
  137. package/dist/src/logging/base-logger.js +1 -1
  138. package/dist/src/logging/utils.js +1 -1
  139. package/dist/src/pear/pre.js +2 -0
  140. package/dist/src/plugin-ids.d.ts +3 -1
  141. package/dist/src/plugin-ids.js +4 -0
  142. package/dist/src/schemas/public.d.ts +2 -1
  143. package/dist/src/schemas/public.js +2 -1
  144. package/dist/src/schemas/sdk-errors-client.d.ts +3 -0
  145. package/dist/src/schemas/sdk-errors-client.js +16 -0
  146. package/dist/src/schemas/sdk-errors-server.d.ts +1 -0
  147. package/dist/src/schemas/sdk-errors-server.js +5 -0
  148. package/dist/src/utils/errors-client.d.ts +10 -0
  149. package/dist/src/utils/errors-client.js +18 -0
  150. package/dist/src/utils/mcp-adapter.js +12 -8
  151. package/dist/src/utils/tool-helpers.d.ts +1 -1
  152. package/dist/src/utils/tool-helpers.js +20 -52
  153. package/dist/src/worker/create-server.d.ts +1 -0
  154. package/dist/src/worker/create-server.js +5 -0
  155. package/dist/src/worker/index.js +4 -0
  156. package/dist/src/worker/lifecycle.js +9 -1
  157. package/dist/src/worker/plugins/llamacpp-decision.d.ts +2 -0
  158. package/dist/src/worker/plugins/llamacpp-decision.js +1 -0
  159. package/dist/src/worker/plugins/moss-transcribe.d.ts +2 -0
  160. package/dist/src/worker/plugins/moss-transcribe.js +1 -0
  161. package/package.json +39 -35
  162. package/src/electron-forge/index.cjs +12 -71
  163. package/dist/scripts/link-workspace-inference.d.ts +0 -2
  164. package/dist/scripts/link-workspace-inference.js +0 -31
  165. package/src/expo/plugins/patches/android-link.mjs +0 -67
  166. package/src/expo/plugins/patches/ios-link.mjs +0 -67
  167. package/src/expo/plugins/patches/qvac-platform-addons.ts +0 -124
@@ -4,14 +4,13 @@ import { createRequire } from 'node:module';
4
4
  import { DEFAULT_HOSTS, DEFAULT_SDK_NAME } from './constants.js';
5
5
  import { CONFIG_CANDIDATES, resolveConfigForProject } from '../../client/config-loader/resolve-config.node.js';
6
6
  import { createCommandLogger } from '../command-logger.js';
7
- import { BareImportsMapNotFoundError, HostPrebuildsInstallRefusedError } from '../../utils/errors-client.js';
7
+ import { BareImportsMapNotFoundError, HostPrebuildsMissingError } from '../../utils/errors-client.js';
8
8
  import { resolvePluginSpecifiers, parseBuiltinSpecifier } from './plugins.js';
9
9
  import { generateWorkerEntries } from './entry-gen.js';
10
10
  import { runBarePack } from './bare-pack.js';
11
- import { generateAddonsManifest } from './manifest.js';
11
+ import { AUDIO_DECODER_ADDON, extractBarePackHeader, extractPackedString, generateAddonsManifest } from './manifest.js';
12
12
  import { createSdkImportResolver } from './resolve-sdk-import.js';
13
- import { installMissingHostPrebuilds } from '../host-prebuilds/index.js';
14
- import { collectAddonsFromBundle } from '../verify/bundle-source.js';
13
+ import { findMissingHostPrebuilds, installMissingHostPrebuilds, resolveAddons } from '../host-prebuilds/index.js';
15
14
  import { verifyBundle } from '../verify/index.js';
16
15
  import { formatRuntimeSource } from '../verify/abi.js';
17
16
  import { formatEnginesAdvice } from '../verify/engines-advice.js';
@@ -55,6 +54,19 @@ function resolveImportsMapPath(sdkPath, sdkName) {
55
54
  throw new BareImportsMapNotFoundError(sdkName, importsMapPath);
56
55
  }
57
56
  const ENGINES_ISSUE_CODES = new Set(['abi-mismatch', 'engines-mismatch']);
57
+ const AUDIO_PLUGINS = new Set([
58
+ 'whispercpp-transcription',
59
+ 'bci-whispercpp-transcription',
60
+ 'parakeet-transcription',
61
+ 'moss-transcribe',
62
+ 'audiogen-ggml'
63
+ ]);
64
+ function audioPluginsIn(pluginSpecifiers, sdkName) {
65
+ return pluginSpecifiers.filter((specifier) => {
66
+ const builtin = parseBuiltinSpecifier(specifier, sdkName);
67
+ return builtin !== null && AUDIO_PLUGINS.has(builtin.suffix);
68
+ });
69
+ }
58
70
  async function checkBundleEngines(options) {
59
71
  const { projectRoot, bundlePath, hosts, configPath, network, logger } = options;
60
72
  logger.info('\n🔎 Checking engines.bare against the Bare runtime of each host...');
@@ -124,7 +136,17 @@ export async function bundleSdk(options = {}) {
124
136
  logger.info(` ${label}: ${spec}`);
125
137
  }
126
138
  const hosts = options.hosts && options.hosts.length > 0 ? options.hosts : DEFAULT_HOSTS;
127
- const deferModules = options.defer ?? [];
139
+ const explicitDefer = options.defer ?? [];
140
+ const includeAudioDecoder = config.includeAudioDecoder !== false && !explicitDefer.includes(AUDIO_DECODER_ADDON);
141
+ const deferModules = includeAudioDecoder
142
+ ? explicitDefer
143
+ : [...new Set([...explicitDefer, AUDIO_DECODER_ADDON])];
144
+ if (!includeAudioDecoder) {
145
+ const affected = audioPluginsIn(pluginSpecifiers, sdkName);
146
+ if (affected.length > 0) {
147
+ logger.warn(`${AUDIO_DECODER_ADDON} is not bundled: ${affected.join(', ')} cannot decode compressed audio files; compressed audiogen output formats also require FFmpeg.`);
148
+ }
149
+ }
128
150
  await fsp.mkdir(outputDir, { recursive: true });
129
151
  logger.info('\n📝 Generating worker entry...');
130
152
  const resolveSdkImport = createSdkImportResolver(sdkPath, sdkName);
@@ -137,46 +159,44 @@ export async function bundleSdk(options = {}) {
137
159
  if (deferModules.length > 0) {
138
160
  logger.debug(` Deferred: ${deferModules.join(', ')}`);
139
161
  }
162
+ // Missing mobile platform packages are installed, or reported, before bundling.
140
163
  let installedPrebuilds = [];
141
- let installRefused;
164
+ const barePackOptions = {
165
+ entryPath: bundleEntryPath,
166
+ hosts,
167
+ importsMapPath,
168
+ quiet: options.quiet === true,
169
+ logger
170
+ };
171
+ const addonsMissingPlatformPackages = () => reachedAddonsMissingPlatformPackages({
172
+ addons: async () => (await resolveAddons(projectRoot, undefined, logger)).filter((addon) => !deferModules.includes(addon.name)),
173
+ hosts,
174
+ scan: (extraDefer, outputPath) => runBarePack({
175
+ ...barePackOptions,
176
+ outputPath,
177
+ deferModules: [...deferModules, ...extraDefer],
178
+ quiet: true
179
+ }),
180
+ scanPath: path.join(outputDir, 'worker.scan.bundle.js'),
181
+ logger
182
+ });
142
183
  try {
143
184
  await fsp.writeFile(bundleEntryPath, bundleEntry, 'utf8');
144
- const barePackOptions = {
145
- entryPath: bundleEntryPath,
146
- outputPath: bundlePath,
147
- hosts,
148
- importsMapPath,
149
- deferModules,
150
- quiet: options.quiet === true,
151
- logger
152
- };
153
- await runBarePack(barePackOptions);
185
+ const addons = await addonsMissingPlatformPackages();
154
186
  if (options.installMissingPrebuilds === true) {
155
- try {
156
- const { installed } = await installMissingHostPrebuilds({
157
- projectRoot,
158
- hosts,
159
- addons: await collectAddonsFromBundle({ bundlePath, projectRoot, hosts }),
160
- quiet: options.quiet === true,
161
- logger
162
- });
163
- installedPrebuilds = installed;
164
- // Where a platform package was missing, bare-pack resolved the addon's
165
- // `#host-addon` import to its fallback module; bundle again to pick up
166
- // the installed package.
167
- if (installed.length > 0) {
168
- logger.info('\n🔨 Bundling again with the installed platform packages...');
169
- await runBarePack(barePackOptions);
170
- }
171
- }
172
- catch (error) {
173
- if (!(error instanceof HostPrebuildsInstallRefusedError))
174
- throw error;
175
- // A refusal happens before anything is installed, so the bundle
176
- // already written is final and only its manifest is left to write.
177
- installRefused = error;
178
- }
187
+ const { installed } = await installMissingHostPrebuilds({
188
+ projectRoot,
189
+ hosts,
190
+ addons,
191
+ quiet: options.quiet === true,
192
+ logger
193
+ });
194
+ installedPrebuilds = installed;
179
195
  }
196
+ else {
197
+ await throwIfPlatformPackagesMissing(addons, hosts);
198
+ }
199
+ await runBarePack({ ...barePackOptions, outputPath: bundlePath, deferModules });
180
200
  }
181
201
  finally {
182
202
  await fsp.rm(bundleEntryPath, { force: true });
@@ -189,7 +209,8 @@ export async function bundleSdk(options = {}) {
189
209
  bundlePath,
190
210
  outputDir,
191
211
  projectRoot,
192
- logger
212
+ logger,
213
+ includeAudioDecoder
193
214
  });
194
215
  if (options.checkEngines !== false) {
195
216
  await checkBundleEngines({
@@ -201,8 +222,6 @@ export async function bundleSdk(options = {}) {
201
222
  logger
202
223
  });
203
224
  }
204
- if (installRefused !== undefined)
205
- throw installRefused;
206
225
  const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
207
226
  logger.info(`\n🎉 Done in ${elapsed}s!\n`);
208
227
  logger.info('Generated files:');
@@ -222,3 +241,67 @@ export async function bundleSdk(options = {}) {
222
241
  installedPrebuilds
223
242
  };
224
243
  }
244
+ /**
245
+ * The installed split addons that the bundle reaches and that are missing a
246
+ * mobile platform package. Every installed addon is a candidate (`@qvac/sdk`
247
+ * depends on all of them), so a first bare-pack pass defers each missing
248
+ * platform package: bare-pack then records the reached ones as
249
+ * `deferred:<package>` and never visits the rest. Empty when nothing is
250
+ * missing, or when that pass fails, which leaves the real bundle to report
251
+ * the failure.
252
+ */
253
+ async function reachedAddonsMissingPlatformPackages(options) {
254
+ const { hosts, scan, scanPath, logger } = options;
255
+ const addons = await options.addons();
256
+ const missing = await findMissingHostPrebuilds(addons, hosts);
257
+ if (missing.length === 0)
258
+ return [];
259
+ logger.debug(`\n🔎 Checking which of ${missing.length} missing platform packages the bundle reaches...`);
260
+ try {
261
+ await scan(missing.map((pkg) => pkg.name), scanPath);
262
+ const reached = deferredSpecifiers(await fsp.readFile(scanPath, 'utf8'));
263
+ const owners = new Set(missing.filter((pkg) => reached.has(pkg.name)).map((pkg) => pkg.addon));
264
+ return addons.filter((addon) => owners.has(addon.name));
265
+ }
266
+ catch (error) {
267
+ logger.debug(` Scan failed: ${error instanceof Error ? error.message : String(error)}`);
268
+ return [];
269
+ }
270
+ finally {
271
+ await fsp.rm(scanPath, { force: true });
272
+ }
273
+ }
274
+ const DEFERRED_PROTOCOL = 'deferred:';
275
+ /** Every specifier a bare-pack bundle leaves as `deferred:<specifier>`. */
276
+ function deferredSpecifiers(bundleText) {
277
+ const { resolutions = {} } = extractBarePackHeader(extractPackedString(bundleText));
278
+ const found = new Set();
279
+ const visit = (value) => {
280
+ if (typeof value === 'string') {
281
+ if (value.startsWith(DEFERRED_PROTOCOL))
282
+ found.add(value.slice(DEFERRED_PROTOCOL.length));
283
+ }
284
+ else if (value !== null && typeof value === 'object') {
285
+ for (const nested of Object.values(value))
286
+ visit(nested);
287
+ }
288
+ };
289
+ visit(resolutions);
290
+ return found;
291
+ }
292
+ /**
293
+ * Throws `HostPrebuildsMissingError` when split addons are missing mobile
294
+ * platform packages, naming the exact pins.
295
+ */
296
+ async function throwIfPlatformPackagesMissing(addons, hosts) {
297
+ let missing;
298
+ try {
299
+ missing = await findMissingHostPrebuilds(addons, hosts);
300
+ }
301
+ catch {
302
+ return;
303
+ }
304
+ if (missing.length === 0)
305
+ return;
306
+ throw new HostPrebuildsMissingError(Object.fromEntries(missing.map((pkg) => [pkg.name, pkg.version])));
307
+ }
@@ -10,7 +10,9 @@ interface GenerateAddonsManifestOptions {
10
10
  outputDir: string;
11
11
  projectRoot: string;
12
12
  logger: Logger;
13
+ includeAudioDecoder?: boolean;
13
14
  }
15
+ export declare const AUDIO_DECODER_ADDON = "bare-ffmpeg";
14
16
  interface GenerateAddonsManifestResult {
15
17
  manifestPath: string;
16
18
  addons: string[];
@@ -1,5 +1,6 @@
1
1
  import fs, { promises as fsp } from 'node:fs';
2
2
  import path from 'node:path';
3
+ export const AUDIO_DECODER_ADDON = 'bare-ffmpeg';
3
4
  export function extractPackedString(bundleJsText) {
4
5
  const idx = bundleJsText.indexOf('module.exports');
5
6
  if (idx === -1) {
@@ -150,7 +151,7 @@ export function buildNestedPathIndex(resolutions, projectRoot) {
150
151
  return index;
151
152
  }
152
153
  export async function generateAddonsManifest(options) {
153
- const { bundlePath, outputDir, projectRoot, logger } = options;
154
+ const { bundlePath, outputDir, projectRoot, logger, includeAudioDecoder = true } = options;
154
155
  logger.info('\n📦 Generating addons manifest...');
155
156
  const bundleJsText = await fsp.readFile(bundlePath, 'utf8');
156
157
  const packed = extractPackedString(bundleJsText);
@@ -171,7 +172,7 @@ export async function generateAddonsManifest(options) {
171
172
  logger.warn(` Could not read ${candidate}: ${err.message}`);
172
173
  }
173
174
  }
174
- if (pkgJson?.addon === true) {
175
+ if (pkgJson?.addon === true && (includeAudioDecoder || pkgName !== AUDIO_DECODER_ADDON)) {
175
176
  addons.push(pkgName);
176
177
  }
177
178
  }
@@ -9,7 +9,8 @@ export interface EnsureHostPrebuildsOptions {
9
9
  hosts: string[];
10
10
  /**
11
11
  * Addon package names to cover. Defaults to every addon installed for the
12
- * project: in its own node_modules or in that of a workspace root listing it.
12
+ * project, split addon metas included: in its own node_modules or in that
13
+ * of a workspace root listing it.
13
14
  */
14
15
  addons?: string[] | undefined;
15
16
  /** Install with this package manager instead of detecting the project's own. */
@@ -38,15 +39,15 @@ export interface EnsureHostPrebuildsResult {
38
39
  * hosts and that the project does not have yet.
39
40
  *
40
41
  * A split addon names one platform package per host in the `#host-addon` map
41
- * of its package.json (`<addon>-ios` covers every iOS host). Desktop platform
42
- * packages install as the addon's os/cpu-filtered optionalDependencies, but a
43
- * build host never reports a mobile os, so mobile ones have to be declared.
42
+ * of its package.json (`<addon>-ios` covers every iOS host) and loads its
43
+ * native code from that package alone. Desktop platform packages install as
44
+ * os/cpu-filtered optionalDependencies, but a build host never reports a
45
+ * mobile os, so mobile ones have to be declared.
44
46
  * This declares the missing ones in package.json, pinned to each addon's
45
47
  * exact version, using the project's own package manager.
46
48
  *
47
- * A host whose prebuild already resolves is skipped: a local
48
- * `prebuilds/<host>` in the addon (source builds) or its platform package at
49
- * the addon's version. Throws `HostPrebuildsInstallRefusedError` when no
49
+ * A host whose platform package is already installed at the addon's version
50
+ * is skipped. Throws `HostPrebuildsInstallRefusedError` when no
50
51
  * supported package manager (npm 7+, pnpm, bun, Yarn Berry) is found, and
51
52
  * `HostPrebuildsInstallFailedError` when the install does not produce the
52
53
  * packages.
@@ -68,4 +69,11 @@ export declare function installMissingHostPrebuilds(options: InstallMissingHostP
68
69
  * the same platform package, since only one version of it can be installed.
69
70
  */
70
71
  export declare function findMissingHostPrebuilds(addons: NativeAddon[], hosts: string[]): Promise<HostPrebuildPackage[]>;
72
+ /**
73
+ * The installed addons named in `names`, or every installed addon when
74
+ * `names` is omitted, split addon metas included. For each name the copy in
75
+ * the nearest modules directory wins, as it does for Node's resolver. Without
76
+ * `names`, the packages nested in each package's own node_modules count too.
77
+ */
78
+ export declare function resolveAddons(projectRoot: string, names: string[] | undefined, logger: Logger): Promise<NativeAddon[]>;
71
79
  //# sourceMappingURL=index.d.ts.map
@@ -13,15 +13,15 @@ const PACKAGE_NAME = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
13
13
  * hosts and that the project does not have yet.
14
14
  *
15
15
  * A split addon names one platform package per host in the `#host-addon` map
16
- * of its package.json (`<addon>-ios` covers every iOS host). Desktop platform
17
- * packages install as the addon's os/cpu-filtered optionalDependencies, but a
18
- * build host never reports a mobile os, so mobile ones have to be declared.
16
+ * of its package.json (`<addon>-ios` covers every iOS host) and loads its
17
+ * native code from that package alone. Desktop platform packages install as
18
+ * os/cpu-filtered optionalDependencies, but a build host never reports a
19
+ * mobile os, so mobile ones have to be declared.
19
20
  * This declares the missing ones in package.json, pinned to each addon's
20
21
  * exact version, using the project's own package manager.
21
22
  *
22
- * A host whose prebuild already resolves is skipped: a local
23
- * `prebuilds/<host>` in the addon (source builds) or its platform package at
24
- * the addon's version. Throws `HostPrebuildsInstallRefusedError` when no
23
+ * A host whose platform package is already installed at the addon's version
24
+ * is skipped. Throws `HostPrebuildsInstallRefusedError` when no
25
25
  * supported package manager (npm 7+, pnpm, bun, Yarn Berry) is found, and
26
26
  * `HostPrebuildsInstallFailedError` when the install does not produce the
27
27
  * packages.
@@ -131,24 +131,35 @@ async function choosePackageManager(projectRoot, requested, dependencies) {
131
131
  }
132
132
  /**
133
133
  * The installed addons named in `names`, or every installed addon when
134
- * `names` is omitted. For each name the copy in the nearest modules directory
135
- * wins, as it does for Node's resolver.
134
+ * `names` is omitted, split addon metas included. For each name the copy in
135
+ * the nearest modules directory wins, as it does for Node's resolver. Without
136
+ * `names`, the packages nested in each package's own node_modules count too.
136
137
  */
137
- async function resolveAddons(projectRoot, names, logger) {
138
+ export async function resolveAddons(projectRoot, names, logger) {
138
139
  const moduleDirs = await reachableModuleDirs(projectRoot);
139
140
  const wanted = names === undefined ? null : new Set(names);
140
141
  const found = new Map();
141
- for (const modulesDir of moduleDirs) {
142
+ const visited = new Set();
143
+ for (let i = 0; i < moduleDirs.length; i++) {
144
+ const modulesDir = moduleDirs[i];
142
145
  const candidates = wanted === null ? await listPackageNames(modulesDir) : [...wanted];
143
146
  for (const name of candidates) {
147
+ const packageDir = path.join(modulesDir, ...name.split('/'));
148
+ if (wanted === null) {
149
+ const nested = path.join(packageDir, 'node_modules');
150
+ const real = await realPath(nested);
151
+ if (real !== null && !visited.has(real)) {
152
+ visited.add(real);
153
+ moduleDirs.push(nested);
154
+ }
155
+ }
144
156
  if (found.has(name))
145
157
  continue;
146
- const result = await readAddonPackageJson({
147
- packageJsonPath: path.join(modulesDir, ...name.split('/'), 'package.json'),
148
- expectedName: name
149
- });
150
- if (result.addon !== undefined)
151
- found.set(name, result.addon);
158
+ const packageJsonPath = path.join(packageDir, 'package.json');
159
+ const result = await readAddonPackageJson({ packageJsonPath, expectedName: name });
160
+ const addon = result.addon ?? result.splitAddon?.addon;
161
+ if (addon !== undefined)
162
+ found.set(name, addon);
152
163
  }
153
164
  }
154
165
  for (const name of wanted ?? []) {
@@ -214,6 +225,14 @@ async function readDirNames(dir) {
214
225
  return [];
215
226
  }
216
227
  }
228
+ async function realPath(dir) {
229
+ try {
230
+ return await fsp.realpath(dir);
231
+ }
232
+ catch {
233
+ return null;
234
+ }
235
+ }
217
236
  async function isDirectory(dir) {
218
237
  try {
219
238
  return (await fsp.stat(dir)).isDirectory();
@@ -4,7 +4,7 @@ export { ensureHostPrebuilds } from './host-prebuilds/index.js';
4
4
  export type { EnsureHostPrebuildsOptions, EnsureHostPrebuildsResult, HostPrebuildPackage, PackageManagerName } from './host-prebuilds/index.js';
5
5
  export { verifyBundle, hasErrors, hasWarnings, formatVerifyBundleResult } from './verify/index.js';
6
6
  export type { VerifyBundleOptions, VerifyBundleResult, VerifyBundleIssue, RuntimeGroup } from './verify/index.js';
7
- export { HostPrebuildsInstallFailedError, HostPrebuildsInstallRefusedError } from '../utils/errors-client.js';
7
+ export { HostPrebuildsInstallFailedError, HostPrebuildsInstallRefusedError, HostPrebuildsMissingError } from '../utils/errors-client.js';
8
8
  export { formatRuntimeSource } from './verify/abi.js';
9
9
  export type { BareRuntime, BareRuntimeResolution } from './verify/abi.js';
10
10
  export { isReactNativeBareKitInstalled } from './verify/bare-kit-runtime.js';
@@ -1,7 +1,7 @@
1
1
  export { bundleSdk } from './bundle/index.js';
2
2
  export { ensureHostPrebuilds } from './host-prebuilds/index.js';
3
3
  export { verifyBundle, hasErrors, hasWarnings, formatVerifyBundleResult } from './verify/index.js';
4
- export { HostPrebuildsInstallFailedError, HostPrebuildsInstallRefusedError } from '../utils/errors-client.js';
4
+ export { HostPrebuildsInstallFailedError, HostPrebuildsInstallRefusedError, HostPrebuildsMissingError } from '../utils/errors-client.js';
5
5
  export { formatRuntimeSource } from './verify/abi.js';
6
6
  export { isReactNativeBareKitInstalled } from './verify/bare-kit-runtime.js';
7
7
  export { isMobileHost } from './verify/prebuilds.js';
@@ -16,6 +16,7 @@ export interface AddonPackageJson {
16
16
  name?: string;
17
17
  version?: string;
18
18
  addon?: boolean;
19
+ imports?: Record<string, unknown>;
19
20
  engines?: {
20
21
  bare?: string;
21
22
  };
@@ -48,6 +49,17 @@ export interface ReadAddonPackageJsonResult {
48
49
  invalid?: InvalidPackageJsonRecord;
49
50
  addon?: NativeAddon;
50
51
  record?: PackageRecord;
52
+ /**
53
+ * Set for a split addon's meta package, which is not itself an addon: its
54
+ * `binding.js` is `require('#host-addon')` and the platform packages that
55
+ * map names (`<name>-<platform>`) are the addons actually loaded.
56
+ */
57
+ splitAddon?: SplitAddon;
58
+ }
59
+ export interface SplitAddon {
60
+ addon: NativeAddon;
61
+ /** Every platform package the meta's `#host-addon` map names. */
62
+ platformPackages: string[];
51
63
  }
52
64
  export declare function readAddonPackageJson(options: ReadAddonPackageJsonOptions): Promise<ReadAddonPackageJsonResult>;
53
65
  export interface CollectDiagnostics {
@@ -31,9 +31,13 @@ export async function readAddonPackageJson(options) {
31
31
  const pkg = parsed;
32
32
  const record = buildRecord(pkg, packageJsonPath, expectedName);
33
33
  if (pkg.addon !== true) {
34
- return record === null
35
- ? { found: true, isAddon: false }
36
- : { found: true, isAddon: false, record };
34
+ const result = { found: true, isAddon: false };
35
+ if (record !== null)
36
+ result.record = record;
37
+ const splitAddon = buildSplitAddon(pkg, packageJsonPath);
38
+ if (splitAddon !== null)
39
+ result.splitAddon = splitAddon;
40
+ return result;
37
41
  }
38
42
  const name = pkg.name ?? expectedName;
39
43
  if (!name) {
@@ -56,6 +60,35 @@ export async function readAddonPackageJson(options) {
56
60
  ? { found: true, isAddon: true, addon }
57
61
  : { found: true, isAddon: true, addon, record };
58
62
  }
63
+ function buildSplitAddon(pkg, packageJsonPath) {
64
+ if (typeof pkg.name !== 'string')
65
+ return null;
66
+ const prefix = `${pkg.name}-`;
67
+ const platformPackages = new Set();
68
+ const visit = (value) => {
69
+ if (typeof value === 'string') {
70
+ if (value.startsWith(prefix))
71
+ platformPackages.add(value);
72
+ }
73
+ else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
74
+ for (const child of Object.values(value))
75
+ visit(child);
76
+ }
77
+ };
78
+ visit(pkg.imports?.['#host-addon']);
79
+ if (platformPackages.size === 0)
80
+ return null;
81
+ const addon = {
82
+ name: pkg.name,
83
+ packageJsonPath,
84
+ packageRoot: path.dirname(packageJsonPath)
85
+ };
86
+ if (typeof pkg.version === 'string')
87
+ addon.version = pkg.version;
88
+ if (typeof pkg.engines?.bare === 'string')
89
+ addon.enginesBare = pkg.engines.bare;
90
+ return { addon, platformPackages: [...platformPackages].sort() };
91
+ }
59
92
  function stringRecord(value) {
60
93
  const out = {};
61
94
  if (typeof value !== 'object' || value === null || Array.isArray(value))
@@ -17,7 +17,8 @@ export const REACT_NATIVE_BARE_KIT_RUNTIMES = {
17
17
  '0.15.3': { bareKit: '2.5.1', bare: '1.33.2' },
18
18
  '0.15.4': { bareKit: '2.5.3', bare: '1.33.3' },
19
19
  '0.15.5': { bareKit: '2.5.4', bare: '1.33.4' },
20
- '0.15.6': { bareKit: '2.5.4', bare: '1.33.4' }
20
+ '0.15.6': { bareKit: '2.5.4', bare: '1.33.4' },
21
+ '0.16.0': { bareKit: '2.5.4', bare: '1.33.4' }
21
22
  };
22
23
  /** Bare version each bare-kit release is built against. */
23
24
  export const BARE_KIT_BARE_VERSIONS = {
@@ -16,7 +16,11 @@ export async function collectAddonsFromNodeModules(options) {
16
16
  const { nodeModulesRoot, diagnostics } = options;
17
17
  const limit = createLimiter(FS_CONCURRENCY);
18
18
  const results = await walkNodeModules(nodeModulesRoot, limit, true);
19
+ // A split addon is checked through its meta, which looks for each host's
20
+ // prebuild in the platform package it names; checking the installed
21
+ // platform packages as well would fail each one on every other host.
19
22
  const addons = [];
23
+ const platformPackages = new Set();
20
24
  for (const result of results) {
21
25
  if (result.record !== undefined && diagnostics !== undefined) {
22
26
  diagnostics.packages.push(result.record);
@@ -24,11 +28,16 @@ export async function collectAddonsFromNodeModules(options) {
24
28
  if (result.isAddon && result.addon) {
25
29
  addons.push(result.addon);
26
30
  }
31
+ else if (result.splitAddon !== undefined) {
32
+ addons.push(result.splitAddon.addon);
33
+ for (const name of result.splitAddon.platformPackages)
34
+ platformPackages.add(name);
35
+ }
27
36
  else if (result.invalid !== undefined && diagnostics !== undefined) {
28
37
  diagnostics.invalidPackageJsons.push(result.invalid);
29
38
  }
30
39
  }
31
- return deduplicateAddons(addons);
40
+ return deduplicateAddons(addons.filter((addon) => !platformPackages.has(addon.name)));
32
41
  }
33
42
  /**
34
43
  * Directory reads run in parallel under `limit`; results are concatenated in
@@ -1,13 +1,9 @@
1
+ /**
2
+ * Resolves split-addon platform packages from the meta package's `#host-addon`
3
+ * map, so verify and the missing-prebuild error name the package the addon
4
+ * actually imports.
5
+ */
1
6
  export declare const HOST_ADDON_IMPORT = "#host-addon";
2
- export interface PlatformAddonRoot {
3
- dir: string;
4
- pkg: {
5
- name?: string;
6
- version?: string;
7
- addon?: boolean;
8
- };
9
- }
10
- export declare function resolvePlatformAddonRoots(projectRoot: string, addonNames: string[], platform: string): PlatformAddonRoot[];
11
7
  /**
12
8
  * Package `#host-addon` names for `host`, if that name belongs to `metaName`.
13
9
  * `host` is a Bare host (`android-arm64`, `ios-arm64-simulator`, `darwin-arm64`)
@@ -20,4 +16,4 @@ export declare function resolveAddonPlatformPackage(metaName: string, hostAddon:
20
16
  * A platform-only `android` target uses arm64, matching the current mobile host.
21
17
  */
22
18
  export declare function resolvePlatformPackageName(hostAddon: unknown, host: string): string | null;
23
- //# sourceMappingURL=qvac-platform-addons.d.ts.map
19
+ //# sourceMappingURL=platform-addons.d.ts.map
@@ -1,53 +1,10 @@
1
1
  /**
2
2
  * Resolves split-addon platform packages from the meta package's `#host-addon`
3
- * map. Linker, verify, and the missing-prebuild error all call this module so
4
- * the slice name cannot drift from what the addon actually imports.
5
- *
6
- * Keep this file free of `@/` imports: the compiled JS is copied next to the
7
- * patched `link.mjs` as `qvac-platform-addons.mjs`.
3
+ * map, so verify and the missing-prebuild error name the package the addon
4
+ * actually imports.
8
5
  */
9
- import * as fs from 'fs';
10
- import * as path from 'path';
11
6
  export const HOST_ADDON_IMPORT = '#host-addon';
12
7
  const DEFAULT_ANDROID_CPU = 'arm64';
13
- export function resolvePlatformAddonRoots(projectRoot, addonNames, platform) {
14
- const roots = [];
15
- for (const name of addonNames) {
16
- const root = resolvePlatformAddonRoot(projectRoot, name, platform);
17
- if (root !== null)
18
- roots.push(root);
19
- }
20
- return roots;
21
- }
22
- function resolvePlatformAddonRoot(projectRoot, metaName, platform) {
23
- const metaManifest = readManifest(packageDir(projectRoot, metaName));
24
- if (metaManifest === null)
25
- return null;
26
- const platformPackage = resolveAddonPlatformPackage(metaName, metaManifest.imports?.[HOST_ADDON_IMPORT], platform);
27
- if (platformPackage === null)
28
- return null;
29
- const addonDir = path.join(packageDir(projectRoot, platformPackage), 'addon');
30
- const addonManifest = readManifest(addonDir);
31
- if (addonManifest === null || addonManifest.addon !== true)
32
- return null;
33
- if (!fs.existsSync(path.join(addonDir, 'prebuilds')))
34
- return null;
35
- return { dir: addonDir, pkg: addonManifest };
36
- }
37
- function packageDir(projectRoot, packageName) {
38
- return path.join(projectRoot, 'node_modules', ...packageName.split('/'));
39
- }
40
- function readManifest(dir) {
41
- try {
42
- const parsed = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
43
- if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
44
- return null;
45
- return parsed;
46
- }
47
- catch {
48
- return null;
49
- }
50
- }
51
8
  /**
52
9
  * Package `#host-addon` names for `host`, if that name belongs to `metaName`.
53
10
  * `host` is a Bare host (`android-arm64`, `ios-arm64-simulator`, `darwin-arm64`)
@@ -40,17 +40,14 @@ export interface PrebuildLocation {
40
40
  mismatchedVersion?: string;
41
41
  }
42
42
  /**
43
- * Directories to search for an addon's `<host>` prebuild, in precedence order:
43
+ * Where an addon's `<host>` prebuild may live:
44
44
  *
45
- * 1. `<packageRoot>/prebuilds/<host>` — the fat layout every addon used to
46
- * publish, and where source builds and `linked:` checkouts still land.
47
- * 2. `<platformRoot>/addon/prebuilds/<host>` — the per-platform package the
48
- * addon's `#host-addon` map names for this host, when that package is
49
- * installed. Each platform package embeds an inner `addon/` package named
50
- * after the meta addon so the `.bare` file keeps its name.
51
- *
52
- * A local `prebuilds/` always wins, matching the precedence the addons apply
53
- * in their own `binding.js` (`require.addon()` first, platform package second).
45
+ * - `<packageRoot>/prebuilds/<host>` for an ordinary addon, including the
46
+ * per-platform packages themselves.
47
+ * - For a split addon, the platform package its `#host-addon` map names for
48
+ * this host: `<platformRoot>/prebuilds/<host>` when that package is an
49
+ * addon, `<platformRoot>/addon/prebuilds/<host>` when it wraps an inner
50
+ * addon. Empty when the package is not installed.
54
51
  */
55
52
  export declare function resolvePrebuildLocations(addon: NativeAddon, host: string): Promise<PrebuildLocation[]>;
56
53
  export declare function checkPrebuilds(options: CheckPrebuildsOptions): Promise<MissingPrebuildIssue[]>;