@mydoormot/app-types 1.1.5 → 1.1.7

package/.turbo/turbo-build.log

@@ -1,13 +1,14 @@
-yarn run v1.22.19
-$ tsup src/index.ts --format cjs --dts
+
+> @mydoormot/app-types@1.1.6 build /Users/chuksben/Desktop/projects/microservices/mydoormot/packages/app-types
+> 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 5.07 KB
-CJS ⚡️ Build success in 38ms
+CJS dist/index.js 5.41 KB
+CJS ⚡️ Build success in 61ms
 DTS Build start
-DTS ⚡️ Build success in 1061ms
-DTS dist/index.d.ts 9.12 KB
-Done in 1.73s.
+DTS ⚡️ Build success in 721ms
+DTS dist/index.d.ts 8.90 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mydoormot/app-types
 
+## 1.1.7
+
+### Patch Changes
+
+- Modified app types for user address
+
+## 1.1.6
+
+### Patch Changes
+
+- Modified types
+
 ## 1.1.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,3 +1,33 @@
+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 RoleType {
     Rider = "rider",
     User = "user",
@@ -22,31 +52,21 @@ 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}`;
-    passwordChangedAt?: string;
-    passwordResetToken?: string;
-    passwordResetExpires?: string;
+    googleUserId?: string;
+    appleUserId?: string;
 };
 type UserAddress = {
+    id: string;
     user: string;
     name: string;
-    city: string;
+    city: string | City;
+    state: string | State;
     address: string;
     landmark?: string;
     location?: {
@@ -108,36 +128,6 @@ 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;
@@ -260,11 +250,12 @@ interface Errand {
     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}`;
@@ -286,7 +277,6 @@ interface AggragatedErrand extends Errand {
         stateCoords: number[];
     };
     riderUserDetails: User;
-    errandRatingDetails?: ErrandRating;
 }
 interface ErrandRating {
     createdAt: string;
@@ -398,4 +388,4 @@ declare enum LinkDestination {
     RiderApp = "mydoormot:rider"
 }
 
-export { AddressDetails, AddressTypes, AggragatedErrand, AuthType, City, DeliveryStatus, Errand, ErrandRating, ErrandStatus, ErrandTimeline, Invoice, InvoiceStatus, LatLng, LinkDestination, Notification, NotificationData, NotificationType, PaginateResult, ParcelSize, PaymentOptions, PendingErrand, Rider, RoleType, State, User, UserAddress, Vehicle, 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,6 +23,7 @@ __export(src_exports, {
   AddressTypes: () => AddressTypes,
   AuthType: () => AuthType,
   DeliveryStatus: () => DeliveryStatus,
+  EnterpriseType: () => EnterpriseType,
   ErrandStatus: () => ErrandStatus,
   InvoiceStatus: () => InvoiceStatus,
   LinkDestination: () => LinkDestination,
@@ -61,7 +62,6 @@ var ErrandStatus = /* @__PURE__ */ ((ErrandStatus2) => {
   ErrandStatus2["Cancelled"] = "cancelled";
   return ErrandStatus2;
 })(ErrandStatus || {});
-console.log("hello");
 var errandTimeline = [
   {
     status: "pending" /* Pending */,
@@ -130,6 +130,15 @@ var NotificationType = /* @__PURE__ */ ((NotificationType2) => {
   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";
@@ -142,6 +151,7 @@ var LinkDestination = /* @__PURE__ */ ((LinkDestination2) => {
   AddressTypes,
   AuthType,
   DeliveryStatus,
+  EnterpriseType,
   ErrandStatus,
   InvoiceStatus,
   LinkDestination,

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "@mydoormot/app-types",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "",
   "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"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -18,5 +14,9 @@
   },
   "devDependencies": {
     "tsup": "^7.2.0"
+  },
+  "scripts": {
+    "clean": "del ./build/*",
+    "build": "tsup src/index.ts --format cjs --dts"
   }
-}
+}

package/src/errand.ts

@@ -14,7 +14,6 @@ export enum ErrandStatus {
   Cancelled = 'cancelled',
 }
 
-console.log('hello');
 export const errandTimeline = [
   {
     status: ErrandStatus.Pending,
@@ -122,11 +121,12 @@ export interface Errand {
   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 {
@@ -149,7 +149,6 @@ export interface AggragatedErrand extends Errand {
     stateCoords: number[];
   };
   riderUserDetails: User;
-  errandRatingDetails?: ErrandRating;
 }
 
 export interface ErrandTimeline {

package/src/index.ts

@@ -26,3 +26,4 @@ export * from './location';
 export * from './invoice';
 export * from './notification';
 export * from './rider';
+export * from './enterprise';

package/src/user.ts

@@ -1,3 +1,5 @@
+import { City, State } from './location';
+
 export enum RoleType {
   Rider = 'rider',
   User = 'user',
@@ -24,32 +26,22 @@ 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}`;
-  passwordChangedAt?: string;
-  passwordResetToken?: string;
-  passwordResetExpires?: string;
+  googleUserId?: string;
+  appleUserId?: string;
 };
 
 export type UserAddress = {
+  id: string;
   user: string;
   name: string;
-  city: string;
+  city: string | City;
+  state: string | State;
   address: string;
   landmark?: string;
   location?: {