@proofkit/fmodata 0.1.0-alpha.0 → 0.1.0-alpha.2

package/README.md

@@ -1,37 +1,972 @@
-# @proofkit/fmodata
+# @proofkit/fmodata Documentation
 
-FileMaker OData API client
+A strongly-typed FileMaker OData API client.
+
+⚠️ WARNING: This library is in "alpha" status. The API is subject to change. Feedback is welcome on the [community forum](https://community.ottomatic.cloud/c/proofkit/13) or on [GitHub](https://github.com/proofgeist/proofkit/issues).
+
+Roadmap:
+
+- [ ] Batch operations
+- [ ] Proper docs at proofkit.dev
+- [ ] @proofkit/typegen integration
 
 ## Installation
 
 ```bash
-pnpm add @proofkit/fmodata
+pnpm add @proofkit/fmodata@alpha
 ```
 
-## Usage
+## Quick Start
+
+Here's a minimal example to get you started:
 
 ```typescript
-import { createODataClient } from "@proofkit/fmodata";
+import {
+  FMServerConnection,
+  BaseTable,
+  TableOccurrence,
+} from "@proofkit/fmodata";
+import { z } from "zod/v4";
+
+// 1. Create a connection to the server
+const connection = new FMServerConnection({
+  serverUrl: "https://your-server.com",
+  auth: {
+    // OttoFMS API key
+    apiKey: "your-api-key",
+
+    // or username and password
+    // username: "admin",
+    // password: "password",
+  },
+});
+
+// 2. Define your table schema
+const usersBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    username: z.string(),
+    email: z.string(),
+    active: z.boolean(),
+  },
+  idField: "id",
+});
+
+// 3. Create a table occurrence
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+});
+
+// 4. Create a database instance
+const db = connection.database("MyDatabase.fmp12", {
+  occurrences: [usersTO],
+});
 
-// Usage example coming soon
+// 5. Query your data
+const { data, error } = await db.from("users").list().execute();
+
+if (error) {
+  console.error(error);
+  return;
+}
+
+if (data) {
+  console.log(data); // Array of users, properly typed
+}
 ```
 
-## Development
+## Core Concepts
 
-```bash
-# Install dependencies
-pnpm install
+This library relies heavily on the builder pattern for defining your queries and operations. Most operations require a final call to `execute()` to send the request to the server. The builder pattern is designed to support batch operations in the future, allowing you to execute multiple operations in a single request as supported by the FileMaker OData API. **Note:** Batch operations are not yet supported but are planned before the production release. It's also helpful for testing the library, as you can call `getQueryString()` to get the OData query string without executing the request.
+
+As such, there are layers to the library to help you build your queries and operations.
+
+- `FMServerConnection` - hold server connection details and authentication
+- `BaseTable` - defines the fields and validators for a base table
+- `TableOccurrence` - references a base table, and other table occurrences for navigation
+- `Database` - connects the table occurrences to the server connection
+
+### FileMaker Server prerequisites
+
+To use this library you need:
+
+- OData service enabled on your FileMaker server
+- A FileMaker account with `fmodata` privilege enabled
+- (if using OttoFMS) a Data API key setup for your FileMaker account with OData enabled
+
+A note on best practices:
+
+OData relies entirely on the table occurances in the relationship graph for data access. Relationships between table occurrences are also used, but maybe not as you expect (in short, only the simplest relationships are supported). Given these constraints, it may be best for you to have a seperate FileMaker file for your OData connection, using external data sources to link to your actual data. We've found this especially helpful for larger projects that have very large graphs with lots of duplicated table occurances compared to actual base tables.
+
+### Server Connection
+
+The client can authenticate using username/password or API key:
+
+```typescript
+// Username and password authentication
+const connection = new FMServerConnection({
+  serverUrl: "https://api.example.com",
+  auth: {
+    username: "test",
+    password: "test",
+  },
+});
+
+// API key authentication
+const connection = new FMServerConnection({
+  serverUrl: "https://api.example.com",
+  auth: {
+    apiKey: "your-api-key",
+  },
+});
+```
+
+### Schema Definitions
+
+This library relies on a schema-first approach for good type-safety and optional runtime validation. These are absracted into BaseTable and TableOccurrence classes to match FileMaker concepts.
+
+A `BaseTable` defines the schema for your FileMaker table using Standard Schema. These examples show zod, but you can use any other validation library that supports Standard Schema.
+
+```typescript
+import { z } from "zod/v4";
+import { BaseTable } from "@proofkit/fmodata";
+
+const contactsBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    name: z.string(),
+    email: z.string(),
+    phone: z.string().optional(),
+    createdAt: z.string(),
+  },
+  idField: "id", // The primary key field
+  insertRequired: ["name", "email"], // optional: fields that are required on insert
+  updateRequired: ["email"], // optional: fields that are required on update
+});
+```
+
+A `TableOccurrence` is the actual entry point for the OData service on the FileMaker server. It's where you can define the relations between tables and also allows you to reference the same base table multiple times with different names.
+
+```typescript
+import { TableOccurrence } from "@proofkit/fmodata";
+
+const contactsTO = new TableOccurrence({
+  name: "contacts", // The table occurrence name in FileMaker
+  baseTable: contactsBase,
+});
+```
+
+#### Default Field Selection
+
+FileMaker will automatically return all non-container fields from a schema if you don't specify a $select parameter in your query. This library forces you to be a bit more explicit about what fields you want to return so that the types will more accurately reflect the full data you will get back. To modify this behavior, change the `defaultSelect` option when creating the `TableOccurrence`.
+
+```typescript
+// Option 1 (default): "schema" - Select all fields from the schema (same as "all" but more explicit)
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+  defaultSelect: "schema", // a $select parameter will be always be added to the query for only the fields you've defined in the BaseTable schema
+});
+
+// Option 2: "all" - Select all fields (default behavior)
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+  defaultSelect: "all", // Don't always a $select parameter to the query; FileMaker will return all non-container fields from the table
+});
+
+// Option 3: Array of field names - Select only specific fields by default
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+  defaultSelect: ["username", "email"], // Only select these fields by default
+});
+
+// When you call list(), the defaultSelect is applied automatically
+const result = await db.from("users").list().execute();
+// If defaultSelect is ["username", "email"], result.data will only contain those fields
+
+// You can still override with explicit select()
+const result = await db
+  .from("users")
+  .list()
+  .select("username", "email", "age") // Always overrides at the per-request level
+  .execute();
+```
+
+Lastly, you can combine all table occurrences into a database instance for the full type-safe experience. This is a method on the main `FMServerConnection` client class.
+
+```typescript
+const db = connection.database("MyDatabase.fmp12", {
+  occurrences: [contactsTO, usersTO], // Register your table occurrences
+});
+```
+
+## Querying Data
+
+### Basic Queries
+
+Use `list()` to retrieve multiple records:
+
+```typescript
+// Get all users
+const result = await db.from("users").list().execute();
+
+if (result.data) {
+  result.data.forEach((user) => {
+    console.log(user.username);
+  });
+}
+```
+
+Get a specific record by ID:
+
+```typescript
+const result = await db.from("users").get("user-123").execute();
+
+if (result.data) {
+  console.log(result.data.username);
+}
+```
+
+Get a single field value:
+
+```typescript
+const result = await db
+  .from("users")
+  .get("user-123")
+  .getSingleField("email")
+  .execute();
+
+if (result.data) {
+  console.log(result.data); // "user@example.com"
+}
+```
+
+### Filtering
+
+fmodata provides type-safe filter operations that prevent common errors at compile time. The filter system supports three syntaxes: shorthand, single operator objects, and arrays for multiple operators.
 
-# Build the package
-pnpm build
+#### Operator Syntax
 
-# Run tests
-pnpm test
+You can use filters in three ways:
 
-# Watch mode for development
-pnpm dev
+**1. Shorthand (direct value):**
+
+```typescript
+.filter({ name: "John" })
+// Equivalent to: { name: [{ eq: "John" }] }
+```
+
+**2. Single operator object:**
+
+```typescript
+.filter({ age: { gt: 18 } })
+```
+
+**3. Array of operators (for multiple operators on same field):**
+
+```typescript
+.filter({ age: [{ gt: 18 }, { lt: 65 }] })
+// Result: age gt 18 and age lt 65
 ```
 
-## License
+The array pattern prevents duplicate operators on the same field and allows multiple conditions with implicit AND.
+
+#### Available Operators
+
+**String fields:**
+
+- `eq`, `ne` - equality/inequality
+- `contains`, `startswith`, `endswith` - string functions
+- `gt`, `ge`, `lt`, `le` - comparison
+- `in` - match any value in array
+
+**Number fields:**
+
+- `eq`, `ne`, `gt`, `ge`, `lt`, `le` - comparisons
+- `in` - match any value in array
+
+**Boolean fields:**
+
+- `eq`, `ne` - equality only
+
+**Date fields:**
+
+- `eq`, `ne`, `gt`, `ge`, `lt`, `le` - date comparisons
+- `in` - match any date in array
+
+#### Shorthand Syntax
+
+For simple equality checks, use the shorthand:
+
+```typescript
+const result = await db.from("users").list().filter({ name: "John" }).execute();
+// Equivalent to: { name: [{ eq: "John" }] }
+```
+
+#### Examples
+
+```typescript
+// Equality filter (single operator)
+const activeUsers = await db
+  .from("users")
+  .list()
+  .filter({ active: { eq: true } })
+  .execute();
+
+// Comparison operators (single operator)
+const adultUsers = await db
+  .from("users")
+  .list()
+  .filter({ age: { gt: 18 } })
+  .execute();
+
+// String operators (single operator)
+const johns = await db
+  .from("users")
+  .list()
+  .filter({ name: { contains: "John" } })
+  .execute();
+
+// Multiple operators on same field (array syntax, implicit AND)
+const rangeQuery = await db
+  .from("users")
+  .list()
+  .filter({ age: [{ gt: 18 }, { lt: 65 }] })
+  .execute();
+
+// Combine filters with AND
+const result = await db
+  .from("users")
+  .list()
+  .filter({
+    and: [{ active: [{ eq: true }] }, { age: [{ gt: 18 }] }],
+  })
+  .execute();
+
+// Combine filters with OR
+const result = await db
+  .from("users")
+  .list()
+  .filter({
+    or: [{ name: [{ eq: "John" }] }, { name: [{ eq: "Jane" }] }],
+  })
+  .execute();
+
+// IN operator
+const result = await db
+  .from("users")
+  .list()
+  .filter({ age: [{ in: [18, 21, 25] }] })
+  .execute();
+
+// Null checks
+const result = await db
+  .from("users")
+  .list()
+  .filter({ deletedAt: [{ eq: null }] })
+  .execute();
+```
+
+#### Logical Operators
+
+Combine multiple conditions with `and`, `or`, `not`:
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .filter({
+    and: [{ name: [{ contains: "John" }] }, { age: [{ gt: 18 }] }],
+  })
+  .execute();
+```
+
+#### Escape Hatch
+
+For unsupported edge cases, pass a raw OData filter string:
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .filter("substringof('John', name)")
+  .execute();
+```
+
+### Sorting
+
+Sort results using `orderBy()`:
+
+```typescript
+// Sort ascending
+const result = await db.from("users").list().orderBy("name").execute();
+
+// Sort descending
+const result = await db.from("users").list().orderBy("name desc").execute();
+
+// Multiple sort fields
+const result = await db
+  .from("users")
+  .list()
+  .orderBy("lastName, firstName desc")
+  .execute();
+```
+
+### Pagination
+
+Control the number of records returned and pagination:
+
+```typescript
+// Limit results
+const result = await db.from("users").list().top(10).execute();
+
+// Skip records (pagination)
+const result = await db.from("users").list().top(10).skip(20).execute();
+
+// Count total records
+const result = await db.from("users").list().count().execute();
+```
+
+### Selecting Fields
+
+Select specific fields to return:
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .select("username", "email")
+  .execute();
+
+// result.data[0] will only have username and email fields
+```
+
+### Single Records
+
+Use `single()` to ensure exactly one record is returned (returns an error if zero or multiple records are found):
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .filter({ email: { eq: "user@example.com" } })
+  .single()
+  .execute();
 
