feat: all resolvers working

packages/upward-js/lib/Context.js

@@ -84,9 +84,9 @@ class Context {
         return path.getFrom(this._data);
     }
 
-    set(base, value) {
+    set(base, value, override) {
         const isSet = constants.has(base) || this._data.hasOwnProperty(base);
-        if (isSet) {
+        if (isSet && !override) {
             throw new Error(
                 `Attempted to reassign context property '${base}' to '${value}'. Context properties cannot be reassigned.`
             );

packages/upward-js/lib/ContextPath.js

@@ -1,3 +1,4 @@
+const debug = require('debug')('upward-js:ContextPath');
 const illegalPathChars = /(^\.+)|[^\.\w\/]/;
 const contextPathCache = new Map();
 class ContextPath {
@@ -45,7 +46,8 @@ class ContextPath {
     getFrom(obj) {
         let current = obj;
         for (const segment of this._segments) {
-            if (!current.hasOwnProperty(segment)) {
+            debug('traverse %o for %s', current, segment);
+            if (!current || !current.hasOwnProperty(segment)) {
                 return;
             }
             current = current[segment];

packages/upward-js/lib/ResolverVisitor.js

@@ -31,6 +31,7 @@ class ResolverVisitor {
             const definedString = defined.toString();
             debug(
                 'defined: %s is primitive, yielding to context.get("%s")',
+                definedString,
                 definedString
             );
             return this.context.get(definedString);

packages/upward-js/lib/compiledResources/index.js

@@ -1,4 +1,4 @@
-const { extname } = require('path');
+const { extname, normalize } = require('path');
 const CompiledResources = {
     GraphQLDocument: require('./GraphQLDocument'),
     MustacheTemplate: require('./MustacheTemplate')
@@ -14,9 +14,10 @@ for (const Resource of Object.values(CompiledResources)) {
 
 module.exports = Object.assign(CompiledResources, {
     forFileOfType(filenameOrExtension) {
-        const extension = filenameOrExtension.startsWith('.')
-            ? filenameOrExtension
-            : extname(filenameOrExtension);
+        const normalized = normalize(filenameOrExtension);
+        const extension = normalized.startsWith('.')
+            ? normalized
+            : extname(normalized);
         return byExtension.get(extension);
     }
 });

packages/upward-js/lib/index.js

@@ -1,4 +1,5 @@
 module.exports = {
+    IOAdapter: require('./IOAdapter'),
     middleware: require('./middleware'),
     server: require('./server')
 };

packages/upward-js/lib/resolvers/ConditionalResolver.js

@@ -1,3 +1,4 @@
+const debug = require('debug')('upward-js:ConditionalResolver');
 const AbstractResolver = require('./AbstractResolver');
 
 class ConditionalResolver extends AbstractResolver {
@@ -27,16 +28,18 @@ class ConditionalResolver extends AbstractResolver {
         return this.tryMatchers(definition.when);
     }
     async tryMatchers([top, ...rest]) {
+        debug('matching %o with %d left to go', top, rest.length);
         const regex = new RegExp(top.pattern);
         const candidate = await this.visitor.context.get(top.matches);
+        debug('regex is %s, candidate is %s', regex, candidate);
         const regexMatch = candidate.match(regex);
 
         if (regexMatch) {
             const match = regexMatch.reduce((contextMatch, group, index) => {
                 contextMatch[`$${index}`] = group;
                 return contextMatch;
             }, {});
-            this.visitor.context.set('$match', match);
+            this.visitor.context.set('$match', match, true);
             const yielded = await this.visitor.upward(top, 'use');
             this.visitor.context.forget('$match');
             return yielded;

packages/upward-js/lib/resolvers/FileResolver.js

@@ -92,7 +92,9 @@ class FileResolver extends AbstractResolver {
             }
         }
         debug('parse === %s, found %s to compile', parse, Resource.name);
-        return new Resource(fileText, this.visitor.io);
+        const rsrc = new Resource(fileText, this.visitor.io);
+        await rsrc.compile();
+        return rsrc;
     }
 }
 

packages/upward-js/lib/resolvers/ServiceResolver.js

@@ -2,15 +2,15 @@ const debug = require('debug')('upward-js:ServiceResolver');
 const { inspect } = require('util');
 const { execute, makePromise } = require('apollo-link');
 const { HttpLink } = require('apollo-link-http');
-const { isPlainObject } = require('lodash');
+const { isPlainObject, fromPairs } = require('lodash');
 const AbstractResolver = require('./AbstractResolver');
 const GraphQLDocument = require('../compiledResources/GraphQLDocument');
 class ServiceResolver extends AbstractResolver {
     static get resolverType() {
         return 'service';
     }
     static get telltale() {
-        return 'endpoint';
+        return 'url';
     }
     async resolve(definition) {
         const die = msg => {
@@ -59,12 +59,18 @@ class ServiceResolver extends AbstractResolver {
                 : {}
         ];
 
-        const [url, query, method, headers, variables] = await Promise.all(
-            toResolve
-        );
+        const [
+            url,
+            query,
+            method,
+            headers,
+            variableEntries
+        ] = await Promise.all(toResolve);
+
+        const variables = fromPairs(variableEntries);
 
         debug(
-            'url retrieved: "%s, query resolved: "%s, creating link',
+            'url retrieved: "%s", query resolved: "%s", creating link',
             url,
             query
         );
@@ -86,9 +92,17 @@ class ServiceResolver extends AbstractResolver {
             throw new Error(`Unknown type passed to 'query'.`);
         }
 
+        debug('running query with %o', variables);
+
         return makePromise(
             execute(link, { query: await parsedQuery.render(), variables })
-        );
+        ).then(({ data, errors }) => {
+            if (errors && errors.length > 0) {
+                throw new Error(errors[0].message);
+            } else {
+                return { data };
+            }
+        });
     }
 }
 

packages/upward-js/lib/resolvers/__tests__/index.test.js

@@ -10,8 +10,10 @@ test('Resolvers exports', () => {
     ).toBeTruthy();
     expect(ResolversByType).toMatchInlineSnapshot(`
 Object {
+  "conditional": [Function],
   "file": [Function],
   "inline": [Function],
+  "service": [Function],
   "template": [Function],
 }
 `);

packages/upward-js/lib/resolvers/index.js

@@ -2,9 +2,9 @@
 const ResolverList = [
     require('./InlineResolver'),
     require('./FileResolver'),
-    require('./TemplateResolver')
-    // require('./ServiceResolver'),
-    // require('./ConditionalResolver')
+    require('./TemplateResolver'),
+    require('./ServiceResolver'),
+    require('./ConditionalResolver')
 ];
 
 const ResolversByType = ResolverList.reduce((out, Resolver) => {

packages/upward-spec/README.md

@@ -278,8 +278,7 @@ The above context lookup behaves at runtime as an instruction to wait until the
 
 ```yaml
 uxbridges:
-  resolver: web
-  parse: json
+  resolver: service
   method: POST
     resolver: inline
       inline: false
@@ -290,10 +289,11 @@ uxbridges:
     resolver: inline
     inline:
       content-type: application/x-www-form-urlencoded
-  body:
+  query:
     resolver: inline
-    inline:
-      name: uxbridge
+    inline: '{
+      characters @rest(type: "Character", path: )
+    }'
 ```
 
 The above definition would assign an [`HttpResponse`](#http-response) to the `uxbridges` basename once it has run. An HTTP response has no `characters` property, so the example context lookup would resolve to the empty string. However, an HTTP response does have a `body` property, so the lookup `uxbridges.body.characters[0].name` would resolve to `Kevin Uxbridge`.

packages/upward-spec/suite/scenarios/003-request-handling/cyclic-dependencies.yml

@@ -0,0 +1,16 @@
+status: 200
+headers:
+  inline:
+    content-type:
+      when:
+        matches:
+    content-disposition:
+      when:
+        matches: headers.content-type
+        pattern: text/html
+        use:
+          inline:
+            inline
+      default:
+        inline:
+          attachment