tag as top level part 2 (#2773)

* updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fmt Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * unit tests pass Signed-off-by: Jess Frazelle <github@jessfraz.com> * playwright Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * format Signed-off-by: Jess Frazelle <github@jessfraz.com> * format Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * more literals gone Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove console log Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove only Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix some recast shit Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * last Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-06-24 22:39:04 -07:00
parent ad5bfa1a29
commit da6cd5cf9f
44 changed files with 720 additions and 536 deletions
--- a/src/lang/std/sketchcombos.ts
+++ b/src/lang/std/sketchcombos.ts
@ -462,7 +462,7 @@ const setAngledIntersectLineForLines: TransformInfo['createNode'] =
      angleVal,
      offsetVal:
        forceValueUsedInTransform || createLiteral(valueUsedInTransform),
-      intersectTag: createLiteral(referenceSegName),
+      intersectTag: createIdentifier(referenceSegName),
      tag,
      valueUsedInTransform,
    })
@ -481,7 +481,7 @@ const setAngledIntersectForAngledLines: TransformInfo['createNode'] =
      angleVal: varValA,
      offsetVal:
        forceValueUsedInTransform || createLiteral(valueUsedInTransform),
-      intersectTag: createLiteral(referenceSegName),
+      intersectTag: createIdentifier(referenceSegName),
      tag,
      valueUsedInTransform,
    })
@ -675,7 +675,7 @@ const transformMap: TransformMap = {
            const angleToMatchLengthXCall = createCallExpression(
              'angleToMatchLengthX',
              [
-                createLiteral(referenceSegName),
+                createIdentifier(referenceSegName),
                varValA,
                createPipeSubstitution(),
              ]
@ -708,7 +708,7 @@ const transformMap: TransformMap = {
            const angleToMatchLengthYCall = createCallExpression(
              'angleToMatchLengthY',
              [
-                createLiteral(referenceSegName),
+                createIdentifier(referenceSegName),
                varValB,
                createPipeSubstitution(),
              ]
@ -973,7 +973,7 @@ const transformMap: TransformMap = {
            const angleToMatchLengthXCall = createCallExpression(
              'angleToMatchLengthX',
              [
-                createLiteral(referenceSegName),
+                createIdentifier(referenceSegName),
                varValB,
                createPipeSubstitution(),
              ]
@ -1023,7 +1023,7 @@ const transformMap: TransformMap = {
            const angleToMatchLengthXCall = createCallExpression(
              'angleToMatchLengthY',
              [
-                createLiteral(referenceSegName),
+                createIdentifier(referenceSegName),
                varValB,
                createPipeSubstitution(),
              ]
@ -1174,7 +1174,7 @@ export function getRemoveConstraintsTransform(
        //       fnName: name,
        //       angleVal: args[0],
        //       offsetVal: args[1],
-        //       intersectTag: createLiteral(referenceSegName),
+        //       intersectTag: createIdentifier(referenceSegName),
        //       tag,
        //     })
        //   }
@ -1593,8 +1593,8 @@ export function transformAstSketchLines({
    const _referencedSegmentName =
      referenceSegName ||
      (_referencedSegmentNameVal &&
-        _referencedSegmentNameVal.type === 'Literal' &&
-        String(_referencedSegmentNameVal.value)) ||
+        _referencedSegmentNameVal.type === 'Identifier' &&
+        String(_referencedSegmentNameVal.name)) ||
      ''
    const { val } = firstArg
    const [varValA, varValB] = Array.isArray(val) ? val : [val, val]
@ -1714,21 +1714,21 @@ export function transformAstSketchLines({

 function createSegLen(referenceSegName: string): Value {
  return createCallExpression('segLen', [
-    createLiteral(referenceSegName),
+    createIdentifier(referenceSegName),
    createPipeSubstitution(),
  ])
 }

 function createSegAngle(referenceSegName: string): Value {
  return createCallExpression('segAng', [
-    createLiteral(referenceSegName),
+    createIdentifier(referenceSegName),
    createPipeSubstitution(),
  ])
 }

 function createSegEnd(referenceSegName: string, isX: boolean): CallExpression {
  return createCallExpression(isX ? 'segEndX' : 'segEndY', [
-    createLiteral(referenceSegName),
+    createIdentifier(referenceSegName),
    createPipeSubstitution(),
  ])
 }