cabloy 5.1.219 → 5.1.221

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

@@ -1,6 +1,13 @@
 import type { Context, Span, SpanOptions } from '@opentelemetry/api';
 
-import { context, propagation, SpanKind, SpanStatusCode, trace } from '@opentelemetry/api';
+import {
+  context,
+  INVALID_SPAN_CONTEXT,
+  propagation,
+  ROOT_CONTEXT,
+  SpanKind,
+  trace,
+} from '@opentelemetry/api';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
 import { W3CTraceContextPropagator } from '@opentelemetry/core';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
@@ -11,12 +18,15 @@ import {
   TraceIdRatioBasedSampler,
 } from '@opentelemetry/sdk-trace-base';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-import { BeanBase } from 'vona';
+import { BeanBase, captureRequestBoundary, getRequestBoundary } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 import type { ITelemetryCarrier } from '../types/telemetry.ts';
 
 import { createIngressTrustChecker } from '../lib/ingress.ts';
+import { endHttpSpan, recordSpanException } from '../lib/spanDiagnostics.ts';
+
+const nonRecordingSpan = trace.wrapSpanContext(INVALID_SPAN_CONTEXT);
 
 const carrierGetter = {
   get(carrier: ITelemetryCarrier, key: string) {
@@ -44,10 +54,12 @@ export class ServiceTelemetry extends BeanBase {
   private _enabled = false;
 
   get enabled() {
+    if (getRequestBoundary()) return false;
     return this._enabled;
   }
 
   init() {
+    if (getRequestBoundary()) return;
     if (this._provider || this._enabled) return;
     const config = this.scope.config;
     this._isTrustedIngress = createIngressTrustChecker(config.ingress);
@@ -96,64 +108,64 @@ export class ServiceTelemetry extends BeanBase {
   }
 
   get activeContext() {
+    if (getRequestBoundary()) return ROOT_CONTEXT;
     return this.ctx?.state.telemetry?.context ?? context.active();
   }
 
   extractCarrier(carrier?: ITelemetryCarrier) {
+    if (getRequestBoundary()) return ROOT_CONTEXT;
     if (!carrier) return context.active();
     return propagation.extract(context.active(), carrier, carrierGetter);
   }
 
   isTrustedIngress(peerAddress?: string, internalHeaderValue?: string) {
+    if (getRequestBoundary()) return false;
     this._isTrustedIngress ??= createIngressTrustChecker(this.scope.config.ingress);
     return this._isTrustedIngress(peerAddress, internalHeaderValue);
   }
 
   extractHttpIngressCarrier(trusted: boolean, carrier: ITelemetryCarrier) {
+    if (getRequestBoundary()) return ROOT_CONTEXT;
     return trusted ? this.extractCarrier(carrier) : this.extractCarrier();
   }
 
-  injectCarrier(source = this.activeContext): ITelemetryCarrier {
+  injectCarrier(source?: Context): ITelemetryCarrier {
+    if (getRequestBoundary()) return { version: 1 };
     const carrier: ITelemetryCarrier = { version: 1 };
-    propagation.inject(source, carrier, carrierSetter);
+    propagation.inject(source === undefined ? this.activeContext : source, carrier, carrierSetter);
     return carrier;
   }
 
-  startSpan(name: string, options?: SpanOptions, parent = this.activeContext) {
-    return trace.getTracer('vona-module-a-telemetry').startSpan(name, options, parent);
+  startSpan(name: string, options?: SpanOptions, parent?: Context) {
+    if (getRequestBoundary()) return nonRecordingSpan;
+    return trace
+      .getTracer('vona-module-a-telemetry')
+      .startSpan(name, options, parent === undefined ? this.activeContext : parent);
   }
 
   withSpan<RESULT>(span: Span, fn: () => RESULT): RESULT {
+    if (getRequestBoundary()) return fn();
     const active = trace.setSpan(this.activeContext, span);
     return context.with(active, fn);
   }
 
-  createContext(span: Span, parent = this.activeContext) {
-    return trace.setSpan(parent, span);
+  createContext(span: Span, parent?: Context) {
+    if (getRequestBoundary()) return ROOT_CONTEXT;
+    return trace.setSpan(parent === undefined ? this.activeContext : parent, span);
   }
 
   recordException(span: Span, error: unknown) {
-    if (error instanceof Error) {
-      span.recordException(error);
-      span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });
-      return;
-    }
-    span.setStatus({ code: SpanStatusCode.ERROR, message: String(error) });
+    if (getRequestBoundary()) return;
+    recordSpanException(span, error, captureRequestBoundary());
   }
 
   endHttpSpan(span: Span, statusCode: number, aborted = false) {
-    if (aborted || statusCode >= 500) {
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: aborted ? 'client aborted' : undefined,
-      });
-    }
-    span.setAttribute('http.response.status_code', statusCode);
-    if (aborted) span.setAttribute('vona.http.aborted', true);
-    span.end();
+    if (getRequestBoundary()) return;
+    endHttpSpan(span, statusCode, aborted);
   }
 
   getLogContext() {
+    if (getRequestBoundary()) return;
     if (!this._enabled) return;
     const spanContext = trace.getSpanContext(this.activeContext);
     if (!spanContext || !trace.isSpanContextValid(spanContext)) return;
@@ -166,6 +178,7 @@ export class ServiceTelemetry extends BeanBase {
   }
 
   createServerSpan(method: string, parent: Context) {
+    if (getRequestBoundary()) return nonRecordingSpan;
     return this.startSpan(`HTTP ${method}`, { kind: SpanKind.SERVER }, parent);
   }
 
@@ -175,6 +188,7 @@ export class ServiceTelemetry extends BeanBase {
     controllerBeanFullName: string,
     action: string,
   ) {
+    if (getRequestBoundary()) return;
     const span = this.ctx.state.telemetry?.serverSpan;
     if (!span) return;
     span.updateName(`HTTP ${method.toUpperCase()} ${routePath}`);

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-version",
-  "version": "5.1.21",
+  "version": "5.1.22",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona-module-a-version",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-version/src/service/database.ts

@@ -9,6 +9,8 @@ import {
   BeanBase,
   assertDisposableDatabaseName as assertDisposableDatabaseNameCore,
   assertIsolatedTestPath,
+  assertFreshTestResourcesReady,
+  requiresFreshTestResources,
   assertTestRunOwner,
   resolveVonaLocalPaths,
   withIsolatedTestDatabaseDiscovery,
@@ -39,6 +41,7 @@ interface IDevDatabasePreparation {
 }
 
 const devDatabasePreparations = new WeakMap<VonaApplication, IDevDatabasePreparation>();
+const freshDatabaseCreations = new WeakMap<VonaApplication, Map<string, string>>();
 
 export function assertDisposableDatabaseName(
   databaseName: string,
@@ -318,7 +321,7 @@ export class ServiceDatabase extends BeanBase {
     // client
     const client = this.bean.database.current.client;
     // get current database name
-    const databaseName = client.getDatabaseName();
+    const currentDatabaseName = client.getDatabaseName();
     const sqliteRoot =
       client.db.dialectName === 'better-sqlite3'
         ? resolveVonaLocalPaths(
@@ -327,9 +330,12 @@ export class ServiceDatabase extends BeanBase {
             this.app.meta.env.VONA_TEST_RUN_ID,
           ).sqliteRoot
         : undefined;
-    const currentFilename = sqliteRoot ? path.basename(databaseName, '.db') : databaseName;
+    const currentFilename = sqliteRoot
+      ? path.basename(currentDatabaseName, '.db')
+      : currentDatabaseName;
     const isTestDatabase = currentFilename.startsWith(databasePrefix);
-    if (isTestDatabase) assertDisposableDatabaseName(databaseName, databasePrefix, sqliteRoot);
+    if (isTestDatabase)
+      assertDisposableDatabaseName(currentDatabaseName, databasePrefix, sqliteRoot);
     if (
       this.app.meta.isTest &&
       this.app.meta.env.VONA_TEST_RUN_ID &&
@@ -337,11 +343,32 @@ export class ServiceDatabase extends BeanBase {
       !isTestDatabase
     ) {
       throw new Error(
-        `Isolated test database is outside its disposable namespace: ${databaseName}`,
+        `Isolated test database is outside its disposable namespace: ${currentDatabaseName}`,
       );
     }
     // test db
     if (this.app.meta.isTest) {
+      if (requiresFreshTestResources()) {
+        assertFreshTestResourcesReady(this.app);
+        const key = `${client.clientName}\0${databasePrefix}`;
+        const created = freshDatabaseCreations.get(this.app);
+        if (isTestDatabase) {
+          if (created?.get(key) !== currentDatabaseName) {
+            throw new Error('Strict test cannot reuse an unowned database');
+          }
+          return;
+        }
+        if ((await this.__fetchDatabases(client, instanceName, configInstanceBase)).length !== 0) {
+          throw new Error('Strict test database namespace is no longer fresh');
+        }
+        const name = await this.__createDatabase(client, instanceName, configInstanceBase);
+        assertDisposableDatabaseName(name, databasePrefix, sqliteRoot);
+        const creations = created ?? new Map<string, string>();
+        creations.set(key, name);
+        freshDatabaseCreations.set(this.app, creations);
+        await client.changeConfigConnectionAndReloadWorker(name);
+        return;
+      }
       // check
       if (isTestDatabase) {
         // donothing

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.101",
+  "version": "5.1.103",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -54,7 +54,7 @@
     "vona-module-a-static": "workspace:^",
     "vona-module-a-summer": "workspace:^",
     "vona-module-a-swagger": "workspace:^",
-    "vona-module-a-telemetry": "^5.0.2",
+    "vona-module-a-telemetry": "^5.0.3",
     "vona-module-a-upload": "workspace:^",
     "vona-module-a-user": "workspace:^",
     "vona-module-a-validation": "workspace:^",

package/zova/package.original.json

@@ -14,7 +14,7 @@
     "url": "git+https://github.com/zovajs/zova.git"
   },
   "type": "module",
-  "packageManager": "pnpm@11.5.2",
+  "packageManager": "pnpm@12.14.0",
   "scripts": {
     "zova": "node ./packages-cli/cli/src/bin/zova.ts",
     "dev": "npm run dev:ssr:admin",
@@ -96,6 +96,7 @@
     "oxlint": "^1.77.0"
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.4.0",
+    "pnpm": ">=11.5.2"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.115",
+  "version": "1.2.117",
   "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.113"
+    "zova-cli-set-front": "^1.2.115"
   },
   "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.113",
+  "version": "1.2.115",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

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

@@ -12,9 +12,10 @@ import fse from 'fs-extra';
 import path from 'node:path';
 import { rimraf } from 'rimraf';
 import { build } from 'tsdown';
-import yaml from 'yaml';
 import { createConfigUtils, saveJSONFile } from 'zova-vite';
 
+import { extractRestDependencies } from '../common/restDependencies.ts';
+import { extractRestDependencyVersions } from '../common/restDependencyVersions.ts';
 import { loadJSONFile } from '../common/utils.ts';
 import { __ThisSetName__ } from '../this.ts';
 
@@ -61,6 +62,7 @@ interface IBinBuildRestContext {
   outDir: string;
   bundleModules?: string[];
   sideEffectImportModuleNames?: string[];
+  moduleRoots?: string[];
   packageJson?: IBinBuildRestPackageJson;
 }
 
@@ -116,11 +118,13 @@ export class CliBinBuildRest extends BeanCliBase {
     const modules: string[] = [];
     const bundleModules: string[] = [];
     const sideEffectImportModuleNames: string[] = [];
+    const moduleRoots: string[] = [];
     for (const module of modulesMeta.modulesArray) {
       const moduleName = module.info.fullName;
       modules.push(`import '${moduleName}';`);
       modules.push(`export * from '${moduleName}';`);
       const moduleRoot = module.root.replaceAll('\\', '/');
+      moduleRoots.push(moduleRoot);
       if (moduleRoot.includes('/src/module/') || moduleRoot.includes('/src/suite/')) {
         bundleModules.push(moduleName);
       } else {
@@ -129,6 +133,7 @@ export class CliBinBuildRest extends BeanCliBase {
     }
     context.bundleModules = bundleModules;
     context.sideEffectImportModuleNames = sideEffectImportModuleNames;
+    context.moduleRoots = moduleRoots;
     argv.Modules = modules.join('\n');
     // Name/Version
     argv.Name = bundleName;
@@ -181,8 +186,7 @@ export class CliBinBuildRest extends BeanCliBase {
       tsconfig: 'tsconfig.rest.json',
       clean: false,
       dts: {
-        // resolve: true,
-        resolver: 'tsc',
+        resolver: 'oxc',
         tsgo: true,
         eager: true,
         tsconfig: 'tsconfig.rest.json',
@@ -213,13 +217,13 @@ export class CliBinBuildRest extends BeanCliBase {
   }
 
   async _build(buildContext: IBinBuildRestContext) {
-    const { projectPath, flavor, bundleNameCopy, outDir, packageJson } = buildContext;
+    const { projectPath, flavor, bundleNameCopy, outDir, packageJson, moduleRoots } = buildContext;
     // build
     await this._buildTs(buildContext);
     await this._buildDts(buildContext);
     // deps
     const deps = await _extractDeps(path.join(outDir, 'index.d.mts'));
-    const depsVersion = await _extractDepsVersion(projectPath, deps);
+    const depsVersion = await extractRestDependencyVersions(projectPath, deps, moduleRoots);
     // package.json
     const pkgContent = {
       ...packageJson!,
@@ -256,100 +260,6 @@ function _copyToTarget(
 }
 
 async function _extractDeps(filePath: string): Promise<string[]> {
-  let content = (await fse.readFile(filePath)).toString();
-  const pos = content.indexOf('//#region');
-  content = content.substring(0, pos);
-  const packageNames = new Set();
-  const re = /import\s+(?:[\s\S]*?\s+from\s+)?['"]([^'"]+)['"]/g;
-
-  let match: any;
-  while (true) {
-    match = re.exec(content);
-    if (!match) break;
-    let pkg: string = match[1];
-    if (pkg.startsWith('.') || pkg.startsWith('/')) continue;
-    if (pkg.startsWith('@')) {
-      if (pkg.split('/').length > 2) {
-        pkg = pkg.split('/').slice(0, 2).join('/');
-      }
-    } else {
-      if (pkg.split('/').length > 1) {
-        pkg = pkg.split('/').slice(0, 1).join('/');
-      }
-    }
-    packageNames.add(pkg);
-  }
-  return Array.from(packageNames).sort() as string[];
-}
-
-async function _extractDepsVersion(
-  projectPath: string,
-  deps: string[],
-): Promise<Record<string, string>> {
-  const lockfilePath = path.join(projectPath, 'pnpm-lock.yaml');
-  const lockfileContent = (await fse.readFile(lockfilePath)).toString();
-  const parsedLockfile = yaml.parse(lockfileContent);
-  const depsVersion: Record<string, string> = {};
-  for (const dep of deps) {
-    let dependencyRange = getPackageDependencyRangeFromLock(parsedLockfile, dep);
-    if (!dependencyRange) {
-      const version = await getPackageVersionFromNodeModules(projectPath, dep);
-      dependencyRange = version ? `^${version}` : null;
-    }
-    if (!dependencyRange) {
-      console.warn('dep version not found: ', dep);
-      continue;
-    }
-    depsVersion[dep] = dependencyRange;
-  }
-  return depsVersion;
-}
-
-function getPackageDependencyRangeFromLock(
-  parsedLockfile: any,
-  packageName: string,
-): string | null {
-  const importer = parsedLockfile.importers?.['.'];
-  const sections = ['dependencies', 'devDependencies', 'optionalDependencies'];
-  for (const section of sections) {
-    const dependencyRange = getImporterDependencyRange(importer?.[section]?.[packageName]);
-    if (dependencyRange) return dependencyRange;
-  }
-  return null;
-}
-
-function getImporterDependencyRange(
-  importerDependency: { specifier?: string; version?: string } | undefined,
-): string | null {
-  if (!importerDependency) return null;
-
-  const specifier = importerDependency.specifier;
-  if (specifier?.startsWith('npm:')) return specifier;
-
-  const version = normalizeLockfileVersion(importerDependency.version);
-  if (!version) return null;
-  return `^${version}`;
-}
-
-function normalizeLockfileVersion(version: string | undefined): string | null {
-  if (!version) return null;
-  if (version.startsWith('link:') || version.startsWith('file:')) return null;
-
-  const versionWithoutPeers = version.split('(')[0];
-  if (!versionWithoutPeers) return null;
-  if (/^\d/.test(versionWithoutPeers)) return versionWithoutPeers;
-
-  const aliasSeparator = versionWithoutPeers.lastIndexOf('@');
-  if (aliasSeparator === -1) return null;
-
-  const aliasedVersion = versionWithoutPeers.slice(aliasSeparator + 1);
-  if (!aliasedVersion || !/^\d/.test(aliasedVersion)) return null;
-  return aliasedVersion;
-}
-
-async function getPackageVersionFromNodeModules(projectPath: string, packageName: string) {
-  const pkgFile = path.join(projectPath, 'node_modules', packageName, 'package.json');
-  if (!fse.existsSync(pkgFile)) return null;
-  const pkgContent = await loadJSONFile(pkgFile);
-  return pkgContent.version;
+  const content = await fse.readFile(filePath, 'utf8');
+  return extractRestDependencies(content);
 }

package/zova/packages-cli/cli-set-front/src/lib/common/restDependencies.ts

@@ -0,0 +1,78 @@
+import { isBuiltin } from 'node:module';
+import path from 'node:path';
+import ts from 'typescript';
+
+export function extractRestDependencies(content: string): string[] {
+  const source = ts.createSourceFile('index.d.mts', content, ts.ScriptTarget.Latest);
+  // createSourceFile exposes syntax diagnostics at runtime, but not in its public return type.
+  const { parseDiagnostics } = source as ts.SourceFile & {
+    parseDiagnostics: readonly ts.Diagnostic[];
+  };
+  if (parseDiagnostics.length) {
+    const diagnostic = parseDiagnostics[0];
+    const { line, character } = source.getLineAndCharacterOfPosition(diagnostic.start ?? 0);
+    throw new Error(
+      `Invalid REST declaration at ${source.fileName}:${line + 1}:${character + 1}: ${ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n')}`,
+    );
+  }
+  for (const kind of ['path', 'types'] as const) {
+    const references = kind === 'path' ? source.referencedFiles : source.typeReferenceDirectives;
+    if (references.length) {
+      throw new Error(
+        `Unsupported REST declaration reference directive: ${kind} ${JSON.stringify(references[0].fileName)}. ` +
+          'The current REST bundling workflow does not support this directive.',
+      );
+    }
+  }
+  // lib references are compiler-owned, not package dependencies.
+  const dependencies = new Set<string>();
+
+  function addDependency(specifier: ts.Node | undefined) {
+    if (!specifier) return;
+    if (!ts.isStringLiteral(specifier)) {
+      throw new Error('Unsupported REST declaration module specifier');
+    }
+    const id = specifier.text;
+    if (
+      id.startsWith('.') ||
+      id.startsWith('#') ||
+      id.startsWith('\0') ||
+      path.isAbsolute(id) ||
+      path.win32.isAbsolute(id) ||
+      /^[a-z][a-z\d+.-]*:/i.test(id) ||
+      isBuiltin(id)
+    ) {
+      return;
+    }
+    if (!id || id.includes(':')) {
+      throw new Error(`Unsupported REST declaration package reference: ${id}`);
+    }
+    const parts = id.split('/');
+    if (id.startsWith('@') && (!parts[0].slice(1) || !parts[1])) {
+      throw new Error(`Invalid REST declaration package reference: ${id}`);
+    }
+    dependencies.add(parts.slice(0, id.startsWith('@') ? 2 : 1).join('/'));
+  }
+
+  function visit(node: ts.Node) {
+    if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) {
+      addDependency(node.moduleSpecifier);
+    } else if (ts.isImportTypeNode(node)) {
+      if (!ts.isLiteralTypeNode(node.argument)) {
+        throw new Error('Unsupported REST declaration import type');
+      }
+      addDependency(node.argument.literal);
+    } else if (
+      ts.isImportEqualsDeclaration(node) &&
+      ts.isExternalModuleReference(node.moduleReference)
+    ) {
+      addDependency(node.moduleReference.expression);
+    } else if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+      throw new Error('Unsupported REST declaration dynamic import');
+    }
+    ts.forEachChild(node, visit);
+  }
+
+  visit(source);
+  return Array.from(dependencies).sort();
+}