@voxgig/sdkgen 0.36.0 → 0.37.0

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

@@ -1394,7 +1394,17 @@ local function merge(val, maxdepth)
   end
 
   local list = val
+
+  -- Use rawlen or find max integer key to handle nil gaps in arrays.
   local lenlist = #list
+  if lenlist == 0 then
+    -- Check for nil gaps: find the actual max integer key.
+    for k in pairs(list) do
+      if type(k) == S_number and k > lenlist then
+        lenlist = k
+      end
+    end
+  end
 
   if lenlist == 0 then
     return NONE

package/project/.sdk/tm/php/feature/TestFeature.php

@@ -25,24 +25,26 @@ class ProjectNameTestFeature extends ProjectNameBaseFeature
         $this->client = $ctx->client;
         $this->options = $options;
 
-        $entity = \Voxgig\Struct\Struct::getprop($options, 'entity');
-        if (!is_array($entity)) {
-            $entity = [];
+        $entity_data = \Voxgig\Struct\Struct::getprop($options, 'entity');
+        if (!is_array($entity_data)) {
+            $entity_data = [];
         }
 
         $this->client->mode = 'test';
 
         // Ensure entity ids are correct.
-        \Voxgig\Struct\Struct::walk($entity, function ($key, $val, $parent, $path) {
+        \Voxgig\Struct\Struct::walk($entity_data, function ($key, $val, $parent, $path) {
             if (count($path) === 2 && is_array($val) && $key !== null) {
                 $val['id'] = $key;
             }
             return $val;
         });
 
-        $test_self = $this;
+        // Wrap in object so closure mutations persist (PHP arrays are value types).
+        $entity = new \stdClass();
+        $entity->data = $entity_data;
 
-        $test_fetcher = function (ProjectNameContext $fctx, string $_fullurl, array $_fetchdef) use ($entity, $test_self): array {
+        $test_fetcher = function (ProjectNameContext $fctx, string $_fullurl, array $_fetchdef) use ($entity): array {
             $respond = function (int $status, mixed $data, ?array $extra): array {
                 $out = [
                     'status' => $status,
@@ -59,83 +61,90 @@ class ProjectNameTestFeature extends ProjectNameBaseFeature
             };
 
             $op = $fctx->op;
-            $entmap = \Voxgig\Struct\Struct::getprop($entity, $op->entity);
-            if (!is_array($entmap)) {
-                $entmap = [];
-            }
+            $entname = $op->entity;
+            $entmap = is_array($entity->data[$entname] ?? null) ? $entity->data[$entname] : [];
+
+            // Extract id from context: reqmatch for load/remove, reqdata for update/create.
+            $get_id = function () use ($fctx) {
+                $sources = [$fctx->reqmatch, $fctx->reqdata, $fctx->data];
+                foreach ($sources as $src) {
+                    if (is_array($src) && isset($src['id']) && $src['id'] !== '__UNDEFINED__') {
+                        return $src['id'];
+                    }
+                }
+                return null;
+            };
 
             if ($op->name === 'load') {
-                $args = $test_self->build_args($fctx, $op, $fctx->reqmatch);
-                $found = \Voxgig\Struct\Struct::select($entmap, $args);
-                $ent = \Voxgig\Struct\Struct::getelem($found, 0);
+                $id = $get_id();
+                $ent = ($id !== null && isset($entmap[$id])) ? $entmap[$id] : null;
+                if (!$ent) {
+                    // Fallback: search by id field value
+                    foreach ($entmap as $e) {
+                        if (is_array($e) && ($e['id'] ?? null) === $id) { $ent = $e; break; }
+                    }
+                }
                 if (!$ent) {
                     return $respond(404, null, ['statusText' => 'Not found']);
                 }
-                \Voxgig\Struct\Struct::delprop($ent, '$KEY');
                 $out = \Voxgig\Struct\Struct::clone($ent);
+                if (is_array($out)) { unset($out['$KEY']); }
                 return $respond(200, $out, null);
 
             } elseif ($op->name === 'list') {
-                $args = $test_self->build_args($fctx, $op, $fctx->reqmatch);
-                $found = \Voxgig\Struct\Struct::select($entmap, $args);
-                if (!$found) {
-                    return $respond(404, null, ['statusText' => 'Not found']);
-                }
-                if (is_array($found)) {
-                    foreach ($found as $item) {
-                        \Voxgig\Struct\Struct::delprop($item, '$KEY');
+                $out = [];
+                foreach ($entmap as $e) {
+                    if (is_array($e)) {
+                        $copy = $e;
+                        unset($copy['$KEY']);
+                        $out[] = $copy;
                     }
                 }
-                $out = \Voxgig\Struct\Struct::clone($found);
                 return $respond(200, $out, null);
 
             } elseif ($op->name === 'update') {
-                $args = $test_self->build_args($fctx, $op, $fctx->reqdata);
-                $found = \Voxgig\Struct\Struct::select($entmap, $args);
-                $ent = \Voxgig\Struct\Struct::getelem($found, 0);
+                $id = $get_id();
+                $ent = ($id !== null && isset($entmap[$id])) ? $entmap[$id] : null;
+                if (!$ent) {
+                    foreach ($entmap as $e) {
+                        if (is_array($e) && ($e['id'] ?? null) === $id) { $ent = $e; break; }
+                    }
+                }
                 if (!$ent) {
                     return $respond(404, null, ['statusText' => 'Not found']);
                 }
-                if (is_array($ent) && $fctx->reqdata) {
+                if (is_array($fctx->reqdata)) {
                     foreach ($fctx->reqdata as $k => $v) {
                         $ent[$k] = $v;
                     }
                 }
-                \Voxgig\Struct\Struct::delprop($ent, '$KEY');
+                $entmap[$id] = $ent;
+                $entity->data[$entname] = $entmap;
                 $out = \Voxgig\Struct\Struct::clone($ent);
+                if (is_array($out)) { unset($out['$KEY']); }
                 return $respond(200, $out, null);
 
             } elseif ($op->name === 'remove') {
-                $args = $test_self->build_args($fctx, $op, $fctx->reqmatch);
-                $found = \Voxgig\Struct\Struct::select($entmap, $args);
-                $ent = \Voxgig\Struct\Struct::getelem($found, 0);
-                if (!$ent) {
-                    return $respond(404, null, ['statusText' => 'Not found']);
-                }
-                if (is_array($ent)) {
-                    $id = \Voxgig\Struct\Struct::getprop($ent, 'id');
-                    \Voxgig\Struct\Struct::delprop($entmap, $id);
+                $id = $get_id();
+                if ($id !== null && isset($entmap[$id])) {
+                    unset($entmap[$id]);
+                    $entity->data[$entname] = $entmap;
                 }
                 return $respond(200, null, null);
 
             } elseif ($op->name === 'create') {
-                $test_self->build_args($fctx, $op, $fctx->reqdata);
-                $id = ($fctx->utility->param)($fctx, 'id');
+                $id = $get_id();
                 if ($id === null) {
                     $id = sprintf('%04x%04x%04x%04x', random_int(0, 0xFFFF), random_int(0, 0xFFFF), random_int(0, 0xFFFF), random_int(0, 0xFFFF));
                 }
 
-                $ent = \Voxgig\Struct\Struct::clone($fctx->reqdata);
-                if (is_array($ent)) {
-                    $ent['id'] = $id;
-                    if (is_string($id)) {
-                        $entmap[$id] = $ent;
-                    }
-                    \Voxgig\Struct\Struct::delprop($ent, '$KEY');
-                    $out = \Voxgig\Struct\Struct::clone($ent);
-                    return $respond(200, $out, null);
-                }
-                return $respond(200, $ent, null);
+                $ent = is_array($fctx->reqdata) ? $fctx->reqdata : [];
+                $ent['id'] = $id;
+                $entmap[$id] = $ent;
+                $entity->data[$entname] = $entmap;
+                $out = \Voxgig\Struct\Struct::clone($ent);
+                if (is_array($out)) { unset($out['$KEY']); }
+                return $respond(200, $out, null);
 
             } else {
                 return $respond(404, null, ['statusText' => 'Unknown operation']);
@@ -144,50 +153,4 @@ class ProjectNameTestFeature extends ProjectNameBaseFeature
 
         $ctx->utility->fetcher = $test_fetcher;
     }
-
-    public function build_args(ProjectNameContext $ctx, ProjectNameOperation $op, mixed $args): array
-    {
-        $opname = $op->name;
-        $entname = (is_object($ctx->entity) && method_exists($ctx->entity, 'get_name'))
-            ? $ctx->entity->get_name()
-            : '_';
-        $points = \Voxgig\Struct\Struct::getpath($ctx->config, "entity.{$entname}.op.{$opname}.points");
-        $point = \Voxgig\Struct\Struct::getelem($points, -1);
-
-        $params_path = \Voxgig\Struct\Struct::getpath($point, 'args.params');
-        $reqd_params = \Voxgig\Struct\Struct::select($params_path, ['reqd' => true]);
-        $reqd = \Voxgig\Struct\Struct::transform($reqd_params, ['`$EACH`', '', '`$KEY.name`']);
-
-        $qand = [];
-        $q = ['`$AND`' => &$qand];
-
-        if ($args) {
-            $keys = \Voxgig\Struct\Struct::keysof($args);
-            if ($keys) {
-                foreach ($keys as $key) {
-                    $is_id = ($key === 'id');
-                    $selected = \Voxgig\Struct\Struct::select($reqd, $key);
-                    $is_reqd = !\Voxgig\Struct\Struct::isempty($selected);
-
-                    if ($is_id || $is_reqd) {
-                        $v = ($ctx->utility->param)($ctx, $key);
-                        $ka = $op->alias_map ? \Voxgig\Struct\Struct::getprop($op->alias_map, $key) : null;
-
-                        $qor = [[$key => $v]];
-                        if (is_string($ka)) {
-                            $qor[] = [$ka => $v];
-                        }
-
-                        $qand[] = ['`$OR`' => $qor];
-                    }
-                }
-            }
-        }
-
-        if ($ctx->ctrl->explain) {
-            $ctx->ctrl->explain['test'] = ['query' => $q];
-        }
-
-        return $q;
-    }
 }