@microsoft/type2docfx 2.3.3-dev.2167871.0 → 2.3.3-dev.2173727.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Context = void 0;
|
|
4
4
|
class Context {
|
|
5
|
-
constructor(parentUid, parentKind, packageName, references) {
|
|
5
|
+
constructor(parentUid, parentKind, packageName, references, methodOverloadCounters) {
|
|
6
6
|
this.packageName = packageName;
|
|
7
7
|
this.parentUid = parentUid;
|
|
8
8
|
this.parentKind = parentKind;
|
|
9
9
|
this.references = references;
|
|
10
|
+
this.methodOverloadCounters = methodOverloadCounters || new Map();
|
|
10
11
|
}
|
|
11
12
|
get PackageName() {
|
|
12
13
|
return this.packageName;
|
|
@@ -26,6 +27,18 @@ class Context {
|
|
|
26
27
|
get ParentKind() {
|
|
27
28
|
return this.parentKind;
|
|
28
29
|
}
|
|
30
|
+
getNextMethodOverloadIndex(methodName) {
|
|
31
|
+
const key = `${this.ParentUid}.${methodName}`;
|
|
32
|
+
const currentCount = this.methodOverloadCounters.get(key) || 0;
|
|
33
|
+
this.methodOverloadCounters.set(key, currentCount + 1);
|
|
34
|
+
return currentCount;
|
|
35
|
+
}
|
|
36
|
+
getMethodOverloadCounters() {
|
|
37
|
+
return this.methodOverloadCounters;
|
|
38
|
+
}
|
|
39
|
+
resetMethodOverloadCounters() {
|
|
40
|
+
this.methodOverloadCounters.clear();
|
|
41
|
+
}
|
|
29
42
|
}
|
|
30
43
|
exports.Context = Context;
|
|
31
44
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/converters/context.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/converters/context.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;IAOlB,YACE,SAAiB,EACjB,UAAkB,EAClB,WAAmB,EACnB,UAAiC,EACjC,sBAA4C;QAE5C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,IAAI,IAAI,GAAG,EAAkB,CAAC;IACpF,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAW,SAAS;QAClB,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,SAAS,CAAC,GAAW;QAC9B,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEM,0BAA0B,CAAC,UAAkB;QAClD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,UAAU,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,yBAAyB;QAC9B,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEM,2BAA2B;QAChC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC;IACtC,CAAC;CACF;AA3DD,0BA2DC"}
|
|
@@ -9,6 +9,8 @@ class MethodConverter extends base_1.AbstractConverter {
|
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
11
|
const models = new Array();
|
|
12
|
+
// Get the overload index for this method name
|
|
13
|
+
const methodOverloadIndex = context.getNextMethodOverloadIndex(node.name);
|
|
12
14
|
for (let index = 0; index < node.signatures.length; index++) {
|
|
13
15
|
// ignore implicit constructor
|
|
14
16
|
if (node.kindString === 'Constructor' &&
|
|
@@ -17,24 +19,13 @@ class MethodConverter extends base_1.AbstractConverter {
|
|
|
17
19
|
continue;
|
|
18
20
|
}
|
|
19
21
|
let uid = context.ParentUid + '.' + node.name;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (!MethodConverter.methodCounts.has(parentKey)) {
|
|
24
|
-
MethodConverter.methodCounts.set(parentKey, new Map());
|
|
22
|
+
// Handle multiple overloaded methods (different method nodes with same name)
|
|
23
|
+
if (methodOverloadIndex > 0) {
|
|
24
|
+
uid += `_${methodOverloadIndex}`;
|
|
25
25
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
methodCounts.set(methodName, currentCount + 1);
|
|
30
|
-
// Add suffix only if there are naming conflicts
|
|
31
|
-
if (currentCount > 0) {
|
|
32
|
-
if (isStatic) {
|
|
33
|
-
uid += '_static';
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
uid += `_${currentCount}`;
|
|
37
|
-
}
|
|
26
|
+
// Handle multiple signatures within the same method
|
|
27
|
+
if (index > 0) {
|
|
28
|
+
uid += `_${index}`;
|
|
38
29
|
}
|
|
39
30
|
console.log(` - ${node.kindString}: ${uid}`);
|
|
40
31
|
const model = {
|
|
@@ -56,5 +47,4 @@ class MethodConverter extends base_1.AbstractConverter {
|
|
|
56
47
|
}
|
|
57
48
|
}
|
|
58
49
|
exports.MethodConverter = MethodConverter;
|
|
59
|
-
MethodConverter.methodCounts = new Map();
|
|
60
50
|
//# sourceMappingURL=method.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../src/converters/method.ts"],"names":[],"mappings":";;;AAEA,iCAA2C;AAG3C,mDAA4C;AAE5C,MAAa,eAAgB,SAAQ,wBAAiB;
|
|
1
|
+
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../src/converters/method.ts"],"names":[],"mappings":";;;AAEA,iCAA2C;AAG3C,mDAA4C;AAE5C,MAAa,eAAgB,SAAQ,wBAAiB;IAC1C,QAAQ,CAAC,IAAU,EAAE,OAAgB;QAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO;SACR;QAED,MAAM,MAAM,GAAG,IAAI,KAAK,EAAa,CAAC;QAEtC,8CAA8C;QAC9C,MAAM,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC3D,8BAA8B;YAC9B,IACE,IAAI,CAAC,UAAU,KAAK,aAAa;gBACjC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO;gBAC/B,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,UAAU,EAClC;gBACA,SAAS;aACV;YAED,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;YAE9C,6EAA6E;YAC7E,IAAI,mBAAmB,GAAG,CAAC,EAAE;gBAC3B,GAAG,IAAI,IAAI,mBAAmB,EAAE,CAAC;aAClC;YAED,oDAAoD;YACpD,IAAI,KAAK,GAAG,CAAC,EAAE;gBACb,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;aACpB;YAED,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC,CAAC;YAC7C,MAAM,KAAK,GAAc;gBACvB,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,EAAE;gBACZ,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,iBAAK;gBACZ,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE;oBACN,OAAO,EAAE,EAAE;iBACZ;aACF,CAAC;YAEF,IAAI,CAAC,+BAA+B,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,8BAA8B,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC;YAE9F,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtDD,0CAsDC"}
|
package/dist/parser.js
CHANGED
|
@@ -21,7 +21,9 @@ class Parser {
|
|
|
21
21
|
}
|
|
22
22
|
for (const child of node.children) {
|
|
23
23
|
const uid = models.length > 0 ? models[0].uid : context.PackageName;
|
|
24
|
-
|
|
24
|
+
// For child nodes within the same parent scope, we should preserve method overload counters
|
|
25
|
+
// This ensures that overloaded methods within the same class/interface get unique UIDs
|
|
26
|
+
const newContext = new context_1.Context(uid, node.kindString, context.PackageName, context.References, context.getMethodOverloadCounters());
|
|
25
27
|
if (models.length > 0) {
|
|
26
28
|
models[0].children = [].concat(models[0].children, this.traverse(child, uidMapping, newContext));
|
|
27
29
|
}
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":";;;AAIA,sDAAmD;AACnD,kDAA+C;AAE/C,MAAa,MAAM;IACV,QAAQ,CAAC,IAAU,EAAE,UAAsB,EAAE,OAAgB;QAClE,IAAI,UAAU,GAAG,IAAI,KAAK,EAAa,CAAC;QAExC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzB,OAAO,UAAU,CAAC;SACnB;QAED,MAAM,MAAM,GAAG,IAAI,qBAAS,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;YAChC,IAAI,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE;gBACnC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACxB;SACF;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,OAAO,UAAU,CAAC;SACnB;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YACpE,MAAM,UAAU,GAAG,IAAI,iBAAO,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":";;;AAIA,sDAAmD;AACnD,kDAA+C;AAE/C,MAAa,MAAM;IACV,QAAQ,CAAC,IAAU,EAAE,UAAsB,EAAE,OAAgB;QAClE,IAAI,UAAU,GAAG,IAAI,KAAK,EAAa,CAAC;QAExC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzB,OAAO,UAAU,CAAC;SACnB;QAED,MAAM,MAAM,GAAG,IAAI,qBAAS,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;YAChC,IAAI,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE;gBACnC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACxB;SACF;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,OAAO,UAAU,CAAC;SACnB;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YACpE,4FAA4F;YAC5F,uFAAuF;YACvF,MAAM,UAAU,GAAG,IAAI,iBAAO,CAC5B,GAAG,EACH,IAAI,CAAC,UAAU,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,yBAAyB,EAAE,CACpC,CAAC;YACF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC,MAAM,CAC5B,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAClB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAC7C,CAAC;aACH;iBAAM;gBACL,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;aAClF;SACF;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,UAAU,CAAC,IAAU;QAC3B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAClD,OAAO,IAAI,CAAC;SACb;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3E,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,UAAU,CAAC,IAAU;QAC3B,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACrD,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAClD,OAAO,IAAI,CAAC;aACb;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAzED,wBAyEC"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/type2docfx",
|
|
3
|
-
"version": "2.3.3-dev.
|
|
3
|
+
"version": "2.3.3-dev.2173727.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@microsoft/type2docfx",
|
|
9
|
-
"version": "2.3.3-dev.
|
|
9
|
+
"version": "2.3.3-dev.2173727.0",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"commander": "^9.4.1",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/type2docfx",
|
|
3
|
-
"version": "2.3.3-dev.
|
|
3
|
+
"version": "2.3.3-dev.2173727.0",
|
|
4
4
|
"description": "A tool to convert json format output from TypeDoc to schema driven reference model for DocFx to consume.",
|
|
5
5
|
"main": "./dist/main.js",
|
|
6
6
|
"bin": {
|