@voxgig/sdkgen 4.34.0 → 4.34.2

package/project/.sdk/src/cmp/java/ReadmeRef_java.ts

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, canonKey, canonScalarKey, File, isAuthActive, entityIdField, opRequestShape , targetFeatures } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, canonKey, File, isAuthActive, entityIdField, opRequestShape , targetFeatures, opNeedsAction, bodyNote, javaMap, javaMapOf } from '@voxgig/sdkgen'
 import { ReadmeRefFeatures } from '@voxgig/sdkgen'
 
 import {
@@ -7,48 +7,41 @@ import {
   getModelPath,
 } from '@voxgig/apidef'
 
-import { javaVarName } from './utility_java'
+import { javaVarName, javaListMatch, javaLit } from './utility_java'
 
 
 // Type names come from the shared canonToType 'java' column (single source of truth).
 
-// A type-correct Java literal for a field's canonical type.
-function javaLit(type: any, placeholder: string = 'example'): string {
-  const k = canonScalarKey(type)
-  if ('INTEGER' === k) return '1L'
-  if ('NUMBER' === k) return '1.0'
-  if ('BOOLEAN' === k) return 'true'
-  if ('ARRAY' === k) return 'List.of()'
-  if ('OBJECT' === k) return 'Map.of()'
-  return `"${placeholder}"`
-}
-
-
 const OP_SIGNATURES: Record<string, { sig: string, returns: string, desc: string }> = {
   load: {
     sig: 'load(reqmatch, ctrl) -> Object',
-    returns: 'the entity data',
-    desc: 'Load a single entity matching the given criteria. Returns the entity data and raises on error.',
+    returns: 'the entity',
+    desc: 'Load a single entity matching the given criteria. Returns the entity, whose record `data()` reads, and raises on error.',
   },
   list: {
     sig: 'list(reqmatch, ctrl) -> Object',
-    returns: 'an aggregate list of entities',
-    desc: 'List entities matching the given criteria. The match is optional — call `list(null, null)` to list all records. Returns an aggregate list and raises on error.',
+    returns: 'a list of entities, one per record',
+    desc: 'List entities matching the given criteria. The match is optional — call `list(null, null)` to list all records. Returns a list of entities, one per record, and raises on error.',
   },
   create: {
     sig: 'create(reqdata, ctrl) -> Object',
-    returns: 'the created entity data',
-    desc: 'Create a new entity with the given data. Returns the created entity data and raises on error.',
+    returns: 'the created entity',
+    desc: 'Create a new entity with the given data. Returns the created entity and raises on error.',
   },
   update: {
     sig: 'update(reqdata, ctrl) -> Object',
-    returns: 'the updated entity data',
-    desc: 'Update an existing entity. The data must include the entity `id`. Returns the updated entity data and raises on error.',
+    returns: 'the updated entity',
+    desc: 'Update an existing entity. The data must include the entity `id`. Returns the updated entity and raises on error.',
+  },
+  patch: {
+    sig: 'patch(reqdata, ctrl) -> Object',
+    returns: 'the patched entity',
+    desc: 'Change part of an existing entity: only the fields given are sent. The data must include the entity `id`. Returns the patched entity and raises on error.',
   },
   remove: {
     sig: 'remove(reqmatch, ctrl) -> Object',
-    returns: 'the removed entity data',
-    desc: 'Remove the entity matching the given criteria. Raises on error.',
+    returns: 'the removed entity',
+    desc: 'Remove the entity matching the given criteria. Returns the entity, marked as deleted, and raises on error.',
   },
 }
 
@@ -217,7 +210,7 @@ SdkEntity ${eVar} = client.${accessor}(null);
         // Field operations breakdown
         const hasFieldOps = fields.some((f: any) => f.op && Object.keys(f.op).length > 0)
         if (hasFieldOps) {
-          const opcols = ['load', 'list', 'create', 'update', 'remove']
+          const opcols = ['load', 'list', 'create', 'update', 'patch', 'remove']
             .filter((op: string) => opnames.includes(op) && ent.op[op]?.active !== false)
           Content(`### Field Usage by Operation
 
@@ -258,15 +251,19 @@ ${info.desc}
 
 `)
 
+          if (opNeedsAction(ent.op[opname])) {
+            return
+          }
+
           if ('load' === opname || 'remove' === opname) {
             const matchItems = opRequestShape(ent, opname).items
               .filter((it: any) => !it.optional || it.name === idF)
               .sort((a: any, b: any) =>
                 (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
             const arg = 0 < matchItems.length
-              ? `Map.of(${matchItems.map((it: any) =>
+              ? javaMapOf(matchItems.map((it: any) =>
                 `"${it.name}", ${javaLit(it.type,
-                  it.name === idF ? ent.name + '_id' : it.name)}`).join(', ')})`
+                  it.name === idF ? ent.name + '_id' : it.name)}`))
               : 'null'
             Content(`\`\`\`java
 Object result = client.${accessor}(null).${opname}(${arg}, null);
@@ -276,8 +273,10 @@ Object result = client.${accessor}(null).${opname}(${arg}, null);
           }
           else if ('list' === opname) {
             Content(`\`\`\`java
-Object results = client.${accessor}(null).list(null, null);
-System.out.println(results);
+List<?> results = (List<?>) client.${accessor}(null).list(${javaListMatch(ent)}, null);
+for (Object item : results) {
+    System.out.println(((SdkEntity) item).data());
+}
 \`\`\`
 
 `)
@@ -285,12 +284,13 @@ System.out.println(results);
           else if ('create' === opname) {
             const createItems = opRequestShape(ent, 'create').items
               .filter((it: any) => !it.optional)
+            const createMap = javaMap(createItems.length)
             Content(`\`\`\`java
-Object result = client.${accessor}(null).create(Map.of(
+Object result = client.${accessor}(null).create(${createMap.open}
 `)
             createItems.map((it: any, i: number) => {
               const comma = i < createItems.length - 1 ? ',' : ''
-              Content(`    "${it.name}", ${javaLit(it.type, 'example_' + it.name)}${comma}  // ${canonToType(it.type, target.name)}
+              Content(`    ${createMap.pair(`"${it.name}", ${javaLit(it.type, 'example_' + it.name)}`)}${comma}  // ${canonToType(it.type, target.name)}
 `)
             })
             Content(`), null);
@@ -298,23 +298,32 @@ Object result = client.${accessor}(null).create(Map.of(
 
 `)
           }
-          else if ('update' === opname) {
-            const updateItems = opRequestShape(ent, 'update').items
+          else if ('update' === opname || 'patch' === opname) {
+            const updateItems = opRequestShape(ent, opname).items
               .filter((it: any) => !it.optional || it.name === idF)
               .sort((a: any, b: any) =>
                 (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
+            const updateMap = javaMap(updateItems.length)
             const updateLines = updateItems.map((it: any, i: number) => {
               const comma = i < updateItems.length - 1 ? ',' : ''
-              return `    "${it.name}", ${javaLit(it.type,
-                it.name === idF ? ent.name + '_id' : it.name)}${comma}\n`
+              return `    ${updateMap.pair(`"${it.name}", ${javaLit(it.type,
+                it.name === idF ? ent.name + '_id' : it.name)}`)}${comma}\n`
             }).join('')
             Content(`\`\`\`java
-Object result = client.${accessor}(null).update(Map.of(
+Object result = client.${accessor}(null).${opname}(${updateMap.open}
 ${updateLines}), null);
 \`\`\`
 
 `)
           }
+
+          if ('create' === opname || 'update' === opname || 'patch' === opname) {
+            const note = bodyNote(ent.op[opname], {
+              values: 'a `byte[]`, a `String` or an `InputStream`',
+              once: 'an `InputStream`',
+            })
+            if ('' !== note) Content(note)
+          }
         })
       }
 

package/project/.sdk/src/cmp/java/ReadmeTopQuick_java.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, entityIdField, opRequestShape , serverVariables} from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, entityIdField, opRequestShape , serverVariables, javaMapOf } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -7,21 +7,7 @@ import {
   nom,
 } from '@voxgig/apidef'
 
