Improve remote document retrieval

.github/workflows/swift.yml

@@ -120,6 +120,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.9
     needs: install-swiftly
     with:
+      api_breakage_check_allowlist_path: "api-breakages.txt"
       api_breakage_check_container_image: "swift:${{ needs.install-swiftly.outputs.current_version }}-noble"
       docs_check_enabled: false
       format_check_container_image: "swift:${{ needs.install-swiftly.outputs.current_version }}-noble"

Sources/JSONLD/Algorithms/ExpansionAlgorithm.swift

@@ -13,7 +13,7 @@ struct ExpansionAlgorithm {
 
   static func run(
     _ input: Input,
-    loader: any JSONLDDocumentLoader
+    loader: (any JSONLDDocumentLoader)?
   ) async throws(JSONLDError) -> JSONLDValues<Expanded> {
     _ = input.normative
 

Sources/JSONLD/Context/ContextResolver.swift

@@ -78,17 +78,11 @@ struct ContextResolver {
         )
       }
 
-      let result = await loader.load(url: resolvedIRI)
-      let remoteDocument: RemoteDocument =
-        switch result {
-        case .success(let doc):
-          doc
-        case .failure(let error):
-          throw .code(
-            .loadingRemoteContextFailed,
-            debugInfo: .init(url: resolvedIRI, message: String(describing: error))
-          )
-        }
+      let remoteDocument = try await RemoteDocument.load(
+        url: resolvedIRI,
+        using: loader,
+        requestProfile: RemoteDocument.contextProfile
+      )
 
       guard case .object(let object) = remoteDocument.document,
         let innerContext = object[.context]
@@ -101,11 +95,15 @@ struct ContextResolver {
       var subContext = activeContext
       subContext.baseIRI = remoteDocument.documentURL
 
+      let previousBaseIRI = activeContext.baseIRI
+      let previousOriginalBaseIRI = activeContext.originalBaseIRI
       activeContext = try await self.process(
         contexts: remoteContext,
         activeContext: subContext,
         remoteContexts: updatedRemoteContexts
       )
+      activeContext.baseIRI = previousBaseIRI
+      activeContext.originalBaseIRI = previousOriginalBaseIRI
 
     case .contextDefinition(let definition):
       try self.apply(contextDefinition: definition, to: &activeContext)

Sources/JSONLD/Context/Contexts.swift

@@ -53,11 +53,7 @@ extension Contexts: ExpressibleByNilLiteral {
 extension Contexts: ExpressibleByStringLiteral {
   /// Creates a context literal from an IRI string.
   public init(stringLiteral value: String) {
-    do {
-      self = .single(try .init(iri: value))
-    } catch {
-      preconditionFailure("Invalid @context literal: \(error)")
-    }
+    self = .single(.init(iri: value))
   }
 }
 
@@ -75,6 +71,21 @@ extension Contexts: ExpressibleByDictionaryLiteral {
   }
 }
 
+extension Contexts {
+  static func + (lhs: Self, rhs: Self) -> Self {
+    switch (lhs, rhs) {
+    case (.null, .null): .null
+    case (.null, let context), (let context, .null): context
+
+    case (.single(let lhsElement), .single(let rhsElement)): .array([lhsElement, rhsElement])
+
+    case (.array(let lhsElements), .single(let rhsElement)): .array(lhsElements + [rhsElement])
+    case (.single(let lhsElement), .array(let rhsElements)): .array([lhsElement] + rhsElements)
+    case (.array(let lhsElements), .array(let rhsElements)): .array(lhsElements + rhsElements)
+    }
+  }
+}
+
 extension Contexts {
   /// A single `@context` element.
   public enum Element: CustomJSONValueConvertible, Equatable, Sendable {
@@ -87,11 +98,7 @@ extension Contexts {
 extension Contexts.Element: ExpressibleByStringLiteral {
   /// Creates a context element literal from an IRI string.
   public init(stringLiteral value: String) {
-    do {
-      try self.init(iri: value)
-    } catch {
-      preconditionFailure("Invalid @context literal: \(error)")
-    }
+    self.init(iri: value)
   }
 }
 
@@ -111,7 +118,7 @@ extension Contexts.Element {
     }
   }
 
-  init(iri value: String) throws(JSONLDError) {
+  init(iri value: String) {
     self =
       if value.contains(":") {
         .absoluteIRI(value)
@@ -130,7 +137,7 @@ extension Contexts.Element {
     self =
       switch jsonValue {
       case .object(let jsonObject): try .init(from: jsonObject)
-      case .string(let value): try .init(iri: value)
+      case .string(let value): .init(iri: value)
       default: throw .code(.invalidLocalContext)
       }
   }