rads-db 3.0.25 → 3.0.27

package/dist/index.cjs

@@ -659,6 +659,59 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     await afterPut(docArgsToSave, ctx, computedContext);
     return docsToSave;
   }
+  async function verifyMany(args, ctx) {
+    if (driverInstance.verifyMany) {
+      return driverInstance.verifyMany(args, ctx);
+    }
+    ctx = { ...options.context, ...ctx };
+    if (args?.dryRun) {
+      ctx._logs = ctx._logs || [];
+      ctx.dryRun = true;
+    }
+    const { _logs } = ctx;
+    const { nodes, cursor } = await driverInstance.getMany(args, ctx);
+    let correctCount = 0;
+    let incorrectCount = 0;
+    const incorrectDocs = [];
+    const oldDocs = nodes;
+    const docArgsToSave = oldDocs.map((oldDoc) => {
+      const doc = merge(oldDoc, {});
+      if (args?.recompute) {
+        for (const p of args.recompute) {
+          delete doc[p];
+        }
+      }
+      if (!options.keepNulls)
+        cleanUndefinedAndNull(doc);
+      return { oldDoc, doc };
+    });
+    await handlePrecomputed(computedContext, docArgsToSave, ctx);
+    const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
+    await beforePut(docArgsToSave, ctx, computedContext);
+    for (const d of docArgsToSave) {
+      const validatedDoc = validators[key](d.doc);
+      for (const f of precomputedFields || []) {
+        ___default.set(validatedDoc, f, ___default.get(d.doc, f));
+      }
+      d.doc = validatedDoc;
+    }
+    await fillDenormFieldsBeforePut(computedContext, docArgsToSave, ctx);
+    for (const { oldDoc, doc } of docArgsToSave) {
+      const d = diff(doc, oldDoc);
+      if (___default.isEmpty(d))
+        correctCount++;
+      else {
+        incorrectCount++;
+        const objToAdd = { id: doc.id, diff: d };
+        incorrectDocs.push(objToAdd);
+      }
+    }
+    const docsToSave = docArgsToSave.map((x) => x.doc);
+    await driverInstance.putMany(docsToSave, ctx);
+    await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
+    await afterPut(docArgsToSave, ctx, computedContext);
+    return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
+  }
   const result = {
     // No deleteMany / deleteAll on purpose - it's a dangerous operation, let them use driver instead
     createObject() {
@@ -666,6 +719,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     },
     getMany,
     putMany,
+    verifyMany,
     driver: driverInstance,
     getAgg: async (args, ctx) => {
       args = { ...args, where: { ...args?.where } };
@@ -703,6 +757,17 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await afterGet(result2, args, ctx, computedContext);
       return result2;
     },
+    verifyAll: async (args, ctx) => {
+      let cursor = args?.cursor;
+      const result2 = { correctCount: 0, incorrectCount: 0 };
+      do {
+        const response = await verifyMany({ ...args, cursor }, ctx);
+        cursor = response.cursor;
+        result2.correctCount += response.correctCount;
+        result2.incorrectCount += response.incorrectCount;
+      } while (cursor);
+      return result2;
+    },
     put: async (doc, ctx) => {
       const precomputed = schema[key].decorators.precomputed;
       if (precomputed && ctx?.skipPrecomputedCheckFor !== key) {
@@ -735,59 +800,6 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
       await afterPut(docArgsToSave, ctx, computedContext);
       return doc;
-    },
-    async verifyMany(args, ctx) {
-      if (driverInstance.verifyMany) {
-        return driverInstance.verifyMany(args, ctx);
-      }
-      ctx = { ...options.context, ...ctx };
-      if (args?.dryRun) {
-        ctx._logs = ctx._logs || [];
-        ctx.dryRun = true;
-      }
-      const { _logs } = ctx;
-      const { nodes, cursor } = await driverInstance.getMany(args, ctx);
-      let correctCount = 0;
-      let incorrectCount = 0;
-      const incorrectDocs = [];
-      const oldDocs = nodes;
-      const docArgsToSave = oldDocs.map((oldDoc) => {
-        const doc = merge(oldDoc, {});
-        if (args?.recompute) {
-          for (const p of args.recompute) {
-            delete doc[p];
-          }
-        }
-        if (!options.keepNulls)
-          cleanUndefinedAndNull(doc);
-        return { oldDoc, doc };
-      });
-      await handlePrecomputed(computedContext, docArgsToSave, ctx);
-      const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
-      await beforePut(docArgsToSave, ctx, computedContext);
-      for (const d of docArgsToSave) {
-        const validatedDoc = validators[key](d.doc);
-        for (const f of precomputedFields || []) {
-          ___default.set(validatedDoc, f, ___default.get(d.doc, f));
-        }
-        d.doc = validatedDoc;
-      }
-      await fillDenormFieldsBeforePut(computedContext, docArgsToSave, ctx);
-      for (const { oldDoc, doc } of docArgsToSave) {
-        const d = diff(doc, oldDoc);
-        if (___default.isEmpty(d))
-          correctCount++;
-        else {
-          incorrectCount++;
-          const objToAdd = { id: doc.id, diff: d };
-          incorrectDocs.push(objToAdd);
-        }
-      }
-      const docsToSave = docArgsToSave.map((x) => x.doc);
-      await driverInstance.putMany(docsToSave, ctx);
-      await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
-      await afterPut(docArgsToSave, ctx, computedContext);
-      return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
     }
   };
   for (const f of options.features) {

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { RadsDb } from '_rads-db';
 
 type MaybePromise$1<T> = Promise<T> | T;
 type Change<T> = {
-    [K in keyof T]?: Change<T[K]>;
+    [K in keyof T]?: T[K] extends any[] ? T[K] : T[K] extends {} ? Change<T[K]> : T[K];
 };
 interface GetManyArgs<E, EN extends keyof EntityMeta, W> extends GetArgs<E, EN, W> {
     cursor?: string | null;
@@ -52,15 +52,16 @@ interface GetManyResponse<E, EN extends keyof EntityMeta, A extends GetArgs<E, E
 type GetResponse<E, EN extends keyof EntityMeta, A extends GetArgs<E, EN, any>> = A extends {
     include: any;
 } ? GetResponseInclude<E, EN, A['include']> : GetResponseNoInclude<E, EN>;
+type RelationData<EN extends keyof EntityMeta, K extends keyof EntityMeta[EN]['relations']> = Pick<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['denormFields']>;
 type GetResponseInclude<E, EN extends keyof EntityMeta, I extends GetArgsInclude<E, EN>> = I extends {
     _pick: string[];
 } ? GetResponseIncludeSelect<E, I> : {
-    [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof I ? GetResponseInclude<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['entityName'], I[K]> : Pick<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['denormFields']> : E[K];
+    [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof I ? GetResponseInclude<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['entityName'], I[K]> : RelationData<EN, K> : E[K];
 };
 interface GetResponseIncludeSelect<E, I> {
 }
 type GetResponseNoInclude<E, EN extends keyof EntityMeta> = {
-    [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? Pick<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['denormFields']> : E[K];
+    [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? E[K] extends any[] ? RelationData<EN, K>[] : RelationData<EN, K> : E[K];
 };
 type DeepPartial<T> = {
     [K in keyof T]?: NonNullable<T[K]> extends Record<string, any> ? DeepPartial<T[K]> : T[K] | null;

package/dist/index.mjs

@@ -651,6 +651,59 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     await afterPut(docArgsToSave, ctx, computedContext);
     return docsToSave;
   }
+  async function verifyMany(args, ctx) {
+    if (driverInstance.verifyMany) {
+      return driverInstance.verifyMany(args, ctx);
+    }
+    ctx = { ...options.context, ...ctx };
+    if (args?.dryRun) {
+      ctx._logs = ctx._logs || [];
+      ctx.dryRun = true;
+    }
+    const { _logs } = ctx;
+    const { nodes, cursor } = await driverInstance.getMany(args, ctx);
+    let correctCount = 0;
+    let incorrectCount = 0;
+    const incorrectDocs = [];
+    const oldDocs = nodes;
+    const docArgsToSave = oldDocs.map((oldDoc) => {
+      const doc = merge(oldDoc, {});
+      if (args?.recompute) {
+        for (const p of args.recompute) {
+          delete doc[p];
+        }
+      }
+      if (!options.keepNulls)
+        cleanUndefinedAndNull(doc);
+      return { oldDoc, doc };
+    });
+    await handlePrecomputed(computedContext, docArgsToSave, ctx);
+    const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
+    await beforePut(docArgsToSave, ctx, computedContext);
+    for (const d of docArgsToSave) {
+      const validatedDoc = validators[key](d.doc);
+      for (const f of precomputedFields || []) {
+        _.set(validatedDoc, f, _.get(d.doc, f));
+      }
+      d.doc = validatedDoc;
+    }
+    await fillDenormFieldsBeforePut(computedContext, docArgsToSave, ctx);
+    for (const { oldDoc, doc } of docArgsToSave) {
+      const d = diff(doc, oldDoc);
+      if (_.isEmpty(d))
+        correctCount++;
+      else {
+        incorrectCount++;
+        const objToAdd = { id: doc.id, diff: d };
+        incorrectDocs.push(objToAdd);
+      }
+    }
+    const docsToSave = docArgsToSave.map((x) => x.doc);
+    await driverInstance.putMany(docsToSave, ctx);
+    await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
+    await afterPut(docArgsToSave, ctx, computedContext);
+    return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
+  }
   const result = {
     // No deleteMany / deleteAll on purpose - it's a dangerous operation, let them use driver instead
     createObject() {
@@ -658,6 +711,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     },
     getMany,
     putMany,
+    verifyMany,
     driver: driverInstance,
     getAgg: async (args, ctx) => {
       args = { ...args, where: { ...args?.where } };
@@ -695,6 +749,17 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await afterGet(result2, args, ctx, computedContext);
       return result2;
     },
+    verifyAll: async (args, ctx) => {
+      let cursor = args?.cursor;
+      const result2 = { correctCount: 0, incorrectCount: 0 };
+      do {
+        const response = await verifyMany({ ...args, cursor }, ctx);
+        cursor = response.cursor;
+        result2.correctCount += response.correctCount;
+        result2.incorrectCount += response.incorrectCount;
+      } while (cursor);
+      return result2;
+    },
     put: async (doc, ctx) => {
       const precomputed = schema[key].decorators.precomputed;
       if (precomputed && ctx?.skipPrecomputedCheckFor !== key) {
@@ -727,59 +792,6 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
       await afterPut(docArgsToSave, ctx, computedContext);
       return doc;
-    },
-    async verifyMany(args, ctx) {
-      if (driverInstance.verifyMany) {
-        return driverInstance.verifyMany(args, ctx);
-      }
-      ctx = { ...options.context, ...ctx };
-      if (args?.dryRun) {
-        ctx._logs = ctx._logs || [];
-        ctx.dryRun = true;
-      }
-      const { _logs } = ctx;
-      const { nodes, cursor } = await driverInstance.getMany(args, ctx);
-      let correctCount = 0;
-      let incorrectCount = 0;
-      const incorrectDocs = [];
-      const oldDocs = nodes;
-      const docArgsToSave = oldDocs.map((oldDoc) => {
-        const doc = merge(oldDoc, {});
-        if (args?.recompute) {
-          for (const p of args.recompute) {
-            delete doc[p];
-          }
-        }
-        if (!options.keepNulls)
-          cleanUndefinedAndNull(doc);
-        return { oldDoc, doc };
-      });
-      await handlePrecomputed(computedContext, docArgsToSave, ctx);
-      const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
-      await beforePut(docArgsToSave, ctx, computedContext);
-      for (const d of docArgsToSave) {
-        const validatedDoc = validators[key](d.doc);
-        for (const f of precomputedFields || []) {
-          _.set(validatedDoc, f, _.get(d.doc, f));
-        }
-        d.doc = validatedDoc;
-      }
-      await fillDenormFieldsBeforePut(computedContext, docArgsToSave, ctx);
-      for (const { oldDoc, doc } of docArgsToSave) {
-        const d = diff(doc, oldDoc);
-        if (_.isEmpty(d))
-          correctCount++;
-        else {
-          incorrectCount++;
-          const objToAdd = { id: doc.id, diff: d };
-          incorrectDocs.push(objToAdd);
-        }
-      }
-      const docsToSave = docArgsToSave.map((x) => x.doc);
-      await driverInstance.putMany(docsToSave, ctx);
-      await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
-      await afterPut(docArgsToSave, ctx, computedContext);
-      return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
     }
   };
   for (const f of options.features) {

package/features/eventSourcing.cjs

@@ -77,7 +77,9 @@ function verifyEventSourcingSetup(schema, effects) {
             events
           });
         }
-        await (0, _radsDb.handlePrecomputed)({
+        await (0, _radsDb.handlePrecomputed)(
+        // @ts-expect-error TODO wrong types
+        {
           ...context,
           typeName: entityName
         }, result.map(v => ({

package/features/eventSourcing.mjs

@@ -70,6 +70,7 @@ function verifyEventSourcingSetup(schema, effects) {
           result.push({ aggDoc, events });
         }
         await handlePrecomputed(
+          // @ts-expect-error TODO wrong types
           { ...context, typeName: entityName },
           result.map((v) => ({ doc: v.aggDoc, events: v.events, oldDoc: existingAggregatesById[v.aggDoc.id] })),
           ctx

package/integrations/nuxtModule.cjs

@@ -3,23 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.radsDbNuxt = void 0;
-var _kit = require("@nuxt/kit");
-const radsDbNuxt = (0, _kit.defineNuxtModule)({
-  meta: {
-    name: "rads-db",
-    compatibility: {
-      nuxt: "^3.0.0"
-    }
-  },
-  defaults: {},
-  setup(options, nuxt) {
-    const {
-      resolve
-    } = (0, _kit.createResolver)(require('url').pathToFileURL(__filename).toString());
-    (0, _kit.addServerHandler)({
-      handler: resolve("./nuxtModuleHandler")
-    });
-  }
-});
-exports.radsDbNuxt = radsDbNuxt;
+module.exports = void 0;
+var _default = {};
+module.exports = _default;

package/integrations/nuxtModule.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/integrations/nuxtModule.mjs

@@ -1,16 +1 @@
-import { addServerHandler, createResolver, defineNuxtModule } from "@nuxt/kit";
-export const radsDbNuxt = defineNuxtModule({
-  meta: {
-    name: "rads-db",
-    compatibility: {
-      nuxt: "^3.0.0"
-    }
-  },
-  defaults: {},
-  setup(options, nuxt) {
-    const { resolve } = createResolver(import.meta.url);
-    addServerHandler({
-      handler: resolve("./nuxtModuleHandler")
-    });
-  }
-});
+export default {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.25",
+  "version": "3.0.27",
   "files": [
     "dist",
     "drivers",
@@ -94,7 +94,6 @@
   },
   "dependencies": {
     "@fastify/deepmerge": "^1.3.0",
-    "@nuxt/kit": "^3.5.1",
     "dataloader": "^2.2.2",
     "ignore": "^5.2.4",
     "klaw": "^4.1.0",