cqm-models 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ac25732f7441e1f217c08aacb938c540990b8e
-  data.tar.gz: a2c73abb9977475e4c5e846a12e0f932dfab429d
+  metadata.gz: b9d47b3179ff71c148dc93685264bb99d67450df
+  data.tar.gz: ce27d319bba38981c36c9f39c1a4f73c1568baa2
 SHA512:
-  metadata.gz: 19db96aa4d3648726e77a08f0d0240a6a412c7a2abba404f825766195e5c9886b6d11c2c1093a70ee603baaf9c9fcdfca66d921dc58c24fa827098ad45092132
-  data.tar.gz: f97daed348d53ce526dc7fd78298b909ed1dbe08b7f0dfd5d34a98d5ae1238861bbd389e28154f7808c724029fc9d04753e96a06a913a0fee19c8101ff0a373a
+  metadata.gz: 945986b71beeb3de8d60896a831b55662c8b34c09681e303534c415b57b1e98310be61846fa176e004ec553f94174f3a8707ab2968336924161c0f27f90c56e4
+  data.tar.gz: 7811109c26110d36417c1967baf46cbf51f8fd9feed91f20e7491a96b181b561758b0a18274619f14b461f1d6472623af47451b873cb6e12108ceec313764e3c

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,7 @@ Pull requests into cqm-models require the following. Submitter and reviewer shou
 - [ ] If there were any JavaScript changes, this PR has updated the `dist` directory using `npm run dist`
 - [ ] If applicable, the library version number in `package.json` and `cqm-models.gemspec` has been updated
 - [ ] All changes can be reproduced by running the generator script
+- [ ] Cqm-execution fixtures have been updated with the update_cqm_execution_fixtures.sh script inside server-scripts using this branch in the cqm-converter
 
 **Bonnie Reviewer:**
 

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '1.0.1'
+  spec.version       = '1.0.2'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'

data/dist/index.js

@@ -26004,7 +26004,8 @@ function objectToString(o) {
 },{"./clinical":150,"./datetime":152,"./interval":154,"./logic":155,"./uncertainty":156}],152:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Date, DateTime, Uncertainty, cqlFormatStringToMomentFormatString, daysInMonth, getTimezoneSeparatorFromString, isValidDateStringFormat, isValidDateTimeStringFormat, jsDate, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString, ref;
