@voxgig/sdkgen 4.34.0 → 4.34.2

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

@@ -84,10 +84,7 @@ final class PrepareAuth {
       'import java.nio.charset.StandardCharsets;',
       'import java.util.Base64;',
     ] : []),
-    // `List.of("auth", "prefix")` is the only use of java.util.List, and a
-    // prefix is a HEADER convention — the query and cookie branches drop it,
-    // so neither needs the import.
-    ...(header ? ['import java.util.List;'] : []),
+    'import java.util.List;',
     'import java.util.Map;',
   ].join('\n')
 
@@ -113,7 +110,7 @@ final class PrepareAuth {
           || NOT_FOUND.equals(secret) || "".equals(secret);
 
       if (noApikey) {
-        headers.remove(CRED_NAME);
+        headers.remove(name);
       }
       else {
         String basicPrefix = "";
@@ -127,10 +124,10 @@ final class PrepareAuth {
         // registration covers.
         ctx.utility.cleanAdd.apply(ctx, b64);
         if ("".equals(basicPrefix)) {
-          headers.put(CRED_NAME, b64);
+          headers.put(name, b64);
         }
         else {
-          headers.put(CRED_NAME, basicPrefix + " " + b64);
+          headers.put(name, basicPrefix + " " + b64);
         }
       }
 
@@ -152,6 +149,13 @@ final class PrepareAuth {
 
 ${consts}
 
+  // The client's auth.name option, when set, replaces the name the API declares.
+  static String authName(Map<String, Object> options) {
+    Object name = Struct.getpath(options, List.of("auth", "name"));
+    return name instanceof String && !"".equals(name)
+        ? ${header ? '((String) name).toLowerCase(java.util.Locale.ROOT)' : '(String) name'} : CRED_NAME;
+  }
+${cookie ? COOKIE_HELPER : ''}
   static Spec prepareAuth(Context ctx) {
     Spec spec = ctx.spec;
     if (spec == null) {
@@ -164,10 +168,17 @@ ${consts}
 
     // Public APIs that need no auth omit the options.auth block entirely.
     if (options.get("auth") == null) {
-      ${clear(spec.where)}
+      ${clear(spec.where, 'CRED_NAME')}
       return spec;
     }
 
+    String name = authName(options);
+
+    // A credential left under the declared name would travel beside the renamed one.
+    if (!name.equals(CRED_NAME)) {
+      ${clear(spec.where, 'CRED_NAME')}
+    }
+
     Object apikey = Struct.getprop(options, OPTION_APIKEY, NOT_FOUND);
 ${basicBlock}
     boolean skip = false;
@@ -180,10 +191,10 @@ ${basicBlock}
     }
 
     if (skip) {
-      ${clear(spec.where)}
+      ${clear(spec.where, 'name')}
     }
     else {
-${place(spec.where)}
+${place(spec.where, 'name')}
     }
 
     return spec;
@@ -198,28 +209,52 @@ function credName(where: string, name: string): string {
 }
 
 
-function clear(where: string): string {
-  return 'query' === where ? 'query.remove(CRED_NAME);' : 'headers.remove(CRED_NAME);'
+// A cookie has no header of its own: place() writes it into `cookie` as
+// `name=value`, so clear() frees that pair, not a header of that name.
+function clear(where: string, name: string): string {
+  if ('cookie' === where) {
+    return `applyCookie(headers, ${name}, null);`
+  }
+  return 'query' === where ? `query.remove(${name});` : `headers.remove(${name});`
 }
 
 
-function place(where: string): string {
+// The cookie header is shared with whatever cookies the caller set, so the
+// credential's pair is spliced in and out rather than appended.
+const COOKIE_HELPER = `
+  // Rewrites the cookie header with the named pair removed, then set to the
+  // value when it is not null; every other cookie is kept in order.
+  static void applyCookie(Map<String, Object> headers, String name, String value) {
+    Object existing = headers.get(COOKIE_HEADER);
+    String cookie = existing instanceof String ? (String) existing : "";
+    List<String> kept = PrepareHeaders.cookieKeep(cookie, List.of(name));
+    if (value != null) {
+      kept.add(name + "=" + value);
+    }
+    if (kept.isEmpty()) {
+      headers.remove(COOKIE_HEADER);
+    }
+    else {
+      headers.put(COOKIE_HEADER, String.join("; ", kept));
+    }
+  }
+`
+
+
+function place(where: string, name: string): string {
   if ('query' === where) {
     return `      String apikeyVal = apikey instanceof String ? (String) apikey : "";
       // NO PREFIX IN A QUERY STRING: ?name=Bearer%20abc is not a thing any
       // API reads, so the auth.prefix option is dropped here deliberately.
-      query.put(CRED_NAME, apikeyVal);`
+      query.put(${name}, apikeyVal);`
   }
 
   if ('cookie' === where) {
     return `      String apikeyVal = apikey instanceof String ? (String) apikey : "";
-      // A cookie IS a header, but the request may already carry others, so
-      // the pair is APPENDED rather than replacing the whole cookie header.
-      // No prefix, for the same reason a query parameter carries none.
-      Object existing = Struct.getprop(headers, COOKIE_HEADER, "");
-      String cookie = existing instanceof String ? (String) existing : "";
-      String pair = CRED_NAME + "=" + apikeyVal;
-      headers.put(COOKIE_HEADER, "".equals(cookie) ? pair : cookie + "; " + pair);`
+      // Spliced in, replacing an earlier pair of the same name, beside any
+      // cookie the caller set. No prefix, for the same reason a query
+      // parameter carries none.
+      applyCookie(headers, ${name}, apikeyVal);`
   }
 
   return `      String authPrefix = "";
@@ -230,10 +265,10 @@ function place(where: string): string {
       String apikeyVal = apikey instanceof String ? (String) apikey : "";
       // Empty prefix (raw apiKey credential) must not add a leading space.
       if ("".equals(authPrefix)) {
-        headers.put(CRED_NAME, apikeyVal);
+        headers.put(${name}, apikeyVal);
       }
       else {
-        headers.put(CRED_NAME, authPrefix + " " + apikeyVal);
+        headers.put(${name}, authPrefix + " " + apikeyVal);
       }`
 }
 

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

@@ -1,28 +1,16 @@
 
-import { cmp, each, Content, canonToType, canonKey, canonScalarKey, entityIdField, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, canonKey, entityIdField, opRequestShape, opNeedsAction, javaMap, javaMapOf } from '@voxgig/sdkgen'
 
 import {
   KIT,
   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, JSON-serialisable 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}"`
-}
-
-
 // Operation method spelling for Java: camelCase methods over the loose object
 // model. The op descriptions are language-agnostic.
 const OP_DESC: Record<string, { method: string, desc: string }> = {
@@ -30,6 +18,7 @@ const OP_DESC: Record<string, { method: string, desc: string }> = {
   list:   { method: 'list(null, null)',    desc: 'List entities, optionally matching the given criteria.' },
   create: { method: 'create(data, null)',  desc: 'Create a new entity with the given data.' },
   update: { method: 'update(data, null)',  desc: 'Update an existing entity.' },
+  patch:  { method: 'patch(data, null)',   desc: 'Change part of an existing entity.' },
   remove: { method: 'remove(match, null)', desc: 'Remove the matching entity.' },
 }
 
@@ -55,6 +44,8 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 
   publishedEntities.map((entity: any) => {
     const opnames = Object.keys(entity.op || {})
+    // An op that needs an action has no plain call to show.
+    const callable = opnames.filter((o: string) => !opNeedsAction(entity.op[o]))
     const fields = Object.values(entity.fields || {})
     const idF = entityIdField(entity)
     // Sanitise the local variable name — a camelCased Java keyword gets a
@@ -112,7 +103,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 `)
     }
 
-    if (opnames.includes('load')) {
+    if (callable.includes('load')) {
       // The id key plus every REQUIRED match key (parent path params like
       // page_id) — the same shape the runtime resolves path params from, so
       // the example always works.
@@ -121,9 +112,9 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
         .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 ? entity.name + '_id' : it.name)}`).join(', ')})`
+            it.name === idF ? entity.name + '_id' : it.name)}`))
         : 'null'
       Content(`#### Example: Load
 
@@ -134,30 +125,31 @@ Object ${eVar} = client.${accessor}(null).load(${loadArg}, null);
 `)
     }
 
-    if (opnames.includes('list')) {
+    if (callable.includes('list')) {
       Content(`#### Example: List
 
 \`\`\`java
-Object ${eVar}List = client.${accessor}(null).list(null, null);
+Object ${eVar}List = client.${accessor}(null).list(${javaListMatch(entity)}, null);
 \`\`\`
 
 `)
     }
 
-    if (opnames.includes('create')) {
+    if (callable.includes('create')) {
       // Members come from the SAME shape the runtime validates
       // (opRequestShape): every required member must appear — including a
       // required id and parent keys like page_id — with a real literal.
       const createItems = opRequestShape(entity, 'create').items
         .filter((it: any) => !it.optional)
+      const createMap = javaMap(createItems.length)
       Content(`#### Example: Create
 
 \`\`\`java
-Object ${eVar} = client.${accessor}(null).create(Map.of(
+Object ${eVar} = 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);

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

@@ -1,24 +1,12 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, entityIdField, pickExampleEntity, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, 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 ReadmeHowto = cmp(function ReadmeHowto(props: any) {
@@ -39,23 +27,32 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
   let testArg = 'null'
   if (exampleEntity && isMatchOp) {
     testArg = idF ? `Map.of("${idF}", "test01")` : 'null'
-  } else if (exampleEntity && ('create' === primaryOp || 'update' === primaryOp)) {
+  } else if (exampleEntity && 'list' === primaryOp && 0 < requiredItems(exampleEntity, 'list').length) {
+    const chosen = requiredItems(exampleEntity, 'list')
+    testArg = javaMapOf(chosen.map((it: any) =>
+      `${JSON.stringify(it.name)}, ${javaLit(it.type)}`))
+  } else if (exampleEntity && ('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)
-    testArg = `Map.of(${chosen.map((it: any) =>
-      `"${it.name}", ${javaLit(it.type)}`).join(', ')})`
+    testArg = javaMapOf(chosen.map((it: any) =>
+      `${JSON.stringify(it.name)}, ${javaLit(it.type)}`))
   }
 
   // The op-driven test-mode line, shown only when the SDK has an entity op.
   // A direct()-only SDK (no ops anywhere) shows a direct() call instead.
-  const testModeExample = primaryOp
-    ? `// Entity ops return the ENTITY and raises on error;
-// call data() for the record.
-Object ${eVar} = client.${accessor}(null).${primaryOp}(${testArg}, null);
-// ${eVar} holds the mock response record
-System.out.println(${eVar});`
+  const testModeExample = 'list' === primaryOp
+    ? `// list returns a list of entities, one per mock record; it raises on error.
+List<?> ${eVar}List = (List<?>) client.${accessor}(null).list(${testArg}, null);
+for (Object ${eVar}Item : ${eVar}List) {
+    System.out.println(((SdkEntity) ${eVar}Item).data());
+}`
+    : primaryOp
+    ? `// Entity ops return the entity; they raise on error.
+SdkEntity ${eVar} = (SdkEntity) client.${accessor}(null).${primaryOp}(${testArg}, null);
+// data() reads the entity's mock record
+System.out.println(${eVar}.data());`
     : `Map<String, Object> result = client.direct(Map.of(
     "path", "/api/resource",
     "method", "GET"));

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

@@ -34,9 +34,9 @@ cd java && mvn install
 
   // Publish pending: not yet on Maven Central. Install from the git release
   // tag or from a local source checkout built with Maven.
-  const { releasesUrl } = repoInfo(model)
-  Content(`This package is not yet published to Maven Central. Install it from the GitHub
-release tag (\`${target.name}/vX.Y.Z\`, see [Releases](${releasesUrl})) or
+  const { hostName, tagsUrl } = repoInfo(model)
+  Content(`This package is not yet published to Maven Central. Install it from the ${hostName}
+release tag (\`${target.name}/vX.Y.Z\`, see [Tags](${tagsUrl})) or
 from a source checkout — build the library with Maven:
 
 \`\`\`bash

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content } from '@voxgig/sdkgen'
+import { cmp, Content, modelText } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -11,7 +11,7 @@ import { javaVarName } from './utility_java'
 
 const ReadmeIntro = cmp(function ReadmeIntro(props: any) {
   const { target, ctx$: { model } } = props
-  const info = (model.main && model.main.kit && model.main.kit.info) || {}
+  const info = modelText(model)
   const tagline = info.tagline || ''
 
   Content(`# ${model.Name} ${target.title} SDK
@@ -36,7 +36,7 @@ The ${target.title} SDK for the ${model.Name} API — an entity-oriented client
   // Model-driven op list — only the operations the active entities actually
   // expose (a read-only entity has just list+load); never claim
   // create/update/remove exist when no entity has them.
-  const CANON_OPS = ['list', 'load', 'create', 'update', 'remove']
+  const CANON_OPS = ['list', 'load', 'create', 'update', 'patch', 'remove']
   const opSet = new Set<string>()
   Object.values(entity || {}).forEach((e: any) => {
     if (!e || e.active === false) return

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

@@ -24,13 +24,14 @@ const ReadmeModel = cmp(function ReadmeModel(props: any) {
   entityList.forEach((e: any) => Object.keys(e.op || {})
     .forEach((o: string) => { if (e.op[o] && e.op[o].active !== false) opUnion.add(o) }))
   const opRowDefs: Record<string, string> = {
-    load: '| `load` | `(reqmatch, ctrl) -> Object` | Load a single entity by match criteria. Raises on error. |',
-    list: '| `list` | `(reqmatch, ctrl) -> Object` | List entities matching the criteria (an aggregate list). Raises on error. |',
-    create: '| `create` | `(reqdata, ctrl) -> Object` | Create a new entity. Raises on error. |',
-    update: '| `update` | `(reqdata, ctrl) -> Object` | Update an existing entity. Raises on error. |',
-    remove: '| `remove` | `(reqmatch, ctrl) -> Object` | Remove an entity. Raises on error. |',
+    load: '| `load` | `(reqmatch, ctrl) -> Object` | Load a single entity by match criteria, and return it. Raises on error. |',
+    list: '| `list` | `(reqmatch, ctrl) -> Object` | List entities matching the criteria, one per record. Raises on error. |',
+    create: '| `create` | `(reqdata, ctrl) -> Object` | Create a new entity, and return it. Raises on error. |',
+    update: '| `update` | `(reqdata, ctrl) -> Object` | Update an existing entity, and return it. Raises on error. |',
+    patch: '| `patch` | `(reqdata, ctrl) -> Object` | Change part of an existing entity, and return it. Raises on error. |',
+    remove: '| `remove` | `(reqmatch, ctrl) -> Object` | Remove an entity, and return it marked as deleted. Raises on error. |',
   }
-  const opRows = ['load', 'list', 'create', 'update', 'remove']
+  const opRows = ['load', 'list', 'create', 'update', 'patch', 'remove']
     .filter((o) => opUnion.has(o)).map((o) => opRowDefs[o]).join('\n')
 
   const apikeyOptionRow = isAuthActive(model)
@@ -93,9 +94,10 @@ ${opRows}
 
 ### Result shape
 
-Entity operations return the ENTITY (call data() for the record) (a \`Map\` for single-entity
-ops, an aggregate \`List\` for \`list\`) as \`Object\` and raise on error. Wrap
-calls in \`try\`/\`catch\` to handle failures.
+Entity operations return the entity, and \`list\` a list of entities, one per
+record, as \`Object\`; an entity is an \`SdkEntity\`, whose \`data()\` reads its
+record. They raise on error, so wrap calls in \`try\`/\`catch\` to handle
+failures.
 
 The \`direct()\` escape hatch never raises — it returns a result
 \`Map<String, Object>\` you branch on via \`result.get("ok")\`:

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, opRequestShape, entityIdField, entityOps , serverVariables} from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, opRequestShape, entityIdField, entityOps , serverVariables, javaMapOf } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -7,7 +7,7 @@ import {
   nom,
 } from '@voxgig/apidef'
 
-import { javaVarName, javaPackage } from './utility_java'
+import { javaVarName, javaPackage, javaListMatch, javaLit } from './utility_java'
 
 
 const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
@@ -44,23 +44,14 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
     'options.put("server", server);\n'
 
 
-  // A type-correct Java literal for a param — the loose object model means
-  // all values live in a Map<String, Object>.
-  const 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}"`
-  }
-
   if (authActive) {
     Content(`### 1. Create a client
 
 \`\`\`java
+import java.util.List;
+import java.util.Map;
 import ${javaPackage(model)}.core.${SDK};
+import ${javaPackage(model)}.core.SdkEntity;
 
 Map<String, Object> options = new java.util.LinkedHashMap<>();
 options.put("apikey", System.getenv("${envName(model)}_APIKEY"));
@@ -73,7 +64,10 @@ ${javaServerLines}${SDK} client = new ${SDK}(options);
     Content(`### 1. Create a client
 
 \`\`\`java
+import java.util.List;
+import java.util.Map;
 import ${javaPackage(model)}.core.${SDK};
+import ${javaPackage(model)}.core.SdkEntity;
 
 ${'' === javaServerLines
       ? `${SDK} client = new ${SDK}();`
@@ -96,13 +90,15 @@ ${'' === javaServerLines
     if (opnames.includes('list')) {
       Content(`### 2. List ${eName.toLowerCase()} records
 
-\`list(null, null)\` returns an aggregate list of records (as \`Object\`, an
-aggregate list) and raises on error.
+\`list(null, null)\` returns a list of entities, one per record (as \`Object\`),
+and raises on error; an entity's \`data()\` reads its record.
 
 \`\`\`java
 try {
-    Object ${eVar}List = client.${accessor}(null).list(null, null);
-    System.out.println(${eVar}List);
+    List<?> ${eVar}List = (List<?>) client.${accessor}(null).list(${javaListMatch(exampleEntity)}, null);
+    for (Object ${eVar}Item : ${eVar}List) {
+        System.out.println(((SdkEntity) ${eVar}Item).data());
+    }
 }
 catch (RuntimeException err) {
     System.out.println("list failed: " + err.getMessage());
@@ -139,8 +135,8 @@ ${neName} is nested under ${parentName}, so provide the \`${parentParam}\`.
 
 \`\`\`java
 try {
-    Object ${neVar} = client.${neAccessor}(null).load(Map.of(${neMatch.join(', ')}), null);
-    System.out.println(${neVar});
+    SdkEntity ${neVar} = (SdkEntity) client.${neAccessor}(null).load(${javaMapOf(neMatch)}, null);
+    System.out.println(${neVar}.data());
 }
 catch (RuntimeException err) {
     System.out.println("load failed: " + err.getMessage());
@@ -155,9 +151,9 @@ catch (RuntimeException err) {
         .sort((a: any, b: any) =>
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       const loadArg = 0 < loadRequired.length
-        ? `Map.of(${loadRequired.map((it: any) =>
+        ? javaMapOf(loadRequired.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(`### 3. Load ${article} ${eName.toLowerCase()}
@@ -166,8 +162,8 @@ catch (RuntimeException err) {
 
 \`\`\`java
 try {
-    Object ${eVar} = client.${accessor}(null).load(${loadArg}, null);
-    System.out.println(${eVar});
+    SdkEntity ${eVar} = (SdkEntity) client.${accessor}(null).load(${loadArg}, null);
+    System.out.println(${eVar}.data());
 }
 catch (RuntimeException err) {
     System.out.println("load failed: " + err.getMessage());
@@ -196,14 +192,15 @@ catch (RuntimeException err) {
       return it && it.type
     }
 
-    if (opnames.includes('create') || opnames.includes('update') || opnames.includes('remove')) {
+    if (opnames.includes('create') || opnames.includes('update') || opnames.includes('patch') ||
+      opnames.includes('remove')) {
       Content(`### 4. Create, update, and remove
 
 \`\`\`java
 `)
       if (opnames.includes('create')) {
         Content(`// Create — returns the ENTITY (call data() for the record)
-Object created = client.${accessor}(null).create(Map.of(${examplePairs('create').join(', ')}), null);
+Object created = client.${accessor}(null).create(${javaMapOf(examplePairs('create'))}, null);
 
 `)
       }
@@ -211,7 +208,15 @@ Object created = client.${accessor}(null).create(Map.of(${examplePairs('create')
         const updatePairs = (idF ? [`"${idF}", ${javaLit(idParamType('update'), 'example_id')}`] : [])
           .concat(examplePairs('update'))
         Content(`// Update — supply the id in the match/data
-client.${accessor}(null).update(Map.of(${updatePairs.join(', ')}), null);
+client.${accessor}(null).update(${javaMapOf(updatePairs)}, null);
+
+`)
+      }
+      if (opnames.includes('patch')) {
+        const patchPairs = (idF ? [`"${idF}", ${javaLit(idParamType('patch'), 'example_id')}`] : [])
+          .concat(examplePairs('patch'))
+        Content(`// Patch — sends only the fields given
+client.${accessor}(null).patch(${javaMapOf(patchPairs)}, null);
 
 `)
       }
@@ -224,7 +229,7 @@ client.${accessor}(null).update(Map.of(${updatePairs.join(', ')}), null);
             ? `"${it.name}", ${javaLit(idParamType('remove'), 'example_id')}`
             : `"${it.name}", ${javaLit(it.type, 'example_' + it.name)}`)
         Content(`// Remove
-client.${accessor}(null).remove(${removePairs.length ? `Map.of(${removePairs.join(', ')})` : 'null'}, null);
+client.${accessor}(null).remove(${removePairs.length ? javaMapOf(removePairs) : 'null'}, null);
 `)
       }
       Content(`\`\`\`