@saber-usa/node-common 1.7.33 → 1.7.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber-usa/node-common",
-  "version": "1.7.33",
+  "version": "1.7.35",
   "description": "Common node functions for Saber",
   "main": "src/index.js",
   "type": "module",
@@ -15,7 +15,7 @@
     "test:wasmProp": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.wasmProp.js --no-coverage --silent --runInBand",
     "test:all": "npm test && npm run test:wasmProp",
     "bench:wasmProp": "node benchmarks/benchmarkBulkPropagator.js",
-    "sonar": "sonar -Dsonar.host.url=http://localhost:9000"
+    "sonar": "sonar-scanner-npm -Dsonar.host.url=http://localhost:9000"
   },
   "files": [
     "src/**/*"
@@ -23,7 +23,7 @@
   "author": "Saber USA",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1088.0",
+    "@aws-sdk/client-s3": "^3.1092.0",
     "date-fns": "^4.4.0",
     "lodash": "4.18.1",
     "mathjs": "^15.2.0",
@@ -39,10 +39,10 @@
     "@babel/preset-env": "^8.0.2",
     "@eslint/js": "^10.0.1",
     "@jest/globals": "^30.4.1",
-    "@sonar/scan": "^4.4.0",
+    "@sonar/scan": "^5.0.0",
     "cross-env": "^10.1.0",
     "eslint": "^10.7.0",
-    "eslint-plugin-jest": "^29.15.4",
+    "eslint-plugin-jest": "^29.15.5",
     "globals": "^17.7.0",
     "jest": "^30.4.2",
     "jest-diff": "^30.4.1",
@@ -50,6 +50,7 @@
   },
   "overrides": {
     "braces": "3.0.3",
+    "brace-expansion": "2.1.2",
     "lodash": "4.18.1"
   }
 }

package/src/astro.js

