@based/schema 5.0.0-alpha.1 → 5.0.0-alpha.3

package/dist/parse/index.js

@@ -20,7 +20,7 @@ export class SchemaParser {
         expectObject(types);
         for (const type in types) {
             this.lvl++;
-            if (type[0] === '_') {
+            if (type === '_root') {
                 throw new Error(INVALID_KEY);
             }
             this.path[this.lvl] = type;

package/dist/parse/props.js

@@ -382,10 +382,15 @@ p.alias = propParser(STUB, {
     },
     format: binaryOpts.format,
 }, 0);
-p.hll = propParser(STUB, {
+p.cardinality = propParser(STUB, {
     default(val) {
         expectNumber(val);
     },
 }, 0);
+p.json = propParser(STUB, {
+    default(val) {
+        expectObject(val);
+    },
+}, 0);
 export default p;
 //# sourceMappingURL=props.js.map

package/dist/types.d.ts

@@ -49,6 +49,9 @@ export type SchemaNumber = Prop<{
     max?: number;
     step?: number | 'any';
     display?: NumberDisplay;
+    history?: {
+        interval: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
+    };
 }>;
 export type SchemaString = Prop<{
     type: 'string';
@@ -67,13 +70,20 @@ export type SchemaBinary = Prop<{
     mime?: Mime;
     format?: StringFormat;
 }>;
+export type SchemaJson = Prop<{
+    type: 'json';
+    default?: Record<string, any> | null;
+}>;
 export type SchemaBoolean = Prop<{
     type: 'boolean';
     default?: boolean;
 }>;
-export type SchemaHll = Prop<{
-    type: 'hll';
-    default?: number;
+export type SchemaCardinality = Prop<{
+    type: 'cardinality';
+    default?: string;
+    maxBytes?: number;
+    mime?: Mime;
+    format?: NumberDisplay;
 }>;
 export type SchemaVector = Prop<{
     type: 'vector';
@@ -122,7 +132,7 @@ export type SchemaEnum = Prop<{
 export type SchemaAlias = Omit<SchemaString, 'type'> & {
     type: 'alias';
 };
-export type SchemaPropShorthand = 'timestamp' | 'binary' | 'boolean' | 'string' | 'alias' | 'text' | 'hll' | NumberType | EnumItem[];
+export type SchemaPropShorthand = 'timestamp' | 'binary' | 'boolean' | 'string' | 'alias' | 'text' | 'json' | 'cardinality' | NumberType | EnumItem[];
 type SetItems<isStrict = false> = SchemaTimestamp | SchemaBoolean | SchemaNumber | SchemaString | SchemaEnum | (isStrict extends true ? never : 'timestamp' | 'binary' | 'boolean' | 'string' | NumberType | EnumItem[]);
 export type SchemaSet<ItemsType extends SetItems = SetItems> = Prop<{
     type?: 'set';
@@ -131,7 +141,7 @@ export type SchemaSet<ItemsType extends SetItems = SetItems> = Prop<{
     } ? ItemsType['default'][] : undefined;
     items: ItemsType & NeverInItems;
 }>;
-type NonRefSchemaProps<isStrict = false> = SchemaTimestamp | SchemaBoolean | SchemaNumber | SchemaString | SchemaAlias | SchemaText | SchemaEnum | SchemaBinary | SchemaHll | SchemaVector | (isStrict extends true ? SchemaSet<SetItems<true>> : SchemaPropShorthand | SchemaSet);
+type NonRefSchemaProps<isStrict = false> = SchemaTimestamp | SchemaBoolean | SchemaNumber | SchemaString | SchemaAlias | SchemaText | SchemaEnum | SchemaJson | SchemaBinary | SchemaCardinality | SchemaVector | (isStrict extends true ? SchemaSet<SetItems<true>> : SchemaPropShorthand | SchemaSet);
 export type SchemaProp<isStrict = false> = SchemaReferencesWithQuery | SchemaReferenceWithQuery | NonRefSchemaProps<isStrict> | SchemaReferences | SchemaReference | SchemaObject | SchemaBinary;
 export type SchemaPropOneWay<isStrict = false> = SchemaReferencesOneWay | SchemaReferenceOneWay | SchemaObjectOneWay | NonRefSchemaProps<isStrict>;
 export type SchemaAnyProp = SchemaPropOneWay | SchemaProp;
@@ -152,8 +162,10 @@ export type StrictSchemaType = GenericSchemaType<true>;
 export type SchemaType<isStrict = false> = isStrict extends true ? StrictSchemaType : StrictSchemaType | GenericSchemaType<false> | (SchemaProps & {
     props?: never;
 });
-export type SchemaTypeName = AllowedKey;
-export type SchemaTypes<isStrict = false> = Record<SchemaTypeName, SchemaType<isStrict>>;
+export type SchemaTypeName = Exclude<string, '_root'>;
+export type SchemaTypes<isStrict = false> = Record<SchemaTypeName, SchemaType<isStrict>> & {
+    _root?: never;
+};
 export type SchemaPropsOneWay<isStrict = false> = Record<AllowedKey, SchemaPropOneWay<isStrict>> & {
     id?: never;
 };
@@ -178,9 +190,10 @@ export type SchemaPropTypeMap = {
     alias: SchemaAlias;
     enum: SchemaEnum;
     text: SchemaText;
+    json: SchemaJson;
     set: SchemaSet;
     binary: SchemaBinary;
-    hll: SchemaHll;
+    cardinality: SchemaCardinality;
     vector: SchemaVector;
 } & Record<NumberType, SchemaNumber>;
 export type SchemaPropTypes = keyof SchemaPropTypeMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.3",
   "license": "MIT",
   "main": "dist/index.js",
   "files": [