@microsoft/type2docfx 2.3.1-dev.2107022.0 → 2.3.1-dev.2110533.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.
Files changed (4) hide show
  1. package/dist/helpers/linkConvertHelper.js +3 -1
  2. package/dist/helpers/linkConvertHelper.js.map +1 -1
  3. package/npm-shrinkwrap.json +2 -2
  4. package/package.json +1 -1
package/dist/helpers/linkConvertHelper.js CHANGED
@@ -56,6 +56,7 @@ function convertLinkToGfm(text, uidPrefix = null) {
56
56
  if (!urlRegex.test(target)) {
57
57
  // if target isn't a url, it must be a namepath(uid)
58
58
  result += 'xref:';
59
+ target = convertNamepathToUid(target);
59
60
  }
60
61
  result += target + ')';
61
62
  }
@@ -64,13 +65,14 @@ function convertLinkToGfm(text, uidPrefix = null) {
64
65
  return target;
65
66
  }
66
67
  // if link text is undefined and target isn't a url, it must link to namepath(uid)
67
- result = '<xref:' + target + '>';
68
+ result = '<xref:' + convertNamepathToUid(target) + '>';
68
69
  if (tag === '@linkcode') {
69
70
  result = '<code>' + result + '</code>';
70
71
  }
71
72
  }
72
73
  return result;
73
74
  function convertNamepathToUid(namepath) {
75
+ // TODO: handle namepath containining `@` or `#`
74
76
  var uid = encodeURIComponent(namepath);
75
77
  if (uidPrefix) {
76
78
  uid = uidPrefix + uid;
package/dist/helpers/linkConvertHelper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"linkConvertHelper.js","sourceRoot":"","sources":["../../src/helpers/linkConvertHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"linkConvertHelper.js","sourceRoot":"","sources":["../../src/helpers/linkConvertHelper.ts"],"names":[],"mappings":"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"}
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@microsoft/type2docfx",
3
- "version": "2.3.1-dev.2107022.0",
3
+ "version": "2.3.1-dev.2110533.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@microsoft/type2docfx",
9
- "version": "2.3.1-dev.2107022.0",
9
+ "version": "2.3.1-dev.2110533.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.1-dev.2107022.0",
3
+ "version": "2.3.1-dev.2110533.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": {