@geekity/cms 0.49.0 → 0.50.1

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 (147) hide show
  1. package/admin/pages/federation/followers.njk +78 -55
  2. package/admin/pages/federation/resend.njk +70 -0
  3. package/dist/admin/assets.d.ts +1 -1
  4. package/dist/admin/assets.d.ts.map +1 -1
  5. package/dist/admin/assets.js +3 -5
  6. package/dist/admin/assets.js.map +1 -1
  7. package/dist/admin/federation.d.ts +7 -2
  8. package/dist/admin/federation.d.ts.map +1 -1
  9. package/dist/admin/federation.js +60 -11
  10. package/dist/admin/federation.js.map +1 -1
  11. package/dist/admin/menu.js +3 -3
  12. package/dist/admin/menu.js.map +1 -1
  13. package/dist/admin/preview.js +1 -1
  14. package/dist/admin/preview.js.map +1 -1
  15. package/dist/admin/routes.js +1 -1
  16. package/dist/admin/routes.js.map +1 -1
  17. package/dist/admin/settings-general.js +4 -3
  18. package/dist/admin/settings-general.js.map +1 -1
  19. package/dist/admin/templates.d.ts +1 -0
  20. package/dist/admin/templates.d.ts.map +1 -1
  21. package/dist/admin/templates.js +1 -0
  22. package/dist/admin/templates.js.map +1 -1
  23. package/dist/admin/widget-health.d.ts.map +1 -1
  24. package/dist/admin/widget-health.js +5 -6
  25. package/dist/admin/widget-health.js.map +1 -1
  26. package/dist/avatars/avatars.d.ts +12 -9
  27. package/dist/avatars/avatars.d.ts.map +1 -1
  28. package/dist/avatars/avatars.js +66 -33
  29. package/dist/avatars/avatars.js.map +1 -1
  30. package/dist/cms/services.d.ts.map +1 -1
  31. package/dist/cms/services.js +2 -0
  32. package/dist/cms/services.js.map +1 -1
  33. package/dist/content/image-tags.d.ts +5 -1
  34. package/dist/content/image-tags.d.ts.map +1 -1
  35. package/dist/content/image-tags.js +8 -11
  36. package/dist/content/image-tags.js.map +1 -1
  37. package/dist/content/review.d.ts +2 -0
  38. package/dist/content/review.d.ts.map +1 -1
  39. package/dist/content/review.js +23 -6
  40. package/dist/content/review.js.map +1 -1
  41. package/dist/content/uploads.js +2 -3
  42. package/dist/content/uploads.js.map +1 -1
  43. package/dist/files/static-files.js +7 -4
  44. package/dist/files/static-files.js.map +1 -1
  45. package/dist/files/upload-types.d.ts +2 -5
  46. package/dist/files/upload-types.d.ts.map +1 -1
  47. package/dist/files/upload-types.js +2 -5
  48. package/dist/files/upload-types.js.map +1 -1
  49. package/dist/fonts/index.d.ts +1 -1
  50. package/dist/fonts/index.d.ts.map +1 -1
  51. package/dist/fonts/index.js +1 -1
  52. package/dist/fonts/index.js.map +1 -1
  53. package/dist/fonts/roles.d.ts +11 -2
  54. package/dist/fonts/roles.d.ts.map +1 -1
  55. package/dist/fonts/roles.js +57 -11
  56. package/dist/fonts/roles.js.map +1 -1
  57. package/dist/fonts/store.d.ts.map +1 -1
  58. package/dist/fonts/store.js +9 -7
  59. package/dist/fonts/store.js.map +1 -1
  60. package/dist/images/derived-sets.d.ts +56 -0
  61. package/dist/images/derived-sets.d.ts.map +1 -0
  62. package/dist/images/derived-sets.js +116 -0
  63. package/dist/images/derived-sets.js.map +1 -0
  64. package/dist/images/icon-setting.d.ts.map +1 -1
  65. package/dist/images/icon-setting.js +6 -10
  66. package/dist/images/icon-setting.js.map +1 -1
  67. package/dist/images/icons.d.ts +16 -13
  68. package/dist/images/icons.d.ts.map +1 -1
  69. package/dist/images/icons.js +103 -43
  70. package/dist/images/icons.js.map +1 -1
  71. package/dist/images/markup.d.ts.map +1 -1
  72. package/dist/images/markup.js +2 -12
  73. package/dist/images/markup.js.map +1 -1
  74. package/dist/images/paths.d.ts +32 -1
  75. package/dist/images/paths.d.ts.map +1 -1
  76. package/dist/images/paths.js +27 -3
  77. package/dist/images/paths.js.map +1 -1
  78. package/dist/images/variants.d.ts +34 -32
  79. package/dist/images/variants.d.ts.map +1 -1
  80. package/dist/images/variants.js +157 -168
  81. package/dist/images/variants.js.map +1 -1
  82. package/dist/mcp/inspect/status.d.ts.map +1 -1
  83. package/dist/mcp/inspect/status.js +5 -2
  84. package/dist/mcp/inspect/status.js.map +1 -1
  85. package/dist/media/library.js +3 -3
  86. package/dist/media/library.js.map +1 -1
  87. package/dist/store/deliveries.d.ts +1 -1
  88. package/dist/store/deliveries.d.ts.map +1 -1
  89. package/dist/store/deliveries.js +13 -5
  90. package/dist/store/deliveries.js.map +1 -1
  91. package/dist/theme/assets.d.ts +8 -0
  92. package/dist/theme/assets.d.ts.map +1 -1
  93. package/dist/theme/assets.js +92 -9
  94. package/dist/theme/assets.js.map +1 -1
  95. package/dist/util/public-address.d.ts +19 -1
  96. package/dist/util/public-address.d.ts.map +1 -1
  97. package/dist/util/public-address.js +51 -1
  98. package/dist/util/public-address.js.map +1 -1
  99. package/dist/util/queue.d.ts +5 -0
  100. package/dist/util/queue.d.ts.map +1 -1
  101. package/dist/util/queue.js +21 -0
  102. package/dist/util/queue.js.map +1 -1
  103. package/dist/util/url.d.ts +10 -0
  104. package/dist/util/url.d.ts.map +1 -1
  105. package/dist/util/url.js +27 -0
  106. package/dist/util/url.js.map +1 -1
  107. package/dist/web/asset-routes.d.ts.map +1 -1
  108. package/dist/web/asset-routes.js +33 -33
  109. package/dist/web/asset-routes.js.map +1 -1
  110. package/dist/web/avatar-routes.d.ts.map +1 -1
  111. package/dist/web/avatar-routes.js +5 -7
  112. package/dist/web/avatar-routes.js.map +1 -1
  113. package/dist/web/compression.d.ts +1 -0
  114. package/dist/web/compression.d.ts.map +1 -1
  115. package/dist/web/compression.js +22 -8
  116. package/dist/web/compression.js.map +1 -1
  117. package/dist/web/context.js +3 -4
  118. package/dist/web/context.js.map +1 -1
  119. package/dist/web/document-page.js +2 -2
  120. package/dist/web/document-page.js.map +1 -1
  121. package/dist/web/font-routes.d.ts.map +1 -1
  122. package/dist/web/font-routes.js +2 -4
  123. package/dist/web/font-routes.js.map +1 -1
  124. package/dist/web/markdown-representation.js +2 -2
  125. package/dist/web/markdown-representation.js.map +1 -1
  126. package/dist/web/opensearch.js +2 -2
  127. package/dist/web/opensearch.js.map +1 -1
  128. package/dist/web/paths.js +1 -1
  129. package/dist/web/paths.js.map +1 -1
  130. package/dist/web/request.d.ts +6 -2
  131. package/dist/web/request.d.ts.map +1 -1
  132. package/dist/web/request.js +9 -7
  133. package/dist/web/request.js.map +1 -1
  134. package/dist/web/routes.d.ts.map +1 -1
  135. package/dist/web/routes.js +2 -1
  136. package/dist/web/routes.js.map +1 -1
  137. package/dist/web/site-index.js +2 -2
  138. package/dist/web/site-index.js.map +1 -1
  139. package/dist/webmention/cited-picture.d.ts.map +1 -1
  140. package/dist/webmention/cited-picture.js +2 -1
  141. package/dist/webmention/cited-picture.js.map +1 -1
  142. package/dist/webmention/fetch-public.d.ts.map +1 -1
  143. package/dist/webmention/fetch-public.js +5 -3
  144. package/dist/webmention/fetch-public.js.map +1 -1
  145. package/package.json +3 -2
  146. package/themes/default/src/style.css +24 -0
  147. package/themes/default/static/style.css +52 -0
