flo-mat 3.0.14 → 4.0.1

package/__tests__/jsog/to-jsog-breath-first.ts

@@ -1,107 +1,110 @@
-
-/*
-Copy/paste this into the Chrome console to serialize an object to JSOG
-and copy the result to clipboard. Replace `temp1` with your root object.
-*/
-// (() => {
-//     const encoded = toJsogBreathFirst(temp1);
-//     copy(JSON.stringify(encoded, null, 2));
-// })();
-
-
-function toJsogBreathFirst(v: any) {
-    const seen = new Map();
-    let nextId = 1;
-
-    type QueueItem =
-        | { kind: 'array'; source: any[]; target: any[] }
-        | { kind: 'map'; source: Map<any, any>; target: { '@id': string; '@type': 'Map'; entries: any[] } }
-        | { kind: 'set'; source: Set<any>; target: { '@id': string; '@type': 'Set'; values: any[] } }
-        | { kind: 'object'; source: Record<string, any>; target: Record<string, any> };
-
-    const queue: QueueItem[] = [];
-
-    function encodeValue(value: any): any {
-        if (value === null || typeof value !== 'object') return value;
-
-        if (seen.has(value)) {
-            return { '@ref': seen.get(value) };
-        }
-
-        // Arrays are encoded by value only because JSON drops custom array props
-        // like "@id" during stringify.
-        if (Array.isArray(value)) {
-            const result: any[] = new Array(value.length);
-            queue.push({ kind: 'array', source: value, target: result });
-            return result;
-        }
-
-        const id = String(nextId++);
-        seen.set(value, id);
-
-        if (value instanceof Map) {
-            const result = {
-                '@id': id,
-                '@type': 'Map' as const,
-                entries: [] as any[]
-            };
-            queue.push({ kind: 'map', source: value, target: result });
-            return result;
-        }
-
-        if (value instanceof Set) {
-            const result = {
-                '@id': id,
-                '@type': 'Set' as const,
-                values: [] as any[]
-            };
-            queue.push({ kind: 'set', source: value, target: result });
-            return result;
-        }
-
-        const result: Record<string, any> = { '@id': id };
-        queue.push({ kind: 'object', source: value, target: result });
-        return result;
-    }
-
-    const encoded = encodeValue(v);
-
-    while (queue.length > 0) {
-        const item = queue.shift()!;
-
-        if (item.kind === 'array') {
-            for (let i = 0; i < item.source.length; i++) {
-                item.target[i] = encodeValue(item.source[i]);
-            }
-            continue;
-        }
-
-        if (item.kind === 'map') {
-            for (const [k, val] of item.source.entries()) {
-                item.target.entries.push([encodeValue(k), encodeValue(val)]);
-            }
-            continue;
-        }
-
-        if (item.kind === 'set') {
-        for (const val of item.source.values()) {
-            item.target.values.push(encodeValue(val));
-        }
-        continue;
-        }
-
-        for (const [key, val] of Object.entries(item.source)) {
-            item.target[key] = encodeValue(val);
-        }
-    }
-
-    // `copy` below is only available in the Chrome console.
-    // If you want to run this in Node.js, replace it with `console.log`.
-    // copy(JSON.stringify(encoded, null, 2));
-    // console.log(JSON.stringify(encoded, null, 2));
-    // console.log('JSOG copied to clipboard.');
-    return encoded;
-}
-
-
-export { toJsogBreathFirst }
+//=======================================
+// NOTE! JSOG not used in tests anymore!
+//=======================================
+
+// /*
+// Copy/paste this into the Chrome console to serialize an object to JSOG
+// and copy the result to clipboard. Replace `temp1` with your root object.
+// */
+// // (() => {
+// //     const encoded = toJsogBreathFirst(temp1);
+// //     copy(JSON.stringify(encoded, null, 2));
+// // })();
+
+
+// function toJsogBreathFirst(v: any) {
+//     const seen = new Map();
+//     let nextId = 1;
+
+//     type QueueItem =
+//         | { kind: 'array'; source: any[]; target: any[] }
+//         | { kind: 'map'; source: Map<any, any>; target: { '@id': string; '@type': 'Map'; entries: any[] } }
+//         | { kind: 'set'; source: Set<any>; target: { '@id': string; '@type': 'Set'; values: any[] } }
+//         | { kind: 'object'; source: Record<string, any>; target: Record<string, any> };
+
+//     const queue: QueueItem[] = [];
+
+//     function encodeValue(value: any): any {
+//         if (value === null || typeof value !== 'object') return value;
+
+//         if (seen.has(value)) {
+//             return { '@ref': seen.get(value) };
+//         }
+
+//         // Arrays are encoded by value only because JSON drops custom array props
+//         // like "@id" during stringify.
+//         if (Array.isArray(value)) {
+//             const result: any[] = new Array(value.length);
+//             queue.push({ kind: 'array', source: value, target: result });
+//             return result;
+//         }
+
+//         const id = String(nextId++);
+//         seen.set(value, id);
+
+//         if (value instanceof Map) {
+//             const result = {
+//                 '@id': id,
+//                 '@type': 'Map' as const,
+//                 entries: [] as any[]
+//             };
+//             queue.push({ kind: 'map', source: value, target: result });
+//             return result;
+//         }
+
+//         if (value instanceof Set) {
+//             const result = {
+//                 '@id': id,
+//                 '@type': 'Set' as const,
+//                 values: [] as any[]
+//             };
+//             queue.push({ kind: 'set', source: value, target: result });
+//             return result;
+//         }
+
+//         const result: Record<string, any> = { '@id': id };
+//         queue.push({ kind: 'object', source: value, target: result });
+//         return result;
+//     }
+
+//     const encoded = encodeValue(v);
+
+//     while (queue.length > 0) {
+//         const item = queue.shift()!;
+
+//         if (item.kind === 'array') {
+//             for (let i = 0; i < item.source.length; i++) {
+//                 item.target[i] = encodeValue(item.source[i]);
+//             }
+//             continue;
+//         }
+
+//         if (item.kind === 'map') {
+//             for (const [k, val] of item.source.entries()) {
+//                 item.target.entries.push([encodeValue(k), encodeValue(val)]);
+//             }
+//             continue;
+//         }
+
+//         if (item.kind === 'set') {
+//         for (const val of item.source.values()) {
+//             item.target.values.push(encodeValue(val));
+//         }
+//         continue;
+//         }
+
+//         for (const [key, val] of Object.entries(item.source)) {
+//             item.target[key] = encodeValue(val);
+//         }
+//     }
+
+//     // `copy` below is only available in the Chrome console.
+//     // If you want to run this in Node.js, replace it with `console.log`.
+//     // copy(JSON.stringify(encoded, null, 2));
+//     // console.log(JSON.stringify(encoded, null, 2));
+//     // console.log('JSOG copied to clipboard.');
+//     return encoded;
+// }
+
+
+// export { toJsogBreathFirst }

