json-server 1.0.0-alpha.18 → 1.0.0-alpha.20

package/lib/service.d.ts

@@ -17,7 +17,7 @@ export declare class Service {
     constructor(db: Low<Data>);
     has(name: string): boolean;
     findById(name: string, id: string, query: {
-        _embed?: string[];
+        _embed?: string[] | string;
     }): Item | undefined;
     find(name: string, query?: {
         [key: string]: unknown;

package/lib/service.js

@@ -24,6 +24,9 @@ var Condition;
 function isCondition(value) {
     return Object.values(Condition).includes(value);
 }
+function ensureArray(arg = []) {
+    return Array.isArray(arg) ? arg : [arg];
+}
 function embed(db, name, item, related) {
     if (inflection.singularize(related) === related) {
         const relatedData = db.data[inflection.pluralize(related)];
@@ -75,25 +78,28 @@ function deleteDependents(db, name, dependents) {
 function randomId() {
     return randomBytes(2).toString('hex');
 }
-function ensureItemsHaveIds(items) {
-    return items.map((item) => {
+function fixItemsIds(items) {
+    items.forEach((item) => {
+        if (typeof item['id'] === 'number') {
+            item['id'] = item['id'].toString();
+        }
         if (item['id'] === undefined) {
-            return { ...item, id: randomId() };
+            item['id'] = randomId();
         }
-        return item;
     });
 }
 // Ensure all items have an id
-function ensureAllItemsHaveIds(data) {
-    return Object.entries(data).reduce((acc, [key, value]) => ({
-        ...acc,
-        [key]: Array.isArray(value) ? ensureItemsHaveIds(value) : value,
-    }), {});
+function fixAllItemsIds(data) {
+    Object.values(data).forEach((value) => {
+        if (Array.isArray(value)) {
+            fixItemsIds(value);
+        }
+    });
 }
 export class Service {
     #db;
     constructor(db) {
-        db.data = ensureAllItemsHaveIds(db.data);
+        fixAllItemsIds(db.data);
         this.#db = db;
     }
     #get(name) {
@@ -106,7 +112,7 @@ export class Service {
         const value = this.#get(name);
         if (Array.isArray(value)) {
             let item = value.find((item) => item['id'] === id);
-            query._embed?.forEach((related) => {
+            ensureArray(query._embed).forEach((related) => {
                 if (item !== undefined)
                     item = embed(this.#db, name, item, related);
             });
@@ -120,9 +126,10 @@ export class Service {
             return items;
         }
         // Include
-        query._embed?.forEach((related) => {
-            if (items !== undefined && Array.isArray(items))
+        ensureArray(query._embed).forEach((related) => {
+            if (items !== undefined && Array.isArray(items)) {
                 items = items.map((item) => embed(this.#db, name, item, related));
+            }
         });
         // Return list if no query params
         if (Object.keys(query).length === 0) {
@@ -142,8 +149,17 @@ export class Service {
                 conds[field] = [op, value];
                 continue;
             }
-            if (['_sort', '_start', '_end', '_limit', '_page', '_per_page'].includes(key))
+            if ([
+                '_embed',
+                '_sort',
+                '_start',
+                '_end',
+                '_limit',
+                '_page',
+                '_per_page',
+            ].includes(key)) {
                 continue;
+            }
             conds[key] = [Condition.default, value];
         }
         // Loop through conditions and filter items

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-server",
-  "version": "1.0.0-alpha.18",
+  "version": "1.0.0-alpha.20",
   "description": "",
   "type": "module",
   "bin": {