Move adapters under src/adapters and remove service auto-fixes

Author: typicode

src/normalized-adapter.ts src/adapters/normalized-adapter.tssrc/normalized-adapter.ts renamed to src/adapters/normalized-adapter.ts

@@ -1,7 +1,7 @@
 import type { Adapter } from 'lowdb'
 
-import { randomId } from './random-id.ts'
-import type { Data, Item } from './service.ts'
+import { randomId } from '../random-id.ts'
+import type { Data, Item } from '../service.ts'
 
 export const DEFAULT_SCHEMA_PATH = './node_modules/json-server/schema.json'
 export type RawData = Record<string, Item[] | Item | string | undefined> & {

src/observer.ts src/adapters/observer.tssrc/observer.ts renamed to src/adapters/observer.ts

@@ -12,10 +12,10 @@ import { DataFile, JSONFile } from "lowdb/node";
 import type { PackageJson } from "type-fest";
 
 import { fileURLToPath } from "node:url";
+import { NormalizedAdapter } from "./adapters/normalized-adapter.ts";
+import type { RawData } from "./adapters/normalized-adapter.ts";
+import { Observer } from "./adapters/observer.ts";
 import { createApp } from "./app.ts";
-import { NormalizedAdapter } from "./normalized-adapter.ts";
-import type { RawData } from "./normalized-adapter.ts";
-import { Observer } from "./observer.ts";
 import type { Data } from "./service.ts";
 
 function help() {

src/bin.ts

@@ -3,8 +3,8 @@ import test from 'node:test'
 
 import type { Adapter } from 'lowdb'
 
-import { DEFAULT_SCHEMA_PATH, NormalizedAdapter } from './normalized-adapter.ts'
-import type { RawData } from './normalized-adapter.ts'
+import { DEFAULT_SCHEMA_PATH, NormalizedAdapter } from './adapters/normalized-adapter.ts'
+import type { RawData } from './adapters/normalized-adapter.ts'
 import type { Data } from './service.ts'
 
 class StubAdapter implements Adapter<RawData> {

src/normalized-adapter.test.ts

@@ -56,42 +56,6 @@ beforeEach(() => {
   })
 })
 
-await test('constructor', () => {
-  const defaultData = { posts: [{ id: '1' }, {}], object: {} } satisfies Data
-  const db = new Low<Data>(adapter, defaultData)
-  new Service(db)
-  if (Array.isArray(db.data['posts'])) {
-    const id0 = db.data['posts'][0]['id']
-    const id1 = db.data['posts'][1]['id']
-    assert.ok(
-      typeof id0 === 'string' && id0 === '1',
-      `id should not change if already set but was: ${id0}`,
-    )
-    assert.ok(
-      typeof id1 === 'string' && id1.length > 0,
-      `id should be a non empty string but was: ${id1}`,
-    )
-  }
-  assert.equal(
-    (db.data as Record<string, unknown>)['$schema'],
-    './node_modules/json-server/schema.json',
-    '$schema should be set when missing',
-  )
-})
-
-await test('constructor: $schema not overwritten if present', () => {
-  const defaultData = { posts: [] } satisfies Data
-  const db = new Low<Data>(adapter, defaultData)
-  const data = db.data as Record<string, unknown>
-  data['$schema'] = './custom/schema.json'
-  new Service(db)
-  assert.equal(
-    data['$schema'],
-    './custom/schema.json',
-    '$schema should not be overwritten when already set',
-  )
-})
-
 await test('findById', () => {
   const cases: [[string, string, { _embed?: string[] | string }], unknown][] = [
     [[POSTS, '1', {}], db.data?.[POSTS]?.[0]],

src/service.test.ts

@@ -4,7 +4,6 @@ import sortOn from 'sort-on'
 import type { JsonObject } from 'type-fest'
 
 import { matchesWhere } from './matches-where.ts'
-import { DEFAULT_SCHEMA_PATH } from './normalized-adapter.ts'
 import { paginate, type PaginationResult } from './paginate.ts'
 import { randomId } from './random-id.ts'
 export type Item = Record<string, unknown>
@@ -21,31 +20,6 @@ function ensureArray(arg: string | string[] = []): string[] {
   return Array.isArray(arg) ? arg : [arg]
 }
 
-function fixItemsIds(items: Item[]) {
-  items.forEach((item) => {
-    if (typeof item['id'] === 'number') {
-      item['id'] = item['id'].toString()
-    }
-    if (item['id'] === undefined) {
-      item['id'] = randomId()
-    }
-  })
-}
-
-function fixAllItemsIds(data: Data) {
-  Object.values(data).forEach((value) => {
-    if (Array.isArray(value)) {
-      fixItemsIds(value)
-    }
-  })
-}
-
-function fixSchema(data: Data) {
-  if (data['$schema'] === undefined) {
-    ;(data as Record<string, unknown>)['$schema'] = DEFAULT_SCHEMA_PATH
-  }
-}
-
 function embed(db: Low<Data>, name: string, item: Item, related: string): Item {
   if (inflection.singularize(related) === related) {
     const relatedData = db.data[inflection.pluralize(related)] as Item[]
@@ -108,8 +82,6 @@ export class Service {
   #db: Low<Data>
 
   constructor(db: Low<Data>) {
-    fixSchema(db.data)
-    fixAllItemsIds(db.data)
     this.#db = db
   }