appflare 0.0.18 → 0.0.19

package/cli/schema/schema-static-types.ts

@@ -13,6 +13,16 @@ type NumericKeys<T> =
 	{
 		[K in keyof T]: NonNil<T[K]> extends number | bigint ? K : never;
 	}[keyof T] & string;
+ 
+type Friendly<T> = T extends Id<any>
+	? T | string
+	: T extends Array<infer TItem>
+		? Array<Friendly<TItem>>
+		: T;
+ 
+type FriendlyDoc<TDoc> = {
+	[K in keyof TDoc]: Friendly<TDoc[K]>;
+};
 
 type PopulateValue<T> = T extends Id<infer TTable>
 	? (TTable extends TableNames ? Doc<TTable> : never)
@@ -53,16 +63,16 @@ type RegexOperand<T> = NonNil<T> extends string
 type ArrayOperand<T> = ReadonlyArray<NonNil<T>>;
 
 type QueryWhereField<T> =
-	| NonNil<T>
+	| Friendly<NonNil<T>>
 	| {
-			eq?: NonNil<T>;
-			$eq?: NonNil<T>;
-			ne?: NonNil<T>;
-			$ne?: NonNil<T>;
-			in?: ArrayOperand<T>;
-			$in?: ArrayOperand<T>;
-			nin?: ArrayOperand<T>;
-			$nin?: ArrayOperand<T>;
+			eq?: Friendly<NonNil<T>>;
+			$eq?: Friendly<NonNil<T>>;
+			ne?: Friendly<NonNil<T>>;
+			$ne?: Friendly<NonNil<T>>;
+			in?: ReadonlyArray<Friendly<NonNil<T>>>;
+			$in?: ReadonlyArray<Friendly<NonNil<T>>>;
+			nin?: ReadonlyArray<Friendly<NonNil<T>>>;
+			$nin?: ReadonlyArray<Friendly<NonNil<T>>>;
 			gt?: Comparable<T>;
 			$gt?: Comparable<T>;
 			gte?: Comparable<T>;
@@ -605,9 +615,8 @@ export const query = <TArgs extends QueryArgsShape, TResult>(
 	definition: QueryDefinition<TArgs, TResult>
 ): QueryDefinition<TArgs, TResult> => definition;
 
-export type EditableDoc<TableName extends TableNames> = Omit<
-	TableDocMap[TableName],
-	"_id" | "_creationTime"
+export type EditableDoc<TableName extends TableNames> = FriendlyDoc<
+	Omit<TableDocMap[TableName], "_id" | "_creationTime">
 >;
 
 export interface DatabaseWriter extends DatabaseReader {}

package/cli/schema/schema.ts

@@ -5,7 +5,7 @@ import { getZodObjectShape, renderField } from "../utils/zod-utils";
 
 function generateDocParts(
 	tableNames: string[],
-	schema: any
+	schema: any,
 ): {
 	docInterfaces: string[];
 	docMapEntries: string[];
@@ -40,13 +40,13 @@ function generateDocParts(
 }
 
 export async function getSchemaTableNames(
-	schemaPathAbs: string
+	schemaPathAbs: string,
 ): Promise<string[]> {
 	const mod = await import(pathToFileURL(schemaPathAbs).href);
 	const schema = mod?.default ?? mod;
 	if (!schema || typeof schema !== "object") {
 		throw new Error(
-			`Invalid schema export in ${schemaPathAbs} (expected default export object)`
+			`Invalid schema export in ${schemaPathAbs} (expected default export object)`,
 		);
 	}
 	return Object.keys(schema).sort();
@@ -61,7 +61,7 @@ export async function generateSchemaTypes(params: {
 	const schema = mod?.default ?? mod;
 	if (!schema || typeof schema !== "object") {
 		throw new Error(
-			`Invalid schema export in ${params.schemaPathAbs} (expected default export object)`
+			`Invalid schema export in ${params.schemaPathAbs} (expected default export object)`,
 		);
 	}
 
@@ -72,7 +72,7 @@ export async function generateSchemaTypes(params: {
 
 	const { docInterfaces, docMapEntries, tableIndexEntries } = generateDocParts(
 		tableNames,
-		schema
+		schema,
 	);
 
 	const configImportPath =
@@ -130,7 +130,7 @@ export type AnyValidator = SchemaValidator<unknown>;
 
 export type TableNames = ${tableNames.map((t) => JSON.stringify(t)).join(" | ")};
 
-export type Id<TableName extends TableNames> = string & { __table?: TableName };
+export type Id<TableName extends TableNames> = string & { __table: TableName };
 
 ${docInterfaces.join("\n\n")}
 

package/cli/utils/zod-utils.ts

@@ -63,8 +63,8 @@ function renderType(schema: any): { tsType: string; optional: boolean } {
 		const description: string | undefined =
 			schema?.description ?? def?.description;
 		if (typeof description === "string" && description.startsWith("ref:")) {
-			// Treat reference fields as plain strings in generated types for friendlier typing/UX.
-			return { tsType: "string", optional: false };
+			const refTableName = description.slice(4);
+			return { tsType: `Id<${JSON.stringify(refTableName)}>`, optional: false };
 		}
 		return { tsType: "string", optional: false };
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},