@timardex/cluemart-shared 1.0.9 → 1.0.12

package/dist/index.cjs

@@ -69,6 +69,7 @@ __export(index_exports, {
   mapArrayToOptions: () => mapArrayToOptions,
   marketBasicInfoFields: () => marketBasicInfoFields,
   marketEndDateFields: () => marketEndDateFields,
+  marketPriceByDateFields: () => marketPriceByDateFields,
   marketSchema: () => marketSchema,
   marketStartDateFields: () => marketStartDateFields,
   packagingOptions: () => packagingOptions,
@@ -216,22 +217,22 @@ var EnumResourceTypeIcon = /* @__PURE__ */ ((EnumResourceTypeIcon2) => {
   EnumResourceTypeIcon2["STALLHOLDER"] = "store";
   return EnumResourceTypeIcon2;
 })(EnumResourceTypeIcon || {});
-var EnumRegions = /* @__PURE__ */ ((EnumRegions2) => {
-  EnumRegions2["Auckland"] = "Auckland";
-  EnumRegions2["BayOfPlenty"] = "Bay of Plenty";
-  EnumRegions2["Canterbury"] = "Canterbury";
-  EnumRegions2["Gisborne"] = "Gisborne";
-  EnumRegions2["HawkesBay"] = "Hawke's Bay";
-  EnumRegions2["ManawatuWanganui"] = "Manawatu-Wanganui";
-  EnumRegions2["Marlborough"] = "Marlborough";
-  EnumRegions2["Nelson"] = "Nelson";
-  EnumRegions2["Northland"] = "Northland";
-  EnumRegions2["Otago"] = "Otago";
-  EnumRegions2["Southland"] = "Southland";
-  EnumRegions2["Taranaki"] = "Taranaki";
-  EnumRegions2["Waikato"] = "Waikato";
-  EnumRegions2["Wellington"] = "Wellington";
-  return EnumRegions2;
+var EnumRegions = /* @__PURE__ */ ((EnumRegions3) => {
+  EnumRegions3["Auckland"] = "Auckland";
+  EnumRegions3["BayOfPlenty"] = "Bay of Plenty";
+  EnumRegions3["Canterbury"] = "Canterbury";
+  EnumRegions3["Gisborne"] = "Gisborne";
+  EnumRegions3["HawkesBay"] = "Hawke's Bay";
+  EnumRegions3["ManawatuWanganui"] = "Manawatu-Wanganui";
+  EnumRegions3["Marlborough"] = "Marlborough";
+  EnumRegions3["Nelson"] = "Nelson";
+  EnumRegions3["Northland"] = "Northland";
+  EnumRegions3["Otago"] = "Otago";
+  EnumRegions3["Southland"] = "Southland";
+  EnumRegions3["Taranaki"] = "Taranaki";
+  EnumRegions3["Waikato"] = "Waikato";
+  EnumRegions3["Wellington"] = "Wellington";
+  return EnumRegions3;
 })(EnumRegions || {});
 var ImageTypeEnum = /* @__PURE__ */ ((ImageTypeEnum2) => {
   ImageTypeEnum2["AVATAR"] = "avatar";
@@ -351,6 +352,8 @@ function sortDatesByProximity(dates) {
     return diffA - diffB;
   });
 }
+var availableRegionTypes = Object.values(EnumRegions);
+var availableRegionOptions = mapArrayToOptions(availableRegionTypes);
 
 // src/hooks/useLocationSearch.ts
 var handleApiError = (error, message) => {
@@ -493,6 +496,14 @@ var startTimeCannotBeInPastTest = yup.string().test(
 var dateTimeSchema = yup.object().shape({
   endDate: yup.string().concat(endDateNotInPastTest).concat(endDateAfterStartDateTest).required("End date is required"),
   endTime: yup.string().concat(endTimeMustBeAfterStartTimeTest).required("End time is required"),
+  marketPrice: yup.number().typeError("Market price must be a number").min(0.1, "Market price must be at least 0.1").required("Market price is required").test(
+    "no-leading-zeros",
+    "Market price must not have leading zeros",
+    (value, context) => {
+      const original = context.originalValue?.toString() ?? "";
+      return !/^0\d+(\.\d+)?$/.test(original);
+    }
+  ),
   startDate: yup.string().concat(startDateNotInPastTest).required("Start date is required"),
   startTime: yup.string().concat(startTimeCannotBeInPastTest).required("Start time is required")
 });
@@ -531,9 +542,23 @@ var marketSchema = globalResourceSchema.shape({
   location: locationSchema,
   provider: yup2.string().trim().min(3).required("Provider is required"),
   stallApplicationInfo: yup2.object().shape({
-    applicationDeadlineHours: yup2.number().min(1).required("Application deadline hours is required"),
+    applicationDeadlineHours: yup2.number().typeError("Application deadline hours must be a number").min(1, "Application deadline hours must be at least 1").required("Application deadline hours is required").test(
+      "no-leading-zeros",
+      "Application deadline hours must not start with leading zeros",
+      (value, context) => {
+        const original = context.originalValue?.toString() ?? "";
+        return !/^0\d+$/.test(original);
+      }
+    ),
     rejectionPolicy: yup2.mixed().oneOf(Object.values(EnumRejectionPolicy)).required("Rejection policy is required"),
-    stallCapacity: yup2.number().min(1).required("Stall capacity is required")
+    stallCapacity: yup2.number().typeError("Stall capacity must be a number").min(1, "Stall capacity must be at least 1").integer("Stall capacity must be a whole number").required("Stall capacity is required").test(
+      "no-leading-zeros",
+      "Stall capacity must not have leading zeros",
+      (value, context) => {
+        const original = context.originalValue?.toString() ?? "";
+        return !/^0\d+$/.test(original);
+      }
+    )
   }),
   tags: yup2.array().of(yup2.string().defined()).nullable()
 });
@@ -607,6 +632,7 @@ var userSchema = yup4.object().shape({
   firstName: yup4.string().required("First name is required"),
   lastName: yup4.string().required("Last name is required"),
   password: passwordSchema,
+  preferredRegion: yup4.string().required("Preferred region is required"),
   // eslint-disable-next-line sort-keys
   confirmPassword: yup4.string().oneOf([yup4.ref("password")], "Passwords must match").required("Confirm Password is required"),
   role: yup4.mixed().oneOf(Object.values(EnumUserRole)).required("Role is required")
@@ -623,6 +649,7 @@ var registerSchema = yup5.object().shape({
   firstName: yup5.string().required("First Name is required"),
   lastName: yup5.string().required("Last Name is required"),
   password: passwordSchema,
+  preferredRegion: yup5.string().required("Preferred Region is required"),
   role: yup5.mixed().oneOf(Object.values(EnumUserRole)).required("Role is required")
 });
 var requestPasswordResetSchema = yup5.object().shape({
@@ -665,12 +692,14 @@ var defaultMarketFormValues = {
     {
       endDate: "04-05-2025",
       endTime: "15:00",
+      marketPrice: 0,
       startDate: "04-05-2025",
       startTime: "09:00"
     },
     {
       endDate: "05-05-2025",
       endTime: "15:00",
+      marketPrice: 0,
       startDate: "05-05-2025",
       startTime: "09:00"
     }
@@ -689,9 +718,9 @@ var defaultMarketFormValues = {
   },
   provider: "Provider name",
   stallApplicationInfo: {
-    applicationDeadlineHours: 72,
+    applicationDeadlineHours: 0,
     rejectionPolicy: "multi_date_allowed" /* MULTI_DATE_ALLOWED */,
-    stallCapacity: 4
+    stallCapacity: 0
   },
   tags: null
 };
@@ -980,6 +1009,7 @@ var defaultValues = {
   firstName: "",
   lastName: "",
   password: "",
+  preferredRegion: "",
   role: "customer" /* CUSTOMER */
 };
 function useUserForm(data) {
@@ -1007,6 +1037,7 @@ function useUserForm(data) {
         firstName: data.firstName,
         lastName: data.lastName,
         password: data.password,
+        preferredRegion: data.preferredRegion,
         role: data.role
       });
     } else {
@@ -1023,6 +1054,7 @@ function useUserForm(data) {
     firstName,
     lastName,
     password,
+    preferredRegion,
     role
   } = getValues();
   return {
@@ -1037,6 +1069,7 @@ function useUserForm(data) {
       firstName,
       lastName,
       password,
+      preferredRegion,
       role
     },
     formState: { errors },
@@ -1090,6 +1123,7 @@ var defaultValues3 = {
   firstName: "",
   lastName: "",
   password: "",
+  preferredRegion: "",
   role: "customer" /* CUSTOMER */
 };
 function useRegisterForm() {
@@ -1105,7 +1139,7 @@ function useRegisterForm() {
     defaultValues: defaultValues3,
     resolver: (0, import_yup6.yupResolver)(registerSchema)
   });
-  const { email, firstName, lastName, password, role } = getValues();
+  const { email, firstName, lastName, password, preferredRegion, role } = getValues();
   return {
     control,
     fields: {
@@ -1113,6 +1147,7 @@ function useRegisterForm() {
       firstName,
       lastName,
       password,
+      preferredRegion,
       role
     },
     formState: { errors },
@@ -1277,6 +1312,7 @@ var USER_FIELDS_FRAGMENT = import_client.gql`
     lastName
     licences
     markets
+    preferredRegion
     role
     stallholder
     updatedAt
@@ -1559,6 +1595,7 @@ var MARKET_DATETIME_FIELDS_FRAGMENT = import_client8.gql`
   fragment MarketDateTimeFields on MarketDateTimeType {
     endDate
     endTime
+    marketPrice
     startDate
     startTime
   }
@@ -1982,6 +2019,7 @@ var RELATION_LOGS_FRAGMENT = import_client14.gql`
 var RELATION_DATES_FRAGMENT = import_client14.gql`
   fragment RelationDates on RelationDateType {
     lastUpdateBy
+    marketPrice
     startDate
     status
   }
@@ -2759,9 +2797,7 @@ var availableCityTypes = [
   "Hamilton",
   "Wellington"
 ];
-var availableRegionTypes = Object.values(EnumRegions);
 var availableCityOptions = mapArrayToOptions(availableCityTypes);
-var availableRegionOptions = mapArrayToOptions(availableRegionTypes);
 
 // src/formFields/stallholder/stallholderApplyForm.ts
 var stallholderElectricity = {
@@ -2915,6 +2951,14 @@ var marketStartDateFields = [
     placeholder: "Start Time"
   }
 ];
+var marketPriceByDateFields = [
+  {
+    helperText: "Market Price for this date *",
+    keyboardType: "number-pad",
+    name: "marketPrice",
+    placeholder: "Market Price"
+  }
+];
 var marketEndDateFields = [
   {
     dateMode: "date",
@@ -3413,6 +3457,7 @@ var categoryColors = {
   mapArrayToOptions,
   marketBasicInfoFields,
   marketEndDateFields,
+  marketPriceByDateFields,
   marketSchema,
   marketStartDateFields,
   packagingOptions,

package/dist/index.d.mts

@@ -87,6 +87,7 @@ type RegisterFormData = {
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
 };
 interface CreateRegisterFormData {
@@ -185,6 +186,7 @@ type RelationLog = {
 };
 type RelationDate = {
     lastUpdateBy: string;
+    marketPrice: number;
     startDate: string;
     status: EnumInviteStatus;
 };
@@ -200,8 +202,11 @@ interface RelationType {
     updatedAt?: string;
 }
 
+type DateTimeWithPrice = DateTimeType & {
+    marketPrice: number;
+};
 interface MarketFormData extends BaseResourceTypeFormData {
-    dateTime: DateTimeType[];
+    dateTime: DateTimeWithPrice[];
     location: LocationType;
     provider: string;
     stallApplicationInfo: {
@@ -234,23 +239,9 @@ interface MarketWithConnectionDatesType extends MarketType {
 }
 
 type StallholderLocation = {
-    dateTime: {
-        startDate?: string | null;
-        startTime?: string | null;
-        endDate?: string | null;
-        endTime?: string | null;
-    } | null;
+    dateTime: Nullable<DateTimeType> | null;
     description?: string | null;
-    location: {
-        city?: string | null;
-        coordinates?: number[] | null;
-        country?: string | null;
-        fullAddress?: string | null;
-        latitude?: number | null;
-        longitude?: number | null;
-        region?: string | null;
-        type?: "Point" | null;
-    } | null;
+    location: Nullable<LocationType> | null;
     resourceId?: MapMultiLocation["resourceId"];
     resourceName?: MapMultiLocation["resourceName"];
     resourceType?: MapMultiLocation["resourceType"];
@@ -359,6 +350,7 @@ type UserFormData = {
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
 };
 interface CreateUserFormData {
@@ -387,11 +379,15 @@ interface UserType {
     licences: EnumUserLicence[] | null;
     markets: string[] | null;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
     stallholder: string | null;
     updatedAt: string;
 }
 
+type Nullable<T> = {
+    [K in keyof T]: T[K] | null | undefined;
+};
 type ResourceImageType = {
     source: string;
     title: string;
@@ -513,13 +509,10 @@ type DateFormat = "date" | "time" | "datetime";
  * @returns formatted string based on display option
  */
 declare const formatDate: (dateStr: string, display?: DateFormat, timeStr?: string) => string;
-declare const getCurrentAndFutureDates: (dates: {
+declare const getCurrentAndFutureDates: <T extends {
     startDate: string;
     startTime: string;
-}[]) => {
-    startDate: string;
-    startTime: string;
-}[];
+}>(dates: T[]) => T[];
 declare const getFutureDatesAfterThreshold: (dates: {
     startDate: string;
     startTime: string;
@@ -558,13 +551,12 @@ declare const statusOptions: {
  * @param dates - The array of date strings to sort.
  * @returns - The sorted array of date strings.
  */
-declare function sortDatesByProximity(dates: {
+declare function sortDatesByProximity<T extends {
     startDate: string;
     startTime: string;
-}[]): {
-    startDate: string;
-    startTime: string;
-}[];
+}>(dates: T[]): T[];
+declare const availableRegionTypes: EnumRegions[];
+declare const availableRegionOptions: OptionItem[];
 
 interface PlacePrediction {
     place_id: string;
@@ -646,11 +638,13 @@ declare const startTimeCannotBeInPastTest: yup.StringSchema<string | undefined,
 declare const dateTimeSchema: yup.ObjectSchema<{
     endDate: string;
     endTime: string;
+    marketPrice: number;
     startDate: string;
     startTime: string;
 }, yup.AnyObject, {
     endDate: undefined;
     endTime: undefined;
+    marketPrice: undefined;
     startDate: undefined;
     startTime: undefined;
 }, "">;
@@ -709,6 +703,7 @@ declare const marketSchema: yup.ObjectSchema<{
         endTime: string;
         startDate: string;
         startTime: string;
+        marketPrice: number;
     }[];
     location: {
         region: string;
@@ -851,6 +846,7 @@ declare const userSchema: yup.ObjectSchema<{
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     confirmPassword: string;
     role: NonNullable<EnumUserRole | undefined>;
 }, yup.AnyObject, {
@@ -859,6 +855,7 @@ declare const userSchema: yup.ObjectSchema<{
     firstName: undefined;
     lastName: undefined;
     password: undefined;
+    preferredRegion: undefined;
     confirmPassword: undefined;
     role: undefined;
 }, "">;
@@ -875,12 +872,14 @@ declare const registerSchema: yup.ObjectSchema<{
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: NonNullable<EnumUserRole | undefined>;
 }, yup.AnyObject, {
     email: undefined;
     firstName: undefined;
     lastName: undefined;
     password: undefined;
+    preferredRegion: undefined;
     role: undefined;
 }, "">;
 declare const requestPasswordResetSchema: yup.ObjectSchema<{
@@ -1197,9 +1196,7 @@ declare const stallholderFullAddress: FormField;
 declare const stallholderStartDateFields: FormDateField[];
 declare const stallholderEndDateFields: FormDateField[];
 declare const stallholderLocationDescription: FormField;
-declare const availableRegionTypes: EnumRegions[];
 declare const availableCityOptions: OptionItem[];
-declare const availableRegionOptions: OptionItem[];
 
 declare const stallholderElectricity: {
     details: FormField;
@@ -1231,6 +1228,7 @@ declare const paymentMethodOptions: OptionItem[];
 declare const marketBasicInfoFields: FormField[];
 declare const stallApplicationInfo: FormField[];
 declare const marketStartDateFields: FormDateField[];
+declare const marketPriceByDateFields: FormField[];
 declare const marketEndDateFields: FormDateField[];
 declare const availableTagTypes: string[];
 declare const tagOptions: OptionItem[];
@@ -1247,4 +1245,4 @@ declare const profileFields: FormField[];
 declare const availableCategories: Category[];
 declare const categoryColors: Record<string, string>;
 
-export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type OptionItem, type PlacePrediction, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, dateTimeSchema, defaultMarketFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, emailSchema, endDateAfterStartDateTest, endDateNotInPastTest, endTimeMustBeAfterStartTimeTest, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, globalResourceSchema, locationSchema, loginFields, loginSchema, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketSchema, marketStartDateFields, packagingOptions, passwordSchema, paymentMethodOptions, producedIngOptions, profileFields, registerFields, registerSchema, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, requestPasswordResetSchema, resetPasswordFields, resetPasswordSchema, sortDatesByProximity, stallApplicationInfo, stallHolderSchema, stallholderApplyFormSchema, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, startDateNotInPastTest, startTimeCannotBeInPastTest, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, userSchema, validateTokenFields, validateTokenSchema };
+export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, type DateTimeWithPrice, EnumInviteStatus, EnumNotification, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, dateTimeSchema, defaultMarketFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, emailSchema, endDateAfterStartDateTest, endDateNotInPastTest, endTimeMustBeAfterStartTimeTest, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, globalResourceSchema, locationSchema, loginFields, loginSchema, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketPriceByDateFields, marketSchema, marketStartDateFields, packagingOptions, passwordSchema, paymentMethodOptions, producedIngOptions, profileFields, registerFields, registerSchema, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, requestPasswordResetSchema, resetPasswordFields, resetPasswordSchema, sortDatesByProximity, stallApplicationInfo, stallHolderSchema, stallholderApplyFormSchema, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, startDateNotInPastTest, startTimeCannotBeInPastTest, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, userSchema, validateTokenFields, validateTokenSchema };

package/dist/index.d.ts

@@ -87,6 +87,7 @@ type RegisterFormData = {
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
 };
 interface CreateRegisterFormData {
@@ -185,6 +186,7 @@ type RelationLog = {
 };
 type RelationDate = {
     lastUpdateBy: string;
+    marketPrice: number;
     startDate: string;
     status: EnumInviteStatus;
 };
@@ -200,8 +202,11 @@ interface RelationType {
     updatedAt?: string;
 }
 
+type DateTimeWithPrice = DateTimeType & {
+    marketPrice: number;
+};
 interface MarketFormData extends BaseResourceTypeFormData {
-    dateTime: DateTimeType[];
+    dateTime: DateTimeWithPrice[];
     location: LocationType;
     provider: string;
     stallApplicationInfo: {
@@ -234,23 +239,9 @@ interface MarketWithConnectionDatesType extends MarketType {
 }
 
 type StallholderLocation = {
-    dateTime: {
-        startDate?: string | null;
-        startTime?: string | null;
-        endDate?: string | null;
-        endTime?: string | null;
-    } | null;
+    dateTime: Nullable<DateTimeType> | null;
     description?: string | null;
-    location: {
-        city?: string | null;
-        coordinates?: number[] | null;
-        country?: string | null;
-        fullAddress?: string | null;
-        latitude?: number | null;
-        longitude?: number | null;
-        region?: string | null;
-        type?: "Point" | null;
-    } | null;
+    location: Nullable<LocationType> | null;
     resourceId?: MapMultiLocation["resourceId"];
     resourceName?: MapMultiLocation["resourceName"];
     resourceType?: MapMultiLocation["resourceType"];
@@ -359,6 +350,7 @@ type UserFormData = {
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
 };
 interface CreateUserFormData {
@@ -387,11 +379,15 @@ interface UserType {
     licences: EnumUserLicence[] | null;
     markets: string[] | null;
     password: string;
+    preferredRegion: string;
     role: EnumUserRole;
     stallholder: string | null;
     updatedAt: string;
 }
 
+type Nullable<T> = {
+    [K in keyof T]: T[K] | null | undefined;
+};
 type ResourceImageType = {
     source: string;
     title: string;
@@ -513,13 +509,10 @@ type DateFormat = "date" | "time" | "datetime";
  * @returns formatted string based on display option
  */
 declare const formatDate: (dateStr: string, display?: DateFormat, timeStr?: string) => string;
-declare const getCurrentAndFutureDates: (dates: {
+declare const getCurrentAndFutureDates: <T extends {
     startDate: string;
     startTime: string;
-}[]) => {
-    startDate: string;
-    startTime: string;
-}[];
+}>(dates: T[]) => T[];
 declare const getFutureDatesAfterThreshold: (dates: {
     startDate: string;
     startTime: string;
@@ -558,13 +551,12 @@ declare const statusOptions: {
  * @param dates - The array of date strings to sort.
  * @returns - The sorted array of date strings.
  */
-declare function sortDatesByProximity(dates: {
+declare function sortDatesByProximity<T extends {
     startDate: string;
     startTime: string;
-}[]): {
-    startDate: string;
-    startTime: string;
-}[];
+}>(dates: T[]): T[];
+declare const availableRegionTypes: EnumRegions[];
+declare const availableRegionOptions: OptionItem[];
 
 interface PlacePrediction {
     place_id: string;
@@ -646,11 +638,13 @@ declare const startTimeCannotBeInPastTest: yup.StringSchema<string | undefined,
 declare const dateTimeSchema: yup.ObjectSchema<{
     endDate: string;
     endTime: string;
+    marketPrice: number;
     startDate: string;
     startTime: string;
 }, yup.AnyObject, {
     endDate: undefined;
     endTime: undefined;
+    marketPrice: undefined;
     startDate: undefined;
     startTime: undefined;
 }, "">;
@@ -709,6 +703,7 @@ declare const marketSchema: yup.ObjectSchema<{
         endTime: string;
         startDate: string;
         startTime: string;
+        marketPrice: number;
     }[];
     location: {
         region: string;
@@ -851,6 +846,7 @@ declare const userSchema: yup.ObjectSchema<{
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     confirmPassword: string;
     role: NonNullable<EnumUserRole | undefined>;
 }, yup.AnyObject, {
@@ -859,6 +855,7 @@ declare const userSchema: yup.ObjectSchema<{
     firstName: undefined;
     lastName: undefined;
     password: undefined;
+    preferredRegion: undefined;
     confirmPassword: undefined;
     role: undefined;
 }, "">;
@@ -875,12 +872,14 @@ declare const registerSchema: yup.ObjectSchema<{
     firstName: string;
     lastName: string;
     password: string;
+    preferredRegion: string;
     role: NonNullable<EnumUserRole | undefined>;
 }, yup.AnyObject, {
     email: undefined;
     firstName: undefined;
     lastName: undefined;
     password: undefined;
+    preferredRegion: undefined;
     role: undefined;
 }, "">;
 declare const requestPasswordResetSchema: yup.ObjectSchema<{
@@ -1197,9 +1196,7 @@ declare const stallholderFullAddress: FormField;
 declare const stallholderStartDateFields: FormDateField[];
 declare const stallholderEndDateFields: FormDateField[];
 declare const stallholderLocationDescription: FormField;
-declare const availableRegionTypes: EnumRegions[];
 declare const availableCityOptions: OptionItem[];
-declare const availableRegionOptions: OptionItem[];
 
 declare const stallholderElectricity: {
     details: FormField;
@@ -1231,6 +1228,7 @@ declare const paymentMethodOptions: OptionItem[];
 declare const marketBasicInfoFields: FormField[];
 declare const stallApplicationInfo: FormField[];
 declare const marketStartDateFields: FormDateField[];
+declare const marketPriceByDateFields: FormField[];
 declare const marketEndDateFields: FormDateField[];
 declare const availableTagTypes: string[];
 declare const tagOptions: OptionItem[];
@@ -1247,4 +1245,4 @@ declare const profileFields: FormField[];
 declare const availableCategories: Category[];
 declare const categoryColors: Record<string, string>;
 
-export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type OptionItem, type PlacePrediction, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, dateTimeSchema, defaultMarketFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, emailSchema, endDateAfterStartDateTest, endDateNotInPastTest, endTimeMustBeAfterStartTimeTest, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, globalResourceSchema, locationSchema, loginFields, loginSchema, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketSchema, marketStartDateFields, packagingOptions, passwordSchema, paymentMethodOptions, producedIngOptions, profileFields, registerFields, registerSchema, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, requestPasswordResetSchema, resetPasswordFields, resetPasswordSchema, sortDatesByProximity, stallApplicationInfo, stallHolderSchema, stallholderApplyFormSchema, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, startDateNotInPastTest, startTimeCannotBeInPastTest, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, userSchema, validateTokenFields, validateTokenSchema };
+export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, type DateTimeWithPrice, EnumInviteStatus, EnumNotification, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, dateTimeSchema, defaultMarketFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, emailSchema, endDateAfterStartDateTest, endDateNotInPastTest, endTimeMustBeAfterStartTimeTest, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, globalResourceSchema, locationSchema, loginFields, loginSchema, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketPriceByDateFields, marketSchema, marketStartDateFields, packagingOptions, passwordSchema, paymentMethodOptions, producedIngOptions, profileFields, registerFields, registerSchema, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, requestPasswordResetSchema, resetPasswordFields, resetPasswordSchema, sortDatesByProximity, stallApplicationInfo, stallHolderSchema, stallholderApplyFormSchema, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, startDateNotInPastTest, startTimeCannotBeInPastTest, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, userSchema, validateTokenFields, validateTokenSchema };