Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Fixes some easier dependency cycles #2605

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/quicktype-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions packages/quicktype-core/src/input/FetchingJSONSchemaStore.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
1 change: 0 additions & 1 deletion packages/quicktype-core/src/input/Inputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/quicktype-core/src/input/io/NodeIO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
1 change: 0 additions & 1 deletion packages/quicktype-core/src/language/All.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/quicktype-core/src/language/CJSON/language.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { type RenderContext } from "../../Renderer";
import { EnumOption, type Option, StringOption, getOptionValues } from "../../RendererOptions";
import { type NamingStyle } from "../../support/Strings";
import { TargetLanguage } from "../../TargetLanguage";
import { type FixMeOptionsType, type FixMeOptionsAnyType } from "../../types";
import { type FixMeOptionsAnyType, type FixMeOptionsType } from "../../types";

import { CJSONRenderer } from "./CJSONRenderer";

Expand Down
Loading
Loading