@projectdochelp/s3te 3.3.2 → 3.3.3

package/package.json

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

package/packages/aws-adapter/src/runtime/common.mjs

@@ -76,8 +76,37 @@ function localeMatchScore(itemLocale, language, languageLocaleMap) {
   return 0;
 }
 
-function matchesRequestedLocale(item, language, languageLocaleMap) {
-  return localeMatchScore(item?.locale, language, languageLocaleMap) > 0;
+function comparableTimestamp(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+
+  const timestamp = Date.parse(String(value ?? ""));
+  return Number.isFinite(timestamp) ? timestamp : -1;
+}
+
+function compareContentFreshness(left, right) {
+  const updatedDiff = comparableTimestamp(right.updatedAt) - comparableTimestamp(left.updatedAt);
+  if (updatedDiff !== 0) {
+    return updatedDiff;
+  }
+
+  const changedDiff = comparableTimestamp(right.lastChangedAt) - comparableTimestamp(left.lastChangedAt);
+  if (changedDiff !== 0) {
+    return changedDiff;
+  }
+
+  const createdDiff = comparableTimestamp(right.createdAt) - comparableTimestamp(left.createdAt);
+  if (createdDiff !== 0) {
+    return createdDiff;
+  }
+
+  const versionDiff = Number(right.version ?? -1) - Number(left.version ?? -1);
+  if (versionDiff !== 0) {
+    return versionDiff;
+  }
+
+  return String(right.id ?? "").localeCompare(String(left.id ?? ""));
 }
 
 function filterItemsByRequestedLocale(items, language, languageLocaleMap) {
@@ -103,7 +132,11 @@ function filterItemsByRequestedLocale(items, language, languageLocaleMap) {
     }
 
     const bestScore = Math.max(...scored.map((entry) => entry.score));
-    return scored.filter((entry) => entry.score === bestScore).map((entry) => entry.item);
+    return scored
+      .filter((entry) => entry.score === bestScore)
+      .map((entry) => entry.item)
+      .sort(compareContentFreshness)
+      .slice(0, 1);
   });
 }
 
@@ -390,14 +423,7 @@ export class DynamoContentRepository {
       }
     }).promise();
     const items = response.Items ?? [];
-    const candidates = items
-      .map((item) => ({
-        item,
-        score: localeMatchScore(item.locale, language, this.languageLocaleMap)
-      }))
-      .filter((entry) => entry.score > 0)
-      .sort((left, right) => right.score - left.score || String(left.item.id).localeCompare(String(right.item.id)));
-    return candidates[0]?.item ?? null;
+    return filterItemsByRequestedLocale(items, language, this.languageLocaleMap)[0] ?? null;
   }
 
   async query(query, language) {

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

@@ -314,6 +314,17 @@ function extractWebinyTenant(item) {
     ?? null;
 }
 
+function normalizeMirrorLocale(value) {
+  return value == null ? "" : String(value).trim().toLowerCase();
+}
+
+function isSameMirroredContentIdentity(existingItem, contentItem) {
+  return String(existingItem.contentId ?? "") === String(contentItem.contentId ?? "")
+    && String(existingItem.model ?? "") === String(contentItem.model ?? "")
+    && String(existingItem.tenant ?? "") === String(contentItem.tenant ?? "")
+    && normalizeMirrorLocale(existingItem.locale) === normalizeMirrorLocale(contentItem.locale);
+}
+
 export function normalizeContentItem(item, options = {}) {
   const root = getItemRoot(item);
   const values = normalizeValues(item, options.modelFields);
@@ -369,12 +380,53 @@ async function loadModelFields(clients, sourceTableName, tenant, modelId, cache)
   return fields;
 }
 
+async function listMirroredContentItems(clients, tableName, indexName, contentId) {
+  const items = [];
+  let lastEvaluatedKey;
+
+  do {
+    const response = await clients.dynamo.query({
+      TableName: tableName,
+      IndexName: indexName,
+      KeyConditionExpression: "contentId = :contentId",
+      ExpressionAttributeValues: {
+        ":contentId": contentId
+      },
+      ExclusiveStartKey: lastEvaluatedKey
+    }).promise();
+    items.push(...(response.Items ?? []));
+    lastEvaluatedKey = response.LastEvaluatedKey;
+  } while (lastEvaluatedKey);
+
+  return items;
+}
+
+async function removeMirroredContentRevisions(clients, tableName, indexName, contentItem, excludeId = null) {
+  const mirroredItems = await listMirroredContentItems(clients, tableName, indexName, contentItem.contentId);
+  const removals = mirroredItems.filter((existingItem) => (
+    isSameMirroredContentIdentity(existingItem, contentItem)
+    && existingItem.id !== excludeId
+  ));
+
+  for (const existingItem of removals) {
+    await clients.dynamo.delete({
+      TableName: tableName,
+      Key: {
+        id: existingItem.id
+      }
+    }).promise();
+  }
+
+  return removals.length;
+}
+
 export async function handler(event) {
   const clients = createAwsClients();
   const tableName = process.env.S3TE_CONTENT_TABLE;
   const renderWorkerName = process.env.S3TE_RENDER_WORKER_NAME;
   const environmentName = process.env.S3TE_ENVIRONMENT;
   const sourceTableName = process.env.S3TE_WEBINY_SOURCE_TABLE;
+  const contentIndexName = process.env.S3TE_CONTENT_ID_INDEX_NAME ?? "contentid";
   const configuredTenant = String(process.env.S3TE_WEBINY_TENANT ?? "").trim();
   const relevantModels = new Set(String(process.env.S3TE_RELEVANT_MODELS ?? "")
     .split(",")
@@ -411,13 +463,7 @@ export async function handler(event) {
 
     const shouldDelete = record.eventName === "REMOVE" || !isPublished(item);
     if (shouldDelete) {
-      await clients.dynamo.delete({
-        TableName: tableName,
-        Key: {
-          id: contentItem.id
-        }
-      }).promise();
-      deleted += 1;
+      deleted += await removeMirroredContentRevisions(clients, tableName, contentIndexName, contentItem);
       await invokeLambdaEvent(clients.lambda, renderWorkerName, {
         type: "content-item",
         action: "delete",
@@ -429,6 +475,7 @@ export async function handler(event) {
       continue;
     }
 
+    await removeMirroredContentRevisions(clients, tableName, contentIndexName, contentItem, contentItem.id);
     await clients.dynamo.put({
       TableName: tableName,
       Item: contentItem

package/packages/aws-adapter/src/template.mjs

@@ -631,6 +631,7 @@ export function buildWebinyCloudFormationTemplate({ config, environment }) {
             Variables: {
               S3TE_ENVIRONMENT: environment,
               S3TE_CONTENT_TABLE: runtimeConfig.tables.content,
+              S3TE_CONTENT_ID_INDEX_NAME: config.aws.contentStore.contentIdIndexName,
               S3TE_RELEVANT_MODELS: runtimeConfig.integrations.webiny.relevantModels.join(","),
               S3TE_WEBINY_SOURCE_TABLE: runtimeConfig.integrations.webiny.sourceTableName,
               S3TE_WEBINY_TENANT: runtimeConfig.integrations.webiny.tenant ?? "",