Remove extraneous parameters from FlagFile.ts

octogonz · octogonz · commit 203c71099f6f · 2024-05-09T19:44:12.000-07:00
diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md
@@ -311,13 +311,12 @@ export class FileSystemBuildCacheProvider {
 }
 
 // @internal
-export class _FlagFile<T extends object = JsonObject> {
-    constructor(folderPath: string, flagName: string, initialState?: T);
+export class _FlagFile {
+    constructor(folderPath: string, flagName: string, initialState?: JsonObject);
     clearAsync(): Promise<void>;
     createAsync(): Promise<void>;
     isValidAsync(): Promise<boolean>;
     readonly path: string;
-    protected _state: T | {};
 }
 
 // @beta
diff --git a/libraries/rush-lib/src/api/FlagFile.ts b/libraries/rush-lib/src/api/FlagFile.ts
@@ -8,7 +8,7 @@ import { objectsAreDeepEqual } from '../utilities/objectUtilities';
  * A base class for flag file.
  * @internal
  */
-export class FlagFile<T extends object = JsonObject> {
+export class FlagFile {
   /**
    * Flag file path
    */
@@ -17,14 +17,14 @@ export class FlagFile<T extends object = JsonObject> {
   /**
    * Content of the flag
    */
-  protected _state: T | {};
+  private _state: JsonObject;
 
   /**
    * Creates a new flag file
    * @param folderPath - the folder that this flag is managing
    * @param state - optional, the state that should be managed or compared
    */
-  public constructor(folderPath: string, flagName: string, initialState?: T) {
+  public constructor(folderPath: string, flagName: string, initialState?: JsonObject) {
     this.path = `${folderPath}/${flagName}.flag`;
     this._state = initialState || {};
   }
@@ -33,10 +33,10 @@ export class FlagFile<T extends object = JsonObject> {
    * Returns true if the file exists and the contents match the current state.
    */
   public async isValidAsync(): Promise<boolean> {
-    let oldState: T | undefined;
+    let oldState: JsonObject | undefined;
     try {
       oldState = await JsonFile.loadAsync(this.path);
-      const newState: T | {} = this._state;
+      const newState: JsonObject = this._state;
       return objectsAreDeepEqual(oldState, newState);
     } catch (err) {
       return false;

Original file line number	Diff line number	Diff line change
`@@ -311,13 +311,12 @@ export class FileSystemBuildCacheProvider {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`// @internal`
`314`		`-export class _FlagFile<T extends object = JsonObject> {`
`315`		`- constructor(folderPath: string, flagName: string, initialState?: T);`
	`314`	`+export class _FlagFile {`
	`315`	`+ constructor(folderPath: string, flagName: string, initialState?: JsonObject);`
`316`	`316`	`clearAsync(): Promise<void>;`
`317`	`317`	`createAsync(): Promise<void>;`
`318`	`318`	`isValidAsync(): Promise<boolean>;`
`319`	`319`	`readonly path: string;`
`320`		`- protected _state: T \| {};`
`321`	`320`	`}`
`322`	`321`
`323`	`322`	`// @beta`