flo-mat 3.0.14 → 4.0.1

package/__tests__/jsog/check-jsog-eql-calc.spec.ts

@@ -1,81 +1,61 @@
-import type { Mat } from '../../src/mat/mat.js';
-import { expect, test } from '@jest/globals';
-import { squares4 } from 'squares-rng';
-import { mats1_, getMats1 } from './mat-dummys.js';
-import { CpNode, getAllOnLoop } from '../../src/index.js';
+import { test } from '@jest/globals';
 
+test.todo('Ignore this test for now');
 
-test('Check MAT objects equal (JSOG)', function() {
-    const mats1 = getMats1();
+// //=======================================
+// // NOTE! JSOG not used in tests anymore!
+// //=======================================
 
-    // too hard for Jest due to circular references
-    // expect(mats_obj1).toEqual(mats_calc1);
+// import { expect, test } from '@jest/globals';
+// import type { CpNode } from '../../src/cp-node/cp-node.js';
+// import { mats1_, getMats1 } from './mat-dummys.js';
+// import { getAllOnLoop } from '../../src/cp-node/fs/get-all-on-loop.js';
+// import { randomWalk } from './random-walk.js';
+
+
+// test('Check MAT objects equal (JSOG)', function() {
+//     const mats1 = getMats1();
+
+//     // too hard for Jest due to circular references
+//     // expect(mats_obj1).toEqual(mats_calc1);
     
-    // Fast path: check root array structure and length
-    expect(Array.isArray(mats1_)).toBe(true);
-    expect(Array.isArray(mats1)).toBe(true);
-    expect(mats1_.length).toBe(mats1.length);
+//     // Fast path: check root array structure and length
+//     expect(Array.isArray(mats1_)).toBe(true);
+//     expect(Array.isArray(mats1)).toBe(true);
+//     expect(mats1_.length).toBe(mats1.length);
     
-    // Verify key properties of the MAT objects instead of deep comparison
-    const mats1_0_ = mats1_[0];
-    const mats1_0 = mats1[0];
+//     // Verify key properties of the MAT objects instead of deep comparison
+//     const mats1_0_ = mats1_[0];
+//     const mats1_0 = mats1[0];
     
-    // Check critical structure exists
-    expect(mats1_0_).toHaveProperty('cpNode');
-    expect(mats1_0).toHaveProperty('cpNode');
+//     // Check critical structure exists
+//     expect(mats1_0_).toHaveProperty('cpNode');
+//     expect(mats1_0).toHaveProperty('cpNode');
     
-    // Verify circular reference integrity
-    if (mats1_0_.cpNode && mats1_0_.cpNode.nextOnCircle) {
-        expect(mats1_0_.cpNode.nextOnCircle).toBeDefined();
-    }
-
-    getAllOnLoop(mats1_0_.cpNode).length; //?
-
-    // Perform a random walk on the calculated MAT to ensure it behaves as expected
-    let testCpNode = mats1_0.cpNode;
-    let testCpNode_ = mats1_0_.cpNode;
-
-    const N = 10;
-    let reachCpNodes = new Set<CpNode>();
-    for (let i=0; i<N; i++) {
-        testCpNode = randomWalk(testCpNode, i*N, N);
-        testCpNode_ = randomWalk(testCpNode_, i*N, N);
-
-        // testCpNode.cp.pointOnShape.p; //?
-        // testCpNode_.cp.pointOnShape.p;//?
-
-        reachCpNodes.add(testCpNode);
-
-        expect(testCpNode.cp.pointOnShape).toEqual(testCpNode_.cp.pointOnShape);
-    }
+//     // Verify circular reference integrity
+//     if (mats1_0_.cpNode && mats1_0_.cpNode.nextOnCircle) {
+//         expect(mats1_0_.cpNode.nextOnCircle).toBeDefined();
+//     }
 
-    reachCpNodes.size; //?
-});
+//     getAllOnLoop(mats1_0_.cpNode).length; //?
 
+//     // Perform a random walk on the calculated MAT to ensure it behaves as expected
+//     let testCpNode = mats1_0.cpNode;
+//     let testCpNode_ = mats1_0_.cpNode;
 
-const NEXT = 0;
-const PREV = 1;
-const NEXT_ON_CIRCLE = 2;
-const PREV_ON_CIRCLE = 3;
+//     const N = 10;
+//     let reachCpNodes = new Set<CpNode>();
+//     for (let i=0; i<N; i++) {
+//         testCpNode = randomWalk(testCpNode, i*N, N);
+//         testCpNode_ = randomWalk(testCpNode_, i*N, N);
 
-function randomWalk(
-        cpNode: CpNode,
-        seed: number,
-        steps: number) {
+//         // testCpNode.cp.pointOnShape.p; //?
+//         // testCpNode_.cp.pointOnShape.p;//?
 
-    for (let i=0; i<steps; i++) {
-        const direction = squares4(seed + i) % 4;
+//         reachCpNodes.add(testCpNode);
 
-        if (direction === NEXT) {
-            cpNode = cpNode.next;
-        } else if (direction === PREV) {
-            cpNode = cpNode.prev;
-        } else if (direction === NEXT_ON_CIRCLE) {
-            cpNode = cpNode.nextOnCircle;
-        } else if (direction === PREV_ON_CIRCLE) {
-            cpNode = cpNode.prevOnCircle;
-        }
-    }
+//         expect(testCpNode.cp.pointOnShape).toEqual(testCpNode_.cp.pointOnShape);
+//     }
 
-    return cpNode;
-}
+//     reachCpNodes.size; //?
+// });

package/__tests__/jsog/decode-jsog.ts

