@nyig/models 0.2.26 → 0.2.27

package/index.js

@@ -59,9 +59,11 @@ __export(src_exports, {
   zMClassTracker: () => zMClassTracker,
   zMCourse: () => zMCourse,
   zMEventConfig: () => zMEventConfig,
+  zMEventConfigResponse: () => zMEventConfigResponse,
   zMEventReg: () => zMEventReg,
   zMEventRegResponse: () => zMEventRegResponse,
   zMEventTicket: () => zMEventTicket,
+  zMEventTicketResponse: () => zMEventTicketResponse,
   zMGroupBooking: () => zMGroupBooking,
   zMGroupTracker: () => zMGroupTracker,
   zMInvoice: () => zMInvoice,
@@ -69,7 +71,6 @@ __export(src_exports, {
   zMReportTicket: () => zMReportTicket,
   zMSemester: () => zMSemester,
   zMStudent: () => zMStudent,
-  zMTConfigResponse: () => zMTConfigResponse,
   zMTeacher: () => zMTeacher,
   zMTeacherPayment: () => zMTeacherPayment,
   zMUser: () => zMUser,
@@ -137,9 +138,16 @@ var import_zod13 = require("zod");
 // src/interface/mongoose/mongoose.ts
 var import_zod3 = require("zod");
 var import_mongoose2 = require("mongoose");
-function extendZodObjectForMongoose(original, isIdString) {
+function addMongooseProps(original) {
   return original.extend({
-    _id: !isIdString ? import_zod3.z.instanceof(import_mongoose2.Types.ObjectId).or(import_zod3.z.string()) : import_zod3.z.string(),
+    _id: import_zod3.z.instanceof(import_mongoose2.Types.ObjectId).or(import_zod3.z.string()),
+    createdAt: import_zod3.z.coerce.date().optional(),
+    updatedAt: import_zod3.z.coerce.date().optional()
+  });
+}
+function addMongoosePropsToResponse(original) {
+  return original.extend({
+    _id: import_zod3.z.string(),
     createdAt: import_zod3.z.coerce.date().optional(),
     updatedAt: import_zod3.z.coerce.date().optional()
   });
@@ -181,7 +189,7 @@ var zAttendance = import_zod5.z.object({
   paid: import_zod5.z.boolean().optional(),
   campOption: import_zod5.z.nativeEnum(CampOption)
 });
-var zMAttendance = extendZodObjectForMongoose(zAttendance);
+var zMAttendance = addMongooseProps(zAttendance);
 
 // src/interface/tracking/campTracker.ts
 var import_mongoose5 = require("mongoose");
@@ -200,7 +208,7 @@ var zCampTracker = import_zod6.z.object({
   attendances: import_zod6.z.array(import_zod6.z.string()),
   notes: import_zod6.z.string().optional()
 });
-var zMCampTracker = extendZodObjectForMongoose(zCampTracker);
+var zMCampTracker = addMongooseProps(zCampTracker);
 
 // src/interface/tracking/classTracker.ts
 var import_mongoose11 = require("mongoose");
@@ -244,7 +252,7 @@ var zInvoice = import_zod7.z.object({
   createdBy: import_zod7.z.instanceof(import_mongoose7.Types.ObjectId).or(import_zod7.z.string()),
   lastEditBy: import_zod7.z.instanceof(import_mongoose7.Types.ObjectId).or(import_zod7.z.string()).optional()
 });
-var zMInvoice = extendZodObjectForMongoose(zInvoice);
+var zMInvoice = addMongooseProps(zInvoice);
 
 // src/interface/payment/teacherPayment.ts
 var import_mongoose9 = require("mongoose");
@@ -260,7 +268,7 @@ var zTeacherPayment = import_zod8.z.object({
   rows: import_zod8.z.array(zTeacherPaymentRow),
   paid: import_zod8.z.boolean().optional()
 });
-var zMTeacherPayment = extendZodObjectForMongoose(zTeacherPayment);
+var zMTeacherPayment = addMongooseProps(zTeacherPayment);
 
 // src/interface/tracking/classTracker.ts
 var zClassTracker = import_zod9.z.object({
@@ -278,7 +286,7 @@ var zClassTracker = import_zod9.z.object({
   paused: import_zod9.z.boolean().optional(),
   notes: import_zod9.z.string().optional()
 });
-var zMClassTracker = extendZodObjectForMongoose(zClassTracker);
+var zMClassTracker = addMongooseProps(zClassTracker);
 
 // src/interface/tracking/groupTracker.ts
 var import_zod12 = require("zod");
@@ -347,7 +355,7 @@ var zCourse = import_zod11.z.object({
    */
   fullCampTuition: import_zod11.z.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 zMCourse = addMongooseProps(zCourse);
 
 // src/interface/tracking/groupTracker.ts
 var import_mongoose15 = require("mongoose");
@@ -378,7 +386,7 @@ var zGroupTracker = import_zod12.z.object({
   isNonPublic: import_zod12.z.boolean().optional(),
   notes: import_zod12.z.string().optional()
 });
-var zMGroupTracker = extendZodObjectForMongoose(zGroupTracker);
+var zMGroupTracker = addMongooseProps(zGroupTracker);
 
 // src/interface/booking/campBooking.ts
 var zCampBooking = import_zod13.z.object({
@@ -388,7 +396,7 @@ var zCampBooking = import_zod13.z.object({
   campOption: import_zod13.z.nativeEnum(CampOption),
   shipping: import_zod13.z.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMCampBooking = extendZodObjectForMongoose(zCampBooking);
+var zMCampBooking = addMongooseProps(zCampBooking);
 
 // src/interface/booking/groupBooking.ts
 var import_mongoose17 = require("mongoose");
@@ -400,7 +408,7 @@ var zGroupBooking = import_zod14.z.object({
   classDate: import_zod14.z.string().optional(),
   shipping: import_zod14.z.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMGroupBooking = extendZodObjectForMongoose(zGroupBooking);
+var zMGroupBooking = addMongooseProps(zGroupBooking);
 
 // src/interface/booking/privateBooking.ts
 var import_mongoose19 = require("mongoose");
@@ -410,7 +418,7 @@ var zPrivateBooking = import_zod15.z.object({
   teacherId: import_zod15.z.instanceof(import_mongoose19.Types.ObjectId).or(import_zod15.z.string()),
   classDate: import_zod15.z.string().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMPrivateBooking = extendZodObjectForMongoose(zPrivateBooking);
+var zMPrivateBooking = addMongooseProps(zPrivateBooking);
 
 // src/interface/public/aurora.ts
 var import_zod16 = require("zod");
@@ -459,7 +467,7 @@ var zReportTicket = import_zod18.z.object({
   title: import_zod18.z.string(),
   description: import_zod18.z.string()
 });
-var zMReportTicket = extendZodObjectForMongoose(zReportTicket);
+var zMReportTicket = addMongooseProps(zReportTicket);
 
 // src/interface/semester/season.ts
 var Season = /* @__PURE__ */ ((Season2) => {
@@ -485,7 +493,7 @@ var zSemester = import_zod19.z.object({
    */
   importantDates: import_zod19.z.array(import_zod19.z.string())
 });
-var zMSemester = extendZodObjectForMongoose(zSemester);
+var zMSemester = addMongooseProps(zSemester);
 
 // src/interface/event/eConfig.ts
 var import_mongoose25 = require("mongoose");
@@ -512,7 +520,8 @@ var zEventTicket = import_zod20.z.object({
    */
   lastBuyableDate: import_zod20.z.coerce.date().optional()
 });
-var zMEventTicket = extendZodObjectForMongoose(zEventTicket);
+var zMEventTicket = addMongooseProps(zEventTicket);
+var zMEventTicketResponse = addMongoosePropsToResponse(zEventTicket);
 
 // src/interface/event/table.ts
 var import_zod21 = require("zod");
@@ -588,11 +597,11 @@ var zEventConfig = import_zod22.z.object({
    */
   image: zImageDef.optional()
 });
+var zMEventConfig = addMongooseProps(zEventConfig);
 var zEventConfigResponse = zEventConfig.extend({
-  tickets: import_zod22.z.array(zMEventTicket)
+  tickets: import_zod22.z.array(zMEventTicketResponse)
 });
-var zMEventConfig = extendZodObjectForMongoose(zEventConfig);
-var zMTConfigResponse = extendZodObjectForMongoose(zEventConfigResponse, true);
+var zMEventConfigResponse = addMongoosePropsToResponse(zEventConfigResponse);
 
 // src/interface/event/eReg.ts
 var import_mongoose28 = require("mongoose");
@@ -633,8 +642,8 @@ var zEventReg = import_zod24.z.object({
 var zEventRegResponse = zEventReg.extend({
   tickets: import_zod24.z.array(zEventTicketRegResponse)
 });
-var zMEventReg = extendZodObjectForMongoose(zEventReg);
-var zMEventRegResponse = extendZodObjectForMongoose(zEventRegResponse, true);
+var zMEventReg = addMongooseProps(zEventReg);
+var zMEventRegResponse = addMongoosePropsToResponse(zEventRegResponse);
 
 // src/interface/user/goRank.ts
 var GoRank = /* @__PURE__ */ ((GoRank2) => {
@@ -702,12 +711,12 @@ var zUser = import_zod25.z.object({
     message: "Enter a valid date in yyyy-mm-dd format"
   }).optional()
 });
-var zMUser = extendZodObjectForMongoose(zUser);
+var zMUser = addMongooseProps(zUser);
 var zStudent = zUser.extend({
   rank: import_zod25.z.nativeEnum(GoRank),
   guardian: import_zod25.z.instanceof(import_mongoose31.Types.ObjectId).optional()
 });
-var zMStudent = extendZodObjectForMongoose(zStudent);
+var zMStudent = addMongooseProps(zStudent);
 var zTeacher = zUser.extend({
   rank: import_zod25.z.nativeEnum(GoRank),
   /**
@@ -737,7 +746,7 @@ var zTeacher = zUser.extend({
    */
   available: import_zod25.z.array(import_zod25.z.array(import_zod25.z.array(import_zod25.z.number()))).optional()
 });
-var zMTeacher = extendZodObjectForMongoose(zTeacher);
+var zMTeacher = addMongooseProps(zTeacher);
 
 // src/interface/user/userRoles.ts
 var import_zod26 = require("zod");
@@ -787,9 +796,11 @@ var zUserRoles = import_zod26.z.object({
   zMClassTracker,
   zMCourse,
   zMEventConfig,
+  zMEventConfigResponse,
   zMEventReg,
   zMEventRegResponse,
   zMEventTicket,
+  zMEventTicketResponse,
   zMGroupBooking,
   zMGroupTracker,
   zMInvoice,
@@ -797,7 +808,6 @@ var zUserRoles = import_zod26.z.object({
   zMReportTicket,
   zMSemester,
   zMStudent,
-  zMTConfigResponse,
   zMTeacher,
   zMTeacherPayment,
   zMUser,

package/index.mjs

@@ -46,9 +46,16 @@ 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) {
+function addMongooseProps(original) {
   return original.extend({
-    _id: !isIdString ? z3.instanceof(Types2.ObjectId).or(z3.string()) : z3.string(),
+    _id: z3.instanceof(Types2.ObjectId).or(z3.string()),
+    createdAt: z3.coerce.date().optional(),
+    updatedAt: z3.coerce.date().optional()
+  });
+}
+function addMongoosePropsToResponse(original) {
+  return original.extend({
+    _id: z3.string(),
     createdAt: z3.coerce.date().optional(),
     updatedAt: z3.coerce.date().optional()
   });
@@ -90,7 +97,7 @@ var zAttendance = z5.object({
   paid: z5.boolean().optional(),
   campOption: z5.nativeEnum(CampOption)
 });
-var zMAttendance = extendZodObjectForMongoose(zAttendance);
+var zMAttendance = addMongooseProps(zAttendance);
 
 // src/interface/tracking/campTracker.ts
 import { Types as Types4 } from "mongoose";
@@ -109,7 +116,7 @@ var zCampTracker = z6.object({
   attendances: z6.array(z6.string()),
   notes: z6.string().optional()
 });
-var zMCampTracker = extendZodObjectForMongoose(zCampTracker);
+var zMCampTracker = addMongooseProps(zCampTracker);
 
 // src/interface/tracking/classTracker.ts
 import { Types as Types7 } from "mongoose";
@@ -153,7 +160,7 @@ var zInvoice = z7.object({
   createdBy: z7.instanceof(Types5.ObjectId).or(z7.string()),
   lastEditBy: z7.instanceof(Types5.ObjectId).or(z7.string()).optional()
 });
-var zMInvoice = extendZodObjectForMongoose(zInvoice);
+var zMInvoice = addMongooseProps(zInvoice);
 
 // src/interface/payment/teacherPayment.ts
 import { Types as Types6 } from "mongoose";
@@ -169,7 +176,7 @@ var zTeacherPayment = z8.object({
   rows: z8.array(zTeacherPaymentRow),
   paid: z8.boolean().optional()
 });
-var zMTeacherPayment = extendZodObjectForMongoose(zTeacherPayment);
+var zMTeacherPayment = addMongooseProps(zTeacherPayment);
 
 // src/interface/tracking/classTracker.ts
 var zClassTracker = z9.object({
@@ -187,7 +194,7 @@ var zClassTracker = z9.object({
   paused: z9.boolean().optional(),
   notes: z9.string().optional()
 });
-var zMClassTracker = extendZodObjectForMongoose(zClassTracker);
+var zMClassTracker = addMongooseProps(zClassTracker);
 
 // src/interface/tracking/groupTracker.ts
 import { z as z12 } from "zod";
@@ -256,7 +263,7 @@ 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 zMCourse = addMongooseProps(zCourse);
 
 // src/interface/tracking/groupTracker.ts
 import { Types as Types8 } from "mongoose";
@@ -287,7 +294,7 @@ var zGroupTracker = z12.object({
   isNonPublic: z12.boolean().optional(),
   notes: z12.string().optional()
 });
-var zMGroupTracker = extendZodObjectForMongoose(zGroupTracker);
+var zMGroupTracker = addMongooseProps(zGroupTracker);
 
 // src/interface/booking/campBooking.ts
 var zCampBooking = z13.object({
@@ -297,7 +304,7 @@ var zCampBooking = z13.object({
   campOption: z13.nativeEnum(CampOption),
   shipping: z13.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMCampBooking = extendZodObjectForMongoose(zCampBooking);
+var zMCampBooking = addMongooseProps(zCampBooking);
 
 // src/interface/booking/groupBooking.ts
 import { Types as Types9 } from "mongoose";
@@ -309,7 +316,7 @@ var zGroupBooking = z14.object({
   classDate: z14.string().optional(),
   shipping: z14.boolean().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMGroupBooking = extendZodObjectForMongoose(zGroupBooking);
+var zMGroupBooking = addMongooseProps(zGroupBooking);
 
 // src/interface/booking/privateBooking.ts
 import { Types as Types10 } from "mongoose";
@@ -319,7 +326,7 @@ var zPrivateBooking = z15.object({
   teacherId: z15.instanceof(Types10.ObjectId).or(z15.string()),
   classDate: z15.string().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
-var zMPrivateBooking = extendZodObjectForMongoose(zPrivateBooking);
+var zMPrivateBooking = addMongooseProps(zPrivateBooking);
 
 // src/interface/public/aurora.ts
 import { z as z16 } from "zod";
@@ -368,7 +375,7 @@ var zReportTicket = z18.object({
   title: z18.string(),
   description: z18.string()
 });
-var zMReportTicket = extendZodObjectForMongoose(zReportTicket);
+var zMReportTicket = addMongooseProps(zReportTicket);
 
 // src/interface/semester/season.ts
 var Season = /* @__PURE__ */ ((Season2) => {
@@ -394,7 +401,7 @@ var zSemester = z19.object({
    */
   importantDates: z19.array(z19.string())
 });
-var zMSemester = extendZodObjectForMongoose(zSemester);
+var zMSemester = addMongooseProps(zSemester);
 
 // src/interface/event/eConfig.ts
 import { Types as Types12 } from "mongoose";
@@ -421,7 +428,8 @@ var zEventTicket = z20.object({
    */
   lastBuyableDate: z20.coerce.date().optional()
 });
-var zMEventTicket = extendZodObjectForMongoose(zEventTicket);
+var zMEventTicket = addMongooseProps(zEventTicket);
+var zMEventTicketResponse = addMongoosePropsToResponse(zEventTicket);
 
 // src/interface/event/table.ts
 import { z as z21 } from "zod";
@@ -497,11 +505,11 @@ var zEventConfig = z22.object({
    */
   image: zImageDef.optional()
 });
+var zMEventConfig = addMongooseProps(zEventConfig);
 var zEventConfigResponse = zEventConfig.extend({
-  tickets: z22.array(zMEventTicket)
+  tickets: z22.array(zMEventTicketResponse)
 });
-var zMEventConfig = extendZodObjectForMongoose(zEventConfig);
-var zMTConfigResponse = extendZodObjectForMongoose(zEventConfigResponse, true);
+var zMEventConfigResponse = addMongoosePropsToResponse(zEventConfigResponse);
 
 // src/interface/event/eReg.ts
 import { Types as Types14 } from "mongoose";
@@ -542,8 +550,8 @@ var zEventReg = z24.object({
 var zEventRegResponse = zEventReg.extend({
   tickets: z24.array(zEventTicketRegResponse)
 });
-var zMEventReg = extendZodObjectForMongoose(zEventReg);
-var zMEventRegResponse = extendZodObjectForMongoose(zEventRegResponse, true);
+var zMEventReg = addMongooseProps(zEventReg);
+var zMEventRegResponse = addMongoosePropsToResponse(zEventRegResponse);
 
 // src/interface/user/goRank.ts
 var GoRank = /* @__PURE__ */ ((GoRank2) => {
@@ -611,12 +619,12 @@ var zUser = z25.object({
     message: "Enter a valid date in yyyy-mm-dd format"
   }).optional()
 });
-var zMUser = extendZodObjectForMongoose(zUser);
+var zMUser = addMongooseProps(zUser);
 var zStudent = zUser.extend({
   rank: z25.nativeEnum(GoRank),
   guardian: z25.instanceof(Types15.ObjectId).optional()
 });
-var zMStudent = extendZodObjectForMongoose(zStudent);
+var zMStudent = addMongooseProps(zStudent);
 var zTeacher = zUser.extend({
   rank: z25.nativeEnum(GoRank),
   /**
@@ -646,7 +654,7 @@ var zTeacher = zUser.extend({
    */
   available: z25.array(z25.array(z25.array(z25.number()))).optional()
 });
-var zMTeacher = extendZodObjectForMongoose(zTeacher);
+var zMTeacher = addMongooseProps(zTeacher);
 
 // src/interface/user/userRoles.ts
 import { z as z26 } from "zod";
@@ -695,9 +703,11 @@ export {
   zMClassTracker,
   zMCourse,
   zMEventConfig,
+  zMEventConfigResponse,
   zMEventReg,
   zMEventRegResponse,
   zMEventTicket,
+  zMEventTicketResponse,
   zMGroupBooking,
   zMGroupTracker,
   zMInvoice,
@@ -705,7 +715,6 @@ export {
   zMReportTicket,
   zMSemester,
   zMStudent,
-  zMTConfigResponse,
   zMTeacher,
   zMTeacherPayment,
   zMUser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nyig/models",
-  "version": "0.2.26",
+  "version": "0.2.27",
   "license": "MIT",
   "main": "index.js",
   "module": "index.mjs",