fix lint and eslint

fern-api · Oct 2, 2024 · ba50633 · ba50633
1 parent ea40933
commit ba50633
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 20 deletions.
diff --git a/packages/cli/api-importers/commons/.prettierrc.cjs b/packages/cli/api-importers/commons/.prettierrc.cjs
@@ -1 +1 @@
-module.exports = require("../../../../../.prettierrc.json");
+module.exports = require("../../../../.prettierrc.json");
diff --git a/packages/cli/api-importers/commons/src/APIDefinitionImporter.ts b/packages/cli/api-importers/commons/src/APIDefinitionImporter.ts
@@ -3,7 +3,6 @@ import { RelativeFilePath } from "@fern-api/fs-utils";
 import { TaskContext } from "@fern-api/task-context";
 
 export declare namespace APIDefinitionImporter {
-
     interface Return {
         rootApiFile: RootApiFileSchema;
         packageMarkerFile: PackageMarkerFileSchema;
@@ -12,9 +11,7 @@ export declare namespace APIDefinitionImporter {
 }
 
 export abstract class APIDefinitionImporter<T> {
-
-    public constructor (protected readonly context?: TaskContext) {}
+    public constructor(protected readonly context?: TaskContext) {}
 
     public abstract import(input: T): Promise<APIDefinitionImporter.Return>;
-
-}
+}
diff --git a/packages/cli/api-importers/commons/src/FernDefnitionBuilder.ts b/packages/cli/api-importers/commons/src/FernDefnitionBuilder.ts
@@ -42,7 +42,15 @@ export interface FernDefinitionBuilder {
      * @param fileToImport the file to import
      * @param alias import the file with this alias
      */
-    addImport({ file, fileToImport, alias }: { file: RelativeFilePath; fileToImport: RelativeFilePath; alias?: string; }): string | undefined;
+    addImport({
+        file,
+        fileToImport,
+        alias
+    }: {
+        file: RelativeFilePath;
+        fileToImport: RelativeFilePath;
+        alias?: string;
+    }): string | undefined;
 
     addType(file: RelativeFilePath, { name, schema }: { name: string; schema: RawSchemas.TypeDeclarationSchema }): void;
 
@@ -58,7 +66,11 @@ export interface FernDefinitionBuilder {
 
     addEndpoint(
         file: RelativeFilePath,
-        { name, schema, source }: { name: string; schema: RawSchemas.HttpEndpointSchema; source: RawSchemas.SourceSchema | undefined }
+        {
+            name,
+            schema,
+            source
+        }: { name: string; schema: RawSchemas.HttpEndpointSchema; source: RawSchemas.SourceSchema | undefined }
     ): void;
 
     addWebhook(file: RelativeFilePath, { name, schema }: { name: string; schema: RawSchemas.WebhookSchema }): void;
@@ -102,8 +114,8 @@ export class FernDefinitionBuilderImpl implements FernDefinitionBuilder {
             }
         };
     }
-    
-    public setDisplayName({ displayName }: { displayName: string; }): void {
+
+    public setDisplayName({ displayName }: { displayName: string }): void {
         this.rootApiFile["display-name"] = displayName;
     }
 
@@ -222,7 +234,7 @@ export class FernDefinitionBuilderImpl implements FernDefinitionBuilder {
     public addImport({
         file,
         fileToImport,
-        alias,
+        alias
     }: {
         file: RelativeFilePath;
         fileToImport: RelativeFilePath;
@@ -231,12 +243,14 @@ export class FernDefinitionBuilderImpl implements FernDefinitionBuilder {
         if (file === fileToImport) {
             return undefined;
         }
-        const importPrefix = alias ?? camelCase(
-            (dirname(fileToImport) + "/" + basename(fileToImport, extname(fileToImport))).replaceAll(
-                "__package__",
-                "root"
-            )
-        );
+        const importPrefix =
+            alias ??
+            camelCase(
+                (dirname(fileToImport) + "/" + basename(fileToImport, extname(fileToImport))).replaceAll(
+                    "__package__",
+                    "root"
+                )
+            );
 
         if (file === RelativeFilePath.of(ROOT_API_FILENAME)) {
             if (this.rootApiFile.imports == null) {
@@ -336,7 +350,11 @@ export class FernDefinitionBuilderImpl implements FernDefinitionBuilder {
 
     public addEndpoint(
         file: RelativeFilePath,
-        { name, schema, source }: { name: string; schema: RawSchemas.HttpEndpointSchema; source: RawSchemas.SourceSchema | undefined }
+        {
+            name,
+            schema,
+            source
+        }: { name: string; schema: RawSchemas.HttpEndpointSchema; source: RawSchemas.SourceSchema | undefined }
     ): void {
         const fernFile = this.getOrCreateFile(file);
         if (fernFile.service == null) {

diff --git a/packages/cli/api-importers/commons/src/index.ts b/packages/cli/api-importers/commons/src/index.ts
@@ -1,2 +1,2 @@
 export { APIDefinitionImporter } from "./APIDefinitionImporter";
-export { type FernDefinitionBuilder, FernDefinitionBuilderImpl, type FernDefinition } from "./FernDefnitionBuilder";
+export { type FernDefinitionBuilder, FernDefinitionBuilderImpl, type FernDefinition } from "./FernDefnitionBuilder";
diff --git a/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts b/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts
@@ -33,6 +33,7 @@ describe("ir", () => {
                 if (!workspace.didSucceed) {
                     throw new Error(`Failed to convert conjure fixture ${fixture.name}\n${JSON.stringify(workspace.failures)}`);
                 }
+                // eslint-disable-next-line jest/no-standalone-expect
                 expect(await workspace.workspace.toFernWorkspace({ context})).toMatchSnapshot(); 
             },
             90_000

diff --git a/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts b/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts
@@ -84,7 +84,7 @@ export async function visitAllConjureDefinitionFiles(
     absolutePathToConjureFolder: AbsoluteFilePath,
     visitor: (filepath: RelativeFilePath, definitionFile: DefinitionFile) => void | Promise<void>
 ): Promise<void> {
-    for (const conjureFile of await listConjureFiles(absolutePathToConjureFolder, `{yml,yaml}`)) {
+    for (const conjureFile of await listConjureFiles(absolutePathToConjureFolder, "{yml,yaml}")) {
         await visitor(conjureFile.relativeFilepath, conjureFile.fileContents);
     }
 }