@verdant-web/common 2.1.0 → 2.2.0

package/src/schema/types/fields.ts

@@ -1,7 +1,5 @@
 export type StorageStringFieldSchema = {
 	type: 'string';
-	/** @deprecated - add an index to indexes with this field name. */
-	indexed?: boolean;
 	nullable?: boolean;
 	default?: string | (() => string);
 	/** Limit the values to a certain set of options */
@@ -9,8 +7,6 @@ export type StorageStringFieldSchema = {
 };
 export type StorageNumberFieldSchema = {
 	type: 'number';
-	/** @deprecated - add an index to indexes with this field name. */
-	indexed?: boolean;
 	nullable?: boolean;
 	default?: number | (() => number);
 };
@@ -18,26 +14,23 @@ export type StorageBooleanFieldSchema = {
 	type: 'boolean';
 	nullable?: boolean;
 	default?: boolean | (() => boolean);
-	/** @deprecated - add an index to indexes with this field name. */
-	indexed?: boolean;
 };
-export type StorageArrayFieldSchema<TItems extends NestedStorageFieldSchema> = {
+export type StorageArrayFieldSchema<TItems extends StorageFieldSchema> = {
 	type: 'array';
 	items: TItems;
 	nullable?: boolean;
 };
-export type StorageObjectFieldSchema<Props extends NestedStorageFieldsSchema> =
-	{
-		type: 'object';
-		properties: Props;
-		nullable?: boolean;
-		default?: Record<string, any> | (() => Record<string, any>);
-	};
+export type StorageObjectFieldSchema<Props extends StorageFieldsSchema> = {
+	type: 'object';
+	properties: Props;
+	nullable?: boolean;
+	default?: Record<string, any> | (() => Record<string, any>);
+};
 export type StorageAnyFieldSchema<TShape = any> = {
 	type: 'any';
 	default?: TShape;
 };
-export type StorageMapFieldSchema<V extends NestedStorageFieldSchema> = {
+export type StorageMapFieldSchema<V extends StorageFieldSchema> = {
 	type: 'map';
 	values: V;
 };
@@ -62,42 +55,10 @@ export type StorageFieldSchema =
 	| StorageMapFieldSchema<any>
 	| StorageFileFieldSchema;
 
-// nested versions don't have index info
-export type NestedStorageStringFieldSchema = {
-	type: 'string';
-	nullable?: boolean;
-	default?: string | (() => string);
-};
-export type NestedStorageNumberFieldSchema = {
-	type: 'number';
-	nullable?: boolean;
-	default?: number | (() => number);
-};
-export type NestedStorageBooleanFieldSchema = {
-	type: 'boolean';
-	nullable?: boolean;
-	default: boolean | (() => boolean);
-};
-
-export type NestedStorageFieldSchema =
-	| NestedStorageStringFieldSchema
-	| NestedStorageNumberFieldSchema
-	| NestedStorageBooleanFieldSchema
-	| StorageArrayFieldSchema<any>
-	| StorageObjectFieldSchema<any>
-	| StorageAnyFieldSchema
-	| StorageMapFieldSchema<any>
-	| StorageFileFieldSchema;
-
 export type StorageFieldsSchema = {
 	[key: string]: StorageFieldSchema;
 };
 
-export type NestedStorageFieldsSchema = Record<
-	string,
-	NestedStorageFieldSchema
->;
-
 // filters to only fields which can be indexed
 export type StorageIndexableFields<Fields extends StorageFieldsSchema> = {
 	[K in keyof Fields]: Fields[K] extends { indexed: boolean } ? K : never;

package/src/schema/types/shapes.ts

@@ -1,6 +1,5 @@
 import { StorageCollectionSchema } from './collection.js';
 import {
-	NestedStorageFieldsSchema,
 	StorageArrayFieldSchema,
 	StorageFieldSchema,
 	StorageFieldsSchema,
@@ -42,9 +41,7 @@ export type ShapeFromProperty<T extends StorageFieldSchema> =
 		? BaseShapeFromProperty<T> | null
 		: BaseShapeFromProperty<T>;
 
-export type ShapeFromFields<
-	T extends StorageFieldsSchema | NestedStorageFieldsSchema,
-> = {
+export type ShapeFromFields<T extends StorageFieldsSchema> = {
 	[K in keyof T]: ShapeFromProperty<T[K]>;
 };
 
@@ -65,9 +62,7 @@ type StoragePropertyIsOptional<T extends StorageFieldSchema> =
 		? true
 		: false;
 
-export type ShapeFromFieldsWithDefaults<
-	T extends StorageFieldsSchema | NestedStorageFieldsSchema,
-> = {
+export type ShapeFromFieldsWithDefaults<T extends StorageFieldsSchema> = {
 	[K in keyof T as StoragePropertyIsOptional<T[K]> extends true
 		? K
 		: never]?: ShapeFromProperty<T[K]>;

package/src/schema/types/synthetics.ts

@@ -1,6 +1,5 @@
 import {
 	StorageBooleanFieldSchema,
-	StorageFieldSchema,
 	StorageFieldsSchema,
 	StorageNumberFieldSchema,
 	StorageStringFieldSchema,

package/src/schema/validation.ts

@@ -1,11 +1,7 @@
 import { OID_KEY } from '../oids.js';
 import { isObject } from '../utils.js';
 import { hasDefault, isNullable } from './fields.js';
-import {
-	NestedStorageFieldsSchema,
-	StorageFieldSchema,
-	StorageFieldsSchema,
-} from './types.js';
+import { StorageFieldSchema, StorageFieldsSchema } from './types.js';
 
 export function validateEntity(
 	schema: StorageFieldsSchema,
@@ -81,7 +77,7 @@ export function validateEntityField({
 			};
 		}
 		for (const [key, subField] of Object.entries(
-			field.properties as NestedStorageFieldsSchema,
+			field.properties as StorageFieldsSchema,
 		)) {
 			// legacy -- old objects sometimes accidentally include this key
 			if (key === OID_KEY) continue;