-import { javaVarName, javaPackage } from './utility_java'
-
-
-// A type-correct Java literal for a param: numeric/boolean/array/object params
-// render a typed literal; strings render the quoted placeholder. The SDK's
-// loose object model means all values live in Map<String, Object>.
-function javaLit(type: any, placeholder: string = 'example'): string {
-  const k = canonScalarKey(type)
-  if ('INTEGER' === k) return '1L'
-  if ('NUMBER' === k) return '1.0'
-  if ('BOOLEAN' === k) return 'true'
-  if ('ARRAY' === k) return 'List.of()'
-  if ('OBJECT' === k) return 'Map.of()'
-  return `"${placeholder}"`
-}
+import { javaVarName, javaPackage, javaListMatch, javaLit } from './utility_java'
 
 
 const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
@@ -47,8 +33,17 @@ const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
     'options.put("server", server);\n'
 
 
+  const shown = null == exampleEntity ? [] :
+    ['list', 'load'].filter((op: string) => Object.keys(exampleEntity.op || {}).includes(op))
+  const imports = [
+    ...(shown.includes('list') ? ['java.util.List'] : []),
+    ...(authActive || '' !== javaServerLines || shown.includes('load') ? ['java.util.Map'] : []),
+    `${javaPackage(model)}.core.${SDK}`,
+    ...(0 < shown.length ? [`${javaPackage(model)}.core.SdkEntity`] : []),
+  ]
+
   Content(`\`\`\`java
-import ${javaPackage(model)}.core.${SDK};
+${imports.map((i: string) => 'import ' + i + ';').join('\n')}
 
 `)
 
