prettier

.prettierignore

@@ -3,3 +3,4 @@ coverage/
 package-lock.json
 package.json
 API.md
+flake.lock

src/DB/DB.js

@@ -54,7 +54,7 @@ class DBImpl extends SQLite {
 					if (onBeforeMigrations) await onBeforeMigrations(db)
 					await this.runMigrations(db)
 					if (options.onDidOpen) await options.onDidOpen(db)
-			  }
+				}
 		super({...options, onDidOpen})
 		this.options.migrations = migrations
 	}

src/DB/SQLite.js

@@ -371,10 +371,10 @@ class SQLiteImpl extends EventEmitter {
 								return _sqlite[method](...(args || []), cb)
 							})
 							.catch(cb)
-				  }
+					}
 				: () => {
 						fnResult = _sqlite[method](...(args || []), cb)
-				  }
+					}
 			let busyRetry = RETRY_COUNT
 			// We need to consume `this` from sqlite3 callback
 			// eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias -- we need it
@@ -400,8 +400,8 @@ class SQLiteImpl extends EventEmitter {
 						returnFn
 							? fnResult
 							: returnThis
-							? {lastID: this.lastID, changes: this.changes}
-							: out
+								? {lastID: this.lastID, changes: this.changes}
+								: out
 					)
 			}
 			if (!_sqlite[method])
