@voxgig/sdkgen 4.5.0 → 4.5.2

package/bin/voxgig-sdkgen

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

package/package.json

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

package/project/.sdk/tm/clojure/src/sdk/core.clj

@@ -1012,8 +1012,12 @@
           config (or (oget ctx :config) (vs/jm))
           cfgopts (let [c (vs/getprop config "options")] (if (vs/ismap c) c (vs/jm)))
           optspec (vs/jm
-                   "apikey" "" "base" "http://localhost:8000" "prefix" "" "suffix" ""
-                   "auth" (vs/jm "prefix" "")
+                   "apikey" "" "secret" "" "base" "http://localhost:8000" "prefix" "" "suffix" ""
+                   ;; `basic` and `secret`: HTTP Basic Auth needs a second
+                   ;; credential and a flag to say the pair is Basic rather
+                   ;; than a single bearer token. Absent from the shape, a
+                   ;; client passing them is refused with "Unexpected keys".
+                   "auth" (vs/jm "prefix" "" "basic" false)
                    "headers" (vs/jm "`$CHILD`" "`$STRING`")
                    "allow" (vs/jm "method" "GET,PUT,POST,PATCH,DELETE,OPTIONS"
                                   "op" "create,update,load,list,remove,command,direct,graphql")

package/project/.sdk/tm/csharp/utility/MakeOptions.cs

@@ -150,12 +150,17 @@ public static partial class SdkUtility
         var optspec = new Dictionary<string, object?>
         {
             ["apikey"] = "",
+            ["secret"] = "",
             ["base"] = "http://localhost:8000",
             ["prefix"] = "",
             ["suffix"] = "",
+            // `basic` and `secret`: HTTP Basic Auth needs a second credential
+            // and a flag to say the pair is Basic rather than a single bearer
+            // token.
             ["auth"] = new Dictionary<string, object?>
             {
                 ["prefix"] = "",
+                ["basic"] = false,
             },
             ["headers"] = new Dictionary<string, object?>
             {

package/project/.sdk/tm/dart/lib/utility/MakeOptionsUtility.dart

@@ -21,10 +21,14 @@ dynamic makeOptions(dynamic ctx) {
   final optspec = {
     'apikey': '',
     'base': 'http://localhost:8000',
+    'secret': '',
     'prefix': '',
     'suffix': '',
+    // `basic` and `secret`: HTTP Basic Auth needs a second credential and a
+    // flag to say the pair is Basic rather than a single bearer token.
     'auth': {
       'prefix': '',
+      'basic': false,
     },
     'headers': {
       '`\$CHILD`': '`\$STRING`',

package/project/.sdk/tm/elixir/lib/projectname/utility.ex

@@ -285,10 +285,13 @@ defmodule ProjectName.Utility do
     optspec =
       H.deep(%{
         "apikey" => "",
+        "secret" => "",
         "base" => "http://localhost:8000",
         "prefix" => "",
         "suffix" => "",
-        "auth" => %{"prefix" => ""},
+        # `basic` and `secret`: HTTP Basic Auth needs a second credential and
+        # a flag to say the pair is Basic rather than a single bearer token.
+        "auth" => %{"prefix" => "", "basic" => false},
         "headers" => %{"`$CHILD`" => "`$STRING`"},
         "allow" => %{
           "method" => "GET,PUT,POST,PATCH,DELETE,OPTIONS",

package/project/.sdk/tm/lua/utility/struct/struct.lua

@@ -1440,7 +1440,15 @@ local function merge(val, maxdepth)
         -- Descend into override node.
         else
           -- Descend into destination node using same key.
-          dst[pI + 1] = 0 < pI and getprop(dst[pI], key) or dst[pI + 1]
+          -- NOT `a and b or c`: that idiom silently yields `c` whenever `b`
+          -- is falsy, and `getprop` returns exactly that for a key the
+          -- destination does not have. `dst[pI + 1]` then kept the PREVIOUS
+          -- sibling's destination node, so the next key descended into it:
+          -- merging {auth={prefix}} with {auth={...}, feature={...}} left
+          -- `auth` and `feature` as ONE table holding the union of both.
+          if 0 < pI then
+            dst[pI + 1] = getprop(dst[pI], key)
+          end
           local tval = dst[pI + 1]
 
           -- Destination empty, so create node (unless override is class instance).

package/project/.sdk/tm/ocaml/sdk_runtime.ml

@@ -937,10 +937,13 @@ let fetcher_util (ctx : ctx) (fullurl : string) (fetchdef : value) : (value * sd
 let opt_spec_value () : value =
   jo [
     ("apikey", Str "");
+    ("secret", Str "");
     ("base", Str "http://localhost:8000");
     ("prefix", Str "");
     ("suffix", Str "");
-    ("auth", jo [("prefix", Str "")]);
+    (* `basic` and `secret`: HTTP Basic Auth needs a second credential and a
+       flag to say the pair is Basic rather than a single bearer token. *)
+    ("auth", jo [("prefix", Str ""); ("basic", Bool false)]);
     ("headers", jo [("`$CHILD`", Str "`$STRING`")]);
     ("allow", jo [("method", Str "GET,PUT,POST,PATCH,DELETE,OPTIONS");
                   ("op", Str "create,update,load,list,remove,command,direct,graphql")]);

package/project/.sdk/tm/perl/utility/make_options.pm

@@ -108,9 +108,12 @@ $REGISTRY{make_options} = sub {
   my $optspec = {
     'apikey' => '',
     'base' => 'http://localhost:8000',
+    'secret' => '',
     'prefix' => '',
     'suffix' => '',
-    'auth' => { 'prefix' => '' },
+    # `basic` and `secret`: HTTP Basic Auth needs a second credential and a
+    # flag to say the pair is Basic rather than a single bearer token.
+    'auth' => { 'prefix' => '', 'basic' => $JF },
     'headers' => { '`$CHILD`' => '`$STRING`' },
     'allow' => {
       'method' => 'GET,PUT,POST,PATCH,DELETE,OPTIONS',

package/project/.sdk/tm/rb/utility/make_options.rb

@@ -69,9 +69,12 @@ module ProjectNameUtilities
     optspec = {
       "apikey" => "",
       "base" => "http://localhost:8000",
+      "secret" => "",
       "prefix" => "",
       "suffix" => "",
-      "auth" => { "prefix" => "" },
+      # `basic` and `secret`: HTTP Basic Auth needs a second credential and
+      # a flag to say the pair is Basic rather than a single bearer token.
+      "auth" => { "prefix" => "", "basic" => false },
       "headers" => { "`$CHILD`" => "`$STRING`" },
       "allow" => {
         "method" => "GET,PUT,POST,PATCH,DELETE,OPTIONS",

package/project/sdkgen-package.json

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