@drawbridge/drawbridge-utils 0.0.25 → 0.0.27

package/dist/cdn.d.cts

@@ -1,6 +1,6 @@
 // Build a DigitalOcean Spaces CDN URL with a cache-busting query string.
 // `asset` is any object with a `sizes` map. `size` is the sizes key (e.g.
-// '100x100', 'original', 'hsl'). `timestamp` is required — without it the
+// '100x100', 'original', 'hls'). `timestamp` is required — without it the
 // URL would never change across uploads and the CDN/browser would serve a
 // stale asset. Pass the asset's own `updatedAt` when it has one, or the
 // parent document's `updatedAt` for embedded assets like `user.image`.

package/dist/cdn.d.ts

@@ -1,6 +1,6 @@
 // Build a DigitalOcean Spaces CDN URL with a cache-busting query string.
 // `asset` is any object with a `sizes` map. `size` is the sizes key (e.g.
-// '100x100', 'original', 'hsl'). `timestamp` is required — without it the
+// '100x100', 'original', 'hls'). `timestamp` is required — without it the
 // URL would never change across uploads and the CDN/browser would serve a
 // stale asset. Pass the asset's own `updatedAt` when it has one, or the
 // parent document's `updatedAt` for embedded assets like `user.image`.

package/dist/index.cjs