-MIT
+if (result.data) {
+  // result.data is a single record, not an array
+  console.log(result.data.username);
+}
+```
+
+Use `maybeSingle()` when you want at most one record (returns `null` if no record is found, returns an error if multiple records are found):
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .filter({ email: { eq: "user@example.com" } })
+  .maybeSingle()
+  .execute();
+
+if (result.data) {
+  // result.data is a single record or null
+  console.log(result.data?.username);
+} else {
+  // No record found - result.data would be null
+  console.log("User not found");
+}
+```
+
+**Difference between `single()` and `maybeSingle()`:**
+
+- `single()` - Requires exactly one record. Returns an error if zero or multiple records are found.
+- `maybeSingle()` - Allows zero or one record. Returns `null` if no record is found, returns an error only if multiple records are found.
+
+### Chaining Methods
+
+All query methods can be chained together:
+
+```typescript
+const result = await db
+  .from("users")
+  .list()
+  .select("username", "email", "age")
+  .filter({ age: { gt: 18 } })
+  .orderBy("username")
+  .top(10)
+  .skip(0)
+  .execute();
+```
+
+## CRUD Operations
+
+### Insert
+
+Insert new records with type-safe data:
+
+```typescript
+// Insert a new user
+const result = await db
+  .from("users")
+  .insert({
+    username: "johndoe",
+    email: "john@example.com",
+    active: true,
+  })
+  .execute();
+
+if (result.data) {
+  console.log("Created user:", result.data);
+}
+```
+
+If you specify `insertRequired` fields in your base table, those fields become required:
+
+```typescript
+const usersBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    username: z.string(),
+    email: z.string(),
+    createdAt: z.string().optional(),
+  },
+  idField: "id",
+  insertRequired: ["username", "email"], // These fields are required on insert
+});
+
+// TypeScript will enforce that username and email are provided
+const result = await db
+  .from("users")
+  .insert({
+    username: "johndoe",
+    email: "john@example.com",
+    // createdAt is optional
+  })
+  .execute();
+```
+
+### Update
+
+Update records by ID or filter:
+
+```typescript
+// Update by ID
+const result = await db
+  .from("users")
+  .update({ username: "newname" })
+  .byId("user-123")
+  .execute();
+
+if (result.data) {
+  console.log(`Updated ${result.data.updatedCount} record(s)`);
+}
+
+// Update by filter
+const result = await db
+  .from("users")
+  .update({ active: false })
+  .where((q) => q.filter({ lastLogin: { lt: "2023-01-01" } }))
+  .execute();
+
+// Complex filter example
+const result = await db
+  .from("users")
+  .update({ active: false })
+  .where((q) =>
+    q.filter({
+      and: [{ active: true }, { count: { lt: 5 } }],
+    }),
+  )
+  .execute();
+
+// Update with additional query options
+const result = await db
+  .from("users")
+  .update({ active: false })
+  .where((q) => q.filter({ active: true }).top(10))
+  .execute();
+```
+
+### Delete
+
+Delete records by ID or filter:
+
+```typescript
+// Delete by ID
+const result = await db.from("users").delete().byId("user-123").execute();
+
+if (result.data) {
+  console.log(`Deleted ${result.data.deletedCount} record(s)`);
+}
+
+// Delete by filter
+const result = await db
+  .from("users")
+  .delete()
+  .where((q) => q.filter({ active: false }))
+  .execute();
+
+// Delete with complex filters
+const result = await db
+  .from("users")
+  .delete()
+  .where((q) =>
+    q.filter({
+      and: [{ active: false }, { lastLogin: { lt: "2023-01-01" } }],
+    }),
+  )
+  .execute();
+```
+
+## Navigation & Relationships
+
+### Defining Navigation
+
+Define relationships between tables using the `navigation` option:
+
+```typescript
+const contactsBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    name: z.string(),
+    userId: z.string(),
+  },
+  idField: "id",
+});
+
+const usersBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    username: z.string(),
+    email: z.string(),
+  },
+  idField: "id",
+});
+
+// Define navigation using functions to handle circular dependencies
+const contactsTO = new TableOccurrence({
+  name: "contacts",
+  baseTable: contactsBase,
+  navigation: {
+    users: () => usersTO, // Relationship to users table
+  },
+});
+
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+  navigation: {
+    contacts: () => contactsTO, // Relationship to contacts table
+  },
+});
+
+// You can also add navigation after creation
+const updatedUsersTO = usersTO.addNavigation({
+  profile: () => profileTO,
+});
+```
+
+### Navigating Between Tables
+
+Navigate to related records:
+
+```typescript
+// Navigate from a specific record
+const result = await db
+  .from("contacts")
+  .get("contact-123")
+  .navigate("users")
+  .select("username", "email")
+  .execute();
+
+// Navigate without specifying a record first
+const result = await db.from("contacts").navigate("users").list().execute();
+
+// You can navigate to arbitrary tables not in your schema
+const result = await db
+  .from("contacts")
+  .navigate("some_other_table")
+  .list()
+  .execute();
+```
+
+### Expanding Related Records
+
+Use `expand()` to include related records in your query results:
+
+```typescript
+// Simple expand
+const result = await db.from("contacts").list().expand("users").execute();
+
+// Expand with field selection
+const result = await db
+  .from("contacts")
+  .list()
+  .expand("users", (b) => b.select("username", "email"))
+  .execute();
+
+// Expand with filtering
+const result = await db
+  .from("contacts")
+  .list()
+  .expand("users", (b) => b.filter({ active: true }))
+  .execute();
+
+// Multiple expands
+const result = await db
+  .from("contacts")
+  .list()
+  .expand("users", (b) => b.select("username"))
+  .expand("orders", (b) => b.select("total").top(5))
+  .execute();
+
+// Nested expands
+const result = await db
+  .from("contacts")
+  .list()
+  .expand("users", (usersBuilder) =>
+    usersBuilder
+      .select("username", "email")
+      .expand("customer", (customerBuilder) =>
+        customerBuilder.select("name", "tier"),
+      ),
+  )
+  .execute();
+
+// Complex expand with multiple options
+const result = await db
+  .from("contacts")
+  .list()
+  .expand("users", (b) =>
+    b
+      .select("username", "email")
+      .filter({ active: true })
+      .orderBy("username")
+      .top(10)
+      .expand("customer", (nested) => nested.select("name")),
+  )
+  .execute();
+```
+
+## Running Scripts
+
+Execute FileMaker scripts via OData:
+
+```typescript
+// Simple script execution
+const result = await db.runScript("MyScriptName");
+
+console.log(result.resultCode); // Script result code
+console.log(result.result); // Optional script result string
+
+// Pass parameters to script
+const result = await db.runScript("MyScriptName", {
+  scriptParam: "some value",
+});
+
+// Script parameters can be strings, numbers, or objects
+const result = await db.runScript("ProcessOrder", {
+  scriptParam: {
+    orderId: "12345",
+    action: "approve",
+  }, // Will be JSON stringified
+});
+
+// Validate script result with Zod schema
+// NOTE: Your validator must be able to parse a string.
+// See Zod codecs for how to build a jsonCodec function that does this
+// https://zod.dev/codecs?id=jsonschema
+
+const schema = jsonCodec(
+  z.object({
+    success: z.boolean(),
+    message: z.string(),
+    recordId: z.string(),
+  }),
+);
+
+const result = await db.runScript("CreateRecord", {
+  resultSchema: schema,
+});
+
+// result.result is now typed based on your schema
+console.log(result.result.recordId);
+```
+
+**Note:** OData doesn't support script names with special characters (e.g., `@`, `&`, `/`) or script names beginning with a number. TypeScript will catch these at compile time.
+
+## Advanced Features
+
+### Type Safety
+
+The library provides full TypeScript type inference:
+
+```typescript
+const usersBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    username: z.string(),
+    email: z.string(),
+  },
+  idField: "id",
+});
+
+const usersTO = new TableOccurrence({
+  name: "users",
+  baseTable: usersBase,
+});
+
+const db = connection.database("MyDB", {
+  occurrences: [usersTO],
+});
+
+// TypeScript knows these are valid field names
+db.from("users").list().select("username", "email");
+
+// TypeScript error: "invalid" is not a field name
+db.from("users").list().select("invalid"); // TS Error
+
+// Type-safe filters
+db.from("users")
+  .list()
+  .filter({ username: { eq: "john" } }); // ✓
+db.from("users")
+  .list()
+  .filter({ invalid: { eq: "john" } }); // TS Error
+```
+
+### Required Fields
+
+Control which fields are required for insert and update operations:
+
+```typescript
+const usersBase = new BaseTable({
+  schema: {
+    id: z.string(),
+    username: z.string(),
+    email: z.string(),
+    status: z.string(),
+    updatedAt: z.string().optional(),
+  },
+  idField: "id",
+  insertRequired: ["username", "email"], // Required on insert
+  updateRequired: ["status"], // Required on update
+});
+
+// Insert requires username and email
+db.from("users").insert({
+  username: "john",
+  email: "john@example.com",
+  // updatedAt is optional
+});
+
+// Update requires status
+db.from("users")
+  .update({
+    status: "active",
+    // other fields are optional
+  })
+  .byId("user-123");
+```
+
+### Error Handling
+
+All operations return a `Result` type with either `data` or `error`:
+
+```typescript
+const result = await db.from("users").list().execute();
+
+if (result.error) {
+  console.error("Query failed:", result.error.message);
+  return;
+}
+
+if (result.data) {
+  console.log("Query succeeded:", result.data);
+}
+```
+
+### OData Annotations and Validation
+
+By default, the library automatically strips OData annotations fields (`@id` and `@editLink`) from responses. If you need these fields, you can include them by passing `includeODataAnnotations: true`:
+
+```typescript
+const result = await db.from("users").list().execute({
+  includeODataAnnotations: true,
+});
+```
+
+You can also skip runtime validation by passing `skipValidation: true`.
+
+```typescript
+const result = await db.from("users").list().execute({
+  skipValidation: true,
+});
+
+// Response is returned without schema validation
+```
+
+**Note:** Skipping validation means the response won't be validated OR transformed against your schema, so you lose runtime type safety guarantees. Use with caution.
+
+### Custom Fetch Handlers
+
+You can provide custom fetch handlers for testing or custom networking:
+
+```typescript
+const customFetch = async (url, options) => {
+  console.log("Fetching:", url);
+  return fetch(url, options);
+};
+
+const result = await db.from("users").list().execute({
+  fetchHandler: customFetch,
+});
+```
+
+## Testing
+
+The library supports testing with custom fetch handlers. You can create mock fetch functions to return test data:
+
+```typescript
+const mockResponse = {
+  "@odata.context": "...",
+  value: [
+    { id: "1", username: "john", email: "john@example.com" },
+    { id: "2", username: "jane", email: "jane@example.com" },
+  ],
+};
+
+const mockFetch = async () => {
+  return new Response(JSON.stringify(mockResponse), {
+    status: 200,
+    headers: { "content-type": "application/json" },
+  });
+};
+
+const result = await db.from("users").list().execute({
+  fetchHandler: mockFetch,
+});
+
+expect(result.data).toHaveLength(2);
+expect(result.data[0].username).toBe("john");
+```
+
+You can also inspect query strings without executing:
+
+```typescript
+const queryString = db
+  .from("users")
+  .list()
+  .select("username", "email")
+  .filter({ active: true })
+  .orderBy("username")
+  .top(10)
+  .getQueryString();
+
+console.log(queryString);
+// Output: "/users?$select=username,email&$filter=active eq true&$orderby=username&$top=10"
+```