@@ -3,8 +3,11 @@ import path from 'node:path';
3
3
  import sharp from 'sharp';
4
4
  import { UPLOAD_ASSET_PREFIX, VARIANT_ASSET_PREFIX } from '../content/uploads.js';
5
5
  import { writeFileAtomically } from '../files/atomic.js';
6
+ import { encodePath } from '../util/url.js';
6
7
  import { ICON_SOURCES, parseIconSetting } from './icon-setting.js';
7
- import { derivedDir, sourceFile, sourceVersion, versioned } from './paths.js';
8
+ import { DECODE_OPTIONS, decodable, locateUpload, MAX_INPUT_PIXELS, sourceVersion, versioned, } from './paths.js';
9
+ import { deriveSet, settledSet } from './derived-sets.js';
10
+ import { messageOf } from '../util/errors.js';
8
11
  /**
9
12
  * Every file derived from the site's icon, by the name it is served under.
10
13
  *
@@ -69,18 +72,59 @@ export function iconSetting(site) {
69
72
  * directory, or `undefined` when there is none to derive from.
70
73
  *
71
74
  * None when the setting is empty, names no upload of this site, names a file
72
- * no icon can be made of, or when image optimization is off, because nothing
73
- * may link a file this server would answer 404 for.
75
+ * no icon can be made of, or when image optimization is off.
74
76
  */
