chore: typecheck on build

flagsmith-core.ts

@@ -80,7 +80,7 @@ const Flagsmith = class {
     }
 
     getFlags = () => {
-        let { api, evaluationContext } = this;
+        const { api, evaluationContext } = this;
         this.log("Get Flags")
         this.isLoading = true;
 
@@ -95,7 +95,8 @@ const Flagsmith = class {
             if(!response || previousIdentity !== `${this.getContext().identity}`) {
                 return // getJSON returned null due to request/response mismatch
             }
-            let { flags: features, traits, identifier }: IFlagsmithResponse = response
+            let { flags: features, traits }: IFlagsmithResponse = response
+            const {identifier} = response
             this.isLoading = false;
             // Handle server response
             const flags: IFlags = {};
@@ -453,7 +454,7 @@ const Flagsmith = class {
                                             ...json,
                                             evaluationContext: toEvaluationContext({
                                                 ...json.evaluationContext,
-                                                identity: !!json.evaluationContext?.identity ? {
+                                                identity: json.evaluationContext?.identity ? {
                                                     ...json.evaluationContext?.identity,
                                                     traits: {
                                                         ...json.evaluationContext?.identity?.traits || {},
@@ -660,7 +661,7 @@ const Flagsmith = class {
     }
 
     setContext = (clientEvaluationContext: ClientEvaluationContext) => {
-        let evaluationContext = toEvaluationContext(clientEvaluationContext);
+        const evaluationContext = toEvaluationContext(clientEvaluationContext);
         this.evaluationContext = {
             ...evaluationContext,
             environment: evaluationContext.environment || this.evaluationContext.environment,

move-react.js

@@ -7,29 +7,19 @@ const replaceInFileSync = (file,from,to) => {
     fs.writeFileSync(file, newData, {encoding:"utf8"})
 }
 
-
-fs.rmSync(path.join(__dirname,"lib/flagsmith/index-es.d.ts"))
-fs.rmSync(path.join(__dirname,"lib/flagsmith-es/index-es.d.ts"))
-
-fs.rmSync(path.join(__dirname,"lib/flagsmith/isomorphic-es.d.ts"))
-fs.rmSync(path.join(__dirname,"lib/flagsmith-es/isomorphic-es.d.ts"))
-
-fs.rmSync(path.join(__dirname,"lib/react-native-flagsmith/index-es.d.ts"))
-fs.rmSync(path.join(__dirname,"lib/react-native-flagsmith/isomorphic-es.d.ts"))
-
-
 // Copy source files to lib/flagsmith/src
 fs.copyFileSync(path.join(__dirname,"index.ts"),path.join(__dirname,"lib/flagsmith/src/index.ts"))
 fs.copyFileSync(path.join(__dirname,"flagsmith-core.ts"),path.join(__dirname,"lib/flagsmith/src/flagsmith-core.ts"))
 fs.copyFileSync(path.join(__dirname,"next-middleware.ts"),path.join(__dirname,"lib/flagsmith/src/next-middleware.ts"))
 fs.copyFileSync(path.join(__dirname,"isomorphic.ts"),path.join(__dirname,"lib/flagsmith/src/isomorphic.ts"))
 fs.copyFileSync(path.join(__dirname,"react.tsx"),path.join(__dirname,"lib/flagsmith/src/react.tsx"))
 fs.copyFileSync(path.join(__dirname,"react.tsx"),path.join(__dirname,"lib/react-native-flagsmith/src/react.tsx"))
-fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/src/react.d.ts"))
-//Remove not needed flagsmith-core.d.ts
-fs.rmSync(path.join(__dirname,"lib/flagsmith/flagsmith-core.d.ts"))
-fs.rmSync(path.join(__dirname,"lib/react-native-flagsmith/flagsmith-core.d.ts"))
-fs.rmSync(path.join(__dirname,"lib/flagsmith-es/flagsmith-core.d.ts"))
+fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/react.d.ts"))
+fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/flagsmith/react.d.ts"))
+fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/flagsmith-es/react.d.ts"))
+fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/index.d.ts"))
+fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/flagsmith/index.d.ts"))
+fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/flagsmith-es/index.d.ts"))
 
 // Copy source files to lib/react-native-flagsmith/src
 fs.copyFileSync(path.join(__dirname,"index.react-native.ts"),path.join(__dirname,"lib/react-native-flagsmith/src/index.react-native.ts"))

package.json

@@ -3,11 +3,12 @@
   "description": "Feature flagging to support continuous development",
   "main": "./flagsmith/index.js",
   "scripts": {
+    "typecheck": "tsc",
     "postinstall": "patch-package",
     "prepublish": "npx in-publish && npm run build || echo",
     "deploy": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish && cd ../../lib/react-native-flagsmith && npm publish && cd ../../lib/flagsmith-es && npm publish",
     "deploy:beta": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish --tag beta && cd ../../lib/react-native-flagsmith && npm publish --tag beta && cd ../../lib/flagsmith-es && npm publish --tag beta",
-    "build": "npm run generatetypes && rollup -c && node ./move-react.js",
+    "build": "npm run generatetypes && rollup -c && node ./move-react.js && npm run typecheck",
     "test": "jest --env=jsdom",
     "generatetypes": "curl https://raw.githubusercontent.com/Flagsmith/flagsmith/refs/heads/main/sdk/evaluation-context.json -o evaluation-context.json && npx quicktype -o evaluation-context.ts --src-lang schema --just-types --no-prefer-types --nice-property-names evaluation-context.json && rm evaluation-context.json"
   },
@@ -52,7 +53,7 @@
     "quicktype": "^23.0.170",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup": "^2.79.2",
+    "rollup": "^2.77.0",
     "rollup-plugin-dts": "^4.2.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-terser": "^7.0.2",

react.d.ts

@@ -14,3 +14,4 @@ export declare function useFlags<F extends string, T extends string>(_flags: rea
     [K in T]: IFlagsmithTrait;
 };
 export declare const useFlagsmith: () => IFlagsmith;
+export declare const useFlagsmithLoading: () => LoadingState | undefined;

react.tsx

@@ -27,6 +27,7 @@ export const FlagsmithProvider: FC<FlagsmithContextType> = ({
     const firstRenderRef = useRef(true)
     if (flagsmith && !flagsmith?._trigger) {
         flagsmith._trigger = () => {
+            // @ts-expect-error using internal function, consumers would never call this
             flagsmith.log("React - trigger event received")
             events.emit('event');
         }
@@ -138,6 +139,7 @@ export function useFlags<F extends string=string, T extends string=string>(_flag
     const eventListener = useCallback(() => {
         const newRenderKey = getRenderKey(flagsmith as IFlagsmith, flags, traits)
         if (newRenderKey !== renderRef) {
+            // @ts-expect-error using internal function, consumers would never call this
             flagsmith?.log("React - useFlags flags and traits have changed")
             setRenderRef(newRenderKey)
         }
@@ -148,6 +150,7 @@ export function useFlags<F extends string=string, T extends string=string>(_flag
 
     if (firstRender.current) {
         firstRender.current = false;
+        // @ts-expect-error using internal function, consumers would never call this
         flagsmith?.log("React - Initialising event listeners")
     }
 

test/cache.test.ts

@@ -344,18 +344,21 @@ describe('Cache', () => {
             cacheFlags: true,
             preventFetch: true,
         });
-        const storage = new SyncStorageMock();
-        await storage.setItem('BULLET_TRAIN_DB', JSON.stringify({
+        await AsyncStorage.setItem('BULLET_TRAIN_DB', JSON.stringify({
             ...identityState,
         }));
+
+
         const ts = Date.now();
         await flagsmith.init({
             ...initConfig,
+            identity: identityState.evaluationContext.identity.identifier,
             traits: { ts },
-            AsyncStorage: storage,
+            AsyncStorage
         });
         expect(flagsmith.getAllTraits()).toEqual({
-            ...identityState.traits,
+            string_trait: 'Example',
+            number_trait:  1,
             ts
         })
     });
@@ -395,4 +398,4 @@ describe('Cache', () => {
             },
         })
     });
-});
+});

test/init.test.ts

@@ -12,7 +12,7 @@ describe('Flagsmith.init', () => {
         const {flagsmith,initConfig, AsyncStorage,mockFetch} = getFlagsmith({onChange})
         await flagsmith.init(initConfig);
 
-        expect(flagsmith.environmentID).toBe(initConfig.environmentID);
+        expect(flagsmith.getContext().environment!.apiKey).toBe(initConfig.evaluationContext?.environment?.apiKey);
         expect(flagsmith.api).toBe('https://edge.api.flagsmith.com/api/v1/'); // Assuming defaultAPI is globally defined
         expect(AsyncStorage.getItem).toHaveBeenCalledTimes(1);
         expect(mockFetch).toHaveBeenCalledTimes(1);
@@ -29,7 +29,7 @@ describe('Flagsmith.init', () => {
         const {flagsmith,initConfig, AsyncStorage,mockFetch} = getFlagsmith({onChange, identity:"test_identity"})
         await flagsmith.init(initConfig);
 
-        expect(flagsmith.environmentID).toBe(initConfig.environmentID);
+        expect(flagsmith.getContext().environment!.apiKey).toBe(initConfig.evaluationContext?.environment?.apiKey);
         expect(flagsmith.api).toBe('https://edge.api.flagsmith.com/api/v1/'); // Assuming defaultAPI is globally defined
         expect(AsyncStorage.getItem).toHaveBeenCalledTimes(1);
         expect(mockFetch).toHaveBeenCalledTimes(1);
@@ -49,7 +49,7 @@ describe('Flagsmith.init', () => {
 
         await flagsmith.init(initConfig);
 
-        expect(flagsmith.environmentID).toBe(initConfig.environmentID);
+        expect(flagsmith.getContext().environment!.apiKey).toBe(initConfig.evaluationContext?.environment?.apiKey);
         expect(flagsmith.api).toBe('https://edge.api.flagsmith.com/api/v1/'); // Assuming defaultAPI is globally defined
         expect(AsyncStorage.getItem).toHaveBeenCalledTimes(1);
         expect(mockFetch).toHaveBeenCalledTimes(1);

tsconfig.json

@@ -5,14 +5,13 @@
     "skipLibCheck": true,
     "jsx": "react",
     "module": "ESNext",
-    "declaration": true,
+    "declaration": false,
     "strict": true,
-    "declarationDir": ".",
+    "noEmit": true,
     "sourceMap": true,
     "moduleResolution": "node",
-    "emitDeclarationOnly": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true
   },
-  "exclude": ["examples","flagsmith"]
+  "exclude": ["lib"]
 }

utils/emitter.ts

@@ -36,16 +36,20 @@ class Emitter {
         return offFunction.bind(this) as () => this;
     }
 
-    once(name: EventName, callback: () => void, ctx?: any): () => this {
+    once(
+        name: string, // EventName inlined as string
+        callback: (...args: any[]) => void,
+        ctx?: any
+    ): () => this {
         const self = this;
         const id = this.generateCallbackId();
 
-        function listener(this: any) {
+        function listener(this: unknown, ...args: any[]) {
             self.off(name, id);
-            callback.apply(ctx, arguments);
+            callback.apply(ctx, args);
         }
 
-        listener._ = callback;
+        (listener as any)._ = callback;
 
         return this.on(name, listener, ctx) as () => this;
     }