added composition test

Author: bjdmeest

package-lock.json

@@ -23,6 +23,7 @@
     "left-pad": "^1.3.0",
     "mkdirp": "^0.5.1",
     "n3": "^1.1.1",
+    "node-resolve-dependency-graph": "^1.3.7",
     "npm-programmatic": "0.0.10",
     "php-parser": "^3.0.0-prerelease.8",
     "rdflib": "^2.1.6",

package.json

@@ -2,9 +2,6 @@ import { expect } from 'chai';
 import { FunctionHandler } from "./FunctionHandler";
 import { } from 'mocha';
 import { JavaScriptHandler } from './handlers/JavaScriptHandler';
-import { Argument, Function, Implementation } from './models';
-import { namedNode } from 'rdflib';
-import { Term } from 'rdf-js';
 import prefixes from './prefixes';
 
 const fnTtl = `@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -30,22 +27,13 @@ fns:bParameter rdf:type fno:Parameter ;
 
 fns:sumOutput rdf:type fno:Output ;
         rdfs:label "sum output"@en ;
-        fno:predicate fno:Result .
+        fno:predicate fns:out .
 
 fns:sum rdf:type fno:Function ;
         dcterms:description "Description of the sum function"@en ;
         rdfs:label "sum"@en ;
-        fno:expects _:g0 ;
-        fno:returns _:g2 .
-
-_:g0 rdf:first fns:aParameter ;
-        rdf:rest _:g1 .
-
-_:g1 rdf:first fns:bParameter ;
-        rdf:rest rdf:nil .
-
-_:g2 rdf:first fns:sumOutput ;
-        rdf:rest rdf:nil .
+        fno:expects ( fns:aParameter fns:bParameter ) ;
+        fno:returns ( fns:sumOutput ) .
 
 fns:sumImplementation rdf:type fno:Implementation, fnoi:JavaScriptImplementation, fnoi:JavaScriptFunction ;
         doap:release fns:sumImplementationRelease .
@@ -69,11 +57,91 @@ fns:bParametermapping rdf:type fno:ParameterMapping, fnom:PositionParameterMappi
         fnom:functionParameter fns:bParameter ;
         fnom:implementationParameterPosition "1"^^xsd:integer .
 
-fns:sumReturnMapping rdf:type fno:ReturnMapping, fnom:DefaultReturnMapping .
+fns:sumReturnMapping rdf:type fno:ReturnMapping, fnom:DefaultReturnMapping ;
+        fnom:functionOutput fns:sumOutput .
 
 fns:sumMethodMapping rdf:type fno:MethodMapping, fnom:StringMethodMapping ;
         fnom:method-name "sum" .
 `;
