@timber-js/app 0.2.0-alpha.246 → 0.2.0-alpha.248
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/fonts/ast.d.ts.map +1 -1
- package/dist/fonts/bundle.d.ts +26 -8
- package/dist/fonts/bundle.d.ts.map +1 -1
- package/dist/fonts/fallbacks.d.ts +46 -8
- package/dist/fonts/fallbacks.d.ts.map +1 -1
- package/dist/fonts/font-metrics.d.ts +54 -0
- package/dist/fonts/font-metrics.d.ts.map +1 -0
- package/dist/fonts/local-fallback.d.ts +64 -0
- package/dist/fonts/local-fallback.d.ts.map +1 -0
- package/dist/fonts/local.d.ts.map +1 -1
- package/dist/fonts/sfnt.d.ts +30 -0
- package/dist/fonts/sfnt.d.ts.map +1 -0
- package/dist/fonts/transform.d.ts.map +1 -1
- package/dist/fonts/types.d.ts +29 -0
- package/dist/fonts/types.d.ts.map +1 -1
- package/dist/index.js +1063 -352
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/server/internal.js +2 -2
- package/dist/native/rsc/server/metadata-render.js +3 -1
- package/dist/native/rsc/server/metadata-render.js.map +1 -1
- package/dist/native/rsc/server/metadata-urls.js +70 -0
- package/dist/native/rsc/server/metadata-urls.js.map +1 -0
- package/dist/native/rsc/server/metadata.js +1 -64
- package/dist/native/rsc/server/metadata.js.map +1 -1
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/server/internal.js +2 -2
- package/dist/native/ssr/server/metadata-render.js +3 -1
- package/dist/native/ssr/server/metadata-render.js.map +1 -1
- package/dist/native/ssr/server/metadata-urls.js +70 -0
- package/dist/native/ssr/server/metadata-urls.js.map +1 -0
- package/dist/native/ssr/server/metadata.js +1 -64
- package/dist/native/ssr/server/metadata.js.map +1 -1
- package/dist/plugins/build-manifest.d.ts +5 -0
- package/dist/plugins/build-manifest.d.ts.map +1 -1
- package/dist/plugins/fonts.d.ts.map +1 -1
- package/dist/server/internal.d.ts +1 -1
- package/dist/server/internal.d.ts.map +1 -1
- package/dist/server/internal.js +84 -77
- package/dist/server/internal.js.map +1 -1
- package/dist/server/metadata-render.d.ts +4 -1
- package/dist/server/metadata-render.d.ts.map +1 -1
- package/dist/server/metadata-urls.d.ts +24 -0
- package/dist/server/metadata-urls.d.ts.map +1 -0
- package/dist/server/metadata.d.ts +0 -7
- package/dist/server/metadata.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/fonts/ast.ts +35 -2
- package/src/fonts/bundle.ts +71 -17
- package/src/fonts/fallbacks.ts +92 -28
- package/src/fonts/font-metrics.ts +236 -0
- package/src/fonts/local-fallback.ts +249 -0
- package/src/fonts/local.ts +14 -1
- package/src/fonts/pipeline.ts +6 -3
- package/src/fonts/sfnt.ts +185 -0
- package/src/fonts/transform.ts +4 -1
- package/src/fonts/types.ts +29 -0
- package/src/plugins/build-manifest.ts +1 -1
- package/src/plugins/fonts.ts +28 -2
- package/src/server/internal.ts +1 -6
- package/src/server/metadata-render.ts +6 -1
- package/src/server/metadata-urls.ts +109 -0
- package/src/server/metadata.ts +0 -108
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* metadataBase — resolve relative URLs in metadata against the base URL.
|
|
3
|
+
*
|
|
4
|
+
* Runs inside renderMetadataToElements, so every path that turns metadata
|
|
5
|
+
* into head tags (MetadataHead, the deny page) emits absolute URLs. It must
|
|
6
|
+
* not run before findDeclaredImageOwners: that reads which segment supplied
|
|
7
|
+
* the merged images by object identity, and resolving copies the images.
|
|
8
|
+
*
|
|
9
|
+
* Auto-linked metadata route hrefs (metadata-route-links.ts) never pass
|
|
10
|
+
* through here — they are HeadElements, not Metadata — so nothing is
|
|
11
|
+
* resolved twice.
|
|
12
|
+
*
|
|
13
|
+
* See design/16-metadata.md §"metadataBase — URL Resolution".
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import type { Metadata } from './types.ts';
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Absolute means the browser would not resolve it against the page: any URL
|
|
20
|
+
* with a scheme (`https:`, `data:`, `mailto:` …) or protocol-relative `//`.
|
|
21
|
+
*/
|
|
22
|
+
function isAbsoluteUrl(url: string): boolean {
|
|
23
|
+
return url.startsWith('//') || URL.canParse(url);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function resolveUrl(url: string, base: URL): string {
|
|
27
|
+
return isAbsoluteUrl(url) ? url : new URL(url, base).toString();
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function resolveEach<T extends { url: string }>(items: T[], base: URL): T[] {
|
|
31
|
+
return items.map((item) => ({ ...item, url: resolveUrl(item.url, base) }));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function resolveValues(
|
|
35
|
+
record: Record<string, string> | undefined,
|
|
36
|
+
base: URL
|
|
37
|
+
): Record<string, string> | undefined {
|
|
38
|
+
if (!record) return record;
|
|
39
|
+
return Object.fromEntries(Object.entries(record).map(([k, url]) => [k, resolveUrl(url, base)]));
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Resolve relative URLs in metadata fields against metadataBase.
|
|
44
|
+
*
|
|
45
|
+
* Returns a new metadata object with URLs resolved. Absolute and
|
|
46
|
+
* protocol-relative URLs are not modified. If metadataBase is not set,
|
|
47
|
+
* returns the metadata unchanged.
|
|
48
|
+
*/
|
|
49
|
+
export function resolveMetadataUrls(metadata: Metadata): Metadata {
|
|
50
|
+
const base = metadata.metadataBase;
|
|
51
|
+
if (!base) return metadata;
|
|
52
|
+
|
|
53
|
+
const result = { ...metadata };
|
|
54
|
+
|
|
55
|
+
if (result.openGraph) {
|
|
56
|
+
const og = { ...result.openGraph };
|
|
57
|
+
const images = og.images;
|
|
58
|
+
if (typeof images === 'string') og.images = resolveUrl(images, base);
|
|
59
|
+
else if (Array.isArray(images)) og.images = resolveEach(images, base);
|
|
60
|
+
else if (images) og.images = { ...images, url: resolveUrl(images.url, base) };
|
|
61
|
+
if (og.url) og.url = resolveUrl(og.url, base);
|
|
62
|
+
if (og.videos) og.videos = resolveEach(og.videos, base);
|
|
63
|
+
if (og.audio) og.audio = resolveEach(og.audio, base);
|
|
64
|
+
result.openGraph = og;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (result.twitter) {
|
|
68
|
+
const twitter = { ...result.twitter };
|
|
69
|
+
const images = twitter.images;
|
|
70
|
+
if (typeof images === 'string') {
|
|
71
|
+
twitter.images = resolveUrl(images, base);
|
|
72
|
+
} else if (Array.isArray(images)) {
|
|
73
|
+
// `string[] | object[]` — map each branch separately so the result
|
|
74
|
+
// keeps the homogeneous array type the field declares.
|
|
75
|
+
twitter.images = images.every((img) => typeof img === 'string')
|
|
76
|
+
? images.map((img) => resolveUrl(img, base))
|
|
77
|
+
: resolveEach(
|
|
78
|
+
images.filter((img) => typeof img !== 'string'),
|
|
79
|
+
base
|
|
80
|
+
);
|
|
81
|
+
} else if (images) {
|
|
82
|
+
twitter.images = { ...images, url: resolveUrl(images.url, base) };
|
|
83
|
+
}
|
|
84
|
+
result.twitter = twitter;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (result.alternates) {
|
|
88
|
+
const alternates = { ...result.alternates };
|
|
89
|
+
if (alternates.canonical) alternates.canonical = resolveUrl(alternates.canonical, base);
|
|
90
|
+
alternates.languages = resolveValues(alternates.languages, base);
|
|
91
|
+
alternates.media = resolveValues(alternates.media, base);
|
|
92
|
+
alternates.types = resolveValues(alternates.types, base);
|
|
93
|
+
result.alternates = alternates;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (result.icons) {
|
|
97
|
+
const icons = { ...result.icons };
|
|
98
|
+
if (typeof icons.icon === 'string') icons.icon = resolveUrl(icons.icon, base);
|
|
99
|
+
else if (icons.icon) icons.icon = resolveEach(icons.icon, base);
|
|
100
|
+
if (typeof icons.apple === 'string') icons.apple = resolveUrl(icons.apple, base);
|
|
101
|
+
else if (icons.apple) icons.apple = resolveEach(icons.apple, base);
|
|
102
|
+
if (typeof icons.shortcut === 'string') icons.shortcut = resolveUrl(icons.shortcut, base);
|
|
103
|
+
else if (icons.shortcut) icons.shortcut = icons.shortcut.map((url) => resolveUrl(url, base));
|
|
104
|
+
if (icons.other) icons.other = resolveEach(icons.other, base);
|
|
105
|
+
result.icons = icons;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return result;
|
|
109
|
+
}
|
package/src/server/metadata.ts
CHANGED
|
@@ -174,111 +174,3 @@ export function resolveMetadata(
|
|
|
174
174
|
|
|
175
175
|
return merged;
|
|
176
176
|
}
|
|
177
|
-
|
|
178
|
-
// ─── URL Resolution ──────────────────────────────────────────────────────────
|
|
179
|
-
|
|
180
|
-
/**
|
|
181
|
-
* Check if a string is an absolute URL.
|
|
182
|
-
*/
|
|
183
|
-
function isAbsoluteUrl(url: string): boolean {
|
|
184
|
-
return url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//');
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
/**
|
|
188
|
-
* Resolve a relative URL against a base URL.
|
|
189
|
-
*/
|
|
190
|
-
function resolveUrl(url: string, base: URL): string {
|
|
191
|
-
if (isAbsoluteUrl(url)) return url;
|
|
192
|
-
return new URL(url, base).toString();
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
/**
|
|
196
|
-
* Resolve relative URLs in metadata fields against metadataBase.
|
|
197
|
-
*
|
|
198
|
-
* Returns a new metadata object with URLs resolved. Absolute URLs are not modified.
|
|
199
|
-
* If metadataBase is not set, returns the metadata unchanged.
|
|
200
|
-
*/
|
|
201
|
-
export function resolveMetadataUrls(metadata: Metadata): Metadata {
|
|
202
|
-
const base = metadata.metadataBase;
|
|
203
|
-
if (!base) return metadata;
|
|
204
|
-
|
|
205
|
-
const result = { ...metadata };
|
|
206
|
-
|
|
207
|
-
// Resolve openGraph images
|
|
208
|
-
if (result.openGraph) {
|
|
209
|
-
result.openGraph = { ...result.openGraph };
|
|
210
|
-
if (typeof result.openGraph.images === 'string') {
|
|
211
|
-
result.openGraph.images = resolveUrl(result.openGraph.images, base);
|
|
212
|
-
} else if (Array.isArray(result.openGraph.images)) {
|
|
213
|
-
result.openGraph.images = result.openGraph.images.map((img) => ({
|
|
214
|
-
...img,
|
|
215
|
-
url: resolveUrl(img.url, base),
|
|
216
|
-
}));
|
|
217
|
-
} else if (result.openGraph.images) {
|
|
218
|
-
// Single object: { url, width?, height?, alt? }
|
|
219
|
-
result.openGraph.images = {
|
|
220
|
-
...result.openGraph.images,
|
|
221
|
-
url: resolveUrl(result.openGraph.images.url, base),
|
|
222
|
-
};
|
|
223
|
-
}
|
|
224
|
-
if (result.openGraph.url && !isAbsoluteUrl(result.openGraph.url)) {
|
|
225
|
-
result.openGraph.url = resolveUrl(result.openGraph.url, base);
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
// Resolve twitter images
|
|
230
|
-
if (result.twitter) {
|
|
231
|
-
result.twitter = { ...result.twitter };
|
|
232
|
-
if (typeof result.twitter.images === 'string') {
|
|
233
|
-
result.twitter.images = resolveUrl(result.twitter.images, base);
|
|
234
|
-
} else if (Array.isArray(result.twitter.images)) {
|
|
235
|
-
// Resolve each image URL, preserving the union type structure
|
|
236
|
-
const resolved = result.twitter.images.map((img) =>
|
|
237
|
-
typeof img === 'string' ? resolveUrl(img, base) : { ...img, url: resolveUrl(img.url, base) }
|
|
238
|
-
);
|
|
239
|
-
// If all entries are strings, assign as string[]; otherwise as object[]
|
|
240
|
-
const allStrings = resolved.every((r) => typeof r === 'string');
|
|
241
|
-
result.twitter.images = allStrings
|
|
242
|
-
? (resolved as string[])
|
|
243
|
-
: (resolved as Array<{ url: string; alt?: string; width?: number; height?: number }>);
|
|
244
|
-
} else if (result.twitter.images) {
|
|
245
|
-
// Single object: { url, alt?, width?, height? }
|
|
246
|
-
result.twitter.images = {
|
|
247
|
-
...result.twitter.images,
|
|
248
|
-
url: resolveUrl(result.twitter.images.url, base),
|
|
249
|
-
};
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
// Resolve alternates
|
|
254
|
-
if (result.alternates) {
|
|
255
|
-
result.alternates = { ...result.alternates };
|
|
256
|
-
if (result.alternates.canonical && !isAbsoluteUrl(result.alternates.canonical)) {
|
|
257
|
-
result.alternates.canonical = resolveUrl(result.alternates.canonical, base);
|
|
258
|
-
}
|
|
259
|
-
if (result.alternates.languages) {
|
|
260
|
-
const langs: Record<string, string> = {};
|
|
261
|
-
for (const [lang, url] of Object.entries(result.alternates.languages)) {
|
|
262
|
-
langs[lang] = isAbsoluteUrl(url) ? url : resolveUrl(url, base);
|
|
263
|
-
}
|
|
264
|
-
result.alternates.languages = langs;
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
// Resolve icon URLs
|
|
269
|
-
if (result.icons) {
|
|
270
|
-
result.icons = { ...result.icons };
|
|
271
|
-
if (typeof result.icons.icon === 'string') {
|
|
272
|
-
result.icons.icon = resolveUrl(result.icons.icon, base);
|
|
273
|
-
} else if (Array.isArray(result.icons.icon)) {
|
|
274
|
-
result.icons.icon = result.icons.icon.map((i) => ({ ...i, url: resolveUrl(i.url, base) }));
|
|
275
|
-
}
|
|
276
|
-
if (typeof result.icons.apple === 'string') {
|
|
277
|
-
result.icons.apple = resolveUrl(result.icons.apple, base);
|
|
278
|
-
} else if (Array.isArray(result.icons.apple)) {
|
|
279
|
-
result.icons.apple = result.icons.apple.map((i) => ({ ...i, url: resolveUrl(i.url, base) }));
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
return result;
|
|
284
|
-
}
|