@saber-usa/node-common 1.7.29 → 1.7.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber-usa/node-common",
-  "version": "1.7.29",
+  "version": "1.7.32",
   "description": "Common node functions for Saber",
   "main": "src/index.js",
   "type": "module",
@@ -23,7 +23,7 @@
   "author": "Saber USA",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1085.0",
+    "@aws-sdk/client-s3": "^3.1086.0",
     "date-fns": "^4.4.0",
     "lodash": "4.18.1",
     "mathjs": "^15.2.0",

package/src/astro.js

@@ -145,24 +145,24 @@ const validateTle = (line1, line2) => {
  * @return {boolean} true if the propagation output is valid, false otherwise
  */
 const isPropagateValid = (out) => {
-    if (out === null || out === undefined) {
+    if (!isDefined(out)) {
         return false;
     }
 
     if (out.position) {
         const pos = out.position;
-        if (pos.x === null || pos.x === undefined || Number.isNaN(pos.x)
-            || pos.y === null || pos.y === undefined || Number.isNaN(pos.y)
-            || pos.z === null || pos.z === undefined || Number.isNaN(pos.z)) {
+        if (!isDefined(pos.x) || Number.isNaN(pos.x)
+            || !isDefined(pos.y) || Number.isNaN(pos.y)
+            || !isDefined(pos.z) || Number.isNaN(pos.z)) {
             return false;
         }
     }
 
     if (out.velocity) {
         const vel = out.velocity;
-        if (vel.x === null || vel.x === undefined || Number.isNaN(vel.x)
-            || vel.y === null || vel.y === undefined || Number.isNaN(vel.y)
-            || vel.z === null || vel.z === undefined || Number.isNaN(vel.z)) {
+        if (!isDefined(vel.x) || Number.isNaN(vel.x)
+            || !isDefined(vel.y) || Number.isNaN(vel.y)
+            || !isDefined(vel.z) || Number.isNaN(vel.z)) {
             return false;
         }
     }
@@ -1391,7 +1391,7 @@ const GetElsetUdlFromTle = (
         // and we may be unsure of entering true or false for any reason.
         if (isBoolean(isUct)) {
             elset.uct = isUct;
-        } else if (isUct === null || isUct === undefined) {
+        } else if (!isDefined(isUct)) {
             // Do nothing, do not populate nor put null.
         } else {
             throw new Error("Input uct flag is not of type boolean.");

package/src/transform.js

@@ -1,4 +1,5 @@
 import _ from "lodash";
+import {isDefined} from "./utils.js";
 
 const transformObjectKeys = (transform, object, deep = true) => _.cond([
     [
@@ -32,4 +33,15 @@ const pascalCaseObjectKeys = (transformItem, deep) => transformObjectKeys(
     deep,
 );
 
-export {transformObjectKeys, lowerCaseObjectKeys, pascalCaseObjectKeys, pascalCase};
+// Write a true SQL NULL instead of the *string* "null" (JSON.stringify(null) === "null")
+// when a value is absent, so nullable JSON/TEXT columns stay unambiguously empty.
+const jsonOrNull = (value) => (isDefined(value) ? JSON.stringify(value) : null);
+
+// As jsonOrNull, but additionally rejects non-array values (e.g. a provider returning the
+// string "OTHER" in place of a real array), coercing them to null rather than serializing them.
+const jsonArrayOrNull = (value) => (Array.isArray(value) ? JSON.stringify(value) : null);
+
+export {
+    transformObjectKeys, lowerCaseObjectKeys, pascalCaseObjectKeys, pascalCase,
+    jsonOrNull, jsonArrayOrNull,
+};

package/src/udl.js

@@ -10,7 +10,7 @@ import {
     raDecToGeodetic,
     estimateSlantRange,
 } from "./astro.js";
-import {lowerCaseObjectKeys} from "./transform.js";
+import {lowerCaseObjectKeys, jsonArrayOrNull} from "./transform.js";
 import {isDefined} from "./utils.js";
 import _ from "lodash";
 
@@ -336,10 +336,6 @@ const udlToNpsState = (udlRow) => {
     const Yvel = _.get(udlRow, "yvel", null);
     const Zvel = _.get(udlRow, "zvel", null);
     const rawCov = _.get(udlRow, "cov", null );
-    // Guard against providers returning a non-array `cov` (e.g. the string "null" or "OTHER"
-    // in place of a real covariance matrix). Only ever serialize a real array or null, so the
-    // Covariance column always holds valid JSON that downstream JSON-array parsers can read.
-    const cov = Array.isArray(rawCov) ? rawCov : null;
     const covRefFrame = _.get(udlRow, "covReferenceFrame", null );
     let keplerians = {a: null, e: null, i: null, raan: null, w: null, f: null};
 
@@ -372,7 +368,10 @@ const udlToNpsState = (udlRow) => {
         Xvel: Xvel,
         Yvel: Yvel,
         Zvel: Zvel,
-        Covariance: JSON.stringify(cov),
+        // Guard against providers returning a non-array `cov` (e.g. the string "null" or
+        // "OTHER" in place of a real covariance matrix), and write a true SQL NULL rather
+        // than the string "null" when there is no covariance at all.
+        Covariance: jsonArrayOrNull(rawCov),
         CovarianceRefFrame: covRefFrame,
         SemiMajorAxis: keplerians.a,
         Eccentricity: keplerians.e,