clefbase 1.3.0 → 1.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/auth/index.d.ts +128 -0
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +192 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/cli.js +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/react/StorageImage.d.ts.map +1 -1
- package/dist/react/StorageImage.js +29 -4
- package/dist/react/StorageImage.js.map +1 -1
- package/package.json +1 -1
package/dist/auth/index.d.ts
CHANGED
|
@@ -1,5 +1,60 @@
|
|
|
1
1
|
import { HttpClient } from "../http";
|
|
2
2
|
import type { AuthUser, AuthResult } from "../types";
|
|
3
|
+
interface GisNotification {
|
|
4
|
+
isNotDisplayed(): boolean;
|
|
5
|
+
isSkippedMoment(): boolean;
|
|
6
|
+
isDismissedMoment(): boolean;
|
|
7
|
+
getNotDisplayedReason(): string;
|
|
8
|
+
getSkippedReason(): string;
|
|
9
|
+
getDismissedReason(): string;
|
|
10
|
+
}
|
|
11
|
+
interface GoogleAccountsId {
|
|
12
|
+
initialize(config: {
|
|
13
|
+
client_id: string;
|
|
14
|
+
callback: (response: {
|
|
15
|
+
credential: string;
|
|
16
|
+
}) => void;
|
|
17
|
+
auto_select?: boolean;
|
|
18
|
+
cancel_on_tap_outside?: boolean;
|
|
19
|
+
}): void;
|
|
20
|
+
prompt(momentListener?: (n: GisNotification) => void): void;
|
|
21
|
+
renderButton(parent: HTMLElement, options: {
|
|
22
|
+
type?: "standard" | "icon";
|
|
23
|
+
theme?: "outline" | "filled_blue" | "filled_black";
|
|
24
|
+
size?: "large" | "medium" | "small";
|
|
25
|
+
text?: "signin_with" | "signup_with" | "continue_with" | "signin";
|
|
26
|
+
shape?: "rectangular" | "pill" | "circle" | "square";
|
|
27
|
+
logo_alignment?: "left" | "center";
|
|
28
|
+
width?: number;
|
|
29
|
+
locale?: string;
|
|
30
|
+
}): void;
|
|
31
|
+
disableAutoSelect(): void;
|
|
32
|
+
revoke(hint: string, done: () => void): void;
|
|
33
|
+
}
|
|
34
|
+
declare global {
|
|
35
|
+
interface Window {
|
|
36
|
+
google?: {
|
|
37
|
+
accounts: {
|
|
38
|
+
id: GoogleAccountsId;
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Options for rendering a Google-branded sign-in button.
|
|
45
|
+
* Pass to `auth.signInWithGoogle()` to show a button instead of One Tap.
|
|
46
|
+
*/
|
|
47
|
+
export interface GoogleButtonOptions {
|
|
48
|
+
/** The DOM element to render the button into. */
|
|
49
|
+
container: HTMLElement;
|
|
50
|
+
theme?: "outline" | "filled_blue" | "filled_black";
|
|
51
|
+
size?: "large" | "medium" | "small";
|
|
52
|
+
text?: "signin_with" | "signup_with" | "continue_with" | "signin";
|
|
53
|
+
shape?: "rectangular" | "pill";
|
|
54
|
+
/** Pixel width of the button (min 200, max 400). */
|
|
55
|
+
width?: number;
|
|
56
|
+
locale?: string;
|
|
57
|
+
}
|
|
3
58
|
type AuthStateCallback = (user: AuthUser | null) => void;
|
|
4
59
|
/**
|
|
5
60
|
* Authentication service. Obtain via `getAuth(app)`.
|
|
@@ -14,9 +69,12 @@ export declare class Auth {
|
|
|
14
69
|
private readonly http;
|
|
15
70
|
private readonly store;
|
|
16
71
|
private listeners;
|
|
72
|
+
/** Cached Google Client ID. `null` = confirmed not configured. `undefined` = not yet fetched. */
|
|
73
|
+
private _googleClientId;
|
|
17
74
|
constructor(http: HttpClient);
|
|
18
75
|
private notify;
|
|
19
76
|
private handleResult;
|
|
77
|
+
private resolveGoogleClientId;
|
|
20
78
|
/** @internal — used by Storage to attach the bearer token to upload requests */
|
|
21
79
|
getAuthHeaders(): Record<string, string>;
|
|
22
80
|
/** The currently signed-in user, or null. */
|
|
@@ -44,6 +102,76 @@ export declare class Auth {
|
|
|
44
102
|
* const { user, token } = await auth.signIn("alice@example.com", "pass");
|
|
45
103
|
*/
|
|
46
104
|
signIn(email: string, password: string): Promise<AuthResult>;
|
|
105
|
+
/**
|
|
106
|
+
* Sign in with Google using the Google Identity Services popup or One Tap.
|
|
107
|
+
*
|
|
108
|
+
* Browser-only. The GIS script (`accounts.google.com/gsi/client`) is loaded
|
|
109
|
+
* automatically — no manual `<script>` tag needed.
|
|
110
|
+
*
|
|
111
|
+
* Without `buttonOptions`, the Google One Tap prompt is shown.
|
|
112
|
+
* Pass `{ container }` to render a fully styled Google button instead —
|
|
113
|
+
* which is more reliable since One Tap can be suppressed by the browser.
|
|
114
|
+
*
|
|
115
|
+
* Automatically handles new sign-ups: if the Google account has never been
|
|
116
|
+
* seen before, a new user record is created server-side.
|
|
117
|
+
*
|
|
118
|
+
* @throws `ClefbaseError` with code `GOOGLE_NOT_CONFIGURED` if no Client ID
|
|
119
|
+
* has been set in the project's auth settings.
|
|
120
|
+
* @throws `ClefbaseError` with code `GOOGLE_PROMPT_SUPPRESSED` if One Tap
|
|
121
|
+
* could not be displayed (switch to button mode in that case).
|
|
122
|
+
* @throws `ClefbaseError` with code `GOOGLE_SIGN_IN_CANCELLED` if the user
|
|
123
|
+
* dismissed the popup.
|
|
124
|
+
*
|
|
125
|
+
* @example
|
|
126
|
+
* // One Tap prompt
|
|
127
|
+
* const { user } = await auth.signInWithGoogle();
|
|
128
|
+
*
|
|
129
|
+
* // Branded Google button
|
|
130
|
+
* const { user } = await auth.signInWithGoogle({
|
|
131
|
+
* container: document.getElementById("google-btn")!,
|
|
132
|
+
* theme: "filled_blue",
|
|
133
|
+
* size: "large",
|
|
134
|
+
* text: "continue_with",
|
|
135
|
+
* });
|
|
136
|
+
*
|
|
137
|
+
* // React example
|
|
138
|
+
* const btnRef = useRef<HTMLDivElement>(null);
|
|
139
|
+
* await auth.signInWithGoogle({ container: btnRef.current! });
|
|
140
|
+
*/
|
|
141
|
+
signInWithGoogle(buttonOptions?: GoogleButtonOptions): Promise<AuthResult>;
|
|
142
|
+
/**
|
|
143
|
+
* Sign in with Google using a raw ID token string.
|
|
144
|
+
*
|
|
145
|
+
* Use this when you already have a `credential` from Google's callback —
|
|
146
|
+
* for example with a custom button implementation, React Native Google
|
|
147
|
+
* Sign-In, or any other flow that gives you an ID token directly.
|
|
148
|
+
*
|
|
149
|
+
* Works in both browser and Node.js environments.
|
|
150
|
+
*
|
|
151
|
+
* @example
|
|
152
|
+
* // Inside a GIS callback
|
|
153
|
+
* google.accounts.id.initialize({
|
|
154
|
+
* client_id: "...",
|
|
155
|
+
* callback: async ({ credential }) => {
|
|
156
|
+
* const { user } = await auth.signInWithGoogleToken(credential);
|
|
157
|
+
* },
|
|
158
|
+
* });
|
|
159
|
+
*
|
|
160
|
+
* // React Native
|
|
161
|
+
* const { idToken } = await GoogleSignin.signIn();
|
|
162
|
+
* const { user } = await auth.signInWithGoogleToken(idToken);
|
|
163
|
+
*/
|
|
164
|
+
signInWithGoogleToken(idToken: string): Promise<AuthResult>;
|
|
165
|
+
/**
|
|
166
|
+
* Returns `true` if Google Sign-In is configured for this project.
|
|
167
|
+
* Useful for conditionally rendering a "Sign in with Google" button.
|
|
168
|
+
*
|
|
169
|
+
* @example
|
|
170
|
+
* if (await auth.isGoogleSignInEnabled()) {
|
|
171
|
+
* showGoogleButton();
|
|
172
|
+
* }
|
|
173
|
+
*/
|
|
174
|
+
isGoogleSignInEnabled(): Promise<boolean>;
|
|
47
175
|
/** Sign out and clear the local session. */
|
|
48
176
|
signOut(): Promise<void>;
|
|
49
177
|
/** Re-fetch the current user's profile from the server and update the cache. */
|
package/dist/auth/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Auth = void 0;
|
|
4
|
+
const types_1 = require("../types");
|
|
4
5
|
class SessionStore {
|
|
5
6
|
constructor() {
|
|
6
7
|
this.session = null;
|
|
@@ -46,6 +47,44 @@ class SessionStore {
|
|
|
46
47
|
catch { /* ignore */ }
|
|
47
48
|
}
|
|
48
49
|
}
|
|
50
|
+
// ─── GIS script loader ────────────────────────────────────────────────────────
|
|
51
|
+
const GIS_SCRIPT_URL = "https://accounts.google.com/gsi/client";
|
|
52
|
+
let _gisLoading = null;
|
|
53
|
+
function loadGisScript() {
|
|
54
|
+
if (typeof window === "undefined") {
|
|
55
|
+
return Promise.reject(new types_1.ClefbaseError("signInWithGoogle() requires a browser environment. " +
|
|
56
|
+
"Use signInWithGoogleToken(idToken) for server/Node.js contexts.", "UNSUPPORTED_ENVIRONMENT"));
|
|
57
|
+
}
|
|
58
|
+
if (window.google?.accounts?.id)
|
|
59
|
+
return Promise.resolve();
|
|
60
|
+
if (_gisLoading)
|
|
61
|
+
return _gisLoading;
|
|
62
|
+
_gisLoading = new Promise((resolve, reject) => {
|
|
63
|
+
if (window.google?.accounts?.id) {
|
|
64
|
+
resolve();
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const existing = document.querySelector(`script[src="${GIS_SCRIPT_URL}"]`);
|
|
68
|
+
const onLoad = () => resolve();
|
|
69
|
+
const onError = () => {
|
|
70
|
+
_gisLoading = null;
|
|
71
|
+
reject(new types_1.ClefbaseError("Failed to load the Google Identity Services script. Check your internet connection and Content Security Policy.", "GOOGLE_SCRIPT_LOAD_ERROR"));
|
|
72
|
+
};
|
|
73
|
+
if (existing) {
|
|
74
|
+
existing.addEventListener("load", onLoad, { once: true });
|
|
75
|
+
existing.addEventListener("error", onError, { once: true });
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const script = document.createElement("script");
|
|
79
|
+
script.src = GIS_SCRIPT_URL;
|
|
80
|
+
script.async = true;
|
|
81
|
+
script.defer = true;
|
|
82
|
+
script.addEventListener("load", onLoad, { once: true });
|
|
83
|
+
script.addEventListener("error", onError, { once: true });
|
|
84
|
+
document.head.appendChild(script);
|
|
85
|
+
});
|
|
86
|
+
return _gisLoading;
|
|
87
|
+
}
|
|
49
88
|
/**
|
|
50
89
|
* Authentication service. Obtain via `getAuth(app)`.
|
|
51
90
|
*
|
|
@@ -60,7 +99,8 @@ class Auth {
|
|
|
60
99
|
this.http = http;
|
|
61
100
|
this.store = new SessionStore();
|
|
62
101
|
this.listeners = [];
|
|
63
|
-
|
|
102
|
+
/** Cached Google Client ID. `null` = confirmed not configured. `undefined` = not yet fetched. */
|
|
103
|
+
this._googleClientId = undefined;
|
|
64
104
|
this.store.load();
|
|
65
105
|
}
|
|
66
106
|
// ── Internals ─────────────────────────────────────────────────────────────
|
|
@@ -81,6 +121,23 @@ class Auth {
|
|
|
81
121
|
this.notify(result.user);
|
|
82
122
|
return result;
|
|
83
123
|
}
|
|
124
|
+
async resolveGoogleClientId() {
|
|
125
|
+
if (this._googleClientId !== undefined) {
|
|
126
|
+
if (!this._googleClientId) {
|
|
127
|
+
throw new types_1.ClefbaseError("Google Sign-In is not enabled for this project. " +
|
|
128
|
+
"Add a Google Client ID in your Clefbase auth settings.", "GOOGLE_NOT_CONFIGURED");
|
|
129
|
+
}
|
|
130
|
+
return this._googleClientId;
|
|
131
|
+
}
|
|
132
|
+
const cfg = await this.http.get("/google/config");
|
|
133
|
+
if (!cfg.enabled || !cfg.clientId) {
|
|
134
|
+
this._googleClientId = null;
|
|
135
|
+
throw new types_1.ClefbaseError("Google Sign-In is not enabled for this project. " +
|
|
136
|
+
"Add a Google Client ID in your Clefbase auth settings.", "GOOGLE_NOT_CONFIGURED");
|
|
137
|
+
}
|
|
138
|
+
this._googleClientId = cfg.clientId;
|
|
139
|
+
return this._googleClientId;
|
|
140
|
+
}
|
|
84
141
|
/** @internal — used by Storage to attach the bearer token to upload requests */
|
|
85
142
|
getAuthHeaders() {
|
|
86
143
|
const s = this.store.load();
|
|
@@ -116,6 +173,133 @@ class Auth {
|
|
|
116
173
|
const result = await this.http.post("/signin", { email, password });
|
|
117
174
|
return this.handleResult(result);
|
|
118
175
|
}
|
|
176
|
+
/**
|
|
177
|
+
* Sign in with Google using the Google Identity Services popup or One Tap.
|
|
178
|
+
*
|
|
179
|
+
* Browser-only. The GIS script (`accounts.google.com/gsi/client`) is loaded
|
|
180
|
+
* automatically — no manual `<script>` tag needed.
|
|
181
|
+
*
|
|
182
|
+
* Without `buttonOptions`, the Google One Tap prompt is shown.
|
|
183
|
+
* Pass `{ container }` to render a fully styled Google button instead —
|
|
184
|
+
* which is more reliable since One Tap can be suppressed by the browser.
|
|
185
|
+
*
|
|
186
|
+
* Automatically handles new sign-ups: if the Google account has never been
|
|
187
|
+
* seen before, a new user record is created server-side.
|
|
188
|
+
*
|
|
189
|
+
* @throws `ClefbaseError` with code `GOOGLE_NOT_CONFIGURED` if no Client ID
|
|
190
|
+
* has been set in the project's auth settings.
|
|
191
|
+
* @throws `ClefbaseError` with code `GOOGLE_PROMPT_SUPPRESSED` if One Tap
|
|
192
|
+
* could not be displayed (switch to button mode in that case).
|
|
193
|
+
* @throws `ClefbaseError` with code `GOOGLE_SIGN_IN_CANCELLED` if the user
|
|
194
|
+
* dismissed the popup.
|
|
195
|
+
*
|
|
196
|
+
* @example
|
|
197
|
+
* // One Tap prompt
|
|
198
|
+
* const { user } = await auth.signInWithGoogle();
|
|
199
|
+
*
|
|
200
|
+
* // Branded Google button
|
|
201
|
+
* const { user } = await auth.signInWithGoogle({
|
|
202
|
+
* container: document.getElementById("google-btn")!,
|
|
203
|
+
* theme: "filled_blue",
|
|
204
|
+
* size: "large",
|
|
205
|
+
* text: "continue_with",
|
|
206
|
+
* });
|
|
207
|
+
*
|
|
208
|
+
* // React example
|
|
209
|
+
* const btnRef = useRef<HTMLDivElement>(null);
|
|
210
|
+
* await auth.signInWithGoogle({ container: btnRef.current! });
|
|
211
|
+
*/
|
|
212
|
+
async signInWithGoogle(buttonOptions) {
|
|
213
|
+
const clientId = await this.resolveGoogleClientId();
|
|
214
|
+
await loadGisScript();
|
|
215
|
+
const gis = window.google.accounts.id;
|
|
216
|
+
return new Promise((resolve, reject) => {
|
|
217
|
+
gis.initialize({
|
|
218
|
+
client_id: clientId,
|
|
219
|
+
auto_select: false,
|
|
220
|
+
cancel_on_tap_outside: true,
|
|
221
|
+
callback: async ({ credential }) => {
|
|
222
|
+
try {
|
|
223
|
+
resolve(await this.signInWithGoogleToken(credential));
|
|
224
|
+
}
|
|
225
|
+
catch (err) {
|
|
226
|
+
reject(err);
|
|
227
|
+
}
|
|
228
|
+
},
|
|
229
|
+
});
|
|
230
|
+
if (buttonOptions?.container) {
|
|
231
|
+
const { container, theme, size, text, shape, width, locale } = buttonOptions;
|
|
232
|
+
gis.renderButton(container, {
|
|
233
|
+
type: "standard",
|
|
234
|
+
theme: theme ?? "outline",
|
|
235
|
+
size: size ?? "large",
|
|
236
|
+
text: text ?? "signin_with",
|
|
237
|
+
shape: shape ?? "rectangular",
|
|
238
|
+
logo_alignment: "left",
|
|
239
|
+
width,
|
|
240
|
+
locale,
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
gis.prompt((n) => {
|
|
245
|
+
if (n.isNotDisplayed()) {
|
|
246
|
+
reject(new types_1.ClefbaseError(`Google One Tap could not be displayed (${n.getNotDisplayedReason()}). ` +
|
|
247
|
+
"Pass a { container } element to render a sign-in button instead.", "GOOGLE_PROMPT_SUPPRESSED"));
|
|
248
|
+
}
|
|
249
|
+
else if (n.isSkippedMoment() || n.isDismissedMoment()) {
|
|
250
|
+
reject(new types_1.ClefbaseError("Google Sign-In was cancelled by the user.", "GOOGLE_SIGN_IN_CANCELLED"));
|
|
251
|
+
}
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
/**
|
|
257
|
+
* Sign in with Google using a raw ID token string.
|
|
258
|
+
*
|
|
259
|
+
* Use this when you already have a `credential` from Google's callback —
|
|
260
|
+
* for example with a custom button implementation, React Native Google
|
|
261
|
+
* Sign-In, or any other flow that gives you an ID token directly.
|
|
262
|
+
*
|
|
263
|
+
* Works in both browser and Node.js environments.
|
|
264
|
+
*
|
|
265
|
+
* @example
|
|
266
|
+
* // Inside a GIS callback
|
|
267
|
+
* google.accounts.id.initialize({
|
|
268
|
+
* client_id: "...",
|
|
269
|
+
* callback: async ({ credential }) => {
|
|
270
|
+
* const { user } = await auth.signInWithGoogleToken(credential);
|
|
271
|
+
* },
|
|
272
|
+
* });
|
|
273
|
+
*
|
|
274
|
+
* // React Native
|
|
275
|
+
* const { idToken } = await GoogleSignin.signIn();
|
|
276
|
+
* const { user } = await auth.signInWithGoogleToken(idToken);
|
|
277
|
+
*/
|
|
278
|
+
async signInWithGoogleToken(idToken) {
|
|
279
|
+
if (!idToken || typeof idToken !== "string") {
|
|
280
|
+
throw new types_1.ClefbaseError("idToken must be a non-empty string.", "INVALID_ARGUMENT");
|
|
281
|
+
}
|
|
282
|
+
const result = await this.http.post("/google", { idToken });
|
|
283
|
+
return this.handleResult(result);
|
|
284
|
+
}
|
|
285
|
+
/**
|
|
286
|
+
* Returns `true` if Google Sign-In is configured for this project.
|
|
287
|
+
* Useful for conditionally rendering a "Sign in with Google" button.
|
|
288
|
+
*
|
|
289
|
+
* @example
|
|
290
|
+
* if (await auth.isGoogleSignInEnabled()) {
|
|
291
|
+
* showGoogleButton();
|
|
292
|
+
* }
|
|
293
|
+
*/
|
|
294
|
+
async isGoogleSignInEnabled() {
|
|
295
|
+
try {
|
|
296
|
+
const cfg = await this.http.get("/google/config");
|
|
297
|
+
return cfg.enabled && Boolean(cfg.clientId);
|
|
298
|
+
}
|
|
299
|
+
catch {
|
|
300
|
+
return false;
|
|
301
|
+
}
|
|
302
|
+
}
|
|
119
303
|
/** Sign out and clear the local session. */
|
|
120
304
|
async signOut() {
|
|
121
305
|
const token = this.currentToken;
|
|
@@ -127,6 +311,13 @@ class Auth {
|
|
|
127
311
|
}
|
|
128
312
|
this.store.clear();
|
|
129
313
|
this.notify(null);
|
|
314
|
+
// Tell GIS to disable auto-select so the user isn't silently re-signed in
|
|
315
|
+
if (typeof window !== "undefined" && window.google?.accounts?.id) {
|
|
316
|
+
try {
|
|
317
|
+
window.google.accounts.id.disableAutoSelect();
|
|
318
|
+
}
|
|
319
|
+
catch { /* ignore */ }
|
|
320
|
+
}
|
|
130
321
|
}
|
|
131
322
|
/** Re-fetch the current user's profile from the server and update the cache. */
|
|
132
323
|
async refreshCurrentUser() {
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -34405,7 +34405,7 @@ async function runSitesList(cwd = process.cwd()) {
|
|
|
34405
34405
|
}
|
|
34406
34406
|
|
|
34407
34407
|
// package.json
|
|
34408
|
-
var version = "1.3.
|
|
34408
|
+
var version = "1.3.2";
|
|
34409
34409
|
|
|
34410
34410
|
// src/cli/index.ts
|
|
34411
34411
|
var program2 = new Command();
|
package/dist/index.d.ts
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
export { ClefbaseApp, initClefbase, getApp, getDatabase, getAuth, getStorage, getHosting, } from "./app";
|
|
20
20
|
export { Database, CollectionReference, DocumentReference, Query } from "./db";
|
|
21
21
|
export { Auth } from "./auth";
|
|
22
|
+
export type { GoogleButtonOptions } from "./auth";
|
|
22
23
|
export { ClefbaseStorage, StorageReference, BucketReference } from "./storage";
|
|
23
24
|
export type { StorageFile } from "./storage";
|
|
24
25
|
export type { StorageImageStatus } from "./react/StorageImage";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,WAAW,EACX,YAAY,EACZ,MAAM,EACN,WAAW,EACX,OAAO,EACP,UAAU,EACV,UAAU,GACX,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAG/E,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,WAAW,EACX,YAAY,EACZ,MAAM,EACN,WAAW,EACX,OAAO,EACP,UAAU,EACV,UAAU,GACX,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAG/E,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC/E,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAQ7C,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC3D,YAAY,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,YAAY,EACZ,aAAa,EACb,aAAa,EACb,YAAY,GACb,MAAM,WAAW,CAAC;AAGnB,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,cAAc,EACd,WAAW,EACX,UAAU,EACV,QAAQ,EACR,WAAW,EACX,UAAU,GACX,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,iFAAiF;AACjF,6BAQe;AAPb,kGAAA,WAAW,OAAA;AACX,mGAAA,YAAY,OAAA;AACZ,6FAAA,MAAM,OAAA;AACN,kGAAA,WAAW,OAAA;AACX,8FAAA,OAAO,OAAA;AACP,iGAAA,UAAU,OAAA;AACV,iGAAA,UAAU,OAAA;AAGZ,iFAAiF;AACjF,2BAA+E;AAAtE,8FAAA,QAAQ,OAAA;AAAE,yGAAA,mBAAmB,OAAA;AAAE,uGAAA,iBAAiB,OAAA;AAAE,2FAAA,KAAK,OAAA;AAEhE,iFAAiF;AACjF,+BAA8B;AAArB,4FAAA,IAAI,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,iFAAiF;AACjF,6BAQe;AAPb,kGAAA,WAAW,OAAA;AACX,mGAAA,YAAY,OAAA;AACZ,6FAAA,MAAM,OAAA;AACN,kGAAA,WAAW,OAAA;AACX,8FAAA,OAAO,OAAA;AACP,iGAAA,UAAU,OAAA;AACV,iGAAA,UAAU,OAAA;AAGZ,iFAAiF;AACjF,2BAA+E;AAAtE,8FAAA,QAAQ,OAAA;AAAE,yGAAA,mBAAmB,OAAA;AAAE,uGAAA,iBAAiB,OAAA;AAAE,2FAAA,KAAK,OAAA;AAEhE,iFAAiF;AACjF,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AAGb,iFAAiF;AACjF,qCAA+E;AAAtE,0GAAA,eAAe,OAAA;AAAE,2GAAA,gBAAgB,OAAA;AAAE,0GAAA,eAAe,OAAA;AAW3D,iFAAiF;AACjF,qCAA2D;AAAlD,0GAAA,eAAe,OAAA;AAAE,wGAAA,aAAa,OAAA;AAyBvC,iCAAwC;AAA/B,sGAAA,aAAa,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageImage.d.ts","sourceRoot":"","sources":["../../src/react/StorageImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAKZ,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlD,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEhE,MAAM,WAAW,iBACf,SAAQ,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACxD;;OAEG;IACH,OAAO,EAAE,eAAe,CAAC;IAEzB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAElC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAEjC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACvD;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"StorageImage.d.ts","sourceRoot":"","sources":["../../src/react/StorageImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAKZ,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlD,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEhE,MAAM,WAAW,iBACf,SAAQ,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACxD;;OAEG;IACH,OAAO,EAAE,eAAe,CAAC;IAEzB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAElC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAEjC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACvD;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,YAAY,4FAuKxB,CAAC;AAIF,eAAe,YAAY,CAAC"}
|
|
@@ -35,8 +35,24 @@ const react_1 = require("react");
|
|
|
35
35
|
* ```
|
|
36
36
|
*/
|
|
37
37
|
exports.StorageImage = (0, react_1.forwardRef)(function StorageImage({ storage, src, bucket, path, placeholder, fallback, onResolve, onError, onStatusChange, alt = "", ...imgProps }, ref) {
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
// Resolve the URL synchronously where possible (_directUrl is pure/sync)
|
|
39
|
+
// to avoid an async waterfall that exhausts the browser's per-host
|
|
40
|
+
// connection pool (typically 6 connections) when many cards mount at once.
|
|
41
|
+
const getDirectUrl = () => {
|
|
42
|
+
try {
|
|
43
|
+
if (bucket && path)
|
|
44
|
+
return storage._directUrl(bucket, path);
|
|
45
|
+
if (src)
|
|
46
|
+
return storage._directUrl(storage["_defaultBucket"] ?? "default", src);
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
const initialUrl = getDirectUrl();
|
|
54
|
+
const [resolvedUrl, setResolvedUrl] = (0, react_1.useState)(initialUrl);
|
|
55
|
+
const [status, setStatus] = (0, react_1.useState)(initialUrl ? "loaded" : "loading");
|
|
40
56
|
// Keep a ref to the latest callbacks so the effect closure stays stable.
|
|
41
57
|
const onResolveRef = (0, react_1.useRef)(onResolve);
|
|
42
58
|
const onErrorRef = (0, react_1.useRef)(onError);
|
|
@@ -47,6 +63,12 @@ exports.StorageImage = (0, react_1.forwardRef)(function StorageImage({ storage,
|
|
|
47
63
|
// Determine the key that uniquely identifies the requested file.
|
|
48
64
|
const fileKey = bucket && path ? `${bucket}::${path}` : src ?? null;
|
|
49
65
|
(0, react_1.useEffect)(() => {
|
|
66
|
+
// If we already resolved synchronously, notify callers and skip the
|
|
67
|
+
// async effect entirely — no extra network round-trip needed.
|
|
68
|
+
if (initialUrl) {
|
|
69
|
+
onResolveRef.current?.(initialUrl);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
50
72
|
if (!fileKey)
|
|
51
73
|
return;
|
|
52
74
|
let cancelled = false;
|
|
@@ -117,8 +139,11 @@ exports.StorageImage = (0, react_1.forwardRef)(function StorageImage({ storage,
|
|
|
117
139
|
}
|
|
118
140
|
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: fallback });
|
|
119
141
|
}
|
|
120
|
-
// Resolved — render the real image
|
|
121
|
-
|
|
142
|
+
// Resolved — render the real image.
|
|
143
|
+
// `loading="lazy"` defers off-screen fetches so the browser never
|
|
144
|
+
// saturates its per-host connection pool (typically 6) when many
|
|
145
|
+
// cards render simultaneously. Callers may override with loading="eager".
|
|
146
|
+
return ((0, jsx_runtime_1.jsx)("img", { loading: "lazy", ...imgProps, ref: ref, src: resolvedUrl, alt: alt, onLoad: handleLoad, onError: handleImgError }));
|
|
122
147
|
});
|
|
123
148
|
exports.StorageImage.displayName = "StorageImage";
|
|
124
149
|
exports.default = exports.StorageImage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageImage.js","sourceRoot":"","sources":["../../src/react/StorageImage.tsx"],"names":[],"mappings":";;;;AAAA,iCAMe;AA0Df,iFAAiF;AAEjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACU,QAAA,YAAY,GAAG,IAAA,kBAAU,EACpC,SAAS,YAAY,CACnB,EACE,OAAO,EACP,GAAG,EACH,MAAM,EACN,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,cAAc,EACd,GAAG,GAAG,EAAE,EACR,GAAG,QAAQ,EACZ,EACD,GAAG;IAEH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAgB,
|
|
1
|
+
{"version":3,"file":"StorageImage.js","sourceRoot":"","sources":["../../src/react/StorageImage.tsx"],"names":[],"mappings":"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"}
|