Fix panel inheritance

Author: luttje

src/api-writer/glua-api-writer.ts

@@ -1,4 +1,4 @@
-import { ClassFunction, Enum, Function, HookFunction, LibraryFunction, PanelFunction, Realm, Struct, WikiPage } from '../scrapers/wiki-page-markup-scraper.js';
+import { ClassFunction, Enum, Function, HookFunction, LibraryFunction, Panel, PanelFunction, Realm, Struct, WikiPage, isPanel } from '../scrapers/wiki-page-markup-scraper.js';
 import { putCommentBeforeEachLine, removeNewlines, toLowerCamelCase } from '../utils/string.js';
 import {
   isClassFunction,
@@ -83,6 +83,8 @@ export class GluaApiWriter {
       return this.writeLibraryFunction(page);
     else if (isHookFunction(page))
       return this.writeHookFunction(page);
+    else if (isPanel(page))
+      return this.writePanel(page);
     else if (isPanelFunction(page))
       return this.writePanelFunction(page);
     else if (isEnum(page))
@@ -150,8 +152,12 @@ export class GluaApiWriter {
     return this.writeClassFunction(func);
   }
 
+  private writePanel(panel: Panel) {
+    return this.writeClass(panel.name, panel.parent);
+  }
+
   private writePanelFunction(func: PanelFunction) {
-    let api: string = this.writeClass(func.parent, 'Panel');
+    let api: string = '';
 
     api += this.writeFunctionLuaDocComment(func, func.realm);
     api += this.writeFunctionDeclaration(func, func.realm, ':');

src/scrapers/wiki-page-markup-scraper.ts

@@ -5,7 +5,7 @@ export type WikiFunctionType = 'panelfunc' | 'classfunc' | 'libraryfunc' | 'hook
 export type Realm = 'Menu' | 'Client' | 'Server' | 'Shared' | 'Client and menu';
 
 export type CommonWikiProperties = {
-  type: WikiFunctionType | 'enum' | 'struct';
+  type: WikiFunctionType | 'enum' | 'struct' | 'panel';
   address: string;
   name: string;
   description: string;
@@ -43,7 +43,7 @@ export type HookFunction = Function & {
 
 export type PanelFunction = Function & {
   type: 'panelfunc';
-  isPanel: 'yes';
+  isPanelFunction: 'yes';
 };
 
 export type EnumValue = {
@@ -69,7 +69,12 @@ export type Struct = CommonWikiProperties & {
   fields: StructField[];
 };
 
-export type WikiPage = ClassFunction | LibraryFunction | HookFunction | PanelFunction | Enum | Struct;
+export type Panel = CommonWikiProperties & {
+  type: 'panel';
+  parent: string;
+};
+
+export type WikiPage = ClassFunction | LibraryFunction | HookFunction | PanelFunction | Panel | Enum | Struct;
 
 /**
  * Guards
@@ -90,6 +95,10 @@ export function isPanelFunction(page: WikiPage): page is PanelFunction {
   return page.type === 'panelfunc';
 }
 
+export function isPanel(page: WikiPage): page is Panel {
+  return page.type === 'panel';
+}
+
 export function isEnum(page: WikiPage): page is Enum {
   return page.type === 'enum';
 }
@@ -114,13 +123,14 @@ export class WikiPageMarkupScraper extends Scraper<WikiPage> {
         const isEnum = $('enum').length > 0;
         const isStruct = $('structure').length > 0;
         const isFunction = $('function').length > 0;
-        const mainElement = $(isEnum ? 'enum' : isStruct ? 'struct' : 'function').first();
+        const isPanel = $('panel').length > 0;
+        const mainElement = $(isEnum ? 'enum' : isStruct ? 'struct' : isPanel ? 'panel' : 'function');
         const address = response.url.split('/').pop()!.split('?')[0];
 
         if (isEnum) {
-          const items = $('items item').map(function() {
+          const items = $('items item').map(function () {
             const $el = $(this);
-            return <EnumValue> {
+            return <EnumValue>{
               key: $el.attr('key')!,
               value: $el.attr('value')!,
               description: $el.text()
@@ -136,9 +146,9 @@ export class WikiPageMarkupScraper extends Scraper<WikiPage> {
             items
           };
         } else if (isStruct) {
-          const fields = $('fields item').map(function() {
+          const fields = $('fields item').map(function () {
             const $el = $(this);
-            return <StructField> {
+            return <StructField>{
               name: $el.attr('name')!,
               type: $el.attr('type')!,
               default: $el.attr('default'),
@@ -154,6 +164,15 @@ export class WikiPageMarkupScraper extends Scraper<WikiPage> {
             realm: $('realm').text() as Realm,
             fields
           };
+        } else if (isPanel) {
+          return <Panel>{
+            type: 'panel',
+            name: address,
+            address: address,
+            description: $('description').text(),
+            realm: $('realm').text() as Realm,
+            parent: $('parent').text()
+          };
         } else if (isFunction) {
           const isClassFunction = mainElement.attr('type') === 'classfunc';
           const isLibraryFunction = mainElement.attr('type') === 'libraryfunc';
@@ -219,7 +238,7 @@ export class WikiPageMarkupScraper extends Scraper<WikiPage> {
             return <PanelFunction> {
               ...base,
               type: 'panelfunc',
-              isPanel: 'yes'
+              isPanelFunction: 'yes'
             };
           }
         }