cabloy 5.1.95 → 5.1.96

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

@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.base",
+  "compilerOptions": {},
+  "references": [
+    {
+      "path": "modules/a-image/tsconfig.build.json"
+    },
+    {
+      "path": "modules/image-native/tsconfig.build.json"
+    },
+    {
+      "path": "modules/image-cloudflare/tsconfig.build.json"
+    }
+  ],
+  "exclude": ["modules"]
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.41",
+  "version": "5.1.42",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
@@ -36,7 +36,7 @@
     "@babel/traverse": "^7.29.0",
     "@cabloy/deps": "workspace:^",
     "@cabloy/json5": "workspace:^",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/type-fest": "^5.3.1",
     "@cabloy/utils": "workspace:^",
     "@cabloy/word-utils": "^2.1.8",

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-jwt",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-jwt/src/service/jwtClient.ts

@@ -79,6 +79,11 @@ export class ServiceJwtClient extends BeanBase {
           expiresIn: this.scope.config.tempAuthToken.signOptions.expiresIn,
         });
       }
+      if (options?.expiresIn !== undefined) {
+        signOptions = Object.assign({}, signOptions, {
+          expiresIn: options.expiresIn,
+        });
+      }
       this._jwtInstance.sign(payload, this._clientOptions.secret!, signOptions, (err, encoded) => {
         if (err) return reject(err);
         resolve(encoded!);

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

@@ -21,6 +21,7 @@ export interface IJwtSignOptions {
   path?: string | string[];
   dev?: boolean;
   temp?: boolean;
+  expiresIn?: StringValue | number;
 }
 
 export interface IJwtVerifyOptions {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapiutils",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/src/lib/schema/makeSchemaLikes.ts

@@ -11,6 +11,7 @@ import { SymbolDecoratorRule } from '../const/decorator.ts';
 import {
   getTargetDecoratorDtoOpenapi,
   getTargetDecoratorDtoPipes,
+  mergeSchemaOpenapiMetadata,
   prepareClassType,
 } from '../utils.ts';
 import { SymbolSchemaDynamicRefId } from './schemaDynamic.ts';
@@ -39,9 +40,10 @@ export function makeSchemaLike<T>(
   schemaPrevious: z.ZodType<T>,
 ): z.ZodType<T> {
   if (!schemaLike) return schemaPrevious;
+  let schemaCurrent: z.ZodType<T>;
   if (Object.prototype.hasOwnProperty.call(schemaLike, 'parseAsync')) {
     // schema
-    return schemaLike as z.ZodType<T>;
+    schemaCurrent = schemaLike as z.ZodType<T>;
   } else if (
     isClass(schemaLike) ||
     ['String', 'Number', 'Boolean', 'Date', 'BigInt', 'Array'].includes(
@@ -49,11 +51,12 @@ export function makeSchemaLike<T>(
     )
   ) {
     // class
-    return $schema(cast<Constructable>(schemaLike)) as z.ZodType<T>;
+    schemaCurrent = $schema(cast<Constructable>(schemaLike)) as z.ZodType<T>;
   } else {
     // function
-    return cast<SchemaLikeCreate>(schemaLike)(schemaPrevious);
+    schemaCurrent = cast<SchemaLikeCreate>(schemaLike)(schemaPrevious);
   }
+  return mergeSchemaOpenapiMetadata(schemaPrevious, schemaCurrent);
 }
 
 export function $schema<T>(schemaLike: z.ZodType<T>): z.ZodType<T>;

package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/src/lib/utils.ts

@@ -93,6 +93,18 @@ export function mergeDtoFieldsOpenapiMetadata(target: Constructable) {
   }
 }
 
+export function mergeSchemaOpenapiMetadata<T>(
+  schemaPrevious: z.ZodType<T> | undefined,
+  schemaCurrent: z.ZodType<T>,
+): z.ZodType<T> {
+  if (!schemaPrevious) return schemaCurrent;
+  if (schemaPrevious === schemaCurrent) return schemaCurrent;
+  const metadataPrevious = ZodMetadata.getOpenapiMetadata(schemaPrevious);
+  if (isEmptyObject(metadataPrevious)) return schemaCurrent;
+  const metadataCurrent = ZodMetadata.getOpenapiMetadata(schemaCurrent);
+  return schemaCurrent.openapi(deepExtend({}, metadataPrevious, metadataCurrent));
+}
+
 // fieldRule maybe undefined
 export function mergeFieldOpenapiMetadata(
   target: object,
@@ -106,13 +118,7 @@ export function mergeFieldOpenapiMetadata(
   const metadataCurrent = schemaCurrent ? ZodMetadata.getOpenapiMetadata(schemaCurrent) : undefined;
   // merge
   if (Object.prototype.hasOwnProperty.call(fieldRule, 'parseAsync')) {
-    const schema: z.ZodType = fieldRule as any;
-    if (isEmptyObject(metadataCurrent)) {
-      rules[prop] = schema;
-    } else {
-      const metadataCustom = ZodMetadata.getOpenapiMetadata(schema);
-      rules[prop] = schema.openapi(deepExtend({}, metadataCurrent, metadataCustom));
-    }
+    rules[prop] = mergeSchemaOpenapiMetadata(schemaCurrent as any, fieldRule as any) as any;
   } else {
     if (schemaCurrent) {
       if (!isEmptyObject(fieldRule)) {

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

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

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

@@ -42,7 +42,6 @@ declare module 'vona' {
     DATABASE_DEFAULT_CLIENT: string | undefined;
     // sqlite3
     DATABASE_CLIENT_SQLITE3_FILENAME: string | undefined;
-    DATABASE_CLIENT_SQLITE3_NATIVEBINDING: string | 'true' | 'false' | undefined;
     // pg
     DATABASE_CLIENT_PG_HOST: string | undefined;
     DATABASE_CLIENT_PG_PORT: string | undefined;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ormdialect",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
@@ -54,6 +54,14 @@
     "dependencies": {},
     "globalDependencies": {
       "better-sqlite3": true
+    },
+    "bundle": {
+      "externals": [
+        "better-sqlite3"
+      ],
+      "allowBuilds": [
+        "better-sqlite3"
+      ]
     }
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-upload",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-upload/src/bean/interceptor.upload.ts

@@ -44,6 +44,13 @@ export class InterceptorUpload extends BeanBase implements IInterceptorExecute {
       const fields: IUploadField[] = [];
       const files: IUploadFile[] = [];
       const filesCleanup: Function[] = [];
+      const fileWrites: Promise<void>[] = [];
+      let settled = false;
+      const rejectOnce = (err: Error) => {
+        if (settled) return;
+        settled = true;
+        reject(err);
+      };
       // bb
       const bb = Busboy(Object.assign({}, options.busboy, { headers: this.ctx.req.headers }));
       bb.on('file', (name, file, info) => {
@@ -59,7 +66,25 @@ export class InterceptorUpload extends BeanBase implements IInterceptorExecute {
           info,
         });
         // save
-        file.pipe(createWriteStream(fileTemp));
+        const writeStream = createWriteStream(fileTemp);
+        const fileWrite = new Promise<void>((resolveWrite, rejectWrite) => {
+          writeStream.on('finish', () => {
+            resolveWrite();
+          });
+          writeStream.on('error', err => {
+            rejectWrite(err);
+          });
+          file.on('error', err => {
+            rejectWrite(err);
+          });
+        });
+        fileWrites.push(
+          fileWrite.catch(err => {
+            rejectOnce(err as Error);
+            throw err;
+          }),
+        );
+        file.pipe(writeStream);
       });
       bb.on('field', (name, value, info) => {
         fields.push({
@@ -68,20 +93,27 @@ export class InterceptorUpload extends BeanBase implements IInterceptorExecute {
           info,
         });
       });
-      bb.on('close', () => {
-        resolve([fields, files, filesCleanup]);
+      bb.on('close', async () => {
+        try {
+          await Promise.all(fileWrites);
+          if (settled) return;
+          settled = true;
+          resolve([fields, files, filesCleanup]);
+        } catch {
+          // handled by rejectOnce
+        }
       });
       bb.on('error', (err: Error) => {
-        reject(err);
+        rejectOnce(err);
       });
       bb.on('partsLimit', () => {
-        reject(new Error('partsLimit'));
+        rejectOnce(new Error('partsLimit'));
       });
       bb.on('filesLimit', () => {
-        reject(new Error('filesLimit'));
+        rejectOnce(new Error('filesLimit'));
       });
       bb.on('fieldsLimit', () => {
-        reject(new Error('fieldsLimit'));
+        rejectOnce(new Error('fieldsLimit'));
       });
       this.ctx.req.pipe(bb);
     });

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.96",
+  "version": "1.2.97",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -40,11 +40,11 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/cli": "^3.1.27",
+    "@cabloy/cli": "^3.1.28",
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.94"
+    "zova-cli-set-front": "^1.2.95"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.94",
+  "version": "1.2.95",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -41,21 +41,21 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.27",
+    "@cabloy/cli": "^3.1.28",
     "@cabloy/extend": "^3.2.8",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@cabloy/utils": "^2.1.25",
+    "@cabloy/utils": "^2.1.26",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/word-utils": "^2.1.14",
     "@typescript/native-preview": "^7.0.0-dev.20260320.1",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
-    "babel-plugin-zova-bean-module": "^1.2.14",
-    "babel-plugin-zova-bean-use": "^1.1.14",
-    "babel-plugin-zova-behavior": "^1.1.14",
-    "babel-plugin-zova-component": "^1.1.14",
+    "babel-plugin-zova-bean-module": "^1.2.15",
+    "babel-plugin-zova-bean-use": "^1.1.15",
+    "babel-plugin-zova-behavior": "^1.1.15",
+    "babel-plugin-zova-component": "^1.1.15",
     "compressing": "^1.10.0",
     "fs-extra": "^11.3.5",
     "globby": "^14.1.0",
@@ -70,7 +70,7 @@
     "vite": "^8.0.14",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.42"
+    "zova-vite": "^1.1.43"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.generate.ts

@@ -393,17 +393,26 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     }
     //
     const contentTypes2 = contentTypes.join('\n');
-    const importsType: string[] = [];
-    if (contentSignatures.length > 0) importsType.push('OpenApiBaseURL');
-    if (contentTypes2.includes('components["schemas"]')) importsType.push('type components');
-    if (contentTypes2.includes('paths[')) importsType.push('type paths');
-    const contentImportsType =
-      importsType.length > 0
-        ? `import { ${importsType.join(', ')} } from './openapi/index.js';`
+    const importsOpenapiValue: string[] = [];
+    const importsOpenapiType: string[] = [];
+    if (contentSignatures.length > 0) importsOpenapiValue.push('OpenApiBaseURL');
+    if (contentTypes2.includes('components["schemas"]')) importsOpenapiType.push('components');
+    if (contentTypes2.includes('paths[')) importsOpenapiType.push('paths');
+    const contentImportsOpenapiValue =
+      importsOpenapiValue.length > 0
+        ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.js';`
         : '';
+    const contentImportsOpenapiType =
+      importsOpenapiType.length > 0
+        ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.js';`
+        : '';
+    const contentImportsOpenapi = [contentImportsOpenapiValue, contentImportsOpenapiType]
+      .filter(item => !!item)
+      .join('\n');
     // apiContent
-    const apiContent = `import { Api, BeanApiBase, IApiActionOptions } from 'zova-module-a-api';
-${contentImportsType}
+    const apiContent = `import { Api, BeanApiBase } from 'zova-module-a-api';
+import type { IApiActionOptions } from 'zova-module-a-api';
+${contentImportsOpenapi}
 
 ${contentTypes2}
 
@@ -441,7 +450,8 @@ export class ApiMeta${apiName} extends BeanBase {
 }
 `;
     const apiSchemaContent = `import { BeanBase } from 'zova';
-import { ApiSchema, IApiSchemaOptions } from 'zova-module-a-api';
+import { ApiSchema } from 'zova-module-a-api';
+import type { IApiSchemaOptions } from 'zova-module-a-api';
 ${contentImportsApiPath}
 
 @ApiSchema()

package/zova/packages-utils/babel-plugin-zova-bean-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-zova-bean-module",
-  "version": "1.2.14",
+  "version": "1.2.15",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "babel-plugin-zova-bean-module",
   "keywords": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/traverse": "^7.29.0",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/word-utils": "^2.1.14"
   },
   "devDependencies": {

package/zova/packages-utils/babel-plugin-zova-bean-use/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-zova-bean-use",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "babel-plugin-zova-bean-use",
   "keywords": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/traverse": "^7.29.0",
-    "@cabloy/module-info": "^2.0.0"
+    "@cabloy/module-info": "^2.0.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",

package/zova/packages-utils/babel-plugin-zova-behavior/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-zova-behavior",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "babel-plugin-zova-behavior",
   "keywords": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/traverse": "^7.29.0",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "html-tags": "^3.3.1",
     "svg-tags": "^1.0.0"
   },

package/zova/packages-utils/babel-plugin-zova-component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-zova-component",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "babel-plugin-zova-component",
   "keywords": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/traverse": "^7.29.0",
-    "@cabloy/module-info": "^2.0.0"
+    "@cabloy/module-info": "^2.0.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.75",
+  "version": "1.1.76",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -46,11 +46,11 @@
   },
   "dependencies": {
     "@cabloy/compose": "^2.1.8",
-    "@cabloy/utils": "^2.1.25",
+    "@cabloy/utils": "^2.1.26",
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.75"
+    "zova-core": "^5.1.76"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [
@@ -42,8 +42,8 @@
     "@babel/plugin-transform-typescript": "^7.28.6",
     "@cabloy/dotenv": "^1.2.8",
     "@cabloy/extend": "^3.2.8",
-    "@cabloy/module-glob": "^5.3.16",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-glob": "^5.3.17",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/vue-compiler-sfc": "^3.5.14",
@@ -56,10 +56,10 @@
     "@types/node": "^22.19.17",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
-    "babel-plugin-zova-bean-module": "^1.2.14",
-    "babel-plugin-zova-bean-use": "^1.1.14",
-    "babel-plugin-zova-behavior": "^1.1.14",
-    "babel-plugin-zova-component": "^1.1.14",
+    "babel-plugin-zova-bean-module": "^1.2.15",
+    "babel-plugin-zova-bean-use": "^1.1.15",
+    "babel-plugin-zova-behavior": "^1.1.15",
+    "babel-plugin-zova-component": "^1.1.15",
     "chalk": "^3.0.0",
     "esbuild": "^0.25.12",
     "fs-extra": "^11.3.5",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.130",
+  "version": "5.1.131",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.75",
-    "zova-suite-a-zova": "^5.1.129"
+    "zova-core": "^5.1.76",
+    "zova-suite-a-zova": "^5.1.130"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.75",
+  "version": "5.1.76",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -51,8 +51,8 @@
     "@cabloy/json5": "^1.1.9",
     "@cabloy/localeutil": "^2.1.8",
     "@cabloy/logger": "^1.1.24",
-    "@cabloy/module-info": "^2.0.0",
-    "@cabloy/utils": "^2.1.25",
+    "@cabloy/module-info": "^2.0.3",
+    "@cabloy/utils": "^2.1.26",
     "@cabloy/vue-compiler-sfc": "^3.5.14",
     "@cabloy/vue-reactivity": "^3.5.16",
     "@cabloy/vue-router": "^4.4.16",