react-native-webrtc-kaleidoscope 2.2.0 → 2.2.1

package/llms.txt

@@ -81,7 +81,7 @@ Web (Chromium only) runs with no prebuild: `bunx expo start --web`.
 The plugin statically analyzes ONE file to decide which image assets ship in your native bundle. The contract:
 
 1. **Exact filename, exact location:** `kaleidoscope.preset-book.ts` at the **project root** (the directory containing `package.json` and your app config). A book named or placed differently still typechecks and still works on web, but at prebuild NO assets are copied and every image background silently renders nothing on native. This is the most common integration mistake; the failure is silent.
-2. **The book is parsed as text, never executed.** Keep every `image` layer's `source` statically analyzable: a single named import from `react-native-webrtc-kaleidoscope/images/<category>/<leaf>`, a `require('./local.webp')` literal, or a `const X = Asset.fromModule(require('./local.webp')).uri` binding. Do not compute sources, build layers in helper functions, or re-export the book through a barrel; the parser will not follow them and the assets will be skipped (with at most a prebuild warning).
+2. **The book is parsed as text, never executed.** Keep every `image` layer's `source` statically analyzable: a single named import from `react-native-webrtc-kaleidoscope/images/<category>/<leaf>`, a `require('./local.webp')` literal, or a `const X = Asset.fromModule(require('./local.webp')).uri` binding (the binding may span lines; a formatter wrapping it at a narrow print width is fine). Do not compute sources, build layers in helper functions, or re-export the book through a barrel; the parser will not follow them, and each skipped `image` layer warns at prebuild naming the layer id.
 3. **An `image` layer's `id` doubles as its native plate id**: keep it equal to the image file's basename (`office-dark`, `my-bg`). Your own background images must be `.webp` (native resolves `assets/images/<id>.webp`).
 4. **Re-run `bunx expo prebuild` after editing the book** (adding/deleting presets changes the native asset set). JS-only uniform tweaks hot-reload without it.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-webrtc-kaleidoscope",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Live video effects (blur, background replacement, generative backgrounds, flip/rotate) for react-native-webrtc, packaged as a managed-Expo-friendly Expo Module. Working on web, Android, and iOS. Active development.",
   "keywords": [
     "react-native",

package/plugin/build/lib/preset-book.js

@@ -18,8 +18,11 @@
 // each `image` layer is `{ id, shader: 'image', source: <ref> }`, where <ref> is
 // a `require('./x.webp')` literal, a single named import from an
 // `.../images/<category>/<leaf>` specifier, or a `const X = ...require('./x.webp')...`
-// binding. Anything that can't be parsed or resolved warns (never throws),
-// matching the plugin's non-fatal contract.
+// binding. A binding's initializer may span lines (a consumer's formatter wraps
+// the idiomatic `Asset.fromModule(require(...)).uri` at narrow print widths), so
+// the parse reads statements, not lines. Anything that can't be parsed or
+// resolved warns (never throws), matching the plugin's non-fatal contract; an
+// `image` layer dropped silently at prebuild is a bug, not a policy.
 var __importDefault =
   (this && this.__importDefault) ||
   function (mod) {
@@ -30,6 +33,7 @@ exports.PRESET_BOOK_FILENAME = void 0;
 exports.collectReferencedAssets = collectReferencedAssets;
 const node_fs_1 = __importDefault(require('node:fs'));
 const node_path_1 = __importDefault(require('node:path'));
+const constants_1 = require('./constants');
 const file_manipulation_1 = require('./file-manipulation');
 /** The file a consumer declares at their project root. */
 exports.PRESET_BOOK_FILENAME = 'kaleidoscope.preset-book.ts';
@@ -48,8 +52,12 @@ function parseImports(source) {
     const specifier = m[3];
     if (local && specifier) imports[local] = specifier;
   }
+  // The initializer scan crosses newlines (formatters wrap the binding) but
+  // stops at `;` and refuses to run into a following declaration, so a
+  // no-semicolon style cannot misattribute a later require() to an earlier
+  // binding.
   const requireBindingRe =
-    /(?:const|let|var)\s+([A-Za-z0-9_$]+)\s*=\s*[^;\n]*\brequire\(\s*['"]([^'"]+)['"]\s*\)/g;
+    /(?:const|let|var)\s+([A-Za-z0-9_$]+)\s*=\s*(?:(?!\b(?:const|let|var)\b)[^;])*?\brequire\(\s*['"]([^'"]+)['"]\s*\)/g;
   for (const m of source.matchAll(requireBindingRe)) {
     const local = m[1];
     const specifier = m[2];
@@ -81,14 +89,27 @@ function parseImageRefs(source) {
   for (const m of source.matchAll(layerRe)) {
     const body = m[1];
     if (!body) continue;
+    const layerId = body.match(/\bid\s*:\s*['"]([\w-]+)['"]/)?.[1];
     const sourceM = body.match(/source\s*:\s*(require\(\s*['"][^'"]+['"]\s*\)|[A-Za-z0-9_$]+)/);
     const expr = sourceM?.[1];
-    if (!expr) continue;
+    // The warn-never-throw contract: a layer the parse cannot follow is skipped
+    // LOUDLY, naming the layer, so the missing plate surfaces at prebuild
+    // instead of on-device.
+    if (!expr) {
+      console.warn(
+        `${constants_1.LOG_TAG} Could not parse the 'source' of image layer '${layerId ?? '<no id>'}'; skipping its asset. An image layer's source must be a require('...') literal or an identifier bound by a single named import or a require() binding.`,
+      );
+      continue;
+    }
     const requireLiteral = expr.match(/require\(\s*['"]([^'"]+)['"]\s*\)/);
     const specifier = requireLiteral ? requireLiteral[1] : (imports[expr] ?? null);
-    if (!specifier) continue;
-    const idM = body.match(/\bid\s*:\s*['"]([\w-]+)['"]/);
-    const id = idM?.[1] ?? imageIdFromSpecifier(specifier);
+    if (!specifier) {
+      console.warn(
+        `${constants_1.LOG_TAG} Could not resolve '${expr}' (the 'source' of image layer '${layerId ?? '<no id>'}') to an import or require() binding; skipping its asset.`,
+      );
+      continue;
+    }
+    const id = layerId ?? imageIdFromSpecifier(specifier);
     if (seen.has(id)) continue;
     seen.add(id);
     refs.push({ id, specifier });
@@ -96,13 +117,21 @@ function parseImageRefs(source) {
   return refs;
 }
 /**
- * Resolve an imported-composite specifier (`<pkg>/composites/<name>`) to its
- * source `.ts` on disk. Returns null for a non-composite specifier or an
- * unresolvable package.
+ * The composite a specifier references: `<pkg>/composites/<name>` or any of its
+ * per-composite subpaths (today `/controls`). A consumer importing ONLY a
+ * composite's controls is still using that composite, so both forms count.
+ */
+function compositeNameFromSpecifier(specifier) {
+  return specifier.match(/(?:^|\/)composites\/([\w-]+)(?:\/controls)?$/)?.[1] ?? null;
+}
+/**
+ * Resolve an imported-composite specifier (`<pkg>/composites/<name>`, or its
+ * `/controls` subpath) to the composite's source `.ts` on disk. Returns null
+ * for a non-composite specifier or an unresolvable package.
  */
 function resolveCompositeSource(specifier, projectRoot) {
-  if (!/(^|\/)composites\/[\w-]+$/.test(specifier)) return null;
-  const name = specifier.substring(specifier.lastIndexOf('/') + 1);
+  const name = compositeNameFromSpecifier(specifier);
+  if (!name) return null;
   try {
     const pkgJson = require.resolve('react-native-webrtc-kaleidoscope/package.json', {
       paths: [projectRoot],
@@ -143,9 +172,13 @@ function resolveAssetPath(specifier, baseDir, projectRoot) {
 // collectors so neither drifts from the other.
 function walkBookSources(bookSource, projectRoot) {
   const sources = [{ source: bookSource, baseDir: projectRoot }];
+  // A composite and its `/controls` subpath resolve to the SAME source file;
+  // parse it once.
+  const seenPaths = new Set();
   for (const specifier of Object.values(parseImports(bookSource))) {
     const compositePath = resolveCompositeSource(specifier, projectRoot);
-    if (!compositePath) continue;
+    if (!compositePath || seenPaths.has(compositePath)) continue;
+    seenPaths.add(compositePath);
     const compositeSource = (0, file_manipulation_1.readTextOrNull)(compositePath);
     // Non-fatal: a composite we cannot read contributes nothing.
     if (compositeSource !== null) {
@@ -182,10 +215,10 @@ function collectCompositeThumbRefs(bookSource, projectRoot) {
   const refs = [];
   const seen = new Set();
   for (const specifier of Object.values(parseImports(bookSource))) {
+    const name = compositeNameFromSpecifier(specifier);
+    if (!name || seen.has(name)) continue;
     const compositeTs = resolveCompositeSource(specifier, projectRoot);
     if (!compositeTs) continue;
-    const name = specifier.substring(specifier.lastIndexOf('/') + 1);
-    if (seen.has(name)) continue;
     const thumbPath = node_path_1.default.join(
       node_path_1.default.dirname(compositeTs),
       `${name}.thumb.webp`,