@progress/kendo-typescript-api-tasks 1.1.2-dev.32 → 1.1.2-dev.36

package/lib/generator.js

@@ -91,18 +91,7 @@ const normalizeUnionReferences = (element, members) => {
 const normalizeMembers = (members) => {
     traverseElements(members, (element) => {
         normalizeUnionReferences(element, members);
-
-        if (!element.comment && element.implementationOf) {
-            const interfaceName = element.implementationOf.name.split('.')[0];
-            const interfaceOptions = members.find((child) => child.name === interfaceName);
-
-            if (interfaceOptions) {
-                const baseOption = interfaceOptions.children.find(child => child.name === element.name);
-                if (baseOption) {
-                    mergeComments(element, baseOption);
-                }
-            }
-        }
+        mergeBaseOptions(element, members);
 
         if (!element.comment && element.kind === ReflectionKind.Accessor) {
             element.comment = (element.setSignature || {}).comment || (element.getSignature || {}).comment || [];
@@ -110,6 +99,21 @@ const normalizeMembers = (members) => {
     });
 };
 
+const mergeBaseOptions = (element, members) => {
+    if (!element.comment && (element.implementationOf || element.inheritedFrom)) {
+        const interfaceName = (element.implementationOf || element.inheritedFrom).name.split('.')[0];
+        const interfaceOptions = members.find((child) => child.name === interfaceName);
+
+        if (interfaceOptions) {
+            const baseOption = interfaceOptions.children.find(child => child.name === element.name);
+            if (baseOption) {
+                mergeBaseOptions(baseOption, members);
+                mergeComments(element, baseOption);
+            }
+        }
+    }
+};
+
 const mergeComments = (root, src) => {
     if (!root.comment && src.comment) {
         root.comment = src.comment;

package/lib/source.js

@@ -1,6 +1,12 @@
 const source = (member, parent) => {
-    const source = parent ? parent.sources[0] : member.sources[0];
-    const sourceFile = `${source.fileName}:${source.line}`;
+    const source = member.sources[0];
+    let sourceFile = `${source.fileName}:${source.line}`;
+    if (parent) {
+        const parentSource = parent.sources[0];
+        if (parentSource.fileName !== source.fileName) {
+            sourceFile = `${parentSource.fileName}:${parentSource.line} -> ` + sourceFile;
+        }
+    }
     return `'${member.name}' ${sourceFile}`;
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-typescript-api-tasks",
   "description": "Kendo UI API docs package gulp tasks",
-  "version": "1.1.2-dev.32+864edf2",
+  "version": "1.1.2-dev.36+629ea4d",
   "author": "Progress",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -40,5 +40,5 @@
     "jest-cli": "^29.2.2",
     "typescript": "5.2.2"
   },
-  "gitHead": "864edf23cc968b7eb30826398c8f926f2175e2b8"
+  "gitHead": "629ea4d6fb4f9562435f8a8be485f31a87174f69"
 }