refactor: clean up plugin node methods

mrlubos · mrlubos · commit 34bec6753730 · 2025-12-11T23:55:28.000+08:00
diff --git a/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts b/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
@@ -156,7 +156,7 @@ const generateAngularClassRequests = ({
         ),
       )
       .do(...currentClass.nodes);
-    plugin.addNode(node);
+    plugin.node(node);
 
     generatedClasses.add(currentClass.className);
   };
@@ -195,7 +195,7 @@ const generateAngularFunctionRequests = ({
         plugin,
         symbol,
       });
-      plugin.addNode(node);
+      plugin.node(node);
     },
     {
       order: 'declarations',
diff --git a/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts b/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts
@@ -153,7 +153,7 @@ const generateAngularClassServices = ({
         ),
       )
       .do(...currentClass.nodes);
-    plugin.addNode(node);
+    plugin.node(node);
 
     generatedClasses.add(currentClass.className);
   };
@@ -185,7 +185,7 @@ const generateAngularFunctionServices = ({
         plugin,
         symbol,
       });
-      plugin.addNode(node);
+      plugin.node(node);
     },
     {
       order: 'declarations',
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts b/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts
@@ -99,5 +99,5 @@ export const createClient: PluginHandler = ({ plugin }) => {
         (c) => c.call(...createConfigParameters),
       ),
     );
-  plugin.addNode(statement);
+  plugin.node(statement);
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-core/createClientConfig.ts b/packages/openapi-ts/src/plugins/@hey-api/client-core/createClientConfig.ts
@@ -61,5 +61,5 @@ export const createClientConfigType = ({
           ),
         ),
     );
-  plugin.addNode(typeCreateClientConfig);
+  plugin.node(typeCreateClientConfig);
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts
@@ -390,7 +390,7 @@ const schemasV2_0_X = ({
           }),
         ).as('const'),
       );
-    plugin.addNode(statement);
+    plugin.node(statement);
   }
 };
 
@@ -430,7 +430,7 @@ const schemasV3_0_X = ({
           }),
         ).as('const'),
       );
-    plugin.addNode(statement);
+    plugin.node(statement);
   }
 };
 
@@ -470,7 +470,7 @@ const schemasV3_1_X = ({
           }),
         ).as('const'),
       );
