@rsconcept/rstool 0.10.3 → 1.0.1

package/examples/kinship/build-rsform.ts

@@ -1,7 +1,9 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../../src';
+import { CstType, RSToolWrapperClient, type AgentConstituentaPatch } from '../../src';
+
+type DraftBatch = { draft: AgentConstituentaPatch };
 
 import { DEFAULT_RSFORM_SESSION_PATH } from './constants';
 
@@ -14,7 +16,7 @@ async function run() {
     await client.waitUntilReady();
     const session = await client.call<{ sessionId: string; contractVersion: string }>('createSession');
 
-    const drafts: AddOrUpdateConstituentaInput[] = [
+    const drafts: DraftBatch[] = [
       {
         draft: {
           id: 1,
@@ -647,22 +649,25 @@ async function run() {
       }
     ];
 
-    for (const input of drafts) {
-      const result = await client.call<{
-        state: { alias: string; analysis: { success: boolean } };
-        diagnostics: unknown[];
-      }>('addOrUpdateConstituenta', {
-        sessionId: session.sessionId,
-        input
-      });
-      const ok = result.state.analysis.success;
-      const diagCount = result.diagnostics?.length ?? 0;
-      console.log(`${input.draft.alias}: ${ok ? 'OK' : 'FAIL'} (${diagCount} diagnostics)`);
-      if (!ok) {
-        const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
-        console.log(JSON.stringify(diags, null, 2));
-        throw new Error(`${input.draft.alias}: analysis failed (${diagCount} diagnostics): ${JSON.stringify(diags)}`);
-      }
+    const patch = await client.call<{
+      success: boolean;
+      diagnostics: unknown[];
+      failed: Array<{ draft: { alias: string }; diagnostics: unknown[] }>;
+      summary: { items: Array<{ alias: string; analysisSuccess: boolean }> };
+    }>('applySchemaPatch', {
+      sessionId: session.sessionId,
+      mode: 'atomic',
+      items: drafts.map(entry => entry.draft)
+    });
+
+    for (const item of patch.summary.items) {
+      console.log(`${item.alias}: ${item.analysisSuccess ? 'OK' : 'FAIL'}`);
+    }
+    if (!patch.success) {
+      const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
+      console.log(JSON.stringify(diags, null, 2));
+      const failedAlias = patch.failed[0]?.draft.alias ?? 'unknown';
+      throw new Error(`${failedAlias}: analysis failed: ${JSON.stringify(diags)}`);
     }
 
     await client.call('commitStep', {

package/examples/kinship/build-rsmodel.ts

@@ -10,9 +10,11 @@ import {
   D3_ID,
   DEFAULT_RSFORM_SESSION_PATH,
   DEFAULT_RSMODEL_SESSION_PATH,
+  S1_ID,
   S2_ID,
   S3_ID,
-  S4_ID
+  S4_ID,
+  X1_ID
 } from './constants';
 
 /**
@@ -61,21 +63,19 @@ async function run() {
     const kinshipPath = resolve(process.cwd(), DEFAULT_RSFORM_SESSION_PATH);
     const kinshipJson = await readFile(kinshipPath, 'utf8');
 
-    const imported = await client.call<{ sessionId: string }>('importSession', {
+    const imported = await client.call<{ sessionId: string }>('importData', {
       payload: kinshipJson
     });
 
-    await client.call('setConstituentaValues', {
+    await client.call('setModelValues', {
       sessionId: imported.sessionId,
-      input: {
-        items: [
-          { target: 1, value: X1_BINDING },
-          { target: 2, value: S1_VALUE },
-          { target: S2_ID, value: S2_VALUE },
-          { target: S3_ID, value: S3_VALUE },
-          { target: S4_ID, value: S4_VALUE }
-        ]
-      }
+      set: [
+        { target: X1_ID, value: X1_BINDING },
+        { target: S1_ID, value: S1_VALUE },
+        { target: S2_ID, value: S2_VALUE },
+        { target: S3_ID, value: S3_VALUE },
+        { target: S4_ID, value: S4_VALUE }
+      ]
     });
 
     const recalculated = await client.call<{
@@ -85,14 +85,14 @@ async function run() {
     });
 
     const d3 = recalculated.items.find(item => item.id === D3_ID);
-    const d3Eval = await client.call<{ success: boolean; value: unknown; status: number }>('evaluateConstituenta', {
+    const d3Eval = await client.call<{ success: boolean; value: unknown; status: number }>('evaluate', {
       sessionId: imported.sessionId,
-      input: { constituentId: D3_ID }
+      constituentId: D3_ID
     });
 
-    const a1Eval = await client.call<{ success: boolean; value: unknown; status: number }>('evaluateConstituenta', {
+    const a1Eval = await client.call<{ success: boolean; value: unknown; status: number }>('evaluate', {
       sessionId: imported.sessionId,
-      input: { constituentId: A1_ID }
+      constituentId: A1_ID
     });
 
     console.log('D3 recalculate:', d3);