chore(deps): bump

.github/dependabot.yml

@@ -51,3 +51,6 @@ updates:
       - dependency-name: stringify-object
         versions:
           - '>= 4'
+      - dependency-name: '@types/stringify-object'
+        versions:
+          - '>= 4'

package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.6",
     "@commitlint/config-conventional": "^17.7.0",
-    "@readme/eslint-config": "^12.2.1",
+    "@readme/eslint-config": "^13.0.1",
     "alex": "^11.0.1",
     "conventional-changelog-cli": "^4.1.0",
     "eslint": "^8.48.0",

packages/api/package.json

@@ -47,8 +47,8 @@
     "lodash.deburr": "^4.1.0",
     "lodash.setwith": "^4.3.2",
     "lodash.startcase": "^4.4.0",
-    "make-dir": "^3.1.0",
-    "oas": "^20.4.0",
+    "make-dir": "^4.0.0",
+    "oas": "^21.1.1",
     "ora": "^5.4.1",
     "prompts": "^2.4.2",
     "semver": "^7.3.8",
@@ -75,7 +75,7 @@
     "type-fest": "^4.3.1",
     "typescript": "^5.2.2",
     "unique-temp-dir": "^1.0.0",
-    "vitest": "^0.34.1"
+    "vitest": "^0.34.5"
   },
   "prettier": "@readme/eslint-config/prettier"
 }

packages/api/src/codegen/languages/typescript.ts

@@ -2,7 +2,7 @@ import type Storage from '../../storage';
 import type { InstallerOptions } from '../language';
 import type Oas from 'oas';
 import type { Operation } from 'oas';
-import type { HttpMethods, SchemaObject } from 'oas/dist/rmoas.types';
+import type { HttpMethods, SchemaObject } from 'oas/rmoas.types';
 import type { SemVer } from 'semver';
 import type {
   ClassDeclaration,

packages/api/src/fetcher.ts

@@ -1,4 +1,4 @@
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import fs from 'node:fs';
 import path from 'node:path';

packages/api/src/storage.ts

@@ -1,4 +1,4 @@
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import fs from 'node:fs';
 import path from 'node:path';

packages/api/test/storage.test.ts

@@ -1,4 +1,4 @@
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import assert from 'node:assert';
 import fs from 'node:fs/promises';

packages/api/tsconfig.json

@@ -5,8 +5,10 @@
     "declaration": true,
     "esModuleInterop": true,
     "lib": ["DOM", "DOM.Iterable", "ES2020"],
+    "module": "NodeNext",
     "noImplicitAny": true,
     "outDir": "dist/",
+    "skipLibCheck": true,
     "strict": true,
     "useUnknownInCatchVariables": false
   },

packages/core/package.json

@@ -33,7 +33,7 @@
     "get-stream": "^6.0.1",
     "json-schema-traverse": "^1.0.0",
     "lodash.merge": "^4.6.2",
-    "oas": "^20.10.3",
+    "oas": "^21.1.1",
     "remove-undefined-objects": "^3.0.0"
   },
   "devDependencies": {
@@ -44,7 +44,7 @@
     "@vitest/coverage-v8": "^0.34.4",
     "fetch-mock": "^9.11.0",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.4"
+    "vitest": "^0.34.5"
   },
   "prettier": "@readme/eslint-config/prettier"
 }

packages/core/src/index.ts

@@ -1,7 +1,7 @@
 import type { Har } from 'har-format';
 import type Oas from 'oas';
 import type { Operation } from 'oas';
-import type { HttpMethods } from 'oas/dist/rmoas.types';
+import type { HttpMethods } from 'oas/rmoas.types';
 
 import oasToHar from '@readme/oas-to-har';
 import fetchHar from 'fetch-har';

packages/core/src/lib/getJSONSchemaDefaults.ts

@@ -1,5 +1,5 @@
-import type { SchemaWrapper } from 'oas/dist/operation/get-parameters-as-json-schema';
-import type { SchemaObject } from 'oas/dist/rmoas.types';
+import type { SchemaWrapper } from 'oas/operation/get-parameters-as-json-schema';
+import type { SchemaObject } from 'oas/rmoas.types';
 
 import traverse from 'json-schema-traverse';
 

