json-server 1.0.0-beta.10 → 1.0.0-beta.12

package/lib/adapters/normalized-adapter.js

@@ -0,0 +1,31 @@
+import { randomId } from "../random-id.js";
+export const DEFAULT_SCHEMA_PATH = './node_modules/json-server/schema.json';
+export class NormalizedAdapter {
+    #adapter;
+    constructor(adapter) {
+        this.#adapter = adapter;
+    }
+    async read() {
+        const data = await this.#adapter.read();
+        if (data === null) {
+            return null;
+        }
+        delete data['$schema'];
+        for (const value of Object.values(data)) {
+            if (Array.isArray(value)) {
+                for (const item of value) {
+                    if (typeof item['id'] === 'number') {
+                        item['id'] = item['id'].toString();
+                    }
+                    if (item['id'] === undefined) {
+                        item['id'] = randomId();
+                    }
+                }
+            }
+        }
+        return data;
+    }
+    async write(data) {
+        await this.#adapter.write({ ...data, $schema: DEFAULT_SCHEMA_PATH });
+    }
+}

package/lib/bin.js

@@ -8,8 +8,9 @@ import JSON5 from "json5";
 import { Low } from "lowdb";
 import { DataFile, JSONFile } from "lowdb/node";
 import { fileURLToPath } from "node:url";
+import { NormalizedAdapter } from "./adapters/normalized-adapter.js";
+import { Observer } from "./adapters/observer.js";
 import { createApp } from "./app.js";
-import { Observer } from "./observer.js";
 function help() {
     console.log(`Usage: json-server [options] <file>
 
@@ -109,7 +110,7 @@ if (extname(file) === ".json5") {
 else {
     adapter = new JSONFile(file);
 }
-const observer = new Observer(adapter);
+const observer = new Observer(new NormalizedAdapter(adapter));
 const db = new Low(observer, {});
 await db.read();
 // Create app

package/lib/random-id.js

@@ -0,0 +1,4 @@
+import { randomBytes } from 'node:crypto';
+export function randomId() {
+    return randomBytes(2).toString('hex');
+}

package/lib/service.js

@@ -1,19 +1,12 @@
-import { randomBytes } from 'node:crypto';
 import inflection from 'inflection';
 import { Low } from 'lowdb';
 import sortOn from 'sort-on';
 import { matchesWhere } from "./matches-where.js";
 import { paginate } from "./paginate.js";
+import { randomId } from "./random-id.js";
 export function isItem(obj) {
     return typeof obj === 'object' && obj !== null && !Array.isArray(obj);
 }
-export function isData(obj) {
-    if (typeof obj !== 'object' || obj === null) {
-        return false;
-    }
-    const data = obj;
-    return Object.values(data).every((value) => Array.isArray(value) ? value.every(isItem) : isItem(value));
-}
 function ensureArray(arg = []) {
     return Array.isArray(arg) ? arg : [arg];
 }
@@ -65,31 +58,9 @@ function deleteDependents(db, name, dependents) {
         }
     });
 }
-function randomId() {
-    return randomBytes(2).toString('hex');
-}
-function fixItemsIds(items) {
-    items.forEach((item) => {
-        if (typeof item['id'] === 'number') {
-            item['id'] = item['id'].toString();
-        }
-        if (item['id'] === undefined) {
-            item['id'] = randomId();
-        }
-    });
-}
-// Ensure all items have an id
-function fixAllItemsIds(data) {
-    Object.values(data).forEach((value) => {
-        if (Array.isArray(value)) {
-            fixItemsIds(value);
-        }
-    });
-}
 export class Service {
     #db;
     constructor(db) {
-        fixAllItemsIds(db.data);
         this.#db = db;
     }
     #get(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-server",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "description": "",
   "keywords": [
     "JSON",