@reactionary/source 0.6.1 → 0.6.3

package/packages/commercetools/src/test/client-builder-merge-extensions.example.ts

@@ -0,0 +1,125 @@
+import {
+  ClientBuilder,
+  createInitialRequestContext,
+  NoOpCache,
+  ProductSchema,
+  StoreSchema,
+  type RequestContext,
+} from '@reactionary/core';
+import type { ProductProjection, Channel } from '@commercetools/platform-sdk';
+import * as z from 'zod';
+import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
+import { withCommercetoolsCapabilities } from '../core/initialize.js';
+import { CommercetoolsProductFactory } from '../factories/product/product.factory.js';
+import { CommercetoolsStoreFactory } from '../factories/store/store.factory.js';
+import { assertNotAny, assertType } from '../factories/product/utils.example.js';
+
+const ExtendedProductSchema = ProductSchema.safeExtend({
+  extendedProductValue: z.string(),
+});
+
+class ExtendedCommercetoolsProductFactory extends CommercetoolsProductFactory<
+  typeof ExtendedProductSchema
+> {
+  constructor() {
+    super(ExtendedProductSchema);
+  }
+
+  public override parseProduct(context: RequestContext, data: ProductProjection) {
+    const base = super.parseProduct(context, data);
+    return this.productSchema.parse({
+      ...base,
+      extendedProductValue: 'from-product-factory',
+    });
+  }
+}
+
+const ExtendedStoreSchema = StoreSchema.safeExtend({
+  extendedStoreValue: z.string(),
+});
+
+class ExtendedCommercetoolsStoreFactory extends CommercetoolsStoreFactory<
+  typeof ExtendedStoreSchema
+> {
+  constructor() {
+    super(ExtendedStoreSchema);
+  }
+
+  public override parseStore(context: RequestContext, data: Channel) {
+    const base = super.parseStore(context, data);
+    return this.storeSchema.parse({
+      ...base,
+      extendedStoreValue: 'from-store-factory',
+    });
+  }
+}
+
+const config = {
+  apiUrl: 'https://api.example.invalid',
+  authUrl: 'https://auth.example.invalid',
+  clientId: 'test-client',
+  clientSecret: 'test-secret',
+  projectKey: 'test-project',
+  scopes: [],
+  paymentMethods: [],
+  facetFieldsForSearch: [],
+} satisfies CommercetoolsConfiguration;
+
+function createMergedClientExample() {
+  const cache = new NoOpCache();
+  const context = createInitialRequestContext();
+
+  const withProduct = withCommercetoolsCapabilities(config, {
+    product: {
+      enabled: true,
+      factory: new ExtendedCommercetoolsProductFactory(),
+    },
+  });
+
+  const withStore = withCommercetoolsCapabilities(config, {
+    store: {
+      enabled: true,
+      factory: new ExtendedCommercetoolsStoreFactory(),
+    },
+  });
+
+  const client = new ClientBuilder(context)
+    .withCache(cache)
+    .withCapability(withProduct)
+    .withCapability(withStore)
+    .build();
+
+  client.product
+    .getById({
+      identifier: { key: 'p-1' },
+    })
+    .then((result) => {
+      assertNotAny(result);
+      if (result.success) {
+        assertNotAny(result.value);
+        assertNotAny(result.value.extendedProductValue);
+        assertType<string>(result.value.extendedProductValue);
+      }
+    });
+
+  client.store
+    .queryByProximity({
+      longitude: 10.0,
+      latitude: 56.0,
+      distance: 50,
+      limit: 5,
+    })
+    .then((result) => {
+      assertNotAny(result);
+      if (result.success) {
+        const first = result.value[0];
+        assertNotAny(first);
+        assertNotAny(first.extendedStoreValue);
+        assertType<string>(first.extendedStoreValue);
+      }
+    });
+
+  return client;
+}
+
+void createMergedClientExample;

package/{providers/algolia → packages/commercetools}/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "NodeNext",
+    "module": "nodenext",
     "moduleResolution": "nodenext",
     "forceConsistentCasingInFileNames": true,
     "strict": true,

