Create mergeNodeMapGraphs implementing the 1.1 algorithm used in framing. This leaves other versions used for merging documents, which aren't related to the spec.

Author: gkellogg

lib/frame.js

@@ -10,7 +10,7 @@ const util = require('./util');
 const JsonLdError = require('./JsonLdError');
 const {
   createNodeMap: _createNodeMap,
-  mergeNodeMaps: _mergeNodeMaps
+  mergeNodeMapGraphs: _mergeNodeMapGraphs
 } = require('./nodeMap');
 
 const api = {};
@@ -40,7 +40,7 @@ api.frameMerged = (input, frame, options) => {
   // FIXME: currently uses subjects from @merged graph only
   const issuer = new util.IdentifierIssuer('_:b');
   _createNodeMap(input, state.graphMap, '@default', issuer);
-  state.graphMap['@merged'] = _mergeNodeMaps(state.graphMap);
+  state.graphMap['@merged'] = _mergeNodeMapGraphs(state.graphMap);
   state.subjects = state.graphMap['@merged'];
 
   // frame the subjects

lib/nodeMap.js

@@ -140,8 +140,7 @@ api.createNodeMap = (input, graphs, graph, issuer, name, list) => {
       if(!(name in graphs)) {
         graphs[name] = {};
       }
-      const g = (graph === '@merged') ? graph : name;
-      api.createNodeMap(input[property], graphs, g, issuer);
+      api.createNodeMap(input[property], graphs, name, issuer);
       continue;
     }
 
@@ -209,6 +208,42 @@ api.createNodeMap = (input, graphs, graph, issuer, name, list) => {
   }
 };
 
+/**
+ * Merge separate named graphs into a single merged graph including
+ * all nodes from the default graph and named graphs.
+ *
+ * @param graphs a map of graph name to subject map.
+ *
+ * @return the merged graph map.
+ */
+api.mergeNodeMapGraphs = graphs => {
+  const merged = {};
+  for(const name of Object.keys(graphs).sort()) {
+    for(const id of Object.keys(graphs[name]).sort()) {
+      const node = graphs[name][id];
+      if(!(id in merged)) {
+        merged[id] = {'@id': id};
+      }
+      const mergedNode = merged[id];
+
+      for(const property of Object.keys(node).sort()) {
+        if(isKeyword(property)) {
+          // copy keywords
+          mergedNode[property] = util.clone(node[property]);
+        } else {
+          // merge objects
+          for(const value of node[property]) {
+            util.addValue(
+              mergedNode, property, util.clone(value), {propertyIsArray: true, allowDuplicate: false});
+          }
+        }
+      }
+    }
+  }
+
+  return merged;
+};
+
 api.mergeNodeMaps = graphs => {
   // add all non-default graphs to default graph
   const defaultGraph = graphs['@default'];

tests/test-common.js

@@ -60,7 +60,7 @@ const TEST_TYPES = {
   },
   'jld:FrameTest': {
     skip: {
-      regex: [/tp/, /t0031/, /t004[6-9]/, /t005[01]/]
+      regex: [/tp/, /t0031/, /t0051/]
     },
     fn: 'frame',
     params: [