@confect/server 9.0.0-next.5 → 9.0.0-next.6

package/dist/Table.js

@@ -3,76 +3,85 @@ import { compileTableSchema } from "./SchemaToValidator.js";
 import { Predicate, Schema } from "effect";
 import { defineTable } from "convex/server";
 import * as SystemFields$1 from "@confect/core/SystemFields";
+import * as Lazy from "@confect/core/Lazy";
 
 //#region src/Table.ts
 var Table_exports = /* @__PURE__ */ __exportAll({
 	TypeId: () => TypeId,
 	isTable: () => isTable,
+	isUnnamedTable: () => isUnnamedTable,
 	make: () => make,
 	scheduledFunctionsTable: () => scheduledFunctionsTable,
 	storageTable: () => storageTable,
 	systemTables: () => systemTables
 });
 const TypeId = "@confect/server/Table";
-const isTable = (u) => Predicate.hasProperty(u, TypeId);
-const Proto = {
-	[TypeId]: TypeId,
-	index(name, fields) {
-		return makeProto({
-			name: this.name,
-			Fields: this.Fields,
-			Doc: this.Doc,
-			tableDefinition: this.tableDefinition.index(name, fields),
-			indexes: {
-				...this.indexes,
-				[name]: fields
-			}
-		});
-	},
-	searchIndex(name, indexConfig) {
-		return makeProto({
-			name: this.name,
-			Fields: this.Fields,
-			Doc: this.Doc,
-			tableDefinition: this.tableDefinition.searchIndex(name, indexConfig),
-			indexes: this.indexes
-		});
-	},
-	vectorIndex(name, indexConfig) {
-		return makeProto({
-			name: this.name,
-			Fields: this.Fields,
-			Doc: this.Doc,
-			tableDefinition: this.tableDefinition.vectorIndex(name, {
-				vectorField: indexConfig.vectorField,
-				dimensions: indexConfig.dimensions,
-				...indexConfig.filterFields ? { filterFields: indexConfig.filterFields } : {}
-			}),
-			indexes: this.indexes
-		});
-	}
+const isTable = (u) => Predicate.hasProperty(u, TypeId) && Predicate.hasProperty(u, "tableName");
+const isUnnamedTable = (u) => Predicate.hasProperty(u, TypeId) && !Predicate.hasProperty(u, "tableName");
+const makeBound = (tableName, state) => {
+	const bound = {
+		[TypeId]: TypeId,
+		tableName,
+		indexes: state.indexes
+	};
+	Lazy.defineProperty(bound, "Fields", () => state.lazyFields());
+	Lazy.defineProperty(bound, "Doc", () => SystemFields$1.extendWithSystemFields(tableName, bound.Fields));
+	Lazy.defineProperty(bound, "tableDefinition", () => {
+		const fields = bound.Fields;
+		let definition = defineTable(compileTableSchema(fields));
+		for (const [name, indexFields] of Object.entries(state.indexes)) definition = definition.index(name, indexFields);
+		for (const [name, config] of Object.entries(state.searchIndexes)) definition = definition.searchIndex(name, config);
+		for (const [name, config] of Object.entries(state.vectorIndexes)) definition = definition.vectorIndex(name, config);
+		return definition;
+	});
+	return bound;
 };
-const makeProto = ({ name, Fields, Doc, tableDefinition, indexes }) => Object.assign(Object.create(Proto), {
-	name,
-	Fields,
-	Doc,
-	tableDefinition,
-	indexes
-});
-/**
-* Create a table.
-*/
-const make = (name, fields) => {
-	const tableDefinition = defineTable(compileTableSchema(fields));
-	return makeProto({
-		name,
-		Fields: fields,
-		Doc: SystemFields$1.extendWithSystemFields(name, fields),
-		tableDefinition,
-		indexes: {}
+const makeUnnamed = (state) => {
+	const bind = (tableName) => makeBound(tableName, state);
+	const index = (name, fields) => makeUnnamed({
+		lazyFields: state.lazyFields,
+		indexes: {
+			...state.indexes,
+			[name]: fields
+		},
+		searchIndexes: state.searchIndexes,
+		vectorIndexes: state.vectorIndexes
+	});
+	const searchIndex = (name, indexConfig) => makeUnnamed({
+		lazyFields: state.lazyFields,
+		indexes: state.indexes,
+		searchIndexes: {
+			...state.searchIndexes,
+			[name]: indexConfig
+		},
+		vectorIndexes: state.vectorIndexes
+	});
+	const vectorIndex = (name, indexConfig) => makeUnnamed({
+		lazyFields: state.lazyFields,
+		indexes: state.indexes,
+		searchIndexes: state.searchIndexes,
+		vectorIndexes: {
+			...state.vectorIndexes,
+			[name]: indexConfig
+		}
+	});
+	return Object.assign(bind, {
+		[TypeId]: TypeId,
+		indexes: state.indexes,
+		index,
+		searchIndex,
+		vectorIndex
+	});
+};
+const make = (lazyFields) => {
+	return makeUnnamed({
+		lazyFields,
+		indexes: {},
+		searchIndexes: {},
+		vectorIndexes: {}
 	});
 };
-const scheduledFunctionsTable = make("_scheduled_functions", Schema.Struct({
+const scheduledFunctionsTable = make(() => Schema.Struct({
 	name: Schema.String,
 	args: Schema.Array(Schema.Any),
 	scheduledTime: Schema.Number,
@@ -81,17 +90,17 @@ const scheduledFunctionsTable = make("_scheduled_functions", Schema.Struct({
 		kind: Schema.Literal("failed"),
 		error: Schema.String
 	}), Schema.Struct({ kind: Schema.Literal("canceled") }))
-}));
-const storageTable = make("_storage", Schema.Struct({
+}))("_scheduled_functions");
+const storageTable = make(() => Schema.Struct({
 	sha256: Schema.String,
 	size: Schema.Number,
 	contentType: Schema.optionalWith(Schema.String, { exact: true })
-}));
+}))("_storage");
 const systemTables = {
 	_scheduled_functions: scheduledFunctionsTable,
 	_storage: storageTable
 };
 
 //#endregion
-export { Table_exports, TypeId, isTable, make, scheduledFunctionsTable, storageTable, systemTables };
+export { Table_exports, TypeId, isTable, isUnnamedTable, make, scheduledFunctionsTable, storageTable, systemTables };
 //# sourceMappingURL=Table.js.map

package/dist/Table.js.map

@@ -1 +1 @@
-{"version":3,"file":"Table.js","names":["SystemFields"],"sources":["../src/Table.ts"],"sourcesContent":["import * as SystemFields from \"@confect/core/SystemFields\";\nimport {\n  defineTable,\n  type SystemFields as ConvexSystemFields,\n  type Expand,\n  type GenericTableIndexes,\n  type GenericTableSearchIndexes,\n  type GenericTableVectorIndexes,\n  type IndexTiebreakerField,\n  type SearchIndexConfig,\n  type TableDefinition,\n  type VectorIndexConfig,\n} from \"convex/server\";\nimport type { GenericValidator, Validator } from \"convex/values\";\nimport { Predicate, Schema } from \"effect\";\nimport {\n  compileTableSchema,\n  type TableSchemaToTableValidator,\n} from \"./SchemaToValidator\";\n\nexport const TypeId = \"@confect/server/Table\";\nexport type TypeId = typeof TypeId;\n\nexport const isTable = (u: unknown): u is Any =>\n  Predicate.hasProperty(u, TypeId);\n\nexport interface Table<\n  Name_ extends string,\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends GenericValidator =\n    TableSchemaToTableValidator<TableSchema_>,\n  Indexes_ extends GenericTableIndexes = {},\n  SearchIndexes_ extends GenericTableSearchIndexes = {},\n  VectorIndexes_ extends GenericTableVectorIndexes = {},\n> {\n  readonly [TypeId]: TypeId;\n  readonly tableDefinition: TableDefinition<\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  readonly name: Name_;\n\n  readonly Fields: TableSchema_;\n  readonly Doc: SystemFields.ExtendWithSystemFields<Name_, TableSchema_>;\n\n  readonly indexes: Indexes_;\n\n  index<\n    IndexName extends string,\n    FirstFieldPath extends ExtractFieldPaths<TableValidator_>,\n    RestFieldPaths extends ExtractFieldPaths<TableValidator_>[],\n  >(\n    name: IndexName,\n    fields: [FirstFieldPath, ...RestFieldPaths],\n  ): Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Expand<\n      Indexes_ &\n        Record<\n          IndexName,\n          [FirstFieldPath, ...RestFieldPaths, IndexTiebreakerField]\n        >\n    >,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  searchIndex<\n    IndexName extends string,\n    SearchField extends ExtractFieldPaths<TableValidator_>,\n    FilterFields extends ExtractFieldPaths<TableValidator_> = never,\n  >(\n    name: IndexName,\n    indexConfig: Expand<SearchIndexConfig<SearchField, FilterFields>>,\n  ): Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    Expand<\n      SearchIndexes_ &\n        Record<\n          IndexName,\n          {\n            searchField: SearchField;\n            filterFields: FilterFields;\n          }\n        >\n    >,\n    VectorIndexes_\n  >;\n\n  vectorIndex<\n    IndexName extends string,\n    VectorField extends ExtractFieldPaths<TableValidator_>,\n    FilterFields extends ExtractFieldPaths<TableValidator_> = never,\n  >(\n    name: IndexName,\n    indexConfig: Expand<VectorIndexConfig<VectorField, FilterFields>>,\n  ): Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    Expand<\n      VectorIndexes_ &\n        Record<\n          IndexName,\n          {\n            vectorField: VectorField;\n            dimensions: number;\n            filterFields: FilterFields;\n          }\n        >\n    >\n  >;\n}\n\nexport interface Any {\n  readonly [TypeId]: TypeId;\n}\n\nexport type AnyWithProps = Table<\n  any,\n  Schema.Schema.AnyNoContext,\n  GenericValidator,\n  GenericTableIndexes,\n  GenericTableSearchIndexes,\n  GenericTableVectorIndexes\n>;\n\nexport type Name<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableName & string\n    : never;\n\nexport type TableSchema<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableSchema_\n    : never;\n\nexport type TableValidator<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer TableValidator_,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableValidator_\n    : never;\n\nexport type Indexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer Indexes_,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? Indexes_\n    : never;\n\nexport type SearchIndexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer SearchIndexes_,\n    infer _VectorIndexes\n  >\n    ? SearchIndexes_\n    : never;\n\nexport type VectorIndexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer VectorIndexes_\n  >\n    ? VectorIndexes_\n    : never;\n\nexport type Doc<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? SystemFields.ExtendWithSystemFields<TableName, TableSchema_>\n    : never;\n\nexport type Fields<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableSchema_\n    : never;\n\nexport type WithName<\n  TableDef extends AnyWithProps,\n  Name_ extends string,\n> = TableDef extends { readonly name: Name_ } ? TableDef : never;\n\nexport type TablesRecord<Tables extends AnyWithProps> = {\n  readonly [TableName_ in Name<Tables>]: WithName<Tables, TableName_>;\n};\n\nconst Proto = {\n  [TypeId]: TypeId,\n\n  index<\n    IndexName extends string,\n    FirstFieldPath extends string,\n    RestFieldPaths extends string[],\n  >(\n    this: AnyWithProps,\n    name: IndexName,\n    fields: [FirstFieldPath, ...RestFieldPaths],\n  ) {\n    return makeProto({\n      name: this.name,\n      Fields: this.Fields,\n      Doc: this.Doc,\n      tableDefinition: this.tableDefinition.index(name, fields as any),\n      indexes: {\n        ...this.indexes,\n        [name]: fields,\n      },\n    });\n  },\n\n  searchIndex<IndexName extends string, SearchField extends string>(\n    this: AnyWithProps,\n    name: IndexName,\n    indexConfig: SearchIndexConfig<SearchField, any>,\n  ) {\n    return makeProto({\n      name: this.name,\n      Fields: this.Fields,\n      Doc: this.Doc,\n      tableDefinition: this.tableDefinition.searchIndex(name, indexConfig),\n      indexes: this.indexes,\n    });\n  },\n\n  vectorIndex<IndexName extends string, VectorField extends string>(\n    this: AnyWithProps,\n    name: IndexName,\n    indexConfig: {\n      vectorField: VectorField;\n      dimensions: number;\n      filterFields?: string[] | undefined;\n    },\n  ) {\n    return makeProto({\n      name: this.name,\n      Fields: this.Fields,\n      Doc: this.Doc,\n      tableDefinition: this.tableDefinition.vectorIndex(name, {\n        vectorField: indexConfig.vectorField,\n        dimensions: indexConfig.dimensions,\n        ...(indexConfig.filterFields\n          ? { filterFields: indexConfig.filterFields }\n          : {}),\n      }),\n      indexes: this.indexes,\n    });\n  },\n};\n\nconst makeProto = <\n  Name_ extends string,\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends Validator<any, any, any>,\n  Indexes_ extends GenericTableIndexes,\n  SearchIndexes_ extends GenericTableSearchIndexes,\n  VectorIndexes_ extends GenericTableVectorIndexes,\n>({\n  name,\n  Fields,\n  Doc,\n  tableDefinition,\n  indexes,\n}: {\n  name: Name_;\n  Fields: TableSchema_;\n  Doc: SystemFields.ExtendWithSystemFields<Name_, TableSchema_>;\n  tableDefinition: TableDefinition<\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n  indexes: Indexes_;\n}): Table<\n  Name_,\n  TableSchema_,\n  TableValidator_,\n  Indexes_,\n  SearchIndexes_,\n  VectorIndexes_\n> =>\n  Object.assign(Object.create(Proto), {\n    name,\n    Fields,\n    Doc,\n    tableDefinition,\n    indexes,\n  });\n\n/**\n * Create a table.\n */\nexport const make = <\n  const Name_ extends string,\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends GenericValidator =\n    TableSchemaToTableValidator<TableSchema_>,\n  Indexes_ extends GenericTableIndexes = {},\n  SearchIndexes_ extends GenericTableSearchIndexes = {},\n  VectorIndexes_ extends GenericTableVectorIndexes = {},\n>(\n  name: Name_,\n  fields: TableSchema_,\n): Table<\n  Name_,\n  TableSchema_,\n  TableValidator_,\n  Indexes_,\n  SearchIndexes_,\n  VectorIndexes_\n> => {\n  const tableValidator = compileTableSchema(fields) as any;\n  const tableDefinition = defineTable(tableValidator) as any;\n\n  return makeProto<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >({\n    name,\n    Fields: fields,\n    Doc: SystemFields.extendWithSystemFields(name, fields),\n    tableDefinition,\n    indexes: {} as Indexes_,\n  });\n};\n\n// -----------------------------------------------------------------------------\n// System tables\n// -----------------------------------------------------------------------------\n\nexport const scheduledFunctionsTable = make(\n  \"_scheduled_functions\",\n  Schema.Struct({\n    name: Schema.String,\n    args: Schema.Array(Schema.Any),\n    scheduledTime: Schema.Number,\n    completedTime: Schema.optionalWith(Schema.Number, { exact: true }),\n    state: Schema.Union(\n      Schema.Struct({ kind: Schema.Literal(\"pending\") }),\n      Schema.Struct({ kind: Schema.Literal(\"inProgress\") }),\n      Schema.Struct({ kind: Schema.Literal(\"success\") }),\n      Schema.Struct({\n        kind: Schema.Literal(\"failed\"),\n        error: Schema.String,\n      }),\n      Schema.Struct({ kind: Schema.Literal(\"canceled\") }),\n    ),\n  }),\n);\n\nexport const storageTable = make(\n  \"_storage\",\n  Schema.Struct({\n    sha256: Schema.String,\n    size: Schema.Number,\n    contentType: Schema.optionalWith(Schema.String, { exact: true }),\n  }),\n);\n\nexport const systemTables = {\n  _scheduled_functions: scheduledFunctionsTable,\n  _storage: storageTable,\n} as const;\n\nexport type SystemTables = typeof scheduledFunctionsTable | typeof storageTable;\n\n// Vendored types from convex-js, partially modified. Ideally we could use these directly. See https://github.com/get-convex/convex-js/pull/14\n\n/**\n * Extract all of the index field paths within a {@link Validator}.\n *\n * This is used within {@link defineTable}.\n * @public\n */\ntype ExtractFieldPaths<T extends Validator<any, any, any>> =\n  // Add in the system fields available in index definitions.\n  // This should be everything except for `_id` because thats added to indexes\n  // automatically.\n  T[\"fieldPaths\"] | keyof ConvexSystemFields;\n"],"mappings":";;;;;;;;;;;;;;;AAoBA,MAAa,SAAS;AAGtB,MAAa,WAAW,MACtB,UAAU,YAAY,GAAG,OAAO;AA0NlC,MAAM,QAAQ;EACX,SAAS;CAEV,MAME,MACA,QACA;AACA,SAAO,UAAU;GACf,MAAM,KAAK;GACX,QAAQ,KAAK;GACb,KAAK,KAAK;GACV,iBAAiB,KAAK,gBAAgB,MAAM,MAAM,OAAc;GAChE,SAAS;IACP,GAAG,KAAK;KACP,OAAO;IACT;GACF,CAAC;;CAGJ,YAEE,MACA,aACA;AACA,SAAO,UAAU;GACf,MAAM,KAAK;GACX,QAAQ,KAAK;GACb,KAAK,KAAK;GACV,iBAAiB,KAAK,gBAAgB,YAAY,MAAM,YAAY;GACpE,SAAS,KAAK;GACf,CAAC;;CAGJ,YAEE,MACA,aAKA;AACA,SAAO,UAAU;GACf,MAAM,KAAK;GACX,QAAQ,KAAK;GACb,KAAK,KAAK;GACV,iBAAiB,KAAK,gBAAgB,YAAY,MAAM;IACtD,aAAa,YAAY;IACzB,YAAY,YAAY;IACxB,GAAI,YAAY,eACZ,EAAE,cAAc,YAAY,cAAc,GAC1C,EAAE;IACP,CAAC;GACF,SAAS,KAAK;GACf,CAAC;;CAEL;AAED,MAAM,aAOJ,EACA,MACA,QACA,KACA,iBACA,cAoBA,OAAO,OAAO,OAAO,OAAO,MAAM,EAAE;CAClC;CACA;CACA;CACA;CACA;CACD,CAAC;;;;AAKJ,MAAa,QASX,MACA,WAQG;CAEH,MAAM,kBAAkB,YADD,mBAAmB,OAAO,CACE;AAEnD,QAAO,UAOL;EACA;EACA,QAAQ;EACR,KAAKA,eAAa,uBAAuB,MAAM,OAAO;EACtD;EACA,SAAS,EAAE;EACZ,CAAC;;AAOJ,MAAa,0BAA0B,KACrC,wBACA,OAAO,OAAO;CACZ,MAAM,OAAO;CACb,MAAM,OAAO,MAAM,OAAO,IAAI;CAC9B,eAAe,OAAO;CACtB,eAAe,OAAO,aAAa,OAAO,QAAQ,EAAE,OAAO,MAAM,CAAC;CAClE,OAAO,OAAO,MACZ,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,UAAU,EAAE,CAAC,EAClD,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,aAAa,EAAE,CAAC,EACrD,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,UAAU,EAAE,CAAC,EAClD,OAAO,OAAO;EACZ,MAAM,OAAO,QAAQ,SAAS;EAC9B,OAAO,OAAO;EACf,CAAC,EACF,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,WAAW,EAAE,CAAC,CACpD;CACF,CAAC,CACH;AAED,MAAa,eAAe,KAC1B,YACA,OAAO,OAAO;CACZ,QAAQ,OAAO;CACf,MAAM,OAAO;CACb,aAAa,OAAO,aAAa,OAAO,QAAQ,EAAE,OAAO,MAAM,CAAC;CACjE,CAAC,CACH;AAED,MAAa,eAAe;CAC1B,sBAAsB;CACtB,UAAU;CACX"}
+{"version":3,"file":"Table.js","names":["SystemFields"],"sources":["../src/Table.ts"],"sourcesContent":["import * as Lazy from \"@confect/core/Lazy\";\nimport * as SystemFields from \"@confect/core/SystemFields\";\nimport {\n  defineTable,\n  type SystemFields as ConvexSystemFields,\n  type Expand,\n  type GenericTableIndexes,\n  type GenericTableSearchIndexes,\n  type GenericTableVectorIndexes,\n  type IndexTiebreakerField,\n  type SearchIndexConfig,\n  type TableDefinition,\n  type VectorIndexConfig,\n} from \"convex/server\";\nimport type { GenericValidator, Validator } from \"convex/values\";\nimport { Predicate, Schema } from \"effect\";\nimport {\n  compileTableSchema,\n  type TableSchemaToTableValidator,\n} from \"./SchemaToValidator\";\n\nexport const TypeId = \"@confect/server/Table\";\nexport type TypeId = typeof TypeId;\n\n// -----------------------------------------------------------------------------\n// Predicates\n// -----------------------------------------------------------------------------\n//\n// Both bound `Table`s and `UnnamedTable` callables share the same `[TypeId]`\n// brand. They disambiguate by whether a `tableName` property is set: bound\n// tables have one, unnamed callables do not.\n//\n// The discriminator is `tableName` (not `name`) so it does not collide with\n// the built-in `Function.prototype.name` that every JS function carries.\n\nexport const isTable = (u: unknown): u is Any =>\n  Predicate.hasProperty(u, TypeId) && Predicate.hasProperty(u, \"tableName\");\n\nexport const isUnnamedTable = (u: unknown): u is UnnamedAny =>\n  Predicate.hasProperty(u, TypeId) && !Predicate.hasProperty(u, \"tableName\");\n\n// -----------------------------------------------------------------------------\n// Bound Table\n// -----------------------------------------------------------------------------\n\nexport interface Table<\n  Name_ extends string,\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends GenericValidator =\n    TableSchemaToTableValidator<TableSchema_>,\n  Indexes_ extends GenericTableIndexes = {},\n  SearchIndexes_ extends GenericTableSearchIndexes = {},\n  VectorIndexes_ extends GenericTableVectorIndexes = {},\n> {\n  readonly [TypeId]: TypeId;\n  readonly tableName: Name_;\n  readonly tableDefinition: TableDefinition<\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n  readonly Fields: TableSchema_;\n  readonly Doc: SystemFields.ExtendWithSystemFields<Name_, TableSchema_>;\n  readonly indexes: Indexes_;\n}\n\nexport interface Any {\n  readonly [TypeId]: TypeId;\n  readonly tableName: string;\n}\n\nexport type AnyWithProps = Table<\n  any,\n  Schema.Schema.AnyNoContext,\n  GenericValidator,\n  GenericTableIndexes,\n  GenericTableSearchIndexes,\n  GenericTableVectorIndexes\n>;\n\n// -----------------------------------------------------------------------------\n// UnnamedTable (callable)\n// -----------------------------------------------------------------------------\n//\n// `Table.make(lazyFields)` returns an `UnnamedTable`: a callable that\n// produces a fully bound `Table` when invoked with a name. Chaining methods\n// (`.index`, `.searchIndex`, `.vectorIndex`) live here and return new\n// `UnnamedTable`s, accumulating plain index metadata records. Neither the\n// field-schema nor the deploy-time `tableDefinition` is constructed at this\n// stage — the user-supplied `lazyFields` callback is just carried through.\n// The codegen pipeline emits a wrapper file per user-authored table that\n// simply invokes the unnamed callable with the filename basename.\n\nexport interface UnnamedTable<\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends GenericValidator =\n    TableSchemaToTableValidator<TableSchema_>,\n  Indexes_ extends GenericTableIndexes = {},\n  SearchIndexes_ extends GenericTableSearchIndexes = {},\n  VectorIndexes_ extends GenericTableVectorIndexes = {},\n> {\n  <const Name_ extends string>(\n    tableName: Name_,\n  ): Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  readonly [TypeId]: TypeId;\n  readonly indexes: Indexes_;\n\n  index<\n    IndexName extends string,\n    FirstFieldPath extends ExtractFieldPaths<TableValidator_>,\n    RestFieldPaths extends ExtractFieldPaths<TableValidator_>[],\n  >(\n    name: IndexName,\n    fields: [FirstFieldPath, ...RestFieldPaths],\n  ): UnnamedTable<\n    TableSchema_,\n    TableValidator_,\n    Expand<\n      Indexes_ &\n        Record<\n          IndexName,\n          [FirstFieldPath, ...RestFieldPaths, IndexTiebreakerField]\n        >\n    >,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  searchIndex<\n    IndexName extends string,\n    SearchField extends ExtractFieldPaths<TableValidator_>,\n    FilterFields extends ExtractFieldPaths<TableValidator_> = never,\n  >(\n    name: IndexName,\n    indexConfig: Expand<SearchIndexConfig<SearchField, FilterFields>>,\n  ): UnnamedTable<\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    Expand<\n      SearchIndexes_ &\n        Record<\n          IndexName,\n          {\n            searchField: SearchField;\n            filterFields: FilterFields;\n          }\n        >\n    >,\n    VectorIndexes_\n  >;\n\n  vectorIndex<\n    IndexName extends string,\n    VectorField extends ExtractFieldPaths<TableValidator_>,\n    FilterFields extends ExtractFieldPaths<TableValidator_> = never,\n  >(\n    name: IndexName,\n    indexConfig: Expand<VectorIndexConfig<VectorField, FilterFields>>,\n  ): UnnamedTable<\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    Expand<\n      VectorIndexes_ &\n        Record<\n          IndexName,\n          {\n            vectorField: VectorField;\n            dimensions: number;\n            filterFields: FilterFields;\n          }\n        >\n    >\n  >;\n}\n\nexport interface UnnamedAny {\n  readonly [TypeId]: TypeId;\n}\n\nexport type UnnamedAnyWithProps = UnnamedTable<\n  Schema.Schema.AnyNoContext,\n  GenericValidator,\n  GenericTableIndexes,\n  GenericTableSearchIndexes,\n  GenericTableVectorIndexes\n>;\n\n// -----------------------------------------------------------------------------\n// Type extractors\n// -----------------------------------------------------------------------------\n\nexport type Name<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableName & string\n    : never;\n\nexport type TableSchema<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableSchema_\n    : never;\n\nexport type TableValidator<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer TableValidator_,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableValidator_\n    : never;\n\nexport type Indexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer Indexes_,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? Indexes_\n    : never;\n\nexport type SearchIndexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer SearchIndexes_,\n    infer _VectorIndexes\n  >\n    ? SearchIndexes_\n    : never;\n\nexport type VectorIndexes<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer _TableSchema,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer VectorIndexes_\n  >\n    ? VectorIndexes_\n    : never;\n\nexport type Doc<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? SystemFields.ExtendWithSystemFields<TableName, TableSchema_>\n    : never;\n\nexport type Fields<TableDef extends AnyWithProps> =\n  TableDef extends Table<\n    infer _TableName,\n    infer TableSchema_,\n    infer _TableValidator,\n    infer _Indexes,\n    infer _SearchIndexes,\n    infer _VectorIndexes\n  >\n    ? TableSchema_\n    : never;\n\nexport type WithName<\n  TableDef extends AnyWithProps,\n  Name_ extends string,\n> = TableDef extends { readonly tableName: Name_ } ? TableDef : never;\n\nexport type TablesRecord<Tables extends AnyWithProps> = {\n  readonly [TableName_ in Name<Tables>]: WithName<Tables, TableName_>;\n};\n\n// -----------------------------------------------------------------------------\n// Construction\n// -----------------------------------------------------------------------------\n//\n// `make` only stores the user-supplied `lazyFields` callback alongside any\n// chained index metadata. Neither `Fields` nor `Doc` nor `tableDefinition`\n// is constructed until first access on a bound `Table`. Each chain step is\n// O(1) (plain object spread of the metadata records) and never invokes the\n// callback. Binding via `unnamed(tableName)` installs lazy memoised getters\n// for `Fields`, `Doc`, and `tableDefinition` via `Lazy.defineProperty`, so the\n// first access materialises the value and replaces the getter with a plain\n// data property — second-and-subsequent accesses are observably\n// indistinguishable from a plain property and avoid all function-call\n// overhead.\n\ninterface UnnamedState<\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  Indexes_ extends GenericTableIndexes,\n  SearchIndexes_ extends GenericTableSearchIndexes,\n  VectorIndexes_ extends GenericTableVectorIndexes,\n> {\n  readonly lazyFields: () => TableSchema_;\n  readonly indexes: Indexes_;\n  readonly searchIndexes: SearchIndexes_;\n  readonly vectorIndexes: VectorIndexes_;\n}\n\nconst makeBound = <\n  Name_ extends string,\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends Validator<any, any, any>,\n  Indexes_ extends GenericTableIndexes,\n  SearchIndexes_ extends GenericTableSearchIndexes,\n  VectorIndexes_ extends GenericTableVectorIndexes,\n>(\n  tableName: Name_,\n  state: UnnamedState<TableSchema_, Indexes_, SearchIndexes_, VectorIndexes_>,\n): Table<\n  Name_,\n  TableSchema_,\n  TableValidator_,\n  Indexes_,\n  SearchIndexes_,\n  VectorIndexes_\n> => {\n  const bound = {\n    [TypeId]: TypeId as TypeId,\n    tableName,\n    indexes: state.indexes,\n  } as Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  Lazy.defineProperty(bound, \"Fields\", () => state.lazyFields());\n\n  Lazy.defineProperty(bound, \"Doc\", () =>\n    SystemFields.extendWithSystemFields(\n      tableName,\n      (bound as { Fields: TableSchema_ }).Fields,\n    ),\n  );\n\n  Lazy.defineProperty(bound, \"tableDefinition\", () => {\n    const fields = (bound as { Fields: TableSchema_ }).Fields;\n    let definition: TableDefinition<any, any, any, any> = defineTable(\n      compileTableSchema(fields),\n    );\n    for (const [name, indexFields] of Object.entries(\n      state.indexes as Record<string, any>,\n    )) {\n      definition = definition.index(name, indexFields);\n    }\n    for (const [name, config] of Object.entries(\n      state.searchIndexes as Record<string, any>,\n    )) {\n      definition = definition.searchIndex(name, config);\n    }\n    for (const [name, config] of Object.entries(\n      state.vectorIndexes as Record<string, any>,\n    )) {\n      definition = definition.vectorIndex(name, config);\n    }\n    return definition;\n  });\n\n  return bound;\n};\n\nconst makeUnnamed = <\n  TableSchema_ extends Schema.Schema.AnyNoContext,\n  TableValidator_ extends Validator<any, any, any>,\n  Indexes_ extends GenericTableIndexes,\n  SearchIndexes_ extends GenericTableSearchIndexes,\n  VectorIndexes_ extends GenericTableVectorIndexes,\n>(\n  state: UnnamedState<TableSchema_, Indexes_, SearchIndexes_, VectorIndexes_>,\n): UnnamedTable<\n  TableSchema_,\n  TableValidator_,\n  Indexes_,\n  SearchIndexes_,\n  VectorIndexes_\n> => {\n  type UnnamedTable_ = UnnamedTable<\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  >;\n\n  type UnnamedTableFunction<FunctionName extends keyof UnnamedTable_> =\n    UnnamedTable_[FunctionName];\n\n  const bind = <const Name_ extends string>(\n    tableName: Name_,\n  ): Table<\n    Name_,\n    TableSchema_,\n    TableValidator_,\n    Indexes_,\n    SearchIndexes_,\n    VectorIndexes_\n  > =>\n    makeBound<\n      Name_,\n      TableSchema_,\n      TableValidator_,\n      Indexes_,\n      SearchIndexes_,\n      VectorIndexes_\n    >(tableName, state);\n\n  const index: UnnamedTableFunction<\"index\"> = (name, fields) =>\n    makeUnnamed({\n      lazyFields: state.lazyFields,\n      indexes: {\n        ...state.indexes,\n        [name]: fields,\n      } as any,\n      searchIndexes: state.searchIndexes,\n      vectorIndexes: state.vectorIndexes,\n    });\n\n  const searchIndex: UnnamedTableFunction<\"searchIndex\"> = (\n    name,\n    indexConfig,\n  ) =>\n    makeUnnamed({\n      lazyFields: state.lazyFields,\n      indexes: state.indexes,\n      searchIndexes: {\n        ...state.searchIndexes,\n        [name]: indexConfig,\n      } as any,\n      vectorIndexes: state.vectorIndexes,\n    });\n\n  const vectorIndex: UnnamedTableFunction<\"vectorIndex\"> = (\n    name,\n    indexConfig,\n  ) =>\n    makeUnnamed({\n      lazyFields: state.lazyFields,\n      indexes: state.indexes,\n      searchIndexes: state.searchIndexes,\n      vectorIndexes: {\n        ...state.vectorIndexes,\n        [name]: indexConfig,\n      } as any,\n    });\n\n  return Object.assign(bind, {\n    [TypeId]: TypeId as TypeId,\n    indexes: state.indexes,\n    index,\n    searchIndex,\n    vectorIndex,\n  }) satisfies UnnamedTable_;\n};\n\nexport const make = <const TableSchema_ extends Schema.Schema.AnyNoContext>(\n  lazyFields: () => TableSchema_,\n): UnnamedTable<TableSchema_, TableSchemaToTableValidator<TableSchema_>> => {\n  type TableValidator_ = TableSchemaToTableValidator<TableSchema_>;\n  type UnnamedTable_ = UnnamedTable<TableSchema_, TableValidator_>;\n\n  return makeUnnamed<TableSchema_, TableValidator_, {}, {}, {}>({\n    lazyFields,\n    indexes: {},\n    searchIndexes: {},\n    vectorIndexes: {},\n  }) satisfies UnnamedTable_;\n};\n\n// -----------------------------------------------------------------------------\n// System tables\n// -----------------------------------------------------------------------------\n\nexport const scheduledFunctionsTable = make(() =>\n  Schema.Struct({\n    name: Schema.String,\n    args: Schema.Array(Schema.Any),\n    scheduledTime: Schema.Number,\n    completedTime: Schema.optionalWith(Schema.Number, { exact: true }),\n    state: Schema.Union(\n      Schema.Struct({ kind: Schema.Literal(\"pending\") }),\n      Schema.Struct({ kind: Schema.Literal(\"inProgress\") }),\n      Schema.Struct({ kind: Schema.Literal(\"success\") }),\n      Schema.Struct({\n        kind: Schema.Literal(\"failed\"),\n        error: Schema.String,\n      }),\n      Schema.Struct({ kind: Schema.Literal(\"canceled\") }),\n    ),\n  }),\n)(\"_scheduled_functions\");\n\nexport const storageTable = make(() =>\n  Schema.Struct({\n    sha256: Schema.String,\n    size: Schema.Number,\n    contentType: Schema.optionalWith(Schema.String, { exact: true }),\n  }),\n)(\"_storage\");\n\nexport const systemTables = {\n  _scheduled_functions: scheduledFunctionsTable,\n  _storage: storageTable,\n} as const;\n\nexport type SystemTables = typeof scheduledFunctionsTable | typeof storageTable;\n\n// Vendored types from convex-js, partially modified. Ideally we could use these directly. See https://github.com/get-convex/convex-js/pull/14\n\n/**\n * Extract all of the index field paths within a {@link Validator}.\n *\n * This is used within {@link defineTable}.\n * @public\n */\ntype ExtractFieldPaths<T extends Validator<any, any, any>> =\n  // Add in the system fields available in index definitions.\n  // This should be everything except for `_id` because thats added to indexes\n  // automatically.\n  T[\"fieldPaths\"] | keyof ConvexSystemFields;\n"],"mappings":";;;;;;;;;;;;;;;;;AAqBA,MAAa,SAAS;AActB,MAAa,WAAW,MACtB,UAAU,YAAY,GAAG,OAAO,IAAI,UAAU,YAAY,GAAG,YAAY;AAE3E,MAAa,kBAAkB,MAC7B,UAAU,YAAY,GAAG,OAAO,IAAI,CAAC,UAAU,YAAY,GAAG,YAAY;AAwS5E,MAAM,aAQJ,WACA,UAQG;CACH,MAAM,QAAQ;GACX,SAAS;EACV;EACA,SAAS,MAAM;EAChB;AASD,MAAK,eAAe,OAAO,gBAAgB,MAAM,YAAY,CAAC;AAE9D,MAAK,eAAe,OAAO,aACzBA,eAAa,uBACX,WACC,MAAmC,OACrC,CACF;AAED,MAAK,eAAe,OAAO,yBAAyB;EAClD,MAAM,SAAU,MAAmC;EACnD,IAAI,aAAkD,YACpD,mBAAmB,OAAO,CAC3B;AACD,OAAK,MAAM,CAAC,MAAM,gBAAgB,OAAO,QACvC,MAAM,QACP,CACC,cAAa,WAAW,MAAM,MAAM,YAAY;AAElD,OAAK,MAAM,CAAC,MAAM,WAAW,OAAO,QAClC,MAAM,cACP,CACC,cAAa,WAAW,YAAY,MAAM,OAAO;AAEnD,OAAK,MAAM,CAAC,MAAM,WAAW,OAAO,QAClC,MAAM,cACP,CACC,cAAa,WAAW,YAAY,MAAM,OAAO;AAEnD,SAAO;GACP;AAEF,QAAO;;AAGT,MAAM,eAOJ,UAOG;CAYH,MAAM,QACJ,cASA,UAOE,WAAW,MAAM;CAErB,MAAM,SAAwC,MAAM,WAClD,YAAY;EACV,YAAY,MAAM;EAClB,SAAS;GACP,GAAG,MAAM;IACR,OAAO;GACT;EACD,eAAe,MAAM;EACrB,eAAe,MAAM;EACtB,CAAC;CAEJ,MAAM,eACJ,MACA,gBAEA,YAAY;EACV,YAAY,MAAM;EAClB,SAAS,MAAM;EACf,eAAe;GACb,GAAG,MAAM;IACR,OAAO;GACT;EACD,eAAe,MAAM;EACtB,CAAC;CAEJ,MAAM,eACJ,MACA,gBAEA,YAAY;EACV,YAAY,MAAM;EAClB,SAAS,MAAM;EACf,eAAe,MAAM;EACrB,eAAe;GACb,GAAG,MAAM;IACR,OAAO;GACT;EACF,CAAC;AAEJ,QAAO,OAAO,OAAO,MAAM;GACxB,SAAS;EACV,SAAS,MAAM;EACf;EACA;EACA;EACD,CAAC;;AAGJ,MAAa,QACX,eAC0E;AAI1E,QAAO,YAAuD;EAC5D;EACA,SAAS,EAAE;EACX,eAAe,EAAE;EACjB,eAAe,EAAE;EAClB,CAAC;;AAOJ,MAAa,0BAA0B,WACrC,OAAO,OAAO;CACZ,MAAM,OAAO;CACb,MAAM,OAAO,MAAM,OAAO,IAAI;CAC9B,eAAe,OAAO;CACtB,eAAe,OAAO,aAAa,OAAO,QAAQ,EAAE,OAAO,MAAM,CAAC;CAClE,OAAO,OAAO,MACZ,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,UAAU,EAAE,CAAC,EAClD,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,aAAa,EAAE,CAAC,EACrD,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,UAAU,EAAE,CAAC,EAClD,OAAO,OAAO;EACZ,MAAM,OAAO,QAAQ,SAAS;EAC9B,OAAO,OAAO;EACf,CAAC,EACF,OAAO,OAAO,EAAE,MAAM,OAAO,QAAQ,WAAW,EAAE,CAAC,CACpD;CACF,CAAC,CACH,CAAC,uBAAuB;AAEzB,MAAa,eAAe,WAC1B,OAAO,OAAO;CACZ,QAAQ,OAAO;CACf,MAAM,OAAO;CACb,aAAa,OAAO,aAAa,OAAO,QAAQ,EAAE,OAAO,MAAM,CAAC;CACjE,CAAC,CACH,CAAC,WAAW;AAEb,MAAa,eAAe;CAC1B,sBAAsB;CACtB,UAAU;CACX"}

package/dist/index.d.ts

@@ -1,14 +1,13 @@
 import { ActionCtx_d_exports } from "./ActionCtx.js";
 import { ActionRunner_d_exports } from "./ActionRunner.js";
-import { SchemaToValidator_d_exports } from "./SchemaToValidator.js";
-import { Table_d_exports } from "./Table.js";
-import { DatabaseSchema_d_exports } from "./DatabaseSchema.js";
-import { Api_d_exports } from "./Api.js";
 import { Auth_d_exports } from "./Auth.js";
 import { BlobNotFoundError_d_exports } from "./BlobNotFoundError.js";
 import { ConvexConfigProvider_d_exports } from "./ConvexConfigProvider.js";
 import { CronJob_d_exports } from "./CronJob.js";
 import { CronJobs_d_exports } from "./CronJobs.js";
+import { SchemaToValidator_d_exports } from "./SchemaToValidator.js";
+import { Table_d_exports } from "./Table.js";
+import { DatabaseSchema_d_exports } from "./DatabaseSchema.js";
 import { Document_d_exports } from "./Document.js";
 import { TableInfo_d_exports } from "./TableInfo.js";
 import { DataModel_d_exports } from "./DataModel.js";
@@ -33,4 +32,4 @@ import { HttpApi_d_exports } from "./HttpApi.js";
 import { RegistryItem_d_exports } from "./RegistryItem.js";
 import { RegisteredConvexFunction_d_exports } from "./RegisteredConvexFunction.js";
 import { RegisteredFunctions_d_exports } from "./RegisteredFunctions.js";
-export { ActionCtx_d_exports as ActionCtx, ActionRunner_d_exports as ActionRunner, Api_d_exports as Api, Auth_d_exports as Auth, BlobNotFoundError_d_exports as BlobNotFoundError, ConvexConfigProvider_d_exports as ConvexConfigProvider, CronJob_d_exports as CronJob, CronJobs_d_exports as CronJobs, DataModel_d_exports as DataModel, DatabaseReader_d_exports as DatabaseReader, DatabaseSchema_d_exports as DatabaseSchema, DatabaseWriter_d_exports as DatabaseWriter, Document_d_exports as Document, FunctionImpl_d_exports as FunctionImpl, GroupImpl_d_exports as GroupImpl, Handler_d_exports as Handler, HttpApi_d_exports as HttpApi, MutationCtx_d_exports as MutationCtx, MutationRunner_d_exports as MutationRunner, OrderedQuery_d_exports as OrderedQuery, QueryCtx_d_exports as QueryCtx, QueryInitializer_d_exports as QueryInitializer, QueryRunner_d_exports as QueryRunner, RegisteredConvexFunction_d_exports as RegisteredConvexFunction, RegisteredFunction_d_exports as RegisteredFunction, RegisteredFunctions_d_exports as RegisteredFunctions, RegistryItem_d_exports as RegistryItem, Scheduler_d_exports as Scheduler, SchemaToValidator_d_exports as SchemaToValidator, StorageActionWriter_d_exports as StorageActionWriter, StorageReader_d_exports as StorageReader, StorageWriter_d_exports as StorageWriter, Table_d_exports as Table, TableInfo_d_exports as TableInfo, VectorSearch_d_exports as VectorSearch };
+export { ActionCtx_d_exports as ActionCtx, ActionRunner_d_exports as ActionRunner, Auth_d_exports as Auth, BlobNotFoundError_d_exports as BlobNotFoundError, ConvexConfigProvider_d_exports as ConvexConfigProvider, CronJob_d_exports as CronJob, CronJobs_d_exports as CronJobs, DataModel_d_exports as DataModel, DatabaseReader_d_exports as DatabaseReader, DatabaseSchema_d_exports as DatabaseSchema, DatabaseWriter_d_exports as DatabaseWriter, Document_d_exports as Document, FunctionImpl_d_exports as FunctionImpl, GroupImpl_d_exports as GroupImpl, Handler_d_exports as Handler, HttpApi_d_exports as HttpApi, MutationCtx_d_exports as MutationCtx, MutationRunner_d_exports as MutationRunner, OrderedQuery_d_exports as OrderedQuery, QueryCtx_d_exports as QueryCtx, QueryInitializer_d_exports as QueryInitializer, QueryRunner_d_exports as QueryRunner, RegisteredConvexFunction_d_exports as RegisteredConvexFunction, RegisteredFunction_d_exports as RegisteredFunction, RegisteredFunctions_d_exports as RegisteredFunctions, RegistryItem_d_exports as RegistryItem, Scheduler_d_exports as Scheduler, SchemaToValidator_d_exports as SchemaToValidator, StorageActionWriter_d_exports as StorageActionWriter, StorageReader_d_exports as StorageReader, StorageWriter_d_exports as StorageWriter, Table_d_exports as Table, TableInfo_d_exports as TableInfo, VectorSearch_d_exports as VectorSearch };

package/dist/index.js

@@ -1,19 +1,18 @@
 import { ActionCtx_exports } from "./ActionCtx.js";
 import { ActionRunner_exports } from "./ActionRunner.js";
-import { Api_exports } from "./Api.js";
 import { Auth_exports } from "./Auth.js";
 import { BlobNotFoundError_exports } from "./BlobNotFoundError.js";
 import { ConvexConfigProvider_exports } from "./ConvexConfigProvider.js";
 import { CronJob_exports } from "./CronJob.js";
 import { CronJobs_exports } from "./CronJobs.js";
 import { DataModel_exports } from "./DataModel.js";
-import { SchemaToValidator_exports } from "./SchemaToValidator.js";
-import { Table_exports } from "./Table.js";
-import { DatabaseSchema_exports } from "./DatabaseSchema.js";
 import { Document_exports } from "./Document.js";
 import { OrderedQuery_exports } from "./OrderedQuery.js";
 import { QueryInitializer_exports } from "./QueryInitializer.js";
+import { SchemaToValidator_exports } from "./SchemaToValidator.js";
+import { Table_exports } from "./Table.js";
 import { DatabaseReader_exports } from "./DatabaseReader.js";
+import { DatabaseSchema_exports } from "./DatabaseSchema.js";
 import { DatabaseWriter_exports } from "./DatabaseWriter.js";
 import { RegistryItem_exports } from "./RegistryItem.js";
 import { FunctionImpl_exports } from "./FunctionImpl.js";
@@ -34,4 +33,4 @@ import { RegisteredConvexFunction_exports } from "./RegisteredConvexFunction.js"
 import { RegisteredFunctions_exports } from "./RegisteredFunctions.js";
 import { TableInfo_exports } from "./TableInfo.js";
 
-export { ActionCtx_exports as ActionCtx, ActionRunner_exports as ActionRunner, Api_exports as Api, Auth_exports as Auth, BlobNotFoundError_exports as BlobNotFoundError, ConvexConfigProvider_exports as ConvexConfigProvider, CronJob_exports as CronJob, CronJobs_exports as CronJobs, DataModel_exports as DataModel, DatabaseReader_exports as DatabaseReader, DatabaseSchema_exports as DatabaseSchema, DatabaseWriter_exports as DatabaseWriter, Document_exports as Document, FunctionImpl_exports as FunctionImpl, GroupImpl_exports as GroupImpl, Handler_exports as Handler, HttpApi_exports as HttpApi, MutationCtx_exports as MutationCtx, MutationRunner_exports as MutationRunner, OrderedQuery_exports as OrderedQuery, QueryCtx_exports as QueryCtx, QueryInitializer_exports as QueryInitializer, QueryRunner_exports as QueryRunner, RegisteredConvexFunction_exports as RegisteredConvexFunction, RegisteredFunction_exports as RegisteredFunction, RegisteredFunctions_exports as RegisteredFunctions, RegistryItem_exports as RegistryItem, Scheduler_exports as Scheduler, SchemaToValidator_exports as SchemaToValidator, StorageActionWriter_exports as StorageActionWriter, StorageReader_exports as StorageReader, StorageWriter_exports as StorageWriter, Table_exports as Table, TableInfo_exports as TableInfo, VectorSearch_exports as VectorSearch };
+export { ActionCtx_exports as ActionCtx, ActionRunner_exports as ActionRunner, Auth_exports as Auth, BlobNotFoundError_exports as BlobNotFoundError, ConvexConfigProvider_exports as ConvexConfigProvider, CronJob_exports as CronJob, CronJobs_exports as CronJobs, DataModel_exports as DataModel, DatabaseReader_exports as DatabaseReader, DatabaseSchema_exports as DatabaseSchema, DatabaseWriter_exports as DatabaseWriter, Document_exports as Document, FunctionImpl_exports as FunctionImpl, GroupImpl_exports as GroupImpl, Handler_exports as Handler, HttpApi_exports as HttpApi, MutationCtx_exports as MutationCtx, MutationRunner_exports as MutationRunner, OrderedQuery_exports as OrderedQuery, QueryCtx_exports as QueryCtx, QueryInitializer_exports as QueryInitializer, QueryRunner_exports as QueryRunner, RegisteredConvexFunction_exports as RegisteredConvexFunction, RegisteredFunction_exports as RegisteredFunction, RegisteredFunctions_exports as RegisteredFunctions, RegistryItem_exports as RegistryItem, Scheduler_exports as Scheduler, SchemaToValidator_exports as SchemaToValidator, StorageActionWriter_exports as StorageActionWriter, StorageReader_exports as StorageReader, StorageWriter_exports as StorageWriter, Table_exports as Table, TableInfo_exports as TableInfo, VectorSearch_exports as VectorSearch };

package/package.json

@@ -1,47 +1,11 @@
 {
   "name": "@confect/server",
-  "version": "9.0.0-next.5",
   "description": "Backend bindings to the Convex platform",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rjdellecese/confect.git"
-  },
+  "version": "9.0.0-next.6",
+  "author": "RJ Dellecese",
   "bugs": {
     "url": "https://github.com/rjdellecese/confect/issues"
   },
-  "homepage": "https://confect.dev",
-  "sideEffects": false,
-  "type": "module",
-  "files": [
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md",
-    "dist",
-    "package.json",
-    "src"
-  ],
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./*": {
-      "types": "./dist/*.d.ts",
-      "default": "./dist/*.js"
-    },
-    "./package.json": "./package.json",
-    "./internal/*": null,
-    "./node": {
-      "types": "./dist/node.d.ts",
-      "default": "./dist/node.js"
-    }
-  },
-  "keywords": [
-    "effect",
-    "convex"
-  ],
-  "author": "RJ Dellecese",
-  "license": "ISC",
   "devDependencies": {
     "@ark/attest": "0.56.0",
     "@effect/cluster": "0.58.2",
@@ -68,33 +32,68 @@
     "vite-tsconfig-paths": "6.1.1",
     "vitest": "3.2.4"
   },
+  "engines": {
+    "node": ">=22"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
+    },
+    "./package.json": "./package.json",
+    "./internal/*": null,
+    "./node": {
+      "types": "./dist/node.d.ts",
+      "default": "./dist/node.js"
+    }
+  },
+  "files": [
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md",
+    "dist",
+    "package.json",
+    "src"
+  ],
+  "homepage": "https://confect.dev",
+  "keywords": [
+    "convex",
+    "effect"
+  ],
+  "license": "ISC",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
   "peerDependencies": {
     "@effect/platform": "^0.96.1",
     "@effect/platform-node": "^0.106.0",
     "convex": "1.39.1",
     "effect": "^3.21.2",
-    "@confect/core": "^9.0.0-next.5"
+    "@confect/core": "^9.0.0-next.6"
   },
-  "engines": {
-    "node": ">=22",
-    "pnpm": ">=10"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rjdellecese/confect.git"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
+  "sideEffects": false,
+  "type": "module",
   "types": "./dist/index.d.ts",
   "scripts": {
+    "bench": "tsx test/SchemaToValidator.bench.ts && tsx test/Document.bench.ts",
     "build": "tsdown --config-loader unrun",
-    "dev": "tsdown --watch",
-    "test": "vitest run",
-    "test:mock-backend": "vitest run --config vitest.mock-backend.config.ts",
-    "test:local-backend": "vitest run --config vitest.local-backend.config.ts",
-    "codegen:mock-backend": "cd test/mock-backend/fixtures && pnpm confect codegen && CONVEX_AGENT_MODE=anonymous pnpm convex dev --once --typecheck=disable --tail-logs=disable",
+    "clean": "rm -rf dist coverage node_modules",
     "codegen:local-backend": "cd test/local-backend/fixtures && pnpm confect codegen && CONVEX_AGENT_MODE=anonymous pnpm convex dev --once --typecheck=disable --tail-logs=disable",
-    "typecheck": "tsc --noEmit --project tsconfig.json",
+    "codegen:mock-backend": "cd test/mock-backend/fixtures && pnpm confect codegen && CONVEX_AGENT_MODE=anonymous pnpm convex dev --once --typecheck=disable --tail-logs=disable",
+    "dev": "tsdown --watch",
     "fix": "prettier --write . && eslint --fix . --max-warnings=0",
     "format": "prettier --check .",
     "lint": "eslint . --max-warnings=0",
-    "bench": "tsx test/SchemaToValidator.bench.ts && tsx test/Document.bench.ts",
-    "clean": "rm -rf dist coverage node_modules"
+    "test": "vitest run",
+    "test:local-backend": "vitest run --config vitest.local-backend.config.ts",
+    "test:mock-backend": "vitest run --config vitest.mock-backend.config.ts",
+    "typecheck": "tsc --noEmit --project tsconfig.json"
   }
 }

package/src/DatabaseReader.ts

@@ -1,7 +1,7 @@
 import type { GenericDatabaseReader } from "convex/server";
-import { Array, Context, Layer } from "effect";
+import { Context, Layer } from "effect";
 import type { BaseDatabaseReader } from "@confect/core/Types";
-import * as DatabaseSchema from "./DatabaseSchema";
+import type * as DatabaseSchema from "./DatabaseSchema";
 import type * as DataModel from "./DataModel";
 import * as QueryInitializer from "./QueryInitializer";
 import * as Table from "./Table";
@@ -13,35 +13,31 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
   >,
 ) => {
   type Tables = DatabaseSchema.Tables<DatabaseSchema_>;
-  type IncludedTables = DatabaseSchema.IncludeSystemTables<Tables>;
-  const extendedTables = DatabaseSchema.extendWithSystemTables(
-    databaseSchema.tables as Table.TablesRecord<Tables>,
-  );
+  type IncludedTables = Tables | Table.SystemTables;
 
   return {
     table: <const TableName extends Table.Name<IncludedTables>>(
       tableName: TableName,
     ) => {
-      const table = Object.values(extendedTables).find(
-        (def) => def.name === tableName,
-      ) as Table.WithName<IncludedTables, TableName>;
+      const isSystem = Object.hasOwn(Table.systemTables, tableName);
 
-      const baseDatabaseReader: BaseDatabaseReader<any> = Array.some(
-        Object.values(Table.systemTables),
-        (systemTableDef) => systemTableDef.name === tableName,
-      )
-        ? ({
+      const baseDatabaseReader: BaseDatabaseReader<any> = isSystem
+        ? {
             get: convexDatabaseReader.system.get,
             query: convexDatabaseReader.system.query,
-          } as BaseDatabaseReader<
-            DataModel.ToConvex<DataModel.FromTables<Table.SystemTables>>
-          >)
-        : ({
+          }
+        : {
             get: convexDatabaseReader.get,
             query: convexDatabaseReader.query,
-          } as BaseDatabaseReader<
-            DataModel.ToConvex<DataModel.FromSchema<DatabaseSchema_>>
-          >);
+          };
+
+      const table = (
+        isSystem
+          ? (Table.systemTables as Record<string, Table.AnyWithProps>)[
+              tableName
+            ]
+          : databaseSchema.tables[tableName]
+      ) as Table.WithName<IncludedTables, TableName>;
 
       return QueryInitializer.make<IncludedTables, TableName>(
         tableName,