atmn 1.1.19 → 1.1.20

package/dist/cli.js

@@ -45772,30 +45772,16 @@ async function startCallbackServer(port, onCallback, onListening) {
     server.listen(port, onListening);
   });
 }
+function buildCliOAuthScopes() {
+  return CLI_SCOPE_REQUESTS.flatMap(({ resource, actions }) => actions.map((action) => `${resource}:${action}`));
+}
 async function startOAuthFlow(clientId, options) {
   const codeVerifier = generateCodeVerifier();
   const state = generateState();
   for (const port of OAUTH_PORTS) {
     const redirectUri = getOAuthRedirectUri(port);
     const client = new OAuth2Client(clientId, null, redirectUri);
-    const authUrl = client.createAuthorizationURLWithPKCE(getAuthorizationEndpoint(), state, CodeChallengeMethod.S256, codeVerifier, [
-      ...[
-        {
-          resource: "customers",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        {
-          resource: "features",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        {
-          resource: "plans",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        { resource: "apiKeys", actions: ["create", "read"] },
-        { resource: "organisation", actions: ["read"] }
-      ].flatMap(({ resource, actions }) => actions.map((action) => `${resource}:${action}`))
-    ]);
+    const authUrl = client.createAuthorizationURLWithPKCE(getAuthorizationEndpoint(), state, CodeChallengeMethod.S256, codeVerifier, buildCliOAuthScopes());
     authUrl.searchParams.set("prompt", "consent");
     const result2 = await startCallbackServer(port, async (url) => {
       const error = url.searchParams.get("error");
@@ -45872,12 +45858,29 @@ async function getApiKeysWithToken(accessToken) {
     orgId: data.org_id
   };
 }
-var getAuthorizationEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/authorize`, getTokenEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/token`;
+var getAuthorizationEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/authorize`, getTokenEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/token`, CLI_SCOPE_REQUESTS;
 var init_oauth = __esm(() => {
   init_dist8();
   init_open();
   init_backendUrl();
   init_constants();
+  CLI_SCOPE_REQUESTS = [
+    {
+      resource: "customers",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    {
+      resource: "features",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    {
+      resource: "plans",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    { resource: "rewards", actions: ["read", "write"] },
+    { resource: "apiKeys", actions: ["create", "read"] },
+    { resource: "organisation", actions: ["read"] }
+  ];
 });
 
 // src/lib/api/client.ts
@@ -47152,7 +47155,7 @@ function parseExistingConfig({
     }
     if (trimmed.startsWith("import ")) {
       const startLine = i;
-      while (i < lines.length && !lines[i].includes(";")) {
+      while (i < lines.length && !/(?:["'];?|;)\s*(?:\/\/.*|\/\*.*)?$/.test(lines[i])) {
         i++;
       }
       const endLine = i;
@@ -47205,7 +47208,7 @@ function parseExistingConfig({
             depth--;
           }
         }
-        if (foundStart && depth === 0 && currentLine.includes(";")) {
+        if (foundStart && depth === 0) {
           break;
         }
         i++;
@@ -48483,7 +48486,7 @@ var init_pull = __esm(() => {
 });
 
 // src/lib/version.ts
-var APP_VERSION = "1.1.19";
+var APP_VERSION = "1.1.20";
 
 // ../../node_modules/.bun/@tanstack+query-core@5.101.1/node_modules/@tanstack/query-core/build/modern/subscribable.js
 var Subscribable = class {
@@ -105929,7 +105932,7 @@ var init_usageLimit = __esm(() => {
     exports_external.string().min(1).max(USAGE_LIMIT_FILTER_MAX_VALUE_LENGTH),
     exports_external.number(),
     exports_external.boolean()
-  ]).transform(String);
+  ]).transform(String).pipe(exports_external.string());
   UsageLimitFilterSchema = exports_external.object({
     properties: exports_external.record(exports_external.string().min(1).max(USAGE_LIMIT_FILTER_MAX_KEY_LENGTH), UsageLimitFilterValueSchema).meta({
       description: "Event property equality conditions. A usage event counts toward this cap only when every listed property matches (AND)."
@@ -121538,7 +121541,7 @@ var init_eventsAggregateResponseV0 = __esm(() => {
 });
 
 // ../../shared/api/events/aggregate/eventsAggregateResponseV1.ts
-var EventAggregateListItemV1Schema, EventAggregateTotalItemSchema, EventsAggregateResponseV1Schema;
+var EventAggregateListItemV1Schema, EventAggregateTotalItemSchema, DeductionBalanceSchema, DeductionFeatureSchema, DeductionPeriodSchema, EventsAggregateResponseV1Schema;
 var init_eventsAggregateResponseV1 = __esm(() => {
   init_v4();
   EventAggregateListItemV1Schema = exports_external.object({
@@ -121556,12 +121559,57 @@ var init_eventsAggregateResponseV1 = __esm(() => {
     count: exports_external.number().meta({ description: "Number of events for this feature" }),
     sum: exports_external.number().meta({ description: "Sum of event values for this feature" })
   });
+  DeductionBalanceSchema = exports_external.object({
+    balance_id: exports_external.string().meta({
+      description: "ID of the balance row drawn from (customer_entitlement or rollover)."
+    }),
+    entity_id: exports_external.string().nullable().meta({
+      description: "Entity that owns this balance, or null when it is customer-level and shared."
+    }),
+    plan_id: exports_external.string().nullable().meta({
+      description: "Plan the balance came with. Null for balances created outside a plan."
+    }),
+    reset: exports_external.object({
+      interval: exports_external.string(),
+      resets_at: exports_external.number().nullable()
+    }).nullable().meta({ description: "Reset config for this balance, captured at deduction time." }),
+    credit_cost: exports_external.number().nullable().meta({
+      description: "Multiplier applied converting the tracked feature into this balance. Null when 1:1, or when the query spans sources converting at different rates."
+    }),
+    deducted: exports_external.number(),
+    events: exports_external.number()
+  });
+  DeductionFeatureSchema = exports_external.object({
+    feature_type: exports_external.enum(["metered", "credit_system"]).meta({
+      description: "credit_system means `deducted` is credits; metered means it is that feature's own amount."
+    }),
+    deducted: exports_external.number(),
+    events: exports_external.number(),
+    balances: exports_external.array(DeductionBalanceSchema)
+  });
+  DeductionPeriodSchema = exports_external.object({
+    period: exports_external.number().meta({
+      description: "Unix timestamp (epoch ms), same basis as `list`."
+    }),
+    values: exports_external.record(exports_external.string(), DeductionFeatureSchema).meta({
+      description: "Keyed by the feature that OWNS the balance drawn from, not the feature that was tracked."
+    }),
+    grouped_values: exports_external.record(exports_external.string(), exports_external.record(exports_external.string(), exports_external.object({
+      deducted: exports_external.number(),
+      credit_cost: exports_external.number().nullable().optional()
+    }))).optional().meta({
+      description: "Present only when group_by is used. Keyed by balance_id, then by group value — the only way to attribute a shared balance to the entity that spent from it."
+    })
+  });
   EventsAggregateResponseV1Schema = exports_external.object({
     list: exports_external.array(EventAggregateListItemV1Schema).meta({
       description: "Array of time periods with aggregated values"
     }),
     total: exports_external.record(exports_external.string(), EventAggregateTotalItemSchema).meta({
       description: "Total aggregations per feature. Keys are feature IDs, values contain count and sum."
+    }),
+    deductions: exports_external.array(DeductionPeriodSchema).optional().meta({
+      description: 'Per-balance breakdown of what was consumed. Present only when aggregate_on is "deducted".'
     })
   });
 });
@@ -126536,6 +126584,9 @@ var init_eventsAggregateParams = __esm(() => {
     }),
     max_groups: exports_external.number().int().min(1).max(250).optional().meta({
       description: "Maximum number of distinct group values to return per time bin when using group_by. Remaining values are bundled into an 'Other' bucket. Defaults to 9"
+    }),
+    aggregate_on: exports_external.enum(["deducted"]).optional().meta({
+      description: 'Set to "deducted" to additionally return a per-balance breakdown of what each event consumed, under `deductions`. Purely additive: `list` and `total` are unchanged. Requires customer_id.'
     })
   });
   EventsAggregateParamsSchema = ExtEventsAggregateParamsSchema.refine((data) => {
@@ -133860,7 +133911,7 @@ var init_error3 = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/access/access.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/access/access.mjs
 function unknownResourceResponse(requestedResource) {
   return {
     success: false,
@@ -133949,12 +134000,12 @@ var init_access = __esm(() => {
   init_error3();
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/access/index.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/access/index.mjs
 var init_access2 = __esm(() => {
   init_access();
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/organization/access/statement.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/organization/access/statement.mjs
 var defaultStatements, defaultAc, adminAc, ownerAc, memberAc;
 var init_statement = __esm(() => {
   init_access();
@@ -134028,7 +134079,7 @@ var init_statement = __esm(() => {
   });
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/organization/access/index.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/organization/access/index.mjs
 var init_access3 = __esm(() => {
   init_statement();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmn",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "license": "MIT",
   "bin": {
     "atmn": "dist/cli.js"
@@ -34,7 +34,7 @@
     "build": "bun run bun.config.ts",
     "dev": "nodemon -e ts,tsx --watch src --ignore dist --exec \"bun run bun.config.ts\"",
     "dev:bun": "bun run dev.ts",
-    "test": "bun test test/*.test.ts test/codegen test/nuke test/pull test/push test/workflow",
+    "test": "bun test test/*.test.ts test/auth test/codegen test/nuke test/pull test/push test/workflow",
     "test:integration": "cd ../../server && ENV_FILE=.env infisical run --env=dev --recursive -- bun test --timeout 0 ../packages/atmn/test/integration",
     "test:integration:cli": "cd ../../server && ENV_FILE=.env infisical run --env=dev --recursive -- bun ../packages/atmn/test/integration/cli.ts",
     "test:unit": "bun test test/codegen",