@drawbridge/drawbridge-utils 0.0.64 → 0.0.66

package/dist/index.cjs

@@ -285,6 +285,67 @@ var constants_default = {
   }
 };
 
+// lib/usage.js
+var incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
+  if (!usageId || !$inc) return;
+  const safeInc = Object.fromEntries(
+    Object.entries($inc).filter(([, value]) => {
+      const number = Number(value);
+      return Number.isFinite(number) && number !== 0;
+    })
+  );
+  if (Object.keys(safeInc).length === 0) return;
+  return controller.update({
+    collection: "usage",
+    data: { $inc: safeInc },
+    options: {
+      bypassDocumentValidation: true,
+      ...session && { session }
+    },
+    query: { id: usageId }
+  });
+};
+var isDuplicateKey = (error) => (error == null ? void 0 : error.code) === 11e3 || (error == null ? void 0 : error.code) === "11000" || /E11000|duplicate key/i.test((error == null ? void 0 : error.message) || "");
+var recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
+  if (!controller || !organization || !usageId || !type || !key) return;
+  const amount = Number(units);
+  if (!Number.isFinite(amount) || amount === 0) return;
+  let inserted = false;
+  try {
+    const { lastErrorObject } = await controller.update({
+      collection: "action",
+      data: {
+        $setOnInsert: {
+          organization,
+          usage: usageId,
+          type,
+          units: amount,
+          key,
+          meta,
+          ...traceId && { traceId }
+        }
+      },
+      options: {
+        bypassDocumentValidation: true,
+        includeResultMetadata: true,
+        upsert: true,
+        ...session && { session }
+      },
+      query: {
+        key,
+        usage: usageId
+      }
+    });
+    inserted = Boolean(lastErrorObject == null ? void 0 : lastErrorObject.upserted);
+  } catch (error) {
+    if (isDuplicateKey(error) && !session) return;
+    throw error;
+  }
+  if (inserted) {
+    await incrementUsageTotals({ controller, usageId, $inc: { "totals.actions": amount }, session });
+  }
+};
+
 // index.js
 var nanoid = (0, import_nanoid.customAlphabet)("0123456789abcdefghijklmnopqrstuvwxyz", 8);
 var constants = constants_default;
@@ -373,65 +434,6 @@ var getPlanFeature = (plan, key) => {
     message: granted ? feature : error
   };
 };
