Merge pull request #39 from standardhealth/cimpl6-import

CIMPL6 Import
standardhealth · Jun 5, 2019 · 59be131 · 59be131
2 parents f1e3350 + 228a8ce
commit 59be131
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 187 deletions.
diff --git a/lib/models.js b/lib/models.js
@@ -168,7 +168,7 @@ class DataElementSpecifications {
       if (id.isEntryKeyWord) {
         [namespace, name] = ['shr.base', 'Entry'];
       } else if (id.isConceptKeyWord) {
-        [namespace, name] = ['shr.core', 'CodeableConcept'];
+        [namespace, name] = ['primitive', 'concept'];
       }
     }
     if (this._nsMap.has(namespace)) {
@@ -1012,7 +1012,7 @@ class Constraint {
   }
 }
 
-// ValueSetConstraint only makes sense on a code or Coding type value
+// ValueSetConstraint only makes sense on a concept type value
 class ValueSetConstraint extends Constraint {
 
   constructor(valueSet, path, bindingStrength=REQUIRED) {
@@ -1061,7 +1061,7 @@ class ValueSetConstraint extends Constraint {
   }
 }
 
-// CodeConstraint only makes sense on a code or Coding type value
+// CodeConstraint only makes sense on a concept type value
 class CodeConstraint extends Constraint {
 
   constructor(code, path) {
@@ -1099,7 +1099,7 @@ class CodeConstraint extends Constraint {
   }
 }
 
-// IncludesCodeConstraint only makes sense on an array of code or Coding
+// IncludesCodeConstraint only makes sense on an array of concept
 class IncludesCodeConstraint extends Constraint {
 
   constructor(code, path) {
@@ -1889,23 +1889,6 @@ class IdentifiableValue extends Value {
   }
 }
 
-class RefValue extends IdentifiableValue {
-
-  constructor(identifier) {
-    super(identifier);
-  }
-
-  clone() {
-    const clone = new RefValue();
-    super._clonePropertiesTo(clone);
-    return clone;
-  }
-
-  toString() {
-    return `ref(${this.identifier.name})`;
-  }
-}
-
 class ChoiceValue extends Value {
 
 
@@ -2751,11 +2734,11 @@ const EXAMPLE = 'EXAMPLE';
 
 // Primitive constants
 const PRIMITIVE_NS = 'primitive';
-const PRIMITIVES = ['boolean', 'integer', 'decimal', 'unsignedInt', 'positiveInt', 'string', 'markdown', 'code', 'id',
+const PRIMITIVES = ['boolean', 'integer', 'decimal', 'unsignedInt', 'positiveInt', 'string', 'markdown', 'concept', 'id',
   'oid', 'uri', 'base64Binary', 'date', 'dateTime', 'instant', 'time', 'xhtml'];
 
 // Inheritance constants
 const INHERITED = 'inherited';
 const OVERRIDDEN = 'overridden';
 
-module.exports = {Specifications, NamespaceSpecifications, DataElementSpecifications, ContentProfileSpecifications, Namespace, DataElement, ContentProfile, ContentProfileRule, Concept, Identifier, PrimitiveIdentifier, Value, IdentifiableValue, RefValue, ChoiceValue, IncompleteValue, TBD, ConstraintsFilter, ConstraintHistory, Cardinality, ValueSetConstraint, CodeConstraint, IncludesCodeConstraint, BooleanConstraint, TypeConstraint, IncludesTypeConstraint, CardConstraint, ValueSet, ValueSetIncludesCodeRule, ValueSetIncludesDescendentsRule, ValueSetExcludesDescendentsRule, ValueSetIncludesFromCodeSystemRule, ValueSetIncludesFromCodeRule, CodeSystem, ElementMapping, FieldMappingRule, CardinalityMappingRule, FixedValueMappingRule, Version, PRIMITIVE_NS, PRIMITIVES, VERSION, GRAMMAR_VERSION, REQUIRED, EXTENSIBLE, PREFERRED, EXAMPLE, INHERITED, OVERRIDDEN, MODELS_INFO, sanityCheckModules};
+module.exports = {Specifications, NamespaceSpecifications, DataElementSpecifications, ContentProfileSpecifications, Namespace, DataElement, ContentProfile, ContentProfileRule, Concept, Identifier, PrimitiveIdentifier, Value, IdentifiableValue, ChoiceValue, IncompleteValue, TBD, ConstraintsFilter, ConstraintHistory, Cardinality, ValueSetConstraint, CodeConstraint, IncludesCodeConstraint, BooleanConstraint, TypeConstraint, IncludesTypeConstraint, CardConstraint, ValueSet, ValueSetIncludesCodeRule, ValueSetIncludesDescendentsRule, ValueSetExcludesDescendentsRule, ValueSetIncludesFromCodeSystemRule, ValueSetIncludesFromCodeRule, CodeSystem, ElementMapping, FieldMappingRule, CardinalityMappingRule, FixedValueMappingRule, Version, PRIMITIVE_NS, PRIMITIVES, VERSION, GRAMMAR_VERSION, REQUIRED, EXTENSIBLE, PREFERRED, EXAMPLE, INHERITED, OVERRIDDEN, MODELS_INFO, sanityCheckModules};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shr-models",
-  "version": "5.9.0",
+  "version": "6.0.0",
   "description": "Models used to represent SHR namespaces, data elements, value sets, code systems, and mappings for import/export",
   "author": "",
   "license": "Apache-2.0",

diff --git a/test/canon-json-test.js b/test/canon-json-test.js
@@ -42,17 +42,6 @@ describe('#CanonicalJSON.DataElements.core', () => {
     expect(outputJson).to.deep.equal(fixtureJson);
   });
 
-  it('should correctly generate a simple element with a reference', () => {
-    let de = new simpleDE('shr.test', 'SimpleReference', true, false)
-            .withValue(new mdl.RefValue(id('shr.test', 'Simple')).withMinMax(1, 1))
-            .withDescription('It is a reference to a simple element');
-
-    let outputJson = de.toJSON();
-    let fixtureJson = importDataElementFixture('SimpleReference');
-
-    expect(outputJson).to.deep.equal(fixtureJson);
-  });
-
   it('should correctly generate an element with a multi-string value', () => {
     let de = new simpleDE('shr.test', 'MultiString', true, false)
             .withDescription('It is a multi-string entry')
@@ -102,7 +91,7 @@ describe('#CanonicalJSON.DataElements.core', () => {
 
   it('should correctly generate an entry element with a coded value', () => {
     let de = new simpleDE('shr.test', 'SimpleCoded', true, false)
-         .withValue(new mdl.IdentifiableValue(pid('code')).withMinMax(1, 1));
+         .withValue(new mdl.IdentifiableValue(pid('concept')).withMinMax(1, 1));
 
     let outputJson = de.toJSON();
     let fixtureJson = importDataElementFixture('SimpleCoded');
@@ -216,8 +205,8 @@ describe('#DataElements.constraints', () => {
 
     let de = new mdl.DataElement(id('shr.test', 'CodeConstraintOnField'), true, false)
             .withField(new mdl.IdentifiableValue(id('shr.test', 'Simple')).withMinMax(0, 1))
-            .withField(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(0, 1)
-                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('code')]))
+            .withField(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(0, 1)
+                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -233,7 +222,7 @@ describe('#DataElements.constraints', () => {
     let de = new mdl.DataElement(id('shr.test', 'CodeConstraintOnFieldChild'), true, false)
             .withField(new mdl.IdentifiableValue(id('shr.test', 'Simple')).withMinMax(0, 1))
             .withField(new mdl.IdentifiableValue(id('shr.test', 'CodedFromValueSet')).withMinMax(0, 1)
-                .withConstraint(new mdl.CodeConstraint(defaultCode, [id('shr.test','Coding'), pid('code')]))
+                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -247,8 +236,8 @@ describe('#DataElements.constraints', () => {
     let defaultCode = new mdl.Concept('http://foo.org', 'bar');
 
     let de = new mdl.DataElement(id('shr.test', 'CodeConstraintOnValue'), true, false)
-            .withValue(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(1, 1)
-                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('code')]))
+            .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(1, 1)
+                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -263,7 +252,7 @@ describe('#DataElements.constraints', () => {
 
     let de = new mdl.DataElement(id('shr.test', 'CodeConstraintOnValueChild'), true, false)
             .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedFromValueSet')).withMinMax(1, 1)
-                .withConstraint(new mdl.CodeConstraint(defaultCode, [id('shr.test','Coding'), pid('code')]))
+                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -277,8 +266,8 @@ describe('#DataElements.constraints', () => {
     let defaultCode = new mdl.Concept(null, 'bar');
 
     let de = new mdl.DataElement(id('shr.test', 'SystemlessCodeConstraintOnValue'), true, false)
-            .withValue(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(1, 1)
-                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('code')]))
+            .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(1, 1)
+                .withConstraint(new mdl.CodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -294,8 +283,8 @@ describe('#DataElements.constraints', () => {
     let defaultCode = new mdl.Concept('http://foo.org', 'bar');
 
     let de = new mdl.DataElement(id('shr.test', 'IncludesCodeConstraintOnValue'), true, false)
-            .withValue(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(1)
-                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('code')]))
+            .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(1)
+                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -311,7 +300,7 @@ describe('#DataElements.constraints', () => {
     let de = new mdl.DataElement(id('shr.test', 'IncludesCodeConstraintOnFieldChild'), true, false)
             .withField(new mdl.IdentifiableValue(id('shr.test', 'Simple')).withMinMax(0, 1))
             .withField(new mdl.IdentifiableValue(id('shr.test', 'MultiCodedFromValueSet')).withMinMax(0, 1)
-                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [id('shr.test','Coding'), pid('code')]))
+                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -325,8 +314,8 @@ describe('#DataElements.constraints', () => {
     let defaultCode = new mdl.Concept('http://foo.org', 'bar');
 
     let de = new mdl.DataElement(id('shr.test', 'IncludesCodeConstraintOnValue'), true, false)
-            .withValue(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(1)
-                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('code')]))
+            .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(1)
+                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -341,7 +330,7 @@ describe('#DataElements.constraints', () => {
 
     let de = new mdl.DataElement(id('shr.test', 'IncludesCodeConstraintOnValueChild'), true, false)
             .withValue(new mdl.IdentifiableValue(id('shr.test', 'MultiCodedFromValueSet')).withMinMax(1, 1)
-                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [id('shr.test', 'Coding'), pid('code')]))
+                .withConstraint(new mdl.IncludesCodeConstraint(defaultCode, [pid('concept')]))
             );
 
     let outputJson = de.toJSON();
@@ -480,8 +469,8 @@ describe('#DataElements.constraints', () => {
     let TESTVS = 'http://standardhealthrecord.org/test/vs';
 
     let codedFromVS = new simpleDE('shr.test', 'CodedWithCodeFromValueSet', false, false)
-            .withValue(new mdl.IdentifiableValue(id('shr.test', 'Coding')).withMinMax(1, 1)
-            .withConstraint(new mdl.ValueSetConstraint(`${TESTVS}/Coded`, [pid('code')])));
+            .withValue(new mdl.IdentifiableValue(id('shr.test', 'CodedThing')).withMinMax(1, 1)
+            .withConstraint(new mdl.ValueSetConstraint(`${TESTVS}/Coded`, [pid('concept')])));
 
     let outputJson = codedFromVS.toJSON();
     let fixtureJson = importDataElementFixtureFromPath(['constraints', 'valuesetConstraints'], 'CodedWithCodeFromValueSet');
@@ -493,7 +482,7 @@ describe('#DataElements.constraints', () => {
     let TESTVS = 'http://standardhealthrecord.org/test/vs';
 
     let de = new simpleDE('shr.test', 'CodedFromValueSet', true, false)
-            .withValue(new mdl.IdentifiableValue(pid('code')).withMinMax(1, 1)
+            .withValue(new mdl.IdentifiableValue(pid('concept')).withMinMax(1, 1)
                 .withConstraint(new mdl.ValueSetConstraint(`${TESTVS}/Coded`)));
 
     let outputJson = de.toJSON();

diff --git a/test/fixtures/dataelements/SimpleCoded.json b/test/fixtures/dataelements/SimpleCoded.json
@@ -5,7 +5,7 @@
   "isEntry": true,
   "isAbstract": false,
   "value": {
-    "fqn": "code",
+    "fqn": "concept",
     "valueType": "IdentifiableValue",
     "card": {
       "min": 1,

diff --git a/test/fixtures/dataelements/SimpleReference.json b/test/fixtures/dataelements/SimpleReference.json
diff --git a/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnField.json b/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnField.json
@@ -14,15 +14,15 @@
       }
     },
     {
-      "fqn": "shr.test.Coding",
+      "fqn": "shr.test.CodedThing",
       "valueType": "IdentifiableValue",
       "card": {
         "min": 0,
         "max": 1
       },
       "constraints": {
         "subpaths": {
-          "code": {
+          "concept": {
             "fixedValue": {
               "type": "code",
               "value": {

diff --git a/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnFieldChild.json b/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnFieldChild.json
@@ -22,16 +22,12 @@
       },
       "constraints": {
         "subpaths": {
-          "shr.test.Coding": {
-            "subpaths": {
-              "code": {
-                "fixedValue": {
-                  "type": "code",
-                  "value": {
-                    "system": "http://foo.org",
-                    "code": "bar"
-                  }
-                }
+          "concept": {
+            "fixedValue": {
+              "type": "code",
+              "value": {
+                "system": "http://foo.org",
+                "code": "bar"
               }
             }
           }

diff --git a/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnValue.json b/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnValue.json
@@ -5,15 +5,15 @@
   "isEntry": true,
   "isAbstract": false,
   "value": {
-    "fqn": "shr.test.Coding",
+    "fqn": "shr.test.CodedThing",
     "valueType": "IdentifiableValue",
     "card": {
       "min": 1,
       "max": 1
     },
     "constraints": {
       "subpaths": {
-        "code": {
+        "concept": {
           "fixedValue": {
             "type": "code",
             "value": {

diff --git a/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnValueChild.json b/test/fixtures/dataelements/constraints/codeConstraints/CodeConstraintOnValueChild.json
@@ -13,16 +13,12 @@
     },
     "constraints": {
       "subpaths": {
-        "shr.test.Coding": {
-          "subpaths": {
-            "code": {
-              "fixedValue": {
-                "type": "code",
-                "value": {
-                  "system": "http://foo.org",
-                  "code": "bar"
-                }
-              }
+        "concept": {
+          "fixedValue": {
+            "type": "code",
+            "value": {
+              "system": "http://foo.org",
+              "code": "bar"
             }
           }
         }

diff --git a/test/fixtures/dataelements/constraints/codeConstraints/SystemlessCodeConstraintOnValue.json b/test/fixtures/dataelements/constraints/codeConstraints/SystemlessCodeConstraintOnValue.json
@@ -5,15 +5,15 @@
   "isEntry": true,
   "isAbstract": false,
   "value": {
-    "fqn": "shr.test.Coding",
+    "fqn": "shr.test.CodedThing",
     "valueType": "IdentifiableValue",
     "card": {
       "min": 1,
       "max": 1
     },
     "constraints": {
       "subpaths": {
-        "code": {
+        "concept": {
           "fixedValue": {
             "type": "code",
             "value": {

diff --git a/...tures/dataelements/constraints/includesCodeConstraints/IncludesCodeConstraintOnField.json b/...tures/dataelements/constraints/includesCodeConstraints/IncludesCodeConstraintOnField.json
@@ -14,14 +14,14 @@
       }
     },
     {
-      "fqn": "shr.test.Coding",
+      "fqn": "shr.test.CodedThing",
       "valueType": "IdentifiableValue",
       "card": {
         "min": 1
       },
       "constraints": {
         "subpaths": {
-          "code": {
+          "concept": {
             "includesCode": [
               {
                 "system": "http://foo.org",

diff --git a/.../dataelements/constraints/includesCodeConstraints/IncludesCodeConstraintOnFieldChild.json b/.../dataelements/constraints/includesCodeConstraints/IncludesCodeConstraintOnFieldChild.json
@@ -22,17 +22,13 @@
       },
       "constraints": {
         "subpaths": {
-          "shr.test.Coding": {
-            "subpaths": {
-              "code": {
-                "includesCode": [
-                  {
-                    "system": "http://foo.org",
-                    "code": "bar"
-                  }
-                ]
+          "concept": {
+            "includesCode": [
+              {
+                "system": "http://foo.org",
+                "code": "bar"
               }
-            }
+            ]
           }
         }
       }