@voxgig/sdkgen 0.34.0 → 0.34.1

package/project/.sdk/src/cmp/ts/fragment/EntityBase.fragment.ts

@@ -0,0 +1,161 @@
+
+import { inspect } from 'node:util'
+
+import {
+  SdkNameSDK,
+} from '../SdkNameSDK'
+
+import {
+  Utility
+} from '../utility/Utility'
+
+import type {
+  Context,
+} from '../types'
+
+
+// TODO: needs Entity superclass
+class ProjectNameEntityBase {
+  name = ''
+  name_ = ''
+  Name = ''
+
+  _client: SdkNameSDK
+  _utility: Utility
+  _entopts: any
+  _data: any
+  _match: any
+  _entctx: Context
+
+
+  constructor(client: SdkNameSDK, entopts: any) {
+    entopts = entopts || {}
+    entopts.active = false !== entopts.active
+
+    this._client = client
+    this._entopts = entopts
+    this._utility = client.utility()
+    this._data = {}
+    this._match = {}
+
+    const makeContext = this._utility.makeContext
+
+    this._entctx = makeContext({
+      entity: this,
+      entopts,
+    }, client._rootctx)
+
+    const featureHook = this._utility.featureHook
+    featureHook(this._entctx, 'PostConstructEntity')
+  }
+
+  entopts() {
+    return this._utility.merge({}, this._entopts, 1)
+  }
+
+  client() {
+    return this._client
+  }
+
+
+  data(this: any, data?: any) {
+    const struct = this._utility.struct
+    const featureHook = this._utility.featureHook
+
+    if (null != data) {
+      this._data = struct.clone(data)
+      featureHook(this._entctx, 'SetData')
+    }
+
+    featureHook(this._entctx, 'GetData')
+    let out = struct.clone(this._data)
+
+    return out
+  }
+
+
+  match(match?: any) {
+    const struct = this._utility.struct
+    const featureHook = this._utility.featureHook
+
+    if (null != match) {
+      this._match = struct.clone(match)
+      featureHook(this._entctx, 'SetMatch')
+    }
+
+    featureHook(this._entctx, 'GetMatch')
+    let out = struct.clone(this._match)
+
+    return out
+  }
+
+
+  toJSON() {
+    const struct = this._utility.struct
+    return struct.merge([{}, struct.getdef(this._data, {}), { entity$: this.Name }])
+  }
+
+
+  toString() {
+    return this.Name + ' ' + this._utility.struct.jsonify(this._data)
+  }
+
+
+  [inspect.custom]() {
+    return this.toString()
+  }
+
+
+  _unexpected(this: any, ctx: Context, err: any) {
+    const clean = this._utility.clean
+    const struct = this._utility.struct
+
+    const delprop = struct.delprop
+    const clone = struct.clone
+    const merge = struct.merge
+
+    const ctrl = ctx.ctrl
+
+    ctrl.err = err
+
+    if (ctrl.explain) {
+      ctx.ctrl.explain = clean(ctx, ctx.ctrl.explain)
+      delprop(ctx.ctrl.explain.result, 'err')
+
+      if (null != ctx.result && null != ctx.result.err) {
+        ctrl.explain.err = clean(ctx, merge([
+          clone({ err: ctx.result.err }).err,
+          {
+            message: ctx.result.err.message,
+            stack: ctx.result.err.stack,
+          }]))
+      }
+
+      const cleanerr = clean(ctx, merge([
+        clone({ err }).err,
+        {
+          message: err.message,
+          stack: err.stack,
+        }]))
+
+      if (null == ctrl.explain.err) {
+        ctrl.explain.err = cleanerr
+      }
+      else if (ctrl.explain.err.message != cleanerr.message) {
+        ctrl.explain.unexpected = cleanerr
+      }
+    }
+
+    if (false === ctrl.throw) {
+      return undefined
+    }
+
+    return err
+  }
+
+}
+
+
+export {
+  ProjectNameEntityBase
+}

