chore: progress on TanStack Query plugin

Author: mrlubos

.changeset/tall-deers-shout.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: update TanStack Query key to contain base URL

.changeset/wild-toys-yawn.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: change TanStack Query mutation helpers to functions for consistent API

packages/openapi-ts/src/compiler/module.ts

@@ -36,18 +36,20 @@ export const createCallExpression = ({
   types,
 }: {
   functionName: string | ts.PropertyAccessExpression;
-  parameters?: Array<string | ts.Expression>;
+  parameters?: Array<string | ts.Expression | undefined>;
   types?: ReadonlyArray<ts.TypeNode>;
 }) => {
   const expression =
     typeof functionName === 'string'
       ? createIdentifier({ text: functionName })
       : functionName;
-  const argumentsArray = parameters.map((parameter) =>
-    typeof parameter === 'string'
-      ? createIdentifier({ text: parameter })
-      : parameter,
-  );
+  const argumentsArray = parameters
+    .filter((parameter) => parameter !== undefined)
+    .map((parameter) =>
+      typeof parameter === 'string'
+        ? createIdentifier({ text: parameter })
+        : parameter,
+    );
   const callExpression = ts.factory.createCallExpression(
     expression,
     types,

packages/openapi-ts/src/compiler/typedef.ts

@@ -98,10 +98,13 @@ export const createTypeUnionNode = (
  * @param isNullable - if the whole type can be null
  * @returns ts.IntersectionTypeNode | ts.UnionTypeNode
  */
-export const createTypeIntersectNode = (
-  types: (any | ts.TypeNode)[],
-  isNullable: boolean = false,
-) => {
+export const createTypeIntersectNode = ({
+  isNullable,
+  types,
+}: {
+  isNullable?: boolean;
+  types: (any | ts.TypeNode)[];
+}) => {
   const nodes = types.map((type) => createTypeNode(type));
   const node = ts.factory.createIntersectionTypeNode(nodes);
   return maybeNullable({ isNullable, node });

packages/openapi-ts/src/compiler/types.ts

@@ -338,6 +338,7 @@ export type ObjectValue =
       comments?: Comments;
       isValueAccess?: boolean;
       key: string;
+      shorthand?: boolean;
       value: any;
     };
 
@@ -363,7 +364,7 @@ export const createObjectType = <
   identifiers = [],
   multiLine = true,
   obj,
-  shorthand = false,
+  shorthand,
   unescape = false,
 }: {
   comments?: Comments;
@@ -399,7 +400,9 @@ export const createObjectType = <
           }
           let assignment: ObjectAssignment;
           if ('spread' in value) {
-            const nameIdentifier = createIdentifier({ text: value.spread });
+            const nameIdentifier = isTsNode(value.spread)
+              ? value.spread
+              : createIdentifier({ text: value.spread });
             assignment = ts.factory.createSpreadAssignment(
               value.assertion
                 ? ts.factory.createAsExpression(
@@ -408,7 +411,7 @@ export const createObjectType = <
                   )
                 : nameIdentifier,
             );
-          } else if (shorthand && canShorthand) {
+          } else if (value.shorthand || (shorthand && canShorthand)) {
             assignment = ts.factory.createShorthandPropertyAssignment(
               value.value,
             );