@voxgig/sdkgen 0.26.1 → 0.28.0

package/project/.sdk/tm/ts/src/utility/{SelectionUtility.ts → MakeTargetUtility.ts}

@@ -1,36 +1,34 @@
 
-import { Context, Alt } from '../types'
+import { Context, Target } from '../types'
 
-import { getprop } from './StructUtility'
 
-
-// Ensure standard operation definition.
-// TODO: rename to alt
-function selection(ctx: Context): Alt | Error {
-  if (ctx.out.selected) {
-    return ctx.alt = ctx.out.selected
+function makeTarget(ctx: Context): Target | Error {
+  if (ctx.out.target) {
+    return ctx.target = ctx.out.target
   }
 
-  const { op, options } = ctx
+  const getprop = ctx.utility.struct.getprop
+  const op = ctx.op
+  const options = ctx.options
 
   if (!options.allow.op.includes(op.name)) {
-    return Error('Operation "' + op.name +
+    ctx.error('target_op_allow', 'Operation "' + op.name +
       '" not allowed by SDK option allow.op value: "' + options.allow.op + '"')
   }
 
   // Choose the appropriate operation alternate based on the match or data.
-  if (1 === op.alts.length) {
-    ctx.alt = op.alts[0]
+  if (1 === op.targets.length) {
+    ctx.target = op.targets[0]
   }
   else {
     // Operation argument has priority, but also look in current data or match.
-    const reqselector = getprop(ctx, 'req' + op.select)
-    const selector = getprop(ctx, op.select)
+    const reqselector = getprop(ctx, 'req' + op.input)
+    const selector = getprop(ctx, op.input)
 
-    let alt
-    for (let i = 0; i < op.alts.length; i++) {
-      alt = op.alts[i]
-      const select = alt.select
+    let target
+    for (let i = 0; i < op.targets.length; i++) {
+      target = op.targets[i]
+      const select = target.select
       let found = true
 
       if (selector && select.exist) {
@@ -59,20 +57,20 @@ function selection(ctx: Context): Alt | Error {
 
     if (
       null != reqselector.$action &&
-      null != alt &&
-      reqselector.$action !== alt.select.$action
+      null != target &&
+      reqselector.$action !== target.select.$action
     ) {
-      return Error('Operation "' + op.name +
+      return ctx.error('target_action_invalid', 'Operation "' + op.name +
         '" action "' + reqselector.$action + '" is not valid.')
     }
 
-    ctx.alt = alt
+    ctx.target = target
   }
 
-  return ctx.alt
+  return ctx.target
 }
 
 
 export {
-  selection,
+  makeTarget,
 }

package/project/.sdk/tm/ts/src/utility/{FullurlUtility.ts → MakeUrlUtility.ts}

@@ -2,7 +2,7 @@
 import { Context } from '../types'
 
 
-function fullurl(ctx: Context): Error | string {
+function makeUrl(ctx: Context): Error | string {
   const utility = ctx.utility
   const spec = ctx.spec
   const result = ctx.result
@@ -11,14 +11,15 @@ function fullurl(ctx: Context): Error | string {
   const escurl = struct.escurl
   const escre = struct.escre
   const join = struct.join
+  const items = struct.items
 
 
   if (null == spec) {
-    return new Error('Expected context spec property to be defined.')
+    return ctx.error('url_no_spec', 'Expected context spec property to be defined.')
   }
 
   if (null == result) {
-    return new Error('Expected context result property to be defined.')
+    return ctx.error('url_no_result', 'Expected context result property to be defined.')
   }
 
 
@@ -28,8 +29,7 @@ function fullurl(ctx: Context): Error | string {
 
   const params = spec.params
 
-  for (let key in params) {
-    const val = params[key]
+  for (let [key, val] of items(params)) {
     if (null != val) {
       url = url.replace(RegExp('{' + escre(key) + '}'), escurl(val))
       resmatch[key] = val
@@ -39,9 +39,8 @@ function fullurl(ctx: Context): Error | string {
 
   /* TODO: fix
   let qsep = '?'
-  for (let key in spec.query) {
+  for (let [key, val] of items(spec.query)) {
     if (null == spec.alias[key]) {
-      const val = spec.query[key]
       if (null != val) {
         url += qsep + escurl(key) + '=' + escurl(val)
         qsep = '&'
@@ -58,5 +57,5 @@ function fullurl(ctx: Context): Error | string {
 
 
 export {
-  fullurl
+  makeUrl
 }

package/project/.sdk/tm/ts/src/utility/{FindparamUtility.ts → ParamUtility.ts}

@@ -1,9 +1,6 @@
 
 import { Context } from '../types'
 
-import { setprop, getprop } from './StructUtility'
-
-
 /* Find value of a match parameter, possibly using an alias.
  *
  * The match parameter may have an alias key. For example, the parameter `foo_id` may be
@@ -11,14 +8,30 @@ import { setprop, getprop } from './StructUtility'
  *
  * This function returns `undefined` rather than failing.
  */
-function findparam(ctx: Context, param: any) {
-  let { alt, spec, match, reqmatch, data, reqdata } = ctx
+function param(ctx: Context, paramdef: any) {
+  const target = ctx.target
+  const spec = ctx.spec
+  const match = ctx.match
+  const reqmatch = ctx.reqmatch
+  const data = ctx.data
+  const reqdata = ctx.reqdata
+
+  const utility = ctx.utility
+  const struct = utility.struct
+
+  const getprop = struct.getprop
+  const setprop = struct.setprop
+
+  const typify = struct.typify
+  const T_string = struct.T_string
+
+  const pt = typify(paramdef)
 
   // TODO: review this search algorithm
 
-  const key = param.name
+  const key = 0 < (T_string & pt) ? paramdef : getprop(paramdef, 'name')
 
-  let akey = getprop(alt.alias, key)
+  let akey = getprop(target.alias, key)
 
   let val = getprop(reqmatch, key)
 
@@ -56,6 +69,6 @@ function findparam(ctx: Context, param: any) {
 
 
 export {
-  findparam
+  param
 }
 

package/project/.sdk/tm/ts/src/utility/{AuthUtility.ts → PrepareAuthUtility.ts}

@@ -6,10 +6,10 @@ const HEADER_auth = 'authorization'
 
 const OPTION_apikey = 'apikey'
 
-const NOTFOUND = ''
+const NOTFOUND = '__NOTFOUND__'
 
 
-function auth(ctx: Context): Spec | Error {
+function prepareAuth(ctx: Context): Spec | Error {
   const utility = ctx.utility
 
   const struct = utility.struct
@@ -21,7 +21,7 @@ function auth(ctx: Context): Spec | Error {
   const spec = ctx.spec
 
   if (null == spec) {
-    return new Error('Expected context spec property to be defined.')
+    return ctx.error('auth_no_spec', 'Expected context spec property to be defined.')
   }
 
 
@@ -44,5 +44,5 @@ function auth(ctx: Context): Spec | Error {
 
 
 export {
-  auth
+  prepareAuth
 }

package/project/.sdk/tm/ts/src/utility/{BodyUtility.ts → PrepareBodyUtility.ts}

@@ -1,20 +1,20 @@
 
 import { Context } from '../types'
 
-function body(ctx: Context) {
+function prepareBody(ctx: Context) {
   const op = ctx.op
 
   const utility = ctx.utility
-  const error = utility.error
-  const reqform = utility.reqform
+  const error = utility.makeError
+  const transformRequest = utility.transformRequest
 
   let body = undefined
 
-  if ('data' === op.select) {
+  if ('data' === op.input) {
     try {
-      body = reqform(ctx)
+      body = transformRequest(ctx)
 
-      // if (alt.check.nobody && null == body) {
+      // if (target.check.nobody && null == body) {
       //   return error(ctx, new Error('Request body is empty.'))
       // }
     }
@@ -27,6 +27,6 @@ function body(ctx: Context) {
 }
 
 export {
-  body
+  prepareBody
 }
 

package/project/.sdk/tm/ts/src/utility/{HeadersUtility.ts → PrepareHeadersUtility.ts}

@@ -2,12 +2,10 @@
 import { Context } from '../types'
 
 
-import { getprop } from './StructUtility'
-
-
-function headers(ctx: Context) {
-  const utility = ctx.utility
-  const clone = utility.struct.clone
+function prepareHeaders(ctx: Context) {
+  const struct = ctx.utility.struct
+  const clone = struct.clone
+  const getprop = struct.getprop
 
   const client = ctx.client
 
@@ -20,5 +18,5 @@ function headers(ctx: Context) {
 
 
 export {
-  headers
+  prepareHeaders
 }

package/project/.sdk/tm/ts/src/utility/{MethodUtility.ts → PrepareMethodUtility.ts}

@@ -1,25 +1,25 @@
 
 import { Context } from '../types'
 
-function method(ctx: Context) {
-  const { op } = ctx
+function prepareMethod(ctx: Context) {
+  const op = ctx.op
   const opname = op.name
 
   let key = opname
 
-  // TODO: options
-  const mmap: any = {
+  const methodMap: any = {
     create: 'POST',
     update: 'PUT',
     load: 'GET',
     list: 'GET',
     remove: 'DELETE',
+    patch: 'PATCH',
   }
 
-  return mmap[key]
+  return methodMap[key]
 }
 
 
 export {
-  method
+  prepareMethod
 }

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

@@ -0,0 +1,37 @@
+
+import { Context } from '../types'
+
+
+function prepareParams(ctx: Context) {
+  const utility = ctx.utility
+  const findparam = utility.param
+
+  // const struct = utility.struct
+  // const validate = struct.validate
+
+  const target = ctx.target
+
+  let params = target.args.params
+  // let reqmatch = ctx.reqmatch
+
+  params = params || []
+  // reqmatch = reqmatch || {}
+
+  let out: any = {}
+  for (let pd of params) {
+    let val = findparam(ctx, pd)
+    if (null != val) {
+      out[pd.name] = val
+    }
+  }
+
+  // TODO: review
+  // out = validate(out, target.validate.params)
+
+  return out
+}
+
+
+export {
+  prepareParams
+}

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

@@ -1,13 +1,12 @@
 
 import { Context } from '../types'
 
-import { join } from './StructUtility'
-
 
 function preparePath(ctx: Context) {
-  const { alt } = ctx
+  const join = ctx.utility.struct.join
+  const target = ctx.target
 
-  const path = join(alt.parts, '/', true)
+  const path = join(target.parts, '/', true)
 
   return path
 }

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

@@ -0,0 +1,30 @@
+
+import { Context } from '../types'
+
+
+function prepareQuery(ctx: Context) {
+  const utility = ctx.utility
+  const struct = utility.struct
+  const items = struct.items
+
+  const target = ctx.target
+  let params = target.params
+  let reqmatch = ctx.reqmatch
+
+  params = params || []
+  reqmatch = reqmatch || {}
+
+  const out: any = {}
+  for (let [key, val] of items(reqmatch)) {
+    if (null != val && !params.includes(key)) {
+      out[key] = val
+    }
+  }
+
+  return out
+}
+
+
+export {
+  prepareQuery
+}

package/project/.sdk/tm/ts/src/utility/{ResbasicUtility.ts → ResultBasicUtility.ts}

@@ -2,12 +2,17 @@
 import { Context } from '../types'
 
 
-function resbasic(ctx: Context) {
-  const { response, result } = ctx
+function resultBasic(ctx: Context) {
+  const utility = ctx.utility
+  const struct = utility.struct
+  const getprop = struct.getprop
+
+  const response = ctx.response
+  const result = ctx.result
 
   if (null != result && null != response) {
-    result.status = response.status || -1
-    result.statusText = response.statusText || 'no-status'
+    result.status = getprop(response, 'status', -1)
+    result.statusText = getprop(response, 'statusText', 'no-status')
 
     // TODO: use spec!
     if (400 <= result.status) {
@@ -17,7 +22,7 @@ function resbasic(ctx: Context) {
         result.err.message = prevmsg + ': ' + msg
       }
       else {
-        result.err = new Error(msg)
+        result.err = ctx.error('request_status', msg)
       }
     }
     else if (response.err) {
@@ -30,5 +35,5 @@ function resbasic(ctx: Context) {
 
 
 export {
-  resbasic
+  resultBasic
 }

package/project/.sdk/tm/ts/src/utility/{ResbodyUtility.ts → ResultBodyUtility.ts}

@@ -2,8 +2,9 @@
 import { Context } from '../types'
 
 
-async function resbody(ctx: Context) {
-  const { response, result } = ctx
+async function resultBody(ctx: Context) {
+  const response = ctx.response
+  const result = ctx.result
 
   if (result) {
     if (response && response.json && null != response.body) {
@@ -17,5 +18,5 @@ async function resbody(ctx: Context) {
 
 
 export {
-  resbody
+  resultBody
 }

package/project/.sdk/tm/ts/src/utility/{ResheadersUtility.ts → ResultHeadersUtility.ts}

@@ -2,8 +2,9 @@
 import { Context } from '../types'
 
 
-function resheaders(ctx: Context) {
-  const { response, result } = ctx
+function resultHeaders(ctx: Context) {
+  const response = ctx.response
+  const result = ctx.result
 
   if (result) {
     if (response && response.headers && response.headers.forEach) {
@@ -21,5 +22,5 @@ function resheaders(ctx: Context) {
 
 
 export {
-  resheaders
+  resultHeaders
 }

package/project/.sdk/tm/ts/src/utility/{ReqformUtility.ts → TransformRequestUtility.ts}

@@ -5,17 +5,19 @@ import { Context } from '../types'
  *
  * The operation (op) property `reqform` is used to perform the data preparation.
  */
-function reqform(ctx: Context) {
-  const { spec, utility, alt } = ctx
-  const { struct, error } = utility
-  const { isfunc, transform } = struct
+function transformRequest(ctx: Context) {
+  const spec = ctx.spec
+  const utility = ctx.utility
+  const target = ctx.target
+  const isfunc = utility.struct.isfunc
+  const transform = utility.struct.transform
 
   if (spec) {
     spec.step = 'reqform'
   }
 
   try {
-    const reqform = alt.transform.req
+    const reqform = target.transform.req
     const reqdata = isfunc(reqform) ? reqform(ctx) : transform({
       reqdata: ctx.reqdata
     }, reqform)
@@ -23,11 +25,11 @@ function reqform(ctx: Context) {
     return reqdata
   }
   catch (err) {
-    return error(ctx, err)
+    return utility.makeError(ctx, err)
   }
 }
 
 
 export {
-  reqform
+  transformRequest
 }

package/project/.sdk/tm/ts/src/utility/{ResformUtility.ts → TransformResponseUtility.ts}

@@ -6,10 +6,13 @@ import { Context } from '../types'
  *
  * The operation (op) property `resform` is used to perform the data extraction.
  */
-function resform(ctx: Context) {
-  const { spec, result, utility, alt } = ctx
-  const { struct, error } = utility
-  const { isfunc, transform } = struct
+function transformResponse(ctx: Context) {
+  const spec = ctx.spec
+  const result = ctx.result
+  const utility = ctx.utility
+  const target = ctx.target
+  const isfunc = utility.struct.isfunc
+  const transform = utility.struct.transform
 
   if (spec) {
     spec.step = 'resform'
@@ -20,17 +23,17 @@ function resform(ctx: Context) {
   }
 
   try {
-    const resform = alt.transform.res
+    const resform = target.transform.res
     const resdata = isfunc(resform) ? resform(ctx) : transform(ctx.result, resform)
     result.resdata = resdata
     return resdata
   }
   catch (err) {
-    return error(ctx, err)
+    return utility.makeError(ctx, err)
   }
 }
 
 
 export {
-  resform
+  transformResponse
 }