package/{core → packages/commercetools}/tsconfig.lib.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "declaration": true,
     "types": ["node"]
   },

package/packages/commercetools/tsconfig.spec.json

@@ -0,0 +1,28 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}

package/packages/commercetools/vite.config.ts

@@ -0,0 +1,26 @@
+/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
+
+export default defineConfig(() => ({
+  root: import.meta.dirname,
+  cacheDir: '../../node_modules/.vite/packages/commercetools',
+  plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
+  // Uncomment this if you are using workers.
+  // worker: {
+  //   plugins: () => [ nxViteTsPaths() ],
+  // },
+  test: {
+    name: 'commercetools',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/packages/commercetools',
+      provider: 'v8' as const,
+    },
+  },
+}));

package/packages/commercetools/vitest.config.mts

@@ -0,0 +1,21 @@
+import { defineConfig } from 'vitest/config';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/packages/commercetools',
+  plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
+  test: {
+    name: 'commercetools',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/packages/commercetools',
+      provider: 'v8' as const,
+    },
+  },
+}));

package/{providers/fake → packages/core}/eslint.config.mjs

@@ -9,8 +9,9 @@ export default [
         'error',
         {
           ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
+            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
             '{projectRoot}/esbuild.config.{js,ts,mjs,mts}',
+            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
           ],
         },
       ],

package/{core → packages/core}/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@reactionary/core",
   "version": "0.0.1",
-  "main": "index.js",
-  "types": "src/index.d.ts",
+  "type": "module",
+  "main": "./index.js",
+  "types": "./src/index.d.ts",
   "dependencies": {
     "zod": "4.1.9",
     "@upstash/redis": "^1.34.9",
-    "node-object-hash": "^3.1.1"
-  },
-  "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.9.0",
+    "node-object-hash": "^3.1.1",
+    "vitest": "^4.0.9",
+    "@nx/vite": "22.4.5"
   },
-  "type": "module",
   "sideEffects": false
 }

package/packages/core/project.json

@@ -0,0 +1,33 @@
+{
+  "name": "core",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/core/src",
+  "projectType": "library",
+  "release": {
+    "version": {
+      "manifestRootsToUpdate": ["dist/{projectRoot}"],
+      "currentVersionResolver": "git-tag",
+      "fallbackCurrentVersionResolver": "disk"
+    }
+  },
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/esbuild:esbuild",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/packages/core",
+        "main": "packages/core/src/index.ts",
+        "tsConfig": "packages/core/tsconfig.lib.json",
+        "assets": ["packages/core/*.md"],
+        "format": ["esm"],
+        "bundle": false
+      }
+    },
+    "nx-release-publish": {
+      "options": {
+        "packageRoot": "dist/{projectRoot}"
+      }
+    }
+  }
+}

package/{core/src/providers/analytics.provider.ts → packages/core/src/capabilities/analytics.capability.ts}

@@ -1,5 +1,5 @@
 import type { RequestContext } from '../schemas/session.schema.js';
