@izara_project/izara-core-generate-service-code 1.0.101 → 1.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.101",
+  "version": "1.0.103",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/emit/application/coreFunction/templates/InitialSetupRunner_uploadSchema.ejs

@@ -1,4 +1,11 @@
 import initialSetupLib from '@izara_project/izara-core-library-initial-setup';
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+
+if (basicValidatorSchema?.basicFlowSchema?.properties?.event?.items?.enum) {
+  if (!basicValidatorSchema.basicFlowSchema.properties.event.items.enum.includes('dss')) {
+    basicValidatorSchema.basicFlowSchema.properties.event.items.enum.push('dss');
+  }
+}
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',

package/src/emit/application/coreFunction/templates/UploadSchema_Main.ejs

@@ -16,6 +16,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import initialSetupSharedLib from '@izara_project/izara-core-library-initial-setup';
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+
+if (basicValidatorSchema?.basicFlowSchema?.properties?.event?.items?.enum) {
+  if (!basicValidatorSchema.basicFlowSchema.properties.event.items.enum.includes('dss')) {
+    basicValidatorSchema.basicFlowSchema.properties.event.items.enum.push('dss');
+  }
+}
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',

package/src/emit/application/crud/templates/CreateEndpoint_Main.ejs

@@ -153,6 +153,10 @@ export default async function <%- flowTag %>(
         requestParams.billable = true;
       }
 
+      //(<rbacUsageValue_<%- flowTag %>>)
+      let usageValue = requestParams.value || requestParams.usageValue || 1;
+      //(</rbacUsageValue_<%- flowTag %>>)
+
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
         {
@@ -168,6 +172,7 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
+          value: usageValue,
           sync: true
         }
       );
@@ -187,6 +192,14 @@ export default async function <%- flowTag %>(
         );
       }
 
+      if (resultPermissionCheck?.uniqueIdentify) {
+        requestParams.reservedUsageId = resultPermissionCheck.uniqueIdentify;
+      }
+      if (resultPermissionCheck?.runningTotalReservedId) {
+        requestParams.runningTotalReservedId =
+          resultPermissionCheck.runningTotalReservedId;
+      }
+
       //(<rbacPublish_<%- flowTag %>>)
       //(</rbacPublish_<%- flowTag %>>)
     }
