@lhncbc/ucum-lhc 4.1.6 → 4.1.8

package/source-cjs/unitString.js

@@ -11,6 +11,8 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /**
  * This class handles the parsing of a unit string into a unit object
  */
@@ -64,6 +66,8 @@ class UnitString {
 
     this.suggestions = [];
   } // end constructor
+  // The start of an error message about an invalid annotation character.
+
 
   /**
    * Sets the emphasis strings to the HTML used in the webpage display - or
@@ -72,8 +76,6 @@ class UnitString {
    * @param use flag indicating whether or not to use the html message format;
    *  defaults to true
    */
-
-
   useHTMLInMessages(use) {
     if (use === undefined || use) {
       this.openEmph_ = Ucum.openEmphHTML_;
@@ -194,7 +196,7 @@ class UnitString {
       } // end if blanks were found in the string
       // assign the array returned to retObj.  It will contain 2 elements:
       //  the unit returned in position 0; and the origString (possibly
-      //  modified in position 1.  The origString in position 1 will not
+      //  modified) in position 1.  The origString in position 1 will not
       //  be changed by subsequent processing.
 
 
@@ -369,18 +371,28 @@ class UnitString {
         this.retMsg_.push('Missing closing brace for annotation starting at ' + this.openEmph_ + uString.substr(openBrace) + this.closeEmph_);
         openBrace = -1;
       } else {
-        let braceStr = uString.substring(openBrace, closeBrace + 1);
-        let aIdx = this.annotations_.length.toString();
-        uString = uString.replace(braceStr, this.braceFlag_ + aIdx + this.braceFlag_);
-        this.annotations_.push(braceStr);
-        openBrace = uString.indexOf('{');
+        let braceStr = uString.substring(openBrace, closeBrace + 1); // Check for valid characters in the annotation.
+
+        if (!UnitString.VALID_ANNOTATION_REGEX.test(braceStr)) {
+          this.retMsg_.push(UnitString.INVALID_ANNOTATION_CHAR_MSG + this.openEmph_ + braceStr + this.closeEmph_);
+          openBrace = -1; // end search for annotations
+        } else {
+          let aIdx = this.annotations_.length.toString();
+          uString = uString.replace(braceStr, this.braceFlag_ + aIdx + this.braceFlag_);
+          this.annotations_.push(braceStr);
+          openBrace = uString.indexOf('{');
+        }
       }
     } // end do while we have an opening brace
     // check for a stray/unmatched closing brace
 
 
-    let closeBrace = uString.indexOf('}');
-    if (closeBrace >= 0) this.retMsg_.push('Missing opening brace for closing brace found at ' + this.openEmph_ + uString.substring(0, closeBrace + 1) + this.closeEmph_);
+    if (this.retMsg_.length == 0) {
+      // if there were no other errors above
+      let closeBrace = uString.indexOf('}');
+      if (closeBrace >= 0) this.retMsg_.push('Missing opening brace for closing brace found at ' + this.openEmph_ + uString.substring(0, closeBrace + 1) + this.closeEmph_);
+    }
+
     return uString;
   } // end _getAnnotations
 
@@ -1142,7 +1154,14 @@ class UnitString {
                   uCode = uCode.substr(1); // try one more time for the unit
 
                   origUnit = this.utabs_.getUnitByCode(uCode);
-                }
+                } // Reject the unit we found if it might have another prefix.
+                // Such things are in our tables through the LOINC source_
+                // (ucum.csv) which has guidance and synonyms.  I think it should be
+                // safe to exclude anything whose source is LOINC from having a
+                // prefix.
+
+
+                if (origUnit && origUnit.source_ == 'LOINC') origUnit = null;
               } // end if we found a prefix
 
             } // end if we didn't get a unit after removing an exponent
@@ -1163,8 +1182,11 @@ class UnitString {
             } else {
               // Otherwise we found a unit object.  Clone it and then apply the
               // prefix and exponent, if any, to it.  And remove the guidance.
-              retUnit = origUnit.clone();
-              retUnit.guidance_ = '';
+              retUnit = origUnit.clone(); // If we are here, this is only part of the full unit string, so it is
+              // not a base unit, and the synonyms will mostly likely not be correct for the full
+              // string.
+
+              retUnit.resetFieldsForDerivedUnit();
               let theDim = retUnit.getProperty('dim_');
               let theMag = retUnit.getProperty('magnitude_');
               let theName = retUnit.getProperty('name_');
@@ -1499,6 +1521,11 @@ class UnitString {
 
 exports.UnitString = UnitString;
 
+_defineProperty(UnitString, "INVALID_ANNOTATION_CHAR_MSG", 'An invalid character was found in the annotation ');
+
+// A regular expression for validating annotation strings.
+_defineProperty(UnitString, "VALID_ANNOTATION_REGEX", /^\{[!-z|~]*\}$/);
+
 UnitString.getInstance = function () {
   return new UnitString();
 };