@@ -510,7 +510,8 @@ class SQLiteImpl extends EventEmitter {
 	 * - the variables to be bound to the statement.
 	 * @param {function(Object): Promise<void>} cb
 	 * - the function to call on each row.
-	 * @returns {Promise<void>} - a promise for execution completion.
+	 * @returns {Promise<void>}
+	 * - a promise for execution completion.
 	 */
 	each(...args) {
 		const lastIdx = args.length - 1

src/EventQueue.js

@@ -89,7 +89,7 @@ class EventQueueImpl extends JsonModel {
 							`)
 							// Recalculate size
 							await db.exec(`UPDATE history SET size=0`)
-					  }
+						}
 					: null,
 			},
 		})
@@ -234,7 +234,7 @@ class EventQueueImpl extends JsonModel {
 					? await this.searchOne(null, {
 							where: {'v > ?': [Number(v)]},
 							sort: {v: 1},
-					  })
+						})
 					: null
 			if (event || noWait) break
 			// Wait for next one from this process

src/EventSourcingDB/ESModel.js

@@ -140,14 +140,16 @@ class ESModel extends JsonModel {
 		 * Create an event that will insert or replace the given object into the
 		 * database.
 		 *
-		 * @param {Object}  obj           - the object to store. If there is no `id`
-		 *                                value (or whatever the `id` column is
-		 *                                named), one is assigned automatically.
-		 * @param {boolean} [insertOnly]  - don't allow replacing existing objects.
-		 * @param {*}       [meta]        - extra metadata to store in the event but
-		 *                                not in the object.
-		 * @returns {Pick<ESEvent, 'type' | 'data'>} - args to pass to
-		 *                                           addEvent/dispatch.
+		 * @param {Object} obj
+		 * - the object to store. If there is no `id`
+		 * value (or whatever the `id` column is named), one is assigned
+		 * automatically.
+		 * @param {boolean} [insertOnly]
+		 * - don't allow replacing existing objects.
+		 * @param {*} [meta]
+		 * - extra metadata to store in the event but not in the object.
+		 * @returns {Pick<ESEvent, 'type' | 'data'>}
+		 * - args to pass to addEvent/dispatch.
 		 */
 		set: (obj, insertOnly, meta) => {
 			const data = [insertOnly ? ESModel.INSERT : ESModel.SET, null, obj]
@@ -157,13 +159,14 @@ class ESModel extends JsonModel {
 		/**
 		 * Create an event that will update an existing object.
 		 *
-		 * @param {Object}  obj       - the data to store.
-		 * @param {boolean} [upsert]  - if `true`, allow inserting if the object
-		 *                            doesn't exist.
-		 * @param {*}       [meta]    - extra metadata to store in the event at
-		 *                            `data[3]` but not in the object.
-		 * @returns {Pick<ESEvent, 'type' | 'data'>} - args to pass to
-		 *                                           addEvent/dispatch.
+		 * @param {Object} obj
+		 * - the data to store.
+		 * @param {boolean} [upsert]
+		 * - if `true`, allow inserting if the object doesn't exist.
+		 * @param {*} [meta]
+		 * - extra metadata to store in the event at `data[3]` but not in the object.
+		 * @returns {Pick<ESEvent, 'type' | 'data'>}
+		 * - args to pass to addEvent/dispatch.
 		 */
 		update: (obj, upsert, meta) => {
 			const id = obj[this.idCol]
@@ -185,8 +188,8 @@ class ESModel extends JsonModel {
 		 * - the id or the object itself.
 		 * @param {*} meta
 		 * - metadata, attached to the event only, at `data[3]`
-		 * @returns {Pick<ESEvent, 'type' | 'data'>} - args to pass to
-		 *                                           addEvent/dispatch.
+		 * @returns {Pick<ESEvent, 'type' | 'data'>}
+		 * - args to pass to addEvent/dispatch.
 		 */
 		remove: (idOrObj, meta) => {
 			const id = typeof idOrObj === 'object' ? idOrObj[this.idCol] : idOrObj
@@ -282,7 +285,8 @@ class ESModel extends JsonModel {
 	 * - the id or the object itself.
 	 * @param {*} meta
 	 * - metadata, attached to the event only, at `data[3]`
-	 * @returns {Promise<boolean>} - always returns true.
+	 * @returns {Promise<boolean>}
+	 * - always returns true.
 	 */
 	async remove(idOrObj, meta) {
 		if (this.writable) return super.remove(idOrObj)

src/EventSourcingDB/EventSourcingDB.js

@@ -198,7 +198,7 @@ class EventSourcingDB extends EventEmitter {
 							// Make sure migrations happened before opening
 							await this.rwDb.open()
 						},
-				  })
+					})
 
 		if (queue) {
 			this.queue = queue
@@ -344,7 +344,7 @@ class EventSourcingDB extends EventEmitter {
 								...rest,
 								dispatch,
 								emitter: this,
-						  })
+							})
 				model.preprocessor = preprocessor || Model.preprocessor
 				model.reducer = fixupOldReducer(name, reducer || Model.reducer)
 				if (!model.transact) model.transact = transact || Model.transact
@@ -461,7 +461,8 @@ class EventSourcingDB extends EventEmitter {
 	 * Event data, can be anything.
 	 * @param {number} [ts]
 	 * The timestamp of the event.
-	 * @returns {Promise<Event>} The processed event.
+	 * @returns {Promise<Event>}
+	 * The processed event.
 	 */
 	dispatch = makeDispatcher('dispatch', async (type, data, ts) => {
 		const event = await this.queue.add(type, data, ts)

src/JsonModel/JsonModel.js

@@ -221,7 +221,7 @@ class JsonModelImpl {
 						set(obj, path, {...get(obj, path)})
 					}
 					return obj
-			  }
+				}
 			: obj => ({...obj})
 		const colSqls = realCols.map(col => col.quoted)
 		const setSql = `INTO ${quoted}(${colSqls.join(',')}) VALUES(${colSqls
@@ -280,7 +280,7 @@ class JsonModelImpl {
 							newObj[this.idCol] = result.lastID
 						}
 						return newObj
-				  })
+					})
 		}
 	}
 
