Changed framing defaults and handle omitGraph.

- Changed framing defaults
  - `embed` to "@once" and warn on "@FIRST" or "@last".
  - `pruneBlankNodeIdentifiers` based on processingMode.
  - `omitGraph` based on processingMode.
- Top level `@graph` omitted if `omitGraph` is `true`.

Author: gkellogg

CHANGELOG.md

@@ -22,6 +22,10 @@
 - **NOTE**: `LINK_HEADER_REL` in `lib/constants.js` has been deprecated and
   renamed to `LINK_HEADER_CONTEXT`. It remains for now but will be removed in a
   future release.
+- Changed framing defaults
+  - `embed` to "@once" and warn on "@first" or "@last".
+  - `pruneBlankNodeIdentifiers` based on processingMode.
+  - `omitGraph` based on processingMode.
 
 ### Added
 - Support for `"@import"`.
@@ -30,6 +34,7 @@
 - Support for expansion and compaction of values container `"@direction"`.
 - Support for RDF transformation of `@direction` when `rdfDirection` is
   'i18n-datatype'.
+- Top level `@graph` omitted if `omitGraph` is `true`. 
 
 ## 2.0.2 - 2020-01-17
 

lib/jsonld.js

@@ -62,8 +62,10 @@ const {
 } = require('./graphTypes');
 
 const {
+  expandIri: _expandIri,
   getInitialContext: _getInitialContext,
-  process: _processContext
+  process: _processContext,
+  processingMode: _processingMode
 } = require('./context');
 
 const {
@@ -223,6 +225,12 @@ jsonld.compact = async function(input, ctx, options) {
     ctx = ctx[0];
   }
 
+  if(options.framing) {
+    // remove @preserve from results
+    options.link = {};
+    compacted = _removePreserve(activeCtx, compacted, options);
+  }
+
   // add context and/or @graph
   if(_isArray(compacted)) {
     // use '@graph' keyword
@@ -244,16 +252,6 @@ jsonld.compact = async function(input, ctx, options) {
     }
   }
 
-  if(options.framing) {
-    // get graph alias
-    const graph = _compactIri({
-      activeCtx, iri: '@graph', relativeTo: {vocab: true}
-    });
-    // remove @preserve from results
-    options.link = {};
-    compacted[graph] = _removePreserve(activeCtx, compacted[graph], options);
-  }
-
   return compacted;
 };
 
@@ -435,11 +433,10 @@ jsonld.frame = async function(input, frame, options) {
   // set default options
   options = _setDefaults(options, {
     base: _isString(input) ? input : '',
-    embed: '@last',
+    embed: '@once',
     explicit: false,
-    requireAll: true,
+    requireAll: false,
     omitDefault: false,
-    pruneBlankNodeIdentifiers: true,
     bnodesToClear: [],
     contextResolver: new ContextResolver(
       {sharedCache: _resolvedContextCache})
@@ -467,6 +464,24 @@ jsonld.frame = async function(input, frame, options) {
 
   const frameContext = frame ? frame['@context'] || {} : {};
 
+  // process context
+  const activeCtx = await jsonld.processContext(
+    _getInitialContext(options), frameContext, options);
+
+  // mode specific defaults
+  if(!options.hasOwnProperty('omitGraph')) {
+    options.omitGraph = _processingMode(activeCtx, 1.1);
+  }
+  if(!options.hasOwnProperty('pruneBlankNodeIdentifiers')) {
+    options.pruneBlankNodeIdentifiers = _processingMode(activeCtx, 1.1);
+  }
+  if((options.embed === '@first' || options.embed === '@last') &&
+    _processingMode(activeCtx, 1.1))
+  {
+    console.warn(`WARNING: ${options.embed} is not a valid value ` +
+      `of @embed in 1.1 mode.`);
+  }
+
   // expand input
   const expanded = await jsonld.expand(input, options);
 
@@ -478,14 +493,13 @@ jsonld.frame = async function(input, frame, options) {
 
   // if the unexpanded frame includes a key expanding to @graph, frame the
   // default graph, otherwise, the merged graph
-  // FIXME should look for aliases of @graph
-  opts.merged = !('@graph' in frame);
+  const frameKeys = Object.keys(frame)
+    .map(key => _expandIri(activeCtx, key, {vocab: true}));
+  opts.merged = !frameKeys.includes('@graph');
   // do framing
   const framed = _frameMergedOrDefault(expanded, expandedFrame, opts);
 
-  // compact result (force @graph option to true, skip expansion,
-  // check for linked embeds)
-  opts.graph = true;
+  opts.graph = !options.omitGraph;
   opts.skipExpansion = true;
   opts.link = {};
   opts.framing = true;

tests/misc.js

@@ -22,7 +22,6 @@ describe('link tests', () => {
     p.catch(e => {
       assert.ifError(e);
     }).then(output => {
-      output = output['@graph'][0];
       assert.equal(output, output['a:foo']);
       done();
     });
@@ -453,13 +452,9 @@ describe('js keywords', () => {
   "@context": {
     "@vocab": "http://example.org/"
   },
-  "@graph": [
-    {
-      "toString": {
-        "valueOf": "thing"
-      }
-    }
-  ]
+  "toString": {
+    "valueOf": "thing"
+  }
 }
 ;
     const e = await jsonld.frame(d, frame);

tests/test-common.js

@@ -126,8 +126,6 @@ const TEST_TYPES = {
       specVersion: ['json-ld-1.0'],
       // FIXME
       idRegex: [
-        // ex
-        /frame-manifest.jsonld#tg001$/,
         // graphs
         /frame-manifest.jsonld#t0011$/,
         /frame-manifest.jsonld#t0010$/,
@@ -177,12 +175,8 @@ const TEST_TYPES = {
         // lists
         /frame-manifest.jsonld#t0055$/,
         /frame-manifest.jsonld#t0058$/,
-        // misc
-        /frame-manifest.jsonld#tp010$/,
-        /frame-manifest.jsonld#tp050$/,
-        /frame-manifest.jsonld#teo01$/,
+        // @preserve and @container: @set
         /frame-manifest.jsonld#t0062$/,
-        /frame-manifest.jsonld#t0063$/,
         // @embed:@first
         /frame-manifest.jsonld#t0060$/,
         // requireAll