owostack 0.4.2 → 0.4.4

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { CheckResult, PlanFeatureEntry, ResetInterval, CreditSystemDefinition, AddEntityResult, RemoveEntityResult, ListEntitiesResult, MeteredFeatureConfig, TrackResult, PricingTier, CatalogEntry, SyncPayload, Currency, CreditPackDefinition, PlanInterval, PlanDefinition, OwostackConfig, BillingUsageParams, BillingUsageResult, InvoiceParams, InvoiceResult, InvoicesParams, InvoicesResult, PayInvoiceParams, PayInvoiceResult, WalletResult, WalletSetupResult, WalletRemoveResult, CustomerParams, CustomerResult, SetCustomerFeatureConfigParams, SetCustomerOverageLimitParams, SyncResult, AttachParams, AttachResult, CheckParams, TrackParams, AddonParams, AddonResult, AddEntityParams, RemoveEntityParams, ListEntitiesParams, PlansParams, PlansResult, PublicPlan } from '@owostack/types';
-export { AddEntityParams, AddEntityResult, AddonParams, AddonResult, AttachParams, AttachResult, BillingFeatureUsage, BillingTierBreakdown, BillingUsageParams, BillingUsageResult, BooleanFeatureConfig, CardInfo, CatalogEntry, CheckCode, CheckParams, CheckResult, CreditPlanBalance, CreditSystemBalanceDetails, CreditsBalanceDetails, CurrentPricingTier, CustomerBillingConfig, CustomerData, CustomerFeatureConfigResult, CustomerOverageLimitResult, CustomerParams, CustomerResult, Invoice, InvoiceLineItem, InvoiceParams, InvoiceResult, InvoicesParams, InvoicesResult, ListEntitiesParams, ListEntitiesResult, MeteredFeatureConfig, OverageDetails, OwostackConfig, PayInvoiceParams, PayInvoiceResult, PaymentMethodInfo, PlanDefinition, PlanFeatureEntry, PlansParams, PlansResult, PrepaidBalanceDetails, PricingDetails, PricingTier, PublicPlan, PublicPlanFeature, RatingModel, RemoveEntityParams, RemoveEntityResult, ResponseDetails, SetCustomerFeatureConfigParams, SetCustomerOverageLimitParams, SyncChanges, SyncPayload, SyncResult, TrackCode, TrackParams, TrackResult, WalletRemoveResult, WalletResult, WalletSetupResult } from '@owostack/types';
+import { CheckResult, PlanFeatureEntry, ResetInterval, CreditSystemDefinition, AddEntityResult, RemoveEntityResult, ListEntitiesResult, MeteredFeatureConfig, TrackResult, PricingTier, CatalogEntry, SyncPayload, Currency, CreditPackDefinition, PlanInterval, PlanDefinition, OwostackConfig, BillingUsageParams, BillingUsageResult, InvoiceParams, InvoiceResult, InvoicesParams, InvoicesResult, PayInvoiceParams, PayInvoiceResult, WalletResult, WalletSetupResult, WalletRemoveResult, CustomerParams, CustomerResult, SetCustomerFeatureConfigParams, SetCustomerOverageLimitParams, UsageHistoryParams, UsageHistoryResult, SyncResult, AttachParams, AttachResult, CheckParams, TrackParams, AddonParams, AddonResult, AddEntityParams, RemoveEntityParams, ListEntitiesParams, PlansParams, PlansResult, PublicPlan } from '@owostack/types';
+export { AddEntityParams, AddEntityResult, AddonParams, AddonResult, AttachParams, AttachResult, BillingFeatureUsage, BillingTierBreakdown, BillingUsageParams, BillingUsageResult, BooleanFeatureConfig, CardInfo, CatalogEntry, CheckCode, CheckParams, CheckResult, CreditPlanBalance, CreditSystemBalanceDetails, CreditsBalanceDetails, CurrentPricingTier, CustomerBillingConfig, CustomerData, CustomerFeatureConfigResult, CustomerOverageLimitResult, CustomerParams, CustomerResult, Invoice, InvoiceLineItem, InvoiceParams, InvoiceResult, InvoicesParams, InvoicesResult, ListEntitiesParams, ListEntitiesResult, MeteredFeatureConfig, OverageDetails, OwostackConfig, PayInvoiceParams, PayInvoiceResult, PaymentMethodInfo, PlanDefinition, PlanFeatureEntry, PlansParams, PlansResult, PrepaidBalanceDetails, PricingDetails, PricingTier, PublicPlan, PublicPlanFeature, RatingModel, RemoveEntityParams, RemoveEntityResult, ResponseDetails, SetCustomerFeatureConfigParams, SetCustomerOverageLimitParams, SyncChanges, SyncPayload, SyncResult, TrackCode, TrackParams, TrackResult, UsageHistoryParams, UsageHistoryResult, WalletRemoveResult, WalletResult, WalletSetupResult } from '@owostack/types';
 
 /**
  * BooleanHandle — returned by boolean().
@@ -381,6 +381,7 @@ type CustomerFn = {
     (params: CustomerParams): Promise<CustomerResult>;
     setFeatureConfig(params: SetCustomerFeatureConfigParams): Promise<CustomerResult>;
     setOverageLimit(params: SetCustomerOverageLimitParams): Promise<CustomerResult>;
+    usageHistory(params: UsageHistoryParams): Promise<UsageHistoryResult>;
 };
 type WalletFn = {
     (customer: string): Promise<WalletResult>;

package/dist/index.js

@@ -392,6 +392,40 @@ function creditPack(slug, config) {
 function slugToName(slug) {
   return slug.split(/[-_]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
 }
+function collectReferencedCreditSystems(catalog) {
+  const creditSystems = catalog.filter(
+    (entry) => entry._type === "credit_system"
+  );
+  const knownCreditSystemSlugs = new Set(creditSystems.map((cs) => cs.slug));
+  for (const entry of catalog) {
+    if (entry._type !== "plan") continue;
+    for (const feature of entry.features) {
+      const creditSystemHandle = _creditSystemRegistry.get(feature.slug);
+      if (!creditSystemHandle || knownCreditSystemSlugs.has(feature.slug)) {
+        continue;
+      }
+      creditSystems.push(creditSystemHandle._buildDefinition());
+      knownCreditSystemSlugs.add(feature.slug);
+    }
+  }
+  return creditSystems;
+}
+function collectCatalogFeatureSlugs(catalog) {
+  const featureSlugs = /* @__PURE__ */ new Set();
+  for (const entry of catalog) {
+    if (entry._type !== "plan") continue;
+    for (const feature of entry.features) {
+      if (_creditSystemRegistry.has(feature.slug)) continue;
+      featureSlugs.add(feature.slug);
+    }
+  }
+  for (const creditSystem2 of collectReferencedCreditSystems(catalog)) {
+    for (const feature of creditSystem2.features) {
+      featureSlugs.add(feature.feature);
+    }
+  }
+  return featureSlugs;
+}
 function buildSyncPayload(catalog, defaultProvider) {
   const featureMap = /* @__PURE__ */ new Map();
   for (const entry of catalog) {
@@ -411,9 +445,16 @@ function buildSyncPayload(catalog, defaultProvider) {
       }
     }
   }
