@izara_project/izara-core-generate-service-code 1.0.104 → 1.0.105

package/package.json

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

@@ -167,9 +167,9 @@ export async function resolveAndGenerateIdentifiers(
   const targetIdentifiers = requestParams.targetIdentifiers;
 
   const objectSchemas =
-    uploadUseCase.generateObjectSchemaForCombineFieldNames(
+    await getObjectSchema.getObjectSchemaCombineFieldNamesWithCache(
       _izContext,
-      objectSchema
+      objType
     );
   _izContext.logger.debug(
     `[${process.env.iz_serviceTag}:<%- flowTag %>] objectSchemas:`,
@@ -997,32 +997,29 @@ export async function publishCompletionMessage(_izContext, message, messageAttri
  * Resolves and combines object schemas from S3/hierarchy
  * @param {Object} _izContext - Izara context object
  * @param {string} objectType - Object type identifier
- * @returns {Promise<{ objType: Object, objectSchema: Object, objectSchemas: Object, parentObject?: Object }>}
+ * @returns {Promise<{ objType: Object, objectSchemas: Object, parentObject?: Object }>}
  */
 export async function resolveObjectSchemas(_izContext, objectType) {
   const objType = createObjType(objectType);
-  const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(
-    _izContext,
-    objType
-  );
-  _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- flowTag %>LogicalLib] objectSchema:`, objectSchema);
-
   const objectSchemas =
-    uploadUseCase.generateObjectSchemaForCombineFieldNames(
+    await getObjectSchema.getObjectSchemaCombineFieldNamesWithCache(
       _izContext,
-      objectSchema
+      objType
     );
-  _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- flowTag %>LogicalLib] objectSchemas:`, objectSchemas);
+  _izContext.logger.debug(
+    `[${process.env.iz_serviceTag}:<%- flowTag %>LogicalLib] objectSchemas:`,
+    objectSchemas
+  );
 
   let parentObject;
   if (objectSchemas.hasOwnProperty('extendObjType')) {
     parentObject = await getObjectSchema.getObjSchemaS3WithHierarchy(
       _izContext,
-      objectSchema.extendObjType
+      objectSchemas.extendObjType
     );
   }
 
-  return { objType, objectSchema, objectSchemas, parentObject };
+  return { objType, objectSchemas, parentObject };
 }
 
 /**
@@ -1473,7 +1470,7 @@ export async function <%- flowTag %>LogicalLib(
     //(</beforeCreateMainLogical>)
 
     // 1. Load and resolve Schema
-    const { objType, objectSchema, objectSchemas, parentObject } =
+    const { objType, objectSchemas, parentObject } =
       await resolveObjectSchemas(_izContext, requestParams.objectType);
 
     const directInvoke =
@@ -1551,7 +1548,7 @@ export async function <%- flowTag %>LogicalLib(
           const identifiersForCreateData =
             await dynamoDbIdentifiersByStorageResource(
               _izContext,
-              objectSchema,
+              objectSchemas,
               createDataDetails,
               objInstanceFullForDynamoDb.identifiers
             );
@@ -1591,7 +1588,7 @@ export async function <%- flowTag %>LogicalLib(
 
             // Auto-provision owner TargetRole for DynamoDB-only
             await autoProvisionOwnerTargetRoleForDynamoOnly(_izContext, {
-              objectSchema,
+              objectSchema: objectSchemas,
               identifiersForCreateData,
               requestParams
             });

package/src/emit/schemas/ledger/emitLedgerSchemas.js

@@ -381,6 +381,7 @@ export async function emitLedgerRelationshipSchemas({
       const isRel = {
         generatedBy: 'systemNoUser',
         storageResources: graphStorageResources,
+        fieldNames: {},
         links: isLinks
       };
       artifacts.push({

package/src/emit/schemas/ledger/templates/LedgerRelationshipSchema.ejs

@@ -2,7 +2,33 @@ export default [
   {
     "<%= relationshipTag %>": {
 <% Object.entries(content).forEach(([key, val]) => { -%>
+<%   if (key === 'links' && Array.isArray(val)) { -%>
+      "links": [
+<%     val.forEach((link) => { -%>
+            <%- JSON.stringify(link, null, 6).replace(/\n/g, '\n            ') %>,
+<%     }); -%>
+            //(<<%= relationshipTag %>LinksHookCode>)
+            //(</<%= relationshipTag %>LinksHookCode>)
+      ],
+<%   } else if (key === 'storageResources' && typeof val === 'object' && val !== null) { -%>
+      "storageResources": {
+<%     Object.entries(val).forEach(([resKey, resVal]) => { -%>
+            "<%- resKey %>": <%- JSON.stringify(resVal, null, 6).replace(/\n/g, '\n            ') %>,
+<%     }); -%>
+            //(<<%= relationshipTag %>StorageResourcesHookCode>)
+            //(</<%= relationshipTag %>StorageResourcesHookCode>)
+      },
+<%   } else if (key === 'fieldNames' && typeof val === 'object' && val !== null) { -%>
+      "fieldNames": {
+<%     Object.entries(val).forEach(([fKey, fVal]) => { -%>
+            "<%- fKey %>": <%- JSON.stringify(fVal, null, 6).replace(/\n/g, '\n            ') %>,
+<%     }); -%>
+            //(<<%= relationshipTag %>FieldNamesHookCode>)
+            //(</<%= relationshipTag %>FieldNamesHookCode>)
+      },
+<%   } else { -%>
       "<%- key %>": <%- JSON.stringify(val, null, 6).replace(/\n/g, '\n      ') %>,
+<%   } -%>
 <% }); -%>
       //(<<%= relationshipTag %>HookCode>)
       //(</<%= relationshipTag %>HookCode>)

package/test/unit/schemas/ledgerSchemas.test.js

@@ -166,14 +166,50 @@ test('emitLedgerRelationshipSchemas returns current, old, and is relationship sc
     currentRel.content,
     /\/\/\(<currentUnitStandardSupplyLocationHookCode>\)[\s\S]*?\/\/\(<\/currentUnitStandardSupplyLocationHookCode>\)/
   );
+  assert.match(
+    currentRel.content,
+    /\/\/\(<currentUnitStandardSupplyLocationStorageResourcesHookCode>\)[\s\S]*?\/\/\(<\/currentUnitStandardSupplyLocationStorageResourcesHookCode>\)/
+  );
+  assert.match(
+    currentRel.content,
+    /\/\/\(<currentUnitStandardSupplyLocationFieldNamesHookCode>\)[\s\S]*?\/\/\(<\/currentUnitStandardSupplyLocationFieldNamesHookCode>\)/
+  );
+  assert.match(
+    currentRel.content,
+    /\/\/\(<currentUnitStandardSupplyLocationLinksHookCode>\)[\s\S]*?\/\/\(<\/currentUnitStandardSupplyLocationLinksHookCode>\)/
+  );
   assert.match(
     oldRel.content,
     /\/\/\(<oldUnitStandardSupplyLocationHookCode>\)[\s\S]*?\/\/\(<\/oldUnitStandardSupplyLocationHookCode>\)/
   );
+  assert.match(
+    oldRel.content,
+    /\/\/\(<oldUnitStandardSupplyLocationStorageResourcesHookCode>\)[\s\S]*?\/\/\(<\/oldUnitStandardSupplyLocationStorageResourcesHookCode>\)/
+  );
+  assert.match(
+    oldRel.content,
+    /\/\/\(<oldUnitStandardSupplyLocationFieldNamesHookCode>\)[\s\S]*?\/\/\(<\/oldUnitStandardSupplyLocationFieldNamesHookCode>\)/
+  );
+  assert.match(
+    oldRel.content,
+    /\/\/\(<oldUnitStandardSupplyLocationLinksHookCode>\)[\s\S]*?\/\/\(<\/oldUnitStandardSupplyLocationLinksHookCode>\)/
+  );
   assert.match(
     isRel.content,
     /\/\/\(<isUnitStandardSupplyLocationEntryHookCode>\)[\s\S]*?\/\/\(<\/isUnitStandardSupplyLocationEntryHookCode>\)/
   );
+  assert.match(
+    isRel.content,
+    /\/\/\(<isUnitStandardSupplyLocationEntryStorageResourcesHookCode>\)[\s\S]*?\/\/\(<\/isUnitStandardSupplyLocationEntryStorageResourcesHookCode>\)/
+  );
+  assert.match(
+    isRel.content,
+    /\/\/\(<isUnitStandardSupplyLocationEntryFieldNamesHookCode>\)[\s\S]*?\/\/\(<\/isUnitStandardSupplyLocationEntryFieldNamesHookCode>\)/
+  );
+  assert.match(
+    isRel.content,
+    /\/\/\(<isUnitStandardSupplyLocationEntryLinksHookCode>\)[\s\S]*?\/\/\(<\/isUnitStandardSupplyLocationEntryLinksHookCode>\)/
+  );
 
   // 5. Verify requiredOnCreate is removed from links
   const _parseRel = (content) => {
@@ -181,7 +217,7 @@ test('emitLedgerRelationshipSchemas returns current, old, and is relationship sc
       .replace(/^export default\s+/, '')
       .replace(/;\s*$/, '')
       .replace(/\/\/.*/g, '')
-      .replace(/,(\s*})/g, '$1');
+      .replace(/,(\s*[}\]])/g, '$1');
     return JSON.parse(raw)[0];
   };
 
