@overmap-ai/core 1.0.75 → 1.0.77-store-typing-improvements.0

package/dist/store/slices/teamSlice.d.ts

@@ -1,31 +1,34 @@
-import { Reducer } from '@reduxjs/toolkit';
-import { Organization, OvermapSelector, OvermapSelectorWithArgs, Stored, Team, User } from '../../typings';
-import { ModelState } from '../typings';
-export type TeamState = ModelState<Stored<Team>>;
+import { Organization, Stored, Team, User } from '../../typings';
+import { ModelState } from '../adapters';
+import { OvermapSelector, OvermapSelectorWithArgs } from '../typings';
+export type TeamState = ModelState<Team["uuid"], Stored<Team>>;
 export declare const teamSlice: import('@reduxjs/toolkit').Slice<TeamState, {
-    setTeam: (state: ModelState<Stored<Team>>, action: {
+    setTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    initializeTeams: (state: ModelState<Stored<Team>>, action: {
+    initializeTeams: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>[];
         type: string;
     }) => void;
-    addTeam: (state: ModelState<Stored<Team>>, action: {
+    addTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    updateTeam: (state: ModelState<Stored<Team>>, action: {
+    updateTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    deleteTeam: (state: ModelState<Stored<Team>>, action: import('@reduxjs/toolkit').PayloadAction<string>) => void;
+    deleteTeam: (state: ModelState<string, Stored<Team>>, action: {
+        payload: string;
+        type: string;
+    }) => void;
 }, "teams", "teams", import('@reduxjs/toolkit').SliceSelectors<TeamState>>;
 export declare const setTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/setTeam">, initializeTeams: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>[], "teams/initializeTeams">, addTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/addTeam">, updateTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/updateTeam">, deleteTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "teams/deleteTeam">;
 export declare const selectTeamsMapping: OvermapSelector<TeamState["instances"]>;
 export declare const selectTeams: OvermapSelector<Stored<Team>[]>;
-export declare const selectTeamById: OvermapSelectorWithArgs<string, Stored<Team> | undefined>;
-export declare const selectTeamsByIds: OvermapSelectorWithArgs<string[], Stored<Team>[]>;
-export declare const selectTeamsOfOrganization: OvermapSelectorWithArgs<Organization["id"], Stored<Team>[]>;
+export declare const selectTeamById: OvermapSelectorWithArgs<Team["uuid"], Stored<Team> | undefined>;
+export declare const selectTeamsByIds: OvermapSelectorWithArgs<Team["uuid"][], Stored<Team>[]>;
+export declare const selectTeamsOfOrganization: OvermapSelectorWithArgs<Organization["uuid"], Stored<Team>[]>;
 export declare const selectTeamsOfUser: OvermapSelectorWithArgs<User["id"], Stored<Team>[]>;
-export declare const teamReducer: Reducer<TeamState>;
+export declare const teamReducer: import('redux').Reducer<TeamState>;

package/dist/store/slices/userSlice.d.ts

@@ -1,25 +1,63 @@
-import { PayloadAction, Reducer } from '@reduxjs/toolkit';
-import { OvermapRootState, OvermapSelectorWithArgs, User } from '../../typings';
-export interface UserState {
+import { PayloadAction } from '@reduxjs/toolkit';
+import { User } from '../../typings';
+import { ModelState } from '../adapters';
+import { OvermapRootState, OvermapSelectorWithArgs } from '../typings';
+export interface UserState extends ModelState<User["id"], User> {
     currentUser: User | null;
-    users: Record<number, User>;
 }
 export declare const userSlice: import('@reduxjs/toolkit').Slice<UserState, {
-    setUsers: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<User[]>) => void;
-    addUsers: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<User[]>) => void;
+    initializeUsers: (state: ModelState<number, User>, action: {
+        payload: User[];
+        type: string;
+    }) => void;
+    setUsers: (state: ModelState<number, User>, action: {
+        payload: User[];
+        type: string;
+    }) => void;
+    setUser: (state: ModelState<number, User>, action: {
+        payload: User;
+        type: string;
+    }) => void;
+    addUsers: (state: ModelState<number, User>, action: {
+        payload: User[];
+        type: string;
+    }) => void;
+    addUser: (state: ModelState<number, User>, action: {
+        payload: User;
+        type: string;
+    }) => void;
+    updateUsers: (state: ModelState<number, User>, action: {
+        payload: User[];
+        type: string;
+    }) => void;
+    updateUser: (state: ModelState<number, User>, action: {
+        payload: User;
+        type: string;
+    }) => void;
+    deleteUser: (state: ModelState<number, User>, action: {
+        payload: number;
+        type: string;
+    }) => void;
+    deleteUsers: (state: ModelState<number, User>, action: {
+        payload: number[];
+        type: string;
+    }) => void;
+    removeUser: (state: ModelState<number, User>, action: {
+        payload: number;
+        type: string;
+    }) => void;
     setCurrentUser: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<User | null>) => void;
     setProfilePicture: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<{
         file?: string;
         file_sha1?: string;
     }>) => void;
-    removeUser: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<number>) => void;
 }, "users", "users", import('@reduxjs/toolkit').SliceSelectors<UserState>>;
-export declare const setCurrentUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User | null, "users/setCurrentUser">, setProfilePicture: import('@reduxjs/toolkit').ActionCreatorWithPayload<{
+export declare const initializeUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/initializeUsers">, setUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/setUsers">, setUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/setUser">, addUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/addUsers">, addUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/addUser">, updateUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/updateUsers">, updateUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/updateUser">, deleteUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<number, "users/deleteUser">, deleteUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<number[], "users/deleteUsers">, removeUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<number, "users/removeUser">, setCurrentUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User | null, "users/setCurrentUser">, setProfilePicture: import('@reduxjs/toolkit').ActionCreatorWithPayload<{
     file?: string;
     file_sha1?: string;
-}, "users/setProfilePicture">, setUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/setUsers">, addUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/addUsers">, removeUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<number, "users/removeUser">;
-export declare const userReducer: Reducer<UserState>;
+}, "users/setProfilePicture">;
+export declare const userReducer: import('redux').Reducer<UserState>;
 export declare const selectCurrentUser: (state: OvermapRootState) => User | null;
 export declare const selectUsersMapping: (state: OvermapRootState) => Record<number, User>;
-export declare const selectUserById: OvermapSelectorWithArgs<number, User | undefined>;
+export declare const selectUserById: OvermapSelectorWithArgs<User["id"], User | undefined>;
 export declare const selectUsersByIds: (args: number[]) => (state: OvermapRootState) => User[];

package/dist/store/slices/versioningSlice.d.ts

@@ -1,4 +1,3 @@
-import { Reducer } from '@reduxjs/toolkit';
 export interface VersioningState {
     version: number;
 }
@@ -6,4 +5,4 @@ export interface VersioningState {
  * Version of the offline redux store
  */
 export declare const versioningSlice: import('@reduxjs/toolkit').Slice<VersioningState, {}, "versioning", "versioning", import('@reduxjs/toolkit').SliceSelectors<VersioningState>>;
-export declare const versioningReducer: Reducer<VersioningState>;
+export declare const versioningReducer: import('redux').Reducer<VersioningState>;

package/dist/store/store.d.ts

@@ -1,61 +1,7 @@
 import { Config, OfflineAction, OfflineMetadata } from '@redux-offline/redux-offline/lib/types';
-import { Reducer } from '@reduxjs/toolkit';
 import { default as request } from 'superagent';
 import { BaseSDK, OfflineMetaEffect, OutboxCoordinator, RequestDetails } from '../sdk';
-import { BaseState, OvermapRootState } from '../typings';
-import { AgentsState, AssetAttachmentState, AssetStageCompletionState, AssetStageState, AssetState, AssetTypeAttachmentState, AssetTypeFieldsAttachmentState, AssetTypeFieldsState, AssetTypeFieldValuesAttachmentState, AssetTypeFieldValuesState, AssetTypeState, AuthState, CategoryState, DocumentAttachmentState, DocumentState, EmailDomainState, FileState, FormRevisionAttachmentState, FormRevisionState, FormState, FormSubmissionAttachmentState, FormSubmissionState, GeoImageSliceState, IssueAssociationSliceState, IssueAttachmentState, IssueCommentAttachmentState, IssueCommentState, IssueState, IssueTypeAttachmentState, IssueTypeFieldsAttachmentState, IssueTypeFieldsState, IssueTypeFieldValuesAttachmentState, IssueTypeFieldValuesState, IssueTypeState, IssueUpdateState, LicenseState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectAttachmentState, ProjectFileState, ProjectState, RehydratedState, TeamState, UserState, VersioningState } from './slices';
-export declare const VERSION_REDUCER_KEY = "versioning";
-export declare const overmapReducers: {
-    versioning: Reducer<VersioningState>;
-    fileReducer: Reducer<FileState>;
-    authReducer: Reducer<AuthState>;
-    categoryReducer: Reducer<CategoryState>;
-    assetReducer: Reducer<AssetState>;
-    assetAttachmentReducer: Reducer<AssetAttachmentState>;
-    assetStageCompletionReducer: Reducer<AssetStageCompletionState>;
-    assetStageReducer: Reducer<AssetStageState>;
-    assetTypeReducer: Reducer<AssetTypeState>;
-    assetTypeAttachmentReducer: Reducer<AssetTypeAttachmentState>;
-    issueReducer: Reducer<IssueState>;
-    issueTypeReducer: Reducer<IssueTypeState>;
-    issueTypeAttachmentReducer: Reducer<IssueTypeAttachmentState>;
-    organizationReducer: Reducer<OrganizationState>;
-    outboxReducer: Reducer<OutboxState>;
-    projectReducer: Reducer<ProjectState>;
-    projectAttachmentReducer: Reducer<ProjectAttachmentState>;
-    projectAccessReducer: Reducer<ProjectAccessState>;
-    organizationAccessReducer: Reducer<OrganizationAccessState>;
-    projectFileReducer: Reducer<ProjectFileState>;
-    rehydratedReducer: Reducer<RehydratedState>;
-    formReducer: Reducer<FormState>;
-    userReducer: Reducer<UserState>;
-    formRevisionReducer: Reducer<FormRevisionState>;
-    formRevisionAttachmentReducer: Reducer<FormRevisionAttachmentState>;
-    formSubmissionAttachmentReducer: Reducer<FormSubmissionAttachmentState>;
-    formSubmissionReducer: Reducer<FormSubmissionState>;
-    emailDomainsReducer: Reducer<EmailDomainState>;
-    licenseReducer: Reducer<LicenseState>;
-    documentsReducer: Reducer<DocumentState>;
-    documentAttachmentReducer: Reducer<DocumentAttachmentState>;
-    teamReducer: Reducer<TeamState>;
-    agentsReducer: Reducer<AgentsState>;
-    issueCommentReducer: Reducer<IssueCommentState>;
-    issueCommentAttachmentReducer: Reducer<IssueCommentAttachmentState>;
-    issueUpdateReducer: Reducer<IssueUpdateState>;
-    issueAttachmentReducer: Reducer<IssueAttachmentState>;
-    geoImageReducer: Reducer<GeoImageSliceState>;
-    issueAssociationReducer: Reducer<IssueAssociationSliceState>;
-    issueTypeFieldsReducer: Reducer<IssueTypeFieldsState>;
-    issueTypeFieldValuesReducer: Reducer<IssueTypeFieldValuesState>;
-    issueTypeFieldsAttachmentReducer: Reducer<IssueTypeFieldsAttachmentState>;
-    issueTypeFieldValuesAttachmentReducer: Reducer<IssueTypeFieldValuesAttachmentState>;
-    assetTypeFieldsReducer: Reducer<AssetTypeFieldsState>;
-    assetTypeFieldValuesReducer: Reducer<AssetTypeFieldValuesState>;
-    assetTypeFieldsAttachmentReducer: Reducer<AssetTypeFieldsAttachmentState>;
-    assetTypeFieldValuesAttachmentReducer: Reducer<AssetTypeFieldValuesAttachmentState>;
-};
-export declare const resetStore = "RESET";
-export declare const overmapRootReducer: Reducer<OvermapRootState>;
+import { BaseState } from './typings';
 export interface FullOfflineMetadata extends OfflineMetadata {
     effect: OfflineMetaEffect;
 }

package/dist/store/typings.d.ts

@@ -1,3 +1,14 @@
-export interface ModelState<TModel> {
-    instances: Record<string, TModel>;
-}
+import { OfflineState } from '@redux-offline/redux-offline/lib/types';
+import { baseReducer, overmapReducer } from './reducers';
+export type BaseState = ReturnType<typeof baseReducer> & {
+    offline: OfflineState;
+};
+export type OvermapRootState = ReturnType<typeof overmapReducer> & {
+    offline: OfflineState;
+};
+export type SelectorWithArgs<TState, TArgs, TRet> = (args: TArgs) => (state: TState) => TRet;
+export type Selector<TState, TRet> = (state: TState) => TRet;
+export type OvermapSelectorWithArgs<TArgs, TRet> = SelectorWithArgs<OvermapRootState, TArgs, TRet>;
+export type OvermapSelector<TRet> = Selector<OvermapRootState, TRet>;
+export type Migrator = (state: Partial<OvermapRootState>) => Partial<OvermapRootState>;
+export type Manifest = Record<number, Migrator>;

package/dist/typings/index.d.ts

@@ -3,4 +3,3 @@ export * from './files';
 export * from './json';
 export * from './models';
 export * from './search';
-export * from './store';

package/dist/typings/models/agents.d.ts

@@ -1,5 +1,5 @@
 import { JSONContent } from '@tiptap/core';
-import { Offline, OptionalFileModel, TimestampedModel } from './base';
+import { OptionalFileModel, TimestampedModel, UUID } from './base';
 export interface AgentProfile extends OptionalFileModel {
     /**
      * The name of the agent.
@@ -10,7 +10,7 @@ export interface AgentProfile extends OptionalFileModel {
      */
     description: string;
 }
-export interface AgentUserConversation extends Offline<TimestampedModel> {
+export interface AgentUserConversation extends UUID<TimestampedModel> {
     profile?: AgentProfile | null;
     tiptap_content?: JSONContent[];
 }

package/dist/typings/models/assets.d.ts

@@ -1,39 +1,62 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { ColorModel, CreatedByModel, IconModel, IndexedModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
+import { CanvasMarkableModel, ColorModel, CreatedByModel, IconModel, IndexedModel, MarkableModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
-import { CanvasMarkableModel, MarkableModel } from './geo';
-export interface Asset extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
+export interface Asset extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     asset_type: string;
     label: string | null;
     description?: string;
-    project: number;
+    project: string;
 }
-export interface AssetType extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
-    organization: number;
+export interface AssetType extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
+    organization: string;
     name?: string;
     description?: string;
 }
-export interface AssetStage extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, ColorModel {
+export interface AssetProcedure extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
+    organization: string;
+    name?: string | null;
+    description?: string | null;
+}
+export interface AssetProcedureInstance extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IndexedModel {
+    asset_procedure: string;
     asset_type: string;
+    project: string;
+}
+export interface AssetStage extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, ColorModel {
+    asset_procedure: string;
     name?: string | null;
     description?: string | null;
     priority: number;
 }
-export interface AssetStageCompletion extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
+export interface AssetStageCompletion extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
     asset: string;
     stage: string;
+    asset_procedure_instance: string;
 }
 export type CompletedStagesMapping = Record<string, Record<string, string>>;
-export interface AssetTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface AssetTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     asset_type: string;
 }
-export interface AssetTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface AssetTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    fields_revision: string;
+}
+export interface AssetTypeFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+    fields_revision: string;
+    asset: string;
+}
+export interface AssetTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    field_values: string;
+}
+export interface AssetProcedureFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
+    asset_procedure: string;
+}
+export interface AssetProcedureFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     fields_revision: string;
 }
