@voxgig/sdkgen 0.34.7 → 0.34.10

package/bin/voxgig-sdkgen

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.34.7",
+  "version": "0.34.10",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "types": "dist/sdkgen.d.ts",

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

@@ -39,6 +39,7 @@ const Entity = cmp(function Entity(props: any) {
         from: ff + 'Entity.fragment.js',
         replace: {
           ...entrep,
+          entityname: entity.name,
           SdkName: model.const.Name,
           EntityName: entity.Name,
 

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

@@ -40,6 +40,7 @@ const Entity = cmp(function Entity(props: any) {
         from: ff + 'Entity.fragment.ts',
         replace: {
           ...entrep,
+          entityname: entity.name,
           SdkName: model.const.Name,
           EntityName: entity.Name,
 

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

@@ -121,7 +121,7 @@ function directSetup(mockres?: any) {
 
 function generateDirectLoad(model: any, entity: any) {
   const loadOp = entity.op.load
-  const loadPoint = loadOp.points[0]
+  const loadPoint = loadOp?.points?.[0]
 
   if (null == loadPoint) {
     return
@@ -218,7 +218,7 @@ ${paramAsserts}    }
 
 function generateDirectList(model: any, entity: any) {
   const listOp = entity.op.list
-  const listPoint = listOp.points[0]
+  const listPoint = listOp?.points?.[0]
 
   if (null == listPoint) {
     return

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

@@ -37,7 +37,7 @@ import {
 } from './utility_ts'
 
 
-type OpGen = (model: any, entity: any, flow: any, step: any, index: any) => void
+type OpGen = (model: any, entity: any, flow: any, step: any, index: { key$: number, val$: any }) => void
 
 
 const TestEntity = cmp(function TestEntity(props: any) {
@@ -183,17 +183,39 @@ const generateCreate: OpGen = (
   entity: ModelEntity,
   flow: ModelEntityFlow,
   step: ModelEntityFlowStep,
-  index: number
+  index: any
 ) => {
   const ref = step.input.ref ?? entity.name + '_ref01'
   const entvar = step.input.entvar ?? ref + '_ent'
   const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
 
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const needsEnt = !priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'remove'].includes(s.op))
+
+  const hasDatvar = priorSteps.some((s: any) => {
+    if ('create' === s.op) {
+      const priorRef = s.input?.ref ?? entity.name + '_ref01'
+      const priorDatvar = s.input?.datavar ?? (priorRef + '_data' + (s.input?.suffix ?? ''))
+      return priorDatvar === datavar
+    }
+    return false
+  })
+
   Content(`
     // CREATE
-    const ${entvar} = client.${nom(entity, 'Name')}()
-    let ${datavar} = setup.data.new.${entity.name}['${ref}']
 `)
+  if (needsEnt) {
+    Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
+`)
+  }
+  if (hasDatvar) {
+    Content(`    ${datavar} = setup.data.new.${entity.name}['${ref}']
+`)
+  } else {
+    Content(`    let ${datavar} = setup.data.new.${entity.name}['${ref}']
+`)
+  }
 
   each(step.match, (mi: any) => {
     Content(`    ${datavar}['${mi.key$}'] = setup.idmap['${mi.val$}']
@@ -212,16 +234,25 @@ const generateList: OpGen = (
   entity: ModelEntity,
   flow: ModelEntityFlow,
   step: ModelEntityFlowStep,
-  index: number
+  index: any
 ) => {
   const ref = step.input.ref ?? entity.name + '_ref01'
   const entvar = step.input.entvar ?? ref + '_ent'
   const matchvar = step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? ''))
   const listvar = step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? ''))
 
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const needsEnt = !priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'remove'].includes(s.op))
+
   Content(`
     // LIST
-    const ${matchvar}: any = {}
+`)
+  if (needsEnt) {
+    Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
+`)
+  }
+  Content(`    const ${matchvar}: any = {}
 `)
 
   each(step.match, (mi: any) => {
@@ -232,16 +263,21 @@ const generateList: OpGen = (
   Content(`
     const ${listvar} = await ${entvar}.list(${matchvar})
 `)
+  const allSteps = Object.values(flow.step)
   for (let vI = 0; vI < step.valid.length; vI++) {
     const validator = step.valid[vI]
-    if ('ItemExists' === validator.apply) {
+    const validRef = validator.def?.ref
+    const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.op &&
+      ((s.input?.ref ?? entity.name + '_ref01') === validRef))
+
+    if ('ItemExists' === validator.apply && hasRefData) {
       Content(`
-    assert(!isempty(select(${listvar}, { id: ${validator.def.ref}_data.id })))
+    assert(!isempty(select(${listvar}, { id: ${validRef}_data.id })))
 `)
     }
-    else if ('ItemNotExists' === validator.apply) {
+    else if ('ItemNotExists' === validator.apply && hasRefData) {
       Content(`
-    assert(isempty(select(${listvar}, { id: ${validator.def.ref}_data.id })))
+    assert(isempty(select(${listvar}, { id: ${validRef}_data.id })))
 `)
     }
   }
@@ -253,7 +289,7 @@ const generateUpdate: OpGen = (
   entity: ModelEntity,
   flow: ModelEntityFlow,
   step: ModelEntityFlowStep,
-  index: number
+  index: any
 ) => {
   const ref = step.input.ref ?? entity.name + '_ref01'
   const entvar = step.input.entvar ?? ref + '_ent'
@@ -310,7 +346,7 @@ const generateLoad: OpGen = (
   entity: ModelEntity,
   flow: ModelEntityFlow,
   step: ModelEntityFlowStep,
-  index: number
+  index: any
 ) => {
   const ref = step.input.ref ?? entity.name + '_ref01'
   const entvar = step.input.entvar ?? ref + '_ent'
@@ -318,9 +354,19 @@ const generateLoad: OpGen = (
   const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
   const srcdatavar = step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? ''))
 
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const hasEntVar = priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'remove'].includes(s.op))
+
   Content(`
     // LOAD
-    const ${matchvar}: any = {}
+`)
+  if (!hasEntVar) {
+    Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
+    const ${srcdatavar} = Object.values(setup.data.existing.${entity.name})[0] as any
+`)
+  }
+  Content(`    const ${matchvar}: any = {}
     ${matchvar}.id = ${srcdatavar}.id
     const ${datavar} = await ${entvar}.load(${matchvar})
     assert(${datavar}.id === ${srcdatavar}.id)
@@ -333,16 +379,25 @@ const generateRemove: OpGen = (
   entity: ModelEntity,
   flow: ModelEntityFlow,
   step: ModelEntityFlowStep,
-  index: number
+  index: any
 ) => {
   const ref = step.input.ref ?? entity.name + '_ref01'
   const entvar = step.input.entvar ?? ref + '_ent'
   const matchvar = step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? ''))
   const srcdatavar = step.input.srcdatavar ?? (ref + '_data')
 
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const needsEnt = !priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'remove'].includes(s.op))
+
   Content(`
     // REMOVE
-    const ${matchvar}: any = {}
+`)
+  if (needsEnt) {
+    Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
+`)
+  }
+  Content(`    const ${matchvar}: any = {}
     ${matchvar}.id = ${srcdatavar}.id
     await ${entvar}.remove(${matchvar})
   `)

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

@@ -26,6 +26,11 @@ func makePointUtil(ctx *core.Context) (map[string]any, error) {
 				"\" not allowed by SDK option allow.op value: \""+allowOp+"\"")
 	}
 
+	if len(op.Points) == 0 {
+		return nil, ctx.MakeError("point_no_points",
+			"Operation \""+op.Name+"\" has no endpoint definitions.")
+	}
+
 	if len(op.Points) == 1 {
 		ctx.Point = op.Points[0]
 	} else {

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

@@ -16,6 +16,11 @@ function makePoint(ctx: Context): Point | Error {
       '" not allowed by SDK option allow.op value: "' + options.allow.op + '"')
   }
 
+  if (0 === op.points.length) {
+    return ctx.error('point_no_points',
+      'Operation "' + op.name + '" has no endpoint definitions.')
+  }
+
   // Choose the appropriate point based on the match or data.
   if (1 === op.points.length) {
     ctx.point = op.points[0]