@@ -31,6 +31,7 @@ __export(index_exports, {
   formatNumber: () => formatNumber,
   getPlanFeature: () => getPlanFeature,
   gigabyte: () => gigabyte,
+  incrementUsageTotals: () => incrementUsageTotals,
   infinite: () => infinite,
   isInfinite: () => isInfinite,
   megabyte: () => megabyte,
@@ -52,11 +53,6 @@ var font = {
   weight: "regular"
 };
 var constants_default = {
-  action: {
-    usage: {
-      actions: 0
-    }
-  },
   brand: {
     style: {
       body: font,
@@ -179,6 +175,11 @@ var constants_default = {
       users: 0
     }
   },
+  step: {
+    usage: {
+      actions: 0
+    }
+  },
   template: {
     page: {
       style: {
@@ -309,6 +310,25 @@ 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 percentage = (value1, value2, decimals = 1) => ((value1 || 0) / (value2 || 0) * 100 || 0).toFixed(decimals);
 var reducers = {
   fields: (data2 = [], callback = () => ({})) => data2.reduce(
@@ -400,6 +420,7 @@ var currency = (val) => (0, import_currency_codes.code)(val);
   formatNumber,
   getPlanFeature,
   gigabyte,
+  incrementUsageTotals,
   infinite,
   isInfinite,
   megabyte,

package/dist/index.d.cts

@@ -8,11 +8,6 @@ const font = {
 };
 
 var constantsData = {
-	action : {
-		usage : {
-			actions : 0
-		}
-	},
 	brand : {
 		style : {
 			body : font,
@@ -135,6 +130,11 @@ var constantsData = {
 			users : 0
 		}
 	},
+	step : {
+		usage : {
+			actions : 0
+		}
+	},
 	template : {
 		page : {
 			style : {
@@ -313,6 +313,44 @@ 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 }
+	});
+
+};
+
 const percentage = ( value1, value2, decimals = 1 ) => ( ( ( ( value1 || 0 ) / ( value2 || 0 ) ) * 100 ) || 0 ).toFixed( decimals );
 
 const reducers = {
@@ -411,4 +449,4 @@ const currencies = data.map( ( item ) => ({
 
 const currency = ( val ) => code( val );
 
-export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };
+export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, incrementUsageTotals, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };

package/dist/index.d.ts

@@ -8,11 +8,6 @@ const font = {
 };
 
 var constantsData = {
-	action : {
-		usage : {
-			actions : 0
-		}
-	},
 	brand : {
 		style : {
 			body : font,
@@ -135,6 +130,11 @@ var constantsData = {
 			users : 0
 		}
 	},
+	step : {
+		usage : {
+			actions : 0
+		}
+	},
 	template : {
 		page : {
 			style : {
@@ -313,6 +313,44 @@ 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 }
+	});
+
+};
+
 const percentage = ( value1, value2, decimals = 1 ) => ( ( ( ( value1 || 0 ) / ( value2 || 0 ) ) * 100 ) || 0 ).toFixed( decimals );
 
 const reducers = {
@@ -411,4 +449,4 @@ const currencies = data.map( ( item ) => ({
 
 const currency = ( val ) => code( val );
 
-export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };
+export { bytesToGB, bytesToMB, capitalize, constants, currencies, currency, expiredPaymentMethod, formatCurrency, formatDateString, formatNumber, getPlanFeature, gigabyte, incrementUsageTotals, infinite, isInfinite, megabyte, nanoid, percentage, reducers, regex, shareUrls, urlRoot };

package/dist/index.js

@@ -9,11 +9,6 @@ var font = {
   weight: "regular"
 };
 var constants_default = {
-  action: {
-    usage: {
-      actions: 0
-    }
-  },
   brand: {
     style: {
       body: font,
@@ -136,6 +131,11 @@ var constants_default = {
       users: 0
     }
   },
+  step: {
+    usage: {
+      actions: 0
+    }
+  },
   template: {
     page: {
       style: {
@@ -266,6 +266,25 @@ 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 percentage = (value1, value2, decimals = 1) => ((value1 || 0) / (value2 || 0) * 100 || 0).toFixed(decimals);
 var reducers = {
   fields: (data2 = [], callback = () => ({})) => data2.reduce(
@@ -356,6 +375,7 @@ export {
   formatNumber,
   getPlanFeature,
   gigabyte,
+  incrementUsageTotals,
   infinite,
   isInfinite,
   megabyte,

package/dist/shopify.cjs

@@ -175,6 +175,7 @@ var resolveConnectionSettings = async ({ connection, controller }) => {
   };
 };
 var refreshAdminToken = async ({ connection, controller }) => {
+  var _a;
   const credential = await controller.get({
     collection: "credential",
     query: {
@@ -186,7 +187,7 @@ var refreshAdminToken = async ({ connection, controller }) => {
   }
   ;
   const settings = decrypt(credential.settings);
-  const { identifier: domain } = credential;
+  const domain = (_a = credential.provider) == null ? void 0 : _a.id;
   const { refreshToken } = settings;
   const data = await shopifyOAuthFetch(
     `https://${domain}/admin/oauth/access_token`,

package/dist/shopify.d.cts

@@ -186,7 +186,7 @@ const refreshAdminToken = async ({ connection, controller }) => {
 
 	}
 	const settings = decrypt( credential.settings );
-	const { identifier : domain } = credential;
+	const domain = credential.provider?.id;
 	const { refreshToken } = settings;
 
 	const data = await shopifyOAuthFetch(

package/dist/shopify.d.ts

@@ -186,7 +186,7 @@ const refreshAdminToken = async ({ connection, controller }) => {
 
 	}
 	const settings = decrypt( credential.settings );
-	const { identifier : domain } = credential;
+	const domain = credential.provider?.id;
 	const { refreshToken } = settings;
 
 	const data = await shopifyOAuthFetch(

package/dist/shopify.js

@@ -101,6 +101,7 @@ var resolveConnectionSettings = async ({ connection, controller }) => {
   };
 };
 var refreshAdminToken = async ({ connection, controller }) => {
+  var _a;
   const credential = await controller.get({
     collection: "credential",
     query: {
@@ -112,7 +113,7 @@ var refreshAdminToken = async ({ connection, controller }) => {
   }
   ;
   const settings = decrypt(credential.settings);
-  const { identifier: domain } = credential;
+  const domain = (_a = credential.provider) == null ? void 0 : _a.id;
   const { refreshToken } = settings;
   const data = await shopifyOAuthFetch(
     `https://${domain}/admin/oauth/access_token`,

package/package.json

@@ -1,6 +1,7 @@
 {
   "type": "module",
   "dependencies": {
+    "@drawbridge/drawbridge-agents": "0.0.10",
     "axios": "1.16.0",
     "currency-codes": "2.2.0",
     "nanoid": "3.3.8",
@@ -87,9 +88,9 @@
     "access": "public"
   },
   "scripts": {
-    "sync": ". \"$HOME/.nvm/nvm.sh\" && nvm use && npm prune && npm install",
+    "sync": ". \"$HOME/.nvm/nvm.sh\" && nvm use && npm prune && npm install && npx drawbridge-agents-sync",
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.25"
+  "version": "0.0.27"
 }