vona-core 5.1.50 → 5.1.52

package/dist/index.js

@@ -663,6 +663,10 @@ function _resolverAddonFile(addonName, projectPath, resolver) {
   }
 }
 
+const queryCoercion = new AsyncLocalStorage();
+function runWithZodQueryCoercion(enabled, fn) {
+  return queryCoercion.run(enabled, fn);
+}
 function zodEnhance() {
   setLocaleAdapter((text, iss) => {
     const app = useApp();
@@ -670,7 +674,7 @@ function zodEnhance() {
       return app.meta.text(text, ...args);
     }, text, iss);
   });
-  setParseAdapter(ZodMetadata);
+  setParseAdapter(ZodMetadata, () => queryCoercion.getStore() !== false);
 }
 function zodSetLocaleErrors(app, localeErrors, localeDefault) {
   setLocaleErrors(() => {
@@ -2408,10 +2412,40 @@ function text$1(strings, ...expressions) {
 function isLocaleMagic(str) {
   return typeof str === 'object' && cast(str).toJSON;
 }
+function canonicalizeLocale(value) {
+  return typeof value === 'string' ? value.trim().replaceAll('_', '-').toLowerCase() : '';
+}
+function validateLocaleConfig(config) {
+  const items = config?.items;
+  if (!items || typeof items !== 'object' || Object.keys(items).length === 0) {
+    throw new Error('config.locale.items must contain at least one enabled locale');
+  }
+  for (const key of Object.keys(items)) {
+    if (!key || canonicalizeLocale(key) !== key || typeof items[key] !== 'string') {
+      throw new Error(`config.locale.items contains an invalid locale: ${key}`);
+    }
+  }
+  if (typeof config.default !== 'string' || !Object.hasOwn(items, config.default) || canonicalizeLocale(config.default) !== config.default) {
+    throw new Error('config.locale.default must be an enabled config.locale.items key');
+  }
+}
+
+/** Resolve an enabled input without allowing aliases to expand the configured set. */
+function resolveEnabledLocale(value, config, aliases = {}) {
+  validateLocaleConfig(config);
+  let locale = canonicalizeLocale(value);
+  if (Object.hasOwn(aliases, locale)) locale = canonicalizeLocale(aliases[locale]);
+  return Object.hasOwn(config.items, locale) ? locale : undefined;
+}
+
+/** Active-language selection only; explicit translation lookup remains independent. */
+function resolveLocale(value, config, aliases) {
+  return resolveEnabledLocale(value, config, aliases) ?? config.default;
+}
 
 class AppLocale extends BeanSimple {
   get current() {
-    return this.ctx ? this.ctx.locale : 'en-us';
+    return this.ctx ? this.ctx.locale : resolveLocale(undefined, this.app.config.locale);
   }
   set current(value) {
     this.ctx.locale = value;
@@ -3658,9 +3692,12 @@ function decode(source) {
     throw new Error('Windows test claim filesystem helper returned an invalid response');
   }
   if (!value || value.ok !== true) {
-    const error = new Error(value?.code === 'EEXIST' ? 'Test claim file already exists' : `Unsafe Windows test claim filesystem operation (${value?.code ?? 'unknown'})`);
+    const code = ['EEXIST', 'ENOENT', 'EBUSY', 'EACCES', 'EUNSAFE'].includes(value?.code) ? value.code : 'EUNSAFE';
+    const nativeCode = Number.isInteger(value?.nativeCode) && value.nativeCode >= 0 && value.nativeCode <= 65535 ? value.nativeCode : 0;
+    const error = new Error(`Unsafe Windows test claim filesystem operation (${code}, nativeCode=${nativeCode})`);
     Object.assign(error, {
-      code: value?.code ?? 'EUNSAFE'
+      code,
+      nativeCode
     });
     throw error;
   }
@@ -4350,9 +4387,19 @@ async function startTestClaimBroker(claimPath) {
   const update = event => {
     if (closing) return Promise.reject(new Error('Test claim broker is closed'));
     const result = queue.then(async () => {
-      const manifest = await loadTestClaim(claimPath);
-      applyEvent(manifest, event);
-      await writeTestClaim(claimPath, manifest);
+      let phase = 'read';
+      try {
+        const manifest = await loadTestClaim(claimPath);
+        phase = 'validate';
+        applyEvent(manifest, event);
+        phase = 'write';
+        await writeTestClaim(claimPath, manifest);
+      } catch (error) {
+        if (error instanceof Error) Object.assign(error, {
+          testClaimPhase: phase
+        });
+        throw error;
+      }
     });
     queue = result.catch(() => {});
     return result;
@@ -4373,8 +4420,15 @@ async function startTestClaimBroker(claimPath) {
       }
       if (req.url === '/containment') await containment(parseTestClaimJson(body));else await update(parseTestClaimJson(body));
       res.writeHead(204).end();
-    } catch {
-      res.writeHead(409).end('Test claim registration rejected');
+    } catch (error) {
+      const failure = error;
+      const headers = {};
+      if (['read', 'validate', 'write'].includes(failure?.testClaimPhase)) headers['x-vona-claim-phase'] = failure.testClaimPhase;
+      if (['EEXIST', 'ENOENT', 'EBUSY', 'EACCES', 'EUNSAFE'].includes(failure?.code)) headers['x-vona-claim-code'] = failure.code;
+      if (Number.isInteger(failure?.nativeCode) && failure.nativeCode >= 0 && failure.nativeCode <= 65535) {
+        headers['x-vona-claim-native-code'] = String(failure.nativeCode);
+      }
+      res.writeHead(409, headers).end('Test claim registration rejected');
     }
   });
   server.requestTimeout = 10000;
@@ -4424,20 +4478,34 @@ function hasTestClaimTransport(env = process.env) {
 }
 async function sendTestClaimEvent(env, event) {
   if (!hasTestClaimTransport(env)) return;
+  let response;
   try {
-    const response = await fetch(env[TEST_CLAIM_URL_ENV], {
+    response = await fetch(env[TEST_CLAIM_URL_ENV], {
       method: 'POST',
       headers: {
         'authorization': `Bearer ${env[TEST_CLAIM_TOKEN_ENV]}`,
+        // Startup can block past the broker's idle timeout; never reuse a stale socket.
+        'connection': 'close',
         'content-type': 'application/json'
       },
       body: JSON.stringify(event),
-      signal: AbortSignal.timeout(10000),
+      // Includes the serialized queue and durable Windows filesystem work (30s per operation).
+      signal: AbortSignal.timeout(120000),
       redirect: 'error'
     });
-    if (response.status !== 204) throw new Error('Registration rejected');
   } catch {
-    throw new Error('Managed test allocation registration failed');
+    throw new Error('Managed test allocation registration failed (transport)');
+  }
+  if (response.status !== 204) {
+    const details = [`HTTP ${response.status}`];
+    const phase = response.headers.get('x-vona-claim-phase');
+    const code = response.headers.get('x-vona-claim-code');
+    const nativeCode = response.headers.get('x-vona-claim-native-code');
+    if (['read', 'validate', 'write'].includes(phase)) details.push(phase);
+    if (['EEXIST', 'ENOENT', 'EBUSY', 'EACCES', 'EUNSAFE'].includes(code)) details.push(code);
+    if (nativeCode && /^\d{1,5}$/.test(nativeCode) && Number(nativeCode) <= 65535) details.push(`native ${nativeCode}`);
+    await response.body?.cancel().catch(() => {});
+    throw new Error(`Managed test allocation registration failed (${details.join(', ')})`);
   }
 }
 
@@ -4459,6 +4527,8 @@ async function assertTestClaimWindowsJob(env, identity) {
       method: 'POST',
       headers: {
         'authorization': `Bearer ${env[TEST_CLAIM_TOKEN_ENV]}`,
+        // Startup can block past the broker's idle timeout; never reuse a stale socket.
+        'connection': 'close',
         'content-type': 'application/json'
       },
       body: JSON.stringify(query),
@@ -4944,34 +5014,47 @@ function loadErrors (app, modules) {
 }
 
 async function loadLocales (app, modules) {
-  // all locales
-  app.meta.locales = localesDefault;
+  // Each application owns its registry; never add provider/project data to imported resources.
+  app.meta.locales = deepExtend({}, localesDefault);
   app.meta.localeModules = {};
+  const localesAll = await app.options.locales();
+  // Preserve existing project global/module override semantics.
+  for (const locale in localesAll.localesDefault) {
+    _initLocales(locale, localesAll.localesDefault[locale]);
+  }
+  for (const locale in localesAll.localesModules) {
+    _initLocales(locale, localesAll.localesModules[locale]);
+  }
+
+  // Providers precede all ordinary dictionaries, independent of their module order.
+  for (const moduleName of Object.keys(modules)) {
+    const module = modules[moduleName];
+    if (!module.info.capabilities?.locale) continue;
+    const locales = module.resource.localesProvider;
+    if (!locales) continue;
+    for (const locale of Object.keys(locales)) {
+      const resource = locales[locale];
+      const globals = Object.fromEntries(Object.entries(resource).filter(([key, value]) => key !== 'modules' && typeof value === 'string'));
+      app.meta.locales[locale] = Object.assign({}, globals, app.meta.locales[locale]);
+      for (const target of Object.keys(resource.modules ?? {})) {
+        // Metadata membership is sufficient; no target import, install or dependency is needed.
+        if (!Object.hasOwn(modules, target)) continue;
+        _registerLocale(target, locale, resource.modules[target]);
+      }
+    }
+  }
 
-  // load locales
-  await loadLocales();
-  async function loadLocales() {
-    const localesAll = await app.options.locales();
-    // project locales default
-    for (const locale in localesAll.localesDefault) {
-      _initLocales(locale, localesAll.localesDefault[locale]);
-    }
-    // project locales modules
-    for (const locale in localesAll.localesModules) {
-      _initLocales(locale, localesAll.localesModules[locale]);
-    }
-    // app cache
-    app.meta.hmrCacheLocaleModules = deepExtend({}, app.meta.localeModules);
-    // module locales
-    for (const moduleName in modules) {
-      const module = modules[moduleName];
+  // Preserve project/provider precedence when ordinary target dictionaries are reloaded.
+  app.meta.hmrCacheLocaleModules = deepExtend({}, app.meta.localeModules);
+  for (const moduleName of Object.keys(modules)) {
+    const module = modules[moduleName];
+    if (!module.info.capabilities?.locale) {
       _registerLocales(moduleName, module.resource.locales);
     }
   }
   function _initLocales(locale, locales) {
     if (!locales) return;
     if (!locales.modules) {
-      // override
       app.meta.locales[locale] = Object.assign({}, app.meta.locales[locale], locales);
     } else {
       const moduleMap = locales.modules;
@@ -4987,9 +5070,7 @@ async function loadLocales (app, modules) {
     }
   }
   function _registerLocale(moduleName, locale, moduleLocales) {
-    // locales: not override
     app.meta.locales[locale] = Object.assign({}, moduleLocales, app.meta.locales[locale]);
-    // localeModules
     if (!app.meta.localeModules[moduleName]) app.meta.localeModules[moduleName] = {};
     app.meta.localeModules[moduleName][locale] = Object.assign({}, moduleLocales, app.meta.localeModules[moduleName][locale]);
   }
@@ -5125,6 +5206,10 @@ async function __prepareConfig(app) {
   const configItemsRes = await Promise.all(configItemsPromise);
   for (const configItem of configItemsRes) {
     if (configItem) {
+      // An explicit language subset replaces the preceding policy, not its individual keys.
+      if (configItem.locale && Object.hasOwn(configItem.locale, 'items') && config.locale) {
+        delete config.locale.items;
+      }
       deepExtend(config, configItem);
     }
   }
@@ -5451,5 +5536,5 @@ async function retry(options, fn) {
 
 zodExtendOpenApi();
 
-export { $Class, $localeScope, $makeLocaleMagic, $protocolKey, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, Global, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorGlobal, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, TEST_CLAIM_DIRECTORY, TEST_CLAIM_TOKEN_ENV, TEST_CLAIM_URL_ENV, TEST_CLAIM_WINDOWS_GUARDIAN_ENV, TEST_REQUIRE_FRESH_RESOURCES_ENV, TEST_RUN_ID_ENV, TEST_RUN_OWNER_FILE, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, assertDisposableDatabaseName, assertFreshTestResources, assertFreshTestResourcesReady, assertIsolatedTestConfig, assertIsolatedTestDatabaseClient, assertIsolatedTestPath, assertTestAppIdentity, assertTestClaimDatabaseClient, assertTestClaimRedisClient, assertTestClaimSafePath, assertTestClaimWindowsJob, assertTestRunOwner, beanFullNameFromOnionName, beginCompletedInstance, bootstrap, buildTestClaimResourceInventory, captureCompletedInstance, captureRequestBoundary, cast, closeApp, closeProcessWorker, combineConfigDefault, combineFilePathSafe, compose, copyAddon, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, createApp, createAppMaster, createBeanDecorator, createCompletedReadiness, createDiagnosticLogger, createFreshnessDependencies, createGeneralApp, createHash, createRequestBoundary, createTestClaim, deepExtend, disposeInstance, errorsInternal, filterHeaders, finishCompletedInstance, formatLoggerAxiosError, formatLoggerBoundary, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerErrors, formatLoggerFilter, functionNoop, getDatabaseTestPrefix, getHomeVonaAppDir, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPlatformArch, getPublicPathPhysicalRoot, getRequestBoundary, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSuppressedDiagnosticLogger, getTestAppName, getTestClaimCreatedAt, getTestClaimPaths, getTestClaimRedisPrefix, getTestRunIdFromEnv, hasFreshnessDatabase, hasFreshnessRedis, hasTestClaimTransport, instanceDesp, invalidateCompletedInstance, isExistingReadyContext, isLocaleMagic, loadJSONFile, loadTestClaim, mergeTestClaimDatabaseOptions, mergeTestClaimRedisOptions, normalizeTestClaimDatabaseEndpoint, normalizeTestClaimRedisEndpoint, onionNameFromBeanFullName, pathToHref, pinExistingReadyContext, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, registerTestClaimDatabaseCreation, registerTestClaimResourceInventory, registerTestClaimWindowsJobVerifier, requireAddon, requireDynamic, requiresFreshTestResources, resolveAddon, resolveExistingReadyCapability, resolveTestRunId, resolveVonaLocalPaths, resolverSharp, resolverSharpLibvips, resolverSqlite3, retry, runWithRequestBoundary, saveJSONFile, sendTestClaimEvent, setMappedClassMetadataKeys, startTestClaimBroker, text$1 as text, useApp, usePrepareArg, usePrepareArgs, uuidv4, validateTestClaim, withIsolatedTestDatabaseDiscovery, writeTestClaim };
+export { $Class, $localeScope, $makeLocaleMagic, $protocolKey, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, Global, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorGlobal, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, TEST_CLAIM_DIRECTORY, TEST_CLAIM_TOKEN_ENV, TEST_CLAIM_URL_ENV, TEST_CLAIM_WINDOWS_GUARDIAN_ENV, TEST_REQUIRE_FRESH_RESOURCES_ENV, TEST_RUN_ID_ENV, TEST_RUN_OWNER_FILE, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, assertDisposableDatabaseName, assertFreshTestResources, assertFreshTestResourcesReady, assertIsolatedTestConfig, assertIsolatedTestDatabaseClient, assertIsolatedTestPath, assertTestAppIdentity, assertTestClaimDatabaseClient, assertTestClaimRedisClient, assertTestClaimSafePath, assertTestClaimWindowsJob, assertTestRunOwner, beanFullNameFromOnionName, beginCompletedInstance, bootstrap, buildTestClaimResourceInventory, canonicalizeLocale, captureCompletedInstance, captureRequestBoundary, cast, closeApp, closeProcessWorker, combineConfigDefault, combineFilePathSafe, compose, copyAddon, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, createApp, createAppMaster, createBeanDecorator, createCompletedReadiness, createDiagnosticLogger, createFreshnessDependencies, createGeneralApp, createHash, createRequestBoundary, createTestClaim, deepExtend, disposeInstance, errorsInternal, filterHeaders, finishCompletedInstance, formatLoggerAxiosError, formatLoggerBoundary, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerErrors, formatLoggerFilter, functionNoop, getDatabaseTestPrefix, getHomeVonaAppDir, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPlatformArch, getPublicPathPhysicalRoot, getRequestBoundary, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSuppressedDiagnosticLogger, getTestAppName, getTestClaimCreatedAt, getTestClaimPaths, getTestClaimRedisPrefix, getTestRunIdFromEnv, hasFreshnessDatabase, hasFreshnessRedis, hasTestClaimTransport, instanceDesp, invalidateCompletedInstance, isExistingReadyContext, isLocaleMagic, loadJSONFile, loadTestClaim, mergeTestClaimDatabaseOptions, mergeTestClaimRedisOptions, normalizeTestClaimDatabaseEndpoint, normalizeTestClaimRedisEndpoint, onionNameFromBeanFullName, pathToHref, pinExistingReadyContext, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, registerTestClaimDatabaseCreation, registerTestClaimResourceInventory, registerTestClaimWindowsJobVerifier, requireAddon, requireDynamic, requiresFreshTestResources, resolveAddon, resolveEnabledLocale, resolveExistingReadyCapability, resolveLocale, resolveTestRunId, resolveVonaLocalPaths, resolverSharp, resolverSharpLibvips, resolverSqlite3, retry, runWithRequestBoundary, runWithZodQueryCoercion, saveJSONFile, sendTestClaimEvent, setMappedClassMetadataKeys, startTestClaimBroker, text$1 as text, useApp, usePrepareArg, usePrepareArgs, uuidv4, validateLocaleConfig, validateTestClaim, withIsolatedTestDatabaseDiscovery, writeTestClaim };
 //# sourceMappingURL=index.js.map