package/__tests__/jsog/to-jsog-depth-first.ts

@@ -1,55 +1,58 @@
-
-function toJsogDepthFirst(v: any) {
-    const seen = new Map();
-    let nextId = 1;
-
-    function encode(obj: any): any {
-      if (obj === null || typeof obj !== 'object') return obj;
-
-      if (seen.has(obj)) {
-        return { '@ref': seen.get(obj) };
-      }
-
-      // Arrays are encoded by value only because JSON drops custom array props
-      // like "@id" during stringify.
-      if (Array.isArray(obj)) {
-        return obj.map(encode);
-      }
-
-      const id = String(nextId++);
-      seen.set(obj, id);
-
-      if (obj instanceof Map) {
-        return {
-          '@id': id,
-          '@type': 'Map',
-          entries: [...obj.entries()].map(([k, v]) => [encode(k), encode(v)])
-        };
-      }
-
-      if (obj instanceof Set) {
-        return {
-          '@id': id,
-          '@type': 'Set',
-          values: [...obj.values()].map(value => encode(value))
-        };
-      }
-
-      const result: Record<string, any> = { '@id': id };
-      for (const [key, value] of Object.entries(obj)) {
-        result[key] = encode(value);
-      }
-      return result;
-    }
-
-    const encoded = encode(v);
-
-    // `copy` below is only available in the Chrome console.
-    // If you want to run this in Node.js, replace it with `console.log`.
-    // copy(JSON.stringify(encoded, null, 2));
-    console.log(JSON.stringify(encoded, null, 2));
-    // console.log('JSOG copied to clipboard.');
-}
-
-
-export { toJsogDepthFirst }
+//=======================================
+// NOTE! JSOG not used in tests anymore!
+//=======================================
+
+// function toJsogDepthFirst(v: any) {
+//     const seen = new Map();
+//     let nextId = 1;
+
+//     function encode(obj: any): any {
+//       if (obj === null || typeof obj !== 'object') return obj;
+
+//       if (seen.has(obj)) {
+//         return { '@ref': seen.get(obj) };
+//       }
+
+//       // Arrays are encoded by value only because JSON drops custom array props
+//       // like "@id" during stringify.
+//       if (Array.isArray(obj)) {
+//         return obj.map(encode);
+//       }
+
+//       const id = String(nextId++);
+//       seen.set(obj, id);
+
+//       if (obj instanceof Map) {
+//         return {
+//           '@id': id,
+//           '@type': 'Map',
+//           entries: [...obj.entries()].map(([k, v]) => [encode(k), encode(v)])
+//         };
+//       }
+
+//       if (obj instanceof Set) {
+//         return {
+//           '@id': id,
+//           '@type': 'Set',
+//           values: [...obj.values()].map(value => encode(value))
+//         };
+//       }
+
+//       const result: Record<string, any> = { '@id': id };
+//       for (const [key, value] of Object.entries(obj)) {
+//         result[key] = encode(value);
+//       }
+//       return result;
+//     }
+
+//     const encoded = encode(v);
+
+//     // `copy` below is only available in the Chrome console.
+//     // If you want to run this in Node.js, replace it with `console.log`.
+//     // copy(JSON.stringify(encoded, null, 2));
+//     console.log(JSON.stringify(encoded, null, 2));
+//     // console.log('JSOG copied to clipboard.');
+// }
+
+
+// export { toJsogDepthFirst }

package/__tests__/lib-load.spec.ts

@@ -19,6 +19,6 @@ test('node require', function() {
         expect(result).toBeInstanceOf(Array);
         expect(result[0]).toBeInstanceOf(Object);
         expect(result[0].cpNode).toBeInstanceOf(Object);
-        expect(result[0].cpNode.cp).toBeInstanceOf(Object);
+        expect(result[0].cpNode.pointOnShape).toBeInstanceOf(Object);
 	})();
 });