swcombine.js 0.0.5 → 0.0.7

package/dist/index.cjs.js

@@ -493,7 +493,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 +507,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 };
 }
@@ -547,7 +547,7 @@ class AuthenticatedCharacterResource extends PublicCharacterResource {
     if ("error_code" in response.swcapi) {
       throw new Error(`Something went wrong while attempting to call the GET character endpoint: ${response.swcapi.error_message}`);
     }
-    return mapSwcResponseToCharacterResponse(response.swcapi);
+    return mapSwcResponseToCharacterResponse(response.swcapi.character);
   }
 }
 class AuthService {

package/dist/index.esm.js

@@ -491,7 +491,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 +505,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 };
 }
@@ -545,7 +545,7 @@ class AuthenticatedCharacterResource extends PublicCharacterResource {
     if ("error_code" in response.swcapi) {
       throw new Error(`Something went wrong while attempting to call the GET character endpoint: ${response.swcapi.error_message}`);
     }
-    return mapSwcResponseToCharacterResponse(response.swcapi);
+    return mapSwcResponseToCharacterResponse(response.swcapi.character);
   }
 }
 class AuthService {

package/package.json

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