cabloy 5.1.115 → 5.1.117

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.masterDetail.ts

@@ -36,6 +36,9 @@ declare module '@cabloy/cli' {
     detailDialogTitleCapitalize: string;
     createdDetailModule?: boolean;
     createdDetailResource?: boolean;
+    restAdminNpm: string;
+    detailsModuleName: string;
+    detailCrudCommand: string;
   }
 }
 
@@ -82,6 +85,12 @@ export class CliToolsMasterDetail extends BeanCliBase {
     argv.detailDtoResItemName = `detail${argv.detailResourceNameCapitalize}ResItem`;
     argv.detailFieldPrivateName = `_${argv.relationName}`;
     argv.detailDialogTitleCapitalize = argv.detailModuleCapitalize;
+    const editionName = fs.existsSync(path.join(argv.projectPath, '__CABLOY_START__'))
+      ? 'start'
+      : 'basic';
+    argv.restAdminNpm = `zova-rest-cabloy-${editionName}-admin`;
+    argv.detailsModuleName = `${editionName}-details`;
+    argv.detailCrudCommand = `:tools:crud${this._capitalize(editionName)}`;
   }
 
   private async _ensureDetailModule() {
@@ -437,8 +446,8 @@ export class CliToolsMasterDetail extends BeanCliBase {
     if (!content.includes("import { $locale } from '../.metadata/locales.ts';")) {
       content = this._replaceStrict(
         content,
-        "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n",
-        "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n\nimport { $locale } from '../.metadata/locales.ts';\n",
+        `import { ZovaRender } from '${argv.restAdminNpm}';\n`,
+        `import { ZovaRender } from '${argv.restAdminNpm}';\n\nimport { $locale } from '../.metadata/locales.ts';\n`,
         fileName,
       );
     }
@@ -498,7 +507,7 @@ export class CliToolsMasterDetail extends BeanCliBase {
 
   private _masterDtoFieldCode(scene: MasterDtoScene) {
     const { argv } = this.context;
-    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('basic-details:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
+    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('${argv.detailsModuleName}:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
   }
 
   private _masterDtoClassReplaceSource(scene: MasterDtoScene) {
@@ -546,7 +555,7 @@ export class CliToolsMasterDetail extends BeanCliBase {
     const { argv } = this.context;
     await this.helper.invokeCli(
       [
-        ':tools:crudBasic',
+        argv.detailCrudCommand,
         argv.detailResourceName,
         `--module=${argv.detailModule}`,
         '--nometadata',

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

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.79",
+  "version": "5.1.81",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/packages-vona/vona-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-core",
-  "version": "5.1.33",
+  "version": "5.1.34",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona",
   "keywords": [

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

@@ -44,9 +44,18 @@ export const formatLoggerErrors = (opts: ILoggerFormatOpts) => {
 
 export const formatLoggerCtx = Winston.format((info, _opts: any) => {
   const app = useApp();
-  if (!app.ctx || !app.ctx.method || !app.ctx.path) return info;
-  info.method = app.ctx.method;
-  info.path = app.ctx.path;
+  if (!app.ctx) return info;
+  if (app.ctx.method) info.method = app.ctx.method;
+  if (app.ctx.path) info.path = app.ctx.path;
+  const telemetry = (app.ctx.state as any).telemetry;
+  if (telemetry?.requestId) info.request_id = telemetry.requestId;
+  const span = telemetry?.span ?? telemetry?.serverSpan;
+  const spanContext = span?.spanContext();
+  if (spanContext?.traceId && spanContext?.spanId) {
+    info.trace_id = spanContext.traceId;
+    info.span_id = spanContext.spanId;
+    info.trace_flags = spanContext.traceFlags;
+  }
   return info;
 });
 

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

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