DEVEL strict ID typecasting

demos/_unit-test/modal-error.php

@@ -34,7 +34,7 @@
     $button = Button::addTo($p)->set('Test ModalExecutor load PHP error');
     $executor = ModalExecutor::assertInstanceOf($p->getExecutorFactory()->createExecutor($country->getUserAction('edit'), $button));
     if (\Closure::bind(static fn () => $executor->loader, null, ModalExecutor::class)()->cb->isTriggered()) {
-        $executor->stickyGet($executor->name, '99000'); // no such record so load will fail
+        $executor->stickyGet($executor->name, '218099000');
     }
     $button->on('click', $executor);
 });

demos/basic/breadcrumb.php

@@ -26,7 +26,7 @@
 $model = new Country($app->db);
 $model->setLimit(15);
 
-$id = $app->uiPersistence->typecastLoadField($model->getField($model->idField), $crumb->stickyGet('country_id'));
+$id = $app->uiPersistence->typecastAttributeLoadField($model->getField($model->idField), $crumb->stickyGet('country_id'));
 if ($id !== null) {
     // perhaps we edit individual country?
     $model = $model->load($id);

demos/collection/multitable.php

@@ -30,7 +30,7 @@ private function explodeSelectionValue(string $value): array
     {
         $res = [];
         foreach ($value === '' ? [] : explode(',', $value) as $v) {
-            $res[] = $this->getApp()->uiPersistence->typecastLoadField($this->model->getField($this->model->idField), $v);
+            $res[] = $this->getApp()->uiPersistence->typecastAttributeLoadField($this->model->getField($this->model->idField), $v);
         }
 
         return $res;
@@ -50,7 +50,7 @@ public function setModel(Model $model, array $route = []): void
         $selections = $this->explodeSelectionValue($this->getApp()->tryGetRequestQueryParam($this->name) ?? '');
 
         if ($selections !== []) {
-            $table->js(true)->find('tr[data-id=' . $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $selections[0]) . ']')->addClass('active');
+            $table->js(true)->find('tr[data-id=' . $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $selections[0]) . ']')->addClass('active');
         }
 
         $makeJsReloadFx = function (array $path): JsReload {
@@ -65,7 +65,7 @@ public function setModel(Model $model, array $route = []): void
         $table->on('click', 'tr', $jsReload);
 
         while ($id = array_shift($selections)) {
-            $path[] = $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $id);
+            $path[] = $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $id);
             $pushModel = new $model($model->getPersistence());
             $pushModel = $pushModel->tryLoad($id);
             if ($pushModel === null) {
@@ -87,7 +87,7 @@ public function setModel(Model $model, array $route = []): void
             $table->setModel($pushModel->setLimit(10), [$pushModel->titleField]);
 
             if ($selections !== []) {
-                $table->js(true)->find('tr[data-id=' . $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $selections[0]) . ']')->addClass('active');
+                $table->js(true)->find('tr[data-id=' . $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $selections[0]) . ']')->addClass('active');
             }
 
             $jsReload = $makeJsReloadFx($path);

demos/form-control/multiline.php

@@ -61,7 +61,7 @@
         return $multiline->saveRows()->model->export();
     });
 
-    $rows = array_map(static fn ($row) => $form->getApp()->uiPersistence->typecastSaveRow($multiline->model, $row), $rows);
+    $rows = array_map(static fn ($row) => $form->getApp()->uiPersistence->typecastAttributeSaveRow($multiline->model, $row), $rows);
 
     return new JsToast($form->getApp()->encodeJson($rows));
 });

demos/interactive/loader2.php

@@ -31,6 +31,6 @@
 
 $countryLoader->set(static function (Loader $p) {
     $country = new Country($p->getApp()->db);
-    $id = $p->getApp()->uiPersistence->typecastLoadField($country->getField($country->idField), $p->getApp()->getRequestQueryParam('id'));
+    $id = $p->getApp()->uiPersistence->typecastAttributeLoadField($country->getField($country->idField), $p->getApp()->getRequestQueryParam('id'));
     Form::addTo($p)->setModel($country->load($id));
 });

