cqm-models 4.1.0 → 4.2.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "4.1.0",
+  "version": "4.1.3",
   "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,21 +16,25 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "~2.4.1",
-    "mongoose": "^5.13.12"
+    "cql-execution": "2.4.1",
+    "mongoose": "^5.13.20"
   },
   "devDependencies": {
-    "browserify": "^16.1.0",
-    "eslint": "^7.0.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.8.0",
-    "jasmine": "^2.9.0",
-    "nyc": "^15.1.0"
+    "browserify": "^17.0.0",
+    "eslint": "^8.53.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "jest": "^29.7.0"
+  },
+  "resolutions": {
+    "browserify-sign": "^4.2.2",
+    "semver": "^7.5.4",
+    "@babel/traverse": "^7.23.3"
   },
   "scripts": {
     "prepublish": "./bin/build_cql_execution.sh",
-    "test": "jasmine",
-    "coverage": "nyc npm run test",
+    "test": "npx jest",
+    "coverage": "npx jest --coverage",
     "lint": "eslint 'app/assets/javascripts/**/*.js'",
     "dist": "yarn && browserify app/assets/javascripts/index.js > dist/index.js",
     "browser": "browserify app/assets/javascripts/browser.js > dist/browser.js",

data/templates/mongoose_template.js.erb

@@ -112,6 +112,23 @@ function <%= datatype %>SchemaFunction(add, options) {
     extended.add(add);
   }
 
+  /* eslint no-underscore-dangle: 0 */
+  extended.methods._is = function _is(typeSpecifier) {
+    return this._typeHierarchy().some(
+      t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+    );
+  };
+
+  extended.methods._typeHierarchy = function _typeHierarchy() {
+    const typeName = this._type.replace(/QDM::/, '');
+    const ver = this.qdmVersion.replace('.', '_');
+    return [
+      {
+        name: `{urn:healthit-gov:qdm:v${ver}}${typeName}`,
+        type: 'NamedTypeSpecifier',
+      },
+    ];
+  };
   return extended;
 }
 <% end %>

data/templates/patient_template.js.erb

@@ -3,6 +3,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const AnyEntity = require('./basetypes/AnyEntity');
 const AllDataElements = require('./AllDataElements');
 
 const [Schema, Number, String, Mixed] = [
@@ -94,6 +95,12 @@ QDMPatientSchema.methods.getDataElements = function getDataElements(params) {
   return this.dataElements;
 };
 
+QDMPatientSchema.methods.addMethodsTo = function addMethodsTo(obj, methods) {
+  Object.entries(methods).forEach(([method_name, method]) => {
+    obj[method_name] = method;
+  });
+};
+
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
 // @param {string} profile - the data criteria requested by the execution engine
@@ -105,10 +112,26 @@ QDMPatientSchema.methods.getByProfile = function getByProfile(profile, isNegated
   // If isNegated == null, return all matching data elements by type, regardless of negationRationale.
   const results = this.dataElements.filter(element => (element._type === `QDM::${profile}` || element._type === profile) && (isNegated === null || !!element.negationRationale === isNegated));
   return results.map((result) => {
+    // we need to convert mongoose document to an object.
+    // This is required for comparing the two objects(in cql-execution) as we can't compare two mongoose documents.
     const removedMongooseItems = new AllDataElements[profile](result).toObject({ virtuals: true });
     // toObject() will remove all mongoose functions but also remove the schema methods, so we add them back
-    Object.entries(result.schema.methods).forEach(([method_name, method]) => {
-      removedMongooseItems[method_name] = method;
+    this.addMethodsTo(removedMongooseItems, result.schema.methods);
+    // add methods to entities
+    Object.entries(result).forEach(([key, values]) => {
+      // entities are always an array
+      if (Array.isArray(values)) {
+        try {
+          // check if the attribute is of Entity
+          if (AnyEntity.prototype.cast(values[0])) {
+            values.forEach((value, index) => {
+              const entity = removedMongooseItems[key][index];
+              this.addMethodsTo(entity, value.schema.methods);
+            });
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {}
+      }
     });
     return removedMongooseItems;
   });