@smileid/usesmileid_huawei_face 12.3.0 → 12.3.1-SNAPSHOT.50

package/android/consumer-rules.pro

@@ -17,3 +17,8 @@
     public static **[] values();
     public static ** valueOf(java.lang.String);
 }
+
+# A store build may leave this backend out; LinkedAnalyzers finds it by this class name.
+-keepnames class com.usesmileid.bridge.huawei.face.HuaweiFaceDetectorAnalyzer
+-dontwarn com.usesmileid.bridge.huawei.face.**
+-dontwarn com.huawei.hms.mlsdk.face.**

package/android/src/main/java/com/usesmileid/huawei/face/UseSmileIDHuaweiFaceModule.kt

@@ -16,6 +16,7 @@ import com.usesmileid.bridge.session.UseSmileIDScanState
 import com.usesmileid.bridge.session.UseSmileIDScanStateType
 import com.usesmileid.bridge.storage.FrameStorage
 import com.usesmileid.bridge.model.CaptureType
+import com.usesmileid.rn.analyzer.LinkedAnalyzers
 import com.usesmileid.rn.analyzer.UseSmileIDAnalyzerExecutor
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.modules.Module
@@ -102,7 +103,7 @@ class UseSmileIDHuaweiFaceModule : Module() {
         Name("UseSmileIDHuaweiFace")
 
         OnCreate {
-            FaceAnalyzerFactoryRegistry.register(KEY) { HuaweiFaceDetectorAnalyzer() }
+            if (LinkedAnalyzers.has(KEY)) FaceAnalyzerFactoryRegistry.register(KEY) { HuaweiFaceDetectorAnalyzer() }
             val ctx = appContext.reactContext
                 ?: throw IllegalStateException("Module not attached to a React context")
             executor.onAttach(ctx)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smileid/usesmileid_huawei_face",
-  "version": "12.3.0",
+  "version": "12.3.1-SNAPSHOT.50",
   "description": "Huawei HMS face detection implementation for the UseSmileID React Native (Expo) SDK.",
   "homepage": "https://usesmileid.com",
   "repository": {
@@ -47,8 +47,8 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@smileid/usesmileid_bridge": "12.3.0",
-    "@smileid/usesmileid_platform_interface": "12.3.0"
+    "@smileid/usesmileid_bridge": "12.3.1-SNAPSHOT.50",
+    "@smileid/usesmileid_platform_interface": "12.3.1-SNAPSHOT.50"
   },
   "peerDependencies": {
     "expo": ">=56.0.0",

package/plugin/build/index.d.ts

@@ -5,5 +5,15 @@ import { AndroidConfig, ConfigPlugin } from "expo/config-plugins";
  * with no value to replace is itself a merge error.
  */
 export declare function keepAppAllowBackup(manifest: AndroidConfig.Manifest.AndroidManifest): AndroidConfig.Manifest.AndroidManifest;
-declare const withHuaweiAllowBackup: ConfigPlugin;
-export default withHuaweiAllowBackup;
+/** The analyzers a store flavor keeps: ML Kit's or Huawei's. */
+export type StoreAnalyzers = "mlkit" | "huawei";
+export type HuaweiPluginOptions = {
+    /** One flavor per store and the analyzers it keeps, for example `{ play: "mlkit", appgallery: "huawei" }`. */
+    storeFlavors?: Record<string, StoreAnalyzers>;
+};
+/** The Gradle block that creates the store flavors and leaves the other store's analyzers out of each. */
+export declare function storeFlavorsGradle(storeFlavors: Record<string, StoreAnalyzers>): string;
+/** Puts the store flavors block in `app/build.gradle`, replacing one an earlier run wrote. */
+export declare function withStoreFlavors(buildGradle: string, storeFlavors: Record<string, StoreAnalyzers>): string;
+declare const withHuawei: ConfigPlugin<HuaweiPluginOptions | void>;
+export default withHuawei;

package/plugin/build/index.js

@@ -1 +1,5 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.keepAppAllowBackup=keepAppAllowBackup;const config_plugins_1=require("expo/config-plugins"),ALLOW_BACKUP="android:allowBackup",TOOLS_NAMESPACE="http://schemas.android.com/tools";function keepAppAllowBackup(e){const t=e.manifest.application?.[0];if(t?.$?.[ALLOW_BACKUP]===void 0)return e;e.manifest.$["xmlns:tools"]=TOOLS_NAMESPACE;const l=t.$,o=(l["tools:replace"]??"").split(",").map(s=>s.trim()).filter(s=>s.length>0);return o.includes(ALLOW_BACKUP)||o.push(ALLOW_BACKUP),l["tools:replace"]=o.join(","),e}const withHuaweiAllowBackup=e=>(0,config_plugins_1.withAndroidManifest)(e,t=>(t.modResults=keepAppAllowBackup(t.modResults),t));exports.default=withHuaweiAllowBackup;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.keepAppAllowBackup=keepAppAllowBackup,exports.storeFlavorsGradle=storeFlavorsGradle,exports.withStoreFlavors=withStoreFlavors;const config_plugins_1=require("expo/config-plugins"),ALLOW_BACKUP="android:allowBackup",TOOLS_NAMESPACE="http://schemas.android.com/tools";function keepAppAllowBackup(o){const t=o.manifest.application?.[0];if(t?.$?.[ALLOW_BACKUP]===void 0)return o;o.manifest.$["xmlns:tools"]=TOOLS_NAMESPACE;const e=t.$,s=(e["tools:replace"]??"").split(",").map(r=>r.trim()).filter(r=>r.length>0);return s.includes(ALLOW_BACKUP)||s.push(ALLOW_BACKUP),e["tools:replace"]=s.join(","),o}const withHuaweiAllowBackup=o=>(0,config_plugins_1.withAndroidManifest)(o,t=>(t.modResults=keepAppAllowBackup(t.modResults),t)),LEFT_OUT={mlkit:["huawei-face","huawei-document","kamera-huawei"],huawei:["mlkit-face","mlkit-document","kamera-mlkit"]},BEGIN="// @smileid store flavors: begin",END="// @smileid store flavors: end";function storeFlavorsGradle(o){const t=Object.entries(o);if(t.length===0)throw new Error("storeFlavors needs at least one flavor.");for(const[e,s]of t){if(!/^[a-z][A-Za-z0-9]*$/.test(e))throw new Error(`storeFlavors: "${e}" isn't a flavor name Gradle accepts.`);if(t.some(([r])=>r!==e&&r.startsWith(e)))throw new Error(`storeFlavors: "${e}" prefixes another flavor's name, so both would get its excludes.`);if(!Object.hasOwn(LEFT_OUT,s))throw new Error(`storeFlavors.${e} must be "mlkit" or "huawei".`)}return[BEGIN,"android {",'    flavorDimensions "store"',"    productFlavors {",...t.map(([e])=>`        ${e} { dimension "store" }`),"    }","}","react {",`    debuggableVariants = [${t.map(([e])=>`"${e}Debug"`).join(", ")}]`,"}",...t.flatMap(([e,s])=>[`configurations.matching { it.name.startsWith("${e}") }.configureEach {`,...LEFT_OUT[s].map(r=>`    exclude group: "com.usesmileid", module: "${r}"`),"}"]),END].join(`
+`)}function withStoreFlavors(o,t){const e=storeFlavorsGradle(t),s=o.indexOf(BEGIN);if(s<0)return`${o.trimEnd()}
+
+${e}
+`;const r=o.indexOf(END,s);if(r<0)throw new Error("app/build.gradle has a store flavors begin marker without its end; remove the partial block.");const n=r+END.length;return o.slice(0,s)+e+o.slice(n)}const withHuawei=(o,t)=>{const e=withHuaweiAllowBackup(o),s=t?.storeFlavors;return s?(0,config_plugins_1.withAppBuildGradle)(e,r=>{if(r.modResults.language!=="groovy")throw new Error("storeFlavors writes a Groovy app/build.gradle; this app's is Kotlin.");return r.modResults.contents=withStoreFlavors(r.modResults.contents,s),r}):e};exports.default=withHuawei;