Fix composite primary auto-fill for preInsert hook fields and add regression test

orga/changelog/add-test-composite-primary-preinsert-hook.md

@@ -0,0 +1 @@
+- TEST add reproduction for composite primary key auto-fill when only `name` and `number` are set in a `preInsert` hook without `id` (https://github.com/pubkey/rxdb/pull/8527)

orga/changelog/fix-composite-primary-preinsert-hook.md

@@ -0,0 +1 @@
+- FIX allow `preInsert` hooks to set composite primary key fields (for example `name` and `number`) without manually setting `id`, so RxDB computes the composite primary key afterwards (https://github.com/pubkey/rxdb/pull/8527)

src/rx-collection-helper.ts

@@ -33,11 +33,12 @@ import { newRxError } from './rx-error.ts';
  */
 export function fillObjectDataBeforeInsert<RxDocType>(
     schema: RxSchema<RxDocType>,
-    data: Partial<RxDocumentData<RxDocType>> | any
+    data: Partial<RxDocumentData<RxDocType>> | any,
+    skipPrimaryKeyFill: boolean = false
 ): RxDocumentData<RxDocType> {
     data = flatClone(data);
     data = fillObjectWithDefaults(schema, data);
-    if (typeof schema.jsonSchema.primaryKey !== 'string') {
+    if (!skipPrimaryKeyFill && typeof schema.jsonSchema.primaryKey !== 'string') {
         data = fillPrimaryKey(
             schema.primaryPath,
             schema.jsonSchema,

src/rx-collection.ts

@@ -52,6 +52,7 @@ import {
     runAsyncPluginHooks,
     runPluginHooks
 } from './hooks.ts';
+import { fillPrimaryKey } from './rx-schema-helper.ts';
 
 import {
     Subscription,
@@ -443,9 +444,16 @@ export class RxCollectionBase<
         if (this.hasHooks('pre', 'insert')) {
             insertRows = await Promise.all(
                 docsData.map(docData => {
-                    const useDocData = fillObjectDataBeforeInsert(this.schema, docData);
+                    const useDocData = fillObjectDataBeforeInsert(this.schema, docData, true);
                     return this._runHooks('pre', 'insert', useDocData)
                         .then(() => {
+                            if (typeof this.schema.jsonSchema.primaryKey !== 'string') {
+                                fillPrimaryKey(
+                                    this.schema.primaryPath as any,
+                                    this.schema.jsonSchema as any,
+                                    useDocData as any
+                                );
+                            }
                             ids.add((useDocData as any)[primaryPath]);
                             return { document: useDocData };
                         });

test/unit/hooks.test.ts

@@ -559,5 +559,58 @@ describe('hooks.test.js', () => {
             assert.strictEqual(allDocs.length, 0);
             c.database.close();
         });
+        it('should auto-generate composite primary key when set in preInsert hook', async () => {
+            const db = await createRxDatabase({
+                name: randomToken(10),
+                storage: config.storage.getStorage(),
+                multiInstance: true
+            });
+            const collections = await db.addCollections({
+                humans: {
+                    schema: {
+                        version: 0,
+                        primaryKey: {
+                            key: 'id',
+                            fields: ['name', 'number'],
+                            separator: '|'
+                        },
+                        type: 'object',
+                        properties: {
+                            id: {
+                                type: 'string',
+                                maxLength: 100
+                            },
+                            name: {
+                                type: 'string',
+                                maxLength: 100
+                            },
+                            number: {
+                                type: 'integer',
+                                minimum: 0,
+                                maximum: 9999
+                            }
+                        },
+                        required: [
+                            'id',
+                            'name',
+                            'number'
+                        ]
+                    }
+                }
+            });
+            const collection = collections.humans;
+
+            collection.preInsert((docData) => {
+                docData.name = 'alice';
+                docData.number = 5;
+            }, false);
+
+            const doc = await collection.insert({} as any);
+            assert.strictEqual(doc.id, 'alice|5');
+            assert.strictEqual(doc.name, 'alice');
+            assert.strictEqual(doc.number, 5);
+
+            db.close();
+        });
     });
 });