@verdant-web/common 1.11.1 → 1.13.0

package/dist/cjs/migration.d.ts

@@ -40,6 +40,12 @@ declare type MigrationMutations<New extends StorageSchema> = {
 export interface MigrationTools<Old extends StorageSchema<any>, New extends StorageSchema<any>> {
     migrate: MigrationRunner<Old, New>;
     identity: <T>(val: T) => T;
+    /**
+     * @deprecated - default field values are automatically
+     * applied during migration, you don't need to use this.
+     * Please remove it from your migrations - even old ones
+     * (old migrations can be updated!)
+     */
     withDefaults: (collectionName: string, value: any) => any;
     queries: MigrationQueries<Old>;
     mutations: MigrationMutations<New>;
@@ -57,6 +63,7 @@ export interface MigrationEngine<Old extends StorageSchema, New extends StorageS
     newOids: string[];
     /** Promises that should be resolved before completing the migration */
     awaitables: Promise<any>[];
+    log: (...messages: any[]) => void;
 }
 declare type MigrationProcedure<Old extends StorageSchema, New extends StorageSchema> = (tools: MigrationTools<Old, New>) => Promise<void>;
 declare type EmptySchema = {

package/dist/cjs/migration.js

@@ -23,6 +23,20 @@ function migrate(oldSchemaOrNewSchema, newSchemaOrProcedure, procedureIfTwoSchem
             (0, index_js_1.stableStringify)(newSchema.collections[key]));
     const removedCollections = Object.keys(oldSchema.collections).filter((key) => !newSchema.collections[key]);
     const addedCollections = Object.keys(newSchema.collections).filter((key) => !oldSchema.collections[key]);
+    // collections which added one or more field defaults
+    const autoMigratedCollections = new Set();
+    for (const collection of changedCollections) {
+        const oldFields = oldSchema.collections[collection].fields;
+        const newFields = newSchema.collections[collection].fields;
+        // a new default was added - we can auto-migrate it
+        if (Object.keys(newFields).some((key) => { var _a, _b; return !((_a = oldFields[key]) === null || _a === void 0 ? void 0 : _a.default) && ((_b = newFields[key]) === null || _b === void 0 ? void 0 : _b.default); })) {
+            autoMigratedCollections.add(collection);
+        }
+        // a field was removed - we can auto-migrate it
+        if (Object.keys(oldFields).some((key) => !newFields[key])) {
+            autoMigratedCollections.add(collection);
+        }
+    }
     const addedIndexes = {};
     const removedIndexes = {};
     for (const changed of [...changedCollections, ...addedCollections]) {
@@ -37,20 +51,38 @@ function migrate(oldSchemaOrNewSchema, newSchemaOrProcedure, procedureIfTwoSchem
             removedIndexes[changed] = removed;
         }
     }
+    const withDefaults = (collectionName, val) => {
+        return (0, index_js_1.addFieldDefaults)(newSchema.collections[collectionName], val);
+    };
+    const autoMigration = (collectionName) => (val) => {
+        const collection = newSchema.collections[collectionName];
+        return (0, index_js_1.addFieldDefaults)(collection, (0, index_js_1.removeExtraProperties)(collection, val));
+    };
     return {
         version: newSchema.version,
         migrate: async (engine) => {
             const migratedCollections = [];
             await procedure({
                 migrate: async (collection, strategy) => {
+                    const auto = autoMigration(collection);
+                    const wrapped = async (val) => {
+                        const baseValue = await strategy(val);
+                        // assign OID from original value in case user's strategy
+                        // involves cloning
+                        (0, index_js_1.assignOid)(baseValue, (0, index_js_1.getOid)(val));
+                        const result = auto(baseValue);
+                        return result;
+                    };
                     // @ts-ignore
-                    await engine.migrate(collection, strategy);
+                    await engine.migrate(collection, wrapped);
                     migratedCollections.push(collection);
+                    // since the user migrated this one and we wrap their
+                    // strategy with auto-migration, we can remove it from
+                    // the auto-migration list
+                    autoMigratedCollections.delete(collection);
                 },
                 identity: (val) => val,
-                withDefaults: (collectionName, val) => {
-                    return (0, index_js_1.addFieldDefaults)(newSchema.collections[collectionName], val);
-                },
+                withDefaults,
                 info: {
                     changedCollections,
                     addedCollections,
@@ -59,8 +91,16 @@ function migrate(oldSchemaOrNewSchema, newSchemaOrProcedure, procedureIfTwoSchem
                 queries: engine.queries,
                 mutations: engine.mutations,
             });
+            // 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);
+            }
             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);
             }
         },
@@ -115,12 +155,12 @@ function createDefaultMigration(schema, newSchema) {
             version: 0,
             collections: {},
         };
-    return migrate(oldSchema, newSchema || schema, async ({ migrate, withDefaults, info }) => {
+    return migrate(oldSchema, newSchema || schema, async ({ migrate, info }) => {
         if ((newSchema || schema).version === 1)
             return;
         for (const collection of info.changedCollections) {
             // @ts-ignore indefinite type resolution
-            await migrate(collection, (old) => withDefaults(collection, old));
+            await migrate(collection, (old) => old);
         }
     });
 }

package/dist/cjs/migration.js.map

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

package/dist/cjs/oids.d.ts

@@ -28,7 +28,6 @@ import { ObjectRef } from './operation.js';
  * conflict resolution purposes
  */
 export declare type ObjectIdentifier = string;
-export declare type KeyPath = (string | number)[];
 export declare const LEGACY_OID_KEY = "__@@oid_do_not_use";
 export declare const OID_KEY = "@@id";
 export declare function getOid(obj: any): string;
@@ -41,14 +40,14 @@ export declare function isOidKey(key: string): boolean;
  * For sub-objects, assign a random sub-OID if no OID
  * is already assigned.
  */
-export declare function ensureOid(obj: any, rootOid: ObjectIdentifier, key: string | number, createSubId?: () => string): string;
-export declare function createOid(collection: string, documentId: string, keyPath?: KeyPath, subId?: string): string;
-export declare function createSubOid(root: ObjectIdentifier, key: string | number, createSubId?: () => string): string;
+export declare function ensureOid(obj: any, rootOid: ObjectIdentifier, createSubId?: () => string): string;
+export declare function ensureCompatibleOid(obj: any, rootOid: ObjectIdentifier, createSubId?: () => string): string;
+export declare function createOid(collection: string, documentId: string, subId?: string): string;
+export declare function createSubOid(root: ObjectIdentifier, createSubId?: () => string): string;
 export declare function decomposeOid(oid: ObjectIdentifier): {
     collection: string;
     id: string;
     subId?: string;
-    keyPath: KeyPath;
 };
 export declare function assertAllLevelsHaveOids(obj: any, root?: any): void;
 export declare function assignOidsToAllSubObjects(obj: any, createSubId?: () => string): void;
@@ -85,3 +84,4 @@ export declare function getOidRoot(oid: ObjectIdentifier): string;
  */
 export declare function getOidRange(oid: ObjectIdentifier): string[];
 export declare function getRoots(oids: ObjectIdentifier[]): string[];
+export declare function areOidsRelated(oidA: ObjectIdentifier, oidB: ObjectIdentifier): boolean;

package/dist/cjs/oids.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoots = exports.getOidRange = exports.getOidRoot = exports.normalizeFirstLevel = exports.normalize = exports.createRef = exports.createOidSubId = exports.removeOidsFromAllSubObjects = exports.removeOidPropertiesFromAllSubObjects = exports.assignOidPropertiesToAllSubObjects = exports.maybeGetOidProperty = exports.assignOidProperty = exports.assignOidsToAllSubObjects = exports.assertAllLevelsHaveOids = exports.decomposeOid = exports.createSubOid = exports.createOid = exports.ensureOid = exports.isOidKey = exports.removeOid = exports.hasOid = exports.assignOid = exports.maybeGetOid = exports.getOid = exports.OID_KEY = exports.LEGACY_OID_KEY = void 0;
+exports.areOidsRelated = exports.getRoots = exports.getOidRange = exports.getOidRoot = exports.normalizeFirstLevel = exports.normalize = exports.createRef = exports.createOidSubId = exports.removeOidsFromAllSubObjects = exports.removeOidPropertiesFromAllSubObjects = exports.assignOidPropertiesToAllSubObjects = exports.maybeGetOidProperty = exports.assignOidProperty = exports.assignOidsToAllSubObjects = exports.assertAllLevelsHaveOids = exports.decomposeOid = exports.createSubOid = exports.createOid = exports.ensureCompatibleOid = exports.ensureOid = exports.isOidKey = exports.removeOid = exports.hasOid = exports.assignOid = exports.maybeGetOid = exports.getOid = exports.OID_KEY = exports.LEGACY_OID_KEY = void 0;
 const uuid_1 = require("uuid");
 const files_js_1 = require("./files.js");
 const operation_js_1 = require("./operation.js");
@@ -8,7 +8,6 @@ const refs_js_1 = require("./refs.js");
 const utils_js_1 = require("./utils.js");
 exports.LEGACY_OID_KEY = '__@@oid_do_not_use';
 exports.OID_KEY = '@@id';
-const KEY_PATH_SEPARATOR = '.';
 const COLLECTION_SEPARATOR = '/';
 const RANDOM_SEPARATOR = ':';
 /**
@@ -32,6 +31,9 @@ function maybeGetOid(obj) {
 exports.maybeGetOid = maybeGetOid;
 function assignOid(obj, oid) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(obj), `Only objects can be assigned OIDs, received ${JSON.stringify(obj)}`);
+    if (hasOid(obj)) {
+        removeOid(obj);
+    }
     oidMap.set(obj, oid);
     return obj;
 }
@@ -53,9 +55,9 @@ exports.isOidKey = isOidKey;
  * For sub-objects, assign a random sub-OID if no OID
  * is already assigned.
  */
-function ensureOid(obj, rootOid, key, createSubId) {
+function ensureOid(obj, rootOid, createSubId) {
     if (!hasOid(obj)) {
-        const oid = createSubOid(rootOid, key, createSubId);
+        const oid = createSubOid(rootOid, createSubId);
         assignOid(obj, oid);
         return oid;
     }
@@ -64,6 +66,25 @@ function ensureOid(obj, rootOid, key, createSubId) {
     }
 }
 exports.ensureOid = ensureOid;
+function ensureCompatibleOid(obj, rootOid, createSubId) {
+    if (!hasOid(obj)) {
+        const oid = createSubOid(rootOid, createSubId);
+        assignOid(obj, oid);
+        return oid;
+    }
+    else {
+        const existingOid = getOid(obj);
+        if (!areOidsRelated(existingOid, rootOid)) {
+            const oid = createSubOid(rootOid, createSubId);
+            assignOid(obj, oid);
+            return oid;
+        }
+        else {
+            return getOid(obj);
+        }
+    }
+}
+exports.ensureCompatibleOid = ensureCompatibleOid;
 const SANTIIZE_PLACEHOLDERS = {
     '.': '˙',
     '/': '&slash;',
@@ -83,32 +104,28 @@ function unsanitizeFragment(id) {
         .replace(/:/g, ':')
         .replace(/˙/g, '.');
 }
-function createOid(collection, documentId, keyPath = [], subId) {
+function createOid(collection, documentId, subId) {
     let oid = sanitizeFragment(collection) +
         COLLECTION_SEPARATOR +
         sanitizeFragment(documentId);
     if (subId) {
-        const keyPathItems = keyPath.map((k) => typeof k === 'number' ? '#' : sanitizeFragment(k));
-        oid += KEY_PATH_SEPARATOR + keyPathItems.join(KEY_PATH_SEPARATOR);
         oid += RANDOM_SEPARATOR + subId;
     }
     return oid;
 }
 exports.createOid = createOid;
-function createSubOid(root, key, createSubId = createOidSubId) {
-    const { collection, id, keyPath } = decomposeOid(root);
-    return createOid(collection, id, [...keyPath, key], createSubId());
+function createSubOid(root, createSubId = createOidSubId) {
+    const { collection, id } = decomposeOid(root);
+    return createOid(collection, id, createSubId());
 }
 exports.createSubOid = createSubOid;
 function decomposeOid(oid) {
     const [core, random] = oid.split(RANDOM_SEPARATOR);
-    const [collection, paths] = core.split('/');
-    const [id, ...keyPath] = paths.split(KEY_PATH_SEPARATOR);
+    const [collection, id] = core.split('/');
     return {
         collection: unsanitizeFragment(collection),
         id: unsanitizeFragment(id),
         subId: random,
-        keyPath: keyPath.map(unsanitizeFragment),
     };
 }
 exports.decomposeOid = decomposeOid;
@@ -133,7 +150,7 @@ function assignOidsToAllSubObjects(obj, createSubId) {
         for (let i = 0; i < obj.length; i++) {
             item = obj[i];
             if ((0, utils_js_1.isObject)(item) && !(0, refs_js_1.isRef)(item)) {
-                ensureOid(item, rootOid, i, createSubId);
+                ensureCompatibleOid(item, rootOid, createSubId);
                 assignOidsToAllSubObjects(item, createSubId);
             }
         }
@@ -141,7 +158,7 @@ function assignOidsToAllSubObjects(obj, createSubId) {
     else if ((0, utils_js_1.isObject)(obj) && !(0, refs_js_1.isRef)(obj)) {
         for (const key of Object.keys(obj)) {
             if ((0, utils_js_1.isObject)(obj[key]) && !(0, refs_js_1.isRef)(obj[key])) {
-                ensureOid(obj[key], rootOid, key, createSubId);
+                ensureCompatibleOid(obj[key], rootOid, createSubId);
                 assignOidsToAllSubObjects(obj[key], createSubId);
             }
         }
@@ -161,9 +178,6 @@ function maybeGetOidProperty(obj) {
     return obj[exports.OID_KEY] || obj[exports.LEGACY_OID_KEY];
 }
 exports.maybeGetOidProperty = maybeGetOidProperty;
-function hasOidProperty(obj) {
-    return !!maybeGetOidProperty(obj);
-}
 function removeOidProperty(obj) {
     if (!(0, utils_js_1.isObject)(obj)) {
         return obj;
@@ -349,10 +363,7 @@ function normalizeFirstLevel(obj) {
 }
 exports.normalizeFirstLevel = normalizeFirstLevel;
 function getOidRoot(oid) {
-    const [collection, idAndPaths] = oid.split(RANDOM_SEPARATOR)[0].split('/');
-    const sepIdx = idAndPaths.indexOf(KEY_PATH_SEPARATOR);
-    const id = sepIdx !== -1 ? idAndPaths.substring(0, sepIdx) : idAndPaths;
-    return `${collection}/${id}`;
+    return oid.split(RANDOM_SEPARATOR)[0];
 }
 exports.getOidRoot = getOidRoot;
 /**
@@ -372,4 +383,8 @@ function getRoots(oids) {
     return Array.from(set);
 }
 exports.getRoots = getRoots;
+function areOidsRelated(oidA, oidB) {
+    return getOidRoot(oidA) === getOidRoot(oidB);
+}
+exports.areOidsRelated = areOidsRelated;
 //# sourceMappingURL=oids.js.map

package/dist/cjs/oids.js.map

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

package/dist/cjs/oids.test.js

@@ -31,43 +31,43 @@ const oids_js_1 = require("./oids.js");
         (0, vitest_1.expect)(result.get('test/a')).toEqual((0, oids_js_1.assignOid)({
             foo: {
                 '@@type': 'ref',
-                id: 'test/a.foo:0',
+                id: 'test/a:0',
             },
             qux: {
                 '@@type': 'ref',
-                id: 'test/a.qux:2',
+                id: 'test/a:2',
             },
         }, 'test/a'));
-        (0, vitest_1.expect)(result.get('test/a.foo:0')).toEqual((0, oids_js_1.assignOid)({
+        (0, vitest_1.expect)(result.get('test/a:0')).toEqual((0, oids_js_1.assignOid)({
             bar: 1,
             baz: {
                 '@@type': 'ref',
-                id: 'test/a.foo.baz:1',
+                id: 'test/a:1',
             },
-        }, 'test/a.foo:0'));
-        (0, vitest_1.expect)(result.get('test/a.foo.baz:1')).toEqual((0, oids_js_1.assignOid)([2, 3], 'test/a.foo.baz:1'));
-        (0, vitest_1.expect)(result.get('test/a.qux:2')).toEqual((0, oids_js_1.assignOid)([
+        }, 'test/a:0'));
+        (0, vitest_1.expect)(result.get('test/a:1')).toEqual((0, oids_js_1.assignOid)([2, 3], 'test/a:1'));
+        (0, vitest_1.expect)(result.get('test/a:2')).toEqual((0, oids_js_1.assignOid)([
             {
                 '@@type': 'ref',
-                id: 'test/a.qux.#:3',
+                id: 'test/a:3',
             },
             {
                 '@@type': 'ref',
-                id: 'test/a.qux.#:4',
+                id: 'test/a:4',
             },
-        ], 'test/a.qux:2'));
-        (0, vitest_1.expect)(result.get('test/a.qux.#:3')).toEqual((0, oids_js_1.assignOid)({
+        ], 'test/a:2'));
+        (0, vitest_1.expect)(result.get('test/a:3')).toEqual((0, oids_js_1.assignOid)({
             corge: true,
-        }, 'test/a.qux.#:3'));
-        (0, vitest_1.expect)(result.get('test/a.qux.#:4')).toEqual((0, oids_js_1.assignOid)({
+        }, 'test/a:3'));
+        (0, vitest_1.expect)(result.get('test/a:4')).toEqual((0, oids_js_1.assignOid)({
             grault: {
                 '@@type': 'ref',
-                id: 'test/a.qux.#.grault:5',
+                id: 'test/a:5',
             },
-        }, 'test/a.qux.#:4'));
-        (0, vitest_1.expect)(result.get('test/a.qux.#.grault:5')).toEqual((0, oids_js_1.assignOid)({
+        }, 'test/a:4'));
+        (0, vitest_1.expect)(result.get('test/a:5')).toEqual((0, oids_js_1.assignOid)({
             garply: 4,
-        }, 'test/a.qux.#.grault:5'));
+        }, 'test/a:5'));
     });
     (0, vitest_1.it)('should handle file references and not replace them with refs or attempt to normalize them', () => {
         let i = 0;
@@ -88,21 +88,21 @@ const oids_js_1 = require("./oids.js");
         (0, vitest_1.expect)(result.get('test/a')).toEqual((0, oids_js_1.assignOid)({
             foo: {
                 '@@type': 'ref',
-                id: 'test/a.foo:0',
+                id: 'test/a:0',
             },
             qux: {
                 '@@type': 'ref',
-                id: 'test/a.qux:1',
+                id: 'test/a:1',
             },
         }, 'test/a'));
-        (0, vitest_1.expect)(result.get('test/a.foo:0')).toEqual((0, oids_js_1.assignOid)({
+        (0, vitest_1.expect)(result.get('test/a:0')).toEqual((0, oids_js_1.assignOid)({
             bar: 1,
             file: {
                 '@@type': 'file',
                 id: 'abcd123',
             },
-        }, 'test/a.foo:0'));
-        (0, vitest_1.expect)(result.get('test/a.qux:1')).toEqual((0, oids_js_1.assignOid)([
+        }, 'test/a:0'));
+        (0, vitest_1.expect)(result.get('test/a:1')).toEqual((0, oids_js_1.assignOid)([
             {
                 '@@type': 'file',
                 id: 'efgh456',
@@ -111,7 +111,7 @@ const oids_js_1 = require("./oids.js");
                 '@@type': 'file',
                 id: 'ijkl789',
             },
-        ], 'test/a.qux:2'));
+        ], 'test/a:2'));
     });
 });
 (0, vitest_1.describe)('normalizing the first level of an object', () => {
@@ -143,17 +143,36 @@ const oids_js_1 = require("./oids.js");
 			{
 			  "foo": {
 			    "@@type": "ref",
-			    "id": "test/a.foo:0",
+			    "id": "test/a:0",
 			  },
 			  "qux": {
 			    "@@type": "ref",
-			    "id": "test/a.qux:2",
+			    "id": "test/a:2",
 			  },
 			}
 		`);
-        (0, vitest_1.expect)(result.get('test/a:0')).toMatchInlineSnapshot('undefined');
+        (0, vitest_1.expect)(result.get('test/a:0')).toMatchInlineSnapshot(`
+			{
+			  "bar": 1,
+			  "baz": [
+			    2,
+			    3,
+			  ],
+			}
+		`);
         (0, vitest_1.expect)(result.get('test/a:1')).toBeUndefined();
-        (0, vitest_1.expect)(result.get('test/a:2')).toMatchInlineSnapshot('undefined');
+        (0, vitest_1.expect)(result.get('test/a:2')).toMatchInlineSnapshot(`
+			[
+			  {
+			    "corge": true,
+			  },
+			  {
+			    "grault": {
+			      "garply": 4,
+			    },
+			  },
+			]
+		`);
         (0, vitest_1.expect)(result.get('test/a:3')).toBeUndefined();
         (0, vitest_1.expect)(result.get('test/a:4')).toBeUndefined();
         (0, vitest_1.expect)(result.get('test/a:5')).toBeUndefined();
@@ -207,7 +226,7 @@ const oids_js_1 = require("./oids.js");
 			{
 			  "@@id": "test/a",
 			  "foo": {
-			    "@@id": "test/a.foo:0",
+			    "@@id": "test/a:0",
 			    "bar": 1,
 			    "baz": [
 			      2,
@@ -216,13 +235,13 @@ const oids_js_1 = require("./oids.js");
 			  },
 			  "qux": [
 			    {
-			      "@@id": "test/a.qux.#:3",
+			      "@@id": "test/a:3",
 			      "corge": true,
 			    },
 			    {
-			      "@@id": "test/a.qux.#:4",
+			      "@@id": "test/a:4",
 			      "grault": {
-			        "@@id": "test/a.qux.#.grault:5",
+			        "@@id": "test/a:5",
 			        "garply": 4,
 			      },
 			    },
@@ -230,38 +249,37 @@ const oids_js_1 = require("./oids.js");
 			}
 		`);
         // extra check needed for array since it doesn't serialize in the snapshot
-        (0, vitest_1.expect)((0, oids_js_1.maybeGetOidProperty)(initial.qux)).toBe('test/a.qux:2');
+        (0, vitest_1.expect)((0, oids_js_1.maybeGetOidProperty)(initial.qux)).toBe('test/a:2');
     });
     (0, vitest_1.it)('should transfer assigned OID properties to the memory system', () => {
         const initial = (0, oids_js_1.assignOidProperty)({
             foo: (0, oids_js_1.assignOidProperty)({
                 bar: 1,
-            }, 'test/a.foo:1'),
+            }, 'test/a:1'),
             qux: (0, oids_js_1.assignOidProperty)([
                 (0, oids_js_1.assignOidProperty)({
                     corge: true,
-                }, 'test/a.qux.#:2'),
+                }, 'test/a:2'),
                 (0, oids_js_1.assignOidProperty)({
                     grault: (0, oids_js_1.assignOidProperty)({
                         garply: 4,
-                    }, 'test/a.qux.#.grault:3'),
-                }, 'test/a.qux.#:4'),
-            ], 'test/a.qux:2'),
+                    }, 'test/a:3'),
+                }, 'test/a:4'),
+            ], 'test/a:2'),
         }, 'test/a');
         (0, oids_js_1.removeOidPropertiesFromAllSubObjects)(initial);
         (0, vitest_1.expect)((0, oids_js_1.getOid)(initial)).toEqual('test/a');
-        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.foo)).toEqual('test/a.foo:1');
-        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux)).toEqual('test/a.qux:2');
-        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[0])).toEqual('test/a.qux.#:2');
-        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[1])).toEqual('test/a.qux.#:4');
-        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[1].grault)).toEqual('test/a.qux.#.grault:3');
+        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.foo)).toEqual('test/a:1');
+        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux)).toEqual('test/a:2');
+        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[0])).toEqual('test/a:2');
+        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[1])).toEqual('test/a:4');
+        (0, vitest_1.expect)((0, oids_js_1.getOid)(initial.qux[1].grault)).toEqual('test/a:3');
     });
 });
 (0, vitest_1.it)('should handle special characters in document id or collection', () => {
-    (0, vitest_1.expect)((0, oids_js_1.decomposeOid)((0, oids_js_1.createOid)('test.teesssst/asdf::', 'foo/bar (.) : huh:', ['baz?.quoo:/', 'qux'], 'corge'))).toEqual({
+    (0, vitest_1.expect)((0, oids_js_1.decomposeOid)((0, oids_js_1.createOid)('test.teesssst/asdf::', 'foo/bar (.) : huh:', 'corge'))).toEqual({
         collection: 'test.teesssst/asdf::',
         id: 'foo/bar (.) : huh:',
-        keyPath: ['baz?.quoo:/', 'qux'],
         subId: 'corge',
     });
 });

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

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