Fix bundling not de-duplicating equal schemas

DEPENDENCIES

@@ -1,5 +1,5 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 9eb79e6d10f9a141b214b29867f602bd3ec6202a
+core https://github.com/sourcemeta/core 6cdc6b362fef03e3efb5b674095287d983bafffa
 jsonbinpack https://github.com/sourcemeta/jsonbinpack 3898774a945ebf7392bad8a9015ead97a0518a19
 blaze https://github.com/sourcemeta/blaze a7d43ba8a4de39918f44b97602950e260809cd0d
 hydra https://github.com/sourcemeta/hydra 6e0ad118846ce57275bc7d6434f8440baae2c27e

src/resolver.h

@@ -262,7 +262,7 @@ class CustomResolver {
       sourcemeta::core::reidentify(subschema, key.second, entry.base_dialect);
 
       const auto result{this->schemas.emplace(key.second, subschema)};
-      if (!result.second && result.first->second != schema) {
+      if (!result.second && result.first->second != subschema) {
         throw sourcemeta::core::SchemaFrameError(
             key.second, "Cannot register the same identifier twice");
       }

test/CMakeLists.txt

@@ -358,6 +358,7 @@ add_jsonschema_test_unix(bundle/fail_invalid_id_type)
 add_jsonschema_test_unix(bundle/fail_invalid_schema_uri)
 add_jsonschema_test_unix(bundle/pass_config_ignore)
 add_jsonschema_test_unix(bundle/pass_ref_in_bundled_resolves_against_id)
+add_jsonschema_test_unix(bundle/pass_resolve_deduplicate_embedded)
 
 # Inspect
 add_jsonschema_test_unix(inspect/pass)

test/bundle/pass_ref_in_bundled_resolves_against_id.sh

@@ -36,16 +36,14 @@ cat << EOF > "$TMP/expected.json"
   "title": "Entry",
   "\$ref": "https://example.com/schemas/parent",
   "\$defs": {
+    "https://example.com/schemas/child": {
+      "\$id": "https://example.com/schemas/child",
+      "type": "string"
+    },
     "https://example.com/schemas/parent": {
       "\$schema": "https://json-schema.org/draft/2020-12/schema",
       "\$id": "https://example.com/schemas/parent",
-      "\$ref": "./child",
-      "\$defs": {
-        "https://example.com/schemas/child": {
-          "\$id": "https://example.com/schemas/child",
-          "type": "string"
-        }
-      }
+      "\$ref": "./child"
     }
   }
 }

test/bundle/pass_resolve_deduplicate_embedded.sh

@@ -0,0 +1,95 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/common.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/common",
+  "type": "string"
+}
+EOF
+
+cat << 'EOF' > "$TMP/a.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/a",
+  "$ref": "common",
+  "$defs": {
+    "https://example.com/common": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/common",
+      "type": "string"
+    }
+  }
+}
+EOF
+
+cat << 'EOF' > "$TMP/b.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/b",
+  "$ref": "common",
+  "$defs": {
+    "https://example.com/common": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/common",
+      "type": "string"
+    }
+  }
+}
+EOF
+
+cat << 'EOF' > "$TMP/entry.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/entry",
+  "allOf": [
+    { "$ref": "a" },
+    { "$ref": "b" }
+  ]
+}
+EOF
+
+"$1" bundle "$TMP/entry.json" \
+  --resolve "$TMP/a.json" \
+  --resolve "$TMP/b.json" > "$TMP/result.json"
+
+cat << 'EOF' > "$TMP/expected.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/entry",
+  "allOf": [
+    {
+      "$ref": "a"
+    },
+    {
+      "$ref": "b"
+    }
+  ],
+  "$defs": {
+    "https://example.com/common": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/common",
+      "type": "string"
+    },
+    "https://example.com/a": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/a",
+      "$ref": "common"
+    },
+    "https://example.com/b": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/b",
+      "$ref": "common"
+    }
+  }
+}
+EOF
+
+diff "$TMP/result.json" "$TMP/expected.json"