test(oracle): consolidate object graph helpers

Author: doodlewind

scripts/check-oracle-helper-duplication.mjs

@@ -9,6 +9,7 @@ const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const root = resolve(scriptDirectory, "..");
 const supportDirectory = resolve(root, "tests/support");
 const providerFiles = [
+  resolve(supportDirectory, "object_graph_observation.rs"),
   resolve(supportDirectory, "runtime_completion_oracle.rs"),
   resolve(supportDirectory, "runtime_observation.rs"),
 ];
@@ -155,21 +156,76 @@ const tombstoneSources = [
         }
         Err(error) => panic!("Rust engine failure for {description}: {error}"),
     }
+}`,
+  },
+  {
+    label: "Object graph descriptor-bit formatter without a trailing argument comma",
+    origin: "tests/oracle/object/oracle_object_descriptors.rs",
+    replacement: "object_graph_observation::data_bits",
+    source: String.raw`fn data_bits(writable: bool, enumerable: bool, configurable: bool) -> String {
+    format!(
+        "D:{}{}{}",
+        Number(writable),
+        Number(enumerable),
+        Number(configurable)
+    )
+}`,
+  },
+  {
+    label: "Object graph integer-property reader",
+    origin: "tests/oracle/object/oracle_object_assign.rs",
+    replacement: "object_graph_observation::int_property",
+    source: String.raw`fn int_property(runtime: &Runtime, context: &mut Context, object: &ObjectRef, name: &str) -> i32 {
+    let Value::Int(value) = context
+        .get_property(object, &runtime.intern_property_key(name).unwrap())
+        .unwrap()
+    else {
+        panic!("{name} was not an Int property");
+    };
+    value
 }`,
   },
 ];
 
-// All exact copies of the shared providers were retired with this gate. Keep
-// the mechanism explicit so a narrowly justified exception remains a reviewed
-// path-and-fingerprint decision instead of a global clone-count waiver.
-const providerAllowlist = new Set();
+// The Object graph cleanup was deliberately bounded to eight oracle modules.
+// Adjacent pre-existing copies stay explicit as path-and-fingerprint
+// exceptions, so the gate still rejects any new copy and detects stale entries.
+const helperAllowlist = new Set([
+  "tests/oracle/collections/oracle_map.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/collections/oracle_set.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/collections/oracle_weak_collections.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/errors/oracle_errors.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/function_semantics/oracle_function_prototype_prefix.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/global/oracle_global_numeric_predicates.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/global/oracle_global_uri_codecs.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/number/oracle_number_constructor_conversion.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/object/oracle_object_group_by.rs\u00002ecb9b416736102f1170cfa102c85182007491633a58badf2c1677354d8fa244",
+  "tests/oracle/object/oracle_object_group_by.rs\u00003da3ed15c59afc7ed8c28f61354fa7f1ad406d948f45faa8d6989b5805fbeec7",
+  "tests/oracle/object/oracle_object_group_by.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/object/oracle_object_group_by.rs\u0000174e66d9def3034c785ba13ce8818d1a4b6132fa1aa62f3956f8a870a18c6690",
+  "tests/oracle/object/oracle_object_group_by.rs\u0000ae3af224efe82f1d4d7b2adf0ac80991c51681123f90bc2ed647e15b29c3832d",
+  "tests/oracle/object/oracle_object_group_by.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/object/oracle_object_intrinsic.rs\u00002ecb9b416736102f1170cfa102c85182007491633a58badf2c1677354d8fa244",
+  "tests/oracle/object/oracle_object_intrinsic.rs\u00005d9661cb5d6d4945fe9108896091b79c50bcf99ec24a535d745088a4bd150a86",
+  "tests/oracle/object/oracle_object_intrinsic.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/string/oracle_string_index_search.rs\u0000ae3af224efe82f1d4d7b2adf0ac80991c51681123f90bc2ed647e15b29c3832d",
+  "tests/oracle/string/oracle_string_index_search.rs\u0000174e66d9def3034c785ba13ce8818d1a4b6132fa1aa62f3956f8a870a18c6690",
+  "tests/oracle/string/oracle_string_index_search.rs\u0000c09ce90549ab8e65e6a88c4f7261c5ec6e7aa8a11bee43106b827b8823bc1377",
+  "tests/oracle/string/oracle_string_index_search.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/string/oracle_string_intrinsic.rs\u00003da3ed15c59afc7ed8c28f61354fa7f1ad406d948f45faa8d6989b5805fbeec7",
+  "tests/oracle/string/oracle_string_intrinsic.rs\u0000c09ce90549ab8e65e6a88c4f7261c5ec6e7aa8a11bee43106b827b8823bc1377",
+  "tests/oracle/string/oracle_string_intrinsic.rs\u0000decb1b0e66595c263bc68421bb9797396e381256f18cfb9bf9892c576822ad4a",
+  "tests/oracle/string/oracle_string_split.rs\u0000174e66d9def3034c785ba13ce8818d1a4b6132fa1aa62f3956f8a870a18c6690",
+  "tests/oracle_math_intrinsic.rs\u00002ecb9b416736102f1170cfa102c85182007491633a58badf2c1677354d8fa244",
+]);
 
 runCanaries();
 
 const providers = loadProviders();
 const tombstones = loadTombstones();
 const consumerFiles = collectConsumerFiles();
 const functions = consumerFiles.flatMap((path) => scanFile(path));
+runAllowlistMultiplicityCanary(functions, providers, tombstones);
 const failures = checkFunctions(functions, providers, tombstones);
 
 if (options.report) {
@@ -283,15 +339,16 @@ function scanFile(path) {
 
 function checkFunctions(functions, providers, tombstones) {
   const failures = [];
-  const usedAllowlist = new Set();
+  const allowlistUseCounts = new Map();
   for (const helper of functions) {
     const displayPath = display(helper.path);
+    const allowlistKey = `${displayPath}\0${helper.fingerprint}`;
+    const allowlisted = helperAllowlist.has(allowlistKey);
+    let protectedHelper = false;
     const providersForFingerprint = providers.get(helper.fingerprint);
     if (providersForFingerprint !== undefined) {
-      const allowlistKey = `${displayPath}\0${helper.fingerprint}`;
-      if (providerAllowlist.has(allowlistKey)) {
-        usedAllowlist.add(allowlistKey);
-      } else {
+      protectedHelper = true;
+      if (!allowlisted) {
         const providerNames = providersForFingerprint
           .map((provider) => provider.name)
           .sort()
@@ -305,22 +362,56 @@ function checkFunctions(functions, providers, tombstones) {
     }
     const tombstone = tombstones.get(helper.fingerprint);
     if (tombstone !== undefined) {
-      failures.push(
-        `${displayPath}:${helper.line} restores retired ${tombstone.label} ` +
-          `(from ${tombstone.origin}); use ${tombstone.replacement}`,
+      protectedHelper = true;
+      if (!allowlisted) {
+        failures.push(
+          `${displayPath}:${helper.line} restores retired ${tombstone.label} ` +
+            `(from ${tombstone.origin}); use ${tombstone.replacement}`,
+        );
+      }
+    }
+    if (allowlisted && protectedHelper) {
+      allowlistUseCounts.set(
+        allowlistKey,
+        (allowlistUseCounts.get(allowlistKey) ?? 0) + 1,
       );
     }
   }
-  for (const allowlistKey of providerAllowlist) {
-    if (!usedAllowlist.has(allowlistKey)) {
+  for (const allowlistKey of helperAllowlist) {
+    const useCount = allowlistUseCounts.get(allowlistKey) ?? 0;
+    if (useCount === 0) {
+      failures.push(
+        `stale shared-helper allowlist entry: ${allowlistKey.replace("\0", " ")}`,
+      );
+    } else if (useCount !== 1) {
       failures.push(
-        `stale shared-provider allowlist entry: ${allowlistKey.replace("\0", " ")}`,
+        `shared-helper allowlist multiplicity drift: ` +
+          `${allowlistKey.replace("\0", " ")} expected=1 actual=${useCount}`,
       );
     }
   }
   return failures.sort();
 }
 
+function runAllowlistMultiplicityCanary(functions, providers, tombstones) {
+  const [allowlistKey] = helperAllowlist;
+  const helper = functions.find(
+    (candidate) =>
+      `${display(candidate.path)}\0${candidate.fingerprint}` === allowlistKey,
+  );
+  if (helper === undefined) {
+    fail("allowlist multiplicity canary could not find its protected helper");
+  }
+  const failures = checkFunctions([helper, helper], providers, tombstones);
+  if (
+    !failures.some((failure) =>
+      failure.startsWith("shared-helper allowlist multiplicity drift:"),
+    )
+  ) {
+    fail("allowlist multiplicity canary accepted a second protected helper copy");
+  }
+}
+
 function printCensus(functions, consumerFiles, providers, tombstones) {
   const groups = new Map();
   for (const helper of functions) {

tests/oracle.rs

@@ -1,5 +1,7 @@
 // Keep this registry sorted by wrapper path; the test262 aliases intentionally
 // differ from their filenames so one filter selects the feature-gated host tests.
+#[path = "support/object_graph_observation.rs"]
+mod object_graph_observation;
 #[path = "support/quickjs_argv_completion_oracle.rs"]
 mod quickjs_argv_completion_oracle;
 #[path = "support/quickjs_array_completion_oracle.rs"]

tests/oracle/object/oracle_object_assign.rs

@@ -1,3 +1,7 @@
+use crate::object_graph_observation::{
+    data_bits, data_descriptor, eval_object, global_callable, int_property, intrinsic_prototype,
+    oracle_lines, own_key_names,
+};
 use crate::quickjs_oracle::observe_completion as observe_oracle;
 use crate::runtime_completion_oracle::compare_eval_completion_cases as compare_cases;
 use crate::runtime_observation::{
@@ -6,10 +10,7 @@ use crate::runtime_observation::{
 use crate::runtime_oracle::value_type;
 use std::ffi::OsStr;
 
-use quickjs_oxide::{
-    CallableRef, CompleteOrdinaryPropertyDescriptor, Context, JsString, ObjectRef, PropertyKey,
-    Runtime, RuntimeError, Value,
-};
+use quickjs_oxide::{JsString, Runtime, RuntimeError, Value};
 
 // Pins QuickJS 2026-06-04 `js_object_assign` and `JS_CopyDataProperties`.
 // Ordinary sources use QuickJS's enumerable-at-snapshot optimization; Proxy
@@ -707,98 +708,3 @@ fn rust_graph_observations() -> Vec<String> {
 fn oracle_graph_observations(oracle: &OsStr) -> Vec<String> {
     oracle_lines(oracle, GRAPH_ORACLE, "Object.assign graph")
 }
-
-fn oracle_lines(oracle: &OsStr, source: &str, description: &str) -> Vec<String> {
-    super::quickjs_oracle::eval_std_lines(oracle, source, description)
-}
-
-fn global_callable(runtime: &Runtime, context: &mut Context, name: &str) -> CallableRef {
-    let global = context.global_object().unwrap();
-    property_callable(runtime, context, &global, name)
-}
-
-fn intrinsic_prototype(
-    runtime: &Runtime,
-    context: &mut Context,
-    constructor_name: &str,
-) -> ObjectRef {
-    let constructor = global_callable(runtime, context, constructor_name);
-    let Value::Object(prototype) = context
-        .get_property(
-            constructor.as_object(),
-            &runtime.intern_property_key("prototype").unwrap(),
-        )
-        .unwrap()
-    else {
-        panic!("{constructor_name}.prototype was not an object");
-    };
-    prototype
-}
-
-fn eval_object(context: &mut Context, source: &str) -> ObjectRef {
-    let Value::Object(object) = context.eval(source).unwrap() else {
-        panic!("{source:?} did not evaluate to an object");
-    };
-    object
-}
-
-fn own_key_names(runtime: &Runtime, object: &ObjectRef) -> Vec<String> {
-    runtime
-        .own_property_keys(object)
-        .unwrap()
-        .into_iter()
-        .map(|key| {
-            runtime
-                .property_key_to_js_string(&key)
-                .unwrap()
-                .to_utf8_lossy()
-        })
-        .collect()
-}
-
-fn data_descriptor(
-    runtime: &Runtime,
-    object: &ObjectRef,
-    key: &PropertyKey,
-) -> (Value, bool, bool, bool) {
-    let CompleteOrdinaryPropertyDescriptor::Data {
-        value,
-        writable,
-        enumerable,
-        configurable,
-    } = runtime
-        .get_own_property(object, key)
-        .unwrap()
-        .expect("missing data descriptor")
-    else {
-        panic!("property was not a data descriptor");
-    };
-    (value, writable, enumerable, configurable)
-}
-
-fn int_property(runtime: &Runtime, context: &mut Context, object: &ObjectRef, name: &str) -> i32 {
-    let Value::Int(value) = context
-        .get_property(object, &runtime.intern_property_key(name).unwrap())
-        .unwrap()
-    else {
-        panic!("{name} was not an Int property");
-    };
-    value
-}
-
-fn data_bits(writable: bool, enumerable: bool, configurable: bool) -> String {
-    format!(
-        "D:{}{}{}",
-        Number(writable),
-        Number(enumerable),
-        Number(configurable),
-    )
-}
-
-struct Number(bool);
-
-impl std::fmt::Display for Number {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        formatter.write_str(if self.0 { "1" } else { "0" })
-    }
-}