@voxgig/sdkgen 4.32.1 → 4.34.0

package/project/.sdk/src/cmp/perl/fragment/Entity.fragment.pm

@@ -52,6 +52,19 @@ sub get_name {
   return $self->{_name};
 }
 
+# The entity serialises and prints as its data (clean honours TO_JSON),
+# never as the client it holds or the match it absorbed: a query
+# credential comes back in resmatch.
+sub TO_JSON {
+  my ($self) = @_;
+  return Voxgig::Struct::clone($self->{_data});
+}
+
+sub to_string {
+  my ($self) = @_;
+  return 'EntityName ' . Voxgig::Struct::jsonify($self->{_data});
+}
+
 sub make {
   my ($self) = @_;
   my $opts = { %{ $self->{_entopts} } };
@@ -179,13 +192,24 @@ sub stream {
 
   # Inbound: prefer the streaming feature's incremental iterator; else fall
   # back to the materialised items so stream() always yields.
+  # Each pull runs the source, so what it dies with leaves through the same
+  # catch path as the operation, and ends the stream.
   if ($result && ref $result->{stream} eq 'CODE') {
     my $src = $result->{stream};
     return sub {
       return undef if $aborted->();
-      my $item = $src->();
-      return undef unless defined $item;
-      return $unwrap->($item);
+      my $item = eval {
+        my $next = $src->();
+        defined $next ? $unwrap->($next) : undef;
+      };
+      if (my $operr = $@) {
+        $src = sub { return undef };
+        $ctx->{ctrl}{err} = $operr;
+        my $e = $self->_unexpected($ctx, $operr);
+        die $e if defined $e;
+        return undef;
+      }
+      return $item;
     };
   }
 
@@ -260,11 +284,49 @@ sub _run_op {
     $out;
   };
   if (my $operr = $@) {
-    # #PreUnexpected-Hook
+    $ctx->{ctrl}{err} = $operr;
 
-    die $operr;
+    # What a hook dies with here must not escape the cleaning below.
+    my $fired = eval {
+      # #PreUnexpected-Hook
+      1;
+    };
+    if (!$fired) {
+      $operr = $@;
+      $ctx->{ctrl}{err} = $operr;
+    }
+
+    my $e = $self->_unexpected($ctx, $operr);
+    die $e if defined $e;
+    return undef;
   }
   return $out;
 }
 
+# An exception the pipeline did not build still leaves through the
+# caller: it is cleaned, and so is the explain record it interrupted.
+# Answers undef when throwing is disabled, as the pipeline's own errors do.
+sub _unexpected {
+  my ($self, $ctx, $err) = @_;
+  my $clean = $self->{_utility}{clean};
+  my $explain = $ctx->{ctrl}{explain};
+  if (Voxgig::Struct::ismap($explain)) {
+    $self->{_utility}{clean_explain}->($ctx);
+    my $msg = "$err";
+    $msg =~ s/\s+\z//;
+    my $cleanerr = $clean->($ctx, {
+      'message' => $msg,
+      'class' => (Scalar::Util::blessed($err) || ref($err) || 'die'),
+    });
+    if (!Voxgig::Struct::ismap($explain->{err})) {
+      $explain->{err} = $cleanerr;
+    }
+    elsif (($explain->{err}{message} // '') ne $cleanerr->{message}) {
+      $explain->{unexpected} = $cleanerr;
+    }
+  }
+  return undef if defined $ctx->{ctrl}{throw_err} && !$ctx->{ctrl}{throw_err};
+  return $clean->($ctx, $err);
+}
+
 1;

package/project/.sdk/src/cmp/perl/fragment/Main.fragment.pm

@@ -116,6 +116,18 @@ sub get_root_ctx {
   return $self->{_rootctx};
 }
 
+# The options and the root context both hold the credential, so the
+# client's printed form is its name alone; `options_map` is the documented
+# way to read them back.
+sub TO_JSON {
+  return { 'name' => 'ProjectName' };
+}
+
+sub to_string {
+  my ($self) = @_;
+  return 'ProjectName ' . Voxgig::Struct::jsonify($self->TO_JSON);
+}
+
 # #SecretsAccessor
 sub prepare {
   my ($self, $fetchargs) = @_;
@@ -232,7 +244,7 @@ sub _raw_request {
   my $url = defined $fetchdef->{url} ? $fetchdef->{url} : '';
   my ($fetched, $fetch_err) = $utility->{fetcher}->($ctx, $url, $fetchdef);
 
-  return { 'ok' => 0, 'err' => $fetch_err } if $fetch_err;
+  return { 'ok' => 0, 'err' => $utility->{clean}->($ctx, $fetch_err) } if $fetch_err;
 
   if (!defined $fetched) {
     return {

package/project/.sdk/src/cmp/php/PrepareAuth_php.ts

@@ -217,6 +217,9 @@ function basicBlock(spec: AuthSpec): string {
             } else {
                 $auth_prefix = \\Voxgig\\Struct\\Struct::getpath($options, 'auth.prefix') ?? '';
                 $b64 = base64_encode("{$apikey_val}:{$secret_val}");
+                // The joined, encoded pair is a wire form neither credential's
+                // own registration covers.
+                ($ctx->utility->clean_add)($ctx, $b64);
                 $headers[self::HEADER_AUTH] = $auth_prefix === ''
                     ? $b64 : "{$auth_prefix} {$b64}";
             }