swcombine.js 0.0.6 → 0.0.8

package/dist/index.cjs.js

@@ -173,7 +173,7 @@ const _SwcTimestamp = class _SwcTimestamp {
     const seconds = Math.floor(msSinceSwcStart / 1e3);
     return new _SwcTimestamp({
       year,
-      day,
+      day: day + 1,
       hour,
       minute,
       second: seconds
@@ -253,6 +253,20 @@ const _SwcTimestamp = class _SwcTimestamp {
     const endTime = otherTimestamp.toUnixTimestamp("sec");
     return secondsToDuration(endTime - startTime);
   }
+  /**
+   * Convert the SWC timestamp to a string (i.e. Year 25 Day 60, 12:45:21)
+   * @param format 'full' = Year 25, Day 60, 12:45:21, 'short' = 'Y26 D60, 12:45:21', 'day' = 'Y26 D60'.
+   */
+  toString(format = "full") {
+    switch (format) {
+      case "full":
+        return `Year ${this.year} Day ${this.day}, ${this.hour}:${this.minute}:${this.second}`;
+      case "short":
+        return `Y${this.year} D${this.day}, ${this.hour}:${this.minute}:${this.second}`;
+      case "day":
+        return `Y${this.year} D${this.day}`;
+    }
+  }
   /**
    * @returns {number}
    * @private
@@ -265,13 +279,13 @@ const _SwcTimestamp = class _SwcTimestamp {
     let msSinceSwcStart = 0;
     msSinceSwcStart += this.year * msPerYear;
     msSinceSwcStart += (this.day - 1) * msPerDay;
-    msSinceSwcStart += (this.hour + 1) * msPerHour;
+    msSinceSwcStart += this.hour * msPerHour;
     msSinceSwcStart += this.minute * msPerMinute;
     msSinceSwcStart += this.second * 1e3;
     return msSinceSwcStart;
   }
 };
-__publicField(_SwcTimestamp, "swcStart", new Date(1998, 11, 3, 7, 0, 0));
+__publicField(_SwcTimestamp, "swcStart", new Date(Date.UTC(1998, 11, 3, 7, 0, 0)));
 let SwcTimestamp = _SwcTimestamp;
 const durationToSeconds = (duration) => (duration.years || 0) * 365 * 24 * 60 * 60 + (duration.days || 0) * 24 * 60 * 60 + (duration.hours || 0) * 60 * 60 + (duration.minutes || 0) * 60 + (duration.seconds || 0);
 const secondsToDuration = (seconds) => {
@@ -493,7 +507,7 @@ function findPrivilege(privileges, groupName, privilegeName) {
   return !!privilege && privilege.value === "true";
 }
 function mapSwcLocation(location) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   if (!location)
     return void 0;
   return {
@@ -507,19 +521,19 @@ function mapSwcLocation(location) {
     planet: !((_c = location.planet) == null ? void 0 : _c.value) ? void 0 : { uid: new SwcUid(location.planet.attributes.uid), name: location.planet.value },
     city: !((_d = location.city) == null ? void 0 : _d.value) ? void 0 : { uid: new SwcUid(location.city.attributes.uid), name: location.city.value },
     coordinates: {
-      galaxy: { x: location.coordinates.galaxy.attributes.x, y: location.coordinates.galaxy.attributes.y },
-      system: parseCoords(location.coordinates.system.attributes.x, location.coordinates.system.attributes.y),
-      surface: parseCoords(location.coordinates.surface.attributes.x, location.coordinates.surface.attributes.y),
-      ground: parseCoords(location.coordinates.ground.attributes.x, location.coordinates.ground.attributes.y)
+      galaxy: parseCoords((_e = location.coordinates.galaxy.attributes) == null ? void 0 : _e.x, (_f = location.coordinates.galaxy.attributes) == null ? void 0 : _f.y),
+      system: parseCoords((_g = location.coordinates.system.attributes) == null ? void 0 : _g.x, (_h = location.coordinates.system.attributes) == null ? void 0 : _h.y),
+      surface: parseCoords((_i = location.coordinates.surface.attributes) == null ? void 0 : _i.x, (_j = location.coordinates.surface.attributes) == null ? void 0 : _j.y),
+      ground: parseCoords((_k = location.coordinates.ground.attributes) == null ? void 0 : _k.x, (_l = location.coordinates.ground.attributes) == null ? void 0 : _l.y)
     }
   };
 }
 function parseCoords(x, y) {
-  if (x === null || y === null)
+  if (x === null || x === void 0 || y === null || y === void 0)
     return { x: null, y: null };
-  const intX = Number.parseInt(x, 10);
-  const intY = Number.parseInt(y, 10);
-  if (Number.isNaN(intX) || Number.isNaN(intY))
+  const intX = typeof x === "number" ? x : Number.parseInt(x, 10);
+  const intY = typeof y === "number" ? y : Number.parseInt(y, 10);
+  if (!Number.isFinite(intX) || !Number.isFinite(intY))
     return { x: null, y: null };
   return { x: intX, y: intY };
 }

package/dist/index.d.ts

@@ -440,6 +440,11 @@ export declare class SwcTimestamp {
      */
     subtract(duration: Partial<Duration>): SwcTimestamp;
     getDurationTo(otherTimestamp: SwcTimestamp): Duration;
+    /**
+     * Convert the SWC timestamp to a string (i.e. Year 25 Day 60, 12:45:21)
+     * @param format 'full' = Year 25, Day 60, 12:45:21, 'short' = 'Y26 D60, 12:45:21', 'day' = 'Y26 D60'.
+     */
+    toString(format?: 'full' | 'short' | 'day'): string;
     /**
      * @returns {number}
      * @private

package/dist/index.esm.js

@@ -171,7 +171,7 @@ const _SwcTimestamp = class _SwcTimestamp {
     const seconds = Math.floor(msSinceSwcStart / 1e3);
     return new _SwcTimestamp({
       year,
-      day,
+      day: day + 1,
       hour,
       minute,
       second: seconds
@@ -251,6 +251,20 @@ const _SwcTimestamp = class _SwcTimestamp {
     const endTime = otherTimestamp.toUnixTimestamp("sec");
     return secondsToDuration(endTime - startTime);
   }
+  /**
+   * Convert the SWC timestamp to a string (i.e. Year 25 Day 60, 12:45:21)
+   * @param format 'full' = Year 25, Day 60, 12:45:21, 'short' = 'Y26 D60, 12:45:21', 'day' = 'Y26 D60'.
+   */
+  toString(format = "full") {
+    switch (format) {
+      case "full":
+        return `Year ${this.year} Day ${this.day}, ${this.hour}:${this.minute}:${this.second}`;
+      case "short":
+        return `Y${this.year} D${this.day}, ${this.hour}:${this.minute}:${this.second}`;
+      case "day":
+        return `Y${this.year} D${this.day}`;
+    }
+  }
   /**
    * @returns {number}
    * @private
@@ -263,13 +277,13 @@ const _SwcTimestamp = class _SwcTimestamp {
     let msSinceSwcStart = 0;
     msSinceSwcStart += this.year * msPerYear;
     msSinceSwcStart += (this.day - 1) * msPerDay;
-    msSinceSwcStart += (this.hour + 1) * msPerHour;
+    msSinceSwcStart += this.hour * msPerHour;
     msSinceSwcStart += this.minute * msPerMinute;
     msSinceSwcStart += this.second * 1e3;
     return msSinceSwcStart;
   }
 };
-__publicField(_SwcTimestamp, "swcStart", new Date(1998, 11, 3, 7, 0, 0));
+__publicField(_SwcTimestamp, "swcStart", new Date(Date.UTC(1998, 11, 3, 7, 0, 0)));
 let SwcTimestamp = _SwcTimestamp;
 const durationToSeconds = (duration) => (duration.years || 0) * 365 * 24 * 60 * 60 + (duration.days || 0) * 24 * 60 * 60 + (duration.hours || 0) * 60 * 60 + (duration.minutes || 0) * 60 + (duration.seconds || 0);
 const secondsToDuration = (seconds) => {
@@ -491,7 +505,7 @@ function findPrivilege(privileges, groupName, privilegeName) {
   return !!privilege && privilege.value === "true";
 }
 function mapSwcLocation(location) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   if (!location)
     return void 0;
   return {
@@ -505,19 +519,19 @@ function mapSwcLocation(location) {
     planet: !((_c = location.planet) == null ? void 0 : _c.value) ? void 0 : { uid: new SwcUid(location.planet.attributes.uid), name: location.planet.value },
     city: !((_d = location.city) == null ? void 0 : _d.value) ? void 0 : { uid: new SwcUid(location.city.attributes.uid), name: location.city.value },
     coordinates: {
-      galaxy: { x: location.coordinates.galaxy.attributes.x, y: location.coordinates.galaxy.attributes.y },
-      system: parseCoords(location.coordinates.system.attributes.x, location.coordinates.system.attributes.y),
-      surface: parseCoords(location.coordinates.surface.attributes.x, location.coordinates.surface.attributes.y),
-      ground: parseCoords(location.coordinates.ground.attributes.x, location.coordinates.ground.attributes.y)
+      galaxy: parseCoords((_e = location.coordinates.galaxy.attributes) == null ? void 0 : _e.x, (_f = location.coordinates.galaxy.attributes) == null ? void 0 : _f.y),
+      system: parseCoords((_g = location.coordinates.system.attributes) == null ? void 0 : _g.x, (_h = location.coordinates.system.attributes) == null ? void 0 : _h.y),
+      surface: parseCoords((_i = location.coordinates.surface.attributes) == null ? void 0 : _i.x, (_j = location.coordinates.surface.attributes) == null ? void 0 : _j.y),
+      ground: parseCoords((_k = location.coordinates.ground.attributes) == null ? void 0 : _k.x, (_l = location.coordinates.ground.attributes) == null ? void 0 : _l.y)
     }
   };
 }
 function parseCoords(x, y) {
-  if (x === null || y === null)
+  if (x === null || x === void 0 || y === null || y === void 0)
     return { x: null, y: null };
-  const intX = Number.parseInt(x, 10);
-  const intY = Number.parseInt(y, 10);
-  if (Number.isNaN(intX) || Number.isNaN(intY))
+  const intX = typeof x === "number" ? x : Number.parseInt(x, 10);
+  const intY = typeof y === "number" ? y : Number.parseInt(y, 10);
+  if (!Number.isFinite(intX) || !Number.isFinite(intY))
     return { x: null, y: null };
   return { x: intX, y: intY };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swcombine.js",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "",
   "keywords": [
     "swcombine",