npm - @rhyster/wow-casc-dbc - Versions diffs - 2.4.0 → 2.5.0 - Mend

@rhyster/wow-casc-dbc 2.4.0 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.cjs CHANGED Viewed

@@ -912,14 +912,10 @@ const readBitpackedValue = (buffer, fieldOffsetBits, fieldSizeBits, signed = fal
       signed ? BigInt.asIntN(fieldSizeBits, BigInt(rawValue >>> bitOffset)) : BigInt.asUintN(fieldSizeBits, BigInt(rawValue >>> bitOffset))
     );
   }
-  let remain = sizeBytes;
   let value = 0n;
-  while (remain > 0) {
-    const byteLength = Math.min(remain, 6);
-    const offset = offsetBytes + remain - byteLength;
-    const rawValue = buffer.readUIntLE(offset, byteLength);
-    value = value << BigInt(byteLength * 8) | BigInt(rawValue);
-    remain -= byteLength;
+  for (let i = sizeBytes - 1; i >= 0; i -= 1) {
+    const byte = buffer.readUInt8(offsetBytes + i);
+    value = value << 8n | BigInt(byte);
   }
   return signed ? BigInt.asIntN(fieldSizeBits, value >> BigInt(bitOffset)) : BigInt.asUintN(fieldSizeBits, value >> BigInt(bitOffset));
 };
@@ -1740,6 +1736,15 @@ const castBigInt64 = (value, srcSigned, dstSigned) => {
   }
   return dstSigned ? castBuffer.readBigInt64LE(0) : castBuffer.readBigUInt64LE(0);
 };