-var incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
-  if (!usageId || !$inc) return;
-  const safeInc = Object.fromEntries(
-    Object.entries($inc).filter(([, value]) => {
-      const number = Number(value);
-      return Number.isFinite(number) && number !== 0;
-    })
-  );
-  if (Object.keys(safeInc).length === 0) return;
-  return controller.update({
-    collection: "usage",
-    data: { $inc: safeInc },
-    options: {
-      bypassDocumentValidation: true,
-      ...session && { session }
-    },
-    query: { id: usageId }
-  });
-};
-var isDuplicateKey = (error) => (error == null ? void 0 : error.code) === 11e3 || (error == null ? void 0 : error.code) === "11000" || /E11000|duplicate key/i.test((error == null ? void 0 : error.message) || "");
-var recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
-  if (!controller || !organization || !usageId || !type || !key) return;
-  const amount = Number(units);
-  if (!Number.isFinite(amount) || amount === 0) return;
-  let inserted = false;
-  try {
-    const { lastErrorObject } = await controller.update({
-      collection: "action",
-      data: {
-        $setOnInsert: {
-          organization,
-          usage: usageId,
-          type,
-          units: amount,
-          key,
-          meta,
-          ...traceId && { traceId }
-        }
-      },
-      options: {
-        bypassDocumentValidation: true,
-        includeResultMetadata: true,
-        upsert: true,
-        ...session && { session }
-      },
-      query: {
-        key,
-        usage: usageId
-      }
-    });
-    inserted = Boolean(lastErrorObject == null ? void 0 : lastErrorObject.upserted);
-  } catch (error) {
-    if (isDuplicateKey(error) && !session) return;
-    throw error;
-  }
-  if (inserted) {
-    await incrementUsageTotals({ controller, usageId, $inc: { "totals.actions": amount }, session });
-  }
-};
 var percentage = (value1, value2, decimals = 1) => ((value1 || 0) / (value2 || 0) * 100 || 0).toFixed(decimals);
 var reducers = {
   fields: (data2 = [], callback = () => ({})) => data2.reduce(

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import { data, code } from 'currency-codes';
 import { customAlphabet } from 'nanoid';
 import { colorFormatted, colorAccessible } from './color.cjs';
+export { incrementUsageTotals, isDuplicateKey, recordAction } from './usage.cjs';
 import 'tinycolor2';
 
 const font = {
@@ -341,127 +342,6 @@ const getPlanFeature = ( plan, key ) => {
 
 };
 
-// Centralized $inc helper for the per-org usage doc. Replaces inline
-// $inc-with-bypass-validation patterns in drawbridge-api + drawbridge-sync.
-//
-// MongoDB's $inc with 0 / NaN / undefined / null writes the value into the
-// field (zeroing or NaN-ing it) instead of no-op'ing — so we filter the
-// $inc object to keep only finite, non-zero values and callers don't have
-// to remember the guard.
-//
-// `session` is forwarded when present so callers inside a transaction get
-// atomic writes; standalone callers omit it.
-const incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
-
-	if( ! usageId || ! $inc ) return;
-
-	const safeInc = Object.fromEntries(
-		Object.entries( $inc ).filter( ([ , value ]) => {
-
-			const number = Number( value );
-
-			return Number.isFinite( number ) && number !== 0;
-
-		})
-	);
-
-	if( Object.keys( safeInc ).length === 0 ) return;
-
-	return controller.update({
-		collection : 'usage',
-		data : { $inc : safeInc },
-		options : {
-			bypassDocumentValidation : true,
-			...( session && { session })
-		},
-		query : { id : usageId }
-	});
-
-};
-
-// True for a MongoDB duplicate-key error (unique-index violation).
-const isDuplicateKey = ( error ) =>
-	error?.code === 11000
-	|| error?.code === '11000'
-	|| /E11000|duplicate key/i.test( error?.message || '' );
-
-// Record a billable action as a row in the append-only `action` ledger — the
-// source of truth for usage billing (summed per period at changeover).
-//
-// Idempotent via an UPSERT on the unique { usage, key }: a duplicate event (the
-// segment realtime path AND the sweep firing for the same membership, or a retry)
-// matches the existing row and no-ops — no duplicate-key error — so this is safe
-// to call INSIDE a caller's transaction (a thrown E11000 would abort the whole
-// transaction). The display cache `usage.totals.actions` is bumped ONLY when the
-// upsert actually inserts a new row, so a duplicate never double-counts.
-//
-// Pass `session` to make the ledger row + cache bump atomic with the caller's own
-// writes (e.g. the membership writes in a segment-sweep chunk, or the submission
-// docs) — all-or-nothing. Without a session it runs standalone.
-//   key   deterministic per source event, e.g. 'segment.join:<contact>:<segment>'
-//   units billable units (default 1; N for batch, e.g. accepted entries)
-//   meta  attribution ids { campaign, page, submission, segment, workflow, step, ... }
-const recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
-
-	if( ! controller || ! organization || ! usageId || ! type || ! key ) return;
-
-	const amount = Number( units );
-
-	if( ! Number.isFinite( amount ) || amount === 0 ) return;
-
-	let inserted = false;
-
-	try {
-
-		const { lastErrorObject } = await controller.update({
-			collection : 'action',
-			data : {
-				$setOnInsert : {
-					organization,
-					usage : usageId,
-					type,
-					units : amount,
-					key,
-					meta,
-					...( traceId && { traceId })
-				}
-			},
-			options : {
-				bypassDocumentValidation : true,
-				includeResultMetadata : true,
-				upsert : true,
-				...( session && { session })
-			},
-			query : {
-				key,
-				usage : usageId
-			}
-		});
-
-		inserted = Boolean( lastErrorObject?.upserted );
-
-	} catch ( error ) {
-
-		// A concurrent upsert of the same { usage, key } can still race to E11000.
-		// Standalone: the other writer recorded it — skip. Inside a transaction:
-		// the txn is already aborted, so re-throw to let the caller retry the whole
-		// unit (which then sees the row and no-ops).
-		if( isDuplicateKey( error ) && ! session ) return;
-
-		throw error;
-
-	}
-
-	// Only a genuinely new row bumps the display cache (a matched duplicate must
-	// not double-count). Joined to the caller's transaction when a session is given.
-	if( inserted ){
-
-		await incrementUsageTotals({ controller, usageId, $inc : { 'totals.actions' : amount }, session });
-
-	}
-
-};
-
 const percentage = ( value1, value2, decimals = 1 ) => ( ( ( ( value1 || 0 ) / ( value2 || 0 ) ) * 100 ) || 0 ).toFixed( decimals );
 
 const reducers = {
@@ -560,4 +440,4 @@ const currencies = data.map( ( item ) => ({
 
 const currency = ( val ) => code( val );
 
-export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, incrementUsageTotals, infinite, isDuplicateKey, isInfinite, megabyte, nanoid, percentage, recordAction, reducers, regex, shareUrls, urlRoot };
+export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { data, code } from 'currency-codes';
 import { customAlphabet } from 'nanoid';
 import { colorFormatted, colorAccessible } from './color.js';
+export { incrementUsageTotals, isDuplicateKey, recordAction } from './usage.js';
 import 'tinycolor2';
 
 const font = {
@@ -341,127 +342,6 @@ const getPlanFeature = ( plan, key ) => {
 
 };
 
-// Centralized $inc helper for the per-org usage doc. Replaces inline
-// $inc-with-bypass-validation patterns in drawbridge-api + drawbridge-sync.
-//
-// MongoDB's $inc with 0 / NaN / undefined / null writes the value into the
-// field (zeroing or NaN-ing it) instead of no-op'ing — so we filter the
-// $inc object to keep only finite, non-zero values and callers don't have
-// to remember the guard.
-//
-// `session` is forwarded when present so callers inside a transaction get
-// atomic writes; standalone callers omit it.
-const incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
-
-	if( ! usageId || ! $inc ) return;
-
-	const safeInc = Object.fromEntries(
-		Object.entries( $inc ).filter( ([ , value ]) => {
-
-			const number = Number( value );
-
-			return Number.isFinite( number ) && number !== 0;
-
-		})
-	);
-
-	if( Object.keys( safeInc ).length === 0 ) return;
-
-	return controller.update({
-		collection : 'usage',
-		data : { $inc : safeInc },
-		options : {
-			bypassDocumentValidation : true,
-			...( session && { session })
-		},
-		query : { id : usageId }
-	});
-
-};
-
-// True for a MongoDB duplicate-key error (unique-index violation).
-const isDuplicateKey = ( error ) =>
-	error?.code === 11000
-	|| error?.code === '11000'
-	|| /E11000|duplicate key/i.test( error?.message || '' );
-
-// Record a billable action as a row in the append-only `action` ledger — the
-// source of truth for usage billing (summed per period at changeover).
-//
-// Idempotent via an UPSERT on the unique { usage, key }: a duplicate event (the
-// segment realtime path AND the sweep firing for the same membership, or a retry)
-// matches the existing row and no-ops — no duplicate-key error — so this is safe
-// to call INSIDE a caller's transaction (a thrown E11000 would abort the whole
-// transaction). The display cache `usage.totals.actions` is bumped ONLY when the
-// upsert actually inserts a new row, so a duplicate never double-counts.
-//
-// Pass `session` to make the ledger row + cache bump atomic with the caller's own
-// writes (e.g. the membership writes in a segment-sweep chunk, or the submission
-// docs) — all-or-nothing. Without a session it runs standalone.
-//   key   deterministic per source event, e.g. 'segment.join:<contact>:<segment>'
-//   units billable units (default 1; N for batch, e.g. accepted entries)
-//   meta  attribution ids { campaign, page, submission, segment, workflow, step, ... }
-const recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
-
-	if( ! controller || ! organization || ! usageId || ! type || ! key ) return;
-
-	const amount = Number( units );
-
-	if( ! Number.isFinite( amount ) || amount === 0 ) return;
-
-	let inserted = false;
-
-	try {
-
-		const { lastErrorObject } = await controller.update({
-			collection : 'action',
-			data : {
-				$setOnInsert : {
-					organization,
-					usage : usageId,
-					type,
-					units : amount,
-					key,
-					meta,
-					...( traceId && { traceId })
-				}
-			},
-			options : {
-				bypassDocumentValidation : true,
-				includeResultMetadata : true,
-				upsert : true,
-				...( session && { session })
-			},
-			query : {
-				key,
-				usage : usageId
-			}
-		});
-
-		inserted = Boolean( lastErrorObject?.upserted );
-
-	} catch ( error ) {
-
-		// A concurrent upsert of the same { usage, key } can still race to E11000.
-		// Standalone: the other writer recorded it — skip. Inside a transaction:
-		// the txn is already aborted, so re-throw to let the caller retry the whole
-		// unit (which then sees the row and no-ops).
-		if( isDuplicateKey( error ) && ! session ) return;
-
-		throw error;
-
-	}
-
-	// Only a genuinely new row bumps the display cache (a matched duplicate must
-	// not double-count). Joined to the caller's transaction when a session is given.
-	if( inserted ){
-
-		await incrementUsageTotals({ controller, usageId, $inc : { 'totals.actions' : amount }, session });
-
-	}
-
-};
-
 const percentage = ( value1, value2, decimals = 1 ) => ( ( ( ( value1 || 0 ) / ( value2 || 0 ) ) * 100 ) || 0 ).toFixed( decimals );
 
 const reducers = {
@@ -560,4 +440,4 @@ const currencies = data.map( ( item ) => ({
 
 const currency = ( val ) => code( val );
 
-export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, incrementUsageTotals, infinite, isDuplicateKey, isInfinite, megabyte, nanoid, percentage, recordAction, reducers, regex, shareUrls, urlRoot };
+export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };

package/dist/index.js

@@ -229,6 +229,67 @@ var constants_default = {
   }
 };
 
+// lib/usage.js
+var incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
+  if (!usageId || !$inc) return;
+  const safeInc = Object.fromEntries(
+    Object.entries($inc).filter(([, value]) => {
+      const number = Number(value);
+      return Number.isFinite(number) && number !== 0;
+    })
+  );
+  if (Object.keys(safeInc).length === 0) return;
+  return controller.update({
+    collection: "usage",
+    data: { $inc: safeInc },
+    options: {
+      bypassDocumentValidation: true,
+      ...session && { session }
+    },
+    query: { id: usageId }
+  });
+};
+var isDuplicateKey = (error) => (error == null ? void 0 : error.code) === 11e3 || (error == null ? void 0 : error.code) === "11000" || /E11000|duplicate key/i.test((error == null ? void 0 : error.message) || "");
+var recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
+  if (!controller || !organization || !usageId || !type || !key) return;
+  const amount = Number(units);
+  if (!Number.isFinite(amount) || amount === 0) return;
+  let inserted = false;
+  try {
+    const { lastErrorObject } = await controller.update({
+      collection: "action",
+      data: {
+        $setOnInsert: {
+          organization,
+          usage: usageId,
+          type,
+          units: amount,
+          key,
+          meta,
+          ...traceId && { traceId }
+        }
+      },
+      options: {
+        bypassDocumentValidation: true,
+        includeResultMetadata: true,
+        upsert: true,
+        ...session && { session }
+      },
+      query: {
+        key,
+        usage: usageId
+      }
+    });
+    inserted = Boolean(lastErrorObject == null ? void 0 : lastErrorObject.upserted);
+  } catch (error) {
+    if (isDuplicateKey(error) && !session) return;
+    throw error;
+  }
+  if (inserted) {
+    await incrementUsageTotals({ controller, usageId, $inc: { "totals.actions": amount }, session });
+  }
+};
+
 // index.js
 var nanoid = customAlphabet("0123456789abcdefghijklmnopqrstuvwxyz", 8);
 var constants = constants_default;
@@ -317,65 +378,6 @@ var getPlanFeature = (plan, key) => {
     message: granted ? feature : error
   };
 };
-var incrementUsageTotals = async ({ controller, usageId, $inc, session }) => {
-  if (!usageId || !$inc) return;
-  const safeInc = Object.fromEntries(
-    Object.entries($inc).filter(([, value]) => {
-      const number = Number(value);
-      return Number.isFinite(number) && number !== 0;
-    })
-  );
-  if (Object.keys(safeInc).length === 0) return;
-  return controller.update({
-    collection: "usage",
-    data: { $inc: safeInc },
-    options: {
-      bypassDocumentValidation: true,
-      ...session && { session }
-    },
-    query: { id: usageId }
-  });
-};
-var isDuplicateKey = (error) => (error == null ? void 0 : error.code) === 11e3 || (error == null ? void 0 : error.code) === "11000" || /E11000|duplicate key/i.test((error == null ? void 0 : error.message) || "");
-var recordAction = async ({ controller, organization, usageId, type, units = 1, key, meta = {}, traceId, session }) => {
-  if (!controller || !organization || !usageId || !type || !key) return;
-  const amount = Number(units);
-  if (!Number.isFinite(amount) || amount === 0) return;
-  let inserted = false;
-  try {
-    const { lastErrorObject } = await controller.update({
-      collection: "action",
-      data: {
-        $setOnInsert: {
-          organization,
-          usage: usageId,
-          type,
-          units: amount,
-          key,
-          meta,
-          ...traceId && { traceId }
-        }
-      },
-      options: {
-        bypassDocumentValidation: true,
-        includeResultMetadata: true,
-        upsert: true,
-        ...session && { session }
-      },
-      query: {
-        key,
-        usage: usageId
-      }
-    });
-    inserted = Boolean(lastErrorObject == null ? void 0 : lastErrorObject.upserted);
-  } catch (error) {
-    if (isDuplicateKey(error) && !session) return;
-    throw error;
-  }
-  if (inserted) {
-    await incrementUsageTotals({ controller, usageId, $inc: { "totals.actions": amount }, session });
-  }
-};
 var percentage = (value1, value2, decimals = 1) => ((value1 || 0) / (value2 || 0) * 100 || 0).toFixed(decimals);
 var reducers = {
   fields: (data2 = [], callback = () => ({})) => data2.reduce(

package/dist/phone.cjs

@@ -0,0 +1,48 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/phone.js
+var phone_exports = {};
+__export(phone_exports, {
+  isValid: () => isValid,
+  toE164: () => toE164
+});
+module.exports = __toCommonJS(phone_exports);
+var import_libphonenumber_js = require("libphonenumber-js");
+var toE164 = (value, country) => {
+  if (!value) return null;
+  try {
+    const parsed = (0, import_libphonenumber_js.parsePhoneNumberFromString)(String(value), country);
+    return parsed ? parsed.number : null;
+  } catch {
+    return null;
+  }
+};
+var isValid = (value, country) => {
+  if (!value) return false;
+  try {
+    return (0, import_libphonenumber_js.isValidPhoneNumber)(String(value), country);
+  } catch {
+    return false;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isValid,
+  toE164
+});

package/dist/phone.d.cts

@@ -0,0 +1,45 @@
+import { isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
+
+// Canonicalize a phone value to E.164 (e.g. '+15551234567'), or null if it cannot
+// be parsed. `country` (ISO 3166-1 alpha-2, e.g. 'US') is only needed for
+// national-format input; E.164 input (Shopify webhooks, react-phone-number-input)
+// parses without it. Lenient by design — returns the canonical form for any
+// parseable number so order/lead phone matching does not drop valid-but-unusual
+// numbers; clearly garbage input yields null.
+const toE164 = ( value, country ) => {
+
+	if( ! value ) return null;
+
+	try {
+
+		const parsed = parsePhoneNumberFromString( String( value ), country );
+
+		return parsed ? parsed.number : null;
+
+	} catch {
+
+		return null;
+
+	}
+
+};
+
+// Strict validity check (wraps libphonenumber-js). Mirrors the validation
+// drawbridge-api's submission route already performs on lead phone input.
+const isValid = ( value, country ) => {
+
+	if( ! value ) return false;
+
+	try {
+
+		return isValidPhoneNumber( String( value ), country );
+
+	} catch {
+
+		return false;
+
+	}
+
+};
+
+export { isValid, toE164 };

package/dist/phone.d.ts

@@ -0,0 +1,45 @@
+import { isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
+
+// Canonicalize a phone value to E.164 (e.g. '+15551234567'), or null if it cannot
+// be parsed. `country` (ISO 3166-1 alpha-2, e.g. 'US') is only needed for
+// national-format input; E.164 input (Shopify webhooks, react-phone-number-input)
+// parses without it. Lenient by design — returns the canonical form for any
+// parseable number so order/lead phone matching does not drop valid-but-unusual
+// numbers; clearly garbage input yields null.
+const toE164 = ( value, country ) => {
+
+	if( ! value ) return null;
+
+	try {
+
+		const parsed = parsePhoneNumberFromString( String( value ), country );
+
+		return parsed ? parsed.number : null;
+
+	} catch {
+
+		return null;
+
+	}
+
+};
+
+// Strict validity check (wraps libphonenumber-js). Mirrors the validation
+// drawbridge-api's submission route already performs on lead phone input.
+const isValid = ( value, country ) => {
+
+	if( ! value ) return false;
+
+	try {
+
+		return isValidPhoneNumber( String( value ), country );
+
+	} catch {
+
+		return false;
+
+	}
+
+};
+
+export { isValid, toE164 };