Better frame validation.

Author: gkellogg

CHANGELOG.md

@@ -18,6 +18,7 @@
 - Handling of `@` values for `@reverse`.
 - Changes in object embedding.
 - Better support for graph framing.
+- Better frame validation.
 
 ### Changed
 - Keep term definitions mapping to null so they may be protected.

lib/frame.js

@@ -7,6 +7,7 @@ const {isKeyword} = require('./context');
 const graphTypes = require('./graphTypes');
 const types = require('./types');
 const util = require('./util');
+const url = require('./url');
 const JsonLdError = require('./JsonLdError');
 const {
   createNodeMap: _createNodeMap,
@@ -453,6 +454,32 @@ function _validateFrame(frame) {
       'Invalid JSON-LD syntax; a JSON-LD frame must be a single object.',
       'jsonld.SyntaxError', {frame});
   }
+
+  if(frame[0].hasOwnProperty('@id')) {
+    for(const id of util.asArray(frame[0]['@id'])) {
+      // @id must be wildcard or an IRI
+      if(!(types.isObject(id) || url.isAbsolute(id)) ||
+         (types.isString(id) && id.indexOf('_:') === 0))
+      {
+        throw new JsonLdError(
+          'Invalid JSON-LD syntax; invalid @id in frame.',
+          'jsonld.SyntaxError', {code: 'invalid frame', frame});
+      }
+    }
+  }
+
+  if(frame[0].hasOwnProperty('@type')) {
+    for(const type of util.asArray(frame[0]['@type'])) {
+      // @id must be wildcard or an IRI
+      if(!(types.isObject(type) || url.isAbsolute(type)) ||
+         (types.isString(type) && type.indexOf('_:') === 0))
+      {
+        throw new JsonLdError(
+          'Invalid JSON-LD syntax; invalid @type in frame.',
+          'jsonld.SyntaxError', {code: 'invalid frame', frame});
+      }
+    }
+  }
 }
 
 /**
@@ -733,7 +760,7 @@ function _cleanupPreserve(input, options) {
     }
   }
   return input;
-};
+}
 
 /**
  * Adds framing output to the given parent.

lib/jsonld.js

@@ -49,8 +49,7 @@ const {toRDF: _toRDF} = require('./toRdf');
 
 const {
   frameMergedOrDefault: _frameMergedOrDefault,
-  cleanupNull: _cleanupNull,
-  cleanupPreserve: _cleanupPreserve
+  cleanupNull: _cleanupNull
 } = require('./frame');
 
 const {
@@ -488,7 +487,7 @@ jsonld.frame = async function(input, frame, options) {
   opts.is11 = _processingMode(activeCtx, 1.1);
 
   // do framing
-  let framed = _frameMergedOrDefault(expanded, expandedFrame, opts);
+  const framed = _frameMergedOrDefault(expanded, expandedFrame, opts);
 
   opts.graph = !options.omitGraph;
   opts.skipExpansion = true;

tests/test-common.js

@@ -126,9 +126,6 @@ const TEST_TYPES = {
       specVersion: ['json-ld-1.0'],
       // FIXME
       idRegex: [
-        // blank nodes
-        /frame-manifest.jsonld#t0052$/,
-        /frame-manifest.jsonld#t0053$/,
         // lists
         /frame-manifest.jsonld#t0055$/,
         /frame-manifest.jsonld#t0058$/,