@izara_project/izara-core-generate-service-code 1.0.66 → 1.0.68

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "plugins": ["prettier-plugin-ejs"]
+}

package/docs/TriggeredCache Flow.drawio

@@ -0,0 +1,193 @@
+<mxfile host="app.diagrams.net">
+  <diagram name="Page-1" id="pXYk_RwGkFAkQVFTFBd9">
+    <mxGraphModel grid="1" page="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="tqax0Luh1uLb62xYIonj-1" parent="1" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;strokeColor=light-dark(#000000,#FF66FF);" value="PrepComparisData_Main" vertex="1">
+          <mxGeometry height="120" width="120" x="354" y="120" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-2" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-1" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="370" y="330" as="sourcePoint" />
+            <mxPoint x="414" y="340" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-3" connectable="0" parent="tqax0Luh1uLb62xYIonj-2" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#60a917;fontColor=#ffffff;labelBorderColor=#2D7600;" value="checkTriggeredCacheV2&amp;nbsp;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;ว่ามีงานของ triggerFlow อื่นที่ยังค้างอยูไหม&lt;/div&gt;" vertex="1">
+          <mxGeometry relative="1" x="-0.1668" y="2" as="geometry">
+            <mxPoint x="-2" y="78" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-15" connectable="0" parent="tqax0Luh1uLb62xYIonj-2" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#60a917;fontColor=#ffffff;labelBorderColor=#2D7600;" value="checkTriggerFlowCompleteAwaitingStepV2&amp;nbsp;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;ว่ามีงานของ triggerFlow อื่นที่ยังค้างอยูไหม&lt;/div&gt;" vertex="1">
+          <mxGeometry relative="1" x="-0.1668" y="2" as="geometry">
+            <mxPoint x="4" y="339" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-23" connectable="0" parent="tqax0Luh1uLb62xYIonj-2" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#60a917;fontColor=#ffffff;labelBorderColor=#2D7600;" value="checkTriggerResetedV2&amp;nbsp;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;ว่ามีงานของ triggerFlow อื่นที่ยังค้างอยูไหม&lt;/div&gt;" vertex="1">
+          <mxGeometry relative="1" x="-0.1668" y="2" as="geometry">
+            <mxPoint x="764" y="218" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-4" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="360" y="380" as="sourcePoint" />
+            <mxPoint x="360" y="480" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-5" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="480" y="380" as="sourcePoint" />
+            <mxPoint x="480" y="480" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-6" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="มี" vertex="1">
+          <mxGeometry height="30" width="80" x="320" y="480" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-7" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="ไม่มี" vertex="1">
+          <mxGeometry height="30" width="80" x="440" y="480" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-9" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-6" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="320" y="495" as="sourcePoint" />
+            <mxPoint x="200" y="495" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-11" parent="1" style="shape=tape;whiteSpace=wrap;html=1;" value="สร้าง request ไปที่&lt;div&gt;triggerFlow&lt;/div&gt;" vertex="1">
+          <mxGeometry height="135" width="120" x="80" y="427.5" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-12" parent="1" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;strokeColor=light-dark(#000000,#FF66FF);" value="CheckTriggerCache&lt;div&gt;Complete&lt;/div&gt;" vertex="1">
+          <mxGeometry height="104" width="104" x="370" y="800" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-16" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-12" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="210" y="680" as="sourcePoint" />
+            <mxPoint x="420" y="640" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-17" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" target="tqax0Luh1uLb62xYIonj-6" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="360" y="600" as="sourcePoint" />
+            <mxPoint x="330" y="530" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-18" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="479.65999999999997" y="600" as="sourcePoint" />
+            <mxPoint x="479.65999999999997" y="510" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-19" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="520" y="494.65647058823527" as="sourcePoint" />
+            <mxPoint x="640" y="494.65647058823527" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-20" parent="1" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;strokeColor=light-dark(#000000,#FF66FF);" value="ProcessTriggerCache&lt;div&gt;PrepComparisData&lt;/div&gt;" vertex="1">
+          <mxGeometry height="104" width="104" x="640" y="443" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-21" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" target="tqax0Luh1uLb62xYIonj-22" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="744" y="494.6464705882353" as="sourcePoint" />
+            <mxPoint x="864" y="494.6464705882353" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-22" parent="1" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;strokeColor=light-dark(#000000,#FF66FF);" value="ProcessTriggerCache&lt;div&gt;PrepComparisData&lt;/div&gt;" vertex="1">
+          <mxGeometry height="104" width="104" x="864" y="443" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-24" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-22" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="990" y="520" as="sourcePoint" />
+            <mxPoint x="1080" y="495" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-25" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" target="tqax0Luh1uLb62xYIonj-26" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1180" y="480" as="sourcePoint" />
+            <mxPoint x="1150" y="410" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-26" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="มี" vertex="1">
+          <mxGeometry height="30" width="80" x="1140" y="360" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-27" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-26" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;" target="tqax0Luh1uLb62xYIonj-11" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <Array as="points">
+              <mxPoint x="1180" y="80" />
+              <mxPoint x="170" y="80" />
+            </Array>
+            <mxPoint x="860" y="240" as="sourcePoint" />
+            <mxPoint x="910" y="190" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-28" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1180" y="520" as="sourcePoint" />
+            <mxPoint x="1180" y="600" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-29" parent="1" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;fontColor=#ffffff;strokeColor=#2D7600;" value="&lt;div&gt;&lt;span style=&quot;font-size: 11px; white-space: nowrap; background-color: rgb(74, 137, 12);&quot;&gt;checkTriggerResetedV2&lt;/span&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;check&amp;nbsp;Timestamp Match&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));&quot;&gt;&amp;nbsp;&lt;/span&gt;" vertex="1">
+          <mxGeometry height="60" width="200" x="1080" y="720" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-30" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="ไม่มี" vertex="1">
+          <mxGeometry height="30" width="80" x="1140" y="600" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-31" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-30" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1179.41" y="640" as="sourcePoint" />
+            <mxPoint x="1179.4099999999999" y="720" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-33" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="match" vertex="1">
+          <mxGeometry height="30" width="80" x="1360" y="735" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-34" parent="1" style="rounded=1;whiteSpace=wrap;html=1;" value="not match" vertex="1">
+          <mxGeometry height="30" width="80" x="920" y="735" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-35" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-29" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" target="tqax0Luh1uLb62xYIonj-34" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1120" y="680" as="sourcePoint" />
+            <mxPoint x="1170" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-36" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-29" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" target="tqax0Luh1uLb62xYIonj-33" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1120" y="680" as="sourcePoint" />
+            <mxPoint x="1170" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-37" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-34" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" target="tqax0Luh1uLb62xYIonj-20" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <Array as="points">
+              <mxPoint x="690" y="750" />
+            </Array>
+            <mxPoint x="930" y="680" as="sourcePoint" />
+            <mxPoint x="980" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-38" edge="1" parent="1" style="endArrow=classic;html=1;rounded=0;" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <mxPoint x="1440" y="750" as="sourcePoint" />
+            <mxPoint x="1560" y="750" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-39" parent="1" style="shape=tape;whiteSpace=wrap;html=1;" value="PrepComparisData_Out" vertex="1">
+          <mxGeometry height="100" width="230" x="1560" y="690" as="geometry" />
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-40" edge="1" parent="1" source="tqax0Luh1uLb62xYIonj-11" style="endArrow=classic;html=1;rounded=0;exitX=0.25;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" target="tqax0Luh1uLb62xYIonj-12" value="">
+          <mxGeometry height="50" relative="1" width="50" as="geometry">
+            <Array as="points">
+              <mxPoint x="110" y="852" />
+            </Array>
+            <mxPoint x="780" y="680" as="sourcePoint" />
+            <mxPoint x="830" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tqax0Luh1uLb62xYIonj-41" connectable="0" parent="tqax0Luh1uLb62xYIonj-40" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" value="Sub to Out topic" vertex="1">
+          <mxGeometry relative="1" x="-0.6336" y="-2" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

