Fix paths to be full resolves; fixed one loadVS test

Author: Dtphelan1

src/helpers/cancerStagingUtils.js

@@ -2,7 +2,7 @@ const path = require('path');
 const { checkCodeInVs } = require('./valueSetUtils');
 
 function isCancerStagingSystem(code) {
-  const cancerStagingSystemVSPath = path.resolve(__dirname, './valueSets/ValueSet-mcode-cancer-staging-system-vs.json');
+  const cancerStagingSystemVSPath = path.resolve(__dirname, 'valueSets', 'ValueSet-mcode-cancer-staging-system-vs.json');
   return checkCodeInVs(code, cancerStagingSystemVSPath);
 }
 

src/helpers/conditionUtils.js

@@ -24,7 +24,7 @@ function getICD10Code(condition) {
  * @return {boolean} if primary cancer condition
  */
 function isConditionCodePrimary(code) {
-  const primaryCancerConditionVSFilepath = path.resolve(__dirname, './valueSets/ValueSet-mcode-primary-or-uncertain-behavior-cancer-disorder-vs.json');
+  const primaryCancerConditionVSFilepath = path.resolve(__dirname, 'valueSets', 'ValueSet-mcode-primary-or-uncertain-behavior-cancer-disorder-vs.json');
   return checkCodeInVs(code, primaryCancerConditionVSFilepath);
 }
 
@@ -34,7 +34,7 @@ function isConditionCodePrimary(code) {
  * @return {boolean} if secondary cancer condition
  */
 function isConditionCodeSecondary(code) {
-  const secondaryCancerConditionVSFilepath = path.resolve(__dirname, './valueSets/ValueSet-mcode-secondary-cancer-disorder-vs.json');
+  const secondaryCancerConditionVSFilepath = path.resolve(__dirname, 'valueSets', 'ValueSet-mcode-secondary-cancer-disorder-vs.json');
   return checkCodeInVs(code, secondaryCancerConditionVSFilepath);
 }
 

src/helpers/observationUtils.js

@@ -20,7 +20,7 @@ const vitalSignsCodeToTextLookup = {
 
 
 function isTumorMarker(code) {
-  const tumorMarkerTestVSPath = path.resolve(__dirname, './valueSets/ValueSet-mcode-tumor-marker-test-vs.json');
+  const tumorMarkerTestVSPath = path.resolve(__dirname, 'valueSets', 'ValueSet-mcode-tumor-marker-test-vs.json');
   return checkCodeInVs(code, tumorMarkerTestVSPath);
 }
 

src/helpers/valueSetUtils.js

@@ -46,7 +46,7 @@ const checkCodeInVs = (code, valueSetFilePath, typeOfVS = vsTypes.json) => {
   let inVSExpansion = false;
   let inVSCompose = false;
   if (valueSet.expansion) {
-    // If valueSet has expansion, we only need to check these codes since everything in compose is in expansion
+    // If valueSet has expansion, we only need to check these codes
     inVSExpansion = valueSet.expansion.contains.some((containsItem) => {
       if (!code || !containsItem) return false;
       // return code.system === containsItem.system && code === containsItem.code;

test/helpers/valueSetUtils.test.js

@@ -23,7 +23,7 @@ describe('valueSetUtils', () => {
       expect(() => loadJsonVs('./path/does/not/exist')).toThrow();
     });
     test('should load from the supplied filepath', () => {
-      const valueSetFilePath = path.resolve(__dirname, './fixtures/valueset-without-expansion.json');
+      const valueSetFilePath = path.resolve(__dirname, 'fixtures', 'valueset-without-expansion.json');
       expect(loadJsonVs(valueSetFilePath)).toEqual(exampleValueSet);
     });
   });
@@ -39,17 +39,17 @@ describe('valueSetUtils', () => {
       expect(() => loadVs(undefined, vsTypes.newType)).toThrow();
     });
     test('Should load a vs properly for json', () => {
-      const valueSetFilePath = path.resolve(__dirname, './fixtures/valueset-without-expansion.json');
-      expect(loadJsonVs(valueSetFilePath, vsTypes.json)).toEqual(exampleValueSet);
+      const valueSetFilePath = path.resolve(__dirname, 'fixtures', 'valueset-without-expansion.json');
+      expect(loadVs(valueSetFilePath, vsTypes.json)).toEqual(exampleValueSet);
     });
   });
 
   describe('checkCodeInVs', () => {
     const includesCode = 'C00.0';
     const expansionCode = 'C00.1';
     const missingCode = 'C12.34';
-    const vsPath = path.resolve(__dirname, './fixtures/valueset-without-expansion.json');
-    const vsWithExpansionPath = path.resolve(__dirname, './fixtures/valueset-with-expansion.json');
+    const vsPath = path.resolve(__dirname, 'fixtures', 'valueset-without-expansion.json');
+    const vsWithExpansionPath = path.resolve(__dirname, 'fixtures', 'valueset-with-expansion.json');
     test('Should throw when not provided a vs', () => {
       expect(() => checkCodeInVs(includesCode, undefined)).toThrow();
     });