@objectstack/runtime 3.2.5 → 3.2.6

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @objectstack/runtime@3.2.5 build /home/runner/work/spec/spec/packages/runtime
+> @objectstack/runtime@3.2.6 build /home/runner/work/spec/spec/packages/runtime
 > tsup --config ../../tsup.config.ts
 
 CLI Building entry: src/index.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs     82.74 KB
-CJS dist/index.cjs.map 172.94 KB
-CJS ⚡️ Build success in 219ms
-ESM dist/index.js     80.18 KB
-ESM dist/index.js.map 172.87 KB
-ESM ⚡️ Build success in 221ms
+ESM dist/index.js     85.70 KB
+ESM dist/index.js.map 184.26 KB
+ESM ⚡️ Build success in 64ms
+CJS dist/index.cjs     88.28 KB
+CJS dist/index.cjs.map 184.34 KB
+CJS ⚡️ Build success in 64ms
 DTS Build start
-DTS ⚡️ Build success in 6647ms
-DTS dist/index.d.ts  23.61 KB
-DTS dist/index.d.cts 23.61 KB
+DTS ⚡️ Build success in 2485ms
+DTS dist/index.d.ts  24.35 KB
+DTS dist/index.d.cts 24.35 KB

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @objectstack/runtime
 
+## 3.2.6
+
+### Patch Changes
+
+- @objectstack/spec@3.2.6
+- @objectstack/core@3.2.6
+- @objectstack/types@3.2.6
+- @objectstack/rest@3.2.6
+
 ## 3.2.5
 
 ### Patch Changes

package/dist/index.cjs

