@izara_project/izara-core-generate-service-code 1.0.81 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.81",
+  "version": "1.0.82",
   "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/crud/templates/FlowEndpoint_HdrWbs.ejs

@@ -116,7 +116,7 @@ export const main = middleware.wrap(async (event, context) => {
     } else {
       const connId = event.connId;
       // await postMessage({ message: event.message }, connId);
-      await postToConnection({ message: event.message }, connId);
+      await postToConnection(event._izContext, { message: event.message }, connId);
     }
 
     return response.webSocketSuccess();
@@ -124,7 +124,7 @@ export const main = middleware.wrap(async (event, context) => {
     const connId = event.requestContext.connectionId;
     event._izContext.logger.error('Error, WebSocket: ', err);
     // await sendErrorMessage({ message: err.message }, connId);
-    await postToConnection({ message: err.message }, connId);
+    await postToConnection(event._izContext, { message: err.message }, connId);
     return response.failure(err);
   }
 });

package/src/emit/crud/templates/FlowMain_Wbs.ejs

@@ -78,6 +78,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 
     if (!flowSchema) {
       await postToConnection(
+        _izContext,
         {
           message: {
             error: `flowTag not found ${requestParams.action}`
@@ -99,7 +100,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
           callingFlowSharedLib.createCallingFlowConfig(
             await lambdaSharedLib.lambdaFunctionName(
               _izContext,
-              'WebSocketComplete'
+              'WebSocketCompleteHdrSqs'
             ),
             {}
           )

package/src/emit/custom/templates/s3/CreateObject_HdrWbs.ejs

@@ -77,7 +77,7 @@ export const main = middleware.wrap(async (event, context) => {
     } else {
       const connId = event.connId;
       // await postMessage({ message: event.message }, connId);
-      await postToConnection({ message: event.message }, connId);
+      await postToConnection(event._izContext, { message: event.message }, connId);
     }
 
     return response.webSocketSuccess();
@@ -85,7 +85,7 @@ export const main = middleware.wrap(async (event, context) => {
     const connId = event.requestContext.connectionId;
     event._izContext.logger.error('Error, WebSocket: ', err);
     // await sendErrorMessage({ message: err.message }, connId);
-    await postToConnection({ message: err.message }, connId);
+    await postToConnection(event._izContext, { message: err.message }, connId);
     return response.failure(err);
   }
 });

package/src/emit/custom/templates/s3/CreatePreSignUrl_Main.ejs

@@ -171,6 +171,7 @@ export default async function createPreSignUrl(
       await sns.publishAsync(_izContext, sendMessageToCancelReserved);
 
       await postToConnection(
+        _izContext,
         { message: 'reserved has reach limit' },
         connectionId
       );
@@ -254,7 +255,7 @@ export default async function createPreSignUrl(
               // calling flow own service
               await lambdaSharedLib.lambdaFunctionName(
                 _izContext,
-                `WebSocketComplete`
+                `WebSocketCompleteHdrSqs`
               ),
               {}
             )

package/src/emit/custom/templates/s3/ReservedLimit_Main.ejs

@@ -89,7 +89,7 @@ export default async function reservedLimit(
     _izContext.logger.debug('res::', res);
 
     if (res.passStatus === false) {
-      postToConnection({ message: 'static limit over' }, connectionId);
+      await postToConnection(_izContext, { message: 'static limit over' }, connectionId);
       let identifiers = hash({
         //(<hashIdentifiers>)
         //(</hashIdentifiers>)

package/src/emit/system/templates/RegisterComplete_Main.ejs

@@ -93,9 +93,9 @@ export default async function registerCompleteMain(
         await Promise.all(
           tasks.Items.map(async (task) => {
             if (!result) {
-              await postToConnection({ message: 'not have record' }, task.connectionId);
+              await postToConnection(_izContext, { message: 'not have record' }, task.connectionId);
             } else {
-              await postToConnection({ message: result }, task.connectionId);
+              await postToConnection(_izContext, { message: result }, task.connectionId);
             }
           })
         );
@@ -138,7 +138,7 @@ export default async function registerCompleteMain(
         if (tasks.Items && tasks.Items.length > 0) {
           await Promise.all(
             tasks.Items.map(async (task) => {
-              await postToConnection({ message: task }, task.connectionId);
+              await postToConnection(_izContext, { message: task }, task.connectionId);
             })
           );
         }

package/src/emit/system/templates/Register_HdrWbs.ejs

@@ -42,14 +42,14 @@ export const main = middleware.wrap(async (event, context) => {
       }
     } else {
       const connId = event.connId;
-      await postToConnection({ message: event.message }, 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);
     if (connId) {
-      await postToConnection({ message: err.message }, connId);
+      await postToConnection(event._izContext, { message: err.message }, connId);
     }
     return response.failure(err);
   }

package/src/emit/system/templates/Register_Main.ejs

@@ -55,7 +55,7 @@ export default async function registerMain(
       );
 
       if (!result) {
-        await postToConnection({ message: 'not have record' }, connectionId);
+        await postToConnection(_izContext, { message: 'not have record' }, connectionId);
       } else {
         for (const [fieldName, fieldNameSetting] of Object.entries(
           objectSchema.fieldNames
@@ -77,7 +77,7 @@ export default async function registerMain(
                 }
               );
             } else {
-              await postToConnection({ message: result }, connectionId);
+              await postToConnection(_izContext, { message: result }, connectionId);
             }
           }
         }
@@ -121,10 +121,10 @@ export default async function registerMain(
         if (tasks.Items && tasks.Items.length > 0) {
           await Promise.all(
             tasks.Items.map(async (task) => {
-              await postToConnection({ message: task }, task.connectionId);
+              await postToConnection(_izContext, { message: task }, task.connectionId);
             })
           );
-          await postToConnection({ message: tasks.Items[0] }, connectionId);
+          await postToConnection(_izContext, { message: tasks.Items[0] }, connectionId);
           return tasks.Items[0];
         } else {
           await dynamodbSharedLib.putItem(

package/src/emit/system/templates/WebSocketComplete_Main.ejs

@@ -76,7 +76,7 @@ export default async function WebSocketComplete(
       (tasks.Items ?? []).map(async (task) => {
         //(<beforePostMessage>)
         //(</beforePostMessage>)
-        await postToConnection({ message: requestParams }, task.connectionId);
+        await postToConnection(_izContext, { message: requestParams }, task.connectionId);
         await dynamodbSharedLib.deleteItem(
           _izContext,
           await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),

package/src/emit/systemText/emitSystemTextSchemas.js

@@ -84,8 +84,8 @@ export async function emitSystemTextSchemas({
     }
 
     for (const fieldName of fieldNames) {
-      const nameSpace = `${objectType}_${objServiceTag}_description`;
-      const systemTextTag = `${fieldName}_${objectType}_${objServiceTag}`;
+      const nameSpace = `${objectType}|${objServiceTag}|description`;
+      const systemTextTag = `${fieldName}|${objectType}|${objServiceTag}`;
       const openHook = `//(<${objectType}_${objServiceTag}${fieldName}Hook>)`;
       const closeHook = `//(</${objectType}_${objServiceTag}${fieldName}Hook>)`;
       datas.push({
@@ -100,7 +100,7 @@ export async function emitSystemTextSchemas({
   // 2. Process Notifications
   for (const notification of safeNotifications) {
     if (notification?.notificationGrouping && notification?.notificationTag) {
-      const nameSpace = `sysNotification_${notification.notificationGrouping}`;
+      const nameSpace = `sysNotification|${notification.notificationGrouping}`;
       const systemTextTag = notification.notificationTag;
       const openHook = `//(<${notification.notificationTag}Hook>)`;
       const closeHook = `//(</${notification.notificationTag}Hook>)`;
@@ -127,8 +127,8 @@ export async function emitSystemTextSchemas({
 
     if (relData?.fieldNames && Object.keys(relData.fieldNames).length > 0) {
       for (const fieldName of Object.keys(relData.fieldNames)) {
-        const nameSpace = `${relTag}_${relServiceTag}_description`;
-        const systemTextTag = `${fieldName}_${relTag}_${relServiceTag}`;
+        const nameSpace = `${relTag}|${relServiceTag}|description`;
+        const systemTextTag = `${fieldName}|${relTag}|${relServiceTag}`;
         const openHook = `//(<${relTag}_${relServiceTag}${fieldName}Hook>)`;
         const closeHook = `//(</${relTag}_${relServiceTag}${fieldName}Hook>)`;
         datas.push({
@@ -208,8 +208,8 @@ export async function emitSystemTextSchemas({
   }
 
   for (const flowTag of flowTags) {
-    const nameSpace = `${flowTag}_${serviceTag}`;
-    const systemTextTag = `errors_${flowTag}_${serviceTag}`;
+    const nameSpace = `${flowTag}|${serviceTag}`;
+    const systemTextTag = `errors|${flowTag}|${serviceTag}`;
     const openHook = `//(<${flowTag}_${serviceTag}Hook>)`;
     const closeHook = `//(</${flowTag}_${serviceTag}Hook>)`;
     datas.push({

package/test/crudApplicationArtifacts.test.js

@@ -67,16 +67,27 @@ test('emits CRUD handlers and function YAML from schema data without reading gen
     ),
     /checkAllAwaitingStepsFinishedWithReturnParams/
   );
-  assert.doesNotMatch(
-    await readFile(
-      join(
-        rootPath,
-        'app/src/generatedCode/FlowObjects/Create/source/Create_WbsMain.js'
-      ),
-      'utf8'
+  const createWbsMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Create/source/Create_WbsMain.js'
     ),
+    'utf8'
+  );
+  assert.doesNotMatch(
+    createWbsMain,
     /from '@izara_project\/izara-core-generate-service-code'/
   );
+  assert.match(createWbsMain, /'WebSocketCompleteHdrSqs'/);
+  assert.match(createWbsMain, /postToConnection\(\s*_izContext,/);
+  const createHdrWbs = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Create/source/Create_HdrWbs.js'
+    ),
+    'utf8'
+  );
+  assert.match(createHdrWbs, /postToConnection\(event\._izContext,/);
   await assert.rejects(
     readFile(
       join(

package/test/customFlowApplicationArtifacts.test.js

@@ -239,6 +239,14 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
     assert.ok(helperPath, `${path} imports GenerateCodeLibs`);
     await access(resolve(dirname(filePath), helperPath));
   }
+  const presignMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Upload/source/UploadCreatePreSignUrl_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(presignMain, /`WebSocketCompleteHdrSqs`/);
 });
 
 test('removes only V2-owned custom-flow application artifacts when supported events are removed', async () => {

package/test/publicApi.test.js

@@ -33,7 +33,7 @@ test('generate commits schemas, application artifacts, and resources in one publ
       ),
       'utf8'
     ),
-    /nameSpace:\s*"Create_/
+    /nameSpace:\s*"Create\|/
   );
   assert.match(
     await readFile(
@@ -203,6 +203,7 @@ test('generate commits the system WebSocket completion path for own-topic flows'
   );
   assert.match(webSocketComplete, /\(\<createIdentifiersFlow\>\)/);
   assert.match(webSocketComplete, /\(\<beforePostMessage\>\)/);
+  assert.match(webSocketComplete, /postToConnection\(_izContext,/);
   const webSocketHandler = await readFile(
     join(
       rootPath,

package/test/systemTextSchemas.test.js

@@ -63,32 +63,32 @@ test('emitSystemTextSchemas produces expected structure for objects, flows, rela
 
   const content = artifacts[0].content;
   // Object fields
-  assert.match(content, /nameSpace:\s*"product_MyService_description"/);
+  assert.match(content, /nameSpace:\s*"product\|MyService\|description"/);
   assert.match(
     content,
-    /systemTextTag:\s*"productId_product_MyService"/
+    /systemTextTag:\s*"productId\|product\|MyService"/
   );
   assert.match(content, /\/\/\(<product_MyServiceproductIdHook>\)/);
   assert.match(
     content,
-    /systemTextTag:\s*"version_product_MyService"/
+    /systemTextTag:\s*"version\|product\|MyService"/
   );
 
   // Notification
-  assert.match(content, /nameSpace:\s*"sysNotification_OrderEvents"/);
+  assert.match(content, /nameSpace:\s*"sysNotification\|OrderEvents"/);
   assert.match(content, /systemTextTag:\s*"OrderPlaced"/);
   assert.match(content, /\/\/\(<OrderPlacedHook>\)/);
 
   // Relationship
-  assert.match(content, /nameSpace:\s*"hasCategory_MyService_description"/);
+  assert.match(content, /nameSpace:\s*"hasCategory\|MyService\|description"/);
   assert.match(
     content,
-    /systemTextTag:\s*"originTimestamp_hasCategory_MyService"/
+    /systemTextTag:\s*"originTimestamp\|hasCategory\|MyService"/
   );
 
   // Custom Flow
-  assert.match(content, /nameSpace:\s*"ProcessOrder_MyService"/);
-  assert.match(content, /systemTextTag:\s*"errors_ProcessOrder_MyService"/);
+  assert.match(content, /nameSpace:\s*"ProcessOrder\|MyService"/);
+  assert.match(content, /systemTextTag:\s*"errors\|ProcessOrder\|MyService"/);
 });
 
 test('emitSystemTextSchemas returns empty array when no inputs provided', async () => {