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

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

@@ -1,59 +1,20 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
 import { IssuePriority, IssueStatus, IssueUpdateChange } from '../../enums';
-import { COMMON_AUTO_FIELDS } from '../../utils';
 import { CSSColor } from '../colors';
-import { CreatedByModel, IndexedModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
+import { CanvasMarkableModel, CreatedByModel, IndexedModel, MarkableModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
-import { CanvasMarkableModel, MarkableModel } from './geo';
 import { User } from './users';
-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>;
-/**
- * Represents the properties you can always expect on any object representing an issue. These are the minimal details
- * required when creating an issue.
- */
-export interface Issue extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
+export interface Issue extends UUIDModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     title?: string | null;
     description?: string | null;
     priority: IssuePriority;
     status: IssueStatus;
-    assigned_to?: number | null;
+    assigned_to?: User["id"] | null;
     due_date?: string | Date | null;
     category?: string | null;
     issue_type: string;
-    project: number;
+    project: string;
 }
-export interface IssueComment extends OfflineModel, SubmittedAtModel, TimestampedModel {
+export interface IssueComment extends UUIDModel, SubmittedAtModel, TimestampedModel {
     issue: string;
     content: string;
     author?: number;
@@ -64,7 +25,7 @@ export interface IssueUpdateChangeTypes {
     category: {
         name: string;
         color: CSSColor;
-        offline_id: OfflineModel["offline_id"];
+        uuid: UUIDModel["uuid"];
     } | null;
     description: string;
     title: string;
@@ -74,27 +35,26 @@ export interface IssueUpdateChangeTypes {
     } | null;
     due_date: string;
 }
-export interface IssueUpdate extends OfflineModel, CreatedByModel {
+export interface IssueUpdate extends UUIDModel, CreatedByModel {
     submitted_at: string;
-    issue: OfflineModel["offline_id"];
+    issue: UUIDModel["uuid"];
     changes: Partial<Record<IssueUpdateChange, IssueUpdateChangeTypes[IssueUpdateChange]>>;
 }
-export interface IssueAssociation extends OfflineModel, SubmittedAtModel, CreatedByModel {
+export interface IssueAssociation extends UUIDModel, SubmittedAtModel, CreatedByModel {
     associated_issue: string;
     issue?: string;
     asset?: string;
 }
-export interface IssueTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface IssueTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     issue_type: string;
 }
-export interface IssueTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface IssueTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     fields_revision: string;
 }
-export interface IssueTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface IssueTypeFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
     fields_revision: string;
     issue: string;
 }
-export interface IssueTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface IssueTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }
-export {};

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

@@ -1,10 +1,10 @@
 import { LicenseLevel, LicenseStatus } from '../../enums';
-import { OfflineModel, OwnedByOrganization } from './base';
+import { OwnedByOrganization, UUIDModel } from './base';
 export interface Transaction {
     id: string;
 }
-export interface License extends OfflineModel, OwnedByOrganization {
-    project: number | null;
+export interface License extends UUIDModel, OwnedByOrganization {
+    project: string | null;
     level: LicenseLevel;
     status: LicenseStatus;
     is_special: boolean;

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

@@ -1,6 +1,12 @@
-import { CreatedByModel, Model } from './base';
-export interface Organization extends Model, CreatedByModel {
-    id: number;
+import { OrganizationAccessLevel } from '../../enums';
+import { CreatedByModel, UUIDModel } from './base';
+import { User } from './users';
+export interface Organization extends UUIDModel, CreatedByModel {
     name: string;
     has_access: boolean;
 }
+export interface OrganizationAccess extends UUIDModel {
+    user: User["id"];
+    organization: string;
+    access_level: OrganizationAccessLevel;
+}

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

@@ -1,14 +1,19 @@
+import { ProjectAccessLevel } from '../../enums';
 import { FileWithNameModel } from '../files';
-import { Model, OfflineModel, OwnedByOrganization, SubmittedAtModel } from './base';
-import { BoundableModel, CanvasBoundableModel } from './geo';
-export interface Project extends Model, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
-    id: number;
+import { BoundableModel, CanvasBoundableModel, OwnedByOrganization, SubmittedAtModel, UUIDModel } from './base';
+import { User } from './users';
+export interface Project extends UUIDModel, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
     name: string;
     invited?: boolean;
     issues_count?: number;
     form_submissions_count?: number;
 }
-export interface ProjectFile extends OfflineModel, SubmittedAtModel, FileWithNameModel, BoundableModel, CanvasBoundableModel {
+export interface ProjectFile extends UUIDModel, SubmittedAtModel, FileWithNameModel, BoundableModel, CanvasBoundableModel {
     z_index: number;
-    project: number;
+    project: Project["uuid"];
+}
+export interface ProjectAccess extends UUIDModel {
+    user: User["id"];
+    project: Project["uuid"];
+    access_level: ProjectAccessLevel;
 }

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

@@ -1,54 +0,0 @@
-import { OfflineState } from '@redux-offline/redux-offline/lib/types';
-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, VERSION_REDUCER_KEY, VersioningState } from '../../store';
-export interface BaseState {
-    outboxReducer: OutboxState;
-    offline: OfflineState;
-    fileReducer: FileState;
-    authReducer: AuthState;
-}
-export interface OvermapRootState extends BaseState {
-    [VERSION_REDUCER_KEY]: VersioningState;
-    categoryReducer: CategoryState;
-    assetReducer: AssetState;
-    assetAttachmentReducer: AssetAttachmentState;
-    assetStageCompletionReducer: AssetStageCompletionState;
-    assetStageReducer: AssetStageState;
-    assetTypeReducer: AssetTypeState;
-    assetTypeAttachmentReducer: AssetTypeAttachmentState;
-    issueReducer: IssueState;
-    issueAttachmentReducer: IssueAttachmentState;
-    issueCommentReducer: IssueCommentState;
-    issueCommentAttachmentReducer: IssueCommentAttachmentState;
-    issueUpdateReducer: IssueUpdateState;
-    issueTypeReducer: IssueTypeState;
-    issueTypeAttachmentReducer: IssueTypeAttachmentState;
-    organizationReducer: OrganizationState;
-    projectReducer: ProjectState;
-    projectAttachmentReducer: ProjectAttachmentState;
-    projectAccessReducer: ProjectAccessState;
-    organizationAccessReducer: OrganizationAccessState;
-    projectFileReducer: ProjectFileState;
-    rehydratedReducer: RehydratedState;
-    formReducer: FormState;
-    formRevisionReducer: FormRevisionState;
-    formRevisionAttachmentReducer: FormRevisionAttachmentState;
-    formSubmissionReducer: FormSubmissionState;
-    formSubmissionAttachmentReducer: FormSubmissionAttachmentState;
-    userReducer: UserState;
-    emailDomainsReducer: EmailDomainState;
-    licenseReducer: LicenseState;
-    documentsReducer: DocumentState;
-    documentAttachmentReducer: DocumentAttachmentState;
-    teamReducer: TeamState;
-    agentsReducer: AgentsState;
-    geoImageReducer: GeoImageSliceState;
-    issueAssociationReducer: IssueAssociationSliceState;
-    issueTypeFieldsReducer: IssueTypeFieldsState;
-    issueTypeFieldValuesReducer: IssueTypeFieldValuesState;
-    issueTypeFieldsAttachmentReducer: IssueTypeFieldsAttachmentState;
-    issueTypeFieldValuesAttachmentReducer: IssueTypeFieldValuesAttachmentState;
-    assetTypeFieldsReducer: AssetTypeFieldsState;
-    assetTypeFieldValuesReducer: AssetTypeFieldValuesState;
-    assetTypeFieldsAttachmentReducer: AssetTypeFieldsAttachmentState;
-    assetTypeFieldValuesAttachmentReducer: AssetTypeFieldValuesAttachmentState;
-}

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

@@ -1,9 +1,9 @@
-import { ColorModel, IconModel, OfflineModel, SubmittedAtModel } from './base';
+import { ColorModel, IconModel, SubmittedAtModel, UUIDModel } from './base';
 import { Organization } from './organizations';
 import { User } from './users';
-export interface Team extends OfflineModel, SubmittedAtModel, IconModel, ColorModel {
+export interface Team extends UUIDModel, SubmittedAtModel, IconModel, ColorModel {
     name: string;
-    parent: OfflineModel["offline_id"] | null;
-    organization: Organization["id"];
+    parent: Team["uuid"] | null;
+    organization: Organization["uuid"];
     members: User["id"][];
 }

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

@@ -1,10 +1,8 @@
-import { OptionalFileModel } from './base';
+import { IdModel, OptionalFileModel } from './base';
 export interface Profile extends OptionalFileModel {
-    favourite_project_ids: number[];
     tour_step: number;
 }
-export interface User {
-    id: number;
+export interface User extends IdModel {
     username: string;
     email: string;
     profile: Profile;

package/dist/utils/offline.d.ts

@@ -1,13 +1,13 @@
-import { Offline, OfflineModel } from '../typings';
+import { UUID, UUIDModel } from '../typings';
 export declare const COMMON_AUTO_FIELDS: readonly ["created_at", "updated_at", "index", "revision"];
 /**
  * Adds a generated UUID to the "offline_id" key of the object.
  * @param draft The model data to add the offline_id to
  */
-export declare function offline<T>(draft: T): Offline<T>;
+export declare function offline<T>(draft: T): UUID<T>;
 /**
  * Converts an array of OfflineModel objects to a Record<string, TModel>, mapping an offline ID to the object with that
  * offline ID.
  * @param array An array of offline model instances
  */
-export declare function toOfflineIdRecord<TModel extends OfflineModel>(array: TModel[]): Record<string, TModel>;
+export declare function toOfflineIdRecord<TModel extends UUIDModel>(array: TModel[]): Record<string, TModel>;

package/dist/utils/utils.d.ts

@@ -1,7 +1,8 @@
-import { IssueAttachment, OfflineModel, OvermapRootState } from '../typings';
+import { OvermapRootState } from '../store';
+import { IssueAttachment, UUIDModel } from '../typings';
 type MemoizedSelectorWithArgs<TArgs, TRet> = (state: OvermapRootState, args: TArgs) => TRet;
 export declare const restructureCreateSelectorWithArgs: <TArgs, TRet>(selector: MemoizedSelectorWithArgs<TArgs, TRet>) => (args: TArgs) => (state: OvermapRootState) => TRet;
-export declare function onlyUniqueOfflineIds(value: OfflineModel, index: number, self: OfflineModel[]): boolean;
+export declare function onlyUniqueOfflineIds(value: UUIDModel, index: number, self: UUIDModel[]): boolean;
 export declare function onlyUniqueHashes(value: IssueAttachment, index: number, self: IssueAttachment[]): boolean;
 export declare const emailRegex: RegExp;
 export declare function createPayload<TPayload extends object>(payload: TPayload): TPayload;

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.75",
+	"version": "1.0.77-store-typing-improvements.0",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",
@@ -35,8 +35,8 @@
 		"yarn": "^1.22.22"
 	},
 	"devDependencies": {
-		"@overmap-ai/blocks": "^1.0.35-radio-card.2",
-		"@overmap-ai/forms": "1.0.29",
+		"@overmap-ai/blocks": "1.0.40-alpha.1",
+		"@overmap-ai/forms": "1.0.32-react-flow-david-fixes.6",
 		"@rollup/plugin-commonjs": "^28.0.6",
 		"@tiptap/core": "^3.0.7",
 		"@types/add": "^2",
@@ -77,8 +77,8 @@
 		"vitest": "3.2.4"
 	},
 	"peerDependencies": {
-		"@overmap-ai/blocks": "^1.0.35-radio-card.2",
-		"@overmap-ai/forms": "1.0.29",
+		"@overmap-ai/blocks": "1.0.40-alpha.1",
+		"@overmap-ai/forms": "1.0.32-react-flow-david-fixes.6",
 		"@tiptap/core": "^2.4.0",
 		"react": ">=18.2.0 <20.0.0",
 		"react-dom": ">=18.2.0 <20.0.0"

package/dist/store/adapter.d.ts

@@ -1,15 +0,0 @@
-import { PayloadAction } from '@reduxjs/toolkit';
-import { ModelState } from './typings';
-export interface OvermapModelAdapter<TModel> {
-    addOne: (state: ModelState<TModel>, action: PayloadAction<TModel>) => void;
-    addMany: (state: ModelState<TModel>, action: PayloadAction<TModel[]>) => void;
-    setOne: (state: ModelState<TModel>, action: PayloadAction<TModel>) => void;
-    setMany: (state: ModelState<TModel>, action: PayloadAction<TModel[]>) => void;
-    updateOne: (state: ModelState<TModel>, action: PayloadAction<TModel>) => void;
-    updateMany: (state: ModelState<TModel>, action: PayloadAction<TModel[]>) => void;
-    deleteOne: (state: ModelState<TModel>, action: PayloadAction<string>) => void;
-    deleteMany: (state: ModelState<TModel>, action: PayloadAction<string[]>) => void;
-    initialize: (state: ModelState<TModel>, action: PayloadAction<TModel[]>) => void;
-    getInitialState: <TState extends object>(state: TState) => TState & ModelState<TModel>;
-}
-export declare function createModelAdapter<TModel>(computeModelId: (model: TModel) => string): OvermapModelAdapter<TModel>;

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

@@ -1,12 +0,0 @@
-import { OrganizationAccessLevel, ProjectAccessLevel } from '../../enums';
-import { OfflineModel } from './base';
-export interface ProjectAccess extends OfflineModel {
-    user: number;
-    project: number;
-    access_level: ProjectAccessLevel;
-}
-export interface OrganizationAccess extends OfflineModel {
-    user: number;
-    organization: number;
-    access_level: OrganizationAccessLevel;
-}

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

@@ -1,13 +0,0 @@
-import { MultiPoint, Point } from 'geojson';
-export interface BoundableModel {
-    bounds?: MultiPoint;
-}
-export interface CanvasBoundableModel {
-    canvas_bounds?: MultiPoint;
-}
-export interface MarkableModel {
-    geo_marker?: Point;
-}
-export interface CanvasMarkableModel {
-    canvas_marker?: Point;
-}

package/dist/typings/store.d.ts

@@ -1,7 +0,0 @@
-import { OvermapRootState } from './models';
-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>;