@microsoft/type2docfx 2.3.2-preview.0 → 2.3.2
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.
- package/dist/converters/context.js +10 -1
- package/dist/converters/context.js.map +1 -1
- package/dist/converters/method.js +4 -2
- package/dist/converters/method.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/parser.js +3 -1
- package/dist/parser.js.map +1 -1
- package/npm-shrinkwrap.json +3 -5
- package/package.json +4 -10
|
@@ -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;
|
|
10
11
|
}
|
|
11
12
|
get PackageName() {
|
|
12
13
|
return this.packageName;
|
|
@@ -26,6 +27,14 @@ class Context {
|
|
|
26
27
|
get ParentKind() {
|
|
27
28
|
return this.parentKind;
|
|
28
29
|
}
|
|
30
|
+
getNextMethodOverloadIndex(uid) {
|
|
31
|
+
const currentCount = this.methodOverloadCounters.get(uid) || 0;
|
|
32
|
+
this.methodOverloadCounters.set(uid, currentCount + 1);
|
|
33
|
+
return currentCount;
|
|
34
|
+
}
|
|
35
|
+
get MethodOverloadCounters() {
|
|
36
|
+
return this.methodOverloadCounters;
|
|
37
|
+
}
|
|
29
38
|
}
|
|
30
39
|
exports.Context = Context;
|
|
31
40
|
//# 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,sBAA2C;QAE3C,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,CAAC;IACvD,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,GAAW;QAC3C,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;IAED,IAAW,sBAAsB;QAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;CACF;AAtDD,0BAsDC"}
|
|
@@ -17,8 +17,10 @@ class MethodConverter extends base_1.AbstractConverter {
|
|
|
17
17
|
continue;
|
|
18
18
|
}
|
|
19
19
|
let uid = context.ParentUid + '.' + node.name;
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
// Get the overload index for this method name (unified for static and instance)
|
|
21
|
+
const methodOverloadIndex = context.getNextMethodOverloadIndex(uid);
|
|
22
|
+
if (methodOverloadIndex > 0) {
|
|
23
|
+
uid += `_${methodOverloadIndex}`;
|
|
22
24
|
}
|
|
23
25
|
console.log(` - ${node.kindString}: ${uid}`);
|
|
24
26
|
const model = {
|
|
@@ -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;IAC1C,QAAQ,CAAC,IAAU,EAAE,OAAgB;QAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO;SACR;QAED,MAAM,MAAM,GAAG,IAAI,KAAK,EAAa,CAAC;
|
|
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,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,gFAAgF;YAChF,MAAM,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;YAEpE,IAAI,mBAAmB,GAAG,CAAC,EAAE;gBAC3B,GAAG,IAAI,IAAI,mBAAmB,EAAE,CAAC;aAClC;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;AAhDD,0CAgDC"}
|
package/dist/main.js
CHANGED
|
@@ -60,7 +60,7 @@ function run(inputPath, outputPath) {
|
|
|
60
60
|
// const innerClassReferenceMapping = new Map<string, string[]>();
|
|
61
61
|
let collection = [];
|
|
62
62
|
if (json) {
|
|
63
|
-
const context = new context_1.Context('', '', json.name, new Map());
|
|
63
|
+
const context = new context_1.Context('', '', json.name, new Map(), new Map());
|
|
64
64
|
collection = new parser_1.Parser().traverse(json, uidMapping, context);
|
|
65
65
|
}
|
|
66
66
|
if (!collection || collection.length === 0) {
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AACtC,2BAA4B;AAC5B,+BAA+C;AAC/C,6CAAoC;AACpC,iDAA6C;AAC7C,0CAA2C;AAC3C,qCAAkC;AAClC,uDAAkD;AAClD,iDAA6C;AAC7C,6CAA0C;AAG1C,kDAA+E;AAE/E,kDAA+C;AAE/C,qEAAmG;AACnG,qCAA0E;AAC1E,uCAckB;AAClB,2DAAsE;AAEtE,SAAgB,GAAG,CAAC,SAAiB,EAAE,UAAkB;IACvD,IAAI,IAAI,GAAG,IAAI,CAAC;IAEhB,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,IAAI,IAAA,oBAAS,EAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;QAC/D,oBAAoB;QACpB,IAAI,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KACrC;SAAM,IACL,IAAA,qBAAU,EAAC,SAAS,CAAC;QACrB,IAAA,oBAAS,EAAC,SAAS,CAAC,CAAC,MAAM,EAAE;QAC7B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC3B;QACA,+BAA+B;QAC/B,IAAI,GAAG,IAAA,uBAAY,EAAC,SAAS,CAAS,CAAC;KACxC;SAAM;QACL,sIAAsI;QACtI,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;KAC9B;IAED,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,kEAAkE;IAElE,IAAI,UAAU,GAAgB,EAAE,CAAC;IACjC,IAAI,IAAI,EAAE;QACR,MAAM,OAAO,GAAG,IAAI,iBAAO,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
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.MethodOverloadCounters);
|
|
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,sBAAsB,CAC/B,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.2
|
|
3
|
+
"version": "2.3.2",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@microsoft/type2docfx",
|
|
9
|
-
"version": "2.3.2
|
|
9
|
+
"version": "2.3.2",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"commander": "^9.4.1",
|
|
@@ -3511,9 +3511,7 @@
|
|
|
3511
3511
|
"dev": true,
|
|
3512
3512
|
"hasInstallScript": true,
|
|
3513
3513
|
"optional": true,
|
|
3514
|
-
"os": [
|
|
3515
|
-
"darwin"
|
|
3516
|
-
],
|
|
3514
|
+
"os": ["darwin"],
|
|
3517
3515
|
"engines": {
|
|
3518
3516
|
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
|
3519
3517
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/type2docfx",
|
|
3
|
-
"version": "2.3.2
|
|
3
|
+
"version": "2.3.2",
|
|
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": {
|
|
@@ -21,11 +21,7 @@
|
|
|
21
21
|
"type": "git",
|
|
22
22
|
"url": "git+https://github.com/docascode/type2docfx.git"
|
|
23
23
|
},
|
|
24
|
-
"keywords": [
|
|
25
|
-
"typescript",
|
|
26
|
-
"docfx",
|
|
27
|
-
"documentation"
|
|
28
|
-
],
|
|
24
|
+
"keywords": ["typescript", "docfx", "documentation"],
|
|
29
25
|
"author": "Microsoft",
|
|
30
26
|
"license": "Apache-2.0",
|
|
31
27
|
"bugs": {
|
|
@@ -63,12 +59,10 @@
|
|
|
63
59
|
"typedoc": "^0.23.28"
|
|
64
60
|
},
|
|
65
61
|
"lint-staged": {
|
|
66
|
-
"**/*.{ts,json,js}": [
|
|
67
|
-
"npm run dprint"
|
|
68
|
-
]
|
|
62
|
+
"**/*.{ts,json,js}": ["npm run dprint"]
|
|
69
63
|
},
|
|
70
64
|
"publishConfig": {
|
|
71
|
-
"tag": "
|
|
65
|
+
"tag": "latest",
|
|
72
66
|
"registry": "https://registry.npmjs.org/"
|
|
73
67
|
}
|
|
74
68
|
}
|