fix type check

fern-api · Oct 9, 2024 · a3f5020 · a3f5020
1 parent 861114f
commit a3f5020
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 161 deletions.
diff --git a/packages/ui/app/package.json b/packages/ui/app/package.json
@@ -19,6 +19,8 @@
   ],
   "scripts": {
     "test": "vitest --run --passWithNoTests --globals --disable-console-intercept",
+    "compile": "tsc",
+    "check-types": "tsc --noEmit",
     "lint:eslint": "eslint --max-warnings 1000 . --ignore-path=../../../.eslintignore",
     "lint:eslint:fix": "pnpm lint:eslint --fix",
     "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0",

diff --git a/packages/ui/app/src/api-reference/artifacts/ApiArtifacts.tsx b/packages/ui/app/src/api-reference/artifacts/ApiArtifacts.tsx
diff --git a/packages/ui/app/src/api-reference/endpoints/__test__/EndpointUrl.test.tsx b/packages/ui/app/src/api-reference/endpoints/__test__/EndpointUrl.test.tsx
@@ -2,33 +2,28 @@
  * @vitest-environment jsdom
  */
 
+import { PathPart } from "@fern-api/fdr-sdk/api-definition";
+import { EnvironmentId, PropertyKey } from "@fern-api/fdr-sdk/navigation";
 import { render, screen } from "@testing-library/react";
-import { ResolvedEndpointPathParts } from "../../../resolver/types";
 import { EndpointUrl } from "../EndpointUrl";
 
-function lit(value: string): ResolvedEndpointPathParts.Literal {
+function lit(value: string): PathPart.Literal {
     return { type: "literal", value };
 }
 
-function path(key: string): ResolvedEndpointPathParts.PathParameter {
+function path(key: string): PathPart.PathParameter {
     return {
         type: "pathParameter",
-        key,
-        valueShape: { type: "primitive", description: undefined, availability: undefined, value: { type: "string" } },
-        hidden: false,
-        description: undefined,
-        availability: undefined,
+        value: PropertyKey(key),
     };
 }
 
 describe("EndpointUrl", () => {
     it("works with lit and path", async () => {
         render(
             <EndpointUrl
-                selectedEnvironment={{
-                    id: "Production",
-                    baseUrl: "https://api.buildwithfern.com",
-                }}
+                environmentId={EnvironmentId("Production")}
+                baseUrl="https://api.buildwithfern.com"
                 path={[lit("/testing/"), path("id")]}
                 method={"GET"}
                 showEnvironment={true}
@@ -41,10 +36,8 @@ describe("EndpointUrl", () => {
     it("renders full environment with basepath", async () => {
         render(
             <EndpointUrl
-                selectedEnvironment={{
-                    id: "Production",
-                    baseUrl: "https://api.buildwithfern.com/with/basepath",
-                }}
+                environmentId={EnvironmentId("Production")}
+                baseUrl="https://api.buildwithfern.com/with/basepath"
                 path={[lit("/testing/"), path("id")]}
                 method={"GET"}
                 showEnvironment={true}

diff --git a/packages/ui/app/src/playground/code-snippets/__test__/code-snippets.test.ts b/packages/ui/app/src/playground/code-snippets/__test__/code-snippets.test.ts
@@ -49,13 +49,16 @@ describe("PlaygroundCodeSnippetBuilder", () => {
             {
                 key: APIV1Read.PropertyKey("test"),
                 valueShape: {
-                    type: "primitive",
+                    type: "alias",
                     value: {
-                        type: "string",
-                        regex: undefined,
-                        minLength: undefined,
-                        maxLength: undefined,
-                        default: undefined,
+                        type: "primitive",
+                        value: {
+                            type: "string",
+                            regex: undefined,
+                            minLength: undefined,
+                            maxLength: undefined,
+                            default: undefined,
+                        },
                     },
                 },
                 description: undefined,
@@ -99,6 +102,7 @@ describe("PlaygroundCodeSnippetBuilder", () => {
         endpoint,
         auth: undefined,
         types: {},
+        globalHeaders: [],
     };
 
     it("should render curl", () => {

diff --git a/packages/ui/app/src/playground/utils/utils.ts b/packages/ui/app/src/playground/utils/utils.ts
@@ -36,7 +36,7 @@ export function isExpandable(
 }
 
 export function hasRequiredFields(
-    bodyShape: HttpRequestBodyShape | TypeReference,
+    bodyShape: HttpRequestBodyShape | TypeShapeOrReference,
     types: Record<string, TypeDefinition>,
 ): boolean {
     if (bodyShape.type === "formData") {

diff --git a/packages/ui/app/src/resolver/url.ts b/packages/ui/app/src/resolver/url.ts
diff --git a/packages/ui/app/src/seo/__test__/getBreadcrumbList.test.ts b/packages/ui/app/src/seo/__test__/getBreadcrumbList.test.ts
@@ -20,6 +20,7 @@ title: Overriden Title
             icon: undefined,
             hidden: false,
             noindex: undefined,
+            canonicalSlug: undefined,
         };
         const parents: FernNavigation.NavigationNode[] = [
             {
@@ -34,13 +35,14 @@ title: Overriden Title
                 children: [node],
                 overviewPageId: undefined,
                 pointsTo: undefined,
+                canonicalSlug: undefined,
             },
         ];
         expect(
             getBreadcrumbList(
                 "buildwithfern.com",
                 {
-                    [node.pageId]: { markdown },
+                    [node.pageId]: { markdown, editThisPageUrl: undefined },
                 },
                 parents,
                 node,

diff --git a/packages/ui/app/tsconfig.json b/packages/ui/app/tsconfig.json
@@ -4,7 +4,7 @@
     "composite": true,
     "noEmit": false,
     "outDir": "./dist",
-    "rootDir": "."
+    "rootDir": "./src"
   },
   "include": ["./src/**/*"],
   "references": [

diff --git a/packages/ui/components/package.json b/packages/ui/components/package.json
@@ -21,6 +21,7 @@
   ],
   "scripts": {
     "test": "vitest --run --passWithNoTests --globals --disable-console-intercept",
+    "compile": "tsc",
     "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore",
     "lint:eslint:fix": "pnpm lint:eslint --fix",
     "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0",

diff --git a/turbo.json b/turbo.json
@@ -12,6 +12,9 @@
       "outputs": ["dist/**"],
       "dependsOn": ["^compile"]
     },
+    "check-types": {
+      "dependsOn": ["^compile"]
+    },
     "lint": {},
     "lint:eslint": {},
     "lint:style": {},