@voxgig/sdkgen 0.34.8 → 0.34.11

package/bin/voxgig-sdkgen

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.34.8",
+  "version": "0.34.11",
   "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

@@ -11,6 +11,7 @@ import {
   Fragment,
   Slot,
   cmp,
+  snakify,
 } from '@voxgig/sdkgen'
 
 
@@ -121,20 +122,20 @@ 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
   }
 
-  const loadPath = (loadPoint.parts || []).join('/')
   const loadParams = loadPoint.args?.params || []
+  const loadPath = normalizePathParams(loadPoint.parts || [], loadParams)
 
   // Get list info for live mode bootstrapping
   const listOp = entity.op.list
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? (listPoint.parts || []).join('/') : ''
   const listParams = listPoint?.args?.params || []
+  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams) : ''
   const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
@@ -218,14 +219,14 @@ ${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
   }
 
-  const listPath = (listPoint.parts || []).join('/')
   const listParams = listPoint.args?.params || []
+  const listPath = normalizePathParams(listPoint.parts || [], listParams)
 
   // Build live params
   const liveParams = listParams.map((p: any) => {
@@ -283,6 +284,21 @@ ${paramAsserts}    }
 }
 
 
+// Replace raw OpenAPI parameter names in path parts with model parameter names.
+// Path parts may have e.g. {subBreed} while model params use sub_breed.
+function normalizePathParams(parts: string[], params: any[]): string {
+  return parts.map((part: string) => {
+    if (part.startsWith('{') && part.endsWith('}')) {
+      const rawName = part.slice(1, -1)
+      const snaked = snakify(rawName)
+      const param = params.find((p: any) => p.orig === snaked || p.name === snaked)
+      if (param) return '{' + param.name + '}'
+    }
+    return part
+  }).join('/')
+}
+
+
 export {
   TestDirect
 }

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

@@ -78,9 +78,9 @@ const TestEntity = cmp(function TestEntity(props: any) {
         const indent = 2
 
         const idlist = flatten([
-          '${entity.name}01',
-          '${entity.name}02',
-          '${entity.name}03',
+          entity.name + '01',
+          entity.name + '02',
+          entity.name + '03',
           flatten(items(entity.relations.ancestors, (ap: any) =>
             items(ap[1], (a: any) =>
               items(['01', '02', '03'], (n: any) =>
@@ -189,11 +189,33 @@ const generateCreate: OpGen = (
   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$}']
@@ -219,8 +241,9 @@ const generateList: OpGen = (
   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, index.key$)
-  const needsEnt = !priorSteps.some((s: any) => 'create' === s.op)
+  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
@@ -331,15 +354,29 @@ 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, index.key$)
-  const hasCreate = priorSteps.some((s: any) => 'create' === s.op)
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const hasEntVar = priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'remove'].includes(s.op))
+
+  // Check if srcdatavar was declared by a prior create step
+  const hasSrcData = 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 === srcdatavar
+    }
+    return false
+  })
 
   Content(`
     // LOAD
 `)
-  if (!hasCreate) {
+  if (!hasEntVar) {
     Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
-    const ${srcdatavar} = Object.values(setup.data.existing.${entity.name})[0] as any
+`)
+  }
+  if (!hasSrcData) {
+    Content(`    const ${srcdatavar} = Object.values(setup.data.existing.${entity.name})[0] as any
 `)
   }
   Content(`    const ${matchvar}: any = {}
@@ -362,8 +399,9 @@ const generateRemove: OpGen = (
   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, index.key$)
-  const needsEnt = !priorSteps.some((s: any) => 'create' === s.op)
+  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

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]