@voxgig/sdkgen 4.8.2 → 4.8.3

package/project/.sdk/tm/ts/test/vendor/omni/index.ts

@@ -1,5 +1,5 @@
-// VENDORED: @voxgig/omni 0.1.2 (typescript/src/index.ts)
-// Source: https://github.com/voxgig/omni @ 5956cc4e5ecdaeebd11eab8bb4b9462dfc76e018
+// VENDORED: @voxgig/omni 0.1.4 (typescript/src/index.ts)
+// Source: https://github.com/voxgig/omni @ 8c3e1b573a8d35796f7fc45e3226b977023cabf7  [tag: sdk-20260904-1610-0]
 // License: MIT (c) voxgig - see repository LICENSE. Do not edit: resync from upstream.
 // @voxgig/omni - shared multi-language test runner.
 

package/project/.sdk/tm/zig/test/primary_utility_test.zig

@@ -356,7 +356,7 @@ test "primary new sdk smoke" {
 // ---------------------------------------------------------------------------
 
 const runner = @import("struct_runner.zig");
-const vs = @import("../utility/voxgigstruct/struct.zig");
+const vs = @import("voxgig-struct");
 
 const StdJson = std.json.Value;
 

package/project/.sdk/tm/zig/test/struct_runner.zig

@@ -2,7 +2,6 @@
 // against subject functions, mirroring the TS/Go runner pattern.
 
 const std = @import("std");
-const regex = @import("../utility/voxgigstruct/regex.zig");
 const voxgig_struct = @import("voxgig-struct");
 
 const Allocator = std.mem.Allocator;
@@ -322,9 +321,11 @@ pub fn matchval(alloc: Allocator, check: StdJsonValue, base: StdJsonValue) bool
         // A /pattern/ is a regex over the stringified base.
         if (2 <= c.len and c[0] == '/' and c[c.len - 1] == '/') {
             const pat = c[1 .. c.len - 1];
-            var re = regex.compile(alloc, pat) orelse return false;
-            defer re.deinit();
-            return re.isMatch(basestr);
+            // Through the MODULE, never `../utility/voxgigstruct/regex.zig`:
+            // a file may belong to exactly one module, and regex.zig already
+            // belongs to voxgig-struct. Importing it by path a second time is
+            // "file exists in multiple modules".
+            return voxgig_struct.re_test(pat, basestr);
         }
 
         // Otherwise a case-insensitive substring, as the reference does.

package/project/sdkgen-package.json

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

package/src/action/doctor.ts

@@ -128,6 +128,11 @@ type DoctorReport = {
   // Project-owned components the scaffold never shipped. NOT drift.
   additive: string[]
 
+  // Generated files the model declares RETIRED (`target.superseded`) that
+  // still sit in the target output directories — the old runner beside its
+  // replacement. `doctor prune` deletes exactly these.
+  superseded: string[]
+
   // Root-level components this sdkgen provides that the project's root
   // wiring never calls. Informational: opting out is legitimate.
   unwired: string[]
@@ -151,6 +156,7 @@ type DoctorReport = {
 
 const CMD_MAP: any = {
   check: cmd_doctor_check,
+  prune: cmd_doctor_prune,
 }
 
 
@@ -173,6 +179,57 @@ async function cmd_doctor_check(_args: string[], actx: ActionContext): Promise<A
 }
 
 
+// `doctor prune` — the ONE write doctor performs, and only ever of files a
+// target's model DECLARES superseded (retired templates jostraca cannot
+// delete from a consumer: the old runner beside its replacement, a
+// pre-reshape vendored file). Everything else doctor does stays read-only.
+async function cmd_doctor_prune(_args: string[], actx: ActionContext): Promise<ActionResult> {
+  const log = actx.log
+  const fs = actx.fs()
+
+  const found = supersededFiles(actx)
+  const pruned: string[] = []
+
+  for (const abs of found) {
+    fs.unlinkSync(abs)
+    pruned.push(abs)
+    log.info({ point: 'doctor-prune', file: abs, note: 'pruned superseded: ' + abs })
+  }
+
+  log.info({
+    point: 'doctor-prune-end', pruned: pruned.length,
+    note: 0 === pruned.length ? 'nothing superseded to prune' :
+      ('pruned ' + pruned.length + ' superseded file(s)')
+  })
+
+  return { report: { pruned, ok: true } }
+}
+
+
+// Generated files the model says this toolchain NO LONGER writes, that
+// still exist in the project's target output directories. Paths in the
+// model are relative to each target's output dir (a sibling of `.sdk/`,
+// named for the target).
+function supersededFiles(actx: ActionContext): string[] {
+  const fs = actx.fs()
+  const model = actx.model
+  const root = actx.folder
+
+  const targets = (model as any)?.main?.[KIT]?.target ?? {}
+
+  const found: string[] = []
+  for (const tname of Object.keys(targets).sort()) {
+    for (const rel of (targets[tname].superseded || [])) {
+      const abs = Path.join(root, '..', tname, String(rel))
+      if (fs.existsSync(abs)) {
+        found.push(abs)
+      }
+    }
+  }
+  return found
+}
+
+
 // Narrows the check to particular items — `package update` runs doctor as
 // its pre-check and needs the verdict for ONE package's items, not the
 // project's. Reusing the real comparison rather than writing a second one is
@@ -193,9 +250,14 @@ async function doctor(
 
   const report: DoctorReport = {
     forked: [], edited: [], stale: [], missing: [], additive: [],
-    unwired: [], resyncPending: [], aliasedDiff: [], ok: true,
+    superseded: [], unwired: [], resyncPending: [], aliasedDiff: [], ok: true,
   }
 
+  // Retired-output leftovers first: purely model-driven, and a finding —
+  // two copies of the same machinery, one stale, is exactly the state the
+  // migration guide had to clean up by hand three times.
+  report.superseded = supersededFiles(actx)
+
   // EVERY KIND, not just targets.
   //
   // `add` writes a copied model file for each kind — `model/target/<t>.aon`
@@ -283,7 +345,7 @@ async function doctor(
   }
 
   report.ok = 0 === report.forked.length + report.edited.length +
-    report.stale.length + report.missing.length
+    report.stale.length + report.missing.length + report.superseded.length
 
   for (const [kind, note] of [
     ['forked', 'FORKED (will be reverted by `target add`)'],
@@ -291,6 +353,7 @@ async function doctor(
     ['stale', 'STALE (no longer written by `target add`)'],
     ['missing', 'MISSING (would be written by `target add`)'],
     ['additive', 'additive (project-owned, not drift)'],
+    ['superseded', 'SUPERSEDED generated output (run `doctor prune` to delete)'],
     ['unwired', 'NOT WIRED IN (root capability this project is missing)'],
     ['resyncPending', 'RESYNC PENDING (predates provenance; `target add` updates it)'],
     ['aliasedDiff', 'aliased model differs from its origin (project-owned, not drift)'],
@@ -308,6 +371,7 @@ async function doctor(
     stale: report.stale.length,
     missing: report.missing.length,
     additive: report.additive.length,
+    superseded: report.superseded.length,
     unwired: report.unwired.length,
     resyncPending: report.resyncPending.length,
     aliasedDiff: report.aliasedDiff.length,

package/src/helpers/naming.ts

@@ -148,6 +148,8 @@ const RB_SDK_CONSTANTS = new Set<string>([
   // vendored struct library and its test scaffolding
   'StructRunner', 'StructTestClient', 'StructUtilityTest', 'VoxgigStruct',
   'STRUCT_TEST_JSON_FILE',
+  // vendored omni runner and its smoke test (vendor-tag rollout)
+  'VoxgigOmni', 'OmniSmokeTest',
   // the generated/templated test classes
   'ExistsTest', 'FeatureCorpusTest', 'FeatureTest', 'NetsimTest',
   'PipelineTest', 'PrimaryUtilityTest', 'ReadmeExamplesTest',
@@ -330,8 +332,8 @@ function isPhpReservedType(Name: string): boolean {
 const PHP_SDK_CLASSES = new Set<string>([
   // the generated/templated test classes
   'existstest', 'featurecorpustest', 'featuretest', 'netsimtest',
-  'pipelinetest', 'primaryutilitytest', 'readmeexamplestest',
-  'structutilitytest',
+  'omnismoketest', 'pipelinetest', 'primaryutilitytest',
+  'readmeexamplestest', 'structutilitytest',
   // helper classes those suites declare beside them
   'ftclient', 'ftclock', 'ftctrl', 'ftentity', 'ftharness', 'ftrecorder',
   'plclient', 'plentity', 'plentityitem',

package/project/.sdk/tm/c/tests/runner.h

@@ -1,274 +0,0 @@
-/* Voxgig Struct corpus runner — C port.
- * Mirrors cpp/tests/runner.hpp.
- */
-
-#ifndef VOXGIG_STRUCT_RUNNER_H
-#define VOXGIG_STRUCT_RUNNER_H
-
-#include "voxgig_struct.h"
-
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Subject: function from input value to output value.
- * On error, the subject may set *err to an error message (caller-owned char*).
- */
-typedef voxgig_value* (*runner_subject_fn)(voxgig_value* in, char** err, void* ud);
-
-typedef struct runner_result {
-  char* name;
-  int passed;
-  int total;
-  /* Failure messages (owned). */
-  size_t fail_len;
-  size_t fail_cap;
-  char** failures;
-} runner_result;
-
-static inline void runner_result_init(runner_result* r, const char* name) {
-  r->name = strdup(name);
-  r->passed = 0;
-  r->total = 0;
-  r->fail_len = 0;
-  r->fail_cap = 0;
-  r->failures = NULL;
-}
-
-static inline void runner_result_free(runner_result* r) {
-  free(r->name);
-  for (size_t i = 0; i < r->fail_len; i++)
-    free(r->failures[i]);
-  free(r->failures);
-}
-
-static inline void runner_push_failure(runner_result* r, const char* msg) {
-  if (r->fail_len + 1 > r->fail_cap) {
-    size_t nc = r->fail_cap == 0 ? 8 : r->fail_cap * 2;
-    r->failures = (char**)realloc(r->failures, nc * sizeof(char*));
-    r->fail_cap = nc;
-  }
-  r->failures[r->fail_len++] = strdup(msg);
-}
-
-/* Normalize: turn integer-valued doubles into ints; sort map keys; sentinels and
- * undef → null for stable comparison. */
-static voxgig_value* normalize(const voxgig_value* v) {
-  if (!v || voxgig_is_undef(v) || voxgig_is_null(v))
-    return voxgig_new_null();
-  if (voxgig_is_double(v)) {
-    double d = voxgig_as_double(v);
-    if (isfinite(d) && floor(d) == d)
-      return voxgig_new_int((int64_t)d);
-    return voxgig_new_double(d);
-  }
-  if (voxgig_is_list(v)) {
-    voxgig_value* out = voxgig_new_list();
-    voxgig_list* l = voxgig_as_list(v);
-    for (size_t i = 0; i < l->len; i++) {
-      voxgig_list_push(voxgig_as_list(out), normalize(l->items[i]));
-    }
-    return out;
-  }
-  if (voxgig_is_map(v)) {
-    /* Sort by key (alphabetical). */
-    voxgig_map* m = voxgig_as_map(v);
-    size_t n = m->len;
-    size_t* idx = (size_t*)malloc(n * sizeof(size_t) + 1);
-    for (size_t i = 0; i < n; i++)
-      idx[i] = i;
-    for (size_t i = 1; i < n; i++) {
-      size_t j = i;
-      while (j > 0 && strcmp(m->entries[idx[j - 1]].key, m->entries[idx[j]].key) > 0) {
-        size_t t = idx[j - 1];
-        idx[j - 1] = idx[j];
-        idx[j] = t;
-        j--;
-      }
-    }
-    voxgig_value* out = voxgig_new_map();
-    for (size_t i = 0; i < n; i++) {
-      voxgig_map_set(voxgig_as_map(out), m->entries[idx[i]].key,
-                     normalize(m->entries[idx[i]].value));
-    }
-    free(idx);
-    return out;
-  }
-  return voxgig_clone((voxgig_value*)v);
-}
-
-static bool deep_equal(const voxgig_value* a, const voxgig_value* b) {
-  voxgig_value* na = normalize(a);
-  voxgig_value* nb = normalize(b);
-  bool eq = voxgig_equals(na, nb);
-  voxgig_release(na);
-  voxgig_release(nb);
-  return eq;
-}
-
-static char* brief(const voxgig_value* v) {
-  if (!v || voxgig_is_undef(v))
-    return strdup("__UNDEF__");
-  char* s = voxgig_jsonify((voxgig_value*)v, NULL);
-  if (!s)
-    return strdup("?");
-  size_t n = strlen(s);
-  if (n > 200) {
-    s[197] = '\0';
-    char* tmp = (char*)malloc(202);
-    snprintf(tmp, 202, "%s...", s);
-    free(s);
-    return tmp;
-  }
-  return s;
-}
-
-__attribute__((unused)) static void str_lower(char* s) {
-  for (; *s; s++)
-    *s = (char)tolower((unsigned char)*s);
-}
-
-/* Deep-copy `v`, replacing every JSON null with the marker string "__NULL__".
- * Mirrors what the TS / JS / Py / Go / Lua runners do under their null flag —
- * the corpus uses null in source to mean "JSON null" but every runner
- * substitutes a string marker so comparisons can be done in JSON-poor
- * languages. */
-__attribute__((unused)) static voxgig_value* null_substitute(voxgig_value* v) {
-  if (!v || voxgig_is_undef(v))
-    return voxgig_new_undef();
-  if (voxgig_is_null(v))
-    return voxgig_new_string("__NULL__");
-  if (voxgig_is_list(v)) {
-    voxgig_value* out = voxgig_new_list();
-    voxgig_list* l = voxgig_as_list(v);
-    for (size_t i = 0; i < l->len; i++)
-      voxgig_list_push(voxgig_as_list(out), null_substitute(l->items[i]));
-    return out;
-  }
-  if (voxgig_is_map(v)) {
-    voxgig_value* out = voxgig_new_map();
-    voxgig_map* m = voxgig_as_map(v);
-    for (size_t i = 0; i < m->len; i++)
-      voxgig_map_set(voxgig_as_map(out), m->entries[i].key, null_substitute(m->entries[i].value));
-    return out;
-  }
-  return voxgig_clone(v);
-}
-
-static void run_subject(runner_result* res, voxgig_value* testspec, bool null_flag,
-                        runner_subject_fn subj, void* ud) {
-  voxgig_value* setk = voxgig_new_string("set");
-  voxgig_value* set = voxgig_getprop(testspec, setk, NULL);
-  voxgig_release(setk);
-  if (!voxgig_is_list(set)) {
-    voxgig_release(set);
-    return;
-  }
-  voxgig_list* sl = voxgig_as_list(set);
-  for (size_t i = 0; i < sl->len; i++) {
-    voxgig_value* eo = sl->items[i];
-    if (!voxgig_is_map(eo))
-      continue;
-    /* Use voxgig_map_get directly: voxgig_haskey treats null at a key as "no value"
-       (Group A rule), but the runner needs literal presence to preserve
-       test inputs like { in: null } where null IS the value to pass. */
-    voxgig_value* in_raw_ptr = voxgig_map_get(voxgig_as_map(eo), "in");
-    bool has_in = (in_raw_ptr != NULL);
-    voxgig_value* in_raw = in_raw_ptr ? voxgig_retain(in_raw_ptr) : voxgig_new_undef();
-    voxgig_value* in = has_in ? voxgig_clone(in_raw) : voxgig_new_undef();
-    voxgig_value* out_raw_ptr = voxgig_map_get(voxgig_as_map(eo), "out");
-    bool has_out = (out_raw_ptr != NULL);
-    voxgig_value* expected = NULL;
-    if (has_out)
-      expected = voxgig_retain(out_raw_ptr);
-    else if (null_flag)
-      expected = voxgig_new_null();
-    else
-      expected = voxgig_new_undef();
-    voxgig_value* err_ptr = voxgig_map_get(voxgig_as_map(eo), "err");
-    voxgig_value* err_v = err_ptr ? voxgig_retain(err_ptr) : voxgig_new_undef();
-
-    res->total++;
-    char* err_msg = NULL;
-    voxgig_value* got = subj(in, &err_msg, ud);
-
-    if (!voxgig_is_undef(err_v)) {
-      /* Test expects an error. Check if err_msg was set. */
-      bool match = false;
-      if (err_msg) {
-        if (voxgig_is_bool(err_v) && voxgig_as_bool(err_v)) {
-          match = true;
-        } else if (voxgig_is_string(err_v)) {
-          const char* es = voxgig_as_string(err_v);
-          if (!es || !*es)
-            match = true;
-          else if (strstr(err_msg, es))
-            match = true;
-          else {
-            /* Case-insensitive substring. */
-            char* lm = strdup(err_msg);
-            char* le = strdup(es);
-            str_lower(lm);
-            str_lower(le);
-            if (strstr(lm, le))
-              match = true;
-            free(lm);
-            free(le);
-          }
-        }
-      }
-      if (match) {
-        res->passed++;
-      } else {
-        char* gs = brief(got);
-        char* es = brief(err_v);
-        char buf[2048];
-        snprintf(buf, sizeof(buf), "[%zu] err mode (expected '%s' got err='%s' val=%s)", i, es,
-                 err_msg ? err_msg : "(no err)", gs);
-        runner_push_failure(res, buf);
-        free(gs);
-        free(es);
-      }
-      free(err_msg);
-      voxgig_release(got);
-      voxgig_release(err_v);
-      voxgig_release(in);
-      voxgig_release(in_raw);
-      voxgig_release(expected);
-      continue;
-    }
-
-    if (err_msg) {
-      char* gs = brief(got);
-      char* ins = brief(in_raw);
-      char buf[2048];
-      snprintf(buf, sizeof(buf), "[%zu] in=%s threw='%s' got=%s", i, ins, err_msg, gs);
-      runner_push_failure(res, buf);
-      free(gs);
-      free(ins);
-    } else if (deep_equal(got, expected)) {
-      res->passed++;
-    } else {
-      char* gs = brief(got);
-      char* es = brief(expected);
-      char* ins = brief(in_raw);
-      char buf[2048];
-      snprintf(buf, sizeof(buf), "[%zu] in=%s expected=%s got=%s", i, ins, es, gs);
-      runner_push_failure(res, buf);
-      free(gs);
-      free(es);
-      free(ins);
-    }
-    free(err_msg);
-    voxgig_release(got);
-    voxgig_release(err_v);
-    voxgig_release(in);
-    voxgig_release(in_raw);
-    voxgig_release(expected);
-  }
-  voxgig_release(set);
-}
-
-#endif