@verdant-web/common 1.11.0 → 1.12.0

package/src/operation.test.ts

@@ -28,7 +28,7 @@ describe('creating diff patch operations', () => {
 			assignOid(from, 'test/a');
 			const to = { foo: 'bar', baz: 'pop' };
 			assignOid(to, 'test/a');
-			const ops = diffToPatches(from, to, createClock(), []);
+			const ops = diffToPatches(from, to, createClock());
 			expect(ops).toMatchInlineSnapshot(`
 				[
 				  {
@@ -70,7 +70,7 @@ describe('creating diff patch operations', () => {
 				},
 				'test/a',
 			);
-			const patches = diffToPatches(from, to, createClock(), []);
+			const patches = diffToPatches(from, to, createClock());
 			expect(patches).toMatchInlineSnapshot(`
 				[
 				  {
@@ -118,7 +118,7 @@ describe('creating diff patch operations', () => {
 			};
 			assignOid(to, 'test/a');
 			assignOid(to.baz, 'test/a:1');
-			const patches = diffToPatches(from, to, createClock(), []);
+			const patches = diffToPatches(from, to, createClock());
 			expect(patches).toMatchInlineSnapshot(`
 				[
 				  {
@@ -166,7 +166,7 @@ describe('creating diff patch operations', () => {
 			};
 			assignOid(to, 'test/a');
 			assignOid(to.baz, 'test/a:0');
-			const patches = diffToPatches(from, to, createClock(), []);
+			const patches = diffToPatches(from, to, createClock());
 			expect(patches).toEqual([]);
 		});
 		it('patches sub-objects with same identity', () => {
@@ -182,7 +182,7 @@ describe('creating diff patch operations', () => {
 			};
 			assignOid(to, 'test/a');
 			assignOid(to.baz, 'test/a:0');
-			const patches = diffToPatches(from, to, createClock(), []);
+			const patches = diffToPatches(from, to, createClock());
 			expect(patches).toMatchInlineSnapshot(`
 				[
 				  {
@@ -208,18 +208,10 @@ describe('creating diff patch operations', () => {
 				foo: 'bip',
 			};
 			assignOid(to, 'test/a');
-			const patches = diffToPatches(
-				from,
-				to,
-				createClock(),
-				[],
-				undefined,
-				[],
-				{
-					defaultUndefined: true,
-					mergeUnknownObjects: true,
-				},
-			);
+			const patches = diffToPatches(from, to, createClock(), undefined, [], {
+				defaultUndefined: true,
+				mergeUnknownObjects: true,
+			});
 			expect(patches).toMatchInlineSnapshot(`
 				[
 				  {
@@ -303,7 +295,7 @@ describe('creating diff patch operations', () => {
 		assignOid(to.baz, 'test/a:3');
 		assignOid(to.baz[0], 'test/a:4');
 		assignOid(to.baz[1], 'test/a:5');
-		expect(diffToPatches(from, to, createClock(), [])).toMatchInlineSnapshot(`
+		expect(diffToPatches(from, to, createClock())).toMatchInlineSnapshot(`
 			[
 			  {
 			    "data": {
@@ -400,7 +392,7 @@ describe('creating diff patch operations', () => {
 			],
 		};
 		expect(
-			diffToPatches(from, to, createClock(), [], createClock(5), [], {
+			diffToPatches(from, to, createClock(), createClock(5), [], {
 				mergeUnknownObjects: true,
 			}),
 		).toMatchInlineSnapshot(`
@@ -411,7 +403,7 @@ describe('creating diff patch operations', () => {
 			      "index": 2,
 			      "op": "list-delete",
 			    },
-			    "oid": "test/a.foo.bar:1",
+			    "oid": "test/a:1",
 			    "timestamp": "0",
 			  },
 			  {
@@ -421,7 +413,7 @@ describe('creating diff patch operations', () => {
 			        0,
 			      ],
 			    },
-			    "oid": "test/a.foo.bop:5",
+			    "oid": "test/a:5",
 			    "timestamp": "1",
 			  },
 			  {
@@ -430,10 +422,10 @@ describe('creating diff patch operations', () => {
 			      "op": "set",
 			      "value": {
 			        "@@type": "ref",
-			        "id": "test/a.foo.bop:5",
+			        "id": "test/a:5",
 			      },
 			    },
-			    "oid": "test/a.foo:0",
+			    "oid": "test/a:0",
 			    "timestamp": "2",
 			  },
 			  {
@@ -442,7 +434,7 @@ describe('creating diff patch operations', () => {
 			      "op": "set",
 			      "value": false,
 			    },
-			    "oid": "test/a.baz.#:3",
+			    "oid": "test/a:3",
 			    "timestamp": "3",
 			  },
 			  {
@@ -452,7 +444,7 @@ describe('creating diff patch operations', () => {
 			        "corge": false,
 			      },
 			    },
-			    "oid": "test/a.baz.#:6",
+			    "oid": "test/a:6",
 			    "timestamp": "4",
 			  },
 			  {
@@ -461,10 +453,10 @@ describe('creating diff patch operations', () => {
 			      "op": "set",
 			      "value": {
 			        "@@type": "ref",
-			        "id": "test/a.baz.#:6",
+			        "id": "test/a:6",
 			      },
 			    },
-			    "oid": "test/a.baz:2",
+			    "oid": "test/a:2",
 			    "timestamp": "5",
 			  },
 			]
@@ -488,7 +480,7 @@ describe('creating diff patch operations', () => {
 			bar: [createFileRef('def456')],
 		};
 		expect(
-			diffToPatches(from, to, createClock(), [], createClock(5), [], {
+			diffToPatches(from, to, createClock(), createClock(5), [], {
 				mergeUnknownObjects: true,
 			}),
 		).toMatchInlineSnapshot(`
@@ -502,7 +494,7 @@ describe('creating diff patch operations', () => {
 			        "id": "abc456",
 			      },
 			    },
-			    "oid": "test/a.foo:0",
+			    "oid": "test/a:0",
 			    "timestamp": "0",
 			  },
 			  {
@@ -511,7 +503,7 @@ describe('creating diff patch operations', () => {
 			      "index": 1,
 			      "op": "list-delete",
 			    },
-			    "oid": "test/a.bar:1",
+			    "oid": "test/a:1",
 			    "timestamp": "1",
 			  },
 			]
@@ -730,7 +722,7 @@ describe('creating patches from initial state', () => {
 			        "bar": "baz",
 			      },
 			    },
-			    "oid": "test/a.foo:0",
+			    "oid": "test/a:0",
 			    "timestamp": "0",
 			  },
 			  {
@@ -740,7 +732,7 @@ describe('creating patches from initial state', () => {
 			        "corge": "grault",
 			      },
 			    },
-			    "oid": "test/a.qux.#:2",
+			    "oid": "test/a:2",
 			    "timestamp": "1",
 			  },
 			  {
@@ -750,7 +742,7 @@ describe('creating patches from initial state', () => {
 			        "oof": 1,
 			      },
 			    },
-			    "oid": "test/a.qux.#.bin:4",
+			    "oid": "test/a:4",
 			    "timestamp": "2",
 			  },
 			  {
@@ -759,11 +751,11 @@ describe('creating patches from initial state', () => {
 			      "value": {
 			        "bin": {
 			          "@@type": "ref",
-			          "id": "test/a.qux.#.bin:4",
+			          "id": "test/a:4",
 			        },
 			      },
 			    },
-			    "oid": "test/a.qux.#:3",
+			    "oid": "test/a:3",
 			    "timestamp": "3",
 			  },
 			  {
@@ -772,15 +764,15 @@ describe('creating patches from initial state', () => {
 			      "value": [
 			        {
 			          "@@type": "ref",
-			          "id": "test/a.qux.#:2",
+			          "id": "test/a:2",
 			        },
 			        {
 			          "@@type": "ref",
-			          "id": "test/a.qux.#:3",
+			          "id": "test/a:3",
 			        },
 			      ],
 			    },
-			    "oid": "test/a.qux:1",
+			    "oid": "test/a:1",
 			    "timestamp": "4",
 			  },
 			  {
@@ -789,11 +781,11 @@ describe('creating patches from initial state', () => {
 			      "value": {
 			        "foo": {
 			          "@@type": "ref",
-			          "id": "test/a.foo:0",
+			          "id": "test/a:0",
 			        },
 			        "qux": {
 			          "@@type": "ref",
-			          "id": "test/a.qux:1",
+			          "id": "test/a:1",
 			        },
 			      },
 			    },

package/src/operation.ts

@@ -4,20 +4,17 @@ import {
 	assignOid,
 	assignOidsToAllSubObjects,
 	createRef,
-	decomposeOid,
 	ensureOid,
 	getOid,
 	getOidRoot,
 	isOidKey,
-	KeyPath,
 	maybeGetOid,
 	normalize,
 	ObjectIdentifier,
-	OID_KEY,
 	removeOid,
 } from './oids.js';
 import { compareRefs, isRef } from './refs.js';
-import { isObject, assert, cloneDeep, findLastIndex } from './utils.js';
+import { assert, cloneDeep, findLastIndex, isObject } from './utils.js';
 
 // export type ObjectIdentifier<
 // 	CollectionName extends string = string,
@@ -161,7 +158,6 @@ export function diffToPatches<T extends { [key: string]: any } | any[]>(
 	from: T,
 	to: T,
 	getNow: () => string,
-	keyPath: KeyPath,
 	createSubId?: () => string,
 	patches: Operation[] = [],
 	options: {
@@ -198,7 +194,7 @@ export function diffToPatches<T extends { [key: string]: any } | any[]>(
 			const oldValueOid = maybeGetOid(oldValue);
 			let valueOid;
 			if (!options.mergeUnknownObjects) {
-				valueOid = ensureOid(value, oid, key, createSubId);
+				valueOid = ensureOid(value, oid, createSubId);
 			} else {
 				// if merge unknown objects is requested, we copy the previous value's oid
 				// to any mirrored new value if it doesn't have one assigned already.
@@ -207,7 +203,7 @@ export function diffToPatches<T extends { [key: string]: any } | any[]>(
 					assignOid(value, oldValueOid);
 					valueOid = oldValueOid;
 				} else {
-					valueOid = ensureOid(value, oid, key, createSubId);
+					valueOid = ensureOid(value, oid, createSubId);
 				}
 			}
 
@@ -239,15 +235,7 @@ export function diffToPatches<T extends { [key: string]: any } | any[]>(
 			} else {
 				// third case: OIDs are the same, meaning the identity is the same,
 				// and we must diff the objects
-				diffToPatches(
-					oldValue,
-					value,
-					getNow,
-					[...keyPath, key],
-					createSubId,
-					patches,
-					options,
-				);
+				diffToPatches(oldValue, value, getNow, createSubId, patches, options);
 			}
 		}
 	}

package/src/patch.ts

@@ -2,7 +2,7 @@
  * High-level patch creation for use with complex nested objects.
  */
 
-import { createRef, createSubOid, KeyPath, ObjectIdentifier } from './oids.js';
+import { createRef, createSubOid, ObjectIdentifier } from './oids.js';
 import {
 	diffToPatches,
 	initialToPatches,
@@ -22,18 +22,9 @@ export class PatchCreator {
 	createDiff = (
 		from: any,
 		to: any,
-		keyPath: KeyPath,
 		options: { mergeUnknownObjects?: boolean; defaultUndefined?: boolean } = {},
 	) => {
-		return diffToPatches(
-			from,
-			to,
-			this.getNow,
-			keyPath,
-			this.createSubId,
-			[],
-			options,
-		);
+		return diffToPatches(from, to, this.getNow, this.createSubId, [], options);
 	};
 
 	createInitialize = (obj: any, oid: ObjectIdentifier) => {
@@ -44,7 +35,6 @@ export class PatchCreator {
 		oid: ObjectIdentifier,
 		key: PropertyName,
 		value: any,
-		keyPath: KeyPath,
 	): Operation[] => {
 		// incoming value must be normalized. if it's not a primitive, it and all sub-objects
 		// must be created
@@ -61,7 +51,7 @@ export class PatchCreator {
 				},
 			];
 		} else {
-			const itemOid = createSubOid(oid, key, this.createSubId);
+			const itemOid = createSubOid(oid, this.createSubId);
 			return [
 				// since we're setting a complex nested object, we can initialize it wholesale.
 				// no diffing to do.
@@ -106,7 +96,7 @@ export class PatchCreator {
 				},
 			];
 		} else {
-			const itemOid = createSubOid(oid, 0, this.createSubId);
+			const itemOid = createSubOid(oid, this.createSubId);
 			return [
 				...initialToPatches(value, itemOid, this.getNow),
 				{
@@ -165,7 +155,7 @@ export class PatchCreator {
 				},
 			];
 		} else {
-			const itemOid = createSubOid(oid, index, this.createSubId);
+			const itemOid = createSubOid(oid, this.createSubId);
 			return [
 				...initialToPatches(value, itemOid, this.getNow),
 				{

package/src/schema/defaults.test.ts

@@ -12,7 +12,7 @@ describe('getting field defaults', () => {
 			},
 		} as const;
 		const first = getFieldDefault(field);
-		assignOid(first, createOid('test', '1', []));
+		assignOid(first, createOid('test', '1'));
 		const second = getFieldDefault(field);
 		expect(maybeGetOid(second)).toBe(undefined);
 	});

package/dist/cjs/files.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/cjs/files.test.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-const files_js_1 = require("./files.js");
-function makeFile() {
-    return new File([''], 'test.txt', { type: 'text/plain' });
-}
-(0, vitest_1.describe)('processing files in a value', () => {
-    (0, vitest_1.it)('replaces a single file with a reference', () => {
-        const file = makeFile();
-        const list = [];
-        const result = (0, files_js_1.processValueFiles)(file, list.push.bind(list));
-        (0, vitest_1.expect)(result).toEqual({
-            '@@type': 'file',
-            id: vitest_1.expect.stringContaining(''),
-        });
-        (0, vitest_1.expect)(list).toEqual([
-            {
-                id: vitest_1.expect.stringContaining(''),
-                blob: file,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-    });
-    (0, vitest_1.it)('replaces a list of files with references', () => {
-        const file1 = makeFile();
-        const file2 = makeFile();
-        const list = [];
-        const result = (0, files_js_1.processValueFiles)([file1, file2], list.push.bind(list));
-        (0, vitest_1.expect)(result).toEqual([
-            { '@@type': 'file', id: vitest_1.expect.stringContaining('') },
-            { '@@type': 'file', id: vitest_1.expect.stringContaining('') },
-        ]);
-        (0, vitest_1.expect)(list).toEqual([
-            {
-                id: vitest_1.expect.stringContaining(''),
-                blob: file1,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-            {
-                id: vitest_1.expect.stringContaining(''),
-                blob: file2,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-        (0, vitest_1.expect)(result[0].id).not.toEqual(result[1].id);
-    });
-    (0, vitest_1.it)('replaces nested files with references', () => {
-        const file = makeFile();
-        const list = [];
-        const result = (0, files_js_1.processValueFiles)({ a: { b: file } }, list.push.bind(list));
-        (0, vitest_1.expect)(result).toEqual({
-            a: {
-                b: {
-                    '@@type': 'file',
-                    id: vitest_1.expect.stringContaining(''),
-                },
-            },
-        });
-        (0, vitest_1.expect)(list).toEqual([
-            {
-                id: vitest_1.expect.stringContaining(''),
-                blob: file,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-    });
-});
-//# sourceMappingURL=files.test.js.map

package/dist/cjs/files.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/files.test.ts"],"names":[],"mappings":"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"}

package/dist/esm/files.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/esm/files.test.js

@@ -1,79 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { processValueFiles } from './files.js';
-function makeFile() {
-    return new File([''], 'test.txt', { type: 'text/plain' });
-}
-describe('processing files in a value', () => {
-    it('replaces a single file with a reference', () => {
-        const file = makeFile();
-        const list = [];
-        const result = processValueFiles(file, list.push.bind(list));
-        expect(result).toEqual({
-            '@@type': 'file',
-            id: expect.stringContaining(''),
-        });
-        expect(list).toEqual([
-            {
-                id: expect.stringContaining(''),
-                blob: file,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-    });
-    it('replaces a list of files with references', () => {
-        const file1 = makeFile();
-        const file2 = makeFile();
-        const list = [];
-        const result = processValueFiles([file1, file2], list.push.bind(list));
-        expect(result).toEqual([
-            { '@@type': 'file', id: expect.stringContaining('') },
-            { '@@type': 'file', id: expect.stringContaining('') },
-        ]);
-        expect(list).toEqual([
-            {
-                id: expect.stringContaining(''),
-                blob: file1,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-            {
-                id: expect.stringContaining(''),
-                blob: file2,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-        expect(result[0].id).not.toEqual(result[1].id);
-    });
-    it('replaces nested files with references', () => {
-        const file = makeFile();
-        const list = [];
-        const result = processValueFiles({ a: { b: file } }, list.push.bind(list));
-        expect(result).toEqual({
-            a: {
-                b: {
-                    '@@type': 'file',
-                    id: expect.stringContaining(''),
-                },
-            },
-        });
-        expect(list).toEqual([
-            {
-                id: expect.stringContaining(''),
-                blob: file,
-                url: null,
-                remote: false,
-                name: 'test.txt',
-                type: 'text/plain',
-            },
-        ]);
-    });
-});
-//# sourceMappingURL=files.test.js.map

package/dist/esm/files.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/files.test.ts"],"names":[],"mappings":"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"}