@voxgig/sdkgen 0.44.0 → 1.0.1

package/project/.sdk/src/cmp/lua/TestDirect_lua.ts

@@ -1,5 +1,8 @@
 
 import {
+  Model,
+  ModelEntity,
+  nom,
   depluralize,
 } from '@voxgig/apidef'
 
@@ -8,6 +11,7 @@ import {
   File,
   cmp,
   snakify,
+  isAuthActive,
 } from '@voxgig/sdkgen'
 
 
@@ -51,12 +55,20 @@ function normalizePathParams(
 
 const TestDirect = cmp(function TestDirect(props: any) {
   const ctx$ = props.ctx$
-  const model = ctx$.model
+  const model: Model = ctx$.model
 
   const target = props.target
-  const entity = props.entity
+  const entity: ModelEntity = props.entity
 
-  const PROJECTNAME = model.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
+  const PROJECTNAME = nom(model, 'Name').toUpperCase().replace(/[^A-Z_]/g, '_')
+
+  const authActive = isAuthActive(model)
+  const apikeyEnvEntry = authActive
+    ? `\n    ["${PROJECTNAME}_APIKEY"] = "NONE",`
+    : ''
+  const apikeyLiveField = authActive
+    ? `\n      apikey = env["${PROJECTNAME}_APIKEY"],`
+    : ''
 
   const opnames = Object.keys(entity.op)
   const hasLoad = opnames.includes('load')
@@ -71,13 +83,49 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
-  const loadParams = loadPoint?.args?.params || []
+  const allLoadParams = loadPoint?.args?.params || []
+  // Some upstream OpenAPI specs declare a parameter as `in: path` even when
+  // that path has no `{name}` placeholder for it. Only path params that
+  // actually appear in the URL template should drive direct-test path-param
+  // setup and URL-substitution asserts; otherwise the SDK silently drops
+  // them and the URL-includes assert fails.
+  const _pathPlaceholders = new Set<string>()
+  for (const part of (loadPoint?.parts || [])) {
+    if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
+      _pathPlaceholders.add(part.slice(1, -1))
+    }
+  }
+  const _renameMap = (loadPoint?.rename?.param || {}) as Record<string, string>
+  const _renamedPlaceholders = new Set<string>()
+  for (const ph of _pathPlaceholders) {
+    _renamedPlaceholders.add(ph)
+    for (const [orig, renamed] of Object.entries(_renameMap)) {
+      if (renamed === ph) _renamedPlaceholders.add(orig)
+    }
+  }
+  const loadParams = allLoadParams.filter((p: any) =>
+    _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
   const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
-  const entidEnvVar = `${PROJECTNAME}_TEST_${entity.Name.toUpperCase().replace(/[^A-Z_]/g, '_')}_ENTID`
+  // Required query params with spec-provided examples — needed in live mode.
+  const loadQuery = loadPoint?.args?.query || []
+  const loadLiveQueryEntries = loadQuery
+    .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
+  const loadLiveQueryLines = loadLiveQueryEntries
+    .map((q: any) => `      query["${q.name}"] = ${JSON.stringify(q.example)}`)
+    .join('\n')
+
+  const loadAllHaveExamples =
+    loadParams.length > 0 &&
+    loadParams.every((p: any) => undefined !== p.example && null !== p.example)
+  const loadExampleLines = loadAllHaveExamples
+    ? loadParams.map((p: any) => `      params["${p.name}"] = ${JSON.stringify(p.example)}`).join('\n')
+    : ''
+
+  const entidEnvVar = `${PROJECTNAME}_TEST_${nom(entity, 'NAME').replace(/[^A-Z_]/g, '_')}_ENTID`
 
   File({ name: entity.name + '_direct_test.' + target.ext }, () => {
 
@@ -93,12 +141,33 @@ describe("${entity.Name}Direct", function()
 `)
 
     if (hasList && listPoint) {
+      const listLiveIdKeys: string[] = listParams.map((lp: any) => {
+        return lp.name === 'id'
+          ? entity.name + '01'
+          : lp.name.replace(/_id$/, '') + '01'
+      })
+      const listSkipBlock = listLiveIdKeys.length > 0
+        ? `    if setup.live then
+      for _, _live_key in ipairs({${listLiveIdKeys.map(k => `"${k}"`).join(', ')}}) do
+        if setup.idmap[_live_key] == nil then
+          pending("live test needs " .. _live_key .. " via *_ENTID env var (synthetic IDs only)")
+          return
+        end
+      end
+    end
+`
+        : ''
       Content(`  it("should direct-list-${entity.name}", function()
     local setup = ${entity.name}_direct_setup({
       { id = "direct01" },
       { id = "direct02" },
     })
-    local client = setup.client
+    local _should_skip, _reason = runner.is_control_skipped("direct", "direct-list-${entity.name}", setup.live and "live" or "unit")
+    if _should_skip then
+      pending(_reason or "skipped via sdk-test-control.json")
+      return
+    end
+${listSkipBlock}    local client = setup.client
 
 `)
 
@@ -133,11 +202,27 @@ describe("${entity.Name}Direct", function()
 `)
       }
 
-      Content(`    assert.is_nil(err)
-    assert.is_true(result["ok"])
-    assert.are.equal(200, helpers.to_int(result["status"]))
-
-    if not setup.live then
+      Content(`    if setup.live then
+      -- Live mode is lenient: synthetic IDs frequently 4xx and the list-
+      -- response shape varies wildly across public APIs. Skip rather than
+      -- fail when the call doesn't return a usable list.
+      if err ~= nil then
+        pending("list call failed (likely synthetic IDs against live API): " .. tostring(err))
+        return
+      end
+      if not result["ok"] then
+        pending("list call not ok (likely synthetic IDs against live API)")
+        return
+      end
+      local status = helpers.to_int(result["status"])
+      if status < 200 or status >= 300 then
+        pending("expected 2xx status, got " .. tostring(status))
+        return
+      end
+    else
+      assert.is_nil(err)
+      assert.is_true(result["ok"])
+      assert.are.equal(200, helpers.to_int(result["status"]))
       assert.is_table(result["data"])
       assert.are.equal(2, #result["data"])
       assert.are.equal(1, #setup.calls)
@@ -148,22 +233,65 @@ describe("${entity.Name}Direct", function()
     }
 
     if (hasLoad && loadPoint) {
+      // Skip live direct-load only when we can't fill path params:
+      // no spec examples and no list-bootstrap. Spec examples win first.
+      const loadSkipBlock = (loadParams.length > 0 && !loadAllHaveExamples)
+        ? `    if setup.live then
+      pending("live direct-load needs real ID — set *_ENTID env var with real IDs to run")
+      return
+    end
+`
+        : ''
       Content(`  it("should direct-load-${entity.name}", function()
     local setup = ${entity.name}_direct_setup({ id = "direct01" })
-    local client = setup.client
+    local _should_skip, _reason = runner.is_control_skipped("direct", "direct-load-${entity.name}", setup.live and "live" or "unit")
+    if _should_skip then
+      pending(_reason or "skipped via sdk-test-control.json")
+      return
+    end
+${loadSkipBlock}    local client = setup.client
 
 `)
 
-      if (loadParams.length > 0) {
+      const needsQuery = loadParams.length > 0 || loadLiveQueryLines !== ''
+      if (needsQuery) {
         Content(`    local params = {}
-    if not setup.live then
+    local query = {}
 `)
-        for (let i = 0; i < loadParams.length; i++) {
-          Content(`      params["${loadParams[i].name}"] = "direct0${i + 1}"
+        if (loadAllHaveExamples) {
+          Content(`    if setup.live then
 `)
-        }
-        Content(`    end
+          if (loadLiveQueryLines) Content(loadLiveQueryLines + '\n')
+          Content(loadExampleLines + '\n')
+          Content(`    else
 `)
+          for (let i = 0; i < loadParams.length; i++) {
+            Content(`      params["${loadParams[i].name}"] = "direct0${i + 1}"
+`)
+          }
+          Content(`    end
+`)
+        } else if (loadParams.length > 0) {
+          if (loadLiveQueryLines) {
+            Content(`    if setup.live then
+${loadLiveQueryLines}
+    end
+`)
+          }
+          Content(`    if not setup.live then
+`)
+          for (let i = 0; i < loadParams.length; i++) {
+            Content(`      params["${loadParams[i].name}"] = "direct0${i + 1}"
+`)
+          }
+          Content(`    end
+`)
+        } else if (loadLiveQueryLines) {
+          Content(`    if setup.live then
+${loadLiveQueryLines}
+    end
+`)
+        }
       }
 
       Content(`
@@ -171,20 +299,37 @@ describe("${entity.Name}Direct", function()
       path = "${loadPath}",
       method = "GET",
 `)
-      if (loadParams.length > 0) {
+      if (needsQuery) {
         Content(`      params = params,
+      query = query,
 `)
       } else {
         Content(`      params = {},
 `)
       }
       Content(`    })
-    assert.is_nil(err)
-    assert.is_true(result["ok"])
-    assert.are.equal(200, helpers.to_int(result["status"]))
-    assert.is_not_nil(result["data"])
-
-    if not setup.live then
+    if setup.live then
+      -- Live mode is lenient: synthetic IDs frequently 4xx. Skip rather
+      -- than fail when the load endpoint isn't reachable with the IDs we
+      -- can construct from setup.idmap.
+      if err ~= nil then
+        pending("load call failed (likely synthetic IDs against live API): " .. tostring(err))
+        return
+      end
+      if not result["ok"] then
+        pending("load call not ok (likely synthetic IDs against live API)")
+        return
+      end
+      local status = helpers.to_int(result["status"])
+      if status < 200 or status >= 300 then
+        pending("expected 2xx status, got " .. tostring(status))
+        return
+      end
+    else
+      assert.is_nil(err)
+      assert.is_true(result["ok"])
+      assert.are.equal(200, helpers.to_int(result["status"]))
+      assert.is_not_nil(result["data"])
       if type(result["data"]) == "table" then
         assert.are.equal("direct01", result["data"]["id"])
       end
@@ -205,15 +350,13 @@ function ${entity.name}_direct_setup(mockres)
 
   local env = runner.env_override({
     ["${entidEnvVar}"] = {},
-    ["${PROJECTNAME}_TEST_LIVE"] = "FALSE",
-    ["${PROJECTNAME}_APIKEY"] = "NONE",
+    ["${PROJECTNAME}_TEST_LIVE"] = "FALSE",${apikeyEnvEntry}
   })
 
   local live = env["${PROJECTNAME}_TEST_LIVE"] == "TRUE"
 
   if live then
-    local merged_opts = {
-      apikey = env["${PROJECTNAME}_APIKEY"],
+    local merged_opts = {${apikeyLiveField}
     }
     local client = sdk.new(merged_opts)
     return {

package/project/.sdk/src/cmp/lua/TestEntity_lua.ts

@@ -7,7 +7,12 @@ import {
 
 import {
   KIT,
+  Model,
+  ModelEntity,
+  ModelEntityFlow,
+  ModelEntityFlowStep,
   getModelPath,
+  nom,
 } from '@voxgig/apidef'
 
 
@@ -18,34 +23,43 @@ import {
   each,
   buildIdNames,
   getMatchEntries,
+  isAuthActive,
 } from '@voxgig/sdkgen'
 
 
-type OpGen = (ctx: GenCtx, step: any, index: any) => void
-
+// See TestEntity_ts.ts for the GenCtx/OpGen contract.
 type GenCtx = {
-  model: any
-  entity: any
-  flow: any
+  model: Model
+  entity: ModelEntity
+  flow: ModelEntityFlow
   PROJUPPER: string
 }
 
+type OpGen = (ctx: GenCtx, step: ModelEntityFlowStep, index: number) => void
+
 
 const TestEntity = cmp(function TestEntity(props: any) {
   const ctx$ = props.ctx$
-  const model = ctx$.model
+  const model: Model = ctx$.model
 
   const target = props.target
-  const entity = props.entity
+  const entity: ModelEntity = props.entity
 
-  const basicflow = getModelPath(model, `main.${KIT}.flow.Basic${entity.Name}Flow`)
-  const dobasic = basicflow && true === basicflow.active
-
-  if (!dobasic) {
+  const basicflow: ModelEntityFlow | undefined =
+    getModelPath(model, `main.${KIT}.flow.Basic${nom(entity, 'Name')}Flow`)
+  if (null == basicflow || true !== basicflow.active) {
     return
   }
 
-  const PROJUPPER = model.const.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
+  const PROJUPPER = nom(model.const, 'Name').toUpperCase().replace(/[^A-Z_]/g, '_')
+
+  const authActive = isAuthActive(model)
+  const apikeyEnvEntry = authActive
+    ? `\n    ["${PROJUPPER}_APIKEY"] = "NONE",`
+    : ''
+  const apikeyLiveField = authActive
+    ? `\n        apikey = env["${PROJUPPER}_APIKEY"],`
+    : ''
 
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
@@ -80,6 +94,21 @@ describe("${entity.Name}Entity", function()
 
   it("should run basic flow", function()
     local setup = ${entity.name}_basic_setup(nil)
+    -- Per-op sdk-test-control.json skip.
+    local _live = setup.live or false
+    for _, _op in ipairs({${(Array.from(new Set((allSteps as any[]).map((s: any) => s.op).filter(Boolean)))).map(o => `"${o}"`).join(', ')}}) do
+      local _should_skip, _reason = runner.is_control_skipped("entityOp", "${entity.name}." .. _op, _live and "live" or "unit")
+      if _should_skip then
+        pending(_reason or "skipped via sdk-test-control.json")
+        return
+      end
+    end
+    -- The basic flow consumes synthetic IDs from the fixture. In live mode
+    -- without an *_ENTID env override, those IDs hit the live API and 4xx.
+    if setup.synthetic_only then
+      pending("live entity test uses synthetic IDs from fixture — set ${PROJUPPER}_TEST_${entity.name.toUpperCase().replace(/[^A-Z_]/g, '_')}_ENTID JSON to run live")
+      return
+    end
     local client = setup.client
 
 `)
@@ -147,11 +176,16 @@ end)
 
 `)
 
-    Content(`  local env = runner.env_override({
+    Content(`  -- Detect ENTID env override before envOverride consumes it. When live
+  -- mode is on without a real override, the basic test runs against synthetic
+  -- IDs from the fixture and 4xx's. Surface this so the test can skip.
+  local entid_env_raw = os.getenv("${PROJUPPER}_TEST_${entity.name.toUpperCase().replace(/[^A-Z_]/g, '_')}_ENTID")
+  local idmap_overridden = entid_env_raw ~= nil and entid_env_raw:match("^%s*{") ~= nil
+
+  local env = runner.env_override({
     ["${PROJUPPER}_TEST_${entity.name.toUpperCase().replace(/[^A-Z_]/g, '_')}_ENTID"] = idmap,
     ["${PROJUPPER}_TEST_LIVE"] = "FALSE",
-    ["${PROJUPPER}_TEST_EXPLAIN"] = "FALSE",
-    ["${PROJUPPER}_APIKEY"] = "NONE",
+    ["${PROJUPPER}_TEST_EXPLAIN"] = "FALSE",${apikeyEnvEntry}
   })
 
   local idmap_resolved = helpers.to_map(
@@ -172,20 +206,22 @@ end)
     Content(`
   if env["${PROJUPPER}_TEST_LIVE"] == "TRUE" then
     local merged_opts = vs.merge({
-      {
-        apikey = env["${PROJUPPER}_APIKEY"],
+      {${apikeyLiveField}
       },
       extra or {},
     })
     client = sdk.new(helpers.to_map(merged_opts))
   end
 
+  local live = env["${PROJUPPER}_TEST_LIVE"] == "TRUE"
   return {
     client = client,
     data = entity_data,
     idmap = idmap_resolved,
     env = env,
     explain = env["${PROJUPPER}_TEST_EXPLAIN"] == "TRUE",
+    live = live,
+    synthetic_only = live and not idmap_overridden,
     now = os.time() * 1000,
   }
 end
@@ -196,9 +232,9 @@ end
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 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)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
@@ -206,8 +242,8 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
   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 ?? ''))
+      const priorRef = s.input.ref ?? entity.name + '_ref01'
+      const priorDatvar = s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? ''))
       return priorDatvar === datavar
     }
     return false
@@ -241,17 +277,20 @@ const generateCreate: OpGen = (ctx, step, index) => {
     assert.is_nil(err)
     ${datavar} = helpers.to_map(${datavar}_result)
     assert.is_not_nil(${datavar})
-    assert.is_not_nil(${datavar}["id"])
 `)
+  if (null != ctx.entity.id) {
+    Content(`    assert.is_not_nil(${datavar}["id"])
+`)
+  }
 }
 
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 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)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
@@ -291,7 +330,7 @@ const generateList: OpGen = (ctx, step, index) => {
     for (const validator of step.valid) {
       const validRef = validator.def?.ref
       const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.op &&
-        ((s.input?.ref ?? entity.name + '_ref01') === validRef))
+        ((s.input.ref ?? entity.name + '_ref01') === validRef))
 
       if ('ItemExists' === validator.apply && hasRefData) {
         const refDataVar = validRef + '_data'
@@ -317,17 +356,19 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 resdatavar = step.input?.resdatavar ?? (ref + '_resdata' + (step.input?.suffix ?? ''))
-  const markdefvar = step.input?.markdefvar ?? (ref + '_markdef' + (step.input?.suffix ?? ''))
-  const srcdatavar = step.input?.srcdatavar ?? (ref + '_data' + (step.input?.suffix ?? ''))
+  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 resdatavar = step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? ''))
+  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)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
     ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
+  const hasEntIdU = null != entity.id
+
   Content(`    -- UPDATE
 `)
   if (needsEnt) {
@@ -335,8 +376,11 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
   Content(`    local ${datavar}_up = {
-      id = ${srcdatavar}["id"],
 `)
+  if (hasEntIdU) {
+    Content(`      id = ${srcdatavar}["id"],
+`)
+  }
 
   if (step.data) {
     const dataEntries = Object.entries(step.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
@@ -351,7 +395,7 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
   if (step.spec) {
     for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input?.textfield) {
+      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
         const fieldname = step.input.textfield
         const fieldvalue = spec.def?.mark ?? `Mark01-${ref}`
         Content(`
@@ -368,12 +412,15 @@ const generateUpdate: OpGen = (ctx, step, index) => {
     assert.is_nil(err)
     local ${resdatavar} = helpers.to_map(${resdatavar}_result)
     assert.is_not_nil(${resdatavar})
-    assert.are.equal(${resdatavar}["id"], ${datavar}_up["id"])
 `)
+  if (hasEntIdU) {
+    Content(`    assert.are.equal(${resdatavar}["id"], ${datavar}_up["id"])
+`)
+  }
 
   if (step.spec) {
     for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input?.textfield) {
+      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
         Content(`    assert.are.equal(${resdatavar}[${markdefvar}_name], ${markdefvar}_value)
 `)
       }
@@ -384,11 +431,11 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 datavar = step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? ''))
-  const srcdatavar = step.input?.srcdatavar ?? (ref + '_data' + (step.input?.suffix ?? ''))
+  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 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)) as any[]
   const hasEntVar = priorSteps.some((s: any) =>
@@ -399,20 +446,22 @@ const generateLoad: OpGen = (ctx, step, index) => {
   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 ?? ''))
+        const priorRef = s.input.ref ?? entity.name + '_ref01'
+        const priorDatvar = s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? ''))
         return priorDatvar === srcdatavar
       }
       return false
     })
 
+  const hasEntId = null != entity.id
+
   Content(`    -- LOAD
 `)
   if (!hasEntVar) {
     Content(`    local ${entvar} = client:${entity.Name}(nil)
 `)
   }
-  if (!hasSrcData) {
+  if (!hasSrcData && hasEntId) {
     Content(`    local ${srcdatavar}_raw = vs.items(helpers.to_map(
       vs.getpath(setup.data, "existing.${entity.name}")))
     local ${srcdatavar} = nil
@@ -421,7 +470,8 @@ const generateLoad: OpGen = (ctx, step, index) => {
     end
 `)
   }
-  Content(`    local ${matchvar} = {
+  if (hasEntId) {
+    Content(`    local ${matchvar} = {
       id = ${srcdatavar}["id"],
     }
     local ${datavar}_loaded, err = ${entvar}:load(${matchvar}, nil)
@@ -430,32 +480,50 @@ const generateLoad: OpGen = (ctx, step, index) => {
     assert.is_not_nil(${datavar}_load_result)
     assert.are.equal(${datavar}_load_result["id"], ${srcdatavar}["id"])
 `)
+  }
+  else {
+    Content(`    local ${matchvar} = {}
+    local ${datavar}_loaded, err = ${entvar}:load(${matchvar}, nil)
+    assert.is_nil(err)
+    assert.is_not_nil(${datavar}_loaded)
+`)
+  }
 }
 
 
 const generateRemove: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 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)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
     ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
+  const hasEntIdR = null != entity.id
+
   Content(`    -- REMOVE
 `)
   if (needsEnt) {
     Content(`    local ${entvar} = client:${entity.Name}(nil)
 `)
   }
-  Content(`    local ${matchvar} = {
+  if (hasEntIdR) {
+    Content(`    local ${matchvar} = {
       id = ${srcdatavar}["id"],
     }
     local _, err = ${entvar}:remove(${matchvar}, nil)
     assert.is_nil(err)
 `)
+  }
+  else {
+    Content(`    local ${matchvar} = {}
+    local _, err = ${entvar}:remove(${matchvar}, nil)
+    assert.is_nil(err)
+`)
+  }
 }