json-server 1.0.0-alpha.21 → 1.0.0-alpha.22

package/README.md

@@ -169,7 +169,7 @@ GET /comments?_embed=post
 
 ```
 DELETE /posts/1
-DELETE /posts/1?_embed=comments
+DELETE /posts/1?_dependent=comments
 ```
 
 ## Serving static files

package/lib/app.js

@@ -29,7 +29,17 @@ export function createApp(db, options = {}) {
     app.get('/', (_req, res) => res.send(eta.render('index.html', { data: db.data })));
     app.get('/:name', (req, res, next) => {
         const { name = '' } = req.params;
-        res.locals['data'] = service.find(name, req.query);
+        const query = Object.fromEntries(Object.entries(req.query)
+            .map(([key, value]) => {
+            if (['_start', '_end', '_limit', '_page', '_per_page'].includes(key) && typeof value === 'string') {
+                return [key, parseInt(value)];
+            }
+            else {
+                return [key, value];
+            }
+        })
+            .filter(([_, value]) => !Number.isNaN(value)));
+        res.locals['data'] = service.find(name, query);
         next();
     });
     app.get('/:name/:id', (req, res, next) => {
@@ -74,7 +84,7 @@ export function createApp(db, options = {}) {
     });
     app.delete('/:name/:id', async (req, res, next) => {
         const { name = '', id = '' } = req.params;
-        res.locals['data'] = await service.destroyById(name, id);
+        res.locals['data'] = await service.destroyById(name, id, req.query['dependent']);
         next();
     });
     app.use('/:name', (req, res) => {

package/lib/service.d.ts

@@ -21,8 +21,7 @@ export declare class Service {
     }): Item | undefined;
     find(name: string, query?: {
         [key: string]: unknown;
-    } & {
-        _embed?: string[];
+        _embed?: string | string[];
         _sort?: string;
         _start?: number;
         _end?: number;
@@ -35,5 +34,5 @@ export declare class Service {
     patch(name: string, body?: Item): Promise<Item | undefined>;
     updateById(name: string, id: string, body?: Item): Promise<Item | undefined>;
     patchById(name: string, id: string, body?: Item): Promise<Item | undefined>;
-    destroyById(name: string, id: string, dependents?: string[]): Promise<Item | undefined>;
+    destroyById(name: string, id: string, dependent?: string | string[]): Promise<Item | undefined>;
 }

package/lib/service.js

@@ -224,11 +224,14 @@ export class Service {
         const start = query._start;
         const end = query._end;
         const limit = query._limit;
-        if (start === undefined && limit) {
-            return sorted.slice(0, limit);
+        if (start !== undefined) {
+            if (end !== undefined) {
+                return sorted.slice(start, end);
+            }
+            return sorted.slice(start, start + (limit || 0));
         }
-        if (start && limit) {
-            return sorted.slice(start, start + limit);
+        if (limit !== undefined) {
+            return sorted.slice(0, limit);
         }
         // Paginate
         let page = query._page;
@@ -299,7 +302,7 @@ export class Service {
     async patchById(name, id, body = {}) {
         return this.#updateOrPatchById(name, id, body, true);
     }
-    async destroyById(name, id, dependents = []) {
+    async destroyById(name, id, dependent) {
         const items = this.#get(name);
         if (items === undefined || !Array.isArray(items))
             return;
@@ -309,6 +312,7 @@ export class Service {
         const index = items.indexOf(item);
         items.splice(index, 1)[0];
         nullifyForeignKey(this.#db, name, id);
+        const dependents = ensureArray(dependent);
         deleteDependents(this.#db, name, dependents);
         await this.#db.write();
         return item;

package/package.json

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

package/views/index.html

@@ -31,7 +31,7 @@
         <a href="<%= name %>">/<%= name %></a>
         <span class="text-gray-500">
           <% if (Array.isArray(it.data[name])) { %>
-           - <%= it.data[name].length %> items</span>
+           - <%= it.data[name].length %> <%= it.data[name].length > 1 ? 'items' : 'item' %></span>
           <% } %>
       </div>
     <% }) %>