@trainstar/synchro-react-native 0.4.0-rc.2 → 0.4.0-rc.4

package/ios-tests/TransactionSessionTests.swift

@@ -1,4 +1,5 @@
 @testable import SynchroReactNative
+import os
 import XCTest
 
 private struct SessionError: Error, Equatable {
@@ -6,21 +7,95 @@ private struct SessionError: Error, Equatable {
 }
 
 /// Records the begin completions that the actual session delivers.
-private final class BeginRecorder {
-    private(set) var results: [Result<String, Error>] = []
-
-    func record(_ result: Result<String, Error>) {
-        results.append(result)
+private final class BeginRecorder: Sendable {
+    private struct State: Sendable {
+        var successes: [String] = []
+        var failures: [SessionError?] = []
     }
 
+    private let state = OSAllocatedUnfairLock(initialState: State())
+
     var successes: [String] {
-        results.compactMap { try? $0.get() }
+        state.withLock { $0.successes }
     }
 
     var failures: [SessionError?] {
-        results.compactMap { result in
-            guard case .failure(let error) = result else { return nil }
-            return .some(error as? SessionError)
+        state.withLock { $0.failures }
+    }
+
+    func settlement() -> ReactPromiseSettlement {
+        ReactPromiseSettlement(
+            resolve: { [self] value in
+                let stringValue = value as? String
+                state.withLock { state in
+                    if let stringValue {
+                        state.successes.append(stringValue)
+                    }
+                }
+            },
+            reject: { [self] _, _, error in
+                state.withLock { $0.failures.append(error as? SessionError) }
+            }
+        )
+    }
+}
+
+private final class SettlementCounter: Sendable {
+    private let countState = OSAllocatedUnfairLock(initialState: 0)
+
+    var count: Int {
+        countState.withLock { $0 }
+    }
+
+    func increment() {
+        countState.withLock { $0 += 1 }
+    }
+}
+
+private final class EventRecorder: NSObject, SynchroEventEmitting {
+    private struct State {
+        var name: String?
+        var body: NSDictionary?
+        var deliveredOnMain = false
+    }
+
+    private let state = NSLock()
+    private var value = State()
+    let expectation: XCTestExpectation
+
+    init(expectation: XCTestExpectation) {
+        self.expectation = expectation
+    }
+
+    func emitEvent(_ name: String, body: NSDictionary) {
+        state.lock()
+        value.name = name
+        value.body = body
+        value.deliveredOnMain = Thread.isMainThread
+        state.unlock()
+        expectation.fulfill()
+    }
+
+    func snapshot() -> (String?, NSDictionary?, Bool) {
+        state.lock()
+        defer { state.unlock() }
+        return (value.name, value.body, value.deliveredOnMain)
+    }
+}
+
+private struct AuthStoreTimeout: Error {}
+
+private func pendingAuthRequest(
+    _ store: AuthRequestStore,
+    id: String,
+    insertion: CheckedContinuation<Bool, Never>
+) async throws -> String {
+    try await withCheckedThrowingContinuation { continuation in
+        let inserted = store.insert(continuation, for: id)
+        insertion.resume(returning: inserted)
+        guard inserted else {
+            continuation.resume(throwing: AuthStoreTimeout())
+            return
         }
     }
 }
@@ -29,7 +104,7 @@ private final class BeginRecorder {
 final class TransactionSessionTests: XCTestCase {
     func testFailureBeforeCallbackRejectsStoredBeginOnce() {
         let begin = BeginRecorder()
-        let session = TransactionSession(isWrite: true, beginCompletion: begin.record)
+        let session = TransactionSession(isWrite: true, beginSettlement: begin.settlement())
 
         session.rejectBegin(SessionError(name: "acquisition"))
         session.rejectBegin(SessionError(name: "later failure"))
@@ -40,7 +115,7 @@ final class TransactionSessionTests: XCTestCase {
 
     func testAbortBeforeBeginAcceptanceRejectsBeginAndUnwindsCallback() {
         let begin = BeginRecorder()
-        let session = TransactionSession(isWrite: true, beginCompletion: begin.record)
+        let session = TransactionSession(isWrite: true, beginSettlement: begin.settlement())
 
         session.abort(SessionError(name: "close"))
         XCTAssertThrowsError(try session.acceptBegin("abort-before-begin")) { error in
@@ -54,7 +129,7 @@ final class TransactionSessionTests: XCTestCase {
 
     func testAcceptedBeginIsNotSettledAgainByLaterFailure() throws {
         let begin = BeginRecorder()
-        let session = TransactionSession(isWrite: true, beginCompletion: begin.record)
+        let session = TransactionSession(isWrite: true, beginSettlement: begin.settlement())
 
         try session.acceptBegin("accepted")
         session.abort(SessionError(name: "close"))
@@ -63,4 +138,84 @@ final class TransactionSessionTests: XCTestCase {
         XCTAssertEqual(begin.successes, ["accepted"])
         XCTAssertEqual(begin.failures, [])
     }
+
+    func testPromiseSettlementRaceInvokesOneBlock() {
+        let counter = SettlementCounter()
+        let settlement = ReactPromiseSettlement(
+            resolve: { _ in counter.increment() },
+            reject: { _, _, _ in counter.increment() }
+        )
+
+        DispatchQueue.concurrentPerform(iterations: 100) { index in
+            if index.isMultiple(of: 2) {
+                settlement.resolve(.void)
+            } else {
+                settlement.reject("TEST", "test", nil)
+            }
+        }
+
+        XCTAssertEqual(counter.count, 1)
+    }
+
+    func testPromiseSettlementUnlocksBeforeReentrantInvocation() {
+        let counter = SettlementCounter()
+        let holder = OSAllocatedUnfairLock<ReactPromiseSettlement?>(initialState: nil)
+        let settlement = ReactPromiseSettlement(
+            resolve: { _ in
+                counter.increment()
+                holder.withLock { $0 }?.reject("REENTRANT", "reentrant", nil)
+            },
+            reject: { _, _, _ in counter.increment() }
+        )
+        holder.withLock { $0 = settlement }
+
+        settlement.resolve(.void)
+
+        XCTAssertEqual(counter.count, 1)
+    }
+
+    func testEventTargetIsWeakAndDeliversOnMain() {
+        let event = expectation(description: "event")
+        let target = ReactEventTarget()
+        var recorder: EventRecorder? = EventRecorder(expectation: event)
+        target.setDelegate(recorder)
+
+        target.emit("onTest", body: .object(["value": .string("ok")]))
+        wait(for: [event], timeout: 1)
+
+        let snapshot = recorder?.snapshot()
+        XCTAssertEqual(snapshot?.0, "onTest")
+        XCTAssertEqual(snapshot?.1?["value"] as? String, "ok")
+        XCTAssertEqual(snapshot?.2, true)
+
+        weak let weakRecorder = recorder
+        recorder = nil
+        XCTAssertNil(weakRecorder)
+        XCTAssertNil(target.currentDelegate)
+    }
+
+    func testAuthStoreCloseRejectsPendingAndIgnoresLateCompletion() async throws {
+        let store = AuthRequestStore()
+        store.activate()
+        var pendingTask: Task<String, Error>?
+        let inserted = await withCheckedContinuation { insertion in
+            pendingTask = Task {
+                try await pendingAuthRequest(store, id: "request", insertion: insertion)
+            }
+        }
+        XCTAssertTrue(inserted)
+        XCTAssertEqual(store.count, 1)
+        let task = try XCTUnwrap(pendingTask)
+
+        store.cancelAll()
+        store.resolve("request", token: "late")
+
+        do {
+            _ = try await task.value
+            XCTFail("Expected close to reject the request")
+        } catch {
+            XCTAssertEqual((error as NSError).domain, "SynchroModule")
+        }
+        XCTAssertEqual(store.count, 0)
+    }
 }

package/lib/module/NativeSynchro.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeSynchro.ts"],"mappings":";;AAKA,SAASA,mBAAmB,QAAQ,cAAc;;AAElD;AACA;AACA;;AAgLA,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeSynchro.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;;AAElD;AACA;AACA;;AAgLA,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}

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

@@ -1,7 +1,6 @@
-import type { TurboModule } from 'react-native';
-import type { EventEmitter, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
-type NativeSQLiteBindValue = string | number | boolean | null | UnsafeObject;
-type NativeRow = UnsafeObject;
+import type { CodegenTypes, TurboModule } from 'react-native';
+type NativeSQLiteBindValue = string | number | boolean | null | CodegenTypes.UnsafeObject;
+type NativeRow = CodegenTypes.UnsafeObject;
 type NativeSQLStatement = {
     sql: string;
     params: ReadonlyArray<NativeSQLiteBindValue>;
@@ -10,7 +9,7 @@ type StatusEvent = {
     status: string;
     retryAt: string | null;
     operation: string | null;
-    failure: UnsafeObject | null;
+    failure: CodegenTypes.UnsafeObject | null;
 };
 type ConflictEvent = {
     table: string;
@@ -25,8 +24,8 @@ type SyncEvent = {
     operation: string | null;
     attempt: number | null;
     retryAt: string | null;
-    source: UnsafeObject | null;
-    target: UnsafeObject | null;
+    source: CodegenTypes.UnsafeObject | null;
+    target: CodegenTypes.UnsafeObject | null;
     action: string | null;
     mutationID: string | null;
     tableID: string | null;
@@ -34,7 +33,7 @@ type SyncEvent = {
     rejectionCode: string | null;
     scopeID: string | null;
     rebuildID: string | null;
-    failure: UnsafeObject | null;
+    failure: CodegenTypes.UnsafeObject | null;
 };
 type AuthRequestEvent = {
     requestID: string;
@@ -118,12 +117,12 @@ export interface Spec extends TurboModule {
     clearRejectedMutations(): Promise<void>;
     resolveAuthRequest(requestID: string, token: string): void;
     rejectAuthRequest(requestID: string, error: string): void;
-    readonly onStatusChange: EventEmitter<StatusEvent>;
-    readonly onSyncEvent: EventEmitter<SyncEvent>;
-    readonly onConflict: EventEmitter<ConflictEvent>;
-    readonly onAuthRequest: EventEmitter<AuthRequestEvent>;
-    readonly onChange: EventEmitter<ChangeEvent>;
-    readonly onQueryResult: EventEmitter<QueryResultEvent>;
+    readonly onStatusChange: CodegenTypes.EventEmitter<StatusEvent>;
+    readonly onSyncEvent: CodegenTypes.EventEmitter<SyncEvent>;
+    readonly onConflict: CodegenTypes.EventEmitter<ConflictEvent>;
+    readonly onAuthRequest: CodegenTypes.EventEmitter<AuthRequestEvent>;
+    readonly onChange: CodegenTypes.EventEmitter<ChangeEvent>;
+    readonly onQueryResult: CodegenTypes.EventEmitter<QueryResultEvent>;
     addListener(eventName: string): void;
     removeListeners(count: number): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"NativeSynchro.d.ts","sourceRoot":"","sources":["../../../src/NativeSynchro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NativeSynchro.d.ts","sourceRoot":"","sources":["../../../src/NativeSynchro.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trainstar/synchro-react-native",
-  "version": "0.4.0-rc.2",
+  "version": "0.4.0-rc.4",
   "description": "React Native bridge for Synchro sync SDK",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -20,6 +20,8 @@
     "./tooling-patches/cli-config-android-20.2.0.patch": "./tooling-patches/cli-config-android-20.2.0.patch",
     "./tooling-patches/cli-clean-20.2.0.patch": "./tooling-patches/cli-clean-20.2.0.patch",
     "./tooling-patches/react-native-builder-bob-0.40.18.patch": "./tooling-patches/react-native-builder-bob-0.40.18.patch",
+    "./tooling-patches/react-native-gradle-plugin-0.82.1-kotlin-2.4.21.patch": "./tooling-patches/react-native-gradle-plugin-0.82.1-kotlin-2.4.21.patch",
+    "./tooling-patches/react-native-gradle-plugin-0.88.0-kotlin-2.4.21.patch": "./tooling-patches/react-native-gradle-plugin-0.88.0-kotlin-2.4.21.patch",
     "./tooling-patches/stream-json-1.9.1.patch": "./tooling-patches/stream-json-1.9.1.patch",
     "./package.json": "./package.json"
   },
@@ -76,25 +78,26 @@
     "node": ">=20.19.4"
   },
   "devDependencies": {
-    "@react-native/babel-preset": "0.83.10",
+    "@react-native/babel-preset": "0.88.0",
+    "@react-native/jest-preset": "0.88.0",
     "@testing-library/react-native": "^12.4.0",
     "@types/jest": "^29.5.14",
-    "@types/react": "^19.2.4",
+    "@types/react": "^19.3.0",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "del-cli": "^6.0.0",
     "eslint": "^9.0.0",
     "jest": "^29.7.0",
-    "react": "19.2.4",
-    "react-native": "0.83.10",
+    "react": "19.3.0",
+    "react-native": "0.88.0",
     "react-native-builder-bob": "^0.40.18",
-    "react-test-renderer": "^19.2.4",
+    "react-test-renderer": "19.3.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "react": ">=19.1.1 <20.0.0",
-    "react-native": ">=0.82.1 <0.84.0"
+    "react-native": ">=0.82.1 <0.89.0"
   },
   "workspaces": [
     "example"
@@ -102,6 +105,7 @@
   "resolutions": {
     "@react-native-community/cli-config-android@npm:20.2.0": "patch:@react-native-community/cli-config-android@npm%3A20.2.0#./tooling-patches/cli-config-android-20.2.0.patch",
     "@react-native-community/cli-clean@npm:20.2.0": "patch:@react-native-community/cli-clean@npm%3A20.2.0#./tooling-patches/cli-clean-20.2.0.patch",
+    "@react-native/gradle-plugin@npm:0.88.0": "patch:@react-native/gradle-plugin@npm%3A0.88.0#./tooling-patches/react-native-gradle-plugin-0.88.0-kotlin-2.4.21.patch",
     "react-native-builder-bob@npm:^0.40.18": "patch:react-native-builder-bob@npm%3A0.40.18#./tooling-patches/react-native-builder-bob-0.40.18.patch",
     "stream-json@npm:^1.7.4": "patch:stream-json@npm%3A1.9.1#./tooling-patches/stream-json-1.9.1.patch",
     "stream-json@npm:^1.7.5": "patch:stream-json@npm%3A1.9.1#./tooling-patches/stream-json-1.9.1.patch"
@@ -139,7 +143,7 @@
     }
   },
   "jest": {
-    "preset": "react-native",
+    "preset": "@react-native/jest-preset",
     "transform": {
       "^.+\\.tsx?$": [
         "ts-jest",

package/src/NativeSynchro.ts

@@ -1,15 +1,11 @@
-import type { TurboModule } from 'react-native';
-import type {
-  EventEmitter,
-  UnsafeObject,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { CodegenTypes, TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 // Codegen does not support a discriminated union of object and primitive
 // parameter types. UnsafeObject keeps the TurboModule boundary representable,
 // while the public client validates the tagged values before crossing it.
-type NativeSQLiteBindValue = string | number | boolean | null | UnsafeObject;
-type NativeRow = UnsafeObject;
+type NativeSQLiteBindValue = string | number | boolean | null | CodegenTypes.UnsafeObject;
+type NativeRow = CodegenTypes.UnsafeObject;
 type NativeSQLStatement = {
   sql: string;
   params: ReadonlyArray<NativeSQLiteBindValue>;
@@ -18,7 +14,7 @@ type StatusEvent = {
   status: string;
   retryAt: string | null;
   operation: string | null;
-  failure: UnsafeObject | null;
+  failure: CodegenTypes.UnsafeObject | null;
 };
 type ConflictEvent = {
   table: string;
@@ -33,8 +29,8 @@ type SyncEvent = {
   operation: string | null;
   attempt: number | null;
   retryAt: string | null;
-  source: UnsafeObject | null;
-  target: UnsafeObject | null;
+  source: CodegenTypes.UnsafeObject | null;
+  target: CodegenTypes.UnsafeObject | null;
   action: string | null;
   mutationID: string | null;
   tableID: string | null;
@@ -42,7 +38,7 @@ type SyncEvent = {
   rejectionCode: string | null;
   scopeID: string | null;
   rebuildID: string | null;
-  failure: UnsafeObject | null;
+  failure: CodegenTypes.UnsafeObject | null;
 };
 type AuthRequestEvent = { requestID: string };
 type ChangeEvent = { observerID: string };
@@ -171,12 +167,12 @@ export interface Spec extends TurboModule {
   rejectAuthRequest(requestID: string, error: string): void;
 
   // Typed events
-  readonly onStatusChange: EventEmitter<StatusEvent>;
-  readonly onSyncEvent: EventEmitter<SyncEvent>;
-  readonly onConflict: EventEmitter<ConflictEvent>;
-  readonly onAuthRequest: EventEmitter<AuthRequestEvent>;
-  readonly onChange: EventEmitter<ChangeEvent>;
-  readonly onQueryResult: EventEmitter<QueryResultEvent>;
+  readonly onStatusChange: CodegenTypes.EventEmitter<StatusEvent>;
+  readonly onSyncEvent: CodegenTypes.EventEmitter<SyncEvent>;
+  readonly onConflict: CodegenTypes.EventEmitter<ConflictEvent>;
+  readonly onAuthRequest: CodegenTypes.EventEmitter<AuthRequestEvent>;
+  readonly onChange: CodegenTypes.EventEmitter<ChangeEvent>;
+  readonly onQueryResult: CodegenTypes.EventEmitter<QueryResultEvent>;
 
   // NativeEventEmitter compatibility
   addListener(eventName: string): void;

package/tooling-patches/apply.cjs

@@ -58,6 +58,69 @@ const repairs = {
       preimage: '451fe8050e20bc1c4724564b2c33fb819f815848f5ad2eb529be5915bf62f2bb',
       postimage: 'd22c16e9d4ebe97b15a3b734b70e1060a5526b907cad2b1ec3bb1004d4ed0675'
     }]
+  }],
+  rngp: [{
+    caller: 'react-native',
+    callerVersion: '0.88.0',
+    packageName: '@react-native/gradle-plugin',
+    version: '0.88.0',
+    patch: 'react-native-gradle-plugin-0.88.0-kotlin-2.4.21.patch',
+    sources: [{
+      path: 'gradle/libs.versions.toml',
+      preimage: 'c7a028cdee90f490de9493ca9de92b61b994844836161871091c340c568f109e',
+      postimage: '44a27d41062a7c01889fac1bc7666f8235ee14060de8588d66660830f8484c7d'
+    }, {
+      path: 'react-native-gradle-plugin/build.gradle.kts',
+      preimage: '44bcf53d885c52ef9988b7147e8e522563eaf519144109f40390fc7601a6469e',
+      postimage: 'cced8bd5897896d6f00149e4704b51130e8b9468f39ab4247f9aca0f2ddcc864'
+    }, {
+      path: 'settings-plugin/build.gradle.kts',
+      preimage: '326cc1d071e500711a12134d0577059929ae3e6960e2d1bfb10e0cffea8832f2',
+      postimage: '3af9b7ea340523e24e3492db32da30943dd840c3f2e656ffdc72b7a37129a3d5'
+    }, {
+      path: 'shared-testutil/build.gradle.kts',
+      preimage: '40950ae3b3bf68b35515f022f2819c98def11f0aee67ade7ed64f04c6f033cca',
+      postimage: '2db5af783296917c76c1f410ead33ed555310917a79b3b005ee996f1ac23a6d6'
+    }, {
+      path: 'shared/build.gradle.kts',
+      preimage: '7069a997b96e4c8a733a62e00d557730ab32bde6a5dc54dbd18d86d2bc302d09',
+      postimage: '5d8d113c7849a448d1abafb8fcdb545f389133fcd3fb6c68c12089de53e24c6c'
+    }]
+  }, {
+    caller: 'react-native',
+    callerVersion: '0.82.1',
+    packageName: '@react-native/gradle-plugin',
+    version: '0.82.1',
+    patch: 'react-native-gradle-plugin-0.82.1-kotlin-2.4.21.patch',
+    sources: [{
+      path: 'gradle/libs.versions.toml',
+      preimage: 'eea932505dd9efd2d660d8d10efddbe84b74ed47456d995099af7ab5d97d6802',
+      postimage: '8a30e112ad18be9bc95f509d1cc42affd09e23dd2cfe22677cd7c7703628247f'
+    }, {
+      path: 'react-native-gradle-plugin/build.gradle.kts',
+      preimage: 'b45b3f39996d9db2b54c68cca073063c605d313aae548f633b6a00fc6df556b0',
+      postimage: 'f0b609f0c29dbd6e90de935d3d6690b5cc6dd61f314345ccb662a0baf11a5fcc'
+    }, {
+      path: 'settings-plugin/build.gradle.kts',
+      preimage: '18d28065072ad8c93656deadfbcff095a05fd6a58e25d047eb69d839e347aa97',
+      postimage: '95b2086c29bd771fd9e52d23c931897852d6669138f0939a1b26a14f67c9a41e'
+    }, {
+      path: 'shared-testutil/build.gradle.kts',
+      preimage: '8cb397c7d640a836c2edce904cf2fbf90c069a2b228b539c0243e3d7997854bf',
+      postimage: '9af52f0cdf6f76a713598db2da6c7679390625028a23a0946c27d9df580d4bdc'
+    }, {
+      path: 'shared/build.gradle.kts',
+      preimage: 'fd66179022462615f054ccf03af25bc8b9399dc6b492d75b022bf2961f0f034e',
+      postimage: '00a4789ebba1fea4cfd6e0d3ef298fda7af7a462306ede91081d01c94cd74a92'
+    }, {
+      path: 'react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt',
+      preimage: '0d8511fc8c814b40a910b894986665784ef36a977c139923e92bfc62ef4cb845',
+      postimage: '8d47cc51b9759d19a400fc015a455cd137b867c8db69b06f19e7ed4e50d30151'
+    }, {
+      path: 'react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt',
+      preimage: 'd25dbfc8d9ee685269e22cddff9f4e86691fe922074dde32e1c5662d9a406309',
+      postimage: 'd1e7e31b236484cf06521e64eadff3c85502e822c08351de7caf7a78ed51bea0'
+    }]
   }]
 };
 
@@ -154,10 +217,28 @@ function applyRepair(repair) {
   process.stdout.write(`applied verified ${repair.packageName} ${repair.version} patch\n`);
 }
 
+function hasCallerIdentity(repair) {
+  try {
+    const caller = callerRoot(repair);
+    const manifest = JSON.parse(fs.readFileSync(path.join(caller, 'package.json'), 'utf8'));
+    return manifest.name === repair.caller && manifest.version === repair.callerVersion;
+  } catch {
+    return false;
+  }
+}
+
+function selectedRepairs(name) {
+  const candidates = repairs[name];
+  if (name !== 'rngp') return candidates;
+  const selected = candidates.filter(hasCallerIdentity);
+  if (selected.length !== 1) fail('unsupported React Native Gradle Plugin version');
+  return selected;
+}
+
 const name = process.argv[2] || 'cli';
 if (!Object.prototype.hasOwnProperty.call(repairs, name)) {
   fail('unsupported repair');
 }
-for (const repair of repairs[name]) {
+for (const repair of selectedRepairs(name)) {
   applyRepair(repair);
 }