@oneuptime/common 12.0.12 → 12.0.14

package/build/dist/Types/Database/AccessControl/ColumnAccessControl.js

@@ -6,14 +6,28 @@ export default (accessControl) => {
 export const getColumnAccessControl = (target, propertyKey) => {
     return Reflect.getMetadata(accessControlSymbol, target, propertyKey);
 };
+/*
+ * Per-class cache. Safe to key on the constructor because every decorated
+ * column is initialised to `undefined` in the class body, so Object.keys()
+ * is identical for every instance of a class (see OwnerOnlyColumn.ts).
+ * Callers must treat the returned dictionary as read-only.
+ */
+const accessControlCache = new WeakMap();
 export const getColumnAccessControlForAllColumns = (target) => {
-    const dictonary = {};
-    const keys = Object.keys(target);
-    for (const key of keys) {
-        if (Reflect.getMetadata(accessControlSymbol, target, key)) {
-            dictonary[key] = Reflect.getMetadata(accessControlSymbol, target, key);
+    const modelClass = target.constructor;
+    let cached = accessControlCache.get(modelClass);
+    if (!cached) {
+        const dictonary = {};
+        const keys = Object.keys(target);
+        for (const key of keys) {
+            const accessControl = Reflect.getMetadata(accessControlSymbol, target, key);
+            if (accessControl) {
+                dictonary[key] = accessControl;
+            }
         }
+        cached = dictonary;
+        accessControlCache.set(modelClass, cached);
     }
-    return dictonary;
+    return cached;
 };
 //# sourceMappingURL=ColumnAccessControl.js.map

package/build/dist/Types/Database/AccessControl/ColumnAccessControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnAccessControl.js","sourceRoot":"","sources":["../../../../../Types/Database/AccessControl/ColumnAccessControl.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,mBAAmB,GAAW,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAElE,eAAe,CAAC,aAAkC,EAA0B,EAAE;IAC5E,OAAO,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,sBAAsB,GAAmC,CACpE,MAAiB,EACjB,WAAmB,EACE,EAAE;IACvB,OAAO,OAAO,CAAC,WAAW,CACxB,mBAAmB,EACnB,MAAM,EACN,WAAW,CACW,CAAC;AAC3B,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,mCAAmC,GAC9C,CAAsB,MAAS,EAAmC,EAAE;IAClE,MAAM,SAAS,GAAoC,EAAE,CAAC;IACtD,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAC1D,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,CAClC,mBAAmB,EACnB,MAAM,EACN,GAAG,CACmB,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"ColumnAccessControl.js","sourceRoot":"","sources":["../../../../../Types/Database/AccessControl/ColumnAccessControl.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,mBAAmB,GAAW,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAElE,eAAe,CAAC,aAAkC,EAA0B,EAAE;IAC5E,OAAO,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,sBAAsB,GAAmC,CACpE,MAAiB,EACjB,WAAmB,EACE,EAAE;IACvB,OAAO,OAAO,CAAC,WAAW,CACxB,mBAAmB,EACnB,MAAM,EACN,WAAW,CACW,CAAC;AAC3B,CAAC,CAAC;AAMF;;;;;GAKG;AACH,MAAM,kBAAkB,GAGpB,IAAI,OAAO,EAAE,CAAC;AAElB,MAAM,CAAC,MAAM,mCAAmC,GAC9C,CAAsB,MAAS,EAAmC,EAAE;IAClE,MAAM,UAAU,GAA0B,MAAM,CAAC,WAEhD,CAAC;IACF,IAAI,MAAM,GACR,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAErC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,SAAS,GAAoC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,aAAa,GACjB,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,CAEvC,CAAC;YAChB,IAAI,aAAa,EAAE,CAAC;gBAClB,SAAS,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;YACjC,CAAC;QACH,CAAC;QAED,MAAM,GAAG,SAAS,CAAC;QACnB,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/build/dist/Types/Database/AccessControl/ColumnBillingAccessControl.js

@@ -6,14 +6,28 @@ export default (accessControl) => {
 export const getColumnBillingAccessControl = (target, propertyKey) => {
     return Reflect.getMetadata(accessControlSymbol, target, propertyKey);
 };
+/*
+ * Per-class cache. Safe to key on the constructor because every decorated
+ * column is initialised to `undefined` in the class body, so Object.keys()
+ * is identical for every instance of a class (see OwnerOnlyColumn.ts).
+ * Callers must treat the returned dictionary as read-only.
+ */
+const billingAccessControlCache = new WeakMap();
 export const getColumnBillingAccessControlForAllColumns = (target) => {
-    const dictonary = {};
-    const keys = Object.keys(target);
-    for (const key of keys) {
-        if (Reflect.getMetadata(accessControlSymbol, target, key)) {
-            dictonary[key] = Reflect.getMetadata(accessControlSymbol, target, key);
+    const modelClass = target.constructor;
+    let cached = billingAccessControlCache.get(modelClass);
+    if (!cached) {
+        const dictonary = {};
+        const keys = Object.keys(target);
+        for (const key of keys) {
+            const accessControl = Reflect.getMetadata(accessControlSymbol, target, key);
+            if (accessControl) {
+                dictonary[key] = accessControl;
+            }
         }
+        cached = dictonary;
+        billingAccessControlCache.set(modelClass, cached);
     }
-    return dictonary;
+    return cached;
 };
 //# sourceMappingURL=ColumnBillingAccessControl.js.map

package/build/dist/Types/Database/AccessControl/ColumnBillingAccessControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnBillingAccessControl.js","sourceRoot":"","sources":["../../../../../Types/Database/AccessControl/ColumnBillingAccessControl.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,mBAAmB,GAAW,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAEzE,eAAe,CACb,aAAyC,EACjB,EAAE;IAC1B,OAAO,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,6BAA6B,GACxC,CAAC,MAAiB,EAAE,WAAmB,EAA8B,EAAE;IACrE,OAAO,OAAO,CAAC,WAAW,CACxB,mBAAmB,EACnB,MAAM,EACN,WAAW,CACkB,CAAC;AAClC,CAAC,CAAC;AAMJ,MAAM,CAAC,MAAM,0CAA0C,GACrD,CAAsB,MAAS,EAA0C,EAAE;IACzE,MAAM,SAAS,GAA2C,EAAE,CAAC;IAC7D,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAC1D,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,CAClC,mBAAmB,EACnB,MAAM,EACN,GAAG,CAC0B,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"ColumnBillingAccessControl.js","sourceRoot":"","sources":["../../../../../Types/Database/AccessControl/ColumnBillingAccessControl.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,mBAAmB,GAAW,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAEzE,eAAe,CACb,aAAyC,EACjB,EAAE;IAC1B,OAAO,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,6BAA6B,GACxC,CAAC,MAAiB,EAAE,WAAmB,EAA8B,EAAE;IACrE,OAAO,OAAO,CAAC,WAAW,CACxB,mBAAmB,EACnB,MAAM,EACN,WAAW,CACkB,CAAC;AAClC,CAAC,CAAC;AAMJ;;;;;GAKG;AACH,MAAM,yBAAyB,GAG3B,IAAI,OAAO,EAAE,CAAC;AAElB,MAAM,CAAC,MAAM,0CAA0C,GACrD,CAAsB,MAAS,EAA0C,EAAE;IACzE,MAAM,UAAU,GAA0B,MAAM,CAAC,WAEhD,CAAC;IACF,IAAI,MAAM,GACR,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,SAAS,GAA2C,EAAE,CAAC;QAC7D,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,aAAa,GACjB,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,CAEvC,CAAC;YAChB,IAAI,aAAa,EAAE,CAAC;gBAClB,SAAS,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;YACjC,CAAC;QACH,CAAC;QAED,MAAM,GAAG,SAAS,CAAC;QACnB,yBAAyB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/build/dist/Types/Database/DatabaseProperty.js

@@ -1,5 +1,6 @@
 import NotImplementedException from "../Exception/NotImplementedException";
 import SerializableObject from "../SerializableObject";
+import { FindOperator } from "typeorm";
 export default class DatabaseProperty extends SerializableObject {
     constructor() {
         super();
@@ -18,6 +19,43 @@ export default class DatabaseProperty extends SerializableObject {
         if (value && value._type === "raw") {
             return value;
         }
+        /*
+         * A FindOperator reaches a transformer when the query value is an
+         * operator rather than a plain value. Two ways in:
+         *
+         *   - Nested. `And(Equal(id), Raw(privacyClause))` — the shape every
+         *     privacy/scope filter builds (Server/Utils/PrivacyFilterUtil.ts).
+         *     TypeORM calls `operator.transformValue(column.transformer)`
+         *     (SelectQueryBuilder.buildWhere), and FindOperator.transformValue
+         *     hands each CHILD OPERATOR to this function whenever the operator
+         *     carries multiple parameters — which And() and Or() both do.
+         *   - Top level. ColumnMetadata.getEntityValue applies the transformer to
+         *     the whole criteria of a .where()/.update()/.delete() call.
+         *
+         * Every toDatabase() below expects a value, so an operator makes it
+         * produce garbage: "[object Object]" from the string-ish types (ObjectID
+         * included — a uuid column then fails with Postgres 22P02 invalid input
+         * syntax for type uuid), `null` from Port, a serialized operator from the
+         * JSON types. The child is REPLACED by that garbage, so the caller's own
+         * predicate is lost and the privacy clause it was ANDed with can no
+         * longer match anything.
+         *
+         * Transform the operator's leaf value(s) in place and hand the operator
+         * back, so `And`/`Or`/`In`/`Not`/`Between` keep their structure and only
+         * the leaves are converted. Recursion terminates because transformValue
+         * always descends into the operator's value, and a leaf is never a
+         * FindOperator.
+         *
+         * NOTE: transformValue mutates. One query object can legitimately be
+         * transformed more than once — BaseAPI.getList shares it between findBy
+         * and countBy — so every toDatabase() has to be a fixpoint: handed its
+         * own output it must return that output unchanged. Tests/Types/Database/
+         * DatabasePropertyFindOperator.test.ts enforces that for each type.
+         */
+        if (value instanceof FindOperator) {
+            value.transformValue(this.getDatabaseTransformer());
+            return value;
+        }
         return this.toDatabase(value);
     }
     static getDatabaseTransformer() {

package/build/dist/Types/Database/DatabaseProperty.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseProperty.js","sourceRoot":"","sources":["../../../../Types/Database/DatabaseProperty.ts"],"names":[],"mappings":"AACA,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAE3E,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,kBAAkB;IAC9D;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAES,MAAM,CAAC,YAAY,CAC3B,MAAgD;QAEhD,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;IAES,MAAM,CAAC,UAAU,CACzB,MAGkC;QAElC,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;IAES,MAAM,CAAC,aAAa,CAC5B,KAA+C;QAE/C,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAES,MAAM,CAAC,WAAW,CAC1B,KAAwD;QAExD,0CAA0C;QAC1C,IAAI,KAAK,IAAK,KAAa,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC5C,OAAO,KAAY,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAClC,OAAO;YACL,EAAE,EAAE,CAAC,KAAU,EAAE,EAAE;gBACjB;;;;;;;;;;;;;;;;;;;;;mBAqBG;gBACH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;gBACnB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;SACF,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,SAAS;QACrB,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;CACF"}
+{"version":3,"file":"DatabaseProperty.js","sourceRoot":"","sources":["../../../../Types/Database/DatabaseProperty.ts"],"names":[],"mappings":"AACA,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAE3E,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGvC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,kBAAkB;IAC9D;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAES,MAAM,CAAC,YAAY,CAC3B,MAAgD;QAEhD,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;IAES,MAAM,CAAC,UAAU,CACzB,MAGkC;QAElC,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;IAES,MAAM,CAAC,aAAa,CAC5B,KAA+C;QAE/C,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAES,MAAM,CAAC,WAAW,CAC1B,KAAwD;QAExD,0CAA0C;QAC1C,IAAI,KAAK,IAAK,KAAa,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC5C,OAAO,KAAY,CAAC;QACtB,CAAC;QAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgCG;QACH,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAClC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;YACpD,OAAO,KAAY,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAClC,OAAO;YACL,EAAE,EAAE,CAAC,KAAU,EAAE,EAAE;gBACjB;;;;;;;;;;;;;;;;;;;;;mBAqBG;gBACH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;gBACnB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;SACF,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,SAAS;QACrB,MAAM,IAAI,uBAAuB,EAAE,CAAC;IACtC,CAAC;CACF"}

package/build/dist/Types/Database/TableColumn.js

@@ -6,14 +6,32 @@ export default (props) => {
 export const getTableColumn = (target, propertyKey) => {
     return Reflect.getMetadata(tableColumn, target, propertyKey);
 };
+/*
+ * Per-class cache. Safe to key on the constructor because every decorated
+ * column is initialised to `undefined` in the class body, so Object.keys()
+ * is identical for every instance of a class (see OwnerOnlyColumn.ts).
+ */
+const tableColumnsCache = new WeakMap();
 export const getTableColumns = (target) => {
-    const dictonary = {};
-    const keys = Object.keys(target);
-    for (const key of keys) {
-        if (Reflect.getMetadata(tableColumn, target, key)) {
-            dictonary[key] = Reflect.getMetadata(tableColumn, target, key);
+    const modelClass = target.constructor;
+    let cached = tableColumnsCache.get(modelClass);
+    if (!cached) {
+        const dictonary = {};
+        const keys = Object.keys(target);
+        for (const key of keys) {
+            const metadata = Reflect.getMetadata(tableColumn, target, key);
+            if (metadata) {
+                dictonary[key] = metadata;
+            }
         }
+        cached = dictonary;
+        tableColumnsCache.set(modelClass, cached);
     }
-    return dictonary;
+    /*
+     * Hand out a copy, not the cached dictionary itself: callers mutate the
+     * result (the API reference docs delete entries from it), which would
+     * otherwise strip columns from every later call for the same class.
+     */
+    return Object.assign({}, cached);
 };
 //# sourceMappingURL=TableColumn.js.map

package/build/dist/Types/Database/TableColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableColumn.js","sourceRoot":"","sources":["../../../../Types/Database/TableColumn.ts"],"names":[],"mappings":"AAKA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,WAAW,GAAW,MAAM,CAAC,aAAa,CAAC,CAAC;AAkClD,eAAe,CAAC,KAA0B,EAA0B,EAAE;IACpE,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AAC9C,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,cAAc,GAA2B,CACpD,MAAS,EACT,WAAmB,EACE,EAAE;IACvB,OAAO,OAAO,CAAC,WAAW,CACxB,WAAW,EACX,MAAM,EACN,WAAW,CACW,CAAC;AAC3B,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,eAAe,GAA4B,CACtD,MAAS,EACwB,EAAE;IACnC,MAAM,SAAS,GAAoC,EAAE,CAAC;IACtD,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAClD,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,CAClC,WAAW,EACX,MAAM,EACN,GAAG,CACmB,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"TableColumn.js","sourceRoot":"","sources":["../../../../Types/Database/TableColumn.ts"],"names":[],"mappings":"AAKA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,WAAW,GAAW,MAAM,CAAC,aAAa,CAAC,CAAC;AAkClD,eAAe,CAAC,KAA0B,EAA0B,EAAE;IACpE,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AAC9C,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,cAAc,GAA2B,CACpD,MAAS,EACT,WAAmB,EACE,EAAE;IACvB,OAAO,OAAO,CAAC,WAAW,CACxB,WAAW,EACX,MAAM,EACN,WAAW,CACW,CAAC;AAC3B,CAAC,CAAC;AAMF;;;;GAIG;AACH,MAAM,iBAAiB,GAGnB,IAAI,OAAO,EAAE,CAAC;AAElB,MAAM,CAAC,MAAM,eAAe,GAA4B,CACtD,MAAS,EACwB,EAAE;IACnC,MAAM,UAAU,GAA0B,MAAM,CAAC,WAEhD,CAAC;IACF,IAAI,MAAM,GACR,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,SAAS,GAAoC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAkB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAoC,OAAO,CAAC,WAAW,CACnE,WAAW,EACX,MAAM,EACN,GAAG,CAC+B,CAAC;YACrC,IAAI,QAAQ,EAAE,CAAC;gBACb,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,MAAM,GAAG,SAAS,CAAC;QACnB,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,yBAAY,MAAM,EAAG;AACvB,CAAC,CAAC"}

package/build/dist/Types/Email/EmailTemplateType.js

@@ -4,6 +4,7 @@ var EmailTemplateType;
     EmailTemplateType["ForgotPassword"] = "ForgotPassword.hbs";
     EmailTemplateType["ProbeOffline"] = "ProbeOffline.hbs";
     EmailTemplateType["SignupWelcomeEmail"] = "SignupWelcomeEmail.hbs";
+    EmailTemplateType["CompleteRegistration"] = "CompleteRegistration.hbs";
     EmailTemplateType["ProbeConnectionStatusChange"] = "ProbeConnectionStatusChange.hbs";
     EmailTemplateType["AIAgentConnectionStatusChange"] = "AIAgentConnectionStatusChange.hbs";
     EmailTemplateType["AIAgentOwnerAdded"] = "AIAgentOwnerAdded.hbs";

package/build/dist/Types/Email/EmailTemplateType.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailTemplateType.js","sourceRoot":"","sources":["../../../../Types/Email/EmailTemplateType.ts"],"names":[],"mappings":"AAAA,IAAK,iBA+FJ;AA/FD,WAAK,iBAAiB;IACpB,wDAAmC,CAAA;IACnC,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,kEAA6C,CAAA;IAC7C,oFAA+D,CAAA;IAC/D,wFAAmE,CAAA;IACnE,gEAA2C,CAAA;IAC3C,wFAAmE,CAAA;IACnE,wDAAmC,CAAA;IACnC,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,0EAAqD,CAAA;IACrD,wFAAmE,CAAA;IACnE,gFAA2D,CAAA;IAC3D,oGAA+E,CAAA;IAC/E,kFAA6D,CAAA;IAC7D,wFAAmE,CAAA;IACnE,0FAAqE,CAAA;IACrE,kHAA6F,CAAA;IAC7F,0HAAqG,CAAA;IACrG,4HAAuG,CAAA;IACvG,8EAAyD,CAAA;IACzD,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,0HAAqG,CAAA;IACrG,8CAAyB,CAAA;IACzB,gEAA2C,CAAA;IAC3C,oFAA+D,CAAA;IAC/D,oEAA+C,CAAA;IAC/C,gFAA2D,CAAA;IAE3D,wEAAmD,CAAA;IAEnD,kEAA6C,CAAA;IAC7C,gFAA2D,CAAA;IAC3D,4EAAuD,CAAA;IACvD,sFAAiE,CAAA;IACjE,oEAA+C,CAAA;IAC/C,4FAAuE,CAAA;IAEvE,4DAAuC,CAAA;IACvC,0EAAqD,CAAA;IACrD,sEAAiD,CAAA;IACjD,gFAA2D,CAAA;IAC3D,sFAAiE,CAAA;IAEjE,0EAAqD,CAAA;IACrD,wFAAmE,CAAA;IACnE,oFAA+D,CAAA;IAC/D,8FAAyE,CAAA;IACzE,oFAA+D,CAAA;IAE/D,gFAA2D,CAAA;IAC3D,8FAAyE,CAAA;IACzE,0FAAqE,CAAA;IACrE,oGAA+E,CAAA;IAC/E,gGAA2E,CAAA;IAE3E,8EAAyD,CAAA;IACzD,wFAAmE,CAAA;IACnE,sFAAiE,CAAA;IAEjE,oGAA+E,CAAA;IAC/E,0FAAqE,CAAA;IACrE,wGAAmF,CAAA;IACnF,8GAAyF,CAAA;IACzF,oHAA+F,CAAA;IAC/F,0FAAqE,CAAA;IACrE,sEAAiD,CAAA;IACjD,gGAA2E,CAAA;IAC3E,wDAAmC,CAAA;IACnC,8DAAyC,CAAA;IACzC,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,4EAAuD,CAAA;IACvD,kFAA6D,CAAA;IAE7D,4EAAuD,CAAA;IACvD,oFAA+D,CAAA;IAC/D,oFAA+D,CAAA;IAC/D,0EAAqD,CAAA;IACrD,8FAAyE,CAAA;IAEzE,kFAA6D,CAAA;IAC7D,4CAAuB,CAAA;IAEvB,gFAA2D,CAAA;IAC3D,kEAA6C,CAAA;IAC7C,wEAAmD,CAAA;IAEnD,8FAAyE,CAAA;IACzE,4FAAuE,CAAA;AACzE,CAAC,EA/FI,iBAAiB,KAAjB,iBAAiB,QA+FrB;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"EmailTemplateType.js","sourceRoot":"","sources":["../../../../Types/Email/EmailTemplateType.ts"],"names":[],"mappings":"AAAA,IAAK,iBAgGJ;AAhGD,WAAK,iBAAiB;IACpB,wDAAmC,CAAA;IACnC,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,kEAA6C,CAAA;IAC7C,sEAAiD,CAAA;IACjD,oFAA+D,CAAA;IAC/D,wFAAmE,CAAA;IACnE,gEAA2C,CAAA;IAC3C,wFAAmE,CAAA;IACnE,wDAAmC,CAAA;IACnC,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,0EAAqD,CAAA;IACrD,wFAAmE,CAAA;IACnE,gFAA2D,CAAA;IAC3D,oGAA+E,CAAA;IAC/E,kFAA6D,CAAA;IAC7D,wFAAmE,CAAA;IACnE,0FAAqE,CAAA;IACrE,kHAA6F,CAAA;IAC7F,0HAAqG,CAAA;IACrG,4HAAuG,CAAA;IACvG,8EAAyD,CAAA;IACzD,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,0HAAqG,CAAA;IACrG,8CAAyB,CAAA;IACzB,gEAA2C,CAAA;IAC3C,oFAA+D,CAAA;IAC/D,oEAA+C,CAAA;IAC/C,gFAA2D,CAAA;IAE3D,wEAAmD,CAAA;IAEnD,kEAA6C,CAAA;IAC7C,gFAA2D,CAAA;IAC3D,4EAAuD,CAAA;IACvD,sFAAiE,CAAA;IACjE,oEAA+C,CAAA;IAC/C,4FAAuE,CAAA;IAEvE,4DAAuC,CAAA;IACvC,0EAAqD,CAAA;IACrD,sEAAiD,CAAA;IACjD,gFAA2D,CAAA;IAC3D,sFAAiE,CAAA;IAEjE,0EAAqD,CAAA;IACrD,wFAAmE,CAAA;IACnE,oFAA+D,CAAA;IAC/D,8FAAyE,CAAA;IACzE,oFAA+D,CAAA;IAE/D,gFAA2D,CAAA;IAC3D,8FAAyE,CAAA;IACzE,0FAAqE,CAAA;IACrE,oGAA+E,CAAA;IAC/E,gGAA2E,CAAA;IAE3E,8EAAyD,CAAA;IACzD,wFAAmE,CAAA;IACnE,sFAAiE,CAAA;IAEjE,oGAA+E,CAAA;IAC/E,0FAAqE,CAAA;IACrE,wGAAmF,CAAA;IACnF,8GAAyF,CAAA;IACzF,oHAA+F,CAAA;IAC/F,0FAAqE,CAAA;IACrE,sEAAiD,CAAA;IACjD,gGAA2E,CAAA;IAC3E,wDAAmC,CAAA;IACnC,8DAAyC,CAAA;IACzC,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,4EAAuD,CAAA;IACvD,kFAA6D,CAAA;IAE7D,4EAAuD,CAAA;IACvD,oFAA+D,CAAA;IAC/D,oFAA+D,CAAA;IAC/D,0EAAqD,CAAA;IACrD,8FAAyE,CAAA;IAEzE,kFAA6D,CAAA;IAC7D,4CAAuB,CAAA;IAEvB,gFAA2D,CAAA;IAC3D,kEAA6C,CAAA;IAC7C,wEAAmD,CAAA;IAEnD,8FAAyE,CAAA;IACzE,4FAAuE,CAAA;AACzE,CAAC,EAhGI,iBAAiB,KAAjB,iBAAiB,QAgGrB;AAED,eAAe,iBAAiB,CAAC"}

package/build/dist/Types/Events/Recurring.js

@@ -209,7 +209,19 @@ export default class Recurring extends DatabaseProperty {
     }
     static toDatabase(value) {
         if (Array.isArray(value)) {
-            return this.toJSONArray(value);
+            /*
+             * Per item rather than through toJSONArray, which assumes every item is
+             * still a Recurring instance and throws "item.toJSON is not a function"
+             * on an already-serialized array. TypeORM can hand a transformer its own
+             * output — BaseAPI.getList shares one query object between findBy and
+             * countBy — so this has to be a fixpoint.
+             */
+            return value.map((item) => {
+                if (item instanceof Recurring) {
+                    return item.toJSON();
+                }
+                return JSONFunctions.serialize(item);
+            });
         }
         if (value && value instanceof Recurring) {
             return value.toJSON();

package/build/dist/Types/Events/Recurring.js.map

@@ -1 +1 @@
-{"version":3,"file":"Recurring.js","sourceRoot":"","sources":["../../../../Types/Events/Recurring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Recurring.js","sourceRoot":"","sources":["../../../../Types/Events/Recurring.ts"],"names":[],"mappings":"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"}

package/build/dist/Types/Monitor/MonitorCriteriaInstance.js

@@ -11,7 +11,7 @@ import { CriteriaIncidentSchema } from "./CriteriaIncident";
 import { IncidentGroupingConfigSchema, } from "./IncomingMonitor/IncidentGroupingConfig";
 import MonitorType from "./MonitorType";
 import Zod from "../../Utils/Schema/Zod";
-export default class MonitorCriteriaInstance extends DatabaseProperty {
+class MonitorCriteriaInstance extends DatabaseProperty {
     constructor() {
         super();
         this.data = undefined;
@@ -45,9 +45,9 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 filterCondition: FilterCondition.All,
                 filters: [
                     {
-                        checkOn: CheckOn.IncomingRequest,
-                        filterType: FilterType.RecievedInMinutes,
-                        value: 30,
+                        checkOn: CheckOn.RequestBody,
+                        filterType: FilterType.NotContains,
+                        value: MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD,
                     },
                 ],
                 incidents: [],
@@ -56,7 +56,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 changeMonitorStatus: true,
                 createIncidents: false,
                 name: `Check if ${arg.monitorName} is online`,
-                description: `This criteria checks if the ${arg.monitorName} is online`,
+                description: `This criteria checks if the request body of ${arg.monitorName} does not contain "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}"`,
             };
             return monitorCriteriaInstance;
         }
@@ -68,9 +68,9 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 filterCondition: FilterCondition.All,
                 filters: [
                     {
-                        checkOn: CheckOn.EmailReceivedAt,
-                        filterType: FilterType.RecievedInMinutes,
-                        value: 30,
+                        checkOn: CheckOn.EmailBody,
+                        filterType: FilterType.NotContains,
+                        value: MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD,
                     },
                 ],
                 incidents: [],
@@ -79,7 +79,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 changeMonitorStatus: true,
                 createIncidents: false,
                 name: `Check if ${arg.monitorName} is online`,
-                description: `This criteria checks if the ${arg.monitorName} is online`,
+                description: `This criteria checks if the email body of ${arg.monitorName} does not contain "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}"`,
             };
             return monitorCriteriaInstance;
         }
@@ -1047,15 +1047,19 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 filterCondition: FilterCondition.Any,
                 filters: [
                     {
-                        checkOn: CheckOn.IncomingRequest,
-                        filterType: FilterType.NotRecievedInMinutes,
-                        value: 30, // if the request is not recieved in 30 minutes, then the monitor is offline
+                        /*
+                         * If the sender reports an error in the request body, the monitor
+                         * is offline.
+                         */
+                        checkOn: CheckOn.RequestBody,
+                        filterType: FilterType.Contains,
+                        value: MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD,
                     },
                 ],
                 alerts: [
                     {
                         title: `${arg.monitorName} is offline`,
-                        description: `${arg.monitorName} is currently offline.`,
+                        description: `${arg.monitorName} is currently offline. The request body contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}".`,
                         alertSeverityId: arg.alertSeverityId,
                         autoResolveAlert: true,
                         id: ObjectID.generate().toString(),
@@ -1066,7 +1070,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 incidents: [
                     {
                         title: `${arg.monitorName} is offline`,
-                        description: `${arg.monitorName} is currently offline.`,
+                        description: `${arg.monitorName} is currently offline. The request body contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}".`,
                         incidentSeverityId: arg.incidentSeverityId,
                         autoResolveIncident: true,
                         id: ObjectID.generate().toString(),
@@ -1076,7 +1080,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 changeMonitorStatus: true,
                 createIncidents: true,
                 name: `Check if ${arg.monitorName} is offline`,
-                description: `This criteria checks if the ${arg.monitorName} is offline`,
+                description: `This criteria checks if the request body of ${arg.monitorName} contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}"`,
             };
         }
         if (arg.monitorType === MonitorType.IncomingEmail) {
@@ -1086,15 +1090,19 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 filterCondition: FilterCondition.Any,
                 filters: [
                     {
-                        checkOn: CheckOn.EmailReceivedAt,
-                        filterType: FilterType.NotRecievedInMinutes,
-                        value: 30, // if email is not received in 30 minutes, then the monitor is offline
+                        /*
+                         * If the received email reports an error in its body, the monitor
+                         * is offline.
+                         */
+                        checkOn: CheckOn.EmailBody,
+                        filterType: FilterType.Contains,
+                        value: MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD,
                     },
                 ],
                 alerts: [
                     {
                         title: `${arg.monitorName} is offline`,
-                        description: `${arg.monitorName} is currently offline. No email received.`,
+                        description: `${arg.monitorName} is currently offline. The email body contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}".`,
                         alertSeverityId: arg.alertSeverityId,
                         autoResolveAlert: true,
                         id: ObjectID.generate().toString(),
@@ -1105,7 +1113,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 incidents: [
                     {
                         title: `${arg.monitorName} is offline`,
-                        description: `${arg.monitorName} is currently offline. No email received.`,
+                        description: `${arg.monitorName} is currently offline. The email body contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}".`,
                         incidentSeverityId: arg.incidentSeverityId,
                         autoResolveIncident: true,
                         id: ObjectID.generate().toString(),
@@ -1115,7 +1123,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
                 changeMonitorStatus: true,
                 createIncidents: true,
                 name: `Check if ${arg.monitorName} is offline`,
-                description: `This criteria checks if the ${arg.monitorName} is offline`,
+                description: `This criteria checks if the email body of ${arg.monitorName} contains "${MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD}"`,
             };
         }
         if (arg.monitorType === MonitorType.CustomJavaScriptCode ||
@@ -1532,4 +1540,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         return JSON.stringify(this.toJSON());
     }
 }
+/*
+ * Keyword the out-of-the-box criteria for the two incoming monitor types
+ * (Incoming Request and Incoming Email) look for in the payload body.
+ *
+ * These monitors are driven by whatever the sender pushes, so the default
+ * that is useful to the most people is "the sender told us something broke":
+ * a body carrying this keyword takes the monitor offline and opens an
+ * incident, a body without it puts the monitor back online. Users who want
+ * a dead-man's-switch instead can still add an Incoming Request /
+ * Email Received criteria by hand.
+ */
+MonitorCriteriaInstance.DEFAULT_INCOMING_BODY_ERROR_KEYWORD = "error";
+export default MonitorCriteriaInstance;
 //# sourceMappingURL=MonitorCriteriaInstance.js.map