squishjs 0.7.52 → 0.7.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squishjs",
-  "version": "0.7.52",
+  "version": "0.7.55",
   "description": "squish & unsquish stuff",
   "scripts": {
     "test": "node testRunner.js"

package/src/InternalGameNode.js

@@ -1,8 +1,6 @@
-let _id = 0;
-
 class InternalGameNode {
     constructor(color, onClick, coordinates2d, border, fill, text, asset, playerIds = [], effects = null, input = null, subType = null, id = null) {
-        this.id = id ? Number(id) : Number(_id++);
+        this.id = id ? Number(id) : Math.floor(Math.random() * 999999999999);
         this.children = new Array();
         this.color = color;
         this.handleClick = onClick;

package/src/squish.js

@@ -56,8 +56,8 @@ const unsquish = (squished) => {
     while(squishedIndex < squished.length) {
 
         const subFrameType = squished[squishedIndex];
-        const subFrameLength = squished[squishedIndex + 1];
-        const subFrame = squished.slice(squishedIndex + 2, squishedIndex + subFrameLength);
+        const subFrameLength = squished[squishedIndex + 1] + squished[squishedIndex + 2];
+        const subFrame = squished.slice(squishedIndex + 3, squishedIndex + subFrameLength);
 
         if (!typeToSquishMap[subFrameType]) {
             console.warn("Unknown sub frame type " + subFrameType);
@@ -115,7 +115,11 @@ const squish = (entity, scale = null) => {
             const attr = internalNode[key];
             if (attr !== undefined && attr !== null) {
                 const squished = squishSpec[key].squish(attr, scale, internalNode);
-                squishedPieces.push([squishSpec[key]['type'], squished.length + 2, ...squished]);
+                const totalLength = squished.length + 3;
+                const rightMost = Math.min(255, totalLength);
+                const leftMost = Math.min(255, Math.max(0, totalLength - 255));
+
+                squishedPieces.push([squishSpec[key]['type'], leftMost, rightMost, ...squished]);
             }
         }
     }
@@ -131,9 +135,9 @@ const squish = (entity, scale = null) => {
 
     // length + 5 bytes for what we're inserting here - 3 for length, one for type (3), one for class code
     const totalLength = squished.length + 5;
-    const rightMost = Math.min(256, totalLength);
-    const middle = Math.min(256, Math.max(0, totalLength - 256));
-    const leftMost = Math.min(256, Math.max(0, totalLength - 512));
+    const rightMost = Math.min(255, totalLength);
+    const middle = Math.min(255, Math.max(0, totalLength - 255));
+    const leftMost = Math.min(255, Math.max(0, totalLength - 510));
 
     return [3, leftMost, middle, rightMost, nodeClassCode, ...squished];