@voxgig/sdkgen 0.34.10 → 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.10'
+const VERSION = '0.34.11'
 const KONSOLE = console
 
 

package/package.json

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

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

@@ -11,6 +11,7 @@ import {
   Fragment,
   Slot,
   cmp,
+  snakify,
 } from '@voxgig/sdkgen'
 
 
@@ -127,14 +128,14 @@ function generateDirectLoad(model: any, entity: any) {
     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
@@ -224,8 +225,8 @@ function generateDirectList(model: any, entity: any) {
     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) =>
@@ -358,12 +358,25 @@ const generateLoad: OpGen = (
   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 (!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 = {}