add partial in LunaticData

fmt
InseeFr · Mar 8, 2024 · 07767a0 · 07767a0
1 parent a4cc8dc
commit 07767a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/use-lunatic/type.ts b/src/use-lunatic/type.ts
@@ -15,12 +15,11 @@ export type LunaticControl = ControlType;
 
 export type VTLBindings = { [variableName: string]: unknown };
 
-export type LunaticData = Record<
-	Exclude<VariableType, 'COLLECTED'>,
-	Record<string, unknown>
-> & {
-	COLLECTED: Record<string, LunaticCollectedValue>;
-};
+export type LunaticData = Partial<
+	Record<Exclude<VariableType, 'COLLECTED'>, Record<string, unknown>> & {
+		COLLECTED: Record<string, LunaticCollectedValue>;
+	}
+>;
 
 export type LunaticValues = {
 	[variableName: string]: unknown;
@@ -43,13 +42,13 @@ export type LunaticExpression = {
 export type TODO = unknown; // Temporary type to mark types as unresolved
 
 export type LunaticVariable = Variable;
-export type LunaticCollectedValue = {
+export type LunaticCollectedValue = Partial<{
 	COLLECTED: unknown;
 	EDITED: unknown;
 	FORCED: unknown;
 	INPUTED: unknown;
 	PREVIOUS: unknown;
-};
+}>;
 
 export type LunaticOverviewItem = {
 	id: string;

diff --git a/src/use-lunatic/use-lunatic.test.ts b/src/use-lunatic/use-lunatic.test.ts
@@ -208,11 +208,11 @@ describe('use-lunatic()', () => {
 			);
 			result.current.onChange({ name: 'NB' }, 3);
 			expect(
-				(result.current.getData(true).COLLECTED.PRENOMS as any).COLLECTED
+				(result.current.getData(true).COLLECTED?.PRENOMS as any).COLLECTED
 			).toEqual([null, null, null]);
 			result.current.onChange({ name: 'NB' }, 2);
 			expect(
-				(result.current.getData(true).COLLECTED.PRENOMS as any).COLLECTED
+				(result.current.getData(true).COLLECTED?.PRENOMS as any).COLLECTED
 			).toEqual([null, null]);
 		});
 	});
@@ -241,13 +241,13 @@ describe('use-lunatic()', () => {
 					},
 				},
 			});
-			expect(Object.keys(data.COLLECTED)).toHaveLength(109);
-			expect(Object.keys(data.CALCULATED)).toHaveLength(0);
+			expect(data.COLLECTED && Object.keys(data.COLLECTED)).toHaveLength(109);
+			expect(data.CALCULATED && Object.keys(data?.CALCULATED)).toHaveLength(0);
 		});
 		it('should return calculated values', () => {
 			const data = hookRef.current.getData(true);
-			expect(Object.keys(data.COLLECTED)).toHaveLength(109);
-			expect(Object.keys(data.CALCULATED)).toHaveLength(33);
+			expect(data.COLLECTED && Object.keys(data.COLLECTED)).toHaveLength(109);
+			expect(data.CALCULATED && Object.keys(data?.CALCULATED)).toHaveLength(33);
 		});
 		it('should only return requested variables', () => {
 			const data = hookRef.current.getData(false, ['COMMENT']);
@@ -258,7 +258,7 @@ describe('use-lunatic()', () => {
 					},
 				},
 			});
-			expect(Object.keys(data.COLLECTED)).toHaveLength(1);
+			expect(data.COLLECTED && Object.keys(data.COLLECTED)).toHaveLength(1);
 		});
 	});