@bedrockio/yada 1.5.0 → 1.5.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.5.2
+
+- Removed boolean requried fields for further schema adherence.
+- Added `toJSON` as main serialization method and moved `toOpenApi` to an alias.
+
+## 1.5.1
+
+- Require more strict adherence to JSON Schema.
+
 ## 1.5.0
 
 - Calendar date validator moved to string as it cannot work when coerced to a

package/README.md

@@ -888,26 +888,38 @@ const schema = yd.custom((val) => {
 });
 ```
 
-## OpenApi
+## JSON Schema
 
-One of the benefits of Yada is built-in OpenApi integration. Any schema can
-describe itself in OpenApi format including complex nested schemas.
+One of the benefits of Yada is built-in [JSON Schema](https://json-schema.org/)
+integration. Any schema can describe itself in JSON Schema format including
+complex nested schemas.
 
 ```js
-yd.string().allow('foo', 'bar').toOpenApi();
+yd.string().allow('foo', 'bar').toJSON();
 // {
 //   type: 'string',
 //   enum: ['foo', 'bar'],
 // }
 ```
 
-The `tag` method allows tagging custom OpenApi fields:
+This also means schemas work with JSON helpers:
+
+```js
+const schema = yd.string().allow('foo', 'bar');
+JSON.stringify(schema, null, 2);
+// {
+//   type: 'string',
+//   enum: ['foo', 'bar'],
+// }
+```
+
+The `tag` method allows tagging custom fields:
 
 ```js
 yd.string().tag({
   description: 'my description!',
   x-field: 'my custom field!',
-}).toOpenApi();
+}).toJSON();
 // {
 //   type: 'string',
 //   description: 'my description!',
