Skip to content

Commit daea032

Browse files
authored
Fix doc formatting (#4147)
1 parent 11563b2 commit daea032

File tree

3 files changed

+43
-24
lines changed

3 files changed

+43
-24
lines changed

packages/firebase/index.d.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ declare namespace firebase {
485485
linkWithRedirect(provider: firebase.auth.AuthProvider): Promise<void>;
486486
metadata: firebase.auth.UserMetadata;
487487
/**
488-
* The {@link firebase.User.MultiFactor} object corresponding to the current user.
488+
* The {@link firebase.User.MultiFactorUser} object corresponding to the current user.
489489
* This is used to access all multi-factor properties and operations related to the
490490
* current user.
491491
*/
@@ -1964,7 +1964,7 @@ declare namespace firebase.auth {
19641964
* For the REVERT_SECOND_FACTOR_ADDITION action, which allows a user to unenroll
19651965
* a newly added second factor, this object contains a `multiFactorInfo` field with
19661966
* the information about the second factor. For phone second factor, the
1967-
* `multiFactorInfo` is a {@link firebase.auth.Auth.PhoneMultiFactorInfo} object,
1967+
* `multiFactorInfo` is a {@link firebase.auth.PhoneMultiFactorInfo} object,
19681968
* which contains the phone number.
19691969
*/
19701970
data: {
@@ -3323,8 +3323,8 @@ declare namespace firebase.auth {
33233323
/**
33243324
* An authentication error.
33253325
* For method-specific error codes, refer to the specific methods in the
3326-
* documentation. For common error codes, check the reference below. Use {@link
3327-
* firebase.auth.Error#code} to get the specific error code. For a detailed
3326+
* documentation. For common error codes, check the reference below. Use{@link
3327+
* firebase.auth.Error.code} to get the specific error code. For a detailed
33283328
* message, use {@link firebase.auth.Error.message}.
33293329
* Errors with the code <strong>auth/account-exists-with-different-credential
33303330
* </strong> will have the additional fields <strong>email</strong> and <strong>
@@ -3452,7 +3452,7 @@ declare namespace firebase.auth {
34523452
phoneNumber?: string;
34533453
/**
34543454
* The tenant ID being used for sign-in/linking. If you use
3455-
* {@link firebase.auth.signInWithRedirect} to sign in, you have to
3455+
* {@link firebase.auth.Auth.signInWithRedirect} to sign in, you have to
34563456
* set the tenant ID on Auth instanace again as the tenant ID is not
34573457
* persisted after redirection.
34583458
*/
@@ -7534,18 +7534,18 @@ declare namespace firebase.storage {
75347534
* @param url A URL in the form: <br />
75357535
* 1) a gs:// URL, for example `gs://bucket/files/image.png` <br />
75367536
* 2) a download URL taken from object metadata. <br />
7537-
* @see {@link firebase.storage.FullMetadata.prototype.downloadURLs}
7537+
* @see {@link firebase.storage.FullMetadata.downloadURLs}
75387538
* @return A reference for the given URL.
75397539
*/
75407540
refFromURL(url: string): firebase.storage.Reference;
75417541
/**
75427542
* @param time The new maximum operation retry time in milliseconds.
7543-
* @see {@link firebase.storage.Storage.prototype.maxOperationRetryTime}
7543+
* @see {@link firebase.storage.Storage.maxOperationRetryTime}
75447544
*/
75457545
setMaxOperationRetryTime(time: number): any;
75467546
/**
75477547
* @param time The new maximum upload retry time in milliseconds.
7548-
* @see {@link firebase.storage.Storage.prototype.maxUploadRetryTime}
7548+
* @see {@link firebase.storage.Storage.maxUploadRetryTime}
75497549
*/
75507550
setMaxUploadRetryTime(time: number): any;
75517551
}
@@ -7593,7 +7593,7 @@ declare namespace firebase.storage {
75937593
/**
75947594
* An event that is triggered on a task.
75957595
* @enum {string}
7596-
* @see {@link firebase.storage.UploadTask.prototype.on}
7596+
* @see {@link firebase.storage.UploadTask.on}
75977597
*/
75987598
type TaskEvent = string;
75997599
var TaskEvent: {

scripts/docgen/content-sources/js/toc.yaml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,31 +67,31 @@ toc:
6767
- title: "IdTokenResult"
6868
path: /docs/reference/js/firebase.auth.IDTokenResult
6969
- title: "MultiFactorAssertion"
70-
path: /docs/reference/js/firebase.auth.multifactorassertion
70+
path: /docs/reference/js/firebase.auth.MultiFactorAssertion
7171
- title: "MultiFactorError"
72-
path: /docs/reference/js/firebase.auth.multifactorerror
72+
path: /docs/reference/js/firebase.auth.MultiFactorError
7373
- title: "MultiFactorInfo"
74-
path: /docs/reference/js/firebase.auth.multifactorinfo
74+
path: /docs/reference/js/firebase.auth.MultiFactorInfo
7575
- title: "MultiFactorResolver"
76-
path: /docs/reference/js/firebase.auth.multifactorresolver
76+
path: /docs/reference/js/firebase.auth.MultiFactorResolver
7777
- title: "MultiFactorSession"
78-
path: /docs/reference/js/firebase.auth.multifactorsession
78+
path: /docs/reference/js/firebase.auth.MultiFactorSession
7979
- title: "PhoneAuthCredential"
80-
path: /docs/reference/js/firebase.auth.phoneauthcredential
80+
path: /docs/reference/js/firebase.auth.PhoneAuthCredential
8181
- title: "PhoneMultiFactorAssertion"
82-
path: /docs/reference/js/firebase.auth.phonemultifactorassertion
82+
path: /docs/reference/js/firebase.auth.PhoneMultiFactorAssertion
8383
- title: "PhoneMultiFactorEnrollInfoOptions"
84-
path: /docs/reference/js/firebase.auth.phonemultifactorenrollinfooptions
84+
path: /docs/reference/js/firebase.auth.PhoneMultiFactorEnrollInfoOptions
8585
- title: "PhoneMultiFactorGenerator"
86-
path: /docs/reference/js/firebase.auth.phonemultifactorgenerator
86+
path: /docs/reference/js/firebase.auth.PhoneMultiFactorGenerator
8787
- title: "PhoneMultiFactorInfo"
88-
path: /docs/reference/js/firebase.auth.phonemultifactorinfo
88+
path: /docs/reference/js/firebase.auth.PhoneMultiFactorInfo
8989
- title: "PhoneMultiFactorSignInInfoOptions"
90-
path: /docs/reference/js/firebase.auth.phonemultifactorsignininfooptions
90+
path: /docs/reference/js/firebase.auth.PhoneMultiFactorSignInInfoOptions
9191
- title: "PhoneSingleFactorInfoOptions"
92-
path: /docs/reference/js/firebase.auth.phonesinglefactorinfooptions
92+
path: /docs/reference/js/firebase.auth.PhoneSingleFactorInfoOptions
9393
- title: "MultiFactorUser"
94-
path: /docs/reference/js/firebase.user.multifactoruser
94+
path: /docs/reference/js/firebase.user.MultiFactorUser
9595
- title: "OAuthCredential"
9696
path: /docs/reference/js/firebase.auth.OAuthCredential
9797
- title: "OAuthCredentialOptions"
@@ -236,6 +236,8 @@ toc:
236236
- title: "firebase.storage"
237237
path: /docs/reference/js/firebase.storage
238238
section:
239+
- title: "FirebaseStorageError"
240+
path: /docs/reference/js/firebase.storage.FirebaseStorageError
239241
- title: "FullMetadata"
240242
path: /docs/reference/js/firebase.storage.FullMetadata
241243
- title: "ListOptions"
@@ -248,6 +250,8 @@ toc:
248250
path: /docs/reference/js/firebase.storage.SettableMetadata
249251
- title: "Storage"
250252
path: /docs/reference/js/firebase.storage.Storage
253+
- title: "StorageObserver"
254+
path: /docs/reference/js/firebase.storage.StorageObserver
251255
- title: "UploadMetadata"
252256
path: /docs/reference/js/firebase.storage.UploadMetadata
253257
- title: "UploadTask"

scripts/docgen/generate-docs.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -104,7 +104,22 @@ function fixLinks(file) {
104104
const re = new RegExp(lower, 'g');
105105
caseFixedLinks = caseFixedLinks.replace(re, lowerToUpperLookup[lower]);
106106
}
107-
return fs.writeFile(file, caseFixedLinks);
107+
let badLinkCleanup = caseFixedLinks.replace(
108+
/{@link (.+)}/g,
109+
(all, text) => {
110+
// It's expected to have some broken @link tags in Node docs
111+
// since they could reference some pages only generated for JS.
112+
// Just render as plain text. Warn if it's not a Node doc.
113+
if (!file.includes('/node/')) {
114+
console.log(
115+
`Unable to generate link for "${all} in ${file}", ` +
116+
`removing markup and rendering as plain text.`
117+
);
118+
}
119+
return text;
120+
}
121+
);
122+
return fs.writeFile(file, badLinkCleanup);
108123
});
109124
}
110125

0 commit comments

Comments
 (0)