package/docs/TriggeredCacheFlow.mmd

@@ -0,0 +1,47 @@
+flowchart TD
+    classDef process fill:#d4edda,stroke:#28a745,stroke-width:2px,color:#000;
+    classDef check fill:#fff3cd,stroke:#ffc107,stroke-width:2px,color:#000;
+    classDef complete fill:#cce5ff,stroke:#007bff,stroke-width:2px,color:#000;
+    classDef subflow fill:#e2e3e5,stroke:#6c757d,stroke-width:2px,color:#000;
+    classDef decision fill:#f8d7da,stroke:#dc3545,stroke-width:2px,color:#000;
+
+    Start((จุดเริ่มต้น)) --> ProcessMain
+
+    subgraph Process [1. Process Step]
+        ProcessMain["PrepComparisData_Main<br/>(Process Step)"]:::process
+        CheckReset{"checkTriggerResetedV2<br/>(Timestamp Match)"}:::decision
+        CheckCache{"checkTriggeredCacheV2<br/>(เช็คว่ามีงานย่อยต้องทำไหม?)"}:::decision
+        CreateReq["สร้าง request ไปที่ triggerFlow<br/>(ยิงงานย่อย)"]:::process
+        
+        ProcessMain --> CheckReset
+        CheckReset -- "not match" --> ProcessMain
+        CheckReset -- "match" --> CheckCache
+        CheckCache -- "มีงาน" --> CreateReq
+    end
+
+    SubFlow["triggerFlow<br/>(งานย่อย)"]:::subflow
+
+    subgraph Check [2. Check Step]
+        SubOut["Sub to Out topic<br/>(รับ Message งานย่อยที่เสร็จ)"]:::check
+        CheckComplete["CheckTriggerCacheComplete<br/>(Check Step)"]:::check
+        CheckFlow{"checkTriggerFlowComplete<br/>AwaitingStepV2<br/>(ตรวจว่าทุกงานเสร็จหรือยัง?)"}:::decision
+        
+        SubOut --> CheckComplete
+        CheckComplete --> CheckFlow
+    end
+
+    subgraph Complete [3. Complete Step]
+        OutMain["PrepComparisData_Out<br/>(Complete Step)"]:::complete
+    end
+
+    %% เส้นทางเชื่อมต่อระหว่างกลุ่ม
+    CreateReq -- "ส่งงาน" --> SubFlow
+    SubFlow -- "ทำงานเสร็จ ส่ง passBack" --> SubOut
+    
+    CheckCache -- "ไม่มีงาน (ข้ามไปทำ Complete)" --> OutMain
+    
+    CheckFlow -- "มีงานค้าง (รอตัวถัดไป)" --> Wait((รอ Message ถัดไป))
+    CheckFlow -- "ไม่มีงานค้าง (เสร็จหมด 100%)" --> OutMain
+
+    %% เส้นสีแดงสำหรับ Loop Not Match
+    linkStyle 1 stroke:#dc3545,stroke-width:2px

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "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": {
@@ -10,31 +10,35 @@
   "license": "AGPL-3.0-or-later",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "type": "module",
-  "main": "index.js",
   "exports": "./index.js",
+  "main": "index.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "format:ejs": "node scripts/format-ejs.js"
   },
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
+    "@izara_project/izara-attribute-tree": "^1.0.15",
     "@izara_project/izara-core-library-core": "^1.0.32",