packages/core/src/lib/prepareAuth.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import type { Operation } from 'oas';
-import type { KeyedSecuritySchemeObject } from 'oas/dist/rmoas.types';
+import type { KeyedSecuritySchemeObject } from 'oas/rmoas.types';
 
 export default function prepareAuth(authKey: (number | string)[], operation: Operation) {
   if (authKey.length === 0) {

packages/core/src/lib/prepareParams.ts

@@ -1,6 +1,6 @@
 import type { ReadStream } from 'node:fs';
 import type { Operation } from 'oas';
-import type { ParameterObject, SchemaObject } from 'oas/dist/rmoas.types';
+import type { ParameterObject, SchemaObject } from 'oas/rmoas.types';
 
 import fs from 'node:fs';
 import path from 'node:path';

packages/core/test/lib/prepareAuth.test.ts

@@ -1,4 +1,4 @@
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import loadSpec from '@api/test-utils/load-spec';
 import Oas from 'oas';

packages/core/tsconfig.json

@@ -5,8 +5,10 @@
     "declaration": true,
     "esModuleInterop": true,
     "lib": ["DOM", "DOM.Iterable", "ES2020"],
+    "module": "NodeNext",
     "noImplicitAny": true,
     "outDir": "dist/",
+    "skipLibCheck": true,
     "strict": true
   },
   "include": ["./src/**/*"]

packages/httpsnippet-client-api/package.json

@@ -30,16 +30,16 @@
   },
   "peerDependencies": {
     "@readme/httpsnippet": ">=4",
-    "oas": "^20.0.0"
+    "oas": "^21.1.1"
   },
   "devDependencies": {
     "@readme/oas-examples": "^5.12.0",
     "@readme/openapi-parser": "^2.5.0",
     "@types/content-type": "^1.1.6",
-    "@types/stringify-object": "^4.0.2",
+    "@types/stringify-object": "^3.3.1",
     "@vitest/coverage-v8": "^0.34.4",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.1"
+    "vitest": "^0.34.5"
   },
   "prettier": "@readme/eslint-config/prettier"
 }

packages/httpsnippet-client-api/src/index.ts

@@ -1,9 +1,9 @@
-import type { ReducedHelperObject } from '@readme/httpsnippet/dist/helpers/reducer';
-import type { Client } from '@readme/httpsnippet/dist/targets/targets';
+import type { ReducedHelperObject } from '@readme/httpsnippet/helpers/reducer';
+import type { Client } from '@readme/httpsnippet/targets';
 import type { Operation } from 'oas';
-import type { HttpMethods, OASDocument } from 'oas/dist/rmoas.types';
+import type { HttpMethods, OASDocument } from 'oas/rmoas.types';
 
-import { CodeBuilder } from '@readme/httpsnippet/dist/helpers/code-builder';
+import { CodeBuilder } from '@readme/httpsnippet/helpers/code-builder';
 import contentType from 'content-type';
 import Oas, { utils } from 'oas';
 import stringifyObject from 'stringify-object';

packages/httpsnippet-client-api/test/__datasets__/application-form-encoded/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/application-json/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-apikey-cookie/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/security.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-apikey-header/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/security.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-basic-full/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/readme.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-basic-password-only/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/readme.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-basic-username-only/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/readme.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-bearer/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/security.json';
 

packages/httpsnippet-client-api/test/__datasets__/auth-query/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/security.json';
 

packages/httpsnippet-client-api/test/__datasets__/cookies/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/full-many-query-params/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/full/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/headers/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/http-insecure/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/issue-128/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/issue-76/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/issue-78-operationid/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/issue-78/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/jsonObj-multiline/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/jsonObj-null-value/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/multipart-data/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/multipart-file/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/multipart-form-data-no-params/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/multipart-form-data/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/operationid-non-alphanumerical/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/operationid-with-underscores/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/parameter-special-characters/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/petstore/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from '@readme/oas-examples/3.0/json/petstore.json';
 

packages/httpsnippet-client-api/test/__datasets__/query/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/short/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';
 

packages/httpsnippet-client-api/test/__datasets__/text-plain/index.ts

@@ -1,5 +1,5 @@
 import type { SnippetMock } from '../../index.test';
-import type { OASDocument } from 'oas/dist/rmoas.types';
+import type { OASDocument } from 'oas/rmoas.types';
 
 import definition from './openapi.json';