@projectdochelp/s3te 3.4.0 → 3.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectdochelp/s3te",
-  "version": "3.4.0",
+  "version": "3.4.3",
   "description": "CLI, render core, AWS adapter, and testkit for S3TemplateEngine projects",
   "repository": {
     "type": "git",

package/packages/aws-adapter/src/runtime/content-mirror.mjs

@@ -106,7 +106,27 @@ function serializeStructuredValue(value) {
   return null;
 }
 
+function maybeParseStructuredString(value) {
+  if (typeof value !== "string") {
+    return value;
+  }
+
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+    return value;
+  }
+
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return value;
+  }
+}
+
 function toSimpleValue(value) {
+  const normalizedValue = maybeParseStructuredString(value);
+
+  value = normalizedValue;
   if (value == null) {
     return null;
   }

package/packages/cli/src/fs-adapters.mjs

@@ -7,6 +7,12 @@ function normalizeKey(value) {
   return String(value).replace(/\\/g, "/");
 }
 
+function matchesProjectRelativeRoot(key, root) {
+  const normalizedKey = normalizeKey(key);
+  const normalizedRoot = normalizeKey(root);
+  return normalizedKey === normalizedRoot || normalizedKey.startsWith(`${normalizedRoot}/`);
+}
+
 function normalizeLocale(value) {
   return String(value).trim().toLowerCase();
 }
@@ -122,6 +128,15 @@ export class FileSystemTemplateRepository {
   resolveKey(key) {
     const normalized = normalizeKey(key);
 
+    for (const variantConfig of Object.values(this.config.variants)) {
+      if (
+        matchesProjectRelativeRoot(normalized, variantConfig.sourceDir)
+        || matchesProjectRelativeRoot(normalized, variantConfig.partDir)
+      ) {
+        return path.join(this.projectDir, normalized);
+      }
+    }
+
     for (const [variantName, variantConfig] of Object.entries(this.config.variants)) {
       if (normalized === variantName || normalized.startsWith(`${variantName}/`)) {
         const suffix = normalized === variantName ? "" : normalized.slice(variantName.length + 1);

package/packages/core/src/content-query.mjs

@@ -22,6 +22,23 @@ function legacyAttributeValueToPlain(attribute) {
   return undefined;
 }
 
+function maybeParseStructuredString(value) {
+  if (typeof value !== "string") {
+    return value;
+  }
+
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+    return value;
+  }
+
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return value;
+  }
+}
+
 function readComparableValue(item, field) {
   if (field === "__typename") {
     return item.model;
@@ -159,12 +176,14 @@ export function readContentField(item, field, language) {
 }
 
 export function serializeContentValue(value) {
-  if (value == null) {
+  const normalizedValue = maybeParseStructuredString(value);
+
+  if (normalizedValue == null) {
     return "";
   }
 
-  if (Array.isArray(value)) {
-    return value.map((entry) => {
+  if (Array.isArray(normalizedValue)) {
+    return normalizedValue.map((entry) => {
       const text = typeof entry === "string" && entry.includes("-")
         ? entry.slice(entry.lastIndexOf("-") + 1)
         : String(entry);
@@ -172,5 +191,14 @@ export function serializeContentValue(value) {
     }).join("");
   }
 
-  return String(value);
+  if (normalizedValue && typeof normalizedValue === "object") {
+    if (typeof normalizedValue.html === "string") {
+      return normalizedValue.html;
+    }
+    if (typeof normalizedValue.text === "string") {
+      return normalizedValue.text;
+    }
+  }
+
+  return String(normalizedValue);
 }