@voxgig/sdkgen 4.32.1 → 4.33.0

package/project/.sdk/src/cmp/go/Test_go.ts

@@ -9,6 +9,7 @@ import { cmp, each, Folder, File, Content, goModule, entityCollection,
 
 import { TestEntity } from './TestEntity_go'
 import { TestDirect } from './TestDirect_go'
+import { TestClean } from './TestClean_go'
 import { ReadmeExamplesTest } from './ReadmeExamplesTest_go'
 
 
@@ -47,6 +48,8 @@ func TestExists(t *testing.T) {
 `)
     })
 
+    TestClean({ target, gomodule })
+
     const entity = each(entityCollection(model))
       .filter((e: any) => false !== e.active)
 

package/project/.sdk/src/cmp/go/fragment/Entity.fragment.go

@@ -1,6 +1,9 @@
 package entity
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"GOMODULE/core"
 
 	vs "github.com/voxgig/struct"
@@ -50,6 +53,26 @@ func NewEntyClass(client *core.ProjectNameSDK, entopts map[string]any) *EntyClas
 
 func (e *EntyClass) GetName() string { return e.name }
 
+// An entity prints and serialises as its data, as ts's toString and toJSON
+// do: the match state can carry a query credential, and the client holds
+// the options.
+func (e *EntyClass) String() string {
+	return "EntityName " + vs.Jsonify(e.data, map[string]any{"indent": 0})
+}
+
+func (e *EntyClass) GoString() string {
+	return e.String()
+}
+
+func (e *EntyClass) MarshalJSON() ([]byte, error) {
+	out := map[string]any{}
+	for k, v := range e.data {
+		out[k] = v
+	}
+	out["voxgig$entity"] = "EntityName"
+	return json.Marshal(out)
+}
+
 func (e *EntyClass) MarkDeleted() {
 	e.deleted = true
 }
@@ -173,6 +196,15 @@ func (e *EntyClass) Stream(action string, args map[string]any, callopts map[stri
 	go func() {
 		defer close(out)
 
+		// With no error channel, a panicking hook or stream function ends the
+		// stream as runOp's error would. A goroutine the stream function
+		// starts is out of reach of this recover.
+		defer func() {
+			if r := recover(); r != nil {
+				e.recovered(ctx, r)
+			}
+		}()
+
 		utility.FeatureHook(ctx, "PrePoint")
 		point, err := utility.MakePoint(ctx)
 		ctx.Out["point"] = point
@@ -213,6 +245,8 @@ func (e *EntyClass) Stream(action string, args map[string]any, callopts map[stri
 		// Inbound: prefer the streaming feature's incremental iterator; else
 		// fall back to the materialised items so Stream always yields.
 		if ctx.Result != nil && ctx.Result.Stream != nil {
+			// Done does not run on this path, so its record is cleaned here.
+			utility.CleanExplain(ctx)
 			for item := range ctx.Result.Stream() {
 				if !send(item) {
 					return
@@ -252,9 +286,15 @@ func (e *EntyClass) Stream(action string, args map[string]any, callopts map[stri
 
 // #RemoveOp
 
-func (e *EntyClass) runOp(ctx *core.Context, postDone func()) (any, error) {
+func (e *EntyClass) runOp(ctx *core.Context, postDone func()) (out any, err error) {
 	utility := e.utility
 
+	defer func() {
+		if r := recover(); r != nil {
+			out, err = e.recovered(ctx, r)
+		}
+	}()
+
 	// #PrePoint-Hook
 
 	point, err := utility.MakePoint(ctx)
@@ -299,9 +339,9 @@ func (e *EntyClass) runOp(ctx *core.Context, postDone func()) (any, error) {
 
 	postDone()
 
-	out, doneErr := utility.Done(ctx)
-	if doneErr != nil {
-		return out, doneErr
+	out, err = utility.Done(ctx)
+	if err != nil {
+		return out, err
 	}
 
 	opname := ""
@@ -318,3 +358,13 @@ func (e *EntyClass) runOp(ctx *core.Context, postDone func()) (any, error) {
 
 	return out, nil
 }
+
+// A hook, fetcher or parser that panics never reached MakeError, and its
+// message can quote the request.
+func (e *EntyClass) recovered(ctx *core.Context, r any) (any, error) {
+	perr, ok := r.(error)
+	if !ok {
+		perr = fmt.Errorf("%v", r)
+	}
+	return e.utility.MakeError(ctx, perr)
+}

package/project/.sdk/src/cmp/go/fragment/Main.fragment.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -84,6 +85,22 @@ func NewProjectNameSDK(options map[string]any) *ProjectNameSDK {
 	return sdk
 }
 
+// The client holds the credential in its options, so a print or a JSON dump
+// carries the name alone. Value receivers: a dereferenced client prints the
+// same way.
+func (sdk ProjectNameSDK) String() string {
+	return "ProjectName " + vs.Jsonify(map[string]any{"name": "ProjectName"},
+		map[string]any{"indent": 0})
+}
+
+func (sdk ProjectNameSDK) GoString() string {
+	return sdk.String()
+}
+
+func (sdk ProjectNameSDK) MarshalJSON() ([]byte, error) {
+	return json.Marshal(map[string]any{"name": "ProjectName"})
+}
+
 func (sdk *ProjectNameSDK) OptionsMap() map[string]any {
 	out := vs.Clone(sdk.options)
 	if om, ok := out.(map[string]any); ok {
@@ -210,7 +227,7 @@ func (sdk *ProjectNameSDK) rawRequest(fetchargs map[string]any) (map[string]any,
 
 	fetchdef, err := sdk.Prepare(fetchargs)
 	if err != nil {
-		return map[string]any{"ok": false, "err": err}, nil
+		return map[string]any{"ok": false, "err": sdk.cleanErr(sdk.rootctx, err)}, nil
 	}
 
 	if fetchargs == nil {
@@ -236,7 +253,7 @@ func (sdk *ProjectNameSDK) rawRequest(fetchargs map[string]any) (map[string]any,
 	fetched, fetchErr := utility.Fetcher(ctx, url, fetchdef)
 
 	if fetchErr != nil {
-		return map[string]any{"ok": false, "err": fetchErr}, nil
+		return map[string]any{"ok": false, "err": sdk.cleanErr(ctx, fetchErr)}, nil
 	}
 
 	if fetched == nil {
@@ -280,6 +297,14 @@ func (sdk *ProjectNameSDK) rawRequest(fetchargs map[string]any) (map[string]any,
 	return map[string]any{"ok": false, "err": ctx.MakeError("direct_invalid", "invalid response type")}, nil
 }
 
+// A raw request returns its error rather than passing it through MakeError.
+func (sdk *ProjectNameSDK) cleanErr(ctx *Context, err error) error {
+	if cleaned, ok := sdk.utility.Clean(ctx, err).(error); ok {
+		return cleaned
+	}
+	return err
+}
+
 func (sdk *ProjectNameSDK) Graphql(
 	query string, variables map[string]any, ctrl map[string]any,
 ) (map[string]any, error) {

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

@@ -123,6 +123,9 @@ final class PrepareAuth {
         }
         String b64 = Base64.getEncoder().encodeToString(
             ((String) apikey + ":" + (noSecret ? "" : (String) secret)).getBytes(StandardCharsets.UTF_8));
+        // The joined, encoded pair is a wire form neither credential's own
+        // registration covers.
+        ctx.utility.cleanAdd.apply(ctx, b64);
         if ("".equals(basicPrefix)) {
           headers.put(CRED_NAME, b64);
         }