cabloy 5.1.229 → 5.1.231

package/vona/packages-vona/vona-core/src/lib/core/testClaimFilesystemWindows.ts

@@ -62,12 +62,17 @@ function decode(source: string): { exists?: boolean; content?: string } {
     throw new Error('Windows test claim filesystem helper returned an invalid response');
   }
   if (!value || value.ok !== true) {
+    const code = ['EEXIST', 'ENOENT', 'EBUSY', 'EACCES', 'EUNSAFE'].includes(value?.code)
+      ? value.code
+      : 'EUNSAFE';
+    const nativeCode =
+      Number.isInteger(value?.nativeCode) && value.nativeCode >= 0 && value.nativeCode <= 65535
+        ? value.nativeCode
+        : 0;
     const error = new Error(
-      value?.code === 'EEXIST'
-        ? 'Test claim file already exists'
-        : `Unsafe Windows test claim filesystem operation (${value?.code ?? 'unknown'})`,
+      `Unsafe Windows test claim filesystem operation (${code}, nativeCode=${nativeCode})`,
     );
-    Object.assign(error, { code: value?.code ?? 'EUNSAFE' });
+    Object.assign(error, { code, nativeCode });
     throw error;
   }
   return value;

package/vona/packages-vona/vona-core/src/lib/utils/index.ts

@@ -3,5 +3,6 @@ import { zodExtendOpenApi } from './zod-openapi.ts';
 export * from './protocolKey.ts';
 export * from './retry.ts';
 export * from './util.ts';
+export { runWithZodQueryCoercion } from './zod-enhance.ts';
 
 zodExtendOpenApi();

package/vona/packages-vona/vona-core/src/lib/utils/zod-enhance.ts

@@ -3,6 +3,7 @@ import type z from 'zod';
 import { setLocaleAdapter, setLocaleErrors, translateError } from '@cabloy/zod-errors-custom';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { setParseAdapter } from '@cabloy/zod-query';
+import { AsyncLocalStorage } from 'node:async_hooks';
 
 import type { ILocaleRecord } from '../bean/resource/locale/type.ts';
 import type { VonaApplication } from '../core/application.ts';
@@ -12,6 +13,12 @@ import { useApp } from '../framework/useApp.ts';
 export type ZodLocaleError = () => { localeError: z.core.$ZodErrorMap };
 export type ZodLocaleErrors = Record<keyof ILocaleRecord, ZodLocaleError>;
 