75
77
  export function siteIconSource(config, setting) {
76
78
  return config.imageOptimization ? iconSource(setting) : undefined;
77
79
  }
80
+ /**
81
+ * The site icon's upload and the version of its bytes, once the icons have
82
+ * been drawn from those bytes.
83
+ *
84
+ * Nothing may link a file this server would answer 404 for, and only drawing
85
+ * the icons shows whether the upload is there and can be read. So a version
86
+ * not drawn yet is drawn in the background and links nothing until it is,
87
+ * the way a page's images stay plain until their variants exist.
88
+ */
89
+ function drawnIcons(config, setting) {
90
+ const named = namedIcon(config, setting);
91
+ if (named === undefined)
92
+ return undefined;
93
+ const { upload, version } = named;
94
+ const known = settledSet(SITE_ICONS, upload, version);
95
+ if (known === undefined) {
96
+ void deriveSet(SITE_ICONS, upload, version).catch((error) => {
97
+ console.warn(`Could not derive the site's icons from ${upload.source}: ${messageOf(error)}`);
98
+ });
99
+ return undefined;
100
+ }
101
+ return known.set === undefined ? undefined : { source: upload.source, version };
102
+ }
103
+ /**
104
+ * Draw the site's icons now if the bytes the setting names have not been
105
+ * drawn from, so a page that shows them right after the setting changes has
106
+ * them to show.
107
+ */
108
+ export async function deriveSiteIcons(config, setting) {
109
+ const named = namedIcon(config, setting);
110
+ if (named === undefined || settledSet(SITE_ICONS, named.upload, named.version) !== undefined) {
111
+ return;
112
+ }
113
+ await deriveSet(SITE_ICONS, named.upload, named.version);
114
+ }
115
+ /** The upload the icon setting names and the version of its bytes, when it is there. */
116
+ function namedIcon(config, setting) {
117
+ const source = siteIconSource(config, setting);
118
+ const upload = source === undefined ? undefined : locateUpload(config, source);
119
+ const version = upload === undefined ? undefined : sourceVersion(config, upload.source);
120
+ return version === undefined || upload === undefined ? undefined : { upload, version };
121
+ }
78
122
  /** The icons the head of a site whose icon setting is this links, or none at all. */
79
123
  export function siteIcons(config, setting) {
80
- const source = siteIconSource(config, setting);
81
- if (source === undefined)
124
+ const drawn = drawnIcons(config, setting);
125
+ if (drawn === undefined)
82
126
  return [];
83
- const version = sourceVersion(config, source);
127
+ const { source, version } = drawn;
84
128
  const svg = isSvg(source)
85
129
  ? [{ rel: 'icon', sizes: '', type: 'image/svg+xml', href: uploadHref(source) }]
86
130
  : [];
@@ -96,10 +140,10 @@ export function siteIcons(config, setting) {
96
140
  }
97
141
  /** The icons a web app manifest lists for a site whose icon setting is this. */
98
142
  export function manifestIcons(config, setting) {
99
- const source = siteIconSource(config, setting);
100
- if (source === undefined)
143
+ const drawn = drawnIcons(config, setting);
144
+ if (drawn === undefined)
101
145
  return [];
102
- const version = sourceVersion(config, source);
146
+ const { source, version } = drawn;
103
147
  const svg = isSvg(source)
104
148
  ? [{ src: uploadHref(source), sizes: 'any', type: 'image/svg+xml' }]
105
149
  : [];
@@ -113,35 +157,53 @@ export function manifestIcons(config, setting) {
113
157
  })),
114
158
  ];
115
159
  }
160
+ /** The sidecar that records which bytes the site's icons were drawn from. */
161
+ export const ICON_RECORD_NAME = 'icons.json';
162
+ /**
163
+ * The site's icons as a derived set: every one of them, drawn together from
164
+ * one version of the icon upload, so a replaced icon is redrawn whole.
165
+ */
166
+ export const SITE_ICONS = {
167
+ sidecar: ICON_RECORD_NAME,
168
+ parse: (value) => Array.isArray(value) &&
169
+ value.every((name) => typeof name === 'string' && DERIVED_ICONS.has(name))
170
+ ? value
171
+ : undefined,
172
+ derive: deriveIcons,
173
+ offers: (_upload, name) => Promise.resolve(DERIVED_ICONS.has(name)),
174
+ holds: (names, name) => names.includes(name),
175
+ };
116
176
  /**
117
- * Derive one icon file, or answer `false` having written nothing.
177
+ * Draw every icon, or answer `undefined` having written nothing when sharp
178
+ * cannot read the picture.
118
179
  *
119
180
  * Enlarging is allowed, unlike a width variant: 512 pixels is what a launcher
120
181
  * asks for, and a site whose icon is smaller than that is better served a soft
121
182
  * icon than none. The crop is the middle of the picture, which is where a face
122
- * is.
183
+ * is. The icons are drawn one at a time, so deriving them holds one decode.
123
184
  */
