Revert "Allow hash keys to be URIs that dereference to a string"

This reverts commit b35b725.

Author: rubensworks

lib/construction/argument/ArgumentConstructorHandlerHash.ts

@@ -29,16 +29,14 @@ export class ArgumentConstructorHandlerHash implements IArgumentConstructorHandl
       if (!entry.property.key) {
         throw new ErrorResourcesContext(`Missing key in fields entry`, { entry, argument });
       }
-
-      const key = await argsCreator.getArgumentValues(entry.properties.key, settings);
-      if (typeof key !== 'string') {
-        throw new ErrorResourcesContext(`Illegal non-string key (${entry.property.key.value} as ${entry.property.key.type}) in fields entry`, { entry, argument });
+      if (entry.property.key.type !== 'Literal') {
+        throw new ErrorResourcesContext(`Illegal non-literal key (${entry.property.key.value} as ${entry.property.key.type}) in fields entry`, { entry, argument });
       }
 
       // Recursively get value arg value
       if (entry.property.value) {
         const subValue = await argsCreator.getArgumentValues(entry.properties.value, settings);
-        return { key, value: subValue };
+        return { key: entry.property.key.value, value: subValue };
       }
 
       // Ignore cases where value may not be set, because params may be optional

test/unit/construction/ConfigConstructor-test.ts

@@ -12,7 +12,7 @@ const DF = new DataFactory();
 describe('ConfigConstructor', () => {
   let objectLoader: RdfObjectLoader;
   let componentResources: Record<string, Resource>;
-  let configConstructorPool: jest.Mocked<ConfigConstructorPool<any>>;
+  let configConstructorPool: ConfigConstructorPool<any>;
   let constructor: ConfigConstructor<any>;
   let constructionStrategy: IConstructionStrategy<any>;
   let moduleState: IModuleState;
@@ -223,7 +223,7 @@ describe('ConfigConstructor', () => {
           .toThrowError(/^Missing key in fields entry/u);
       });
 
-      it('can use dereferenced IRI values as keys', async() => {
+      it('should throw on IRI key', async() => {
         const resource = objectLoader.createCompactedResource({
           fields: {
             list: [
@@ -234,39 +234,8 @@ describe('ConfigConstructor', () => {
             ],
           },
         });
-        expect(await constructor.getArgumentValue(resource, settings)).toEqual({
-          entries: [
-            {
-              key: 'INSTANCE',
-              value: 'ABC',
-            },
-          ],
-        });
-        expect(constructionStrategy.createHash).toHaveBeenCalledWith({
-          settings,
-          entries: [
-            {
-              key: 'INSTANCE',
-              value: 'ABC',
-            },
-          ],
-        });
-      });
-
-      it('should throw on non-string keys', async() => {
-        configConstructorPool.instantiate.mockResolvedValueOnce(new Error('this is an object'));
-        const resource = objectLoader.createCompactedResource({
-          fields: {
-            list: [
-              {
-                key: `ex:abc`,
-                value: '"ABC"',
-              },
-            ],
-          },
-        });
         await expect(constructor.getArgumentValue(resource, settings)).rejects
-          .toThrowError(/^Illegal non-string key \(ex:abc as NamedNode\) in fields entry/u);
+          .toThrowError(/^Illegal non-literal key \(ex:abc as NamedNode\) in fields entry/u);
       });
 
       it('should ignore fields without value', async() => {