cleanup: remove most i64s from the wasm_bindings, safely cast to i32.

halvorgb · halvorgb · commit d12d76cf7260 · 2026-01-29T14:56:36.000+01:00
diff --git a/crates/lox-space/src/time/wasm/deltas.rs b/crates/lox-space/src/time/wasm/deltas.rs
@@ -60,13 +60,26 @@ impl JsTimeDelta {
     ///
     /// Raises:
     ///     NonFiniteTimeDeltaError: If the delta is non-finite.
-    pub fn seconds(&self) -> Result<i64, JsValue> {
-        self.0.seconds().ok_or_else(|| {
+    pub fn seconds(&self) -> Result<i32, JsValue> {
+        self
+        .0
+        .seconds()
+        .ok_or_else(|| {
             js_error_with_name(
                 "NonFiniteTimeDeltaError",
                 "cannot access seconds for non-finite time delta",
             )
         })
+        .and_then(|seconds| {
+            if seconds > i32::MAX as i64 || seconds < i32::MIN as i64 {
+                Err(js_error_with_name(
+                    "OverflowError",
+                    "seconds component out of range for i32",
+                ))
+            } else {
+                Ok(seconds as i32)
+            }
+        })
     }
 
     /// Return the subsecond (fractional second) component.
@@ -87,8 +100,8 @@ impl JsTimeDelta {
 
     /// Create a TimeDelta from integer seconds.
     #[wasm_bindgen(js_name = "fromSeconds")]
-    pub fn from_seconds(seconds: i64) -> Self {
-        Self(TimeDelta::from_seconds(seconds))
+    pub fn from_seconds(seconds: i32) -> Self {
+        Self(TimeDelta::from_seconds(seconds as i64))
     }
 
     /// Create a TimeDelta from minutes.
@@ -133,9 +146,9 @@ impl JsTimeDelta {
     ///
     /// Examples:
     ///     >>> deltas = lox.TimeDelta.range(0, 10, 2)  # [0, 2, 4, 6, 8, 10]
-    pub fn range(start: i64, end: i64, step: Option<i64>) -> Array {
-        let step = TimeDelta::from_seconds(step.unwrap_or(1));
-        let range = TimeDelta::range(start..=end).with_step(step);
+    pub fn range(start: i32, end: i32, step: Option<i32>) -> Array {
+        let step = TimeDelta::from_seconds(step.unwrap_or(1) as i64);
+        let range = TimeDelta::range(start as i64..=end as i64).with_step(step);
         let arr = Array::new();
         for delta in range {
             arr.push(&JsValue::from(JsTimeDelta(delta)));
diff --git a/crates/lox-space/src/time/wasm/time.rs b/crates/lox-space/src/time/wasm/time.rs
@@ -132,7 +132,7 @@ impl JsTime {
     #[wasm_bindgen(constructor)]
     pub fn new(
         scale: JsValue,
-        year: i64,
+        year: i32,
         month: u8,
         day: u8,
         hour: Option<u8>,
@@ -144,7 +144,7 @@ impl JsTime {
         let seconds = seconds.unwrap_or(0.0);
         let scale: JsTimeScale = scale.try_into()?;
         let time = Time::builder_with_scale(scale.inner())
-            .with_ymd(year, month, day)
+            .with_ymd(year as i64, month, day)
             .with_hms(hour, minute, seconds)
             .build()
             .map_err(JsTimeError)?;
@@ -218,15 +218,15 @@ impl JsTime {
     #[wasm_bindgen(js_name="fromDayOfYear")]
     pub fn from_day_of_year(
         scale: JsValue,
-        year: i64,
+        year: i32,
         day: u16,
         hour: Option<u8>,
         minute: Option<u8>,
         seconds: Option<f64>,
     ) -> Result<JsTime, JsValue> {
         let scale: JsTimeScale = scale.try_into()?;
         let time = Time::builder_with_scale(scale.inner())
-            .with_doy(year, day)
+            .with_doy(year as i64, day)
             .with_hms(hour.unwrap_or(0), minute.unwrap_or(0), seconds.unwrap_or(0.0))
             .build()
             .map_err(JsTimeError)?;
@@ -419,8 +419,17 @@ impl JsTime {
     }
 
     /// Return the year component.
-    pub fn year(&self) -> i64 {
-        self.0.year()
+    pub fn year(&self) -> Result<i32, JsValue> {
+        let year: i64 = self.0.year();
+
+        if year > i32::MAX as i64 || year < i32::MIN as i64 {
+                Err(js_error_with_name(
+                    "OverflowError",
+                    "seconds component out of range for i32",
+                ))
+        } else {
+            Ok(year as i32)
+        }
     }
 
     /// Return the month component (1-12).
diff --git a/crates/lox-space/src/time/wasm/utc.rs b/crates/lox-space/src/time/wasm/utc.rs
@@ -12,7 +12,7 @@ use crate::time::time_of_day::CivilTime;
 use crate::time::utc::{Utc, UtcError};
 use crate::time::wasm::time::JsTime;
 use crate::time::wasm::time_scales::JsTimeScale;
-use crate::wasm::{js_error_with_name_from_string};
+use crate::wasm::{js_error_with_name, js_error_with_name_from_string};
 
 pub struct JsUtcError(pub UtcError);
 
@@ -49,15 +49,15 @@ pub struct JsUtc(Utc);
 impl JsUtc {
     #[wasm_bindgen(constructor)]
     pub fn new(
-        year: i64,
+        year: i32,
         month: u8,
         day: u8,
         hour: Option<u8>,
         minute: Option<u8>,
         seconds: Option<f64>,
     ) -> Result<JsUtc, JsValue> {
         let utc = Utc::builder()
-            .with_ymd(year, month, day)
+            .with_ymd(year as i64, month, day)
             .with_hms(hour.unwrap_or(0), minute.unwrap_or(0), seconds.unwrap_or(0.0))
             .build()
             .map_err(JsUtcError)?;
@@ -117,8 +117,17 @@ impl JsUtc {
     }
 
     /// Return the year component.
-    pub fn year(&self) -> i64 {
-        self.0.year()
+    pub fn year(&self) -> Result<i32, JsValue> {
+        let year: i64 = self.0.year();
+
+        if year > i32::MAX as i64 || year < i32::MIN as i64 {
+                Err(js_error_with_name(
+                    "OverflowError",
+                    "seconds component out of range for i32",
+                ))
+        } else {
+            Ok(year as i32)
+        }
     }
 
     /// Return the month component (1-12).
diff --git a/crates/lox-space/tests/js/fixtures.js b/crates/lox-space/tests/js/fixtures.js
@@ -85,7 +85,7 @@ export function loadEstrack() {
     const origin = new lox.Origin('Earth');
     const loc = new lox.GroundLocation(origin, deg2rad(lon), deg2rad(lat), 0);
     const mask = lox.ElevationMask.fixed(0);
-    return new lox.GroundStation(name, loc, mask); // adjust ctor if different
+    return new lox.GroundStation(name, loc, mask);
   });
 }
 
diff --git a/crates/lox-space/tests/js/test_frames.js b/crates/lox-space/tests/js/test_frames.js
@@ -37,7 +37,7 @@ const assertVecClose = (a, b, atol = 1e-6) => {
 describe("IAU frame transforms", () => {
   for (const frame of frames) {
     it(`converts J2000 -> ${frame}`, () => {
-      const t = new Time("TDB", 2000n, 1, 1, 0, 0, 0);
+      const t = new Time("TDB", 2000, 1, 1, 0, 0, 0);
       const r0 = [6068.27927, -1692.84394, -2516.61918];
       const v0 = [-0.660415582, 5.495938726, -5.303093233];
 
diff --git a/crates/lox-space/tests/js/test_ground.js b/crates/lox-space/tests/js/test_ground.js
@@ -22,7 +22,7 @@ describe('Ground observables', () => {
 
     const position = [3359.927, -2398.072, 5153.0];
     const velocity = [5.0657, 5.485, -0.744];
-    const time = new Time('TDB', 2012n, 7, 1, 0, 0, 0);
+    const time = new Time('TDB', 2012, 7, 1, 0, 0, 0);
     const state = new State(time, position, velocity, new Origin('Earth'), new Frame('IAU_EARTH'));
 
     const observables = location.observables(state);
diff --git a/crates/lox-space/tests/js/test_propagators.js b/crates/lox-space/tests/js/test_propagators.js
@@ -2,32 +2,10 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-import assert from "node:assert/strict";
 import { describe, it } from "node:test";
-import { lox as binding, deg2rad } from './fixtures.js';
+import { lox as bindings, deg2rad, approxEqual, assertVecClose } from './fixtures.js';
 
-const { GroundLocation, GroundPropagator, Origin, SGP4, TimeDelta, UTC } =
-  bindings;
-
-const assertCloseRel = (actual, expected, rel = 1e-6) => {
-  const diff = Math.abs(actual - expected);
-  const tol = Math.abs(expected) * rel;
-  assert.ok(
-    diff <= tol,
-    `actual=${actual}, expected=${expected}, |diff|=${diff} > tol=${tol}`
-  );
-};
-
-const assertVecClose = (actual, expected, atol = 1e-6) => {
-  assert.equal(actual.length, expected.length);
-  actual.forEach((v, idx) => {
-    const diff = Math.abs(v - expected[idx]);
-    assert.ok(
-      diff <= atol,
-      `mismatch at idx ${idx}: actual=${v}, expected=${expected[idx]}, |diff|=${diff} > atol=${atol}`
-    );
-  });
-};
+const { GroundLocation, GroundPropagator, Origin, SGP4, TimeDelta, UTC } = bindings;
 
 describe("propagators", () => {
   it("computes SGP4 orbital period", () => {
@@ -43,7 +21,7 @@ describe("propagators", () => {
     const actualPeriod = k1.orbitalPeriod().toDecimalSeconds();
     const expectedPeriod = 92.821 * 60;
 
-    assertCloseRel(actualPeriod, expectedPeriod, 1e-4);
+    approxEqual(actualPeriod, expectedPeriod, 1e-4);
   });
 
   it("propagates ground location state", () => {
diff --git a/crates/lox-space/tests/js/test_time.js b/crates/lox-space/tests/js/test_time.js
@@ -33,7 +33,7 @@ describe('time', () => {
       });
 
     it('handles time scale conversions and arithmetic', () => {
-        const taiExp = new Time('TAI', 2000n, 1, 1);
+        const taiExp = new Time('TAI', 2000, 1, 1);
         let taiAct = Time.fromISO('2000-01-01T00:00:00.000 TAI');
         assertTimeEqual(taiExp, taiAct);
 
@@ -55,7 +55,7 @@ describe('time', () => {
         taiAct = taiExp.toScale('UT1', provider).toScale('TAI', provider);
         assertTimeClose(taiExp, taiAct);
 
-        const tai1 = new Time('TAI', 2000n, 1, 1, 0, 0, 0.5);
+        const tai1 = new Time('TAI', 2000, 1, 1, 0, 0, 0.5);
         assert.ok(tai1.julianDate('jd', 'seconds') > taiExp.julianDate('jd', 'seconds'));
         const dt = new TimeDelta(0.5);
         assertTimeClose(taiExp.add(dt), tai1);
@@ -65,7 +65,7 @@ describe('time', () => {
     });
 
     it('parses and converts UTC', () => {
-        const utcExp = new UTC(2000n, 1, 1);
+        const utcExp = new UTC(2000, 1, 1);
 
         let utcAct = UTC.fromISO('2000-01-01T00:00:00.000');
         assertTimeEqual(utcExp, utcAct);
@@ -101,7 +101,7 @@ describe('time', () => {
         assert.equal(delta.toString(), '1.5 seconds'); // in case String calls toString
         assert.equal(delta.inspect ? delta.inspect() : delta.toString(), '1.5 seconds');
 
-        assert.equal(delta.seconds(), 1n);
+        assert.equal(delta.seconds(), 1);
         assert.equal(delta.subsecond(), 0.5);
 
         assert.equal(String(delta.add(delta)), '3 seconds');
@@ -115,7 +115,7 @@ describe('time', () => {
     });
 
     it('constructs TimeDelta from various units', () => {
-        let td = TimeDelta.fromSeconds(123n);
+        let td = TimeDelta.fromSeconds(123);
         assert.equal(td.toDecimalSeconds(), 123);
 
         td = TimeDelta.fromMinutes(2);
@@ -135,15 +135,15 @@ describe('time', () => {
     });
 
     it('stringifies Time correctly', () => {
-        const time = new Time('TAI', 2000n, 1, 1, 0, 0, 12.123456789123);
+        const time = new Time('TAI', 2000, 1, 1, 0, 0, 12.123456789123);
         assert.equal(String(time), '2000-01-01T00:00:12.123 TAI');
         assert.equal(time.toString(), '2000-01-01T00:00:12.123 TAI');
     });
 
     it('exposes Time accessors', () => {
-        const time = new Time('TAI', 2000n, 1, 1, 0, 0, 12.123456789123);
+        const time = new Time('TAI', 2000, 1, 1, 0, 0, 12.123456789123);
         assert.equal(time.scale().abbreviation(), 'TAI');
-        assert.equal(time.year(), 2000n);
+        assert.equal(time.year(), 2000);
         assert.equal(time.month(), 1);
         assert.equal(time.day(), 1);
         assert.equal(time.hour(), 0);
@@ -157,19 +157,19 @@ describe('time', () => {
     });
 
     it('rejects invalid dates and hours', () => {
-        assert.throws(() => new Time('TAI', 2000n, 13, 1), /invalid date/);
-        assert.throws(() => new Time('TAI', 2000n, 12, 1, 24, 0, 0), /hour must be in the range/);
+        assert.throws(() => new Time('TAI', 2000, 13, 1), /invalid date/);
+        assert.throws(() => new Time('TAI', 2000, 12, 1, 24, 0, 0), /hour must be in the range/);
     });
 
     it('disallows subtracting different time scales', () => {
-        const t1 = new Time('TAI', 2000n, 1, 1, 0, 0, 1.0);
-        const t0 = new Time('TT', 2000n, 1, 1, 0, 0, 1.0);
+        const t1 = new Time('TAI', 2000, 1, 1, 0, 0, 1.0);
+        const t0 = new Time('TT', 2000, 1, 1, 0, 0, 1.0);
         assert.throws(() => t1.subtractTime(t0), /cannot subtract.*different time scales/i);
     });
 
     it('disallows isclose on different time scales', () => {
-        const t0 = new Time('TAI', 2000n, 1, 1);
-        const t1 = new Time('TT', 2000n, 1, 1);
+        const t0 = new Time('TAI', 2000, 1, 1);
+        const t1 = new Time('TT', 2000, 1, 1);
         assert.throws(() => t0.isClose(t1), /cannot compare.*different time scales/i);
     });
 
@@ -199,27 +199,27 @@ describe('time', () => {
     });
 
     it('rejects invalid epochs and units', () => {
-        const time = new Time('TAI', 2000n, 1, 1);
+        const time = new Time('TAI', 2000, 1, 1);
         assert.throws(() => time.julianDate('unknown', 'days'), /unknown epoch: unknown/);
         assert.throws(() => time.julianDate('jd', 'unknown'), /unknown unit: unknown/);
     });
 
     it('converts to/from two-part Julian dates', () => {
-        const expected = new Time('TAI', 2024n, 7, 11, 8, 2, 14.0);
+        const expected = new Time('TAI', 2024, 7, 11, 8, 2, 14.0);
         const [jd1, jd2] = expected.twoPartJulianDate();
         const actual = Time.fromTwoPartJulianDate('TAI', jd1, jd2);
         assertTimeClose(expected, actual);
     });
 
     it('converts from day-of-year', () => {
-        const expected = new Time('TAI', 2024n, 12, 31);
-        const actual = Time.fromDayOfYear('TAI', 2024n, 366);
+        const expected = new Time('TAI', 2024, 12, 31);
+        const actual = Time.fromDayOfYear('TAI', 2024, 366);
         assertTimeEqual(actual, expected);
     });
 
     it('exposes UTC accessors', () => {
-        const utc = new UTC(2000n, 1, 1, 12, 13, 14.123456789123);
-        assert.equal(utc.year(), 2000n);
+        const utc = new UTC(2000, 1, 1, 12, 13, 14.123456789123);
+        assert.equal(utc.year(), 2000);
         assert.equal(utc.month(), 1);
         assert.equal(utc.day(), 1);
         assert.equal(utc.hour(), 12);
@@ -235,15 +235,15 @@ describe('time', () => {
     });
 
     it('rejects invalid UTC inputs', () => {
-        assert.throws(() => new UTC(2000n, 0, 1), /invalid date/);
+        assert.throws(() => new UTC(2000, 0, 1), /invalid date/);
         assert.throws(() => UTC.fromISO('2000-01-01X00:00:00 UTC'), /invalid ISO/);
     });
 
     it('handles EOP provider errors', () => {
         assert.throws(() => new EOPProvider('invalid_path'), EopParserError);
 
         const provider = loadEOPProvider();
-        const tai = new Time('TAI', 2100n, 1, 1);
+        const tai = new Time('TAI', 2100, 1, 1);
         assert.throws(() => tai.toScaleWithProvider('UT1', provider), EopProviderError);
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export function loadEstrack() {`
`85`	`85`	`const origin = new lox.Origin('Earth');`
`86`	`86`	`const loc = new lox.GroundLocation(origin, deg2rad(lon), deg2rad(lat), 0);`
`87`	`87`	`const mask = lox.ElevationMask.fixed(0);`
`88`		`- return new lox.GroundStation(name, loc, mask); // adjust ctor if different`
	`88`	`+ return new lox.GroundStation(name, loc, mask);`
`89`	`89`	`});`
`90`	`90`	`}`
`91`	`91`