@antelopejs/dms-mailing 0.7.1 → 0.9.0
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/README.md +46 -31
- package/dist/automation/email-event-trigger.d.ts +2 -2
- package/dist/automation/send-template-action.d.ts +11 -3
- package/dist/automation/send-template-action.js +1 -1
- package/dist/automation/send-template-action.js.map +1 -1
- package/dist/crons/jobs.d.ts +1 -1
- package/dist/data/body.d.ts +2 -1
- package/dist/data/body.js +4 -2
- package/dist/data/body.js.map +1 -1
- package/dist/data/read-only-routes.d.ts +4 -4
- package/dist/data/sends-table.d.ts +4 -4
- package/dist/data/suppressions-table.d.ts +4 -4
- package/dist/data/templates-table.d.ts +35 -12
- package/dist/data/templates-table.js +30 -24
- package/dist/data/templates-table.js.map +1 -1
- package/dist/data-types/categories-type.d.ts +1 -2
- package/dist/data-types/categories-type.js +3 -5
- package/dist/data-types/categories-type.js.map +1 -1
- package/dist/data-types/category-type.d.ts +1 -2
- package/dist/data-types/category-type.js +3 -5
- package/dist/data-types/category-type.js.map +1 -1
- package/dist/db/models/send-events.model.d.ts +7 -5
- package/dist/db/models/sends.model.d.ts +7 -5
- package/dist/db/models/sends.model.js.map +1 -1
- package/dist/db/models/settings.model.d.ts +7 -5
- package/dist/db/models/suppressions.model.d.ts +7 -5
- package/dist/db/models/template-versions.model.d.ts +7 -5
- package/dist/db/models/template-versions.model.js +4 -3
- package/dist/db/models/template-versions.model.js.map +1 -1
- package/dist/db/models/templates.model.d.ts +7 -5
- package/dist/db/models/templates.model.js +2 -1
- package/dist/db/models/templates.model.js.map +1 -1
- package/dist/db/models/webhook-status.model.d.ts +7 -5
- package/dist/db/tables/templates.table.js.map +1 -1
- package/dist/engine/changes.js +8 -18
- package/dist/engine/changes.js.map +1 -1
- package/dist/engine/conditions.d.ts +2 -1
- package/dist/engine/conditions.js +5 -5
- package/dist/engine/conditions.js.map +1 -1
- package/dist/engine/coverage.d.ts +2 -1
- package/dist/engine/coverage.js.map +1 -1
- package/dist/engine/fallback-html.js +8 -8
- package/dist/engine/fallback-html.js.map +1 -1
- package/dist/engine/formats.d.ts +4 -6
- package/dist/engine/formats.js +22 -8
- package/dist/engine/formats.js.map +1 -1
- package/dist/engine/paths.d.ts +4 -2
- package/dist/engine/paths.js +16 -5
- package/dist/engine/paths.js.map +1 -1
- package/dist/engine/plain-text.js +2 -4
- package/dist/engine/plain-text.js.map +1 -1
- package/dist/engine/resolve.d.ts +2 -1
- package/dist/engine/resolve.js +1 -1
- package/dist/engine/resolve.js.map +1 -1
- package/dist/engine/system-variables.d.ts +2 -1
- package/dist/engine/system-variables.js +1 -1
- package/dist/engine/system-variables.js.map +1 -1
- package/dist/engine/tokens.d.ts +2 -1
- package/dist/engine/tokens.js.map +1 -1
- package/dist/hooks/tenant-export.js +10 -9
- package/dist/hooks/tenant-export.js.map +1 -1
- package/dist/pages/sends.js.map +1 -1
- package/dist/pages/templates.js +3 -1
- package/dist/pages/templates.js.map +1 -1
- package/dist/pages/toolbar.js.map +1 -1
- package/dist/routes/events.js +6 -4
- package/dist/routes/events.js.map +1 -1
- package/dist/routes/index.d.ts +1 -0
- package/dist/routes/index.js +1 -0
- package/dist/routes/index.js.map +1 -1
- package/dist/routes/metrics.js +31 -31
- package/dist/routes/metrics.js.map +1 -1
- package/dist/routes/period.js +5 -5
- package/dist/routes/period.js.map +1 -1
- package/dist/routes/sends.js +4 -5
- package/dist/routes/sends.js.map +1 -1
- package/dist/routes/settings.d.ts +1 -1
- package/dist/routes/settings.js +16 -14
- package/dist/routes/settings.js.map +1 -1
- package/dist/routes/suppressions.js +9 -6
- package/dist/routes/suppressions.js.map +1 -1
- package/dist/routes/template-content.d.ts +27 -0
- package/dist/routes/template-content.js +3 -0
- package/dist/routes/template-content.js.map +1 -0
- package/dist/routes/templates.d.ts +7 -30
- package/dist/routes/templates.js +7 -6
- package/dist/routes/templates.js.map +1 -1
- package/dist/routes/zod-json.d.ts +3 -0
- package/dist/routes/zod-json.js +21 -0
- package/dist/routes/zod-json.js.map +1 -0
- package/dist/services/attention.js +16 -8
- package/dist/services/attention.js.map +1 -1
- package/dist/services/catalog.js +4 -2
- package/dist/services/catalog.js.map +1 -1
- package/dist/services/categories.js +6 -6
- package/dist/services/categories.js.map +1 -1
- package/dist/services/checked-send.js +16 -9
- package/dist/services/checked-send.js.map +1 -1
- package/dist/services/declaration-error.d.ts +1 -1
- package/dist/services/declaration-error.js.map +1 -1
- package/dist/services/declarations.js +4 -1
- package/dist/services/declarations.js.map +1 -1
- package/dist/services/events.js +13 -7
- package/dist/services/events.js.map +1 -1
- package/dist/services/localized-text.d.ts +2 -1
- package/dist/services/localized-text.js +2 -1
- package/dist/services/localized-text.js.map +1 -1
- package/dist/services/metrics.js +2 -5
- package/dist/services/metrics.js.map +1 -1
- package/dist/services/render.js.map +1 -1
- package/dist/services/send-import.js +7 -3
- package/dist/services/send-import.js.map +1 -1
- package/dist/services/send.js +7 -7
- package/dist/services/send.js.map +1 -1
- package/dist/services/settings.d.ts +4 -2
- package/dist/services/settings.js +5 -4
- package/dist/services/settings.js.map +1 -1
- package/dist/services/starters.d.ts +3 -2
- package/dist/services/starters.js +5 -5
- package/dist/services/starters.js.map +1 -1
- package/dist/services/template-stats.js +5 -2
- package/dist/services/template-stats.js.map +1 -1
- package/dist/services/templates.d.ts +2 -1
- package/dist/services/templates.js +8 -4
- package/dist/services/templates.js.map +1 -1
- package/dist/services/webhook-status.d.ts +2 -2
- package/dist/services/webhook-status.js +6 -4
- package/dist/services/webhook-status.js.map +1 -1
- package/dist/types/json.d.ts +1 -0
- package/dist/types/json.js +3 -0
- package/dist/types/json.js.map +1 -0
- package/dist/types/settings.d.ts +2 -2
- package/dist/validation/declarations.schema.d.ts +44 -44
- package/dist/validation/declarations.schema.js +6 -5
- package/dist/validation/declarations.schema.js.map +1 -1
- package/dist/validation/guards.d.ts +3 -0
- package/dist/validation/guards.js +15 -0
- package/dist/validation/guards.js.map +1 -0
- package/dist/validation/json.d.ts +5 -0
- package/dist/validation/json.js +54 -0
- package/dist/validation/json.js.map +1 -0
- package/dist/validation/json.schema.d.ts +2 -0
- package/dist/validation/json.schema.js +9 -0
- package/dist/validation/json.schema.js.map +1 -0
- package/dist/validation/send-event-type.schema.d.ts +2 -0
- package/dist/validation/send-event-type.schema.js +11 -0
- package/dist/validation/send-event-type.schema.js.map +1 -0
- package/dist/validation/settings.schema.js +1 -1
- package/dist/validation/settings.schema.js.map +1 -1
- package/dist/validation/templates.schema.d.ts +44 -42
- package/dist/validation/templates.schema.js +4 -3
- package/dist/validation/templates.schema.js.map +1 -1
- package/frontend-vue/app/build/components/TemplateDrawerFooter.vue +45 -0
- package/frontend-vue/app/build/components/TemplateDrawerPerformance.vue +102 -0
- package/frontend-vue/app/build/components/TemplateDrawerVariables.vue +110 -0
- package/frontend-vue/app/build/composables/useDrawerStats.ts +78 -0
- package/frontend-vue/app/components/DuplicateModal.vue +3 -11
- package/frontend-vue/app/components/FixAddressModal.vue +2 -1
- package/frontend-vue/app/components/NewTemplateModal.vue +3 -11
- package/frontend-vue/app/components/RealSendModal.vue +6 -17
- package/frontend-vue/app/components/RenderingModal.vue +2 -1
- package/frontend-vue/app/components/SendDrawer.vue +5 -4
- package/frontend-vue/app/components/StarterGallery.vue +3 -11
- package/frontend-vue/app/components/TemplateDrawer.vue +40 -269
- package/frontend-vue/app/components/TestSendModal.vue +7 -18
- package/frontend-vue/app/components/VersionHistory.vue +2 -7
- package/frontend-vue/app/components/WebhookStatus.vue +2 -1
- package/frontend-vue/app/components/editor/EditorWorkspace.vue +2 -7
- package/frontend-vue/build/backend-boundary.ts +122 -0
- package/frontend-vue/dms.frontend.build.ts +7 -0
- package/frontend-vue/eslint.config.mjs +13 -0
- package/frontend-vue/package.json +4 -2
- package/frontend-vue/pnpm-lock.yaml +250 -61
- package/frontend-vue/tests/backend-boundary.test.ts +203 -0
- package/frontend-vue/tests/dnd.test.ts +1 -2
- package/frontend-vue/tests/editor-block-list.test.ts +136 -53
- package/frontend-vue/tests/helpers/auth-fetch.ts +123 -0
- package/frontend-vue/tests/helpers/nuxt-globals.ts +17 -1
- package/frontend-vue/tests/new-template-modal.test.ts +41 -6
- package/frontend-vue/tests/page-reads.test.ts +26 -6
- package/frontend-vue/tests/send-actions.test.ts +0 -1
- package/frontend-vue/tests/send-drawer.test.ts +2 -6
- package/frontend-vue/tests/send-modals.test.ts +8 -5
- package/frontend-vue/tests/sortable-list.test.ts +54 -62
- package/frontend-vue/tests/suppression.test.ts +1 -2
- package/frontend-vue/tests/template-drawer.test.ts +27 -18
- package/frontend-vue/tests/template-gallery.test.ts +7 -5
- package/frontend-vue/tests/template-preview-frame.test.ts +2 -5
- package/package.json +16 -20
- package/skills/dms-mailing/SKILL.md +1 -1
- package/skills/dms-mailing/cases.json +49 -0
- package/src/automation/email-event-trigger.ts +2 -2
- package/src/automation/send-template-action.ts +33 -14
- package/src/crons/jobs.ts +1 -1
- package/src/data/body.ts +7 -3
- package/src/data/templates-table.ts +55 -56
- package/src/data-types/categories-type.ts +2 -2
- package/src/data-types/category-type.ts +2 -2
- package/src/db/models/sends.model.ts +2 -2
- package/src/db/models/template-versions.model.ts +10 -4
- package/src/db/models/templates.model.ts +6 -3
- package/src/db/tables/templates.table.ts +1 -1
- package/src/engine/changes.ts +11 -28
- package/src/engine/conditions.ts +14 -8
- package/src/engine/coverage.ts +2 -1
- package/src/engine/fallback-html.ts +13 -13
- package/src/engine/formats.ts +35 -21
- package/src/engine/paths.ts +41 -7
- package/src/engine/plain-text.ts +2 -4
- package/src/engine/resolve.ts +12 -4
- package/src/engine/system-variables.ts +6 -4
- package/src/engine/tokens.ts +3 -3
- package/src/hooks/tenant-export.ts +11 -13
- package/src/pages/sends.ts +5 -3
- package/src/pages/templates.ts +4 -2
- package/src/pages/toolbar.ts +4 -2
- package/src/routes/events.ts +10 -10
- package/src/routes/index.ts +1 -0
- package/src/routes/metrics.ts +35 -33
- package/src/routes/period.ts +5 -5
- package/src/routes/sends.ts +23 -26
- package/src/routes/settings.ts +21 -17
- package/src/routes/suppressions.ts +12 -8
- package/src/routes/template-content.ts +45 -0
- package/src/routes/templates.ts +16 -49
- package/src/routes/zod-json.ts +28 -0
- package/src/services/attention.ts +20 -18
- package/src/services/catalog.ts +4 -8
- package/src/services/categories.ts +6 -6
- package/src/services/checked-send.ts +17 -19
- package/src/services/declaration-error.ts +1 -1
- package/src/services/declarations.ts +7 -6
- package/src/services/events.ts +18 -13
- package/src/services/localized-text.ts +4 -2
- package/src/services/metrics.ts +5 -7
- package/src/services/notify.ts +1 -1
- package/src/services/render.ts +5 -1
- package/src/services/send-import.ts +16 -11
- package/src/services/send.ts +10 -13
- package/src/services/settings.ts +17 -16
- package/src/services/starters.ts +12 -8
- package/src/services/template-stats.ts +11 -4
- package/src/services/templates.ts +24 -15
- package/src/services/webhook-status.ts +13 -8
- package/src/types/json.ts +1 -0
- package/src/types/settings.ts +2 -2
- package/src/validation/declarations.schema.ts +6 -5
- package/src/validation/guards.ts +17 -0
- package/src/validation/json.schema.ts +7 -0
- package/src/validation/json.ts +66 -0
- package/src/validation/send-event-type.schema.ts +10 -0
- package/src/validation/settings.schema.ts +7 -2
- package/src/validation/templates.schema.ts +9 -4
- package/frontend-vue/tests/i18n-editor.test.ts +0 -50
- package/frontend-vue/tests/i18n.test.ts +0 -138
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.zodIssuesJson = zodIssuesJson;
|
|
4
|
+
function isJson(value) {
|
|
5
|
+
if (value === null ||
|
|
6
|
+
typeof value === "string" ||
|
|
7
|
+
typeof value === "number" ||
|
|
8
|
+
typeof value === "boolean") {
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
if (Array.isArray(value))
|
|
12
|
+
return value.every(isJson);
|
|
13
|
+
return typeof value === "object" && Object.values(value).every(isJson);
|
|
14
|
+
}
|
|
15
|
+
function zodIssuesJson(issues) {
|
|
16
|
+
const json = JSON.parse(JSON.stringify(issues));
|
|
17
|
+
if (!isJson(json))
|
|
18
|
+
throw new TypeError("zod issues did not serialize to JSON");
|
|
19
|
+
return json;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=zod-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zod-json.js","sourceRoot":"","sources":["../../src/routes/zod-json.ts"],"names":[],"mappings":";;AAsBA,sCAKC;AAxBD,SAAS,MAAM,CAAC,KAAc;IAC5B,IACE,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS,EAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACzE,CAAC;AAQD,SAAgB,aAAa,CAAC,MAA2B;IACvD,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACf,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -8,6 +8,7 @@ exports.templateAttentionReasons = templateAttentionReasons;
|
|
|
8
8
|
const constants_1 = require("../constants");
|
|
9
9
|
const types_1 = require("../types");
|
|
10
10
|
const metrics_1 = require("./metrics");
|
|
11
|
+
const guards_1 = require("../validation/guards");
|
|
11
12
|
const TEMPLATES_PAGE = "/modules/mailing/templates";
|
|
12
13
|
const TEMPLATES_ATTENTION_PAGE = `${TEMPLATES_PAGE}?tab=attention`;
|
|
13
14
|
const SENDS_PAGE = "/modules/mailing/sends";
|
|
@@ -240,7 +241,7 @@ const COUNT_PARAM = "count";
|
|
|
240
241
|
function feedParams(item) {
|
|
241
242
|
const params = { ...item.params };
|
|
242
243
|
const count = item.count ?? item.params?.[COUNT_PARAM];
|
|
243
|
-
if (
|
|
244
|
+
if ((0, guards_1.isNumber)(count)) {
|
|
244
245
|
params[COUNT_PARAM] = { type: "count", value: count };
|
|
245
246
|
}
|
|
246
247
|
return Object.keys(params).length ? params : undefined;
|
|
@@ -257,13 +258,20 @@ function attentionFeedItem(item) {
|
|
|
257
258
|
to: item.to,
|
|
258
259
|
};
|
|
259
260
|
}
|
|
260
|
-
const TEMPLATE_ATTENTION_RULES =
|
|
261
|
-
stale_draft
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
261
|
+
const TEMPLATE_ATTENTION_RULES = new Map([
|
|
262
|
+
["stale_draft", (template, context) => isStaleDraft(template, context.now)],
|
|
263
|
+
[
|
|
264
|
+
"never_sent",
|
|
265
|
+
(template, context) => template.status === "live" && !context.sentSlugs.has(template.slug),
|
|
266
|
+
],
|
|
267
|
+
[
|
|
268
|
+
"missing_locale",
|
|
269
|
+
(template, context) => isMissingLocale(template, context.knownLocales),
|
|
270
|
+
],
|
|
271
|
+
]);
|
|
266
272
|
function templateAttentionReasons(template, context) {
|
|
267
|
-
return
|
|
273
|
+
return [...TEMPLATE_ATTENTION_RULES]
|
|
274
|
+
.filter(([, applies]) => applies(template, context))
|
|
275
|
+
.map(([reason]) => reason);
|
|
268
276
|
}
|
|
269
277
|
//# sourceMappingURL=attention.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attention.js","sourceRoot":"","sources":["../../src/services/attention.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"attention.js","sourceRoot":"","sources":["../../src/services/attention.ts"],"names":[],"mappings":"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"}
|
package/dist/services/catalog.js
CHANGED
|
@@ -7,12 +7,14 @@ exports.moduleVersion = moduleVersion;
|
|
|
7
7
|
exports.catalogStatus = catalogStatus;
|
|
8
8
|
const node_fs_1 = require("node:fs");
|
|
9
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
|
+
const guards_1 = require("../validation/guards");
|
|
11
|
+
const json_1 = require("../validation/json");
|
|
10
12
|
const provider_1 = require("./provider");
|
|
11
13
|
const PACKAGE_JSON_PATH = node_path_1.default.join(__dirname, "../../package.json");
|
|
12
14
|
function moduleVersion() {
|
|
13
15
|
try {
|
|
14
|
-
const manifest =
|
|
15
|
-
return manifest.version;
|
|
16
|
+
const manifest = (0, json_1.parseJsonObject)((0, node_fs_1.readFileSync)(PACKAGE_JSON_PATH, "utf8"));
|
|
17
|
+
return (0, guards_1.isText)(manifest.version) ? manifest.version : undefined;
|
|
16
18
|
}
|
|
17
19
|
catch {
|
|
18
20
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/services/catalog.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/services/catalog.ts"],"names":[],"mappings":";;;;;AAUA,sCAOC;AAGD,sCAGC;AAvBD,qCAAuC;AACvC,0DAA6B;AAE7B,iDAA8C;AAC9C,6CAAqD;AACrD,yCAA8C;AAE9C,MAAM,iBAAiB,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGrE,SAAgB,aAAa;IAC3B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,sBAAe,EAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,OAAO,IAAA,eAAM,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAGM,KAAK,UAAU,aAAa;IACjC,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAC9C,OAAO,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;AAC7C,CAAC"}
|
|
@@ -22,11 +22,11 @@ function categoryMoves(entries) {
|
|
|
22
22
|
}
|
|
23
23
|
function reassignRemovedCategories(templates, categories, moves = new Map()) {
|
|
24
24
|
const kept = new Set(categories.map((category) => category.id));
|
|
25
|
-
return templates
|
|
26
|
-
|
|
27
|
-
.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
})
|
|
25
|
+
return templates.flatMap((template) => {
|
|
26
|
+
const { category } = template;
|
|
27
|
+
return category && !kept.has(category)
|
|
28
|
+
? [{ templateId: template._id, category: moves.get(category) ?? "" }]
|
|
29
|
+
: [];
|
|
30
|
+
});
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=categories.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"categories.js","sourceRoot":"","sources":["../../src/services/categories.ts"],"names":[],"mappings":";;AAMA,oCASC;AAGD,wCAIC;AAGD,sCAMC;AAaD,8DAYC;AArDD,qDAA0C;AAG1C,SAAgB,YAAY,CAC1B,UAA8B,EAC9B,MAAc;IAEd,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,EAAE;QACF,KAAK,EAAE,IAAA,uBAAM,EAAC,KAAK,EAAE,MAAM,CAAC;QAC5B,IAAI;KACL,CAAC,CAAC,CAAC;AACN,CAAC;AAGD,SAAgB,cAAc,CAAC,OAAwB;IACrD,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;SAC7C,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAGD,SAAgB,aAAa,CAAC,OAAwB;IACpD,OAAO,IAAI,GAAG,CACZ,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACxB,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAU,CAAC,CACtE,CACF,CAAC;AACJ,CAAC;AAaD,SAAgB,yBAAyB,CACvC,SAA4B,EAC5B,UAA8B,EAC9B,QAAqC,IAAI,GAAG,EAAE;IAE9C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,OAAO,SAAS
|
|
1
|
+
{"version":3,"file":"categories.js","sourceRoot":"","sources":["../../src/services/categories.ts"],"names":[],"mappings":";;AAMA,oCASC;AAGD,wCAIC;AAGD,sCAMC;AAaD,8DAYC;AArDD,qDAA0C;AAG1C,SAAgB,YAAY,CAC1B,UAA8B,EAC9B,MAAc;IAEd,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,EAAE;QACF,KAAK,EAAE,IAAA,uBAAM,EAAC,KAAK,EAAE,MAAM,CAAC;QAC5B,IAAI;KACL,CAAC,CAAC,CAAC;AACN,CAAC;AAGD,SAAgB,cAAc,CAAC,OAAwB;IACrD,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;SAC7C,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAGD,SAAgB,aAAa,CAAC,OAAwB;IACpD,OAAO,IAAI,GAAG,CACZ,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACxB,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAU,CAAC,CACtE,CACF,CAAC;AACJ,CAAC;AAaD,SAAgB,yBAAyB,CACvC,SAA4B,EAC5B,UAA8B,EAC9B,QAAqC,IAAI,GAAG,EAAE;IAE9C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QAC9B,OAAO,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,CAAC,CAAC,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -6,9 +6,10 @@ exports.sendUnlessSuppressed = sendUnlessSuppressed;
|
|
|
6
6
|
const db_1 = require("../db");
|
|
7
7
|
const send_1 = require("./send");
|
|
8
8
|
const suppressions_1 = require("./suppressions");
|
|
9
|
+
const guards_1 = require("../validation/guards");
|
|
9
10
|
exports.SUPPRESSED_ERROR_PREFIX = "$dms_mailing.errors.suppressed.";
|
|
10
11
|
const NO_LATENCY = null;
|
|
11
|
-
const addressOf = (to) =>
|
|
12
|
+
const addressOf = (to) => ((0, guards_1.isText)(to) ? to : to.email);
|
|
12
13
|
const toRecipients = (to) => Array.isArray(to) ? to : [to];
|
|
13
14
|
function suppressedError(row) {
|
|
14
15
|
return `${exports.SUPPRESSED_ERROR_PREFIX}${row.reason}`;
|
|
@@ -27,9 +28,9 @@ function suppressedMessage(to, row) {
|
|
|
27
28
|
outcome: { latencyMs: NO_LATENCY, error: suppressedError(row) },
|
|
28
29
|
};
|
|
29
30
|
}
|
|
30
|
-
async function recordSuppressed(slug, params, blocked
|
|
31
|
+
async function recordSuppressed(slug, params, blocked) {
|
|
31
32
|
const prepared = await (0, send_1.prepare)(params.tenantId, slug, params);
|
|
32
|
-
const messages = blocked.map((to) => suppressedMessage(to,
|
|
33
|
+
const messages = blocked.map(({ to, row }) => suppressedMessage(to, row));
|
|
33
34
|
return (0, send_1.recordAll)(prepared, params, messages);
|
|
34
35
|
}
|
|
35
36
|
async function sendAllowed(slug, params, allowed) {
|
|
@@ -43,12 +44,18 @@ async function sendUnlessSuppressed(slug, params) {
|
|
|
43
44
|
const rows = await blockedRecipients(params, recipients);
|
|
44
45
|
if (!rows.size)
|
|
45
46
|
return (0, send_1.sendTemplate)(slug, params);
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
const
|
|
47
|
+
const rowOf = (to) => rows.get((0, db_1.normalizeAddress)(addressOf(to)));
|
|
48
|
+
const isBlocked = (to) => rowOf(to) !== undefined;
|
|
49
|
+
const blocked = recipients.flatMap((to) => {
|
|
50
|
+
const row = rowOf(to);
|
|
51
|
+
return row ? [{ to, row }] : [];
|
|
52
|
+
});
|
|
53
|
+
const suppressedResults = await recordSuppressed(slug, params, blocked);
|
|
49
54
|
const sentResults = await sendAllowed(slug, params, recipients.filter((to) => !isBlocked(to)));
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
55
|
+
let nextSuppressed = 0;
|
|
56
|
+
let nextSent = 0;
|
|
57
|
+
return (0, send_1.aggregateResults)(recipients.map((to) => isBlocked(to)
|
|
58
|
+
? suppressedResults[nextSuppressed++]
|
|
59
|
+
: sentResults[nextSent++]));
|
|
53
60
|
}
|
|
54
61
|
//# sourceMappingURL=checked-send.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checked-send.js","sourceRoot":"","sources":["../../src/services/checked-send.ts"],"names":[],"mappings":";;;AAiCA,0CAEC;
|
|
1
|
+
{"version":3,"file":"checked-send.js","sourceRoot":"","sources":["../../src/services/checked-send.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,4 @@ export declare class DeclarationError extends Error {
|
|
|
3
3
|
readonly code: string;
|
|
4
4
|
constructor(code: string, message: string);
|
|
5
5
|
}
|
|
6
|
-
export declare function parseDeclared<Output, Input>(schema: ZodType<Output, ZodTypeDef, Input>, input:
|
|
6
|
+
export declare function parseDeclared<Output, Input>(schema: ZodType<Output, ZodTypeDef, Input>, input: Input, code: string, subject: string): Output;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration-error.js","sourceRoot":"","sources":["../../src/services/declaration-error.ts"],"names":[],"mappings":";;;AA0BA,sCAYC;AA/BD,MAAa,gBAAiB,SAAQ,KAAK;IAEvB;IADlB,YACkB,IAAY,EAC5B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHC,SAAI,GAAJ,IAAI,CAAQ;IAI9B,CAAC;CACF;AAPD,4CAOC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC;AAC7B,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAS,cAAc,CAAC,KAAe;IACrC,OAAO,KAAK,CAAC,MAAM;SAChB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;SACxE,IAAI,CAAC,eAAe,CAAC,CAAC;AAC3B,CAAC;AAGD,SAAgB,aAAa,CAC3B,MAA0C,EAC1C,
|
|
1
|
+
{"version":3,"file":"declaration-error.js","sourceRoot":"","sources":["../../src/services/declaration-error.ts"],"names":[],"mappings":";;;AA0BA,sCAYC;AA/BD,MAAa,gBAAiB,SAAQ,KAAK;IAEvB;IADlB,YACkB,IAAY,EAC5B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHC,SAAI,GAAJ,IAAI,CAAQ;IAI9B,CAAC;CACF;AAPD,4CAOC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC;AAC7B,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAS,cAAc,CAAC,KAAe;IACrC,OAAO,KAAK,CAAC,MAAM;SAChB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;SACxE,IAAI,CAAC,eAAe,CAAC,CAAC;AAC3B,CAAC;AAGD,SAAgB,aAAa,CAC3B,MAA0C,EAC1C,KAAY,EACZ,IAAY,EACZ,OAAe;IAEf,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC;IACvC,MAAM,IAAI,gBAAgB,CACxB,IAAI,EACJ,WAAW,OAAO,KAAK,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACtD,CAAC;AACJ,CAAC"}
|
|
@@ -73,7 +73,10 @@ async function declareTemplate(input) {
|
|
|
73
73
|
const created = await createDeclared(declaration);
|
|
74
74
|
if (created)
|
|
75
75
|
return resultOf(created, "created");
|
|
76
|
-
|
|
76
|
+
const winner = await model.getBySlug(slug);
|
|
77
|
+
if (!winner)
|
|
78
|
+
throw new Error(`Template "${slug}" disappeared before it was read`);
|
|
79
|
+
return resultOf(winner, "kept");
|
|
77
80
|
}
|
|
78
81
|
const categoryQueues = new Map();
|
|
79
82
|
function inTenantQueue(tenantId, task) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../src/services/declarations.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../src/services/declarations.ts"],"names":[],"mappings":"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"}
|
package/dist/services/events.js
CHANGED
|
@@ -15,6 +15,8 @@ const db_1 = require("../db");
|
|
|
15
15
|
const realtime_1 = require("../realtime");
|
|
16
16
|
const notify_1 = require("./notify");
|
|
17
17
|
const suppressions_1 = require("./suppressions");
|
|
18
|
+
const guards_1 = require("../validation/guards");
|
|
19
|
+
const json_1 = require("../validation/json");
|
|
18
20
|
const RANK = {
|
|
19
21
|
queued: 0,
|
|
20
22
|
sent: 1,
|
|
@@ -38,12 +40,15 @@ const CLEARED_ERROR = "";
|
|
|
38
40
|
const SOFT_BOUNCE_TYPE = /soft|transient|temporary/i;
|
|
39
41
|
const HARD_BOUNCE_TYPE = /hard|permanent/i;
|
|
40
42
|
const SOFT_SMTP_ANSWER = /^\s*4\d\d\b|\b4\.\d{1,3}\.\d{1,3}\b/;
|
|
41
|
-
|
|
43
|
+
function textOf(details, key) {
|
|
44
|
+
const value = details?.[key];
|
|
45
|
+
return (0, guards_1.isText)(value) ? value : "";
|
|
46
|
+
}
|
|
42
47
|
function problemReason(event) {
|
|
43
48
|
if (!PROBLEM_EVENTS.has(event.type))
|
|
44
49
|
return undefined;
|
|
45
50
|
const reason = event.details?.reason;
|
|
46
|
-
return
|
|
51
|
+
return (0, guards_1.isText)(reason) && reason ? reason : undefined;
|
|
47
52
|
}
|
|
48
53
|
function overridesStatus(current, next) {
|
|
49
54
|
if (DEFERRABLE_STATUSES.has(current))
|
|
@@ -60,12 +65,12 @@ function applyEvent(current, type) {
|
|
|
60
65
|
return next;
|
|
61
66
|
}
|
|
62
67
|
function isSoftBounce(event) {
|
|
63
|
-
const bounceType = textOf(event.details
|
|
68
|
+
const bounceType = textOf(event.details, "bounceType");
|
|
64
69
|
if (SOFT_BOUNCE_TYPE.test(bounceType))
|
|
65
70
|
return true;
|
|
66
71
|
if (HARD_BOUNCE_TYPE.test(bounceType))
|
|
67
72
|
return false;
|
|
68
|
-
return SOFT_SMTP_ANSWER.test(textOf(event.details
|
|
73
|
+
return SOFT_SMTP_ANSWER.test(textOf(event.details, "reason"));
|
|
69
74
|
}
|
|
70
75
|
function errorAfter(event, previous, next) {
|
|
71
76
|
const reason = problemReason(event);
|
|
@@ -94,12 +99,13 @@ async function publishEmailEvent(payload, send) {
|
|
|
94
99
|
isTest: send.isTest,
|
|
95
100
|
});
|
|
96
101
|
}
|
|
97
|
-
const eventIdOf = (details) => textOf(details
|
|
102
|
+
const eventIdOf = (details) => textOf(details, "eventId");
|
|
98
103
|
function isSameEvent(stored, event) {
|
|
99
104
|
const eventId = eventIdOf(event.details);
|
|
100
105
|
if (eventId) {
|
|
101
106
|
const storedDetails = JSON.parse(stored.json_details || "{}");
|
|
102
|
-
return eventIdOf(storedDetails) ===
|
|
107
|
+
return (eventIdOf((0, json_1.isJsonObject)(storedDetails) ? storedDetails : undefined) ===
|
|
108
|
+
eventId);
|
|
103
109
|
}
|
|
104
110
|
if (!event.at || stored.type !== event.type)
|
|
105
111
|
return false;
|
|
@@ -138,7 +144,7 @@ async function suppressAfterEvent(tenantId, send, event) {
|
|
|
138
144
|
email: send.recipientEmail,
|
|
139
145
|
reason,
|
|
140
146
|
sendId: send._id,
|
|
141
|
-
detail: textOf(event.details
|
|
147
|
+
detail: textOf(event.details, "reason") || undefined,
|
|
142
148
|
});
|
|
143
149
|
}
|
|
144
150
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/services/events.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/services/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import type { IncomingHttpHeaders } from "node:http";
|
|
1
2
|
import type { RequestContext } from "@antelopejs/interface-api";
|
|
2
3
|
import { type LocalizedText } from "@antelopejs/interface-dms-mailing";
|
|
3
4
|
export declare const CONTENT_LANGUAGE_HEADER = "x-content-language";
|
|
4
|
-
export declare function requestLocale(header:
|
|
5
|
+
export declare function requestLocale(header: IncomingHttpHeaders[string]): string;
|
|
5
6
|
export declare function localeOfRequest(ctx: RequestContext): string;
|
|
6
7
|
export declare function textIn(text: LocalizedText | undefined, locale: string): string;
|
|
7
8
|
export declare function withTextIn(text: LocalizedText | undefined, locale: string, value: string): LocalizedText;
|
|
@@ -6,9 +6,10 @@ exports.localeOfRequest = localeOfRequest;
|
|
|
6
6
|
exports.textIn = textIn;
|
|
7
7
|
exports.withTextIn = withTextIn;
|
|
8
8
|
const interface_dms_mailing_1 = require("@antelopejs/interface-dms-mailing");
|
|
9
|
+
const guards_1 = require("../validation/guards");
|
|
9
10
|
exports.CONTENT_LANGUAGE_HEADER = "x-content-language";
|
|
10
11
|
function requestLocale(header) {
|
|
11
|
-
return
|
|
12
|
+
return (0, guards_1.isText)(header) && header.length > 0
|
|
12
13
|
? header
|
|
13
14
|
: interface_dms_mailing_1.LOCALIZED_TEXT_FALLBACK_LOCALE;
|
|
14
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localized-text.js","sourceRoot":"","sources":["../../src/services/localized-text.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"localized-text.js","sourceRoot":"","sources":["../../src/services/localized-text.ts"],"names":[],"mappings":";;;AAiBA,sCAIC;AAGD,0CAEC;AAMD,wBAKC;AAOD,gCAUC;AApDD,6EAG2C;AAC3C,iDAA8C;AAGjC,QAAA,uBAAuB,GAAG,oBAAoB,CAAC;AAQ5D,SAAgB,aAAa,CAAC,MAAmC;IAC/D,OAAO,IAAA,eAAM,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,sDAA8B,CAAC;AACrC,CAAC;AAGD,SAAgB,eAAe,CAAC,GAAmB;IACjD,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,+BAAuB,CAAC,CAAC,CAAC;AACxE,CAAC;AAMD,SAAgB,MAAM,CACpB,IAA+B,EAC/B,MAAc;IAEd,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,sDAA8B,CAAC,IAAI,EAAE,CAAC;AACxE,CAAC;AAOD,SAAgB,UAAU,CACxB,IAA+B,EAC/B,MAAc,EACd,KAAa;IAEb,OAAO;QACL,CAAC,sDAA8B,CAAC,EAAE,KAAK;QACvC,GAAG,IAAI;QACP,CAAC,MAAM,CAAC,EAAE,KAAK;KAChB,CAAC;AACJ,CAAC"}
|
package/dist/services/metrics.js
CHANGED
|
@@ -17,12 +17,9 @@ const AUDIENCE_KEEPS = {
|
|
|
17
17
|
[types_1.BUSINESS_AUDIENCE]: (send) => !send.isTest,
|
|
18
18
|
[types_1.OPERATIONAL_AUDIENCE]: () => true,
|
|
19
19
|
};
|
|
20
|
-
const
|
|
21
|
-
[types_1.BUSINESS_AUDIENCE]: types_1.BUSINESS_AUDIENCE,
|
|
22
|
-
[types_1.OPERATIONAL_AUDIENCE]: types_1.OPERATIONAL_AUDIENCE,
|
|
23
|
-
};
|
|
20
|
+
const isAudience = (raw) => Object.hasOwn(AUDIENCE_KEEPS, raw);
|
|
24
21
|
function readAudience(raw) {
|
|
25
|
-
return
|
|
22
|
+
return raw != null && isAudience(raw) ? raw : types_1.BUSINESS_AUDIENCE;
|
|
26
23
|
}
|
|
27
24
|
const STATS_WINDOW_DAYS = 30;
|
|
28
25
|
function statsWindowStart(now = Date.now()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/services/metrics.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/services/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/services/render.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/services/render.ts"],"names":[],"mappings":";;AAwBA,0CAaC;AArCD,gEAA6D;AAC7D,uEAG+C;AAC/C,sCAAsC;AACtC,4CAAmD;AACnD,sCAA+C;AAS/C,MAAM,oBAAoB,GACxB,IAAA,kCAAoB,EAAoB,+BAAmB,CAAC,CAAC;AAOxD,KAAK,UAAU,eAAe,CACnC,KAAoB,EACpB,MAAc;IAEd,IAAI,CAAC,IAAA,kBAAS,GAAE,CAAC,aAAa;QAAE,OAAO,IAAA,2BAAkB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzE,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,0BAAY,EAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iBAAO,CAAC,IAAI,CACV,0DAA0D,MAAM,CAAC,KAAK,CAAC,EAAE,CAC1E,CAAC;QACF,OAAO,IAAA,2BAAkB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC"}
|
|
@@ -10,6 +10,7 @@ const declaration_error_1 = require("./declaration-error");
|
|
|
10
10
|
const events_1 = require("./events");
|
|
11
11
|
const settings_1 = require("./settings");
|
|
12
12
|
const template_attention_1 = require("./template-attention");
|
|
13
|
+
const guards_1 = require("../validation/guards");
|
|
13
14
|
const IMPORT_SOURCE = "import";
|
|
14
15
|
const ID_LENGTH = 32;
|
|
15
16
|
const DEFAULT_EVENT = "sent";
|
|
@@ -20,7 +21,7 @@ function importedSendIdOf(tenantId, importId) {
|
|
|
20
21
|
.digest("hex")
|
|
21
22
|
.slice(0, ID_LENGTH);
|
|
22
23
|
}
|
|
23
|
-
const addressOf = (to) =>
|
|
24
|
+
const addressOf = (to) => (0, guards_1.isText)(to) ? { email: to } : to;
|
|
24
25
|
function timelineOf(send) {
|
|
25
26
|
if (!send.events.length)
|
|
26
27
|
return [{ type: DEFAULT_EVENT, at: send.sentAt }];
|
|
@@ -30,7 +31,7 @@ function timelineOf(send) {
|
|
|
30
31
|
type: stored.type,
|
|
31
32
|
at: stored.at,
|
|
32
33
|
json_details: JSON.stringify(stored.details ?? {}),
|
|
33
|
-
},
|
|
34
|
+
}, entry));
|
|
34
35
|
if (!repeated)
|
|
35
36
|
timeline.push(entry);
|
|
36
37
|
}
|
|
@@ -83,6 +84,7 @@ function sendRow(id, send, template, locale, activity) {
|
|
|
83
84
|
isSoftBounce: activity.isSoftBounce,
|
|
84
85
|
};
|
|
85
86
|
}
|
|
87
|
+
const missingTemplate = (slug) => new declaration_error_1.DeclarationError("template_not_found", `Imported sends name template "${slug}", which the workspace does not have`);
|
|
86
88
|
async function templatesOf(tenantId, sends) {
|
|
87
89
|
const model = (0, interface_database_decorators_1.GetModel)(db_1.TemplateModel, tenantId);
|
|
88
90
|
const slugs = [...new Set(sends.map((send) => send.templateSlug))];
|
|
@@ -90,7 +92,7 @@ async function templatesOf(tenantId, sends) {
|
|
|
90
92
|
for (const slug of slugs) {
|
|
91
93
|
const template = await model.getBySlug(slug);
|
|
92
94
|
if (!template)
|
|
93
|
-
throw
|
|
95
|
+
throw missingTemplate(slug);
|
|
94
96
|
templates.set(slug, template);
|
|
95
97
|
}
|
|
96
98
|
return templates;
|
|
@@ -120,6 +122,8 @@ async function importSends(input) {
|
|
|
120
122
|
const result = { imported: 0, skipped: 0, sendIds: [] };
|
|
121
123
|
for (const send of sends) {
|
|
122
124
|
const template = templates.get(send.templateSlug);
|
|
125
|
+
if (!template)
|
|
126
|
+
throw missingTemplate(send.templateSlug);
|
|
123
127
|
const { id, isImported } = await importOne(tenantId, send, template, fallbackLocale);
|
|
124
128
|
result.sendIds.push(id);
|
|
125
129
|
if (isImported)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-import.js","sourceRoot":"","sources":["../../src/services/send-import.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"send-import.js","sourceRoot":"","sources":["../../src/services/send-import.ts"],"names":[],"mappings":"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"}
|