@an5/orm 1.2.0 → 1.3.1

package/dist/generator/src/python-generator.js

@@ -56,7 +56,7 @@ class PythonGenerator {
     }
     generateOrmTypes(models, outputDir) {
         let content = '# This file is auto-generated. Do not edit directly.\n';
-        content += '"""\nAN5 ORM typed filter/args dataclasses for type-safe queries.\n\nUsage example::\n\n    db.user.find_many(where=UserWhereInput(name=StringFilter(contains="John")),\n                      order_by=UserOrderByInput(created_at="desc"),\n                      take=10)\n"""\n';
+        content += '"""\nAN5 ORM typed filter/args dataclasses.\n\nThese describe the filter shapes the Python client accepts. The adapter reads plain\ndicts, not these dataclasses, and it quotes every key verbatim, so use the schema\nfield names (`createdAt`, not `created_at`):\n\n    db.user.find_many(where={"name": {"contains": "John"}},\n                      order_by={"createdAt": "desc"},\n                      take=10)\n"""\n';
         content += 'from __future__ import annotations\n';
         content += 'from dataclasses import dataclass, field\n';
         content += 'from typing import List, Optional, Any\n';
@@ -318,9 +318,11 @@ class PythonGenerator {
         }
         content += 'class An5Client:\n';
         content += '    """AN5 Python ORM Client - type-safe database access.\n\n';
+        content += '    Query keys are schema field names, used verbatim: the SQL builder quotes a key\n';
+        content += '    as-is, so `createdAt` reaches the database and `created_at` does not.\n\n';
         content += '    Usage:\n';
         content += '        db = An5Client()\n';
-        content += '        users = db.user.find_many(where={"name": {"contains": "John"}}, order_by={"created_at": "asc"}, take=10)\n';
+        content += '        users = db.user.find_many(where={"name": {"contains": "John"}}, order_by={"createdAt": "asc"}, take=10)\n';
         content += '        user  = db.user.find_first(where={"id": "abc"})\n';
         content += '        new   = db.user.create(data={"name": "Alice", "email": "alice@example.com"})\n';
         content += '    """\n';

package/dist/generator/src/rust-generator.js

@@ -490,6 +490,20 @@ pub struct DateTimeFilter {
             s.push(`    #[serde(default, skip_serializing_if = "Option::is_none")]`);
             s.push(`    pub where_: Option<${name}WhereInput>,`);
             s.push(`}\n`);
+            // VectorSearchArgs mirrors the runtime's, so a caller can narrow the search.
+            s.push(`/// ORM-style args for ${name}.vector_search().`);
+            s.push(`#[derive(Debug, Clone, Default, Serialize, Deserialize)]`);
+            s.push(`pub struct ${name}VectorSearchArgs {`);
+            s.push(`    pub vector: Vec<f32>,`);
+            s.push(`    #[serde(default, skip_serializing_if = "Option::is_none")]`);
+            s.push(`    pub take: Option<i64>,`);
+            s.push(`    #[serde(default, skip_serializing_if = "Option::is_none")]`);
+            s.push(`    pub where_: Option<${name}WhereInput>,`);
+            s.push(`    #[serde(default)]`);
+            s.push(`    pub vector_field: String,`);
+            s.push(`    #[serde(default)]`);
+            s.push(`    pub distance_metric: String,`);
+            s.push(`}\n`);
             // UpdateArgs carries the typed input alongside the where clause.
             s.push(`/// ORM-style args for ${name}.update().`);
             s.push(`#[derive(Debug, Clone, Default, Serialize, Deserialize)]`);
@@ -587,7 +601,7 @@ pub struct DateTimeFilter {
 
 use an5_adapters::{
     AdapterMetadata, An5Adapter, CountArgs, DeleteManyArgs, FindManyArgs, RowMap, TableClient,
-    UpdateArgs,
+    UpdateArgs, VectorSearchArgs,
 };
 use serde::de::DeserializeOwned;
 
@@ -808,6 +822,27 @@ impl SqlBuilder {
         lines.push(`        deserialize_rows(rows)`);
         lines.push(`    }`);
         lines.push(``);
+        lines.push(`    /// The rows nearest \`vector\`, each carrying a \`distance\`.`);
+        lines.push(`    pub async fn vector_search(&self, args: &${name}VectorSearchArgs) -> Result<Vec<(${name}, f64)>> {`);
+        lines.push(`        let rows = self`);
+        lines.push(`            .db`);
+        lines.push(`            .table("${model.name}")`);
+        lines.push(`            .vector_search(&VectorSearchArgs {`);
+        lines.push(`                vector: args.vector.iter().map(|v| *v as f64).collect(),`);
+        lines.push(`                take: args.take.unwrap_or(0),`);
+        lines.push(`                r#where: to_value(&args.where_)?,`);
+        lines.push(`                vector_field: args.vector_field.clone(),`);
+        lines.push(`                distance_metric: args.distance_metric.clone(),`);
+        lines.push(`                ..Default::default()`);
+        lines.push(`            })`);
+        lines.push(`            .await?;`);
+        lines.push(`        rows.into_iter().map(|row| {`);
+        lines.push(`            let distance = row.get("distance").and_then(serde_json::Value::as_f64)`);
+        lines.push(`                .ok_or("vector search returned no distance")?;`);
+        lines.push(`            Ok((deserialize_row(row)?, distance))`);
+        lines.push(`        }).collect()`);
+        lines.push(`    }`);
+        lines.push(``);
         lines.push(`    pub async fn find_first(&self, args: &${name}FindFirstArgs) -> Result<Option<${name}>> {`);
         lines.push(`        let row = self`);
         lines.push(`            .db`);

package/dist/generator/src/swift-generator.d.ts

@@ -0,0 +1,42 @@
+import { Model } from './types';
+export declare class SwiftGenerator {
+    private outputDir;
+    /** The database being generated for; decides types like `TIMESTAMP`. */
+    private provider;
+    constructor(outputDir: string);
+    generate(models: Model[]): void;
+    /**
+     * The SwiftPM manifest for the generated client.
+     *
+     * <p>SwiftPM has no "point a build at this folder" story the way a csproj or a go.mod
+     * does: a target's sources have to live under `Sources/<Target>/`. Emitting the manifest
+     * and that layout together is what makes the output a package an app can depend on,
+     * rather than a directory a consumer has to restructure by hand.
+     */
+    private generatePackageManifest;
+    /** Where SwiftPM expects a target's sources. */
+    private get sourceDir();
+    private capitalize;
+    /**
+     * The property name for a column.
+     *
+     * Backticked rather than renamed where possible: `default` and `class` are valid column
+     * names, and renaming them in the model but not in the SQL is a mismatch nobody notices.
+     */
+    private property;
+    private static toCamelCase;
+    private static toLowerCamelCase;
+    /** The Swift type for a column. */
+    private mapType;
+    private mapOptionalType;
+    /** How a column is read out of a row, as a Swift expression. */
+    private readExpression;
+    private filterType;
+    private generateModels;
+    private modelSource;
+    private generateOrmTypes;
+    private generateMetadata;
+    private generateConfig;
+    private generateClient;
+    private tableName;
+}