Enables goto source/reference/implementation

.npmignore

@@ -1,4 +1,5 @@
 *
 !dist/**/*
 !README.md
-!package.json
+!package.json
+dist/**/*.d.ts.map

packages/angular/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/angular",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },

packages/angular/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/axios/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/axios",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },

packages/axios/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/core/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/core",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts",
     "test": "vitest"

packages/core/src/generators/mutator.ts

@@ -1,4 +1,4 @@
-import acorn, { Parser } from 'acorn';
+import { Parser, ecmaVersion } from 'acorn';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import {
@@ -130,9 +130,7 @@ export const generateMutator = async ({
   }
 };
 
-const getEcmaVersion = (
-  target?: TsConfigTarget,
-): acorn.ecmaVersion | undefined => {
+const getEcmaVersion = (target?: TsConfigTarget): ecmaVersion | undefined => {
   if (!target) {
     return;
   }
@@ -142,7 +140,7 @@ const getEcmaVersion = (
   }
 
   try {
-    return Number(target.toLowerCase().replace('es', '')) as acorn.ecmaVersion;
+    return Number(target.toLowerCase().replace('es', '')) as ecmaVersion;
   } catch {
     return;
   }
@@ -161,7 +159,7 @@ const removeComments = (file: string) => {
 const parseFile = (
   file: string,
   name: string,
-  ecmaVersion: acorn.ecmaVersion = 6,
+  ecmaVersion: ecmaVersion = 6,
 ): GeneratorMutatorParsingInfo | undefined => {
   try {
     const ast = Parser.parse(file, { ecmaVersion }) as any;

packages/core/src/generators/schema-definition.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import type { ContextSpecs, InputFiltersOption, SchemasObject } from '../types';
+import type { ContextSpecs, InputFiltersOption } from '../types';
+import type { SchemasObject } from 'openapi3-ts/oas30';
 import { generateSchemasDefinition } from './schema-definition';
 
 describe('generateSchemasDefinition', () => {

packages/core/src/utils/dynamic-import.ts

@@ -1,6 +1,6 @@
-import { pathToFileURL } from 'url';
+import { resolve, extname } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { isModule, isObject, isString } from './assertion';
-import { resolve } from './path';
 
 export const dynamicImport = async <T>(
   toImport: T | string,
@@ -17,7 +17,10 @@ export const dynamicImport = async <T>(
       // use pathToFileURL to solve issue #1332.
       // https://github.com/nodejs/node/issues/31710
       const fileUrl = pathToFileURL(path);
-      const data = await import(fileUrl.href);
+      const isJson = extname(fileUrl.href) === '.json';
+      const data = isJson
+        ? await import(fileUrl.href, { with: { type: 'json' } })
+        : await import(fileUrl.href);
       if (takeDefault && (isObject(data) || isModule(data)) && data.default) {
         return (data as any).default as T;
       }

packages/core/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/core/tsup.config.ts

@@ -1,4 +1,4 @@
 import { defineConfig } from 'tsup';
 import { baseOptions } from '../tsup.base';
 
-export default defineConfig({ ...baseOptions, target: 'node16' });
+export default defineConfig(baseOptions);

packages/fetch/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/fetch",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },

packages/fetch/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/hono/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/hono",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },

packages/hono/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/mcp/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/mcp",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },

packages/mcp/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/mock/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/mock",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts",
     "test": "vitest"

packages/mock/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/orval/package.json

@@ -6,9 +6,14 @@
   "files": [
     "dist"
   ],
-  "bin": "dist/bin/orval.js",
+  "bin": "./dist/bin/orval.js",
   "type": "commonjs",
-  "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "keywords": [
     "rest",
     "client",
@@ -42,7 +47,7 @@
     "url": "git+https://github.com/orval-labs/orval.git"
   },
   "scripts": {
-    "build": "tsup --dts src/index.ts",
+    "build": "tsup",
     "dev": "tsup --watch src --onSuccess 'yarn generate-api'",
     "lint": "eslint src/**/*.ts",
     "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts",

packages/orval/src/utils/package-json.ts

@@ -1,4 +1,4 @@
-import { isString, log, PackageJson } from '@orval/core';
+import { dynamicImport, isString, log, PackageJson } from '@orval/core';
 import chalk from 'chalk';
 import findUp from 'find-up';
 import fs from 'fs-extra';
@@ -10,11 +10,9 @@ export const loadPackageJson = async (
   workspace = process.cwd(),
 ): Promise<PackageJson | undefined> => {
   if (!packageJson) {
-    const pkgPath = await findUp(['package.json'], {
-      cwd: workspace,
-    });
+    const pkgPath = await findUp(['package.json'], { cwd: workspace });
     if (pkgPath) {
-      const pkg = await import(pkgPath);
+      const pkg = await dynamicImport<any>(pkgPath, workspace);
       return await maybeReplaceCatalog(pkg, workspace);
     }
     return;

packages/orval/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/query/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/query",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts",
     "test": "vitest"

packages/query/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }

packages/swr/package.json

@@ -2,13 +2,17 @@
   "name": "@orval/swr",
   "version": "7.11.2",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "tsup",
     "dev": "tsup --watch src",
     "lint": "eslint src/**/*.ts"
   },