@deconz-community/ddf-validator 2.32.0 → 2.34.0

package/dist/ddf-validator.mjs

@@ -1,23 +1,23 @@
 import { z as e } from "zod";
-const M = "2.32.0", O = {
+const A = "2.34.0", _ = {
   "devcap1.schema.json": [
-    z,
+    F,
+    k,
+    Z,
+    G,
     P,
-    W,
-    L,
-    R,
-    Y
+    M
   ],
   "constants2.schema.json": [
-    N
+    z
   ]
 };
-function z(t, r, u) {
-  const i = typeof t.manufacturername == "string" && typeof t.modelid == "string";
-  if (i)
+function F(t, r, m) {
+  const s = typeof t.manufacturername == "string" && typeof t.modelid == "string";
+  if (s)
     return;
-  const c = Array.isArray(t.manufacturername) && Array.isArray(t.modelid);
-  if (c && t.manufacturername.length !== t.modelid.length) {
+  const o = Array.isArray(t.manufacturername) && Array.isArray(t.modelid);
+  if (o && t.manufacturername.length !== t.modelid.length) {
     r.addIssue({
       code: e.ZodIssueCode.invalid_intersection_types,
       message: "When 'manufacturername' and 'modelid' are both arrays they should be the same length",
@@ -25,39 +25,38 @@ function z(t, r, u) {
     });
     return;
   }
-  (i || c) === !1 && r.addIssue({
+  (s || o) === !1 && r.addIssue({
     code: e.ZodIssueCode.invalid_intersection_types,
     message: "Invalid properties 'manufacturername' and 'modelid' should have the same type",
     path: ["manufacturername", "modelid"]
   });
 }
-function P(t, r, u) {
+function k(t, r, m) {
   if (!t.bindings)
     return;
-  const i = (n) => `0x${(typeof n == "number" ? n : Number.parseInt(n, 16)).toString(16)}`, c = {};
+  const s = (n) => `0x${(typeof n == "number" ? n : Number.parseInt(n, 16)).toString(16)}`, o = {};
   t.bindings.forEach((n) => {
-    n.bind === "unicast" && n.report && n.report.forEach((d) => {
-      d.max !== 65535 && (c[`${i(n["src.ep"])}.${i(n.cl)}.${i(d.at)}`] = d.max);
+    n.bind === "unicast" && n.report && n.report.forEach((c) => {
+      c.max !== 65535 && (o[`${s(n["src.ep"])}.${s(n.cl)}.${s(c.at)}`] = c.max);
     });
-  }), t.subdevices.forEach((n, d) => {
-    n.items.forEach((a, m) => {
-      var s;
+  }), t.subdevices.forEach((n, c) => {
+    n.items.forEach((a, d) => {
       if (a["refresh.interval"] && a.read && a.read.fn === "zcl:attr" && a.read.at) {
-        const o = i(a.read.ep ?? ((s = n.fingerprint) == null ? void 0 : s.endpoint) ?? n.uuid[1]), p = Array.isArray(a.read.at) ? a.read.at : [a.read.at];
-        for (let b = 0; b < p.length; b++) {
-          const h = `${o}.${i(a.read.cl)}.${i(p[b])}`;
-          c[h] !== void 0 && a["refresh.interval"] - 60 < c[h] && r.addIssue({
+        const i = s(a.read.ep ?? n.fingerprint?.endpoint ?? n.uuid[1]), u = Array.isArray(a.read.at) ? a.read.at : [a.read.at];
+        for (let p = 0; p < u.length; p++) {
+          const h = `${i}.${s(a.read.cl)}.${s(u[p])}`;
+          o[h] !== void 0 && a["refresh.interval"] - 60 < o[h] && r.addIssue({
             code: e.ZodIssueCode.custom,
-            message: `The refresh interval (${a["refresh.interval"]} - 60 = ${a["refresh.interval"] - 60}) should be greater than the binding max refresh value (${c[h]}) with a margin of 60 seconds`,
-            path: ["subdevices", d, "items", m, "refresh.interval"]
+            message: `The refresh interval (${a["refresh.interval"]} - 60 = ${a["refresh.interval"] - 60}) should be greater than the binding max refresh value (${o[h]}) with a margin of 60 seconds`,
+            path: ["subdevices", c, "items", d, "refresh.interval"]
           });
         }
       }
     });
   });
 }
-function W(t, r, u) {
-  const i = [
+function Z(t, r, m) {
+  const s = [
     /*
     {
       description: 'a device should always have basic attributes.',
@@ -147,100 +146,100 @@ function W(t, r, u) {
         }
       }
     }
-  ], c = (n, d) => typeof n == "string" ? d(n) : Array.isArray(n) ? n.every((a) => c(a, d)) : "and" in n ? n.and.every((a) => c(a, d)) : "or" in n ? n.or.some((a) => c(a, d)) : !1;
-  t.subdevices.forEach((n, d) => {
-    const a = n.items.map((m) => m.name);
-    i.forEach((m) => {
-      (Object.keys(m.if).length === 0 || Object.entries(m.if).some(([s, o]) => {
-        switch (s) {
+  ], o = (n, c) => typeof n == "string" ? c(n) : Array.isArray(n) ? n.every((a) => o(a, c)) : "and" in n ? n.and.every((a) => o(a, c)) : "or" in n ? n.or.some((a) => o(a, c)) : !1;
+  t.subdevices.forEach((n, c) => {
+    const a = n.items.map((d) => d.name);
+    s.forEach((d) => {
+      (Object.keys(d.if).length === 0 || Object.entries(d.if).some(([i, u]) => {
+        switch (i) {
           case "type":
-            return c(o, (p) => p === n.type);
+            return o(u, (p) => p === n.type);
           case "item":
-            return c(o, (p) => a.includes(p));
+            return o(u, (p) => a.includes(p));
           default:
             return !1;
         }
-      })) && (c(m.need.item, (s) => a.includes(s)) || r.addIssue({
+      })) && (o(d.need.item, (i) => a.includes(i)) || r.addIssue({
         code: e.ZodIssueCode.custom,
-        message: `The device is missing some items because ${m.description}`,
-        path: ["subdevices", d, "items"]
+        message: `The device is missing some items because ${d.description}`,
+        path: ["subdevices", c, "items"]
       }));
     });
   });
 }
-function L(t, r, u) {
-  const i = ["parse", "write"];
-  t.subdevices.forEach((c, n) => {
-    c.items.forEach((d, a) => {
-      i.forEach((m) => {
-        const s = d[m];
-        s !== void 0 && (s.fn === void 0 || s.fn === "zcl:attr" || s.fn === "zcl:cmd") && (s.eval === void 0 && s.script === void 0 && r.addIssue({
+function G(t, r, m) {
+  const s = ["parse", "write"];
+  t.subdevices.forEach((o, n) => {
+    o.items.forEach((c, a) => {
+      s.forEach((d) => {
+        const i = c[d];
+        i !== void 0 && (i.fn === void 0 || i.fn === "zcl:attr" || i.fn === "zcl:cmd") && (i.eval === void 0 && i.script === void 0 && r.addIssue({
           code: e.ZodIssueCode.custom,
-          message: `The '${m}' function is missing 'eval' or 'script' option.`,
-          path: ["subdevices", n, "items", a, m]
-        }), s.eval !== void 0 && s.script !== void 0 && r.addIssue({
+          message: `The '${d}' function is missing 'eval' or 'script' option.`,
+          path: ["subdevices", n, "items", a, d]
+        }), i.eval !== void 0 && i.script !== void 0 && r.addIssue({
           code: e.ZodIssueCode.custom,
-          message: `The '${m}' function is having both 'eval' and 'script' option.`,
-          path: ["subdevices", n, "items", a, m]
+          message: `The '${d}' function is having both 'eval' and 'script' option.`,
+          path: ["subdevices", n, "items", a, d]
         }));
       });
     });
   });
 }
-function N(t, r, u) {
-  const i = C();
-  Object.keys(t).forEach((c) => {
-    if (!Object.keys(i.shape).includes(c)) {
-      if (!["$MF_", "$TYPE_"].some((n) => c.startsWith(n))) {
+function z(t, r, m) {
+  const s = w();
+  Object.keys(t).forEach((o) => {
+    if (!Object.keys(s.shape).includes(o)) {
+      if (!["$MF_", "$TYPE_"].some((n) => o.startsWith(n))) {
         r.addIssue({
           code: e.ZodIssueCode.custom,
           message: "The constant key should start with '$MF_' or '$TYPE_'",
-          path: [c]
+          path: [o]
         });
         return;
       }
-      typeof t[c] != "string" && r.addIssue({
+      typeof t[o] != "string" && r.addIssue({
         code: e.ZodIssueCode.custom,
         message: "The constant value should be a string",
-        path: [c]
+        path: [o]
       });
     }
   });
 }
-function R(t, r, u) {
-  t.subdevices.forEach((i, c) => {
-    const n = u.subDevices[i.type];
+function P(t, r, m) {
+  t.subdevices.forEach((s, o) => {
+    const n = m.subDevices[s.type];
     if (!n) {
       r.addIssue({
         code: e.ZodIssueCode.custom,
-        message: `The device is missing the device definition (subdevice1.schema.json) for the type "${i.type}"`,
-        path: ["subdevices", c, "items"]
+        message: `The device is missing the device definition (subdevice1.schema.json) for the type "${s.type}"`,
+        path: ["subdevices", o, "items"]
       });
       return;
     }
-    let d = n.items;
-    n.items_optional && (d = d.filter((a) => !n.items_optional.includes(a))), d.forEach((a) => {
-      i.items.find((m) => m.name === a) || r.addIssue({
+    let c = n.items;
+    n.items_optional && (c = c.filter((a) => !n.items_optional.includes(a))), c.forEach((a) => {
+      s.items.find((d) => d.name === a) || r.addIssue({
         code: e.ZodIssueCode.custom,
-        message: `The device should have the item "${a}" because it is mandatory for devices of type "${i.type}"`,
-        path: ["subdevices", c, "items"]
+        message: `The device should have the item "${a}" because it is mandatory for devices of type "${s.type}"`,
+        path: ["subdevices", o, "items"]
       });
     });
   });
 }
-function Y(t, r, u) {
-  t.subdevices.forEach((i, c) => {
-    const n = i.items.map((d) => d.name);
-    i.items.forEach((d, a) => {
-      d.parse && d.parse.fn === "numtostr" && (n.includes(d.parse.srcitem) || r.addIssue({
+function M(t, r, m) {
+  t.subdevices.forEach((s, o) => {
+    const n = s.items.map((c) => c.name);
+    s.items.forEach((c, a) => {
+      c.parse && c.parse.fn === "numtostr" && (n.includes(c.parse.srcitem) || r.addIssue({
         code: e.ZodIssueCode.custom,
-        message: `The device should have the item "${d.parse.srcitem}" because it is used in the 'numtostr' function`,
-        path: ["subdevices", c, "items", a, "parse", "srcitem"]
+        message: `The device should have the item "${c.parse.srcitem}" because it is used in the 'numtostr' function`,
+        path: ["subdevices", o, "items", a, "parse", "srcitem"]
       }));
     });
   });
 }
-function B(t) {
+function W(t) {
   return e.strictObject({
     $schema: e.optional(e.string()),
     schema: e.literal("constants1.schema.json"),
@@ -249,17 +248,17 @@ function B(t) {
     "device-types": e.record(e.string().startsWith("$TYPE_"), e.string())
   });
 }
-function C(t) {
+function w(t) {
   return e.object({
     $schema: e.optional(e.string()),
     schema: e.literal("constants2.schema.json"),
     ddfvalidate: e.optional(e.boolean())
-  }).passthrough();
+  }).loose();
 }
-function U() {
+function L() {
   return e.string().regex(
     // Regex for AAAA-MM-JJ
-    /^(\d{4})-(?:(?:0[1-9])|(?:1[0-2]))-(?:(?:0[1-9])|(?:[12][0-9])|(?:3[01]))$/,
+    /^(\d{4})-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])$/,
     "Invalid date value"
   );
 }
@@ -273,19 +272,19 @@ function g() {
     e.number().min(0).max(255)
   ]);
 }
-function k() {
+function N() {
   return e.custom((t) => {
     if (!Array.isArray(t) || t.length % 2 !== 0)
       return !1;
     for (let r = 0; r < t.length; r += 2) {
-      const u = t[r], i = t[r + 1];
-      if (typeof u != "number" || typeof i != "string")
+      const m = t[r], s = t[r + 1];
+      if (typeof m != "number" || typeof s != "string")
         return !1;
     }
     return !0;
   }, "The value must be an array with an even number of values and alternating between number and string.");
 }
-function S() {
+function E() {
   return e.union([
     e.tuple([
       e.literal("$address.ext"),
@@ -298,10 +297,10 @@ function S() {
     ])
   ]);
 }
-function A() {
+function O() {
   return e.string();
 }
-function F() {
+function D() {
   return e.string();
 }
 const x = e.strictObject({
@@ -311,8 +310,8 @@ const x = e.strictObject({
   mf: e.optional(l(4)).describe("Manufacturer code, must be set to 0x0000 for non manufacturer specific commands."),
   cmd: e.optional(e.union([e.literal("any"), l(2)])).describe("Zigbee command."),
   fc: e.optional(l(2).or(e.number())).describe("Zigbee command frame control."),
-  eval: e.optional(F()).describe("Javascript expression to transform the attribute value to the Item value."),
-  script: e.optional(A()).describe("Relative path of a Javascript .js file.")
+  eval: e.optional(D()).describe("Javascript expression to transform the attribute value to the Item value."),
+  script: e.optional(O()).describe("Relative path of a Javascript .js file.")
 }), f = {
   read: x.extend({}),
   parse: x.extend({}),
@@ -322,7 +321,7 @@ const x = e.strictObject({
     dt: e.optional(l(2)).describe("Data type.")
   })
 };
-function V() {
+function R() {
   return e.discriminatedUnion("fn", [
     e.strictObject({
       fn: e.literal("none")
@@ -343,7 +342,7 @@ function V() {
     message: "eval and script should not both be present"
   });
 }
-function q(t) {
+function Y(t) {
   return e.discriminatedUnion("fn", [
     f.parse.extend({
       fn: e.undefined().describe("Generic function to read ZCL attributes."),
@@ -362,10 +361,10 @@ function q(t) {
     e.strictObject({
       fn: e.literal("numtostr").describe("Generic function to to convert number to string."),
       srcitem: e.enum(t.attributes, {
-        errorMap: (r, u) => r.code === "invalid_enum_value" ? { message: `Invalid enum value. Expected item from generic attributes definition, received '${r.received}'` } : { message: u.defaultError }
+        error: (r) => r.code === "invalid_value" ? `Invalid enum value. Expected item from generic attributes definition, received '${r.input}'` : r.message
       }).describe("The source item holding the number."),
       op: e.enum(["lt", "le", "eq", "gt", "ge"]).describe("Comparison operator (lt | le | eq | gt | ge)"),
-      to: k().describe("Array of (num, string) mappings")
+      to: N().describe("Array of (num, string) mappings")
     }),
     e.strictObject({
       fn: e.literal("time").describe("Specialized function to parse time, local and last set time from read/report commands of the time cluster and auto-sync time if needed.")
@@ -388,7 +387,7 @@ function q(t) {
     message: "eval and script should not both be present"
   });
 }
-function H() {
+function B() {
   return e.discriminatedUnion("fn", [
     e.strictObject({
       fn: e.literal("none")
@@ -412,7 +411,7 @@ function H() {
     message: "eval and script should not both be present"
   });
 }
-function Z(t) {
+function C(t) {
   return e.strictObject({
     $schema: e.optional(e.string()),
     schema: e.literal("resourceitem1.schema.json"),
@@ -420,7 +419,7 @@ function Z(t) {
     ddfvalidate: e.optional(e.boolean()),
     description: e.optional(e.string()).describe("Item description, better to do not use it."),
     comment: e.optional(e.string()).describe("TODO: What is this ? What the difference with description ?"),
-    deprecated: e.optional(U()).describe("Date of deprecation, if the item is deprecated, it's better to use the new one."),
+    deprecated: e.optional(L()).describe("Date of deprecation, if the item is deprecated, it's better to use the new one."),
     datatype: e.optional(e.enum([
       "String",
       "Bool",
@@ -445,9 +444,9 @@ function Z(t) {
     static: e.optional(e.union([e.string(), e.number(), e.boolean()])).describe("A static default value is fixed and can be not changed."),
     range: e.optional(e.tuple([e.number(), e.number()])).describe("Values range limit."),
     virtual: e.optional(e.boolean()).describe("TODO: What is this ?"),
-    read: e.optional(V()).describe("Fonction used to read value."),
-    parse: e.optional(q(t)).describe("Fonction used to parse incoming values."),
-    write: e.optional(H()).describe("Fonction used to write value."),
+    read: e.optional(R()).describe("Fonction used to read value."),
+    parse: e.optional(Y(t)).describe("Fonction used to parse incoming values."),
+    write: e.optional(B()).describe("Fonction used to write value."),
     "refresh.interval": e.optional(e.number()).describe("Refresh interval used for read fonction, NEED to be superior at value used in binding part."),
     // TODO Validate this
     values: e.optional(e.unknown()).describe("TODO: What is this ?"),
@@ -455,7 +454,7 @@ function Z(t) {
     default: e.optional(e.unknown()).describe("Defaut value.")
   });
 }
-function J(t) {
+function U(t) {
   return e.strictObject({
     $schema: e.optional(e.string()),
     schema: e.literal("devcap1.schema.json"),
@@ -483,25 +482,25 @@ function J(t) {
     vendor: e.optional(e.string()).describe("Friendly name of the manufacturer."),
     product: e.optional(e.string()).describe("Friendly name of the product."),
     comment: e.optional(e.string()),
-    matchexpr: e.optional(F()).describe("Need to return true for the DDF be used."),
-    path: e.optional(A()).describe("DDF path, useless, can be removed."),
+    matchexpr: e.optional(D()).describe("Need to return true for the DDF be used."),
+    path: e.optional(O()).describe("DDF path, useless, can be removed."),
     sleeper: e.optional(e.boolean()).describe("Sleeping devices can only receive when awake."),
     supportsMgmtBind: e.optional(e.boolean()),
     status: e.enum(["Draft", "Bronze", "Silver", "Gold"]).describe("The code quality of the DDF file."),
-    subdevices: e.array(X(t)).describe("Devices section."),
-    bindings: e.optional(e.array(Q())).describe("Bindings section.")
+    subdevices: e.array(V(t)).describe("Devices section."),
+    bindings: e.optional(e.array(H())).describe("Bindings section.")
   });
 }
-function X(t) {
+function V(t) {
   return e.strictObject({
     type: e.union([
       e.enum(Object.keys(t.deviceTypes), {
-        errorMap: (r, u) => r.code === "invalid_enum_value" ? { message: `Invalid enum value. Expected type from generic attributes definition, received '${r.received}'` } : { message: u.defaultError }
+        error: (r) => r.code === "invalid_value" ? `Invalid enum value. Expected type from generic attributes definition, received '${r.received}'` : r.message
       }),
       e.string().regex(/^(?!\$TYPE_).*/g, "The type start with $TYPE_ but is not present in constants.json")
     ]),
     restapi: e.enum(["/lights", "/sensors"]),
-    uuid: S(),
+    uuid: E(),
     fingerprint: e.optional(e.strictObject({
       profile: l(4),
       device: l(4),
@@ -518,22 +517,22 @@ function X(t) {
     buttons: e.optional(e.any()),
     // TODO validate this
     buttonevents: e.optional(e.any()),
-    items: e.array(K(t)),
+    items: e.array(q(t)),
     example: e.optional(e.unknown())
   });
 }
-function K(t) {
-  return Z(t).omit({
+function q(t) {
+  return C(t).omit({
     $schema: !0,
     schema: !0,
     id: !0
   }).extend({
     name: e.enum(t.attributes, {
-      errorMap: (r, u) => r.code === "invalid_enum_value" ? { message: `Invalid enum value. Expected item from generic attributes definition, received '${r.received}'` } : { message: u.defaultError }
+      error: (r) => r.code === "invalid_value" ? `Invalid enum value. Expected item from generic attributes definition, received '${r.received}'` : r.message
     }).describe("Item name.")
   });
 }
-function Q(t) {
+function H(t) {
   return e.discriminatedUnion("bind", [
     e.strictObject({
       bind: e.literal("unicast"),
@@ -559,10 +558,10 @@ function Q(t) {
     })
   ]);
 }
-function ee(t) {
+function J(t) {
   const r = e.array(
     e.enum(t.attributes, {
-      errorMap: (u, i) => u.code === "invalid_enum_value" ? { message: `Invalid enum value. Expected item from generic attributes definition, received '${u.received}'` } : { message: i.defaultError }
+      error: (m) => m.code === "invalid_value" ? `Invalid enum value. Expected item from generic attributes definition, received '${m.input}'` : m.message
     })
   );
   return e.strictObject({
@@ -571,111 +570,110 @@ function ee(t) {
     ddfvalidate: e.optional(e.boolean()),
     type: e.union([
       e.enum(Object.keys(t.deviceTypes), {
-        errorMap: (u, i) => u.code === "invalid_enum_value" ? { message: `Invalid enum value. Expected type from generic attributes definition, received '${u.received}'` } : { message: i.defaultError }
+        error: (m) => m.code === "invalid_value" ? `Invalid enum value. Expected type from generic attributes definition, received '${m.input}'` : m.message
       }),
       e.string().regex(/^(?!\$TYPE_).*/g, "The type start with $TYPE_ but is not present in constants.json")
     ]),
     name: e.string(),
+    ui_name: e.string().max(64),
     restapi: e.enum(["/lights", "/sensors"]),
     order: e.number(),
-    uuid: S(),
+    uuid: E(),
     items: r,
     items_optional: e.optional(r)
   });
 }
-function D(t) {
+function T(t) {
   return e.discriminatedUnion("schema", [
-    J(t),
-    B(),
-    C(),
-    Z(t),
-    ee(t)
-  ]).superRefine((r, u) => {
+    U(t),
+    W(),
+    w(),
+    C(t),
+    J(t)
+  ]).superRefine((r, m) => {
     switch (r.schema) {
       case "devcap1.schema.json":
-        O[r.schema].map((i) => i(r, u, t));
+        _[r.schema].map((s) => s(r, m, t));
         break;
       case "constants2.schema.json":
-        O[r.schema].map((i) => i(r, u, t));
+        _[r.schema].map((s) => s(r, m, t));
         break;
     }
   });
 }
-function re(t = {
+function K(t = {
   attributes: [],
   manufacturers: {},
   deviceTypes: {},
   resources: {},
   subDevices: {}
 }) {
-  let r = D(t);
-  const u = () => {
-    r = D(t);
-  }, i = (m) => [
+  let r = T(t);
+  const m = () => {
+    r = T(t);
+  }, s = (d) => [
     "constants1.schema.json",
     "constants2.schema.json",
     "resourceitem1.schema.json",
     "subdevice1.schema.json"
-  ].includes(m), c = (m) => m === "devcap1.schema.json", n = (m) => {
-    const s = r.parse(m);
-    switch (s.schema) {
+  ].includes(d), o = (d) => d === "devcap1.schema.json", n = (d) => {
+    const i = r.parse(d);
+    switch (i.schema) {
       case "constants1.schema.json":
         t.manufacturers = {
           ...t.manufacturers,
-          ...s.manufacturers
+          ...i.manufacturers
         }, t.deviceTypes = {
           ...t.deviceTypes,
-          ...s["device-types"]
+          ...i["device-types"]
         };
         break;
       case "constants2.schema.json": {
-        Object.keys(s).filter((o) => o.startsWith("$MF_")).forEach((o) => {
-          t.manufacturers[o] = s[o];
-        }), Object.keys(s).filter((o) => o.startsWith("$TYPE_")).forEach((o) => {
-          t.deviceTypes[o] = s[o];
+        Object.keys(i).filter((u) => u.startsWith("$MF_")).forEach((u) => {
+          t.manufacturers[u] = i[u];
+        }), Object.keys(i).filter((u) => u.startsWith("$TYPE_")).forEach((u) => {
+          t.deviceTypes[u] = i[u];
         });
         break;
       }
       case "resourceitem1.schema.json": {
-        if (t.attributes.includes(s.id))
-          throw new Error(`Got duplicate resource item with attribute id '${s.id}'.`);
-        const o = s, p = s.id;
-        delete o.$schema, delete o.schema, delete o.id, t.resources[p] = o, t.attributes.push(p);
+        if (t.attributes.includes(i.id))
+          throw new Error(`Got duplicate resource item with attribute id '${i.id}'.`);
+        const u = i, p = i.id;
+        delete u.$schema, delete u.schema, delete u.id, t.resources[p] = u, t.attributes.push(p);
         break;
       }
       case "subdevice1.schema.json":
-        t.subDevices[s.type] = s, t.subDevices[s.name] = s;
+        t.subDevices[i.type] = i, t.subDevices[i.name] = i;
         break;
       default:
-        throw new Error(`Got invalid generic file, got data with schema '${s.schema}'.`);
+        throw new Error(`Got invalid generic file, got data with schema '${i.schema}'.`);
     }
-    return u(), !0;
-  }, d = (m) => r.parse(m);
-  return { generics: t, loadGeneric: n, validate: d, bulkValidate: (m, s, o = {}) => {
-    const p = (b, h) => {
-      var j, E, T;
-      let I = 0, _ = Number.POSITIVE_INFINITY, $ = b, v = [];
-      for ((j = o.onSectionStart) == null || j.call(o, h, b.length); v = [], (E = o.onSectionProgress) == null || E.call(o, h, 1, b.length), $.forEach((y) => {
-        var w;
-        (w = o.onSectionProgress) == null || w.call(o, h, I++, b.length);
+    return m(), !0;
+  }, c = (d) => r.parse(d);
+  return { generics: t, loadGeneric: n, validate: c, bulkValidate: (d, i, u = {}) => {
+    const p = (h, v) => {
+      let I = 0, $ = Number.POSITIVE_INFINITY, j = h, b = [];
+      for (u.onSectionStart?.(v, h.length); b = [], u.onSectionProgress?.(v, 1, h.length), j.forEach((y) => {
+        u.onSectionProgress?.(v, I++, h.length);
         try {
-          h === "generic" ? n(y.data) : h === "ddf" && d(y.data);
-        } catch (G) {
-          v.push({
+          v === "generic" ? n(y.data) : v === "ddf" && c(y.data);
+        } catch (S) {
+          b.push({
             ...y,
-            error: G
+            error: S
           });
         }
-      }), !(v.length === 0 || v.length >= _); )
-        I -= v.length, $ = v, _ = v.length;
-      return (T = o.onSectionEnd) == null || T.call(o, h, b.length, v), v;
+      }), !(b.length === 0 || b.length >= $); )
+        I -= b.length, j = b, $ = b.length;
+      return u.onSectionEnd?.(v, h.length, b), b;
     };
     return [
-      ...p(m, "generic"),
-      ...p(s, "ddf")
+      ...p(d, "generic"),
+      ...p(i, "ddf")
     ];
-  }, getSchema: () => r, version: M, isGeneric: i, isDDF: c };
+  }, getSchema: () => r, version: A, isGeneric: s, isDDF: o };
 }
 export {
-  re as createValidator
+  K as createValidator
 };