goodguide-gibbon 0.3.2 → 0.3.3

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.3.2'
+      '0.3.3'
     end
   end
 end

data/vendor/gibbon/lib/gibbon.browser.dev.js

@@ -1569,6 +1569,7 @@ analyze = Gibbon.analyze = (function() {
       destructure: ['constraint', 'name', 'argnum'],
       "native": ['id'],
       param: ['name', 'constraints'],
+      error: ['type', 'args'],
       any: []
     });
 
@@ -1719,6 +1720,23 @@ analyze = Gibbon.analyze = (function() {
       });
     };
 
+    TypeExpr.fromType = function(t) {
+      var st;
+      if (t._tag === 'entity') {
+        return TypeExpr["native"](t.id);
+      }
+      return TypeExpr.param(t._tag, (function() {
+        var _i, _len, _ref4, _results;
+        _ref4 = t._values;
+        _results = [];
+        for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
+          st = _ref4[_i];
+          _results.push(this.fromType(st));
+        }
+        return _results;
+      }).call(this));
+    };
+
     TypeExpr.prototype.map = function(f) {
       return this.cases({
         param: function(name, params) {
@@ -1780,7 +1798,7 @@ analyze = Gibbon.analyze = (function() {
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
-        return this.externalLookup.call(null, id, query, TypeAST, function(err, analysis) {
+        return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
           if (err) {
             return cb(TypeLookup.error(err));
           } else {
@@ -1891,7 +1909,8 @@ analyze = Gibbon.analyze = (function() {
           func: function(name, args) {
             var arg, ast, func, i, input, scope, _i, _len, _results;
             if (!stdlib.hasOwnProperty(name)) {
-              throw new Error("no such function " + name);
+              push(TypeExpr.expr(flow.head), TypeExpr.error('func', [flow.head]));
+              return;
             }
             func = stdlib[name];
             ast = func.type;
@@ -1985,7 +2004,8 @@ analyze = Gibbon.analyze = (function() {
         match: ['lhs', 'rhs'],
         destructure: ['type'],
         lookup: ['query', 'id', 'error'],
-        circular: ['crumbs']
+        circular: ['crumbs'],
+        func: ['node']
       });
 
       return TypeError;
@@ -2064,6 +2084,9 @@ analyze = Gibbon.analyze = (function() {
         };
         simplify = function(expr, cb) {
           return expr.cases({
+            error: function(type, args) {
+              return cb(error.apply(null, [type].concat(__slice.call(args))));
+            },
             destructure: function(constraint, name, argnum) {
               var destructured;
               destructured = this;
@@ -2094,7 +2117,7 @@ analyze = Gibbon.analyze = (function() {
                         },
                         response: function(analysis) {
                           semanticAccessors.set(query, Semantic.query(analysis.annotations));
-                          return cb(TypeExpr.fromAST(analysis.type));
+                          return cb(TypeExpr.fromType(analysis.type));
                         },
                         local: function(key) {
                           var localFrame;
@@ -2126,7 +2149,10 @@ analyze = Gibbon.analyze = (function() {
           var flowType, toSemanticTree;
           flowType = function(expr) {
             if (!solutions.has(TypeExpr.expr(expr))) {
-              throw 'unsolved!';
+              if (errors.length === 0) {
+                throw new Error('unsolved!');
+              }
+              return Type.abstract(TypeExpr.expr(expr));
             }
             return solutions.get(TypeExpr.expr(expr)).realize();
           };
@@ -2867,7 +2893,7 @@ Gibbon.jsonConsumer = (function() {
         return callback(new Error("" + id + " has no field " + accessorName));
       }
       return callback(null, {
-        type: t.parseUnit(fields[accessorName]),
+        type: fields[accessorName],
         annotations: {
           name: accessorName,
           table: id
@@ -2900,7 +2926,7 @@ Gibbon.jsonConsumer = (function() {
         callback(new Error("wrong type " + id + " for list `" + listName + "'"));
       }
       return callback(null, {
-        type: t.concrete('bool'),
+        type: t.bool(),
         annotations: {
           list: listName
         }

data/vendor/gibbon/lib/gibbon.browser.js

@@ -1563,6 +1563,7 @@ analyze = Gibbon.analyze = (function() {
       destructure: ['constraint', 'name', 'argnum'],
       "native": ['id'],
       param: ['name', 'constraints'],
+      error: ['type', 'args'],
       any: []
     });
 
@@ -1713,6 +1714,23 @@ analyze = Gibbon.analyze = (function() {
       });
     };
 
+    TypeExpr.fromType = function(t) {
+      var st;
+      if (t._tag === 'entity') {
+        return TypeExpr["native"](t.id);
+      }
+      return TypeExpr.param(t._tag, (function() {
+        var _i, _len, _ref4, _results;
+        _ref4 = t._values;
+        _results = [];
+        for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
+          st = _ref4[_i];
+          _results.push(this.fromType(st));
+        }
+        return _results;
+      }).call(this));
+    };
+
     TypeExpr.prototype.map = function(f) {
       return this.cases({
         param: function(name, params) {
@@ -1774,7 +1792,7 @@ analyze = Gibbon.analyze = (function() {
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
-        return this.externalLookup.call(null, id, query, TypeAST, function(err, analysis) {
+        return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
           if (err) {
             return cb(TypeLookup.error(err));
           } else {
@@ -1885,7 +1903,8 @@ analyze = Gibbon.analyze = (function() {
           func: function(name, args) {
             var arg, ast, func, i, input, scope, _i, _len, _results;
             if (!stdlib.hasOwnProperty(name)) {
-              throw new Error("no such function " + name);
+              push(TypeExpr.expr(flow.head), TypeExpr.error('func', [flow.head]));
+              return;
             }
             func = stdlib[name];
             ast = func.type;
@@ -1979,7 +1998,8 @@ analyze = Gibbon.analyze = (function() {
         match: ['lhs', 'rhs'],
         destructure: ['type'],
         lookup: ['query', 'id', 'error'],
-        circular: ['crumbs']
+        circular: ['crumbs'],
+        func: ['node']
       });
 
       return TypeError;
@@ -2044,6 +2064,9 @@ analyze = Gibbon.analyze = (function() {
         };
         simplify = function(expr, cb) {
           return expr.cases({
+            error: function(type, args) {
+              return cb(error.apply(null, [type].concat(__slice.call(args))));
+            },
             destructure: function(constraint, name, argnum) {
               var destructured;
               destructured = this;
@@ -2074,7 +2097,7 @@ analyze = Gibbon.analyze = (function() {
                         },
                         response: function(analysis) {
                           semanticAccessors.set(query, Semantic.query(analysis.annotations));
-                          return cb(TypeExpr.fromAST(analysis.type));
+                          return cb(TypeExpr.fromType(analysis.type));
                         },
                         local: function(key) {
                           var localFrame;
@@ -2106,7 +2129,10 @@ analyze = Gibbon.analyze = (function() {
           var flowType, toSemanticTree;
           flowType = function(expr) {
             if (!solutions.has(TypeExpr.expr(expr))) {
-              throw 'unsolved!';
+              if (errors.length === 0) {
+                throw new Error('unsolved!');
+              }
+              return Type.abstract(TypeExpr.expr(expr));
             }
             return solutions.get(TypeExpr.expr(expr)).realize();
           };
@@ -2839,7 +2865,7 @@ Gibbon.jsonConsumer = (function() {
         return callback(new Error("" + id + " has no field " + accessorName));
       }
       return callback(null, {
-        type: t.parseUnit(fields[accessorName]),
+        type: fields[accessorName],
         annotations: {
           name: accessorName,
           table: id
@@ -2872,7 +2898,7 @@ Gibbon.jsonConsumer = (function() {
         callback(new Error("wrong type " + id + " for list `" + listName + "'"));
       }
       return callback(null, {
-        type: t.concrete('bool'),
+        type: t.bool(),
         annotations: {
           list: listName
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime