@voxgig/sdkgen 4.32.0 → 4.32.1

package/bin/voxgig-sdkgen

@@ -8,7 +8,7 @@ const { Shape, One, Skip } = require('shape')
 
 const { SdkGen } = require('../dist/sdkgen.js')
 
-const VERSION = '4.32.0'
+const VERSION = '4.32.1'
 const KONSOLE = console
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "4.32.0",
+  "version": "4.32.1",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "engines": {

package/project/.sdk/tm/js/src/Response.js

@@ -7,13 +7,26 @@ class Response {
     this.status = getprop(resmap, 'status', -1)
     this.statusText = getprop(resmap, 'statusText', '')
     this.headers = getprop(resmap, 'headers')
-    this.json = resmap.json ? resmap.json.bind(resmap) : async () => undefined
+    this.json = readJson(resmap)
     this.body = getprop(resmap, 'body')
     this.err = getprop(resmap, 'err')
   }
 }
 
 
+// An empty body, such as the one an accepted delete answers with, is no
+// body: parsing it as JSON would throw after the call has succeeded.
+function readJson(resmap) {
+  if ('function' === typeof resmap.text) {
+    return async () => {
+      const text = await resmap.text()
+      return '' === text.trim() ? undefined : JSON.parse(text)
+    }
+  }
+  return resmap.json ? resmap.json.bind(resmap) : async () => undefined
+}
+
+
 module.exports = {
   Response,
 }

package/project/.sdk/tm/js/test/utility/PrimaryUtility.test.js

@@ -246,6 +246,31 @@ describe('PrimaryUtility', async () => {
   })
 
 
+  // An accepted delete answers 202 with an empty body, which is no body.
+  test('resbody-empty', async () => {
+    const read = async (res) => {
+      const reqClient = new SDK({
+        base: 'http://localhost:8080',
+        system: { fetch: async () => res },
+      })
+      const reqUtility = reqClient.utility()
+      const ctx = reqUtility.makeContext({
+        opname: 'remove',
+        spec: {
+          alias: {}, base: 'http://localhost/', headers: {}, method: 'DELETE',
+          params: {}, path: '/p0', prefix: '', query: {}, suffix: '',
+        },
+      }, reqClient._rootctx)
+      ctx.client = reqClient
+      await reqUtility.makeRequest(ctx)
+      return reqUtility.resultBody(ctx)
+    }
+
+    equal((await read(new Response('', { status: 202 }))).body, undefined)
+    deepStrictEqual((await read(new Response('{"a":1}', { status: 200 }))).body, { a: 1 })
+  })
+
+
   test('request-basic', async () => {
     const mockFetch = async (url, init) => ({
       status: 200,

package/project/.sdk/tm/ts/src/Response.ts

@@ -14,13 +14,26 @@ class Response {
     this.status = getprop(resmap, 'status', -1)
     this.statusText = getprop(resmap, 'statusText', '')
     this.headers = getprop(resmap, 'headers')
-    this.json = resmap.json ? resmap.json.bind(resmap) : async () => undefined
+    this.json = readJson(resmap)
     this.body = getprop(resmap, 'body')
     this.err = getprop(resmap, 'err')
   }
 }
 
 
+// An empty body, such as the one an accepted delete answers with, is no
+// body: parsing it as JSON would throw after the call has succeeded.
+function readJson(resmap: Record<string, any>): Function {
+  if ('function' === typeof resmap.text) {
+    return async () => {
+      const text = await resmap.text()
+      return '' === text.trim() ? undefined : JSON.parse(text)
+    }
+  }
+  return resmap.json ? resmap.json.bind(resmap) : async () => undefined
+}
+
+
 export {
   Response,
 }

package/project/.sdk/tm/ts/test/utility/PrimaryUtility.test.ts

@@ -259,6 +259,31 @@ describe('PrimaryUtility', async () => {
   })
 
 
+  // An accepted delete answers 202 with an empty body, which is no body.
+  test('resbody-empty', async () => {
+    const read = async (res: any) => {
+      const reqClient = new (SDK as any)({
+        base: 'http://localhost:8080',
+        system: { fetch: async () => res },
+      })
+      const reqUtility = reqClient.utility()
+      const ctx = reqUtility.makeContext({
+        opname: 'remove',
+        spec: {
+          alias: {}, base: 'http://localhost/', headers: {}, method: 'DELETE',
+          params: {}, path: '/p0', prefix: '', query: {}, suffix: '',
+        },
+      }, reqClient._rootctx)
+      ctx.client = reqClient
+      await reqUtility.makeRequest(ctx)
+      return reqUtility.resultBody(ctx)
+    }
+
+    equal((await read(new Response('', { status: 202 }))).body, undefined)
+    deepStrictEqual((await read(new Response('{"a":1}', { status: 200 }))).body, { a: 1 })
+  })
+
+
   test('request-basic', async () => {
     const mockFetch = async (url: string, init: any) => ({
       status: 200,

package/project/sdkgen-package.json

@@ -3,7 +3,7 @@
     "package": 1
   },
   "name": "@voxgig/sdkgen",
-  "version": "4.32.0",
+  "version": "4.32.1",
   "provides": {
     "target": [
       "c",