@objectstack/rest 14.6.0 → 14.8.0

package/dist/index.d.cts

@@ -869,21 +869,18 @@ type PrepareImportResult = {
     code: string;
     error: string;
 };
-/**
- * Parse & validate a bulk-import request body into a {@link PreparedImport}.
- *
- * Shared by the synchronous `POST /data/:object/import` route and the async
- * import-job create route so both accept byte-identical payloads (writeMode +
- * matchFields, mapping in either shape, rows[]/csv/xlsxBase64) and resolve the
- * same field metadata. The only knob that differs is `maxRows` (5k sync vs
- * 50k async). Returns a discriminated result; the caller maps `!ok` to an HTTP
- * error using the returned status/code/error.
- */
 declare function prepareImportRequest(body: any, opts: {
     p: any;
     objectName: string;
     environmentId?: string;
     maxRows: number;
+    /**
+     * Optional hook applying the request locale to a schema document (the
+     * REST server passes `translateMetaItem` bound to the request). Used to
+     * accept locale-translated option labels — the strings the localized
+     * export / import template actually contain — as select-cell synonyms.
+     */
+    localizeSchema?: (schema: any) => Promise<any> | any;
 }): Promise<PrepareImportResult>;
 
 /**

package/dist/index.d.ts

@@ -869,21 +869,18 @@ type PrepareImportResult = {
     code: string;
     error: string;
 };
-/**
- * Parse & validate a bulk-import request body into a {@link PreparedImport}.
- *
- * Shared by the synchronous `POST /data/:object/import` route and the async
- * import-job create route so both accept byte-identical payloads (writeMode +
- * matchFields, mapping in either shape, rows[]/csv/xlsxBase64) and resolve the
- * same field metadata. The only knob that differs is `maxRows` (5k sync vs
- * 50k async). Returns a discriminated result; the caller maps `!ok` to an HTTP
- * error using the returned status/code/error.
- */
 declare function prepareImportRequest(body: any, opts: {
     p: any;
     objectName: string;
     environmentId?: string;
     maxRows: number;
+    /**
+     * Optional hook applying the request locale to a schema document (the
+     * REST server passes `translateMetaItem` bound to the request). Used to
+     * accept locale-translated option labels — the strings the localized
+     * export / import template actually contain — as select-cell synonyms.
+     */
+    localizeSchema?: (schema: any) => Promise<any> | any;
 }): Promise<PrepareImportResult>;
 
 /**

package/dist/index.js

@@ -213,6 +213,16 @@ var RouteGroupBuilder = class {
 };
 
 // src/export-format.ts
+function exportContentDisposition(objectName, label, ext, now = /* @__PURE__ */ new Date()) {
+  const pad = (n) => String(n).padStart(2, "0");
+  const stamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
+  const asciiBase = objectName.replace(/[^A-Za-z0-9_.-]/g, "_") || "export";
+  const utf8Base = String(label ?? "").replace(/[\\/:*?"<>|\u0000-\u001f]+/g, "_").replace(/^[\s._-]+|[\s._-]+$/g, "").slice(0, 80) || asciiBase;
+  const asciiName = `${asciiBase}-${stamp}.${ext}`;
+  const utf8Name = `${utf8Base}-${stamp}.${ext}`;
+  const encoded = encodeURIComponent(utf8Name).replace(/['()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`);
+  return `attachment; filename="${asciiName}"; filename*=UTF-8''${encoded}`;
+}
 var REFERENCE_TYPES = /* @__PURE__ */ new Set(["lookup", "master_detail", "user", "reference", "tree"]);
 var OPTION_TYPES = /* @__PURE__ */ new Set(["select", "radio"]);
 var MULTI_OPTION_TYPES = /* @__PURE__ */ new Set(["multiselect", "checkboxes", "tags"]);
@@ -1038,8 +1048,23 @@ async function parseXlsxToRows(buffer, mapping = {}, sheet) {
   }
   return out;
 }
+function mergeLocalizedOptionSynonyms(metaMap, localized) {
+  for (const [name, meta] of metaMap) {
+    const loc = localized.get(name);
+    if (!meta.options?.length || !loc?.options?.length) continue;
+    const known = new Set(
+      meta.options.map((o) => typeof o?.label === "string" ? o.label.trim().toLowerCase() : "").filter(Boolean)
+    );
+    const synonyms = loc.options.filter(
+      (o) => o && typeof o.label === "string" && o.label.trim().length > 0 && o.value !== void 0 && !known.has(o.label.trim().toLowerCase())
+    );
+    if (synonyms.length > 0) {
+      meta.options = [...meta.options, ...synonyms.map((o) => ({ label: o.label, value: o.value }))];
+    }
+  }
+}
 async function prepareImportRequest(body, opts) {
-  const { p, objectName, environmentId, maxRows } = opts;
+  const { p, objectName, environmentId, maxRows, localizeSchema } = opts;
   const dryRun = body?.dryRun === true;
   let writeMode = body?.writeMode === "update" || body?.writeMode === "upsert" ? body.writeMode : "insert";
   let matchFields = Array.isArray(body?.matchFields) ? body.matchFields.filter((f) => typeof f === "string" && f.length > 0) : [];
@@ -1126,6 +1151,15 @@ async function prepareImportRequest(body, opts) {
       schema = await p.getObjectSchema(objectName, environmentId);
     }
     metaMap = buildFieldMetaMap(schema);
+    if (schema && typeof localizeSchema === "function") {
+      try {
+        const localized = await localizeSchema(schema);
+        if (localized && localized !== schema) {
+          mergeLocalizedOptionSynonyms(metaMap, buildFieldMetaMap(localized));
+        }
+      } catch {
+      }
+    }
   } catch {
   }
   return {
@@ -1204,8 +1238,28 @@ function mapDataError(error, object) {
       }
     };
   }
+  if (typeof error?.innerMessage === "string" && error.innerMessage) {
+    return {
+      status: 400,
+      body: {
+        error: error.innerMessage,
+        ...object ? { object } : {}
+      }
+    };
+  }
   const raw = String(error?.message ?? error ?? "");
   const lower = raw.toLowerCase();
+  const sandboxWrapper = /^(?:hook|action) '[^']*' threw:\s*(.+)$/s.exec(raw);
+  if (sandboxWrapper) {
+    const msg = sandboxWrapper[1].startsWith("Error: ") ? sandboxWrapper[1].slice("Error: ".length) : sandboxWrapper[1];
+    return {
+      status: 400,
+      body: {
+        error: msg,
+        ...object ? { object } : {}
+      }
+    };
+  }
   if (raw.includes("[EnvironmentKernelFactory]") && (lower.includes("missing database_url") || lower.includes("not found"))) {
     const isProvisioning = lower.includes("status='provisioning'") || lower.includes("status='pending'");
     const isFailed = lower.includes("status='failed'");
@@ -2056,7 +2110,6 @@ var RestServer = class _RestServer {
     if (!TRANSLATABLE_META_TYPES.has(type)) return item;
     const i18n = i18nService !== void 0 ? i18nService : await this.resolveI18nService(environmentId, req);
     const bundle = this.buildTranslationBundle(i18n);
-    if (!bundle) return item;
     const locale = this.extractLocale(req, i18n);
     if (!locale) return item;
     const { translateMetadataDocument } = await import("@objectstack/spec/system");
@@ -2074,7 +2127,6 @@ var RestServer = class _RestServer {
     if (!arr) return items;
     const i18n = await this.resolveI18nService(environmentId, req);
     const bundle = this.buildTranslationBundle(i18n);
-    if (!bundle) return items;
     const locale = this.extractLocale(req, i18n);
     if (!locale) return items;
     const { translateMetadataDocument } = await import("@objectstack/spec/system");
@@ -3646,7 +3698,15 @@ var RestServer = class _RestServer {
           }
           if (await this.enforceApiAccess(req, res, p, environmentId, "import")) return;
           const body = req.body ?? {};
-          const prep = await prepareImportRequest(body, { p, objectName, environmentId, maxRows: 5e3 });
+          const prep = await prepareImportRequest(body, {
+            p,
+            objectName,
+            environmentId,
+            maxRows: 5e3,
+            // Accept locale-translated option labels (what the localized
+            // export / import template contain) as select-cell synonyms.
+            localizeSchema: (schema) => this.translateMetaItem(req, "object", environmentId, schema)
+          });
           if (!prep.ok) {
             if (prep.status === 413) prep.error += " Use an async import job for larger files.";
             res.status(prep.status).json({ code: prep.code, error: prep.error });
@@ -3697,7 +3757,14 @@ var RestServer = class _RestServer {
             return;
           }
           if (await this.enforceApiAccess(req, res, p, environmentId, "import")) return;
-          const prep = await prepareImportRequest(req.body ?? {}, { p, objectName, environmentId, maxRows: IMPORT_JOB_MAX_ROWS });
+          const prep = await prepareImportRequest(req.body ?? {}, {
+            p,
+            objectName,
+            environmentId,
+            maxRows: IMPORT_JOB_MAX_ROWS,
+            // Same round-trip i18n synonyms as the synchronous route.
+            localizeSchema: (schema) => this.translateMetaItem(req, "object", environmentId, schema)
+          });
           if (!prep.ok) {
             if (prep.status === 413) prep.error += ` This is the async import ceiling; split the file into batches of ${IMPORT_JOB_MAX_ROWS}.`;
             res.status(prep.status).json({ code: prep.code, error: prep.error });
@@ -4027,6 +4094,7 @@ var RestServer = class _RestServer {
             fields = q.fields.filter((s) => typeof s === "string" && s.length > 0);
           }
           let metaMap = /* @__PURE__ */ new Map();
+          let objectLabel;
           try {
             let schema = void 0;
             if (typeof p.getMetaItem === "function") {
@@ -4037,6 +4105,9 @@ var RestServer = class _RestServer {
               schema = await p.getObjectSchema(objectName, environmentId);
             }
             schema = await this.translateMetaItem(req, "object", environmentId, schema);
+            if (typeof schema?.label === "string" && schema.label.length > 0) {
+              objectLabel = schema.label;
+            }
             metaMap = buildFieldMetaMap(schema);
             if (!fields || fields.length === 0) {
               const names = [...metaMap.keys()];
@@ -4045,18 +4116,14 @@ var RestServer = class _RestServer {
           } catch {
           }
           const expandFields = referenceFieldNames(metaMap);
-          const stamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-          const safeObj = objectName.replace(/[^A-Za-z0-9_.-]/g, "_");
           if (format === "csv") {
             res.header("Content-Type", "text/csv; charset=utf-8");
-            res.header("Content-Disposition", `attachment; filename="${safeObj}-${stamp}.csv"`);
           } else if (format === "xlsx") {
             res.header("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            res.header("Content-Disposition", `attachment; filename="${safeObj}-${stamp}.xlsx"`);
           } else {
             res.header("Content-Type", "application/json; charset=utf-8");
-            res.header("Content-Disposition", `attachment; filename="${safeObj}-${stamp}.json"`);
           }
+          res.header("Content-Disposition", exportContentDisposition(objectName, objectLabel, format));
           res.header("X-Export-Format", format);
           res.header("X-Export-Limit", String(limit));
           if (format === "xlsx") res.header("X-Export-Styles", styled ? "applied" : "dropped");