package/project/.sdk/src/cmp/ts/fragment/EntityCreateOp.fragment.ts

@@ -18,7 +18,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -36,11 +36,11 @@ class EntityOperation {
     }, this._entctx)
 
     try {
-      // #PreSelection-Hook    
+      // #PrePoint-Hook
 
-      ctx.out.target = makeTarget(ctx)
-      if (ctx.out.target instanceof Error) {
-        return error(ctx, ctx.out.target)
+      ctx.out.point = makePoint(ctx)
+      if (ctx.out.point instanceof Error) {
+        return error(ctx, ctx.out.point)
       }
 
 
@@ -89,7 +89,7 @@ class EntityOperation {
     catch (err: any) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -103,5 +103,5 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
+  _unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
 }

package/project/.sdk/src/cmp/ts/fragment/EntityListOp.fragment.ts

@@ -19,7 +19,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -37,11 +37,11 @@ class EntityOperation {
     }, this._entctx)
 
     try {
-      // #PreSelection-Hook    
+      // #PrePoint-Hook
 
-      ctx.out.target = makeTarget(ctx)
-      if (ctx.out.target instanceof Error) {
-        return error(ctx, ctx.out.target)
+      ctx.out.point = makePoint(ctx)
+      if (ctx.out.point instanceof Error) {
+        return error(ctx, ctx.out.point)
       }
 
 
@@ -90,7 +90,7 @@ class EntityOperation {
     catch (err: any) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -104,7 +104,7 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(this: any, _ctx: Context, _ctrl: any, err: any): any { return err }
+  _unexpected(this: any, _ctx: Context, _ctrl: any, err: any): any { return err }
 
 }
 

package/project/.sdk/src/cmp/ts/fragment/EntityLoadOp.fragment.ts

@@ -19,7 +19,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -37,11 +37,11 @@ class EntityOperation {
     }, this._entctx)
 
     try {
-      // #PreSelection-Hook    
+      // #PrePoint-Hook
 
-      ctx.out.target = makeTarget(ctx)
-      if (ctx.out.target instanceof Error) {
-        return error(ctx, ctx.out.target)
+      ctx.out.point = makePoint(ctx)
+      if (ctx.out.point instanceof Error) {
+        return error(ctx, ctx.out.point)
       }
 
 
@@ -94,7 +94,7 @@ class EntityOperation {
     catch (err: any) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -108,6 +108,6 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
+  _unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
 }
 

package/project/.sdk/src/cmp/ts/fragment/EntityRemoveOp.fragment.ts

@@ -19,7 +19,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -38,11 +38,11 @@ class EntityOperation {
 
     try {
 
-      // #PreTarget-Hook    
+      // #PrePoint-Hook
 
-      ctx.out.target = makeTarget(ctx)
-      if (ctx.out.target instanceof Error) {
-        return error(ctx, ctx.out.target)
+      ctx.out.point = makePoint(ctx)
+      if (ctx.out.point instanceof Error) {
+        return error(ctx, ctx.out.point)
       }
 
 
@@ -93,9 +93,9 @@ class EntityOperation {
       return done(ctx)
     }
     catch (err: any) {
-      // #PreSelection-Hook
+      // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -109,7 +109,7 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
+  _unexpected(this: any, ctx: Context, ctrl: any, err: any): any { return err }
 
 }
 

package/project/.sdk/src/cmp/ts/fragment/EntityUpdateOp.fragment.ts

@@ -19,7 +19,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -38,11 +38,11 @@ class EntityOperation {
 
     try {
 
-      // #PreSelection-Hook    
+      // #PrePoint-Hook
 
-      ctx.out.target = makeTarget(ctx)
-      if (ctx.out.target instanceof Error) {
-        return error(ctx, ctx.out.target)
+      ctx.out.point = makePoint(ctx)
+      if (ctx.out.point instanceof Error) {
+        return error(ctx, ctx.out.point)
       }
 
 

package/project/.sdk/src/cmp/ts/fragment/Main.fragment.ts

@@ -4,6 +4,7 @@ import { inspect } from 'node:util'
 import type { Context, Feature } from './types'
 
 import { config } from './Config'
+import { ProjectNameEntityBase } from './ProjectNameEntityBase'
 import { Utility } from './utility/Utility'
 
 
@@ -230,7 +231,7 @@ export {
   stdutil,
 
   BaseFeature,
-  ProjectNameEntity,
+  ProjectNameEntityBase,
 
   ProjectNameSDK,
   SDK,

package/project/.sdk/tm/go/core/context.go

@@ -15,7 +15,7 @@ type Context struct {
 	Client   *ProjectNameSDK
 	Utility  *Utility
 	Op       *Operation
-	Target   map[string]any
+	Point    map[string]any
 	Config   map[string]any
 	Entopts  map[string]any
 	Options  map[string]any
@@ -169,14 +169,14 @@ func NewContext(ctxmap map[string]any, basectx *Context) *Context {
 		ctx.Reqmatch = map[string]any{}
 	}
 
-	// Target
-	if t := getCtxProp(ctxmap, "target"); t != nil {
+	// Point
+	if t := getCtxProp(ctxmap, "point"); t != nil {
 		if tm, ok := t.(map[string]any); ok {
-			ctx.Target = tm
+			ctx.Point = tm
 		}
 	}
-	if ctx.Target == nil && basectx != nil {
-		ctx.Target = basectx.Target
+	if ctx.Point == nil && basectx != nil {
+		ctx.Point = basectx.Point
 	}
 
 	// Spec
@@ -240,7 +240,7 @@ func (ctx *Context) resolveOp(opname string) *Operation {
 	var targets []any
 	if opcfg != nil {
 		if ocm, ok := opcfg.(map[string]any); ok {
-			if t := vs.GetProp(ocm, "targets"); t != nil {
+			if t := vs.GetProp(ocm, "points"); t != nil {
 				if tl, ok := t.([]any); ok {
 					targets = tl
 				}
@@ -255,7 +255,7 @@ func (ctx *Context) resolveOp(opname string) *Operation {
 		"entity":  entname,
 		"name":    opname,
 		"input":   input,
-		"targets": targets,
+		"points": targets,
 	})
 
 	ctx.Opmap[opname] = op

package/project/.sdk/tm/go/core/operation.go

@@ -8,7 +8,7 @@ type Operation struct {
 	Entity  string
 	Name    string
 	Input   string
-	Targets []map[string]any
+	Points []map[string]any
 	Alias   map[string]any
 }
 
@@ -27,15 +27,15 @@ func NewOperation(opmap map[string]any) *Operation {
 	}
 
 	var targets []map[string]any
-	rawTargets := vs.GetProp(opmap, "targets")
-	if rawTargets != nil {
-		if tlist, ok := rawTargets.([]any); ok {
+	rawPoints := vs.GetProp(opmap, "points")
+	if rawPoints != nil {
+		if tlist, ok := rawPoints.([]any); ok {
 			for _, t := range tlist {
 				if tm, ok := t.(map[string]any); ok {
 					targets = append(targets, tm)
 				}
 			}
-		} else if tlist, ok := rawTargets.([]map[string]any); ok {
+		} else if tlist, ok := rawPoints.([]map[string]any); ok {
 			targets = tlist
 		}
 	}
@@ -55,7 +55,7 @@ func NewOperation(opmap map[string]any) *Operation {
 		Entity:  entity,
 		Name:    name,
 		Input:   input,
-		Targets: targets,
+		Points: targets,
 		Alias:   alias,
 	}
 }

package/project/.sdk/tm/go/core/target.go

@@ -4,7 +4,7 @@ import (
 	vs "github.com/voxgig/struct"
 )
 
-type Target struct {
+type Point struct {
 	Args      map[string]any
 	Rename    map[string]any
 	Method    string
@@ -18,8 +18,8 @@ type Target struct {
 	Transform map[string]any
 }
 
-func NewTarget(altmap map[string]any) *Target {
-	t := &Target{}
+func NewPoint(altmap map[string]any) *Point {
+	t := &Point{}
 
 	if args := vs.GetProp(altmap, "args"); args != nil {
 		if am, ok := args.(map[string]any); ok {

package/project/.sdk/tm/go/core/types.go

@@ -13,15 +13,13 @@ type Feature interface {
 	GetData(ctx *Context)
 	GetMatch(ctx *Context)
 
-	PreTarget(ctx *Context)
-	PreSelection(ctx *Context)
+	PrePoint(ctx *Context)
 	PreSpec(ctx *Context)
 	PreRequest(ctx *Context)
 	PreResponse(ctx *Context)
 	PreResult(ctx *Context)
 	PreDone(ctx *Context)
 	PreUnexpected(ctx *Context)
-	PostOperation(ctx *Context)
 	SetMatch(ctx *Context)
 }
 

package/project/.sdk/tm/go/core/utility_type.go

@@ -14,7 +14,7 @@ type Utility struct {
 	MakeRequest       func(ctx *Context) (*Response, error)
 	MakeResponse      func(ctx *Context) (*Response, error)
 	MakeResult        func(ctx *Context) (*Result, error)
-	MakeTarget        func(ctx *Context) (map[string]any, error)
+	MakePoint         func(ctx *Context) (map[string]any, error)
 	MakeSpec          func(ctx *Context) (*Spec, error)
 	MakeUrl           func(ctx *Context) (string, error)
 	Param             func(ctx *Context, paramdef any) any

package/project/.sdk/tm/go/feature/base_feature.go

@@ -29,12 +29,10 @@ func (f *BaseFeature) SetData(ctx *core.Context)                       {}
 func (f *BaseFeature) GetData(ctx *core.Context)                       {}
 func (f *BaseFeature) GetMatch(ctx *core.Context)                      {}
 func (f *BaseFeature) SetMatch(ctx *core.Context)                      {}
-func (f *BaseFeature) PreTarget(ctx *core.Context)                     {}
-func (f *BaseFeature) PreSelection(ctx *core.Context)                  {}
+func (f *BaseFeature) PrePoint(ctx *core.Context)                      {}
 func (f *BaseFeature) PreSpec(ctx *core.Context)                       {}
 func (f *BaseFeature) PreRequest(ctx *core.Context)                    {}
 func (f *BaseFeature) PreResponse(ctx *core.Context)                   {}
 func (f *BaseFeature) PreResult(ctx *core.Context)                     {}
 func (f *BaseFeature) PreDone(ctx *core.Context)                       {}
 func (f *BaseFeature) PreUnexpected(ctx *core.Context)                 {}
-func (f *BaseFeature) PostOperation(ctx *core.Context)                 {}

package/project/.sdk/tm/go/feature/test_feature.go

@@ -151,12 +151,12 @@ func (f *TestFeature) Init(ctx *core.Context, options map[string]any) {
 func (f *TestFeature) buildArgs(ctx *core.Context, op *core.Operation, args map[string]any) any {
 	opname := op.Name
 
-	// Get last target from config.
-	targets := vs.GetPath([]any{"entity", ctx.Entity.GetName(), "op", opname, "targets"}, ctx.Config)
-	target := vs.GetElem(targets, -1)
+	// Get last point from config.
+	points := vs.GetPath([]any{"entity", ctx.Entity.GetName(), "op", opname, "points"}, ctx.Config)
+	point := vs.GetElem(points, -1)
 
 	// Get required params.
-	paramsPath := vs.GetPath([]any{"args", "params"}, target)
+	paramsPath := vs.GetPath([]any{"args", "params"}, point)
 	reqdParams := vs.Select(paramsPath, map[string]any{"reqd": true})
 	reqd := vs.Transform(reqdParams, []any{"`$EACH`", "", "`$KEY.name`"})
 

package/project/.sdk/tm/go/test/primary_utility_test.go

@@ -59,8 +59,8 @@ func TestPrimaryUtility(t *testing.T) {
 		if utility.MakeResult == nil {
 			t.Error("MakeResult should not be nil")
 		}
-		if utility.MakeTarget == nil {
-			t.Error("MakeTarget should not be nil")
+		if utility.MakePoint == nil {
+			t.Error("MakePoint should not be nil")
 		}
 		if utility.MakeSpec == nil {
 			t.Error("MakeSpec should not be nil")
@@ -550,9 +550,9 @@ func TestPrimaryUtility(t *testing.T) {
 		})
 	})
 
-	t.Run("makeTarget-basic", func(t *testing.T) {
+	t.Run("makePoint-basic", func(t *testing.T) {
 		ctx := makeTestCtx(client, utility, nil)
-		target := map[string]any{
+		point := map[string]any{
 			"parts":     []any{"items", "{id}"},
 			"args":      map[string]any{"params": []any{}},
 			"params":    []any{},
@@ -561,15 +561,15 @@ func TestPrimaryUtility(t *testing.T) {
 			"active":    true,
 			"transform": map[string]any{},
 		}
-		ctx.Op.Targets = []map[string]any{target}
+		ctx.Op.Points = []map[string]any{point}
 
-		_, err := utility.MakeTarget(ctx)
+		_, err := utility.MakePoint(ctx)
 		if err != nil {
 			t.Errorf("expected no error, got: %v", err)
 			return
 		}
-		if ctx.Target == nil {
-			t.Error("expected target to be set")
+		if ctx.Point == nil {
+			t.Error("expected point to be set")
 		}
 	})
 
@@ -592,7 +592,7 @@ func TestPrimaryUtility(t *testing.T) {
 				"entity":  op.Entity,
 				"name":    op.Name,
 				"input":   op.Input,
-				"targets": op.Targets,
+				"points": op.Points,
 			}, nil
 		})
 	})
@@ -704,7 +704,7 @@ func TestPrimaryUtility(t *testing.T) {
 
 	t.Run("preparePath-basic", func(t *testing.T) {
 		ctx := makeTestFullCtx(client, utility)
-		ctx.Target = map[string]any{
+		ctx.Point = map[string]any{
 			"parts": []any{"api", "planet", "{id}"},
 			"args":  map[string]any{"params": []any{}},
 		}
@@ -717,7 +717,7 @@ func TestPrimaryUtility(t *testing.T) {
 
 	t.Run("preparePath-single", func(t *testing.T) {
 		ctx := makeTestFullCtx(client, utility)
-		ctx.Target = map[string]any{
+		ctx.Point = map[string]any{
 			"parts": []any{"items"},
 			"args":  map[string]any{"params": []any{}},
 		}
@@ -878,10 +878,10 @@ func makeTestCtx(client *sdk.ProjectNameSDK, utility *sdk.Utility, overrides map
 	return utility.MakeContext(ctxmap, client.GetRootCtx())
 }
 
-// Helper: create full test context with target and match
+// Helper: create full test context with point and match
 func makeTestFullCtx(client *sdk.ProjectNameSDK, utility *sdk.Utility) *sdk.Context {
 	ctx := makeTestCtx(client, utility, nil)
-	ctx.Target = map[string]any{
+	ctx.Point = map[string]any{
 		"parts":     []any{"items", "{id}"},
 		"args":      map[string]any{"params": []any{map[string]any{"name": "id", "reqd": true}}},
 		"params":    []any{"id"},

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

@@ -16,7 +16,7 @@ func makeSpecUtil(ctx *core.Context) (*core.Spec, error) {
 		}
 	}
 
-	target := ctx.Target
+	point := ctx.Point
 	options := ctx.Options
 	utility := ctx.Utility
 
@@ -25,7 +25,7 @@ func makeSpecUtil(ctx *core.Context) (*core.Spec, error) {
 	suffix, _ := vs.GetProp(options, "suffix").(string)
 
 	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
 		}