@@ -653,7 +653,11 @@ var AppPlugin = class {
     this.start = async (ctx) => {
       const sys = this.bundle.manifest || this.bundle;
       const appId = sys.id || sys.name;
-      const ql = ctx.getService("objectql");
+      let ql;
+      try {
+        ql = ctx.getService("objectql");
+      } catch {
+      }
       if (!ql) {
         ctx.logger.warn("ObjectQL engine service not found", {
           appName: this.name,
@@ -687,6 +691,7 @@ var AppPlugin = class {
       } else {
         ctx.logger.debug("No runtime.onEnable function found", { appId });
       }
+      this.loadTranslations(ctx, appId);
       const seedDatasets = [];
       if (Array.isArray(this.bundle.data)) {
         seedDatasets.push(...this.bundle.data);
@@ -757,6 +762,68 @@ var AppPlugin = class {
     this.name = `plugin.app.${appId}`;
     this.version = sys.version;
   }
+  /**
+   * Auto-load i18n translation bundles from the app config into the
+   * kernel's i18n service. Handles both `translations` (array of
+   * TranslationBundle) and `i18n` config (default locale, etc.).
+   *
+   * Gracefully skips when the i18n service is not registered —
+   * this keeps AppPlugin resilient across server/dev/mock environments.
+   */
+  loadTranslations(ctx, appId) {
+    let i18nService;
+    try {
+      i18nService = ctx.getService("i18n");
+    } catch {
+    }
+    const bundles = [];
+    if (Array.isArray(this.bundle.translations)) {
+      bundles.push(...this.bundle.translations);
+    }
+    const manifest = this.bundle.manifest || this.bundle;
+    if (manifest && Array.isArray(manifest.translations) && manifest.translations !== this.bundle.translations) {
+      bundles.push(...manifest.translations);
+    }
+    if (!i18nService) {
+      if (bundles.length > 0) {
+        ctx.logger.warn(
+          `[i18n] App "${appId}" has ${bundles.length} translation bundle(s) but no i18n service is registered. Translations will not be served via REST API. Register I18nServicePlugin from @objectstack/service-i18n, or use DevPlugin which auto-detects translations and registers the i18n service automatically.`
+        );
+      } else {
+        ctx.logger.debug("[i18n] No i18n service registered; skipping translation loading", { appId });
+      }
+      return;
+    }
+    const i18nConfig = this.bundle.i18n || (this.bundle.manifest || this.bundle)?.i18n;
+    if (i18nConfig?.defaultLocale && typeof i18nService.setDefaultLocale === "function") {
+      i18nService.setDefaultLocale(i18nConfig.defaultLocale);
+      ctx.logger.debug("[i18n] Set default locale", { appId, locale: i18nConfig.defaultLocale });
+    }
+    if (bundles.length === 0) {
+      return;
+    }
+    let loadedLocales = 0;
+    for (const bundle of bundles) {
+      for (const [locale, data] of Object.entries(bundle)) {
+        if (data && typeof data === "object") {
+          try {
+            i18nService.loadTranslations(locale, data);
+            loadedLocales++;
+          } catch (err) {
+            ctx.logger.warn("[i18n] Failed to load translations", { appId, locale, error: err.message });
+          }
+        }
+      }
+    }
+    const svcAny = i18nService;
+    if (svcAny._fallback || svcAny._dev) {
+      ctx.logger.info(
+        `[i18n] Loaded ${loadedLocales} locale(s) into in-memory i18n fallback for "${appId}". For production, consider registering I18nServicePlugin from @objectstack/service-i18n.`
+      );
+    } else {
+      ctx.logger.info("[i18n] Loaded translation bundles", { appId, bundles: bundles.length, locales: loadedLocales });
+    }
+  }
 };
 
 // src/http-dispatcher.ts
@@ -796,25 +863,61 @@ var HttpDispatcher = class {
     return this.kernel.broker;
   }
   /**
-   * Generates the discovery JSON response for the API root
+   * Generates the discovery JSON response for the API root.
+   *
+   * Uses the same async `resolveService()` fallback chain that request
+   * handlers use, so the reported service status is always consistent
+   * with the actual runtime availability.
    */
-  getDiscoveryInfo(prefix) {
-    const services = this.getServicesMap();
-    const hasAuth = !!services[import_system.CoreServiceName.enum.auth];
-    const hasGraphQL = !!(services[import_system.CoreServiceName.enum.graphql] || this.kernel.graphql);
-    const hasSearch = !!services[import_system.CoreServiceName.enum.search];
-    const hasWebSockets = !!services[import_system.CoreServiceName.enum.realtime];
-    const hasFiles = !!(services[import_system.CoreServiceName.enum["file-storage"]] || services["storage"]?.supportsFiles);
-    const hasAnalytics = !!services[import_system.CoreServiceName.enum.analytics];
-    const hasWorkflow = !!services[import_system.CoreServiceName.enum.workflow];
-    const hasAi = !!services[import_system.CoreServiceName.enum.ai];
-    const hasNotification = !!services[import_system.CoreServiceName.enum.notification];
-    const hasI18n = !!services[import_system.CoreServiceName.enum.i18n];
-    const hasUi = !!services[import_system.CoreServiceName.enum.ui];
-    const hasAutomation = !!services[import_system.CoreServiceName.enum.automation];
-    const hasCache = !!services[import_system.CoreServiceName.enum.cache];
-    const hasQueue = !!services[import_system.CoreServiceName.enum.queue];
-    const hasJob = !!services[import_system.CoreServiceName.enum.job];
+  async getDiscoveryInfo(prefix) {
+    const [
+      authSvc,
+      graphqlSvc,
+      searchSvc,
+      realtimeSvc,
+      filesSvc,
+      analyticsSvc,
+      workflowSvc,
+      aiSvc,
+      notificationSvc,
+      i18nSvc,
+      uiSvc,
+      automationSvc,
+      cacheSvc,
+      queueSvc,
+      jobSvc
+    ] = await Promise.all([
+      this.resolveService(import_system.CoreServiceName.enum.auth),
+      this.resolveService(import_system.CoreServiceName.enum.graphql),
+      this.resolveService(import_system.CoreServiceName.enum.search),
+      this.resolveService(import_system.CoreServiceName.enum.realtime),
+      this.resolveService(import_system.CoreServiceName.enum["file-storage"]),
+      this.resolveService(import_system.CoreServiceName.enum.analytics),
+      this.resolveService(import_system.CoreServiceName.enum.workflow),
+      this.resolveService(import_system.CoreServiceName.enum.ai),
+      this.resolveService(import_system.CoreServiceName.enum.notification),
+      this.resolveService(import_system.CoreServiceName.enum.i18n),
+      this.resolveService(import_system.CoreServiceName.enum.ui),
+      this.resolveService(import_system.CoreServiceName.enum.automation),
+      this.resolveService(import_system.CoreServiceName.enum.cache),
+      this.resolveService(import_system.CoreServiceName.enum.queue),
+      this.resolveService(import_system.CoreServiceName.enum.job)
+    ]);
+    const hasAuth = !!authSvc;
+    const hasGraphQL = !!(graphqlSvc || this.kernel.graphql);
+    const hasSearch = !!searchSvc;
+    const hasWebSockets = !!realtimeSvc;
+    const hasFiles = !!filesSvc;
+    const hasAnalytics = !!analyticsSvc;
+    const hasWorkflow = !!workflowSvc;
+    const hasAi = !!aiSvc;
+    const hasNotification = !!notificationSvc;
+    const hasI18n = !!i18nSvc;
+    const hasUi = !!uiSvc;
+    const hasAutomation = !!automationSvc;
+    const hasCache = !!cacheSvc;
+    const hasQueue = !!queueSvc;
+    const hasJob = !!jobSvc;
     const routes = {
       data: `${prefix}/data`,
       metadata: `${prefix}/meta`,
@@ -842,6 +945,16 @@ var HttpDispatcher = class {
       status: "unavailable",
       message: `Install a ${name} plugin to enable`
     });
+    let locale = { default: "en", supported: ["en"], timezone: "UTC" };
+    if (hasI18n && i18nSvc) {
+      const defaultLocale = typeof i18nSvc.getDefaultLocale === "function" ? i18nSvc.getDefaultLocale() : "en";
+      const locales = typeof i18nSvc.getLocales === "function" ? i18nSvc.getLocales() : [];
+      locale = {
+        default: defaultLocale,
+        supported: locales.length > 0 ? locales : [defaultLocale],
+        timezone: "UTC"
+      };
+    }
     return {
       name: "ObjectOS",
       version: "1.0.0",
@@ -881,11 +994,7 @@ var HttpDispatcher = class {
         "file-storage": hasFiles ? svcAvailable(routes.storage) : svcUnavailable("file-storage"),
         search: hasSearch ? svcAvailable() : svcUnavailable("search")
       },
-      locale: {
-        default: "en",
-        supported: ["en", "zh-CN"],
-        timezone: "UTC"
-      }
+      locale
     };
   }
   /**
@@ -1199,13 +1308,24 @@ var HttpDispatcher = class {
     if (parts[0] === "translations") {
       const locale = parts[1] ? decodeURIComponent(parts[1]) : query?.locale;
       if (!locale) return { handled: true, response: this.error("Missing locale parameter", 400) };
-      const translations = i18nService.getTranslations(locale);
+      let translations = i18nService.getTranslations(locale);
+      if (Object.keys(translations).length === 0) {
+        const availableLocales = typeof i18nService.getLocales === "function" ? i18nService.getLocales() : [];
+        const resolved = (0, import_core2.resolveLocale)(locale, availableLocales);
+        if (resolved && resolved !== locale) {
+          translations = i18nService.getTranslations(resolved);
+          return { handled: true, response: this.success({ locale: resolved, requestedLocale: locale, translations }) };
+        }
+      }
       return { handled: true, response: this.success({ locale, translations }) };
     }
     if (parts[0] === "labels" && parts.length >= 2) {
       const objectName = decodeURIComponent(parts[1]);
-      const locale = parts[2] ? decodeURIComponent(parts[2]) : query?.locale;
+      let locale = parts[2] ? decodeURIComponent(parts[2]) : query?.locale;
       if (!locale) return { handled: true, response: this.error("Missing locale parameter", 400) };
+      const availableLocales = typeof i18nService.getLocales === "function" ? i18nService.getLocales() : [];
+      const resolved = (0, import_core2.resolveLocale)(locale, availableLocales);
+      if (resolved) locale = resolved;
       if (typeof i18nService.getFieldLabels === "function") {
         const labels2 = i18nService.getFieldLabels(objectName, locale);
         return { handled: true, response: this.success({ object: objectName, locale, labels: labels2 }) };
@@ -1580,7 +1700,7 @@ var HttpDispatcher = class {
   async dispatch(method, path, body, query, context) {
     const cleanPath = path.replace(/\/$/, "");
     if (cleanPath === "" && method === "GET") {
-      const info = this.getDiscoveryInfo("");
+      const info = await this.getDiscoveryInfo("");
       return {
         handled: true,
         response: this.success(info)
@@ -1728,10 +1848,10 @@ function createDispatcherPlugin(config = {}) {
       const dispatcher = new HttpDispatcher(kernel);
       const prefix = config.prefix || "/api/v1";
       server.get("/.well-known/objectstack", async (_req, res) => {
-        res.json({ data: dispatcher.getDiscoveryInfo(prefix) });
+        res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });
       });
       server.get(`${prefix}/discovery`, async (_req, res) => {
-        res.json({ data: dispatcher.getDiscoveryInfo(prefix) });
+        res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });
       });
       server.post(`${prefix}/auth/login`, async (req, res) => {
         try {
@@ -1853,6 +1973,30 @@ function createDispatcherPlugin(config = {}) {
           errorResponse(err, res);
         }
       });
+      server.get(`${prefix}/i18n/locales`, async (req, res) => {
+        try {
+          const result = await dispatcher.handleI18n("/locales", "GET", req.query, { request: req });
+          sendResult(result, res);
+        } catch (err) {
+          errorResponse(err, res);
+        }
+      });
+      server.get(`${prefix}/i18n/translations/:locale`, async (req, res) => {
+        try {
+          const result = await dispatcher.handleI18n(`/translations/${req.params.locale}`, "GET", req.query, { request: req });
+          sendResult(result, res);
+        } catch (err) {
+          errorResponse(err, res);
+        }
+      });
+      server.get(`${prefix}/i18n/labels/:object/:locale`, async (req, res) => {
+        try {
+          const result = await dispatcher.handleI18n(`/labels/${req.params.object}/${req.params.locale}`, "GET", req.query, { request: req });
+          sendResult(result, res);
+        } catch (err) {
+          errorResponse(err, res);
+        }
+      });
       server.get(`${prefix}/automation`, async (req, res) => {
         try {
           const result = await dispatcher.handleAutomation("", "GET", {}, { request: req });