diff --git a/.changeset/kind-schools-live.md b/.changeset/kind-schools-live.md new file mode 100644 index 00000000..3a9f5dd1 --- /dev/null +++ b/.changeset/kind-schools-live.md @@ -0,0 +1,6 @@ +--- +"@openapi-qraft/plugin": patch +"@openapi-qraft/react": patch +--- + +Update import attributes syntax to use `with` instead of `assert`. diff --git a/.prettierrc.json b/.prettierrc.json index 38ba6458..2469d462 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -4,7 +4,14 @@ "trailingComma": "es5", "importOrderCaseInsensitive": true, "importOrderSeparation": true, - "importOrder": ["^react(.*)$","^@(.*)$", "", "^[./]"], + "importOrder": [ + "^(node:)", + "", + "^[.]", + "", + "", + "^[.]" + ], "importOrderParserPlugins": ["importAssertions", "typescript", "jsx"], - "plugins": ["@trivago/prettier-plugin-sort-imports"] + "plugins": ["@ianvs/prettier-plugin-sort-imports"] } diff --git a/package.json b/package.json index 8e60ed12..beea4d40 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ }, "devDependencies": { "@changesets/cli": "^2.27.1", - "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "prettier": "^3.1.1", + "@ianvs/prettier-plugin-sort-imports": "^4.3.1", + "prettier": "^3.3.3", "turbo": "^2.0.4", "typescript": "^5.3.3" }, diff --git a/packages/cli/eslint.config.js b/packages/cli/eslint.config.js index 518641c2..d8f66c5f 100644 --- a/packages/cli/eslint.config.js +++ b/packages/cli/eslint.config.js @@ -1,5 +1,4 @@ import openAPIQraftConfig from '@openapi-qraft/eslint-config/eslint.vanilla.config'; - import globals from 'globals'; export default [ diff --git a/packages/cli/src/bin.spec.ts b/packages/cli/src/bin.spec.ts index 3ba36f0e..d5995fd0 100644 --- a/packages/cli/src/bin.spec.ts +++ b/packages/cli/src/bin.spec.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from 'vitest'; - import { extractArgvPluginOptions } from './bin.js'; describe('bin', () => { diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts index 46b6e5f6..220f58fd 100644 --- a/packages/cli/src/bin.ts +++ b/packages/cli/src/bin.ts @@ -1,10 +1,8 @@ #!/usr/bin/env node -import { QraftCommand } from '@openapi-qraft/plugin/lib/QraftCommand'; import type { QraftCommandPlugin } from '@openapi-qraft/plugin/lib/QraftCommandPlugin'; - -import { Option } from 'commander'; import process from 'node:process'; - +import { QraftCommand } from '@openapi-qraft/plugin/lib/QraftCommand'; +import { Option } from 'commander'; import { builtInPlugins } from './builtInPlugins.js'; export async function main() { diff --git a/packages/openapi-typescript-plugin/eslint.config.js b/packages/openapi-typescript-plugin/eslint.config.js index 518641c2..d8f66c5f 100644 --- a/packages/openapi-typescript-plugin/eslint.config.js +++ b/packages/openapi-typescript-plugin/eslint.config.js @@ -1,5 +1,4 @@ import openAPIQraftConfig from '@openapi-qraft/eslint-config/eslint.vanilla.config'; - import globals from 'globals'; export default [ diff --git a/packages/openapi-typescript-plugin/src/generateSchemaTypes.ts b/packages/openapi-typescript-plugin/src/generateSchemaTypes.ts index 50347ec5..fb6e81cd 100644 --- a/packages/openapi-typescript-plugin/src/generateSchemaTypes.ts +++ b/packages/openapi-typescript-plugin/src/generateSchemaTypes.ts @@ -1,12 +1,7 @@ -import { createConfig } from '@redocly/openapi-core'; - import type { Readable } from 'node:stream'; -import openapiTS, { - astToString, - type OpenAPI3, - type OpenAPITSOptions, - SchemaObject, -} from 'openapi-typescript'; +import type { OpenAPI3, OpenAPITSOptions } from 'openapi-typescript'; +import { createConfig } from '@redocly/openapi-core'; +import openapiTS, { astToString, SchemaObject } from 'openapi-typescript'; import ts from 'typescript'; export async function generateSchemaTypes( diff --git a/packages/openapi-typescript-plugin/src/lib/createOpenapiTypesImportPath.test.ts b/packages/openapi-typescript-plugin/src/lib/createOpenapiTypesImportPath.test.ts index a799e117..cf73ebcf 100644 --- a/packages/openapi-typescript-plugin/src/lib/createOpenapiTypesImportPath.test.ts +++ b/packages/openapi-typescript-plugin/src/lib/createOpenapiTypesImportPath.test.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from 'vitest'; - import { createOpenapiTypesImportPath } from './createOpenapiTypesImportPath.js'; describe('createOpenapiTypesImportPath', () => { diff --git a/packages/openapi-typescript-plugin/src/plugin.test.ts b/packages/openapi-typescript-plugin/src/plugin.test.ts index af694169..1bc413b8 100644 --- a/packages/openapi-typescript-plugin/src/plugin.test.ts +++ b/packages/openapi-typescript-plugin/src/plugin.test.ts @@ -1,9 +1,7 @@ import '@openapi-qraft/plugin/lib/vitestFsMock'; - import fs from 'node:fs'; import { createRequire } from 'node:module'; import { describe, expect, it, test } from 'vitest'; - import { openapiTypesFileNameOptionParser } from './plugin.js'; describe('openapi-typescript types generation', () => { diff --git a/packages/openapi-typescript-plugin/src/plugin.ts b/packages/openapi-typescript-plugin/src/plugin.ts index 66920c35..b53759a0 100644 --- a/packages/openapi-typescript-plugin/src/plugin.ts +++ b/packages/openapi-typescript-plugin/src/plugin.ts @@ -1,9 +1,7 @@ import { fileHeader } from '@openapi-qraft/plugin/lib/fileHeader'; import { formatFileHeader } from '@openapi-qraft/plugin/lib/formatFileHeader'; import { QraftCommandPlugin } from '@openapi-qraft/plugin/lib/QraftCommandPlugin'; - import { CommanderError } from 'commander'; - import { generateSchemaTypes } from './generateSchemaTypes.js'; import { createOpenapiTypesImportPath, diff --git a/packages/plugin/eslint.config.js b/packages/plugin/eslint.config.js index 518641c2..d8f66c5f 100644 --- a/packages/plugin/eslint.config.js +++ b/packages/plugin/eslint.config.js @@ -1,5 +1,4 @@ import openAPIQraftConfig from '@openapi-qraft/eslint-config/eslint.vanilla.config'; - import globals from 'globals'; export default [ diff --git a/packages/plugin/src/lib/QraftCommand.test.ts b/packages/plugin/src/lib/QraftCommand.test.ts index f3390860..65c4dbae 100644 --- a/packages/plugin/src/lib/QraftCommand.test.ts +++ b/packages/plugin/src/lib/QraftCommand.test.ts @@ -1,5 +1,4 @@ -import { describe, it, expect } from 'vitest'; - +import { describe, expect, it } from 'vitest'; import { QraftCommand, splitOptionFlags } from './QraftCommand.js'; describe('QraftCommand', () => { diff --git a/packages/plugin/src/lib/QraftCommand.ts b/packages/plugin/src/lib/QraftCommand.ts index d5c2f0e5..56e56deb 100644 --- a/packages/plugin/src/lib/QraftCommand.ts +++ b/packages/plugin/src/lib/QraftCommand.ts @@ -1,22 +1,23 @@ -import c from 'ansi-colors'; -import { Command, type Option } from 'commander'; +import type { Option } from 'commander'; +import type { Service } from './open-api/getServices.js'; import * as console from 'node:console'; import { sep } from 'node:path'; import process from 'node:process'; import { pathToFileURL, URL } from 'node:url'; +import c from 'ansi-colors'; +import { Command } from 'commander'; import ora, { Ora } from 'ora'; - import { parsePathGlobs } from './createServicePathMatch.js'; import { filterDocumentPaths } from './filterDocumentPaths.js'; import { GeneratorFile } from './GeneratorFile.js'; import { handleSchemaInput } from './handleSchemaInput.js'; -import { getServices, type Service } from './open-api/getServices.js'; +import { getServices } from './open-api/getServices.js'; import { OpenAPISchemaType } from './open-api/OpenAPISchemaType.js'; import { readSchema } from './open-api/readSchema.js'; import { OutputOptions } from './OutputOptions.js'; import { - parseOperationPredefinedParametersOption, createPredefinedParametersGlobMap, + parseOperationPredefinedParametersOption, predefineSchemaParameters, } from './predefineSchemaParameters.js'; import { writeGeneratorFiles } from './writeGeneratorFiles.js'; @@ -75,7 +76,7 @@ export class QraftCommand extends Command { const { version: packageVersion } = await import( '@openapi-qraft/plugin/package.json', { - assert: { type: 'json' }, + with: { type: 'json' }, } ).then(({ default: packageJSON }) => packageJSON); diff --git a/packages/plugin/src/lib/filterDocumentPaths.spec.ts b/packages/plugin/src/lib/filterDocumentPaths.spec.ts index f798d3cd..cd35cb27 100644 --- a/packages/plugin/src/lib/filterDocumentPaths.spec.ts +++ b/packages/plugin/src/lib/filterDocumentPaths.spec.ts @@ -1,5 +1,4 @@ -import { describe, it, expect } from 'vitest'; - +import { describe, expect, it } from 'vitest'; import { createServicePathMatch } from './createServicePathMatch.js'; describe('createServicePathMatch', () => { diff --git a/packages/plugin/src/lib/filterDocumentPaths.ts b/packages/plugin/src/lib/filterDocumentPaths.ts index dd817237..5ce43368 100644 --- a/packages/plugin/src/lib/filterDocumentPaths.ts +++ b/packages/plugin/src/lib/filterDocumentPaths.ts @@ -1,5 +1,4 @@ import { type OpenAPI3 } from 'openapi-typescript/src/types.js'; - import { createServicePathMatch } from './createServicePathMatch.js'; /** diff --git a/packages/plugin/src/lib/handleSchemaInput.ts b/packages/plugin/src/lib/handleSchemaInput.ts index 864470c9..1f97bdaa 100644 --- a/packages/plugin/src/lib/handleSchemaInput.ts +++ b/packages/plugin/src/lib/handleSchemaInput.ts @@ -1,6 +1,6 @@ +import type { Ora } from 'ora'; import process from 'node:process'; import { URL } from 'node:url'; -import type { Ora } from 'ora'; /** * Validates Schema's `input` and return `Readable` stream or `URL` diff --git a/packages/plugin/src/lib/open-api/getOperationName.spec.ts b/packages/plugin/src/lib/open-api/getOperationName.spec.ts index 4e221fff..79539011 100644 --- a/packages/plugin/src/lib/open-api/getOperationName.spec.ts +++ b/packages/plugin/src/lib/open-api/getOperationName.spec.ts @@ -1,5 +1,4 @@ -import { describe, it, expect } from 'vitest'; - +import { describe, expect, it } from 'vitest'; import { getOperationName } from './getOperationName.js'; describe('getOperationName', () => { diff --git a/packages/plugin/src/lib/open-api/getServiceName.spec.ts b/packages/plugin/src/lib/open-api/getServiceName.spec.ts index 4aee3a4b..11afa8bd 100644 --- a/packages/plugin/src/lib/open-api/getServiceName.spec.ts +++ b/packages/plugin/src/lib/open-api/getServiceName.spec.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from 'vitest'; - import { getServiceName } from './getServiceName.js'; describe('getServiceName', () => { diff --git a/packages/plugin/src/lib/open-api/getServiceNamesByEndpoint.spec.ts b/packages/plugin/src/lib/open-api/getServiceNamesByEndpoint.spec.ts index 3ae17349..4b04ef49 100644 --- a/packages/plugin/src/lib/open-api/getServiceNamesByEndpoint.spec.ts +++ b/packages/plugin/src/lib/open-api/getServiceNamesByEndpoint.spec.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from 'vitest'; - import { getEndpointPartIndex, getServiceBaseNameByOperationEndpoint, diff --git a/packages/plugin/src/lib/open-api/getServiceNamesByOperationTags.spec.ts b/packages/plugin/src/lib/open-api/getServiceNamesByOperationTags.spec.ts index f9f56266..d0ac0f6b 100644 --- a/packages/plugin/src/lib/open-api/getServiceNamesByOperationTags.spec.ts +++ b/packages/plugin/src/lib/open-api/getServiceNamesByOperationTags.spec.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from 'vitest'; - import { getServiceNamesByOperationTags } from './getServiceNamesByOperationTags.js'; describe('getServiceNamesByOperationTags(...)', () => { diff --git a/packages/plugin/src/lib/open-api/getServices.spec.ts b/packages/plugin/src/lib/open-api/getServices.spec.ts index d4270366..2a8c9310 100644 --- a/packages/plugin/src/lib/open-api/getServices.spec.ts +++ b/packages/plugin/src/lib/open-api/getServices.spec.ts @@ -1,7 +1,5 @@ -import openAPI from '@openapi-qraft/test-fixtures/openapi.json' assert { type: 'json' }; - +import openAPI from '@openapi-qraft/test-fixtures/openapi.json' with { type: 'json' }; import { describe, expect, it } from 'vitest'; - import { filterDocumentPaths } from '../filterDocumentPaths.js'; import { getServices } from './getServices.js'; diff --git a/packages/plugin/src/lib/open-api/getServices.ts b/packages/plugin/src/lib/open-api/getServices.ts index f40cc414..c61a77c9 100644 --- a/packages/plugin/src/lib/open-api/getServices.ts +++ b/packages/plugin/src/lib/open-api/getServices.ts @@ -1,5 +1,5 @@ +import type { OpenAPISchemaType } from './OpenAPISchemaType.js'; import camelCase from 'camelcase'; - import { getContentMediaType } from './getContent.js'; import { getOperationName } from './getOperationName.js'; import { @@ -7,7 +7,6 @@ import { ServiceBaseNameByEndpointOption, } from './getServiceNamesByOperationEndpoint.js'; import { getServiceNamesByOperationTags } from './getServiceNamesByOperationTags.js'; -import type { OpenAPISchemaType } from './OpenAPISchemaType.js'; export type ServiceBaseName = ServiceBaseNameByEndpointOption | 'tags'; diff --git a/packages/plugin/src/lib/open-api/readSchema.ts b/packages/plugin/src/lib/open-api/readSchema.ts index 80522f7d..558f30b9 100644 --- a/packages/plugin/src/lib/open-api/readSchema.ts +++ b/packages/plugin/src/lib/open-api/readSchema.ts @@ -1,7 +1,6 @@ -import { createConfig } from '@redocly/openapi-core'; - import type { Readable } from 'node:stream'; import type { OpenAPI3 } from 'openapi-typescript'; +import { createConfig } from '@redocly/openapi-core'; import { validateAndBundle } from 'openapi-typescript/dist/lib/redoc.js'; export const readSchema = async ( diff --git a/packages/plugin/src/lib/predefineSchemaParameters.test.ts b/packages/plugin/src/lib/predefineSchemaParameters.test.ts index 04e2a742..685cb75a 100644 --- a/packages/plugin/src/lib/predefineSchemaParameters.test.ts +++ b/packages/plugin/src/lib/predefineSchemaParameters.test.ts @@ -1,7 +1,5 @@ -import openAPI from '@openapi-qraft/test-fixtures/openapi.json' assert { type: 'json' }; - -import { describe, it, expect } from 'vitest'; - +import openAPI from '@openapi-qraft/test-fixtures/openapi.json' with { type: 'json' }; +import { describe, expect, it } from 'vitest'; import { assertIsOperationObject, assertIsParameterObjects, diff --git a/packages/plugin/src/lib/predefineSchemaParameters.ts b/packages/plugin/src/lib/predefineSchemaParameters.ts index 16047049..6a17ad32 100644 --- a/packages/plugin/src/lib/predefineSchemaParameters.ts +++ b/packages/plugin/src/lib/predefineSchemaParameters.ts @@ -1,10 +1,9 @@ +import type { OpenAPI3 } from 'openapi-typescript/src/types.js'; import { OperationObject, ParameterObject } from 'openapi-typescript'; import { - type OpenAPI3, PathItemObject, ReferenceObject, } from 'openapi-typescript/src/types.js'; - import { createServicePathMatch, parsePathGlobs, diff --git a/packages/plugin/src/lib/writeGeneratorFiles.ts b/packages/plugin/src/lib/writeGeneratorFiles.ts index 9975624f..4b52cf80 100644 --- a/packages/plugin/src/lib/writeGeneratorFiles.ts +++ b/packages/plugin/src/lib/writeGeneratorFiles.ts @@ -1,7 +1,6 @@ -import c from 'ansi-colors'; import fs from 'node:fs'; +import c from 'ansi-colors'; import { Ora } from 'ora'; - import { GeneratorFile } from './GeneratorFile.js'; export const writeGeneratorFiles = async ({ diff --git a/packages/react-client/eslint.config.js b/packages/react-client/eslint.config.js index f4bdf78c..ea8ae536 100644 --- a/packages/react-client/eslint.config.js +++ b/packages/react-client/eslint.config.js @@ -1,5 +1,4 @@ import openAPIQraftConfig from '@openapi-qraft/eslint-config/eslint.vanilla.config'; - import globals from 'globals'; export default [ diff --git a/packages/react-client/package.json b/packages/react-client/package.json index 853bbc5e..ec825079 100644 --- a/packages/react-client/package.json +++ b/packages/react-client/package.json @@ -31,7 +31,7 @@ "globals": "^15.0.0", "jsdom": "latest", "msw": "^2.0.12", - "prettier": "^3.1.1", + "prettier": "^3.3.3", "query-string": "^8.1.0", "react": "^18.2.0", "rimraf": "^5.0.5", diff --git a/packages/react-client/rollup.config.mjs b/packages/react-client/rollup.config.mjs index faed6028..e2721c01 100644 --- a/packages/react-client/rollup.config.mjs +++ b/packages/react-client/rollup.config.mjs @@ -1,6 +1,5 @@ import { rollupConfig } from '@openapi-qraft/rollup-config'; - -import packageJson from './package.json' assert { type: 'json' }; +import packageJson from './package.json' with { type: 'json' }; const moduleDist = { import: packageJson['exports']['.']['import'], diff --git a/packages/react-client/src/QraftContext.ts b/packages/react-client/src/QraftContext.ts index ea7e0290..2cc923d1 100644 --- a/packages/react-client/src/QraftContext.ts +++ b/packages/react-client/src/QraftContext.ts @@ -1,10 +1,8 @@ 'use client'; -import { createContext } from 'react'; - import type { QueryClient } from '@tanstack/react-query'; - import type { OperationSchema, RequestFnPayload } from './lib/requestFn.js'; +import { createContext } from 'react'; interface QraftContextValueBase { /** diff --git a/packages/react-client/src/ServiceOperation.ts b/packages/react-client/src/ServiceOperation.ts index 200b0ed5..11891f75 100644 --- a/packages/react-client/src/ServiceOperation.ts +++ b/packages/react-client/src/ServiceOperation.ts @@ -1,8 +1,7 @@ import type { DefaultError } from '@tanstack/query-core'; - import type { - ServiceOperationQuery as ServiceOperationQueryBase, ServiceOperationMutation as ServiceOperationMutationBase, + ServiceOperationQuery as ServiceOperationQueryBase, } from './service-operation/ServiceOperation.js'; import type { ServiceOperationInfiniteQueryKey as ServiceOperationInfiniteQueryKeyBase, diff --git a/packages/react-client/src/Unstable_QraftSecureRequestFn.ts b/packages/react-client/src/Unstable_QraftSecureRequestFn.ts index 81bf64df..c4c824d6 100644 --- a/packages/react-client/src/Unstable_QraftSecureRequestFn.ts +++ b/packages/react-client/src/Unstable_QraftSecureRequestFn.ts @@ -1,20 +1,14 @@ 'use client'; -import { createElement, Fragment, ReactNode, useEffect, useMemo } from 'react'; - -import { - QueryClient, - type QueryFunctionContext, - type QueryKey, - useQueries, -} from '@tanstack/react-query'; - -import { jwtDecode } from './lib/jwt-decode/index.js'; +import type { QueryFunctionContext, QueryKey } from '@tanstack/react-query'; import type { OperationSchema, RequestFnInfo, RequestFnOptions, } from './lib/requestFn.js'; +import { QueryClient, useQueries } from '@tanstack/react-query'; +import { createElement, Fragment, ReactNode, useEffect, useMemo } from 'react'; +import { jwtDecode } from './lib/jwt-decode/index.js'; interface QraftSecureRequestFnBaseProps { requestFn( diff --git a/packages/react-client/src/callbacks/cancelQueries.ts b/packages/react-client/src/callbacks/cancelQueries.ts index e9150ee5..88e48e98 100644 --- a/packages/react-client/src/callbacks/cancelQueries.ts +++ b/packages/react-client/src/callbacks/cancelQueries.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationCancelQueriesCallback } from '../service-operation/ServiceOperationCancelQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function cancelQueries( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/fetchInfiniteQuery.ts b/packages/react-client/src/callbacks/fetchInfiniteQuery.ts index c3b32474..2bae5f11 100644 --- a/packages/react-client/src/callbacks/fetchInfiniteQuery.ts +++ b/packages/react-client/src/callbacks/fetchInfiniteQuery.ts @@ -1,5 +1,5 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const fetchInfiniteQuery: < diff --git a/packages/react-client/src/callbacks/fetchQuery.ts b/packages/react-client/src/callbacks/fetchQuery.ts index ac10542d..1d28f62f 100644 --- a/packages/react-client/src/callbacks/fetchQuery.ts +++ b/packages/react-client/src/callbacks/fetchQuery.ts @@ -1,5 +1,5 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const fetchQuery: < diff --git a/packages/react-client/src/callbacks/getInfiniteQueryData.ts b/packages/react-client/src/callbacks/getInfiniteQueryData.ts index c0e8c44b..a8249d71 100644 --- a/packages/react-client/src/callbacks/getInfiniteQueryData.ts +++ b/packages/react-client/src/callbacks/getInfiniteQueryData.ts @@ -1,9 +1,8 @@ import type { InfiniteData } from '@tanstack/query-core'; - -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function getInfiniteQueryData( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/getInfiniteQueryKey.ts b/packages/react-client/src/callbacks/getInfiniteQueryKey.ts index d303f5a7..47e40443 100644 --- a/packages/react-client/src/callbacks/getInfiniteQueryKey.ts +++ b/packages/react-client/src/callbacks/getInfiniteQueryKey.ts @@ -1,6 +1,6 @@ -import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const getInfiniteQueryKey = ( diff --git a/packages/react-client/src/callbacks/getInfiniteQueryState.ts b/packages/react-client/src/callbacks/getInfiniteQueryState.ts index b3482b79..0a2170e1 100644 --- a/packages/react-client/src/callbacks/getInfiniteQueryState.ts +++ b/packages/react-client/src/callbacks/getInfiniteQueryState.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function getInfiniteQueryState( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/getMutationKey.ts b/packages/react-client/src/callbacks/getMutationKey.ts index b9eaf492..8f8f168a 100644 --- a/packages/react-client/src/callbacks/getMutationKey.ts +++ b/packages/react-client/src/callbacks/getMutationKey.ts @@ -1,6 +1,6 @@ -import { composeMutationKey } from '../lib/composeMutationKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { composeMutationKey } from '../lib/composeMutationKey.js'; import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js'; export const getMutationKey = ( diff --git a/packages/react-client/src/callbacks/getQueriesData.ts b/packages/react-client/src/callbacks/getQueriesData.ts index 2f1d42f0..858c4797 100644 --- a/packages/react-client/src/callbacks/getQueriesData.ts +++ b/packages/react-client/src/callbacks/getQueriesData.ts @@ -1,6 +1,6 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export function getQueriesData( diff --git a/packages/react-client/src/callbacks/getQueryData.ts b/packages/react-client/src/callbacks/getQueryData.ts index 5fa29cbc..78f09401 100644 --- a/packages/react-client/src/callbacks/getQueryData.ts +++ b/packages/react-client/src/callbacks/getQueryData.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function getQueryData( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/getQueryKey.ts b/packages/react-client/src/callbacks/getQueryKey.ts index 9f761177..9ba98b34 100644 --- a/packages/react-client/src/callbacks/getQueryKey.ts +++ b/packages/react-client/src/callbacks/getQueryKey.ts @@ -1,6 +1,6 @@ -import { composeQueryKey } from '../lib/composeQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { composeQueryKey } from '../lib/composeQueryKey.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const getQueryKey = ( diff --git a/packages/react-client/src/callbacks/getQueryState.ts b/packages/react-client/src/callbacks/getQueryState.ts index 55990802..fd4898db 100644 --- a/packages/react-client/src/callbacks/getQueryState.ts +++ b/packages/react-client/src/callbacks/getQueryState.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function getQueryState( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/invalidateQueries.ts b/packages/react-client/src/callbacks/invalidateQueries.ts index f5493443..7df5c75f 100644 --- a/packages/react-client/src/callbacks/invalidateQueries.ts +++ b/packages/react-client/src/callbacks/invalidateQueries.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationInvalidateQueriesCallback } from '../service-operation/ServiceOperationInvalidateQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function invalidateQueries( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/isFetching.ts b/packages/react-client/src/callbacks/isFetching.ts index 2f99c9a3..e8b4a201 100644 --- a/packages/react-client/src/callbacks/isFetching.ts +++ b/packages/react-client/src/callbacks/isFetching.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationIsFetchingQueriesCallback } from '../service-operation/ServiceOperationIsFetchingQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function isFetching( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/isMutating.ts b/packages/react-client/src/callbacks/isMutating.ts index c2aa15e5..1b880b47 100644 --- a/packages/react-client/src/callbacks/isMutating.ts +++ b/packages/react-client/src/callbacks/isMutating.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationIsMutatingQueriesCallback } from '../service-operation/ServiceOperationIsMutatingQueries.js'; +import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js'; export function isMutating( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts b/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts index d6892bec..dc73a309 100644 --- a/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts +++ b/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts @@ -1,5 +1,5 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const prefetchInfiniteQuery: < diff --git a/packages/react-client/src/callbacks/prefetchQuery.ts b/packages/react-client/src/callbacks/prefetchQuery.ts index 2161fd64..f03f5cae 100644 --- a/packages/react-client/src/callbacks/prefetchQuery.ts +++ b/packages/react-client/src/callbacks/prefetchQuery.ts @@ -1,5 +1,5 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; export const prefetchQuery: < diff --git a/packages/react-client/src/callbacks/refetchQueries.ts b/packages/react-client/src/callbacks/refetchQueries.ts index 82944063..40a3c994 100644 --- a/packages/react-client/src/callbacks/refetchQueries.ts +++ b/packages/react-client/src/callbacks/refetchQueries.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationRefetchQueriesCallback } from '../service-operation/ServiceOperationRefetchQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function refetchQueries( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/removeQueries.ts b/packages/react-client/src/callbacks/removeQueries.ts index 9d82e7d5..ca323330 100644 --- a/packages/react-client/src/callbacks/removeQueries.ts +++ b/packages/react-client/src/callbacks/removeQueries.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationRemoveQueriesCallback } from '../service-operation/ServiceOperationRemoveQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function removeQueries( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/resetQueries.ts b/packages/react-client/src/callbacks/resetQueries.ts index 78bb5fc7..aef511e1 100644 --- a/packages/react-client/src/callbacks/resetQueries.ts +++ b/packages/react-client/src/callbacks/resetQueries.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationResetQueriesCallback } from '../service-operation/ServiceOperationResetQueries.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function resetQueries( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/setInfiniteQueryData.ts b/packages/react-client/src/callbacks/setInfiniteQueryData.ts index 119679bc..1b0a4748 100644 --- a/packages/react-client/src/callbacks/setInfiniteQueryData.ts +++ b/packages/react-client/src/callbacks/setInfiniteQueryData.ts @@ -1,9 +1,8 @@ -import { InfiniteData } from '@tanstack/query-core'; - -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { InfiniteData } from '@tanstack/query-core'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function setInfiniteQueryData( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/setQueriesData.ts b/packages/react-client/src/callbacks/setQueriesData.ts index 082ccff3..0972b8f2 100644 --- a/packages/react-client/src/callbacks/setQueriesData.ts +++ b/packages/react-client/src/callbacks/setQueriesData.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationSetQueriesDataCallback } from '../service-operation/ServiceOperationSetQueriesData.js'; +import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js'; export function setQueriesData( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/setQueryData.ts b/packages/react-client/src/callbacks/setQueryData.ts index d1481813..e84d63f0 100644 --- a/packages/react-client/src/callbacks/setQueryData.ts +++ b/packages/react-client/src/callbacks/setQueryData.ts @@ -1,7 +1,7 @@ -import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; import type { OperationSchema } from '../lib/requestFn.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationSetQueryDataCallback } from '../service-operation/ServiceOperationSetQueryData.js'; +import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js'; export function setQueryData( _: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/useInfiniteQuery.ts b/packages/react-client/src/callbacks/useInfiniteQuery.ts index 82ee0e35..787bfb42 100644 --- a/packages/react-client/src/callbacks/useInfiniteQuery.ts +++ b/packages/react-client/src/callbacks/useInfiniteQuery.ts @@ -1,15 +1,12 @@ 'use client'; import type { DefaultError, InfiniteData } from '@tanstack/query-core'; -import { - useInfiniteQuery as useInfiniteQueryBase, - type UseInfiniteQueryResult, -} from '@tanstack/react-query'; - +import type { UseInfiniteQueryResult } from '@tanstack/react-query'; import type { OperationSchema } from '../lib/requestFn.js'; -import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query'; +import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; export const useInfiniteQuery: < TQueryFnData, diff --git a/packages/react-client/src/callbacks/useIsFetching.ts b/packages/react-client/src/callbacks/useIsFetching.ts index db76ff54..1bcfbf11 100644 --- a/packages/react-client/src/callbacks/useIsFetching.ts +++ b/packages/react-client/src/callbacks/useIsFetching.ts @@ -1,12 +1,11 @@ 'use client'; -import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query'; - -import { composeQueryFilters } from '../lib/composeQueryFilters.js'; import type { OperationSchema } from '../lib/requestFn.js'; -import { useQueryClient } from '../lib/useQueryClient.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query'; +import { composeQueryFilters } from '../lib/composeQueryFilters.js'; +import { useQueryClient } from '../lib/useQueryClient.js'; export const useIsFetching: ( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/useIsMutating.ts b/packages/react-client/src/callbacks/useIsMutating.ts index 375e58d7..5399fd05 100644 --- a/packages/react-client/src/callbacks/useIsMutating.ts +++ b/packages/react-client/src/callbacks/useIsMutating.ts @@ -1,15 +1,14 @@ 'use client'; import type { DefaultError } from '@tanstack/query-core'; +import type { OperationSchema } from '../lib/requestFn.js'; +import type { QraftClientOptions } from '../qraftAPIClient.js'; import { - UseMutationResult, useIsMutating as useIsMutatingStateTanstack, + UseMutationResult, } from '@tanstack/react-query'; - import { composeMutationFilters } from '../lib/composeMutationFilters.js'; -import type { OperationSchema } from '../lib/requestFn.js'; import { useQueryClient } from '../lib/useQueryClient.js'; -import type { QraftClientOptions } from '../qraftAPIClient.js'; import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js'; export const useIsMutating: < diff --git a/packages/react-client/src/callbacks/useMutation.ts b/packages/react-client/src/callbacks/useMutation.ts index 233a30e4..b0763e20 100644 --- a/packages/react-client/src/callbacks/useMutation.ts +++ b/packages/react-client/src/callbacks/useMutation.ts @@ -1,20 +1,18 @@ 'use client'; -import { useContext } from 'react'; - import type { DefaultError } from '@tanstack/query-core'; +import type { OperationSchema } from '../lib/requestFn.js'; +import type { QraftClientOptions } from '../qraftAPIClient.js'; +import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js'; +import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js'; import { useMutation as useMutationBase, UseMutationResult, } from '@tanstack/react-query'; - +import { useContext } from 'react'; import { composeMutationKey } from '../lib/composeMutationKey.js'; -import type { OperationSchema } from '../lib/requestFn.js'; import { useQueryClient } from '../lib/useQueryClient.js'; -import type { QraftClientOptions } from '../qraftAPIClient.js'; import { QraftContext } from '../QraftContext.js'; -import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js'; -import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js'; export const useMutation: < TData = unknown, diff --git a/packages/react-client/src/callbacks/useMutationState.ts b/packages/react-client/src/callbacks/useMutationState.ts index 0935eaf2..8baa85b3 100644 --- a/packages/react-client/src/callbacks/useMutationState.ts +++ b/packages/react-client/src/callbacks/useMutationState.ts @@ -1,15 +1,14 @@ 'use client'; import type { DefaultError } from '@tanstack/query-core'; +import type { OperationSchema } from '../lib/requestFn.js'; +import type { QraftClientOptions } from '../qraftAPIClient.js'; import { UseMutationResult, useMutationState as useMutationStateTanstack, } from '@tanstack/react-query'; - import { composeMutationFilters } from '../lib/composeMutationFilters.js'; -import type { OperationSchema } from '../lib/requestFn.js'; import { useQueryClient } from '../lib/useQueryClient.js'; -import type { QraftClientOptions } from '../qraftAPIClient.js'; import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js'; export const useMutationState: < diff --git a/packages/react-client/src/callbacks/useQueries.ts b/packages/react-client/src/callbacks/useQueries.ts index 72cd2605..b837a8c5 100644 --- a/packages/react-client/src/callbacks/useQueries.ts +++ b/packages/react-client/src/callbacks/useQueries.ts @@ -1,16 +1,14 @@ 'use client'; -import { useContext } from 'react'; - +import type { OperationSchema } from '../lib/requestFn.js'; +import type { QraftClientOptions } from '../qraftAPIClient.js'; import { QueriesResults, useQueries as useQueriesTanstack, } from '@tanstack/react-query'; - +import { useContext } from 'react'; import { composeQueryKey } from '../lib/composeQueryKey.js'; -import type { OperationSchema } from '../lib/requestFn.js'; import { useQueryClient } from '../lib/useQueryClient.js'; -import type { QraftClientOptions } from '../qraftAPIClient.js'; import { QraftContext } from '../QraftContext.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; diff --git a/packages/react-client/src/callbacks/useQuery.ts b/packages/react-client/src/callbacks/useQuery.ts index 32206ead..66cedd45 100644 --- a/packages/react-client/src/callbacks/useQuery.ts +++ b/packages/react-client/src/callbacks/useQuery.ts @@ -1,15 +1,12 @@ 'use client'; import type { DefaultError } from '@tanstack/query-core'; -import { - useQuery as useQueryTanstack, - type UseQueryResult, -} from '@tanstack/react-query'; - +import type { UseQueryResult } from '@tanstack/react-query'; import type { OperationSchema } from '../lib/requestFn.js'; -import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { useQuery as useQueryTanstack } from '@tanstack/react-query'; +import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; export const useQuery: ( qraftOptions: QraftClientOptions | undefined, diff --git a/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts b/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts index f24b7a11..411bed7e 100644 --- a/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts +++ b/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts @@ -1,15 +1,12 @@ 'use client'; import type { DefaultError, InfiniteData } from '@tanstack/query-core'; -import { - useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, - type UseSuspenseInfiniteQueryResult, -} from '@tanstack/react-query'; - +import type { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query'; import type { OperationSchema } from '../lib/requestFn.js'; -import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack } from '@tanstack/react-query'; +import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; export const useSuspenseInfiniteQuery: < TQueryFnData, diff --git a/packages/react-client/src/callbacks/useSuspenseQueries.ts b/packages/react-client/src/callbacks/useSuspenseQueries.ts index 07b4210d..99092196 100644 --- a/packages/react-client/src/callbacks/useSuspenseQueries.ts +++ b/packages/react-client/src/callbacks/useSuspenseQueries.ts @@ -1,16 +1,14 @@ 'use client'; -import { useContext } from 'react'; - +import type { OperationSchema } from '../lib/requestFn.js'; +import type { QraftClientOptions } from '../qraftAPIClient.js'; import { SuspenseQueriesResults, useSuspenseQueries as useSuspenseQueriesTanstack, } from '@tanstack/react-query'; - +import { useContext } from 'react'; import { composeQueryKey } from '../lib/composeQueryKey.js'; -import type { OperationSchema } from '../lib/requestFn.js'; import { useQueryClient } from '../lib/useQueryClient.js'; -import type { QraftClientOptions } from '../qraftAPIClient.js'; import { QraftContext } from '../QraftContext.js'; import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; diff --git a/packages/react-client/src/callbacks/useSuspenseQuery.ts b/packages/react-client/src/callbacks/useSuspenseQuery.ts index e26b4b1a..5b4377e8 100644 --- a/packages/react-client/src/callbacks/useSuspenseQuery.ts +++ b/packages/react-client/src/callbacks/useSuspenseQuery.ts @@ -1,15 +1,12 @@ 'use client'; import type { DefaultError } from '@tanstack/query-core'; -import { - type UseQueryResult, - useSuspenseQuery as useSuspenseQueryTanstack, -} from '@tanstack/react-query'; - +import type { UseQueryResult } from '@tanstack/react-query'; import type { OperationSchema } from '../lib/requestFn.js'; -import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; import type { QraftClientOptions } from '../qraftAPIClient.js'; import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js'; +import { useSuspenseQuery as useSuspenseQueryTanstack } from '@tanstack/react-query'; +import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js'; export const useSuspenseQuery: < TQueryFnData = unknown, diff --git a/packages/react-client/src/lib/callQueryClientFetchMethod.ts b/packages/react-client/src/lib/callQueryClientFetchMethod.ts index 4629ecf6..f2b30eaa 100644 --- a/packages/react-client/src/lib/callQueryClientFetchMethod.ts +++ b/packages/react-client/src/lib/callQueryClientFetchMethod.ts @@ -1,8 +1,7 @@ import type { QueryClient } from '@tanstack/query-core'; - +import type { OperationSchema, RequestFn } from './requestFn.js'; import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js'; import { composeQueryKey } from './composeQueryKey.js'; -import type { OperationSchema, RequestFn } from './requestFn.js'; import { shelfMerge } from './shelfMerge.js'; /** diff --git a/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts b/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts index 89619e98..7b1a63ed 100644 --- a/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts +++ b/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts @@ -1,7 +1,6 @@ import type { QueryClient } from '@tanstack/query-core'; - -import { composeMutationFilters } from './composeMutationFilters.js'; import type { OperationSchema } from './requestFn.js'; +import { composeMutationFilters } from './composeMutationFilters.js'; /** * Calls a query client method with mutation filters and options, diff --git a/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts b/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts index 7b9827a7..69fc2abe 100644 --- a/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts +++ b/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts @@ -1,7 +1,6 @@ import type { QueryClient } from '@tanstack/query-core'; - -import { composeQueryFilters } from './composeQueryFilters.js'; import type { OperationSchema } from './requestFn.js'; +import { composeQueryFilters } from './composeQueryFilters.js'; /** * Calls a query client method with query filters and options, diff --git a/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts b/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts index 3e806b5a..399fd570 100644 --- a/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts +++ b/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts @@ -1,8 +1,7 @@ import type { QueryClient } from '@tanstack/query-core'; - +import type { OperationSchema } from './requestFn.js'; import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js'; import { composeQueryKey } from './composeQueryKey.js'; -import type { OperationSchema } from './requestFn.js'; /** * Calls a query client method with parameters and options, diff --git a/packages/react-client/src/lib/composeInfiniteQueryKey.ts b/packages/react-client/src/lib/composeInfiniteQueryKey.ts index 8d77662c..6d128530 100644 --- a/packages/react-client/src/lib/composeInfiniteQueryKey.ts +++ b/packages/react-client/src/lib/composeInfiniteQueryKey.ts @@ -1,6 +1,6 @@ import type { ServiceOperationInfiniteQueryKey } from '../service-operation/ServiceOperationKey.js'; -import { composeBaseQueryKey } from './composeBaseQueryKey.js'; import type { OperationSchema } from './requestFn.js'; +import { composeBaseQueryKey } from './composeBaseQueryKey.js'; export function composeInfiniteQueryKey< TSchema extends OperationSchema, diff --git a/packages/react-client/src/lib/composeMutationFilters.ts b/packages/react-client/src/lib/composeMutationFilters.ts index cf2e8620..8f19132d 100644 --- a/packages/react-client/src/lib/composeMutationFilters.ts +++ b/packages/react-client/src/lib/composeMutationFilters.ts @@ -1,5 +1,5 @@ -import { composeMutationKey } from './composeMutationKey.js'; import type { OperationSchema } from './requestFn.js'; +import { composeMutationKey } from './composeMutationKey.js'; /** * Replaces the `parameters` field in the filters with a `mutationKey` field based on the schema. diff --git a/packages/react-client/src/lib/composeQueryFilters.ts b/packages/react-client/src/lib/composeQueryFilters.ts index 5330b550..8f5d08ca 100644 --- a/packages/react-client/src/lib/composeQueryFilters.ts +++ b/packages/react-client/src/lib/composeQueryFilters.ts @@ -1,7 +1,7 @@ +import type { OperationSchema } from './requestFn.js'; import { composeBaseQueryKey } from './composeBaseQueryKey.js'; import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js'; import { composeQueryKey } from './composeQueryKey.js'; -import type { OperationSchema } from './requestFn.js'; /** * Replaces the `parameters` field in the filters with a `queryKey` field based on the schema. diff --git a/packages/react-client/src/lib/composeQueryKey.ts b/packages/react-client/src/lib/composeQueryKey.ts index bbeebcb6..13810add 100644 --- a/packages/react-client/src/lib/composeQueryKey.ts +++ b/packages/react-client/src/lib/composeQueryKey.ts @@ -1,6 +1,6 @@ import type { ServiceOperationQueryKey } from '../service-operation/ServiceOperationKey.js'; -import { composeBaseQueryKey } from './composeBaseQueryKey.js'; import type { OperationSchema } from './requestFn.js'; +import { composeBaseQueryKey } from './composeBaseQueryKey.js'; export function composeQueryKey( schema: TSchema, diff --git a/packages/react-client/src/lib/jwt-decode/index.test.ts b/packages/react-client/src/lib/jwt-decode/index.test.ts index 7cd71bb1..322b58a0 100644 --- a/packages/react-client/src/lib/jwt-decode/index.test.ts +++ b/packages/react-client/src/lib/jwt-decode/index.test.ts @@ -1,10 +1,9 @@ import { describe, expect, it } from 'vitest'; - import { - jwtDecode, + b64DecodeUnicode, InvalidTokenError, + jwtDecode, JwtPayload, - b64DecodeUnicode, } from './index.js'; const token = diff --git a/packages/react-client/src/lib/useComposeUseQueryOptions.ts b/packages/react-client/src/lib/useComposeUseQueryOptions.ts index 965aed82..82823e40 100644 --- a/packages/react-client/src/lib/useComposeUseQueryOptions.ts +++ b/packages/react-client/src/lib/useComposeUseQueryOptions.ts @@ -1,16 +1,14 @@ 'use client'; -import { useContext } from 'react'; - import type { QueryClient } from '@tanstack/query-core'; import type { UseQueryOptions } from '@tanstack/react-query'; - import type { QraftClientOptions } from '../qraftAPIClient.js'; -import { QraftContext } from '../QraftContext.js'; import type { ServiceOperationQueryKey } from '../service-operation/ServiceOperationKey.js'; +import type { OperationSchema } from './requestFn.js'; +import { useContext } from 'react'; +import { QraftContext } from '../QraftContext.js'; import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js'; import { composeQueryKey } from './composeQueryKey.js'; -import type { OperationSchema } from './requestFn.js'; import { shelfMerge } from './shelfMerge.js'; import { useQueryClient } from './useQueryClient.js'; diff --git a/packages/react-client/src/lib/useQueryClient.ts b/packages/react-client/src/lib/useQueryClient.ts index 9d7c37cb..b21a4b6b 100644 --- a/packages/react-client/src/lib/useQueryClient.ts +++ b/packages/react-client/src/lib/useQueryClient.ts @@ -1,13 +1,11 @@ 'use client'; -import { useContext } from 'react'; - +import type { QraftClientOptions } from '../qraftAPIClient.js'; import { QueryClient, useQueryClient as useQueryClientTanstack, } from '@tanstack/react-query'; - -import type { QraftClientOptions } from '../qraftAPIClient.js'; +import { useContext } from 'react'; import { QraftContext } from '../QraftContext.js'; /** diff --git a/packages/react-client/src/qraftAPIClient.ts b/packages/react-client/src/qraftAPIClient.ts index 6210e31b..8119b8a0 100644 --- a/packages/react-client/src/qraftAPIClient.ts +++ b/packages/react-client/src/qraftAPIClient.ts @@ -1,9 +1,8 @@ import type { Context } from 'react'; - import type * as operationInvokeModule from './callbacks/operationInvokeFn.js'; -import { createRecursiveProxy } from './lib/createRecursiveProxy.js'; import type { OperationSchema } from './lib/requestFn.js'; import type { QraftContextValue } from './QraftContext.js'; +import { createRecursiveProxy } from './lib/createRecursiveProxy.js'; export interface QraftClientOptions { context?: Context; diff --git a/packages/react-client/src/service-operation/OperationInfiniteData.ts b/packages/react-client/src/service-operation/OperationInfiniteData.ts index cc3e17be..4d9f97ae 100644 --- a/packages/react-client/src/service-operation/OperationInfiniteData.ts +++ b/packages/react-client/src/service-operation/OperationInfiniteData.ts @@ -1,5 +1,4 @@ import type { InfiniteData } from '@tanstack/query-core'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; export type OperationInfiniteData = InfiniteData< diff --git a/packages/react-client/src/service-operation/QueryFilters.ts b/packages/react-client/src/service-operation/QueryFilters.ts index 00ca2fc7..05f27f9e 100644 --- a/packages/react-client/src/service-operation/QueryFilters.ts +++ b/packages/react-client/src/service-operation/QueryFilters.ts @@ -1,5 +1,4 @@ import type { DefaultError, FetchStatus, Query } from '@tanstack/query-core'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { diff --git a/packages/react-client/src/service-operation/ServiceOperation.ts b/packages/react-client/src/service-operation/ServiceOperation.ts index c6ef6377..97653f0f 100644 --- a/packages/react-client/src/service-operation/ServiceOperation.ts +++ b/packages/react-client/src/service-operation/ServiceOperation.ts @@ -1,5 +1,4 @@ import type { DefaultError } from '@tanstack/query-core'; - import type { ServiceOperationCancelQueries } from './ServiceOperationCancelQueries.js'; import type { ServiceOperationFetchInfiniteQuery } from './ServiceOperationFetchInfiniteQuery.js'; import type { ServiceOperationFetchQuery } from './ServiceOperationFetchQuery.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationCancelQueries.ts b/packages/react-client/src/service-operation/ServiceOperationCancelQueries.ts index f15ca29f..7ab75a5d 100644 --- a/packages/react-client/src/service-operation/ServiceOperationCancelQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationCancelQueries.ts @@ -3,7 +3,6 @@ import type { DefaultError, QueryClient, } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationFetchInfiniteQuery.ts b/packages/react-client/src/service-operation/ServiceOperationFetchInfiniteQuery.ts index 0a2bffb1..59172a1c 100644 --- a/packages/react-client/src/service-operation/ServiceOperationFetchInfiniteQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationFetchInfiniteQuery.ts @@ -6,7 +6,6 @@ import type { QueryClient, QueryFunction, } from '@tanstack/query-core'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; import type { RequestFn } from '../lib/requestFn.js'; import type { OperationInfiniteData } from './OperationInfiniteData.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationFetchQuery.ts b/packages/react-client/src/service-operation/ServiceOperationFetchQuery.ts index 190baa5b..77f546a6 100644 --- a/packages/react-client/src/service-operation/ServiceOperationFetchQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationFetchQuery.ts @@ -4,7 +4,6 @@ import type { QueryClient, QueryFunction, } from '@tanstack/query-core'; - import type { RequestFn } from '../lib/requestFn.js'; import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationGetInfiniteQueryData.ts b/packages/react-client/src/service-operation/ServiceOperationGetInfiniteQueryData.ts index d396da57..e3f8bc72 100644 --- a/packages/react-client/src/service-operation/ServiceOperationGetInfiniteQueryData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationGetInfiniteQueryData.ts @@ -1,5 +1,4 @@ import type { QueryClient } from '@tanstack/query-core'; - import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationGetQueriesData.ts b/packages/react-client/src/service-operation/ServiceOperationGetQueriesData.ts index 3f86a112..a010dec4 100644 --- a/packages/react-client/src/service-operation/ServiceOperationGetQueriesData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationGetQueriesData.ts @@ -1,5 +1,4 @@ import type { DefaultError, NoInfer, QueryClient } from '@tanstack/query-core'; - import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { QueryFiltersByParameters, diff --git a/packages/react-client/src/service-operation/ServiceOperationGetQueryData.ts b/packages/react-client/src/service-operation/ServiceOperationGetQueryData.ts index 5828bb03..996d9801 100644 --- a/packages/react-client/src/service-operation/ServiceOperationGetQueryData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationGetQueryData.ts @@ -1,5 +1,4 @@ import type { QueryClient } from '@tanstack/query-core'; - import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; export interface ServiceOperationGetQueryData< diff --git a/packages/react-client/src/service-operation/ServiceOperationGetQueryState.ts b/packages/react-client/src/service-operation/ServiceOperationGetQueryState.ts index d86fc2f9..1d5f5d93 100644 --- a/packages/react-client/src/service-operation/ServiceOperationGetQueryState.ts +++ b/packages/react-client/src/service-operation/ServiceOperationGetQueryState.ts @@ -3,7 +3,6 @@ import type { QueryClient, QueryState, } from '@tanstack/query-core'; - import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { ServiceOperationInfiniteQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationInvalidateQueries.ts b/packages/react-client/src/service-operation/ServiceOperationInvalidateQueries.ts index 686ab381..6ca7e584 100644 --- a/packages/react-client/src/service-operation/ServiceOperationInvalidateQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationInvalidateQueries.ts @@ -3,7 +3,6 @@ import type { InvalidateOptions, QueryClient, } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationIsFetchingQueries.ts b/packages/react-client/src/service-operation/ServiceOperationIsFetchingQueries.ts index a782daf1..fc14f224 100644 --- a/packages/react-client/src/service-operation/ServiceOperationIsFetchingQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationIsFetchingQueries.ts @@ -1,5 +1,4 @@ import type { DefaultError, QueryClient } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationIsMutatingQueries.ts b/packages/react-client/src/service-operation/ServiceOperationIsMutatingQueries.ts index b1c48e8e..4aa275d3 100644 --- a/packages/react-client/src/service-operation/ServiceOperationIsMutatingQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationIsMutatingQueries.ts @@ -1,5 +1,4 @@ import type { DefaultError, QueryClient } from '@tanstack/query-core'; - import type { MutationFiltersByMutationKey, MutationFiltersByParameters, diff --git a/packages/react-client/src/service-operation/ServiceOperationRefetchQueries.ts b/packages/react-client/src/service-operation/ServiceOperationRefetchQueries.ts index 089375c7..7b5b0a2b 100644 --- a/packages/react-client/src/service-operation/ServiceOperationRefetchQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationRefetchQueries.ts @@ -4,7 +4,6 @@ import type { RefetchOptions, ResetOptions, } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationRemoveQueries.ts b/packages/react-client/src/service-operation/ServiceOperationRemoveQueries.ts index a0dafd85..9b829211 100644 --- a/packages/react-client/src/service-operation/ServiceOperationRemoveQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationRemoveQueries.ts @@ -1,5 +1,4 @@ import type { DefaultError, QueryClient } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationResetQueries.ts b/packages/react-client/src/service-operation/ServiceOperationResetQueries.ts index 9df6c7c8..2c0a1cc8 100644 --- a/packages/react-client/src/service-operation/ServiceOperationResetQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationResetQueries.ts @@ -3,7 +3,6 @@ import type { QueryClient, ResetOptions, } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationSetInfiniteQueryData.ts b/packages/react-client/src/service-operation/ServiceOperationSetInfiniteQueryData.ts index 99147247..83c5c9d8 100644 --- a/packages/react-client/src/service-operation/ServiceOperationSetInfiniteQueryData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationSetInfiniteQueryData.ts @@ -4,7 +4,6 @@ import type { SetDataOptions, Updater, } from '@tanstack/query-core'; - import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationSetQueriesData.ts b/packages/react-client/src/service-operation/ServiceOperationSetQueriesData.ts index 4cfef151..9546b3f2 100644 --- a/packages/react-client/src/service-operation/ServiceOperationSetQueriesData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationSetQueriesData.ts @@ -5,7 +5,6 @@ import type { SetDataOptions, Updater, } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationSetQueryData.ts b/packages/react-client/src/service-operation/ServiceOperationSetQueryData.ts index faceb794..98a5c2c3 100644 --- a/packages/react-client/src/service-operation/ServiceOperationSetQueryData.ts +++ b/packages/react-client/src/service-operation/ServiceOperationSetQueryData.ts @@ -4,7 +4,6 @@ import type { SetDataOptions, Updater, } from '@tanstack/query-core'; - import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; export interface ServiceOperationSetQueryData< diff --git a/packages/react-client/src/service-operation/ServiceOperationUseInfiniteQuery.ts b/packages/react-client/src/service-operation/ServiceOperationUseInfiniteQuery.ts index 43ad67ff..edea4323 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseInfiniteQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseInfiniteQuery.ts @@ -9,7 +9,6 @@ import type { UndefinedInitialDataInfiniteOptions, UseInfiniteQueryResult, } from '@tanstack/react-query'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationUseIsFetchingQueries.ts b/packages/react-client/src/service-operation/ServiceOperationUseIsFetchingQueries.ts index a1494b9f..b629d0ac 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseIsFetchingQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseIsFetchingQueries.ts @@ -1,5 +1,4 @@ import type { DefaultError, QueryClient } from '@tanstack/query-core'; - import type { QueryFiltersByParameters, QueryFiltersByQueryKey, diff --git a/packages/react-client/src/service-operation/ServiceOperationUseIsMutating.ts b/packages/react-client/src/service-operation/ServiceOperationUseIsMutating.ts index 93e4b61f..94c6a243 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseIsMutating.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseIsMutating.ts @@ -1,5 +1,4 @@ import type { DefaultError, QueryClient } from '@tanstack/query-core'; - import type { MutationFiltersByMutationKey, MutationFiltersByParameters, diff --git a/packages/react-client/src/service-operation/ServiceOperationUseMutation.ts b/packages/react-client/src/service-operation/ServiceOperationUseMutation.ts index f729ba7b..c00388dc 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseMutation.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseMutation.ts @@ -3,7 +3,6 @@ import type { UseMutationOptions, UseMutationResult, } from '@tanstack/react-query'; - import type { AreAllOptional } from '../lib/AreAllOptional.js'; import type { ServiceOperationMutationKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationUseMutationState.ts b/packages/react-client/src/service-operation/ServiceOperationUseMutationState.ts index 00e874d0..a74fd663 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseMutationState.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseMutationState.ts @@ -5,7 +5,6 @@ import type { MutationStatus, QueryClient, } from '@tanstack/query-core'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; import type { ServiceOperationMutationKey } from './ServiceOperationKey.js'; import type { MutationVariables } from './ServiceOperationUseMutation.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationUseQueries.ts b/packages/react-client/src/service-operation/ServiceOperationUseQueries.ts index 628036a3..d1f99f1b 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseQueries.ts @@ -1,11 +1,10 @@ +import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; +import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; import { DefaultError, QueriesPlaceholderDataFunction, QueryClient, } from '@tanstack/query-core'; -import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; - -import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; type UseQueryOptionsForUseQueries< TSchema extends { url: string; method: string }, diff --git a/packages/react-client/src/service-operation/ServiceOperationUseQuery.ts b/packages/react-client/src/service-operation/ServiceOperationUseQuery.ts index 52d75b46..3df0b312 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseQuery.ts @@ -5,9 +5,8 @@ import type { UndefinedInitialDataOptions, UseQueryResult, } from '@tanstack/react-query'; - -import { AreAllOptional } from '../lib/AreAllOptional.js'; import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; +import { AreAllOptional } from '../lib/AreAllOptional.js'; export interface ServiceOperationUseQuery< TSchema extends { url: string; method: string }, diff --git a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts index fdea7c6a..477ab204 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts @@ -7,7 +7,6 @@ import type { UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, } from '@tanstack/react-query'; - import type { PartialParameters } from '../lib/PartialParameters.type.js'; import type { OperationInfiniteData } from './OperationInfiniteData.js'; import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'; diff --git a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQueries.ts b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQueries.ts index 29d48514..db25cd89 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQueries.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQueries.ts @@ -3,7 +3,6 @@ import type { UseQueryOptions, UseSuspenseQueryResult, } from '@tanstack/react-query'; - import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; type UseQueryOptionsForUseSuspenseQuery< diff --git a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQuery.ts b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQuery.ts index 731d35fd..ec047f35 100644 --- a/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQuery.ts +++ b/packages/react-client/src/service-operation/ServiceOperationUseSuspenseQuery.ts @@ -3,7 +3,6 @@ import type { UseSuspenseQueryOptions, UseSuspenseQueryResult, } from '@tanstack/react-query'; - import type { ServiceOperationQueryKey } from './ServiceOperationKey.js'; export interface ServiceOperationUseSuspenseQuery< diff --git a/packages/react-client/src/tests/QraftSecureRequestFn.test.tsx b/packages/react-client/src/tests/QraftSecureRequestFn.test.tsx index 9b9d4192..efdf6282 100644 --- a/packages/react-client/src/tests/QraftSecureRequestFn.test.tsx +++ b/packages/react-client/src/tests/QraftSecureRequestFn.test.tsx @@ -1,12 +1,10 @@ -import React, { ReactNode } from 'react'; - +import type { RequestFn } from '../lib/requestFn.js'; import { QraftContext as QraftContextDist } from '@openapi-qraft/react'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { act, renderHook, waitFor } from '@testing-library/react'; - +import React, { ReactNode } from 'react'; import { vi } from 'vitest'; - -import { type RequestFn, requestFn } from '../lib/requestFn.js'; +import { requestFn } from '../lib/requestFn.js'; import { QraftSecureRequestFn } from '../Unstable_QraftSecureRequestFn.js'; import { createTestJwt } from './createTestJwt.js'; import { createAPIClient } from './fixtures/api/index.js'; diff --git a/packages/react-client/src/tests/callQueryClientFetchMethod.test.ts b/packages/react-client/src/tests/callQueryClientFetchMethod.test.ts index d5eef2d9..8d9717dd 100644 --- a/packages/react-client/src/tests/callQueryClientFetchMethod.test.ts +++ b/packages/react-client/src/tests/callQueryClientFetchMethod.test.ts @@ -1,5 +1,4 @@ import { QueryClient } from '@tanstack/react-query'; - import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js'; describe('callQueryClientFetchMethod', () => { diff --git a/packages/react-client/src/tests/createTestJwt.test.ts b/packages/react-client/src/tests/createTestJwt.test.ts index 9d95c2a5..23adf0b9 100644 --- a/packages/react-client/src/tests/createTestJwt.test.ts +++ b/packages/react-client/src/tests/createTestJwt.test.ts @@ -1,5 +1,4 @@ import { expect } from 'vitest'; - import { jwtDecode } from '../lib/jwt-decode/index.js'; import { createTestJwt } from './createTestJwt.js'; diff --git a/packages/react-client/src/tests/msw/handlers.ts b/packages/react-client/src/tests/msw/handlers.ts index f1560095..41a18a5d 100644 --- a/packages/react-client/src/tests/msw/handlers.ts +++ b/packages/react-client/src/tests/msw/handlers.ts @@ -1,6 +1,5 @@ import { http, HttpResponse } from 'msw'; import queryString from 'query-string'; - import { Services, services } from '../fixtures/api/index.js'; export const handlers = [ diff --git a/packages/react-client/src/tests/msw/node.ts b/packages/react-client/src/tests/msw/node.ts index 9ea8d0aa..f10a6b64 100644 --- a/packages/react-client/src/tests/msw/node.ts +++ b/packages/react-client/src/tests/msw/node.ts @@ -1,5 +1,4 @@ import { setupServer } from 'msw/node'; - import { handlers } from './handlers.js'; export const server = setupServer(...handlers); diff --git a/packages/react-client/src/tests/qraftAPIClient.test.tsx b/packages/react-client/src/tests/qraftAPIClient.test.tsx index ca6567bb..8e0ff78b 100644 --- a/packages/react-client/src/tests/qraftAPIClient.test.tsx +++ b/packages/react-client/src/tests/qraftAPIClient.test.tsx @@ -1,5 +1,8 @@ -import React, { createContext, ReactNode, useEffect } from 'react'; - +import type { + OperationSchema, + RequestFn, + RequestFnInfo, +} from '../lib/requestFn.js'; import { QraftContext as QraftContextDist } from '@openapi-qraft/react'; import { QueryClient, @@ -7,20 +10,14 @@ import { useQueryClient, } from '@tanstack/react-query'; import { act, renderHook, waitFor } from '@testing-library/react'; - +import React, { createContext, ReactNode, useEffect } from 'react'; import { vi } from 'vitest'; - import { bodySerializer, QraftContextValue, requestFn, urlSerializer, } from '../index.js'; -import type { - OperationSchema, - RequestFn, - RequestFnInfo, -} from '../lib/requestFn.js'; import { createAPIClient } from './fixtures/api/index.js'; const qraft = createAPIClient(); diff --git a/packages/react-client/src/tests/setupTests.ts b/packages/react-client/src/tests/setupTests.ts index fda6926c..2918d4ac 100644 --- a/packages/react-client/src/tests/setupTests.ts +++ b/packages/react-client/src/tests/setupTests.ts @@ -1,7 +1,5 @@ import '@testing-library/jest-dom'; - import { afterAll, afterEach, beforeAll } from 'vitest'; - import { server } from './msw/node.js'; beforeAll(() => { diff --git a/packages/react-client/vitest.config.ts b/packages/react-client/vitest.config.ts index cb95b426..5daf88e4 100644 --- a/packages/react-client/vitest.config.ts +++ b/packages/react-client/vitest.config.ts @@ -1,6 +1,5 @@ -import react from '@vitejs/plugin-react'; - import { fileURLToPath } from 'node:url'; +import react from '@vitejs/plugin-react'; import { defineConfig } from 'vitest/config'; export default defineConfig({ diff --git a/packages/tanstack-query-react-plugin/eslint.config.js b/packages/tanstack-query-react-plugin/eslint.config.js index 518641c2..d8f66c5f 100644 --- a/packages/tanstack-query-react-plugin/eslint.config.js +++ b/packages/tanstack-query-react-plugin/eslint.config.js @@ -1,5 +1,4 @@ import openAPIQraftConfig from '@openapi-qraft/eslint-config/eslint.vanilla.config'; - import globals from 'globals'; export default [ diff --git a/packages/tanstack-query-react-plugin/src/generateCode.ts b/packages/tanstack-query-react-plugin/src/generateCode.ts index 87432f2d..bf532340 100644 --- a/packages/tanstack-query-react-plugin/src/generateCode.ts +++ b/packages/tanstack-query-react-plugin/src/generateCode.ts @@ -1,12 +1,10 @@ +import { URL } from 'node:url'; import { formatFileHeader } from '@openapi-qraft/plugin/lib/formatFileHeader'; import { GeneratorFile } from '@openapi-qraft/plugin/lib/GeneratorFile'; import { Service } from '@openapi-qraft/plugin/lib/open-api/getServices'; import { OutputOptions as OutputOptionsBase } from '@openapi-qraft/plugin/lib/OutputOptions'; - import c from 'ansi-colors'; -import { URL } from 'node:url'; import { Ora } from 'ora'; - import { astToString } from './ts-factory/astToString.js'; import { getClientFactory } from './ts-factory/getClientFactory.js'; import { getIndexFactory } from './ts-factory/getIndexFactory.js'; diff --git a/packages/tanstack-query-react-plugin/src/plugin.spec.ts b/packages/tanstack-query-react-plugin/src/plugin.spec.ts index 4038f1b3..0a723229 100644 --- a/packages/tanstack-query-react-plugin/src/plugin.spec.ts +++ b/packages/tanstack-query-react-plugin/src/plugin.spec.ts @@ -1,5 +1,4 @@ import '@openapi-qraft/plugin/lib/vitestFsMock'; - import fs from 'node:fs'; import { createRequire } from 'node:module'; import { beforeAll, describe, expect, test } from 'vitest'; diff --git a/packages/tanstack-query-react-plugin/src/plugin.ts b/packages/tanstack-query-react-plugin/src/plugin.ts index 703ff94e..e5c63d8f 100644 --- a/packages/tanstack-query-react-plugin/src/plugin.ts +++ b/packages/tanstack-query-react-plugin/src/plugin.ts @@ -1,7 +1,6 @@ import { fileHeader } from '@openapi-qraft/plugin/lib/fileHeader'; import { QraftCommand } from '@openapi-qraft/plugin/lib/QraftCommand'; import { QraftCommandPlugin } from '@openapi-qraft/plugin/lib/QraftCommandPlugin'; - import { generateCode } from './generateCode.js'; export const plugin: QraftCommandPlugin = { diff --git a/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.spec.ts b/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.spec.ts index 2f9be54c..4643442a 100644 --- a/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.spec.ts +++ b/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.spec.ts @@ -1,5 +1,4 @@ import { describe, expect, test } from 'vitest'; - import { maybeResolveImport } from './getIndexFactory.js'; describe('maybeResolveImport', () => { diff --git a/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.ts b/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.ts index 2694be0c..53bcef46 100644 --- a/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.ts +++ b/packages/tanstack-query-react-plugin/src/ts-factory/getIndexFactory.ts @@ -1,6 +1,5 @@ -import ts from 'typescript'; - import type { ServiceImportsFactoryOptions } from './getServiceFactory.js'; +import ts from 'typescript'; export const getIndexFactory = ({ openapiTypesImportPath, diff --git a/packages/tanstack-query-react-plugin/src/ts-factory/getServiceFactory.ts b/packages/tanstack-query-react-plugin/src/ts-factory/getServiceFactory.ts index a98283d6..3af892a2 100644 --- a/packages/tanstack-query-react-plugin/src/ts-factory/getServiceFactory.ts +++ b/packages/tanstack-query-react-plugin/src/ts-factory/getServiceFactory.ts @@ -1,5 +1,4 @@ import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/getServices'; - import ts from 'typescript'; const SERVICE_OPERATION_QUERY = 'ServiceOperationQuery'; diff --git a/packages/tanstack-query-react-plugin/src/ts-factory/getServiceIndexFactory.ts b/packages/tanstack-query-react-plugin/src/ts-factory/getServiceIndexFactory.ts index e0bb5261..75ab09ed 100644 --- a/packages/tanstack-query-react-plugin/src/ts-factory/getServiceIndexFactory.ts +++ b/packages/tanstack-query-react-plugin/src/ts-factory/getServiceIndexFactory.ts @@ -1,5 +1,4 @@ import { Service } from '@openapi-qraft/plugin/lib/open-api/getServices'; - import ts from 'typescript'; type Options = { explicitImportExtensions: boolean }; diff --git a/website/package.json b/website/package.json index dbff9e7c..e63323ff 100644 --- a/website/package.json +++ b/website/package.json @@ -28,7 +28,7 @@ "@docusaurus/module-type-aliases": "3.4.0", "@docusaurus/types": "3.4.0", "editorconfig-checker": "^5.1.5", - "prettier": "^3.2.5", + "prettier": "^3.3.3", "remark-cli": "12.0.0", "remark-heading-id": "^1.0.1", "remark-lint-match-punctuation": "0.2.1", diff --git a/yarn.lock b/yarn.lock index 732fa673..764efd7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -242,6 +242,16 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/code-frame@npm:7.24.7" + dependencies: + "@babel/highlight": "npm:^7.24.7" + picocolors: "npm:^1.0.0" + checksum: 10c0/ab0af539473a9f5aeaac7047e377cb4f4edd255a81d84a76058595f8540784cc3fbe8acf73f1e073981104562490aabfb23008cd66dc677a456a4ed5390fdde6 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5": version: 7.23.5 resolution: "@babel/compat-data@npm:7.23.5" @@ -256,6 +266,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/compat-data@npm:7.25.2" + checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5 + languageName: node + linkType: hard + "@babel/core@npm:^7.21.3": version: 7.24.6 resolution: "@babel/core@npm:7.24.6" @@ -302,18 +319,30 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.17.7": - version: 7.17.7 - resolution: "@babel/generator@npm:7.17.7" +"@babel/core@npm:^7.24.0": + version: 7.25.2 + resolution: "@babel/core@npm:7.25.2" dependencies: - "@babel/types": "npm:^7.17.0" - jsesc: "npm:^2.5.1" - source-map: "npm:^0.5.0" - checksum: 10c0/8088453c4418e0ee6528506fbd5847bbdfd56327a0025ca9496a259261e162c594ffd08be0d63e74c32feced795616772f38acc5f5e493a86a45fd439fd9feb0 + "@ampproject/remapping": "npm:^2.2.0" + "@babel/code-frame": "npm:^7.24.7" + "@babel/generator": "npm:^7.25.0" + "@babel/helper-compilation-targets": "npm:^7.25.2" + "@babel/helper-module-transforms": "npm:^7.25.2" + "@babel/helpers": "npm:^7.25.0" + "@babel/parser": "npm:^7.25.0" + "@babel/template": "npm:^7.25.0" + "@babel/traverse": "npm:^7.25.2" + "@babel/types": "npm:^7.25.2" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.2" + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: 10c0/a425fa40e73cb72b6464063a57c478bc2de9dbcc19c280f1b55a3d88b35d572e87e8594e7d7b4880331addb6faef641bbeb701b91b41b8806cd4deae5d74f401 languageName: node linkType: hard -"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.6": +"@babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.6": version: 7.23.6 resolution: "@babel/generator@npm:7.23.6" dependencies: @@ -337,6 +366,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/generator@npm:7.25.0" + dependencies: + "@babel/types": "npm:^7.25.0" + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.25" + jsesc: "npm:^2.5.1" + checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -399,6 +440,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/helper-compilation-targets@npm:7.25.2" + dependencies: + "@babel/compat-data": "npm:^7.25.2" + "@babel/helper-validator-option": "npm:^7.24.8" + browserslist: "npm:^4.23.1" + lru-cache: "npm:^5.1.1" + semver: "npm:^6.3.1" + checksum: 10c0/de10e986b5322c9f807350467dc845ec59df9e596a5926a3b5edbb4710d8e3b8009d4396690e70b88c3844fe8ec4042d61436dd4b92d1f5f75655cf43ab07e99 + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.6": version: 7.24.0 resolution: "@babel/helper-create-class-features-plugin@npm:7.24.0" @@ -596,6 +650,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/helper-module-imports@npm:7.24.7" + dependencies: + "@babel/traverse": "npm:^7.24.7" + "@babel/types": "npm:^7.24.7" + checksum: 10c0/97c57db6c3eeaea31564286e328a9fb52b0313c5cfcc7eee4bc226aebcf0418ea5b6fe78673c0e4a774512ec6c86e309d0f326e99d2b37bfc16a25a032498af0 + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.23.3": version: 7.23.3 resolution: "@babel/helper-module-transforms@npm:7.23.3" @@ -626,6 +690,20 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/helper-module-transforms@npm:7.25.2" + dependencies: + "@babel/helper-module-imports": "npm:^7.24.7" + "@babel/helper-simple-access": "npm:^7.24.7" + "@babel/helper-validator-identifier": "npm:^7.24.7" + "@babel/traverse": "npm:^7.25.2" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/adaa15970ace0aee5934b5a633789b5795b6229c6a9cf3e09a7e80aa33e478675eee807006a862aa9aa517935d81f88a6db8a9f5936e3a2a40ec75f8062bc329 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" @@ -728,6 +806,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-simple-access@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/helper-simple-access@npm:7.24.7" + dependencies: + "@babel/traverse": "npm:^7.24.7" + "@babel/types": "npm:^7.24.7" + checksum: 10c0/7230e419d59a85f93153415100a5faff23c133d7442c19e0cd070da1784d13cd29096ee6c5a5761065c44e8164f9f80e3a518c41a0256df39e38f7ad6744fed7 + languageName: node + linkType: hard + "@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5" @@ -778,7 +866,14 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.20": +"@babel/helper-string-parser@npm:^7.24.8": + version: 7.24.8 + resolution: "@babel/helper-string-parser@npm:7.24.8" + checksum: 10c0/6361f72076c17fabf305e252bf6d580106429014b3ab3c1f5c4eb3e6d465536ea6b670cc0e9a637a77a9ad40454d3e41361a2909e70e305116a23d68ce094c08 + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" checksum: 10c0/dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e @@ -792,6 +887,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/helper-validator-identifier@npm:7.24.7" + checksum: 10c0/87ad608694c9477814093ed5b5c080c2e06d44cb1924ae8320474a74415241223cc2a725eea2640dd783ff1e3390e5f95eede978bc540e870053152e58f1d651 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5": version: 7.23.5 resolution: "@babel/helper-validator-option@npm:7.23.5" @@ -806,6 +908,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.24.8": + version: 7.24.8 + resolution: "@babel/helper-validator-option@npm:7.24.8" + checksum: 10c0/73db93a34ae89201351288bee7623eed81a54000779462a986105b54ffe82069e764afd15171a428b82e7c7a9b5fec10b5d5603b216317a414062edf5c67a21f + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-wrap-function@npm:7.22.20" @@ -849,6 +958,16 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/helpers@npm:7.25.0" + dependencies: + "@babel/template": "npm:^7.25.0" + "@babel/types": "npm:^7.25.0" + checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.23.4": version: 7.23.4 resolution: "@babel/highlight@npm:7.23.4" @@ -872,7 +991,19 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.3, @babel/parser@npm:^7.24.0": +"@babel/highlight@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/highlight@npm:7.24.7" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.24.7" + chalk: "npm:^2.4.2" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.0.0" + checksum: 10c0/674334c571d2bb9d1c89bdd87566383f59231e16bcdcf5bb7835babdf03c9ae585ca0887a7b25bdf78f303984af028df52831c7989fecebb5101cc132da9393a + languageName: node + linkType: hard + +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.3, @babel/parser@npm:^7.24.0": version: 7.24.0 resolution: "@babel/parser@npm:7.24.0" bin: @@ -890,6 +1021,17 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": + version: 7.25.3 + resolution: "@babel/parser@npm:7.25.3" + dependencies: + "@babel/types": "npm:^7.25.2" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e + languageName: node + linkType: hard + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6": version: 7.24.6 resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6" @@ -2830,21 +2972,14 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:7.23.2": - version: 7.23.2 - resolution: "@babel/traverse@npm:7.23.2" +"@babel/template@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/template@npm:7.25.0" dependencies: - "@babel/code-frame": "npm:^7.22.13" - "@babel/generator": "npm:^7.23.0" - "@babel/helper-environment-visitor": "npm:^7.22.20" - "@babel/helper-function-name": "npm:^7.23.0" - "@babel/helper-hoist-variables": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/parser": "npm:^7.23.0" - "@babel/types": "npm:^7.23.0" - debug: "npm:^4.1.0" - globals: "npm:^11.1.0" - checksum: 10c0/d096c7c4bab9262a2f658298a3c630ae4a15a10755bb257ae91d5ab3e3b2877438934859c8d34018b7727379fe6b26c4fa2efc81cf4c462a7fe00caf79fa02ff + "@babel/code-frame": "npm:^7.24.7" + "@babel/parser": "npm:^7.25.0" + "@babel/types": "npm:^7.25.0" + checksum: 10c0/4e31afd873215744c016e02b04f43b9fa23205d6d0766fb2e93eb4091c60c1b88897936adb895fb04e3c23de98dfdcbe31bc98daaa1a4e0133f78bb948e1209b languageName: node linkType: hard @@ -2884,17 +3019,22 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:7.17.0": - version: 7.17.0 - resolution: "@babel/types@npm:7.17.0" +"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.25.2": + version: 7.25.3 + resolution: "@babel/traverse@npm:7.25.3" dependencies: - "@babel/helper-validator-identifier": "npm:^7.16.7" - to-fast-properties: "npm:^2.0.0" - checksum: 10c0/ad09224272b40fedb00b262677d12b6838f5b5df5c47d67059ba1181bd4805439993393a8de32459dae137b536d60ebfcaf39ae84d8b3873f1e81cc75f5aeae8 + "@babel/code-frame": "npm:^7.24.7" + "@babel/generator": "npm:^7.25.0" + "@babel/parser": "npm:^7.25.3" + "@babel/template": "npm:^7.25.0" + "@babel/types": "npm:^7.25.2" + debug: "npm:^4.3.1" + globals: "npm:^11.1.0" + checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.17.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.24.0 resolution: "@babel/types@npm:7.24.0" dependencies: @@ -2916,6 +3056,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.24.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/types@npm:7.25.2" + dependencies: + "@babel/helper-string-parser": "npm:^7.24.8" + "@babel/helper-validator-identifier": "npm:^7.24.7" + to-fast-properties: "npm:^2.0.0" + checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864 + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -4090,6 +4241,26 @@ __metadata: languageName: node linkType: hard +"@ianvs/prettier-plugin-sort-imports@npm:^4.3.1": + version: 4.3.1 + resolution: "@ianvs/prettier-plugin-sort-imports@npm:4.3.1" + dependencies: + "@babel/core": "npm:^7.24.0" + "@babel/generator": "npm:^7.23.6" + "@babel/parser": "npm:^7.24.0" + "@babel/traverse": "npm:^7.24.0" + "@babel/types": "npm:^7.24.0" + semver: "npm:^7.5.2" + peerDependencies: + "@vue/compiler-sfc": 2.7.x || 3.x + prettier: 2 || 3 + peerDependenciesMeta: + "@vue/compiler-sfc": + optional: true + checksum: 10c0/2e997fe88da3b6d8288b83aa708afde427e48be55d432dd1657ef8d28a9eb1c329afdf331f46bcfb1f3ce26d3f335598814512902e4644414b4d0ba47b9c416b + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -4531,7 +4702,7 @@ __metadata: globals: "npm:^15.0.0" jsdom: "npm:latest" msw: "npm:^2.0.12" - prettier: "npm:^3.1.1" + prettier: "npm:^3.3.3" query-string: "npm:^8.1.0" react: "npm:^18.2.0" rimraf: "npm:^5.0.5" @@ -5433,26 +5604,6 @@ __metadata: languageName: node linkType: hard -"@trivago/prettier-plugin-sort-imports@npm:^4.3.0": - version: 4.3.0 - resolution: "@trivago/prettier-plugin-sort-imports@npm:4.3.0" - dependencies: - "@babel/generator": "npm:7.17.7" - "@babel/parser": "npm:^7.20.5" - "@babel/traverse": "npm:7.23.2" - "@babel/types": "npm:7.17.0" - javascript-natural-sort: "npm:0.7.1" - lodash: "npm:^4.17.21" - peerDependencies: - "@vue/compiler-sfc": 3.x - prettier: 2.x - 3.x - peerDependenciesMeta: - "@vue/compiler-sfc": - optional: true - checksum: 10c0/42270fb9c89e54a3f8b6ac8c43e6d0e03350e2857e902cdad4de22c78ef1864da600525595311bc7e94e51c16c7dd3882c2e048a162fdab59761ffa893756aa2 - languageName: node - linkType: hard - "@trysound/sax@npm:0.2.0": version: 0.2.0 resolution: "@trysound/sax@npm:0.2.0" @@ -7688,6 +7839,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.23.1": + version: 4.23.3 + resolution: "browserslist@npm:4.23.3" + dependencies: + caniuse-lite: "npm:^1.0.30001646" + electron-to-chromium: "npm:^1.5.4" + node-releases: "npm:^2.0.18" + update-browserslist-db: "npm:^1.1.0" + bin: + browserslist: cli.js + checksum: 10c0/3063bfdf812815346447f4796c8f04601bf5d62003374305fd323c2a463e42776475bcc5309264e39bcf9a8605851e53560695991a623be988138b3ff8c66642 + languageName: node + linkType: hard + "buffer-equal-constant-time@npm:1.0.1": version: 1.0.1 resolution: "buffer-equal-constant-time@npm:1.0.1" @@ -7879,6 +8044,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001646": + version: 1.0.30001649 + resolution: "caniuse-lite@npm:1.0.30001649" + checksum: 10c0/0ca2f3776324acfc36d72a575e72ffd1408b91f0ac462a6f0aa08ea24d0d16e83f85f652e19d40e6d6d82ab0fb588740f948e7c88d2818fe6bcd68f70ca33acf + languageName: node + linkType: hard + "caseless@npm:~0.12.0": version: 0.12.0 resolution: "caseless@npm:0.12.0" @@ -9437,6 +9609,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.5.4": + version: 1.5.4 + resolution: "electron-to-chromium@npm:1.5.4" + checksum: 10c0/139abf1b7281c2f3288819fb9b114f09d541ac38c9f0373f194ce2d483d82d118b8751f1b2a59b04ed0d8f414071b58508a40050fc0f23b5aa7e38d11d0cf30c + languageName: node + linkType: hard + "emoji-regex@npm:^10.2.1, emoji-regex@npm:^10.3.0": version: 10.3.0 resolution: "emoji-regex@npm:10.3.0" @@ -9766,6 +9945,13 @@ __metadata: languageName: node linkType: hard +"escalade@npm:^3.1.2": + version: 3.1.2 + resolution: "escalade@npm:3.1.2" + checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287 + languageName: node + linkType: hard + "escape-goat@npm:^4.0.0": version: 4.0.0 resolution: "escape-goat@npm:4.0.0" @@ -12638,13 +12824,6 @@ __metadata: languageName: node linkType: hard -"javascript-natural-sort@npm:0.7.1": - version: 0.7.1 - resolution: "javascript-natural-sort@npm:0.7.1" - checksum: 10c0/340f8ffc5d30fb516e06dc540e8fa9e0b93c865cf49d791fed3eac3bdc5fc71f0066fc81d44ec1433edc87caecaf9f13eec4a1fce8c5beafc709a71eaedae6fe - languageName: node - linkType: hard - "jest-diff@npm:^29.7.0": version: 29.7.0 resolution: "jest-diff@npm:29.7.0" @@ -15268,6 +15447,13 @@ __metadata: languageName: node linkType: hard +"node-releases@npm:^2.0.18": + version: 2.0.18 + resolution: "node-releases@npm:2.0.18" + checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27 + languageName: node + linkType: hard + "nopt@npm:^7.0.0": version: 7.2.0 resolution: "nopt@npm:7.2.0" @@ -15490,7 +15676,7 @@ __metadata: "@mdx-js/react": "npm:^3.0.0" clsx: "npm:^2.0.0" editorconfig-checker: "npm:^5.1.5" - prettier: "npm:^3.2.5" + prettier: "npm:^3.3.3" prism-react-renderer: "npm:^2.3.0" react: "npm:^18.0.0" react-dom: "npm:^18.0.0" @@ -16043,6 +16229,13 @@ __metadata: languageName: node linkType: hard +"picocolors@npm:^1.0.1": + version: 1.0.1 + resolution: "picocolors@npm:1.0.1" + checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400 + languageName: node + linkType: hard + "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" @@ -16681,12 +16874,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.1.1, prettier@npm:^3.2.5": - version: 3.2.5 - resolution: "prettier@npm:3.2.5" +"prettier@npm:^3.3.3": + version: 3.3.3 + resolution: "prettier@npm:3.3.3" bin: prettier: bin/prettier.cjs - checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6 + checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26 languageName: node linkType: hard @@ -16889,8 +17082,8 @@ __metadata: resolution: "qraft@workspace:." dependencies: "@changesets/cli": "npm:^2.27.1" - "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0" - prettier: "npm:^3.1.1" + "@ianvs/prettier-plugin-sort-imports": "npm:^4.3.1" + prettier: "npm:^3.3.3" turbo: "npm:^2.0.4" typescript: "npm:^5.3.3" languageName: unknown @@ -19164,6 +19357,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.5.2": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf + languageName: node + linkType: hard + "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" @@ -19563,13 +19765,6 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.5.0": - version: 0.5.7 - resolution: "source-map@npm:0.5.7" - checksum: 10c0/904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599 - languageName: node - linkType: hard - "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0": version: 0.6.1 resolution: "source-map@npm:0.6.1" @@ -21185,6 +21380,20 @@ __metadata: languageName: node linkType: hard +"update-browserslist-db@npm:^1.1.0": + version: 1.1.0 + resolution: "update-browserslist-db@npm:1.1.0" + dependencies: + escalade: "npm:^3.1.2" + picocolors: "npm:^1.0.1" + peerDependencies: + browserslist: ">= 4.21.0" + bin: + update-browserslist-db: cli.js + checksum: 10c0/a7452de47785842736fb71547651c5bbe5b4dc1e3722ccf48a704b7b34e4dcf633991eaa8e4a6a517ffb738b3252eede3773bef673ef9021baa26b056d63a5b9 + languageName: node + linkType: hard + "update-notifier@npm:^6.0.2": version: 6.0.2 resolution: "update-notifier@npm:6.0.2"