cqm-models 4.0.0 → 4.0.1

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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/patient_template.js.erb

@@ -56,6 +56,30 @@ 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}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