-    "@izara_project/izara-core-library-logger": "^1.0.11",
+    "@izara_project/izara-property-nodes": "^1.0.16",
     "@izara_project/izara-shared-core": "^1.0.13",
     "ejs": "^6.0.1",
     "js-beautify": "^2.0.3",
-    "yaml": "^2.9.0",
-    "@izara_project/izara-property-nodes": "^1.0.16",
-    "@izara_project/izara-attribute-tree": "^1.0.15"
+    "yaml": "^2.9.0"
+  },
+  "devDependencies": {
+    "@izara_project/izara-core-library-logger": "^1.0.11",
+    "@izara_project/izara-core-library-service-schemas": "1.0.158",
+    "@izara_project/izara-shared-service-schemas": "^1.0.67",
+    "jest": "^30.4.2",
+    "prettier": "^3.9.6",
+    "prettier-plugin-ejs": "^1.0.3"
   },
   "peerDependencies": {
+    "@izara_project/izara-core-library-logger": "^1.0.11",
     "@izara_project/izara-core-library-service-schemas": "^1.0.157",
     "@izara_project/izara-shared-service-schemas": "^1.0.65"
-  },
-  "devDependencies": {
-    "@izara_project/izara-core-library-service-schemas": "^1.0.158",
-    "@izara_project/izara-shared-service-schemas": "^1.0.66",
-    "jest": "^30.4.2"
   }
 }