@@ -48,7 +48,6 @@ import {DEG2RAD,
 import TLEValidator from "./tle/TLEValidator.js";
 import MultiLineTLEValidator from "./tle/MultiLineTLEValidator.js";
 import {TLE_ERRORS} from "./tle/tleErrors.js";
-import {TleParseUtils} from "./tle/TleParseUtils.js";
 
 // Solar Terminator
 // Returns sun latitude and longitude as -180/180
@@ -146,24 +145,24 @@ const validateTle = (line1, line2) => {
  * @return {boolean} true if the propagation output is valid, false otherwise
  */
 const isPropagateValid = (out) => {
-    if (!isDefined(out)) {
+    if (out === null || out === undefined) {
         return false;
     }
 
     if (out.position) {
         const pos = out.position;
-        if (!isDefined(pos.x) || Number.isNaN(pos.x)
-            || !isDefined(pos.y) || Number.isNaN(pos.y)
-            || !isDefined(pos.z) || Number.isNaN(pos.z)) {
+        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)) {
             return false;
         }
     }
 
     if (out.velocity) {
         const vel = out.velocity;
-        if (!isDefined(vel.x) || Number.isNaN(vel.x)
-            || !isDefined(vel.y) || Number.isNaN(vel.y)
-            || !isDefined(vel.z) || Number.isNaN(vel.z)) {
+        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)) {
             return false;
         }
     }
@@ -1392,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 (!isDefined(isUct)) {
+        } else if (isUct === null || isUct === undefined) {
             // Do nothing, do not populate nor put null.
         } else {
             throw new Error("Input uct flag is not of type boolean.");
@@ -1424,7 +1423,7 @@ const GetElsetUdlFromTle = (
         const date = julianToGregorian(satrec.jdsatepoch);
         elset.epoch = date.toISOString();
 
-        elset.satNo = TleParseUtils.getSatnoFromTle(satrec.satnum);
+        elset.satNo = Number.parseInt(satrec.satnum);
 
         // Eccentricity
         elset.eccentricity = satrec.ecco;

package/src/index.js

@@ -11,7 +11,6 @@ export * from "./OrbitUtils.js";
 export * from "./PropagateUtils.js";
 export * from "./ballisticPropagator.js";
 export * from "./NodeVector3D.js";
-export * from "./tle/TleParseUtils.js";
 
 // UDL exports are grouped; re-export individually and as namespace if needed
 import * as udl from "./udl.js";
@@ -31,7 +30,6 @@ import * as OrbitUtilsNS from "./OrbitUtils.js";
 import * as PropagateUtilsNS from "./PropagateUtils.js";
 import * as ballisticPropagatorNS from "./ballisticPropagator.js";
 import * as NodeVector3DNS from "./NodeVector3D.js";
-import * as TleParseUtilsNS from "./tle/TleParseUtils.js";
 
 const aggregate = {
     ...loggerFactoryNS,
@@ -46,7 +44,6 @@ const aggregate = {
     ...PropagateUtilsNS,
     ...ballisticPropagatorNS,
     ...NodeVector3DNS,
-    ...TleParseUtilsNS,
     ...udl,
 };
 

package/src/tle/TLEValidator.js

@@ -1,13 +1,12 @@
 import {formatChecksumError, formatLengthError, TLE_ERRORS} from "./tleErrors.js";
-import {TleParseUtils} from "./TleParseUtils.js";
 
 /**
  * NORAD TLE line-pair validator.
  * Logic derived from whatswrongwithmytle.com (Dr. TS Kelso's field guide).
- * Catalog-number grammar is owned by TleParseUtils (Alpha-5 aware).
  */
 class TLEValidator {
     constructor() {
+        this.lineOneRegexCatalogNumber = /[0-Z]{5}[CSU]/;
         this.lineOneRegexInternationalDesignator = / (\d{5}[A-Z][ A-Z]{2}|\d{5}[ A-Z]{2}[A-Z]| {8})/;
         this.lineOneRegexEpoch = / \d{5}\.\d{8}/;
         this.lineOneRegexDMeanMotion = / [ +-]\.\d{8}/;
@@ -16,6 +15,7 @@ class TLEValidator {
         this.lineOneRegexEphemType = / [0-5]/;
         this.lineOneRegexSetNumber = / [ \d]{3}\d/;
 
+        this.lineTwoRegexCatalogNumber = /[0-Z]{5}/;
         this.lineTwoRegexInclination = / [ \d]{3}\.\d{4}/;
         this.lineTwoRegexRAAN = / [ \d]{3}\.\d{4}/;
         this.lineTwoRegexEccentricity = / \d{7}/;
@@ -57,8 +57,7 @@ class TLEValidator {
         if (line.length < 69) {
             return formatLengthError(TLE_ERRORS.LINE1_LENGTH, line.length);
         }
-        if (!TleParseUtils.isValidSatelliteNumberField(line.slice(2, 7))
-            || !/[CSU]/.test(line.slice(7, 8))) {
+        if (!this.lineOneRegexCatalogNumber.test(line.slice(2, 8))) {
             return TLE_ERRORS.LINE1_CATALOG_NUMBER;
         }
         if (!this.lineOneRegexInternationalDesignator.test(line.slice(8, 17))) {
@@ -97,7 +96,7 @@ class TLEValidator {
         if (line.length < 69) {
             return formatLengthError(TLE_ERRORS.LINE2_LENGTH, line.length);
         }
-        if (!TleParseUtils.isValidSatelliteNumberField(line.slice(2, 7))) {
+        if (!this.lineTwoRegexCatalogNumber.test(line.slice(2, 7))) {
             return TLE_ERRORS.LINE2_CATALOG_NUMBER;
         }
         if (!this.lineTwoRegexInclination.test(line.slice(7, 16))) {

package/src/transform.js

@@ -1,5 +1,4 @@
 import _ from "lodash";
-import {isDefined} from "./utils.js";
 
 const transformObjectKeys = (transform, object, deep = true) => _.cond([
     [
@@ -33,15 +32,4 @@ const pascalCaseObjectKeys = (transformItem, deep) => transformObjectKeys(
     deep,
 );
 
-// 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,
-};
+export {transformObjectKeys, lowerCaseObjectKeys, pascalCaseObjectKeys, pascalCase};

package/src/udl.js

@@ -10,7 +10,7 @@ import {
     raDecToGeodetic,
     estimateSlantRange,
 } from "./astro.js";
-import {lowerCaseObjectKeys, jsonArrayOrNull} from "./transform.js";
+import {lowerCaseObjectKeys} from "./transform.js";
 import {isDefined} from "./utils.js";
 import _ from "lodash";
 
@@ -335,7 +335,7 @@ const udlToNpsState = (udlRow) => {
     const Xvel = _.get(udlRow, "xvel", null); // kilometers/second
     const Yvel = _.get(udlRow, "yvel", null);
     const Zvel = _.get(udlRow, "zvel", null);
-    const rawCov = _.get(udlRow, "cov", null );
+    const cov = _.get(udlRow, "cov", null );
     const covRefFrame = _.get(udlRow, "covReferenceFrame", null );
     let keplerians = {a: null, e: null, i: null, raan: null, w: null, f: null};
 
@@ -368,10 +368,7 @@ const udlToNpsState = (udlRow) => {
         Xvel: Xvel,
         Yvel: Yvel,
         Zvel: Zvel,
-        // 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),
+        Covariance: JSON.stringify(cov),
         CovarianceRefFrame: covRefFrame,
         SemiMajorAxis: keplerians.a,
         Eccentricity: keplerians.e,

package/src/tle/TleParseUtils.js

@@ -1,147 +0,0 @@
-/**
- * Utility class for TLE parsing, including Alpha-5 TLE satellite IDs.
- * Ported from org.orekit.propagation.analytical.tle.ParseUtils / TLE.
- *
- * Alpha-5 extends the range of existing 5-digit TLE satellite numbers
- * by allowing the first digit to be an upper case letter, ignoring 'I'
- * and 'O' to avoid confusion with numbers '1' and '0'.
- *
- * @see https://www.space-track.org/documentation#tle-alpha5
- */
-export class TleParseUtils {
-    /** Maximum satellite number representable with 5 numeric digits. */
-    static MAX_NUMERIC_SATNUM = 99999;
-
-    /** Scaling factor for Alpha-5 numbers. */
-    static ALPHA5_SCALING = 10000;
-
-    /** Letter → number map for Alpha-5 satellite numbers. */
-    static ALPHA5_NUMBERS = new Map();
-
-    /** Number → letter map for Alpha-5 satellite numbers. */
-    static ALPHA5_LETTERS = new Map();
-
-    static {
-        const alpha5Letters = [
-            "A", "B", "C", "D", "E", "F", "G", "H", "J",
-            "K", "L", "M", "N", "P", "Q", "R", "S", "T",
-            "U", "V", "W", "X", "Y", "Z",
-        ];
-        for (let i = 0; i < alpha5Letters.length; ++i) {
-            TleParseUtils.ALPHA5_NUMBERS.set(alpha5Letters[i], i + 10);
-            TleParseUtils.ALPHA5_LETTERS.set(i + 10, alpha5Letters[i]);
-        }
-    }
-
-    /** Private constructor for a utility class. */
-    constructor() {
-        throw new Error("TleParseUtils is a utility class and cannot be instantiated");
-    }
-
-    /**
-     * True if token is a valid 5-char TLE catalog field:
-     * five digits, or Alpha-5 letter (no I/O) plus four digits.
-     * @param {string} token
-     * @return {boolean}
-     */
-    static isValidSatelliteNumberField(token) {
-        if (typeof token !== "string" || token.length !== 5) {
-            return false;
-        }
-        if (/^\d{5}$/.test(token)) {
-            return true;
-        }
-        if (!TleParseUtils.ALPHA5_NUMBERS.has(token.charAt(0))) {
-            return false;
-        }
-        return /^\d{4}$/.test(token.substring(1));
-    }
-
-    /**
-     * Stricter int parser: accepts an optional sign plus digits only, else throws.
-     * Unlike Number.parseInt, rejects partial parses (e.g. "12abc").
-     * @param {string} string
-     * @return {number}
-     */
-    static #strictParseInt(string) {
-        if (!/^[+-]?\d+$/.test(string)) {
-            throw new Error(`Invalid integer: "${string}"`);
-        }
-        return Number.parseInt(string, 10);
-    }
-
-    /**
-     * Add padding characters to a string.
-     * Port of ParseUtils.addPadding.
-     * @param {string} name parameter name
-     * @param {string} string string to pad
-     * @param {string} c padding character
-     * @param {number} size desired size
-     * @param {boolean} rightJustified if true, pad on the left
-     * @param {number} satelliteNumber satellite number (for error context)
-     * @return {string} padded string
-     */
-    static addPadding(name, string, c, size, rightJustified, satelliteNumber) {
-        if (string.length > size) {
-            throw new Error(
-                `TLE invalid parameter: satelliteNumber=${satelliteNumber}, name=${name}, value=${string}`,
-            );
-        }
-
-        const padding = c.repeat(size);
-
-        if (rightJustified) {
-            const concatenated = padding + string;
-            const l = concatenated.length;
-            return concatenated.substring(l - size, l);
-        }
-
-        return (string + padding).substring(0, size);
-    }
-
-    /**
-     * Build an Alpha-5 (or numeric) satellite number field.
-     * Port of ParseUtils.buildSatelliteNumber.
-     * @param {number} satelliteNumber satellite number, that may exceed the 99999 limit
-     * @param {string} name parameter name (used in error messages)
-     * @return {string} satellite number in alpha5 / 5-digit representation
-     */
-    static buildSatelliteNumber(satelliteNumber, name) {
-        if (satelliteNumber > TleParseUtils.MAX_NUMERIC_SATNUM) {
-            const highDigits = Math.trunc(satelliteNumber / TleParseUtils.ALPHA5_SCALING);
-            const lowDigits = satelliteNumber - highDigits * TleParseUtils.ALPHA5_SCALING;
-
-            const alpha = TleParseUtils.ALPHA5_LETTERS.get(highDigits);
-            if (alpha === undefined) {
-                throw new Error(
-                    `TLE invalid parameter: satelliteNumber=${satelliteNumber}, name=${name}, value=null`,
-                );
-            }
-            return alpha + TleParseUtils.addPadding(
-                name, String(lowDigits), "0", 4, true, satelliteNumber,
-            );
-        }
-        return TleParseUtils.addPadding(
-            name, String(satelliteNumber), "0", 5, true, satelliteNumber,
-        );
-    }
-
-    /**
-     * Parse a satellite number from a string field (supports Alpha-5).
-     * Port of TLE.parseSatelliteNumber / ParseUtils.parseSatelliteNumber.
-     * @param {string} satNumberString the string to parse (e.g., "25544" or "A0001")
-     * @return {number} the satellite number as an integer
-     */
-    static getSatnoFromTle(satNumberString) {
-        if (!TleParseUtils.isValidSatelliteNumberField(satNumberString)) {
-            throw new Error(`Invalid satellite number field: "${satNumberString}"`);
-        }
-
-        const alpha = TleParseUtils.ALPHA5_NUMBERS.get(satNumberString.charAt(0));
-        if (alpha !== undefined) {
-            return (alpha * TleParseUtils.ALPHA5_SCALING)
-                + TleParseUtils.#strictParseInt(satNumberString.substring(1));
-        }
-        return TleParseUtils.#strictParseInt(satNumberString);
-    }
-}