cqm-models 3.1.0 → 4.0.2

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "3.1.0",
+  "version": "4.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": {
@@ -16,13 +16,13 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "~2.2.0",
-    "mongoose": "^5.11.10"
+    "cql-execution": "~2.3.3",
+    "mongoose": "^5.13.12"
   },
   "devDependencies": {
     "browserify": "^16.1.0",
-    "eslint": "^4.17.19",
-    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint": "^7.0.0",
+    "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.8.0",
     "istanbul": "^0.4.5",
     "jasmine": "^2.9.0"

data/templates/models_template.rb.erb

@@ -1,4 +1,4 @@
-# Base QDM module (generated from lib/generate_models.rb) for QDM 5.5
+# Base QDM module (generated from lib/generate_models.rb) for QDM 5.6
 module QDM
 end
 require 'mongoid'
@@ -25,6 +25,7 @@ require_relative 'qdm/attributes/diagnosis_component'
 require_relative 'qdm/attributes/organization'
 require_relative 'qdm/attributes/patient_entity'
 require_relative 'qdm/attributes/practitioner'
+require_relative 'qdm/attributes/location'
 require_relative 'qdm/attributes/result_component'
 
 # Tacoma-specific models
@@ -55,6 +56,7 @@ require_relative '../../lib/generate_patients'
 <%- next if datatype.underscore == 'organization' -%>
 <%- next if datatype.underscore == 'patient_entity' -%>
 <%- next if datatype.underscore == 'practitioner' -%>
+<%- next if datatype.underscore == 'location' -%>
 <%- next if datatype.underscore == 'result_component' -%>
 require_relative 'qdm/<%= datatype.underscore %>'
 <%- end -%>

data/templates/mongoose_template.js.erb

@@ -26,7 +26,7 @@ const QDMDate = require('../basetypes/QDMDate');
 const Any = require('../basetypes/Any');
 
 const [Schema] = [mongoose.Schema];
-<% elsif datatype.downcase == 'carepartner' || datatype.downcase == 'organization' || datatype.downcase == 'practitioner' || datatype.downcase == 'patiententity'%>
+<% elsif datatype.downcase == 'carepartner' || datatype.downcase == 'organization' || datatype.downcase == 'practitioner' || datatype.downcase == 'patiententity' || datatype.downcase == 'location'%>
 const { EntitySchemaFunction } = require('./Entity');
 const Code = require('../basetypes/Code');
 const Interval = require('../basetypes/Interval');
@@ -65,7 +65,7 @@ const <%= datatype -%>Schema = ComponentSchemaFunction({
   <% if attribute[:default] %><%= attribute[:name] %>: { type: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>, default: '<%= attribute[:default] %>' },<% else %><%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,<%- end %>
   <%- end %>
 });
-<% elsif datatype.downcase == 'carepartner' || datatype.downcase == 'organization' || datatype.downcase == 'practitioner' || datatype.downcase == 'patiententity'%>
+<% elsif datatype.downcase == 'carepartner' || datatype.downcase == 'organization' || datatype.downcase == 'practitioner' || datatype.downcase == 'patiententity' || datatype.downcase == 'location'%>
 const <%= datatype -%>Schema = EntitySchemaFunction({
   <%- for attribute in attrs_with_extras -%>
   <% if attribute[:default] %><%= attribute[:name] %>: { type: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>, default: '<%= attribute[:default] %>' },<% else %><%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,<%- end %>
@@ -83,6 +83,13 @@ class <%= datatype %> extends mongoose.Document {
   constructor(object) {
     super(object, <%= datatype %>Schema);
     this._type = 'QDM::<%= datatype %>';
+    <%- for attribute in attrs_with_extras -%>
+    <%- if RESERVED_WORDS[attribute[:name].to_s] -%>
+    if (object && object.<%= RESERVED_WORDS[attribute[:name].to_s] %>) {
+      this.<%= attribute[:name] %> = object.<%= RESERVED_WORDS[attribute[:name].to_s] %>;
+    }
+    <%- end -%>
+    <%- end -%>
   }
 }
 <% if datatype.downcase == 'entity' || datatype.downcase == 'component'%>

data/templates/patient_template.js.erb

@@ -56,6 +56,31 @@ QDMPatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
   return this.dataElements.filter(element => element.qrdaOid === qrdaOid);
 };
 
+// cql-execution prefers getId() over id() because some data models may have an id property
+QDMPatientSchema.methods.getId = function getId() {
+  return this._id;
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._is = function _is(typeSpecifier) {
+  return this._typeHierarchy().some(
+    t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+  );
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._typeHierarchy = function _typeHierarchy() {
+  const ver = this.qdmVersion.replace('.', '_');
+  return [
+    {
+      name: `{urn:healthit-gov:qdm:v${ver}}Patient`,
+      type: 'NamedTypeSpecifier',
+    },
+    { name: '{urn:hl7-org:elm-types:r1}Tuple', type: 'NamedTypeSpecifier' },
+    { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' },
+  ];
+};
+
 // Returns an array of elements that exist on this patient. Optionally
 // takes a qdmCategory, which returns all elements of that QDM qdmCategory.
 // Example: patient.getDataElements({qdmCategory: 'encounters'}) will return