Merge pull request #8504 from LuLaValva/8356-chainable-ts

fix: use `@chainable` per-overload

Author: davepagurek

utils/data-processor.mjs

@@ -239,9 +239,6 @@ export function processData(rawData, strategy) {
         ...locationInfo(entry),
         ...deprecationInfo(entry),
         itemtype: 'method',
-        chainable: (prevItem?.chainable || entry.tags?.some(tag => tag.title === 'chainable'))
-          ? 1
-          : undefined,
         description: prevItem?.description || strategy.processDescription(entry.description),
         example: [
           ...(prevItem?.example || []),
@@ -259,7 +256,8 @@ export function processData(rawData, strategy) {
             return: entry.returns?.[0] && {
               description: strategy.processDescription(entry.returns[0].description),
               ...strategy.processType(entry.returns[0].type)
-            }
+            },
+            chainable: entry.tags?.some(tag => tag.title === 'chainable') ? 1 : undefined
           }
         ],
         return: prevItem?.return || entry.returns?.[0] && {

utils/typescript.mjs

@@ -504,7 +504,7 @@ function generateMethodDeclaration(method, options = {}) {
         .join(', ');
 
       let returnType = 'void';
-      if (method.chainable && !globalFunction && options.currentClass !== 'p5') {
+      if (overload.chainable && !globalFunction && options.currentClass !== 'p5') {
         returnType = options.currentClass || 'this';
         // TODO: Decide what should be chainable. Many of these are accidental / not thought through
       } else if (overload.return && overload.return.type) {