@blazeo.com/calendar-client 1.0.37 → 1.0.39

package/dist/index.d.ts

@@ -295,7 +295,7 @@ export const LeadModel: {
     phone?: string;
     name?: string;
     source?: string;
-    leadType?: 'sales' | 'service' | 'others' | number;
+    leadType?: 'sales' | 'service' | 'others' | number | null;
     referrerLink?: string;
     description?: string;
   }): Promise<{ status: string; data?: unknown; message?: string } | null>;
@@ -306,7 +306,7 @@ export const LeadModel: {
     name?: string;
     phone?: string;
     source?: string;
-    leadType?: 'sales' | 'service' | 'others' | number;
+    leadType?: 'sales' | 'service' | 'others' | number | null;
     referrerLink?: string;
     description?: string;
   }): Promise<unknown>;

package/dist/index.js

@@ -789,16 +789,16 @@ async function getByFiltersInternal(path, companyKey, opts = {}, dateRange = nul
     query.sort_dir = u.startsWith("DESC") ? "desc" : "asc";
   }
   const pageSize = opts.page_size ?? opts.pageSize;
+  const take = opts.take;
   const pageNum = opts.page != null ? Number(opts.page) : null;
-  const hasSkipTake = opts.skip != null || opts.take != null;
-  const usePageMode = pageNum != null && pageNum >= 1 && !hasSkipTake;
-  if (usePageMode) {
+  if (pageNum != null && pageNum >= 1) {
     query.page = pageNum;
-    if (pageSize != null) query.page_size = pageSize;
+    const size = pageSize ?? take;
+    if (size != null) query.page_size = size;
   } else {
     if (opts.skip != null) query.skip = opts.skip;
-    const take = opts.take ?? (pageSize != null && !hasSkipTake ? pageSize : null);
-    if (take != null) query.take = take;
+    const limit = take ?? pageSize;
+    if (limit != null) query.take = limit;
   }
   const res = await reqGet(path, query, { headers: { offset: String(offset) } });
   if (res.status !== "success") {
@@ -2499,7 +2499,7 @@ function mapLeadFromApi(d) {
   if (!d) return d;
   const pick2 = (...keys) => keys.reduce((v, k) => v ?? d[k], void 0);
   const leadTypeRaw = pick2("leadType", "LeadType", "lead_type");
-  let leadType = 2;
+  let leadType = null;
   if (typeof leadTypeRaw === "number" && Number.isFinite(leadTypeRaw)) {
     leadType = leadTypeRaw;
   } else if (typeof leadTypeRaw === "string" && leadTypeRaw.trim() !== "") {
@@ -2532,7 +2532,7 @@ var LeadModel = import_mobx_state_tree20.types.model("Lead", {
   phone: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.string, ""),
   companyKey: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.string, ""),
   source: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.string, ""),
-  leadType: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.number, 2),
+  leadType: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.maybeNull(import_mobx_state_tree20.types.number), null),
   referrerLink: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.string, ""),
   description: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.string, ""),
   createdOn: import_mobx_state_tree20.types.optional(import_mobx_state_tree20.types.maybeNull(import_mobx_state_tree20.types.string), null),

package/dist/index.mjs

@@ -715,16 +715,16 @@ async function getByFiltersInternal(path, companyKey, opts = {}, dateRange = nul
     query.sort_dir = u.startsWith("DESC") ? "desc" : "asc";
   }
   const pageSize = opts.page_size ?? opts.pageSize;
+  const take = opts.take;
   const pageNum = opts.page != null ? Number(opts.page) : null;
-  const hasSkipTake = opts.skip != null || opts.take != null;
-  const usePageMode = pageNum != null && pageNum >= 1 && !hasSkipTake;
-  if (usePageMode) {
+  if (pageNum != null && pageNum >= 1) {
     query.page = pageNum;
-    if (pageSize != null) query.page_size = pageSize;
+    const size = pageSize ?? take;
+    if (size != null) query.page_size = size;
   } else {
     if (opts.skip != null) query.skip = opts.skip;
-    const take = opts.take ?? (pageSize != null && !hasSkipTake ? pageSize : null);
-    if (take != null) query.take = take;
+    const limit = take ?? pageSize;
+    if (limit != null) query.take = limit;
   }
   const res = await reqGet(path, query, { headers: { offset: String(offset) } });
   if (res.status !== "success") {
@@ -2425,7 +2425,7 @@ function mapLeadFromApi(d) {
   if (!d) return d;
   const pick2 = (...keys) => keys.reduce((v, k) => v ?? d[k], void 0);
   const leadTypeRaw = pick2("leadType", "LeadType", "lead_type");
-  let leadType = 2;
+  let leadType = null;
   if (typeof leadTypeRaw === "number" && Number.isFinite(leadTypeRaw)) {
     leadType = leadTypeRaw;
   } else if (typeof leadTypeRaw === "string" && leadTypeRaw.trim() !== "") {
@@ -2458,7 +2458,7 @@ var LeadModel = types20.model("Lead", {
   phone: types20.optional(types20.string, ""),
   companyKey: types20.optional(types20.string, ""),
   source: types20.optional(types20.string, ""),
-  leadType: types20.optional(types20.number, 2),
+  leadType: types20.optional(types20.maybeNull(types20.number), null),
   referrerLink: types20.optional(types20.string, ""),
   description: types20.optional(types20.string, ""),
   createdOn: types20.optional(types20.maybeNull(types20.string), null),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazeo.com/calendar-client",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Blazeo Calendar / Appointment API client with MobX State Tree models",
   "exports": {
     ".": {