@verdant-web/common 1.13.0 → 1.13.2

package/src/migration.ts

@@ -270,9 +270,17 @@ export function migrate(
 		);
 		if (added.length > 0) {
 			addedIndexes[changed] = added;
+			// FIXME: don't o(n^2) this
+			if (changedCollections.includes(changed)) {
+				autoMigratedCollections.add(changed);
+			}
 		}
 		if (removed.length > 0) {
 			removedIndexes[changed] = removed;
+			// FIXME: don't o(n^2) this
+			if (changedCollections.includes(changed)) {
+				autoMigratedCollections.add(changed);
+			}
 		}
 	}
 
@@ -321,22 +329,27 @@ export function migrate(
 			// mandatory migration of fields which had defaults added or
 			// fields removed but weren't migrated by the user
 
-			engine.log(
-				'debug',
-				'auto-migrating collections with new defaults',
-				autoMigratedCollections,
-			);
-			for (const name of autoMigratedCollections) {
-				await engine.migrate(name, autoMigration(name));
-				migratedCollections.push(name);
-			}
+			if (newSchema.version > 1) {
+				engine.log(
+					'debug',
+					'auto-migrating collections with new defaults',
+					autoMigratedCollections,
+				);
+				for (const name of autoMigratedCollections) {
+					await engine.migrate(name, autoMigration(name));
+					migratedCollections.push(name);
+				}
 
-			const unmigrated = changedCollections.filter(
-				(collection) => !migratedCollections.includes(collection),
-			);
-			if (unmigrated.length > 0) {
-				// TODO: does this deserve a full-on error?
-				console.error('Unmigrated changed collections:', unmigrated);
+				const unmigrated = changedCollections.filter(
+					(collection) => !migratedCollections.includes(collection),
+				);
+				if (unmigrated.length > 0) {
+					// TODO: does this deserve a full-on error?
+					console.error(
+						`Unmigrated changed collections from version ${oldSchema.version} to version ${newSchema.version}:`,
+						unmigrated,
+					);
+				}
 			}
 		},
 		removedCollections,

package/src/oids.test.ts

@@ -9,6 +9,7 @@ import {
 	decomposeOid,
 	getOid,
 	getOidRange,
+	getOidRoot,
 	hasOid,
 	maybeGetOidProperty,
 	normalize,
@@ -404,3 +405,9 @@ describe('assigning OIDs to sub-objects', () => {
 		expect(hasOid(obj.bar[0])).toBe(false);
 	});
 });
+
+it('should get the root OID for a legacy OID', () => [
+	expect(getOidRoot('items/clabgyjfh00003968qycsq3ld.inputs.#')).toEqual(
+		'items/clabgyjfh00003968qycsq3ld',
+	),
+]);

package/src/oids.ts

@@ -426,7 +426,7 @@ export function normalizeFirstLevel(obj: any) {
 }
 
 export function getOidRoot(oid: ObjectIdentifier) {
-	return oid.split(RANDOM_SEPARATOR)[0];
+	return oid.split('.')[0].split(RANDOM_SEPARATOR)[0];
 }
 
 /**

package/src/schema/types/fields.ts

@@ -37,7 +37,12 @@ export type StorageMapFieldSchema<V extends NestedStorageFieldSchema> = {
 export type StorageFileFieldSchema = {
 	type: 'file';
 	nullable?: boolean;
-	// downloadRemote?: boolean; TODO: is this a good feature? maybe later.
+	/**
+	 * Instructs the client to download synced files to local storage on first request for offline use.
+	 * Leave this false to save storage space on the client, at the cost of requiring a network
+	 * connection to use files created by other devices.
+	 */
+	downloadRemote?: boolean;
 };
 
 export type StorageFieldSchema =

package/src/timestamp.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it, vitest } from 'vitest';
 import {
 	convertOldHlcTimestamp,
 	deserializeHlcTimestamp,
+	encodeVersion,
 	HybridLogicalClockTimestampProvider,
 	OLD_encodeVersion,
 	OLD_serializeHlcTimestamp,
@@ -111,3 +112,15 @@ describe('the hybrid logical clock', () => {
 		expect(clock.getWallClockTime(now)).toEqual(time.getTime());
 	});
 });
+
+describe('version encoding', () => {
+	it('orders 1 before 2', () => {
+		expect(encodeVersion(1) < encodeVersion(2)).toBe(true);
+	});
+	it('orders 32 before 33', () => {
+		expect(encodeVersion(32) < encodeVersion(33)).toBe(true);
+	});
+	it('orders 34 before 35', () => {
+		expect(encodeVersion(34) < encodeVersion(35)).toBe(true);
+	});
+});