-    plugin.addNode(statement);
+    plugin.node(statement);
   }
 };
 
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
@@ -306,7 +306,7 @@ export const generateClassSdk = ({
   );
 
   const heyApiClientIndex = plugin.config.instance
-    ? plugin.addNode(null)
+    ? plugin.node(null)
     : undefined;
   const symbolHeyApiClient =
     heyApiClientIndex !== undefined
@@ -320,7 +320,7 @@ export const generateClassSdk = ({
         })
       : undefined;
   const heyApiRegistryIndex = plugin.config.instance
-    ? plugin.addNode(null)
+    ? plugin.node(null)
     : undefined;
 
   const generateClass = (currentClass: SdkClassEntry) => {
@@ -404,7 +404,7 @@ export const generateClassSdk = ({
         plugin,
         symbol: symbolHeyApiClient,
       });
-      plugin.updateNode(heyApiClientIndex, node);
+      plugin.node(node, heyApiClientIndex);
     }
 
     const symbol = plugin.symbol(resourceId, {
@@ -465,7 +465,7 @@ export const generateClassSdk = ({
         sdkSymbol: symbol,
         symbol: symbolRegistry,
       });
-      plugin.updateNode(heyApiRegistryIndex, node);
+      plugin.node(node, heyApiRegistryIndex);
       const registryNode = $.field(registryName, (f) =>
         f
           .public()
@@ -489,7 +489,7 @@ export const generateClassSdk = ({
         ),
       )
       .do(...currentClass.nodes);
-    plugin.addNode(node);
+    plugin.node(node);
   };
 
   for (const sdkClass of sdkClasses.values()) {
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/functions.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/functions.ts
@@ -121,7 +121,7 @@ export const generateFlatSdk = ({
             )
             .do(...statements),
         );
-      plugin.addNode(node);
+      plugin.node(node);
     },
     {
       order: 'declarations',
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts
@@ -109,5 +109,5 @@ export const createTypeOptions = ({
           ),
       ),
     );
-  plugin.addNode(typeOptions);
+  plugin.node(typeOptions);
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/transformers/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/transformers/plugin.ts
@@ -96,7 +96,7 @@ const processSchemaType = ({
               .param(dataVariableName, (p) => p.type('any'))
               .do(...nodes),
           );
-          plugin.addNode(node);
+          plugin.node(node);
         }
       } finally {
         buildingSymbols.delete(symbol.id);
@@ -336,7 +336,7 @@ export const handler: HeyApiTransformersPlugin['Handler'] = ({ plugin }) => {
             .returns($.type('Promise').generic(symbolResponse))
             .do(...nodes),
         );
-      plugin.addNode(value);
+      plugin.node(value);
     },
     {
       order: 'declarations',
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/clientOptions.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/clientOptions.ts
@@ -76,5 +76,5 @@ export const createClientOptions = ({
           p.type($.type.or(...types)),
         ),
     );
-  plugin.updateNode(nodeIndex, node);
+  plugin.node(node, nodeIndex);
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/export.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/export.ts
@@ -134,7 +134,7 @@ export const exportType = ({
             ),
           ).as('const'),
         );
-      plugin.addNode(objectNode);
+      plugin.node(objectNode);
 
       const symbol = plugin.registerSymbol({
         meta: {
@@ -157,7 +157,7 @@ export const exportType = ({
         .type(
           $.type(symbol).idx($.type(symbol).typeofType().keyof()).typeofType(),
         );
-      plugin.addNode(node);
+      plugin.node(node);
       return;
     } else if (
       plugin.config.enums.mode === 'typescript' ||
@@ -193,7 +193,7 @@ export const exportType = ({
                 .value($.fromValue(item.schema.const)),
             ),
           );
-        plugin.addNode(enumNode);
+        plugin.node(enumNode);
         return;
       }
     }
@@ -218,5 +218,5 @@ export const exportType = ({
     .export()
     .$if(createSchemaComment(schema), (t, v) => t.doc(v))
     .type(type);
-  plugin.addNode(node);
+  plugin.node(node);
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/operation.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/operation.ts
@@ -147,7 +147,7 @@ const operationToDataType = ({
         state,
       }),
     );
-  plugin.addNode(node);
+  plugin.node(node);
 };
 
 export const operationToType = ({
@@ -188,7 +188,7 @@ export const operationToType = ({
           state,
         }),
       );
-    plugin.addNode(node);
+    plugin.node(node);
 
     if (error) {
       const symbol = plugin.registerSymbol({
@@ -213,7 +213,7 @@ export const operationToType = ({
         .alias(symbol)
         .export()
         .type($.type(symbolErrors).idx($.type(symbolErrors).keyof()));
-      plugin.addNode(node);
+      plugin.node(node);
     }
   }
 
@@ -243,7 +243,7 @@ export const operationToType = ({
           state,
         }),
       );
-    plugin.addNode(node);
+    plugin.node(node);
 
     if (response) {
       const symbol = plugin.registerSymbol({
@@ -268,7 +268,7 @@ export const operationToType = ({
         .alias(symbol)
         .export()
         .type($.type(symbolResponses).idx($.type(symbolResponses).keyof()));
-      plugin.addNode(node);
+      plugin.node(node);
     }
   }
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/webhook.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/shared/webhook.ts
@@ -55,7 +55,7 @@ const operationToDataType = ({
           state,
         }),
       );
-    plugin.addNode(node);
+    plugin.node(node);
 
     data.properties.body = { symbolRef: symbolWebhookPayload };
     dataRequired.push('body');
@@ -99,7 +99,7 @@ const operationToDataType = ({
         state,
       }),
     );
-  plugin.addNode(node);
+  plugin.node(node);
 
   return symbolWebhookRequest;
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/v1/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/v1/plugin.ts
@@ -86,9 +86,9 @@ const handleComponent = ({
 
 export const handlerV1: HeyApiTypeScriptPlugin['Handler'] = ({ plugin }) => {
   // reserve node for ClientOptions
-  const nodeClientIndex = plugin.addNode(null);
+  const nodeClientIndex = plugin.node(null);
   // reserve node for Webhooks
-  const nodeWebhooksIndex = plugin.addNode(null);
+  const nodeWebhooksIndex = plugin.node(null);
 
   const servers: Array<IR.ServerObject> = [];
   const webhooks: Array<Symbol> = [];
@@ -176,6 +176,6 @@ export const handlerV1: HeyApiTypeScriptPlugin['Handler'] = ({ plugin }) => {
       .alias(symbol)
       .export()
       .type($.type.or(...webhooks));
-    plugin.updateNode(nodeWebhooksIndex, node);
+    plugin.node(node, nodeWebhooksIndex);
   }
 };
diff --git a/packages/openapi-ts/src/plugins/@hey-api/typescript/v1/toAst/string.ts b/packages/openapi-ts/src/plugins/@hey-api/typescript/v1/toAst/string.ts
@@ -60,7 +60,7 @@ export const stringToAst = ({
             .type(
               $.type.template().add($.type('T')).add('_').add($.type('string')),
             );
-          plugin.addNode(nodeTypeId);
+          plugin.node(nodeTypeId);
         }
 
         const symbolTypeId = plugin.referenceSymbol(queryTypeId);
@@ -75,7 +75,7 @@ export const stringToAst = ({
           .alias(symbolTypeName)
           .export()
           .type($.type(symbolTypeId).generic($.type.literal(type)));
-        plugin.addNode(node);
+        plugin.node(node);
       }
       const symbol = plugin.referenceSymbol(query);
       return $.type(symbol);
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
@@ -92,5 +92,5 @@ export const createMutationOptions = ({
         )
         .do($.return(mutationOpts)),
     );
-  plugin.addNode(statement);
+  plugin.node(statement);
 };
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
@@ -123,7 +123,7 @@ export const createQueryKeyFunction = ({
         $.return($.array($('params'))),
       ),
   );
-  plugin.addNode(fn);
+  plugin.node(fn);
 };
 
 const createQueryKeyLiteral = ({
@@ -197,7 +197,7 @@ export const createQueryKeyType = ({
         ),
       ),
     );
-  plugin.addNode(queryKeyType);
+  plugin.node(queryKeyType);
 };
 
 export const queryKeyStatement = ({
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
@@ -61,7 +61,7 @@ export const createQueryOptions = ({
       plugin,
       symbol: symbolQueryKey,
     });
-    plugin.addNode(node);
+    plugin.node(node);
     keyExpression = $(symbolQueryKey).call(optionsParamName);
   } else {
     const symbolCreateQueryKey = plugin.referenceSymbol({
@@ -152,5 +152,5 @@ export const createQueryOptions = ({
           .do($.return(queryOpts)),
       ),
     );
-  plugin.addNode(statement);
+  plugin.node(statement);
 };
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
@@ -99,7 +99,7 @@ export const createQueryKeyFunction = ({
         $.return($.array().element($('params'))),
       ),
   );
-  plugin.addNode(fn);
+  plugin.node(fn);
 };
 
 const createQueryKeyLiteral = ({
@@ -166,7 +166,7 @@ export const createQueryKeyType = ({ plugin }: { plugin: PluginInstance }) => {
         ),
       ),
     );
-  plugin.addNode(queryKeyType);
+  plugin.node(queryKeyType);
 };
 
 export const queryKeyStatement = ({
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts
@@ -100,7 +100,7 @@ const createInfiniteParamsFunction = ({
         $.return($('params').as('unknown').as($('page').typeofType())),
       ),
   );
-  plugin.addNode(fn);
+  plugin.node(fn);
 };
 
 export const createInfiniteQueryOptions = ({
@@ -196,7 +196,7 @@ export const createInfiniteQueryOptions = ({
     symbol: symbolInfiniteQueryKey,
     typeQueryKey,
   });
-  plugin.addNode(node);
+  plugin.node(node);
 
   const awaitSdkFn = $(queryFn)
     .call(
@@ -288,5 +288,5 @@ export const createInfiniteQueryOptions = ({
           ),
         ),
     );
-  plugin.addNode(statement);
+  plugin.node(statement);
 };
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts
@@ -87,5 +87,5 @@ export const createMutationOptions = ({
           $(mutationOptionsFn).return(),
         ),
     );
-  plugin.addNode(statement);
+  plugin.node(statement);
 };
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts
diff --git a/packages/openapi-ts/src/plugins/arktype/shared/export.ts b/packages/openapi-ts/src/plugins/arktype/shared/export.ts
diff --git a/packages/openapi-ts/src/plugins/fastify/plugin.ts b/packages/openapi-ts/src/plugins/fastify/plugin.ts
diff --git a/packages/openapi-ts/src/plugins/shared/utils/instance.ts b/packages/openapi-ts/src/plugins/shared/utils/instance.ts
diff --git a/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts b/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts
diff --git a/packages/openapi-ts/src/plugins/valibot/shared/export.ts b/packages/openapi-ts/src/plugins/valibot/shared/export.ts
diff --git a/packages/openapi-ts/src/plugins/zod/shared/export.ts b/packages/openapi-ts/src/plugins/zod/shared/export.ts

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ export const generateFlatSdk = ({`
`121`	`121`	`)`
`122`	`122`	`.do(...statements),`
`123`	`123`	`);`
`124`		`- plugin.addNode(node);`
	`124`	`+ plugin.node(node);`
`125`	`125`	`},`
`126`	`126`	`{`
`127`	`127`	`order: 'declarations',`