Stop throwing in frontend code (#2654)

Return error instead of throw
2024-06-24 11:45:40 -04:00
parent f7196e7eb0
commit f4877cb160
67 changed files with 5127 additions and 4523 deletions
--- a/src/components/Toolbar/setAngleLength.tsx
+++ b/src/components/Toolbar/setAngleLength.tsx
@ -9,6 +9,7 @@ import {
  PathToNodeMap,
  getTransformInfos,
  transformAstSketchLines,
+  TransformInfo,
 } from '../../lang/std/sketchcombos'
 import {
  SetAngleLengthModal,
@ -22,6 +23,7 @@ import {
 import { removeDoubleNegatives } from '../AvailableVarsHelpers'
 import { normaliseAngle } from '../../lib/utils'
 import { kclManager } from 'lib/singletons'
+import { err } from 'lib/trap'

 const getModalInfo = createSetAngleLengthModal(SetAngleLengthModal)

@ -31,19 +33,29 @@ export function angleLengthInfo({
 }: {
  selectionRanges: Selections
  angleOrLength?: 'setLength' | 'setAngle'
-}) {
+}):
+  | {
+      transforms: TransformInfo[]
+      enabled: boolean
+    }
+  | Error {
  const paths = selectionRanges.codeBasedSelections.map(({ range }) =>
    getNodePathFromSourceRange(kclManager.ast, range)
  )
-  const nodes = paths.map(
-    (pathToNode) =>
-      getNodeFromPath<Value>(kclManager.ast, pathToNode, 'CallExpression').node
-  )
-  const isAllTooltips = nodes.every(
-    (node) =>
-      node?.type === 'CallExpression' &&
-      toolTips.includes(node.callee.name as any)
+
+  const nodes = paths.map((pathToNode) =>
+    getNodeFromPath<Value>(kclManager.ast, pathToNode, 'CallExpression')
  )
+  const _err1 = nodes.find(err)
+  if (err(_err1)) return _err1
+
+  const isAllTooltips = nodes.every((meta) => {
+    if (err(meta)) return false
+    return (
+      meta.node?.type === 'CallExpression' &&
+      toolTips.includes(meta.node.callee.name as any)
+    )
+  })

  const transforms = getTransformInfos(
    selectionRanges,
@ -67,88 +79,91 @@ export async function applyConstraintAngleLength({
  modifiedAst: Program
  pathToNodeMap: PathToNodeMap
 }> {
-  const { transforms } = angleLengthInfo({ selectionRanges, angleOrLength })
-  const { valueUsedInTransform } = transformAstSketchLines({
+  const angleLength = angleLengthInfo({ selectionRanges, angleOrLength })
+  if (err(angleLength)) return Promise.reject(angleLength)
+
+  const { transforms } = angleLength
+  const sketched = transformAstSketchLines({
    ast: JSON.parse(JSON.stringify(kclManager.ast)),
    selectionRanges,
    transformInfos: transforms,
    programMemory: kclManager.programMemory,
    referenceSegName: '',
  })
-  try {
-    const isReferencingYAxis =
-      selectionRanges.otherSelections.length === 1 &&
-      selectionRanges.otherSelections[0] === 'y-axis'
-    const isReferencingYAxisAngle =
-      isReferencingYAxis && angleOrLength === 'setAngle'
+  if (err(sketched)) return Promise.reject(sketched)
+  const { valueUsedInTransform } = sketched

-    const isReferencingXAxis =
-      selectionRanges.otherSelections.length === 1 &&
-      selectionRanges.otherSelections[0] === 'x-axis'
-    const isReferencingXAxisAngle =
-      isReferencingXAxis && angleOrLength === 'setAngle'
+  const isReferencingYAxis =
+    selectionRanges.otherSelections.length === 1 &&
+    selectionRanges.otherSelections[0] === 'y-axis'
+  const isReferencingYAxisAngle =
+    isReferencingYAxis && angleOrLength === 'setAngle'

-    let forceVal = valueUsedInTransform || 0
-    let calcIdentifier = createIdentifier('ZERO')
-    if (isReferencingYAxisAngle) {
-      calcIdentifier = createIdentifier(
-        forceVal < 0 ? 'THREE_QUARTER_TURN' : 'QUARTER_TURN'
-      )
-      forceVal = normaliseAngle(forceVal + (forceVal < 0 ? 90 : -90))
-    } else if (isReferencingXAxisAngle) {
-      calcIdentifier = createIdentifier(
-        Math.abs(forceVal) > 90 ? 'HALF_TURN' : 'ZERO'
-      )
-      forceVal =
-        Math.abs(forceVal) > 90 ? normaliseAngle(forceVal - 180) : forceVal
-    }
-    const { valueNode, variableName, newVariableInsertIndex, sign } =
-      await getModalInfo({
-        value: forceVal,
-        valueName: angleOrLength === 'setAngle' ? 'angle' : 'length',
-        shouldCreateVariable: true,
-      })
+  const isReferencingXAxis =
+    selectionRanges.otherSelections.length === 1 &&
+    selectionRanges.otherSelections[0] === 'x-axis'
+  const isReferencingXAxisAngle =
+    isReferencingXAxis && angleOrLength === 'setAngle'

-    let finalValue = removeDoubleNegatives(
-      valueNode as BinaryPart,
-      sign,
-      variableName
+  let forceVal = valueUsedInTransform || 0
+  let calcIdentifier = createIdentifier('ZERO')
+  if (isReferencingYAxisAngle) {
+    calcIdentifier = createIdentifier(
+      forceVal < 0 ? 'THREE_QUARTER_TURN' : 'QUARTER_TURN'
    )
-    if (
-      isReferencingYAxisAngle ||
-      (isReferencingXAxisAngle && calcIdentifier.name !== 'ZERO')
-    ) {
-      finalValue = createBinaryExpressionWithUnary([calcIdentifier, finalValue])
-    }
+    forceVal = normaliseAngle(forceVal + (forceVal < 0 ? 90 : -90))
+  } else if (isReferencingXAxisAngle) {
+    calcIdentifier = createIdentifier(
+      Math.abs(forceVal) > 90 ? 'HALF_TURN' : 'ZERO'
+    )
+    forceVal =
+      Math.abs(forceVal) > 90 ? normaliseAngle(forceVal - 180) : forceVal
+  }
+  const { valueNode, variableName, newVariableInsertIndex, sign } =
+    await getModalInfo({
+      value: forceVal,
+      valueName: angleOrLength === 'setAngle' ? 'angle' : 'length',
+      shouldCreateVariable: true,
+    })

-    const { modifiedAst: _modifiedAst, pathToNodeMap } =
-      transformAstSketchLines({
-        ast: JSON.parse(JSON.stringify(kclManager.ast)),
-        selectionRanges,
-        transformInfos: transforms,
-        programMemory: kclManager.programMemory,
-        referenceSegName: '',
-        forceValueUsedInTransform: finalValue,
-      })
-    if (variableName) {
-      const newBody = [..._modifiedAst.body]
-      newBody.splice(
-        newVariableInsertIndex,
-        0,
-        createVariableDeclaration(variableName, valueNode)
-      )
-      _modifiedAst.body = newBody
-      Object.values(pathToNodeMap).forEach((pathToNode) => {
-        const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
-        pathToNode[index][0] = Number(pathToNode[index][0]) + 1
-      })
-    }
-    return {
-      modifiedAst: _modifiedAst,
-      pathToNodeMap,
-    }
-  } catch (e) {
-    console.log('error', e)
-    throw e
+  let finalValue = removeDoubleNegatives(
+    valueNode as BinaryPart,
+    sign,
+    variableName
+  )
+  if (
+    isReferencingYAxisAngle ||
+    (isReferencingXAxisAngle && calcIdentifier.name !== 'ZERO')
+  ) {
+    finalValue = createBinaryExpressionWithUnary([calcIdentifier, finalValue])
+  }
+
+  const retval = transformAstSketchLines({
+    ast: JSON.parse(JSON.stringify(kclManager.ast)),
+    selectionRanges,
+    transformInfos: transforms,
+    programMemory: kclManager.programMemory,
+    referenceSegName: '',
+    forceValueUsedInTransform: finalValue,
+  })
+  if (err(retval)) return Promise.reject(retval)
+
+  const { modifiedAst: _modifiedAst, pathToNodeMap } = retval
+  if (variableName) {
+    const newBody = [..._modifiedAst.body]
+    newBody.splice(
+      newVariableInsertIndex,
+      0,
+      createVariableDeclaration(variableName, valueNode)
+    )
+    _modifiedAst.body = newBody
+    Object.values(pathToNodeMap).forEach((pathToNode) => {
+      const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
+      pathToNode[index][0] = Number(pathToNode[index][0]) + 1
+    })
+  }
+  return {
+    modifiedAst: _modifiedAst,
+    pathToNodeMap,
  }
 }