When expanding Type maps, apply any context associated with the type from the map.

Author: gkellogg

lib/json/ld/expand.rb

@@ -377,8 +377,13 @@ def expand_object(input, active_property, context, output_object, ordered: false
           # For each key-value in the object:
           keys = ordered ? value.keys.sort : value.keys
           keys.each do |k|
+            # If container mapping in the active context is @type, and k is a term in the active context having a local context, use that context when expanding values
+            map_context = active_context.term_definitions[k].context if container == '@type' && active_context.term_definitions[k]
+            map_context = active_context.parse(map_context) if map_context
+            map_context ||= active_context
+            
             # Initialize index value to the result of using this algorithm recursively, passing active context, key as active property, and index value as element.
-            index_value = expand([value[k]].flatten, key, active_context, ordered: ordered)
+            index_value = expand([value[k]].flatten, key, map_context, ordered: ordered)
             #require 'byebug'; byebug
             index_value.each do |item|
               case container

spec/compact_spec.rb

@@ -1197,6 +1197,28 @@
             "c": "C in example"
           }),
         },
+        "with @container: @type" => {
+          input: %([{
+            "http://example/typemap": [
+              {"http://example.org/a": [{"@value": "Object with @type <Type>"}], "@type": ["http://example/Type"]}
+            ]
+          }]),
+          context: %({
+            "@vocab": "http://example/",
+            "typemap": {"@container": "@type"},
+            "Type": {"@context": {"a": "http://example.org/a"}}
+          }),
+          output: %({
+            "@context": {
+              "@vocab": "http://example/",
+              "typemap": {"@container": "@type"},
+              "Type": {"@context": {"a": "http://example.org/a"}}
+            },
+            "typemap": {
+              "Type": {"a": "Object with @type <Type>"}
+            }
+          })
+        },
       }.each_pair do |title, params|
         it(title) {run_compact(params)}
       end

spec/expand_spec.rb

@@ -1371,6 +1371,23 @@
             "http://example/c": [{"@value": "C in example"}]
           }])
         },
+        "with @container: @type" => {
+          input: %({
+            "@context": {
+              "@vocab": "http://example/",
+              "typemap": {"@container": "@type"},
+              "Type": {"@context": {"a": "http://example.org/a"}}
+            },
+            "typemap": {
+              "Type": {"a": "Object with @type <Type>"}
+            }
+          }),
+          output: %([{
+            "http://example/typemap": [
+              {"http://example.org/a": [{"@value": "Object with @type <Type>"}], "@type": ["http://example/Type"]}
+            ]
+          }])
+        },
       }.each do |title, params|
         it(title) {run_expand params}
       end