@oneuptime/common 12.0.15 → 12.0.16

package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js

@@ -1,15 +1,17 @@
 import axios from "axios";
-import { LinkedInApiVersion, LinkedInConversionsAccessToken, LinkedInPaidSubscriptionConversionId, LinkedInSignUpConversionId, } from "../../../EnvironmentConfig";
+import { LinkedInApiVersion, LinkedInConversionsAccessToken, LinkedInMeetingBookedConversionId, LinkedInPaidSubscriptionConversionId, LinkedInSignUpConversionId, } from "../../../EnvironmentConfig";
 import ConversionUploadProvider from "../ConversionUploadProvider";
+import { MarketingConversionType } from "../../../../Types/Marketing/MarketingConversion";
 const REQUEST_TIMEOUT_MS = 30000;
 // LinkedIn accepts conversions up to 90 days after the interaction.
 const LINKEDIN_MAX_CONVERSION_AGE_IN_DAYS = 90;
 /*
- * LinkedIn Conversions API (api.linkedin.com/rest/conversionEvents) using
- * the li_fat_id first-party click id. Conversion rules are referenced by
- * urn:lla:llaPartnerConversion:{id}. Events are posted one at a time (small
- * volumes); auth-level failures abort the batch for retry, other per-event
- * rejections are recorded as permanent.
+ * LinkedIn Conversions API (api.linkedin.com/rest/conversionEvents) matching
+ * on the li_fat_id first-party click id, a SHA-256 email, or both — LinkedIn
+ * accepts several userIds and resolves whichever it can. Conversion rules are
+ * referenced by urn:lla:llaPartnerConversion:{id}. Events are posted one at a
+ * time (small volumes); auth-level failures abort the batch for retry, other
+ * per-event rejections are recorded as permanent.
  *
  * Note: LinkedIn access tokens expire (typically 60 days) — the token in
  * LINKEDIN_CONVERSIONS_ACCESS_TOKEN must be rotated externally.
@@ -29,9 +31,9 @@ export default class LinkedInProvider extends ConversionUploadProvider {
         return Boolean(LinkedInConversionsAccessToken);
     }
     getProviderSkipReason(conversion) {
-        if (!this.getClickId(conversion, "li_fat_id")) {
+        if (this.getUserIds(conversion).length === 0) {
             return {
-                reason: "No LinkedIn click id (li_fat_id)",
+                reason: "No LinkedIn click id (li_fat_id) and no email to match on",
                 isPermanent: true,
             };
         }
@@ -51,9 +53,36 @@ export default class LinkedInProvider extends ConversionUploadProvider {
         return null;
     }
     getConversionRuleId(conversion) {
-        return this.isSignUp(conversion)
-            ? LinkedInSignUpConversionId
-            : LinkedInPaidSubscriptionConversionId;
+        const mapping = {
+            [MarketingConversionType.SignUp]: LinkedInSignUpConversionId,
+            [MarketingConversionType.MeetingBooked]: LinkedInMeetingBookedConversionId,
+            [MarketingConversionType.PaidSubscription]: LinkedInPaidSubscriptionConversionId,
+        };
+        return this.resolveByConversionType(conversion, mapping) || "";
+    }
+    /*
+     * Every identifier LinkedIn can resolve this person by. Sending both when
+     * both exist raises the match rate; sending only the email is how a demo
+     * booked on one device and a licence signed on another are still joined to
+     * the click that started it.
+     */
+    getUserIds(conversion) {
+        const userIds = [];
+        const clickId = this.getClickId(conversion, "li_fat_id");
+        if (clickId) {
+            userIds.push({
+                idType: "LINKEDIN_FIRST_PARTY_ADS_TRACKING_UUID",
+                idValue: clickId,
+            });
+        }
+        const hashedEmail = this.getHashedEmail(conversion);
+        if (hashedEmail) {
+            userIds.push({
+                idType: "SHA256_EMAIL",
+                idValue: hashedEmail,
+            });
+        }
+        return userIds;
     }
     async upload(conversions) {
         var _a;
@@ -66,12 +95,7 @@ export default class LinkedInProvider extends ConversionUploadProvider {
                 // Dedup key: a retried batch must not double-count conversions.
                 eventId: conversion.id.toString(),
                 user: {
-                    userIds: [
-                        {
-                            idType: "LINKEDIN_FIRST_PARTY_ADS_TRACKING_UUID",
-                            idValue: this.getClickId(conversion, "li_fat_id") || "",
-                        },
-                    ],
+                    userIds: this.getUserIds(conversion),
                 },
             };
             const valueInUSD = this.getValueInUSD(conversion);

package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"LinkedIn.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/LinkedIn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LinkedIn.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/LinkedIn.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/Meta.js

@@ -1,7 +1,7 @@
 import axios from "axios";
-import crypto from "crypto";
 import { MetaConversionsAccessToken, MetaConversionsPixelId, MetaGraphApiVersion, } from "../../../EnvironmentConfig";
 import ConversionUploadProvider from "../ConversionUploadProvider";
+import { MarketingConversionType } from "../../../../Types/Marketing/MarketingConversion";
 const REQUEST_TIMEOUT_MS = 30000;
 // Meta rejects website events older than 7 days at upload time.
 const META_MAX_EVENT_AGE_IN_DAYS = 7;
@@ -11,6 +11,11 @@ const META_MAX_EVENT_AGE_IN_DAYS = 7;
  * per Meta's customer-information matching spec; the raw email never leaves
  * OneUptime. event_id is the conversion row id, so Meta deduplicates
  * retried uploads (and browser-pixel duplicates) server-side.
+ *
+ * An event is uploadable with a click id, a hashed email, or both — Meta
+ * matches on either. Requiring fbclid, as this provider used to, discarded
+ * every conversion whose click id had not survived to the moment of
+ * conversion, which is most of a sales-led funnel.
  */
 export default class MetaProvider extends ConversionUploadProvider {
     constructor() {
@@ -22,9 +27,16 @@ export default class MetaProvider extends ConversionUploadProvider {
         return Boolean(MetaConversionsPixelId && MetaConversionsAccessToken);
     }
     getProviderSkipReason(conversion) {
-        if (!this.getClickId(conversion, "fbclid")) {
+        if (!this.getClickId(conversion, "fbclid") &&
+            !this.getHashedEmail(conversion)) {
             return {
-                reason: "No Meta click id (fbclid)",
+                reason: "No Meta click id (fbclid) and no email to match on",
+                isPermanent: true,
+            };
+        }
+        if (!this.getEventName(conversion)) {
+            return {
+                reason: "No Meta event name mapped for this conversion type",
                 isPermanent: true,
             };
         }
@@ -36,11 +48,18 @@ export default class MetaProvider extends ConversionUploadProvider {
         }
         return null;
     }
-    hashEmail(email) {
-        return crypto
-            .createHash("sha256")
-            .update(email.trim().toLowerCase())
-            .digest("hex");
+    /*
+     * Standard Meta event names. `Schedule` is Meta's own name for a booked
+     * meeting, and it carries no revenue — which is what keeps a demo out of the
+     * Purchase optimisation pool.
+     */
+    getEventName(conversion) {
+        const mapping = {
+            [MarketingConversionType.SignUp]: "CompleteRegistration",
+            [MarketingConversionType.MeetingBooked]: "Schedule",
+            [MarketingConversionType.PaidSubscription]: "Purchase",
+        };
+        return this.resolveByConversionType(conversion, mapping);
     }
     /*
      * fbc format per Meta spec: fb.1.{creationTimeMs}.{fbclid}. We use the
@@ -54,16 +73,19 @@ export default class MetaProvider extends ConversionUploadProvider {
         var _a;
         const data = conversions.map((conversion) => {
             const eventAt = conversion.conversionAt || new Date();
-            const fbclid = this.getClickId(conversion, "fbclid") || "";
-            const userData = {
-                fbc: this.buildFbc(fbclid, eventAt),
-            };
-            if (conversion.email) {
-                userData["em"] = [this.hashEmail(conversion.email)];
+            const fbclid = this.getClickId(conversion, "fbclid");
+            const userData = {};
+            // Only send fbc when there is a click id to build it from.
+            if (fbclid) {
+                userData["fbc"] = this.buildFbc(fbclid, eventAt);
+            }
+            const hashedEmail = this.getHashedEmail(conversion);
+            if (hashedEmail) {
+                userData["em"] = [hashedEmail];
             }
-            const isSignUp = this.isSignUp(conversion);
+            const eventName = this.getEventName(conversion) || "Lead";
             const payload = {
-                event_name: isSignUp ? "CompleteRegistration" : "Purchase",
+                event_name: eventName,
                 event_time: Math.floor(eventAt.getTime() / 1000),
                 event_id: conversion.id.toString(),
                 /*
@@ -78,9 +100,11 @@ export default class MetaProvider extends ConversionUploadProvider {
             /*
              * Purchase events REQUIRE custom_data.value and currency — one
              * valueless Purchase (custom-pricing plan) would 400 the entire
-             * batch. Send 0 when the value is unknown.
+             * batch. Send 0 when the value is unknown. Lead-shaped events
+             * (Schedule, Lead) never carry a value: getValueInUSD returns
+             * undefined for them, so no custom_data is attached at all.
              */
-            if (!isSignUp || valueInUSD !== undefined) {
+            if (eventName === "Purchase" || valueInUSD !== undefined) {
                 payload["custom_data"] = {
                     value: valueInUSD !== null && valueInUSD !== void 0 ? valueInUSD : 0,
                     currency: "USD",

package/build/dist/Server/Utils/Marketing/Providers/Meta.js.map

@@ -1 +1 @@
-{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Meta.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Meta.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js

@@ -1,15 +1,17 @@
 import axios from "axios";
-import { MicrosoftAdsAccountId, MicrosoftAdsCustomerId, MicrosoftAdsDeveloperToken, MicrosoftAdsOAuthClientId, MicrosoftAdsOAuthClientSecret, MicrosoftAdsOAuthRefreshToken, MicrosoftAdsPaidSubscriptionConversionName, MicrosoftAdsSignUpConversionName, } from "../../../EnvironmentConfig";
+import { MicrosoftAdsAccountId, MicrosoftAdsCustomerId, MicrosoftAdsDeveloperToken, MicrosoftAdsMeetingBookedConversionName, MicrosoftAdsOAuthClientId, MicrosoftAdsOAuthClientSecret, MicrosoftAdsOAuthRefreshToken, MicrosoftAdsPaidSubscriptionConversionName, MicrosoftAdsSignUpConversionName, } from "../../../EnvironmentConfig";
 import ConversionUploadProvider from "../ConversionUploadProvider";
+import { MarketingConversionType } from "../../../../Types/Marketing/MarketingConversion";
 const REQUEST_TIMEOUT_MS = 30000;
 // Microsoft accepts offline conversions up to 90 days after the click.
 const MICROSOFT_MAX_CONVERSION_AGE_IN_DAYS = 90;
 /*
  * Microsoft Advertising (Bing Ads) offline conversions via the Campaign
- * Management v13 REST surface (OfflineConversions/Apply) using msclkid.
- * Offline conversion goals are matched by conversion NAME configured in the
- * Microsoft Advertising UI. OAuth2 refresh-token flow against Microsoft
- * identity platform with the msads.manage scope.
+ * Management v13 REST surface (OfflineConversions/Apply), matching on msclkid
+ * or on a SHA-256 email (Microsoft's enhanced conversions). Offline conversion
+ * goals are matched by conversion NAME configured in the Microsoft Advertising
+ * UI. OAuth2 refresh-token flow against Microsoft identity platform with the
+ * msads.manage scope.
  */
 export default class MicrosoftAdsProvider extends ConversionUploadProvider {
     constructor() {
@@ -27,9 +29,10 @@ export default class MicrosoftAdsProvider extends ConversionUploadProvider {
             MicrosoftAdsAccountId);
     }
     getProviderSkipReason(conversion) {
-        if (!this.getClickId(conversion, "msclkid")) {
+        if (!this.getClickId(conversion, "msclkid") &&
+            !this.getHashedEmail(conversion)) {
             return {
-                reason: "No Microsoft click id (msclkid)",
+                reason: "No Microsoft click id (msclkid) and no email to match on",
                 isPermanent: true,
             };
         }
@@ -49,9 +52,12 @@ export default class MicrosoftAdsProvider extends ConversionUploadProvider {
         return null;
     }
     getConversionName(conversion) {
-        return this.isSignUp(conversion)
-            ? MicrosoftAdsSignUpConversionName
-            : MicrosoftAdsPaidSubscriptionConversionName;
+        const mapping = {
+            [MarketingConversionType.SignUp]: MicrosoftAdsSignUpConversionName,
+            [MarketingConversionType.MeetingBooked]: MicrosoftAdsMeetingBookedConversionName,
+            [MarketingConversionType.PaidSubscription]: MicrosoftAdsPaidSubscriptionConversionName,
+        };
+        return this.resolveByConversionType(conversion, mapping) || "";
     }
     async getAccessToken() {
         var _a, _b;
@@ -88,13 +94,20 @@ export default class MicrosoftAdsProvider extends ConversionUploadProvider {
         const body = {
             OfflineConversions: conversions.map((conversion) => {
                 const payload = {
-                    MicrosoftClickId: this.getClickId(conversion, "msclkid") || "",
                     ConversionName: this.getConversionName(conversion),
                     // ISO 8601 UTC, e.g. 2026-07-18T12:34:56Z.
                     ConversionTime: (conversion.conversionAt || new Date())
                         .toISOString()
                         .replace(/\.\d{3}Z$/, "Z"),
                 };
+                const clickId = this.getClickId(conversion, "msclkid");
+                if (clickId) {
+                    payload["MicrosoftClickId"] = clickId;
+                }
+                const hashedEmail = this.getHashedEmail(conversion);
+                if (hashedEmail) {
+                    payload["HashedEmailAddress"] = hashedEmail;
+                }
                 const valueInUSD = this.getValueInUSD(conversion);
                 if (valueInUSD !== undefined) {
                     payload["ConversionValue"] = valueInUSD;

package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js.map

@@ -1 +1 @@
-{"version":3,"file":"MicrosoftAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/MicrosoftAds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MicrosoftAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/MicrosoftAds.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/Reddit.js

@@ -1,16 +1,17 @@
 import axios from "axios";
-import crypto from "crypto";
 import { RedditAdsAccountId, RedditAdsOAuthClientId, RedditAdsOAuthClientSecret, RedditAdsOAuthRefreshToken, } from "../../../EnvironmentConfig";
 import ConversionUploadProvider from "../ConversionUploadProvider";
+import { MarketingConversionType } from "../../../../Types/Marketing/MarketingConversion";
 const REQUEST_TIMEOUT_MS = 30000;
 // Reddit accepts conversion events up to 7 days old.
 const REDDIT_MAX_EVENT_AGE_IN_DAYS = 7;
 /*
  * Reddit Conversions API
  * (ads-api.reddit.com/api/v2.0/conversions/events/{accountId}) using the
- * rdt_cid click id. conversion_id (the conversion row id) makes retried
- * uploads idempotent on Reddit's side. OAuth2 refresh-token flow with HTTP
- * basic auth against reddit.com.
+ * rdt_cid click id or a SHA-256 email, whichever the conversion carries.
+ * conversion_id (the conversion row id) makes retried uploads idempotent on
+ * Reddit's side. OAuth2 refresh-token flow with HTTP basic auth against
+ * reddit.com.
  */
 export default class RedditProvider extends ConversionUploadProvider {
     constructor() {
@@ -27,9 +28,16 @@ export default class RedditProvider extends ConversionUploadProvider {
             RedditAdsAccountId);
     }
     getProviderSkipReason(conversion) {
-        if (!this.getClickId(conversion, "rdt_cid")) {
+        if (!this.getClickId(conversion, "rdt_cid") &&
+            !this.getHashedEmail(conversion)) {
             return {
-                reason: "No Reddit click id (rdt_cid)",
+                reason: "No Reddit click id (rdt_cid) and no email to match on",
+                isPermanent: true,
+            };
+        }
+        if (!this.getTrackingType(conversion)) {
+            return {
+                reason: "No Reddit tracking type mapped for this conversion type",
                 isPermanent: true,
             };
         }
@@ -41,11 +49,18 @@ export default class RedditProvider extends ConversionUploadProvider {
         }
         return null;
     }
-    hashEmail(email) {
-        return crypto
-            .createHash("sha256")
-            .update(email.trim().toLowerCase())
-            .digest("hex");
+    /*
+     * Reddit standard tracking types. A booked meeting is `Lead`: Reddit has no
+     * distinct "meeting booked" type, and reporting it as Purchase would put a
+     * demo into the same optimisation pool as revenue.
+     */
+    getTrackingType(conversion) {
+        const mapping = {
+            [MarketingConversionType.SignUp]: "SignUp",
+            [MarketingConversionType.MeetingBooked]: "Lead",
+            [MarketingConversionType.PaidSubscription]: "Purchase",
+        };
+        return this.resolveByConversionType(conversion, mapping);
     }
     async getAccessToken() {
         var _a, _b;
@@ -92,15 +107,19 @@ export default class RedditProvider extends ConversionUploadProvider {
             }
             const payload = {
                 event_at: eventAt.toISOString(),
-                click_id: this.getClickId(conversion, "rdt_cid") || "",
                 event_type: {
-                    tracking_type: this.isSignUp(conversion) ? "SignUp" : "Purchase",
+                    tracking_type: this.getTrackingType(conversion) || "Lead",
                 },
                 event_metadata: eventMetadata,
             };
-            if (conversion.email) {
+            const clickId = this.getClickId(conversion, "rdt_cid");
+            if (clickId) {
+                payload["click_id"] = clickId;
+            }
+            const hashedEmail = this.getHashedEmail(conversion);
+            if (hashedEmail) {
                 payload["user"] = {
-                    email: this.hashEmail(conversion.email),
+                    email: hashedEmail,
                 };
             }
             return payload;

package/build/dist/Server/Utils/Marketing/Providers/Reddit.js.map

@@ -1 +1 @@
-{"version":3,"file":"Reddit.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Reddit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reddit.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Reddit.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js

@@ -0,0 +1,109 @@
+import BadDataException from "../../../Types/Exception/BadDataException";
+import MeasurementOccurrence from "../../../Types/Measurement/MeasurementOccurrence";
+/*
+ * Validation shared by the incident, alert and scheduled maintenance
+ * measurement services.
+ *
+ * Every rule here exists to stop a definition that would silently produce a
+ * confidently wrong number -- a constant zero, or a duration that can never
+ * complete with nothing anywhere saying so.
+ */
+class MeasurementDefinitionValidator {
+    static validateKey(key) {
+        if (!key) {
+            throw new BadDataException("A measurement needs a key. Use lowercase letters, numbers and hyphens, for example: time-to-detect");
+        }
+        if (!MeasurementDefinitionValidator.KEY_PATTERN.test(key)) {
+            throw new BadDataException(`"${key}" is not a valid measurement key. Keys start with a lowercase letter or number, contain only lowercase letters, numbers and hyphens, and are at most 50 characters. For example: time-to-detect`);
+        }
+    }
+    static validateAnchorPair(data) {
+        if (!data.startAnchorType) {
+            throw new BadDataException("A measurement needs a starting point.");
+        }
+        if (!data.endAnchorType) {
+            throw new BadDataException("A measurement needs an ending point.");
+        }
+        if (data.startAnchorType === data.stateEnteredAnchor &&
+            !data.startStateId) {
+            throw new BadDataException("Pick the state this measurement starts from.");
+        }
+        if (data.endAnchorType === data.stateEnteredAnchor && !data.endStateId) {
+            throw new BadDataException("Pick the state this measurement ends at.");
+        }
+        if (data.startAnchorType === data.stateRoleEnteredAnchor &&
+            !data.startStateRole) {
+            throw new BadDataException("Pick the kind of state this measurement starts from.");
+        }
+        if (data.endAnchorType === data.stateRoleEnteredAnchor &&
+            !data.endStateRole) {
+            throw new BadDataException("Pick the kind of state this measurement ends at.");
+        }
+        MeasurementDefinitionValidator.rejectIdenticalAnchors(data);
+    }
+    /*
+     * Two identical endpoints always measure zero. Shipping that produces a
+     * chart that reads "we do this instantly" on every incident -- which is
+     * strictly worse than having no chart, because it looks like an answer.
+     */
+    static rejectIdenticalAnchors(data) {
+        const startSource = MeasurementDefinitionValidator.resolveAnchorSource(data.startAnchorType, data.timestampAnchorSources);
+        const endSource = MeasurementDefinitionValidator.resolveAnchorSource(data.endAnchorType, data.timestampAnchorSources);
+        if (startSource !== endSource) {
+            return;
+        }
+        const startOccurrence = data.startOccurrence || MeasurementOccurrence.First;
+        const endOccurrence = data.endOccurrence || MeasurementOccurrence.First;
+        if (data.startAnchorType === data.stateEnteredAnchor) {
+            if (data.startStateId === data.endStateId &&
+                startOccurrence === endOccurrence) {
+                throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+            }
+            return;
+        }
+        if (data.startAnchorType === data.stateRoleEnteredAnchor) {
+            if (data.startStateRole === data.endStateRole &&
+                startOccurrence === endOccurrence) {
+                throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+            }
+            return;
+        }
+        // Two identical timestamp anchors. Always zero, no exceptions.
+        throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+    }
+    /*
+     * The column an anchor reads, so two differently-named anchors that read
+     * the same column are recognised as the same point in time.
+     */
+    static resolveAnchorSource(anchorType, sources) {
+        if (!anchorType) {
+            return "";
+        }
+        return (sources === null || sources === void 0 ? void 0 : sources[anchorType]) || anchorType;
+    }
+    /*
+     * States are entered in strictly increasing order, so an end state ordered
+     * at or before the start state describes a duration that can never
+     * complete. Without this the definition looks fine and every incident
+     * reports "not applicable" forever.
+     */
+    static validateStateOrder(data) {
+        if (data.startStateOrder === undefined ||
+            data.endStateOrder === undefined) {
+            return;
+        }
+        if (data.endStateOrder > data.startStateOrder) {
+            return;
+        }
+        throw new BadDataException(`"${data.endStateName}" comes before "${data.startStateName}" in this project's state order, so this measurement could never complete. Swap the two, or pick a later ending state.`);
+    }
+}
+/*
+ * The key becomes part of the metric name, which lands in ClickHouse, in
+ * the dashboard chart picker and in the API. It is immutable after
+ * creation, so it is worth rejecting a bad one loudly at the only moment
+ * it can still be changed.
+ */
+MeasurementDefinitionValidator.KEY_PATTERN = /^[a-z0-9][a-z0-9-]{0,49}$/;
+export default MeasurementDefinitionValidator;
+//# sourceMappingURL=MeasurementDefinitionValidator.js.map

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeasurementDefinitionValidator.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementDefinitionValidator.ts"],"names":[],"mappings":"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"}