cabloy 5.1.102 → 5.1.104

package/vona/pnpm-lock.yaml

@@ -501,8 +501,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.132
-        version: 5.1.132(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.133
+        version: 5.1.133(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.77
         version: 1.1.77(typescript@5.9.3)
@@ -528,8 +528,8 @@ importers:
         specifier: ^5.1.29
         version: 5.1.29
       zova-module-a-model:
-        specifier: ^5.1.31
-        version: 5.1.31(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.32
+        version: 5.1.32(vue@3.5.39(typescript@5.9.3))
       zova-module-a-openapi:
         specifier: ^5.1.43
         version: 5.1.43
@@ -573,8 +573,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.132
-        version: 5.1.132(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.133
+        version: 5.1.133(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.77
         version: 1.1.77(typescript@5.9.3)
@@ -600,8 +600,8 @@ importers:
         specifier: ^5.1.29
         version: 5.1.29
       zova-module-a-model:
-        specifier: ^5.1.31
-        version: 5.1.31(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.32
+        version: 5.1.32(vue@3.5.39(typescript@5.9.3))
       zova-module-a-openapi:
         specifier: ^5.1.43
         version: 5.1.43
@@ -1517,13 +1517,13 @@ importers:
   src/suite-vendor/a-file:
     dependencies:
       vona-module-a-file:
-        specifier: ^5.0.4
+        specifier: ^5.0.5
         version: link:modules/a-file
       vona-module-file-cloudflare:
-        specifier: ^5.0.3
+        specifier: ^5.0.4
         version: link:modules/file-cloudflare
       vona-module-file-native:
-        specifier: ^5.0.3
+        specifier: ^5.0.4
         version: link:modules/file-native
 
   src/suite-vendor/a-file/modules/a-file:
@@ -1625,7 +1625,7 @@ importers:
   src/suite-vendor/a-test:
     dependencies:
       vona-module-test-file:
-        specifier: ^5.0.4
+        specifier: ^5.0.5
         version: link:modules/test-file
 
   src/suite-vendor/a-test/modules/test-auth:
@@ -7993,8 +7993,8 @@ packages:
   zova-module-a-meta@5.1.21:
     resolution: {integrity: sha512-7vsLOMw1UQEZ+8qbBaiz9t4n3N7AU1jxpaiSIIky7hBvKO9nuHq+e7FONpj9poa8WeHkYoflBg/8imKBy/IlNw==}
 
-  zova-module-a-model@5.1.31:
-    resolution: {integrity: sha512-/6MV5xSklEkain5t0vsZ37ImyIihutCu7ymytq5RFG0QbeKtbSAI/IB6TS2mfkjLkiy97SmDJbuiLGso7Cg/Gw==}
+  zova-module-a-model@5.1.32:
+    resolution: {integrity: sha512-uzOXp2JlIOaBFy4pe5HyM846A2IK3zA2J8y8Je0i4EvioM36eiBhE61F8q0K59ojh3QZuinrxH6m9DIVL2EvVw==}
 
   zova-module-a-openapi@5.1.43:
     resolution: {integrity: sha512-xJKvSPl1AZnH7EpgEd9a3u3IEpJfnou19DKre/7TL1KdiTdfNThLrmmkdP1UNYlUHUgCczcGUwZDdMiE9gdxwA==}
@@ -8032,11 +8032,11 @@ packages:
   zova-module-rest-resource@5.1.41:
     resolution: {integrity: sha512-7Y8rLmHdw0pynlWqsyHPWuCWFLwr/0HsNvfef64cPw91LRujf/7OlulVWqH8ZoFNioZZUpfumB+t/+mICoYfFg==}
 
-  zova-suite-a-zova@5.1.131:
-    resolution: {integrity: sha512-NRPt3ahLwHg+rLuA2VXRbEmrg/bTdgwdQmU9C8nj9R0+E1f0ehbbsUWJFQFN6hJNco5+rDDSDfBlvejf4z6L1w==}
+  zova-suite-a-zova@5.1.132:
+    resolution: {integrity: sha512-bHyim0stshLyjEvehW8cUL0Bf/pR/sU43Dpada2g2ieGH1p34EzyLeaWimhId++sO9H3xErVX6aQXe0Xf6pELA==}
 
-  zova@5.1.132:
-    resolution: {integrity: sha512-lQK1VRnwthDx0qayS7kdElyfAmvPEhlt6sk/2jK5mTbqojsjuDNkrEa9Ck2Q78fag800U6pDwV83o6CRbSUTeA==}
+  zova@5.1.133:
+    resolution: {integrity: sha512-1tM0u0EU69/RvXmlxhVIrEY4ADVhQsEIr8UAcQ1U+Mjm3QwLJ7y7fDAQWsW7ChjEXHGrCU62fdc0tPvJ5CGntg==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -13935,7 +13935,7 @@ snapshots:
 
   zova-module-a-meta@5.1.21: {}
 
-  zova-module-a-model@5.1.31(vue@3.5.39(typescript@5.9.3)):
+  zova-module-a-model@5.1.32(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       '@tanstack/query-core': 5.101.2
       '@tanstack/query-persist-client-core': 5.101.2
@@ -14010,7 +14010,7 @@ snapshots:
 
   zova-module-rest-resource@5.1.41: {}
 
-  zova-suite-a-zova@5.1.131(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.132(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.21
       zova-module-a-app: 5.1.24
@@ -14025,7 +14025,7 @@ snapshots:
       zova-module-a-interceptor: 5.1.29
       zova-module-a-logger: 5.1.26
       zova-module-a-meta: 5.1.21
-      zova-module-a-model: 5.1.31(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-model: 5.1.32(vue@3.5.39(typescript@5.9.3))
       zova-module-a-openapi: 5.1.43
       zova-module-a-router: 5.1.29
       zova-module-a-routerstack: 5.1.26
@@ -14044,10 +14044,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.132(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova@5.1.133(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.77(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.131(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-suite-a-zova: 5.1.132(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -111,6 +111,13 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
+  @Web.post('refreshAuthToken')
+  @Passport.public()
+  @Api.body(v.object(DtoJwtToken))
+  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
+    return await this.bean.passport.refreshAuthToken(refreshToken);
+  }
+
   @Web.post('createPassportJwtFromOauthCode')
   @Passport.public()
   @Api.body(v.object(DtoPassportJwt))
@@ -119,13 +126,6 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
-  @Web.post('refreshAuthToken')
-  @Passport.public()
-  @Api.body(v.object(DtoJwtToken))
-  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
-    return await this.bean.passport.refreshAuthToken(refreshToken);
-  }
-
   @Web.post('createTempAuthToken')
   @Api.body(z.string())
   async createTempAuthToken(@Arg.query('path', v.optional()) path?: string): Promise<string> {

package/vona/src/suite/a-training/modules/training-record/src/.metadata/index.ts

@@ -388,20 +388,46 @@ declare module 'vona-module-training-record' {
           } 
 }
 /** ssrMenu: end */
+/** fileScene: begin */
+export * from '../bean/fileScene.dossierFile.ts';
+
+import { type IDecoratorFileSceneOptions } from 'vona-module-a-file';
+declare module 'vona-module-a-file' {
+
+    export interface IFileSceneRecord {
+      'training-record:dossierFile': IDecoratorFileSceneOptions;
+    }
+
+
+}
+declare module 'vona-module-training-record' {
+
+        export interface FileSceneDossierFile {
+          /** @internal */
+          get scope(): ScopeModuleTrainingRecord;
+        }
+
+          export interface FileSceneDossierFile {
+            get $beanFullName(): 'training-record.fileScene.dossierFile';
+            get $onionName(): 'training-record:dossierFile';
+            get $onionOptions(): IDecoratorFileSceneOptions;
+          }
+}
+/** fileScene: end */
 /** imageScene: begin */
 export * from '../bean/imageScene.sceneImage.ts';
 
 import { type IDecoratorImageSceneOptions } from 'vona-module-a-image';
 declare module 'vona-module-a-image' {
-  
+
     export interface IImageSceneRecord {
       'training-record:sceneImage': IDecoratorImageSceneOptions;
     }
 
-  
+
 }
 declare module 'vona-module-training-record' {
-  
+
         export interface ImageSceneSceneImage {
           /** @internal */
           get scope(): ScopeModuleTrainingRecord;
@@ -411,7 +437,7 @@ declare module 'vona-module-training-record' {
             get $beanFullName(): 'training-record.imageScene.sceneImage';
             get $onionName(): 'training-record:sceneImage';
             get $onionOptions(): IDecoratorImageSceneOptions;
-          } 
+          }
 }
 /** imageScene: end */
 /** locale: begin */

package/vona/src/suite/a-training/modules/training-record/src/bean/fileScene.dossierFile.ts

@@ -2,6 +2,7 @@ import { BeanBase } from 'vona';
 import { FileScene } from 'vona-module-a-file';
 
 @FileScene({
+  public: false,
   upload: {
     maxSize: 20 * 1024 * 1024,
     mimeTypes: [
@@ -16,7 +17,6 @@ import { FileScene } from 'vona-module-a-file';
     ],
     extensions: ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.zip', '.txt'],
     multiple: true,
-    public: false,
   },
 })
 export class FileSceneDossierFile extends BeanBase {}

package/vona/src/suite/a-training/modules/training-record/src/bean/imageScene.sceneImage.ts

@@ -2,6 +2,7 @@ import { BeanBase } from 'vona';
 import { ImageScene } from 'vona-module-a-image';
 
 @ImageScene({
+  public: false,
   upload: {
     maxSize: 2 * 1024 * 1024,
     mimeTypes: ['image/png', 'image/jpeg', 'image/webp'],

package/vona/src/suite/a-training/modules/training-record/src/dto/recordSelectResItem.tsx

@@ -1,5 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { DtoFileView } from 'vona-module-a-file';
 import { DtoImageView } from 'vona-module-a-image';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
@@ -7,9 +8,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
-import { resolveDossierFiles } from '../lib/resolveDossierFiles.ts';
 import { ModelRecord } from '../model/record.ts';
-import { DtoRecordDossierFileView } from './recordDossierFileView.ts';
 
 export interface IDtoOptionsRecordSelectResItem extends IDecoratorDtoOptions {}
 
@@ -34,6 +33,7 @@ export class DtoRecordSelectResItem extends $Dto.get(() => ModelRecord) {
     v.serializerTransform('a-image:resolveViews', {
       fieldName: 'sceneImageIds',
       imageScene: 'training-record:sceneImage',
+      deliveryOptions: { audience: true },
     }),
     v.array(DtoImageView),
   )
@@ -43,12 +43,14 @@ export class DtoRecordSelectResItem extends $Dto.get(() => ModelRecord) {
     v.title($locale('DossierFiles')),
     ZovaRender.visible(false),
     v.optional(),
-    v.serializerTransform('a-serialization:custom', {
-      custom: resolveDossierFiles,
+    v.serializerTransform('a-file:resolveViews', {
+      fieldName: 'dossierFileIds',
+      fileScene: 'training-record:dossierFile',
+      deliveryOptions: { audience: true },
     }),
-    v.array(DtoRecordDossierFileView),
+    v.array(DtoFileView),
   )
-  dossierFiles?: DtoRecordDossierFileView[];
+  dossierFiles?: DtoFileView[];
 
   @Api.field(
     v.title($locale('Operations')),

package/vona/src/suite/a-training/modules/training-record/src/dto/recordView.tsx

@@ -1,5 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { DtoFileView } from 'vona-module-a-file';
 import { DtoImageView } from 'vona-module-a-image';
 import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
@@ -7,11 +8,9 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
-import { resolveDossierFiles } from '../lib/resolveDossierFiles.ts';
 import { ModelRecord } from '../model/record.ts';
 import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';
 import { DtoDetailRecordSubjectView } from './detailRecordSubjectView.tsx';
-import { DtoRecordDossierFileView } from './recordDossierFileView.ts';
 
 export interface IDtoOptionsRecordView extends IDecoratorDtoOptions {}
 
@@ -46,6 +45,7 @@ export class DtoRecordView extends $Dto.get(() => ModelRecord, {
     v.serializerTransform('a-image:resolveViews', {
       fieldName: 'sceneImageIds',
       imageScene: 'training-record:sceneImage',
+      deliveryOptions: { audience: true },
     }),
     v.array(DtoImageView),
   )
@@ -55,12 +55,14 @@ export class DtoRecordView extends $Dto.get(() => ModelRecord, {
     v.title($locale('DossierFiles')),
     ZovaRender.visible(false),
     v.optional(),
-    v.serializerTransform('a-serialization:custom', {
-      custom: resolveDossierFiles,
+    v.serializerTransform('a-file:resolveViews', {
+      fieldName: 'dossierFileIds',
+      fileScene: 'training-record:dossierFile',
+      deliveryOptions: { audience: true },
     }),
-    v.array(DtoRecordDossierFileView),
+    v.array(DtoFileView),
   )
-  dossierFiles?: DtoRecordDossierFileView[];
+  dossierFiles?: DtoFileView[];
 
   @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
   _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];

package/vona/src/suite/a-training/modules/training-record/src/index.ts

@@ -1,6 +1,5 @@
 export * from './bean/fileScene.dossierFile.ts';
 export * from './bean/imageScene.sceneImage.ts';
-export * from './dto/recordDossierFileView.ts';
 export * from './lib/index.ts';
 export * from './.metadata/locales.ts';
 export * from './.metadata/index.ts';

package/vona/src/suite/a-training/modules/training-record/src/lib/index.ts

@@ -1,3 +1,2 @@
 export * from './onEffectForAverageScore.tsx';
 export * from './onEffectForTrainingRecordSubjects.tsx';
-export * from './resolveDossierFiles.ts';

package/vona/src/suite/a-training/modules/training-record/test/record.test.ts

@@ -43,10 +43,6 @@ describe('record.test.ts', () => {
             filename: 'attendance.txt',
             contentType: 'text/plain',
             public: false,
-            meta: {
-              category: 'attendanceSheet',
-              source: 'upload',
-            },
           },
           {
             clientName: 'default',
@@ -96,18 +92,24 @@ describe('record.test.ts', () => {
         assert.equal(String(record.studentId), String(studentId));
         assert.equal(record.subjectCount, recordData.subjectCount);
         assert.equal(record.totalScore, recordData.totalScore);
-        assert.equal(record.averageScore, recordData.averageScore);
+        assert.equal(Number(record.averageScore), recordData.averageScore);
         assert.equal(new Date(record.trainingTime).toISOString(), trainingTime.toISOString());
         assert.equal(record.dossierFileIds?.length, 1);
         assert.equal(record.dossierFiles?.length, 1);
         assert.equal(String(recordDossierFile?.id), String(dossierFileAttendance.id));
         assert.equal(recordDossierFile?.filename, 'attendance.txt');
         assert.equal(recordDossierFile?.signed, true);
-        assert.equal(recordDossierFile?.meta?.category, 'attendanceSheet');
+        assert.equal('meta' in (recordDossierFile ?? {}), false);
+        assert.equal('fileScene' in (recordDossierFile ?? {}), false);
         assert.equal(record.trainingRecordSubjects?.length, 1);
         assert.equal(recordSubject?.name, '__Math__');
         assert.equal(recordSubject?.score, 95);
-        const downloadResponse = await fetch(recordDossierFile.downloadUrl);
+        const passportCode = await app.bean.passport.createTempAuthToken({
+          path: '/api/file/download',
+        });
+        const downloadUrl = new URL(recordDossierFile.downloadUrl);
+        downloadUrl.searchParams.set('x-vona-passport-code', passportCode);
+        const downloadResponse = await fetch(downloadUrl);
         assert.equal(downloadResponse.ok, true);
         assert.equal(await downloadResponse.text(), dossierTextAttendance.toString());
 
@@ -129,10 +131,6 @@ describe('record.test.ts', () => {
             filename: 'assessment.txt',
             contentType: 'text/plain',
             public: false,
-            meta: {
-              category: 'assessmentReport',
-              source: 'upload',
-            },
           },
           {
             clientName: 'default',
@@ -174,7 +172,7 @@ describe('record.test.ts', () => {
         assert.equal(record.name, dataUpdate.name);
         assert.equal(record.subjectCount, dataUpdate.subjectCount);
         assert.equal(record.totalScore, dataUpdate.totalScore);
-        assert.equal(record.averageScore, dataUpdate.averageScore);
+        assert.equal(Number(record.averageScore), dataUpdate.averageScore);
         assert.equal(new Date(record.trainingTime).toISOString(), trainingTimeUpdate.toISOString());
         assert.equal(record.dossierFileIds?.length, 2);
         assert.equal(record.dossierFiles?.length, 2);

package/vona/src/suite/a-training/modules/training-student/src/bean/imageScene.studentImage.ts

@@ -2,6 +2,7 @@ import { BeanBase } from 'vona';
 import { ImageScene } from 'vona-module-a-image';
 
 @ImageScene({
+  public: true,
   upload: {
     maxSize: 2 * 1024 * 1024,
     mimeTypes: ['image/png', 'image/jpeg', 'image/webp'],

package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordBase.tsx

@@ -1,16 +1,12 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
 import { $Class } from 'vona';
+import { DtoFileView } from 'vona-module-a-file';
 import { DtoImageView } from 'vona-module-a-image';
 import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import {
-  DtoRecordDossierFileView,
-  ModelRecord,
-  onEffectForTrainingRecordSubjects,
-  resolveDossierFiles,
-} from 'vona-module-training-record';
+import { ModelRecord, onEffectForTrainingRecordSubjects } from 'vona-module-training-record';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
@@ -50,6 +46,7 @@ export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
     v.serializerTransform('a-image:resolveViews', {
       fieldName: 'sceneImageIds',
       imageScene: 'training-record:sceneImage',
+      deliveryOptions: { audience: true },
     }),
     v.array($Class.partial(DtoImageView)),
   )
@@ -59,10 +56,12 @@ export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
     v.title($locale('DossierFiles')),
     ZovaRender.visible(false),
     v.optional(),
-    v.serializerTransform('a-serialization:custom', {
-      custom: resolveDossierFiles,
+    v.serializerTransform('a-file:resolveViews', {
+      fieldName: 'dossierFileIds',
+      fileScene: 'training-record:dossierFile',
+      deliveryOptions: { audience: true },
     }),
-    v.array($Class.partial(DtoRecordDossierFileView)),
+    v.array($Class.partial(DtoFileView)),
   )
-  dossierFiles?: Partial<DtoRecordDossierFileView>[];
+  dossierFiles?: Partial<DtoFileView>[];
 }

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -87,7 +87,7 @@ describe('student.test.ts', () => {
       assert.equal(record?.name, '__Record__');
       assert.equal(record?.subjectCount, 1);
       assert.equal(record?.totalScore, 88);
-      assert.equal(record?.averageScore, 88);
+      assert.equal(Number(record?.averageScore), 88);
       assert.equal(new Date(record?.trainingTime).toISOString(), trainingTime.toISOString());
       assert.equal(record?.trainingRecordSubjects?.length, 1);
       assert.equal(recordSubject?.name, '__Math__');
@@ -141,7 +141,7 @@ describe('student.test.ts', () => {
       assert.equal(updatedRecord?.name, '__RecordNew__');
       assert.equal(updatedRecord?.subjectCount, 2);
       assert.equal(updatedRecord?.totalScore, 183);
-      assert.equal(updatedRecord?.averageScore, 91.5);
+      assert.equal(Number(updatedRecord?.averageScore), 91.5);
       assert.equal(
         new Date(updatedRecord?.trainingTime).toISOString(),
         trainingTimeUpdate.toISOString(),

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-file",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -9,7 +9,8 @@
   "files": [
     "assets",
     "dist",
-    "src"
+    "src",
+    "cli"
   ],
   "type": "module",
   "exports": {