Update expansion to use array forms for various keywords when framing.

Update framing for graphs and _filterSubject logic.

Author: gkellogg

lib/expand.js

@@ -8,6 +8,7 @@ const JsonLdError = require('./JsonLdError');
 const {
   isArray: _isArray,
   isObject: _isObject,
+  isEmptyObject: _isEmptyObject,
   isString: _isString
 } = require('./types');
 
@@ -31,7 +32,8 @@ const {
 
 const {
   addValue: _addValue,
-  validateTypeValue: _validateTypeValue
+  validateTypeValue: _validateTypeValue,
+  getValues: _getValues
 } = require('./util');
 
 const api = {};
@@ -206,8 +208,11 @@ api.expand = ({
         'which can be "@type" or "@language".',
         'jsonld.SyntaxError', {code: 'invalid value object', element: rval});
     }
+    const values = rval['@value'] === null ? [] : [].concat(rval['@value']);
+    const types = _getValues(rval, '@type');
+
     // drop null @values unless custom mapped
-    if(rval['@value'] === null) {
+    if(values.length === 0) {
       // TODO: use `await` to support async
       const mapped = expansionMap({
         unmappedValue: rval,
@@ -222,15 +227,16 @@ api.expand = ({
       } else {
         rval = null;
       }
-    } else if('@language' in rval && !_isString(rval['@value'])) {
+    } else if(!values.every(v => (_isString(v) || _isEmptyObject(v))) && '@language' in rval) {
       // if @language is present, @value must be a string
       throw new JsonLdError(
         'Invalid JSON-LD syntax; only strings may be language-tagged.',
         'jsonld.SyntaxError',
         {code: 'invalid language-tagged value', element: rval});
-    } else if('@type' in rval && (!_isAbsoluteIri(rval['@type']) ||
-      rval['@type'].indexOf('_:') === 0)) {
-      throw new JsonLdError(
+    } else if(!types.every(t =>
+        (_isAbsoluteIri(t) && !(_isString(t) && t.indexOf('_:') === 0) ||
+        _isEmptyObject(t)))) {
+          throw new JsonLdError(
         'Invalid JSON-LD syntax; an element containing "@value" and "@type" ' +
         'must have an absolute IRI for the value of "@type".',
         'jsonld.SyntaxError', {code: 'invalid typed value', element: rval});
@@ -373,22 +379,50 @@ function _expandObject({
     }
 
     // syntax error if @id is not a string
-    if(expandedProperty === '@id' && !_isString(value)) {
-      if(!options.isFrame) {
-        throw new JsonLdError(
-          'Invalid JSON-LD syntax; "@id" value must a string.',
-          'jsonld.SyntaxError', {code: 'invalid @id value', value: value});
-      }
-      if(!_isObject(value)) {
-        throw new JsonLdError(
-          'Invalid JSON-LD syntax; "@id" value must be a string or an ' +
-          'object.', 'jsonld.SyntaxError',
-          {code: 'invalid @id value', value: value});
+    if(expandedProperty === '@id') {
+      if(!_isString(value)) {
+        if(!options.isFrame) {
+          throw new JsonLdError(
+            'Invalid JSON-LD syntax; "@id" value must a string.',
+            'jsonld.SyntaxError', {code: 'invalid @id value', value: value});
+        }
+        if(_isObject(value)) {
+          // empty object is a wildcard
+          if(!_isEmptyObject(value)) {
+            throw new JsonLdError(
+              'Invalid JSON-LD syntax; "@id" value an empty object or array of strings, if framing',
+              'jsonld.SyntaxError', {code: 'invalid @id value', value: value});
+          }
+        } else if(_isArray(value)) {
+          if(!value.every(v => _isString(v))) {
+            throw new JsonLdError(
+              'Invalid JSON-LD syntax; "@id" value an empty object or array of strings, if framing',
+              'jsonld.SyntaxError', {code: 'invalid @id value', value: value});
+          }
+        } else {
+            throw new JsonLdError(
+              'Invalid JSON-LD syntax; "@id" value an empty object or array of strings, if framing',
+              'jsonld.SyntaxError', {code: 'invalid @id value', value: value});
+        }
       }
+
+      _addValue(
+        expandedParent, '@id',
+        [].concat(value).map(v => _isString(v) ? _expandIri(activeCtx, v, {base: true}) : v),
+        {propertyIsArray: options.isFrame});
+      continue;
     }
 
     if(expandedProperty === '@type') {
       _validateTypeValue(value);
+      _addValue(
+        expandedParent, '@type',
+        [].concat(value).map(v =>
+          _isString(v) ?
+          _expandIri(activeCtx, v, {base: true, vocab: true}) :
+          v),
+        {propertyIsArray: options.isFrame});
+      continue;
     }
 
     // @graph must be an array or an object
@@ -400,14 +434,19 @@ function _expandObject({
         'jsonld.SyntaxError', {code: 'invalid @graph value', value: value});
     }
 
-    // @value must not be an object or an array
-    if(expandedProperty === '@value' &&
-      (_isObject(value) || _isArray(value))) {
-      throw new JsonLdError(
-        'Invalid JSON-LD syntax; "@value" value must not be an ' +
-        'object or an array.',
-        'jsonld.SyntaxError',
-        {code: 'invalid value object value', value: value});
+    // @value must not be an object or an array (unless framing)
+    if(expandedProperty === '@value') {
+      if((_isObject(value) || _isArray(value)) && !options.isFrame) {
+        throw new JsonLdError(
+          'Invalid JSON-LD syntax; "@value" value must not be an ' +
+          'object or an array.',
+          'jsonld.SyntaxError',
+          {code: 'invalid value object value', value: value});
+      }
+
+      _addValue(
+        expandedParent, '@value', value, {propertyIsArray: options.isFrame});
+      continue;
     }
 
     // @language must be a string
@@ -416,14 +455,18 @@ function _expandObject({
         // drop null @language values, they expand as if they didn't exist
         continue;
       }
-      if(!_isString(value)) {
+      if(!_isString(value) && !options.isFrame) {
         throw new JsonLdError(
           'Invalid JSON-LD syntax; "@language" value must be a string.',
           'jsonld.SyntaxError',
           {code: 'invalid language-tagged string', value: value});
       }
       // ensure language value is lowercase
       value = value.toLowerCase();
+
+      _addValue(
+        expandedParent, '@language', value, {propertyIsArray: options.isFrame});
+      continue;
     }
 
     // @index must be a string
@@ -434,6 +477,8 @@ function _expandObject({
           'jsonld.SyntaxError',
           {code: 'invalid @index value', value: value});
       }
+      _addValue(expandedParent, '@index', value);
+      continue;
     }
 
     // @reverse must be an object