package/dist/esm/client/filemaker-odata.d.ts

@@ -2,7 +2,7 @@ import { FFetchOptions } from '@fetchkit/ffetch';
 import { Auth, ExecutionContext } from '../types.js';
 import { Database } from './database.js';
 import { TableOccurrence } from './table-occurrence.js';
-export declare class FileMakerOData implements ExecutionContext {
+export declare class FMServerConnection implements ExecutionContext {
     private fetchClient;
     private serverUrl;
     private auth;

package/dist/esm/client/filemaker-odata.js

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import createClient from "@fetchkit/ffetch";
 import { Database } from "./database.js";
-class FileMakerOData {
+class FMServerConnection {
   constructor(config) {
     __publicField(this, "fetchClient");
     __publicField(this, "serverUrl");
@@ -80,6 +80,6 @@ class FileMakerOData {
   }
 }
 export {
-  FileMakerOData
+  FMServerConnection
 };
 //# sourceMappingURL=filemaker-odata.js.map

package/dist/esm/client/filemaker-odata.js.map

@@ -1 +1 @@
-{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext } from \"../types\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FileMakerOData implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions,\n  ): Promise<T> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: \"application/json\",\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    const resp = await clientToUse(baseUrl + url, {\n      ...restOptions,\n      headers,\n    });\n\n    if (!resp.ok) {\n      throw new Error(\n        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`,\n      );\n    }\n\n    // Check for affected rows header (for DELETE and bulk PATCH operations)\n    // FileMaker may return this with 204 No Content or 200 OK\n    const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n    if (affectedRows !== null) {\n      return parseInt(affectedRows, 10) as T;\n    }\n\n    // Handle 204 No Content with no body\n    if (resp.status === 204) {\n      return 0 as T;\n    }\n\n    if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      let data = await resp.json();\n      if (data.error) {\n        throw new Error(data.error);\n      }\n      return data as T;\n    }\n    return (await resp.text()) as T;\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: { occurrences?: Occurrences },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const response = (await this._makeRequest(\"/\")) as {\n      value?: Array<{ name: string }>;\n    };\n    if (response.value && Array.isArray(response.value)) {\n      return response.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":";;;;;AAKO,MAAM,eAA2C;AAAA,EAItD,YAAY,QAIT;AAPK;AACA;AACA;AAMN,SAAK,cAAc,aAAa;AAAA,MAC9B,SAAS;AAAA,MACT,GAAG,OAAO;AAAA,IAAA,CACX;AAED,UAAM,MAAM,IAAI,IAAI,OAAO,SAAS;AAChC,QAAA,IAAI,aAAa,UAAU;AAC7B,UAAI,WAAW;AAAA,IAAA;AAGjB,QAAI,WAAW,IAAI,SAAS,QAAQ,QAAQ,EAAE;AAC9C,SAAK,YAAY,IAAI,SAAW,EAAA,QAAQ,QAAQ,EAAE;AAClD,SAAK,OAAO,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMrB,MAAM,aACJ,KACA,SACY;;AACN,UAAA,UAAU,GAAG,KAAK,SAAS,GAAG,YAAY,KAAK,OAAO,UAAU,EAAE;AAExE,UAAM,UAAU;AAAA,MACd,eACE,YAAY,KAAK,OACb,UAAU,KAAK,KAAK,MAAM,KAC1B,SAAS,KAAK,GAAG,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;AAAA,MAClE,gBAAgB;AAAA,MAChB,QAAQ;AAAA,MACR,IAAI,mCAAS,YAAW,CAAA;AAAA,IAC1B;AAIA,UAAM,eAAe,mCAAS;AACxB,UAAA;AAAA,MACJ,SAAS;AAAA,MACT,cAAc;AAAA,MACd,GAAG;AAAA,IACL,IAAI,WAAW,CAAC;AAIV,UAAA,cAAc,eAChB,aAAa,EAAE,SAAS,GAAG,aAAA,CAAc,IACzC,KAAK;AAET,UAAM,OAAO,MAAM,YAAY,UAAU,KAAK;AAAA,MAC5C,GAAG;AAAA,MACH;AAAA,IAAA,CACD;AAEG,QAAA,CAAC,KAAK,IAAI;AACZ,YAAM,IAAI;AAAA,QACR,6BAA6B,UAAU,GAAG,KAAK,KAAK,UAAU;AAAA,MAChE;AAAA,IAAA;AAKF,UAAM,eAAe,KAAK,QAAQ,IAAI,uBAAuB;AAC7D,QAAI,iBAAiB,MAAM;AAClB,aAAA,SAAS,cAAc,EAAE;AAAA,IAAA;AAI9B,QAAA,KAAK,WAAW,KAAK;AAChB,aAAA;AAAA,IAAA;AAGT,SAAI,UAAK,QAAQ,IAAI,cAAc,MAA/B,mBAAkC,SAAS,qBAAqB;AAC9D,UAAA,OAAO,MAAM,KAAK,KAAK;AAC3B,UAAI,KAAK,OAAO;AACR,cAAA,IAAI,MAAM,KAAK,KAAK;AAAA,MAAA;AAErB,aAAA;AAAA,IAAA;AAED,WAAA,MAAM,KAAK,KAAK;AAAA,EAAA;AAAA,EAG1B,SAGE,MACA,QACuB;AACvB,WAAO,IAAI,SAAS,MAAM,MAAM,MAAM;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOxC,MAAM,oBAAuC;AAC3C,UAAM,WAAY,MAAM,KAAK,aAAa,GAAG;AAG7C,QAAI,SAAS,SAAS,MAAM,QAAQ,SAAS,KAAK,GAAG;AACnD,aAAO,SAAS,MAAM,IAAI,CAAC,SAAS,KAAK,IAAI;AAAA,IAAA;AAE/C,WAAO,CAAC;AAAA,EAAA;AAEZ;"}
+{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext } from \"../types\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FMServerConnection implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions,\n  ): Promise<T> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: \"application/json\",\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    const resp = await clientToUse(baseUrl + url, {\n      ...restOptions,\n      headers,\n    });\n\n    if (!resp.ok) {\n      throw new Error(\n        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`,\n      );\n    }\n\n    // Check for affected rows header (for DELETE and bulk PATCH operations)\n    // FileMaker may return this with 204 No Content or 200 OK\n    const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n    if (affectedRows !== null) {\n      return parseInt(affectedRows, 10) as T;\n    }\n\n    // Handle 204 No Content with no body\n    if (resp.status === 204) {\n      return 0 as T;\n    }\n\n    if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      let data = await resp.json();\n      if (data.error) {\n        throw new Error(data.error);\n      }\n      return data as T;\n    }\n    return (await resp.text()) as T;\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: { occurrences?: Occurrences },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const response = (await this._makeRequest(\"/\")) as {\n      value?: Array<{ name: string }>;\n    };\n    if (response.value && Array.isArray(response.value)) {\n      return response.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":";;;;;AAKO,MAAM,mBAA+C;AAAA,EAI1D,YAAY,QAIT;AAPK;AACA;AACA;AAMN,SAAK,cAAc,aAAa;AAAA,MAC9B,SAAS;AAAA,MACT,GAAG,OAAO;AAAA,IAAA,CACX;AAED,UAAM,MAAM,IAAI,IAAI,OAAO,SAAS;AAChC,QAAA,IAAI,aAAa,UAAU;AAC7B,UAAI,WAAW;AAAA,IAAA;AAGjB,QAAI,WAAW,IAAI,SAAS,QAAQ,QAAQ,EAAE;AAC9C,SAAK,YAAY,IAAI,SAAW,EAAA,QAAQ,QAAQ,EAAE;AAClD,SAAK,OAAO,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMrB,MAAM,aACJ,KACA,SACY;;AACN,UAAA,UAAU,GAAG,KAAK,SAAS,GAAG,YAAY,KAAK,OAAO,UAAU,EAAE;AAExE,UAAM,UAAU;AAAA,MACd,eACE,YAAY,KAAK,OACb,UAAU,KAAK,KAAK,MAAM,KAC1B,SAAS,KAAK,GAAG,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;AAAA,MAClE,gBAAgB;AAAA,MAChB,QAAQ;AAAA,MACR,IAAI,mCAAS,YAAW,CAAA;AAAA,IAC1B;AAIA,UAAM,eAAe,mCAAS;AACxB,UAAA;AAAA,MACJ,SAAS;AAAA,MACT,cAAc;AAAA,MACd,GAAG;AAAA,IACL,IAAI,WAAW,CAAC;AAIV,UAAA,cAAc,eAChB,aAAa,EAAE,SAAS,GAAG,aAAA,CAAc,IACzC,KAAK;AAET,UAAM,OAAO,MAAM,YAAY,UAAU,KAAK;AAAA,MAC5C,GAAG;AAAA,MACH;AAAA,IAAA,CACD;AAEG,QAAA,CAAC,KAAK,IAAI;AACZ,YAAM,IAAI;AAAA,QACR,6BAA6B,UAAU,GAAG,KAAK,KAAK,UAAU;AAAA,MAChE;AAAA,IAAA;AAKF,UAAM,eAAe,KAAK,QAAQ,IAAI,uBAAuB;AAC7D,QAAI,iBAAiB,MAAM;AAClB,aAAA,SAAS,cAAc,EAAE;AAAA,IAAA;AAI9B,QAAA,KAAK,WAAW,KAAK;AAChB,aAAA;AAAA,IAAA;AAGT,SAAI,UAAK,QAAQ,IAAI,cAAc,MAA/B,mBAAkC,SAAS,qBAAqB;AAC9D,UAAA,OAAO,MAAM,KAAK,KAAK;AAC3B,UAAI,KAAK,OAAO;AACR,cAAA,IAAI,MAAM,KAAK,KAAK;AAAA,MAAA;AAErB,aAAA;AAAA,IAAA;AAED,WAAA,MAAM,KAAK,KAAK;AAAA,EAAA;AAAA,EAG1B,SAGE,MACA,QACuB;AACvB,WAAO,IAAI,SAAS,MAAM,MAAM,MAAM;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOxC,MAAM,oBAAuC;AAC3C,UAAM,WAAY,MAAM,KAAK,aAAa,GAAG;AAG7C,QAAI,SAAS,SAAS,MAAM,QAAQ,SAAS,KAAK,GAAG;AACnD,aAAO,SAAS,MAAM,IAAI,CAAC,SAAS,KAAK,IAAI;AAAA,IAAA;AAE/C,WAAO,CAAC;AAAA,EAAA;AAEZ;"}

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
 export { BaseTable } from './client/base-table.js';
 export { TableOccurrence, createTableOccurrence, } from './client/table-occurrence.js';
-export { FileMakerOData } from './client/filemaker-odata.js';
+export { FMServerConnection as FileMakerOData } from './client/filemaker-odata.js';
 export type { Filter, TypedFilter, FieldFilter, StringOperators, NumberOperators, BooleanOperators, DateOperators, LogicalFilter, } from './filter-types.js';

package/dist/esm/index.js

@@ -1,9 +1,9 @@
 import { BaseTable } from "./client/base-table.js";
 import { TableOccurrence, createTableOccurrence } from "./client/table-occurrence.js";
-import { FileMakerOData } from "./client/filemaker-odata.js";
+import { FMServerConnection } from "./client/filemaker-odata.js";
 export {
   BaseTable,
-  FileMakerOData,
+  FMServerConnection as FileMakerOData,
   TableOccurrence,
   createTableOccurrence
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.2",
   "description": "FileMaker OData API client",
   "repository": "git@github.com:proofgeist/proofkit.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",

package/src/client/filemaker-odata.ts

@@ -3,7 +3,7 @@ import type { Auth, ExecutionContext } from "../types";
 import { Database } from "./database";
 import { TableOccurrence } from "./table-occurrence";
 
-export class FileMakerOData implements ExecutionContext {
+export class FMServerConnection implements ExecutionContext {
   private fetchClient: ReturnType<typeof createClient>;
   private serverUrl: string;
   private auth: Auth;

package/src/index.ts

@@ -4,7 +4,7 @@ export {
   TableOccurrence,
   createTableOccurrence,
 } from "./client/table-occurrence";
-export { FileMakerOData } from "./client/filemaker-odata";
+export { FMServerConnection as FileMakerOData } from "./client/filemaker-odata";
 export type {
   Filter,
   TypedFilter,