@voxgig/sdkgen 0.34.0 → 0.34.1

package/bin/voxgig-sdkgen

@@ -8,7 +8,7 @@ const { Gubu, Fault, One } = require('gubu')
 
 const { SdkGen } = require('../dist/sdkgen.js')
 
-const VERSION = '0.34.0'
+const VERSION = '0.34.1'
 const KONSOLE = console
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "types": "dist/sdkgen.d.ts",
@@ -48,7 +48,7 @@
     "typescript": "^6.0.2"
   },
   "peerDependencies": {
-    "@voxgig/apidef": ">=4",
+    "@voxgig/apidef": ">=5",
     "@voxgig/struct": ">=0",
     "@voxgig/util": ">=0",
     "aontu": ">=0",

package/project/.sdk/model/feature/log.jsonic

@@ -15,12 +15,11 @@ main: kit: feature: log: {
     SetMatch: active: true
     GetMatch: active: true
 
-    PreTarget: active: true
+    PrePoint: active: true
     PreSpec: active: true
     PreRequest: active: true
     PreResponse: active: true
     PreResult: active: true
-    PostOperation: active: true
   }
 
 

package/project/.sdk/model/feature/test.jsonic

@@ -19,12 +19,11 @@ main: kit: feature: test: {
     SetMatch: active: true
     GetMatch: active: true
 
-    PreTarget: active: true
+    PrePoint: active: true
     PreSpec: active: true
     PreRequest: active: true
     PreResponse: active: true
     PreResult: active: true
-    PostOperation: active: true
   }
 }
 

package/project/.sdk/src/cmp/go/TestDirect_go.ts

@@ -27,15 +27,15 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const loadOp = entity.op.load
   const listOp = entity.op.list
 
-  // Get load target info
-  const loadTarget = loadOp?.targets?.[0]
-  const loadPath = loadTarget ? (loadTarget.parts || []).join('/') : ''
-  const loadParams = loadTarget?.args?.params || []
+  // Get load point info
+  const loadPoint = loadOp?.points?.[0]
+  const loadPath = loadPoint ? (loadPoint.parts || []).join('/') : ''
+  const loadParams = loadPoint?.args?.params || []
 
-  // Get list target info
-  const listTarget = listOp?.targets?.[0]
-  const listPath = listTarget ? (listTarget.parts || []).join('/') : ''
-  const listParams = listTarget?.args?.params || []
+  // Get list point info
+  const listPoint = listOp?.points?.[0]
+  const listPath = listPoint ? (listPoint.parts || []).join('/') : ''
+  const listParams = listPoint?.args?.params || []
 
   // Build the ENTID env var name for this entity
   const entidEnvVar = `${PROJECTNAME}_TEST_${entity.Name.toUpperCase().replace(/[^A-Z_]/g, '_')}_ENTID`
