fixup: revert generalization attempt

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

libs/providers/flagd-web/schemas

@@ -4,6 +4,7 @@ export default {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: './tsconfig.lib.json' }],
   },
   moduleNameMapper: {
+    '@openfeature/flagd-core': ['<rootDir>/../../../../shared/flagd-core/src'],
     '^(.*)\\.js$': ['$1.js', '$1.ts', '$1'],
   },
   testEnvironment: 'node',

libs/providers/flagd-web/src/e2e/jest.config.ts

@@ -1,9 +1,14 @@
 import assert from 'assert';
-import { OpenFeature } from '@openfeature/web-sdk';
+import { Client, OpenFeature } from '@openfeature/web-sdk';
 import { GenericContainer, StartedTestContainer } from 'testcontainers';
 import { FlagdWebProvider } from '../../lib/flagd-web-provider';
 import { autoBindSteps, loadFeature } from 'jest-cucumber';
-import { flagStepDefinitions, GHERKIN_EVALUATION_FEATURE, IMAGE_VERSION } from '@openfeature/flagd-core';
+import {
+  E2E_CLIENT_NAME,
+  flagStepDefinitions,
+  GHERKIN_EVALUATION_FEATURE,
+  IMAGE_VERSION,
+} from '@openfeature/flagd-core';
 
 // register the flagd provider before the tests.
 async function setup() {
@@ -16,6 +21,7 @@ async function setup() {
     .start();
   containers.push(stable);
   OpenFeature.setProvider(
+    E2E_CLIENT_NAME,
     new FlagdWebProvider({
       host: stable.getHost(),
       port: stable.getMappedPort(8013),
@@ -24,9 +30,9 @@ async function setup() {
     }),
   );
   assert(
-    OpenFeature.providerMetadata.name === FlagdWebProvider.name,
+    OpenFeature.getProviderMetadata(E2E_CLIENT_NAME).name === E2E_CLIENT_NAME,
     new Error(
-      `Expected ${FlagdWebProvider.name} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`,
+      `Expected ${E2E_CLIENT_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`,
     ),
   );
   console.log('flagd provider configured!');

libs/providers/flagd-web/src/e2e/tests/provider.spec.ts

@@ -1,11 +1,12 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["ES2015", "DOM"],
+    "lib": ["ES2022", "DOM"],
     "outDir": "../../../dist/out-tsc",
     "declaration": true,
     "types": ["jest"],
     "allowSyntheticDefaultImports": true,
-    "allowJs" :true
+    "allowJs" :true,
+    "resolveJsonModule": true
   }
 }

libs/providers/flagd-web/src/e2e/tsconfig.lib.json

@@ -4,13 +4,13 @@ import { FlagdProvider } from '../../lib/flagd-provider';
 import { GenericContainer, StartedTestContainer } from 'testcontainers';
 import { autoBindSteps, loadFeature } from 'jest-cucumber';
 import {
-  FLAGD_NAME,
-  IMAGE_VERSION,
-  UNAVAILABLE_CLIENT_NAME,
   UNSTABLE_CLIENT_NAME,
-  reconnectStepDefinitions,
+  UNAVAILABLE_CLIENT_NAME,
+  FLAGD_NAME,
   GHERKIN_FLAGD_RECONNECT_FEATURE,
-} from '@openfeature/flagd-core';
+  IMAGE_VERSION,
+} from '../constants';
+import { reconnectStepDefinitions } from '../step-definitions';
 
 // register the flagd provider before the tests.
 async function setup() {

libs/providers/flagd/spec

@@ -6,13 +6,12 @@ import { autoBindSteps, loadFeature } from 'jest-cucumber';
 import {
   E2E_CLIENT_NAME,
   FLAGD_NAME,
-  IMAGE_VERSION,
-  flagStepDefinitions,
-  getGherkinTestPath,
-  GHERKIN_FLAGD_FEATURE,
   GHERKIN_EVALUATION_FEATURE,
+  GHERKIN_FLAGD_FEATURE,
   GHERKIN_FLAGD_JSON_EVALUATOR_FEATURE,
-} from '@openfeature/flagd-core';
+  IMAGE_VERSION,
+} from '../constants';
+import { flagStepDefinitions } from '../step-definitions';
 
 // register the flagd provider before the tests.
 async function setup() {

libs/shared/flagd-core/src/e2e/constants.ts renamed to libs/providers/flagd/src/e2e/constants.ts

@@ -4,13 +4,13 @@ import { FlagdProvider } from '../../lib/flagd-provider';
 import { GenericContainer, StartedTestContainer } from 'testcontainers';
 import { autoBindSteps, loadFeature } from 'jest-cucumber';
 import {
-  FLAGD_NAME,
-  IMAGE_VERSION,
-  UNAVAILABLE_CLIENT_NAME,
   UNSTABLE_CLIENT_NAME,
-  reconnectStepDefinitions,
+  UNAVAILABLE_CLIENT_NAME,
+  FLAGD_NAME,
   GHERKIN_FLAGD_RECONNECT_FEATURE,
-} from '@openfeature/flagd-core';
+  IMAGE_VERSION,
+} from '../constants';
+import { reconnectStepDefinitions } from '../step-definitions';
 
 // register the flagd provider before the tests.
 async function setup() {

libs/shared/flagd-core/src/e2e/index.ts renamed to libs/providers/flagd/src/e2e/index.ts

@@ -6,12 +6,12 @@ import { autoBindSteps, loadFeature } from 'jest-cucumber';
 import {
   E2E_CLIENT_NAME,
   FLAGD_NAME,
-  IMAGE_VERSION,
-  flagStepDefinitions,
-  GHERKIN_FLAGD_FEATURE,
   GHERKIN_EVALUATION_FEATURE,
+  GHERKIN_FLAGD_FEATURE,
   GHERKIN_FLAGD_JSON_EVALUATOR_FEATURE,
-} from '@openfeature/flagd-core';
+  IMAGE_VERSION,
+} from '../constants';
+import { flagStepDefinitions } from '../step-definitions';
 
 // register the flagd provider before the tests.
 async function setup() {

libs/shared/flagd-core/src/e2e/step-definitions/flag.ts renamed to libs/providers/flagd/src/e2e/step-definitions/flag.ts

@@ -1,4 +1,3 @@
 export * from './lib/flagd-core';
 export * from './lib/feature-flag';
 export * from './lib/storage';
-export * from './e2e';

libs/shared/flagd-core/src/e2e/step-definitions/flagd-json-evaluator.ts renamed to libs/providers/flagd/src/e2e/step-definitions/flagd-json-evaluator.ts

@@ -6,5 +6,5 @@
     "types": []
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/e2e"]
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }

libs/shared/flagd-core/src/e2e/step-definitions/index.ts renamed to libs/providers/flagd/src/e2e/step-definitions/index.ts

@@ -5,5 +5,5 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts", "src/e2e"]
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
 }