124
- export async function deriveSiteIcon(config, source, name) {
125
- const shape = DERIVED_ICONS.get(name);
126
- const file = sourceFile(config, source);
127
- if (shape === undefined || file === undefined)
128
- return false;
129
- if (!ICON_SOURCES.has(path.extname(source).toLowerCase()))
130
- return false;
185
+ async function deriveIcons(upload) {
186
+ if (!ICON_SOURCES.has(path.extname(upload.source).toLowerCase()))
187
+ return undefined;
188
+ const drawn = [];
131
189
  try {
132
- const encoded = await drawIcon(file, shape);
133
- const directory = derivedDir(config, source);
134
- if (directory === undefined)
135
- return false;
136
- await mkdir(directory, { recursive: true });
137
- await writeFileAtomically(path.join(directory, name), encoded);
138
- return true;
190
+ const { width, height } = await sharp(upload.file, DECODE_OPTIONS).metadata();
191
+ if (width === undefined || height === undefined || !decodable({ width, height })) {
192
+ return undefined;
193
+ }
194
+ for (const [name, shape] of DERIVED_ICONS) {
195
+ drawn.push([name, await drawIcon(upload.file, shape)]);
196
+ }
139
197
  }
140
- catch {
141
- // An icon sharp cannot read is a site with no icons, not a failed
142
- // request: the handler answers 404 and the page it came from is fine.
143
- return false;
198
+ catch (error) {
199
+ console.warn(`Could not derive the site's icons from ${upload.source}: ${messageOf(error)}`);
200
+ return undefined;
144
201
  }
202
+ await mkdir(upload.directory, { recursive: true });
203
+ for (const [name, png] of drawn) {
204
+ await writeFileAtomically(path.join(upload.directory, name), png);
205
+ }
206
+ return drawn.map(([name]) => name);
145
207
  }
146
208
  async function drawIcon(file, shape) {
147
209
  switch (shape.kind) {
@@ -149,8 +211,12 @@ async function drawIcon(file, shape) {
149
211
  return square(file, shape.size);
150
212
  case 'maskable':
151
213
  return maskable(file, shape.size);
152
- case 'ico':
153
- return icoFile(await Promise.all(shape.sizes.map(async (size) => ({ size, png: await square(file, size) }))));
214
+ case 'ico': {
215
+ const frames = [];
216
+ for (const size of shape.sizes)
217
+ frames.push({ size, png: await square(file, size) });
218
+ return icoFile(frames);
219
+ }
154
220
  }
155
221
  }
156
222
  /**
@@ -161,7 +227,7 @@ async function drawIcon(file, shape) {
161
227
  * location.
162
228
  */
163
229
  async function square(file, size) {
164
- return sharp(file, { autoOrient: true })
230
+ return sharp(file, DECODE_OPTIONS)
165
231
  .resize({ width: size, height: size, fit: 'cover', position: 'centre' })
166
232
  .png({ compressionLevel: 9 })
167
233
  .toBuffer();
@@ -175,12 +241,12 @@ async function square(file, size) {
175
241
  async function maskable(file, size) {
176
242
  const inner = Math.round(size * MASKABLE_SAFE_ZONE);
177
243
  const edge = Math.floor((size - inner) / 2);
178
- const { dominant } = await sharp(file, { autoOrient: true }).stats();
244
+ const { dominant } = await sharp(file, DECODE_OPTIONS).stats();
179
245
  const background = { ...dominant, alpha: 1 };
180
- const picture = await sharp(file, { autoOrient: true })
246
+ const picture = await sharp(file, DECODE_OPTIONS)
181
247
  .resize({ width: inner, height: inner, fit: 'cover', position: 'centre' })
182
248
  .toBuffer();
183
- return sharp(picture)
249
+ return sharp(picture, { limitInputPixels: MAX_INPUT_PIXELS })
184
250
  .flatten({ background })
185
251
  .extend({
186
252
  top: edge,
@@ -233,16 +299,10 @@ function iconSource(setting) {
233
299
  }
234
300
  /** Where one derived icon of one upload is served. */
235
301
  function iconHref(source, file) {
236
- return `${VARIANT_ASSET_PREFIX}${encodedPath(source)}/${file}`;
302
+ return `${VARIANT_ASSET_PREFIX}${encodePath(`${source}/${file}`)}`;
237
303
  }
238
304
  /** Where the upload itself is served. */
239
305
  function uploadHref(source) {
240
- return `${UPLOAD_ASSET_PREFIX}${encodedPath(source)}`;
241
- }
242
- function encodedPath(source) {
243
- return source
244
- .split('/')
245
- .map((segment) => encodeURIComponent(segment))
246
- .join('/');
306
+ return `${UPLOAD_ASSET_PREFIX}${encodePath(source)}`;
247
307
  }
248
308
  //# sourceMappingURL=icons.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"icons.js","sourceRoot":"","sources":["../../src/images/icons.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"icons.js","sourceRoot":"","sources":["../../src/images/icons.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"markup.d.ts","sourceRoot":"","sources":["../../src/images/markup.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAE/E;;;;;;;;;GASG;AAEH,uEAAuE;AACvE,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;AAE3E;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,aAAa,EACvB,OAAO,GAAE,YAAiB,GACzB,MAAM,CAsBR;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,YAAiB,GACzB,MAAM,CAIR;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAS/F"}
1
+ {"version":3,"file":"markup.d.ts","sourceRoot":"","sources":["../../src/images/markup.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAE/E;;;;;;;;;GASG;AAEH,uEAAuE;AACvE,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;AAE3E;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,aAAa,EACvB,OAAO,GAAE,YAAiB,GACzB,MAAM,CAsBR;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,YAAiB,GACzB,MAAM,CAIR;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAS/F"}
@@ -1,9 +1,7 @@
1
1
  import { escapeAttribute } from '../util/html.js';
2
2
  import { messageOf } from '../util/errors.js';
3
3
  import { IMG_TAG, parseAttributes, uploadPath } from '../content/image-tags.js';
4
- import { describeImage, generateImageVariants, imageMediaType } from './variants.js';
5
- import { VARIANT_ASSET_PREFIX } from '../content/uploads.js';
6
- import { versioned } from './paths.js';
4
+ import { describeImage, generateImageVariants, imageMediaType, variantUrl } from './variants.js';
7
5
  /**
8
6
  * The `sizes` every image is given.
9
7
  *
@@ -132,15 +130,7 @@ function image(input, fallback) {
132
130
  function srcset(record, variants) {
133
131
  return [...variants]
134
132
  .sort((a, b) => a.width - b.width)
135
- .map((variant) => `${variantHref(record, variant)} ${String(variant.width)}w`)
133
+ .map((variant) => `${variantUrl(record.source, variant, record.version)} ${String(variant.width)}w`)
136
134
  .join(', ');
137
135
  }
138
- /**
139
- * The URL of one derived file, with every path segment encoded as a URL wants
140
- * and the original's version on the end.
141
- */
142
- function variantHref(record, variant) {
143
- const segments = [...record.source.split('/'), variant.file].map((segment) => encodeURIComponent(segment));
144
- return versioned(`${VARIANT_ASSET_PREFIX}${segments.join('/')}`, record.version);
145
- }
146
136
  //# sourceMappingURL=markup.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"markup.js","sourceRoot":"","sources":["../../src/images/markup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAiBvC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AAgBnC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAY,EACZ,QAAuB,EACvB,OAAO,GAAiB,EAAE;IAE1B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAExC,mEAAmE;IACnE,uDAAuD;IACvD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAW,EAAE,UAAkB,EAAE,EAAE;QAC/D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAElC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAErC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QAErE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,WAAW,CAAC;QAClE,OAAO,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAmB,EACnB,IAAY,EACZ,OAAO,GAAiB,EAAE;IAE1B,IAAI,CAAC,MAAM,CAAC,iBAAiB;QAAE,OAAO,IAAI,CAAC;IAE3C,OAAO,gBAAgB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;AACtF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,MAAmB,EAAE,MAAc;IACjE,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACrD,KAAK,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAClE,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,uCAAuC,MAAM,KAAK,OAAO,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,qFAAqF;AACrF,SAAS,OAAO,CAAC,KAMhB;IACC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEzB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;IACnD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1C,wEAAwE;QACxE,sDAAsD;QACtD,IAAI,MAAM,KAAK,MAAM,CAAC,MAAM;YAAE,SAAS;QACvC,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,OAAO,CAAC,IAAI,CACV,iBAAiB,IAAI,aAAa,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CACvG,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,YAAY,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC;AAC3E,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,KAAK,CACZ,KAMC,EACD,QAAwB;IAExB,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAChD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,SAAS,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChF,SAAS,CAAC,IAAI,CAAC,UAAU,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,SAAS,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClD,SAAS,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACjE,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAEnC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAEpC,4EAA4E;IAC5E,2EAA2E;IAC3E,oEAAoE;IACpE,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;AACjE,CAAC;AAED,2FAA2F;AAC3F,SAAS,MAAM,CAAC,MAAsB,EAAE,QAAwB;IAC9D,OAAO,CAAC,GAAG,QAAQ,CAAC;SACjB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;SAC7E,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,MAAsB,EAAE,OAAqB;IAChE,MAAM,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC3E,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;IACF,OAAO,SAAS,CAAC,GAAG,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AACnF,CAAC"}
1
+ {"version":3,"file":"markup.js","sourceRoot":"","sources":["../../src/images/markup.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,38 @@ import type { ResolvedConfig } from '../config.ts';
9
9
  */
10
10
  /** The part of the config the derived images are derived according to. */
11
11
  export type ImageConfig = Pick<ResolvedConfig, 'contentDir' | 'dataDir' | 'imageOptimization' | 'imageWidths' | 'imageFormats'>;
12
- export declare function derivedDir(config: ImageConfig, source: string): string | undefined;
12
+ /**
13
+ * The most pixels a derived image is decoded from: a 60 megapixel camera's
14
+ * full frame, and well under sharp's own default. A flat PNG of a few hundred
15
+ * kilobytes can declare far more, and decoding it costs memory in proportion.
16
+ */
17
+ export declare const MAX_INPUT_PIXELS = 60000000;
18
+ /** sharp's input options for a picture the site derives from. */
19
+ export declare const DECODE_OPTIONS: {
20
+ readonly autoOrient: true;
21
+ readonly limitInputPixels: 60000000;
22
+ };
23
+ /** Whether a header's dimensions are within {@link MAX_INPUT_PIXELS}. */
24
+ export declare function decodable(size: {
25
+ width: number;
26
+ height: number;
27
+ }): boolean;
28
+ /** One upload as the files derived from it know it. */
29
+ export interface Upload {
30
+ /** Its path under `content/uploads/`, `/`-separated, spelled the one way the directory spells it. */
31
+ readonly source: string;
32
+ /** The upload on disk. */
33
+ readonly file: string;
34
+ /** Where the files derived from it live. */
35
+ readonly directory: string;
36
+ }
37
+ /**
38
+ * The upload a source path names, or `undefined` when it names none.
39
+ *
40
+ * The source is rebuilt from the resolved file, so however a caller spelled
41
+ * it, a record and the URLs built from it carry the canonical path.
42
+ */
43
+ export declare function locateUpload(config: ImageConfig, source: string): Upload | undefined;
13
44
  /**
14
45
  * The upload as an absolute path, or `undefined` when it is not one.
15
46
  *
@@ -1 +1 @@
1
- {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/images/paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAMnD;;;;;;;GAOG;AAEH,0EAA0E;AAC1E,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,cAAc,EACd,YAAY,GAAG,SAAS,GAAG,mBAAmB,GAAG,aAAa,GAAG,cAAc,CAChF,CAAC;AAEF,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKlF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,SAAS,CAKpB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGrF;AAED,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAE3E"}
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/images/paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAMnD;;;;;;;GAOG;AAEH,0EAA0E;AAC1E,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,cAAc,EACd,YAAY,GAAG,SAAS,GAAG,mBAAmB,GAAG,aAAa,GAAG,cAAc,CAChF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WAAa,CAAC;AAE3C,iEAAiE;AACjE,eAAO,MAAM,cAAc;aAAK,UAAU;aAAQ,gBAAgB;CAA6B,CAAC;AAEhG,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAE1E;AAED,uDAAuD;AACvD,MAAM,WAAW,MAAM;IACrB,qGAAqG;IACrG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAWpF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,SAAS,CAKpB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGrF;AAED,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAE3E"}
@@ -3,12 +3,36 @@ import { UPLOAD_DIRECTORY } from '../content/uploads.js';
3
3
  import { IMAGES, dataPath } from '../files/data-files.js';
4
4
  import { findAsset } from '../files/static-files.js';
5
5
  import { assetVersion, ASSET_VERSION_PARAM } from '../theme/assets.js';
6
- export function derivedDir(config, source) {
6
+ /**
7
+ * The most pixels a derived image is decoded from: a 60 megapixel camera's
8
+ * full frame, and well under sharp's own default. A flat PNG of a few hundred
9
+ * kilobytes can declare far more, and decoding it costs memory in proportion.
10
+ */
11
+ export const MAX_INPUT_PIXELS = 60_000_000;
12
+ /** sharp's input options for a picture the site derives from. */
13
+ export const DECODE_OPTIONS = { autoOrient: true, limitInputPixels: MAX_INPUT_PIXELS };
14
+ /** Whether a header's dimensions are within {@link MAX_INPUT_PIXELS}. */
15
+ export function decodable(size) {
16
+ return size.width * size.height <= MAX_INPUT_PIXELS;
17
+ }
18
+ /**
19
+ * The upload a source path names, or `undefined` when it names none.
20
+ *
21
+ * The source is rebuilt from the resolved file, so however a caller spelled
22
+ * it, a record and the URLs built from it carry the canonical path.
23
+ */
24
+ export function locateUpload(config, source) {
7
25
  const file = sourceFile(config, source);
8
26
  if (file === undefined)
9
27
  return undefined;
10
- const relative = path.relative(path.resolve(config.contentDir, UPLOAD_DIRECTORY), file);
11
- return dataPath(config.dataDir, IMAGES, ...relative.split(path.sep));
28
+ const segments = path
29
+ .relative(path.resolve(config.contentDir, UPLOAD_DIRECTORY), file)
30
+ .split(path.sep);
31
+ return {
32
+ source: segments.join('/'),
33
+ file,
34
+ directory: dataPath(config.dataDir, IMAGES, ...segments),
35
+ };
12
36
  }
13
37
  /**
14
38
  * The upload as an absolute path, or `undefined` when it is not one.
@@ -1 +1 @@
1
- {"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/images/paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBvE,MAAM,UAAU,UAAU,CAAC,MAAmB,EAAE,MAAc;IAC5D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;IACxF,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CACxB,MAAuC,EACvC,MAAc;IAEd,IAAI,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,MAAmB,EAAE,MAAc;IAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAClF,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,OAA2B;IACjE,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,mBAAmB,IAAI,OAAO,EAAE,CAAC;AACpF,CAAC"}
1
+ {"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/images/paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBvE;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAE3C,iEAAiE;AACjE,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,EAAW,CAAC;AAEhG,yEAAyE;AACzE,MAAM,UAAU,SAAS,CAAC,IAAuC;IAC/D,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,IAAI,gBAAgB,CAAC;AACtD,CAAC;AAYD;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,MAAmB,EAAE,MAAc;IAC9D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI;SAClB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC;SACjE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO;QACL,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1B,IAAI;QACJ,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;KACzD,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CACxB,MAAuC,EACvC,MAAc;IAEd,IAAI,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,MAAmB,EAAE,MAAc;IAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAClF,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,OAA2B;IACjE,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,mBAAmB,IAAI,OAAO,EAAE,CAAC;AACpF,CAAC"}
@@ -31,9 +31,10 @@ export interface ImageVariant {
31
31
  * What was derived from one upload, and the intrinsic size of the upload
32
32
  * itself.
33
33
  *
34
- * This is the sidecar's shape. It exists so that rendering a page never opens
35
- * an image: the dimensions are recorded when the
36
- * variants are generated and read back, never probed per request.
34
+ * The sidecar holds it with the version of the bytes it was derived from. It
35
+ * exists so that rendering a page never opens an image: the dimensions are
36
+ * recorded when the variants are generated and read back, never probed per
37
+ * request.
37
38
  */
38
39
  export interface ImageRecord {
39
40
  /** The upload it was derived from, relative to `content/uploads/`. */
@@ -44,14 +45,7 @@ export interface ImageRecord {
44
45
  height: number;
45
46
  /** The original's own format, which is the one the `<img>` falls back to. */
46
47
  format: string;
47
- /**
48
- * The original's modification time in milliseconds.
49
- *
50
- * It is what makes a stale record notice it is stale. The CMS never
51
- * overwrites an upload — a second `photo.png` becomes `photo-2.png` — but a
52
- * file dropped in by hand can be replaced, and a record that outlived its
53
- * original would give the page the wrong dimensions.
54
- */
48
+ /** The original's modification time in milliseconds when it was derived from. */
55
49
  sourceModified: number;
56
50
  /** Every derived copy, by format in configured order and then by width. */
57
51
  variants: ImageVariant[];
@@ -60,41 +54,42 @@ export interface ImageRecord {
60
54
  export declare function imageMediaType(format: string): string | undefined;
61
55
  /**
62
56
  * A record as a page renders it: what was derived, and the hash of the
63
- * original's bytes that every derived URL carries. The hash is not in the
64
- * sidecar; it is read off the original, so a sidecar written before URLs
65
- * carried it needs no rewrite.
57
+ * original's bytes that every derived URL carries.
66
58
  */
67
59
  export interface DescribedImage extends ImageRecord {
68
60
  /** See {@link sourceVersion}. Without it a derived URL is served for a day, not a year. */
69
61
  version?: string | undefined;
70
62
  }
63
+ /** A derived file, and the version of the upload's bytes it was derived from. */
64
+ export interface DerivedAsset extends StaticAsset {
65
+ version: string;
66
+ }
71
67
  /** The public URL of one derived file, naming the original's bytes when `version` is given. */
72
68
  export declare function variantUrl(source: string, variant: ImageVariant, version?: string): string;
73
69
  /**
74
- * Derive every variant of one upload and record what was derived.
70
+ * Derive every variant of one upload and record what was derived, unless the
71
+ * bytes it holds now have been derived already.
75
72
  *
76
- * Returns `undefined` — having written nothing — when optimization is off,
77
- * when the file is not a raster image the CMS varianties (a GIF, a PDF, a
78
- * text file), when it is animated, or when it is not there at all. None of
79
- * those is an error: an upload that has no variants is the ordinary case for
80
- * most of what a site holds, and the caller's job is to fall back to the
81
- * original, which is exactly what it would have served anyway. Whether the
82
- * file is an image is whatever sharp makes of its header; once that has been
83
- * read, a failure to make the directory, encode or write is thrown, because
84
- * it is the server failing and not the upload.
73
+ * Returns `undefined` when optimization is off, when the file is not a raster
74
+ * image the CMS derives from (a GIF, a PDF, a text file), when it is animated,
75
+ * larger than {@link MAX_INPUT_PIXELS}, undecodable, or not there at all. None
76
+ * of those is an error: an upload that has no variants is the ordinary case
77
+ * for most of what a site holds, and the caller falls back to the original,
78
+ * which is what it would have served anyway. A source that could not be
79
+ * derived is remembered as such until its bytes change. A failure to make
80
+ * the directory or write a file is thrown, because it is the server failing
81
+ * and not the upload.
85
82
  *
86
83
  * Two callers asking for the same image at once share one encode.
87
84
  */
88
85
  export declare function generateImageVariants(config: ImageConfig, source: string): Promise<ImageRecord | undefined>;
89
86
  /**
90
- * Wait for every generation still running under one site's data directory.
87
+ * Wait for every derivation still running under one site's data directory.
91
88
  *
92
89
  * A render starts derivation in the background and returns, so an encode can
93
90
  * outlive the request that asked for it and, without this, the site it was
94
91
  * writing into: closing a site waits here so nothing is left writing under
95
- * `dataDir` once close returns. One that starts while these finish is waited
96
- * for too. A failure is not this caller's to report; the render that started
97
- * the generation already logged it.
92
+ * `dataDir` once close returns.
98
93
  */
99
94
  export declare function settleImageVariants(config: Pick<ImageConfig, 'dataDir'>): Promise<void>;
100
95
  /**
@@ -102,11 +97,13 @@ export declare function settleImageVariants(config: Pick<ImageConfig, 'dataDir'>
102
97
  *
103
98
  * Synchronous and cached, because it is called once per image while a page
104
99
  * renders. `undefined` means the caller should serve the plain original: the
105
- * upload is not an image, or nothing has been derived from it yet.
100
+ * upload is not an image, nothing has been derived from the bytes it holds
101
+ * now, or nothing could be.
106
102
  */
107
103
  export declare function describeImage(config: ImageConfig, source: string): DescribedImage | undefined;
108
104
  /**
109
- * Take one upload's derived files away.
105
+ * Take one upload's derived files away, once any derivation writing them has
106
+ * finished.
110
107
  *
111
108
  * Forgiving by design: an upload with nothing derived from it is the ordinary
112
109
  * case, and this runs after the original has already gone, so refusing to
@@ -121,8 +118,13 @@ export declare function removeImageVariants(config: ImageConfig, source: string)
121
118
  * rebuilds the whole set for that source and then serves it, which is what
122
119
  * makes the derived directory disposable, as everything derived must be. A
123
120
  * request for a width or a format the site does not offer is a 404 and encodes
124
- * nothing, so nobody can make the server work by asking for sizes.
121
+ * nothing, so nobody can make the server work by asking for sizes. An icon
122
+ * name is answered only under `iconSource`, the site icon's upload. A file
123
+ * whose upload has gone is answered with nothing and removed.
124
+ *
125
+ * The file comes back with the version of the bytes it was derived from, and
126
+ * a set derived from older bytes is derived again first.
125
127
  */
126
- export declare function findImageVariant(config: ImageConfig, relative: string): Promise<StaticAsset | undefined>;
128
+ export declare function findImageVariant(config: ImageConfig, relative: string, iconSource?: string): Promise<DerivedAsset | undefined>;
127
129
  export declare function thumbnailUrl(config: ImageConfig, source: string, url: string): string;
128
130
  //# sourceMappingURL=variants.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../src/images/variants.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;;;;;;GAYG;AAEH,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,gFAAgF;AAChF,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAE9C,qCAAqC;AACrC,MAAM,WAAW,YAAY;IAC3B,4EAA4E;IAC5E,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,QAAQ,EAAE,YAAY,EAAE,CAAC;CAC1B;AAgCD,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEjE;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED,+FAA+F;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE1F;AAgBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CASlC;AAED;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAS7F;AAqID;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAa7F;AAyDD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5F;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA8BlC;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQrF"}
1
+ {"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../src/images/variants.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAc5D,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,YAAY,CAAC;AAEtD;;;;;;;;;;;;GAYG;AAEH,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,gFAAgF;AAChF,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAE9C,qCAAqC;AACrC,MAAM,WAAW,YAAY;IAC3B,4EAA4E;IAC5E,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,cAAc,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,QAAQ,EAAE,YAAY,EAAE,CAAC;CAC1B;AAgCD,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEjE;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED,iFAAiF;AACjF,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,+FAA+F;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE1F;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAOlC;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F;AA4JD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAK7F;AAgCD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5F;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAqBnC;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQrF"}