+const getCastBuffer = (value, srcSize, dstSize) => {
+  const castBuffer = Buffer.alloc(dstSize);
+  let remain = value;
+  for (let i = 0; i < srcSize && remain > 0n; i += 1, remain >>= 8n) {
+    const byte = Number(BigInt.asUintN(8, remain));
+    castBuffer.writeUInt8(byte, i);
+  }
+  return castBuffer;
+};
 class DBDParser {
   constructor(wdc) {
     __publicField$1(this, "wdc");
@@ -1867,9 +1872,12 @@ class DBDParser {
             }
           } else if (column.type === "float") {
             if (column.arraySize) {
-              assert__default(typeof cell.data === "bigint", `Invalid data type for float array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
               const values = [];
-              const castBuffer = Buffer.from(cell.data.toString(16).padStart(8 * column.arraySize, "0"), "hex");
               for (let i = 0; i < column.arraySize; i += 1) {
                 const value = castBuffer.readFloatLE(i * 4);
                 values.push(Math.round(value * 100) / 100);
@@ -1879,25 +1887,49 @@ class DBDParser {
               assert__default(typeof cell.data === "number", `Invalid data type for float column ${column.name}`);
               data[column.name] = castFloat(cell.data, srcSize, srcSigned);
             }
-          } else if (typeof cell.data === "number") {
-            data[column.name] = castIntegerBySize(
-              cell.data,
-              srcSize,
-              srcSigned,
-              dstSize ?? srcSize,
-              column.isSigned
-            );
-          } else {
-            assert__default(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
-            if (srcSigned !== column.isSigned) {
-              data[column.name] = castBigInt64(
+          } else if (column.type === "int") {
+            if (column.arraySize) {
+              assert__default(dstSize, `Missing size for int array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
+              const values = [];
+              if (column.isSigned) {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              } else {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readUIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              }
+              data[column.name] = values;
+            } else if (typeof cell.data === "number") {
+              data[column.name] = castIntegerBySize(
                 cell.data,
+                srcSize,
                 srcSigned,
+                dstSize ?? srcSize,
                 column.isSigned
               );
             } else {
-              data[column.name] = cell.data;
+              assert__default(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
+              if (srcSigned !== column.isSigned) {
+                data[column.name] = castBigInt64(
+                  cell.data,
+                  srcSigned,
+                  column.isSigned
+                );
+              } else {
+                data[column.name] = cell.data;
+              }
             }
+          } else {
+            throw new Error(`Unsupported column type ${column.type} for column ${column.name}`);
           }
           fieldIndex += 1;
         } else if (column.isRelation) {

package/dist/index.mjs CHANGED Viewed

@@ -900,14 +900,10 @@ const readBitpackedValue = (buffer, fieldOffsetBits, fieldSizeBits, signed = fal
       signed ? BigInt.asIntN(fieldSizeBits, BigInt(rawValue >>> bitOffset)) : BigInt.asUintN(fieldSizeBits, BigInt(rawValue >>> bitOffset))
     );
   }
-  let remain = sizeBytes;
   let value = 0n;
-  while (remain > 0) {
-    const byteLength = Math.min(remain, 6);
-    const offset = offsetBytes + remain - byteLength;
-    const rawValue = buffer.readUIntLE(offset, byteLength);
-    value = value << BigInt(byteLength * 8) | BigInt(rawValue);
-    remain -= byteLength;
+  for (let i = sizeBytes - 1; i >= 0; i -= 1) {
+    const byte = buffer.readUInt8(offsetBytes + i);
+    value = value << 8n | BigInt(byte);
   }
   return signed ? BigInt.asIntN(fieldSizeBits, value >> BigInt(bitOffset)) : BigInt.asUintN(fieldSizeBits, value >> BigInt(bitOffset));
 };
@@ -1728,6 +1724,15 @@ const castBigInt64 = (value, srcSigned, dstSigned) => {
   }
   return dstSigned ? castBuffer.readBigInt64LE(0) : castBuffer.readBigUInt64LE(0);
 };
+const getCastBuffer = (value, srcSize, dstSize) => {
+  const castBuffer = Buffer.alloc(dstSize);
+  let remain = value;
+  for (let i = 0; i < srcSize && remain > 0n; i += 1, remain >>= 8n) {
+    const byte = Number(BigInt.asUintN(8, remain));
+    castBuffer.writeUInt8(byte, i);
+  }
+  return castBuffer;
+};
 class DBDParser {
   constructor(wdc) {
     __publicField$1(this, "wdc");
@@ -1855,9 +1860,12 @@ class DBDParser {
             }
           } else if (column.type === "float") {
             if (column.arraySize) {
-              assert(typeof cell.data === "bigint", `Invalid data type for float array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
               const values = [];
-              const castBuffer = Buffer.from(cell.data.toString(16).padStart(8 * column.arraySize, "0"), "hex");
               for (let i = 0; i < column.arraySize; i += 1) {
                 const value = castBuffer.readFloatLE(i * 4);
                 values.push(Math.round(value * 100) / 100);
@@ -1867,25 +1875,49 @@ class DBDParser {
               assert(typeof cell.data === "number", `Invalid data type for float column ${column.name}`);
               data[column.name] = castFloat(cell.data, srcSize, srcSigned);
             }
-          } else if (typeof cell.data === "number") {
-            data[column.name] = castIntegerBySize(
-              cell.data,
-              srcSize,
-              srcSigned,
-              dstSize ?? srcSize,
-              column.isSigned
-            );
-          } else {
-            assert(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
-            if (srcSigned !== column.isSigned) {
-              data[column.name] = castBigInt64(
+          } else if (column.type === "int") {
+            if (column.arraySize) {
+              assert(dstSize, `Missing size for int array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
+              const values = [];
+              if (column.isSigned) {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              } else {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readUIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              }
+              data[column.name] = values;
+            } else if (typeof cell.data === "number") {
+              data[column.name] = castIntegerBySize(
                 cell.data,
+                srcSize,
                 srcSigned,
+                dstSize ?? srcSize,
                 column.isSigned
               );
             } else {
-              data[column.name] = cell.data;
+              assert(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
+              if (srcSigned !== column.isSigned) {
+                data[column.name] = castBigInt64(
+                  cell.data,
+                  srcSigned,
+                  column.isSigned
+                );
+              } else {
+                data[column.name] = cell.data;
+              }
             }
+          } else {
+            throw new Error(`Unsupported column type ${column.type} for column ${column.name}`);
           }
           fieldIndex += 1;
         } else if (column.isRelation) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rhyster/wow-casc-dbc",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Fetch World of Warcraft data files from CASC and parse DBC/DB2 files.",
   "type": "module",
   "exports": {
@@ -40,20 +40,21 @@
     "@types/async": "^3.2.24",
     "@types/cli-progress": "^3.11.5",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.7",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@types/node": "^20.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.11.0",
+    "@typescript-eslint/parser": "^7.11.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^18.0.0",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.2",
-    "tsx": "^4.7.3",
+    "ts-jest": "^29.1.4",
+    "tsx": "^4.11.0",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0"
   },
   "dependencies": {
     "async": "^3.2.5",
     "cli-progress": "^3.12.0"
-  }
+  },
+  "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
 }