diff --git a/extensions/ql-vscode/src/model-editor/model-extension-file.schema.json b/extensions/ql-vscode/src/model-editor/model-extension-file.schema.json index da1a62fff..5a19a1222 100644 --- a/extensions/ql-vscode/src/model-editor/model-extension-file.schema.json +++ b/extensions/ql-vscode/src/model-editor/model-extension-file.schema.json @@ -8,45 +8,36 @@ "extensions": { "type": "array", "items": { - "$ref": "#/definitions/ModelExtension" + "type": "object", + "properties": { + "addsTo": { + "type": "object", + "properties": { + "pack": { + "type": "string" + }, + "extensible": { + "type": "string" + } + }, + "required": ["pack", "extensible"] + }, + "data": { + "type": "array", + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/DataTuple" + } + } + } + }, + "required": ["addsTo", "data"] } } }, "required": ["extensions"] }, - "ModelExtension": { - "type": "object", - "properties": { - "addsTo": { - "$ref": "#/definitions/ExtensibleReference" - }, - "data": { - "type": "array", - "items": { - "$ref": "#/definitions/DataRow" - } - } - }, - "required": ["addsTo", "data"] - }, - "ExtensibleReference": { - "type": "object", - "properties": { - "pack": { - "type": "string" - }, - "extensible": { - "type": "string" - } - }, - "required": ["pack", "extensible"] - }, - "DataRow": { - "type": "array", - "items": { - "$ref": "#/definitions/DataTuple" - } - }, "DataTuple": { "type": ["boolean", "number", "string"] } diff --git a/extensions/ql-vscode/src/model-editor/model-extension-file.ts b/extensions/ql-vscode/src/model-editor/model-extension-file.ts index 78a4676c5..7a838483f 100644 --- a/extensions/ql-vscode/src/model-editor/model-extension-file.ts +++ b/extensions/ql-vscode/src/model-editor/model-extension-file.ts @@ -1,13 +1,13 @@ -export type ExtensibleReference = { +type ExtensibleReference = { pack: string; extensible: string; }; export type DataTuple = boolean | number | string; -export type DataRow = DataTuple[]; +type DataRow = DataTuple[]; -export type ModelExtension = { +type ModelExtension = { addsTo: ExtensibleReference; data: DataRow[]; };