@@ -75,9 +70,11 @@ ${javaServerLines}${SDK} client = new ${SDK}(options);
     const idF = entityIdField(exampleEntity)
 
     if (opnames.includes('list')) {
-      Content(`// List all ${eNameLower}s (returns Object, an aggregate list; raises on error)
-Object ${eVar}List = client.${accessor}(null).list(null, null);
-System.out.println(${eVar}List);
+      Content(`// List all ${eNameLower}s (a list of entities, one per record; raises on error)
+List<?> ${eVar}List = (List<?>) client.${accessor}(null).list(${javaListMatch(exampleEntity)}, null);
+for (Object ${eVar}Item : ${eVar}List) {
+    System.out.println(((SdkEntity) ${eVar}Item).data());
+}
 `)
     }
 
@@ -87,14 +84,14 @@ System.out.println(${eVar}List);
         .sort((a: any, b: any) =>
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       const loadArg = 0 < loadItems.length
-        ? `Map.of(${loadItems.map((it: any) =>
+        ? javaMapOf(loadItems.map((it: any) =>
           `"${it.name}", ${javaLit(it.type,
-            it.name === idF ? 'example_id' : 'example_' + it.name)}`).join(', ')})`
+            it.name === idF ? 'example_id' : 'example_' + it.name)}`))
         : 'null'
       Content(`
-// Load a specific ${eNameLower} (returns the record, raises on error)
-Object ${eVar} = client.${accessor}(null).load(${loadArg}, null);
-System.out.println(${eVar});
+// Load a specific ${eNameLower} (returns the entity, raises on error)
+SdkEntity ${eVar} = (SdkEntity) client.${accessor}(null).load(${loadArg}, null);
+System.out.println(${eVar}.data());
 `)
     }
   }

package/project/.sdk/src/cmp/java/ReadmeTopTest_java.ts

@@ -1,24 +1,12 @@
 
-import { cmp, Content, canonKey, canonScalarKey, entityIdField, pickExampleEntity, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, canonKey, entityIdField, pickExampleEntity, opRequestShape, requiredItems, javaMapOf } from '@voxgig/sdkgen'
 
 import {
   KIT,
   getModelPath,
 } from '@voxgig/apidef'
 
