fix: import attributes, dep bumps (#978)

kanadgupta · web-flow · commit f30d79ce5651 · 2025-01-06T18:15:20.000-06:00
* chore: fix linting * chore(deps): bump oas-normalize to latest * revert: don't update fixtures * Revert "revert: don't update fixtures" This reverts commit 80bdd44. * feat: add import attributes ts-morph is incredible
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   "prettier": "@readme/eslint-config/prettier",
   "devDependencies": {
     "@readme/eslint-config": "^14.0.0",
-    "@tsconfig/node18": "^18.2.2",
+    "@tsconfig/node20": "^20.1.4",
     "alex": "^11.0.1",
     "conventional-changelog-cli": "^5.0.0",
     "eslint": "^8.56.0",
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -85,7 +85,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "fetch-mock": "^11.1.3",
-    "oas-normalize": "^11.0.1",
+    "oas-normalize": "^12.0.0",
     "openapi-types": "^12.1.3",
     "tsup": "^8.0.1",
     "tsx": "^4.19.1",
diff --git a/packages/api/src/codegen/languages/typescript/index.ts b/packages/api/src/codegen/languages/typescript/index.ts
@@ -329,7 +329,7 @@ export default class TSGenerator extends CodeGenerator {
         moduleSpecifier: '@readme/api-core/types',
       },
       { defaultImport: 'APICore', moduleSpecifier: '@readme/api-core' },
-      { defaultImport: 'definition', moduleSpecifier: this.specPath },
+      { defaultImport: 'definition', moduleSpecifier: this.specPath, attributes: [{ name: 'type', value: 'json' }] },
     ]);
 
     this.sdk = sourceFile.addClass({
diff --git a/packages/httpsnippet-client-api/test/__datasets__/alternate-server/index.ts b/packages/httpsnippet-client-api/test/__datasets__/alternate-server/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/server-variables.json';
+import definition from '@readme/oas-examples/3.0/json/server-variables.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/application-form-encoded/index.ts b/packages/httpsnippet-client-api/test/__datasets__/application-form-encoded/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/application-json/index.ts b/packages/httpsnippet-client-api/test/__datasets__/application-json/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-apikey-cookie/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-apikey-cookie/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/security.json';
+import definition from '@readme/oas-examples/3.0/json/security.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-apikey-header/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-apikey-header/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/security.json';
+import definition from '@readme/oas-examples/3.0/json/security.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-basic-full/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-basic-full/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/readme.json';
+import definition from '@readme/oas-examples/3.0/json/readme.json' with { type: 'json' };
 
 const authKey = 'buster:pug';
 
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-basic-password-only/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-basic-password-only/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/readme.json';
+import definition from '@readme/oas-examples/3.0/json/readme.json' with { type: 'json' };
 
 const authKey = ':pug';
 
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-basic-username-only/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-basic-username-only/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/readme.json';
+import definition from '@readme/oas-examples/3.0/json/readme.json' with { type: 'json' };
 
 const authKey = 'buster:';
 
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-bearer/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-bearer/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/security.json';
+import definition from '@readme/oas-examples/3.0/json/security.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/auth-query/index.ts b/packages/httpsnippet-client-api/test/__datasets__/auth-query/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/security.json';
+import definition from '@readme/oas-examples/3.0/json/security.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/cookies/index.ts b/packages/httpsnippet-client-api/test/__datasets__/cookies/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/full-many-query-params/index.ts b/packages/httpsnippet-client-api/test/__datasets__/full-many-query-params/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/full/index.ts b/packages/httpsnippet-client-api/test/__datasets__/full/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/headers/index.ts b/packages/httpsnippet-client-api/test/__datasets__/headers/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/http-insecure/index.ts b/packages/httpsnippet-client-api/test/__datasets__/http-insecure/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/issue-128/index.ts b/packages/httpsnippet-client-api/test/__datasets__/issue-128/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/issue-76/index.ts b/packages/httpsnippet-client-api/test/__datasets__/issue-76/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/issue-78-operationid/index.ts b/packages/httpsnippet-client-api/test/__datasets__/issue-78-operationid/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/issue-78/index.ts b/packages/httpsnippet-client-api/test/__datasets__/issue-78/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/jsonObj-multiline/index.ts b/packages/httpsnippet-client-api/test/__datasets__/jsonObj-multiline/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/jsonObj-null-value/index.ts b/packages/httpsnippet-client-api/test/__datasets__/jsonObj-null-value/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/multipart-data/index.ts b/packages/httpsnippet-client-api/test/__datasets__/multipart-data/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 /**
  * This test case is testing that when we have HAR `postData` of a file and the `value` is present
diff --git a/packages/httpsnippet-client-api/test/__datasets__/multipart-file/index.ts b/packages/httpsnippet-client-api/test/__datasets__/multipart-file/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/multipart-form-data-no-params/index.ts b/packages/httpsnippet-client-api/test/__datasets__/multipart-form-data-no-params/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/multipart-form-data/index.ts b/packages/httpsnippet-client-api/test/__datasets__/multipart-form-data/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/operationid-non-alphanumerical/index.ts b/packages/httpsnippet-client-api/test/__datasets__/operationid-non-alphanumerical/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/operationid-with-underscores/index.ts b/packages/httpsnippet-client-api/test/__datasets__/operationid-with-underscores/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/parameter-special-characters/index.ts b/packages/httpsnippet-client-api/test/__datasets__/parameter-special-characters/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/petstore/index.ts b/packages/httpsnippet-client-api/test/__datasets__/petstore/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from '@readme/oas-examples/3.0/json/petstore.json';
+import definition from '@readme/oas-examples/3.0/json/petstore.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/query/index.ts b/packages/httpsnippet-client-api/test/__datasets__/query/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/short/index.ts b/packages/httpsnippet-client-api/test/__datasets__/short/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/httpsnippet-client-api/test/__datasets__/text-plain/index.ts b/packages/httpsnippet-client-api/test/__datasets__/text-plain/index.ts
@@ -1,7 +1,7 @@
 import type { SnippetMock } from '../../index.test.js';
 import type { OASDocument } from 'oas/types';
 
-import definition from './openapi.json';
+import definition from './openapi.json' with { type: 'json' };
 
 const mock: SnippetMock = {
   har: {
diff --git a/packages/test-utils/sdks/alby/src/sdk.ts b/packages/test-utils/sdks/alby/src/sdk.ts
@@ -1,7 +1,9 @@
 import type * as types from './types.js';
 import type { ConfigOptions, FetchResponse } from '@readme/api-core/types';
 import APICore from '@readme/api-core';
-import definition from '@api/test-utils/definitions/alby.json';
+import definition from '@api/test-utils/definitions/alby.json' with {
+  type: 'json'
+};
 
 export default class SDK {
   core: APICore;
diff --git a/packages/test-utils/sdks/metrotransit/src/sdk.ts b/packages/test-utils/sdks/metrotransit/src/sdk.ts
@@ -1,7 +1,9 @@
 import type * as types from './types.js';
 import type { ConfigOptions, FetchResponse } from '@readme/api-core/types';
 import APICore from '@readme/api-core';
-import definition from '@api/test-utils/definitions/metrotransit.json';
+import definition from '@api/test-utils/definitions/metrotransit.json' with {
+  type: 'json'
+};
 
 export default class SDK {
   core: APICore;
diff --git a/packages/test-utils/sdks/operationid-quirks/src/sdk.ts b/packages/test-utils/sdks/operationid-quirks/src/sdk.ts
@@ -1,6 +1,8 @@
 import type { ConfigOptions, FetchResponse } from '@readme/api-core/types';
 import APICore from '@readme/api-core';
-import definition from '@api/test-utils/definitions/operationid-quirks.json';
+import definition from '@api/test-utils/definitions/operationid-quirks.json' with {
+  type: 'json'
+};
 
 export default class SDK {
   core: APICore;
diff --git a/packages/test-utils/sdks/optional-payload/src/sdk.ts b/packages/test-utils/sdks/optional-payload/src/sdk.ts
diff --git a/packages/test-utils/sdks/petstore/src/sdk.ts b/packages/test-utils/sdks/petstore/src/sdk.ts
diff --git a/packages/test-utils/sdks/readme/src/sdk.ts b/packages/test-utils/sdks/readme/src/sdk.ts
diff --git a/packages/test-utils/sdks/response-title-quirks/src/sdk.ts b/packages/test-utils/sdks/response-title-quirks/src/sdk.ts
diff --git a/packages/test-utils/sdks/simple/src/sdk.ts b/packages/test-utils/sdks/simple/src/sdk.ts
diff --git a/packages/test-utils/sdks/star-trek/src/sdk.ts b/packages/test-utils/sdks/star-trek/src/sdk.ts
diff --git a/tsconfig.base.json b/tsconfig.base.json
