@voxgig/sdkgen 4.2.0 → 4.2.2

package/project/.sdk/tm/elixir/lib/utility/struct/voxgig_struct.ex

@@ -50,14 +50,26 @@ defmodule Voxgig.Struct do
     id
   end
 
+  # ensure_heap here too, not only in alloc. A named ETS table belongs to the
+  # process that created it and dies with it — and ExUnit runs each test in its
+  # own process, so a table created by an alloc in one test is gone by the
+  # next. hget then raised ArgumentError ("the table identifier does not refer
+  # to an existing ETS table") from whichever unrelated test happened to run
+  # second, which is why this surfaced as a pipeline/netsim failure rather than
+  # as anything to do with the heap.
   defp hget(id) do
+    ensure_heap()
+
     case :ets.lookup(@heap, id) do
       [{_, c}] -> c
       _ -> nil
     end
   end
 
-  defp hset(id, contents), do: :ets.insert(@heap, {id, contents})
+  defp hset(id, contents) do
+    ensure_heap()
+    :ets.insert(@heap, {id, contents})
+  end
 
   defp vmap_new(pairs), do: {:vmap, alloc(pairs)}
   defp vlist_new(items), do: {:vlist, alloc(items)}

package/project/sdkgen-package.json

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

package/src/helpers/canonType.ts

@@ -182,6 +182,43 @@ function canonKey(sentinel: unknown): string {
 }
 
 
+// The bare key of the sentinel a VALUE of this type must satisfy, resolving
+// the union sentinel `['`$ONE`', [member, ...]]` to its first non-NULL member
+// (recursively — a member may itself be a union).
+//
+// canonKey alone cannot do this: given an array it stringifies it, so a
+// nullable `['`$ONE`', ['`$NUMBER`','`$NULL`']]` field yields neither NUMBER
+// nor anything else recognizable and every caller falls through to its
+// "unknown, use a string" branch. canonToType meanwhile renders that same
+// sentinel as `number | null`, so the doc example said `'..._id'` while the
+// generated type said `number` — a TS2322 in the SDK's own README, which is
+// exactly the disagreement the example helpers exist to prevent.
+//
+// A union of nothing but NULL resolves to NULL; an unrecognized array shape,
+// or an empty member list, resolves to '' (unknown) like any missing
+// sentinel.
+function canonScalarKey(sentinel: unknown): string {
+  if (Array.isArray(sentinel)) {
+    if ('ONE' !== canonKey(sentinel[0]) || !Array.isArray(sentinel[1])) {
+      return ''
+    }
+    let sawNull = false
+    for (const member of sentinel[1]) {
+      const key = canonScalarKey(member)
+      if ('NULL' === key) {
+        sawNull = true
+        continue
+      }
+      if ('' !== key) {
+        return key
+      }
+    }
+    return sawNull ? 'NULL' : ''
+  }
+  return canonKey(sentinel)
+}
+
+
 // Map a field/param type sentinel to a target-language primitive type.
 // Unknown or missing sentinel -> that language's "any" (never throws).
 //
@@ -220,6 +257,7 @@ export {
   canonToType,
   canonToDtype,
   canonKey,
+  canonScalarKey,
   CANON_TYPE,
   CANON_ANY,
   CANON_UNION_JOIN,

package/src/sdkgen.ts

@@ -57,7 +57,7 @@ import { buildIdNames } from './helpers/buildIdNames'
 import { getMatchEntries } from './helpers/getMatchEntries'
 import { collectDeps } from './helpers/collectDeps'
 import type { DepEntry } from './helpers/collectDeps'
-import { canonToType, canonToDtype, canonKey } from './helpers/canonType'
+import { canonToType, canonToDtype, canonKey, canonScalarKey } from './helpers/canonType'
 import { OP_SUFFIX, opTypeName, opParams, ownPoint, opActions, entityActions, entityPath, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection } from './helpers/opShape'
 import { isReservedName, safeVarName, exampleVarName, phpEntityAccessor, entityCacheField, isRbCoreConstant, isRbSdkConstant, rbSafeTypeName, isSwiftSdkType, swiftSafeTypeName, isPhpReservedType, phpSafeTypeName, isTsReservedType, tsSafeTypeName, jsProp, jsOptProp, jsKey } from './helpers/naming'
 import { serverVariables, hasServerVariables } from './helpers/serverVars'
@@ -1059,6 +1059,7 @@ export {
   canonToType,
   canonToDtype,
   canonKey,
+  canonScalarKey,
 
   OP_SUFFIX,
   opTypeName,