Merge branch 'main' into luizgribeiro/#565/inMemoryClient

Signed-off-by: Luiz Guilherme Ribeiro <[email protected]>

.github/workflows/coverage.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version: 16

.github/workflows/dco-merge-group.yml

@@ -0,0 +1,12 @@
+name: DCO
+on:
+  merge_group:
+
+# Workaround because the DCO app doesn't run on a merge_group trigger
+# https://github.com/dcoapp/app/pull/200
+jobs:
+  DCO:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'renovate[bot]' }}
+    steps:
+      - run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue"

.github/workflows/pr-checks.yaml

@@ -8,6 +8,7 @@ on:
       - reopened
     branches:
       - main
+  merge_group:
 
 jobs:
   build-test-lint:
@@ -22,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -44,7 +45,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           cache: 'npm'
@@ -69,7 +70,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           # we need 'fetch' for this test, which is only in 18
           node-version: 18

.github/workflows/publish-experimental.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           registry-url: 'https://registry.npmjs.org'
 

.github/workflows/release-please.yml

@@ -19,15 +19,15 @@ jobs:
       release_created: ${{ steps.release.outputs.releases_created }}
 
   npm-release:
-    needs: Release-please
+    needs: release-please
     runs-on: ubuntu-latest
     if: ${{ needs.release-please.outputs.release_created }}
     steps:
       # The logic below handles the npm publication:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: "https://registry.npmjs.org"

package.json

@@ -34,7 +34,7 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@openfeature/flagd-provider": "^0.8.1",
+    "@openfeature/flagd-provider": "^0.9.0",
     "@openfeature/flagd-web-provider": "^0.4.0",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-typescript": "^11.0.0",
@@ -46,7 +46,7 @@
     "@typescript-eslint/parser": "^5.23.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.14.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-check-file": "^2.0.0",
     "eslint-plugin-import": "^2.26.0",

packages/server/src/index.ts

@@ -2,4 +2,5 @@ export * from './client';
 export * from './provider';
 export * from './evaluation';
 export * from './open-feature';
+export * from './transaction-context';
 export * from '@openfeature/shared';

packages/server/src/open-feature.ts

@@ -6,6 +6,12 @@ import {
   objectOrUndefined,
   stringOrUndefined,
 } from '@openfeature/shared';
+import {
+  ManageTransactionContextPropagator,
+  NOOP_TRANSACTION_CONTEXT_PROPAGATOR,
+  TransactionContext,
+  TransactionContextPropagator,
+} from './transaction-context';
 import { Client, OpenFeatureClient } from './client';
 
 // use a symbol as a key for the global singleton
@@ -16,7 +22,11 @@ type OpenFeatureGlobal = {
 };
 const _globalThis = globalThis as OpenFeatureGlobal;
 
-export class OpenFeatureAPI extends OpenFeatureCommonAPI<Provider> implements ManageContext<OpenFeatureAPI> {
+export class OpenFeatureAPI
+  extends OpenFeatureCommonAPI<Provider>
+  implements ManageContext<OpenFeatureAPI>, ManageTransactionContextPropagator<OpenFeatureCommonAPI<Provider>>
+{
+  private _transactionContextPropagator: TransactionContextPropagator = NOOP_TRANSACTION_CONTEXT_PROPAGATOR;
   protected _defaultProvider: Provider = NOOP_PROVIDER;
 
   private constructor() {
@@ -111,6 +121,39 @@ export class OpenFeatureAPI extends OpenFeatureCommonAPI<Provider> implements Ma
   clearProviders(): Promise<void> {
     return super.clearProvidersAndSetDefault(NOOP_PROVIDER);
   }
+
+  setTransactionContextPropagator(
+    transactionContextPropagator: TransactionContextPropagator
+  ): OpenFeatureCommonAPI<Provider> {
+    const baseMessage = 'Invalid TransactionContextPropagator, will not be set: ';
+    if (typeof transactionContextPropagator?.getTransactionContext !== 'function') {
+      this._logger.error(`${baseMessage}: getTransactionContext is not a function.`);
+    } else if (typeof transactionContextPropagator?.setTransactionContext !== 'function') {
+      this._logger.error(`${baseMessage}: setTransactionContext is not a function.`);
+    } else {
+      this._transactionContextPropagator = transactionContextPropagator;
+    }
+    return this;
+  }
+
+  setTransactionContext<R>(
+    transactionContext: TransactionContext,
+    callback: (...args: unknown[]) => R,
+    ...args: unknown[]
+  ): void {
+    this._transactionContextPropagator.setTransactionContext(transactionContext, callback, ...args);
+  }
+
+  getTransactionContext(): TransactionContext {
+    try {
+      return this._transactionContextPropagator.getTransactionContext();
+    } catch (err: unknown) {
+      const error = err as Error | undefined;
+      this._logger.error(`Error getting transaction context: ${error?.message}, returning empty context.`);
+      this._logger.error(error?.stack);
+      return {};
+    }
+  }
 }
 
 /**

packages/shared/src/transaction-context/no-op-transaction-context-propagator.ts → packages/server/src/transaction-context/no-op-transaction-context-propagator.ts

@@ -1,4 +1,4 @@
-import { EvaluationContext } from '../evaluation';
+import { EvaluationContext } from '@openfeature/shared';
 import { TransactionContextPropagator } from './transaction-context';
 
 class NoopTransactionContextPropagator implements TransactionContextPropagator {

packages/shared/src/transaction-context/transaction-context.ts → packages/server/src/transaction-context/transaction-context.ts

@@ -1,4 +1,4 @@
-import { EvaluationContext } from '../evaluation';
+import { EvaluationContext } from '@openfeature/shared';
 
 /**
  * Transaction context is a mechanism for adding transaction specific context that

packages/shared/src/index.ts

@@ -6,6 +6,5 @@ export * from './events';
 export * from './logger';
 export * from './provider';
 export * from './evaluation';
-export * from './transaction-context';
 export * from './type-guards';
 export * from './open-feature';