refactor: Fixes some easier dependency cycles (#2605)

* fix Acronym dep cycle * ♻️ * fix dep cycle in input dir
glideapps · May 31, 2024 · 29bb816 · 29bb816
1 parent 7b5d1ae
commit 29bb816
Show file tree

Hide file tree

Showing 8 changed files with 1,115 additions and 1,117 deletions.
diff --git a/packages/quicktype-core/src/index.ts b/packages/quicktype-core/src/index.ts
@@ -69,9 +69,9 @@ export {
     type PrimitiveStringTypeKind
 } from "./Type";
 export { getStream } from "./input/io/get-stream";
-// eslint-disable-next-line import/no-cycle
+
 export { readableFromFileOrURL, readFromFileOrURL } from "./input/io/NodeIO";
-// eslint-disable-next-line import/no-cycle
+
 export { FetchingJSONSchemaStore } from "./input/FetchingJSONSchemaStore";
 export { JSONSchemaStore, type JSONSchema } from "./input/JSONSchemaStore";
 export { sourcesFromPostmanCollection } from "./input/PostmanCollection";

diff --git a/packages/quicktype-core/src/input/FetchingJSONSchemaStore.ts b/packages/quicktype-core/src/input/FetchingJSONSchemaStore.ts
@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-cycle
-import { parseJSON } from "..";
+import { parseJSON } from "../support/Support";
 
 import { readFromFileOrURL } from "./io/NodeIO";
 import { type JSONSchema, JSONSchemaStore } from "./JSONSchemaStore";

diff --git a/packages/quicktype-core/src/input/Inputs.ts b/packages/quicktype-core/src/input/Inputs.ts
@@ -2,7 +2,6 @@ import { arrayMapSync, iterableFind, iterableFirst, iterableSome, setFilterMap,
 
 import { descriptionTypeAttributeKind } from "../attributes/Description";
 import { makeNamesTypeAttributes } from "../attributes/TypeNames";
-// eslint-disable-next-line import/no-cycle
 import { languageNamed } from "../language/All";
 import { messageError } from "../Messages";
 import { type RunContext } from "../Run";

diff --git a/packages/quicktype-core/src/input/io/NodeIO.ts b/packages/quicktype-core/src/input/io/NodeIO.ts
@@ -6,8 +6,8 @@ import _fetch from "cross-fetch";
 import isURL from "is-url";
 import { type Readable } from "readable-stream";
 
-// eslint-disable-next-line import/no-cycle
-import { messageError, panic } from "../../index";
+import { messageError } from "../../Messages";
+import { panic } from "../../support/Support";
 
 import { getStream } from "./get-stream";
 

diff --git a/packages/quicktype-core/src/language/All.ts b/packages/quicktype-core/src/language/All.ts
@@ -13,7 +13,6 @@ import { GoTargetLanguage } from "./Golang";
 import { HaskellTargetLanguage } from "./Haskell";
 import { JavaTargetLanguage } from "./Java";
 import { JavaScriptTargetLanguage } from "./JavaScript";
-// eslint-disable-next-line import/no-cycle
 import { JavaScriptPropTypesTargetLanguage } from "./JavaScriptPropTypes";
 import { JSONSchemaTargetLanguage } from "./JSONSchema";
 import { KotlinTargetLanguage } from "./Kotlin";