* Add Rust side artifacts for startSketchOn face or plane * Add Rust-generated artifacts to ExecOutcome * Add output of artifact commands * Add new output files * Wire the artifact commands to the artifact graph creation * Fix to use real PartialEq implemented in modeling commands * Fix modeling commands with zero fields to work * Fix missing artifactCommands field in errors * Change artifact graph to be built from artifact commands * Wire up ExecState artifacts, but not using them yet Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch> * Remove unneeded local var * Fix test to fail with a helpful error message when command isn't found * Rename and deprecate orderedCommands * Update comment about borrowing * Move ArtifactCommand tracking to the EngineManager trait * Update artifact commands since tracking in the engine * Upgrade kittycad-modeling-cmds from 0.2.85 to 0.2.86 * Remove unneeded JsonSchema derive to speed up build * Fix to not fail on floating point differences in CI * Update artifact commands output since truncating floating point numbers * Fix to ensure artifact commands get cleared after a clear scene * Update artifact commands snapshot after clearing them on clear scene * Remove all remnants of OrderedCommands * Update output for new simulation tests --------- Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>
240 lines
6.2 KiB
TypeScript
240 lines
6.2 KiB
TypeScript
import { KclError as RustKclError } from '../wasm-lib/kcl/bindings/KclError'
|
|
import { CompilationError } from 'wasm-lib/kcl/bindings/CompilationError'
|
|
import { Diagnostic as CodeMirrorDiagnostic } from '@codemirror/lint'
|
|
import { posToOffset } from '@kittycad/codemirror-lsp-client'
|
|
import { Diagnostic as LspDiagnostic } from 'vscode-languageserver-protocol'
|
|
import { Text } from '@codemirror/state'
|
|
import { EditorView } from 'codemirror'
|
|
import { ArtifactCommand, SourceRange } from 'lang/wasm'
|
|
import { Operation } from 'wasm-lib/kcl/bindings/Operation'
|
|
|
|
type ExtractKind<T> = T extends { kind: infer K } ? K : never
|
|
export class KCLError extends Error {
|
|
kind: ExtractKind<RustKclError> | 'name'
|
|
sourceRange: SourceRange
|
|
msg: string
|
|
operations: Operation[]
|
|
artifactCommands: ArtifactCommand[]
|
|
|
|
constructor(
|
|
kind: ExtractKind<RustKclError> | 'name',
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super()
|
|
this.kind = kind
|
|
this.msg = msg
|
|
this.sourceRange = sourceRange
|
|
this.operations = operations
|
|
this.artifactCommands = artifactCommands
|
|
Object.setPrototypeOf(this, KCLError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLLexicalError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('lexical', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLSyntaxError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLInternalError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('internal', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLSyntaxError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLSyntaxError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('syntax', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLSyntaxError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLSemanticError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('semantic', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLSemanticError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLTypeError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('type', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLTypeError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLUnimplementedError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('unimplemented', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLUnimplementedError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLUnexpectedError extends KCLError {
|
|
constructor(
|
|
msg: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super('unexpected', msg, sourceRange, operations, artifactCommands)
|
|
Object.setPrototypeOf(this, KCLUnexpectedError.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLValueAlreadyDefined extends KCLError {
|
|
constructor(
|
|
key: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super(
|
|
'name',
|
|
`Key ${key} was already defined elsewhere`,
|
|
sourceRange,
|
|
operations,
|
|
artifactCommands
|
|
)
|
|
Object.setPrototypeOf(this, KCLValueAlreadyDefined.prototype)
|
|
}
|
|
}
|
|
|
|
export class KCLUndefinedValueError extends KCLError {
|
|
constructor(
|
|
key: string,
|
|
sourceRange: SourceRange,
|
|
operations: Operation[],
|
|
artifactCommands: ArtifactCommand[]
|
|
) {
|
|
super(
|
|
'name',
|
|
`Key ${key} has not been defined`,
|
|
sourceRange,
|
|
operations,
|
|
artifactCommands
|
|
)
|
|
Object.setPrototypeOf(this, KCLUndefinedValueError.prototype)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Maps the lsp diagnostic to an array of KclErrors.
|
|
* Currently the diagnostics are all errors, but in the future they could include lints.
|
|
* */
|
|
export function lspDiagnosticsToKclErrors(
|
|
doc: Text,
|
|
diagnostics: LspDiagnostic[]
|
|
): KCLError[] {
|
|
return diagnostics
|
|
.flatMap(
|
|
({ range, message }) =>
|
|
new KCLError(
|
|
'unexpected',
|
|
message,
|
|
[posToOffset(doc, range.start)!, posToOffset(doc, range.end)!, true],
|
|
[],
|
|
[]
|
|
)
|
|
)
|
|
.sort((a, b) => {
|
|
const c = a.sourceRange[0]
|
|
const d = b.sourceRange[0]
|
|
switch (true) {
|
|
case c < d:
|
|
return -1
|
|
case c > d:
|
|
return 1
|
|
}
|
|
return 0
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Maps the KCL errors to an array of CodeMirror diagnostics.
|
|
* Currently the diagnostics are all errors, but in the future they could include lints.
|
|
* */
|
|
export function kclErrorsToDiagnostics(
|
|
errors: KCLError[]
|
|
): CodeMirrorDiagnostic[] {
|
|
return errors
|
|
?.filter((err) => err.sourceRange[2])
|
|
.map((err) => {
|
|
return {
|
|
from: err.sourceRange[0],
|
|
to: err.sourceRange[1],
|
|
message: err.msg,
|
|
severity: 'error',
|
|
}
|
|
})
|
|
}
|
|
|
|
export function complilationErrorsToDiagnostics(
|
|
errors: CompilationError[]
|
|
): CodeMirrorDiagnostic[] {
|
|
return errors
|
|
?.filter((err) => err.sourceRange[2] === 0)
|
|
.map((err) => {
|
|
let severity: any = 'error'
|
|
if (err.severity === 'Warning') {
|
|
severity = 'warning'
|
|
}
|
|
let actions
|
|
const suggestion = err.suggestion
|
|
if (suggestion) {
|
|
actions = [
|
|
{
|
|
name: suggestion.title,
|
|
apply: (view: EditorView, from: number, to: number) => {
|
|
view.dispatch({
|
|
changes: { from, to, insert: suggestion.insert },
|
|
})
|
|
},
|
|
},
|
|
]
|
|
}
|
|
return {
|
|
from: err.sourceRange[0],
|
|
to: err.sourceRange[1],
|
|
message: err.message,
|
|
severity,
|
|
actions,
|
|
}
|
|
})
|
|
}
|