@@ -58,7 +58,7 @@ func Test${entity.Name}Direct(t *testing.T) {
 `)
 
     // Generate list test first (load needs list results in live mode)
-    if (hasList && listTarget) {
+    if (hasList && listPoint) {
       const listParamStr = listParams.length > 0
         ? listParams.map((p: any, i: number) =>
           `"${p.name}": "direct0${i + 1}"`).join(', ')
@@ -160,7 +160,7 @@ func Test${entity.Name}Direct(t *testing.T) {
     }
 
     // Generate load test - in live mode, first list to get a real entity ID
-    if (hasLoad && loadTarget) {
+    if (hasLoad && loadPoint) {
       const loadParamStr = loadParams.length > 0
         ? loadParams.map((p: any, i: number) =>
           `"${p.name}": "direct0${i + 1}"`).join(', ')

package/project/.sdk/src/cmp/go/fragment/Entity.fragment.go

@@ -98,10 +98,10 @@ func (e *EntityNameEntity) Match(args ...any) any {
 func (e *EntityNameEntity) runOp(ctx *core.Context, postDone func()) (any, error) {
 	utility := e.utility
 
-	// #PreSelection-Hook
+	// #PrePoint-Hook
 
-	target, err := utility.MakeTarget(ctx)
-	ctx.Out["target"] = target
+	point, err := utility.MakePoint(ctx)
+	ctx.Out["point"] = point
 	if err != nil {
 		return utility.MakeError(ctx, err)
 	}

package/project/.sdk/src/cmp/js/EntityOperation_js.ts

@@ -32,7 +32,7 @@ const EntityOperation = cmp(function Operation(props: any) {
       SdkName: model.const.Name,
       EntityName: entity.Name,
       entityname: entity.name,
-      "['TARGETS']": formatJson(entop.targets, { margin: 6 }).trim(),
+      "['POINTS']": formatJson(entop.points, { margin: 6 }).trim(),
       '#Feature-Hook': ({ name, indent }: any) =>
         Content({ indent }, `
 fres = featureHook(ctx, '${name}')

package/project/.sdk/src/cmp/js/TestDirect_js.ts

@@ -121,21 +121,21 @@ function directSetup(mockres) {
 
 function generateDirectLoad(model: any, entity: any) {
   const loadOp = entity.op.load
-  const loadTarget = loadOp.targets[0]
+  const loadPoint = loadOp.points[0]
 
-  if (null == loadTarget) {
+  if (null == loadPoint) {
     return
   }
 
-  const loadPath = (loadTarget.parts || []).join('/')
-  const loadParams = loadTarget.args?.params || []
+  const loadPath = (loadPoint.parts || []).join('/')
+  const loadParams = loadPoint.args?.params || []
 
   // Get list info for live mode bootstrapping
   const listOp = entity.op.list
-  const listTarget = listOp?.targets?.[0]
-  const listPath = listTarget ? (listTarget.parts || []).join('/') : ''
-  const listParams = listTarget?.args?.params || []
-  const hasList = null != listTarget
+  const listPoint = listOp?.points?.[0]
+  const listPath = listPoint ? (listPoint.parts || []).join('/') : ''
+  const listParams = listPoint?.args?.params || []
+  const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
   const ancestorParams = loadParams.filter((p: any) => p.name !== 'id')
@@ -218,14 +218,14 @@ ${paramAsserts}    }
 
 function generateDirectList(model: any, entity: any) {
   const listOp = entity.op.list
-  const listTarget = listOp.targets[0]
+  const listPoint = listOp.points[0]
 
-  if (null == listTarget) {
+  if (null == listPoint) {
     return
   }
 
-  const listPath = (listTarget.parts || []).join('/')
-  const listParams = listTarget.args?.params || []
+  const listPath = (listPoint.parts || []).join('/')
+  const listParams = listPoint.args?.params || []
 
   // Build live params
   const liveParams = listParams.map((p: any) => {

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

@@ -16,7 +16,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -34,11 +34,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)
       }
 
 

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

@@ -17,7 +17,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -35,11 +35,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)
       }
 
 

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

@@ -17,7 +17,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -35,11 +35,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)
       }
 
 

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

@@ -17,7 +17,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -36,11 +36,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)
       }
 
 
