From 3275b0b7247f26c9e75eff1ca5fbcab71cce355d Mon Sep 17 00:00:00 2001
From: Pavel Shevaev <pacha.shevaev@gmail.com>
Date: Thu, 27 Feb 2025 20:26:04 +0300
Subject: [PATCH] Making junk check more efficient

---
 src/codegen.inc.php | 17 ++++++++++++++---
 tpl/macro.twig      |  8 ++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/codegen.inc.php b/src/codegen.inc.php
index e425555..f1fbe2e 100644
--- a/src/codegen.inc.php
+++ b/src/codegen.inc.php
@@ -304,10 +304,8 @@ function is_null_str($default)
   return is_string($default) && json_decode($default, true) === null;
 }
 
-function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
+function get_default_value_arg(\mtgType $type, array $tokens) : string
 {
-  $str = '';
-
   $default_value_arg = array_key_exists('default', $tokens) ? default_value($tokens['default']) : "null";
 
   if($type instanceof \mtgMetaStruct)
@@ -330,10 +328,22 @@ function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $t
     }
   }
 
+  return $default_value_arg;
+}
+
+function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
+{
+  $str = '';
+
+  $default_value_arg = get_default_value_arg($type, $tokens);
+
   $str .= "\n";
 
   if($name !== null)
+  {
     $str .= "{$tmp_val} = {$buf}['{$name}'] ?? {$default_value_arg};\n";
+    $str .= "if(\$check_junk) unset({$buf}['{$name}']);\n";
+  }
 
   if($type instanceof \mtgBuiltinType)
   {
@@ -350,6 +360,7 @@ function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $t
     if(array_key_exists('virtual', $tokens))
     {
       $str .= "\$vclass_id__ = \metagen_php\\val_uint32(\$tmp_sub_arr__['\$id'] ?? {$type->getClassId()});\n";
+      $str .= "if(\$check_junk) unset(\$tmp_sub_arr__['\$id']);\n";
       $str .= "\$vclass__ = AutogenBundle::getClassName(\$vclass_id__);\n";
       $str .= "if(!is_a(\$vclass__, '{$type->getName()}', true)) throw new Exception(\"'\$vclass__' is not subclass of '{$type->getName()}'\");\n";
       $str .= "\$tmp_sub_mapped__ = array(\$vclass_id__);\n";
diff --git a/tpl/macro.twig b/tpl/macro.twig
index 2ed6d21..999e0e6 100644
--- a/tpl/macro.twig
+++ b/tpl/macro.twig
@@ -107,7 +107,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
     {{_self.export_fields(o)}}
   }
 
-  static function normalize(array &$data, array &$mapped, bool $root = true, bool $check_junk = false) : int
+  static function normalize(array &$data, array &$mapped, bool $check_junk = true, bool $root = true) : int
   {
     $IDX = -1;
 
@@ -115,7 +115,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
     {
       $IDX = 0;
 {%- if o.parent ~%}
-      $IDX = parent::normalize($data, $mapped, false, false);
+      $IDX = parent::normalize($data, $mapped, $check_junk, false);
 {%- endif ~%}
 
 {%- for f in o.fields ~%}
@@ -129,8 +129,8 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
       throw new Exception($e->getMessage() . " < {$FIELDS[$IDX]} < ({{o.name}})");
     }
     
-    if($root && $check_junk)
-      \metagen_php\check_junk_fields($data, self::CLASS_FIELDS());
+    if($root && $check_junk && sizeof($data) > 0)
+      throw new Exception("Junk fields: " . implode(',', array_keys($data)));
 
     return $IDX;
   }