@@ -724,8 +724,9 @@ class JsonModelImpl {
 	 * @param {IDValue[]} ids                   - the values for the column.
 	 * @param {string}    [colName=this.idCol]  - the columnname, defaults to the
 	 *                                          ID column.
-	 * @returns {Promise<(Item | null)[]>} - the objects, or null where they don't
-	 *                                     exist, in order of their requested ID.
+	 * @returns {Promise<(Item | null)[]>} - the objects, or null where they
+	 *                                     don't exist, in order of their
+	 *                                     requested ID.
 	 */
 	async getAll(ids, colName = this.idCol) {
 		let {path, _getAllSql} = this.columns[colName]
@@ -798,7 +799,8 @@ class JsonModelImpl {
 	 * @param {JMSearchAttrs | RowCallback} attrsOrFn
 	 * @param {RowCallback | JMSearchOptions} [optionsOrFn]
 	 * @param {RowCallback} [fn]
-	 * @returns {Promise<void>} Table iteration completed.
+	 * @returns {Promise<void>}
+	 * Table iteration completed.
 	 */
 	async each(attrsOrFn, optionsOrFn, fn) {
 		if (!fn) {

src/JsonModel/makeDefaultIdValue.js

@@ -14,7 +14,7 @@ export const makeIdValue = (idCol, {value, slugValue, type} = {}) => {
 			: o => {
 					const id = o[idCol]
 					return id || id === 0 ? id : null
-			  }
+				}
 	}
 	// do not bind the value functions, they must be able to use other db during migrations
 	if (slugValue) {

src/JsonModel/makeMigrations.js

@@ -31,7 +31,7 @@ export const makeMigrations = ({
 				? `${type} NOT NULL`
 				: `${type} PRIMARY KEY ${
 						isIntegerId && autoIncrement ? 'AUTOINCREMENT' : ''
-				  } NOT NULL`
+					} NOT NULL`
 
 			await db.exec(
 				`CREATE TABLE ${tableQuoted}(${rowIdCol}${quoted} ${keySql}, json JSON);`
@@ -61,11 +61,11 @@ export const makeMigrations = ({
 					col.index
 						? `CREATE ${
 								col.unique ? 'UNIQUE ' : ''
-						  }INDEX IF NOT EXISTS ${sql.quoteId(
+							}INDEX IF NOT EXISTS ${sql.quoteId(
 								`${tableName}_${name}`
-						  )} ON ${tableQuoted}(${expr}) ${
+							)} ON ${tableQuoted}(${expr}) ${
 								col.ignoreNull ? `WHERE ${expr} IS NOT NULL` : ''
-						  };`
+							};`
 						: ''
 				}`
 			)

src/JsonModel/normalizeColumn.js

@@ -60,24 +60,24 @@ export const normalizeColumn = (col, name) => {
 					const r = await prev.call(this, o)
 					if (r == null) throw new Error(`${name}: value is required`)
 					return r
-			  }
+				}
 			: o => {
 					const v = get(o, col.path)
 					if (v == null) throw new Error(`${name}: value is required`)
 					return v
-			  }
+				}
 	}
 	if (col.falsyBool) {
 		const prev = col.value
 		col.value = prev
 			? async function (o) {
 					const r = await prev.call(this, o)
 					return r ? true : undefined
-			  }
+				}
 			: o => {
 					const v = get(o, col.path)
 					return v ? true : undefined
-			  }
+				}
 		if (col.real) {
 			if (col.parse) throw new TypeError(`${name}: falsyBool can't have parse`)
 			col.parse = v => (v ? true : undefined)

src/JsonModel/verifyOptions.js

@@ -105,7 +105,7 @@ export const columnPropType =
 				isAnyOfArray: PropTypes.bool,
 				isArray: PropTypes.bool,
 				textSearch: PropTypes.bool,
-		  })
+			})
 
 export const verifyColumn = (name, column) => {
 	if (process.env.NODE_ENV !== 'production') {
@@ -172,7 +172,7 @@ const jmPropTypes =
 					dispatch: PropTypes.any,
 					emitter: PropTypes.any,
 				}),
-		  }
+			}
 
 export const verifyOptions = options => {
 	if (process.env.NODE_ENV !== 'production') {

src/lib/slugify.js

@@ -15,10 +15,10 @@ export const slugifyString = (name, alwaysResult) => {
 		typeof name === 'string'
 			? name
 			: typeof name === 'number'
-			? name.toString()
-			: name && typeof name === 'object'
-			? Object.values(name).find(v => typeof v === 'string' && v)
-			: null
+				? name.toString()
+				: name && typeof name === 'object'
+					? Object.values(name).find(v => typeof v === 'string' && v)
+					: null
 	if (!t) {
 		if (alwaysResult) return randomString(12)
 		throw new Error(`Cannot slugify ${name}`)

types.d.ts

@@ -406,16 +406,16 @@ interface JsonModel<
 	IDCol extends string = ConfigOrID extends {idCol: string}
 		? ConfigOrID['idCol']
 		: ConfigOrID extends string
-		? ConfigOrID
-		: 'id',
+			? ConfigOrID
+			: 'id',
 	Item extends {[x: string]: any} = RealItem extends {[id in IDCol]?: unknown}
 		? RealItem
 		: RealItem & {[id in IDCol]: IDValue},
 	Config = ConfigOrID extends string ? object : ConfigOrID,
 	Columns extends JMColums<IDCol> = Config extends {columns: object}
 		? Config['columns']
 		: // If we didn't get a config, assume all keys are columns
-		  {[colName in keyof Item]: object},
+			{[colName in keyof Item]: object},
 	SearchAttrs = JMSearchAttrs<Columns>,
 	SearchOptions = JMSearchOptions<Columns>,
 > {
@@ -460,8 +460,8 @@ interface JsonModel<
 	/**
 	 * Search the all matching objects.
 	 *
-	 * @returns - `{items[], cursor}`. If no cursor, you got all the results. If
-	 *          `options.itemsOnly`, returns only the items array.
+	 * @returns - `{items[], cursor}`. If no cursor, you got all the results.
+	 *          If `options.itemsOnly`, returns only the items array.
 	 */
 	search(
 		/** Simple value attributes. */
@@ -563,8 +563,8 @@ interface JsonModel<
 	/**
 	 * Get several objects by their unique value, like their ID.
 	 *
-	 * @returns - the objects, or undefined where they don't exist, in order of
-	 *          their requested ID.
+	 * @returns - the objects, or undefined where they don't exist, in order
+	 *          of their requested ID.
 	 */
 	getAll(
 		/** The values for the column */
@@ -625,8 +625,8 @@ interface JsonModel<
 	 *                      automatically.
 	 * @param [insertOnly]  - don't allow replacing existing objects.
 	 * @param [noReturn]    - do not return the stored object; an optimization.
-	 * @returns - if `noReturn` is false, the stored object is fetched from the
-	 *          DB.
+	 * @returns - if `noReturn` is false, the stored object is fetched from
+	 *          the DB.
 	 */
 	set(
 		obj: Partial<Item>,
@@ -779,8 +779,9 @@ type DispatchFn = (
 		| [arg: {type: string; data?: any; ts?: number}]
 ) => Promise<ESEvent>
 
-type AddEventFn =
-	 (...args: | [type: string, data?: any ]| [arg: {type: string; data?: any}]) => void
+type AddEventFn = (
+	...args: [type: string, data?: any] | [arg: {type: string; data?: any}]
+) => void
 
 // TODO get from models config
 type ESDBModelArgs = {
@@ -876,8 +877,8 @@ interface ESModel<
 	IDCol extends string = ConfigOrID extends {idCol: string}
 		? ConfigOrID['idCol']
 		: ConfigOrID extends string
-		? ConfigOrID
-		: 'id',
+			? ConfigOrID
+			: 'id',
 	Item extends {[x: string]: any} = RealItem extends {[id in IDCol]: unknown}
 		? RealItem
 		: RealItem & {[id in IDCol]: IDValue},
@@ -934,8 +935,8 @@ interface ESModel<
 	 * @param [noReturn]    - do not return the stored object; an optimization.
 	 * @param [meta]        - extra metadata to store in the event but not in
 	 *                      the object.
-	 * @returns - if `noReturn` is false, the stored object is fetched from the
-	 *          DB.
+	 * @returns - if `noReturn` is false, the stored object is fetched from
+	 *          the DB.
 	 */
 	set(
 		obj: Partial<Item>,
@@ -952,8 +953,8 @@ interface ESModel<
 	 * @param [noReturn]  - do not return the stored object; an optimization.
 	 * @param [meta]      - extra metadata to store in the event at `data[3]`
 	 *                    but not in the object.
-	 * @returns - if `noReturn` is false, the stored object is fetched from the
-	 *          DB.
+	 * @returns - if `noReturn` is false, the stored object is fetched from
+	 *          the DB.
 	 */
 	update(
 		o: Partial<Item>,