@@ -91,7 +91,7 @@ class EntityOperation {
       return done(ctx)
     }
     catch (err) {
-      // #PreSelection-Hook
+      // #PreUnexpected-Hook
 
       err = this.#unexpected(ctx, err)
 

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

@@ -17,7 +17,7 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      makeTarget,
+      makePoint,
       makeRequest,
       makeResponse,
       makeResult,
@@ -36,11 +36,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/EntityBase_ts.ts

@@ -0,0 +1,38 @@
+
+import * as Path from 'node:path'
+
+import {
+  cmp,
+  File, Folder, Fragment,
+} from '@voxgig/sdkgen'
+
+
+
+const EntityBase = cmp(async function EntityBase(props: any) {
+
+  // Needs type: target object
+  const { target } = props
+  const { model } = props.ctx$
+
+  Folder({ name: 'src' }, () => {
+
+    File({ name: model.const.Name + 'Base.' + target.name }, () => {
+
+      Fragment(
+        {
+          from:
+            Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/EntityBase.fragment.ts'),
+
+          replace: {
+            ...props.ctx$.stdrep,
+          }
+        })
+    })
+
+  })
+})
+
+
+export {
+  EntityBase
+}

package/project/.sdk/src/cmp/ts/EntityOperation_ts.ts

@@ -32,7 +32,7 @@ const EntityOperation = cmp(function Operation(props: any) {
       SdkName: model.const.Name,
       EntityName: entity.Name,
       entityname: entity.name,
-      "['TARGETS']": formatJson(entop.targets, { margin: 6 }).trim(),
+      "['POINTS']": formatJson(entop.points, { margin: 6 }).trim(),
       '#Feature-Hook': ({ name, indent }: any) =>
         Content({ indent }, `
 fres = featureHook(ctx, '${name}')

package/project/.sdk/src/cmp/ts/Main_ts.ts

@@ -21,6 +21,7 @@ import {
 import { Package } from './Package_ts'
 import { Config } from './Config_ts'
 import { MainEntity } from './MainEntity_ts'
+import { EntityBase } from './EntityBase_ts'
 import { SdkError } from './SdkError_ts'
 
 
@@ -87,6 +88,7 @@ if (fres instanceof Promise) { await fres }
     })
 
     Config({ target })
+    EntityBase({ target })
 
   })
 })

package/project/.sdk/src/cmp/ts/TestDirect_ts.ts

@@ -121,21 +121,21 @@ function directSetup(mockres?: any) {
 
 function generateDirectLoad(model: any, entity: any) {
   const loadOp = entity.op.load
-  const loadTarget = loadOp.targets[0]
+  const loadPoint = loadOp.points[0]
 
-  if (null == loadTarget) {
+  if (null == loadPoint) {
     return
   }
 
-  const loadPath = (loadTarget.parts || []).join('/')
-  const loadParams = loadTarget.args?.params || []
+  const loadPath = (loadPoint.parts || []).join('/')
+  const loadParams = loadPoint.args?.params || []
 
   // Get list info for live mode bootstrapping
   const listOp = entity.op.list
-  const listTarget = listOp?.targets?.[0]
-  const listPath = listTarget ? (listTarget.parts || []).join('/') : ''
-  const listParams = listTarget?.args?.params || []
-  const hasList = null != listTarget
+  const listPoint = listOp?.points?.[0]
+  const listPath = listPoint ? (listPoint.parts || []).join('/') : ''
+  const listParams = listPoint?.args?.params || []
+  const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
   const ancestorParams = loadParams.filter((p: any) => p.name !== 'id')
@@ -218,14 +218,14 @@ ${paramAsserts}    }
 
 function generateDirectList(model: any, entity: any) {
   const listOp = entity.op.list
-  const listTarget = listOp.targets[0]
+  const listPoint = listOp.points[0]
 
-  if (null == listTarget) {
+  if (null == listPoint) {
     return
   }
 
-  const listPath = (listTarget.parts || []).join('/')
-  const listParams = listTarget.args?.params || []
+  const listPath = (listPoint.parts || []).join('/')
+  const listParams = listPoint.args?.params || []
 
   // Build live params
   const liveParams = listParams.map((p: any) => {

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

@@ -2,13 +2,10 @@
 import { inspect } from 'node:util'
 
 import {
-  SdkNameSDK,
-  SdkNameEntity,
-} from '../SdkNameSDK'
+  ProjectNameSDK,
+  ProjectNameEntityBase,
+} from '../ProjectNameSDK'
 
-import {
-  Utility
-} from '../utility/Utility'
 
 import type {
   Operation,
@@ -18,95 +15,15 @@ import type {
 
 
 // TODO: needs Entity superclass
-class EntityNameEntity {
-  name = 'entityname'
-
-  #client: SdkNameSDK
-  #utility: Utility
-  #entopts: any
-  #data: any
-  #match: any
-
-  _entctx: Context
-
-  constructor(client: SdkNameSDK, entopts: any) {
-    // super()
-    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
+class EntityNameEntity extends ProjectNameEntityBase {
 
-    this._entctx = makeContext({
-      entity: this,
-      entopts,
-    }, client._rootctx)
-
-    const featureHook = this.#utility.featureHook
-    featureHook(this._entctx, 'PostConstructEntity')
+  constructor(client: ProjectNameSDK, entopts: any) {
+    super(client, entopts)
   }
 
-  entopts() {
-    return { ...this.#entopts }
-  }
 
-  client() {
-    return this.#client
-  }
-
-  make() {
-    return new EntityNameEntity(this.#client, this.entopts())
-  }
-
-
-  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: 'EntityName' }])
-  }
-
-  toString() {
-    return 'EntityName ' + this.#utility.struct.jsonify(this.#data)
-  }
-
-  [inspect.custom]() {
-    return this.toString()
+  make(this: EntityNameEntity) {
+    return new EntityNameEntity(this._client, this.entopts())
   }
 
 
@@ -120,54 +37,6 @@ class EntityNameEntity {
 
   // #RemoveOp
 
-
-  #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
-  }
-
 }