demos/layout/layout-panel.php

@@ -110,7 +110,7 @@
 Header::addTo($app, ['UserAction Friendly', 'size' => 4, 'subHeader' => 'Panel can run model action.']);
 
 $panel3 = Panel\Right::addTo($app);
-$countryId = $app->uiPersistence->typecastLoadField($country->getField($country->idField), $panel3->stickyGet('id'));
+$countryId = $app->uiPersistence->typecastAttributeLoadField($country->getField($country->idField), $panel3->stickyGet('id'));
 $msg = Message::addTo($panel3, ['Run Country model action below.']);
 
 $deck = View::addTo($app, ['ui' => 'cards']);

src/Card.php

@@ -177,7 +177,7 @@ public function setModel(Model $entity, array $fields = null): void
             $fields = array_keys($this->model->getFields(['editable', 'visible']));
         }
 
-        $this->template->trySet('dataId', $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $this->model->getId()));
+        $this->template->trySet('dataId', $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $this->model->getId()));
 
         View::addTo($this->getSection(), [$entity->getTitle(), 'class.header' => true]);
         $this->getSection()->addFields($entity, $fields, $this->useLabel, $this->useTable);

src/Crud.php

@@ -206,7 +206,7 @@ protected function getJsGridAction(Model\UserAction $action): ?JsExpressionable
             case Model\UserAction::MODIFIER_DELETE:
                 // use deleted record ID to remove row, fallback to closest tr if ID is not available
                 $js = $this->deletedId
-                    ? $this->js(false, null, 'tr[data-id="' . $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $this->deletedId) . '"]')
+                    ? $this->js(false, null, 'tr[data-id="' . $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $this->deletedId) . '"]')
                     : (new Jquery())->closest('tr');
                 $js = $js->transition('fade left', new JsFunction([], [new JsExpression('this.remove()')]));
 

src/Form.php

