Merge branch 'main' into feat/interface-definitions

# Conflicts:
#	lib/flagsmith/package.json
#	lib/react-native-flagsmith/package.json

Author: kyle-ssg

flagsmith-core.ts

@@ -23,6 +23,7 @@ import angularFetch from './utils/angular-fetch';
 import setDynatraceValue from './utils/set-dynatrace-value';
 import { EvaluationContext } from './evaluation-context';
 import { isTraitEvaluationContext, toEvaluationContext, toTraitEvaluationContextObject } from './utils/types';
+import { ensureTrailingSlash } from './utils/ensureTrailingSlash';
 
 enum FlagSource {
     "NONE" = "NONE",
@@ -260,7 +261,7 @@ const Flagsmith = class {
     analyticsInterval: NodeJS.Timer | null= null
     api: string|null= null
     cacheFlags= false
-    ts: number|null= null
+    ts?: number
     enableAnalytics= false
     enableLogs= false
     evaluationContext: EvaluationContext= {}
@@ -318,7 +319,7 @@ const Flagsmith = class {
                 ) : {},
             } : evaluationContext.identity;
             this.evaluationContext = evaluationContext;
-            this.api = api;
+            this.api = ensureTrailingSlash(api);
             this.headers = headers;
             this.getFlagInterval = null;
             this.analyticsInterval = null;

index-es.ts

@@ -95,6 +95,21 @@ describe('Flagsmith.init', () => {
         });
         await expect(flagsmith.init(initConfig)).rejects.toThrow(Error);
     });
+    test('should sanitise api url', async () => {
+        const onChange = jest.fn();
+        const { flagsmith,initConfig } = getFlagsmith({
+            api:'https://edge.api.flagsmith.com/api/v1/',
+            onChange,
+        });
+        await flagsmith.init(initConfig)
+        expect(flagsmith.getState().api).toBe('https://edge.api.flagsmith.com/api/v1/');
+        const { flagsmith:flagsmith2 } = getFlagsmith({
+            api:'https://edge.api.flagsmith.com/api/v1',
+            onChange,
+        });
+        await flagsmith2.init(initConfig)
+        expect(flagsmith2.getState().api).toBe('https://edge.api.flagsmith.com/api/v1/');
+    });
     test('should reject initialize with identity bad key', async () => {
         const onChange = jest.fn();
         const { flagsmith, initConfig, mockFetch } = getFlagsmith({ onChange, environmentID: 'bad' });

isomorphic-es.ts

@@ -0,0 +1,9 @@
+import flagsmithIsomorphic from '../lib/flagsmith/isomorphic';
+import { getFlagsmith } from './test-constants';
+
+describe('Flagsmith Isomorphic Import', () => {
+    test('flagsmith is imported correctly', () => {
+        const { initConfig } = getFlagsmith({});
+        flagsmithIsomorphic.init(initConfig)
+    })
+})

test/init.test.ts

@@ -5,7 +5,7 @@
     "skipLibCheck": true,
     "jsx": "react",
     "module": "ESNext",
-    "declaration": false,
+    "declaration": true,
     "strict": true,
     "noEmit": true,
     "sourceMap": true,

test/isomorphic.test.tsx

@@ -0,0 +1,3 @@
+export function ensureTrailingSlash(str: string): string {
+    return str.endsWith('/') ? str : str + '/';
+}