-import { BaseProvider } from './base.provider.js';
+import { BaseCapability } from './base.capability.js';
 import type { Cache } from '../cache/cache.interface.js';
 import {
   AnalyticsMutationSchema,
@@ -12,7 +12,7 @@ import {
 } from '../schemas/index.js';
 import { Reactionary } from '../decorators/reactionary.decorator.js';
 
-export abstract class AnalyticsProvider extends BaseProvider {
+export abstract class AnalyticsCapability extends BaseCapability {
   protected override getResourceName(): string {
     return 'analytics';
   }
@@ -58,25 +58,25 @@ export abstract class AnalyticsProvider extends BaseProvider {
   }
 }
 
-export class MulticastAnalyticsProvider extends AnalyticsProvider {
-  protected providers: Array<AnalyticsProvider>;
+export class MulticastAnalyticsCapability extends AnalyticsCapability {
+  protected capabilities: Array<AnalyticsCapability>;
 
   constructor(
     cache: Cache,
     requestContext: RequestContext,
-    providers: Array<AnalyticsProvider>
+    capabilities: Array<AnalyticsCapability>
   ) {
     super(cache, requestContext);
 
-    this.providers = providers;
+    this.capabilities = capabilities;
   }
 
   @Reactionary({
     inputSchema: AnalyticsMutationSchema,
   })
   public override async track(event: AnalyticsMutation) {
-    for (const provider of this.providers) {
-      provider.track(event);
+    for (const capability of this.capabilities) {
+      capability.track(event);
     }
   }
 }

package/{core/src/providers/base.provider.ts → packages/core/src/capabilities/base.capability.ts}

@@ -3,10 +3,10 @@ import { type RequestContext } from '../schemas/session.schema.js';
 import { hasher } from "node-object-hash";
 
 /**
- * Base capability provider, responsible for mutations (changes) and queries (fetches)
+ * Base capability abstraction, responsible for mutations (changes) and queries (fetches)
  * for a given business object domain.
  */
-export abstract class BaseProvider {
+export abstract class BaseCapability {
   protected cache: Cache;
   protected context: RequestContext;
 

package/{core/src/providers/cart.provider.ts → packages/core/src/capabilities/cart.capability.ts}

@@ -4,12 +4,15 @@ import type { CartIdentifier } from "../schemas/models/identifiers.model.js";
 import type { CartMutationApplyCoupon, CartMutationChangeCurrency, CartMutationDeleteCart, CartMutationItemAdd, CartMutationItemQuantityChange, CartMutationItemRemove, CartMutationRemoveCoupon } from "../schemas/mutations/cart.mutation.js";
 import type { CartQueryById } from "../schemas/queries/cart.query.js";
 import type { Result } from "../schemas/result.js";
-import { BaseProvider } from "./base.provider.js";
+import { BaseCapability } from "./base.capability.js";
 
 /**
  * @group Providers
  */
-export abstract class CartProvider extends BaseProvider {
+export abstract class CartCapability<
+  TCart extends Cart = Cart,
+  TCartIdentifier extends CartIdentifier = CartIdentifier,
+> extends BaseCapability {
 
   /**
    * Get cart by ID.
@@ -18,7 +21,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract getById(payload: CartQueryById): Promise<Result<Cart, NotFoundError>>;
+  public abstract getById(payload: CartQueryById): Promise<Result<TCart, NotFoundError>>;
 
 
   /**
@@ -27,7 +30,7 @@ export abstract class CartProvider extends BaseProvider {
    * Usecase: Most common usecase during site load, or after login. You want to get the active cart for the user, so you can display it in the minicart.
    * @param session
    */
-  public abstract getActiveCartId(): Promise<Result<CartIdentifier, NotFoundError>>;
+  public abstract getActiveCartId(): Promise<Result<TCartIdentifier, NotFoundError>>;
 
 
   /**
@@ -39,7 +42,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract add(payload: CartMutationItemAdd): Promise<Result<Cart>>;
+  public abstract add(payload: CartMutationItemAdd): Promise<Result<TCart>>;
 
   /**
    * Remove item from cart. If the cart is empty after removal, delete the cart. Returns the updated and recalculated cart.
@@ -48,7 +51,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract remove(payload: CartMutationItemRemove): Promise<Result<Cart>>;
+  public abstract remove(payload: CartMutationItemRemove): Promise<Result<TCart>>;
 
   /**
    * Change quantity of item in cart. If the cart is empty after change, delete the cart. Returns the updated and recalculated cart.
@@ -59,7 +62,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract changeQuantity(payload: CartMutationItemQuantityChange): Promise<Result<Cart>>;
+  public abstract changeQuantity(payload: CartMutationItemQuantityChange): Promise<Result<TCart>>;
 
 
   /**
@@ -78,7 +81,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract applyCouponCode(payload: CartMutationApplyCoupon): Promise<Result<Cart>>;
+  public abstract applyCouponCode(payload: CartMutationApplyCoupon): Promise<Result<TCart>>;
 
 
   /**
@@ -88,7 +91,7 @@ export abstract class CartProvider extends BaseProvider {
    * @param payload
    * @param session
    */
-  public abstract removeCouponCode(payload: CartMutationRemoveCoupon): Promise<Result<Cart>>;
+  public abstract removeCouponCode(payload: CartMutationRemoveCoupon): Promise<Result<TCart>>;
 
   /**
    * Changes the currency of the cart.
@@ -97,10 +100,9 @@ export abstract class CartProvider extends BaseProvider {
    * @param newCurrency
    * @param session
    */
-  public abstract changeCurrency(payload: CartMutationChangeCurrency): Promise<Result<Cart>>;
+  public abstract changeCurrency(payload: CartMutationChangeCurrency): Promise<Result<TCart>>;
 
   protected override getResourceName(): string {
     return 'cart';
   }
 }
-

package/{core/src/providers/category.provider.ts → packages/core/src/capabilities/category.capability.ts}

@@ -1,19 +1,22 @@
 import type { Category, CategoryPaginatedResult, NotFoundError, Result } from "../schemas/index.js";
 import type { CategoryQueryById, CategoryQueryBySlug, CategoryQueryForBreadcrumb, CategoryQueryForChildCategories, CategoryQueryForTopCategories } from "../schemas/queries/category.query.js";
-import { BaseProvider } from "./base.provider.js";
+import { BaseCapability } from "./base.capability.js";
 
 
 
 /**
- * CategoryProvider
+ * CategoryCapability
  *
- * This provider allows fetching of single or sets of categories.
+ * This capability allows fetching of single or sets of categories.
  *
  * We only allow fetching one hierachy level at a time, for now. This is to avoid development patterns of "fetch 5000 categories in one go.."
  *
  * @group Foo
  */
-export abstract class CategoryProvider extends BaseProvider {
+export abstract class CategoryCapability<
+  TCategory extends Category = Category,
+  TCategoryPaginatedResult extends CategoryPaginatedResult = CategoryPaginatedResult,
+> extends BaseCapability {
   /**
    * Get a single category by its ID. Cannot return null, because HOW did you come across a categories ID that does not exist?
    *
@@ -29,7 +32,7 @@ export abstract class CategoryProvider extends BaseProvider {
    * @param id
    * @param session
    */
-  public abstract getById(payload: CategoryQueryById): Promise<Result<Category, NotFoundError>>;
+  public abstract getById(payload: CategoryQueryById): Promise<Result<TCategory, NotFoundError>>;
 
   /**
    * Gets a single category by its seo slug
@@ -38,7 +41,7 @@ export abstract class CategoryProvider extends BaseProvider {
    * @param slug the slug
    * @param session
    */
-  public abstract getBySlug(payload: CategoryQueryBySlug): Promise<Result<Category, NotFoundError>>;
+  public abstract getBySlug(payload: CategoryQueryBySlug): Promise<Result<TCategory, NotFoundError>>;
 
   /**
    * Gets the breadcrumb path to the category, i.e. all parents up to the root.
@@ -48,7 +51,7 @@ export abstract class CategoryProvider extends BaseProvider {
    * @param id
    * @param session
    */
-  public abstract getBreadcrumbPathToCategory(payload: CategoryQueryForBreadcrumb): Promise<Result<Category[]>>;
+  public abstract getBreadcrumbPathToCategory(payload: CategoryQueryForBreadcrumb): Promise<Result<TCategory[]>>;
 
   // hmm, this is not really good enough.... We need a type we can pass in that will allow us to specify the precise return type, but otoh we also need
   // to be able to verify and assert the output type. FIXME
@@ -63,7 +66,7 @@ export abstract class CategoryProvider extends BaseProvider {
    * @param id The ID of the parent category.
    * @param session The session information.
    */
-  public abstract findChildCategories(payload: CategoryQueryForChildCategories): Promise<Result<CategoryPaginatedResult>>;
+  public abstract findChildCategories(payload: CategoryQueryForChildCategories): Promise<Result<TCategoryPaginatedResult>>;
 
   /**
    * Returns all top categories, i.e. categories without a parent.
@@ -72,7 +75,7 @@ export abstract class CategoryProvider extends BaseProvider {
    * @param paginationOptions
    * @param session
    */
-  public abstract findTopCategories( payload: CategoryQueryForTopCategories): Promise<Result<CategoryPaginatedResult>>;
+  public abstract findTopCategories( payload: CategoryQueryForTopCategories): Promise<Result<TCategoryPaginatedResult>>;
 
 
   protected override getResourceName(): string {
@@ -80,4 +83,3 @@ export abstract class CategoryProvider extends BaseProvider {
   }
 
 }
-

package/{core/src/providers/checkout.provider.ts → packages/core/src/capabilities/checkout.capability.ts}

@@ -1,11 +1,15 @@
 import type { Checkout, PaymentMethod, ShippingMethod } from "../schemas/models/index.js";
-import { BaseProvider } from "./base.provider.js";
+import { BaseCapability } from "./base.capability.js";
 import type { CheckoutMutationFinalizeCheckout, CheckoutMutationInitiateCheckout, CheckoutMutationSetShippingAddress,  CheckoutMutationAddPaymentInstruction, CheckoutMutationRemovePaymentInstruction, CheckoutMutationSetShippingInstruction } from "../schemas/mutations/checkout.mutation.js";
 import type { CheckoutQueryById, CheckoutQueryForAvailablePaymentMethods, CheckoutQueryForAvailableShippingMethods } from "../schemas/queries/index.js";
 import type { Result } from "../schemas/result.js";
 import type { NotFoundError } from "../schemas/index.js";
 
-export abstract class CheckoutProvider extends BaseProvider {
+export abstract class CheckoutCapability<
+  TCheckout extends Checkout = Checkout,
+  TShippingMethod extends ShippingMethod = ShippingMethod,
+  TPaymentMethod extends PaymentMethod = PaymentMethod,
+> extends BaseCapability {
 
   /**
    * This starts a new checkout session for the given cart. The checkout might duplicate the cart, or just reference it, depending on implementation, but changes to the cart,
@@ -17,7 +21,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param billingAddress the billing/shipping address to start with. This affects available shipping methods, and may be required by some payment providers.
    * @param reqCtx
    */
-  public abstract initiateCheckoutForCart(payload: CheckoutMutationInitiateCheckout): Promise<Result<Checkout>>;
+  public abstract initiateCheckoutForCart(payload: CheckoutMutationInitiateCheckout): Promise<Result<TCheckout>>;
 
 
   /**
@@ -27,7 +31,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param payload
    * @param reqCtx
    */
-  public abstract getById(payload:  CheckoutQueryById): Promise<Result<Checkout, NotFoundError>>;
+  public abstract getById(payload:  CheckoutQueryById): Promise<Result<TCheckout, NotFoundError>>;
 
   /**
    * Updates the shipping address for the checkout and recalculates the shipping methods and totals.
@@ -37,7 +41,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * NOTE: Unsure this is really needed.
    * @param shippingAddress The updated shipping address. Note: This may also be the billing address, if your store does not differentiate.
    */
-  public abstract setShippingAddress(payload: CheckoutMutationSetShippingAddress): Promise<Result<Checkout>>;
+  public abstract setShippingAddress(payload: CheckoutMutationSetShippingAddress): Promise<Result<TCheckout>>;
 
   /**
    * Returns all available shipping methods for the given checkout. This will typically depend on the shipping address, and possibly also the items in the checkout.
@@ -47,7 +51,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param checkoutId The checkout you want to get shipping methods for.
    * @param reqCtx
    */
-  public abstract getAvailableShippingMethods(payload: CheckoutQueryForAvailableShippingMethods): Promise<Result<ShippingMethod[]>>;
+  public abstract getAvailableShippingMethods(payload: CheckoutQueryForAvailableShippingMethods): Promise<Result<TShippingMethod[]>>;
 
   /**
    * Returns all available payment methods for the given checkout. This will typically depend mostly on the billing address and jurisdiction.
@@ -57,7 +61,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param checkoutId The checkout you want to get payment methods for.
    * @param reqCtx
    */
-  public abstract getAvailablePaymentMethods(payload: CheckoutQueryForAvailablePaymentMethods): Promise<Result<PaymentMethod[]>>;
+  public abstract getAvailablePaymentMethods(payload: CheckoutQueryForAvailablePaymentMethods): Promise<Result<TPaymentMethod[]>>;
 
 
   /**
@@ -65,7 +69,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    *
    * Usecase: User has chosen a payment method, and you need to start the payment process.
    */
-  public abstract addPaymentInstruction(payload: CheckoutMutationAddPaymentInstruction): Promise<Result<Checkout>>;
+  public abstract addPaymentInstruction(payload: CheckoutMutationAddPaymentInstruction): Promise<Result<TCheckout>>;
 
   /**
    * Removes a payment instruction from the checkout. This will typically void the payment intent in the payment provider, and remove the payment instruction from the checkout.
@@ -73,7 +77,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * Usecase: User has decided to change payment method, or has cancelled the payment process.
    * @param paymentInstructionId
    */
-  public abstract removePaymentInstruction(payload: CheckoutMutationRemovePaymentInstruction): Promise<Result<Checkout>>;
+  public abstract removePaymentInstruction(payload: CheckoutMutationRemovePaymentInstruction): Promise<Result<TCheckout>>;
 
 
 
@@ -87,7 +91,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param shippingMethodId
    * @param pickupPoint
    */
-  public abstract setShippingInstruction(payload: CheckoutMutationSetShippingInstruction): Promise<Result<Checkout>>;
+  public abstract setShippingInstruction(payload: CheckoutMutationSetShippingInstruction): Promise<Result<TCheckout>>;
 
   /**
    * Finalizes the checkout process. This typically involves creating an order from the checkout and processing payment.
@@ -97,7 +101,7 @@ export abstract class CheckoutProvider extends BaseProvider {
    * @param payload
    * @param reqCtx
    */
-  public abstract finalizeCheckout(payload: CheckoutMutationFinalizeCheckout): Promise<Result<Checkout>>;
+  public abstract finalizeCheckout(payload: CheckoutMutationFinalizeCheckout): Promise<Result<TCheckout>>;
 
 
   public override getResourceName(): string {

package/{core/src/providers/identity.provider.ts → packages/core/src/capabilities/identity.capability.ts}

@@ -2,20 +2,20 @@ import type { Identity } from "../schemas/models/identity.model.js";
 import type { IdentityMutationLogin, IdentityMutationLogout, IdentityMutationRegister } from "../schemas/mutations/identity.mutation.js";
 import type { IdentityQuerySelf } from "../schemas/queries/identity.query.js";
 import type { Result } from "../schemas/result.js";
-import { BaseProvider } from "./base.provider.js";
+import { BaseCapability } from "./base.capability.js";
 
-export abstract class IdentityProvider extends BaseProvider {
-  public abstract getSelf(payload: IdentityQuerySelf): Promise<Result<Identity>>;
-  public abstract login(payload: IdentityMutationLogin): Promise<Result<Identity>>;
-  public abstract logout(payload: IdentityMutationLogout): Promise<Result<Identity>>;
-  public abstract register(payload: IdentityMutationRegister): Promise<Result<Identity>>;
+export abstract class IdentityCapability<TIdentity extends Identity = Identity> extends BaseCapability {
+  public abstract getSelf(payload: IdentityQuerySelf): Promise<Result<TIdentity>>;
+  public abstract login(payload: IdentityMutationLogin): Promise<Result<TIdentity>>;
+  public abstract logout(payload: IdentityMutationLogout): Promise<Result<TIdentity>>;
+  public abstract register(payload: IdentityMutationRegister): Promise<Result<TIdentity>>;
 
   protected override getResourceName(): string {
     return 'identity';
   }
 
-  protected updateIdentityContext(identity: Identity) {
+  protected updateIdentityContext(identity: TIdentity) {
     this.context.session.identityContext.lastUpdated = new Date();
-    this.context.session.identityContext.identity = identity;
+    this.context.session.identityContext.identity = identity as Identity;
   }
 }