-import { javaVarName } from './utility_java'
-
-
-// A type-correct Java literal for a field's canonical type.
-function javaLit(type: any): string {
-  const k = canonScalarKey(type)
-  if ('INTEGER' === k) return '1L'
-  if ('NUMBER' === k) return '1.0'
-  if ('BOOLEAN' === k) return 'true'
-  if ('ARRAY' === k) return 'List.of()'
-  if ('OBJECT' === k) return 'Map.of()'
-  return '"example"'
-}
+import { javaVarName, javaLit } from './utility_java'
 
 
 const ReadmeTopTest = cmp(function ReadmeTopTest(props: any) {
@@ -40,29 +28,35 @@ ${SDK} client = ${SDK}.testSDK(null, null);
     const idF = entityIdField(exampleEntity)
     const isMatchOp = 'load' === primaryOp || 'remove' === primaryOp
     let arg = 'null'
-    if (isMatchOp) {
+    if (isMatchOp || ('list' === primaryOp && 0 < requiredItems(exampleEntity, 'list').length)) {
       // Every REQUIRED match key (id first) — the same shape that generates
       // the op's request type, so the block stays honest.
-      const items = opRequestShape(exampleEntity, primaryOp).items
-        .filter((it: any) => !it.optional || it.name === idF)
+      const items = (isMatchOp ? opRequestShape(exampleEntity, primaryOp).items
+        .filter((it: any) => !it.optional || it.name === idF) : requiredItems(exampleEntity, 'list'))
         .sort((a: any, b: any) =>
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       arg = 0 < items.length
-        ? `Map.of(${items.map((it: any) =>
-          `"${it.name}", ${it.name === idF ? '"test01"' : javaLit(it.type)}`).join(', ')})`
+        ? javaMapOf(items.map((it: any) =>
+          `${JSON.stringify(it.name)}, ${isMatchOp && it.name === idF ? '"test01"' : javaLit(it.type)}`))
         : 'null'
-    } else if ('create' === primaryOp || 'update' === primaryOp) {
+    } else if ('create' === primaryOp || 'update' === primaryOp || 'patch' === primaryOp) {
       const items = opRequestShape(exampleEntity, primaryOp).items
         .filter((it: any) => it.name !== idF && it.name !== 'id')
       const required = items.filter((it: any) => !it.optional)
       const chosen = required.length ? required : items.slice(0, 3)
-      arg = `Map.of(${chosen.map((it: any) =>
-        `"${it.name}", ${javaLit(it.type)}`).join(', ')})`
+      arg = javaMapOf(chosen.map((it: any) =>
+        `${JSON.stringify(it.name)}, ${javaLit(it.type)}`))
     }
-    const eVar = javaVarName(exampleEntity.name) + ('list' === primaryOp ? 'List' : '')
+    const eVar = javaVarName(exampleEntity.name)
     const accessor = javaVarName(exampleEntity.name)
-    Content(`Object ${eVar} = client.${accessor}(null).${primaryOp}(${arg}, null);
-System.out.println(${eVar});
+    Content('list' === primaryOp
+      ? `List<?> ${eVar}List = (List<?>) client.${accessor}(null).list(${arg}, null);
+for (Object ${eVar}Item : ${eVar}List) {
+    System.out.println(((SdkEntity) ${eVar}Item).data());
+}
+`
+      : `SdkEntity ${eVar} = (SdkEntity) client.${accessor}(null).${primaryOp}(${arg}, null);
+System.out.println(${eVar}.data());
 `)
   }
 

package/project/.sdk/src/cmp/java/TestClean_java.ts

@@ -435,8 +435,34 @@ public class CleanTest {
           },
           "body", "<html>")));
 
+  // Offline, as every generated suite is: the test OPTION resolves a
+  // required server variable to test-<name>, and installs no transport.
+  static Map<String, Object> offline(Map<String, Object> opts) {
+    Map<String, Object> out = new LinkedHashMap<>(opts);
+    out.put("test", jm("active", true));
+    return out;
+  }
+
+  // A client the sweep cannot build leaves nothing swept: a harness error,
+  // not a leak.
+  static ${sdk} construct(Map<String, Object> opts) {
+    try {
+      return new ${sdk}(offline(opts));
+    }
+    catch (RuntimeException e) {
+      throw new IllegalStateException(
+          "clean harness: the client could not be constructed, so nothing was swept: "
+          + e.getMessage(), e);
+    }
+  }
+
   static ${sdk} makeSdk(Scenario scenario, List<Sink> sinks, Map<String, Object> cleanopts,
       BaseFeature... extra) {
+    return construct(makeOpts(scenario, sinks, cleanopts, extra));
+  }
+
+  static Map<String, Object> makeOpts(Scenario scenario, List<Sink> sinks,
+      Map<String, Object> cleanopts, BaseFeature... extra) {
     Map<String, Object> feature = new LinkedHashMap<>();
     if (hasFeature("log")) {
       feature.put("log", jm("active", true));
@@ -477,7 +503,7 @@ public class CleanTest {
         "feature", feature,
         "extend", extend,
         "utility", jm("fetcher", scenario.respond));
-    return new ${sdk}(opts);
+    return opts;
   }
 
   // Every log line the log feature emits, whichever level it chooses.
@@ -518,7 +544,10 @@ public class CleanTest {
   }
 
   static Object invoke(${sdk} client, Op op, Map<String, Object> ctrl) throws Exception {
-    Object ent = op.accessor.invoke(client, new Object[] {null});
+    return invokeOn(op.accessor.invoke(client, new Object[] {null}), op, ctrl);
+  }
+
+  static Object invokeOn(Object ent, Op op, Map<String, Object> ctrl) throws Exception {
     try {
       return op.call.invoke(ent, new LinkedHashMap<String, Object>(op.match), ctrl);
     }
@@ -560,7 +589,7 @@ public class CleanTest {
     Map<String, Object> plainOpts = jm("apikey", CANARY_APIKEY, "utility", jm("fetcher", ok));
 
     Map<String, Method> accessors = new TreeMap<>();
-    ${sdk} probe = new ${sdk}(plainOpts);
+    ${sdk} probe = construct(plainOpts);
     for (Method m : probe.getClass().getMethods()) {
       if (1 != m.getParameterCount() || !Map.class.isAssignableFrom(m.getParameterTypes()[0])) {
         continue;
@@ -588,7 +617,7 @@ public class CleanTest {
       catch (Exception ex) {
         continue;
       }
-      for (String opname : List.of("list", "load", "create", "update", "remove")) {
+      for (String opname : List.of("list", "load", "create", "update", "patch", "remove")) {
         Method call;
         try {
           call = ent.getClass().getMethod(opname, Map.class, Map.class);
@@ -601,7 +630,7 @@ public class CleanTest {
         for (Map<String, Object> match : matches) {
           Op op = new Op(e.getValue(), call, match);
           try {
-            invoke(new ${sdk}(plainOpts), op, new LinkedHashMap<>());
+            invoke(construct(plainOpts), op, new LinkedHashMap<>());
             return op;
           }
           catch (Exception ex) {
@@ -626,10 +655,12 @@ public class CleanTest {
   static Exception drive(${sdk} sdk, Op op, Map<String, Object> ctrl, List<Sink> sinks) {
     // A caller may keep the record it passed rather than read ctrl's entry.
     Object held = ctrl.get("explain");
+    Object ent = null;
     Object out = null;
     Exception err = null;
     try {
-      out = invoke(sdk, op, ctrl);
+      ent = op.accessor.invoke(sdk, new Object[] {null});
+      out = invokeOn(ent, op, ctrl);
     }
     catch (Exception e) {
       err = e;
@@ -640,6 +671,10 @@ public class CleanTest {
     if (out != null) {
       forms(sinks, "result", out);
     }
+    // Raw, as a caller copying the match into another query reads it.
+    if (ent instanceof Entity) {
+      forms(sinks, "match", ((Entity) ent).match());
+    }
     if (ctrl.get("explain") != null) {
       forms(sinks, "explain", ctrl.get("explain"));
     }
@@ -683,8 +718,14 @@ public class CleanTest {
         }
       }
 
+      // A name given at run time replaces the declared one: the match leaves
+      // out whichever name prepareAuth placed.
+      Map<String, Object> renamed = makeOpts(SCENARIOS.get(0), sinks, null);
+      renamed.put("auth", jm("name", "zzcred"));
+      drive(construct(renamed), op, new LinkedHashMap<>(), sinks);
+
       // No clean option at all: the schema defaults still apply.
-      ${sdk} bare = new ${sdk}(jm(
+      ${sdk} bare = construct(jm(
           "apikey", CANARY_APIKEY,
           "secret", CANARY_SECRET,
           "headers", jm("X-Custom-Token", CANARY_HEADER),
@@ -696,8 +737,8 @@ public class CleanTest {
       // is no rejection to sweep: sweep the client, and what clean makes of
       // the value should anything quote it.
       try {
-        ${sdk} mistyped = new ${sdk}(jm(
-            "apikey", jm("value", CANARY_APIKEY), "clean", jm("values", CANARY_VALUE)));
+        ${sdk} mistyped = new ${sdk}(offline(jm(
+            "apikey", jm("value", CANARY_APIKEY), "clean", jm("values", CANARY_VALUE))));
         forms(sinks, "mistyped", mistyped);
         forms(sinks, "mistyped:quoted", mistyped.getUtility().clean.apply(
             mistyped.getRootCtx(), "found map: " + CANARY_APIKEY));
@@ -707,7 +748,7 @@ public class CleanTest {
       }
 
       // A number is registered as the text a message quotes it in.
-      ${sdk} numeric = new ${sdk}(jm("apikey", 918273645));
+      ${sdk} numeric = construct(jm("apikey", 918273645));
       numbered = numeric.getUtility().clean.apply(numeric.getRootCtx(), "found 918273645");
 
       for (boolean unexpected : new boolean[] {false, true}) {
@@ -839,13 +880,15 @@ public class CleanTest {
   }
 
   // An entity block, of per-entity settings or seeded records keyed by
-  // entity name and id, is not read at all.
+  // entity name and id, is not read at all, and nor are rbac's rules, keyed by
+  // entity and operation names.
   @Test
   public void aFeatureNameDoesNotMakeItsSettingsSecret() {
-    ${sdk} sdk = new ${sdk}(jm(
+    ${sdk} sdk = construct(jm(
         "apikey", CANARY_APIKEY,
         "feature", jm(
             "secrets", jm("active", false, "kind", "SETTING-KIND-4829", "token", CANARY_SECRET),
+            "rbac", jm("active", false, "rules", jm("zztoken.load", "PLAINRULE-k7j5h3g1")),
             "test", jm("active", false, "entity",
                 jm("zztoken", jm("ZZTOKEN01", jm("note", "PLAINRECORD-t5r3e1w9"))))),
         "entity", jm("zztoken", jm("alias", jm("zzkey", "PLAINALIAS-m2n4b6v8")))));
@@ -856,6 +899,8 @@ public class CleanTest {
         sdk.getUtility().clean.apply(root, "record PLAINRECORD-t5r3e1w9"));
     assertEquals("alias PLAINALIAS-m2n4b6v8",
         sdk.getUtility().clean.apply(root, "alias PLAINALIAS-m2n4b6v8"));
+    assertEquals("rule PLAINRULE-k7j5h3g1",
+        sdk.getUtility().clean.apply(root, "rule PLAINRULE-k7j5h3g1"));
   }
 
   @Test

package/project/.sdk/src/cmp/java/TestDirect_java.ts

@@ -15,6 +15,8 @@ import {
   serverVarEnv,
   serverVariables, envName, envToken,
   pointParts,
+  liveStrict,
+  liveStrictNote,
 } from '@voxgig/sdkgen'
 
 
@@ -181,6 +183,15 @@ import ${javapackage}.utility.Json;
 @SuppressWarnings({"unchecked", "unused"})
 public class ${entity.Name}DirectTest {
 
+${liveStrictNote(liveStrict(model, target.name), '//', '  ')}
+  static final boolean LIVE_STRICT = ${liveStrict(model, target.name)};
+
+  static boolean liveOk(Map<String, Object> result) {
+    int status = Helpers.toInt(result.get("status"));
+    return result.get("err") == null && Boolean.TRUE.equals(result.get("ok"))
+        && status >= 200 && status < 300;
+  }
+
   static Map<String, Object> jm(Object... kv) {
     Map<String, Object> out = new LinkedHashMap<>();
     for (int i = 0; i < kv.length - 1; i += 2) {
@@ -207,8 +218,9 @@ public class ${entity.Name}DirectTest {
       const listSkipBlock = listLiveIdKeys.length > 0
         ? `    if (setup.live) {
       for (String liveKey : new String[] { ${listLiveIdKeys.map((k: string) => `"${k}"`).join(', ')} }) {
-        Assumptions.assumeTrue(setup.idmap.get(liveKey) != null,
-            "live test needs " + liveKey + " via *_ENTID env var (synthetic IDs only)");
+        if (setup.idmap.get(liveKey) == null) {
+          RunnerSupport.liveMiss(LIVE_STRICT, "Live test blocked: needs " + liveKey + " via ${entidEnvVar}");
+        }
       }
     }
 `
@@ -258,14 +270,12 @@ ${listSkipBlock}    ${SDK} client = setup.client;
       }
 
       Content(`    if (setup.live) {
-      // 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.
-      Assumptions.assumeTrue(Boolean.TRUE.equals(result.get("ok")),
-          "list call not ok (likely synthetic IDs against live API): " + result);
-      int status = Helpers.toInt(result.get("status"));
-      Assumptions.assumeTrue(status >= 200 && status < 300,
-          "expected 2xx status, got " + result.get("status"));
+      if (!liveOk(result)) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live list failed: " + RunnerSupport.liveDescribe(result));
+      }
+      if (RunnerSupport.liveList(result.get("data")) == null) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live list returned no list: " + RunnerSupport.liveDescribe(result));
+      }
     }
     else {
       assertEquals(true, result.get("ok"), "expected ok to be true");
@@ -306,23 +316,18 @@ ${listSkipBlock}    ${SDK} client = setup.client;
       // Identify ancestor params (not 'id') for live mode
       const ancestorParams = loadParams.filter((p: any) => p.n !== 'id')
 
+      const liveKey = (p: any) => p.n === 'id' ? entity.name + '01' : p.n.replace(/_id$/, '') + '01'
       let loadLiveIdKeys: string[] = []
       if (loadParams.length > 0 && !loadAllHaveExamples) {
-        if (hasList) {
-          loadLiveIdKeys = listParams.map((p: any) => {
-            return p.n === 'id'
-              ? entity.name + '01'
-              : p.n.replace(/_id$/, '') + '01'
-          })
-        } else {
-          loadLiveIdKeys = loadParams.map((p: any) => p.n + '01')
-        }
+        loadLiveIdKeys = [...new Set((hasList ?
+          [...listParams, ...loadParams.filter((p: any) => p.n !== 'id')] : loadParams).map(liveKey))]
       }
       const loadSkipBlock = loadLiveIdKeys.length > 0
         ? `    if (setup.live) {
       for (String liveKey : new String[] { ${loadLiveIdKeys.map(k => `"${k}"`).join(', ')} }) {
-        Assumptions.assumeTrue(setup.idmap.get(liveKey) != null,
-            "live test needs " + liveKey + " via *_ENTID env var (synthetic IDs only)");
+        if (setup.idmap.get(liveKey) == null) {
+          RunnerSupport.liveMiss(LIVE_STRICT, "Live test blocked: needs " + liveKey + " via ${entidEnvVar}");
+        }
       }
     }
 `
@@ -370,19 +375,30 @@ ${loadSkipBlock}    ${SDK} client = setup.client;
           "path", "${listPath}",
           "method", "GET",
           "params", listParams));
-      Assumptions.assumeTrue(Boolean.TRUE.equals(listResult.get("ok")),
-          "list call not ok (likely synthetic IDs against live API): " + listResult);
-
-      // Get first entity ID from list
-      List<Object> listData = listResult.get("data") instanceof List
-          ? (List<Object>) listResult.get("data") : new ArrayList<>();
-      Assumptions.assumeTrue(!listData.isEmpty(), "no entities to load in live mode");
+      if (!liveOk(listResult)) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live list discovery failed: " + RunnerSupport.liveDescribe(listResult));
+      }
+      List<Object> listData = RunnerSupport.liveList(listResult.get("data"));
+      if (listData == null) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live list discovery returned no list: " + RunnerSupport.liveDescribe(listResult));
+      }
+      if (listData.isEmpty()) {
+        RunnerSupport.liveEmpty("The account has no ${entity.name} record to load");
+      }
       Map<String, Object> firstEnt = Helpers.toMapAny(listData.get(0));
