Merge pull request #1710 from hey-api/fix/relative-import-path

fix: use relative path to custom config file if provided when resolving relative paths

Author: mrlubos

.changeset/many-mangos-sell.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: use relative path to custom config file if provided when resolving relative paths

examples/openapi-ts-next/src/client/sdk.gen.ts

@@ -52,6 +52,11 @@ export type Options<
    * custom client.
    */
   client?: Client;
+  /**
+   * You can pass arbitrary values through the `meta` object. This can be
+   * used to access values that aren't defined as part of the SDK function.
+   */
+  meta?: Record<string, unknown>;
 };
 
 /**

packages/openapi-ts/src/generate/files.ts

@@ -202,15 +202,22 @@ export class TypeScriptFile {
   }): string {
     let filePath = '';
 
-    if (!id.startsWith('.')) {
+    // relative file path
+    if (id.startsWith('.')) {
+      let configFileParts: Array<string> = [];
+      // if providing a custom configuration file, relative paths must resolve
+      // relative to the configuration file.
+      if (context.config.configFile) {
+        const cfgParts = context.config.configFile.split('/');
+        configFileParts = cfgParts.slice(0, cfgParts.length - 1);
+      }
+      filePath = path.resolve(process.cwd(), ...configFileParts, id);
+    } else {
       const file = context.file({ id });
       if (!file) {
         throw new Error(`File with id ${id} does not exist`);
       }
-
       filePath = file._path;
-    } else {
-      filePath = path.resolve(process.cwd(), id);
     }
 
     const thisPathParts = this._path.split(path.sep);

packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/types.d.ts

@@ -1,14 +1,9 @@
 import type { Plugin } from '../../types';
+import type { TanStackQuery } from '../query-core/types';
 
 export interface Config
-  extends Plugin.Name<'@tanstack/angular-query-experimental'> {
-  /**
-   * Should the exports from the generated files be re-exported in the index
-   * barrel file?
-   *
-   * @default false
-   */
-  exportFromIndex?: boolean;
+  extends Plugin.Name<'@tanstack/angular-query-experimental'>,
+    TanStackQuery.Config {
   /**
    * Generate {@link https://tanstack.com/query/v5/docs/framework/angular/reference/infiniteQueryOptions `infiniteQueryOptions()`} helpers? These will be generated from GET and POST requests where a pagination parameter is detected.
    *

packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts

@@ -185,15 +185,15 @@ const createInfiniteParamsFunction = ({
           }),
         }),
         compiler.returnVariable({
-          expression: ts.factory.createAsExpression(
-            ts.factory.createAsExpression(
-              compiler.identifier({ text: 'params' }),
-              ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
-            ),
-            ts.factory.createTypeQueryNode(
+          expression: compiler.asExpression({
+            expression: compiler.asExpression({
+              expression: compiler.identifier({ text: 'params' }),
+              type: compiler.keywordTypeNode({ keyword: 'unknown' }),
+            }),
+            type: ts.factory.createTypeQueryNode(
               compiler.identifier({ text: 'page' }),
             ),
-          ),
+          }),
         }),
       ],
       types: [