Merge pull request #118 from mauriciabad/patch-1

fix: use `with` instead of `assert` in the import attributes

.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`.

.prettierrc.json

@@ -4,7 +4,14 @@
   "trailingComma": "es5",
   "importOrderCaseInsensitive": true,
   "importOrderSeparation": true,
-  "importOrder": ["^react(.*)$","^@(.*)$", "<THIRD_PARTY_MODULES>", "^[./]"],
+  "importOrder": [
+    "<TYPES>^(node:)",
+    "<TYPES>",
+    "<TYPES>^[.]",
+    "<BUILTIN_MODULES>",
+    "<THIRD_PARTY_MODULES>",
+    "^[.]"
+  ],
   "importOrderParserPlugins": ["importAssertions", "typescript", "jsx"],
-  "plugins": ["@trivago/prettier-plugin-sort-imports"]
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"]
 }

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"
   },

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 [

packages/cli/src/bin.spec.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest';
-
 import { extractArgvPluginOptions } from './bin.js';
 
 describe('bin', () => {

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() {

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 [

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(

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', () => {

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', () => {

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,

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 [

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', () => {

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);
 

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', () => {

packages/plugin/src/lib/filterDocumentPaths.ts

@@ -1,5 +1,4 @@
 import { type OpenAPI3 } from 'openapi-typescript/src/types.js';
-
 import { createServicePathMatch } from './createServicePathMatch.js';
 
 /**

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`

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', () => {

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', () => {

packages/plugin/src/lib/open-api/getServiceNamesByEndpoint.spec.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest';
-
 import {
   getEndpointPartIndex,
   getServiceBaseNameByOperationEndpoint,

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(...)', () => {

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';
 

packages/plugin/src/lib/open-api/getServices.ts

@@ -1,13 +1,12 @@
+import type { OpenAPISchemaType } from './OpenAPISchemaType.js';
 import camelCase from 'camelcase';
-
 import { getContentMediaType } from './getContent.js';
 import { getOperationName } from './getOperationName.js';
 import {
   getServiceNamesByOperationEndpoint,
   ServiceBaseNameByEndpointOption,
 } from './getServiceNamesByOperationEndpoint.js';
 import { getServiceNamesByOperationTags } from './getServiceNamesByOperationTags.js';
-import type { OpenAPISchemaType } from './OpenAPISchemaType.js';
 
 export type ServiceBaseName = ServiceBaseNameByEndpointOption | 'tags';
 

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 (

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,

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,

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 ({

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 [

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",

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'],

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 {
   /**

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,

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<T>(

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<TData>(
   qraftOptions: QraftClientOptions | undefined,

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: <

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: <

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<TData>(
   _: QraftClientOptions | undefined,

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 = (

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<TData>(
   _: QraftClientOptions | undefined,

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 = (