@oml/language 0.9.0 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/oml/oml-candidates.d.ts +17 -7
- package/out/oml/oml-candidates.js +121 -19
- package/out/oml/oml-candidates.js.map +1 -1
- package/out/oml/oml-completion.js +2 -1
- package/out/oml/oml-completion.js.map +1 -1
- package/out/oml/oml-document.d.ts +4 -4
- package/out/oml/oml-document.js +42 -7
- package/out/oml/oml-document.js.map +1 -1
- package/out/oml/oml-edit.d.ts +12 -0
- package/out/oml/oml-edit.js +190 -40
- package/out/oml/oml-edit.js.map +1 -1
- package/out/oml/oml-index.d.ts +25 -6
- package/out/oml/oml-index.js +296 -43
- package/out/oml/oml-index.js.map +1 -1
- package/out/oml/oml-rename.js +19 -1
- package/out/oml/oml-rename.js.map +1 -1
- package/out/oml/oml-utils.js +1 -0
- package/out/oml/oml-utils.js.map +1 -1
- package/package.json +1 -1
- package/src/oml/oml-candidates.ts +146 -21
- package/src/oml/oml-completion.ts +2 -1
- package/src/oml/oml-document.ts +49 -9
- package/src/oml/oml-edit.ts +200 -39
- package/src/oml/oml-index.ts +320 -44
- package/src/oml/oml-rename.ts +21 -1
- package/src/oml/oml-utils.ts +1 -0
- package/out/oml/oml-index-manager.d.ts +0 -10
- package/out/oml/oml-index-manager.js +0 -48
- package/out/oml/oml-index-manager.js.map +0 -1
- package/src/oml/oml-index-manager.ts +0 -56
|
@@ -1,25 +1,35 @@
|
|
|
1
1
|
import { type AstNodeDescription, type AstNodeLocator, type IndexManager, type LangiumDocuments, type Stream } from 'langium';
|
|
2
|
-
|
|
3
|
-
export
|
|
4
|
-
|
|
2
|
+
import { type OmlIndex } from './oml-index.js';
|
|
3
|
+
export declare const OmlCompletionRequest = "oml/completion";
|
|
4
|
+
export interface OmlCompletionParams {
|
|
5
|
+
instanceIri?: string;
|
|
6
|
+
propertyIri?: string;
|
|
7
|
+
typeIri?: string;
|
|
5
8
|
}
|
|
6
|
-
export interface
|
|
9
|
+
export interface OmlCompletionResult {
|
|
7
10
|
candidates: string[];
|
|
8
11
|
}
|
|
9
12
|
type ConnectionLike = {
|
|
10
|
-
onRequest: (type: string, handler: (params:
|
|
13
|
+
onRequest: (type: string, handler: (params: OmlCompletionParams) => OmlCompletionResult | Promise<OmlCompletionResult>) => void;
|
|
11
14
|
};
|
|
12
15
|
export declare class OmlCandidates {
|
|
16
|
+
private readonly ontologyIndex;
|
|
13
17
|
private readonly indexManager;
|
|
14
18
|
private readonly langiumDocuments;
|
|
15
19
|
private readonly astNodeLocator;
|
|
16
20
|
private readonly referenceCandidatesCache;
|
|
17
|
-
|
|
18
|
-
constructor(indexManager: IndexManager, langiumDocuments: LangiumDocuments, astNodeLocator: AstNodeLocator);
|
|
21
|
+
constructor(ontologyIndex: OmlIndex, indexManager: IndexManager, langiumDocuments: LangiumDocuments, astNodeLocator: AstNodeLocator);
|
|
19
22
|
getReferenceCandidates(referenceType: string, linkable: Stream<AstNodeDescription>): Stream<AstNodeDescription>;
|
|
20
23
|
getWorkspaceCandidateIris(referenceType: string): string[];
|
|
24
|
+
getCompletionCandidateIris(params: OmlCompletionParams): string[];
|
|
21
25
|
private getWorkspaceCandidates;
|
|
22
26
|
private resolveNodeIri;
|
|
27
|
+
private normalizeIri;
|
|
28
|
+
private resolveTypeNodeByIri;
|
|
29
|
+
private resolveNamedInstanceReferenceIri;
|
|
30
|
+
private serializeLiteralCandidate;
|
|
31
|
+
private serializeQuotedLiteralCandidate;
|
|
32
|
+
private serializeStringLiteral;
|
|
23
33
|
private resolveDescriptionNode;
|
|
24
34
|
private pruneCache;
|
|
25
35
|
}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
// Copyright (c) 2026 Modelware. All rights reserved.
|
|
2
2
|
import { URI, stream } from 'langium';
|
|
3
|
-
import { isConceptInstance, isMember, isRelationInstance } from './generated/ast.js';
|
|
3
|
+
import { isAspect, isBooleanLiteral, isConcept, isConceptInstance, isDecimalLiteral, isDoubleLiteral, isIntegerLiteral, isMember, isQuotedLiteral, isRelationEntity, isRelationInstance, isScalar, } from './generated/ast.js';
|
|
4
|
+
import { getOntologyModelIndex } from './oml-index.js';
|
|
4
5
|
import { getIriForNode, getWorkspaceSnapshot } from './oml-utils.js';
|
|
5
|
-
export const
|
|
6
|
+
export const OmlCompletionRequest = 'oml/completion';
|
|
6
7
|
const MaxReferenceTypeCaches = 64;
|
|
7
8
|
const workspacePreloadState = new WeakMap();
|
|
8
9
|
export class OmlCandidates {
|
|
9
|
-
constructor(indexManager, langiumDocuments, astNodeLocator) {
|
|
10
|
+
constructor(ontologyIndex, indexManager, langiumDocuments, astNodeLocator) {
|
|
11
|
+
this.ontologyIndex = ontologyIndex;
|
|
10
12
|
this.indexManager = indexManager;
|
|
11
13
|
this.langiumDocuments = langiumDocuments;
|
|
12
14
|
this.astNodeLocator = astNodeLocator;
|
|
13
15
|
this.referenceCandidatesCache = new Map();
|
|
14
|
-
this.workspaceCandidateIrisCache = new Map();
|
|
15
16
|
}
|
|
16
17
|
getReferenceCandidates(referenceType, linkable) {
|
|
17
18
|
const workspace = stream(this.getWorkspaceCandidates(referenceType));
|
|
@@ -22,12 +23,7 @@ export class OmlCandidates {
|
|
|
22
23
|
if (!normalizedReferenceType) {
|
|
23
24
|
return [];
|
|
24
25
|
}
|
|
25
|
-
const
|
|
26
|
-
const cached = this.workspaceCandidateIrisCache.get(normalizedReferenceType);
|
|
27
|
-
if (cached && cached.snapshot === snapshot) {
|
|
28
|
-
return cached.candidates;
|
|
29
|
-
}
|
|
30
|
-
const workspace = this.getWorkspaceCandidates(normalizedReferenceType);
|
|
26
|
+
const workspace = this.indexManager.allElements(normalizedReferenceType).toArray();
|
|
31
27
|
const iris = [];
|
|
32
28
|
for (const description of workspace) {
|
|
33
29
|
const node = this.resolveDescriptionNode(description);
|
|
@@ -36,10 +32,38 @@ export class OmlCandidates {
|
|
|
36
32
|
iris.push(iri);
|
|
37
33
|
}
|
|
38
34
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
35
|
+
return [...new Set(iris)];
|
|
36
|
+
}
|
|
37
|
+
getCompletionCandidateIris(params) {
|
|
38
|
+
const typeIri = (params.typeIri ?? '').trim();
|
|
39
|
+
if (!typeIri) {
|
|
40
|
+
return [];
|
|
41
|
+
}
|
|
42
|
+
const typeNode = this.resolveTypeNodeByIri(typeIri);
|
|
43
|
+
if (!typeNode) {
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
if (isScalar(typeNode)) {
|
|
47
|
+
const literals = typeNode.ownedEnumeration?.literals ?? [];
|
|
48
|
+
const values = literals
|
|
49
|
+
.map((literal) => this.serializeLiteralCandidate(literal))
|
|
50
|
+
.filter((value) => typeof value === 'string' && value.length > 0);
|
|
51
|
+
return [...new Set(values)];
|
|
52
|
+
}
|
|
53
|
+
if (isConcept(typeNode)) {
|
|
54
|
+
const enumeration = typeNode.ownedEnumeration;
|
|
55
|
+
if (enumeration?.instances?.length) {
|
|
56
|
+
const values = enumeration.instances
|
|
57
|
+
.map((reference) => this.resolveNamedInstanceReferenceIri(reference))
|
|
58
|
+
.filter((value) => typeof value === 'string' && value.length > 0);
|
|
59
|
+
return [...new Set(values)];
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (isAspect(typeNode) || isConcept(typeNode) || isRelationEntity(typeNode)) {
|
|
63
|
+
const iris = this.ontologyIndex.getTypeMemberIris(typeIri);
|
|
64
|
+
return iris;
|
|
65
|
+
}
|
|
66
|
+
return [];
|
|
43
67
|
}
|
|
44
68
|
getWorkspaceCandidates(referenceType) {
|
|
45
69
|
const snapshot = getWorkspaceSnapshot(this.langiumDocuments);
|
|
@@ -67,6 +91,83 @@ export class OmlCandidates {
|
|
|
67
91
|
}
|
|
68
92
|
return undefined;
|
|
69
93
|
}
|
|
94
|
+
normalizeIri(iri) {
|
|
95
|
+
return iri.replace(/^<|>$/g, '').trim();
|
|
96
|
+
}
|
|
97
|
+
resolveTypeNodeByIri(typeIri) {
|
|
98
|
+
const normalized = this.normalizeIri(typeIri);
|
|
99
|
+
if (!normalized) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
for (const referenceType of ['Scalar', 'Concept', 'Aspect', 'RelationEntity']) {
|
|
103
|
+
for (const description of this.indexManager.allElements(referenceType).toArray()) {
|
|
104
|
+
const node = this.resolveDescriptionNode(description);
|
|
105
|
+
const iri = this.normalizeIri(getIriForNode(node) ?? '');
|
|
106
|
+
if (iri === normalized) {
|
|
107
|
+
return node;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return undefined;
|
|
112
|
+
}
|
|
113
|
+
resolveNamedInstanceReferenceIri(reference) {
|
|
114
|
+
const resolved = reference?.ref;
|
|
115
|
+
const resolvedIri = resolved ? this.normalizeIri(getIriForNode(resolved) ?? '') : '';
|
|
116
|
+
if (resolvedIri) {
|
|
117
|
+
return resolvedIri;
|
|
118
|
+
}
|
|
119
|
+
const refText = reference?.$refText;
|
|
120
|
+
if (typeof refText === 'string' && refText.trim().length > 0) {
|
|
121
|
+
return this.normalizeIri(refText);
|
|
122
|
+
}
|
|
123
|
+
return undefined;
|
|
124
|
+
}
|
|
125
|
+
serializeLiteralCandidate(literal) {
|
|
126
|
+
if (isQuotedLiteral(literal)) {
|
|
127
|
+
return this.serializeQuotedLiteralCandidate(literal);
|
|
128
|
+
}
|
|
129
|
+
if (isBooleanLiteral(literal)) {
|
|
130
|
+
return literal.value ? 'true' : 'false';
|
|
131
|
+
}
|
|
132
|
+
if (isIntegerLiteral(literal) || isDecimalLiteral(literal) || isDoubleLiteral(literal)) {
|
|
133
|
+
return `${literal.value}`;
|
|
134
|
+
}
|
|
135
|
+
return '';
|
|
136
|
+
}
|
|
137
|
+
serializeQuotedLiteralCandidate(literal) {
|
|
138
|
+
const base = this.serializeStringLiteral(literal.value ?? '');
|
|
139
|
+
if (literal.type?.ref) {
|
|
140
|
+
const datatypeIri = this.normalizeIri(getIriForNode(literal.type.ref) ?? literal.type.$refText ?? '');
|
|
141
|
+
if (datatypeIri) {
|
|
142
|
+
return `${base}^^${datatypeIri}`;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (typeof literal.langTag === 'string' && literal.langTag.trim().length > 0) {
|
|
146
|
+
return `${base}$${literal.langTag.trim()}`;
|
|
147
|
+
}
|
|
148
|
+
return base;
|
|
149
|
+
}
|
|
150
|
+
serializeStringLiteral(value) {
|
|
151
|
+
const raw = value ?? '';
|
|
152
|
+
if (raw.includes('\n') || raw.includes('\r')) {
|
|
153
|
+
if (!raw.includes('"""')) {
|
|
154
|
+
return `"""${raw}"""`;
|
|
155
|
+
}
|
|
156
|
+
if (!raw.includes("'''")) {
|
|
157
|
+
return `'''${raw}'''`;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (!raw.includes('"')) {
|
|
161
|
+
return `"${raw}"`;
|
|
162
|
+
}
|
|
163
|
+
if (!raw.includes("'")) {
|
|
164
|
+
return `'${raw}'`;
|
|
165
|
+
}
|
|
166
|
+
if (!raw.includes('"""')) {
|
|
167
|
+
return `"""${raw}"""`;
|
|
168
|
+
}
|
|
169
|
+
return `'''${raw}'''`;
|
|
170
|
+
}
|
|
70
171
|
resolveDescriptionNode(description) {
|
|
71
172
|
if (description.node) {
|
|
72
173
|
return description.node;
|
|
@@ -94,14 +195,15 @@ export class OmlCandidates {
|
|
|
94
195
|
}
|
|
95
196
|
}
|
|
96
197
|
export function registerOmlCandidatesRequests(connection, shared) {
|
|
97
|
-
const
|
|
98
|
-
|
|
198
|
+
const ontologyIndex = getOntologyModelIndex(shared);
|
|
199
|
+
const candidates = new OmlCandidates(ontologyIndex, shared.workspace.IndexManager, shared.workspace.LangiumDocuments, shared.workspace.AstNodeLocator);
|
|
200
|
+
connection.onRequest(OmlCompletionRequest, async (params) => {
|
|
99
201
|
await ensureWorkspaceIndexed(shared);
|
|
100
|
-
const
|
|
101
|
-
if (!
|
|
202
|
+
const typeIri = (params?.typeIri ?? '').trim();
|
|
203
|
+
if (!typeIri) {
|
|
102
204
|
return { candidates: [] };
|
|
103
205
|
}
|
|
104
|
-
return { candidates: candidates.
|
|
206
|
+
return { candidates: candidates.getCompletionCandidateIris(params) };
|
|
105
207
|
});
|
|
106
208
|
}
|
|
107
209
|
async function ensureWorkspaceIndexed(shared) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oml-candidates.js","sourceRoot":"","sources":["../../src/oml/oml-candidates.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAuG,MAAM,SAAS,CAAC;AAC3I,OAAO,
|
|
1
|
+
{"version":3,"file":"oml-candidates.js","sourceRoot":"","sources":["../../src/oml/oml-candidates.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAuG,MAAM,SAAS,CAAC;AAC3I,OAAO,EACH,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,QAAQ,GACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAiB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAYrD,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAClC,MAAM,qBAAqB,GAAG,IAAI,OAAO,EAA2D,CAAC;AAMrG,MAAM,OAAO,aAAa;IAGtB,YACqB,aAAuB,EACvB,YAA0B,EAC1B,gBAAkC,EAClC,cAA8B;QAH9B,kBAAa,GAAb,aAAa,CAAU;QACvB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QANlC,6BAAwB,GAAG,IAAI,GAAG,EAAkE,CAAC;IAOnH,CAAC;IAEJ,sBAAsB,CAAC,aAAqB,EAAE,QAAoC;QAC9E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;IAED,yBAAyB,CAAC,aAAqB;QAC3C,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACrD,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC,OAAO,EAAE,CAAC;QACnF,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,KAAK,MAAM,WAAW,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YACtD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,GAAG,EAAE,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,0BAA0B,CAAC,MAA2B;QAClD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,EAAE,QAAQ,IAAI,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,QAAQ;iBAClB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;iBACzD,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC;YAC9C,IAAI,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS;qBAC/B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC;qBACpE,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACvF,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,aAAqB;QAChD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAChE,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACzC,OAAO,MAAM,CAAC,UAAU,CAAC;QAC7B,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1E,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAwB,EAAE,sBAAsB,CAAC,CAAC;QACvE,OAAO,UAAU,CAAC;IACtB,CAAC;IAEO,cAAc,CAAC,IAAa;QAChC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,GAAG,EAAE,CAAC;gBACN,OAAO,GAAG,CAAC;YACf,CAAC;QACL,CAAC;QACD,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC;YACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,YAAY,CAAC,GAAW;QAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IAEO,oBAAoB,CAAC,OAAe;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,KAAK,MAAM,aAAa,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;YAC5E,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;gBACtD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzD,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;oBACrB,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,gCAAgC,CAAC,SAAc;QACnD,MAAM,QAAQ,GAAG,SAAS,EAAE,GAAG,CAAC;QAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrF,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,EAAE,QAAQ,CAAC;QACpC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,yBAAyB,CAAC,OAAY;QAC1C,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC5C,CAAC;QACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YACrF,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,+BAA+B,CAAC,OAAY;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAC9D,IAAI,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YACtG,IAAI,WAAW,EAAE,CAAC;gBACd,OAAO,GAAG,IAAI,KAAK,WAAW,EAAE,CAAC;YACrC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3E,OAAO,GAAG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,sBAAsB,CAAC,KAAa;QACxC,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE,CAAC;QACxB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO,MAAM,GAAG,KAAK,CAAC;YAC1B,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO,MAAM,GAAG,KAAK,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,IAAI,GAAG,GAAG,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,IAAI,GAAG,GAAG,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,MAAM,GAAG,KAAK,CAAC;QAC1B,CAAC;QACD,OAAO,MAAM,GAAG,KAAK,CAAC;IAC1B,CAAC;IAEO,sBAAsB,CAAC,WAA+B;QAC1D,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,WAAW,CAAC,IAAI,CAAC;QAC5B,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC;QAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAEO,UAAU,CAAI,KAAqB,EAAE,OAAe;QACxD,IAAI,KAAK,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,MAAM;YACV,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,6BAA6B,CAAC,UAA0B,EAAE,MAAW;IACjF,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,aAAa,CAChC,aAAa,EACb,MAAM,CAAC,SAAS,CAAC,YAAY,EAC7B,MAAM,CAAC,SAAS,CAAC,gBAAgB,EACjC,MAAM,CAAC,SAAS,CAAC,cAAc,CAClC,CAAC;IACF,UAAU,CAAC,SAAS,CAAC,oBAAoB,EAAE,KAAK,EAAE,MAA2B,EAAgC,EAAE;QAC3G,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAAW;IAC7C,MAAM,GAAG,GAAG,MAAgB,CAAC;IAC7B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,QAAQ,EAAE,SAAS,EAAE,CAAC;QACtB,OAAO;IACX,CAAC;IACD,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,QAAQ,CAAC,OAAO,CAAC;QACvB,OAAO;IACX,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC;QACjD,MAAM,SAAS,CAAC,KAAK,CAAC;QACtB,MAAM,UAAU,GAAG,SAAS,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACpE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAClC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1B,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAC3E,CAAC;YACF,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;IAC3B,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACd,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,MAAM,OAAO,CAAC;AAClB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright (c) 2026 Modelware. All rights reserved.
|
|
2
2
|
import { DefaultCompletionProvider } from 'langium/lsp';
|
|
3
3
|
import { isDescription, isDescriptionBox, isMember, isOntology, isVocabulary, isVocabularyBundle } from './generated/ast.js';
|
|
4
|
+
import { getOntologyModelIndex } from './oml-index.js';
|
|
4
5
|
import { getLangiumDocumentVersion } from './oml-utils.js';
|
|
5
6
|
import { OmlCandidates } from './oml-candidates.js';
|
|
6
7
|
/**
|
|
@@ -14,7 +15,7 @@ export class OmlCompletionProvider extends DefaultCompletionProvider {
|
|
|
14
15
|
this.indexManager = services.shared.workspace.IndexManager;
|
|
15
16
|
this.langiumDocuments = services.shared.workspace.LangiumDocuments;
|
|
16
17
|
this.astNodeLocator = services.workspace.AstNodeLocator;
|
|
17
|
-
this.candidates = new OmlCandidates(this.indexManager, this.langiumDocuments, this.astNodeLocator);
|
|
18
|
+
this.candidates = new OmlCandidates(getOntologyModelIndex(services.shared), this.indexManager, this.langiumDocuments, this.astNodeLocator);
|
|
18
19
|
}
|
|
19
20
|
/**
|
|
20
21
|
* Get reference candidates - include both local definitions and imported IRIs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oml-completion.js","sourceRoot":"","sources":["../../src/oml/oml-completion.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAIrD,OAAO,EAAE,yBAAyB,EAA0E,MAAM,aAAa,CAAC;AAChI,OAAO,EAAW,aAAa,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,kBAAkB,EAAoB,MAAM,oBAAoB,CAAC;AACxJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASpD;;;GAGG;AACH,MAAM,OAAO,qBAAsB,SAAQ,yBAAyB;IAShE,YAAY,QAAyB;QACjC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAJH,wBAAmB,GAAG,IAAI,GAAG,EAAyB,CAAC;QAKpE,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;QAC3D,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACnE,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oml-completion.js","sourceRoot":"","sources":["../../src/oml/oml-completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { DefaultDocumentUpdateHandler } from 'langium/lsp';
|
|
2
2
|
import type { LangiumSharedServices } from 'langium/lsp';
|
|
3
|
-
import type
|
|
4
|
-
import type { TextDocument } from 'vscode-languageserver-textdocument';
|
|
3
|
+
import { type DidChangeWatchedFilesParams } from 'vscode-languageserver';
|
|
5
4
|
export declare class OmlDocumentUpdateHandler extends DefaultDocumentUpdateHandler {
|
|
6
|
-
private readonly
|
|
5
|
+
private readonly services;
|
|
7
6
|
constructor(services: LangiumSharedServices);
|
|
8
|
-
|
|
7
|
+
didChangeWatchedFiles(params: DidChangeWatchedFilesParams): void;
|
|
8
|
+
private cleanDeletedOntologyDocuments;
|
|
9
9
|
}
|
package/out/oml/oml-document.js
CHANGED
|
@@ -1,18 +1,53 @@
|
|
|
1
1
|
// Copyright (c) 2026 Modelware. All rights reserved.
|
|
2
|
+
import { URI } from 'langium';
|
|
2
3
|
import { DefaultDocumentUpdateHandler } from 'langium/lsp';
|
|
4
|
+
import { FileChangeType } from 'vscode-languageserver';
|
|
5
|
+
import { getOntologyModelIndex } from './oml-index.js';
|
|
3
6
|
export class OmlDocumentUpdateHandler extends DefaultDocumentUpdateHandler {
|
|
4
7
|
constructor(services) {
|
|
5
8
|
super(services);
|
|
6
|
-
this.
|
|
9
|
+
this.services = services;
|
|
7
10
|
}
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
didChangeWatchedFiles(params) {
|
|
12
|
+
this.cleanDeletedOntologyDocuments(params);
|
|
13
|
+
super.didChangeWatchedFiles(params);
|
|
14
|
+
}
|
|
15
|
+
cleanDeletedOntologyDocuments(params) {
|
|
16
|
+
const deletedUris = new Set(params.changes
|
|
17
|
+
.filter((change) => change.type === FileChangeType.Deleted)
|
|
18
|
+
.map((change) => change.uri));
|
|
19
|
+
if (deletedUris.size === 0) {
|
|
12
20
|
return;
|
|
13
21
|
}
|
|
14
|
-
this.
|
|
15
|
-
|
|
22
|
+
const ontologyIndex = getOntologyModelIndex(this.services);
|
|
23
|
+
const documents = this.services.workspace.LangiumDocuments.all.toArray();
|
|
24
|
+
for (const document of documents) {
|
|
25
|
+
if (!matchesDeletedUri(document.uri.toString(), deletedUris)) {
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
ontologyIndex.removeDocument(document);
|
|
29
|
+
const language = this.services.ServiceRegistry.getServices(document.uri);
|
|
30
|
+
language?.reasoning?.ReasoningService?.onDocumentDeleted?.(document);
|
|
31
|
+
}
|
|
16
32
|
}
|
|
17
33
|
}
|
|
34
|
+
function matchesDeletedUri(candidateUri, deletedUris) {
|
|
35
|
+
for (const deletedUri of deletedUris) {
|
|
36
|
+
const deleted = URI.parse(deletedUri);
|
|
37
|
+
const candidate = URI.parse(candidateUri);
|
|
38
|
+
if (candidate.scheme !== deleted.scheme || (candidate.authority ?? '') !== (deleted.authority ?? '')) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const deletedPath = normalizeUriPath(deleted.path);
|
|
42
|
+
const candidatePath = normalizeUriPath(candidate.path);
|
|
43
|
+
if (candidatePath === deletedPath || candidatePath.startsWith(`${deletedPath}/`)) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
function normalizeUriPath(path) {
|
|
50
|
+
const normalized = path.replace(/\/+$/, '');
|
|
51
|
+
return normalized || '/';
|
|
52
|
+
}
|
|
18
53
|
//# sourceMappingURL=oml-document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oml-document.js","sourceRoot":"","sources":["../../src/oml/oml-document.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"oml-document.js","sourceRoot":"","sources":["../../src/oml/oml-document.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAoC,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,OAAO,wBAAyB,SAAQ,4BAA4B;IAGtE,YAAY,QAA+B;QACvC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAEQ,qBAAqB,CAAC,MAAmC;QAC9D,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;QAC3C,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAEO,6BAA6B,CAAC,MAAmC;QACrE,MAAM,WAAW,GAAG,IAAI,GAAG,CACvB,MAAM,CAAC,OAAO;aACT,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,OAAO,CAAC;aAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CACnC,CAAC;QACF,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAED,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACzE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC;gBAC3D,SAAS;YACb,CAAC;YACD,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAQ,CAAC;YAChF,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;CACJ;AAED,SAAS,iBAAiB,CAAC,YAAoB,EAAE,WAAgC;IAC7E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;YACnG,SAAS;QACb,CAAC;QACD,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,aAAa,KAAK,WAAW,IAAI,aAAa,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,UAAU,IAAI,GAAG,CAAC;AAC7B,CAAC"}
|
package/out/oml/oml-edit.d.ts
CHANGED
|
@@ -29,6 +29,12 @@ type OmlEditOperation = {
|
|
|
29
29
|
subjectIri: string;
|
|
30
30
|
predicateIri: string;
|
|
31
31
|
object: unknown;
|
|
32
|
+
} | {
|
|
33
|
+
kind: 'updateAssertion';
|
|
34
|
+
ontologyIri: string;
|
|
35
|
+
subjectIri: string;
|
|
36
|
+
predicateIri: string;
|
|
37
|
+
object: unknown;
|
|
32
38
|
} | {
|
|
33
39
|
kind: 'removeAssertion';
|
|
34
40
|
ontologyIri: string;
|
|
@@ -41,6 +47,12 @@ type OmlEditOperation = {
|
|
|
41
47
|
subjectIri: string;
|
|
42
48
|
predicateIri: string;
|
|
43
49
|
object: unknown;
|
|
50
|
+
} | {
|
|
51
|
+
kind: 'updateAnnotation';
|
|
52
|
+
ontologyIri: string;
|
|
53
|
+
subjectIri: string;
|
|
54
|
+
predicateIri: string;
|
|
55
|
+
object: unknown;
|
|
44
56
|
} | {
|
|
45
57
|
kind: 'removeAnnotation';
|
|
46
58
|
ontologyIri: string;
|