@@ -275,6 +288,7 @@ export default async function <%- flowTag %>(
       //(</afterBeforeLogical_<%= objectType %>>)
 
       <%_ if (hasOwnTopic) { _%>
+      /*
       // ── ownTopic (async — dispatch to before-hook and await callback) ──────────
       <%_ configs.filter(c => c?.generatedCodeConfig?.invocationType === 'ownTopic' || c?.event?.includes('ownTopic')).forEach(config => { _%>
       let hookPayload_<%= config.flowTag %> = {
@@ -341,6 +355,13 @@ export default async function <%- flowTag %>(
         status: 'pending',
         message: 'Dispatched to BeforeHook'
       };
+      */
+      return await <%- flowTag %>LogicalLib(
+        _izContext,
+        requestParams,
+        callingFlowConfig,
+        foundErrors
+      );
       <%_ } else { _%>
       return await <%- flowTag %>LogicalLib(
         _izContext,

package/src/emit/application/custom/customFlowS3.js

@@ -261,6 +261,40 @@ export function resolveParentIdentifierInfo(flow, objects = []) {
   };
 }
 
+export function resolveTargetIdentifierInfo(flow, objects = []) {
+  const targetObjType =
+    typeof flow.objType === 'string'
+      ? flow.objType
+      : flow.objType?.objectType || flow.objectType;
+  const matchedObject = (objects || []).find(
+    (o) => o.objectType === targetObjType
+  );
+
+  let identifierKeys = [];
+  if (Array.isArray(flow.identifierKeys) && flow.identifierKeys.length > 0) {
+    identifierKeys = [...flow.identifierKeys];
+  } else if (flow.identifierKey) {
+    identifierKeys = [flow.identifierKey];
+  } else if (
+    Array.isArray(matchedObject?.identifiers) &&
+    matchedObject.identifiers.length > 0
+  ) {
+    identifierKeys = extractIdentifierFieldNames(matchedObject.identifiers);
+  }
+
+  if (identifierKeys.length === 0 && targetObjType) {
+    identifierKeys = [`${targetObjType}Id`];
+  }
+
+  let identifierKey =
+    identifierKeys.length > 0 ? identifierKeys[0] : `${targetObjType}Id`;
+
+  return {
+    identifierKey,
+    identifierKeys
+  };
+}
+
 export function resolveFlowRelationships(
   flow,
   { objects = [], relationships = [] } = {}
@@ -454,6 +488,8 @@ function _s3TemplateData({
   }
   const { parentObjectType, parentServiceTag, parentIdKey, parentIdKeys } =
     resolveParentIdentifierInfo(flow, objects);
+  const { identifierKey, identifierKeys } =
+    resolveTargetIdentifierInfo(flow, objects);
   let s3KeyPrefix = 'uploads/';
   if (flow.s3KeyPrefix) {
     s3KeyPrefix = flow.s3KeyPrefix;
@@ -498,6 +534,8 @@ function _s3TemplateData({
     action,
     flowTag: flow.flowTag,
     objectType: flow.objType?.objectType,
+    identifierKey,
+    identifierKeys,
     functionName,
     nextStepFunctionName,
     isSimplifiedS3,

package/src/emit/application/custom/customFlows.js

@@ -350,22 +350,22 @@ export const LEGACY_S3_PARTS = [
     action: 'CreateObject',
     handler: 'HdrWbs',
     type: 'wbs',
-    mainTemplate: 'CreateObject_Main.ejs',
-    handlerTemplate: 'CreateObject_HdrWbs.ejs'
+    mainTemplate: 'legacy/CreateObject_Main.ejs',
+    handlerTemplate: 'legacy/CreateObject_HdrWbs.ejs'
   },
   {
     action: 'ReservedLimit',
     handler: 'HdrSqs',
     type: 'sqs',
-    mainTemplate: 'ReservedLimit_Main.ejs',
-    handlerTemplate: 'ReservedLimit_HdrSqs.ejs'
+    mainTemplate: 'legacy/ReservedLimit_Main.ejs',
+    handlerTemplate: 'legacy/ReservedLimit_HdrSqs.ejs'
   },
   {
     action: 'CreatePreSignUrl',
     handler: 'HdrSqs',
     type: 'sqs',
-    mainTemplate: 'CreatePreSignUrl_Main.ejs',
-    handlerTemplate: 'CreatePreSignUrl_HdrSqs.ejs'
+    mainTemplate: 'legacy/CreatePreSignUrl_Main.ejs',
+    handlerTemplate: 'legacy/CreatePreSignUrl_HdrSqs.ejs'
   },
   {
     action: 'ProcessAfterUpload',
@@ -378,8 +378,8 @@ export const LEGACY_S3_PARTS = [
     action: 'ConfirmAfterUpload',
     handler: 'HdrSqs',
     type: 'sqs',
-    mainTemplate: 'ConfirmReserved_Main.ejs',
-    handlerTemplate: 'ConfirmReserved_HdrSqs.ejs'
+    mainTemplate: 'legacy/ConfirmReserved_Main.ejs',
+    handlerTemplate: 'legacy/ConfirmReserved_HdrSqs.ejs'
   }
 ];
 
@@ -419,16 +419,18 @@ export function resolveS3Parts(flow) {
     const eventType = Array.isArray(step.event) ? step.event[0] : 'sqs';
 
     if (eventType === 'wbs' || action === 'Start' || action === 'CreateObject') {
-      let mainTemplate = 'CreateObject_Main.ejs';
+      let mainTemplate = 'legacy/CreateObject_Main.ejs';
+      let handlerTemplate = 'legacy/CreateObject_HdrWbs.ejs';
       if (isDeferredNodeFlow) {
         mainTemplate = 'Start_Main.ejs';
+        handlerTemplate = 'Start_HdrWbs.ejs';
       }
       return {
         action,
         handler: 'HdrWbs',
         type: 'wbs',
         mainTemplate,
-        handlerTemplate: 'CreateObject_HdrWbs.ejs'
+        handlerTemplate
       };
     }
 
@@ -453,12 +455,18 @@ export function resolveS3Parts(flow) {
     }
 
     if (action === 'ConfirmAfterUpload') {
+      let mainTemplate = 'legacy/ConfirmAfterUpload_Main.ejs';
+      let handlerTemplate = 'legacy/ConfirmAfterUpload_HdrSqs.ejs';
+      if (isDeferredNodeFlow) {
+        mainTemplate = 'ConfirmComplete_Main.ejs';
+        handlerTemplate = 'ConfirmComplete_HdrSqs.ejs';
+      }
       return {
         action,
         handler: 'HdrSqs',
         type: 'sqs',
-        mainTemplate: 'ConfirmAfterUpload_Main.ejs',
-        handlerTemplate: 'ConfirmAfterUpload_HdrSqs.ejs'
+        mainTemplate,
+        handlerTemplate
       };
     }
 
@@ -466,8 +474,8 @@ export function resolveS3Parts(flow) {
       action,
       handler: 'HdrSqs',
       type: 'sqs',
-      mainTemplate: 'CreatePreSignUrl_Main.ejs',
-      handlerTemplate: 'CreatePreSignUrl_HdrSqs.ejs'
+      mainTemplate: 'legacy/CreatePreSignUrl_Main.ejs',
+      handlerTemplate: 'legacy/CreatePreSignUrl_HdrSqs.ejs'
     };
   });
 }

package/src/emit/application/custom/templates/s3/ConfirmComplete_Main.ejs

@@ -52,10 +52,10 @@ export default async function <%- functionName %>(
 
     let targetId =
       passBackProperties.rawId ||
-      passBackProperties.<%- objectType %>Id ||
+      passBackProperties.<%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %> ||
       passBackProperties.parentPassBackProperties?.rawId ||
-      passBackProperties.parentPassBackProperties?.<%- objectType %>Id ||
-      objInstanceFull?.identifiers?.<%- objectType %>Id;
+      passBackProperties.parentPassBackProperties?.<%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %> ||
+      objInstanceFull?.identifiers?.<%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>;
 
     if (!targetId && objInstanceFull?.identifiers) {
       targetId = Object.values(objInstanceFull.identifiers)[0];
@@ -73,13 +73,13 @@ export default async function <%- functionName %>(
 
     if (tasks && tasks.Items && tasks.Items.length > 0) {
       for (const taskRecord of tasks.Items) {
-        if (taskRecord.connectionId) {
+        if (taskRecord.connectionId && taskRecord.connectionId !== 'NONE') {
           await postToConnection(
             _izContext,
             {
               status: 'completed',
               data: {
-                <%- objectType %>Id: targetId,
+                <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: targetId,
                 objInstanceFull: objInstanceFull
               }
             },

package/src/emit/application/custom/templates/s3/ProcessS3File_Main.ejs

@@ -27,6 +27,11 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import { sns } from '@izara_project/izara-core-library-external-request';
 import { consts } from '@izara_project/izara-middleware';
+<% if (isSimplifiedS3) { -%>
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import { utils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = utils;
+<% } -%>
 
 //(<optionalRequired>)
 //(</optionalRequired>)
@@ -68,6 +73,16 @@ export default async function <%- functionName %>(
 
     const s3Key = field.key;
     const actualByteSize = field.size;
+
+    if (!s3Key || s3Key.endsWith('/') || actualByteSize === 0) {
+      _izContext.logger.warn('Skipping directory marker or 0-byte object:', {
+        bucketName: bucket.name,
+        key: s3Key,
+        size: actualByteSize
+      });
+      return { status: 'skipped_empty_or_dir', s3Key };
+    }
+
     const actualSizeMb = actualByteSize / (1024 * 1024);
 
     _izContext.logger.debug('S3 file details:', {
@@ -120,6 +135,81 @@ export default async function <%- functionName %>(
 <% } -%>
     //(</extractIdentifiersFromKeyOrMetadata>)
 
+<% if (isSimplifiedS3) { -%>
+    const flowTypeTag = createFlowTypeConcat(_izContext, {
+      flowTag: '<%- flowTag %>',
+      serviceTag: process.env.iz_serviceTag
+    });
+    const taskKey = `${flowTypeTag}${rawId}`;
+    const taskTableName = await dynamodbSharedLib.tableName(
+      _izContext,
+      'WebSocketTask'
+    );
+
+    let resolvedConnectionId =
+      s3Metadata.connectionid || s3Metadata.connectionId || '';
+    if (!resolvedConnectionId) {
+      const queryTasks = await dynamodbSharedLib.query(
+        _izContext,
+        taskTableName,
+        { taskKey }
+      );
+      if (queryTasks && queryTasks.Items && queryTasks.Items.length > 0) {
+        resolvedConnectionId = queryTasks.Items[0].connectionId;
+      } else {
+        _izContext.logger.warn(
+          `[Idempotency] No task record found for <%- objectType %>Id: ${rawId}.` +
+            ' Aborting dispatch to Create_In.'
+        );
+        return {
+          status: 'unauthorized_or_unknown_upload',
+          s3Key,
+          <%- objectType %>Id: rawId
+        };
+      }
+    }
+
+    try {
+      await dynamodbSharedLib.updateItem(
+        _izContext,
+        taskTableName,
+        {
+          taskKey,
+          connectionId: resolvedConnectionId
+        },
+        {
+          UpdateExpression: 'SET uploadClaimed = :claimed, claimedAt = :now',
+          ConditionExpression:
+            'attribute_exists(taskKey) AND attribute_not_exists(uploadClaimed)',
+          ExpressionAttributeValues: {
+            ':claimed': true,
+            ':now': Date.now()
+          }
+        }
+      );
+      _izContext.logger.info(
+        `[Idempotency] Successfully claimed upload for <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: ${rawId}`
+      );
+    } catch (claimErr) {
+      if (claimErr.name === 'ConditionalCheckFailedException') {
+        _izContext.logger.warn(
+          `[Idempotency] Duplicate or unauthorized S3 upload detected for` +
+            ` <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: ${rawId}. Aborting dispatch to Create_In.`
+        );
+        return {
+          status: 'duplicate_upload_ignored',
+          s3Key,
+          <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
+        };
+      }
+      _izContext.logger.error(
+        '[Idempotency] Failed to execute atomic claim on WebSocketTask:',
+        claimErr
+      );
+      throw claimErr;
+    }
+<% } -%>
+
     //(<endpointHook>)
     //(</endpointHook>)
 
@@ -134,7 +224,7 @@ export default async function <%- functionName %>(
 <% } -%>
 
     _izContext.logger.info('Extracted identifiers and metadata:', {
-      <%- objectType %>Id: rawId,
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
       parentId,
       submittedByUserId: metaUserId,
 <% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
@@ -191,9 +281,18 @@ export default async function <%- functionName %>(
     let messageObject = {
       objectType: '<%- objectType %>',
       submittedByUserId: metaUserId,
+<% if (typeof identifierKeys !== 'undefined' && identifierKeys && identifierKeys.length > 1) { -%>
+      identifiers: {
+        <%- identifierKeys[0] %>: rawId,
+<%   for (let i = 1; i < identifierKeys.length; i++) { -%>
+        <%- identifierKeys[i] %>: <%- identifierKeys[i] %><%- i < identifierKeys.length - 1 ? ',' : '' %>
+<%   } -%>
+      },
+<% } else { -%>
       identifiers: {
-        <%- objectType %>Id: rawId
+        <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
       },
+<% } -%>
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 1) { -%>
       targetIdentifiers: {
         <%- parentIdKeys[0] %>: parentId,
@@ -208,9 +307,16 @@ export default async function <%- functionName %>(
 <% } -%>
       relationships,
       fieldNames: {
+<% if (typeof identifierKeys !== 'undefined' && identifierKeys && identifierKeys.length > 1) { -%>
+        <%- identifierKeys[0] %>: rawId,
+<%   for (let i = 1; i < identifierKeys.length; i++) { -%>
+        <%- identifierKeys[i] %>: <%- identifierKeys[i] %>,
+<%   } -%>
+<% } else { -%>
+        <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
+<% } -%>
         //(<fieldNamesHook>)
         //(</fieldNamesHook>)
-        fileName: fileNameWithExt
       }
     };
 
@@ -230,7 +336,7 @@ export default async function <%- functionName %>(
           passBackProperties,
           callingFlowSharedLib.createCallingFlowConfig(
             confirmCallbackFunction,
-            { rawId: rawId, <%- objectType %>Id: rawId }
+            { rawId: rawId, <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId }
           )
         )
       );
@@ -245,7 +351,7 @@ export default async function <%- functionName %>(
 
     _izContext.logger.info('Publishing to Create_In SNS topic:', {
       topicArn,
-      <%- objectType %>Id: rawId,
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
       parentId<%- (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) ? flowRelationships.map(r => { const k = r.targetIdentifierKey || `${r.targetObjType.objectType}Id`; return `,\n      ${k}: meta${k.charAt(0).toUpperCase() + k.slice(1)}`; }).join('') : '' %>
     });
     _izContext.logger.debug(
@@ -260,7 +366,7 @@ export default async function <%- functionName %>(
     _izContext.logger.info('Successfully published to Create_In SNS:', {
       publishResult,
       s3Key,
-      <%- objectType %>Id: rawId
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
     });
 
     return {

package/src/emit/application/custom/templates/s3/Start_HdrWbs.ejs

@@ -0,0 +1,65 @@
+/*
+Copyright (C) 2026 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import {
+  middlewareHandler as middleware,
+  response
+} from '@izara_project/izara-middleware';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
+
+import <%= functionName %> from './<%= functionName %>_Main.js';
+
+export const main = middleware.wrap(async (event, context) => {
+  event._izContext.logger.debug('Event:', event);
+
+  try {
+    if (event.requestContext) {
+      const route = event.requestContext.routeKey;
+
+      switch (route) {
+        case '<%- route %>':
+          console.log('event in route webSocket', event);
+          let eventParams = JSON.parse(event.body);
+
+          let callingFlow = eventParams?.callingFlow
+            ? eventParams.callingFlow
+            : {};
+          await <%= functionName %>(
+            event._izContext,
+            eventParams,
+            callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
+            //(<additionalParams>)
+            //(</additionalParams>)
+          );
+
+          break;
+      }
+    } else {
+      const connId = event.connId;
+      await postToConnection(event._izContext, { message: event.message }, connId);
+    }
+
+    return response.webSocketSuccess();
+  } catch (err) {
+    const connId = event.requestContext.connectionId;
+    event._izContext.logger.error('Error, WebSocket: ', err);
+    await postToConnection(event._izContext, { message: err.message }, connId);
+    return response.failure(err);
+  }
+});

package/src/emit/application/custom/templates/s3/Start_Main.ejs

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { v7 as uuidv7 } from 'uuid';
+import { identifierUuid } from '@izara_project/izara-shared-core';
 import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
 import { S3Client } from '@aws-sdk/client-s3';
 import { consts } from '@izara_project/izara-middleware';
@@ -99,7 +99,8 @@ export default async function <%- functionName %>(
     }
 <% } -%>
 
-    const <%- objectType %>Id = uuidv7();
+<% const targetIdName = (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id`; -%>
+    const <%- targetIdName %> = identifierUuid();
 
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
     const targetParentId = requestParams.targetIdentifiers?.<%- parentIdKeys[0] %>;
@@ -139,7 +140,7 @@ export default async function <%- functionName %>(
       Key: Key,
       Conditions: [
         ['content-length-range', 0, maximumSize],
-        ['eq', '$x-amz-meta-<%- objectType %>Id', <%- objectType %>Id],
+        ['eq', '$x-amz-meta-<%- targetIdName %>', <%- targetIdName %>],
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
 <%   for (const key of parentIdKeys) { -%>
         ['eq', '$x-amz-meta-<%- key %>', target<%- key.charAt(0).toUpperCase() + key.slice(1) %>],
@@ -147,6 +148,7 @@ export default async function <%- functionName %>(
 <% } -%>
         ['starts-with', '$x-amz-meta-submittedByUserId', ''],
         ['starts-with', '$Content-Type', '<%- contentTypePrefix %>'],
+        ['starts-with', '$x-amz-meta-connectionId', ''],
 <% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
 <%   for (const rel of flowRelationships) { -%>
 <%     const relIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
@@ -157,13 +159,14 @@ export default async function <%- functionName %>(
         //(</conditionCreateUrlLink>)
       ],
       Fields: {
-        'x-amz-meta-<%- objectType %>Id': <%- objectType %>Id,
+        'x-amz-meta-<%- targetIdName %>': <%- targetIdName %>,
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
 <%   for (const key of parentIdKeys) { -%>
         'x-amz-meta-<%- key %>': target<%- key.charAt(0).toUpperCase() + key.slice(1) %>,
 <%   } -%>
 <% } -%>
         'x-amz-meta-submittedByUserId': submittedByUserId,
+        'x-amz-meta-connectionId': connectionId || 'NONE',
 <% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
 <%   for (const rel of flowRelationships) { -%>
 <%     const relIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
@@ -181,24 +184,25 @@ export default async function <%- functionName %>(
 
     const uploadUrl = await createPresignedPost(client, createPreSignUrlParam);
 
-    if (connectionId) {
-      await dynamodbSharedLib.putItem(
-        _izContext,
-        await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
-        {
-          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${<%- objectType %>Id}`,
-          connectionId: connectionId,
-          expirationTime: Math.floor(Date.now() / 1000) + 7200
-        }
-      );
+    const resolvedConnectionId = connectionId || 'NONE';
+    await dynamodbSharedLib.putItem(
+      _izContext,
+      await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
+      {
+        taskKey: `${createFlowTypeConcat(_izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${<%- targetIdName %>}`,
+        connectionId: resolvedConnectionId,
+        expirationTime: Math.floor(Date.now() / 1000) + 7200
+      }
+    );
 
+    if (connectionId) {
       await postToConnection(
         _izContext,
         {
           status: 'success',
           data: {
             uploadUrl: uploadUrl,
-            <%- objectType %>Id: <%- objectType %>Id
+            <%- targetIdName %>: <%- targetIdName %>
           }
         },
         connectionId
@@ -207,7 +211,7 @@ export default async function <%- functionName %>(
 
     return {
       uploadUrl: uploadUrl,
-      <%- objectType %>Id: <%- objectType %>Id
+      <%- targetIdName %>: <%- targetIdName %>
     };
   } catch (err) {
     _izContext.logger.error('Error in <%- functionName %>:', err);

package/src/emit/application/custom/templates/s3/{ConfirmAfterUpload_Main.ejs → legacy/ConfirmAfterUpload_Main.ejs}

@@ -64,7 +64,7 @@ export default async function <%- functionName %>(
       { taskKey: taskKey }
     );
 
-    if (taskRecord && taskRecord.connectionId) {
+    if (taskRecord && taskRecord.connectionId && taskRecord.connectionId !== 'NONE') {
       await postToConnection(
         _izContext,
         {

package/src/emit/application/rbac/templates/CancelUsage_Main.ejs

@@ -154,7 +154,7 @@ export default async function CancelUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -162,16 +162,17 @@ export default async function CancelUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: {
-          returnResult
-        },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'CancelUsage_Out'

package/src/emit/application/rbac/templates/ConfirmUsage_Main.ejs

@@ -178,7 +178,7 @@ export default async function ConfirmUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -186,16 +186,17 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: {
-          returnResult
-        },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'ConfirmUsage_Out'

package/src/emit/application/rbac/templates/CreateTargetRole_Main.ejs

@@ -133,8 +133,8 @@ export default async function CreateTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { roleId, roleIdKey } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { roleId, roleIdKey } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'CreateTargetRole_Out'

package/src/emit/application/rbac/templates/DeleteTargetRole_Main.ejs

@@ -82,8 +82,8 @@ export default async function DeleteTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { identifiersConcat, roleIdKey, status: 'deleted' } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { identifiersConcat, roleIdKey, status: 'deleted' } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'DeleteTargetRole_Out'

package/src/emit/application/rbac/templates/GetMyPermissions_Main.ejs

@@ -95,8 +95,8 @@ export default async function GetMyPermissions(_izContext, requestParams) {
       permissions: permissionsMap
     };
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: result },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: result }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'GetMyPermissions_Out'

package/src/emit/application/rbac/templates/GetTargetRole_Main.ejs

@@ -47,8 +47,8 @@ export default async function GetTargetRole(_izContext, requestParams) {
       users: usersResult?.Items || []
     };
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: result },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: result }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'GetTargetRole_Out'

package/src/emit/application/rbac/templates/ListRbac_Main.ejs

@@ -41,8 +41,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
       dynamodbSharedLib.tableName(_izContext, '<%- tableName %>'),
       queryParams
     );
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { records: resultQuery.Items || [] } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { records: resultQuery.Items || [] } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/application/rbac/templates/RbacMutation_Main.ejs

@@ -28,8 +28,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
       dynamodbSharedLib.tableName(_izContext, '<%- tableName %>'),
       { <%- fieldList %> }
     );
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { <%- fieldList %> } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { <%- fieldList %> } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/application/rbac/templates/ReservedDynamicUsage_Main.ejs

@@ -197,7 +197,7 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -205,14 +205,17 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: { returnResult },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'ReservedDynamicUsage_Out'

package/src/emit/application/rbac/templates/UpdateTargetRole_Main.ejs

@@ -93,8 +93,8 @@ export default async function UpdateTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { roleIdKey, status: 'updated' } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { roleIdKey, status: 'updated' } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'UpdateTargetRole_Out'

package/src/emit/application/rbac/templates/UserRoleMutation_Main.ejs

@@ -54,8 +54,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
         }
       }
     ]);
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { userId, roleIdKey } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { userId, roleIdKey } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/infrastructure/functions/templates/DssFunction_Yaml.ejs

@@ -7,7 +7,7 @@
     - stream:
         type: dynamodb
         arn:
-          Fn::GetAtt: [<%= tableName %>Table, StreamArn]
+          Fn::ImportValue: ${self:custom.iz_resourcePrefix}<%= tableName %>StreamArn
         batchSize: <%= batchSize %>
         startingPosition: <%= startingPosition %>
 <% if (Array.isArray(filterPatterns) && filterPatterns.length > 0) { -%>

package/src/emit/infrastructure/resources/dynamoResourceArtifacts.js

@@ -11,8 +11,12 @@ export async function renderDynamo(state) {
     )
   ]);
   const indentedTables = tables.map((t) => indentYaml(t, 2)).join('\n');
+  let content = system;
   if (indentedTables) {
-    return `${system}\n${indentedTables}`;
+    content = `${content}\n${indentedTables}`;
   }
-  return `${system}`;
+  if (state.selfRbac) {
+    content = `${content}\n\nOutputs:\n  RunningTotalReservedUsageStreamArn:\n    Value:\n      Fn::GetAtt: [RunningTotalReservedUsageTable, StreamArn]\n    Export:\n      Name: \${self:custom.iz_resourcePrefix}RunningTotalReservedUsageStreamArn\n`;
+  }
+  return content;
 }

package/src/emit/infrastructure/resources/sqsResourceArtifacts.js

@@ -102,7 +102,8 @@ export async function renderOut(state) {
       renderResourceTemplate('FlowOut_Yaml.ejs', { topicName })
     )
   );
-  const body = renderedTopics.join('\n');
+  const fileHook = '#<#customTopicOut#>\n#<#/customTopicOut#>';
+  const body = [...renderedTopics, fileHook].filter(Boolean).join('\n');
   return `Resources:\n${indentYaml(body, 2)}`;
 }
 

package/src/emit/infrastructure/resources/templates/FlowOut_Yaml.ejs

@@ -4,3 +4,5 @@ Out<%- topicName %>:
   Properties:
     DisplayName: 'SNS Message out'
     TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out
+#<#Out<%- topicName %>TopicSetting#>
+#<#/Out<%- topicName %>TopicSetting#>

package/test/unit/application/createTargetRoleHandler.test.js

@@ -332,7 +332,7 @@ test('generates synchronous HdrInv and HdrApi handlers for FlowLimit flows', asy
     /ReservedUsageTtlExpiredHdrDss:\n\s+handler: src\/generatedCode\/FlowLimit\/ReservedUsageTtlExpired\/source\/ReservedUsageTtlExpired_HdrDss\.main/
   );
   assert.match(limitYaml, /type: dynamodb/);
-  assert.match(limitYaml, /RunningTotalReservedUsageTable/);
+  assert.match(limitYaml, /RunningTotalReservedUsageStreamArn/);
   assert.match(limitYaml, /eventName: \["REMOVE"\]/);
 });
 

package/test/unit/application/customFlowS3.test.js

@@ -131,8 +131,8 @@ test('emitS3Flow with ADR-016 deferred-node pipeline generates correct 3 pairs o
     'Start_Main should generate S3 presigned post URL'
   );
   assert.ok(
-    startMainArtifact.content.includes('uuidv7'),
-    'Start_Main should generate identifier with uuidv7'
+    startMainArtifact.content.includes('identifierUuid'),
+    'Start_Main should generate identifier with identifierUuid'
   );
   assert.ok(
     !startMainArtifact.content.includes("snsTopicArnByFlowSchema(_izContext, 'Create_In')"),
@@ -186,6 +186,10 @@ test('emitS3Flow with ADR-016 deferred-node pipeline generates correct 3 pairs o
     procMainArtifact.content.includes('FeedChunkRecordUrlConfirmAfterUploadHdrSqs'),
     'ProcessAfterUpload_Main must target ConfirmAfterUploadHdrSqs for callback'
   );
+  assert.ok(
+    procMainArtifact.content.includes('feedChunkId: rawId'),
+    'ProcessAfterUpload_Main must include objectTypeId: rawId in fieldNames'
+  );
 
   const confirmMainArtifact = result.artifacts.find(
     (a) => a.path === `${source}/FeedChunkRecordUrlConfirmAfterUpload_Main.js`
@@ -853,6 +857,156 @@ test('emitS3Flow resolves relationships from schemas with relationshipDirection
   );
 });
 
+test('emitS3Flow generates WebSocketTask atomic claim in ProcessAfterUpload and connectionId NONE guard in ConfirmComplete', async () => {
+  const flow = {
+    flowTag: 'FeedChunkRecordUrl',
+    initiateBy: 'user',
+    handleObj: 'one',
+    statusType: 'statusField',
+    event: ['s3'],
+    objType: {
+      objectType: 'feedChunk',
+      serviceTag: 'FeedChunk'
+    },
+    bucketName: 'video-record-temp',
+    flowSteps: [
+      { stepName: 'Start', event: ['wbs'] },
+      { stepName: 'ProcessAfterUpload', event: ['s3'] },
+      { stepName: 'ConfirmComplete', event: ['extTopic'] }
+    ]
+  };
+
+  const source = 'app/src/generatedCode/FlowSchemas/FeedChunkRecordUrl/source';
+  const handlerRoot = 'src/generatedCode/FlowSchemas/FeedChunkRecordUrl/source';
+
+  const result = await emitS3Flow(flow, source, handlerRoot);
+
+  const procMain = result.artifacts.find(
+    (a) => a.path === `${source}/FeedChunkRecordUrlProcessAfterUpload_Main.js`
+  );
+  assert.ok(
+    procMain.content.includes('attribute_exists(taskKey) AND attribute_not_exists(uploadClaimed)'),
+    'ProcessAfterUpload_Main must enforce attribute_exists(taskKey) AND attribute_not_exists(uploadClaimed)'
+  );
+  assert.ok(
+    procMain.content.includes("status: 'unauthorized_or_unknown_upload'"),
+    'ProcessAfterUpload_Main must abort when task record is missing'
+  );
+  assert.ok(
+    procMain.content.includes('dynamodbSharedLib'),
+    'ProcessAfterUpload_Main must import dynamodbSharedLib for simplified S3'
+  );
+
+  assert.ok(
+    procMain.content.includes("status: 'skipped_empty_or_dir'"),
+    'ProcessAfterUpload_Main must guard against directory markers or 0-byte files'
+  );
+
+  const confirmMain = result.artifacts.find(
+    (a) => a.path === `${source}/FeedChunkRecordUrlConfirmComplete_Main.js`
+  );
+  assert.ok(
+    confirmMain.content.includes("taskRecord.connectionId !== 'NONE'"),
+    'ConfirmComplete_Main must guard against connectionId NONE'
+  );
+});
+
+test('resolveTargetIdentifierInfo resolves both DynamoDB and Graph identifier formats', async () => {
+  const { resolveTargetIdentifierInfo } = await import(
+    '../../../src/emit/application/custom/customFlowS3.js'
+  );
+
+  // 1. Graph style: { type: 'identifier', fieldName: 'chunkUuid' }
+  const graphFlow = { objType: { objectType: 'feedChunk' } };
+  const graphObjects = [
+    {
+      objectType: 'feedChunk',
+      identifiers: [{ type: 'identifier', fieldName: 'chunkUuid' }]
+    }
+  ];
+  const graphResult = resolveTargetIdentifierInfo(graphFlow, graphObjects);
+  assert.equal(graphResult.identifierKey, 'chunkUuid');
+  assert.deepEqual(graphResult.identifierKeys, ['chunkUuid']);
+
+  // 2. DynamoDB style: { type: 'partitionKey', fieldName: 'myFeedId' }
+  const dynamoFlow = { objType: { objectType: 'feedChunk' } };
+  const dynamoObjects = [
+    {
+      objectType: 'feedChunk',
+      identifiers: [{ type: 'partitionKey', fieldName: 'myFeedId' }]
+    }
+  ];
+  const dynamoResult = resolveTargetIdentifierInfo(dynamoFlow, dynamoObjects);
+  assert.equal(dynamoResult.identifierKey, 'myFeedId');
+  assert.deepEqual(dynamoResult.identifierKeys, ['myFeedId']);
+
+  // 3. Fallback when no identifiers defined
+  const emptyFlow = { objType: { objectType: 'videoFeed' } };
+  const emptyResult = resolveTargetIdentifierInfo(emptyFlow, []);
+  assert.equal(emptyResult.identifierKey, 'videoFeedId');
+  assert.deepEqual(emptyResult.identifierKeys, ['videoFeedId']);
+});
+
+test('emitS3Flow generates dynamic identifier name for both Start_Main and ProcessAfterUpload_Main', async () => {
+  const flow = {
+    flowTag: 'FeedChunkRecordUrl',
+    flowType: 'custom',
+    event: ['s3'],
+    bucketName: 'video-record-temp',
+    contentTypePrefix: 'video/',
+    maxFileSizeMb: 50,
+    objType: {
+      objectType: 'feedChunk',
+      serviceTag: 'FeedChunk'
+    },
+    flowSteps: [
+      { stepName: 'Start', event: ['wbs'] },
+      { stepName: 'ProcessAfterUpload', event: ['s3'] },
+      { stepName: 'ConfirmComplete', event: ['sqs'] }
+    ]
+  };
+
+  const customObjects = [
+    {
+      objectType: 'feedChunk',
+      identifiers: [
+        {
+          type: 'identifier',
+          fieldName: 'customChunkId'
+        }
+      ]
+    }
+  ];
+
+  const source = 'app/src/generatedCode/FlowSchemas/FeedChunkRecordUrl/source';
+  const handlerRoot = 'src/generatedCode/FlowSchemas/FeedChunkRecordUrl/source';
+
+  const result = await emitS3Flow(flow, source, handlerRoot, {
+    objects: customObjects
+  });
+
+  const startMain = result.artifacts.find(
+    (a) => a.path === `${source}/FeedChunkRecordUrl_Main.js`
+  );
+  assert.ok(
+    startMain.content.includes('const customChunkId = identifierUuid()'),
+    'Start_Main must bind custom identifier key'
+  );
+  assert.ok(
+    startMain.content.includes("'x-amz-meta-customChunkId': customChunkId"),
+    'Start_Main must use custom identifier key in S3 metadata'
+  );
+
+  const procMain = result.artifacts.find(
+    (a) => a.path === `${source}/FeedChunkRecordUrlProcessAfterUpload_Main.js`
+  );
+  assert.ok(
+    procMain.content.includes('customChunkId: rawId'),
+    'ProcessAfterUpload_Main must use custom identifier key in fieldNames and identifiers'
+  );
+});
+
+
 
 
 

package/test/unit/infrastructure/resourceArtifacts.test.js

@@ -97,6 +97,10 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
     dynamoYaml,
     /RunningTotalReservedUsageTable:\s+Type: 'AWS::DynamoDB::Table'[\s\S]+TableName: \${self:custom\.iz_resourcePrefix}RunningTotalReservedUsage/
   );
+  assert.match(
+    dynamoYaml,
+    /Outputs:\s+RunningTotalReservedUsageStreamArn:\s+Value:\s+Fn::GetAtt: \[RunningTotalReservedUsageTable, StreamArn\]\s+Export:\s+Name: \${self:custom\.iz_resourcePrefix}RunningTotalReservedUsageStreamArn/
+  );
   const iam = await readFile(
     join(
       rootPath,
@@ -960,3 +964,23 @@ test('roleStatements emits s3:GetObject for custom S3 flow bucket', async () =>
   assert.match(uploadRole, /arn:aws:s3:::UploadBucket\/\*/);
 });
 
+test('emits per-topic hook tags in generated-sns-out.yml', async () => {
+  const rootPath = await createProject();
+  await generateResourceArtifacts(rootPath);
+  const snsOut = await readFile(
+    join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml'),
+    'utf8'
+  );
+  assert.match(snsOut, /#<#Out\w+TopicSetting#>\s*#<#\/Out\w+TopicSetting#>/);
+});
+
+test('emits customTopicOut file-level hook in generated-sns-out.yml', async () => {
+  const rootPath = await createProject();
+  await generateResourceArtifacts(rootPath);
+  const snsOut = await readFile(
+    join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml'),
+    'utf8'
+  );
+  assert.match(snsOut, /#<#customTopicOut#>\s*#<#\/customTopicOut#>/);
+});
+

package/test/unit/output/mergeHooks.test.js

@@ -402,4 +402,53 @@ test('warns when source content contains custom code in hook missing from templa
   }
 });
 
+test('preserves custom settings inside Out<topicName>TopicSetting and customTopicOut in generated-sns-out.yml', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml';
+    const diskContent = [
+      'Resources:',
+      '  ##===== [Topic Out]',
+      '  OutCreate:',
+      '    Type: AWS::SNS::Topic',
+      '    Properties:',
+      "      DisplayName: 'SNS Message out'",
+      '      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_Create_Out',
+      '  #<#OutCreateTopicSetting#>',
+      '    FifoTopic: true',
+      '  #<#/OutCreateTopicSetting#>',
+      '',
+      '  #<#customTopicOut#>',
+      '  OutCustomNotification:',
+      '    Type: AWS::SNS::Topic',
+      '  #<#/customTopicOut#>'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const generatedArtifact = {
+      path: filePath,
+      content: [
+        'Resources:',
+        '  ##===== [Topic Out]',
+        '  OutCreate:',
+        '    Type: AWS::SNS::Topic',
+        '    Properties:',
+        "      DisplayName: 'SNS Message out'",
+        '      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_Create_Out',
+        '  #<#OutCreateTopicSetting#>',
+        '  #<#/OutCreateTopicSetting#>',
+        '',
+        '  #<#customTopicOut#>',
+        '  #<#/customTopicOut#>'
+      ].join('\n') + '\n'
+    };
+
+    const [result] = await mergeHooks(tmpDir, [generatedArtifact]);
+    assert.match(result.content, /FifoTopic: true/);
+    assert.match(result.content, /OutCustomNotification:/);
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+