@@ -918,13 +930,22 @@ yd.string().tag({
 The `description` method is a shortcut:
 
 ```js
-yd.string().description('my description!').toOpenApi();
+yd.string().description('my description!').toJSON();
 // {
 //   type: 'string',
 //   description: 'my description!',
 // }
 ```
 
+The method `toOpenApi` is provided as an alias:
+
+```js
+yd.string().toOpenApi();
+// {
+//   type: 'string',
+// }
+```
+
 ## Utils
 
 Basic utility methods:

package/dist/cjs/Schema.js

@@ -213,23 +213,36 @@ class Schema {
     merged.assertions = [...this.assertions, ...schema.assertions];
     return merged;
   }
-  toOpenApi(extra) {
+
+  /**
+   * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+   * Note that this may not represent the schema in its enitrety. Specifically,
+   * custom (code-based) assertions will not be output.
+   * @param {Object} [extra]
+   */
+  toJSON(extra) {
     const {
-      required,
       format,
       tags
     } = this.meta;
     return {
-      required,
       format,
       ...tags,
       ...this.getAnyType(),
       ...this.getDefault(),
       ...this.getNullable(),
-      ...this.enumToOpenApi(),
+      ...this.getEnum(),
       ...this.expandExtra(extra)
     };
   }
+
+  /**
+   * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+   * @alias toJSON.
+   */
+  toOpenApi(...extra) {
+    return this.toJSON(extra);
+  }
   getAnyType() {
     const {
       type,
@@ -263,6 +276,49 @@ class Schema {
       };
     }
   }
+  getEnum() {
+    const {
+      enum: allowed
+    } = this.meta;
+    if (allowed?.length) {
+      const type = typeof allowed[0];
+      const allowEnum = allowed.every(entry => {
+        const entryType = typeof entry;
+        return entryType !== 'object' && entryType === type;
+      });
+      if (allowEnum) {
+        return {
+          type,
+          enum: allowed
+        };
+      } else {
+        const oneOf = [];
+        for (let entry of allowed) {
+          if (isSchema(entry)) {
+            oneOf.push(entry.toJSON());
+          } else {
+            const type = typeof entry;
+            let forType = oneOf.find(el => {
+              return el.type === type;
+            });
+            if (!forType) {
+              forType = {
+                type,
+                enum: []
+              };
+              oneOf.push(forType);
+            }
+            if (forType.enum) {
+              forType.enum.push(entry);
+            }
+          }
+        }
+        return {
+          oneOf
+        };
+      }
+    }
+  }
   expandExtra(extra = {}) {
     const {
       tag,
@@ -274,7 +330,7 @@ class Schema {
     return rest;
   }
   inspect() {
-    return JSON.stringify(this.toOpenApi(), null, 2);
+    return JSON.stringify(this.toJSON(), null, 2);
   }
   get() {
     const {
@@ -391,49 +447,6 @@ class Schema {
     }
     return value;
   }
-  enumToOpenApi() {
-    const {
-      enum: allowed
-    } = this.meta;
-    if (allowed?.length) {
-      const type = typeof allowed[0];
-      const allowEnum = allowed.every(entry => {
-        const entryType = typeof entry;
-        return entryType !== 'object' && entryType === type;
-      });
-      if (allowEnum) {
-        return {
-          type,
-          enum: allowed
-        };
-      } else {
-        const oneOf = [];
-        for (let entry of allowed) {
-          if (isSchema(entry)) {
-            oneOf.push(entry.toOpenApi());
-          } else {
-            const type = typeof entry;
-            let forType = oneOf.find(el => {
-              return el.type === type;
-            });
-            if (!forType) {
-              forType = {
-                type,
-                enum: []
-              };
-              oneOf.push(forType);
-            }
-            if (forType.enum) {
-              forType.enum.push(entry);
-            }
-          }
-        }
-        return {
-          oneOf
-        };
-      }
-    }
-  }
 }
 exports.default = Schema;
 function assertTypes(options) {

package/dist/cjs/TypeSchema.js

@@ -22,9 +22,9 @@ class TypeSchema extends _Schema.default {
   toString() {
     return this.meta.type;
   }
-  toOpenApi(extra) {
+  toJSON(extra) {
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: this.meta.type
     };
   }

package/dist/cjs/array.js

@@ -111,7 +111,7 @@ class ArraySchema extends _TypeSchema.default {
   toString() {
     return 'array';
   }
-  toOpenApi(extra) {
+  toJSON(extra) {
     let other;
     const {
       schemas
@@ -119,16 +119,16 @@ class ArraySchema extends _TypeSchema.default {
     if (schemas.length > 1) {
       other = {
         oneOf: schemas.map(schema => {
-          return schema.toOpenApi();
+          return schema.toJSON();
         })
       };
     } else if (schemas.length === 1) {
       other = {
-        items: schemas[0].toOpenApi()
+        items: schemas[0].toJSON()
       };
     }
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...other,
       type: 'array'
     };

package/dist/cjs/date.js

@@ -142,12 +142,12 @@ class DateSchema extends _Schema.default {
   toString() {
     return 'date';
   }
-  toOpenApi(extra) {
+  toJSON(extra) {
     const {
       format
     } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: format.includes('timestamp') ? 'number' : 'string'
     };
   }

package/dist/cjs/number.js

@@ -79,14 +79,14 @@ class NumberSchema extends _TypeSchema.default {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const {
       min,
       max,
       multiple
     } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(min != null && {
         minimum: min
       }),

package/dist/cjs/object.js

@@ -213,9 +213,9 @@ class ObjectSchema extends _TypeSchema.default {
   /**
    * Returns the schema's fields as an object allowing them
    * to be "spread" to create new schemas. Note that doing
-   * this will mean that custom and required assertions will
-   * not be preserved. Compare to {@link append} which
-   * preserves all assertions on the base schema.
+   * this will mean that custom and required assertions on
+   * the object itself will not be preserved. Compare to
+   * {@link append} which preserves all assertions.
    */
   export() {
     return this.meta.fields || {};
@@ -261,15 +261,24 @@ class ObjectSchema extends _TypeSchema.default {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
+    const {
+      stripUnknown = false
+    } = this.meta;
+    const required = [];
     const properties = {};
     for (let [key, schema] of Object.entries(this.export())) {
-      properties[key] = schema.toOpenApi(extra);
+      properties[key] = schema.toJSON(extra);
+      if (schema.meta.required) {
+        required.push(key);
+      }
     }
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(Object.keys(properties).length > 0 && {
-        properties
+        properties,
+        required,
+        additionalProperties: stripUnknown
       })
     };
   }

package/dist/cjs/string.js

@@ -423,13 +423,13 @@ class StringSchema extends _TypeSchema.default {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const {
       min,
       max
     } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(min && {
         minLength: min
       }),

package/dist/cjs/tuple.js

@@ -79,15 +79,15 @@ class TupleSchema extends _Schema.default {
   toString() {
     return 'tuple';
   }
-  toOpenApi(extra) {
+  toJSON(extra) {
     const {
       schemas
     } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: 'array',
       prefixItems: schemas.map(schema => {
-        return schema.toOpenApi();
+        return schema.toJSON();
       })
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",

package/src/Schema.js

@@ -206,20 +206,33 @@ export default class Schema {
     return merged;
   }
 
-  toOpenApi(extra) {
-    const { required, format, tags } = this.meta;
+  /**
+   * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+   * Note that this may not represent the schema in its enitrety. Specifically,
+   * custom (code-based) assertions will not be output.
+   * @param {Object} [extra]
+   */
+  toJSON(extra) {
+    const { format, tags } = this.meta;
     return {
-      required,
       format,
       ...tags,
       ...this.getAnyType(),
       ...this.getDefault(),
       ...this.getNullable(),
-      ...this.enumToOpenApi(),
+      ...this.getEnum(),
       ...this.expandExtra(extra),
     };
   }
 
+  /**
+   * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+   * @alias toJSON.
+   */
+  toOpenApi(...extra) {
+    return this.toJSON(extra);
+  }
+
   getAnyType() {
     const { type, enum: set } = this.meta;
     if (!type && !set) {
@@ -249,6 +262,46 @@ export default class Schema {
     }
   }
 
+  getEnum() {
+    const { enum: allowed } = this.meta;
+    if (allowed?.length) {
+      const type = typeof allowed[0];
+      const allowEnum = allowed.every((entry) => {
+        const entryType = typeof entry;
+        return entryType !== 'object' && entryType === type;
+      });
+      if (allowEnum) {
+        return {
+          type,
+          enum: allowed,
+        };
+      } else {
+        const oneOf = [];
+        for (let entry of allowed) {
+          if (isSchema(entry)) {
+            oneOf.push(entry.toJSON());
+          } else {
+            const type = typeof entry;
+            let forType = oneOf.find((el) => {
+              return el.type === type;
+            });
+            if (!forType) {
+              forType = {
+                type,
+                enum: [],
+              };
+              oneOf.push(forType);
+            }
+            if (forType.enum) {
+              forType.enum.push(entry);
+            }
+          }
+        }
+        return { oneOf };
+      }
+    }
+  }
+
   expandExtra(extra = {}) {
     const { tag, ...rest } = extra;
     if (typeof extra?.tag === 'function') {
@@ -258,7 +311,7 @@ export default class Schema {
   }
 
   inspect() {
-    return JSON.stringify(this.toOpenApi(), null, 2);
+    return JSON.stringify(this.toJSON(), null, 2);
   }
 
   get() {
@@ -382,46 +435,6 @@ export default class Schema {
     }
     return value;
   }
-
-  enumToOpenApi() {
-    const { enum: allowed } = this.meta;
-    if (allowed?.length) {
-      const type = typeof allowed[0];
-      const allowEnum = allowed.every((entry) => {
-        const entryType = typeof entry;
-        return entryType !== 'object' && entryType === type;
-      });
-      if (allowEnum) {
-        return {
-          type,
-          enum: allowed,
-        };
-      } else {
-        const oneOf = [];
-        for (let entry of allowed) {
-          if (isSchema(entry)) {
-            oneOf.push(entry.toOpenApi());
-          } else {
-            const type = typeof entry;
-            let forType = oneOf.find((el) => {
-              return el.type === type;
-            });
-            if (!forType) {
-              forType = {
-                type,
-                enum: [],
-              };
-              oneOf.push(forType);
-            }
-            if (forType.enum) {
-              forType.enum.push(entry);
-            }
-          }
-        }
-        return { oneOf };
-      }
-    }
-  }
 }
 
 function assertTypes(options) {

package/src/TypeSchema.js

@@ -14,9 +14,9 @@ export default class TypeSchema extends Schema {
     return this.meta.type;
   }
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: this.meta.type,
     };
   }

package/src/array.js

@@ -110,23 +110,23 @@ class ArraySchema extends TypeSchema {
     return 'array';
   }
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     let other;
     const { schemas } = this.meta;
     if (schemas.length > 1) {
       other = {
         oneOf: schemas.map((schema) => {
-          return schema.toOpenApi();
+          return schema.toJSON();
         }),
       };
     } else if (schemas.length === 1) {
       other = {
-        items: schemas[0].toOpenApi(),
+        items: schemas[0].toJSON(),
       };
     }
 
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...other,
       type: 'array',
     };

package/src/date.js

@@ -138,10 +138,10 @@ class DateSchema extends Schema {
     return 'date';
   }
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const { format } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: format.includes('timestamp') ? 'number' : 'string',
     };
   }

package/src/number.js

@@ -71,10 +71,10 @@ class NumberSchema extends TypeSchema {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const { min, max, multiple } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(min != null && {
         minimum: min,
       }),

package/src/object.js

@@ -190,6 +190,7 @@ class ObjectSchema extends TypeSchema {
     }
 
     const update = {};
+
     for (let field of fields) {
       set(update, field, this.get(field).required());
     }
@@ -200,9 +201,9 @@ class ObjectSchema extends TypeSchema {
   /**
    * Returns the schema's fields as an object allowing them
    * to be "spread" to create new schemas. Note that doing
-   * this will mean that custom and required assertions will
-   * not be preserved. Compare to {@link append} which
-   * preserves all assertions on the base schema.
+   * this will mean that custom and required assertions on
+   * the object itself will not be preserved. Compare to
+   * {@link append} which preserves all assertions.
    */
   export() {
     return this.meta.fields || {};
@@ -251,15 +252,23 @@ class ObjectSchema extends TypeSchema {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
+    const { stripUnknown = false } = this.meta;
+
+    const required = [];
     const properties = {};
     for (let [key, schema] of Object.entries(this.export())) {
-      properties[key] = schema.toOpenApi(extra);
+      properties[key] = schema.toJSON(extra);
+      if (schema.meta.required) {
+        required.push(key);
+      }
     }
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(Object.keys(properties).length > 0 && {
         properties,
+        required,
+        additionalProperties: stripUnknown,
       }),
     };
   }

package/src/string.js

@@ -440,10 +440,10 @@ class StringSchema extends TypeSchema {
 
   // Private
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const { min, max } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       ...(min && {
         minLength: min,
       }),

package/src/tuple.js

@@ -69,13 +69,13 @@ class TupleSchema extends Schema {
     return 'tuple';
   }
 
-  toOpenApi(extra) {
+  toJSON(extra) {
     const { schemas } = this.meta;
     return {
-      ...super.toOpenApi(extra),
+      ...super.toJSON(extra),
       type: 'array',
       prefixItems: schemas.map((schema) => {
-        return schema.toOpenApi();
+        return schema.toJSON();
       }),
     };
   }

package/types/Schema.d.ts

@@ -71,7 +71,18 @@ export default class Schema {
      * @returns {Schema}
      */
     append(schema: any): Schema;
-    toOpenApi(extra: any): any;
+    /**
+     * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+     * Note that this may not represent the schema in its enitrety. Specifically,
+     * custom (code-based) assertions will not be output.
+     * @param {Object} [extra]
+     */
+    toJSON(extra?: any): any;
+    /**
+     * Exports the schema in [JSON Schema](https://json-schema.org/) format.
+     * @alias toJSON.
+     */
+    toOpenApi(...extra: any[]): any;
     getAnyType(): {
         type: string[];
     };
@@ -83,6 +94,7 @@ export default class Schema {
     getNullable(): {
         nullable: boolean;
     };
+    getEnum(): any;
     expandExtra(extra?: {}): {};
     inspect(): string;
     get(): void;
@@ -102,6 +114,5 @@ export default class Schema {
     transform(fn: any): this;
     getSortIndex(type: any): number;
     runAssertion(value: any, assertion: any, options?: {}): Promise<any>;
-    enumToOpenApi(): any;
 }
 //# sourceMappingURL=Schema.d.ts.map

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAcA,kDAEC;AAED;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,sBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,uBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,YAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAwCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,MAAM,CAMlB;IAED,2BAYC;IAED;;MAOC;IAED;;;;MASC;IAED;;MAOC;IAED,4BAMC;IAED,kBAEC;IAED,YAGC;IAID;;OAEG;IACH,kCAFa,IAAI,CAmDhB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED,gEAQC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAYC;IAED,qBAsCC;CACF"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAcA,kDAEC;AAED;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,sBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,uBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,YAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAwCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,MAAM,CAMlB;IAED;;;;;OAKG;IACH,yBAWC;IAED;;;OAGG;IACH,gCAEC;IAED;;MAOC;IAED;;;;MASC;IAED;;MAOC;IAED,eAsCC;IAED,4BAMC;IAED,kBAEC;IAED,YAGC;IAID;;OAEG;IACH,kCAFa,IAAI,CAmDhB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED,gEAQC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAYC;CACF"}

package/types/object.d.ts

@@ -55,9 +55,9 @@ declare class ObjectSchema extends TypeSchema {
     /**
      * Returns the schema's fields as an object allowing them
      * to be "spread" to create new schemas. Note that doing
-     * this will mean that custom and required assertions will
-     * not be preserved. Compare to {@link append} which
-     * preserves all assertions on the base schema.
+     * this will mean that custom and required assertions on
+     * the object itself will not be preserved. Compare to
+     * {@link append} which preserves all assertions.
      */
     export(): any;
     /**

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAmTA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBArTY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAGC;IAED,cA8EC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAsB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAY9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAkBnB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;CAgBF;mBArQgC,UAAU;uBAFpB,cAAc"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA4TA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBA9TY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAGC;IAED,cA8EC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAsB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAY9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAmBnB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;CAwBF;mBA9QgC,UAAU;uBAFpB,cAAc"}