Compare commits

...
2 Commits
Author SHA1 Message Date
Sirttas f7a193d1c5 feat: New runner UI 2026-08-08 21:28:23 +02:00
Sirttas 0040a5c33b feat: regenerate open api 2026-08-08 20:47:13 +02:00
5 changed files with 576 additions and 92 deletions
+179 -21
View File
@@ -43,8 +43,7 @@ paths:
"400":
description: |-
Returned when:
- a binding references a ledger the caller does not own
- a binding references a ledger that is not a main ledger
- a ledger scope reference is not one of the caller's own main ledgers
/ledgers/main/{ledgerId}:
put:
tags:
@@ -438,11 +437,38 @@ paths:
get:
tags:
- rule-script
summary: Download the TypeScript definitions for the rule script runtime
operationId: getScriptDefinitions
summary: List the available rule script type definition files
operationId: listScriptDefinitions
responses:
"200":
description: The rule-runner.d.ts type definitions
description: The names of the available .d.ts type definitions
content:
'*/*':
schema:
type: array
items:
type: string
/rule-scripts/definitions/{name}:
get:
tags:
- rule-script
summary: Download a rule script type definition file by name
operationId: getScriptDefinition
parameters:
- name: name
in: path
required: true
schema:
type: string
responses:
"200":
description: The requested .d.ts type definitions
content:
text/plain:
schema:
type: string
"404":
description: No type definition with that name exists
content:
text/plain:
schema:
@@ -974,8 +1000,10 @@ paths:
format: uuid
responses:
"200":
description: "Daily realized profit for the ledger, ascending by date, only\
\ for days with a sale"
description: "Daily FIFO-realized profit for the ledger, ascending by date,\
\ only for days with a sale. iskIn is the sum of that day's profitable\
\ trades, iskOut is the sum of that day's losing trades (as a positive\
\ deficit); profit is iskIn minus iskOut."
content:
'*/*':
schema:
@@ -1127,50 +1155,180 @@ paths:
$ref: "#/components/schemas/AcquisitionResponse"
components:
schemas:
UpdateRuleBookRequest:
RuleScopeRequest:
type: object
description: Request to update the caller's rule book; replaces its mutable
fields.
description: The ledgers and other resources to bind to a rule script.
properties:
bindings:
ledgers:
type: object
additionalProperties:
type: string
format: uuid
description: "Ledger references the script writes to, each bound to one\
\ of the user's ledgers."
\ of the user's own main ledgers."
characters:
type: object
additionalProperties:
type: integer
format: int64
description: "Character references the script can read, each bound to one\
\ of the user's own characters."
corporations:
type: object
additionalProperties:
type: integer
format: int64
description: "Corporation references the script can read, each bound to\
\ a corporation of one of the user's own characters."
walletDivisions:
type: object
additionalProperties:
$ref: "#/components/schemas/WalletDivisionTargetRequest"
description: "Corporation wallet division references the script can read,\
\ each bound to a corporation of one of the user's own characters."
required:
- characters
- corporations
- ledgers
- walletDivisions
RuleScriptRequest:
type: object
description: "A named rule script to store in the book, together with its scope."
properties:
name:
type: string
description: Unique script name within the book; a lowercase alphanumeric
identifier.
example: sales
scope:
$ref: "#/components/schemas/RuleScopeRequest"
description: The ledgers and other resources bound to this script.
script:
type: string
description: The classification script source.
example: transfer.to('sales')
example: transfer.to('wallet')
required:
- bindings
- name
- scope
- script
UpdateRuleBookRequest:
type: object
description: Request to update the caller's rule book; replaces its rule scripts.
properties:
scripts:
type: array
description: The rule scripts making up the book.
items:
$ref: "#/components/schemas/RuleScriptRequest"
required:
- scripts
WalletDivisionTargetRequest:
type: object
description: A corporation wallet division to bind.
properties:
corporationId:
type: integer
format: int64
description: The corporation the wallet division belongs to.
example: 98000001
division:
type: integer
format: int32
description: "The wallet division number, from 1 to 7."
example: 1
required:
- corporationId
- division
RuleBookResponse:
type: object
description: "The caller's rule book: a script that classifies transactions,\
\ together with its ledger bindings."
description: "The caller's rule book: the named rule scripts that classify transactions,\
\ each with its scope."
properties:
userId:
type: string
format: uuid
description: Owning user identifier.
example: 3fa85f64-5717-4562-b3fc-2c963f66afa6
bindings:
scripts:
type: array
description: The rule scripts making up the book.
items:
$ref: "#/components/schemas/RuleScriptResponse"
required:
- scripts
- userId
RuleScopeResponse:
type: object
description: The ledgers and other resources bound to a rule script.
properties:
ledgers:
type: object
additionalProperties:
type: string
format: uuid
description: "Ledger references the script writes to, each bound to one\
\ of the user's ledgers."
\ of the user's own main ledgers."
characters:
type: object
additionalProperties:
type: integer
format: int64
description: "Character references the script can read, each bound to one\
\ of the user's own characters."
corporations:
type: object
additionalProperties:
type: integer
format: int64
description: "Corporation references the script can read, each bound to\
\ a corporation of one of the user's own characters."
walletDivisions:
type: object
additionalProperties:
$ref: "#/components/schemas/WalletDivisionTargetResponse"
description: "Corporation wallet division references the script can read,\
\ each bound to a corporation of one of the user's own characters."
required:
- characters
- corporations
- ledgers
- walletDivisions
RuleScriptResponse:
type: object
description: "A named rule script within the book, together with its scope."
properties:
name:
type: string
description: Unique script name within the book.
example: sales
scope:
$ref: "#/components/schemas/RuleScopeResponse"
description: The ledgers and other resources bound to this script.
script:
type: string
description: The classification script source.
example: transfer.to('sales')
example: transfer.to('wallet')
required:
- bindings
- name
- scope
- script
- userId
WalletDivisionTargetResponse:
type: object
description: A corporation wallet division bound to the script.
properties:
corporationId:
type: integer
format: int64
description: The corporation the wallet division belongs to.
example: 98000001
division:
type: integer
format: int32
description: "The wallet division number, from 1 to 7."
example: 1
required:
- corporationId
- division
UpdateMainLedgerRequest:
type: object
description: Request to update an existing main ledger.
+183 -21
View File
@@ -732,7 +732,7 @@ export interface ReprocessingResultResponse {
'output': Array<MarketTypeStackAppraisalResponse>;
}
/**
* The caller\'s rule book: a script that classifies transactions, together with its ledger bindings.
* The caller\'s rule book: the named rule scripts that classify transactions, each with its scope.
*/
export interface RuleBookResponse {
/**
@@ -740,9 +740,81 @@ export interface RuleBookResponse {
*/
'userId': string;
/**
* Ledger references the script writes to, each bound to one of the user\'s ledgers.
* The rule scripts making up the book.
*/
'bindings': { [key: string]: string; };
'scripts': Array<RuleScriptResponse>;
}
/**
* The ledgers and other resources to bind to a rule script.
*/
export interface RuleScopeRequest {
/**
* Ledger references the script writes to, each bound to one of the user\'s own main ledgers.
*/
'ledgers': { [key: string]: string; };
/**
* Character references the script can read, each bound to one of the user\'s own characters.
*/
'characters': { [key: string]: number; };
/**
* Corporation references the script can read, each bound to a corporation of one of the user\'s own characters.
*/
'corporations': { [key: string]: number; };
/**
* Corporation wallet division references the script can read, each bound to a corporation of one of the user\'s own characters.
*/
'walletDivisions': { [key: string]: WalletDivisionTargetRequest; };
}
/**
* The ledgers and other resources bound to a rule script.
*/
export interface RuleScopeResponse {
/**
* Ledger references the script writes to, each bound to one of the user\'s own main ledgers.
*/
'ledgers': { [key: string]: string; };
/**
* Character references the script can read, each bound to one of the user\'s own characters.
*/
'characters': { [key: string]: number; };
/**
* Corporation references the script can read, each bound to a corporation of one of the user\'s own characters.
*/
'corporations': { [key: string]: number; };
/**
* Corporation wallet division references the script can read, each bound to a corporation of one of the user\'s own characters.
*/
'walletDivisions': { [key: string]: WalletDivisionTargetResponse; };
}
/**
* A named rule script to store in the book, together with its scope.
*/
export interface RuleScriptRequest {
/**
* Unique script name within the book; a lowercase alphanumeric identifier.
*/
'name': string;
/**
* The ledgers and other resources bound to this script.
*/
'scope': RuleScopeRequest;
/**
* The classification script source.
*/
'script': string;
}
/**
* A named rule script within the book, together with its scope.
*/
export interface RuleScriptResponse {
/**
* Unique script name within the book.
*/
'name': string;
/**
* The ledgers and other resources bound to this script.
*/
'scope': RuleScopeResponse;
/**
* The classification script source.
*/
@@ -805,17 +877,39 @@ export interface UpdateMainLedgerRequest {
'name': string;
}
/**
* Request to update the caller\'s rule book; replaces its mutable fields.
* Request to update the caller\'s rule book; replaces its rule scripts.
*/
export interface UpdateRuleBookRequest {
/**
* Ledger references the script writes to, each bound to one of the user\'s ledgers.
* The rule scripts making up the book.
*/
'bindings': { [key: string]: string; };
'scripts': Array<RuleScriptRequest>;
}
/**
* The classification script source.
* A corporation wallet division to bind.
*/
'script': string;
export interface WalletDivisionTargetRequest {
/**
* The corporation the wallet division belongs to.
*/
'corporationId': number;
/**
* The wallet division number, from 1 to 7.
*/
'division': number;
}
/**
* A corporation wallet division bound to the script.
*/
export interface WalletDivisionTargetResponse {
/**
* The corporation the wallet division belongs to.
*/
'corporationId': number;
/**
* The wallet division number, from 1 to 7.
*/
'division': number;
}
/**
@@ -3909,12 +4003,16 @@ export const RuleScriptApiAxiosParamCreator = function (configuration?: Configur
return {
/**
*
* @summary Download the TypeScript definitions for the rule script runtime
* @summary Download a rule script type definition file by name
* @param {string} name
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getScriptDefinitions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
const localVarPath = `/rule-scripts/definitions`;
getScriptDefinition: async (name: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'name' is not null or undefined
assertParamExists('getScriptDefinition', 'name', name)
const localVarPath = `/rule-scripts/definitions/{name}`
.replace('{name}', encodeURIComponent(String(name)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
@@ -3932,6 +4030,36 @@ export const RuleScriptApiAxiosParamCreator = function (configuration?: Configur
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
return {
url: toPathString(localVarUrlObj),
options: localVarRequestOptions,
};
},
/**
*
* @summary List the available rule script type definition files
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listScriptDefinitions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
const localVarPath = `/rule-scripts/definitions`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
if (configuration) {
baseOptions = configuration.baseOptions;
}
const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
localVarHeaderParameter['Accept'] = '*/*';
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
return {
url: toPathString(localVarUrlObj),
options: localVarRequestOptions,
@@ -3948,14 +4076,27 @@ export const RuleScriptApiFp = function(configuration?: Configuration) {
return {
/**
*
* @summary Download the TypeScript definitions for the rule script runtime
* @summary Download a rule script type definition file by name
* @param {string} name
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getScriptDefinitions(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getScriptDefinitions(options);
async getScriptDefinition(name: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getScriptDefinition(name, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['RuleScriptApi.getScriptDefinitions']?.[localVarOperationServerIndex]?.url;
const localVarOperationServerBasePath = operationServerMap['RuleScriptApi.getScriptDefinition']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
/**
*
* @summary List the available rule script type definition files
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async listScriptDefinitions(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<string>>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listScriptDefinitions(options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['RuleScriptApi.listScriptDefinitions']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
}
@@ -3969,12 +4110,22 @@ export const RuleScriptApiFactory = function (configuration?: Configuration, bas
return {
/**
*
* @summary Download the TypeScript definitions for the rule script runtime
* @summary Download a rule script type definition file by name
* @param {string} name
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getScriptDefinitions(options?: RawAxiosRequestConfig): AxiosPromise<string> {
return localVarFp.getScriptDefinitions(options).then((request) => request(axios, basePath));
getScriptDefinition(name: string, options?: RawAxiosRequestConfig): AxiosPromise<string> {
return localVarFp.getScriptDefinition(name, options).then((request) => request(axios, basePath));
},
/**
*
* @summary List the available rule script type definition files
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listScriptDefinitions(options?: RawAxiosRequestConfig): AxiosPromise<Array<string>> {
return localVarFp.listScriptDefinitions(options).then((request) => request(axios, basePath));
},
};
};
@@ -3985,12 +4136,23 @@ export const RuleScriptApiFactory = function (configuration?: Configuration, bas
export class RuleScriptApi extends BaseAPI {
/**
*
* @summary Download the TypeScript definitions for the rule script runtime
* @summary Download a rule script type definition file by name
* @param {string} name
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
public getScriptDefinitions(options?: RawAxiosRequestConfig) {
return RuleScriptApiFp(this.configuration).getScriptDefinitions(options).then((request) => request(this.axios, this.basePath));
public getScriptDefinition(name: string, options?: RawAxiosRequestConfig) {
return RuleScriptApiFp(this.configuration).getScriptDefinition(name, options).then((request) => request(this.axios, this.basePath));
}
/**
*
* @summary List the available rule script type definition files
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
public listScriptDefinitions(options?: RawAxiosRequestConfig) {
return RuleScriptApiFp(this.configuration).listScriptDefinitions(options).then((request) => request(this.axios, this.basePath));
}
}
+168 -31
View File
@@ -1,49 +1,111 @@
<script setup lang="ts">
import {computed, ref, watchEffect} from "vue";
import {useEventListener} from "@vueuse/core";
import {computedAsync, useEventListener} from "@vueuse/core";
import log from "loglevel";
import {ScriptEditor, useRuleBookStore} from "@/rules";
import {PlusIcon, TrashIcon} from "@heroicons/vue/24/outline";
import {isMain, Ledger, LedgerSelect, systemLedger, useLedgersStore} from "@/ledger";
import {useCharactersStore} from "@/characters";
import {CorporationLabel, useCorporationsStore} from "@/corporations";
import {RuleScriptRequest} from "@/generated/mammon";
import {toast} from "@/toast";
type Binding = { ref: string; ledger: Ledger };
type LedgerScopeEntry = { ref: string; ledger: Ledger };
type CharacterScopeEntry = { ref: string; characterId: number };
type CorporationScopeEntry = { ref: string; corporationId: number };
type WalletDivisionScopeEntry = { ref: string; corporationId: number; division: number };
interface ScriptDraft {
name: string;
script: string;
ledgers: LedgerScopeEntry[];
characters: CharacterScopeEntry[];
corporations: CorporationScopeEntry[];
walletDivisions: WalletDivisionScopeEntry[];
}
const ruleBookStore = useRuleBookStore();
const ledgersStore = useLedgersStore();
const charactersStore = useCharactersStore();
const corporationsStore = useCorporationsStore();
const ledgersToUse = computed(() => [systemLedger, ...ledgersStore.ledgers.filter(isMain)]);
const bindings = ref<Binding[]>([]);
const script = ref<string>('');
const ledgerRefs = computed<string[]>(() => bindings.value.map(b => b.ref));
const scripts = ref<ScriptDraft[]>([]);
const selectedIndex = ref(0);
const selected = computed<ScriptDraft | undefined>(() => scripts.value[selectedIndex.value]);
watchEffect(() => {
const ruleBook = ruleBookStore.ruleBook;
script.value = ruleBook?.script ?? '';
bindings.value = Object.entries(ruleBook?.bindings ?? {})
.map(([ref, id]) => ({ref, ledger: ledgersToUse.value.find(l => l.ledgerId === id) ?? systemLedger}));
scripts.value = (ruleBook?.scripts ?? []).map(script => ({
name: script.name,
script: script.script,
ledgers: Object.entries(script.scope.ledgers).map(([ref, id]) => ({ref, ledger: ledgersToUse.value.find(l => l.ledgerId === id) ?? systemLedger})),
characters: Object.entries(script.scope.characters).map(([ref, characterId]) => ({ref, characterId})),
corporations: Object.entries(script.scope.corporations).map(([ref, corporationId]) => ({ref, corporationId})),
walletDivisions: Object.entries(script.scope.walletDivisions).map(([ref, target]) => ({ref, corporationId: target.corporationId, division: target.division})),
}));
selectedIndex.value = 0;
log.info('Loaded rule book:', ruleBook);
});
const addBinding = () => {
bindings.value = [...bindings.value, {ref: '', ledger: systemLedger}];
const editorScope = computed(() => selected.value ? {
ledgers: selected.value.ledgers.map(entry => entry.ref),
characters: selected.value.characters.map(entry => entry.ref),
corporations: selected.value.corporations.map(entry => entry.ref),
walletDivisions: selected.value.walletDivisions.map(entry => entry.ref),
} : undefined);
const scriptText = computed<string>({
get: () => selected.value?.script ?? '',
set: value => {
if (selected.value) {
selected.value.script = value;
}
},
});
const addScript = () => {
scripts.value = [...scripts.value, {name: '', script: '', ledgers: [], characters: [], corporations: [], walletDivisions: []}];
selectedIndex.value = scripts.value.length - 1;
};
const removeBinding = (index: number) => {
bindings.value = bindings.value.toSpliced(index, 1);
const removeScript = (index: number) => {
scripts.value = scripts.value.toSpliced(index, 1);
if (selectedIndex.value >= scripts.value.length) {
selectedIndex.value = Math.max(0, scripts.value.length - 1);
}
};
const save = () => ruleBookStore.update({
bindings: Object.fromEntries(
bindings.value
.filter(b => b.ref)
.map(b => [b.ref, b.ledger.ledgerId])
),
script: script.value
})
const addLedgerScope = () => selected.value?.ledgers.push({ref: '', ledger: systemLedger});
const removeLedgerScope = (index: number) => { if (selected.value) selected.value.ledgers = selected.value.ledgers.toSpliced(index, 1); };
const addCharacterScope = () => selected.value?.characters.push({ref: '', characterId: charactersStore.characters[0]?.characterId ?? 0});
const removeCharacterScope = (index: number) => { if (selected.value) selected.value.characters = selected.value.characters.toSpliced(index, 1); };
const addCorporationScope = () => selected.value?.corporations.push({ref: '', corporationId: 0});
const removeCorporationScope = (index: number) => { if (selected.value) selected.value.corporations = selected.value.corporations.toSpliced(index, 1); };
const addWalletDivisionScope = () => selected.value?.walletDivisions.push({ref: '', corporationId: 0, division: 1});
const removeWalletDivisionScope = (index: number) => { if (selected.value) selected.value.walletDivisions = selected.value.walletDivisions.toSpliced(index, 1); };
const resolvedCorporation = (corporationId: number) => computedAsync(async () => corporationId ? await corporationsStore.findById(corporationId) : undefined, undefined);
const save = () => ruleBookStore.update(
scripts.value
.filter(s => s.name)
.map((s): RuleScriptRequest => ({
name: s.name,
script: s.script,
scope: {
ledgers: Object.fromEntries(s.ledgers.filter(entry => entry.ref).map(entry => [entry.ref, entry.ledger.ledgerId])),
characters: Object.fromEntries(s.characters.filter(entry => entry.ref).map(entry => [entry.ref, entry.characterId])),
corporations: Object.fromEntries(s.corporations.filter(entry => entry.ref).map(entry => [entry.ref, entry.corporationId])),
walletDivisions: Object.fromEntries(s.walletDivisions.filter(entry => entry.ref).map(entry => [entry.ref, {corporationId: entry.corporationId, division: entry.division}])),
},
}))
)
.then(() => toast.success('Rule book saved'));
useEventListener(window, 'keydown', (event: KeyboardEvent) => {
@@ -55,28 +117,103 @@ useEventListener(window, 'keydown', (event: KeyboardEvent) => {
</script>
<template>
<div class="flex flex-col mb-2 mt-4 h-[calc(100vh-4.5rem)]">
<div class="flex flex-col grow min-h-0">
<div class="flex mb-2 mt-4 h-[calc(100vh-4.5rem)]">
<div class="flex flex-col me-4 w-48 shrink-0">
<div class="grow overflow-y-auto">
<div v-for="(script, index) in scripts" :key="index"
class="flex items-center mb-1 px-1 py-0.5 cursor-pointer"
:class="{'bg-neutral-700': index === selectedIndex}"
@click="selectedIndex = index">
<span class="grow truncate">{{ script.name || '(unnamed)' }}</span>
<button class="btn-icon text-amber-700 hover:text-amber-600" @click.stop="removeScript(index)"><TrashIcon /></button>
</div>
</div>
<button class="btn-icon mt-2" @click="addScript"><PlusIcon /> Add script</button>
</div>
<div v-if="selected" class="flex flex-col grow min-h-0">
<div class="border-b-1 mb-2">
Name: <input class="me-1" type="text" v-model="selected.name" />
</div>
<div class="border-b-1">
Ledger Bindings:
Scopes:
<div class="ms-4 mt-2">
Ledgers:
<div class="flex flex-wrap items-center mt-2">
<div class="flex items-center mb-2 me-2" v-for="(binding, index) in bindings" :key="index">
<input class="me-1" type="text" v-model="binding.ref" />
<div class="flex items-center mb-2 me-2" v-for="(entry, index) in selected.ledgers" :key="index">
<input class="me-1" type="text" v-model="entry.ref" />
<span class="me-1">:</span>
<LedgerSelect class="me-1" :ledgers="ledgersToUse" v-model="binding.ledger" />
<button class="btn-icon text-amber-700 hover:text-amber-600" @click="removeBinding(index)"><TrashIcon /></button>
<LedgerSelect class="me-1" :ledgers="ledgersToUse" v-model="entry.ledger" />
<button class="btn-icon text-amber-700 hover:text-amber-600" @click="removeLedgerScope(index)"><TrashIcon /></button>
</div>
<div class="flex items-center mb-2">
<button class="btn-icon" @click="addBinding"><PlusIcon /></button>
<button class="btn-icon" @click="addLedgerScope"><PlusIcon /></button>
</div>
</div>
</div>
<div class="ms-4 mt-2">
Characters:
<div class="flex flex-wrap items-center mt-2">
<div class="flex items-center mb-2 me-2" v-for="(entry, index) in selected.characters" :key="index">
<input class="me-1" type="text" v-model="entry.ref" />
<span class="me-1">:</span>
<select class="me-1" v-model="entry.characterId">
<option v-for="character in charactersStore.characters" :key="character.characterId" :value="character.characterId">{{ character.name }}</option>
</select>
<button class="btn-icon text-amber-700 hover:text-amber-600" @click="removeCharacterScope(index)"><TrashIcon /></button>
</div>
<div class="flex items-center mb-2">
<button class="btn-icon" @click="addCharacterScope"><PlusIcon /></button>
</div>
</div>
</div>
<div class="ms-4 mt-2">
Corporations:
<div class="flex flex-wrap items-center mt-2">
<div class="flex items-center mb-2 me-2" v-for="(entry, index) in selected.corporations" :key="index">
<input class="me-1" type="text" v-model="entry.ref" />
<span class="me-1">:</span>
<input class="me-1 w-32" type="number" v-model.number="entry.corporationId" placeholder="Corporation ID" />
<CorporationLabel class="me-1" :corporation-id="entry.corporationId" :corporation="resolvedCorporation(entry.corporationId).value" :size="16" v-if="entry.corporationId" />
<button class="btn-icon text-amber-700 hover:text-amber-600" @click="removeCorporationScope(index)"><TrashIcon /></button>
</div>
<div class="flex items-center mb-2">
<button class="btn-icon" @click="addCorporationScope"><PlusIcon /></button>
</div>
</div>
</div>
<div class="ms-4 mt-2 mb-2">
Wallet Divisions:
<div class="flex flex-wrap items-center mt-2">
<div class="flex items-center mb-2 me-2" v-for="(entry, index) in selected.walletDivisions" :key="index">
<input class="me-1" type="text" v-model="entry.ref" />
<span class="me-1">:</span>
<input class="me-1 w-32" type="number" v-model.number="entry.corporationId" placeholder="Corporation ID" />
<input class="me-1 w-16" type="number" min="1" max="7" v-model.number="entry.division" placeholder="Division" />
<CorporationLabel class="me-1" :corporation-id="entry.corporationId" :corporation="resolvedCorporation(entry.corporationId).value" :division="entry.division" :size="16" v-if="entry.corporationId" />
<button class="btn-icon text-amber-700 hover:text-amber-600" @click="removeWalletDivisionScope(index)"><TrashIcon /></button>
</div>
<div class="flex items-center mb-2">
<button class="btn-icon" @click="addWalletDivisionScope"><PlusIcon /></button>
</div>
</div>
</div>
</div>
<div class="flex flex-col grow min-h-0 border-b-1">
Script:
<ScriptEditor class="mt-2 mb-2" v-model="script" :ledgerRefs="ledgerRefs" />
<ScriptEditor class="mt-2 mb-2" v-model="scriptText" :scope="editorScope" />
</div>
</div>
<div class="mt-2 justify-end flex">
<div v-else class="flex grow items-center justify-center text-neutral-500">
No scripts yet
</div>
<div class="mt-2 justify-end flex" v-if="selected">
<div>
<button @click="save">Save</button>
</div>
+27 -13
View File
@@ -22,27 +22,41 @@ const loadScriptDefinitions = async () => {
}
try {
const definitions = await fetchScriptDefinitions();
monaco.typescript.javascriptDefaults.addExtraLib(definitions, 'ts:rule-runner.d.ts');
monaco.typescript.javascriptDefaults.addExtraLib(definitions, 'file:///node_modules/@eveal/runtime/index.d.ts');
extraLibLoaded = true;
} catch {
// type definitions are optional — the editor still works without autocomplete
}
};
const props = defineProps<{ ledgerRefs?: string[] }>();
export interface ScriptEditorScope {
ledgers?: string[];
characters?: string[];
corporations?: string[];
walletDivisions?: string[];
}
let ledgersLib: monaco.IDisposable | undefined;
const props = defineProps<{ scope?: ScriptEditorScope }>();
const updateLedgerRefs = (refs: readonly string[]) => {
ledgersLib?.dispose();
let scopeLib: monaco.IDisposable | undefined;
const declareInterface = (name: string, type: string, refs: readonly string[]) => {
const members = refs
.filter(ref => ref && ref !== 'system')
.map(ref => ` readonly ${JSON.stringify(ref)}: Ledger;`)
.map(ref => ` readonly ${JSON.stringify(ref)}: ${type};`)
.join('\n');
ledgersLib = monaco.typescript.javascriptDefaults.addExtraLib(
`declare interface Ledgers {\n${members}\n}\n`,
'ts:rule-runner.ledgers.d.ts'
);
return ` interface ${name} {\n${members}\n }\n`;
};
const updateScope = (scope: ScriptEditorScope) => {
scopeLib?.dispose();
const source = `declare module '@eveal/runtime' {\n${[
declareInterface('Ledgers', 'Ledger', scope.ledgers ?? []),
declareInterface('Characters', 'Character', scope.characters ?? []),
declareInterface('Corporations', 'Corporation', scope.corporations ?? []),
declareInterface('WalletDivisions', 'WalletDivision', scope.walletDivisions ?? []),
].join('\n')}}\n`;
scopeLib = monaco.typescript.javascriptDefaults.addExtraLib(source, 'ts:rule-runner.scope.d.ts');
};
const model = defineModel<string>({default: ''});
@@ -51,7 +65,7 @@ let editor: monaco.editor.IStandaloneCodeEditor | undefined;
onMounted(async () => {
await loadScriptDefinitions();
updateLedgerRefs(props.ledgerRefs ?? []);
updateScope(props.scope ?? {});
if (!container.value) {
return;
@@ -83,11 +97,11 @@ watch(model, value => {
}
});
watch(() => props.ledgerRefs, refs => updateLedgerRefs(refs ?? []), {deep: true});
watch(() => props.scope, scope => updateScope(scope ?? {}), {deep: true});
onBeforeUnmount(() => {
editor?.dispose();
ledgersLib?.dispose();
scopeLib?.dispose();
});
</script>
+16 -3
View File
@@ -1,10 +1,19 @@
import {ruleBookApi, ruleScriptApi} from "@/mammon";
import {RuleBookResponse, UpdateRuleBookRequest} from "@/generated/mammon";
import {RuleBookResponse, RuleScopeRequest, RuleScriptRequest, RuleScriptResponse, UpdateRuleBookRequest} from "@/generated/mammon";
import {isAxiosError} from "axios";
import {defineStore} from "pinia";
import {ref} from "vue";
export type RuleBook = RuleBookResponse;
export type RuleScript = RuleScriptResponse;
export type RuleScope = RuleScriptResponse['scope'];
export const emptyScope = (): RuleScopeRequest => ({
ledgers: {},
characters: {},
corporations: {},
walletDivisions: {},
});
export const useRuleBookStore = defineStore('rule-book', () => {
const ruleBook = ref<RuleBook | null>(null);
@@ -19,7 +28,7 @@ export const useRuleBookStore = defineStore('rule-book', () => {
throw error;
});
const update = (request: UpdateRuleBookRequest) => ruleBookApi.updateRuleBook(request)
const update = (scripts: RuleScriptRequest[]) => ruleBookApi.updateRuleBook({scripts} satisfies UpdateRuleBookRequest)
.then(response => ruleBook.value = response.data);
refresh();
@@ -28,4 +37,8 @@ export const useRuleBookStore = defineStore('rule-book', () => {
})
export const fetchScriptDefinitions = (): Promise<string> =>
ruleScriptApi.getScriptDefinitions({responseType: 'text'}).then(response => response.data);
ruleScriptApi.listScriptDefinitions()
.then(response => Promise.all(
response.data.map(name => ruleScriptApi.getScriptDefinition(name, {responseType: 'text'}).then(r => r.data))
))
.then(definitions => definitions.join('\n'));