@mydoormot/app-types 1.1.4 → 1.1.6

package/.turbo/turbo-build.log

@@ -1,11 +1,13 @@
+yarn run v1.22.19
 $ tsup src/index.ts --format cjs --dts
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v7.2.0
 CLI Target: node16
 CJS Build start
-CJS dist/index.js 4.72 KB
-CJS ⚡️ Build success in 83ms
+CJS dist/index.js 5.41 KB
+CJS ⚡️ Build success in 63ms
 DTS Build start
-DTS ⚡️ Build success in 1977ms
-DTS dist/index.d.ts 8.43 KB
+DTS ⚡️ Build success in 1161ms
+DTS dist/index.d.ts 8.85 KB
+Done in 3.13s.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mydoormot/app-types
 
+## 1.1.6
+
+### Patch Changes
+
+- Modified types
+
+## 1.1.5
+
+### Patch Changes
+
+- Modified app types
+
 ## 1.1.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -22,23 +22,14 @@ type User = {
     updatedAt: string;
     createdAt: string;
     enterprise: string[];
+    authType: AuthType | `${AuthType}`;
+    version: number;
     pushTokens?: string[];
     avatarUrl?: string;
     state?: string;
     city?: string;
-    homeAddress?: {
-        coordinates?: number[];
-        address?: string;
-        placeId?: string;
-    };
-    workAddress?: {
-        coordinates?: number[];
-        address?: string;
-        placeId?: string;
-    };
-    googleToken?: string;
-    appleToken?: string;
-    authType?: AuthType | `${AuthType}`;
+    googleUserId?: string;
+    appleUserId?: string;
 };
 type UserAddress = {
     user: string;
@@ -59,6 +50,27 @@ declare enum EnterpriseType {
     Property = "property",
     Store = "store"
 }
+type Enterprise = {
+    id: string;
+    user: string | User;
+    name: string;
+    city: string;
+    verified: boolean;
+    enterpriseType: EnterpriseType | `${EnterpriseType}`;
+    deleted: boolean;
+    updatedAt: Date;
+    createdAt: Date;
+    isActive: boolean;
+    version: number;
+    officeNumber?: string;
+    address?: {
+        coordinates?: number[];
+        address?: string;
+    };
+    image?: string;
+    coverImage?: string;
+    activationDate?: string;
+};
 
 declare enum InvoiceStatus {
     Pending = "pending",
@@ -84,6 +96,73 @@ interface Invoice {
     accessCode?: string;
 }
 
+type City = {
+    id: string;
+    state: string | State;
+    name: string;
+    slug: string;
+    location: {
+        coordinates: number[];
+    };
+    population: string;
+    populationProper: string;
+    updatedAt: Date;
+    createdAt: Date;
+    version: number;
+    isRiderActive: boolean;
+    isPropertyActive: boolean;
+    errandPrice?: number;
+};
+type State = {
+    id: string;
+    name: string;
+    slug: string;
+    location: {
+        coordinates: number[];
+    };
+    alias: string;
+    updatedAt: Date;
+    createdAt: Date;
+};
+type LatLng = `${number},${number}`;
+
+type Rider = {
+    id: string;
+    user: string | User;
+    city: string | City;
+    currLocation: {
+        coordinates: number[];
+    };
+    vehicle: string | Vehicle;
+    vehicleNumber: string;
+    verified: boolean;
+    active: boolean;
+    updatedAt: Date;
+    createdAt: Date;
+    rating: number;
+    version: number;
+    hasBeenRated: boolean;
+    enterprise: string | Enterprise;
+    isTracking: boolean;
+    state?: string | State;
+    currentErrand?: Errand;
+    lastDeliveredErrand?: Errand;
+};
+declare enum VehicleType {
+    Bike = "bike",
+    Shuttle = "shuttle"
+}
+type Vehicle = {
+    user: string;
+    vehicleNumber: string;
+    enterprise: string;
+    version: number;
+    createdAt: string;
+    updatedAt: string;
+    vehicleType: VehicleType | `${VehicleType}`;
+    rider?: string;
+};
+
 declare enum ErrandStatus {
     Pending = "pending",
     RiderAssigned = "rider-assigned",
@@ -152,7 +231,7 @@ interface PendingErrand {
 interface Errand {
     id: string;
     rider: string | Rider;
-    customerId: string;
+    customerId: string | User;
     nameOfItem: string;
     pickupDetails: AddressDetails;
     deliveryDetails: AddressDetails;
@@ -163,16 +242,18 @@ interface Errand {
         refId: string;
         authorizationUrl: string;
         accessCode: string;
-        invoiceId?: string;
+        invoiceId?: string | Invoice;
     };
     aliasId: string;
     errandTimeline: string | ErrandTimeline;
     updatedAt: Date;
     createdAt: Date;
-    errandRating?: string;
+    errandRating?: string | ErrandRating;
     payOnDeliveryAmount?: string;
     additionalData?: string;
     deliveryDate?: Date;
+    city?: City;
+    price?: number;
 }
 interface AggragatedErrand extends Errand {
     parcelSize: `${ParcelSize}`;
@@ -194,7 +275,6 @@ interface AggragatedErrand extends Errand {
         stateCoords: number[];
     };
     riderUserDetails: User;
-    errandRatingDetails?: ErrandRating;
 }
 interface ErrandRating {
     createdAt: string;
@@ -211,47 +291,6 @@ declare enum AddressTypes {
     DeliveryAddress = "deliveryAddress",
     PickupAddress = "pickupAddress"
 }
-interface Rider {
-    id: string;
-    _id: string;
-    user: string | User;
-    city: string;
-    currLocation?: {
-        coordinates: number[];
-    };
-    name?: string;
-    vehicle: string;
-    vehicleNumber: string;
-    verified: boolean;
-    active: boolean;
-    updatedAt: Date;
-    createdAt: Date;
-    rating?: number;
-    hasBeenRated: boolean;
-    enterprise: string;
-    isTracking: boolean;
-}
-interface ActiveRider {
-    _id: string;
-    user: string;
-    enterprise: string;
-    city: string;
-    verified: boolean;
-    currLocation: {
-        type: 'Point';
-        coordinates: [];
-    };
-    active: boolean;
-    vehicleNumber: string;
-    rating: number;
-    hasBeenRated: number;
-    createdAt: string;
-    updatedAt: string;
-    version: number;
-    numErrands: number;
-    available: boolean;
-    fullName: string;
-}
 declare enum DeliveryStatus {
     Pending = "pending",
     EnRoute = "en-route",
@@ -304,36 +343,6 @@ type AddressDetails = {
     addressId?: string;
 };
 
-type City = {
-    id: string;
-    state: string | State;
-    name: string;
-    slug: string;
-    location: {
-        coordinates: number[];
-    };
-    population: string;
-    populationProper: string;
-    updatedAt: Date;
-    createdAt: Date;
-    version: number;
-    isRiderActive: boolean;
-    isPropertyActive: boolean;
-    errandPrice?: number;
-};
-type State = {
-    id: string;
-    name: string;
-    slug: string;
-    location: {
-        coordinates: number[];
-    };
-    alias: string;
-    updatedAt: Date;
-    createdAt: Date;
-};
-type LatLng = `${number},${number}`;
-
 declare enum NotificationType {
     Errand = "errand",
     ErrandTimeline = "errand-timeline"
@@ -371,5 +380,10 @@ interface PaginateResult<T> {
     meta?: any;
     [customLabel: string]: T[] | number | boolean | null | undefined;
 }
+declare enum LinkDestination {
+    Website = "web",
+    MainApp = "mydoormot:app",
+    RiderApp = "mydoormot:rider"
+}
 
-export { ActiveRider, AddressDetails, AddressTypes, AggragatedErrand, AuthType, City, DeliveryStatus, Errand, ErrandRating, ErrandStatus, ErrandTimeline, Invoice, InvoiceStatus, LatLng, Notification, NotificationData, NotificationType, PaginateResult, ParcelSize, PaymentOptions, PendingErrand, Rider, RoleType, State, User, UserAddress, errandTimeline };
+export { AddressDetails, AddressTypes, AggragatedErrand, AuthType, City, DeliveryStatus, Enterprise, EnterpriseType, Errand, ErrandRating, ErrandStatus, ErrandTimeline, Invoice, InvoiceStatus, LatLng, LinkDestination, Notification, NotificationData, NotificationType, PaginateResult, ParcelSize, PaymentOptions, PendingErrand, Rider, RoleType, State, User, UserAddress, Vehicle, errandTimeline };

package/dist/index.js

@@ -23,8 +23,10 @@ __export(src_exports, {
   AddressTypes: () => AddressTypes,
   AuthType: () => AuthType,
   DeliveryStatus: () => DeliveryStatus,
+  EnterpriseType: () => EnterpriseType,
   ErrandStatus: () => ErrandStatus,
   InvoiceStatus: () => InvoiceStatus,
+  LinkDestination: () => LinkDestination,
   NotificationType: () => NotificationType,
   ParcelSize: () => ParcelSize,
   PaymentOptions: () => PaymentOptions,
@@ -127,13 +129,32 @@ var NotificationType = /* @__PURE__ */ ((NotificationType2) => {
   NotificationType2["ErrandTimeline"] = "errand-timeline";
   return NotificationType2;
 })(NotificationType || {});
+
+// src/enterprise.ts
+var EnterpriseType = /* @__PURE__ */ ((EnterpriseType2) => {
+  EnterpriseType2["Restaurant"] = "restaurant";
+  EnterpriseType2["Dispatch"] = "dispatch";
+  EnterpriseType2["Property"] = "property";
+  EnterpriseType2["Store"] = "store";
+  return EnterpriseType2;
+})(EnterpriseType || {});
+
+// src/index.ts
+var LinkDestination = /* @__PURE__ */ ((LinkDestination2) => {
+  LinkDestination2["Website"] = "web";
+  LinkDestination2["MainApp"] = "mydoormot:app";
+  LinkDestination2["RiderApp"] = "mydoormot:rider";
+  return LinkDestination2;
+})(LinkDestination || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddressTypes,
   AuthType,
   DeliveryStatus,
+  EnterpriseType,
   ErrandStatus,
   InvoiceStatus,
+  LinkDestination,
   NotificationType,
   ParcelSize,
   PaymentOptions,

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@mydoormot/app-types",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "mains": "./dist/index.js",
+  "typess": "./dist/index.d.ts",
+  "main": "./src/index.ts",
   "scripts": {
     "clean": "del ./build/*",
     "build": "tsup src/index.ts --format cjs --dts"

package/src/enterprise.ts

@@ -1,4 +1,4 @@
-// NOTE: Modify Enterprise Types
+import { User } from './user';
 
 export enum EnterpriseType {
   Restaurant = 'restaurant',
@@ -6,3 +6,25 @@ export enum EnterpriseType {
   Property = 'property',
   Store = 'store',
 }
+
+export type Enterprise = {
+  id: string;
+  user: string | User;
+  name: string;
+  city: string;
+  verified: boolean;
+  enterpriseType: EnterpriseType | `${EnterpriseType}`;
+  deleted: boolean;
+  updatedAt: Date;
+  createdAt: Date;
+  isActive: boolean;
+  version: number;
+  officeNumber?: string;
+  address?: {
+    coordinates?: number[];
+    address?: string;
+  };
+  image?: string;
+  coverImage?: string;
+  activationDate?: string;
+};

package/src/errand.ts

@@ -1,4 +1,6 @@
 import { Invoice, InvoiceStatus } from './invoice';
+import { City } from './location';
+import { Rider } from './rider';
 import { User } from './user';
 
 export enum ErrandStatus {
@@ -102,7 +104,7 @@ export interface PendingErrand {
 export interface Errand {
   id: string;
   rider: string | Rider;
-  customerId: string;
+  customerId: string | User;
   nameOfItem: string;
   pickupDetails: AddressDetails;
   deliveryDetails: AddressDetails;
@@ -113,17 +115,18 @@ export interface Errand {
     refId: string;
     authorizationUrl: string;
     accessCode: string;
-    invoiceId?: string;
+    invoiceId?: string | Invoice;
   };
   aliasId: string;
   errandTimeline: string | ErrandTimeline;
   updatedAt: Date;
   createdAt: Date;
-
-  errandRating?: string;
+  errandRating?: string | ErrandRating;
   payOnDeliveryAmount?: string;
   additionalData?: string;
   deliveryDate?: Date;
+  city?: City;
+  price?: number;
 }
 
 export interface AggragatedErrand extends Errand {
@@ -146,7 +149,6 @@ export interface AggragatedErrand extends Errand {
     stateCoords: number[];
   };
   riderUserDetails: User;
-  errandRatingDetails?: ErrandRating;
 }
 
 export interface ErrandTimeline {
@@ -181,49 +183,6 @@ export enum AddressTypes {
   PickupAddress = 'pickupAddress',
 }
 
-export interface Rider {
-  id: string;
-  _id: string;
-  user: string | User;
-  city: string;
-  currLocation?: {
-    coordinates: number[];
-  };
-  name?: string;
-  vehicle: string;
-  vehicleNumber: string;
-  verified: boolean;
-  active: boolean;
-  updatedAt: Date;
-  createdAt: Date;
-  rating?: number;
-  hasBeenRated: boolean; // NOTE: This tells app if the rider has an existing rating
-  enterprise: string;
-  isTracking: boolean;
-}
-
-export interface ActiveRider {
-  _id: string;
-  user: string;
-  enterprise: string;
-  city: string;
-  verified: boolean;
-  currLocation: {
-    type: 'Point';
-    coordinates: [];
-  };
-  active: boolean;
-  vehicleNumber: string;
-  rating: number;
-  hasBeenRated: number;
-  createdAt: string;
-  updatedAt: string;
-  version: number;
-  numErrands: number;
-  available: boolean;
-  fullName: string;
-}
-
 export enum DeliveryStatus {
   Pending = 'pending',
   EnRoute = 'en-route',

package/src/index.ts

@@ -14,8 +14,16 @@ export interface PaginateResult<T> {
   [customLabel: string]: T[] | number | boolean | null | undefined;
 }
 
+export enum LinkDestination {
+  Website = 'web',
+  MainApp = 'mydoormot:app',
+  RiderApp = 'mydoormot:rider',
+}
+
 export * from './user';
 export * from './errand';
 export * from './location';
 export * from './invoice';
 export * from './notification';
+export * from './rider';
+export * from './enterprise';

package/src/rider.ts

@@ -0,0 +1,44 @@
+import { Enterprise } from './enterprise';
+import { Errand } from './errand';
+import { City, State } from './location';
+import { User } from './user';
+
+export type Rider = {
+  id: string;
+  user: string | User;
+  city: string | City;
+  currLocation: {
+    coordinates: number[];
+  };
+  vehicle: string | Vehicle;
+  vehicleNumber: string;
+  verified: boolean;
+  active: boolean;
+  updatedAt: Date;
+  createdAt: Date;
+  rating: number;
+  version: number;
+  hasBeenRated: boolean;
+  enterprise: string | Enterprise;
+  isTracking: boolean;
+
+  state?: string | State;
+  currentErrand?: Errand;
+  lastDeliveredErrand?: Errand;
+};
+
+enum VehicleType {
+  Bike = 'bike',
+  Shuttle = 'shuttle',
+}
+
+export type Vehicle = {
+  user: string;
+  vehicleNumber: string;
+  enterprise: string;
+  version: number;
+  createdAt: string;
+  updatedAt: string;
+  vehicleType: VehicleType | `${VehicleType}`;
+  rider?: string;
+};

package/src/user.ts

@@ -24,23 +24,14 @@ export type User = {
   updatedAt: string;
   createdAt: string;
   enterprise: string[];
+  authType: AuthType | `${AuthType}`;
+  version: number;
   pushTokens?: string[];
   avatarUrl?: string;
   state?: string;
   city?: string;
-  homeAddress?: {
-    coordinates?: number[];
-    address?: string;
-    placeId?: string;
-  };
-  workAddress?: {
-    coordinates?: number[];
-    address?: string;
-    placeId?: string;
-  };
-  googleToken?: string;
-  appleToken?: string;
-  authType?: AuthType | `${AuthType}`;
+  googleUserId?: string;
+  appleUserId?: string;
 };
 
 export type UserAddress = {