+const fnTtlComposition = `
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix ex: <http://www.example.com#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix doap: <http://usefulinc.com/ns/doap#> .
+@prefix fno: <https://w3id.org/function/ontology#> .
+@prefix fnoi: <https://w3id.org/function/vocabulary/implementation#> .
+@prefix fnom: <https://w3id.org/function/vocabulary/mapping#> .       
+@prefix fns: <http://example.com/functions#> .
+@prefix fnoc: <https://w3id.org/function/vocabulary/composition#> .
+
+fns:sum3 rdf:type fno:Function ;
+    dcterms:description "Description of the sum3 function"@en ;
+    rdfs:label "sum3"@en ;
+    fno:expects ( fns:aParameter fns:bParameter fns:cParameter ) ;
+    fno:returns ( fns:sumOutput ) .
+
+fns:cParameter rdf:type fno:Parameter ;
+    rdfs:label "c"@en ;
+    fno:predicate fns:c ;
+    fno:required "true"^^xsd:boolean .
+
+fns:sum3_1 fnoc:applies fns:sum .
+fns:sum3_2 fnoc:applies fns:sum .
+
+fns:sum3Composition rdf:type fnoc:Composition ;   
+    fnoc:composedOf [
+        fnoc:mapFrom [
+            fnoc:constituentFunction fns:sum3;
+            fnoc:functionParameter fns:aParameter 
+        ] ;
+        fnoc:mapTo [
+            fnoc:constituentFunction fns:sum3_1;
+            fnoc:functionParameter fns:aParameter
+        ] 
+    ],
+    [
+        fnoc:mapFrom [
+            fnoc:constituentFunction fns:sum3;
+            fnoc:functionParameter fns:bParameter 
+        ] ;
+        fnoc:mapTo [
+            fnoc:constituentFunction fns:sum3_1;
+            fnoc:functionParameter fns:bParameter
+        ] 
+    ],
+    [
+        fnoc:mapFrom [
+            fnoc:constituentFunction fns:sum3_1;
+            fnoc:functionOutput fns:sumOutput 
+        ] ;
+        fnoc:mapTo [
+            fnoc:constituentFunction fns:sum3_2;
+            fnoc:functionParameter fns:aParameter
+        ] 
+    ],
+    [
+        fnoc:mapFrom [
+            fnoc:constituentFunction fns:sum3;
+            fnoc:functionParameter fns:cParameter  
+        ] ;
+        fnoc:mapTo [
+            fnoc:constituentFunction fns:sum3_2;
+            fnoc:functionParameter fns:bParameter
+        ] 
+    ],
+    [
+        fnoc:mapFrom [
+            fnoc:constituentFunction fns:sum3_2;
+            fnoc:functionOutput fns:sumOutput 
+        ] ;
+        fnoc:mapTo [
+            fnoc:constituentFunction fns:sum3;
+            fnoc:functionOutput fns:sumOutput 
+        ] 
+    ] .
+`;
 
 describe('FunctionHandler tests', () => { // the tests container
         it.skip('can parse a function file', async () => { // the single test
@@ -99,15 +167,38 @@ describe('FunctionHandler tests', () => { // the tests container
                 expect(fn.id).to.equal(`${prefixes.fns}sum`)
 
                 const jsHandler = new JavaScriptHandler();
-                jsHandler.loadFunction(new Implementation(namedNode(`${prefixes.fns}sumImplementation`) as Term), (a, b) => a + b)
+                handler.implementationHandler.loadImplementation(`${prefixes.fns}sumImplementation`, jsHandler, {fn: (a, b) => a + b})
+                const result = await handler.executeFunction(fn, {
+                        [`${prefixes.fns}a`]: 1,
+                        [`${prefixes.fns}b`]: 2
+                })
+
+                expect(result[`${prefixes.fns}out`]).to.equal(3);
+                return;
+        })
+
+        it('can load a local file, add a handler, compose, and execute a function', async () => {
+                const handler = new FunctionHandler();
+                await handler.addFunctionResource(`${prefixes.fns}sum3`, {
+                        type: 'string',
+                        contents: fnTtl + fnTtlComposition,
+                        contentType: "text/turtle"
+                });
+                const fn = await handler.getFunction(`${prefixes.fns}sum3`);
 
-                handler.addHandler(jsHandler);
-                const result = await handler.executeFunction(fn, [
-                        new Argument(`${prefixes.fns}aParameter`, 1),
-                        new Argument(`${prefixes.fns}bParameter`, 1),
-                ])
+                expect(fn).to.be.not.null;
+
+                expect(fn.id).to.equal(`${prefixes.fns}sum3`)
 
-                expect(result).to.equal(2);
+                const jsHandler = new JavaScriptHandler();
+                handler.implementationHandler.loadImplementation(`${prefixes.fns}sumImplementation`, jsHandler, {fn: (a, b) => a + b})
+                const result = await handler.executeFunction(fn, {
+                        [`${prefixes.fns}a`]: 1,
+                        [`${prefixes.fns}b`]: 2,
+                        [`${prefixes.fns}c`]: 3,
+                })
+
+                expect(result[`${prefixes.fns}out`]).to.equal(6);
                 return;
         })
 });