@voxgig/sdkgen 4.17.0 → 4.17.1

package/bin/voxgig-sdkgen

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

package/package.json

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

package/project/.sdk/tm/c/Makefile

@@ -15,8 +15,10 @@ CFLAGS ?= -std=c11 -Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE -O0 -g
 # point.h / types.h shadow nothing: the SDK's own value.h (utility/struct)
 # is reached by its neighbours through the including file's directory,
 # which a quoted include searches before any -I.
-PAYLOAD_DIRS := $(patsubst %/,%,$(wildcard feature/*/*/))
-INC := -I core -I utility/struct -I feature $(addprefix -I ,$(PAYLOAD_DIRS))
+PAYLOAD_DIRS := $(sort $(dir $(wildcard feature/*/*/*.h)))
+# Payload headers are quoted includes; they must not shadow system headers
+# such as <regex.h> with the plugin library's own regex.h.
+INC := -I core -I utility/struct -I feature $(addprefix -iquote ,$(PAYLOAD_DIRS))
 # The vendored omni test runner (tests/vendor/omni) is TEST-ONLY: it is
 # reachable from tests/ alone, never from LIB_SRCS, so it cannot enter the
 # shipped libsdk.a. That is why it lives under tests/ and not utility/.
@@ -74,6 +76,18 @@ all: build
 
 build: libsdk.a
 
+# Keep this before the generic rule for GNU make 3.81 on macOS.
+# omni's util.c includes <regex.h>. CFLAGS is `?=`, so an operator override
+# can drop the -D_GNU_SOURCE that exposes it; -D_POSIX_C_SOURCE is the
+# minimum omni itself compiles under (its own test/run.c sets exactly this).
+# _DARWIN_C_SOURCE is needed BESIDE it, not instead of it: on Darwin,
+# defining _POSIX_C_SOURCE alone LOWERS __DARWIN_C_LEVEL and hides regex_t,
+# so the same flag that exposes the header on glibc hides it on macOS. Each
+# platform ignores the other's macro.
+tests/vendor/omni/%.o: tests/vendor/omni/%.c
+	$(CC) $(CFLAGS) -D_POSIX_C_SOURCE=200809L -D_DARWIN_C_SOURCE -c $< -o $@
+
+
 %.o: %.c
 	$(CC) $(CFLAGS) $(INC) -c $< -o $@
 
@@ -87,15 +101,6 @@ libsdk.a: $(LIB_OBJS)
 	@rm -f $@
 	ar rcs $@ $(LIB_OBJS)
 
-# omni's util.c includes <regex.h>. CFLAGS is `?=`, so an operator override
-# can drop the -D_GNU_SOURCE that exposes it; -D_POSIX_C_SOURCE is the
-# minimum omni itself compiles under (its own test/run.c sets exactly this).
-# _DARWIN_C_SOURCE is needed BESIDE it, not instead of it: on Darwin,
-# defining _POSIX_C_SOURCE alone LOWERS __DARWIN_C_LEVEL and hides regex_t,
-# so the same flag that exposes the header on glibc hides it on macOS. Each
-# platform ignores the other's macro.
-tests/vendor/omni/%.o: tests/vendor/omni/%.c
-	$(CC) $(CFLAGS) -D_POSIX_C_SOURCE=200809L -D_DARWIN_C_SOURCE -c $< -o $@
 
 libomni.a: $(OMNI_OBJS)
 	@rm -f $@

package/project/.sdk/tm/c/feature/secrets/sekreto/json.c

@@ -93,7 +93,7 @@ static void pushitem(sek_pool *pool, sek_json *arr, sek_json *item) {
   arr->itemlen++;
 }
 
-static void setkey(sek_pool *pool, sek_json *obj, const char *key, sek_json *val) {
+static void sek_json_assign_member(sek_pool *pool, sek_json *obj, const char *key, sek_json *val) {
   size_t index;
 
   for (index = 0; index < obj->maplen; index++) {
@@ -128,7 +128,7 @@ void sek_json_push(sek_pool *pool, sek_json *arr, sek_json *item) {
 }
 
 void sek_json_set(sek_pool *pool, sek_json *obj, const char *key, sek_json *val) {
-  setkey(pool, obj, key, val);
+  sek_json_assign_member(pool, obj, key, val);
 }
 
 /* ---- reads --------------------------------------------------------- */
@@ -607,7 +607,7 @@ static sek_json *readobject(reader *rd) {
       return NULL;
     }
 
-    setkey(rd->pool, out, key, val);
+    sek_json_assign_member(rd->pool, out, key, val);
     skipspace(rd);
 
     if (rd->at >= rd->len) {

package/project/.sdk/tm/php/test/feature/secrets/SecretsTest.php

@@ -240,7 +240,7 @@ class ProjectNameSecretsTest extends TestCase
     // seeded data, a scripted response); an op the API does not define fails
     // before it reaches the transport, which is why several may need
     // driving.
-    private function driveUntil($client, string $what, callable $stop): void
+    private function driveUntil($client, string $what, callable $stop, ?callable $onError = null): void
     {
         foreach ($this->entityAccessors($client) as $accessor) {
             try {
@@ -255,7 +255,10 @@ class ProjectNameSecretsTest extends TestCase
                 try {
                     $ent->$opname();
                 } catch (\Throwable $e) {
-                    // The op's own failure is not the assertion.
+                    // The op's own failure is not the assertion unless observed.
+                    if ($onError !== null) {
+                        $onError($e);
+                    }
                 }
                 if ($stop()) {
                     return;
@@ -265,6 +268,20 @@ class ProjectNameSecretsTest extends TestCase
         $this->fail('no entity operation ' . $what . ' - nothing to assert on');
     }
 
+    // Capture a refusal from an operation this API actually defines.
+    private function entityError($client): ProjectNameError
+    {
+        $caught = null;
+        $this->driveUntil($client, 'returned an SDK error',
+            function () use (&$caught) { return $caught !== null; },
+            function (\Throwable $error) use (&$caught) {
+                if ($error instanceof ProjectNameError) {
+                    $caught = $error;
+                }
+            });
+        return $caught;
+    }
+
     // Drive ops until one request reached the recorder.
     private function driveOp($client, ProjectNameSecretsWire $wire): void
     {
@@ -469,15 +486,7 @@ class ProjectNameSecretsTest extends TestCase
             ]],
         ]);
 
-        $accessor = $this->entityAccessors($client)[0] ?? null;
-        $this->assertNotNull($accessor, 'no entity accessor - nothing to assert on');
-
-        $caught = null;
-        try {
-            $client->$accessor()->list();
-        } catch (ProjectNameError $e) {
-            $caught = $e;
-        }
+        $caught = $this->entityError($client);
 
         $this->assertNotNull($caught, 'the entity path must fail closed');
         $this->assertStringContainsString('vault unreachable', $caught->msg);
@@ -970,15 +979,8 @@ class ProjectNameSecretsTest extends TestCase
             ]],
         ]);
 
-        $accessor = $this->entityAccessors($client)[0] ?? null;
-        $this->assertNotNull($accessor);
-
-        try {
-            $client->$accessor()->list();
-            $this->fail('the op must fail closed');
-        } catch (ProjectNameError $e) {
-            // expected
-        }
+        $caught = $this->entityError($client);
+        $this->assertStringContainsString('vault unreachable', $caught->msg);
 
         $this->assertSame(1, $calls, 'the refusal must not be retried');
         $this->assertCount(0, $wire->calls);

package/project/sdkgen-package.json

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