@velocity-astro/cms-core 0.1.0-beta.1 → 0.1.0-beta.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/access.d.ts +17 -1
- package/dist/access.d.ts.map +1 -1
- package/dist/access.js +17 -1
- package/dist/access.js.map +1 -1
- package/dist/cms.d.ts +7 -2
- package/dist/cms.d.ts.map +1 -1
- package/dist/cms.js +5 -2
- package/dist/cms.js.map +1 -1
- package/dist/events.d.ts +6 -1
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js.map +1 -1
- package/dist/fields/blocks.d.ts +5 -0
- package/dist/fields/blocks.d.ts.map +1 -1
- package/dist/fields/blocks.js +12 -0
- package/dist/fields/blocks.js.map +1 -1
- package/dist/fields/index.d.ts +67 -5
- package/dist/fields/index.d.ts.map +1 -1
- package/dist/fields/index.js +77 -7
- package/dist/fields/index.js.map +1 -1
- package/dist/index.d.ts +12 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -8
- package/dist/index.js.map +1 -1
- package/dist/model.d.ts +108 -1
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js.map +1 -1
- package/dist/page-address.d.ts +2 -0
- package/dist/page-address.d.ts.map +1 -1
- package/dist/page-address.js +2 -0
- package/dist/page-address.js.map +1 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +5 -34
- package/dist/plugin.js.map +1 -1
- package/dist/ports.d.ts +75 -1
- package/dist/ports.d.ts.map +1 -1
- package/dist/rich-text.d.ts +20 -0
- package/dist/rich-text.d.ts.map +1 -1
- package/dist/rich-text.js +148 -0
- package/dist/rich-text.js.map +1 -1
- package/dist/schema-builder.d.ts +8 -0
- package/dist/schema-builder.d.ts.map +1 -1
- package/dist/schema-builder.js +36 -1
- package/dist/schema-builder.js.map +1 -1
- package/dist/seal.d.ts +22 -0
- package/dist/seal.d.ts.map +1 -0
- package/dist/seal.js +51 -0
- package/dist/seal.js.map +1 -0
- package/dist/search-text.d.ts +5 -0
- package/dist/search-text.d.ts.map +1 -1
- package/dist/search-text.js +7 -0
- package/dist/search-text.js.map +1 -1
- package/dist/services/media-service.d.ts +29 -4
- package/dist/services/media-service.d.ts.map +1 -1
- package/dist/services/media-service.js +88 -14
- package/dist/services/media-service.js.map +1 -1
- package/dist/services/pipeline-service.d.ts +4 -0
- package/dist/services/pipeline-service.d.ts.map +1 -1
- package/dist/services/pipeline-service.js +13 -1
- package/dist/services/pipeline-service.js.map +1 -1
- package/dist/services/schema-service.d.ts +4 -0
- package/dist/services/schema-service.d.ts.map +1 -1
- package/dist/services/schema-service.js +10 -1
- package/dist/services/schema-service.js.map +1 -1
- package/dist/services/settings-service.d.ts +157 -0
- package/dist/services/settings-service.d.ts.map +1 -0
- package/dist/services/settings-service.js +377 -0
- package/dist/services/settings-service.js.map +1 -0
- package/dist/testing/contracts.d.ts +3 -1
- package/dist/testing/contracts.d.ts.map +1 -1
- package/dist/testing/contracts.js +45 -1
- package/dist/testing/contracts.js.map +1 -1
- package/dist/testing/in-memory.d.ts +11 -2
- package/dist/testing/in-memory.d.ts.map +1 -1
- package/dist/testing/in-memory.js +41 -2
- package/dist/testing/in-memory.js.map +1 -1
- package/dist/testing/index.d.ts +2 -2
- package/dist/testing/index.d.ts.map +1 -1
- package/dist/testing/index.js +2 -2
- package/dist/testing/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-builder.js","sourceRoot":"","sources":["../src/schema-builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema-builder.js","sourceRoot":"","sources":["../src/schema-builder.ts"],"names":[],"mappings":"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"}
|
package/dist/seal.d.ts
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/** A key or password as it is kept: sealed, with what it takes to open it besides the site's secret. */
|
|
2
|
+
export interface Sealed {
|
|
3
|
+
readonly iv: string;
|
|
4
|
+
readonly sealed: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Seals keys and passwords with the site's secret before they are stored (AES-256-GCM), and
|
|
8
|
+
* opens them again. `purpose` keeps one kind of secret apart from another: what is sealed for
|
|
9
|
+
* one cannot be opened as the other.
|
|
10
|
+
*/
|
|
11
|
+
export declare class SecretSeal {
|
|
12
|
+
#private;
|
|
13
|
+
private readonly secret;
|
|
14
|
+
private readonly purpose;
|
|
15
|
+
constructor(secret: string | undefined, purpose: string);
|
|
16
|
+
/** Whether the site has a secret to seal with. */
|
|
17
|
+
get canSeal(): boolean;
|
|
18
|
+
seal(text: string): Promise<Sealed>;
|
|
19
|
+
/** What was sealed, or `undefined` when it cannot be opened: the site's secret changed since. */
|
|
20
|
+
open(stored: unknown): Promise<string | undefined>;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=seal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seal.d.ts","sourceRoot":"","sources":["../src/seal.ts"],"names":[],"mappings":"AAIA,wGAAwG;AACxG,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAOD;;;;GAIG;AACH,qBAAa,UAAU;;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM;IAGlC,kDAAkD;IAClD,IAAI,OAAO,IAAI,OAAO,CAErB;IAEK,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMzC,iGAAiG;IAC3F,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAqBzD"}
|
package/dist/seal.js
ADDED
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { ConflictError } from './errors.js';
|
|
2
|
+
const toHex = (bytes) => [...bytes].map((byte) => byte.toString(16).padStart(2, '0')).join('');
|
|
3
|
+
const fromHex = (hex) => new Uint8Array((hex.match(/../g) ?? []).map((pair) => Number.parseInt(pair, 16)));
|
|
4
|
+
const isSealed = (value) => typeof value === 'object' && value !== null && typeof value.iv === 'string' && typeof value.sealed === 'string';
|
|
5
|
+
/**
|
|
6
|
+
* Seals keys and passwords with the site's secret before they are stored (AES-256-GCM), and
|
|
7
|
+
* opens them again. `purpose` keeps one kind of secret apart from another: what is sealed for
|
|
8
|
+
* one cannot be opened as the other.
|
|
9
|
+
*/
|
|
10
|
+
export class SecretSeal {
|
|
11
|
+
secret;
|
|
12
|
+
purpose;
|
|
13
|
+
#key = null;
|
|
14
|
+
constructor(secret, purpose) {
|
|
15
|
+
this.secret = secret;
|
|
16
|
+
this.purpose = purpose;
|
|
17
|
+
}
|
|
18
|
+
/** Whether the site has a secret to seal with. */
|
|
19
|
+
get canSeal() {
|
|
20
|
+
return this.secret !== undefined && this.secret.length >= 32;
|
|
21
|
+
}
|
|
22
|
+
async seal(text) {
|
|
23
|
+
const iv = globalThis.crypto.getRandomValues(new Uint8Array(12));
|
|
24
|
+
const sealed = await globalThis.crypto.subtle.encrypt({ name: 'AES-GCM', iv }, await this.#sealKey(), new TextEncoder().encode(text));
|
|
25
|
+
return { iv: toHex(iv), sealed: toHex(new Uint8Array(sealed)) };
|
|
26
|
+
}
|
|
27
|
+
/** What was sealed, or `undefined` when it cannot be opened: the site's secret changed since. */
|
|
28
|
+
async open(stored) {
|
|
29
|
+
if (!isSealed(stored))
|
|
30
|
+
return undefined;
|
|
31
|
+
try {
|
|
32
|
+
const opened = await globalThis.crypto.subtle.decrypt({ name: 'AES-GCM', iv: fromHex(stored.iv) }, await this.#sealKey(), fromHex(stored.sealed));
|
|
33
|
+
return new TextDecoder().decode(opened);
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
#sealKey() {
|
|
40
|
+
const { secret } = this;
|
|
41
|
+
if (secret === undefined || secret.length < 32) {
|
|
42
|
+
throw new ConflictError('This site has no secret to seal keys and passwords with. Set VELOCITY_CMS_SECRET to at least 32 characters, then save this again.');
|
|
43
|
+
}
|
|
44
|
+
this.#key ??= (async () => {
|
|
45
|
+
const digest = await globalThis.crypto.subtle.digest('SHA-256', new TextEncoder().encode(`${this.purpose}\n${secret}`));
|
|
46
|
+
return globalThis.crypto.subtle.importKey('raw', digest, 'AES-GCM', false, ['encrypt', 'decrypt']);
|
|
47
|
+
})();
|
|
48
|
+
return this.#key;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=seal.js.map
|
package/dist/seal.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seal.js","sourceRoot":"","sources":["../src/seal.ts"],"names":[],"mappings":"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"}
|
package/dist/search-text.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/** Helpers every `SearchIndex` adapter shares, so they agree on words and on excerpts. */
|
|
2
2
|
/** The words of a query or a text: lower case, accents removed, punctuation dropped. */
|
|
3
3
|
export declare function searchWords(text: string): string[];
|
|
4
|
+
/**
|
|
5
|
+
* The words an editor typed to find entries or contacts, as each is looked for: split at spaces,
|
|
6
|
+
* in lower case, kept whole otherwise (`garden-flat`, `100%`), and at most eight.
|
|
7
|
+
*/
|
|
8
|
+
export declare function searchedWords(text: string | undefined): string[];
|
|
4
9
|
export declare function escapeHtml(text: string): string;
|
|
5
10
|
/** Markers an adapter puts around matched words before the text is escaped. Never found in content. */
|
|
6
11
|
export declare const MARK_OPEN = "\u0001";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-text.d.ts","sourceRoot":"","sources":["../src/search-text.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAOlD;AAID,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,uGAAuG;AACvG,eAAO,MAAM,SAAS,WAAW,CAAC;AAClC,eAAO,MAAM,UAAU,WAAW,CAAC;AAEnC,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD"}
|
|
1
|
+
{"version":3,"file":"search-text.d.ts","sourceRoot":"","sources":["../src/search-text.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAOlD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAEhE;AAID,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,uGAAuG;AACvG,eAAO,MAAM,SAAS,WAAW,CAAC;AAClC,eAAO,MAAM,UAAU,WAAW,CAAC;AAEnC,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD"}
|
package/dist/search-text.js
CHANGED
|
@@ -8,6 +8,13 @@ export function searchWords(text) {
|
|
|
8
8
|
.split(/[^\p{L}\p{N}]+/u)
|
|
9
9
|
.filter((word) => word.length > 0);
|
|
10
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* The words an editor typed to find entries or contacts, as each is looked for: split at spaces,
|
|
13
|
+
* in lower case, kept whole otherwise (`garden-flat`, `100%`), and at most eight.
|
|
14
|
+
*/
|
|
15
|
+
export function searchedWords(text) {
|
|
16
|
+
return (text ?? '').toLowerCase().split(/\s+/u).filter((word) => word.length > 0).slice(0, 8);
|
|
17
|
+
}
|
|
11
18
|
const ESCAPES = { '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' };
|
|
12
19
|
export function escapeHtml(text) {
|
|
13
20
|
return text.replace(/[&<>"']/g, (character) => ESCAPES[character] ?? character);
|
package/dist/search-text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-text.js","sourceRoot":"","sources":["../src/search-text.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,wFAAwF;AACxF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,WAAW,EAAE;SACb,KAAK,CAAC,iBAAiB,CAAC;SACxB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,OAAO,GAA2B,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;AAEhH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;AAClF,CAAC;AAED,uGAAuG;AACvG,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;AAEnC,kEAAkE;AAClE,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC/F,CAAC"}
|
|
1
|
+
{"version":3,"file":"search-text.js","sourceRoot":"","sources":["../src/search-text.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,wFAAwF;AACxF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,WAAW,EAAE;SACb,KAAK,CAAC,iBAAiB,CAAC;SACxB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACvC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAwB;IACpD,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,OAAO,GAA2B,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;AAEhH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;AAClF,CAAC;AAED,uGAAuG;AACvG,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;AAEnC,kEAAkE;AAClE,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AccessControl, Actor } from '../access.js';
|
|
2
2
|
import type { EventBus } from '../events.js';
|
|
3
3
|
import type { SiteImage } from '../model.js';
|
|
4
|
-
import type { Clock, ImageLibrary, MediaRepository, MediaStore, StoredFile } from '../ports.js';
|
|
4
|
+
import type { Clock, ImageLibrary, ImageOptimizer, MediaRepository, MediaStore, StoredFile } from '../ports.js';
|
|
5
5
|
/** Where uploads are kept: their records and their files. */
|
|
6
6
|
export interface MediaStorage {
|
|
7
7
|
readonly files: MediaRepository;
|
|
@@ -14,7 +14,24 @@ export interface MediaServiceOptions {
|
|
|
14
14
|
readonly basePath?: string | undefined;
|
|
15
15
|
/** The largest file accepted, in bytes. Defaults to 4 MB, which every host we deploy to lets through. */
|
|
16
16
|
readonly maxBytes?: number | undefined;
|
|
17
|
+
/**
|
|
18
|
+
* Makes each upload lighter before it is kept, and makes the small copies lists show.
|
|
19
|
+
* Without it an upload is kept exactly as it arrived.
|
|
20
|
+
*/
|
|
21
|
+
readonly optimizer?: ImageOptimizer | undefined;
|
|
22
|
+
/** Hears of an image the optimizer could not handle. The upload is kept as it arrived all the same. */
|
|
23
|
+
readonly onOptimizerFault?: ((error: unknown) => void) | undefined;
|
|
17
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* The longest side an image is kept with. No page shows a photo wider than this, and a
|
|
27
|
+
* phone's camera makes them twice as wide.
|
|
28
|
+
*/
|
|
29
|
+
export declare const IMAGE_LONGEST_SIDE = 2560;
|
|
30
|
+
/**
|
|
31
|
+
* The widths a small copy of an upload can be asked for in. A fixed few, so nobody can make
|
|
32
|
+
* the site resize one image ten thousand ways.
|
|
33
|
+
*/
|
|
34
|
+
export declare const IMAGE_WIDTHS: readonly number[];
|
|
18
35
|
export interface NewUpload {
|
|
19
36
|
/** The file's name on the person's computer. It only suggests what the image is called. */
|
|
20
37
|
readonly fileName: string;
|
|
@@ -33,8 +50,8 @@ export declare class MediaService {
|
|
|
33
50
|
* where they are, so it tells the CMS. Including the same library twice changes nothing.
|
|
34
51
|
*/
|
|
35
52
|
include(library: ImageLibrary): void;
|
|
36
|
-
/** Whether this site can take an upload. */
|
|
37
|
-
|
|
53
|
+
/** Whether this site can take an upload right now. An owner may set storage up later, so this is asked each time. */
|
|
54
|
+
takesUploads(): Promise<boolean>;
|
|
38
55
|
/** The largest upload accepted, in bytes. */
|
|
39
56
|
get maxUploadBytes(): number;
|
|
40
57
|
/** Every image there is to choose from, ordered by name. */
|
|
@@ -44,6 +61,10 @@ export declare class MediaService {
|
|
|
44
61
|
/**
|
|
45
62
|
* Takes a new image. The file is checked by what it holds, never by what it is called: it
|
|
46
63
|
* must be a JPEG, PNG or WebP. It gets a name no other image has, made from the file's own.
|
|
64
|
+
*
|
|
65
|
+
* A site with an optimizer keeps a lighter copy and not the file it was sent: the same
|
|
66
|
+
* picture as WebP, no larger than a page shows. The file that arrived is kept instead when
|
|
67
|
+
* the copy would be no lighter, or when the optimizer fails.
|
|
47
68
|
*/
|
|
48
69
|
upload(actor: Actor, upload: NewUpload): Promise<SiteImage>;
|
|
49
70
|
/**
|
|
@@ -55,7 +76,11 @@ export declare class MediaService {
|
|
|
55
76
|
/**
|
|
56
77
|
* An uploaded file by its key, for the site to serve. Anyone may see it: an upload is public
|
|
57
78
|
* from the moment it exists, as a file in the site's image folder is.
|
|
79
|
+
*
|
|
80
|
+
* With a width it is a copy no wider than that, for a place that shows the image small. Only
|
|
81
|
+
* the widths in `IMAGE_WIDTHS` exist, and only on a site with an optimizer. A copy is made
|
|
82
|
+
* when asked for and kept nowhere: whoever serves it lets browsers and the CDN keep it.
|
|
58
83
|
*/
|
|
59
|
-
file(key: string): Promise<StoredFile>;
|
|
84
|
+
file(key: string, width?: number): Promise<StoredFile>;
|
|
60
85
|
}
|
|
61
86
|
//# sourceMappingURL=media-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-service.d.ts","sourceRoot":"","sources":["../../src/services/media-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"media-service.d.ts","sourceRoot":"","sources":["../../src/services/media-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEhH,6DAA6D;AAC7D,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,qGAAqG;IACrG,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IAC5C,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,yGAAyG;IACzG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IAChD,uGAAuG;IACvG,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACpE;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,SAAS,MAAM,EAAgC,CAAC;AAI3E,MAAM,WAAW,SAAS;IACxB,2FAA2F;IAC3F,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAmBD,yFAAyF;AACzF,qBAAa,YAAY;;IAMrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,mBAAwB;IAMpD;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAIpC,qHAAqH;IAC/G,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAKtC,6CAA6C;IAC7C,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,4DAA4D;IACtD,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC;IAMzD,oFAAoF;IAC9E,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC;IAK1D;;;;;;;OAOG;IACG,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IA2CjE;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvD;;;;;;;OAOG;IACG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAoE7D"}
|
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
import { ConflictError, NotFoundError, ValidationError } from '../errors.js';
|
|
2
2
|
import { readImage } from '../image-file.js';
|
|
3
|
+
/**
|
|
4
|
+
* The longest side an image is kept with. No page shows a photo wider than this, and a
|
|
5
|
+
* phone's camera makes them twice as wide.
|
|
6
|
+
*/
|
|
7
|
+
export const IMAGE_LONGEST_SIDE = 2560;
|
|
8
|
+
/**
|
|
9
|
+
* The widths a small copy of an upload can be asked for in. A fixed few, so nobody can make
|
|
10
|
+
* the site resize one image ten thousand ways.
|
|
11
|
+
*/
|
|
12
|
+
export const IMAGE_WIDTHS = [320, 640, 960, 1280, 1920];
|
|
13
|
+
/** The width lists of images in the editor ask for. */
|
|
14
|
+
const THUMBNAIL_WIDTH = 640;
|
|
3
15
|
const MAX_NAME_LENGTH = 80;
|
|
4
16
|
/** The longest side an image may have. Larger than any screen shows, small enough to resize safely. */
|
|
5
17
|
const MAX_SIDE = 12_000;
|
|
@@ -39,9 +51,10 @@ export class MediaService {
|
|
|
39
51
|
include(library) {
|
|
40
52
|
this.#libraries.add(library);
|
|
41
53
|
}
|
|
42
|
-
/** Whether this site can take an upload. */
|
|
43
|
-
|
|
44
|
-
|
|
54
|
+
/** Whether this site can take an upload right now. An owner may set storage up later, so this is asked each time. */
|
|
55
|
+
async takesUploads() {
|
|
56
|
+
const store = this.options.storage?.store;
|
|
57
|
+
return store !== undefined && ((await store.ready?.()) ?? true);
|
|
45
58
|
}
|
|
46
59
|
/** The largest upload accepted, in bytes. */
|
|
47
60
|
get maxUploadBytes() {
|
|
@@ -61,12 +74,16 @@ export class MediaService {
|
|
|
61
74
|
/**
|
|
62
75
|
* Takes a new image. The file is checked by what it holds, never by what it is called: it
|
|
63
76
|
* must be a JPEG, PNG or WebP. It gets a name no other image has, made from the file's own.
|
|
77
|
+
*
|
|
78
|
+
* A site with an optimizer keeps a lighter copy and not the file it was sent: the same
|
|
79
|
+
* picture as WebP, no larger than a page shows. The file that arrived is kept instead when
|
|
80
|
+
* the copy would be no lighter, or when the optimizer fails.
|
|
64
81
|
*/
|
|
65
82
|
async upload(actor, upload) {
|
|
66
83
|
this.access.require(actor, 'entry:write');
|
|
67
84
|
const storage = this.options.storage;
|
|
68
|
-
if (!storage) {
|
|
69
|
-
throw new ConflictError("This site has nowhere to keep uploads yet.
|
|
85
|
+
if (!storage || !(await this.takesUploads())) {
|
|
86
|
+
throw new ConflictError("This site has nowhere to keep uploads yet. An owner can set storage up under Settings, Storage, or add the image to the site's image folder.");
|
|
70
87
|
}
|
|
71
88
|
const { bytes } = upload;
|
|
72
89
|
const refuse = (message) => new ValidationError(message, [{ path: ['file'], message }]);
|
|
@@ -81,21 +98,22 @@ export class MediaService {
|
|
|
81
98
|
if (facts.width > MAX_SIDE || facts.height > MAX_SIDE) {
|
|
82
99
|
throw refuse(`The image is ${facts.width} by ${facts.height} pixels. The longest side can be ${MAX_SIDE} at most.`);
|
|
83
100
|
}
|
|
101
|
+
const kept = await this.#lighter(bytes, facts);
|
|
84
102
|
const name = await this.#freeName(nameFrom(upload.fileName), storage);
|
|
85
103
|
const file = {
|
|
86
104
|
name,
|
|
87
|
-
key: `${name}.${facts.extension}`,
|
|
88
|
-
contentType: facts.contentType,
|
|
89
|
-
width: facts.width,
|
|
90
|
-
height: facts.height,
|
|
91
|
-
size: bytes.length,
|
|
105
|
+
key: `${name}.${kept.facts.extension}`,
|
|
106
|
+
contentType: kept.facts.contentType,
|
|
107
|
+
width: kept.facts.width,
|
|
108
|
+
height: kept.facts.height,
|
|
109
|
+
size: kept.bytes.length,
|
|
92
110
|
createdAt: this.clock.now(),
|
|
93
111
|
createdBy: actor.id,
|
|
94
112
|
};
|
|
95
113
|
// The record goes first: it is what keeps two uploads from taking the same name.
|
|
96
114
|
await storage.files.add(file);
|
|
97
115
|
try {
|
|
98
|
-
await storage.store.put(file.key, { bytes, contentType: file.contentType });
|
|
116
|
+
await storage.store.put(file.key, { bytes: kept.bytes, contentType: file.contentType });
|
|
99
117
|
}
|
|
100
118
|
catch (error) {
|
|
101
119
|
await storage.files.remove(name);
|
|
@@ -127,12 +145,59 @@ export class MediaService {
|
|
|
127
145
|
/**
|
|
128
146
|
* An uploaded file by its key, for the site to serve. Anyone may see it: an upload is public
|
|
129
147
|
* from the moment it exists, as a file in the site's image folder is.
|
|
148
|
+
*
|
|
149
|
+
* With a width it is a copy no wider than that, for a place that shows the image small. Only
|
|
150
|
+
* the widths in `IMAGE_WIDTHS` exist, and only on a site with an optimizer. A copy is made
|
|
151
|
+
* when asked for and kept nowhere: whoever serves it lets browsers and the CDN keep it.
|
|
130
152
|
*/
|
|
131
|
-
async file(key) {
|
|
153
|
+
async file(key, width) {
|
|
154
|
+
if (width !== undefined && !this.#makesCopies(width))
|
|
155
|
+
throw new NotFoundError('Image', key);
|
|
132
156
|
const file = await this.options.storage?.store.get(key);
|
|
133
157
|
if (!file)
|
|
134
158
|
throw new NotFoundError('Image', key);
|
|
135
|
-
|
|
159
|
+
if (width === undefined)
|
|
160
|
+
return file;
|
|
161
|
+
const facts = readImage(file.bytes);
|
|
162
|
+
// An image already that narrow is its own small copy.
|
|
163
|
+
if (!facts || facts.width <= width)
|
|
164
|
+
return file;
|
|
165
|
+
const smaller = await this.options.optimizer?.resize(file.bytes, width).catch((error) => {
|
|
166
|
+
this.options.onOptimizerFault?.(error);
|
|
167
|
+
return null;
|
|
168
|
+
});
|
|
169
|
+
const made = smaller ? readImage(smaller) : null;
|
|
170
|
+
return smaller && made && made.width <= width ? { bytes: smaller, contentType: made.contentType } : file;
|
|
171
|
+
}
|
|
172
|
+
/** Whether a copy of an upload can be asked for at this width. */
|
|
173
|
+
#makesCopies(width) {
|
|
174
|
+
return this.options.optimizer !== undefined && IMAGE_WIDTHS.includes(width);
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* What to keep of an upload: the optimizer's copy when it is a real image that is lighter,
|
|
178
|
+
* or one turned or made smaller, and otherwise the file as it arrived.
|
|
179
|
+
*/
|
|
180
|
+
async #lighter(bytes, facts) {
|
|
181
|
+
const asIs = { bytes, facts };
|
|
182
|
+
const optimizer = this.options.optimizer;
|
|
183
|
+
if (!optimizer)
|
|
184
|
+
return asIs;
|
|
185
|
+
let made;
|
|
186
|
+
try {
|
|
187
|
+
made = await optimizer.optimize(bytes);
|
|
188
|
+
}
|
|
189
|
+
catch (error) {
|
|
190
|
+
this.options.onOptimizerFault?.(error);
|
|
191
|
+
return asIs;
|
|
192
|
+
}
|
|
193
|
+
const madeFacts = made ? readImage(made) : null;
|
|
194
|
+
if (!made || !madeFacts || made.length > this.#maxBytes)
|
|
195
|
+
return asIs;
|
|
196
|
+
// A copy is never larger than what it was made from, whichever way it was turned.
|
|
197
|
+
if (Math.max(madeFacts.width, madeFacts.height) > Math.max(facts.width, facts.height))
|
|
198
|
+
return asIs;
|
|
199
|
+
const reshaped = madeFacts.width !== facts.width || madeFacts.height !== facts.height;
|
|
200
|
+
return made.length < bytes.length || reshaped ? { bytes: made, facts: madeFacts } : asIs;
|
|
136
201
|
}
|
|
137
202
|
async #included() {
|
|
138
203
|
return (await Promise.all([...this.#libraries].map((library) => library.list()))).flat();
|
|
@@ -146,7 +211,16 @@ export class MediaService {
|
|
|
146
211
|
return name;
|
|
147
212
|
}
|
|
148
213
|
#asImage(file) {
|
|
149
|
-
|
|
214
|
+
const url = `${this.#basePath}/${file.key}`;
|
|
215
|
+
return {
|
|
216
|
+
name: file.name,
|
|
217
|
+
url,
|
|
218
|
+
width: file.width,
|
|
219
|
+
height: file.height,
|
|
220
|
+
uploadedAt: file.createdAt,
|
|
221
|
+
size: file.size,
|
|
222
|
+
...(this.#makesCopies(THUMBNAIL_WIDTH) && file.width > THUMBNAIL_WIDTH && { thumbnail: `${url}?w=${THUMBNAIL_WIDTH}` }),
|
|
223
|
+
};
|
|
150
224
|
}
|
|
151
225
|
}
|
|
152
226
|
const megabytes = (bytes) => (bytes / 1_000_000).toFixed(1).replace(/\.0$/, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-service.js","sourceRoot":"","sources":["../../src/services/media-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"media-service.js","sourceRoot":"","sources":["../../src/services/media-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ export interface PipelineChanges {
|
|
|
18
18
|
readonly currency?: string;
|
|
19
19
|
/** Who new contacts from forms are given to. Left out, it stays as it is; empty, nobody. */
|
|
20
20
|
readonly assignTo?: readonly string[];
|
|
21
|
+
/** What the team means to win in a month. Left out, it stays as it is; `null`, there is none. */
|
|
22
|
+
readonly monthlyTarget?: number | null;
|
|
21
23
|
/** The revision the editor loaded. */
|
|
22
24
|
readonly expectedRevision: number;
|
|
23
25
|
}
|
|
@@ -30,6 +32,8 @@ export declare const DEFAULT_CURRENCY = "USD";
|
|
|
30
32
|
/** How likely a deal in a stage is to be won, from 0 to 1. */
|
|
31
33
|
export declare const chanceOf: (stage: PipelineStage) => number;
|
|
32
34
|
export declare const MAX_STAGES = 12;
|
|
35
|
+
/** The largest monthly target, as for a deal's worth. */
|
|
36
|
+
export declare const MAX_MONTHLY_TARGET = 1000000000000;
|
|
33
37
|
export declare const MAX_STAGE_LABEL_LENGTH = 40;
|
|
34
38
|
/** Owns the pipeline: the stages a contact moves through, which a site may rename, reorder, add to and remove from. */
|
|
35
39
|
export declare class PipelineService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-service.d.ts","sourceRoot":"","sources":["../../src/services/pipeline-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEvG,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,kFAAkF;IAClF,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IACvC,kFAAkF;IAClF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,4FAA4F;IAC5F,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,sCAAsC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,aAAa,EAMlD,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AAEtC,8DAA8D;AAC9D,eAAO,MAAM,QAAQ,GAAI,OAAO,aAAa,KAAG,MAA6F,CAAC;AAE9I,eAAO,MAAM,UAAU,KAAK,CAAC;AAC7B,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAGzC,uHAAuH;AACvH,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBANL,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,iBAAiB,EAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,QAAQ,EAChB,GAAG,EAAE,WAAW,EAChB,KAAK,CAAC,EAAE,cAAc,YAAA,EACtB,IAAI,CAAC,EAAE,IAAI,YAAA;IAGxB,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;IAK1C,gIAAgI;IAC1H,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlC;;;OAGG;IACG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline-service.d.ts","sourceRoot":"","sources":["../../src/services/pipeline-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEvG,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,kFAAkF;IAClF,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IACvC,kFAAkF;IAClF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,4FAA4F;IAC5F,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,iGAAiG;IACjG,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,sCAAsC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,aAAa,EAMlD,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AAEtC,8DAA8D;AAC9D,eAAO,MAAM,QAAQ,GAAI,OAAO,aAAa,KAAG,MAA6F,CAAC;AAE9I,eAAO,MAAM,UAAU,KAAK,CAAC;AAC7B,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,gBAAoB,CAAC;AACpD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAGzC,uHAAuH;AACvH,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBANL,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,iBAAiB,EAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,QAAQ,EAChB,GAAG,EAAE,WAAW,EAChB,KAAK,CAAC,EAAE,cAAc,YAAA,EACtB,IAAI,CAAC,EAAE,IAAI,YAAA;IAGxB,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;IAK1C,gIAAgI;IAC1H,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlC;;;OAGG;IACG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;CAiEtE"}
|
|
@@ -14,6 +14,8 @@ export const DEFAULT_CURRENCY = 'USD';
|
|
|
14
14
|
/** How likely a deal in a stage is to be won, from 0 to 1. */
|
|
15
15
|
export const chanceOf = (stage) => (stage.kind === 'won' ? 1 : stage.kind === 'lost' ? 0 : (stage.chance ?? 50) / 100);
|
|
16
16
|
export const MAX_STAGES = 12;
|
|
17
|
+
/** The largest monthly target, as for a deal's worth. */
|
|
18
|
+
export const MAX_MONTHLY_TARGET = 1_000_000_000_000;
|
|
17
19
|
export const MAX_STAGE_LABEL_LENGTH = 40;
|
|
18
20
|
const KINDS = ['open', 'won', 'lost'];
|
|
19
21
|
/** Owns the pipeline: the stages a contact moves through, which a site may rename, reorder, add to and remove from. */
|
|
@@ -94,12 +96,22 @@ export class PipelineService {
|
|
|
94
96
|
if (!assignTo.every(may))
|
|
95
97
|
issues.push({ path: ['assignTo'], message: 'Choose people on the team who may read contacts.' });
|
|
96
98
|
}
|
|
99
|
+
const monthlyTarget = changes.monthlyTarget === undefined ? current.monthlyTarget : (changes.monthlyTarget ?? undefined);
|
|
100
|
+
if (monthlyTarget !== undefined && !(Number.isInteger(monthlyTarget) && monthlyTarget > 0 && monthlyTarget <= MAX_MONTHLY_TARGET)) {
|
|
101
|
+
issues.push({ path: ['monthlyTarget'], message: 'Give a target as a whole number above 0, or leave it empty for none.' });
|
|
102
|
+
}
|
|
97
103
|
if (issues.length > 0)
|
|
98
104
|
throw new ValidationError(issues.length === 1 ? 'One stage needs another look.' : `${issues.length} things about the stages need another look.`, issues);
|
|
99
105
|
const first = stages[0];
|
|
100
106
|
if (!first)
|
|
101
107
|
throw new ConflictError('A pipeline needs at least one stage.');
|
|
102
|
-
const pipeline = await this.store.save({
|
|
108
|
+
const pipeline = await this.store.save({
|
|
109
|
+
stages,
|
|
110
|
+
...(currency !== undefined && { currency }),
|
|
111
|
+
...(assignTo !== undefined && assignTo.length > 0 && { assignTo }),
|
|
112
|
+
...(monthlyTarget !== undefined && { monthlyTarget }),
|
|
113
|
+
revision: current.revision + 1,
|
|
114
|
+
}, current.revision === 0 ? null : current.revision);
|
|
103
115
|
for (const stage of current.stages) {
|
|
104
116
|
if (seen.has(stage.id))
|
|
105
117
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-service.js","sourceRoot":"","sources":["../../src/services/pipeline-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAwB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline-service.js","sourceRoot":"","sources":["../../src/services/pipeline-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,10 @@ export interface NewContentType {
|
|
|
23
23
|
readonly sections?: readonly NewSection[];
|
|
24
24
|
/** Whether a deal can be about one of its entries. Left out, what the editor chose stays. */
|
|
25
25
|
readonly forDeals?: boolean;
|
|
26
|
+
/** For a single page that is part of the site's setup: the editor shows it under Settings. Left out, it stays as it is. */
|
|
27
|
+
readonly inSettings?: boolean;
|
|
28
|
+
/** The field of such a page that holds what the site is called, by key: `name`. */
|
|
29
|
+
readonly siteNameField?: string;
|
|
26
30
|
}
|
|
27
31
|
/** What can be changed about a content type itself. Its key stays: code and addresses use it. */
|
|
28
32
|
export interface ContentTypeChanges {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-service.d.ts","sourceRoot":"","sources":["../../src/services/schema-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,gGAAgG;IAChG,QAAQ,CAAC,oBAAoB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IACtC,oGAAoG;IACpG,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,8FAA8F;IAC9F,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,iFAAiF;IACjF,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAC1C,6FAA6F;IAC7F,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-service.d.ts","sourceRoot":"","sources":["../../src/services/schema-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -258,7 +258,14 @@ export class SchemaService {
|
|
|
258
258
|
}
|
|
259
259
|
/** A type with a description applied to it: its fields, what entries are called by, and its layout. */
|
|
260
260
|
described(type, input) {
|
|
261
|
-
const { titlePath: _title, list: _list, sections: _sections, urlPattern: _url, localizedUrlPatterns: _urls, forDeals, ...rest } = type;
|
|
261
|
+
const { titlePath: _title, list: _list, sections: _sections, urlPattern: _url, localizedUrlPatterns: _urls, forDeals, inSettings: wasInSettings, siteNamePath: _name, ...rest } = type;
|
|
262
|
+
const inSettings = input.inSettings ?? wasInSettings === true;
|
|
263
|
+
if ((inSettings || input.siteNameField !== undefined) && type.kind !== 'single') {
|
|
264
|
+
throw new ValidationError(`Only a single page can be part of the settings, and "${type.key}" is a collection. Leave \`inSettings\` and \`siteNameField\` out of it.`, [{ path: ['inSettings'], message: 'Only a single page can be part of the settings.' }]);
|
|
265
|
+
}
|
|
266
|
+
if (input.siteNameField !== undefined && !inSettings) {
|
|
267
|
+
throw new ValidationError(`"${type.key}" names the field that holds the site's name, so it must also say \`inSettings: true\`.`, [{ path: ['siteNameField'], message: 'Say `inSettings: true` as well.' }]);
|
|
268
|
+
}
|
|
262
269
|
const fields = defineFields(input.fields ?? [], type.fields, this.context);
|
|
263
270
|
const live = liveFields(fields);
|
|
264
271
|
const sections = (input.sections ?? []).map((section) => ({
|
|
@@ -282,6 +289,8 @@ export class SchemaService {
|
|
|
282
289
|
}),
|
|
283
290
|
...(sections.length > 0 && { sections }),
|
|
284
291
|
...((input.forDeals ?? forDeals === true) && { forDeals: true }),
|
|
292
|
+
...(inSettings && { inSettings: true }),
|
|
293
|
+
...(inSettings && input.siteNameField !== undefined && { siteNamePath: this.pathOf(live, input.siteNameField, 'the site name field') }),
|
|
285
294
|
};
|
|
286
295
|
}
|
|
287
296
|
/** The ids along a dotted key path, such as `address.street`. */
|