@velocity-astro/cms-astro 0.1.0-beta.1 → 0.1.0-beta.3

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 (51) hide show
  1. package/dist/connection.d.ts +1 -0
  2. package/dist/connection.d.ts.map +1 -1
  3. package/dist/connection.js +18 -4
  4. package/dist/connection.js.map +1 -1
  5. package/dist/hosted.d.ts +76 -0
  6. package/dist/hosted.d.ts.map +1 -0
  7. package/dist/hosted.js +104 -0
  8. package/dist/hosted.js.map +1 -0
  9. package/dist/image-optimizer.d.ts +35 -0
  10. package/dist/image-optimizer.d.ts.map +1 -0
  11. package/dist/image-optimizer.js +76 -0
  12. package/dist/image-optimizer.js.map +1 -0
  13. package/dist/index.d.ts +3 -0
  14. package/dist/index.d.ts.map +1 -1
  15. package/dist/index.js +3 -0
  16. package/dist/index.js.map +1 -1
  17. package/dist/integration.d.ts +9 -0
  18. package/dist/integration.d.ts.map +1 -1
  19. package/dist/integration.js +15 -1
  20. package/dist/integration.js.map +1 -1
  21. package/dist/media-store.d.ts +6 -0
  22. package/dist/media-store.d.ts.map +1 -1
  23. package/dist/media-store.js +9 -1
  24. package/dist/media-store.js.map +1 -1
  25. package/dist/preview.d.ts.map +1 -1
  26. package/dist/preview.js +13 -6
  27. package/dist/preview.js.map +1 -1
  28. package/dist/secret.d.ts +1 -1
  29. package/dist/secret.d.ts.map +1 -1
  30. package/dist/secret.js +3 -2
  31. package/dist/secret.js.map +1 -1
  32. package/dist/single.d.ts +18 -0
  33. package/dist/single.d.ts.map +1 -0
  34. package/dist/single.js +37 -0
  35. package/dist/single.js.map +1 -0
  36. package/dist/site-editor.d.ts.map +1 -1
  37. package/dist/site-editor.js +9 -1
  38. package/dist/site-editor.js.map +1 -1
  39. package/dist/site-forms.d.ts.map +1 -1
  40. package/dist/site-forms.js +9 -4
  41. package/dist/site-forms.js.map +1 -1
  42. package/dist/site-media.d.ts +5 -1
  43. package/dist/site-media.d.ts.map +1 -1
  44. package/dist/site-media.js +14 -5
  45. package/dist/site-media.js.map +1 -1
  46. package/package.json +11 -8
  47. package/routes/editor.ts +7 -6
  48. package/routes/media.ts +2 -2
  49. package/routes/published.ts +2 -2
  50. package/routes/sitemap-live.xml.ts +4 -1
  51. package/routes/sites.ts +11 -0
@@ -11,6 +11,7 @@ export interface ConnectionOptions {
11
11
  }
12
12
  /** The site reads content as itself, with read access only. */
13
13
  export declare const SITE: Actor;
14
+ /** Where the database is. On a server that runs many sites it is the site's own, whatever was asked for. */
14
15
  export declare const resolveUrl: (options: ConnectionOptions) => string;
15
16
  export interface Connection {
16
17
  readonly cms: Cms;
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,GAAG,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAA2Q,KAAK,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAK1T,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,wFAAwF;IACxF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,+DAA+D;AAC/D,eAAO,MAAM,IAAI,EAAE,KAAyD,CAAC;AAE7E,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,KAAG,MACsB,CAAC;AAE/E,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;IAChB,KAAK,IAAI,IAAI,CAAC;CACf;AAKD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CA2B7E;AAID,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAehF"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,GAAG,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAA2Q,KAAK,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAO1T,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,wFAAwF;IACxF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,+DAA+D;AAC/D,eAAO,MAAM,IAAI,EAAE,KAAyD,CAAC;AAE7E,4GAA4G;AAC5G,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,KAAG,MACqD,CAAC;AAE9G,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;IAChB,KAAK,IAAI,IAAI,CAAC;CACf;AAQD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAoC7E;AAID,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAehF"}
@@ -4,23 +4,30 @@ import path from 'node:path';
4
4
  import { createCms } from '@velocity-astro/cms-core';
5
5
  import { AuthTeam } from '@velocity-astro/cms-auth/team';
6
6
  import { openDatabase, SqliteEntryRepository, SqliteFormRepository, SqliteSubmissionRepository, SqliteContactRepository, SqliteDealRepository, SqlitePipelineStore, SqliteCustomFieldsStore, SqliteMediaRepository, SqlitePluginStore, SqliteSchemaRepository, SqliteSearchIndex } from '@velocity-astro/cms-db';
7
+ import { currentSite } from './hosted.js';
8
+ import { SharpImageOptimizer } from './image-optimizer.js';
7
9
  import { mediaStoreFromEnv } from './media-store.js';
8
10
  import { siteSecret } from './secret.js';