@@ -1,85 +1,88 @@
-
-/**
- * Decodes a JSOG-encoded object back into a live circular graph.
- */
-function decodeJSOG(jsog: any) {
-    const idMap = new Map<string, any>();
-
-    // Pass 1: catalog all objects that have an @id.
-    function findIds(obj: any) {
-        if (!obj || typeof obj !== 'object') return;
-
-        if (Array.isArray(obj)) {
-            obj.forEach(findIds);
-            return;
-        }
-
-        if (obj['@id'] !== undefined) {
-            const id = String(obj['@id']);
-            if (!idMap.has(id)) {
-                if (obj['@type'] === 'Map') {
-                    idMap.set(id, new Map());
-                } else if (obj['@type'] === 'Set') {
-                    idMap.set(id, new Set());
-                } else {
-                    idMap.set(id, {});
-                }
-            }
-        }
-
-        Object.entries(obj).forEach(([key, val]) => {
-            if (key !== '@ref') {
-                findIds(val);
-            }
-        });
-    }
-
-    // Pass 2: reconstruct the graph by swapping @ref for the actual object.
-    function resolve(obj: any): any {
-        if (!obj || typeof obj !== 'object') return obj;
-
-        if (Array.isArray(obj)) {
-            return obj.map(resolve);
-        }
-
-        if (obj['@ref'] !== undefined) {
-            const refId = String(obj['@ref']);
-            if (!idMap.has(refId)) {
-                throw new Error(`Invalid JSOG: missing @id for @ref "${refId}".`);
-            }
-            return idMap.get(refId);
-        }
-
-        const result = obj['@id'] !== undefined
-            ? idMap.get(String(obj['@id']))
-            : {};
-
-        if (obj['@type'] === 'Map') {
-            for (const pair of obj.entries ?? []) {
-                if (!Array.isArray(pair) || pair.length !== 2) continue;
-                result.set(resolve(pair[0]), resolve(pair[1]));
-            }
-            return result;
-        }
-
-        if (obj['@type'] === 'Set') {
-            for (const value of obj.values ?? []) {
-                result.add(resolve(value));
-            }
-            return result;
-        }
-
-        for (const key in obj) {
-            if (key === '@id' || key === '@type') continue;
-            result[key] = resolve(obj[key]);
-        }
-
-        return result;
-    }
-
-    findIds(jsog);
-    return resolve(jsog);
-}
-
-
-export { decodeJSOG }
+//=======================================
+// NOTE! JSOG not used in tests anymore!
+//=======================================
+
+// /**
+//  * Decodes a JSOG-encoded object back into a live circular graph.
+//  */
+// function decodeJSOG(jsog: any) {
+//     const idMap = new Map<string, any>();
+
+//     // Pass 1: catalog all objects that have an @id.
+//     function findIds(obj: any) {
+//         if (!obj || typeof obj !== 'object') return;
+
+//         if (Array.isArray(obj)) {
+//             obj.forEach(findIds);
+//             return;
+//         }
+
+//         if (obj['@id'] !== undefined) {
+//             const id = String(obj['@id']);
+//             if (!idMap.has(id)) {
+//                 if (obj['@type'] === 'Map') {
+//                     idMap.set(id, new Map());
+//                 } else if (obj['@type'] === 'Set') {
+//                     idMap.set(id, new Set());
+//                 } else {
+//                     idMap.set(id, {});
+//                 }
+//             }
+//         }
+
+//         Object.entries(obj).forEach(([key, val]) => {
+//             if (key !== '@ref') {
+//                 findIds(val);
+//             }
+//         });
+//     }
+
+//     // Pass 2: reconstruct the graph by swapping @ref for the actual object.
+//     function resolve(obj: any): any {
+//         if (!obj || typeof obj !== 'object') return obj;
+
+//         if (Array.isArray(obj)) {
+//             return obj.map(resolve);
+//         }
+
+//         if (obj['@ref'] !== undefined) {
+//             const refId = String(obj['@ref']);
+//             if (!idMap.has(refId)) {
+//                 throw new Error(`Invalid JSOG: missing @id for @ref "${refId}".`);
+//             }
+//             return idMap.get(refId);
+//         }
+
+//         const result = obj['@id'] !== undefined
+//             ? idMap.get(String(obj['@id']))
+//             : {};
+
+//         if (obj['@type'] === 'Map') {
+//             for (const pair of obj.entries ?? []) {
+//                 if (!Array.isArray(pair) || pair.length !== 2) continue;
+//                 result.set(resolve(pair[0]), resolve(pair[1]));
+//             }
+//             return result;
+//         }
+
+//         if (obj['@type'] === 'Set') {
+//             for (const value of obj.values ?? []) {
+//                 result.add(resolve(value));
+//             }
+//             return result;
+//         }
+
+//         for (const key in obj) {
+//             if (key === '@id' || key === '@type') continue;
+//             result[key] = resolve(obj[key]);
+//         }
+
+//         return result;
+//     }
+
+//     findIds(jsog);
+//     return resolve(jsog);
+// }
+
+
+// export { decodeJSOG }

package/__tests__/jsog/mat-dummy-1.ts

@@ -0,0 +1,19 @@
+// import { fromStringifyable } from "../../src/cp-node/stringification/from-stringifyable.js";
+// import { toStringifyable } from "../../src/cp-node/stringification/to-stringifyable.js";
+// import { Mat } from "../../src/mat/mat.js";
+// import { getMats1 } from "./get-mats1.js";
+
+
+// const mats1 = getMats1();
+
+// const cpNode1_stringifyable = toStringifyable(mats1[0].cpNode);
+
+// const mats1_: Mat[] = [{
+//     cpNode: fromStringifyable(cpNode1_stringifyable),
+//     meta: mats1[0].meta  // technically should also be 
+// }];
+
+
+// console.log(JSON.stringify(mats1_[0].cpNode)); //?
+
+// export { mats1_ };