rads-db 3.2.13 → 3.2.15

package/dist/index.cjs

@@ -1426,6 +1426,8 @@ function createRadsDbClient(dataSourceKey, args) {
   return generateMethods(s, validators, radsDbArgs);
 }
 
+exports.afterPut = afterPut;
+exports.beforePut = beforePut;
 exports.cleanEntity = cleanEntity;
 exports.computed = computed;
 exports.createRadsDb = createRadsDb;

package/dist/index.d.ts

@@ -16,6 +16,15 @@ declare function getDriverInstance(schema: Schema, key: string, driverConstructo
 
 declare function handlePrecomputed(context: ComputedContext, docs: any[], ctx: RadsRequestContext): Promise<void>;
 
+declare function beforePut(items: {
+    oldDoc: any;
+    doc: any;
+}[], ctx: RadsRequestContext, computedContext: ComputedContext): Promise<void>;
+declare function afterPut(items: {
+    oldDoc: any;
+    doc: any;
+}[], ctx: RadsRequestContext, computedContext: ComputedContext): Promise<void>;
+
 /** Performs immutable deep merge */
 declare function merge<T extends Record<string, any>>(target: T, source: any): T;
 
@@ -35,4 +44,4 @@ declare function createRadsDb<T extends keyof RadsDb>(dataSourceKey: T, args?: C
  */
 declare function createRadsDbClient<T extends keyof RadsDb>(dataSourceKey: T, args?: CreateRadsDbClientArgs): RadsDb[T];
 
-export { ComputedContext, ComputedDecoratorArgs, CreateRadsDbArgs, CreateRadsDbClientArgs, Driver, DriverConstructor, EntityDecoratorArgs, FieldDecoratorArgs, RadsRequestContext, Schema, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { ComputedContext, ComputedDecoratorArgs, CreateRadsDbArgs, CreateRadsDbClientArgs, Driver, DriverConstructor, EntityDecoratorArgs, FieldDecoratorArgs, RadsRequestContext, Schema, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, afterPut, beforePut, cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/dist/index.mjs

@@ -1419,4 +1419,4 @@ function createRadsDbClient(dataSourceKey, args) {
   return generateMethods(s, validators, radsDbArgs);
 }
 
-export { cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { afterPut, beforePut, cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/drivers/sql.cjs

@@ -377,6 +377,7 @@ ${insertQuery.slice(0, 300)}...`);
         await client.query(`delete from ${entity}`);
         return [];
       },
+      ensureClientConnected,
       /** Generates migration script for this one entity */
       async generateMigrationScript() {
         await ensureIntrospectionIsAvailable();
@@ -720,12 +721,12 @@ END;
     await clientPromise;
   }
   async function ensureClientConnectedInner() {
-    client = await _mssql.default.connect({
+    client = await new _mssql.default.ConnectionPool({
       authentication: options.authentication,
       server: options.server,
       database: options.database,
       ...options.options
-    });
+    }).connect();
   }
 };
 module.exports = _default;

package/drivers/sql.mjs

@@ -248,6 +248,7 @@ ${insertQuery.slice(0, 300)}...`);
         await client.query(`delete from ${entity}`);
         return [];
       },
+      ensureClientConnected,
       /** Generates migration script for this one entity */
       async generateMigrationScript() {
         await ensureIntrospectionIsAvailable();
@@ -596,12 +597,12 @@ END;
     await clientPromise;
   }
   async function ensureClientConnectedInner() {
-    client = await sql.connect({
+    client = await new sql.ConnectionPool({
       authentication: options.authentication,
       server: options.server,
       database: options.database,
       ...options.options
-    });
+    }).connect();
   }
 };
 function stringifyValueForInsert(value) {

package/features/eventSourcing.cjs

@@ -113,14 +113,15 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
         updatedEvents: v.updatedEvents,
         oldDoc: v.oldAggDoc
       }));
+      console.log(ctx);
       const aggregateEffectContext = {
         ...context,
         typeName: entityName,
         handle: schema[entityName].handle
       };
-      await beforePut(hookItems, ctx, aggregateEffectContext);
+      await (0, _radsDb.beforePut)(hookItems, ctx, aggregateEffectContext);
       await context.drivers[entityName].putMany(aggs, ctx);
-      await afterPut(hookItems, ctx, aggregateEffectContext);
+      await (0, _radsDb.afterPut)(hookItems, ctx, aggregateEffectContext);
     }
   };
 }
@@ -189,14 +190,4 @@ function validateSchemaField(fieldName, eventEntityName, expectedFields, schema)
     const expectedRequired = expectedField.isRequired ? `required` : "optional";
     throw new Error(`"${eventEntityName}.${fieldName}" must be ${expectedRequired}`);
   }
-}
-async function beforePut(items, ctx, computedContext) {
-  for (const f of computedContext.options.features) {
-    await f.beforePut?.(items, ctx, computedContext);
-  }
-}
-async function afterPut(items, ctx, computedContext) {
-  for (const f of computedContext.options.features) {
-    await f.afterPut?.(items, ctx, computedContext);
-  }
 }

package/features/eventSourcing.mjs

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { cleanEntity, diff, handlePrecomputed, merge } from "rads-db";
+import { afterPut, beforePut, cleanEntity, diff, handlePrecomputed, merge } from "rads-db";
 export default (options) => {
   return {
     name: "eventSourcing",
@@ -97,6 +97,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
         updatedEvents: v.updatedEvents,
         oldDoc: v.oldAggDoc
       }));
+      console.log(ctx);
       const aggregateEffectContext = { ...context, typeName: entityName, handle: schema[entityName].handle };
       await beforePut(hookItems, ctx, aggregateEffectContext);
       await context.drivers[entityName].putMany(aggs, ctx);
@@ -157,13 +158,3 @@ function validateSchemaField(fieldName, eventEntityName, expectedFields, schema)
     throw new Error(`"${eventEntityName}.${fieldName}" must be ${expectedRequired}`);
   }
 }
-async function beforePut(items, ctx, computedContext) {
-  for (const f of computedContext.options.features) {
-    await f.beforePut?.(items, ctx, computedContext);
-  }
-}
-async function afterPut(items, ctx, computedContext) {
-  for (const f of computedContext.options.features) {
-    await f.afterPut?.(items, ctx, computedContext);
-  }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.2.13",
+  "version": "3.2.15",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
   "license": "ISC",