@webiny/db 5.23.1 → 5.24.0-beta.0

package/index.d.ts

@@ -1,16 +1,18 @@
-export declare type Key = {
+interface KeyField {
+    name: string;
+}
+export interface Key {
     primary?: boolean;
     unique?: boolean;
     name: string;
-    fields: {
-        name: string;
-    }[];
-};
-export declare type Args = {
-    __batch?: {
-        instance: Batch;
-        operation: Operation;
-    };
+    fields: KeyField[];
+}
+export interface ArgsBatch {
+    instance: Batch;
+    operation: Operation;
+}
+export interface Args {
+    __batch?: ArgsBatch;
     table?: string;
     meta?: boolean;
     limit?: number;
@@ -18,7 +20,7 @@ export declare type Args = {
     data?: Record<string, any>;
     query?: Record<string, any>;
     keys?: Key[];
-};
+}
 export declare type Result<T = any> = [T, Record<string, any>];
 export interface DbDriver {
     create: (args: Args) => Promise<Result<true>>;
@@ -51,7 +53,7 @@ declare class Db {
     read<T = Record<string, any>>(args: Args): Promise<Result<T[]>>;
     update(args: Args): Promise<Result<true>>;
     delete(args: Args): Promise<Result<true>>;
-    createLog(operation: any, args: Args): Promise<Result<true>>;
+    createLog(operation: string, args: Args): Promise<Result<true>>;
     readLogs<T = Record<string, any>>(): Promise<Result<T[]>>;
     batch<T0 = any, T1 = any, T2 = any, T3 = any, T4 = any, T5 = any, T6 = any, T7 = any, T8 = any, T9 = any>(): Batch<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>;
 }
@@ -61,7 +63,7 @@ declare class Batch<T0 = any, T1 = any, T2 = any, T3 = any, T4 = any, T5 = any,
     id: string;
     meta: Record<string, any>;
     operations: Operation[];
-    constructor(db: any);
+    constructor(db: Db);
     push(...operations: Operation[]): this;
     create(...args: Args[]): this;
     read(...args: Args[]): this;

package/index.js

@@ -18,9 +18,9 @@ const shortId = () => {
   const time = new Date().getTime();
   const uniqueId = Math.random().toString(36).slice(-6);
   return `${time}.${uniqueId}`;
-}; // Picks necessary data from received args, ready to be stored in the log table.
-
+};
 
+// Picks necessary data from received args, ready to be stored in the log table.
 const getCreateLogData = args => {
   const {
     table,
@@ -31,7 +31,7 @@ const getCreateLogData = args => {
     query,
     keys
   } = args;
-  const logData = {
+  return {
     table,
     meta,
     limit,
@@ -39,17 +39,11 @@ const getCreateLogData = args => {
     data,
     query,
     keys,
-    batch: null
-  };
-
-  if (args.__batch) {
-    logData.batch = {
+    batch: args.__batch ? {
       id: args.__batch.instance.id,
       type: args.__batch.instance.type
-    };
-  }
-
-  return logData;
+    } : null
+  };
 };
 
 class Db {
@@ -191,6 +185,9 @@ class Batch {
   }
 
   async execute() {
+    /**
+     * TODO: figure out which exact type to use instead of any.
+     */
     const promises = [];
 
     for (let i = 0; i < this.operations.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webiny/db",
-  "version": "5.23.1",
+  "version": "5.24.0-beta.0",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@babel/cli": "^7.16.0",
     "@babel/core": "^7.16.0",
-    "@webiny/cli": "^5.23.1",
-    "@webiny/project-utils": "^5.23.1",
+    "@webiny/cli": "^5.24.0-beta.0",
+    "@webiny/project-utils": "^5.24.0-beta.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.1.3"
   },
@@ -24,5 +24,5 @@
     "build": "yarn webiny run build",
     "watch": "yarn webiny run watch"
   },
-  "gitHead": "a726d09d2647d13e5a4f376cef23463564ef7ca0"
+  "gitHead": "05b90b92bbaf2ef3adf275d008c4641580cf5f42"
 }