@nyig/models 0.2.26 → 0.2.29

package/index.mjs

@@ -18,10 +18,9 @@ var zBPaymentInfo = z.object({
 });
 
 // src/interface/booking/bUserInfo.ts
-import { Types } from "mongoose";
 import { z as z2 } from "zod";
 var zBUserInfo = z2.object({
-  userId: z2.instanceof(Types.ObjectId).or(z2.string()).optional(),
+  userId: z2.string().optional(),
   firstName: z2.string(),
   lastName: z2.string(),
   rank: z2.string(),
@@ -43,17 +42,6 @@ var BookingType = /* @__PURE__ */ ((BookingType2) => {
 // src/interface/booking/campBooking.ts
 import { z as z13 } from "zod";
 
-// src/interface/mongoose/mongoose.ts
-import { z as z3 } from "zod";
-import { Types as Types2 } from "mongoose";
-function extendZodObjectForMongoose(original, isIdString) {
-  return original.extend({
-    _id: !isIdString ? z3.instanceof(Types2.ObjectId).or(z3.string()) : z3.string(),
-    createdAt: z3.coerce.date().optional(),
-    updatedAt: z3.coerce.date().optional()
-  });
-}
-
 // src/interface/tracking/attendState.ts
 var AttendState = /* @__PURE__ */ ((AttendState2) => {
   AttendState2["ABSENT"] = "absent";
@@ -63,15 +51,14 @@ var AttendState = /* @__PURE__ */ ((AttendState2) => {
 })(AttendState || {});
 
 // src/interface/tracking/attendance.ts
-import { Types as Types3 } from "mongoose";
 import { z as z5 } from "zod";
 
 // src/interface/payment/tuition.ts
-import { z as z4 } from "zod";
-var zTuition = z4.object({
-  primary: z4.number().int().min(1),
-  textbook: z4.boolean().optional(),
-  shipping: z4.boolean().optional()
+import { z as z3 } from "zod";
+var zTuition = z3.object({
+  primary: z3.number().int().min(1),
+  textbook: z3.boolean().optional(),
+  shipping: z3.boolean().optional()
 });
 
 // src/interface/tracking/campOption.ts
@@ -82,23 +69,33 @@ var CampOption = /* @__PURE__ */ ((CampOption2) => {
   return CampOption2;
 })(CampOption || {});
 
+// src/interface/addAutoProps.ts
+import { z as z4 } from "zod";
+function addAutoProps(original) {
+  return original.extend({
+    _id: z4.string(),
+    editedBy: z4.string(),
+    createdAt: z4.coerce.date().optional(),
+    updatedAt: z4.coerce.date().optional()
+  });
+}
+
 // src/interface/tracking/attendance.ts
-var zAttendance = z5.object({
-  student: z5.instanceof(Types3.ObjectId).or(z5.string()),
+var zBAttendance = z5.object({
+  student: z5.string(),
   states: z5.array(z5.nativeEnum(AttendState)),
   tuition: zTuition,
   paid: z5.boolean().optional(),
   campOption: z5.nativeEnum(CampOption)
 });
-var zMAttendance = extendZodObjectForMongoose(zAttendance);
+var zAttendance = addAutoProps(zBAttendance);
 
 // src/interface/tracking/campTracker.ts
-import { Types as Types4 } from "mongoose";
 import { z as z6 } from "zod";
-var zCampTracker = z6.object({
-  course: z6.instanceof(Types4.ObjectId).or(z6.string()),
-  teacher: z6.instanceof(Types4.ObjectId).or(z6.string()),
-  semester: z6.instanceof(Types4.ObjectId).or(z6.string()),
+var zBCampTracker = z6.object({
+  course: z6.string(),
+  teacher: z6.string(),
+  semester: z6.string(),
   /**
    * occurrences are tracked by week for camps
    */
@@ -109,14 +106,12 @@ var zCampTracker = z6.object({
   attendances: z6.array(z6.string()),
   notes: z6.string().optional()
 });
-var zMCampTracker = extendZodObjectForMongoose(zCampTracker);
+var zCampTracker = addAutoProps(zBCampTracker);
 
 // src/interface/tracking/classTracker.ts
-import { Types as Types7 } from "mongoose";
 import { z as z9 } from "zod";
 
 // src/interface/payment/invoice.ts
-import { Types as Types5 } from "mongoose";
 import { z as z7 } from "zod";
 
 // src/interface/payment/paymentMethod.ts
@@ -139,10 +134,10 @@ var zInvoiceItem = z7.object({
   units: z7.number()
 });
 var zInvoicePackage = z7.object({
-  student: z7.instanceof(Types5.ObjectId).or(z7.string()),
+  student: z7.string(),
   items: z7.array(zInvoiceItem).min(1, "Package must contain at least one item")
 });
-var zInvoice = z7.object({
+var zBInvoice = z7.object({
   billTo: z7.string().min(1, "The 'Bill To' field must not be empty"),
   packages: z7.array(zInvoicePackage).min(1, "Invoice must include at least one package"),
   discounts: z7.array(zDiscount),
@@ -150,13 +145,11 @@ var zInvoice = z7.object({
   shipping: z7.number().int().min(0).optional(),
   paid: z7.nativeEnum(PaymentMethod).optional(),
   notes: z7.string().optional(),
-  createdBy: z7.instanceof(Types5.ObjectId).or(z7.string()),
-  lastEditBy: z7.instanceof(Types5.ObjectId).or(z7.string()).optional()
+  createdBy: z7.string()
 });
-var zMInvoice = extendZodObjectForMongoose(zInvoice);
+var zInvoice = addAutoProps(zBInvoice);
 
 // src/interface/payment/teacherPayment.ts
-import { Types as Types6 } from "mongoose";
 import { z as z8 } from "zod";
 var zTeacherPaymentRow = z8.object({
   course: z8.string(),
@@ -164,18 +157,18 @@ var zTeacherPaymentRow = z8.object({
   count: z8.number(),
   wage: z8.number()
 });
-var zTeacherPayment = z8.object({
-  teacher: z8.instanceof(Types6.ObjectId).or(z8.string()),
+var zBTeacherPayment = z8.object({
+  teacher: z8.string(),
   rows: z8.array(zTeacherPaymentRow),
   paid: z8.boolean().optional()
 });
-var zMTeacherPayment = extendZodObjectForMongoose(zTeacherPayment);
+var zTeacherPayment = addAutoProps(zBTeacherPayment);
 
 // src/interface/tracking/classTracker.ts
-var zClassTracker = z9.object({
-  course: z9.instanceof(Types7.ObjectId).or(z9.string()),
-  teacher: z9.instanceof(Types7.ObjectId).or(z9.string()),
-  student: z9.instanceof(Types7.ObjectId).or(z9.string()),
+var zBClassTracker = z9.object({
+  course: z9.string(),
+  teacher: z9.string(),
+  student: z9.string(),
   classTimes: z9.array(z9.coerce.date()),
   completedList: z9.array(z9.boolean()),
   /**
@@ -187,7 +180,7 @@ var zClassTracker = z9.object({
   paused: z9.boolean().optional(),
   notes: z9.string().optional()
 });
-var zMClassTracker = extendZodObjectForMongoose(zClassTracker);
+var zClassTracker = addAutoProps(zBClassTracker);
 
 // src/interface/tracking/groupTracker.ts
 import { z as z12 } from "zod";
@@ -227,7 +220,7 @@ var NYIGSchool = /* @__PURE__ */ ((NYIGSchool2) => {
 
 // src/interface/course/course.ts
 import { z as z11 } from "zod";
-var zCourse = z11.object({
+var zBCourse = z11.object({
   name: z11.string(),
   category: z11.nativeEnum(CourseCategory),
   /**
@@ -256,14 +249,13 @@ var zCourse = z11.object({
    */
   fullCampTuition: z11.number().int("Tuition must be a whole number in cents").min(1, "Tuition must not be less than or equal to 0").optional()
 });
-var zMCourse = extendZodObjectForMongoose(zCourse);
+var zCourse = addAutoProps(zBCourse);
 
 // src/interface/tracking/groupTracker.ts
-import { Types as Types8 } from "mongoose";
-var zGroupTracker = z12.object({
-  course: z12.instanceof(Types8.ObjectId).or(z12.string()),
-  teacher: z12.instanceof(Types8.ObjectId).or(z12.string()),
-  semester: z12.instanceof(Types8.ObjectId).or(z12.string()),
+var zBGroupTracker = z12.object({
+  course: z12.string(),
+  teacher: z12.string(),
+  semester: z12.string(),
   scheduleData: zScheduleData,
   /**
    * occurrences are tracked by week for Groups
@@ -272,7 +264,7 @@ var zGroupTracker = z12.object({
   /**
    * attendances are tracked by week for Groups
    */
-  attendances: z12.array(z12.instanceof(Types8.ObjectId)),
+  attendances: z12.array(z12.string()),
   /**
    * public-facing ID of the course instance, e.g., 101
    */
@@ -287,39 +279,37 @@ var zGroupTracker = z12.object({
   isNonPublic: z12.boolean().optional(),
   notes: z12.string().optional()
 });
-var zMGroupTracker = extendZodObjectForMongoose(zGroupTracker);
+var zGroupTracker = addAutoProps(zBGroupTracker);
 
 // src/interface/booking/campBooking.ts
-var zCampBooking = z13.object({
+var zBCampBooking = z13.object({
   ctId: z13.string().optional(),
   isOnline: z13.boolean(),
   classDates: z13.string(),
   campOption: z13.nativeEnum(CampOption),
   shipping: z13.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMCampBooking = extendZodObjectForMongoose(zCampBooking);
+var zCampBooking = addAutoProps(zBCampBooking);
 
 // src/interface/booking/groupBooking.ts
-import { Types as Types9 } from "mongoose";
 import { z as z14 } from "zod";
-var zGroupBooking = z14.object({
-  gtId: z14.instanceof(Types9.ObjectId).or(z14.string()).optional(),
+var zBGroupBooking = z14.object({
+  gtId: z14.string().optional(),
   isTrial: z14.boolean().optional(),
   isOnline: z14.boolean(),
   classDate: z14.string().optional(),
   shipping: z14.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMGroupBooking = extendZodObjectForMongoose(zGroupBooking);
+var zGroupBooking = addAutoProps(zBGroupBooking);
 
 // src/interface/booking/privateBooking.ts
-import { Types as Types10 } from "mongoose";
 import { z as z15 } from "zod";
-var zPrivateBooking = z15.object({
-  courseId: z15.instanceof(Types10.ObjectId).or(z15.string()),
-  teacherId: z15.instanceof(Types10.ObjectId).or(z15.string()),
+var zBPrivateBooking = z15.object({
+  courseId: z15.string(),
+  teacherId: z15.string(),
   classDate: z15.string().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMPrivateBooking = extendZodObjectForMongoose(zPrivateBooking);
+var zPrivateBooking = addAutoProps(zBPrivateBooking);
 
 // src/interface/public/aurora.ts
 import { z as z16 } from "zod";
@@ -348,7 +338,6 @@ var zImageDef = z17.object({
 });
 
 // src/interface/reporting/reportTicket.ts
-import { Types as Types11 } from "mongoose";
 import { z as z18 } from "zod";
 
 // src/interface/reporting/ticketStatus.ts
@@ -361,14 +350,14 @@ var TicketStatus = /* @__PURE__ */ ((TicketStatus2) => {
 })(TicketStatus || {});
 
 // src/interface/reporting/reportTicket.ts
-var zReportTicket = z18.object({
-  requester: z18.instanceof(Types11.ObjectId).or(z18.string()),
-  resolver: z18.instanceof(Types11.ObjectId).or(z18.string()).optional(),
+var zBReportTicket = z18.object({
+  requester: z18.string(),
+  resolver: z18.string().optional(),
   status: z18.nativeEnum(TicketStatus),
   title: z18.string(),
   description: z18.string()
 });
-var zMReportTicket = extendZodObjectForMongoose(zReportTicket);
+var zReportTicket = addAutoProps(zBReportTicket);
 
 // src/interface/semester/season.ts
 var Season = /* @__PURE__ */ ((Season2) => {
@@ -380,7 +369,7 @@ var Season = /* @__PURE__ */ ((Season2) => {
 
 // src/interface/semester/semester.ts
 import { z as z19 } from "zod";
-var zSemester = z19.object({
+var zBSemester = z19.object({
   season: z19.nativeEnum(Season),
   year: z19.number().min(2022).max(2999),
   startDate: z19.coerce.date(),
@@ -394,15 +383,14 @@ var zSemester = z19.object({
    */
   importantDates: z19.array(z19.string())
 });
-var zMSemester = extendZodObjectForMongoose(zSemester);
+var zSemester = addAutoProps(zBSemester);
 
 // src/interface/event/eConfig.ts
-import { Types as Types12 } from "mongoose";
 import { z as z22 } from "zod";
 
 // src/interface/event/eTicket.ts
 import { z as z20 } from "zod";
-var zEventTicket = z20.object({
+var zBEventTicket = z20.object({
   name: z20.string().min(5, "Name must be at least 5 characters"),
   /**
    * Price in cents
@@ -421,7 +409,7 @@ var zEventTicket = z20.object({
    */
   lastBuyableDate: z20.coerce.date().optional()
 });
-var zMEventTicket = extendZodObjectForMongoose(zEventTicket);
+var zEventTicket = addAutoProps(zBEventTicket);
 
 // src/interface/event/table.ts
 import { z as z21 } from "zod";
@@ -436,7 +424,7 @@ var zScheduleTable = z21.object({
 });
 
 // src/interface/event/eConfig.ts
-var zEventConfig = z22.object({
+var zBEventConfig = z22.object({
   /**
    * Location of the event
    */
@@ -483,7 +471,7 @@ var zEventConfig = z22.object({
   /**
    * List of ticket object IDs for this tournament
    */
-  tickets: z22.array(z22.instanceof(Types12.ObjectId).or(z22.string())),
+  tickets: z22.array(z22.string()),
   /**
    * If false, the tournament registration is closed
    */
@@ -497,34 +485,31 @@ var zEventConfig = z22.object({
    */
   image: zImageDef.optional()
 });
+var zEventConfig = addAutoProps(zBEventConfig);
 var zEventConfigResponse = zEventConfig.extend({
-  tickets: z22.array(zMEventTicket)
+  tickets: z22.array(zEventTicket)
 });
-var zMEventConfig = extendZodObjectForMongoose(zEventConfig);
-var zMTConfigResponse = extendZodObjectForMongoose(zEventConfigResponse, true);
 
 // src/interface/event/eReg.ts
-import { Types as Types14 } from "mongoose";
 import { z as z24 } from "zod";
 
 // src/interface/event/eTicketReg.ts
 import { z as z23 } from "zod";
-import { Types as Types13 } from "mongoose";
 var zEventTicketReg = z23.object({
-  ticket: z23.instanceof(Types13.ObjectId).or(z23.string()),
+  ticket: z23.string(),
   /**
    * integer minimum 1, otherwise no ticket is being bought
    */
   amount: z23.number().int().min(1)
 });
 var zEventTicketRegResponse = zEventTicketReg.extend({
-  ticket: zMEventTicket
+  ticket: zEventTicket
 });
 
 // src/interface/event/eReg.ts
-var zEventReg = z24.object({
+var zBEventReg = z24.object({
   agaId: z24.string(),
-  tournamentId: z24.instanceof(Types14.ObjectId).or(z24.string()),
+  tournamentId: z24.string(),
   tickets: z24.array(zEventTicketReg),
   /**
    * @units CENTS - Donation in cents
@@ -533,17 +518,12 @@ var zEventReg = z24.object({
   /**
    * How the registration was created, namely through public endpoint or admin
    */
-  createMethod: z24.string().optional(),
-  /**
-   * Mongoose ID of the admin that edited the registration
-   */
-  edited: z24.instanceof(Types14.ObjectId).optional()
+  createMethod: z24.string().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
+var zEventReg = addAutoProps(zBEventReg);
 var zEventRegResponse = zEventReg.extend({
   tickets: z24.array(zEventTicketRegResponse)
 });
-var zMEventReg = extendZodObjectForMongoose(zEventReg);
-var zMEventRegResponse = extendZodObjectForMongoose(zEventRegResponse, true);
 
 // src/interface/user/goRank.ts
 var GoRank = /* @__PURE__ */ ((GoRank2) => {
@@ -593,8 +573,7 @@ var GoRank = /* @__PURE__ */ ((GoRank2) => {
 
 // src/interface/user/user.ts
 import { z as z25 } from "zod";
-import { Types as Types15 } from "mongoose";
-var zUser = z25.object({
+var zBUser = z25.object({
   name: z25.string().min(2).max(100),
   username: z25.string().optional(),
   password: z25.string().optional(),
@@ -611,12 +590,11 @@ var zUser = z25.object({
     message: "Enter a valid date in yyyy-mm-dd format"
   }).optional()
 });
-var zMUser = extendZodObjectForMongoose(zUser);
+var zUser = addAutoProps(zBUser);
 var zStudent = zUser.extend({
   rank: z25.nativeEnum(GoRank),
-  guardian: z25.instanceof(Types15.ObjectId).optional()
+  guardian: z25.string().optional()
 });
-var zMStudent = extendZodObjectForMongoose(zStudent);
 var zTeacher = zUser.extend({
   rank: z25.nativeEnum(GoRank),
   /**
@@ -646,7 +624,6 @@ var zTeacher = zUser.extend({
    */
   available: z25.array(z25.array(z25.array(z25.number()))).optional()
 });
-var zMTeacher = extendZodObjectForMongoose(zTeacher);
 
 // src/interface/user/userRoles.ts
 import { z as z26 } from "zod";
@@ -667,7 +644,23 @@ export {
   Season,
   TicketStatus,
   zAttendance,
+  zBAttendance,
+  zBCampBooking,
+  zBCampTracker,
+  zBClassTracker,
+  zBCourse,
+  zBEventConfig,
+  zBEventReg,
+  zBEventTicket,
+  zBGroupBooking,
+  zBGroupTracker,
+  zBInvoice,
   zBPaymentInfo,
+  zBPrivateBooking,
+  zBReportTicket,
+  zBSemester,
+  zBTeacherPayment,
+  zBUser,
   zBUserInfo,
   zCampBooking,
   zCampTracker,
@@ -689,26 +682,6 @@ export {
   zInvoice,
   zInvoiceItem,
   zInvoicePackage,
-  zMAttendance,
-  zMCampBooking,
-  zMCampTracker,
-  zMClassTracker,
-  zMCourse,
-  zMEventConfig,
-  zMEventReg,
-  zMEventRegResponse,
-  zMEventTicket,
-  zMGroupBooking,
-  zMGroupTracker,
-  zMInvoice,
-  zMPrivateBooking,
-  zMReportTicket,
-  zMSemester,
-  zMStudent,
-  zMTConfigResponse,
-  zMTeacher,
-  zMTeacherPayment,
-  zMUser,
   zPrivateBooking,
   zReportTicket,
   zScheduleData,

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@nyig/models",
-  "version": "0.2.26",
+  "version": "0.2.29",
   "license": "MIT",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",
   "peerDependencies": {
-    "mongoose": ">=8.0.0",
     "zod": ">=3.22.4"
   },
   "devDependencies": {