+const queryCoercion = new AsyncLocalStorage<boolean>();
+
+export function runWithZodQueryCoercion<T>(enabled: boolean, fn: () => T): T {
+  return queryCoercion.run(enabled, fn);
+}
+
 export function zodEnhance() {
   setLocaleAdapter((text: string, iss?: object) => {
     const app = useApp();
@@ -23,7 +30,7 @@ export function zodEnhance() {
       iss,
     );
   });
-  setParseAdapter(ZodMetadata);
+  setParseAdapter(ZodMetadata, () => queryCoercion.getStore() !== false);
 }
 
 export function zodSetLocaleErrors(

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.50",
+  "version": "6.1.51",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/cartItem.tsx

@@ -29,6 +29,6 @@ export class DtoCartItem {
   @Api.field(v.required(), z.number().int().nonnegative())
   priceCents: number;
 
-  @Api.field(v.required(), z.number().int().positive())
+  @Api.field(v.required(), z.number().int().nonnegative())
   available: number;
 }

package/vona/src/suite/a-commerce/modules/commerce-trade/test/cartOwnership.test.ts

@@ -6,7 +6,10 @@ import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
 import { after, before, describe, it } from 'node:test';
+import { appResource } from 'vona';
 import { acquireTestLock, app } from 'vona-mock';
+import { $schema } from 'vona-module-a-openapiutils';
+import { DtoCartItem, DtoCartView } from 'vona-module-commerce-trade';
 
 const actionPath = '/commerce/trade/cart';
 
@@ -39,22 +42,32 @@ async function performAs<
 
 async function registerAndSignin(name: string) {
   const user = await app.bean.user.register({ name }, true);
-  const token = await app.bean.passport.signinMock(name as any);
-  return { token: token.accessToken, user };
+  try {
+    const token = await app.bean.passport.signinMock(name as any);
+    return { token: token.accessToken, user };
+  } catch (error) {
+    await dropUser(user.id as number);
+    throw error;
+  }
 }
 
 async function createSellableSku(suffix: string): Promise<ISellableSkuFixture> {
+  const fixture: Partial<ISellableSkuFixture> = {};
   await app.bean.passport.signinMock();
   try {
-    const categoryId = await app.bean.executor.performAction('post', '/commerce/catalog/category', {
-      body: { name: `cart-category-${suffix}`, published: true },
-    });
-    const productId = await app.bean.executor.performAction('post', '/commerce/catalog/product', {
-      body: { categoryId, title: `cart-product-${suffix}`, published: true },
+    fixture.categoryId = await app.bean.executor.performAction(
+      'post',
+      '/commerce/catalog/category',
+      {
+        body: { name: `cart-category-${suffix}`, published: true },
+      },
+    );
+    fixture.productId = await app.bean.executor.performAction('post', '/commerce/catalog/product', {
+      body: { categoryId: fixture.categoryId, title: `cart-product-${suffix}`, published: true },
     });
-    const skuId = await app.bean.executor.performAction('post', '/commerce/catalog/sku', {
+    fixture.skuId = await app.bean.executor.performAction('post', '/commerce/catalog/sku', {
       body: {
-        productId,
+        productId: fixture.productId,
         code: `cart-sku-${suffix}`,
         priceCents: 100,
         lifecycle: 'active',
@@ -62,28 +75,35 @@ async function createSellableSku(suffix: string): Promise<ISellableSkuFixture> {
     });
     await app.bean.executor.performAction('post', '/commerce/trade/stockBalance/adjustStock', {
       body: {
-        skuId,
+        skuId: fixture.skuId,
         delta: 10,
         reason: `cart stock ${suffix}`,
         correlationId: `cart-stock-${suffix}`,
       },
     });
-    return { categoryId, productId, skuId };
+    return fixture as ISellableSkuFixture;
+  } catch (error) {
+    await dropSellableSku(fixture);
+    throw error;
   } finally {
     await app.bean.passport.signout();
   }
 }
 
-async function dropSellableSku(fixture: ISellableSkuFixture | undefined) {
+async function dropSellableSku(fixture: Partial<ISellableSkuFixture> | undefined) {
   if (!fixture) return;
   const trade = app.scope('commerce-trade');
   const catalog = app.scope('commerce-catalog');
-  await trade.model.stockAudit.delete({ skuId: fixture.skuId });
-  await trade.model.stockReservation.delete({ skuId: fixture.skuId });
-  await trade.model.stockBalance.delete({ skuId: fixture.skuId });
-  await catalog.model.sku.delete({ id: fixture.skuId });
-  await catalog.model.product.delete({ id: fixture.productId });
-  await catalog.model.category.delete({ id: fixture.categoryId });
+  if (fixture.skuId !== undefined) {
+    await trade.model.stockAudit.delete({ skuId: fixture.skuId });
+    await trade.model.stockReservation.delete({ skuId: fixture.skuId });
+    await trade.model.stockBalance.delete({ skuId: fixture.skuId });
+    await catalog.model.sku.delete({ id: fixture.skuId });
+  }
+  if (fixture.productId !== undefined)
+    await catalog.model.product.delete({ id: fixture.productId });
+  if (fixture.categoryId !== undefined)
+    await catalog.model.category.delete({ id: fixture.categoryId });
 }
 
 async function dropUser(userId: number | undefined) {
@@ -206,6 +226,112 @@ describe('cartOwnership.test.ts', { concurrency: false }, () => {
     });
   });
 
+  it('reads an empty cart without creating business records', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      let customer: Awaited<ReturnType<typeof registerAndSignin>> | undefined;
+      try {
+        customer = await registerAndSignin(`cart-empty-${createTestId()}`);
+        const trade = app.scope('commerce-trade');
+        assert.equal(await trade.model.cart.get({ userId: customer.user.id }), undefined);
+        assert.deepEqual(await performAs(customer.token, 'get', actionPath), { items: [] });
+        assert.deepEqual(await performAs(customer.token, 'get', actionPath), { items: [] });
+        assert.equal(await trade.model.cart.get({ userId: customer.user.id }), undefined);
+      } finally {
+        await app.bean.passport.signout();
+        await dropUser(customer?.user.id as number | undefined);
+      }
+    });
+  });
+
+  it('keeps a sold-out cart DTO-valid without mutating its business records on reads', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const suffix = createTestId();
+      let sku: ISellableSkuFixture | undefined;
+      let customer: Awaited<ReturnType<typeof registerAndSignin>> | undefined;
+      try {
+        sku = await createSellableSku(suffix);
+        customer = await registerAndSignin(`cart-zero-${suffix}`);
+        const added = await performAs(customer.token, 'post', `${actionPath}/items`, {
+          body: cartItem(sku.skuId),
+        });
+        await app.bean.executor.newCtxIsolate(async () => {
+          await app.bean.passport.signinMock();
+          try {
+            await app.bean.executor.performAction(
+              'post',
+              '/commerce/trade/stockBalance/adjustStock',
+              {
+                body: {
+                  skuId: sku!.skuId,
+                  delta: -10,
+                  reason: `cart depletion ${suffix}`,
+                  correlationId: `cart-deplete-${suffix}`,
+                },
+                innerAccess: false,
+              },
+            );
+          } finally {
+            await app.bean.passport.signout();
+          }
+        });
+        const trade = app.scope('commerce-trade');
+        const before = {
+          cart: await trade.model.cart.getById(added.id),
+          items: await trade.model.cartItem.select({ where: { cartId: added.id } }),
+          stock: await trade.model.stockBalance.get({ skuId: sku.skuId }),
+        };
+        assert.equal(before.stock?.available, 0);
+        const current = await performAs(customer.token, 'get', actionPath);
+        assert.deepEqual(current, {
+          id: added.id,
+          items: [{ ...added.items[0], available: 0 }],
+        });
+        assert.deepEqual(await performAs(customer.token, 'get', actionPath), current);
+        assert.deepEqual(
+          {
+            cart: await trade.model.cart.getById(added.id),
+            items: await trade.model.cartItem.select({ where: { cartId: added.id } }),
+            stock: await trade.model.stockBalance.get({ skuId: sku.skuId }),
+          },
+          before,
+        );
+        assert.deepEqual(await $schema(DtoCartView).parseAsync(current), current);
+        for (const available of [1, 10]) {
+          assert.equal(
+            $schema(DtoCartItem).safeParse({ ...current.items[0], available }).success,
+            true,
+          );
+        }
+        for (const available of [-1, 0.5]) {
+          assert.equal(
+            $schema(DtoCartItem).safeParse({ ...current.items[0], available }).success,
+            false,
+          );
+        }
+        assert.equal(
+          $schema(DtoCartItem).safeParse({ ...current.items[0], available: 1, quantity: 0 })
+            .success,
+          false,
+        );
+        const document = await app.bean.openapi.generateJsonOfClasses(
+          [DtoCartView, DtoCartItem],
+          'V31',
+        );
+        const itemSchema = document.components!.schemas![appResource.getBeanFullName(DtoCartItem)!];
+        assert.ok('properties' in itemSchema);
+        const availableSchema = itemSchema.properties!.available;
+        assert.ok('type' in availableSchema);
+        assert.equal(availableSchema.type, 'integer');
+        assert.equal(availableSchema.minimum, 0);
+        assert.equal(availableSchema.exclusiveMinimum, undefined);
+      } finally {
+        await app.bean.passport.signout();
+        await dropUser(customer?.user.id as number | undefined);
+        await dropSellableSku(sku);
+      }
+    });
+  });
+
   it('treats another instance cart as absent', async () => {
     const suffix = createTestId();
     let itemId!: number;

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-auth-oauth",
-  "version": "5.0.12",
+  "version": "5.0.13",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/src/bean/authProvider.oauth.ts

@@ -43,6 +43,7 @@ const app = useApp();
       clientSecret: app.meta.env.AUTH_GITHUB_CLIENTSECRET || 'Shoule specify clientSecret',
     },
   },
+  useMockForDev: app.meta.env.AUTH_USEMOCKFORDEV !== 'false',
 })
 export class AuthProviderOauth extends BeanAuthProviderOauth2Base {
   async strategy(

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/src/types/index.ts

@@ -1,5 +1,6 @@
 declare module 'vona' {
   export interface VonaConfigEnv {
+    AUTH_USEMOCKFORDEV: 'true' | 'false' | undefined;
     AUTH_GITHUB_CLIENTID: string | undefined;
     AUTH_GITHUB_CLIENTSECRET: string | undefined;
   }

package/vona/src/suite-vendor/a-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-auth",
-  "version": "5.1.29",
+  "version": "5.1.30",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-a-auth": "workspace:^",
-    "vona-module-auth-oauth": "^5.0.12",
+    "vona-module-auth-oauth": "^5.0.13",
     "vona-module-auth-simple": "workspace:^"
   },
   "title": "a-auth"

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-rbac",
-  "version": "5.0.15",
+  "version": "5.0.16",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -10,7 +10,7 @@
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-layoutprofile": "^5.0.2",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.15",
+    "vona-module-a-rbac": "^5.0.16",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

package/vona/src/suite-vendor/a-vona/modules/a-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapi",
-  "version": "5.1.25",
+  "version": "5.1.26",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.38",
+  "version": "5.1.39",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsColumns.ts

@@ -16,11 +16,13 @@ import type {
 export type TypeEntityTableColumnNames<EntityMeta extends { $table: string } | undefined> =
   EntityMeta extends { $table: string }
     ? keyof {
-        [K in keyof EntityMeta as K extends '$table' | '$comment' | '$default'
-          ? never
-          : K extends string
-            ? `${EntityMeta['$table']}.${K}`
-            : never]: EntityMeta[K];
+        [
+          K in keyof EntityMeta as K extends '$table' | '$comment' | '$default'
+            ? never
+            : K extends string
+              ? `${EntityMeta['$table']}.${K}`
+              : never
+        ]: EntityMeta[K];
       }
     : never;
 export type TypeEntityTableColumnNamesShort<Entity> = keyof Entity;

package/vona/src/suite-vendor/a-vona/modules/a-permission/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.107",
+  "version": "5.1.108",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.93",
+  "version": "1.1.94",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.93"
+    "zova-core": "^5.1.94"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.174",
+  "version": "5.1.175",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.93",
-    "zova-suite-a-zova": "^5.1.173"
+    "zova-core": "^5.1.94",
+    "zova-suite-a-zova": "^5.1.174"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.93",
+  "version": "5.1.94",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -62,7 +62,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "@cabloy/zod-errors-custom": "^2.1.10",
     "@cabloy/zod-openapi": "^1.1.10",
-    "@cabloy/zod-query": "^2.1.13",
+    "@cabloy/zod-query": "^2.1.14",
     "@types/js-cookie": "^3.0.6",
     "@types/ms": "^2.1.0",
     "@vue/shared": "^3.5.32",

package/zova/packages-zova/zova-core/src/bean/resource/component/type.ts

@@ -14,9 +14,9 @@ export interface ILayoutRecord {
 }
 
 export type TypeComponentRecordSelector<PREFIX extends string> = {
-  [K in keyof IComponentRecord as K extends `${string}:${PREFIX}${string}`
-    ? K
-    : never]: IComponentRecord[K];
+  [
+    K in keyof IComponentRecord as K extends `${string}:${PREFIX}${string}` ? K : never
+  ]: IComponentRecord[K];
 };
 export type TypeComponentRecordSelectorKeys<PREFIX extends string> =
   keyof TypeComponentRecordSelector<PREFIX>;

package/zova/packages-zova/zova-core/src/bean/type.ts

@@ -12,9 +12,9 @@ export type IBeanRecord = IBeanRecordGeneral & IBeanRecordLocal;
 export type TypeBeanRecordKeys = keyof IBeanRecord;
 
 export type TypeBeanRecordGeneralSelector<SCENE extends keyof IBeanSceneRecord> = {
-  [K in keyof IBeanRecordGeneral as K extends `${string}.${SCENE}.${string}`
-    ? K
-    : never]: IBeanRecordGeneral[K];
+  [
+    K in keyof IBeanRecordGeneral as K extends `${string}.${SCENE}.${string}` ? K : never
+  ]: IBeanRecordGeneral[K];
 };
 export type TypeBeanRecordGeneralSelectorKeys<SCENE extends keyof IBeanSceneRecord> =
   keyof TypeBeanRecordGeneralSelector<SCENE>;
@@ -23,9 +23,9 @@ export type TypeBeanRecordGeneralSelectorSpecificName<
   SCENE extends keyof IBeanSceneRecord,
   NAME extends string,
 > = {
-  [K in keyof IBeanRecordGeneral as K extends `${string}.${SCENE}.${NAME}`
-    ? K
-    : never]: IBeanRecordGeneral[K];
+  [
+    K in keyof IBeanRecordGeneral as K extends `${string}.${SCENE}.${NAME}` ? K : never
+  ]: IBeanRecordGeneral[K];
 };
 
 export type TypeBeanRecordGeneralSelectorSpecificNameKeys<

package/zova/src/suite/cabloy-basic/modules/basic-button/src/bean/behavior.perform.tsx

@@ -6,15 +6,15 @@ import { createVNode } from 'vue';
 import { BeanBehaviorBase, Behavior } from 'zova-module-a-behavior';
 
 export interface IBehaviorPropsInputPerform {
-  'class'?: unknown;
-  'disabled'?: boolean | '' | 'true' | 'false';
-  'onClick'?: (e: MouseEvent) => unknown;
+  class?: unknown;
+  disabled?: boolean | '' | 'true' | 'false';
+  onClick?: (e: MouseEvent) => unknown;
   ['aria-busy']?: boolean | 'true' | 'false';
 }
 
 export interface IBehaviorPropsOutputPerform extends IBehaviorPropsInputPerform {
-  'disabled'?: boolean;
-  'onClick'?: (e: MouseEvent) => unknown;
+  disabled?: boolean;
+  onClick?: (e: MouseEvent) => unknown;
   ['aria-busy']?: boolean | 'true' | 'false';
 }
 

package/zova/src/suite/cabloy-basic/modules/basic-date/src/.metadata/component/date.ts

@@ -51,7 +51,9 @@ declare module 'zova-module-a-bean' {
   export interface IVonaComponentRecord {
     'basic-date:date': ControllerDateProps &
       ControllerDateModels & {
-        [KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>]: ControllerDateModels[KEY];
+        [
+          KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>
+        ]: ControllerDateModels[KEY];
       } & {
         [KEY in keyof ControllerDateModels as TypePropUpdateFromModel<KEY>]: (
           value: ControllerDateModels[KEY],

package/zova/src/suite/cabloy-basic/modules/basic-date/src/.metadata/component/dateRange.ts

@@ -18,18 +18,24 @@ export type ZDateRangeProps = {
   controllerRef?: (ref: ControllerDateRange) => void;
 } & ControllerDateRangeProps &
   ControllerDateRangeModels & {
-    [KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>]: ControllerDateRangeModels[KEY];
+    [
+      KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>
+    ]: ControllerDateRangeModels[KEY];
   } & {
     [KEY in keyof ControllerDateRangeModels as TypePropUpdateFromModel<KEY>]: (
       value: ControllerDateRangeModels[KEY],
     ) => void;
   };
 type TypeModelArguments = {
-  [KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>]: ControllerDateRangeModels[KEY];
+  [
+    KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>
+  ]: ControllerDateRangeModels[KEY];
 };
 type ControllerInnerProps = TypeControllerInnerProps<
   ControllerDateRangeProps & {
-    [KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>]: ControllerDateRangeModels[KEY];
+    [
+      KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>
+    ]: ControllerDateRangeModels[KEY];
   },
   keyof typeof ControllerDateRange.$propsDefault
 >;
@@ -51,7 +57,9 @@ declare module 'zova-module-a-bean' {
   export interface IVonaComponentRecord {
     'basic-date:dateRange': ControllerDateRangeProps &
       ControllerDateRangeModels & {
-        [KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>]: ControllerDateRangeModels[KEY];
+        [
+          KEY in keyof ControllerDateRangeModels as TypePropValueFromModel<KEY>
+        ]: ControllerDateRangeModels[KEY];
       } & {
         [KEY in keyof ControllerDateRangeModels as TypePropUpdateFromModel<KEY>]: (
           value: ControllerDateRangeModels[KEY],

package/zova/src/suite/cabloy-basic/modules/basic-pageentry/src/component/blockPageEntry/controller.tsx

@@ -110,7 +110,9 @@ export class ControllerBlockPageEntry<TData extends {} = {}> extends BeanControl
       return this.$$modelResource.getFormSchema(this.formMeta);
     });
     this.formData = this.$computed(() => {
-      return this.$$modelResource.getFormData(this.formMeta, this.entryId) as TData | undefined;
+      return this.projectFormData(
+        this.$$modelResource.getFormData(this.formMeta, this.entryId) as TData | undefined,
+      );
     });
     // jsx
     this._prepareJsx();
@@ -151,6 +153,10 @@ export class ControllerBlockPageEntry<TData extends {} = {}> extends BeanControl
     this._offDraftDiscard?.();
   }
 
+  protected projectFormData(data: TData | undefined): TData | undefined {
+    return data;
+  }
+
   private _setEditorBaseline(data: TData | undefined) {
     this._baseline = data ? deepExtend({}, data) : undefined;
     this.editorData = this._baseline;
@@ -372,7 +378,7 @@ export class ControllerBlockPageEntry<TData extends {} = {}> extends BeanControl
       let baseline = this._baseline;
       if (this._draftIdentity?.mode === 'edit') {
         const result = await this.queryData!.refetch({ throwOnError: true });
-        baseline = result.data as TData | undefined;
+        baseline = this.projectFormData(result.data as TData | undefined);
       }
       if (!current()) return;
       const schema = this._getDraftSchema();