+  var Date, DateTime, Uncertainty, cqlFormatStringToMomentFormatString, daysInMonth, getTimezoneSeparatorFromString, isValidDateStringFormat, isValidDateTimeStringFormat, jsDate, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString, ref,
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
@@ -26357,6 +26358,32 @@ function objectToString(o) {
     };
 
     DateTime.prototype.toString = function() {
+      if (this.isTime()) {
+        return this.toStringTime();
+      } else {
+        return this.toStringDateTime();
+      }
+    };
+
+    DateTime.prototype.toStringTime = function() {
+      var str;
+      str = 'T';
+      if (this.hour != null) {
+        str += +this._pad(this.hour);
+        if (this.minute != null) {
+          str += ':' + this._pad(this.minute);
+          if (this.second != null) {
+            str += ':' + this._pad(this.second);
+            if (this.millisecond != null) {
+              str += '.' + String("00" + this.millisecond).slice(-3);
+            }
+          }
+        }
+      }
+      return str;
+    };
+
+    DateTime.prototype.toStringDateTime = function() {
       var offsetHours, offsetMin, str;
       str = '';
       if (this.year != null) {
@@ -26390,6 +26417,10 @@ function objectToString(o) {
       return str;
     };
 
+    DateTime.prototype.getDateTime = function() {
+      return this;
+    };
+
     DateTime.prototype.getDate = function() {
       return new Date(this.year, this.month, this.day);
     };
@@ -26700,12 +26731,18 @@ function objectToString(o) {
 
   DateTime.prototype.isMorePrecise = Date.prototype.isMorePrecise = function(other) {
     var field, i, len, ref1;
-    ref1 = this.constructor.FIELDS;
-    for (i = 0, len = ref1.length; i < len; i++) {
-      field = ref1[i];
-      if ((other[field] != null) && (this[field] == null)) {
+    if (typeof other === 'string' && indexOf.call(this.constructor.FIELDS, other) >= 0) {
+      if (this[other] == null) {
         return false;
       }
+    } else {
+      ref1 = this.constructor.FIELDS;
+      for (i = 0, len = ref1.length; i < len; i++) {
+        field = ref1[i];
+        if ((other[field] != null) && (this[field] == null)) {
+          return false;
+        }
+      }
     }
     return !this.isSamePrecision(other);
   };
@@ -26716,6 +26753,9 @@ function objectToString(o) {
 
   DateTime.prototype.isSamePrecision = Date.prototype.isSamePrecision = function(other) {
     var field, i, len, ref1;
+    if (typeof other === 'string' && indexOf.call(this.constructor.FIELDS, other) >= 0) {
+      return other === this.getPrecision();
+    }
     ref1 = this.constructor.FIELDS;
     for (i = 0, len = ref1.length; i < len; i++) {
       field = ref1[i];
@@ -27520,6 +27560,13 @@ function objectToString(o) {
       }
     };
 
+    Interval.prototype.toString = function() {
+      var end, start;
+      start = this.lowClosed ? '[' : '(';
+      end = this.highClosed ? ']' : ')';
+      return start + this.low.toString() + ', ' + this.high.toString() + end;
+    };
+
     return Interval;
 
   })();
@@ -29014,6 +29061,9 @@ function objectToString(o) {
       var date1, date2, ref, result;
       ref = this.execArgs(ctx), date1 = ref[0], date2 = ref[1];
       if ((date1 != null) && (date2 != null)) {
+        if (date2.isDate && date1.isDateTime) {
+          date1 = date1.getDate();
+        }
         result = date1.durationBetween(date2, this.precision.toLowerCase());
         if ((result != null) && result.isPoint()) {
           return result.low;
@@ -30023,9 +30073,10 @@ function objectToString(o) {
 },{"../datatypes/datatypes":151,"./builder":159,"./expression":165,"./quantity":177}],169:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Collapse, End, Ends, Expression, Interval, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Quantity, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, doAddition, doIncludes, doSubtraction, dtivl, predecessor, ref, ref1, ref2, successor,
+  var Collapse, End, Ends, Expand, Expression, Interval, MIN_FLOAT_PRECISION_VALUE, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Quantity, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, collapseIntervals, compare_units, convert_value, doAddition, doIncludes, doSubtraction, dtivl, intervalListType, predecessor, ref, ref1, ref2, successor,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
+    hasProp = {}.hasOwnProperty,
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   ref = require('./expression'), Expression = ref.Expression, UnimplementedExpression = ref.UnimplementedExpression;
 
@@ -30033,9 +30084,9 @@ function objectToString(o) {
 
   build = require('./builder').build;
 
-  ref1 = require('./quantity'), Quantity = ref1.Quantity, doAddition = ref1.doAddition, doSubtraction = ref1.doSubtraction;
+  ref1 = require('./quantity'), Quantity = ref1.Quantity, doAddition = ref1.doAddition, doSubtraction = ref1.doSubtraction, compare_units = ref1.compare_units, convert_value = ref1.convert_value;
 
-  ref2 = require('../util/math'), successor = ref2.successor, predecessor = ref2.predecessor;
+  ref2 = require('../util/math'), successor = ref2.successor, predecessor = ref2.predecessor, MIN_FLOAT_PRECISION_VALUE = ref2.MIN_FLOAT_PRECISION_VALUE;
 
   dtivl = require('../datatypes/interval');
 
@@ -30340,6 +30391,252 @@ function objectToString(o) {
 
   })(Expression);
 
+  intervalListType = function(intervals) {
+    var high, itvl, j, len, low, ref3, ref4, type;
+    type = null;
+    for (j = 0, len = intervals.length; j < len; j++) {
+      itvl = intervals[j];
+      if (itvl == null) {
+        continue;
+      }
+      if ((itvl.low == null) && (itvl.high == null)) {
+        continue;
+      }
+      low = (ref3 = itvl.low) != null ? ref3 : itvl.high;
+      high = (ref4 = itvl.high) != null ? ref4 : itvl.low;
+      if ((typeof low.isTime === "function" ? low.isTime() : void 0) && (typeof high.isTime === "function" ? high.isTime() : void 0)) {
+        if (type == null) {
+          type = 'time';
+        } else if (type === 'time') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if ((low.isDateTime || high.isDateTime) && (low.isDateTime || low.isDate) && (high.isDateTime || high.isDate)) {
+        if ((type == null) || type === 'date') {
+          type = 'datetime';
+        } else if (type === 'datetime') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (low.isDate && high.isDate) {
+        if (type == null) {
+          type = 'date';
+        } else if (type === 'date' || 'datetime') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (low.isQuantity && high.isQuantity) {
+        if (type == null) {
+          type = 'quantity';
+        } else if (type === 'quantity') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (Number.isInteger(low) && Number.isInteger(high)) {
+        if (type == null) {
+          type = 'integer';
+        } else if (type === 'integer' || 'decimal') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (typeof low === 'number' && typeof high === 'number') {
+        if ((type == null) || type === 'integer') {
+          type = 'decimal';
+        } else if (type === 'decimal') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else {
+        return 'mismatch';
+      }
+    }
+    return type;
+  };
+
+  module.exports.Expand = Expand = (function(superClass) {
+    extend(Expand, superClass);
+
+    function Expand(json) {
+      Expand.__super__.constructor.apply(this, arguments);
+    }
+
+    Expand.prototype.exec = function(ctx) {
+      var defaultPer, expandFunction, interval, intervals, items, j, len, per, ref3, results, type;
+      ref3 = this.execArgs(ctx), intervals = ref3[0], per = ref3[1];
+      type = intervalListType(intervals);
+      if (type === 'mismatch') {
+        throw new Error("List of intervals contains mismatched types.");
+      }
+      if (type == null) {
+        return null;
+      }
+      intervals = collapseIntervals(intervals, per);
+      if (intervals.length === 0) {
+        return [];
+      }
+      if (type === "time" || type === "date" || type === "datetime") {
+        expandFunction = this.expandDTishInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: interval.low.getPrecision()
+          });
+        };
+      } else if (type === "quantity") {
+        expandFunction = this.expandQuantityInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: interval.low.unit
+          });
+        };
+      } else if (type === "integer" || type === "decimal") {
+        expandFunction = this.expandNumericInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: '1'
+          });
+        };
+      } else {
+        throw new Error("Interval list type not yet supported.");
+      }
+      results = [];
+      for (j = 0, len = intervals.length; j < len; j++) {
+        interval = intervals[j];
+        if (interval == null) {
+          continue;
+        }
+        if ((interval.low == null) || (interval.high == null)) {
+          return null;
+        }
+        if (type === 'datetime') {
+          interval.low = interval.low.getDateTime();
+          interval.high = interval.high.getDateTime();
+        }
+        per = per != null ? per : defaultPer(interval);
+        items = expandFunction.call(this, interval, per);
+        if (items === null) {
+          return null;
+        }
+        results.push.apply(results, items);
+      }
+      return results;
+    };
+
+    Expand.prototype.expandDTishInterval = function(interval, per) {
+      var count, current_high, current_low, high, i, j, k, low, point_intervals, ref3, ref4, ref5, ref6, results;
+      if ((ref3 = per.unit) === 'week' || ref3 === 'weeks') {
+        per.value *= 7;
+        per.unit = 'day';
+      }
+      if (ref4 = per.unit, indexOf.call(interval.low.constructor.FIELDS, ref4) < 0) {
+        return null;
+      }
+      if (interval.low.isLessPrecise(per.unit)) {
+        return null;
+      }
+      low = interval.lowClosed ? interval.low : interval.low.successor();
+      high = interval.highClosed ? interval.high : interval.high.predecessor();
+      if (low.after(high)) {
+        return [];
+      }
+      current_low = low;
+      results = [];
+      point_intervals = current_low.add(per.value, per.unit).predecessor().equals(current_low);
+      if (per.unit === low.getPrecision()) {
+        count = Math.floor((low.durationBetween(high, per.unit).high + 1) / per.value);
+      } else {
+        count = Math.floor((low.durationBetween(high, per.unit).low + 1) / per.value);
+      }
+      if (point_intervals) {
+        for (i = j = 1, ref5 = count + 1; 1 <= ref5 ? j <= ref5 : j >= ref5; i = 1 <= ref5 ? ++j : --j) {
+          results.push(new dtivl.Interval(current_low, current_low.copy(), true, true));
+          current_low = current_low.add(per.value, per.unit);
+        }
+      } else {
+        for (i = k = 1, ref6 = count; 1 <= ref6 ? k <= ref6 : k >= ref6; i = 1 <= ref6 ? ++k : --k) {
+          current_high = current_low.add(per.value, per.unit).predecessor();
+          results.push(new dtivl.Interval(current_low, current_high, true, true));
+          current_low = current_low.add(per.value, per.unit);
+        }
+      }
+      if (results.length > 0 && !results[results.length - 1].high.sameOrBefore(high)) {
+        results.pop();
+      }
+      return results;
+    };
+
+    Expand.prototype.expandQuantityInterval = function(interval, per) {
+      var high_value, itvl, j, len, low_value, per_value, result_units, results;
+      if (compare_units(interval.low.unit, per.unit) > 0) {
+        result_units = per.unit;
+      } else {
+        result_units = interval.low.unit;
+      }
+      low_value = convert_value(interval.low.value, interval.low.unit, result_units);
+      high_value = convert_value(interval.high.value, interval.high.unit, result_units);
+      per_value = convert_value(per.value, per.unit, result_units);
+      if (!((low_value != null) && (high_value != null) && (per_value != null))) {
+        return null;
+      }
+      results = this.makeNumericIntervalList(low_value, high_value, interval.lowClosed, interval.highClosed, per_value);
+      for (j = 0, len = results.length; j < len; j++) {
+        itvl = results[j];
+        itvl.low = new Quantity({
+          value: itvl.low,
+          unit: result_units
+        });
+        itvl.high = new Quantity({
+          value: itvl.high,
+          unit: result_units
+        });
+      }
+      return results;
+    };
+
+    Expand.prototype.expandNumericInterval = function(interval, per) {
+      if (per.unit !== '1') {
+        return null;
+      }
+      return this.makeNumericIntervalList(interval.low, interval.high, interval.lowClosed, interval.highClosed, per.value);
+    };
+
+    Expand.prototype.makeNumericIntervalList = function(low, high, lowClosed, highClosed, per) {
+      var gap, point_intervals, results, width, x;
+      point_intervals = Number.isInteger(low) && Number.isInteger(high) && Number.isInteger(per);
+      gap = point_intervals ? 1 : MIN_FLOAT_PRECISION_VALUE;
+      if (!lowClosed) {
+        low = low + gap;
+      }
+      if (!highClosed) {
+        high = high - gap;
+      }
+      width = per - gap;
+      if (low > high) {
+        return [];
+      }
+      results = (function() {
+        var j, ref3, ref4, ref5, results1;
+        results1 = [];
+        for (x = j = ref3 = low, ref4 = high - width, ref5 = per; ref5 > 0 ? j <= ref4 : j >= ref4; x = j += ref5) {
+          results1.push(new dtivl.Interval(x, x + width, true, true));
+        }
+        return results1;
+      })();
+      return results;
+    };
+
+    return Expand;
+
+  })(Expression);
+
   module.exports.Collapse = Collapse = (function(superClass) {
     extend(Collapse, superClass);
 
@@ -30348,141 +30645,146 @@ function objectToString(o) {
     }
 
     Collapse.prototype.exec = function(ctx) {
-      var a, b, collapsedIntervals, i, interval, intervals, intervalsClone, len, perWidth, precisionUnits, ref3, ref4, ref5, ref6, ref7;
+      var intervals, perWidth, ref3;
       ref3 = this.execArgs(ctx), intervals = ref3[0], perWidth = ref3[1];
-      intervalsClone = [];
-      for (i = 0, len = intervals.length; i < len; i++) {
-        interval = intervals[i];
-        if (interval != null) {
-          intervalsClone.push(interval.copy());
-        }
+      return collapseIntervals(intervals, perWidth);
+    };
+
+    return Collapse;
+
+  })(Expression);
+
+  collapseIntervals = function(intervals, perWidth) {
+    var a, b, collapsedIntervals, interval, intervalsClone, j, len, precisionUnits, ref3, ref4, ref5, ref6;
+    intervalsClone = [];
+    for (j = 0, len = intervals.length; j < len; j++) {
+      interval = intervals[j];
+      if (interval != null) {
+        intervalsClone.push(interval.copy());
       }
-      if (intervals == null) {
-        return null;
-      } else if ((intervalsClone != null ? intervalsClone.length : void 0) <= 1) {
-        return intervalsClone;
-      } else {
-        if (perWidth == null) {
-          if (intervalsClone[0].low != null) {
-            if (intervalsClone[0].low.isDateTime) {
-              precisionUnits = intervalsClone[0].low.getPrecision();
-              perWidth = new Quantity({
-                value: 1,
-                unit: precisionUnits
-              });
-            } else if (intervalsClone[0].low.isQuantity) {
-              perWidth = doSubtraction(successor(intervalsClone[0].low), intervalsClone[0].low);
-            } else {
-              perWidth = successor(intervalsClone[0].low) - intervalsClone[0].low;
-            }
-          } else if (intervalsClone[0].high != null) {
-            if (intervalsClone[0].high.isDateTime) {
-              precisionUnits = intervalsClone[0].high.getPrecision();
-              perWidth = new Quantity({
-                value: 1,
-                unit: precisionUnits
-              });
-            } else if (intervalsClone[0].high.isQuantity) {
-              perWidth = doSubtraction(successor(intervalsClone[0].high), intervalsClone[0].high);
-            } else {
-              perWidth = successor(intervalsClone[0].high) - intervalsClone[0].high;
-            }
+    }
+    if (intervals == null) {
+      return null;
+    } else if ((intervalsClone != null ? intervalsClone.length : void 0) <= 1) {
+      return intervalsClone;
+    } else {
+      if (perWidth == null) {
+        if (intervalsClone[0].low != null) {
+          if (intervalsClone[0].low.isDateTime) {
+            precisionUnits = intervalsClone[0].low.getPrecision();
+            perWidth = new Quantity({
+              value: 1,
+              unit: precisionUnits
+            });
+          } else if (intervalsClone[0].low.isQuantity) {
+            perWidth = doSubtraction(successor(intervalsClone[0].low), intervalsClone[0].low);
           } else {
-            throw new Error("Point type of intervals provided to collapse cannot be determined.");
+            perWidth = successor(intervalsClone[0].low) - intervalsClone[0].low;
           }
-          if (typeof perWidth === 'number') {
+        } else if (intervalsClone[0].high != null) {
+          if (intervalsClone[0].high.isDateTime) {
+            precisionUnits = intervalsClone[0].high.getPrecision();
             perWidth = new Quantity({
-              value: perWidth,
-              unit: '1'
+              value: 1,
+              unit: precisionUnits
             });
+          } else if (intervalsClone[0].high.isQuantity) {
+            perWidth = doSubtraction(successor(intervalsClone[0].high), intervalsClone[0].high);
+          } else {
+            perWidth = successor(intervalsClone[0].high) - intervalsClone[0].high;
           }
+        } else {
+          throw new Error("Point type of intervals provided to collapse cannot be determined.");
         }
-        intervalsClone.sort(function(a, b) {
-          var ref4, ref5;
-          if (typeof ((ref4 = a.low) != null ? ref4.before : void 0) === 'function') {
-            if ((b.low != null) && a.low.before(b.low)) {
-              return -1;
-            }
-            if ((b.low == null) || a.low.after(b.low)) {
-              return 1;
-            }
-          } else if ((a.low != null) && (b.low != null)) {
-            if (a.low < b.low) {
-              return -1;
-            }
-            if (a.low > b.low) {
-              return 1;
-            }
-          } else if ((a.low != null) && (b.low == null)) {
+        if (typeof perWidth === 'number') {
+          perWidth = new Quantity({
+            value: perWidth,
+            unit: '1'
+          });
+        }
+      }
+      intervalsClone.sort(function(a, b) {
+        var ref3, ref4;
+        if (typeof ((ref3 = a.low) != null ? ref3.before : void 0) === 'function') {
+          if ((b.low != null) && a.low.before(b.low)) {
+            return -1;
+          }
+          if ((b.low == null) || a.low.after(b.low)) {
             return 1;
-          } else if ((a.low == null) && (b.low != null)) {
+          }
+        } else if ((a.low != null) && (b.low != null)) {
+          if (a.low < b.low) {
             return -1;
           }
-          if (typeof ((ref5 = a.high) != null ? ref5.before : void 0) === 'function') {
-            if ((b.high == null) || a.high.before(b.high)) {
-              return -1;
-            }
-            if (a.high.after(b.high)) {
-              return 1;
-            }
-          } else if ((a.high != null) && (b.high != null)) {
-            if (a.high < b.high) {
-              return -1;
-            }
-            if (a.high > b.high) {
-              return 1;
-            }
-          } else if ((a.high != null) && (b.high == null)) {
+          if (a.low > b.low) {
+            return 1;
+          }
+        } else if ((a.low != null) && (b.low == null)) {
+          return 1;
+        } else if ((a.low == null) && (b.low != null)) {
+          return -1;
+        }
+        if (typeof ((ref4 = a.high) != null ? ref4.before : void 0) === 'function') {
+          if ((b.high == null) || a.high.before(b.high)) {
             return -1;
-          } else if ((a.high == null) && (b.high != null)) {
+          }
+          if (a.high.after(b.high)) {
             return 1;
           }
-          return 0;
-        });
-        collapsedIntervals = [];
-        a = intervalsClone.shift();
-        b = intervalsClone.shift();
-        while (b) {
-          if (typeof ((ref4 = b.low) != null ? ref4.durationBetween : void 0) === 'function') {
-            if ((ref5 = a.high) != null ? ref5.sameOrAfter(b.low) : void 0) {
-              if ((b.high == null) || b.high.after(a.high)) {
-                a.high = b.high;
-              }
-            } else if (((ref6 = a.high) != null ? ref6.durationBetween(b.low, perWidth.unit).high : void 0) <= perWidth.value) {
+        } else if ((a.high != null) && (b.high != null)) {
+          if (a.high < b.high) {
+            return -1;
+          }
+          if (a.high > b.high) {
+            return 1;
+          }
+        } else if ((a.high != null) && (b.high == null)) {
+          return -1;
+        } else if ((a.high == null) && (b.high != null)) {
+          return 1;
+        }
+        return 0;
+      });
+      collapsedIntervals = [];
+      a = intervalsClone.shift();
+      b = intervalsClone.shift();
+      while (b) {
+        if (typeof ((ref3 = b.low) != null ? ref3.durationBetween : void 0) === 'function') {
+          if ((ref4 = a.high) != null ? ref4.sameOrAfter(b.low) : void 0) {
+            if ((b.high == null) || b.high.after(a.high)) {
               a.high = b.high;
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
             }
-          } else if (typeof ((ref7 = b.low) != null ? ref7.sameOrBefore : void 0) === 'function') {
-            if ((a.high != null) && b.low.sameOrBefore(doAddition(a.high, perWidth))) {
-              if ((b.high == null) || b.high.after(a.high)) {
-                a.high = b.high;
-              }
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
+          } else if (((ref5 = a.high) != null ? ref5.durationBetween(b.low, perWidth.unit).high : void 0) <= perWidth.value) {
+            a.high = b.high;
+          } else {
+            collapsedIntervals.push(a);
+            a = b;
+          }
+        } else if (typeof ((ref6 = b.low) != null ? ref6.sameOrBefore : void 0) === 'function') {
+          if ((a.high != null) && b.low.sameOrBefore(doAddition(a.high, perWidth))) {
+            if ((b.high == null) || b.high.after(a.high)) {
+              a.high = b.high;
             }
           } else {
-            if ((b.low - a.high) <= perWidth.value) {
-              if (b.high > a.high || (b.high == null)) {
-                a.high = b.high;
-              }
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
+            collapsedIntervals.push(a);
+            a = b;
+          }
+        } else {
+          if ((b.low - a.high) <= perWidth.value) {
+            if (b.high > a.high || (b.high == null)) {
+              a.high = b.high;
             }
+          } else {
+            collapsedIntervals.push(a);
+            a = b;
           }
-          b = intervalsClone.shift();
         }
-        collapsedIntervals.push(a);
-        return collapsedIntervals;
+        b = intervalsClone.shift();
       }
-    };
-
-    return Collapse;
-
-  })(Expression);
+      collapsedIntervals.push(a);
+      return collapsedIntervals;
+    }
+  };
 
 }).call(this);
 
@@ -32221,6 +32523,23 @@ function objectToString(o) {
     }
   };
 
+  module.exports.compare_units = function(unit_a, unit_b) {
+    var c, e;
+    try {
+      c = ucum.convert(1, ucum_unit(unit_a), ucum_unit(unit_b));
+      if (c > 1) {
+        return 1;
+      }
+      if (c < 1) {
+        return -1;
+      }
+      return 0;
+    } catch (error) {
+      e = error;
+      return null;
+    }
+  };
+
 }).call(this);
 
 
@@ -32868,11 +33187,11 @@ function objectToString(o) {
 },{"./builder":159,"./expression":165}],181:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, StartsWith, Substring, Upper, build,
+  var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, SplitOnMatches, StartsWith, Substring, UnimplementedExpression, Upper, build, ref,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
-  Expression = require('./expression').Expression;
+  ref = require('./expression'), Expression = ref.Expression, UnimplementedExpression = ref.UnimplementedExpression;
 
   build = require('./builder').build;
 
@@ -32951,6 +33270,17 @@ function objectToString(o) {
 
   })(Expression);
 
+  module.exports.SplitOnMatches = SplitOnMatches = (function(superClass) {
+    extend(SplitOnMatches, superClass);
+
+    function SplitOnMatches() {
+      return SplitOnMatches.__super__.constructor.apply(this, arguments);
+    }
+
+    return SplitOnMatches;
+
+  })(UnimplementedExpression);
+
   module.exports.Upper = Upper = (function(superClass) {
     extend(Upper, superClass);
 
@@ -33218,7 +33548,7 @@ function objectToString(o) {
 },{"./builder":159,"./expression":165}],183:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
+  var As, Concept, Convert, ConvertsToBoolean, ConvertsToDate, ConvertsToDateTime, ConvertsToDecimal, ConvertsToInteger, ConvertsToQuantity, ConvertsToString, ConvertsToTime, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -33573,6 +33903,94 @@ function objectToString(o) {
 
   })(UnimplementedExpression);
 
+  module.exports.ConvertsToBoolean = ConvertsToBoolean = (function(superClass) {
+    extend(ConvertsToBoolean, superClass);
+
+    function ConvertsToBoolean() {
+      return ConvertsToBoolean.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToBoolean;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDate = ConvertsToDate = (function(superClass) {
+    extend(ConvertsToDate, superClass);
+
+    function ConvertsToDate() {
+      return ConvertsToDate.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDate;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDateTime = ConvertsToDateTime = (function(superClass) {
+    extend(ConvertsToDateTime, superClass);
+
+    function ConvertsToDateTime() {
+      return ConvertsToDateTime.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDateTime;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDecimal = ConvertsToDecimal = (function(superClass) {
+    extend(ConvertsToDecimal, superClass);
+
+    function ConvertsToDecimal() {
+      return ConvertsToDecimal.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDecimal;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToInteger = ConvertsToInteger = (function(superClass) {
+    extend(ConvertsToInteger, superClass);
+
+    function ConvertsToInteger() {
+      return ConvertsToInteger.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToInteger;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToQuantity = ConvertsToQuantity = (function(superClass) {
+    extend(ConvertsToQuantity, superClass);
+
+    function ConvertsToQuantity() {
+      return ConvertsToQuantity.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToQuantity;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToString = ConvertsToString = (function(superClass) {
+    extend(ConvertsToString, superClass);
+
+    function ConvertsToString() {
+      return ConvertsToString.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToString;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToTime = ConvertsToTime = (function(superClass) {
+    extend(ConvertsToTime, superClass);
+
+    function ConvertsToTime() {
+      return ConvertsToTime.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToTime;
+
+  })(UnimplementedExpression);
+
   module.exports.IntervalTypeSpecifier = IntervalTypeSpecifier = (function(superClass) {
     extend(IntervalTypeSpecifier, superClass);
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "This library contains auto generated Mongo (Mongoose.js) models that correspond to the QDM (Quality Data Model) specification.",
   "main": "app/assets/javascripts/index.js",
   "browser": {
@@ -15,7 +15,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "1.3.1",
+    "cql-execution": "1.3.2",
     "mongoose": "^5.0.7"
   },
   "devDependencies": {

data/yarn.lock

@@ -442,9 +442,9 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cql-execution@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.3.1.tgz#79c5fe891202140f6f3d8371fb382765eba06a37"
+cql-execution@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.3.2.tgz#3599ef31a0196e8ee679a37e1eee1911d731360b"
   dependencies:
     moment "^2.20.1"
     ucum "0.0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the QDM specification.