@voxgig/sdkgen 4.2.2 → 4.2.3

package/bin/voxgig-sdkgen

@@ -8,7 +8,7 @@ const { Shape, One, Skip } = require('shape')
 
 const { SdkGen } = require('../dist/sdkgen.js')
 
-const VERSION = '4.2.2'
+const VERSION = '4.2.3'
 const KONSOLE = console
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "engines": {

package/project/.sdk/src/cmp/rust/MainEntity_rust.ts

@@ -7,7 +7,7 @@ import {
   getModelPath
 } from '@voxgig/apidef'
 
-import { rustVarName } from './utility_rust'
+import { rustVarName, rustMethodName } from './utility_rust'
 
 
 // Entity accessor method on the SDK client, injected at the Main fragment
@@ -19,7 +19,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
 
   const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
-  const method = rustVarName(entity.name)
+  const method = rustMethodName(entity.name)
   const mod = rustVarName(entity.name)
 
   Content(`

package/project/.sdk/src/cmp/rust/utility_rust.ts

@@ -18,6 +18,32 @@ const RUST_RESERVED = new Set<string>([
 ])
 
 
+// Method names on a generated struct that must never be an entity accessor.
+//
+// An entity called `clone` generated `pub fn clone(&self, Value)` on the SDK
+// struct, which SHADOWS Clone::clone — so every `sdk.clone()` the generated
+// code makes elsewhere resolved to the entity accessor and the crate failed
+// with "this method takes 1 argument but 0 arguments were supplied", 16 times
+// over, pointing at the call sites and never at the entity that caused it.
+// `new` would collide with the struct's own constructor the same way.
+//
+// These are not Rust keywords, so RUST_RESERVED does not catch them; they are
+// inherent or std-trait methods the generated code actually calls.
+const RUST_METHOD_RESERVED = new Set<string>([
+  'clone', 'new', 'default', 'drop', 'from', 'into', 'to_string',
+  'as_ref', 'as_mut', 'borrow', 'borrow_mut', 'deref', 'deref_mut',
+  'eq', 'ne', 'cmp', 'partial_cmp', 'hash', 'fmt', 'next', 'iter',
+])
+
+
+// A snake_case rust METHOD name for a model name — rustVarName, plus a guard
+// against shadowing a method the generated code calls on the same struct.
+function rustMethodName(name: string): string {
+  const ident = rustVarName(name)
+  return RUST_METHOD_RESERVED.has(ident) ? ident + '_' : ident
+}
+
+
 // A collision-free snake_case rust identifier for a model name.
 function rustVarName(name: string): string {
   let snake = name.replace(/[^a-zA-Z0-9_]/g, '_').toLowerCase()
@@ -170,6 +196,7 @@ function rustRawString(s: string): string {
 }
 
 export {
+  rustMethodName,
   rustRawString,
   clean,
   crateIdent,

package/project/sdkgen-package.json

@@ -3,7 +3,7 @@
     "package": 1
   },
   "name": "@voxgig/sdkgen",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "provides": {
     "target": [
       "c",