@xube/kit-aws-data-schema 0.2.14 → 0.2.16

package/dist/decode/reading.d.ts

@@ -36,6 +36,8 @@ export declare const isReadingMetadataV1: (item: unknown) => item is ReadingMeta
 export declare const ReadingV2MetadataSchema: z.ZodObject<{
     v: z.ZodLiteral<2>;
     tm: z.ZodNumber;
+    s: z.ZodOptional<z.ZodNumber>;
+    f: z.ZodOptional<z.ZodNumber>;
     bo: z.ZodOptional<z.ZodBoolean>;
     so: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;

package/dist/decode/reading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/decode/reading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,uBAAuB,IAAoB,CAAC;AAEzD,eAAO,MAAM,sBAAsB,+FAAyB,CAAC;AAE7D,eAAO,MAAM,6BAA6B;;;iBAGxC,CAAC;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AACF,eAAO,MAAM,yBAAyB,SAC9B,OAAO,KACZ,IAAI,IAAI,uBAC4C,CAAC;AAExD,eAAO,MAAM,qBAAqB;;;;;;iBAGhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,eAAO,MAAM,iBAAiB,SAAU,OAAO,KAAG,IAAI,IAAI,eACX,CAAC;AAEhD,eAAO,MAAM,oBAAoB;;;;;;iBAAwB,CAAC;AAC1D,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACtE,eAAO,MAAM,oBAAoB,SACzB,OAAO,KACZ,IAAI,IAAI,kBAAkE,CAAC;AAE9E,eAAO,MAAM,uBAAuB;;;iBAAgC,CAAC;AACrE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,eAAO,MAAM,mBAAmB,SAAU,OAAO,KAAG,IAAI,IAAI,iBACX,CAAC;AAElD,eAAO,MAAM,uBAAuB;;;;;iBAKlC,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,eAAO,MAAM,mBAAmB,SACxB,OAAO,KACZ,IAAI,IAAI,iBACsC,CAAC;AAElD,eAAO,MAAM,aAAa;;;;;;;;;;iBAYxB,CAAC;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AACpD,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,IAAI,IAAI,OACX,CAAC;AAExC,eAAO,MAAM,WAAW,SAChB,OAAO,KACZ,IAAI,IAAI,OAAO,GAAG;IAAE,CAAC,EAAE,OAAO,iBAAiB,CAAA;CAGjD,CAAC;AAEF,eAAO,MAAM,WAAW,SAChB,OAAO,KACZ,IAAI,IAAI,OAAO,GAAG;IAAE,CAAC,EAAE,OAAO,iBAAiB,CAAA;CAGjD,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;iBAAgB,CAAC;AAC7C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC;AAChC,eAAO,MAAM,eAAe;;;;;;;;;;iBAAgB,CAAC;AAC7C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC"}
+{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/decode/reading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,uBAAuB,IAAoB,CAAC;AAEzD,eAAO,MAAM,sBAAsB,+FAAyB,CAAC;AAE7D,eAAO,MAAM,6BAA6B;;;iBAGxC,CAAC;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AACF,eAAO,MAAM,yBAAyB,SAC9B,OAAO,KACZ,IAAI,IAAI,uBAC4C,CAAC;AAExD,eAAO,MAAM,qBAAqB;;;;;;iBAGhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,eAAO,MAAM,iBAAiB,SAAU,OAAO,KAAG,IAAI,IAAI,eACX,CAAC;AAEhD,eAAO,MAAM,oBAAoB;;;;;;iBAAwB,CAAC;AAC1D,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACtE,eAAO,MAAM,oBAAoB,SACzB,OAAO,KACZ,IAAI,IAAI,kBAAkE,CAAC;AAE9E,eAAO,MAAM,uBAAuB;;;iBAAgC,CAAC;AACrE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,eAAO,MAAM,mBAAmB,SAAU,OAAO,KAAG,IAAI,IAAI,iBACX,CAAC;AAElD,eAAO,MAAM,uBAAuB;;;;;;;iBAWhC,CAAC;AACL,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,eAAO,MAAM,mBAAmB,SACxB,OAAO,KACZ,IAAI,IAAI,iBACsC,CAAC;AAElD,eAAO,MAAM,aAAa;;;;;;;;;;iBAYxB,CAAC;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AACpD,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,IAAI,IAAI,OACX,CAAC;AAExC,eAAO,MAAM,WAAW,SAChB,OAAO,KACZ,IAAI,IAAI,OAAO,GAAG;IAAE,CAAC,EAAE,OAAO,iBAAiB,CAAA;CAGjD,CAAC;AAEF,eAAO,MAAM,WAAW,SAChB,OAAO,KACZ,IAAI,IAAI,OAAO,GAAG;IAAE,CAAC,EAAE,OAAO,iBAAiB,CAAA;CAGjD,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;iBAAgB,CAAC;AAC7C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC;AAChC,eAAO,MAAM,eAAe;;;;;;;;;;iBAAgB,CAAC;AAC7C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC"}

package/dist/decode/reading.js

@@ -26,11 +26,17 @@ exports.isDeviceReadingTypes = isDeviceReadingTypes;
 exports.ReadingMetadataV1Schema = exports.DeviceReadingMetadataV1Schema;
 const isReadingMetadataV1 = (item) => exports.ReadingMetadataV1Schema.safeParse(item).success;
 exports.isReadingMetadataV1 = isReadingMetadataV1;
-exports.ReadingV2MetadataSchema = zod_1.z.object({
+exports.ReadingV2MetadataSchema = zod_1.z
+    .object({
     [constants_1.READING_VERSION_IDENTIFIER]: zod_1.z.literal(exports.READING_VERSION_2),
     tm: zod_1.z.number().refine((tm) => tm > 0, { message: "tm must be positive" }),
+    s: zod_1.z.number().positive().optional(),
+    f: zod_1.z.number().positive().optional(),
     bo: zod_1.z.boolean().optional(),
     so: zod_1.z.boolean().optional(),
+})
+    .refine((d) => (d.s === undefined) === (d.f === undefined), {
+    message: "s and f must both be present or both absent",
 });
 const isReadingV2Metadata = (item) => exports.ReadingV2MetadataSchema.safeParse(item).success;
 exports.isReadingV2Metadata = isReadingV2Metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws-data-schema",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,14 +18,14 @@
   },
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
-    "@xube/kit-build": "^0.2.14"
+    "@xube/kit-build": "^0.2.16"
   },
   "dependencies": {
-    "@xube/kit-aws-schema": "^0.2.14",
-    "@xube/kit-constants": "^0.2.14",
-    "@xube/kit-generator": "^0.2.14",
-    "@xube/kit-log": "^0.2.14",
-    "@xube/kit-schema": "^0.2.14",
+    "@xube/kit-aws-schema": "^0.2.16",
+    "@xube/kit-constants": "^0.2.16",
+    "@xube/kit-generator": "^0.2.16",
+    "@xube/kit-log": "^0.2.16",
+    "@xube/kit-schema": "^0.2.16",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0"
   }

package/src/decode/reading.test.ts

@@ -222,6 +222,36 @@ describe("ReadingV2MetadataSchema (wire-format header)", () => {
     expect(isReadingV2Metadata({ ...minimal, bo: true, so: false })).toBe(true);
     expect(isReadingV2Metadata({ v: 1, tm: 1 })).toBe(false);
   });
+
+  it("accepts v2 metadata with both s and f", () => {
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, s: 4, f: 1000 }).success,
+    ).toBe(true);
+  });
+
+  it("rejects v2 metadata with only s", () => {
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, s: 4 }).success,
+    ).toBe(false);
+  });
+
+  it("rejects v2 metadata with only f", () => {
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, f: 1000 }).success,
+    ).toBe(false);
+  });
+
+  it("rejects v2 metadata with non-positive s or f", () => {
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, s: 0, f: 1000 }).success,
+    ).toBe(false);
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, s: 4, f: 0 }).success,
+    ).toBe(false);
+    expect(
+      ReadingV2MetadataSchema.safeParse({ ...minimal, s: -4, f: 1000 }).success,
+    ).toBe(false);
+  });
 });
 
 describe("DEFAULT_READING_VERSION", () => {

package/src/decode/reading.ts

@@ -40,12 +40,18 @@ export type ReadingMetadataV1 = z.infer<typeof ReadingMetadataV1Schema>;
 export const isReadingMetadataV1 = (item: unknown): item is ReadingMetadataV1 =>
   ReadingMetadataV1Schema.safeParse(item).success;
 
-export const ReadingV2MetadataSchema = z.object({
-  [READING_VERSION_IDENTIFIER]: z.literal(READING_VERSION_2),
-  tm: z.number().refine((tm) => tm > 0, { message: "tm must be positive" }),
-  bo: z.boolean().optional(),
-  so: z.boolean().optional(),
-});
+export const ReadingV2MetadataSchema = z
+  .object({
+    [READING_VERSION_IDENTIFIER]: z.literal(READING_VERSION_2),
+    tm: z.number().refine((tm) => tm > 0, { message: "tm must be positive" }),
+    s: z.number().positive().optional(),
+    f: z.number().positive().optional(),
+    bo: z.boolean().optional(),
+    so: z.boolean().optional(),
+  })
+  .refine((d) => (d.s === undefined) === (d.f === undefined), {
+    message: "s and f must both be present or both absent",
+  });
 export type ReadingV2Metadata = z.infer<typeof ReadingV2MetadataSchema>;
 export const isReadingV2Metadata = (
   item: unknown,