@voxgig/sdkgen 0.34.11 → 0.35.0

package/bin/voxgig-sdkgen

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

package/package.json

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

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

@@ -1,6 +1,7 @@
 
 import {
   nom,
+  depluralize,
 } from '@voxgig/apidef'
 
 
@@ -129,13 +130,13 @@ function generateDirectLoad(model: any, entity: any) {
   }
 
   const loadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(loadPoint.parts || [], loadParams)
+  const loadPath = normalizePathParams(loadPoint.parts || [], loadParams, loadPoint.rename?.param)
 
   // Get list info for live mode bootstrapping
   const listOp = entity.op.list
   const listPoint = listOp?.points?.[0]
   const listParams = listPoint?.args?.params || []
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams) : ''
+  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param) : ''
   const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
@@ -226,7 +227,7 @@ function generateDirectList(model: any, entity: any) {
   }
 
   const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(listPoint.parts || [], listParams)
+  const listPath = normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param)
 
   // Build live params
   const liveParams = listParams.map((p: any) => {
@@ -286,15 +287,46 @@ ${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 {
+// When a rename mapping exists (e.g. closureId -> id), path parts contain the
+// renamed form {id} but params still use the original name closure_id.
+// The rename mapping is used to reverse-lookup the original param name.
+function normalizePathParams(
+  parts: string[],
+  params: any[],
+  rename?: Record<string, string>
+): string {
   return parts.map((part: string) => {
-    if (part.startsWith('{') && part.endsWith('}')) {
-      const rawName = part.slice(1, -1)
+    // Replace each {paramName} occurrence within the part.
+    // Handles both simple parts like "{id}" and compound parts like
+    // "{outputFields}.{format}" that contain multiple parameters.
+    return part.replace(/\{([^}]+)\}/g, (match: string, rawName: string) => {
       const snaked = snakify(rawName)
-      const param = params.find((p: any) => p.orig === snaked || p.name === snaked)
+      const depluralized = depluralize(snaked)
+      const param = params.find((p: any) =>
+        p.orig === snaked || p.name === snaked ||
+        p.orig === depluralized || p.name === depluralized
+      )
       if (param) return '{' + param.name + '}'
-    }
-    return part
+
+      // Reverse-lookup through rename mapping: if rawName is a renamed value
+      // (e.g. "id"), find the original camelCase key (e.g. "closureId"),
+      // snakify+depluralize it (e.g. "closure_id"), and match against params.
+      if (rename) {
+        for (const [origCamel, renamedTo] of Object.entries(rename)) {
+          if (renamedTo === rawName) {
+            const origSnaked = snakify(origCamel)
+            const origDepluralized = depluralize(origSnaked)
+            const renamedParam = params.find(
+              (p: any) => p.orig === origSnaked || p.name === origSnaked ||
+                p.orig === origDepluralized || p.name === origDepluralized
+            )
+            if (renamedParam) return '{' + renamedParam.name + '}'
+          }
+        }
+      }
+
+      return match
+    })
   }).join('/')
 }
 

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

@@ -156,6 +156,10 @@ function basicSetup(extra?: any) {
 
 
         Slot({ name: 'basic' }, () => {
+          const flowHasCreate = Object.values(basicflow.step).some(
+            (s: any) => s.op === 'create'
+          )
+
           Content(`
     const setup = basicSetup()
     const client = setup.client
@@ -166,6 +170,15 @@ function basicSetup(extra?: any) {
 
 `)
 
+          // When the flow has no create step, bootstrap the entity data variable
+          // from existing test data so that subsequent update/load/remove steps
+          // can reference it.
+          if (!flowHasCreate) {
+            const ref01 = entity.name + '_ref01'
+            Content(`    let ${ref01}_data = Object.values(setup.data.existing.${entity.name})[0] as any
+`)
+          }
+
           each(basicflow.step, (step: any, index: any) => {
             const opgen: OpGen = GENERATE_OP[step.op]
             opgen(model, entity, basicflow, step, index)
@@ -191,7 +204,7 @@ const generateCreate: OpGen = (
 
   const priorSteps = Object.values(flow.step).slice(0, Number(index))
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
   const hasDatvar = priorSteps.some((s: any) => {
     if ('create' === s.op) {
@@ -243,7 +256,7 @@ const generateList: OpGen = (
 
   const priorSteps = Object.values(flow.step).slice(0, Number(index))
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
   Content(`
     // LIST
@@ -298,9 +311,18 @@ const generateUpdate: OpGen = (
   const markdefvar = step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? ''))
   const srcdatavar = step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? ''))
 
+  const priorSteps = Object.values(flow.step).slice(0, Number(index))
+  const needsEnt = !priorSteps.some((s: any) =>
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+
   Content(`
     // UPDATE
-    const ${datavar}: any = {}
+`)
+  if (needsEnt) {
+    Content(`    const ${entvar} = client.${nom(entity, 'Name')}()
+`)
+  }
+  Content(`    const ${datavar}: any = {}
     ${datavar}.id = ${srcdatavar}.id
 `)
 
@@ -331,7 +353,7 @@ const generateUpdate: OpGen = (
 
   for (let sI = 0; sI < step.spec.length; sI++) {
     const spec = step.spec[sI]
-    if ('TextFieldMark' === spec.apply) {
+    if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
       Content(`
     assert(${resdatavar}[${markdefvar}.name] === ${markdefvar}.value)
 `)
@@ -356,17 +378,21 @@ const generateLoad: OpGen = (
 
   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
-  })
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+
+  // Check if srcdatavar was declared by a prior create step or by the
+  // preamble bootstrap (which runs when the flow has no create step)
+  const flowHasCreate = Object.values(flow.step).some((s: any) => s.op === 'create')
+  const preambleRef = entity.name + '_ref01'
+  const hasSrcData = (!flowHasCreate && srcdatavar === preambleRef + '_data') ||
+    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
@@ -401,7 +427,7 @@ const generateRemove: OpGen = (
 
   const priorSteps = Object.values(flow.step).slice(0, Number(index))
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
   Content(`
     // REMOVE