-  for (const entry of catalog) {
-    if (entry._type !== "credit_system") continue;
-    for (const csFeature of entry.features) {
+  const creditSystems = collectReferencedCreditSystems(
+    catalog
+  ).map((cs) => ({
+    slug: cs.slug,
+    name: cs.name,
+    description: cs.description,
+    features: cs.features
+  }));
+  for (const creditSystem2 of creditSystems) {
+    for (const csFeature of creditSystem2.features) {
       const featureSlug = csFeature.feature;
       if (!featureMap.has(featureSlug)) {
         const handle = _featureRegistry.get(featureSlug);
@@ -425,47 +466,6 @@ function buildSyncPayload(catalog, defaultProvider) {
       }
     }
   }
-  for (const entry of catalog) {
-    if (entry._type !== "plan") continue;
-    for (const f of entry.features) {
-      const csHandle = _creditSystemRegistry.get(f.slug);
-      if (csHandle) {
-        const def = csHandle._buildDefinition();
-        for (const csFeature of def.features) {
-          const featureSlug = csFeature.feature;
-          if (!featureMap.has(featureSlug)) {
-            const handle = _featureRegistry.get(featureSlug);
-            featureMap.set(featureSlug, {
-              slug: featureSlug,
-              type: "metered",
-              name: handle?.featureName || slugToName(featureSlug)
-            });
-          }
-        }
-      }
-    }
-  }
-  const creditSystems = catalog.filter((e) => e._type === "credit_system").map((cs) => ({
-    slug: cs.slug,
-    name: cs.name,
-    description: cs.description,
-    features: cs.features
-  }));
-  for (const entry of catalog) {
-    if (entry._type !== "plan") continue;
-    for (const f of entry.features) {
-      const csHandle = _creditSystemRegistry.get(f.slug);
-      if (csHandle && !creditSystems.find((cs) => cs.slug === f.slug)) {
-        const def = csHandle._buildDefinition();
-        creditSystems.push({
-          slug: def.slug,
-          name: def.name,
-          description: def.description,
-          features: def.features
-        });
-      }
-    }
-  }
   const plans = catalog.filter((e) => e._type === "plan").map((p) => ({
     slug: p.slug,
     name: p.name,
@@ -545,14 +545,7 @@ function buildSyncPayload(catalog, defaultProvider) {
 }
 function bindFeatureHandles(client, catalog) {
   if (catalog) {
-    const slugsInCatalog = /* @__PURE__ */ new Set();
-    for (const entry of catalog) {
-      if (entry._type === "plan") {
-        for (const f of entry.features) {
-          slugsInCatalog.add(f.slug);
-        }
-      }
-    }
+    const slugsInCatalog = collectCatalogFeatureSlugs(catalog);
     for (const [slug, handle] of _featureRegistry) {
       if (slugsInCatalog.has(slug)) {
         handle._client = client;
@@ -934,6 +927,20 @@ function buildCustomerFn(client) {
   const fn = ((params) => client.post("/customers", params));
   fn.setFeatureConfig = (params) => client.post("/customers/feature-config", params);
   fn.setOverageLimit = (params) => client.post("/customers/overage-limit", params);
+  fn.usageHistory = (params) => {
+    const query = {};
+    if (params.range) query.range = params.range;
+    if (params.granularity) query.granularity = params.granularity;
+    if (params.feature) query.feature = params.feature;
+    if (params.groupBy) query.groupBy = params.groupBy;
+    if (params.timezone) query.timezone = params.timezone;
+    if (params.from) query.from = params.from;
+    if (params.to) query.to = params.to;
+    return client.get(
+      `/customers/${encodeURIComponent(params.customer)}/usage/history`,
+      query
+    );
+  };
   return fn;
 }
 function buildWalletFn(client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owostack",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Core SDK for Owostack billing infrastructure",
   "license": "Apache-2.0",
   "repository": {
@@ -30,7 +30,7 @@
     "payments"
   ],
   "dependencies": {
-    "@owostack/types": "0.4.2"
+    "@owostack/types": "0.4.3"
   },
   "devDependencies": {
     "tsup": "^8.3.6",