@@ -434,7 +434,11 @@ protected function loadPost(): void
                 }
 
                 try {
-                    $control->set($this->getApp()->uiPersistence->typecastLoadField($control->entityField->getField(), $postRawValue));
+                    if ($control instanceof Control\Dropdown || $control instanceof Control\Lookup) { // this condition is definitely unacceptable, also should Control::set() be in the catch?
+                        $control->set($this->getApp()->uiPersistence->typecastAttributeLoadField($control->entityField->getField(), $postRawValue));
+                    } else {
+                        $control->set($this->getApp()->uiPersistence->typecastLoadField($control->entityField->getField(), $postRawValue));
+                    }
                 } catch (\Exception $e) {
                     if ($e instanceof \ErrorException) {
                         throw $e;

src/Form/Control/Dropdown.php

@@ -232,7 +232,7 @@ protected function _renderItemsForModel(): void
     {
         foreach ($this->model as $id => $row) {
             $title = $row->getTitle();
-            $this->_tItem->set('value', $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $id));
+            $this->_tItem->set('value', $this->getApp()->uiPersistence->typecastSaveAttributeField($this->model->getField($this->model->idField), $id));
             $this->_tItem->set('title', $title || is_numeric($title) ? (string) $title : '');
             // add item to template
             $this->template->dangerouslyAppendHtml('Item', $this->_tItem->renderToHtml());
@@ -274,7 +274,7 @@ protected function _addCallBackRow($row, $key = null): void
     {
         if ($this->model !== null) {
             $res = ($this->renderRowFunction)($row);
-            $this->_tItem->set('value', $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $row->getId()));
+            $this->_tItem->set('value', $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $row->getId()));
         } else {
             $res = ($this->renderRowFunction)($row, $key); // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/10283#issuecomment-1850438891
             $this->_tItem->set('value', (string) $res['value']); // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/10283

src/Form/Control/DropdownCascade.php

@@ -32,7 +32,7 @@ protected function init(): void
         }
 
         $cascadeFromValue = $this->getApp()->hasRequestPostParam($this->cascadeFrom->name)
-            ? $this->getApp()->uiPersistence->typecastLoadField($this->cascadeFrom->entityField->getField(), $this->getApp()->getRequestPostParam($this->cascadeFrom->name))
+            ? $this->getApp()->uiPersistence->typecastAttributeLoadField($this->cascadeFrom->entityField->getField(), $this->getApp()->getRequestPostParam($this->cascadeFrom->name))
             : $this->cascadeFrom->entityField->get();
 
         $this->model = $this->cascadeFrom->model ? $this->cascadeFrom->model->ref($this->reference) : null;

src/Form/Control/Lookup.php

@@ -9,6 +9,7 @@
 use Atk4\Data\Model;
 use Atk4\Ui\Button;
 use Atk4\Ui\CallbackLater;
+use Atk4\Ui\Demos\WrappedId;
 use Atk4\Ui\Form;
 use Atk4\Ui\Js\Jquery;
 use Atk4\Ui\Js\JsBlock;
@@ -230,7 +231,7 @@ protected function defaultRenderRow(Model $row)
         $titleField = $this->titleField ?? $row->titleField;
 
         return [
-            'value' => $this->getApp()->uiPersistence->typecastSaveField($row->getField($idField), $row->get($idField)),
+            'value' => $this->getApp()->uiPersistence->typecastAttributeSaveField($row->getField($idField), $row->get($idField)),
             'title' => $row->get($titleField),
         ];
     }

src/Form/Control/Multiline.php

@@ -11,6 +11,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Persistence;
 use Atk4\Data\ValidationException;
+use Atk4\Ui\Demos\WrappedId;
 use Atk4\Ui\Exception;
 use Atk4\Ui\Form;
 use Atk4\Ui\HtmlTemplate;
@@ -252,7 +253,9 @@ protected function typeCastLoadValues(array $values): array
                 if ($fieldName === '__atkml') {
                     $dataRows[$k][$fieldName] = $value;
                 } else {
-                    $dataRows[$k][$fieldName] = $this->getApp()->uiPersistence->typecastLoadField($this->model->getField($fieldName), $value);
+                    $dataRows[$k][$fieldName] = $fieldName === $this->model->idField
+                        ? $this->getApp()->uiPersistence->typecastAttributeLoadField($this->model->getField($fieldName), $value)
+                        : $this->getApp()->uiPersistence->typecastLoadField($this->model->getField($fieldName), $value);
                 }
             }
         }
@@ -288,7 +291,9 @@ public function getValue(): string
                 $cols = [];
                 foreach ($this->rowFields as $fieldName) {
                     $field = $this->model->getField($fieldName);
-                    $value = $this->getApp()->uiPersistence->typecastSaveField($field, $row->get($field->shortName));
+                    $value = $field->shortName === $this->model->idField
+                        ? $this->getApp()->uiPersistence->typecastAttributeSaveField($field, $row->get($field->shortName))
+                        : $this->getApp()->uiPersistence->typecastSaveField($field, $row->get($field->shortName));
                     $cols[$fieldName] = $value;
                 }
                 $rows[] = $cols;
