diff --git a/src/App.tsx b/src/App.tsx index a8f06b834..c8c07f52a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -79,7 +79,6 @@ export function App() { setIsStreamReady, isStreamReady, isMouseDownInStream, - fileId, cmdId, setCmdId, token, @@ -120,7 +119,6 @@ export function App() { isStreamReady: s.isStreamReady, setIsStreamReady: s.setIsStreamReady, isMouseDownInStream: s.isMouseDownInStream, - fileId: s.fileId, cmdId: s.cmdId, setCmdId: s.setCmdId, token: s.token, diff --git a/src/Toolbar.tsx b/src/Toolbar.tsx index 62f4ab252..e9018454a 100644 --- a/src/Toolbar.tsx +++ b/src/Toolbar.tsx @@ -11,7 +11,6 @@ import { SetAngleLength } from './components/Toolbar/setAngleLength' import { ConvertToVariable } from './components/Toolbar/ConvertVariable' import { SetAbsDistance } from './components/Toolbar/SetAbsDistance' import { SetAngleBetween } from './components/Toolbar/SetAngleBetween' -import { ExportButton } from './components/ExportButton' export const Toolbar = () => { const { diff --git a/src/components/AvailableVarsHelpers.tsx b/src/components/AvailableVarsHelpers.tsx index 03465730b..1adae4e41 100644 --- a/src/components/AvailableVarsHelpers.tsx +++ b/src/components/AvailableVarsHelpers.tsx @@ -9,7 +9,6 @@ import { findUniqueName, } from '../lang/modifyAst' import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst' -import { lexer } from '../lang/tokeniser' import { useStore } from '../useStore' export const AvailableVars = ({ diff --git a/src/components/ProjectSidebarMenu.test.tsx b/src/components/ProjectSidebarMenu.test.tsx index 973c450f9..0f90a6044 100644 --- a/src/components/ProjectSidebarMenu.test.tsx +++ b/src/components/ProjectSidebarMenu.test.tsx @@ -1,5 +1,4 @@ import { fireEvent, render, screen } from '@testing-library/react' -import { User } from '../useStore' import { BrowserRouter } from 'react-router-dom' import ProjectSidebarMenu from './ProjectSidebarMenu' import { ProjectWithEntryPointMetadata } from '../Router' diff --git a/src/components/SetVarNameModal.tsx b/src/components/SetVarNameModal.tsx index c653cfe73..b06ddaec1 100644 --- a/src/components/SetVarNameModal.tsx +++ b/src/components/SetVarNameModal.tsx @@ -1,5 +1,5 @@ import { Dialog, Transition } from '@headlessui/react' -import { Fragment, useState } from 'react' +import { Fragment } from 'react' import { useCalc, CreateNewVariable } from './AvailableVarsHelpers' export const SetVarNameModal = ({ diff --git a/src/components/Stream.tsx b/src/components/Stream.tsx index d60da5151..3942a4ce7 100644 --- a/src/components/Stream.tsx +++ b/src/components/Stream.tsx @@ -20,8 +20,6 @@ export const Stream = ({ className = '' }) => { mediaStream, engineCommandManager, setIsMouseDownInStream, - fileId, - setFileId, setCmdId, didDragInStream, setDidDragInStream, @@ -32,7 +30,6 @@ export const Stream = ({ className = '' }) => { isMouseDownInStream: s.isMouseDownInStream, setIsMouseDownInStream: s.setIsMouseDownInStream, fileId: s.fileId, - setFileId: s.setFileId, setCmdId: s.setCmdId, didDragInStream: s.didDragInStream, setDidDragInStream: s.setDidDragInStream, @@ -48,9 +45,8 @@ export const Stream = ({ className = '' }) => { if (!videoRef.current) return if (!mediaStream) return videoRef.current.srcObject = mediaStream - setFileId(uuidv4()) setZoom(videoRef.current.getBoundingClientRect().height / 2) - }, [mediaStream, engineCommandManager, setFileId]) + }, [mediaStream, engineCommandManager]) const handleMouseDown: MouseEventHandler = ({ clientX, diff --git a/src/components/UserSidebarMenu.tsx b/src/components/UserSidebarMenu.tsx index 0370e301a..75d46fff7 100644 --- a/src/components/UserSidebarMenu.tsx +++ b/src/components/UserSidebarMenu.tsx @@ -7,7 +7,6 @@ import { useNavigate } from 'react-router-dom' import { useState } from 'react' import { paths } from '../Router' import makeUrlPathRelative from '../lib/makeUrlPathRelative' -import { ExportButton } from './ExportButton' const UserSidebarMenu = ({ user }: { user?: User }) => { const displayedName = getDisplayName(user) diff --git a/src/lang/artifact.test.ts b/src/lang/artifact.test.ts index b0f9bc487..ce33d6cfc 100644 --- a/src/lang/artifact.test.ts +++ b/src/lang/artifact.test.ts @@ -1,6 +1,6 @@ import { parser_wasm } from './abstractSyntaxTree' import { initPromise } from './rust' -import { enginelessExecutor, executor } from '../lib/testHelpers' +import { enginelessExecutor } from '../lib/testHelpers' beforeAll(() => initPromise) diff --git a/src/lang/executor.ts b/src/lang/executor.ts index abf1edb00..559de62a2 100644 --- a/src/lang/executor.ts +++ b/src/lang/executor.ts @@ -543,7 +543,7 @@ export const _executor = async ( } _programMemory.return = expression.arguments as any // todo memory redo } else { - if (_programMemory.root[functionName] == undefined) { + if (_programMemory.root[functionName] === undefined) { throw new KCLSemanticError(`No such name ${functionName} defined`, [ [statement.start, statement.end], ]) diff --git a/src/lang/queryAst.test.ts b/src/lang/queryAst.test.ts index 7408e5528..3a40988c3 100644 --- a/src/lang/queryAst.test.ts +++ b/src/lang/queryAst.test.ts @@ -5,7 +5,6 @@ import { isTypeInValue, getNodePathFromSourceRange, } from './queryAst' -import { lexer } from './tokeniser' import { initPromise } from './rust' import { enginelessExecutor } from '../lib/testHelpers' import { diff --git a/src/lang/std/sketch.test.ts b/src/lang/std/sketch.test.ts index 400009290..4fe074e4e 100644 --- a/src/lang/std/sketch.test.ts +++ b/src/lang/std/sketch.test.ts @@ -134,7 +134,6 @@ show(mySketch001)` describe('testing addNewSketchLn', () => { const lineToChange = 'lineTo([-1.59, -1.54], %)' - const lineAfterChange = 'lineTo([2, 3], %)' test('addNewSketchLn', async () => { // Enable rotations #152 const code = ` @@ -146,6 +145,7 @@ show(mySketch001)` const ast = parser_wasm(code) const programMemory = await enginelessExecutor(ast) const sourceStart = code.indexOf(lineToChange) + expect(sourceStart).toBe(66) const { modifiedAst } = addNewSketchLn({ node: ast, programMemory, diff --git a/src/lang/std/sketch.ts b/src/lang/std/sketch.ts index 4ff0d49ef..55a987cff 100644 --- a/src/lang/std/sketch.ts +++ b/src/lang/std/sketch.ts @@ -116,7 +116,7 @@ function makeId(seed: string | any) { export const lineTo: SketchLineHelper = { fn: ( - { sourceRange, engineCommandManager, code }, + { sourceRange, code }, data: | [number, number] | { @@ -131,10 +131,6 @@ export const lineTo: SketchLineHelper = { const from = getCoordsFromPaths(sketchGroup, sketchGroup.value.length - 1) const to = 'to' in data ? data.to : data - const lineData: LineData = { - from: [...from, 0], - to: [...to, 0], - } const id = makeId({ code, sourceRange, @@ -672,10 +668,6 @@ export const angledLine: SketchLineHelper = { from[0] + length * Math.cos((angle * Math.PI) / 180), from[1] + length * Math.sin((angle * Math.PI) / 180), ] - const lineData: LineData = { - from: [...from, 0], - to: [...to, 0], - } const id = makeId({ code, sourceRange, diff --git a/src/lang/std/std.ts b/src/lang/std/std.ts index 8242d2e41..4265407c7 100644 --- a/src/lang/std/std.ts +++ b/src/lang/std/std.ts @@ -25,9 +25,8 @@ import { lastSegY, } from './sketchConstraints' import { getExtrudeWallTransform, extrude } from './extrude' -import { SketchGroup, ExtrudeGroup, Position, Rotation } from '../executor' -import { InternalFn, InternalFnNames, InternalFirstArg } from './stdTypes' +import { InternalFn, InternalFnNames } from './stdTypes' // const transform: InternalFn = ( // { sourceRange }: InternalFirstArg, diff --git a/src/routes/Onboarding/index.tsx b/src/routes/Onboarding/index.tsx index 03e7e6faa..f89343ccd 100644 --- a/src/routes/Onboarding/index.tsx +++ b/src/routes/Onboarding/index.tsx @@ -7,7 +7,6 @@ import Units from './Units' import Camera from './Camera' import Sketching from './Sketching' import { useCallback } from 'react' -import { paths } from '../../Router' import makeUrlPathRelative from '../../lib/makeUrlPathRelative' export const onboardingPaths = { diff --git a/src/setupTests.ts b/src/setupTests.ts index 0227219e9..8addffd3d 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -2,7 +2,6 @@ import '@testing-library/jest-dom' import { WebSocket } from 'ws' class MockRTCPeerConnection { - constructor() {} createDataChannel() { return } diff --git a/src/useStore.ts b/src/useStore.ts index a7063f9a9..abf49fe6b 100644 --- a/src/useStore.ts +++ b/src/useStore.ts @@ -12,7 +12,6 @@ import { SourceRange, } from './lang/executor' import { recast } from './lang/recast' -import { asyncLexer } from './lang/tokeniser' import { EditorSelection } from '@codemirror/state' import { BaseDirectory } from '@tauri-apps/api/fs' import { @@ -20,7 +19,7 @@ import { SourceRangeMap, EngineCommandManager, } from './lang/std/engineConnection' -import { KCLError, KCLUndefinedValueError } from './lang/errors' +import { KCLError } from './lang/errors' export type Selection = { type: 'default' | 'line-end' | 'line-mid'