Update kittycad lib (#363)

* Update kittycad lib

* Change output for output["output.obj"]

* Update vitest

* Update e2e snaps

* Disable two tests

* Investigation

Author: pierremtb

package.json

@@ -5,7 +5,7 @@
     "dependencies": {
         "@dicebear/avatars": "^4.10.8",
         "@dicebear/avatars-bottts-sprites": "^4.10.8",
-        "@kittycad/lib": "^0.0.20",
+        "@kittycad/lib": "^0.0.34",
         "@octokit/openapi-types": "^18.0.0",
         "@octokit/rest": "^20.0.1",
         "@octokit/types": "^11.1.0",
@@ -17,7 +17,7 @@
         "@testing-library/jest-dom": "^5.17.0",
         "@testing-library/react": "^14.0.0",
         "@testing-library/user-event": "^14.4.3",
-        "@types/chrome": "^0.0.241",
+        "@types/chrome": "^0.0.244",
         "@types/jest": "^29.5.3",
         "@types/node": "^20.4.2",
         "@types/react": "^18.2.15",
@@ -80,7 +80,7 @@
         "prettier": "^3.0.0",
         "vite": "^4.4.4",
         "vite-plugin-node-polyfills": "^0.9.0",
-        "vitest": "^0.33.0"
+        "vitest": "^0.34.3"
     },
     "packageManager": "yarn@3.6.0",
     "engines": {

src/chrome/diff.ts

@@ -8,16 +8,20 @@ import {
 import { Buffer } from 'buffer'
 
 export const extensionToSrcFormat: {
-    [extension: string]: FileImportFormat_type
+    [extension: string]: FileImportFormat_type | 'fbx' | 'sldprt'
 } = {
-    dae: 'dae',
-    dxf: 'dxf',
+    // expected one of `fbx`, `gltf`, `obj`, `ply`, `sldprt`, `step`, `stl`
     fbx: 'fbx',
+    gltf: 'gltf',
     obj: 'obj',
-    stl: 'stl',
+    ply: 'ply',
+    sldprt: 'sldprt',
     stp: 'step',
     step: 'step',
-    svg: 'svg',
+    stl: 'stl',
+
+    // Disabled in new format api
+    // dae: 'dae',
 }
 
 export function isFilenameSupported(filename: string): boolean {
@@ -71,11 +75,11 @@ async function convert(
         src_format: extensionToSrcFormat[extension],
         output_format: outputFormat as FileExportFormat_type,
     })
-    if ('error_code' in response) throw response
-    const { status, id, output } = response
-    console.log(`File conversion id: ${id}`)
-    console.log(`File conversion status: ${status}`)
-    return output
+    const key = `source.${outputFormat}`
+    if ('error_code' in response || !response.outputs[key]) throw response
+    const { status, id, outputs } = response
+    console.log(`File conversion: ${id}, ${status}`)
+    return outputs[key]
 }
 
 export async function getFileDiff(

tests/extension.spec.ts

@@ -108,31 +108,33 @@ test('commit diff with an added .step file', async ({
     expect(screenshot).toMatchSnapshot()
 })
 
-test('commit diff with a modified .dae file as LFS', async ({
-    page,
-    authorizedBackground,
-}) => {
-    const url =
-        'https://github.com/KittyCAD/diff-samples/commit/b009cfd6dd1eb2d0c3ec0d31a21360766ad084e4'
-    const element = await getFirstDiffElement(page, url, 'dae')
-    const screenshot = await element.screenshot()
-    expect(screenshot).toMatchSnapshot()
-
-    await enableCombined(page, element)
-    const screenshot2 = await element.screenshot()
-    expect(screenshot2).toMatchSnapshot()
-})
-
-test('blob preview with an .obj file', async ({
-    page,
-    authorizedBackground,
-}) => {
-    const url =
-        'https://github.com/KittyCAD/diff-samples/blob/fd9eec79f0464833686ea6b5b34ea07145e32734/models/box.obj'
-    const element = await getBlobPreviewElement(page, url)
-    const screenshot = await element.screenshot()
-    expect(screenshot).toMatchSnapshot()
-})
+// TODO: re-enable when .dae are supported
+// test('commit diff with a modified .dae file as LFS', async ({
+//     page,
+//     authorizedBackground,
+// }) => {
+//     const url =
+//         'https://github.com/KittyCAD/diff-samples/commit/b009cfd6dd1eb2d0c3ec0d31a21360766ad084e4'
+//     const element = await getFirstDiffElement(page, url, 'dae')
+//     const screenshot = await element.screenshot()
+//     expect(screenshot).toMatchSnapshot()
+
+//     await enableCombined(page, element)
+//     const screenshot2 = await element.screenshot()
+//     expect(screenshot2).toMatchSnapshot()
+// })
+
+// TODO: re-enable when new blob page is fixed
+// test('blob preview with an .obj file', async ({
+//     page,
+//     authorizedBackground,
+// }) => {
+//     const url =
+//         'https://github.com/KittyCAD/diff-samples/blob/fd9eec79f0464833686ea6b5b34ea07145e32734/models/box.obj'
+//     const element = await getBlobPreviewElement(page, url)
+//     const screenshot = await element.screenshot()
+//     expect(screenshot).toMatchSnapshot()
+// })
 
 test('blob preview with an .stl file', async ({
     page,