@@ -556,7 +561,7 @@ protected function getLookupProps(Field $field): array
     public function setLookupOptionValue(Field $field, string $value): void
     {
         $model = $field->getReference()->refModel($this->model);
-        $entity = $model->tryLoadBy($field->getReference()->getTheirFieldName($model), $this->getApp()->uiPersistence->typecastLoadField($field, $value));
+        $entity = $model->tryLoadBy($field->getReference()->getTheirFieldName($model), $this->getApp()->uiPersistence->typecastAttributeLoadField($field, $value));
         if ($entity !== null) {
             $option = ['key' => $value, 'text' => $entity->get($model->titleField), 'value' => $value];
             foreach ($this->fieldDefs as $key => $component) {
@@ -617,7 +622,7 @@ protected function getFieldItems(Field $field, ?int $limit = 10): array
 
             $theirFieldName = $field->getReference()->getTheirFieldName($model);
             foreach ($model as $item) {
-                $theirValue = $this->getApp()->uiPersistence->typecastSaveField($model->getField($theirFieldName), $item->get($theirFieldName));
+                $theirValue = $this->getApp()->uiPersistence->typecastSaveAttributeField($model->getField($theirFieldName), $item->get($theirFieldName));
                 $items[$theirValue] = $item->get($model->titleField);
             }
         }

src/Grid.php

@@ -516,7 +516,7 @@ private function explodeSelectionValue(string $value): array
     {
         $res = [];
         foreach ($value === '' ? [] : explode(',', $value) as $v) {
-            $res[] = $this->getApp()->uiPersistence->typecastLoadField($this->model->getField($this->model->idField), $v);
+            $res[] = $this->getApp()->uiPersistence->typecastAttributeLoadField($this->model->getField($this->model->idField), $v);
         }
 
         return $res;

src/Js/JsExpression.php

@@ -5,8 +5,12 @@
 namespace Atk4\Ui\Js;
 
 use Atk4\Core\DiContainerTrait;
+use Atk4\Data\Field;
 use Atk4\Data\Persistence;
+use Atk4\Ui\Demos\WrappedId;
+use Atk4\Ui\Demos\WrappedIdType;
 use Atk4\Ui\Exception;
+use Atk4\Ui\Persistence\Ui as UiPersistence;
 use Atk4\Ui\View;
 
 class JsExpression implements JsExpressionable
@@ -107,6 +111,10 @@ protected function _jsEncode($value): string
             $res = Persistence\Sql\Expression::castFloatToString($value);
         } elseif ($value === null) {
             $res = 'null';
+        } elseif ($value instanceof WrappedId) {
+            // HACK for debug
+            $uiPersistence = new UiPersistence();
+            $res = $this->_jsEncode($uiPersistence->typecastAttributeSaveField(new Field(['type' => WrappedIdType::NAME]), $value));
         } else {
             throw (new Exception('Argument is not renderable to JS'))
                 ->addMoreInfo('arg', $value);

src/JsSortable.php

@@ -77,7 +77,7 @@ public function onReorder(\Closure $fx, Field $idField): void
             $newIndex = (int) $this->getApp()->getRequestPostParam('newIndex');
             $origIndex = (int) $this->getApp()->getRequestPostParam('origIndex');
 
-            $typecastLoadIdFx = fn ($v) => $this->getApp()->uiPersistence->typecastLoadField($idField, $v);
+            $typecastLoadIdFx = fn ($v) => $this->getApp()->uiPersistence->typecastAttributeLoadField($idField, $v);
             $orderedIds = array_map($typecastLoadIdFx, $orderedIds);
             $sourceId = $typecastLoadIdFx($sourceId);
 

src/Lister.php

@@ -181,7 +181,7 @@ public function renderRow(): void
         if ($this->tRow->hasTag('_title')) {
             $this->tRow->set('_title', $this->currentRow->getTitle());
         }
-        $idStr = $this->getApp()->uiPersistence->typecastSaveField($this->currentRow->getField($this->currentRow->idField), $this->currentRow->getId());
+        $idStr = $this->getApp()->uiPersistence->typecastAttributeSaveField($this->currentRow->getField($this->currentRow->idField), $this->currentRow->getId());
         if ($this->tRow->hasTag('_href')) {
             $this->tRow->set('_href', $this->url(['id' => $idStr]));
         }

src/Persistence/Ui.php

@@ -9,6 +9,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Persistence;
 use Atk4\Data\Persistence\Sql\Expression;
+use Atk4\Ui\Demos\WrappedId;
 use Atk4\Ui\Exception;
 
 /**
@@ -280,4 +281,36 @@ public function typecastSaveRow(Model $model, array $row): array
 
         return $result;
     }
+
+    /**
+     * @param mixed $value
+     *
+     * @return scalar|null
+     */
+    public function typecastAttributeSaveField(Field $field, $value)
+    {
+        if ($field->type === 'atk4_ui_demos_id' && $value !== null) {
+            return (string) ($value->getId() + 218_000_000);
+        }
+
+        return $this->typecastSaveField($field, $value);
+    }
+
+    /**
+     * @param scalar|null $value
+     *
+     * @return mixed
+     */
+    public function typecastAttributeLoadField(Field $field, $value)
+    {
+        if ($field->type === 'atk4_ui_demos_id') {
+            $value = $this->typecastLoadField(new Field(['type' => 'integer']), $value);
+
+            return $value === null
+                ? null
+                : new WrappedId($value - 218_000_000);
+        }
+
+        return $this->typecastLoadField($field, $value);
+    }
 }

src/Table.php

@@ -468,7 +468,7 @@ public function renderRow(): void
 
             // render row and add to body
             $this->tRow->dangerouslySetHtml($htmlTags);
-            $this->tRow->set('dataId', $this->getApp()->uiPersistence->typecastSaveField($this->model->getField($this->model->idField), $this->currentRow->getId()));
+            $this->tRow->set('dataId', $this->getApp()->uiPersistence->typecastAttributeSaveField($this->model->getField($this->model->idField), $this->currentRow->getId()));
             $this->template->dangerouslyAppendHtml('Body', $this->tRow->renderToHtml());
             $this->tRow->del(array_keys($htmlTags));
         } else {

src/Table/Column/ActionButtons.php

@@ -100,7 +100,7 @@ public function addModal($button, $defaults, \Closure $callback, $owner = null,
         $modal = Modal::addTo($owner, $defaults);
 
         $modal->set(function (View $t) use ($callback) {
-            $id = $this->getApp()->uiPersistence->typecastLoadField($this->table->model->getField($this->table->model->idField), $t->stickyGet($this->name));
+            $id = $this->getApp()->uiPersistence->typecastAttributeLoadField($this->table->model->getField($this->table->model->idField), $t->stickyGet($this->name));
             $callback($t, $id);
         });
 

src/Table/Column/Link.php

@@ -155,7 +155,7 @@ public function getHtmlTags(Model $row, ?Field $field): array
                 $key = $val;
             }
 
-            $page[$key] = $this->getApp()->uiPersistence->typecastSaveField($row->getField($val), $row->get($val));
+            $page[$key] = $this->getApp()->uiPersistence->typecastAttributeSaveField($row->getField($val), $row->get($val));
         }
 
         return ['c_' . $this->shortName => $this->table->url($page)];

src/UserAction/CommonExecutorTrait.php

@@ -12,7 +12,7 @@ protected function executeModelActionLoad(Model\UserAction $action): Model\UserA
     {
         $model = $action->getModel();
 
-        $id = $this->getApp()->uiPersistence->typecastLoadField(
+        $id = $this->getApp()->uiPersistence->typecastAttributeLoadField(
             $model->getField($model->idField),
             $this->stickyGet($this->name)
         );

src/UserAction/JsCallbackExecutor.php

@@ -89,7 +89,7 @@ public function executeModelAction(): void
     {
         $this->invokeFxWithUrlArgs(function () { // backup/restore $this->args mutated in https://github.com/atk4/ui/blob/8926412a31/src/JsCallback.php#L71
             $this->set(function (Jquery $j, ...$values) {
-                $id = $this->getApp()->uiPersistence->typecastLoadField(
+                $id = $this->getApp()->uiPersistence->typecastAttributeLoadField(
                     $this->action->getModel()->getField($this->action->getModel()->idField),
                     $this->getApp()->tryGetRequestPostParam($this->name)
                 );