@voxgig/sdkgen 0.26.1 → 0.28.0

package/project/.sdk/tm/ts/src/utility/Utility.ts

@@ -1,84 +1,69 @@
 
-/* Utility functions.
- *
- * Many of these functions expect the operation context as the first argument, and
- * assume the following top level properties of the context:
- *   * client: SDK client instance
- *   * op: operation definition
- *   * utility: map of these utility functions
- *   * entity?: SDK entity instance
- *   * spec?: request specification
- *   * response?: unprocessed response
- *   * result?: processed result built from response
- *   * config?: SDK builtin configuration
- *
- */
 
-
-import { addfeature } from './AddfeatureUtility'
-import { auth } from './AuthUtility'
-import { body } from './BodyUtility'
 import { clean } from './CleanUtility'
 import { done } from './DoneUtility'
-import { error } from './ErrorUtility'
+import { makeError } from './MakeErrorUtility'
+import { featureAdd } from './FeatureAddUtility'
 import { featureHook } from './FeatureHookUtility'
+import { featureInit } from './FeatureInitUtility'
 import { fetcher } from './FetcherUtility'
-import { findparam } from './FindparamUtility'
-import { fullurl } from './FullurlUtility'
-import { headers } from './HeadersUtility'
-import { initfeature } from './InitfeatureUtility'
-import { makeContext } from './ContextUtility'
-import { makeOperation } from './OperationUtility'
-import { method } from './MethodUtility'
-import { options } from './OptionsUtility'
-import { params } from './ParamsUtility'
+import { makeFetchDef } from './MakeFetchDefUtility'
+import { makeContext } from './MakeContextUtility'
+import { makeOptions } from './MakeOptionsUtility'
+import { makeRequest } from './MakeRequestUtility'
+import { makeResponse } from './MakeResponseUtility'
+import { makeResult } from './MakeResultUtility'
+import { makeTarget } from './MakeTargetUtility'
+import { makeSpec } from './MakeSpecUtility'
+import { makeUrl } from './MakeUrlUtility'
+import { param } from './ParamUtility'
+import { prepareAuth } from './PrepareAuthUtility'
+import { prepareBody } from './PrepareBodyUtility'
+import { prepareHeaders } from './PrepareHeadersUtility'
+import { prepareMethod } from './PrepareMethodUtility'
+import { prepareParams } from './PrepareParamsUtility'
 import { preparePath } from './PreparePathUtility'
-import { query } from './QueryUtility'
-import { reqform } from './ReqformUtility'
-import { request } from './RequestUtility'
-import { resbasic } from './ResbasicUtility'
-import { resbody } from './ResbodyUtility'
-import { resform } from './ResformUtility'
-import { resheaders } from './ResheadersUtility'
-import { response } from './ResponseUtility'
-import { result } from './ResultUtility'
-import { selection } from './SelectionUtility'
-import { spec } from './SpecUtility'
+import { prepareQuery } from './PrepareQueryUtility'
+import { resultBasic } from './ResultBasicUtility'
+import { resultBody } from './ResultBodyUtility'
+import { resultHeaders } from './ResultHeadersUtility'
+import { transformRequest } from './TransformRequestUtility'
+import { transformResponse } from './TransformResponseUtility'
 
 import { StructUtility } from './StructUtility'
 
 
 class Utility {
 
-  addfeature = addfeature
-  auth = auth
-  body = body
   clean = clean
   done = done
-  error = error
+  makeError = makeError
+  featureAdd = featureAdd
   featureHook = featureHook
+  featureInit = featureInit
   fetcher = fetcher
-  findparam = findparam
-  fullurl = fullurl
-  headers = headers
-  initfeature = initfeature
+  makeFetchDef = makeFetchDef
   makeContext = makeContext
-  makeOperation = makeOperation
-  method = method
-  options = options
-  params = params
+  makeOptions = makeOptions
+  makeRequest = makeRequest
+  makeResponse = makeResponse
+  makeResult = makeResult
+  makeTarget = makeTarget
+  makeSpec = makeSpec
+  makeUrl = makeUrl
+  param = param
+  prepareAuth = prepareAuth
+  prepareBody = prepareBody
+  prepareHeaders = prepareHeaders
+  prepareMethod = prepareMethod
+  prepareParams = prepareParams
   preparePath = preparePath
-  query = query
-  reqform = reqform
-  request = request
-  resbasic = resbasic
-  resbody = resbody
-  resform = resform
-  resheaders = resheaders
-  response = response
-  result = result
-  selection = selection
-  spec = spec
+  prepareQuery = prepareQuery
+  resultBasic = resultBasic
+  resultBody = resultBody
+  resultHeaders = resultHeaders
+  transformRequest = transformRequest
+  transformResponse = transformResponse
 
   struct = new StructUtility()
 }

package/project/.sdk/tm/ts/test/runner.ts

@@ -170,7 +170,7 @@ function checkResult(entry: any, args: any[], res: any, structUtils: Record<stri
 
   if (entry.err) {
     return fail('Expected error did not occur: ' + entry.err +
-      '\n\nENTRY: ' + JSON.stringify(entry, null, 2))
+      '\n\nENTRY: ' + safeStringify(entry))
   }
 
   if (entry.match) {
@@ -195,7 +195,7 @@ function checkResult(entry: any, args: any[], res: any, structUtils: Record<stri
     return
   }
 
-  deepStrictEqual(null != res ? JSON.parse(JSON.stringify(res)) : res, entry.out)
+  deepStrictEqual(null != res ? JSON.parse(safeStringify(res)) : res, entry.out)
 }
 
 
@@ -223,10 +223,10 @@ function handleError(entry: any, err: any, structUtils: Record<string, any>) {
 
   // Unexpected error (test didn't specify an error expectation)
   else if (err instanceof AssertionError) {
-    fail(err.message + '\n\nENTRY: ' + JSON.stringify(entry, null, 2))
+    fail(err.message + '\n\nENTRY: ' + safeStringify(entry))
   }
   else {
-    fail(err.stack + '\\nnENTRY: ' + JSON.stringify(entry, null, 2))
+    fail(err.stack + '\n\nENTRY: ' + safeStringify(entry))
   }
 }
 
@@ -356,11 +356,27 @@ function matchval(
 }
 
 
+function safeStringify(val: any): string {
+  const seen = new WeakSet()
+  return JSON.stringify(val, (_k, v) => {
+    if ('object' === typeof v && null !== v) {
+      if (seen.has(v)) return '[Circular]'
+      seen.add(v)
+    }
+    if (v instanceof Error) {
+      return { name: v.name, message: v.message }
+    }
+    return v
+  }, 2)
+}
+
+
 function fixJSON(val: any, flags?: Flags): any {
   if (null == val) {
     return flags?.null ? NULLMARK : val
   }
 
+  const seen = new WeakSet()
   const replacer = (_k: string, v: any) => {
     if (null == v && flags?.null) {
       return NULLMARK
@@ -374,6 +390,11 @@ function fixJSON(val: any, flags?: Flags): any {
       }
     }
 
+    if ('object' === typeof v && null !== v) {
+      if (seen.has(v)) return '[Circular]'
+      seen.add(v)
+    }
+
     return v
   }