+      if (firstEnt == null || firstEnt.get("id") == null) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live load blocked: discovery returned no usable identity");
+      }
       params.put("id", firstEnt.get("id"));
 `)
           for (const p of ancestorParams) {
             const key = p.n.replace(/_id$/, '') + '01'
             Content(`      params.put("${p.n}", setup.idmap.get("${key}"));
+`)
+          }
+        } else if (loadParams.length > 0) {
+          for (const p of loadParams) {
+            Content(`      params.put("${p.n}", setup.idmap.get("${liveKey(p)}"));
 `)
           }
         }
@@ -418,14 +434,12 @@ ${loadSkipBlock}    ${SDK} client = setup.client;
       }
 
       Content(`    if (setup.live) {
-      // 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.
-      Assumptions.assumeTrue(Boolean.TRUE.equals(result.get("ok")),
-          "load call not ok (likely synthetic IDs against live API): " + result);
-      int status = Helpers.toInt(result.get("status"));
-      Assumptions.assumeTrue(status >= 200 && status < 300,
-          "expected 2xx status, got " + result.get("status"));
+      if (!liveOk(result)) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live load failed: " + RunnerSupport.liveDescribe(result));
+      }
+      if (result.get("data") == null) {
+        RunnerSupport.liveMiss(LIVE_STRICT, "Live load returned no data: " + RunnerSupport.liveDescribe(result));
+      }
     }
     else {
       assertEquals(true, result.get("ok"), "expected ok to be true");