@@ -263,6 +299,18 @@ test('generate preserves user hooks in ledger ObjectSchemas and RelationshipSche
     '//(<currentUnitStandardSupplyLocationHookCode>)\n      //(</currentUnitStandardSupplyLocationHookCode>)',
     '//(<currentUnitStandardSupplyLocationHookCode>)\n      "customRelProp": true,\n      //(</currentUnitStandardSupplyLocationHookCode>)'
   );
+  relContent = relContent.replace(
+    '//(<currentUnitStandardSupplyLocationStorageResourcesHookCode>)\n            //(</currentUnitStandardSupplyLocationStorageResourcesHookCode>)',
+    '//(<currentUnitStandardSupplyLocationStorageResourcesHookCode>)\n            "customRes": { "storageType": "graph" },\n            //(</currentUnitStandardSupplyLocationStorageResourcesHookCode>)'
+  );
+  relContent = relContent.replace(
+    '//(<currentUnitStandardSupplyLocationFieldNamesHookCode>)\n            //(</currentUnitStandardSupplyLocationFieldNamesHookCode>)',
+    '//(<currentUnitStandardSupplyLocationFieldNamesHookCode>)\n            "customRelField": { "type": "string" },\n            //(</currentUnitStandardSupplyLocationFieldNamesHookCode>)'
+  );
+  relContent = relContent.replace(
+    '//(<currentUnitStandardSupplyLocationLinksHookCode>)\n            //(</currentUnitStandardSupplyLocationLinksHookCode>)',
+    '//(<currentUnitStandardSupplyLocationLinksHookCode>)\n            { "customLinkProp": true },\n            //(</currentUnitStandardSupplyLocationLinksHookCode>)'
+  );
   await writeProjectFile(rootPath, relRelPath, relContent);
 
   // Re-run generate
@@ -273,6 +321,9 @@ test('generate preserves user hooks in ledger ObjectSchemas and RelationshipSche
 
   const preservedRelContent = await readProjectFile(rootPath, relRelPath);
   assert.match(preservedRelContent, /"customRelProp": true/);
+  assert.match(preservedRelContent, /"customRes": \{ "storageType": "graph" \}/);
+  assert.match(preservedRelContent, /"customRelField": \{ "type": "string" \}/);
+  assert.match(preservedRelContent, /"customLinkProp": true/);
 });
 
 test('emitLedgerObjectSchemas and managedPaths skip when entryObject is false', async () => {