@xube/kit-aws-data-schema 0.0.74 → 0.0.76

package/dist/get/get-data-by-date-range.d.ts

@@ -20,7 +20,6 @@ export declare const GetDataByDateRangeRequestSchema: z.ZodObject<{
         start: string;
         end: string;
     }>;
-    email: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     devices: {
         id: string;
@@ -30,7 +29,6 @@ export declare const GetDataByDateRangeRequestSchema: z.ZodObject<{
         start: string;
         end: string;
     };
-    email: string;
 }, {
     devices: {
         id: string;
@@ -40,7 +38,6 @@ export declare const GetDataByDateRangeRequestSchema: z.ZodObject<{
         start: string;
         end: string;
     };
-    email: string;
 }>;
 export type GetDataByDateRangeRequest = z.infer<typeof GetDataByDateRangeRequestSchema>;
 export declare const isGetDataByDateRangeRequest: (object: unknown) => object is {
@@ -52,7 +49,6 @@ export declare const isGetDataByDateRangeRequest: (object: unknown) => object is
         start: string;
         end: string;
     };
-    email: string;
 };
 export declare const ComponentDataEntryResponseSchema: z.ZodObject<{
     seconds: z.ZodNumber;

package/dist/get/get-data-by-date-range.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetDataByDateRangeResponseSchema = exports.DeviceDataEntryResponseSchema = exports.ComponentDataEntryResponseSchema = exports.isGetDataByDateRangeRequest = exports.GetDataByDateRangeRequestSchema = void 0;
+const kit_log_1 = require("@xube/kit-log");
 const zod_1 = require("zod");
+const zod_validation_error_1 = require("zod-validation-error");
 exports.GetDataByDateRangeRequestSchema = zod_1.z.object({
     devices: zod_1.z.array(zod_1.z.object({
         id: zod_1.z.string(),
@@ -11,11 +13,20 @@ exports.GetDataByDateRangeRequestSchema = zod_1.z.object({
         start: zod_1.z.string().datetime(),
         end: zod_1.z.string().datetime(),
     }),
-    email: zod_1.z.string().email(),
+    // email: z.string().email(),
 });
 const isGetDataByDateRangeRequest = (object) => {
-    return exports.GetDataByDateRangeRequestSchema.passthrough().safeParse(object)
-        .success;
+    try {
+        exports.GetDataByDateRangeRequestSchema.parse(object);
+        return true;
+    }
+    catch (e) {
+        kit_log_1.XubeLog.getInstance().warn(`Failed to parse request: ${JSON.stringify(object)}`);
+        if (e instanceof zod_1.z.ZodError) {
+            (0, zod_validation_error_1.fromZodError)(e);
+        }
+        return false;
+    }
 };
 exports.isGetDataByDateRangeRequest = isGetDataByDateRangeRequest;
 exports.ComponentDataEntryResponseSchema = zod_1.z.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws-data-schema",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,16 +19,17 @@
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
     "@types/node": "^20.4.7",
-    "@xube/kit-build": "^0.0.74",
+    "@xube/kit-build": "^0.0.76",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@xube/kit-aws-schema": "^0.0.74",
-    "@xube/kit-constants": "^0.0.74",
-    "@xube/kit-generator": "^0.0.74",
-    "@xube/kit-log": "^0.0.74",
-    "@xube/kit-schema": "^0.0.74",
-    "zod": "^3.22.4"
+    "@xube/kit-aws-schema": "^0.0.76",
+    "@xube/kit-constants": "^0.0.76",
+    "@xube/kit-generator": "^0.0.76",
+    "@xube/kit-log": "^0.0.76",
+    "@xube/kit-schema": "^0.0.76",
+    "zod": "^3.22.4",
+    "zod-validation-error": "^2.0.0"
   }
 }

package/src/get/get-data-by-date-range.ts

@@ -1,4 +1,6 @@
+import { XubeLog } from "@xube/kit-log";
 import { z } from "zod";
+import { fromZodError } from "zod-validation-error";
 
 export const GetDataByDateRangeRequestSchema = z.object({
   devices: z.array(
@@ -11,7 +13,7 @@ export const GetDataByDateRangeRequestSchema = z.object({
     start: z.string().datetime(),
     end: z.string().datetime(),
   }),
-  email: z.string().email(),
+  // email: z.string().email(),
 });
 export type GetDataByDateRangeRequest = z.infer<
   typeof GetDataByDateRangeRequestSchema
@@ -19,8 +21,19 @@ export type GetDataByDateRangeRequest = z.infer<
 export const isGetDataByDateRangeRequest = (
   object: unknown
 ): object is GetDataByDateRangeRequest => {
-  return GetDataByDateRangeRequestSchema.passthrough().safeParse(object)
-    .success;
+  try {
+    GetDataByDateRangeRequestSchema.parse(object);
+    return true;
+  } catch (e) {
+    XubeLog.getInstance().warn(
+      `Failed to parse request: ${JSON.stringify(object)}`
+    );
+
+    if (e instanceof z.ZodError) {
+      fromZodError(e);
+    }
+    return false;
+  }
 };
 
 export const ComponentDataEntryResponseSchema = z.object({