Skip to content

Commit

Permalink
Updated type appearances with prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
the-bay-kay committed Nov 2, 2023
1 parent 2dc232f commit 9cf629e
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 91 deletions.
124 changes: 62 additions & 62 deletions www/js/types/diaryTypes.ts
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
import { LocalDt, ServerData } from './serverData'
import { LocalDt, ServerData } from './serverData';

export type UserInput = ServerData<UserInputData>
export type UserInput = ServerData<UserInputData>;

export type UserInputData = {
end_ts: number,
start_ts: number
label: string,
start_local_dt?: LocalDt
end_local_dt?: LocalDt
status?: string,
match_id?: string,
}
end_ts: number;
start_ts: number;
label: string;
start_local_dt?: LocalDt;
end_local_dt?: LocalDt;
status?: string;
match_id?: string;
};

type ConfirmedPlace = any; // TODO

export type CompositeTrip = {
_id: {$oid: string},
additions: any[], // TODO
cleaned_section_summary: any, // TODO
cleaned_trip: {$oid: string},
confidence_threshold: number,
confirmed_trip: {$oid: string},
distance: number,
duration: number,
end_confirmed_place: ConfirmedPlace,
end_fmt_time: string,
end_loc: {type: string, coordinates: number[]},
end_local_dt: LocalDt,
end_place: {$oid: string},
end_ts: number,
expectation: any, // TODO "{to_label: boolean}"
expected_trip: {$oid: string},
inferred_labels: any[], // TODO
inferred_section_summary: any, // TODO
inferred_trip: {$oid: string},
key: string,
locations: any[], // TODO
origin_key: string,
raw_trip: {$oid: string},
sections: any[], // TODO
source: string,
start_confirmed_place: ConfirmedPlace,
start_fmt_time: string,
start_loc: {type: string, coordinates: number[]},
start_local_dt: LocalDt,
start_place: {$oid: string},
start_ts: number,
user_input: UserInput,
}
_id: { $oid: string };
additions: any[]; // TODO
cleaned_section_summary: any; // TODO
cleaned_trip: { $oid: string };
confidence_threshold: number;
confirmed_trip: { $oid: string };
distance: number;
duration: number;
end_confirmed_place: ConfirmedPlace;
end_fmt_time: string;
end_loc: { type: string; coordinates: number[] };
end_local_dt: LocalDt;
end_place: { $oid: string };
end_ts: number;
expectation: any; // TODO "{to_label: boolean}"
expected_trip: { $oid: string };
inferred_labels: any[]; // TODO
inferred_section_summary: any; // TODO
inferred_trip: { $oid: string };
key: string;
locations: any[]; // TODO
origin_key: string;
raw_trip: { $oid: string };
sections: any[]; // TODO
source: string;
start_confirmed_place: ConfirmedPlace;
start_fmt_time: string;
start_loc: { type: string; coordinates: number[] };
start_local_dt: LocalDt;
start_place: { $oid: string };
start_ts: number;
user_input: UserInput;
};

export type PopulatedTrip = CompositeTrip & {
additionsList?: any[], // TODO
finalInference?: any, // TODO
geojson?: any, // TODO
getNextEntry?: () => PopulatedTrip | ConfirmedPlace,
userInput?: UserInput,
verifiability?: string,
}
additionsList?: any[]; // TODO
finalInference?: any; // TODO
geojson?: any; // TODO
getNextEntry?: () => PopulatedTrip | ConfirmedPlace;
userInput?: UserInput;
verifiability?: string;
};

export type Trip = {
end_ts: number,
start_ts: number,
}
end_ts: number;
start_ts: number;
};

export type TlEntry = {
key: string,
origin_key: string,
start_ts: number,
end_ts: number,
enter_ts: number,
exit_ts: number,
duration: number,
getNextEntry?: () => PopulatedTrip | ConfirmedPlace,
}
key: string;
origin_key: string;
start_ts: number;
end_ts: number;
enter_ts: number;
exit_ts: number;
duration: number;
getNextEntry?: () => PopulatedTrip | ConfirmedPlace;
};
12 changes: 6 additions & 6 deletions www/js/types/fileShareTypes.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { ServerData } from './serverData';
import { ServerData } from './serverData';

export type TimeStampData = ServerData<RawTimelineData>;

export type RawTimelineData = {
name: string,
ts: number,
reading: number,
name: string;
ts: number;
reading: number;
};

export interface FsWindow extends Window {
requestFileSystem: (
type: number,
size: number,
successCallback: (fs: any) => void,
errorCallback?: (error: any) => void
errorCallback?: (error: any) => void,
) => void;
LocalFileSystem: {
TEMPORARY: number;
PERSISTENT: number;
};
};
}
45 changes: 22 additions & 23 deletions www/js/types/serverData.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
export type ServerResponse<Type> = {
phone_data: Array<ServerData<Type>>,
}
phone_data: Array<ServerData<Type>>;
};

export type ServerData<Type> = {
data: Type,
metadata: MetaData,
key?: string,
user_id?: { $uuid: string, },
_id?: { $oid: string, },
data: Type;
metadata: MetaData;
key?: string;
user_id?: { $uuid: string };
_id?: { $oid: string };
};

export type MetaData = {
key: string,
platform: string,
write_ts: number,
time_zone: string,
write_fmt_time: string,
write_local_dt: LocalDt,
key: string;
platform: string;
write_ts: number;
time_zone: string;
write_fmt_time: string;
write_local_dt: LocalDt;
};

export type LocalDt = {
minute: number,
hour: number,
second: number,
day: number,
weekday: number,
month: number,
year: number,
timezone: string,
minute: number;
hour: number;
second: number;
day: number;
weekday: number;
month: number;
year: number;
timezone: string;
};

0 comments on commit 9cf629e

Please sign in to comment.