@nyig/models 0.2.36 → 0.2.38

package/index.js

@@ -69,6 +69,7 @@ __export(src_exports, {
   zInvoice: () => zInvoice,
   zInvoiceItem: () => zInvoiceItem,
   zInvoicePackage: () => zInvoicePackage,
+  zInvoiceResponse: () => zInvoiceResponse,
   zPrivateBooking: () => zPrivateBooking,
   zReportTicket: () => zReportTicket,
   zScheduleData: () => zScheduleData,
@@ -201,7 +202,7 @@ var zCampTracker = addAutoProps(zBCampTracker);
 var import_zod11 = require("zod");
 
 // src/interface/payment/invoice.ts
-var import_zod7 = require("zod");
+var import_zod9 = require("zod");
 
 // src/interface/payment/paymentMethod.ts
 var PaymentMethod = /* @__PURE__ */ ((PaymentMethod2) => {
@@ -212,36 +213,6 @@ var PaymentMethod = /* @__PURE__ */ ((PaymentMethod2) => {
   return PaymentMethod2;
 })(PaymentMethod || {});
 
-// src/interface/payment/invoice.ts
-var zDiscount = import_zod7.z.object({
-  desc: import_zod7.z.string(),
-  amount: import_zod7.z.number()
-});
-var zInvoiceItem = import_zod7.z.object({
-  course: import_zod7.z.string().min(1),
-  price: import_zod7.z.number(),
-  units: import_zod7.z.number()
-});
-var zInvoicePackage = import_zod7.z.object({
-  student: import_zod7.z.string(),
-  items: import_zod7.z.array(zInvoiceItem).min(1, "Package must contain at least one item")
-});
-var zBInvoice = import_zod7.z.object({
-  billTo: import_zod7.z.string().min(1, "The 'Bill To' field must not be empty"),
-  packages: import_zod7.z.array(zInvoicePackage).min(1, "Invoice must include at least one package"),
-  discounts: import_zod7.z.array(zDiscount),
-  textbook: import_zod7.z.number().int().min(0).optional(),
-  shipping: import_zod7.z.number().int().min(0).optional(),
-  paid: import_zod7.z.nativeEnum(PaymentMethod).optional(),
-  notes: import_zod7.z.string().optional(),
-  createdBy: import_zod7.z.string(),
-  lastEditBy: import_zod7.z.string().optional()
-});
-var zInvoice = addAutoProps(zBInvoice);
-
-// src/interface/payment/teacherPayment.ts
-var import_zod10 = require("zod");
-
 // src/interface/user/goRank.ts
 var GoRank = /* @__PURE__ */ ((GoRank2) => {
   GoRank2["KYU1"] = "1k";
@@ -289,44 +260,44 @@ var GoRank = /* @__PURE__ */ ((GoRank2) => {
 })(GoRank || {});
 
 // src/interface/user/user.ts
-var import_zod8 = require("zod");
-var zBUser = import_zod8.z.object({
-  name: import_zod8.z.string().min(2).max(100),
-  username: import_zod8.z.string().optional(),
-  password: import_zod8.z.string().optional(),
-  roles: import_zod8.z.array(import_zod8.z.number().int()).optional(),
-  email: import_zod8.z.string().max(100).email().or(import_zod8.z.literal("")).optional(),
-  address: import_zod8.z.string().or(import_zod8.z.literal("")).optional(),
-  country: import_zod8.z.string().length(2, {
+var import_zod7 = require("zod");
+var zBUser = import_zod7.z.object({
+  name: import_zod7.z.string().min(2).max(100),
+  username: import_zod7.z.string().optional(),
+  password: import_zod7.z.string().optional(),
+  roles: import_zod7.z.array(import_zod7.z.number().int()).optional(),
+  email: import_zod7.z.string().max(100).email().or(import_zod7.z.literal("")).optional(),
+  address: import_zod7.z.string().or(import_zod7.z.literal("")).optional(),
+  country: import_zod7.z.string().length(2, {
     message: "Enter the 2-letter country code"
-  }).or(import_zod8.z.literal("")).optional(),
-  phoneNumber: import_zod8.z.string().regex(/^\d{10}/, {
+  }).or(import_zod7.z.literal("")).optional(),
+  phoneNumber: import_zod7.z.string().regex(/^\d{10}/, {
     message: `Please enter a valid 10-digit US phone number with numbers only`
-  }).or(import_zod8.z.literal("")).optional(),
-  birthDate: import_zod8.z.string().regex(/^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/, {
+  }).or(import_zod7.z.literal("")).optional(),
+  birthDate: import_zod7.z.string().regex(/^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/, {
     message: "Enter a valid date in yyyy-mm-dd format"
-  }).or(import_zod8.z.literal("")).optional()
+  }).or(import_zod7.z.literal("")).optional()
 });
 var zUser = addAutoProps(zBUser);
 var zStudent = zUser.extend({
-  rank: import_zod8.z.nativeEnum(GoRank),
-  guardian: import_zod8.z.string().optional()
+  rank: import_zod7.z.nativeEnum(GoRank),
+  guardian: import_zod7.z.string().optional()
 });
 var zTeacher = zUser.extend({
-  rank: import_zod8.z.nativeEnum(GoRank),
+  rank: import_zod7.z.nativeEnum(GoRank),
   /**
    * Inactive teachers are not shown on public endpoints
    */
-  isInactive: import_zod8.z.boolean().optional(),
+  isInactive: import_zod7.z.boolean().optional(),
   /**
    * Teacher's position, e.g., instructor, president
    */
-  title: import_zod8.z.string().optional(),
+  title: import_zod7.z.string().optional(),
   /**
    * Teacher's bio text describing experience
    * new lines will be rendered as paragraphs
    */
-  bio: import_zod8.z.string().optional(),
+  bio: import_zod7.z.string().optional(),
   /** Format is illustrated below, where teacher is available
    * Mon 9-12am 3-6pm & Tue 10-12am 6-10pm
    * [
@@ -339,18 +310,50 @@ var zTeacher = zUser.extend({
    *  [],
    * ]
    */
-  available: import_zod8.z.array(import_zod8.z.array(import_zod8.z.array(import_zod8.z.number()))).optional()
+  available: import_zod7.z.array(import_zod7.z.array(import_zod7.z.array(import_zod7.z.number()))).optional()
 });
 
 // src/interface/user/userRoles.ts
-var import_zod9 = require("zod");
-var zUserRoles = import_zod9.z.object({
-  user: import_zod9.z.number().int(),
-  admin: import_zod9.z.number().int(),
-  superadmin: import_zod9.z.number().int()
+var import_zod8 = require("zod");
+var zUserRoles = import_zod8.z.object({
+  user: import_zod8.z.number().int(),
+  admin: import_zod8.z.number().int(),
+  superadmin: import_zod8.z.number().int()
+});
+
+// src/interface/payment/invoice.ts
+var zDiscount = import_zod9.z.object({
+  desc: import_zod9.z.string().min(1, "Discount description cannot be empty"),
+  amount: import_zod9.z.coerce.number()
+});
+var zInvoiceItem = import_zod9.z.object({
+  course: import_zod9.z.string().min(1, "Course description cannot be empty"),
+  price: import_zod9.z.coerce.number(),
+  units: import_zod9.z.coerce.number()
+});
+var zInvoicePackage = import_zod9.z.object({
+  student: import_zod9.z.string(),
+  items: import_zod9.z.array(zInvoiceItem).min(1, "Package must contain at least one item")
+});
+var zBInvoice = import_zod9.z.object({
+  billTo: import_zod9.z.string().min(1, "The 'Bill To' field must not be empty"),
+  packages: import_zod9.z.array(zInvoicePackage).min(1, "Invoice must include at least one package"),
+  discounts: import_zod9.z.array(zDiscount),
+  textbook: import_zod9.z.coerce.number().int().min(0).optional(),
+  shipping: import_zod9.z.coerce.number().int().min(0).optional(),
+  paid: import_zod9.z.nativeEnum(PaymentMethod).optional(),
+  notes: import_zod9.z.string().or(import_zod9.z.literal("")).optional(),
+  createdBy: import_zod9.z.string(),
+  lastEditBy: import_zod9.z.string().optional()
+});
+var zInvoice = addAutoProps(zBInvoice);
+var zInvoiceResponse = zInvoice.extend({
+  createdBy: zTeacher,
+  lastEditBy: zTeacher.optional()
 });
 
 // src/interface/payment/teacherPayment.ts
+var import_zod10 = require("zod");
 var zTeacherPaymentRow = import_zod10.z.object({
   course: import_zod10.z.string().min(1, "select or enter a course"),
   length: import_zod10.z.coerce.number().gt(0, "must be > 0"),
@@ -363,10 +366,8 @@ var zBTeacherPayment = import_zod10.z.object({
   paid: import_zod10.z.boolean().optional()
 });
 var zTeacherPayment = addAutoProps(zBTeacherPayment);
-var zTeacherPaymentResponse = import_zod10.z.object({
-  teacher: zTeacher,
-  rows: import_zod10.z.array(zTeacherPaymentRow),
-  paid: import_zod10.z.boolean().optional()
+var zTeacherPaymentResponse = zTeacherPayment.extend({
+  teacher: zTeacher
 });
 
 // src/interface/tracking/classTracker.ts
@@ -780,6 +781,7 @@ var zEventRegResponse = zEventReg.extend({
   zInvoice,
   zInvoiceItem,
   zInvoicePackage,
+  zInvoiceResponse,
   zPrivateBooking,
   zReportTicket,
   zScheduleData,

package/index.mjs

@@ -113,7 +113,7 @@ var zCampTracker = addAutoProps(zBCampTracker);
 import { z as z11 } from "zod";
 
 // src/interface/payment/invoice.ts
-import { z as z7 } from "zod";
+import { z as z9 } from "zod";
 
 // src/interface/payment/paymentMethod.ts
 var PaymentMethod = /* @__PURE__ */ ((PaymentMethod2) => {
@@ -124,36 +124,6 @@ var PaymentMethod = /* @__PURE__ */ ((PaymentMethod2) => {
   return PaymentMethod2;
 })(PaymentMethod || {});
 
-// src/interface/payment/invoice.ts
-var zDiscount = z7.object({
-  desc: z7.string(),
-  amount: z7.number()
-});
-var zInvoiceItem = z7.object({
-  course: z7.string().min(1),
-  price: z7.number(),
-  units: z7.number()
-});
-var zInvoicePackage = z7.object({
-  student: z7.string(),
-  items: z7.array(zInvoiceItem).min(1, "Package must contain at least one item")
-});
-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),
-  textbook: z7.number().int().min(0).optional(),
-  shipping: z7.number().int().min(0).optional(),
-  paid: z7.nativeEnum(PaymentMethod).optional(),
-  notes: z7.string().optional(),
-  createdBy: z7.string(),
-  lastEditBy: z7.string().optional()
-});
-var zInvoice = addAutoProps(zBInvoice);
-
-// src/interface/payment/teacherPayment.ts
-import { z as z10 } from "zod";
-
 // src/interface/user/goRank.ts
 var GoRank = /* @__PURE__ */ ((GoRank2) => {
   GoRank2["KYU1"] = "1k";
@@ -201,44 +171,44 @@ var GoRank = /* @__PURE__ */ ((GoRank2) => {
 })(GoRank || {});
 
 // src/interface/user/user.ts
-import { z as z8 } from "zod";
-var zBUser = z8.object({
-  name: z8.string().min(2).max(100),
-  username: z8.string().optional(),
-  password: z8.string().optional(),
-  roles: z8.array(z8.number().int()).optional(),
-  email: z8.string().max(100).email().or(z8.literal("")).optional(),
-  address: z8.string().or(z8.literal("")).optional(),
-  country: z8.string().length(2, {
+import { z as z7 } from "zod";
+var zBUser = z7.object({
+  name: z7.string().min(2).max(100),
+  username: z7.string().optional(),
+  password: z7.string().optional(),
+  roles: z7.array(z7.number().int()).optional(),
+  email: z7.string().max(100).email().or(z7.literal("")).optional(),
+  address: z7.string().or(z7.literal("")).optional(),
+  country: z7.string().length(2, {
     message: "Enter the 2-letter country code"
-  }).or(z8.literal("")).optional(),
-  phoneNumber: z8.string().regex(/^\d{10}/, {
+  }).or(z7.literal("")).optional(),
+  phoneNumber: z7.string().regex(/^\d{10}/, {
     message: `Please enter a valid 10-digit US phone number with numbers only`
-  }).or(z8.literal("")).optional(),
-  birthDate: z8.string().regex(/^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/, {
+  }).or(z7.literal("")).optional(),
+  birthDate: z7.string().regex(/^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/, {
     message: "Enter a valid date in yyyy-mm-dd format"
-  }).or(z8.literal("")).optional()
+  }).or(z7.literal("")).optional()
 });
 var zUser = addAutoProps(zBUser);
 var zStudent = zUser.extend({
-  rank: z8.nativeEnum(GoRank),
-  guardian: z8.string().optional()
+  rank: z7.nativeEnum(GoRank),
+  guardian: z7.string().optional()
 });
 var zTeacher = zUser.extend({
-  rank: z8.nativeEnum(GoRank),
+  rank: z7.nativeEnum(GoRank),
   /**
    * Inactive teachers are not shown on public endpoints
    */
-  isInactive: z8.boolean().optional(),
+  isInactive: z7.boolean().optional(),
   /**
    * Teacher's position, e.g., instructor, president
    */
-  title: z8.string().optional(),
+  title: z7.string().optional(),
   /**
    * Teacher's bio text describing experience
    * new lines will be rendered as paragraphs
    */
-  bio: z8.string().optional(),
+  bio: z7.string().optional(),
   /** Format is illustrated below, where teacher is available
    * Mon 9-12am 3-6pm & Tue 10-12am 6-10pm
    * [
@@ -251,18 +221,50 @@ var zTeacher = zUser.extend({
    *  [],
    * ]
    */
-  available: z8.array(z8.array(z8.array(z8.number()))).optional()
+  available: z7.array(z7.array(z7.array(z7.number()))).optional()
 });
 
 // src/interface/user/userRoles.ts
-import { z as z9 } from "zod";
-var zUserRoles = z9.object({
-  user: z9.number().int(),
-  admin: z9.number().int(),
-  superadmin: z9.number().int()
+import { z as z8 } from "zod";
+var zUserRoles = z8.object({
+  user: z8.number().int(),
+  admin: z8.number().int(),
+  superadmin: z8.number().int()
+});
+
+// src/interface/payment/invoice.ts
+var zDiscount = z9.object({
+  desc: z9.string().min(1, "Discount description cannot be empty"),
+  amount: z9.coerce.number()
+});
+var zInvoiceItem = z9.object({
+  course: z9.string().min(1, "Course description cannot be empty"),
+  price: z9.coerce.number(),
+  units: z9.coerce.number()
+});
+var zInvoicePackage = z9.object({
+  student: z9.string(),
+  items: z9.array(zInvoiceItem).min(1, "Package must contain at least one item")
+});
+var zBInvoice = z9.object({
+  billTo: z9.string().min(1, "The 'Bill To' field must not be empty"),
+  packages: z9.array(zInvoicePackage).min(1, "Invoice must include at least one package"),
+  discounts: z9.array(zDiscount),
+  textbook: z9.coerce.number().int().min(0).optional(),
+  shipping: z9.coerce.number().int().min(0).optional(),
+  paid: z9.nativeEnum(PaymentMethod).optional(),
+  notes: z9.string().or(z9.literal("")).optional(),
+  createdBy: z9.string(),
+  lastEditBy: z9.string().optional()
+});
+var zInvoice = addAutoProps(zBInvoice);
+var zInvoiceResponse = zInvoice.extend({
+  createdBy: zTeacher,
+  lastEditBy: zTeacher.optional()
 });
 
 // src/interface/payment/teacherPayment.ts
+import { z as z10 } from "zod";
 var zTeacherPaymentRow = z10.object({
   course: z10.string().min(1, "select or enter a course"),
   length: z10.coerce.number().gt(0, "must be > 0"),
@@ -275,10 +277,8 @@ var zBTeacherPayment = z10.object({
   paid: z10.boolean().optional()
 });
 var zTeacherPayment = addAutoProps(zBTeacherPayment);
-var zTeacherPaymentResponse = z10.object({
-  teacher: zTeacher,
-  rows: z10.array(zTeacherPaymentRow),
-  paid: z10.boolean().optional()
+var zTeacherPaymentResponse = zTeacherPayment.extend({
+  teacher: zTeacher
 });
 
 // src/interface/tracking/classTracker.ts
@@ -691,6 +691,7 @@ export {
   zInvoice,
   zInvoiceItem,
   zInvoicePackage,
+  zInvoiceResponse,
   zPrivateBooking,
   zReportTicket,
   zScheduleData,

package/package.json

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