Skip to content

Commit ae569b6

Browse files
authored
Use typed KclValue instead of any in sketchFromKclValue (#7144)
* use KclValue instead of any * no need for any in sketchFromKclValueOptional * simplify error reason for sketchFromKclValueOptional
1 parent 0a0e6ab commit ae569b6

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

src/lang/wasm.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,31 +361,24 @@ function rustArtifactGraphToMap(
361361
return map
362362
}
363363

364-
// TODO: In the future, make the parameter be a KclValue.
365364
export function sketchFromKclValueOptional(
366-
obj: any,
365+
obj: KclValue | undefined,
367366
varName: string | null
368367
): Sketch | Reason {
369-
if (obj?.value?.type === 'Sketch') return obj.value
370-
if (obj?.value?.type === 'Solid') return obj.value.sketch
371368
if (obj?.type === 'Sketch') return obj.value
372369
if (obj?.type === 'Solid') return obj.value.sketch
373370
if (!varName) {
374371
varName = 'a KCL value'
375372
}
376-
const actualType = obj?.value?.type ?? obj?.type
377-
if (actualType) {
378-
return new Reason(
379-
`Expected ${varName} to be a sketch or solid, but it was ${actualType} instead.`
380-
)
381-
} else {
382-
return new Reason(`Expected ${varName} to be a sketch, but it wasn't.`)
383-
}
373+
374+
const actualType = obj?.type ?? 'unknown'
375+
return new Reason(
376+
`Expected ${varName} to be a sketch or solid, but it was ${actualType} instead.`
377+
)
384378
}
385379

386-
// TODO: In the future, make the parameter be a KclValue.
387380
export function sketchFromKclValue(
388-
obj: any,
381+
obj: KclValue | undefined,
389382
varName: string | null
390383
): Sketch | Error {
391384
const result = sketchFromKclValueOptional(obj, varName)

0 commit comments

Comments
 (0)