cabloy 5.1.91 → 5.1.92

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 5.1.92
+
+### Bug Fixes
+
+- Preserve SSR route typing visibility.
+
+### Improvements
+
+- Clarify side-effect import module names.
+- Publish the latest package updates.
+
 ## 5.1.91
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.91",
+  "version": "5.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/pnpm-lock.yaml

@@ -474,8 +474,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.126
-        version: 5.1.126(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.129
+        version: 5.1.129(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.74
         version: 1.1.74(typescript@5.9.3)
@@ -513,8 +513,8 @@ importers:
         specifier: ^5.1.32
         version: 5.1.32
       zova-module-a-ssr:
-        specifier: ^5.1.26
-        version: 5.1.26
+        specifier: ^5.1.29
+        version: 5.1.29
       zova-module-a-style:
         specifier: ^5.1.32
         version: 5.1.32
@@ -7598,6 +7598,9 @@ packages:
   zova-module-a-ssr@5.1.26:
     resolution: {integrity: sha512-NSW9Gmf2eM/2L6zKWeW3CU8rwO6d2ayh/XnBSmKK7nZwBtnsYp0J/xs1d4z8JrBOrzkQJaD1YSk7iPtwm8OqMQ==}
 
+  zova-module-a-ssr@5.1.29:
+    resolution: {integrity: sha512-wlxLSy+Wjh/UFEVqsKQ105bvXceXPdIDmJQPKF0hSwiNY1R8HUottADfXPwYOatzZAayZ4AU4vQIpG92F2GJiA==}
+
   zova-module-a-ssrhmr@5.1.22:
     resolution: {integrity: sha512-K9D0DqCPuABvESyuAY8tQ7RukMpMEaMol0SV08ixVyed7Zd/b+Ugh49WEC2b5Y5iZCJliW9JJekvzS9Y0DilTA==}
 
@@ -7622,9 +7625,15 @@ packages:
   zova-suite-a-zova@5.1.125:
     resolution: {integrity: sha512-JE2gfchep6I9OTmQ43O36gbO8JtLfxiy4yCMMsifGvtfZDDuPRx6/KFtFKBIusB7Oohc6GBBGDfixANXdhGDZA==}
 
+  zova-suite-a-zova@5.1.128:
+    resolution: {integrity: sha512-+YRaC7QwS1/3upXrw7gPdpApgJjs1I1UUxeDl+3CHhiXHf/qYsLdPeUuQ98WKCiLIDD5jYyEYI5SU/Cs1gwjwA==}
+
   zova@5.1.126:
     resolution: {integrity: sha512-MRuKzH7rUO7jxYRqTJrjkj9GtgX/liEVyT2cBFp+O+EraHD4EQuYKf88QJzzI6w4CbfPKfgFvOfhsYnzU96pjw==}
 
+  zova@5.1.129:
+    resolution: {integrity: sha512-cRLBx/UbXxhlwYBjLOeO9EI05HFk9rexU9T/KaN2fWrWeEV86cPM6aQmGuyuj/TvnAVEIvmcr+PGFPb6x6YMvQ==}
+
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
 
@@ -13201,6 +13210,11 @@ snapshots:
       devalue: 5.8.1
       ms: 2.1.3
 
+  zova-module-a-ssr@5.1.29:
+    dependencies:
+      devalue: 5.8.1
+      ms: 2.1.3
+
   zova-module-a-ssrhmr@5.1.22:
     dependencies:
       '@cabloy/socket': link:packages-utils/socket
@@ -13281,6 +13295,40 @@ snapshots:
       - typescript
       - vue
 
+  zova-suite-a-zova@5.1.128(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
+      zova-module-a-bean: 5.1.31
+      zova-module-a-behavior: 5.1.25
+      zova-module-a-behaviors: 5.1.21
+      zova-module-a-boundary: 5.1.21
+      zova-module-a-command: 5.1.33
+      zova-module-a-fetch: 5.1.23
+      zova-module-a-form: 5.1.43(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-icon: 5.1.26
+      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.30(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-openapi: 5.1.41
+      zova-module-a-router: 5.1.29
+      zova-module-a-routerstack: 5.1.26
+      zova-module-a-routertabs: 5.1.32
+      zova-module-a-ssr: 5.1.29
+      zova-module-a-ssrhmr: 5.1.22
+      zova-module-a-ssrserver: 5.1.22
+      zova-module-a-style: 5.1.32
+      zova-module-a-table: 5.1.37(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-zod: 5.1.35
+      zova-module-a-zova: 5.1.89(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - debug
+      - supports-color
+      - typescript
+      - vue
+
   zova@5.1.126(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.74(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
@@ -13292,6 +13340,17 @@ snapshots:
       - typescript
       - vue
 
+  zova@5.1.129(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+    dependencies:
+      zova-core: 5.1.74(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
+      zova-suite-a-zova: 5.1.128(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - debug
+      - supports-color
+      - typescript
+      - vue
+
   zwitch@1.0.5: {}
 
   zwitch@2.0.4: {}

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.95",
+  "version": "1.2.96",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.93"
+    "zova-cli-set-front": "^1.2.94"
   },
   "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.93",
+  "version": "1.2.94",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.bin.buildRest.ts

@@ -53,6 +53,7 @@ interface IBinBuildRestContext {
   srcDir: string;
   outDir: string;
   bundleModules?: string[];
+  sideEffectImportModuleNames?: string[];
 }
 
 export class CliBinBuildRest extends BeanCliBase {
@@ -106,14 +107,20 @@ export class CliBinBuildRest extends BeanCliBase {
     // Modules
     const modules: string[] = [];
     const bundleModules: string[] = [];
+    const sideEffectImportModuleNames: string[] = [];
     for (const module of modulesMeta.modulesArray) {
-      modules.push(`export * from '${module.info.fullName}';`);
+      const moduleName = module.info.fullName;
+      modules.push(`import '${moduleName}';`);
+      modules.push(`export * from '${moduleName}';`);
       const moduleRoot = module.root.replaceAll('\\', '/');
       if (moduleRoot.includes('/src/module/') || moduleRoot.includes('/src/suite/')) {
-        bundleModules.push(module.info.fullName);
+        bundleModules.push(moduleName);
+      } else {
+        sideEffectImportModuleNames.push(moduleName);
       }
     }
     context.bundleModules = bundleModules;
+    context.sideEffectImportModuleNames = sideEffectImportModuleNames;
     argv.Modules = modules.join('\n');
     // Name/Version
     argv.Name = bundleName;
@@ -149,7 +156,12 @@ export class CliBinBuildRest extends BeanCliBase {
     await fse.writeFile(fileIndex, fileContent);
   }
 
-  async _buildDts({ srcDir, outDir, bundleModules }: IBinBuildRestContext) {
+  async _buildDts({
+    srcDir,
+    outDir,
+    bundleModules,
+    sideEffectImportModuleNames,
+  }: IBinBuildRestContext) {
     // entry
     const entry = path.join(srcDir, 'index.ts');
     // build
@@ -176,6 +188,18 @@ export class CliBinBuildRest extends BeanCliBase {
       },
       // minify: true,
     });
+    await this._injectDtsImports(outDir, sideEffectImportModuleNames!);
+  }
+
+  async _injectDtsImports(outDir: string, sideEffectImportModuleNames: string[]) {
+    const fileIndex = path.join(outDir, 'index.d.mts');
+    let fileContent = (await fse.readFile(fileIndex)).toString();
+    const imports = sideEffectImportModuleNames
+      .filter(moduleName => !fileContent.includes(`import "${moduleName}";`))
+      .map(moduleName => `import "${moduleName}";`);
+    if (imports.length === 0) return;
+    fileContent = `${imports.join('\n')}\n${fileContent}`;
+    await fse.writeFile(fileIndex, fileContent);
   }
 
   async _build(buildContext: IBinBuildRestContext) {
@@ -224,7 +248,7 @@ async function _extractDeps(filePath: string): Promise<string[]> {
   const pos = content.indexOf('//#region');
   content = content.substring(0, pos);
   const packageNames = new Set();
-  const re = /import\s+[\s\S]*?\s+from\s+['"]([^'"]+)['"]/g;
+  const re = /import\s+(?:[\s\S]*?\s+from\s+)?['"]([^'"]+)['"]/g;
 
   let match: any;
   while (true) {

package/zova/pnpm-lock.yaml

@@ -395,7 +395,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.92
+        specifier: ^1.2.93
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -816,7 +816,7 @@ importers:
         specifier: ^5.1.74
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.126
+        specifier: ^5.1.128
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -983,7 +983,7 @@ importers:
         specifier: ^5.1.32
         version: link:modules/a-routertabs
       zova-module-a-ssr:
-        specifier: ^5.1.27
+        specifier: ^5.1.29
         version: link:modules/a-ssr
       zova-module-a-ssrhmr:
         specifier: ^5.1.22