Merge pull request #32 from ryma2fhir/ryma2fhir-patch-5

Update validate.test.ts
ryma2fhir · Jan 19, 2024 · e8b131f · e8b131f
2 parents 77a9cbd + 7bcbbb1
commit e8b131f
Showing 1 changed file with 46 additions and 34 deletions.
diff --git a/src/validate.test.ts b/src/validate.test.ts
@@ -1,7 +1,7 @@
 import {
     getFhirClientJSON, isIgnoreFile, isIgnoreFolder, NEW_LINE, testFile
 } from "./common.js";
-import * as fs from "fs";
+import * as fs from 'fs/promises';
 import {describe, expect, jest} from "@jest/globals";
 import axios, {AxiosInstance} from "axios";
 import * as console from "console";
@@ -18,40 +18,52 @@ const args = require('minimist')(process.argv.slice(2))
     let source = '../'
     let examples: string
 
-    function readStrictValidation() {
-    try {
-        // Read the content of the JSON file
-        const data = fs.readFileSync('./options.json', 'utf8');
-
-        // Parse the JSON content
-        const options = JSON.parse(data);
-
-        // Access the attribute value or default to true if not found
-        const strictValidation = options['strict-validation'] === undefined ? true : JSON.parse(options['strict-validation']);
-
-        // Print the value
-        console.log('Strict Validation:', strictValidation);
-
-        // Return the attribute value
-        return strictValidation;
-    } catch (error) {
-if (error.code === 'ENOENT') {
-            // File not found
-            console.error('Error: File not found, defaulting to true');
-        } else if (error instanceof SyntaxError) {
-            // JSON parsing error (attribute not found)
-            console.error('Error: Attribute not found in the JSON file, defaulting to true');
-        } else {
-            // Other errors
-            console.error('Error:', error);
-        }
+    function readStrictValidation(): Promise<boolean> {
+    return fs.readFile('options.json', 'utf8')
+        .then(data => {
+            const options: Record<string, string> = JSON.parse(data);
 
-        // Return true as the default value
-        return true;
-        }
-    }
-
-	const failOnWarning = readStrictValidation();
+            // Access the attribute value or default to true if not found
+            const strictValidation: boolean = options['strict-validation'] === undefined
+                ? true
+                : options['strict-validation'].toLowerCase() === 'true';
+
+            // Validate that strictValidation is either true or false
+            if (strictValidation !== true && strictValidation !== false) {
+                console.error('Error: Invalid value for strict-validation. Defaulting to true.');
+                return true;
+            }
+
+            // Print the value
+            console.log('Strict Validation:', strictValidation);
+
+            // Return the attribute value
+            return strictValidation;
+        })
+        .catch(error => {
+            if (error.code === 'ENOENT') {
+                // File not found
+                console.error('Error: File not found, defaulting to true');
+            } else if (error instanceof SyntaxError) {
+                // JSON parsing error (attribute not found)
+                console.error('Error: Attribute not found in the JSON file, defaulting to true');
+            } else {
+                // Other errors
+                console.error('Error:', error);
+            }
+
+            // Return true as the default value
+            return true;
+        });
+}
+
+// Assign the result to the variable failOnWarningPromise
+const failOnWarningPromise: Promise<boolean> = readStrictValidation();
+
+// Use the variable failOnWarningPromise as needed
+failOnWarningPromise.then(result => {
+    console.log('Fail on Warning:', result);
+});
 
     gitHubSummary += 'Strict validation: ' + failOnWarning + NEW_LINE;