-export interface AssetTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface AssetProcedureFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
     fields_revision: string;
+    asset_procedure_instance: string;
     asset: string;
 }
-export interface AssetTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface AssetProcedureFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }

package/dist/typings/models/attachments.d.ts

@@ -1,6 +1,6 @@
 import { FileModel, FileWithNameModel } from '../files';
-import { CreatedByModel, OfflineModel, SubmittedAtModel } from './base';
-export interface Attachment extends OfflineModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
+import { CreatedByModel, SubmittedAtModel, UUIDModel } from './base';
+export interface Attachment extends UUIDModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
     description?: string;
     file_type: string;
 }
@@ -19,8 +19,11 @@ export interface AssetAttachment extends Attachment {
 export interface AssetTypeAttachment extends Attachment {
     asset_type: string;
 }
+export interface AssetProcedureAttachment extends Attachment {
+    asset_procedure: string;
+}
 export interface ProjectAttachment extends Attachment {
-    project: number;
+    project: string;
 }
 export interface DocumentAttachment extends Attachment {
     document: string;

package/dist/typings/models/base.d.ts

@@ -1,10 +1,52 @@
+import { IconType } from '@overmap-ai/blocks';
+import { MultiPoint, Point } from 'geojson';
+import { COMMON_AUTO_FIELDS } from '../../utils';
 import { CSSColor } from '../colors';
-import { CommonAutoFields } from './issues';
 import { User } from './users';
+export type UUID<T> = T & {
+    uuid: string;
+};
+export type UUIDModelMapping<TModel extends UUIDModel> = Record<TModel["uuid"], TModel>;
+type FilteredKeys<T> = {
+    [P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+type ExcludeNeverFields<O> = {
+    [K in FilteredKeys<O>]: O[K];
+};
+type PropertyUndefined<T> = {
+    [P in keyof T]?: T[P];
+};
+export type CommonAutoFields = (typeof COMMON_AUTO_FIELDS)[number];
+/**
+ * Represents a model instance that has been submitted to the backend. Some properties (depending on which model, but in
+ * all cases, the `offline_id`) are guaranteed to be set.
+ */
+export type Submitted<TModel> = Omit<TModel, CommonAutoFields> & PropertyUndefined<ExcludeNeverFields<{
+    created_at: "created_at" extends keyof TModel ? undefined : never;
+    updated_at: "updated_at" extends keyof TModel ? undefined : never;
+    index: "index" extends keyof TModel ? undefined : never;
+    revision: "revision" extends keyof TModel ? undefined : never;
+}>>;
+/**
+ * Represents a model instance that has been submitted to the backend, accepted, then downloaded. Created models
+ * typically have additional properties that are only known once it has been processed and accepted by the API, such as
+ * the `created_at` timestamp, which is the time at which the data was written to the database.
+ */
+export type Created<TModel> = TModel;
+/**
+ * Model instances that are stored in the Redux store can be already-created (and will likely be gotten with the initial
+ * data load), or to-be-created. In the former case, you will get a `Created<TModel>`. In the latter case, you will get
+ * a `Submitted<TModel>`.
+ */
+export type Stored<TModel> = Created<TModel> | Submitted<TModel>;
+export type Payload<TModel> = Omit<TModel, CommonAutoFields | "uuid" | "id" | "submitted_at" | "created_by">;
 export interface Model {
 }
-export interface OfflineModel extends Model {
-    offline_id: string;
+export interface IdModel extends Model {
+    id: number;
+}
+export interface UUIDModel extends Model {
+    uuid: string;
 }
 export interface SubmittedAtModel extends Model {
     submitted_at: string;
@@ -13,26 +55,16 @@ export interface TimestampedModel extends Model {
     created_at: string;
     updated_at: string;
 }
-export type Offline<T> = T & {
-    offline_id: string;
-};
-export type OfflineIdMapping<TModel extends OfflineModel> = Record<TModel["offline_id"], TModel>;
-export type Payload<TModel> = Omit<TModel, CommonAutoFields | "offline_id" | "id" | "submitted_at" | "created_by">;
-export interface FileObject {
-    file_sha1: string;
-    file: string;
-    objectURL?: string;
-}
 export interface OptionalFileModel {
     file_sha1?: string | null;
     file?: string | null;
     objectURL?: string;
 }
 export interface OwnedByOrganization {
-    organization_owner: number;
+    organization_owner: string;
 }
 export interface IconModel {
-    icon: string;
+    icon: IconType;
 }
 export interface ColorModel {
     color: CSSColor;
@@ -43,3 +75,16 @@ export interface CreatedByModel {
 export interface IndexedModel {
     index: number;
 }
+export interface BoundableModel {
+    bounds?: MultiPoint;
+}
+export interface CanvasBoundableModel {
+    canvas_bounds?: MultiPoint;
+}
+export interface MarkableModel {
+    geo_marker?: Point;
+}
+export interface CanvasMarkableModel {
+    canvas_marker?: Point;
+}
+export {};

package/dist/typings/models/categories.d.ts

@@ -1,8 +1,8 @@
 import { CSSColor } from '../colors';
-import { CreatedByModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
-export interface Category extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel {
+import { CreatedByModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+export interface Category extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel {
     name: string;
     description?: string;
     color: CSSColor;
-    project: number;
+    project: string;
 }

package/dist/typings/models/documents.d.ts

@@ -1,11 +1,11 @@
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
-export interface Document extends OfflineModel, SubmittedAtModel, CreatedByModel, TimestampedModel, IconModel, ColorModel {
+import { ColorModel, CreatedByModel, IconModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+export interface Document extends UUIDModel, SubmittedAtModel, CreatedByModel, TimestampedModel, IconModel, ColorModel {
     title: string | null;
     description: string | null;
     content: string | null;
     parent_document: string | null;
     children_documents: string[];
-    project?: number;
-    organization?: number;
+    project?: string;
+    organization?: string;
 }
 export type MovePosition = "left" | "right" | "left-child" | "right-child";

package/dist/typings/models/emailDomain.d.ts

@@ -1,5 +1,5 @@
-import { OfflineModel } from './base';
-export interface EmailDomain extends OfflineModel {
+import { UUIDModel } from './base';
+export interface EmailDomain extends UUIDModel {
     domain: string;
-    organization: number;
+    organization: string;
 }

package/dist/typings/models/emailVerification.d.ts

@@ -1,9 +1,9 @@
-import { OfflineModel } from './base';
+import { UUIDModel } from './base';
 import { RegistrationPayload } from './users';
 export type EmailVerificationPayload = undefined | RegistrationPayload | Omit<RegistrationPayload, "username" | "email">;
 export interface EmailVerificationReturn {
     username?: string;
-    project?: number;
+    project?: string;
 }
 export declare enum VerificationCodeType {
     USER_REGISTRATION = 0,
@@ -13,10 +13,10 @@ export declare enum VerificationCodeType {
     ADD_EMAIL_DOMAIN = 8,
     RESET_PASSWORD = 10
 }
-export interface VerificationCode extends OfflineModel {
+export interface VerificationCode extends UUIDModel {
     verification_code: string;
     verification_type: VerificationCodeType;
     organization?: number;
-    project?: number;
-    user?: number;
+    project?: string;
+    user?: string;
 }

package/dist/typings/models/fields.d.ts

@@ -1,12 +1,12 @@
-import { BaseSerializedObject, FieldValue, ISerializedField } from '@overmap-ai/forms';
+import { SerializedFieldSection, SerializedFieldValues } from '@overmap-ai/forms';
 import { FileWithNameModel } from '../files';
-export interface FieldsModel<TFields extends BaseSerializedObject = ISerializedField> {
-    fields: TFields[];
+export interface FieldsModel {
+    fields: SerializedFieldSection[];
     revision: number;
 }
 export interface FieldValuesModel {
     published_at?: string | null;
-    values: Record<string, FieldValue>;
+    values: SerializedFieldValues;
 }
 export interface FieldsAttachmentModel extends FileWithNameModel {
     field_identifier: string;

package/dist/typings/models/forms.d.ts

@@ -1,24 +1,23 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { CreatedByModel, IndexedModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from './base';
+import { CreatedByModel, IndexedModel, Payload, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from './fields';
-export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
-    organization: number;
+export interface Form extends UUIDModel, SubmittedAtModel, CreatedByModel {
+    organization: string;
 }
-export interface FormRevision<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface FormRevision extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     form: string;
     title: string;
     description?: string;
 }
 export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision">;
-export interface FormSubmission extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel, IndexedModel {
+export interface FormSubmission extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel, IndexedModel {
     form_revision: string;
-    project: number;
+    project: string;
     issue?: string | null;
     asset?: string | null;
 }
-export interface FormSubmissionAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesAttachmentModel {
+export interface FormSubmissionAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesAttachmentModel {
     form_submission: string;
 }
-export interface FormRevisionAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface FormRevisionAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     form_revision: string;
 }

package/dist/typings/models/geoImages.d.ts

@@ -1,10 +1,10 @@
 import { FileWithNameModel } from '../files';
-import { CreatedByModel, IndexedModel, OfflineModel, Payload, SubmittedAtModel } from './base';
-import { CanvasMarkableModel, MarkableModel } from './geo';
-export interface GeoImage extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel, IndexedModel {
+import { CanvasMarkableModel, CreatedByModel, IndexedModel, MarkableModel, Payload, SubmittedAtModel, UUIDModel } from './base';
+import { Project } from './projects';
+export interface GeoImage extends UUIDModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel, IndexedModel {
     title?: string;
     description?: string;
-    project: number;
+    project: Project["uuid"];
     direction?: number;
     original_date?: string;
 }

package/dist/typings/models/index.d.ts

@@ -1,4 +1,3 @@
-export * from './access';
 export * from './agents';
 export * from './assets';
 export * from './attachments';
@@ -9,13 +8,11 @@ export * from './emailDomain';
 export * from './emailVerification';
 export * from './fields';
 export * from './forms';
-export * from './geo';
 export * from './geoImages';
 export * from './issues';
 export * from './issueTypes';
 export * from './license';
 export * from './organizations';
 export * from './projects';
-export * from './store';
 export * from './teams';
 export * from './users';

package/dist/typings/models/issueTypes.d.ts

@@ -1,7 +1,7 @@
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel } from './base';
+import { ColorModel, CreatedByModel, IconModel, SubmittedAtModel, UUIDModel } from './base';
 import { Organization } from './organizations';
-export interface IssueType extends OfflineModel, SubmittedAtModel, IconModel, ColorModel, CreatedByModel {
+export interface IssueType extends UUIDModel, SubmittedAtModel, IconModel, ColorModel, CreatedByModel {
     name?: string;
     description?: string;
-    organization: Organization["id"];
+    organization: Organization["uuid"];
 }