@voxgig/sdkgen 0.33.0 → 0.34.1

package/project/.sdk/tm/go/utility/make_target.go

@@ -8,10 +8,10 @@ import (
 	"GOMODULE/core"
 )
 
-func makeTargetUtil(ctx *core.Context) (map[string]any, error) {
-	if ctx.Out["target"] != nil {
-		if tm, ok := ctx.Out["target"].(map[string]any); ok {
-			ctx.Target = tm
+func makePointUtil(ctx *core.Context) (map[string]any, error) {
+	if ctx.Out["point"] != nil {
+		if tm, ok := ctx.Out["point"].(map[string]any); ok {
+			ctx.Point = tm
 			return tm, nil
 		}
 	}
@@ -21,13 +21,13 @@ func makeTargetUtil(ctx *core.Context) (map[string]any, error) {
 
 	allowOp, _ := vs.GetPath([]any{"allow", "op"}, options).(string)
 	if !strings.Contains(allowOp, op.Name) {
-		return nil, ctx.MakeError("target_op_allow",
+		return nil, ctx.MakeError("point_op_allow",
 			"Operation \""+op.Name+
 				"\" not allowed by SDK option allow.op value: \""+allowOp+"\"")
 	}
 
-	if len(op.Targets) == 1 {
-		ctx.Target = op.Targets[0]
+	if len(op.Points) == 1 {
+		ctx.Point = op.Points[0]
 	} else {
 		var reqselector map[string]any
 		var selector map[string]any
@@ -40,10 +40,10 @@ func makeTargetUtil(ctx *core.Context) (map[string]any, error) {
 			selector = ctx.Match
 		}
 
-		var target map[string]any
-		for i := 0; i < len(op.Targets); i++ {
-			target = op.Targets[i]
-			selectDef := core.ToMapAny(vs.GetProp(target, "select"))
+		var point map[string]any
+		for i := 0; i < len(op.Points); i++ {
+			point = op.Points[i]
+			selectDef := core.ToMapAny(vs.GetProp(point, "select"))
 			found := true
 
 			if selector != nil && selectDef != nil {
@@ -77,19 +77,19 @@ func makeTargetUtil(ctx *core.Context) (map[string]any, error) {
 
 		if reqselector != nil {
 			reqAction := vs.GetProp(reqselector, "$action")
-			if reqAction != nil && target != nil {
-				targetSelect := core.ToMapAny(vs.GetProp(target, "select"))
-				targetAction := vs.GetProp(targetSelect, "$action")
-				if reqAction != targetAction {
-					return nil, ctx.MakeError("target_action_invalid",
+			if reqAction != nil && point != nil {
+				pointSelect := core.ToMapAny(vs.GetProp(point, "select"))
+				pointAction := vs.GetProp(pointSelect, "$action")
+				if reqAction != pointAction {
+					return nil, ctx.MakeError("point_action_invalid",
 						"Operation \""+op.Name+
 							"\" action \""+vs.Stringify(reqAction)+"\" is not valid.")
 				}
 			}
 		}
 
-		ctx.Target = target
+		ctx.Point = point
 	}
 
-	return ctx.Target, nil
+	return ctx.Point, nil
 }

package/project/.sdk/tm/go/utility/param.go

@@ -7,7 +7,7 @@ import (
 )
 
 func paramUtil(ctx *core.Context, paramdef any) any {
-	target := ctx.Target
+	point := ctx.Point
 	spec := ctx.Spec
 	match := ctx.Match
 	reqmatch := ctx.Reqmatch
@@ -25,8 +25,8 @@ func paramUtil(ctx *core.Context, paramdef any) any {
 	}
 
 	var akey string
-	if target != nil {
-		alias := core.ToMapAny(vs.GetProp(target, "alias"))
+	if point != nil {
+		alias := core.ToMapAny(vs.GetProp(point, "alias"))
 		if alias != nil {
 			if ak := vs.GetProp(alias, key); ak != nil {
 				akey, _ = ak.(string)

package/project/.sdk/tm/go/utility/prepare_params.go

@@ -8,10 +8,10 @@ import (
 
 func prepareParamsUtil(ctx *core.Context) map[string]any {
 	utility := ctx.Utility
-	target := ctx.Target
+	point := ctx.Point
 
 	var params []any
-	if args := vs.GetProp(target, "args"); args != nil {
+	if args := vs.GetProp(point, "args"); args != nil {
 		if argsMap, ok := args.(map[string]any); ok {
 			if p := vs.GetProp(argsMap, "params"); p != nil {
 				if pl, ok := p.([]any); ok {

package/project/.sdk/tm/go/utility/prepare_path.go

@@ -7,10 +7,10 @@ import (
 )
 
 func preparePathUtil(ctx *core.Context) string {
-	target := ctx.Target
+	point := ctx.Point
 
 	var parts []any
-	if p := vs.GetProp(target, "parts"); p != nil {
+	if p := vs.GetProp(point, "parts"); p != nil {
 		if pl, ok := p.([]any); ok {
 			parts = pl
 		}

package/project/.sdk/tm/go/utility/prepare_query.go

@@ -7,15 +7,15 @@ import (
 )
 
 func prepareQueryUtil(ctx *core.Context) map[string]any {
-	target := ctx.Target
+	point := ctx.Point
 	reqmatch := ctx.Reqmatch
 	if reqmatch == nil {
 		reqmatch = map[string]any{}
 	}
 
 	var params []any
-	if target != nil {
-		if p := vs.GetProp(target, "params"); p != nil {
+	if point != nil {
+		if p := vs.GetProp(point, "params"); p != nil {
 			if pl, ok := p.([]any); ok {
 				params = pl
 			}

package/project/.sdk/tm/go/utility/register.go

@@ -20,7 +20,7 @@ func registerAll(u *core.Utility) {
 	u.MakeRequest = makeRequestUtil
 	u.MakeResponse = makeResponseUtil
 	u.MakeResult = makeResultUtil
-	u.MakeTarget = makeTargetUtil
+	u.MakePoint = makePointUtil
 	u.MakeSpec = makeSpecUtil
 	u.MakeUrl = makeUrlUtil
 	u.Param = paramUtil

package/project/.sdk/tm/go/utility/transform_request.go

@@ -8,13 +8,13 @@ import (
 
 func transformRequestUtil(ctx *core.Context) any {
 	spec := ctx.Spec
-	target := ctx.Target
+	point := ctx.Point
 
 	if spec != nil {
 		spec.Step = "reqform"
 	}
 
-	transform := core.ToMapAny(vs.GetProp(target, "transform"))
+	transform := core.ToMapAny(vs.GetProp(point, "transform"))
 	if transform == nil {
 		return ctx.Reqdata
 	}

package/project/.sdk/tm/go/utility/transform_response.go

@@ -9,7 +9,7 @@ import (
 func transformResponseUtil(ctx *core.Context) any {
 	spec := ctx.Spec
 	result := ctx.Result
-	target := ctx.Target
+	point := ctx.Point
 
 	if spec != nil {
 		spec.Step = "resform"
@@ -19,7 +19,7 @@ func transformResponseUtil(ctx *core.Context) any {
 		return nil
 	}
 
-	transform := core.ToMapAny(vs.GetProp(target, "transform"))
+	transform := core.ToMapAny(vs.GetProp(point, "transform"))
 	if transform == nil {
 		return nil
 	}

package/project/.sdk/tm/js/src/feature/log/LogFeature.js

@@ -69,8 +69,8 @@ class LogFeature {
   }
 
 
-  PreTarget(ctx) {
-    this.#loghook('PreTarget', ctx)
+  PrePoint(ctx) {
+    this.#loghook('PrePoint', ctx)
   }
 
   PreSpec(ctx) {
@@ -89,11 +89,6 @@ class LogFeature {
     this.#loghook('PreResult', ctx)
   }
  
-  PostOperation(ctx) {
-    this.#loghook('PostOperation', ctx)
-  }
-
-  
   #loghook(hook, ctx, level) {
     level = level || 'info'
     if(this.#logger) {

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

@@ -32,7 +32,7 @@ class Context {
   utility: Utility
 
   op: Operation
-  target: any
+  point: any
 
   config: Record<string, any>
   entopts: Record<string, any>
@@ -75,7 +75,7 @@ class Context {
     this.match = getprop(ctxmap, 'match', {})
     this.reqmatch = getprop(ctxmap, 'reqmatch', {})
 
-    this.target = getprop(ctxmap, 'target', getprop(basectx, 'target'))
+    this.point = getprop(ctxmap, 'point', getprop(basectx, 'point'))
     this.spec = getprop(ctxmap, 'spec', getprop(basectx, 'spec'))
     this.result = getprop(ctxmap, 'result', getprop(basectx, 'result'))
     this.response = getprop(ctxmap, 'response', getprop(basectx, 'response'))
@@ -101,7 +101,7 @@ class Context {
         entity: entname,
         name: opname,
         input,
-        targets: getprop(opcfg, 'targets', [])
+        points: getprop(opcfg, 'points', [])
       })
 
       setprop(this.opmap, opname, op)

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

@@ -1,20 +1,20 @@
 
 import { getprop } from './utility/StructUtility'
 
-import { Target } from './Target'
+import { Point } from './Point'
 
 
 class Operation {
   entity: string
   name: string
   input: string
-  targets: Target[]
+  points: Point[]
 
   constructor(opmap: Record<string, any>) {
     this.entity = getprop(opmap, 'entity', '_')
     this.name = getprop(opmap, 'name', '_')
     this.input = getprop(opmap, 'input', '_')
-    this.targets = getprop(opmap, 'targets', [])
+    this.points = getprop(opmap, 'points', [])
   }
 }
 

package/project/.sdk/tm/ts/src/{Target.ts → Point.ts}

@@ -2,7 +2,7 @@
 import { getprop } from './utility/StructUtility'
 
 
-class Target {
+class Point {
   args: { params: any[] }
   rename: { params: Record<string, string> }
   method: string
@@ -32,5 +32,5 @@ class Target {
 
 
 export {
-  Target,
+  Point,
 }

package/project/.sdk/tm/ts/src/feature/base/BaseFeature.ts

@@ -16,14 +16,17 @@ class BaseFeature implements Feature {
 
   PostConstructEntity(this: any, _ctx: any) { }
 
+
   SetData(this: any, _ctx: any) { }
 
   GetData(this: any, _ctx: any) { }
 
+  SetMatch(this: any, _ctx: any) { }
+
   GetMatch(this: any, _ctx: any) { }
 
 
-  PreTarget(this: any, _ctx: any) { }
+  PrePoint(this: any, _ctx: any) { }
 
   PreSpec(this: any, _ctx: any) { }
 
@@ -33,7 +36,9 @@ class BaseFeature implements Feature {
 
   PreResult(this: any, _ctx: any) { }
 
-  PostOperation(this: any, _ctx: any) { }
+  PreDone(this: any, _ctx: any) { }
+
+  PreUnexpected(this: any, _ctx: any) { }
 
 }
 

package/project/.sdk/tm/ts/src/feature/log/LogFeature.ts

@@ -65,8 +65,8 @@ class LogFeature extends BaseFeature {
   }
 
 
-  PreTarget(this: any, ctx: any) {
-    this._loghook('PreTarget', ctx)
+  PrePoint(this: any, ctx: any) {
+    this._loghook('PrePoint', ctx)
   }
 
   PreSpec(this: any, ctx: any) {
@@ -85,11 +85,6 @@ class LogFeature extends BaseFeature {
     this._loghook('PreResult', ctx)
   }
 
-  PostOperation(this: any, ctx: any) {
-    this._loghook('PostOperation', ctx)
-  }
-
-
   _loghook(this: any, hook: any, ctx: any, level: any) {
     level = level || 'info'
     if (this._logger) {

package/project/.sdk/tm/ts/src/feature/test/TestFeature.ts

@@ -168,12 +168,12 @@ class TestFeature extends BaseFeature {
     const isempty = struct.isempty
 
     const opname = getprop(op, 'name')
-    const target =
+    const point =
       getelem(getpath(ctx.config, [
-        'entity', getprop(ctx.entity, 'name'), 'op', opname, 'targets']), -1)
+        'entity', getprop(ctx.entity, 'name'), 'op', opname, 'points']), -1)
 
     const reqd = transform(
-      select(getpath(target, ['args', 'params']), { reqd: true }),
+      select(getpath(point, ['args', 'params']), { reqd: true }),
       ['`$EACH`', '', '`$KEY.name`']
     )
 

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

@@ -1,7 +1,7 @@
 
-import { ProjectNameSDK } from './ProjectNameSDK'
+import { ProjectNameEntityBase } from './ProjectNameEntityBase'
 
-import { Target } from './Target'
+import { Point } from './Point'
 import { Context } from './Context'
 import { Control } from './Control'
 import { Operation } from './Operation'
@@ -22,29 +22,32 @@ interface Feature {
 
   init: (ctx: Context, options: FeatureOptions) => void | Promise<any>
 
-  PostConstruct: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PostConstructEntity: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  SetData: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  GetData: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  GetMatch: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-
-  PreTarget: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PreSpec: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PreRequest: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PreResponse: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PreResult: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
-  PostOperation: (this: ProjectNameSDK, ctx: Context) => void | Promise<any>
+  PostConstruct: (ctx: Context) => void | Promise<any>
+  PostConstructEntity: (ctx: Context) => void | Promise<any>
+  SetData: (ctx: Context) => void | Promise<any>
+  GetData: (ctx: Context) => void | Promise<any>
+  GetMatch: (ctx: Context) => void | Promise<any>
+
+  PrePoint: (ctx: Context) => void | Promise<any>
+  PreSpec: (ctx: Context) => void | Promise<any>
+  PreRequest: (ctx: Context) => void | Promise<any>
+  PreResponse: (ctx: Context) => void | Promise<any>
+  PreResult: (ctx: Context) => void | Promise<any>
+  PreDone: (ctx: Context) => void | Promise<any>
+  PreUnexpected: (ctx: Context) => void | Promise<any>
+  SetMatch: (ctx: Context) => void | Promise<any>
 }
 
 
 export {
-  Target,
+  Point,
   Context,
   Control,
   Operation,
   Response,
   Result,
   Spec,
+  ProjectNameEntityBase,
 }
 
 

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

@@ -1,10 +1,10 @@
 
-import { Context, Target } from '../types'
+import { Context, Point } from '../types'
 
 
-function makeTarget(ctx: Context): Target | Error {
-  if (ctx.out.target) {
-    return ctx.target = ctx.out.target
+function makePoint(ctx: Context): Point | Error {
+  if (ctx.out.point) {
+    return ctx.point = ctx.out.point
   }
 
   const getprop = ctx.utility.struct.getprop
@@ -12,23 +12,23 @@ function makeTarget(ctx: Context): Target | Error {
   const options = ctx.options
 
   if (!options.allow.op.includes(op.name)) {
-    ctx.error('target_op_allow', 'Operation "' + op.name +
+    return ctx.error('point_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.targets.length) {
-    ctx.target = op.targets[0]
+  // Choose the appropriate point based on the match or data.
+  if (1 === op.points.length) {
+    ctx.point = op.points[0]
   }
   else {
     // Operation argument has priority, but also look in current data or match.
     const reqselector = getprop(ctx, 'req' + op.input)
     const selector = getprop(ctx, op.input)
 
-    let target
-    for (let i = 0; i < op.targets.length; i++) {
-      target = op.targets[i]
-      const select = target.select
+    let point
+    for (let i = 0; i < op.points.length; i++) {
+      point = op.points[i]
+      const select = point.select
       let found = true
 
       if (selector && select.exist) {
@@ -57,20 +57,20 @@ function makeTarget(ctx: Context): Target | Error {
 
     if (
       null != reqselector.$action &&
-      null != target &&
-      reqselector.$action !== target.select.$action
+      null != point &&
+      reqselector.$action !== point.select.$action
     ) {
-      return ctx.error('target_action_invalid', 'Operation "' + op.name +
+      return ctx.error('point_action_invalid', 'Operation "' + op.name +
         '" action "' + reqselector.$action + '" is not valid.')
     }
 
-    ctx.target = target
+    ctx.point = point
   }
 
-  return ctx.target
+  return ctx.point
 }
 
 
 export {
-  makeTarget,
+  makePoint,
 }

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

@@ -8,7 +8,7 @@ function makeSpec(ctx: Context): Spec | Error {
     return ctx.spec = ctx.out.spec
   }
 
-  const target = ctx.target
+  const point = ctx.point
   const options = ctx.options
   const utility = ctx.utility
 
@@ -23,7 +23,7 @@ function makeSpec(ctx: Context): Spec | Error {
   ctx.spec = new Spec({
     base: options.base, // string, URL endpoint base prefix,
     prefix: options.prefix,
-    parts: target.parts,
+    parts: point.parts,
     suffix: options.suffix,
     step: 'start',
   })

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

@@ -9,7 +9,7 @@ import { Context } from '../types'
  * This function returns `undefined` rather than failing.
  */
 function param(ctx: Context, paramdef: any) {
-  const target = ctx.target
+  const point = ctx.point
   const spec = ctx.spec
   const match = ctx.match
   const reqmatch = ctx.reqmatch
@@ -31,7 +31,7 @@ function param(ctx: Context, paramdef: any) {
 
   const key = 0 < (T_string & pt) ? paramdef : getprop(paramdef, 'name')
 
-  let akey = getprop(target.alias, key)
+  let akey = getprop(point.alias, key)
 
   let val = getprop(reqmatch, key)
 

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

@@ -14,7 +14,7 @@ function prepareBody(ctx: Context) {
     try {
       body = transformRequest(ctx)
 
-      // if (target.check.nobody && null == body) {
+      // if (point.check.nobody && null == body) {
       //   return error(ctx, new Error('Request body is empty.'))
       // }
     }

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

@@ -9,9 +9,9 @@ function prepareParams(ctx: Context) {
   // const struct = utility.struct
   // const validate = struct.validate
 
-  const target = ctx.target
+  const point = ctx.point
 
-  let params = target.args.params
+  let params = point.args.params
   // let reqmatch = ctx.reqmatch
 
   params = params || []
@@ -26,7 +26,7 @@ function prepareParams(ctx: Context) {
   }
 
   // TODO: review
-  // out = validate(out, target.validate.params)
+  // out = validate(out, point.validate.params)
 
   return out
 }

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

@@ -4,9 +4,9 @@ import { Context } from '../types'
 
 function preparePath(ctx: Context) {
   const join = ctx.utility.struct.join
-  const target = ctx.target
+  const point = ctx.point
 
-  const path = join(target.parts, '/', true)
+  const path = join(point.parts, '/', true)
 
   return path
 }

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

@@ -7,8 +7,8 @@ function prepareQuery(ctx: Context) {
   const struct = utility.struct
   const items = struct.items
 
-  const target = ctx.target
-  let params = target.params
+  const point = ctx.point
+  let params = point.params
   let reqmatch = ctx.reqmatch
 
   params = params || []

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

@@ -8,7 +8,7 @@ import { Context } from '../types'
 function transformRequest(ctx: Context) {
   const spec = ctx.spec
   const utility = ctx.utility
-  const target = ctx.target
+  const point = ctx.point
   const isfunc = utility.struct.isfunc
   const transform = utility.struct.transform
 
@@ -17,7 +17,7 @@ function transformRequest(ctx: Context) {
   }
 
   try {
-    const reqform = target.transform.req
+    const reqform = point.transform.req
     const reqdata = isfunc(reqform) ? reqform(ctx) : transform({
       reqdata: ctx.reqdata
     }, reqform)

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

@@ -10,7 +10,7 @@ function transformResponse(ctx: Context) {
   const spec = ctx.spec
   const result = ctx.result
   const utility = ctx.utility
-  const target = ctx.target
+  const point = ctx.point
   const isfunc = utility.struct.isfunc
   const transform = utility.struct.transform
 
@@ -23,7 +23,7 @@ function transformResponse(ctx: Context) {
   }
 
   try {
-    const resform = target.transform.res
+    const resform = point.transform.res
     const resdata = isfunc(resform) ? resform(ctx) : transform(ctx.result, resform)
     result.resdata = resdata
     return resdata

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

@@ -13,7 +13,7 @@ import { makeOptions } from './MakeOptionsUtility'
 import { makeRequest } from './MakeRequestUtility'
 import { makeResponse } from './MakeResponseUtility'
 import { makeResult } from './MakeResultUtility'
-import { makeTarget } from './MakeTargetUtility'
+import { makePoint } from './MakePointUtility'
 import { makeSpec } from './MakeSpecUtility'
 import { makeUrl } from './MakeUrlUtility'
 import { param } from './ParamUtility'
@@ -48,7 +48,7 @@ class Utility {
   makeRequest = makeRequest
   makeResponse = makeResponse
   makeResult = makeResult
-  makeTarget = makeTarget
+  makePoint = makePoint
   makeSpec = makeSpec
   makeUrl = makeUrl
   param = param