package/scripts/format-ejs.js

@@ -0,0 +1,105 @@
+/* Copyright (C) 2026 Sven Mason <http://izara.io>
+ * Prettier formatting script for EJS template files under src/emit
+ */
+
+import fs from 'fs';
+import path from 'path';
+import prettier from 'prettier';
+
+function getAllEjsFiles(dirPath, arrayOfFiles = []) {
+  const files = fs.readdirSync(dirPath);
+  for (const file of files) {
+    const fullPath = path.join(dirPath, file);
+    if (fs.statSync(fullPath).isDirectory()) {
+      arrayOfFiles = getAllEjsFiles(fullPath, arrayOfFiles);
+    } else if (file.endsWith('.ejs')) {
+      arrayOfFiles.push(fullPath);
+    }
+  }
+  return arrayOfFiles;
+}
+
+export async function formatEjsFiles(targetDir = 'src/emit') {
+  const ejsFiles = getAllEjsFiles(targetDir);
+  let updatedCount = 0;
+
+  for (const filePath of ejsFiles) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const isYaml = filePath.includes('Yaml.ejs') || filePath.includes('Yaml');
+
+    const placeholders = [];
+    let masked = content;
+
+    masked = masked.replace(/<%[_-]?\s*([\s\S]*?)\s*[_-]?%>/g, (match) => {
+      const id = placeholders.length;
+      const isExpr = match.startsWith('<%=') || match.startsWith('<%-');
+      const isConditionalComma =
+        match.includes('?') &&
+        (match.includes("','") || match.includes('","'));
+
+      let replacement;
+      if (isYaml) {
+        replacement = isExpr ? `EJS_VAL_${id}` : `# __EJS_TAG_${id}__`;
+      } else {
+        if (isConditionalComma) {
+          replacement = `, /*__EJS_COMMA_${id}__*/`;
+        } else if (isExpr) {
+          replacement = `__EJS_VAR_${id}__`;
+        } else {
+          replacement = `/*__EJS_STMT_${id}__*/`;
+        }
+      }
+      placeholders.push({
+        id,
+        original: match,
+        replacement,
+        isConditionalComma
+      });
+      return replacement;
+    });
+
+    const parser = isYaml ? 'yaml' : 'babel';
+    let formatted = await prettier.format(masked, {
+      parser,
+      singleQuote: true,
+      semi: true,
+      tabWidth: 2,
+      useTabs: false,
+      trailingComma: 'none',
+      printWidth: 80,
+      endOfLine: 'lf'
+    });
+
+    for (const item of placeholders) {
+      if (item.isConditionalComma) {
+        formatted = formatted.replace(item.replacement, item.original);
+        formatted = formatted.replace(
+          `, /*__EJS_COMMA_${item.id}__*/`,
+          item.original
+        );
+      } else {
+        formatted = formatted.replace(item.replacement, item.original);
+      }
+    }
+
+    // Ensure unix newline at EOF
+    if (!formatted.endsWith('\n')) {
+      formatted += '\n';
+    }
+
+    if (formatted !== content) {
+      fs.writeFileSync(filePath, formatted, 'utf8');
+      updatedCount++;
+    }
+  }
+
+  return { total: ejsFiles.length, updated: updatedCount };
+}
+
+if (process.argv[1] === new URL(import.meta.url).pathname) {
+  formatEjsFiles().then(({ total, updated }) => {
+    console.log(
+      `Successfully formatted ${updated} / ${total} EJS template files in src/emit.`
+    );
+  });
+}