9
11
  import { allPlugins } from './site-plugins.js';
10
12
  /** The site reads content as itself, with read access only. */
11
13
  export const SITE = { kind: 'cli', id: 'astro-site', role: 'author' };
12
- export const resolveUrl = (options) => options.url ?? process.env.VELOCITY_CMS_DATABASE_URL ?? 'file:./cms/data.db';
14
+ /** Where the database is. On a server that runs many sites it is the site's own, whatever was asked for. */
15
+ export const resolveUrl = (options) => currentSite()?.database.url ?? options.url ?? process.env.VELOCITY_CMS_DATABASE_URL ?? 'file:./cms/data.db';
13
16
  /** Every address a host's name leads to, so a plugin can refuse a name that leads to a private machine. */
14
17
  const lookUp = async (host) => (await lookup(host, { all: true })).map((found) => found.address);
18
+ /** One for the whole server: it holds a library and nothing of any site. */
19
+ const optimizer = new SharpImageOptimizer();
15
20
  export async function connect(options) {
16
- const authToken = options.authToken ?? (process.env.VELOCITY_CMS_DATABASE_TOKEN || undefined);
21
+ const site = currentSite();
22
+ const authToken = site ? site.database.authToken : (options.authToken ?? (process.env.VELOCITY_CMS_DATABASE_TOKEN || undefined));
17
23
  const url = resolveUrl(options);
18
24
  // A database that is a file is made on first use, and so is the folder it sits in.
19
25
  const file = /^file:(?!:memory:)([^?]+)/.exec(url)?.[1];
20
26
  if (file !== undefined)
21
27
  mkdirSync(path.dirname(path.resolve(file.replace(/^\/\/(?=\/)/, ''))), { recursive: true });
22
28
  const database = await openDatabase({ url, ...(authToken !== undefined && { authToken }) });
23
- const store = mediaStoreFromEnv(url);
29
+ // A hosted site keeps uploads where its host says, and nowhere a setting of the server names.
30
+ const store = site ? site.media : mediaStoreFromEnv(url);
24
31
  const secret = siteSecret();
25
32
  const cms = createCms({
26
33
  entries: new SqliteEntryRepository(database.db),
@@ -34,7 +41,14 @@ export async function connect(options) {
34
41
  team: new AuthTeam(database.db),
35
42
  // A secret too short to sign with is the editor's to report, not a reason to read no content.
36
43
  ...(secret !== undefined && secret.length >= 32 && { previews: { secret } }),
37
- ...(store && { media: { storage: { files: new SqliteMediaRepository(database.db), store } } }),
44
+ ...(store && {
45
+ media: {
46
+ storage: { files: new SqliteMediaRepository(database.db), store },
47
+ optimizer,
48
+ // The image is never logged, only that one could not be handled: the upload is kept as it arrived.
49
+ onOptimizerFault: (error) => console.warn('[velocity-cms] An image could not be made lighter, so it is kept as it is.', error),
50
+ },
51
+ }),
38
52
  pluginStore: new SqlitePluginStore(database.db),
39
53
  lookup: lookUp,
40
54
  onPluginFault: (plugin, error) => console.error(`[velocity-cms] The plugin "${plugin}" failed.`, error),
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,76 @@
1
+ import type { MiddlewareHandler } from 'astro';
2
+ import type { MediaStore } from '@velocity-astro/cms-core';
3
+ /**
4
+ * One site among many that a single running copy of a template serves. Everything that sets one
5
+ * site apart from the next is here: nothing of a hosted site is read from the environment.
6
+ */
7
+ export interface HostedSite {
8
+ /** The site's permanent name with its host: letters, digits and dashes. It is never shown. */
9
+ readonly id: string;
10
+ /** The address links, sign-in and passkeys are made for: `https://example.com`. */
11
+ readonly origin: string;
12
+ /** The site's own database. No two sites share one. */
13
+ readonly database: {
14
+ readonly url: string;
15
+ readonly authToken?: string;
16
+ };
17
+ /** The site's own secret, at least 32 characters. It signs previews and seals plugin secrets. */
18
+ readonly secret: string;
19
+ /** The site's name, shown in the editor and in sign-in emails. */
20
+ readonly name?: string;
21
+ /** Where the site's uploads are kept, apart from every other site's. Without it the site takes none. */
22
+ readonly media?: MediaStore;
23
+ }
24
+ /**
25
+ * How a host that runs many sites tells them apart. The registry, and nothing a visitor sends,
26
+ * decides which site an address belongs to: a host name it does not know has no site.
27
+ */
28
+ export interface SiteRegistry {
29
+ /** The site at this host name (`example.com`, `example.com:8080`), or `null` when there is none. */
30
+ find(host: string): Promise<HostedSite | null> | HostedSite | null;
31
+ }
32
+ /** A request, or other work, reached for a site's content when no site was chosen for it. */
33
+ export declare class NoSiteError extends Error {
34
+ constructor();
35
+ }
36
+ /**
37
+ * Tells the CMS that this server runs many sites. From then on nothing is read for "the" site.
38
+ * `undefined` takes it back, which only a test does.
39
+ */
40
+ export declare function useSiteRegistry(sites: SiteRegistry | undefined): void;
41
+ /** Whether this server runs many sites. */
42
+ export declare const isHosted: () => boolean;
43
+ /**
44
+ * The site this work is for. `undefined` on a server that runs one site, which reads its
45
+ * settings from the environment as ever. On a server that runs many, work begun for no site
46
+ * throws: it must never fall back to some site's content.
47
+ */
48
+ export declare function currentSite(): HostedSite | undefined;
49
+ /** The site at a host name, or `null`. On a server that runs one site there is nothing to find. */
50
+ export declare function siteAt(host: string): Promise<HostedSite | null>;
51
+ /** Runs work for one site: whatever it reads and writes is that site's and no other's. */
52
+ export declare const inSite: <Result>(site: HostedSite, work: () => Result) => Result;
53
+ /**
54
+ * The tag every kept page of the site carries, which a publish clears. One site's publish never
55
+ * clears another's pages.
56
+ */
57
+ export declare const siteCacheTag: () => string;
58
+ /** The key state kept per site in this server's memory is filed under. */
59
+ export declare const siteKey: () => string;
60
+ /**
61
+ * A response whose body is read inside the site's work. Astro draws a page as its response is
62
+ * read, which happens after the middleware has returned: without this the rest of the page
63
+ * would be drawn for no site.
64
+ */
65
+ export declare function readInSite(site: HostedSite, response: Response): Response;
66
+ /**
67
+ * On a server that runs many sites, chooses the site a request is for before anything else runs.
68
+ * A host name the registry does not know is answered as nothing at all: there is no site to
69
+ * fall back to. On a server that runs one site this does nothing.
70
+ *
71
+ * The host name is the request's own, which is what a host that runs many sites routes by: it
72
+ * says which site is asked for, never what that site's links are made for. Those come from the
73
+ * registry (`HostedSite.origin`).
74
+ */
75
+ export declare const hostedRequest: MiddlewareHandler;
76
+ //# sourceMappingURL=hosted.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hosted.d.ts","sourceRoot":"","sources":["../src/hosted.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,mFAAmF;IACnF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,QAAQ,CAAC,QAAQ,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,iGAAiG;IACjG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,kEAAkE;IAClE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,wGAAwG;IACxG,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,oGAAoG;IACpG,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC;CACpE;AAED,6FAA6F;AAC7F,qBAAa,WAAY,SAAQ,KAAK;;CAIrC;AAOD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,CAErE;AAED,2CAA2C;AAC3C,eAAO,MAAM,QAAQ,QAAO,OAAiC,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,WAAW,IAAI,UAAU,GAAG,SAAS,CAKpD;AAUD,mGAAmG;AACnG,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAIrE;AAED,0FAA0F;AAC1F,eAAO,MAAM,MAAM,GAAI,MAAM,EAAE,MAAM,UAAU,EAAE,MAAM,MAAM,MAAM,KAAG,MAA0C,CAAC;AAEjH;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAO,MAG/B,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,OAAO,QAAO,MAAiC,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAazE;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,EAAE,iBAS3B,CAAC"}
package/dist/hosted.js ADDED
@@ -0,0 +1,104 @@
1
+ import { AsyncLocalStorage } from 'node:async_hooks';
2
+ /** A request, or other work, reached for a site's content when no site was chosen for it. */
3
+ export class NoSiteError extends Error {
4
+ constructor() {
5
+ super('This server runs many sites, and this work was not begun for any one of them. Content is read only inside a request for a known site.');
6
+ }
7
+ }
8
+ const ID = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
9
+ const current = new AsyncLocalStorage();
10
+ let registry;
11
+ /**
12
+ * Tells the CMS that this server runs many sites. From then on nothing is read for "the" site.
13
+ * `undefined` takes it back, which only a test does.
14
+ */
15
+ export function useSiteRegistry(sites) {
16
+ registry = sites;
17
+ }
18
+ /** Whether this server runs many sites. */
19
+ export const isHosted = () => registry !== undefined;
20
+ /**
21
+ * The site this work is for. `undefined` on a server that runs one site, which reads its
22
+ * settings from the environment as ever. On a server that runs many, work begun for no site
23
+ * throws: it must never fall back to some site's content.
24
+ */
25
+ export function currentSite() {
26
+ if (!registry)
27
+ return undefined;
28
+ const site = current.getStore();
29
+ if (!site)
30
+ throw new NoSiteError();
31
+ return site;
32
+ }
33
+ /** A site as the registry gave it, checked before anything is opened for it. */
34
+ function checked(site) {
35
+ if (!ID.test(site.id))
36
+ throw new Error(`"${site.id}" cannot be a site's id. Use lower-case letters, digits and dashes.`);
37
+ if (!URL.canParse(site.origin))
38
+ throw new Error(`The site "${site.id}" has no address the CMS can make links for.`);
39
+ if (site.secret.length < 32)
40
+ throw new Error(`The secret of the site "${site.id}" is shorter than 32 characters.`);
41
+ return site;
42
+ }
43
+ /** The site at a host name, or `null`. On a server that runs one site there is nothing to find. */
44
+ export async function siteAt(host) {
45
+ if (!registry)
46
+ return null;
47
+ const site = await registry.find(host.toLowerCase());
48
+ return site ? checked(site) : null;
49
+ }
50
+ /** Runs work for one site: whatever it reads and writes is that site's and no other's. */
51
+ export const inSite = (site, work) => current.run(checked(site), work);
52
+ /**
53
+ * The tag every kept page of the site carries, which a publish clears. One site's publish never
54
+ * clears another's pages.
55
+ */
56
+ export const siteCacheTag = () => {
57
+ const site = currentSite();
58
+ return site ? `cms-site:${site.id}` : 'cms';
59
+ };
60
+ /** The key state kept per site in this server's memory is filed under. */
61
+ export const siteKey = () => currentSite()?.id ?? '';
62
+ /**
63
+ * A response whose body is read inside the site's work. Astro draws a page as its response is
64
+ * read, which happens after the middleware has returned: without this the rest of the page
65
+ * would be drawn for no site.
66
+ */
67
+ export function readInSite(site, response) {
68
+ if (!response.body)
69
+ return response;
70
+ const reader = response.body.getReader();
71
+ const body = new ReadableStream({
72
+ pull: (controller) => inSite(site, async () => {
73
+ const { done, value } = await reader.read();
74
+ if (done)
75
+ controller.close();
76
+ else
77
+ controller.enqueue(value);
78
+ }),
79
+ cancel: (reason) => inSite(site, () => reader.cancel(reason)),
80
+ });
81
+ return new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
82
+ }
83
+ /**
84
+ * On a server that runs many sites, chooses the site a request is for before anything else runs.
85
+ * A host name the registry does not know is answered as nothing at all: there is no site to
86
+ * fall back to. On a server that runs one site this does nothing.
87
+ *
88
+ * The host name is the request's own, which is what a host that runs many sites routes by: it
89
+ * says which site is asked for, never what that site's links are made for. Those come from the
90
+ * registry (`HostedSite.origin`).
91
+ */
92
+ export const hostedRequest = async (context, next) => {
93
+ if (!isHosted() || context.isPrerendered)
94
+ return next();
95
+ const site = await siteAt(context.url.host);
96
+ if (!site)
97
+ return new Response('There is no site at this address.', { status: 404, headers: { 'Cache-Control': 'no-store', 'Content-Type': 'text/plain; charset=utf-8' } });
98
+ return inSite(site, async () => {
99
+ // A page kept for this site is cleared by this site's publish and by no other's.
100
+ context.cache.set({ tags: [siteCacheTag()] });
101
+ return readInSite(site, await next());
102
+ });
103
+ };
104
+ //# sourceMappingURL=hosted.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hosted.js","sourceRoot":"","sources":["../src/hosted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAgCrD,6FAA6F;AAC7F,MAAM,OAAO,WAAY,SAAQ,KAAK;IACpC;QACE,KAAK,CAAC,uIAAuI,CAAC,CAAC;IACjJ,CAAC;CACF;AAED,MAAM,EAAE,GAAG,4BAA4B,CAAC;AAExC,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAc,CAAC;AACpD,IAAI,QAAkC,CAAC;AAEvC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAA+B;IAC7D,QAAQ,GAAG,KAAK,CAAC;AACnB,CAAC;AAED,2CAA2C;AAC3C,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAY,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC;AAE9D;;;;GAIG;AACH,MAAM,UAAU,WAAW;IACzB,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,WAAW,EAAE,CAAC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,gFAAgF;AAChF,SAAS,OAAO,CAAC,IAAgB;IAC/B,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,qEAAqE,CAAC,CAAC;IACzH,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,EAAE,8CAA8C,CAAC,CAAC;IACpH,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,EAAE,kCAAkC,CAAC,CAAC;IACnH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAY;IACvC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrC,CAAC;AAED,0FAA0F;AAC1F,MAAM,CAAC,MAAM,MAAM,GAAG,CAAS,IAAgB,EAAE,IAAkB,EAAU,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;AAEjH;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAW,EAAE;IACvC,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,OAAO,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC9C,CAAC,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,OAAO,GAAG,GAAW,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AAE7D;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAgB,EAAE,QAAkB;IAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI;QAAE,OAAO,QAAQ,CAAC;IACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,IAAI,cAAc,CAAa;QAC1C,IAAI,EAAE,CAAC,UAAU,EAAE,EAAE,CACnB,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,UAAU,CAAC,KAAK,EAAE,CAAC;;gBACxB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC;QACJ,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;KAC9D,CAAC,CAAC;IACH,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;AACrH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAsB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,CAAC,QAAQ,EAAE,IAAI,OAAO,CAAC,aAAa;QAAE,OAAO,IAAI,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,QAAQ,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,2BAA2B,EAAE,EAAE,CAAC,CAAC;IAC5K,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;QAC7B,iFAAiF;QACjF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,UAAU,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
@@ -0,0 +1,35 @@
1
+ import type sharp from 'sharp';
2
+ import { type ImageOptimizer } from '@velocity-astro/cms-core';
3
+ /** Only its type is named here: the library itself is loaded when the first image arrives. */
4
+ type Sharp = typeof sharp;
5
+ export interface SharpImageOptimizerOptions {
6
+ /** Loads the library. Defaults to the `sharp` package, which comes with Astro. */
7
+ readonly load?: () => Promise<Sharp>;
8
+ /** Hears, once, that the library could not be loaded. Defaults to a line in the server's log. */
9
+ readonly onUnavailable?: (error: unknown) => void;
10
+ }
11
+ /**
12
+ * Makes uploads lighter with sharp, the library Astro itself resizes images with. It runs
13
+ * wherever Node does: a server of your own, and the functions of hosts such as Vercel.
14
+ *
15
+ * Where it cannot be loaded (a runtime that is not Node, or a machine it has no build for),
16
+ * nothing is optimized and nothing breaks: every method answers `null`, which the media
17
+ * service reads as "keep the image as it is".
18
+ */
19
+ export declare class SharpImageOptimizer implements ImageOptimizer {
20
+ #private;
21
+ constructor(options?: SharpImageOptimizerOptions);
22
+ /**
23
+ * A photo becomes a WebP at a quality nobody tells from the original. A PNG is tried both
24
+ * ways, exact and nearly exact, and the lighter is kept: a logo or a screenshot packs best
25
+ * exactly and stays crisp, a photo saved as a PNG packs best the other way. See-through
26
+ * parts stay see-through.
27
+ *
28
+ * A WebP that already fits is left alone, since packing it again would only wear it, and so
29
+ * is one that moves, which would stop.
30
+ */
31
+ optimize(bytes: Uint8Array): Promise<Uint8Array | null>;
32
+ resize(bytes: Uint8Array, width: number): Promise<Uint8Array | null>;
33
+ }
34
+ export {};
35
+ //# sourceMappingURL=image-optimizer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"image-optimizer.d.ts","sourceRoot":"","sources":["../src/image-optimizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEnF,8FAA8F;AAC9F,KAAK,KAAK,GAAG,OAAO,KAAK,CAAC;AAW1B,MAAM,WAAW,0BAA0B;IACzC,kFAAkF;IAClF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,iGAAiG;IACjG,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACnD;AAED;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,cAAc;;gBAI5C,OAAO,GAAE,0BAA+B;IAIpD;;;;;;;;OAQG;IACG,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAoBvD,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAgB3E"}
@@ -0,0 +1,76 @@
1
+ import { IMAGE_LONGEST_SIDE } from '@velocity-astro/cms-core';
2
+ /** How closely a photo is kept: past this nobody sees the difference, and the file only grows. */
3
+ const PHOTO_QUALITY = 80;
4
+ /** A PNG is often a drawing with sharp edges, which show a loss sooner than a photo does. */
5
+ const DRAWING_QUALITY = 90;
6
+ /** How hard the encoder works, from 0 to 6. Four is where more time stops buying much. */
7
+ const EFFORT = 4;
8
+ /** The most pixels an image is opened with: the service refuses a longer side than 12,000 itself. */
9
+ const MAX_PIXELS = 12_000 * 12_000;
10
+ /**
11
+ * Makes uploads lighter with sharp, the library Astro itself resizes images with. It runs
12
+ * wherever Node does: a server of your own, and the functions of hosts such as Vercel.
13
+ *
14
+ * Where it cannot be loaded (a runtime that is not Node, or a machine it has no build for),
15
+ * nothing is optimized and nothing breaks: every method answers `null`, which the media
16
+ * service reads as "keep the image as it is".
17
+ */
18
+ export class SharpImageOptimizer {
19
+ #options;
20
+ #sharp;
21
+ constructor(options = {}) {
22
+ this.#options = options;
23
+ }
24
+ /**
25
+ * A photo becomes a WebP at a quality nobody tells from the original. A PNG is tried both
26
+ * ways, exact and nearly exact, and the lighter is kept: a logo or a screenshot packs best
27
+ * exactly and stays crisp, a photo saved as a PNG packs best the other way. See-through
28
+ * parts stay see-through.
29
+ *
30
+ * A WebP that already fits is left alone, since packing it again would only wear it, and so
31
+ * is one that moves, which would stop.
32
+ */
33
+ async optimize(bytes) {
34
+ const library = await this.#library();
35
+ if (!library)
36
+ return null;
37
+ const open = () => library(bytes, { limitInputPixels: MAX_PIXELS });
38
+ const facts = await open().metadata();
39
+ if ((facts.pages ?? 1) > 1)
40
+ return null;
41
+ const turned = (facts.orientation ?? 1) > 1;
42
+ const fits = Math.max(facts.width, facts.height) <= IMAGE_LONGEST_SIDE;
43
+ if (facts.format === 'webp' && fits && !turned)
44
+ return null;
45
+ // Turned the way it was taken first, since what the camera noted about that is not kept.
46
+ const ready = () => open().rotate().resize({ width: IMAGE_LONGEST_SIDE, height: IMAGE_LONGEST_SIDE, fit: 'inside', withoutEnlargement: true });
47
+ if (facts.format !== 'png')
48
+ return ready().webp({ quality: PHOTO_QUALITY, effort: EFFORT }).toBuffer();
49
+ const [exact, close] = await Promise.all([
50
+ ready().webp({ lossless: true, effort: EFFORT }).toBuffer(),
51
+ ready().webp({ quality: DRAWING_QUALITY, effort: EFFORT }).toBuffer(),
52
+ ]);
53
+ return exact.length <= close.length ? exact : close;
54
+ }
55
+ async resize(bytes, width) {
56
+ const library = await this.#library();
57
+ if (!library)
58
+ return null;
59
+ const open = () => library(bytes, { limitInputPixels: MAX_PIXELS });
60
+ if (((await open().metadata()).pages ?? 1) > 1)
61
+ return null;
62
+ return open().rotate().resize({ width, withoutEnlargement: true }).webp({ quality: PHOTO_QUALITY, effort: EFFORT }).toBuffer();
63
+ }
64
+ /** The library, loaded the first time an image arrives, or `null` on a machine that has none. */
65
+ #library() {
66
+ const load = this.#options.load ?? (async () => (await import('sharp')).default);
67
+ return (this.#sharp ??= load().catch((error) => {
68
+ (this.#options.onUnavailable ?? unavailable)(error);
69
+ return null;
70
+ }));
71
+ }
72
+ }
73
+ function unavailable(error) {
74
+ console.warn('[velocity-cms] Uploads are kept as they arrive, since the image library "sharp" could not be loaded. Install it (`npm install sharp`) to have them made lighter.', error);
75
+ }
76
+ //# sourceMappingURL=image-optimizer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"image-optimizer.js","sourceRoot":"","sources":["../src/image-optimizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAKnF,kGAAkG;AAClG,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,6FAA6F;AAC7F,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,0FAA0F;AAC1F,MAAM,MAAM,GAAG,CAAC,CAAC;AACjB,qGAAqG;AACrG,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AASnC;;;;;;;GAOG;AACH,MAAM,OAAO,mBAAmB;IACrB,QAAQ,CAA6B;IAC9C,MAAM,CAAoC;IAE1C,YAAY,UAAsC,EAAE;QAClD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,QAAQ,CAAC,KAAiB;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACxC,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC;QACvE,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAE5D,yFAAyF;QACzF,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/I,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK;YAAE,OAAO,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;YAC3D,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;SACtE,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAiB,EAAE,KAAa;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QAC5D,OAAO,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACjI,CAAC;IAED,iGAAiG;IACjG,QAAQ;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,IAAoB,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACjG,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACtD,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,CAAC,IAAI,CAAC,kKAAkK,EAAE,KAAK,CAAC,CAAC;AAC1L,CAAC"}
package/dist/index.d.ts CHANGED
@@ -14,12 +14,15 @@ export { linkTo, type LinkTarget } from './link.js';
14
14
  export { FORM_ABOUT_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, MemoryRateLimiter, aboutMark, englishFormPostWords, type FormPostWords, type FormPostsOptions, type NoticeMailer, type RateLimiter, type SubmissionNotice, } from './form-post.js';
15
15
  export { FORM_SCRIPT, siteForm, siteFormPosts, type FormChoice, type SiteForm, type SiteFormOptions } from './site-forms.js';
16
16
  export { menuLinks, type MenuColumn, type MenuLink, type MenuOptions } from './menu.js';
17
+ export { single } from './single.js';
17
18
  export type { PageHead } from '@velocity-astro/cms-core';
18
19
  export { cmsLoader, type CmsLoaderOptions } from './loader.js';
19
20
  export { liveAddresses, liveCollections, matchLocalizedPage, matchParams, type LiveAddress, type PageModule, type PageSources, type StaticPath, } from './live-pages.js';
21
+ export { SharpImageOptimizer, type SharpImageOptimizerOptions } from './image-optimizer.js';
20
22
  export { FolderMediaStore, S3MediaStore, mediaStoreFromEnv, type S3MediaStoreOptions } from './media-store.js';
21
23
  export { hasSiteSecret } from './secret.js';
22
24
  export { refreshUploadedImages, uploadedFile, uploadedImage } from './site-media.js';
23
25
  export { folderImages, type ImageFile } from './site-images.js';
24
26
  export { indexPages, indexSite, searchSite, toSearchDocument } from './site-search.js';
27
+ export { NoSiteError, currentSite, hostedRequest, inSite, isHosted, siteCacheTag, useSiteRegistry, type HostedSite, type SiteRegistry } from './hosted.js';
25
28
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE7H,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvI,OAAO,EACL,aAAa,EACb,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,EACP,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,oBAAoB,EACpB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7H,OAAO,EAAE,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACxF,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EACL,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -15,11 +15,14 @@ export { linkTo } from './link.js';
15
15
  export { FORM_ABOUT_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, MemoryRateLimiter, aboutMark, englishFormPostWords, } from './form-post.js';
16
16
  export { FORM_SCRIPT, siteForm, siteFormPosts } from './site-forms.js';
17
17
  export { menuLinks } from './menu.js';
18
+ export { single } from './single.js';
18
19
  export { cmsLoader } from './loader.js';
19
20
  export { liveAddresses, liveCollections, matchLocalizedPage, matchParams, } from './live-pages.js';
21
+ export { SharpImageOptimizer } from './image-optimizer.js';
20
22
  export { FolderMediaStore, S3MediaStore, mediaStoreFromEnv } from './media-store.js';
21
23
  export { hasSiteSecret } from './secret.js';
22
24
  export { refreshUploadedImages, uploadedFile, uploadedImage } from './site-media.js';
23
25
  export { folderImages } from './site-images.js';
24
26
  export { indexPages, indexSite, searchSite, toSearchDocument } from './site-search.js';
27
+ export { NoSiteError, currentSite, hostedRequest, inSite, isHosted, siteCacheTag, useSiteRegistry } from './hosted.js';
25
28
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAA0B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAA4C,MAAM,oBAAoB,CAAC;AAC7H,8FAA8F;AAC9F,OAAO,EAAE,YAAY,EAA6C,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAA2B,MAAM,kBAAkB,CAAC;AACvI,OAAO,EACL,aAAa,EACb,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,GAIR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAyC,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAmB,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,oBAAoB,GAMrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAwD,MAAM,iBAAiB,CAAC;AAC7H,OAAO,EAAE,SAAS,EAAoD,MAAM,WAAW,CAAC;AAExF,OAAO,EAAE,SAAS,EAAyB,MAAM,aAAa,CAAC;AAC/D,OAAO,EACL,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,WAAW,GAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAA4B,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAA0B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAA4C,MAAM,oBAAoB,CAAC;AAC7H,8FAA8F;AAC9F,OAAO,EAAE,YAAY,EAA6C,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAA2B,MAAM,kBAAkB,CAAC;AACvI,OAAO,EACL,aAAa,EACb,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,GAIR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAyC,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAmB,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,oBAAoB,GAMrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAwD,MAAM,iBAAiB,CAAC;AAC7H,OAAO,EAAE,SAAS,EAAoD,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,SAAS,EAAyB,MAAM,aAAa,CAAC;AAC/D,OAAO,EACL,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,WAAW,GAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAmC,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAA4B,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAsC,MAAM,aAAa,CAAC"}
@@ -26,6 +26,15 @@ export interface VelocityCmsOptions {
26
26
  * images, which otherwise know only the pages the site has files for.
27
27
  */
28
28
  readonly entryPages?: readonly string[];
29
+ /**
30
+ * For a host that runs many sites from this one copy. The file whose default export is a
31
+ * `SiteRegistry`, from the project's root: `'./src/cms-sites.ts'`. It says which site a host
32
+ * name belongs to, with that site's own database, secret, address and uploads. A host name it
33
+ * does not know gets no site, and nothing is read from the `VELOCITY_CMS_*` settings of one
34
+ * site. Such a copy builds no page ahead of time: every page is drawn for the site that asked.
35
+ * A site of its own leaves this out.
36
+ */
37
+ readonly sites?: string;
29
38
  }
30
39
  /**
31
40
  * The Velocity CMS integration. Add it to `integrations` in `astro.config.mjs`.
@@ -1 +1 @@
1
- {"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../src/integration.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAY9C,MAAM,WAAW,kBAAkB;IACjC,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,yFAAyF;IACzF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,gBAAgB,CAiFtF"}
1
+ {"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../src/integration.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAa9C,MAAM,WAAW,kBAAkB;IACjC,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,yFAAyF;IACzF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC;;;;;;;OAOG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,gBAAgB,CA4FtF"}
@@ -7,6 +7,7 @@ const OPTIONS = 'virtual:velocity-cms/options';
7
7
  const MAILER = 'virtual:velocity-cms/mailer';
8
8
  const PLUGINS = 'virtual:velocity-cms/plugins';
9
9
  const IMAGES = 'virtual:velocity-cms/images';
10
+ const SITES = 'virtual:velocity-cms/sites';
10
11
  const IMAGE_FILES = '*.{jpg,jpeg,png,webp,avif,gif}';
11
12
  const ADMIN_PATH = '/admin';
12
13
  const route = (file) => fileURLToPath(new URL(`../routes/${file}`, import.meta.url));
@@ -53,6 +54,9 @@ export default function velocityCms(options = {}) {
53
54
  root = fileURLToPath(config.root);
54
55
  // The secret a person put in .env must reach the server that runs here, not only the site's code.
55
56
  loadCmsEnv(root, command === 'dev' ? 'development' : 'production');
57
+ // The site a request is for is chosen before anything else looks at it.
58
+ if (options.sites)
59
+ addMiddleware({ entrypoint: route('sites.ts'), order: 'pre' });
56
60
  addMiddleware({ entrypoint: `${PACKAGE}/middleware`, order: 'pre' });
57
61
  // Entries set to go out at a time are looked for as pages are asked for.
58
62
  addMiddleware({ entrypoint: route('due.ts'), order: 'pre' });
@@ -83,7 +87,7 @@ export default function velocityCms(options = {}) {
83
87
  plugins: [
84
88
  {
85
89
  name: 'velocity-cms:options',
86
- resolveId: (id) => (id === OPTIONS || id === MAILER || id === IMAGES || id === PLUGINS ? `\0${id}` : undefined),
90
+ resolveId: (id) => (id === OPTIONS || id === MAILER || id === IMAGES || id === PLUGINS || id === SITES ? `\0${id}` : undefined),
87
91
  load: (id) => {
88
92
  if (id === `\0${OPTIONS}`) {
89
93
  const editor = { site, siteName: options.siteName ?? 'Velocity CMS', adminPath: ADMIN_PATH };
@@ -94,6 +98,9 @@ export default function velocityCms(options = {}) {
94
98
  ? `export { default } from ${JSON.stringify(path.resolve(root, options.mailer))};`
95
99
  : 'export default undefined;';
96
100
  }
101
+ if (id === `\0${SITES}`) {
102
+ return `export { default } from ${JSON.stringify(path.resolve(root, options.sites ?? ''))};`;
103
+ }
97
104
  if (id === `\0${PLUGINS}`) {
98
105
  // A path is the project's own file; anything else is a package the site installed.
99
106
  const from = (plugin) => (/^\.{0,2}\//.test(plugin) ? path.resolve(root, plugin) : plugin);
@@ -119,6 +126,13 @@ export default function velocityCms(options = {}) {
119
126
  },
120
127
  });
121
128
  },
129
+ // A copy that runs many sites builds no page ahead of time. Such a page is built for no
130
+ // site and served to all of them, so one site's name, menu or post would be every site's.
131
+ // Every page is drawn when it is asked for, for the site whose host name asked.
132
+ 'astro:route:setup': ({ route: page }) => {
133
+ if (options.sites)
134
+ page.prerender = false;
135
+ },
122
136
  'astro:config:done': ({ config }) => {
123
137
  clientDir = fileURLToPath(config.adapter ? config.build.client : config.outDir);
124
138
  site = config.site;
@@ -1 +1 @@
1
- {"version":3,"file":"integration.js","sourceRoot":"","sources":["../src/integration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"integration.js","sourceRoot":"","sources":["../src/integration.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,12 @@ export interface S3MediaStoreOptions {
15
15
  readonly secretAccessKey: string;
16
16
  /** Defaults to `auto`, which is what Cloudflare R2 takes. */
17
17
  readonly region?: string;
18
+ /**
19
+ * A folder inside the bucket to keep every file under, such as `sites/s-4f2a`. A host that
20
+ * runs many sites gives each site its own, so one bucket holds them all and no site can
21
+ * name another's file. Lowercase letters, digits and hyphens, in parts divided by `/`.
22
+ */
23
+ readonly prefix?: string;
18
24
  /** Defaults to the server's own `fetch`. */
19
25
  readonly fetch?: typeof globalThis.fetch;
20
26
  /** Defaults to now. */
@@ -1 +1 @@
1
- {"version":3,"file":"media-store.d.ts","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAYvE,yFAAyF;AACzF,qBAAa,gBAAiB,YAAW,UAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAExC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC;AAED,MAAM,WAAW,mBAAmB;IAClC,yHAAyH;IACzH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,uBAAuB;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAWD;;;;GAIG;AACH,qBAAa,YAAa,YAAW,UAAU;;gBAIjC,OAAO,EAAE,mBAAmB;IAKlC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAQ5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDzC;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,UAAU,GAAG,SAAS,CAmB9I"}
1
+ {"version":3,"file":"media-store.d.ts","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAYvE,yFAAyF;AACzF,qBAAa,gBAAiB,YAAW,UAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAExC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC;AAED,MAAM,WAAW,mBAAmB;IAClC,yHAAyH;IACzH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,uBAAuB;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAcD;;;;GAIG;AACH,qBAAa,YAAa,YAAW,UAAU;;gBAMjC,OAAO,EAAE,mBAAmB;IASlC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAQ5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDzC;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,UAAU,GAAG,SAAS,CAmB9I"}