@rsconcept/rstool 0.3.0 → 0.5.0

package/src/models/rstool-agent.test.ts

@@ -126,6 +126,104 @@ describe('RSToolAgent', () => {
     });
   });
 
+  it('stores and exports session metadata', () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession({
+      alias: 'KIN',
+      title: 'Kinship',
+      comment: 'Example schema'
+    });
+
+    expect(tool.getFormState(session.sessionId)).toMatchObject({
+      alias: 'KIN',
+      title: 'Kinship',
+      comment: 'Example schema'
+    });
+
+    const exported = JSON.parse(tool.exportPortalSchema(session.sessionId)) as {
+      title: string;
+      alias: string;
+      description: string;
+    };
+    expect(exported).toMatchObject({
+      title: 'Kinship',
+      alias: 'KIN',
+      description: 'Example schema'
+    });
+  });
+
+  it('exports schema data for Portal JSON import', () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession();
+    tool.addOrUpdateConstituenta(session.sessionId, {
+      draft: {
+        id: 15,
+        alias: 'D2',
+        cstType: CstType.TERM,
+        definitionFormal: '1',
+        term: 'natural number',
+        definitionText: 'A positive integer',
+        convention: 'Standard arithmetic'
+      }
+    });
+
+    const exported = JSON.parse(tool.exportPortalSchema(session.sessionId)) as {
+      contract_version: string;
+      title: string;
+      alias: string;
+      description: string;
+      items: Array<Record<string, unknown>>;
+      attribution: unknown[];
+    };
+
+    expect(exported.contract_version).toBe('1.0.0');
+    expect(exported.title).toBe('Conceptual schema');
+    expect(exported.alias).toBe('SCHEMA');
+    expect(exported.description).toBe('');
+
+    expect(exported.items[0]).toMatchObject({
+      id: 15,
+      alias: 'D2',
+      cst_type: CstType.TERM,
+      definition_formal: '1',
+      definition_raw: 'A positive integer',
+      term_raw: 'natural number',
+      convention: 'Standard arithmetic',
+      crucial: false
+    });
+    expect(exported.attribution).toEqual([]);
+  });
+
+  it('exports model data for Portal JSON import', async () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession();
+    buildSampleForm(tool, session.sessionId);
+    await tool.setConstituentaValue(session.sessionId, {
+      target: 1,
+      value: { 1: 'Alice' }
+    });
+
+    const exported = JSON.parse(tool.exportPortalModel(session.sessionId)) as {
+      contract_version: string;
+      title: string;
+      alias: string;
+      description: string;
+      items: Array<Record<string, unknown>>;
+    };
+
+    expect(exported.contract_version).toBe('1.0.0');
+    expect(exported.title).toBe('Conceptual model');
+    expect(exported.alias).toBe('MODEL');
+
+    expect(exported.items).toEqual([
+      {
+        id: 1,
+        type: 'basic',
+        value: { 1: 'Alice' }
+      }
+    ]);
+  });
+
   it('defaults missing text fields to empty strings', () => {
     const tool = new RSToolAgent();
     const session = tool.createSession();

package/src/models/rstool-agent.ts

@@ -19,9 +19,41 @@ import {
   type SetConstituentaValueInput,
   type SetConstituentaValuesInput
 } from './model-value';
+import {
+  PORTAL_JSON_CONTRACT_VERSION,
+  type PortalModelImportData,
+  type PortalSchemaImportData
+} from './portal-json';
 import { type SessionHandle, type SessionRevision, type SessionState } from './session';
 import { CONTRACT_VERSION, type RSToolAgentContract } from './tool-contract';
 
+function normalizeImportedState(state: SessionState): SessionState {
+  return {
+    ...state,
+    alias: state.alias ?? '',
+    title: state.title ?? '',
+    comment: state.comment ?? '',
+    model: state.model ?? { items: [] }
+  };
+}
+
+function portalImportMetadata(
+  session: SessionState,
+  kind: 'schema' | 'model'
+): Pick<PortalSchemaImportData, 'title' | 'alias' | 'description'> {
+  const defaults =
+    kind === 'schema'
+      ? { title: 'Conceptual schema', alias: 'SCHEMA' }
+      : { title: 'Conceptual model', alias: 'MODEL' };
+  const title = session.title.trim();
+  const alias = session.alias.trim();
+  return {
+    title: title.length > 0 ? title : defaults.title,
+    alias: alias.length > 0 ? alias : defaults.alias,
+    description: session.comment.trim()
+  };
+}
+
 export class RSToolAgent implements RSToolAgentContract {
   public readonly contractVersion = CONTRACT_VERSION;
   private readonly sessions = new SessionStore();
@@ -87,14 +119,50 @@ export class RSToolAgent implements RSToolAgentContract {
     );
   }
 
+  public exportPortalSchema(sessionId: string): string {
+    const envelope = this.sessions.get(sessionId);
+    const payload: PortalSchemaImportData = {
+      contract_version: PORTAL_JSON_CONTRACT_VERSION,
+      ...portalImportMetadata(envelope.state, 'schema'),
+      items: envelope.state.items.map(item => ({
+        id: item.id,
+        alias: item.alias,
+        convention: item.convention,
+        crucial: false,
+        cst_type: item.cstType,
+        definition_formal: item.definitionFormal,
+        typification_manual: '',
+        value_is_property: false,
+        definition_raw: item.definitionText,
+        definition_resolved: item.definitionText,
+        term_raw: item.term,
+        term_resolved: item.term,
+        term_forms: []
+      })),
+      attribution: []
+    };
+    return JSON.stringify(payload, null, 2);
+  }
+
+  public exportPortalModel(sessionId: string): string {
+    const envelope = this.sessions.get(sessionId);
+    const payload: PortalModelImportData = {
+      contract_version: PORTAL_JSON_CONTRACT_VERSION,
+      ...portalImportMetadata(envelope.state, 'model'),
+      items: envelope.state.model.items.map(item => ({
+        id: item.id,
+        type: item.type,
+        value: item.value
+      }))
+    };
+    return JSON.stringify(payload, null, 2);
+  }
+
   public importSession(payload: string): SessionHandle {
     const parsed = JSON.parse(payload) as {
       state: SessionState;
     };
-    if (!parsed.state.model) {
-      parsed.state.model = { items: [] };
-    }
-    return this.sessions.create(parsed.state, this.contractVersion);
+    return this.sessions.create(normalizeImportedState(parsed.state), this.contractVersion);
   }
 
   public async setConstituentaValue(

package/src/models/session.ts

@@ -14,9 +14,20 @@ export interface SessionRevision {
 
 export interface SessionState {
   sessionId: string;
+  /** Library item alias for the conceptual schema or model. */
+  alias: string;
+  /** Human-readable title. */
+  title: string;
+  /** Developer comment (Portal JSON `description` on export). */
+  comment: string;
+  /** Date of creation. */
   createdAt: string;
+  /** Date of last update. */
   updatedAt: string;
+  /** List of revisions. */
   revisions: SessionRevision[];
+  /** List of constituents in the session. */
   items: ConstituentaState[];
+  /** Model state. */
   model: SessionModelState;
 }

package/src/models/tool-contract.ts

@@ -25,7 +25,7 @@ import {
   type SessionState
 } from './session';
 
-export const CONTRACT_VERSION = '1.2.0';
+export const CONTRACT_VERSION = '1.4.0';
 
 export interface RSToolAgentContract {
   readonly contractVersion: string;
@@ -36,6 +36,8 @@ export interface RSToolAgentContract {
   listDiagnostics(sessionId: string, filters?: ListDiagnosticsFilters): DiagnosticRecord[];
   commitStep(sessionId: string, message?: string): SessionRevision;
   exportSession(sessionId: string): string;
+  exportPortalSchema(sessionId: string): string;
+  exportPortalModel(sessionId: string): string;
   importSession(payload: string): SessionHandle;
   setConstituentaValue(sessionId: string, input: SetConstituentaValueInput): Promise<SessionModelState>;
   setConstituentaValues(sessionId: string, input: SetConstituentaValuesInput): Promise<SessionModelState>;

package/src/session/session-store.ts

@@ -21,6 +21,9 @@ export class SessionStore {
     const sessionId = initial?.sessionId ?? randomUUID();
     const state: SessionState = {
       sessionId,
+      alias: initial?.alias ?? '',
+      title: initial?.title ?? '',
+      comment: initial?.comment ?? '',
       createdAt: initial?.createdAt ?? now,
       updatedAt: now,
       revisions: initial?.revisions ?? [],

package/src/wrapper/stdio-wrapper.ts

@@ -30,6 +30,8 @@ const METHODS = [
   'listDiagnostics',
   'commitStep',
   'exportSession',
+  'exportPortalSchema',
+  'exportPortalModel',
   'importSession',
   'setConstituentaValue',
   'setConstituentaValues',
@@ -116,6 +118,18 @@ async function handleRequest(request: StdioRequest): Promise<StdioResponse> {
           ok: true,
           result: tool.exportSession(requiredString(params, 'sessionId'))
         };
+      case 'exportPortalSchema':
+        return {
+          id: request.id,
+          ok: true,
+          result: tool.exportPortalSchema(requiredString(params, 'sessionId'))
+        };
+      case 'exportPortalModel':
+        return {
+          id: request.id,
+          ok: true,
+          result: tool.exportPortalModel(requiredString(params, 'sessionId'))
+        };
       case 'importSession':
         return {
           id: request.id,

package/dist/models/rstool-agent.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rstool-agent.js","names":[],"sources":["../../src/models/rstool-agent.ts"],"sourcesContent":["import { ModelAdapter } from '../mappers/model-adapter';\nimport { SchemaAdapter } from '../mappers/schema-adapter';\nimport { SessionStore } from '../session/session-store';\nimport { type AnalysisResult, type AnalyzeExpressionInput } from './analysis';\nimport {\n  type AddOrUpdateConstituentaInput,\n  type AddOrUpdateConstituentaResult\n} from './constituenta';\nimport { type ListDiagnosticsFilters } from './diagnostic';\nimport {\n  type EvaluateConstituentaInput,\n  type EvaluateExpressionInput,\n  type EvaluationResult\n} from './evaluation';\nimport {\n  type ClearConstituentaValuesInput,\n  type RecalculateModelResult,\n  type SessionModelState,\n  type SetConstituentaValueInput,\n  type SetConstituentaValuesInput\n} from './model-value';\nimport { type SessionHandle, type SessionRevision, type SessionState } from './session';\nimport { CONTRACT_VERSION, type RSToolAgentContract } from './tool-contract';\n\nexport class RSToolAgent implements RSToolAgentContract {\n  public readonly contractVersion = CONTRACT_VERSION;\n  private readonly sessions = new SessionStore();\n  private readonly adapter = new SchemaAdapter();\n  private readonly evaluation = new ModelAdapter();\n\n  public createSession(initial?: Partial<SessionState>): SessionHandle {\n    return this.sessions.create(initial, this.contractVersion);\n  }\n\n  public addOrUpdateConstituenta(\n    sessionId: string,\n    input: AddOrUpdateConstituentaInput\n  ): AddOrUpdateConstituentaResult {\n    const envelope = this.sessions.get(sessionId);\n    const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, input.draft);\n    const state = this.adapter.mergeStateWithDraft(envelope.state, input.draft, result);\n    this.sessions.appendDiagnostics(sessionId, diagnostics);\n    return {\n      state,\n      diagnostics\n    };\n  }\n\n  public analyzeExpression(sessionId: string, input: AnalyzeExpressionInput): AnalysisResult {\n    const envelope = this.sessions.get(sessionId);\n    const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, {\n      id: -1,\n      alias: '_analysis',\n      cstType: input.cstType,\n      definitionFormal: input.expression\n    });\n    this.sessions.appendDiagnostics(\n      sessionId,\n      diagnostics.map(item => ({ ...item, constituentId: undefined }))\n    );\n    return result;\n  }\n\n  public getFormState(sessionId: string): SessionState {\n    const envelope = this.sessions.get(sessionId);\n    return structuredClone(envelope.state);\n  }\n\n  public listDiagnostics(sessionId: string, filters?: ListDiagnosticsFilters) {\n    return this.sessions.listDiagnostics(sessionId, filters);\n  }\n\n  public commitStep(sessionId: string, message?: string): SessionRevision {\n    return this.sessions.addRevision(sessionId, message);\n  }\n\n  public exportSession(sessionId: string): string {\n    const envelope = this.sessions.get(sessionId);\n    return JSON.stringify(\n      {\n        contractVersion: this.contractVersion,\n        state: envelope.state,\n        diagnostics: envelope.diagnostics\n      },\n      null,\n      2\n    );\n  }\n\n  public importSession(payload: string): SessionHandle {\n    const parsed = JSON.parse(payload) as {\n      state: SessionState;\n    };\n    if (!parsed.state.model) {\n      parsed.state.model = { items: [] };\n    }\n    return this.sessions.create(parsed.state, this.contractVersion);\n  }\n\n  public async setConstituentaValue(\n    sessionId: string,\n    input: SetConstituentaValueInput\n  ): Promise<SessionModelState> {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.setConstituentaValue(envelope.state, input);\n  }\n\n  public async setConstituentaValues(\n    sessionId: string,\n    input: SetConstituentaValuesInput\n  ): Promise<SessionModelState> {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.setConstituentaValues(envelope.state, input);\n  }\n\n  public async clearConstituentaValues(\n    sessionId: string,\n    input: ClearConstituentaValuesInput\n  ): Promise<SessionModelState> {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.clearConstituentaValues(envelope.state, input.items);\n  }\n\n  public getModelState(sessionId: string): SessionModelState {\n    const envelope = this.sessions.get(sessionId);\n    return structuredClone(envelope.state.model);\n  }\n\n  public evaluateExpression(sessionId: string, input: EvaluateExpressionInput): EvaluationResult {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.evaluateExpression(envelope.state, input.expression, input.cstType);\n  }\n\n  public evaluateConstituenta(sessionId: string, input: EvaluateConstituentaInput): EvaluationResult {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.evaluateConstituenta(envelope.state, input.constituentId);\n  }\n\n  public recalculateModel(sessionId: string): RecalculateModelResult {\n    const envelope = this.sessions.get(sessionId);\n    return this.evaluation.recalculateModel(envelope.state);\n  }\n}\n"],"mappings":";;;;;AAwBA,IAAa,cAAb,MAAwD;CACtD,kBAAkC;CAClC,WAA4B,IAAI,aAAa;CAC7C,UAA2B,IAAI,cAAc;CAC7C,aAA8B,IAAI,aAAa;CAE/C,cAAqB,SAAgD;EACnE,OAAO,KAAK,SAAS,OAAO,SAAS,KAAK,eAAe;CAC3D;CAEA,wBACE,WACA,OAC+B;EAC/B,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,MAAM,EAAE,QAAQ,gBAAgB,KAAK,QAAQ,sBAAsB,SAAS,OAAO,MAAM,KAAK;EAC9F,MAAM,QAAQ,KAAK,QAAQ,oBAAoB,SAAS,OAAO,MAAM,OAAO,MAAM;EAClF,KAAK,SAAS,kBAAkB,WAAW,WAAW;EACtD,OAAO;GACL;GACA;EACF;CACF;CAEA,kBAAyB,WAAmB,OAA+C;EACzF,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,MAAM,EAAE,QAAQ,gBAAgB,KAAK,QAAQ,sBAAsB,SAAS,OAAO;GACjF,IAAI;GACJ,OAAO;GACP,SAAS,MAAM;GACf,kBAAkB,MAAM;EAC1B,CAAC;EACD,KAAK,SAAS,kBACZ,WACA,YAAY,KAAI,UAAS;GAAE,GAAG;GAAM,eAAe;EAAU,EAAE,CACjE;EACA,OAAO;CACT;CAEA,aAAoB,WAAiC;EACnD,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,gBAAgB,SAAS,KAAK;CACvC;CAEA,gBAAuB,WAAmB,SAAkC;EAC1E,OAAO,KAAK,SAAS,gBAAgB,WAAW,OAAO;CACzD;CAEA,WAAkB,WAAmB,SAAmC;EACtE,OAAO,KAAK,SAAS,YAAY,WAAW,OAAO;CACrD;CAEA,cAAqB,WAA2B;EAC9C,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,UACV;GACE,iBAAiB,KAAK;GACtB,OAAO,SAAS;GAChB,aAAa,SAAS;EACxB,GACA,MACA,CACF;CACF;CAEA,cAAqB,SAAgC;EACnD,MAAM,SAAS,KAAK,MAAM,OAAO;EAGjC,IAAI,CAAC,OAAO,MAAM,OAChB,OAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,EAAE;EAEnC,OAAO,KAAK,SAAS,OAAO,OAAO,OAAO,KAAK,eAAe;CAChE;CAEA,MAAa,qBACX,WACA,OAC4B;EAC5B,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,qBAAqB,SAAS,OAAO,KAAK;CACnE;CAEA,MAAa,sBACX,WACA,OAC4B;EAC5B,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,sBAAsB,SAAS,OAAO,KAAK;CACpE;CAEA,MAAa,wBACX,WACA,OAC4B;EAC5B,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,wBAAwB,SAAS,OAAO,MAAM,KAAK;CAC5E;CAEA,cAAqB,WAAsC;EACzD,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,gBAAgB,SAAS,MAAM,KAAK;CAC7C;CAEA,mBAA0B,WAAmB,OAAkD;EAC7F,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,mBAAmB,SAAS,OAAO,MAAM,YAAY,MAAM,OAAO;CAC3F;CAEA,qBAA4B,WAAmB,OAAoD;EACjG,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,qBAAqB,SAAS,OAAO,MAAM,aAAa;CACjF;CAEA,iBAAwB,WAA2C;EACjE,MAAM,WAAW,KAAK,SAAS,IAAI,SAAS;EAC5C,OAAO,KAAK,WAAW,iBAAiB,SAAS,KAAK;CACxD;AACF"}