package/src/compile/compileProject.js

@@ -1,4 +1,6 @@
 import { join, resolve } from 'node:path';
+import { readFileSync, existsSync } from 'node:fs';
+import { parse as parseYaml } from 'yaml';
 
 export function compileProject(request = {}) {
   if (!isNonEmptyString(request.rootPath)) {
@@ -11,12 +13,25 @@ export function compileProject(request = {}) {
     request.configPath ?? join(rootPath, 'config', 'serverless.config.yml')
   );
 
+  let serviceTag = request.serviceTag;
+  if (!serviceTag && existsSync(configPath)) {
+    try {
+      const configContent = readFileSync(configPath, 'utf8');
+      const parsedConfig = parseYaml(configContent);
+      if (parsedConfig && parsedConfig.main_config) {
+        serviceTag = parsedConfig.main_config.iz_serviceTag || parsedConfig.main_config.iz_serviceName;
+      }
+    } catch (err) {
+      // Ignore configuration read error
+    }
+  }
+
   return Object.freeze({
     rootPath,
     outputPath,
     configPath,
     schemaRoot: join(rootPath, 'app', 'src', 'schemas'),
-    serviceTag: request.serviceTag,
+    serviceTag,
     schemaTemplateConfig: request.schemaTemplateConfig ?? []
   });
 }

package/src/compile/loadSchemas.js

@@ -1,6 +1,8 @@
 import { readdir, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { getObjectSchema, utils } from '@izara_project/izara-core-library-service-schemas';
+import Logger from '@izara_project/izara-core-library-logger';
 
 export async function loadLocalSchemaDirectory(project, directoryName) {
   const directoryPath = join(project.schemaRoot, directoryName);
@@ -22,7 +24,112 @@ export async function loadLocalSchemaDirectory(project, directoryName) {
     if (!module.default || typeof module.default !== 'object') {
       throw new TypeError(`Schema module must default-export an object or array: ${filePath}`);
     }
-    schemas.push(...(Array.isArray(module.default) ? module.default : [module.default]));
+    const loadedSchemas = Array.isArray(module.default) ? module.default : [module.default];
+
+    if (process.env.NODE_ENV !== 'test') {
+      for (const schema of loadedSchemas) {
+        let status = true;
+        let errors = [];
+        
+        if (directoryName === 'ObjectSchemas') {
+          [status, errors] = utils.validateObjectSchema({ logger: Logger }, schema);
+        } else if (directoryName === 'RelationshipSchemas') {
+          if (entry.name.toLowerCase() === 'refobjectrelationships.js') {
+            [status, errors] = utils.validateRefRelationshipSchema({ logger: Logger }, schema);
+          } else {
+            [status, errors] = utils.validateRelationshipSchema({ logger: Logger }, schema);
+          }
+        } else if (directoryName === 'FlowSchemas') {
+          [status, errors] = utils.validateBasicFlowSchema({ logger: Logger }, schema);
+        }
+
+        if (!status) {
+          throw new Error(`Schema validation failed for ${entry.name}:\n${errors.join('\n')}`);
+        }
+      }
+    }
+
+    schemas.push(...loadedSchemas);
   }
   return schemas;
 }
+
+/**
+ * Resolves extendObjType for ObjectSchemas by fetching the parent schema
+ * from S3 and merging its storageResources into the child schema.
+ *
+ * Only schemas with `extendObjType` are processed; others are returned as-is.
+ * If `bucketName` is not provided, falls back to the
+ * `iz_serviceSchemaBucketName` environment variable.
+ *
+ * @param {Object[]} objectSchemas - Array of local ObjectSchemas from
+ *   loadLocalSchemaDirectory.
+ * @param {string} [bucketName] - S3 bucket name for fetching parent schemas.
+ * @returns {Promise<Object[]>} The same array with extended storageResources
+ *   merged in.
+ */
+export async function resolveExtendedObjectSchemas(
+  objectSchemas,
+  bucketName
+) {
+  if (!Array.isArray(objectSchemas)) {
+    throw new TypeError('objectSchemas must be an array');
+  }
+  const resolvedSchemas = [];
+  for (const schema of objectSchemas) {
+    if (!schema.hasOwnProperty('extendObjType')) {
+      resolvedSchemas.push(schema);
+      continue;
+    }
+    try {
+      // Track which storageResource keys existed in the child before merge
+      const childStorageResourceKeys = new Set(
+        Object.keys(schema.storageResources ?? {})
+      );
+      const parentServiceTag = schema.extendObjType.serviceTag;
+
+      const mergedSchema = await getObjectSchema.mergeExtendObjSchema(
+        { logger: Logger },
+        schema,
+        bucketName
+      );
+
+      // Separate parent DynamoDB resources from child's own storageResources.
+      // Parent DynamoDB tables exist in the parent service — they must NOT be
+      // re-created here. Instead, track them as external references so that
+      // emitResourceArtifacts can add cross-service ARNs to IAM roles.
+      const externalDynamoResources = [];
+      const ownStorageResources = {};
+      for (const [key, resource] of Object.entries(
+        mergedSchema.storageResources ?? {}
+      )) {
+        if (
+          resource?.storageType === 'dynamoDB' &&
+          !childStorageResourceKeys.has(key)
+        ) {
+          externalDynamoResources.push({
+            serviceTag: parentServiceTag,
+            tableName: resource.tableName
+          });
+        } else {
+          ownStorageResources[key] = resource;
+        }
+      }
+
+      mergedSchema.storageResources = ownStorageResources;
+      if (externalDynamoResources.length > 0) {
+        mergedSchema.externalDynamoResources = externalDynamoResources;
+      }
+
+      resolvedSchemas.push(mergedSchema);
+    } catch (error) {
+      Logger.error(
+        `resolveExtendedObjectSchemas: failed to merge extendObjType` +
+        ` for objectType=${schema.objectType}`,
+        { error }
+      );
+      throw error;
+    }
+  }
+  return resolvedSchemas;
+}

package/src/emit/crud/emitCrudApplicationArtifacts.js

@@ -83,12 +83,14 @@ async function emitAction(action, objects, flows, serviceTag) {
     return {
       artifacts,
       functions: [
-        { type: 'inv', functionName: 'GetHdrInv', handlerPath: `${handlerRoot}/Get_HdrInv.main`, roleName: 'FlowObjectsRole' },
+        { type: 'inv', functionName: 'GetHdrInv', handlerPath: `${handlerRoot}/Get_HdrInv.main`, roleName: 'FlowObjectsRole', flowTag: action, flowStepName: '' },
         {
           type: 'api',
           functionName: 'GetHdrApi',
           handlerPath: `${handlerRoot}/Get_HdrApi.main`,
           roleName: 'FlowObjectsRole',
+          flowTag: action,
+          flowStepName: '',
           routes: objects.filter(isCrudObject).map(object => ({
             path: `/${serviceTag ?? '${self:custom.iz_serviceName}'}/${object.objectType}/get`,
             upperName: upperFirst(object.objectType)
@@ -99,6 +101,8 @@ async function emitAction(action, objects, flows, serviceTag) {
           functionName: 'GetRangeHdrApi',
           handlerPath: `${handlerRoot}/GetRange_HdrApi.main`,
           roleName: 'FlowObjectsRole',
+          flowTag: 'GetRange',
+          flowStepName: '',
           routes: objects.filter(isCrudObject)
             .filter(object => object.identifiers && object.identifiers.some(i => i.type === 'sortKey'))
             .map(object => ({
@@ -116,22 +120,22 @@ async function emitAction(action, objects, flows, serviceTag) {
     { path: `${source}/${action}_HdrWbs.js`, content: await render('FlowEndpoint_HdrWbs.ejs', { ...shared, mainFileName: `${action}_WbsMain`, functionName: action, route: action }) }
   );
   const functions = [
-    { type: 'wbs', functionName: `${action}HdrWbs`, handlerPath: `${handlerRoot}/${action}_HdrWbs.main`, roleName: 'FlowObjectsRole', routeName: action },
-    { type: 'sqs', functionName: `${action}HdrSqs`, handlerPath: `${handlerRoot}/${action}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}HdrSqs` }
+    { type: 'wbs', functionName: `${action}HdrWbs`, handlerPath: `${handlerRoot}/${action}_HdrWbs.main`, roleName: 'FlowObjectsRole', routeName: action, flowTag: action, flowStepName: '' },
+    { type: 'sqs', functionName: `${action}HdrSqs`, handlerPath: `${handlerRoot}/${action}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}HdrSqs`, flowTag: action, flowStepName: '' }
   ];
   const complete = `${action}Complete`;
   artifacts.push(
     { path: `${source}/${complete}_Main.js`, content: await render('FlowEndpointComplete_Main.ejs', { action }) },
     { path: `${source}/${complete}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, mainFileName: `${complete}_Main`, functionName: complete, queueName: `${action}CompleteHdrSqs` }) }
   );
-  functions.push({ type: 'sqs', functionName: `${action}CompleteHdrSqs`, handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}CompleteHdrSqs` });
+  functions.push({ type: 'sqs', functionName: `${action}CompleteHdrSqs`, handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}CompleteHdrSqs`, flowTag: action, flowStepName: 'Complete' });
   if (generateCode.some(config => config.codeHookTag === 'beforeLogical')) {
     const beforeMain = `${action}BeforeLogical_Main`;
     artifacts.push(
       { path: `${source}/${beforeMain}.js`, content: await render('FlowEndpointBeforeLogical_Main.ejs', shared) },
       { path: `${source}/${action}BeforeLogical_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, mainFileName: beforeMain, functionName: `${action}BeforeLogicalMain`, queueName: `${action}BeforeLogicalHdrSqs` }) }
     );
-    functions.push({ type: 'sqs', functionName: `${action}BeforeLogicalHdrSqs`, handlerPath: `${handlerRoot}/${action}BeforeLogical_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}BeforeLogicalHdrSqs` });
+    functions.push({ type: 'sqs', functionName: `${action}BeforeLogicalHdrSqs`, handlerPath: `${handlerRoot}/${action}BeforeLogical_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}BeforeLogicalHdrSqs`, flowTag: action, flowStepName: 'BeforeLogical' });
   }
   return { artifacts, functions };
 }

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -4,7 +4,7 @@ const ACTIONS = ['Create', 'Update', 'Delete', 'Get'];
 const MESSAGE_ATTRIBUTES = ['userId', 'correlationId'];
 
 export const dynamicCrudFlowSchemaPaths = ACTIONS.map(
-  action => `app/src/schemas/FlowSchemas/generateCode/${action}.js`
+  action => `app/src/schemas/FlowSchemas/generateCode/FlowObjects/${action}.js`
 );
 
 export function emitDynamicCrudFlowSchemas({ objects, flows = [] }) {
@@ -59,7 +59,6 @@ function createDynamicFlow(action, hasBeforeLogicalStep) {
 
   return {
     flowTag: action,
-    isDynamicObjectType: true,
     initiateBy: 'system',
     handleObj: 'one',
     statusType: 'none',