@tailorkit/app 0.1.0-beta.44 → 0.1.0-beta.46

package/README.md

@@ -2,6 +2,8 @@
 
 Use `@tailorkit/app` to build TailorKit extensions. Apps require Preact 11; install `preact@^11` alongside the SDK.
 
+Define app tables, relations, and database capabilities with `tailorkit/db`, backed by [`@tailorkit/app-db`](../app-db/README.md). Define queries, mutations, and actions with `tailorkit/server`.
+
 ## File routing
 
 The builder registers views from `src/slots` automatically. Only files ending in `.view.tsx` register views, so supporting components can live beside them:

package/dist/{chunk-MYK3WL3S.js → chunk-EUQYGSMM.js}

@@ -164,28 +164,18 @@ var waitForRetry = async (signal, delayMs) => {
   if (signal.aborted) {
     return;
   }
-  await (async () => {
-    const {
-      promise: pendingPromise,
-      resolve,
-      reject: rejectPending
-    } = Promise.withResolvers();
-    try {
-      const wake = () => {
-        clearTimeout(timer);
-        signal.removeEventListener("abort", wake);
-        resolve();
-      };
-      const timer = setTimeout(
-        wake,
-        delayMs
-      );
-      signal.addEventListener("abort", wake, { once: true });
-    } catch (error) {
-      rejectPending(error);
-    }
-    await pendingPromise;
-  })();
+  const { promise, resolve } = Promise.withResolvers();
+  const timer = setTimeout(resolve, delayMs);
+  const wake = () => {
+    resolve();
+  };
+  try {
+    signal.addEventListener("abort", wake, { once: true });
+    await promise;
+  } finally {
+    clearTimeout(timer);
+    signal.removeEventListener("abort", wake);
+  }
 };
 var createClient = (options = {}) => {
   let closed = false;

package/dist/{chunk-QDZXHVTU.js → chunk-F4TOPZ5V.js}

@@ -19,9 +19,6 @@ var defineServer = (functions) => {
   return Object.freeze({ functions });
 };
 
-// src/database/definition.ts
-var defineDatabase = (definition) => Object.freeze({ relations: definition.relations });
-
 // src/server/builder.ts
 import * as v from "valibot";
 var FunctionBuilder = class _FunctionBuilder {
@@ -213,65 +210,11 @@ var withInstanceResolvers = (app, resolvers) => {
   });
 };
 
-// src/database/schema.ts
-import {
-  sqliteTable,
-  text as sqliteText,
-  integer as sqliteInteger,
-  real as sqliteReal
-} from "drizzle-orm/sqlite-core";
-import {
-  eq,
-  ne,
-  gt,
-  gte,
-  lt,
-  lte,
-  and,
-  or,
-  asc,
-  desc,
-  count,
-  isNull,
-  isNotNull,
-  inArray
-} from "drizzle-orm";
-var table = (name, columns) => {
-  if (!/^[a-zA-Z][a-zA-Z0-9_]{0,62}$/u.test(name) || name.startsWith("sqlite_") || name.startsWith("tailorkit_")) {
-    throw new Error("Invalid or reserved table name");
-  }
-  return sqliteTable(name, columns);
-};
-var text = (name = "") => sqliteText(name);
-var integer = (name = "") => sqliteInteger(name);
-var real = (name = "") => sqliteReal(name);
-var boolean = (name = "") => sqliteInteger(name, { mode: "boolean" });
-
 export {
   query,
   mutation,
   action,
   defineServer,
-  defineDatabase,
   fn,
-  withInstanceResolvers,
-  table,
-  text,
-  integer,
-  real,
-  boolean,
-  eq,
-  ne,
-  gt,
-  gte,
-  lt,
-  lte,
-  and,
-  or,
-  asc,
-  desc,
-  count,
-  isNull,
-  isNotNull,
-  inArray
+  withInstanceResolvers
 };

package/dist/{chunk-YFKW5FBP.js → chunk-ROHLNTS6.js}

@@ -1,7 +1,7 @@
 import {
   createClient,
   reference
-} from "./chunk-MYK3WL3S.js";
+} from "./chunk-EUQYGSMM.js";
 import {
   AppError,
   appError
@@ -80,10 +80,7 @@ function defineView(options) {
           `View instance is only available while rendering an instance of "${path}".`
         );
       }
-      return (
-        /* oxlint-disable typescript/no-unsafe-type-assertion -- Generated bindings associate this view path with its context and instance schema; the adapter retains that relationship while erasing renderer generics. */
-        value.instance
-      );
+      return value.instance;
     }
   };
 }

package/dist/client-connection.js

@@ -3,7 +3,7 @@ import {
   createSessionProvider,
   parseSession,
   reference
-} from "./chunk-MYK3WL3S.js";
+} from "./chunk-EUQYGSMM.js";
 import {
   AppError
 } from "./chunk-7ZQPXG7O.js";

package/dist/client.js

@@ -9,13 +9,13 @@ import {
   useAction,
   useMutation,
   useQuery
-} from "./chunk-YFKW5FBP.js";
+} from "./chunk-ROHLNTS6.js";
 import {
   createApi,
   createClient,
   createSessionProvider,
   reference
-} from "./chunk-MYK3WL3S.js";
+} from "./chunk-EUQYGSMM.js";
 import {
   AppError,
   appError

package/dist/index.js

@@ -9,41 +9,21 @@ import {
   useAction,
   useMutation,
   useQuery
-} from "./chunk-YFKW5FBP.js";
+} from "./chunk-ROHLNTS6.js";
 import {
   createApi,
   createClient,
   createSessionProvider,
   reference
-} from "./chunk-MYK3WL3S.js";
+} from "./chunk-EUQYGSMM.js";
 import {
   action,
-  and,
-  asc,
-  boolean,
-  count,
-  defineDatabase,
   defineServer,
-  desc,
-  eq,
   fn,
-  gt,
-  gte,
-  inArray,
-  integer,
-  isNotNull,
-  isNull,
-  lt,
-  lte,
   mutation,
-  ne,
-  or,
   query,
-  real,
-  table,
-  text,
   withInstanceResolvers
-} from "./chunk-QDZXHVTU.js";
+} from "./chunk-F4TOPZ5V.js";
 import {
   AppError,
   appError
@@ -53,40 +33,20 @@ export {
   ClientProvider,
   Route,
   action,
-  and,
   appError,
-  asc,
-  boolean,
   callTool,
-  count,
   createApi,
   createClient,
   createFileClient,
   createRemoteComponent,
   createSessionProvider,
-  defineDatabase,
   defineRoute,
   defineServer,
   defineView,
-  desc,
-  eq,
   fn,
-  gt,
-  gte,
-  inArray,
-  integer,
-  isNotNull,
-  isNull,
-  lt,
-  lte,
   mutation,
-  ne,
-  or,
   query,
-  real,
   reference,
-  table,
-  text,
   useAction,
   useMutation,
   useQuery,

package/dist/server/builder.d.ts

@@ -1,10 +1,8 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
-import type { AnyRelations, EmptyRelations } from "drizzle-orm/relations";
+import type { DatabaseRelations, EmptyDatabaseRelations, DatabaseDefinition, QueryDatabase, MutationDatabase } from "@tailorkit/app-db";
 import * as v from "valibot";
-import type { DatabaseDefinition } from "#database/definition";
-import type { MutationDatabase, QueryDatabase } from "#database/types";
 import type { ActionContext, EmptyFunctions, FunctionKind, Functions, Identity } from "./functions";
-type HandlerContext<K extends FunctionKind, A extends StandardSchemaV1, F extends Functions, D extends AnyRelations> = {
+type HandlerContext<K extends FunctionKind, A extends StandardSchemaV1, F extends Functions, D extends DatabaseRelations> = {
     input: StandardSchemaV1.InferOutput<A>;
 } & (K extends "action" ? ActionContext<F> : {
     db: K extends "query" ? QueryDatabase<D> : MutationDatabase<D>;
@@ -12,7 +10,7 @@ type HandlerContext<K extends FunctionKind, A extends StandardSchemaV1, F extend
 });
 type OutputInput<R> = R extends StandardSchemaV1 ? StandardSchemaV1.InferInput<R> : unknown;
 type HandlerOutput<K, O> = K extends "action" ? O | Promise<O> : O & ([O] extends [never] ? unknown : O extends PromiseLike<unknown> ? never : unknown);
-type BuiltFunction<K extends FunctionKind, A extends StandardSchemaV1, R, O, F extends Functions, D extends AnyRelations> = {
+type BuiltFunction<K extends FunctionKind, A extends StandardSchemaV1, R, O, F extends Functions, D extends DatabaseRelations> = {
     readonly kind: K;
     readonly args: A;
     readonly database?: DatabaseDefinition<D>;
@@ -25,7 +23,7 @@ type BuiltFunction<K extends FunctionKind, A extends StandardSchemaV1, R, O, F e
     readonly functions: F;
 } : unknown);
 /** Immutable builders preserve the validated input and wire output types at every step. */
-declare class FunctionBuilder<K extends FunctionKind, A extends StandardSchemaV1, R extends StandardSchemaV1 | undefined = undefined, F extends Functions = EmptyFunctions, D extends AnyRelations = EmptyRelations> {
+declare class FunctionBuilder<K extends FunctionKind, A extends StandardSchemaV1, R extends StandardSchemaV1 | undefined = undefined, F extends Functions = EmptyFunctions, D extends DatabaseRelations = EmptyDatabaseRelations> {
     private readonly kind;
     private readonly args;
     private readonly result;
@@ -35,12 +33,12 @@ declare class FunctionBuilder<K extends FunctionKind, A extends StandardSchemaV1
     input<S extends StandardSchemaV1>(schema: S): FunctionBuilder<K, S, R, F, D>;
     output<S extends StandardSchemaV1>(schema: S): FunctionBuilder<K, A, S, F, D>;
     functions<const G extends Functions>(this: FunctionBuilder<"action", A, R, F, D>, functions: G): FunctionBuilder<"action", A, R, G, D>;
-    database<const E extends AnyRelations>(this: FunctionBuilder<K, A, R, F, D> & (K extends "action" ? never : unknown), database: DatabaseDefinition<E>): FunctionBuilder<K, A, R, F, E>;
+    database<const E extends DatabaseRelations>(this: FunctionBuilder<K, A, R, F, D> & (K extends "action" ? never : unknown), database: DatabaseDefinition<E>): FunctionBuilder<K, A, R, F, E>;
     handler<O extends OutputInput<R>>(handler: (context: HandlerContext<K, A, F, D>) => HandlerOutput<K, O>): BuiltFunction<K, A, R, O, F, D>;
 }
 export declare const fn: Readonly<{
-    action: FunctionBuilder<"action", v.UndefinedSchema<undefined>, undefined, {}, EmptyRelations>;
-    mutation: FunctionBuilder<"mutation", v.UndefinedSchema<undefined>, undefined, {}, EmptyRelations>;
-    query: FunctionBuilder<"query", v.UndefinedSchema<undefined>, undefined, {}, EmptyRelations>;
+    action: FunctionBuilder<"action", v.UndefinedSchema<undefined>, undefined, {}, import("drizzle-orm").EmptyRelations>;
+    mutation: FunctionBuilder<"mutation", v.UndefinedSchema<undefined>, undefined, {}, import("drizzle-orm").EmptyRelations>;
+    query: FunctionBuilder<"query", v.UndefinedSchema<undefined>, undefined, {}, import("drizzle-orm").EmptyRelations>;
 }>;
 export {};

package/dist/server/functions.d.ts

@@ -1,8 +1,6 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
-import type { AnyRelations, EmptyRelations } from "drizzle-orm/relations";
+import type { DatabaseRelations, EmptyDatabaseRelations, DatabaseDefinition, QueryDatabase, MutationDatabase } from "@tailorkit/app-db";
 import type { TailorKitServerTools } from "#client/tools";
-import type { DatabaseDefinition } from "#database/definition";
-import type { QueryDatabase, MutationDatabase } from "#database/types";
 import type { JsonValue } from "#validation";
 export type EmptyFunctions = Record<never, never>;
 export interface Identity {
@@ -53,7 +51,7 @@ export interface ActionContext<F extends Functions = EmptyFunctions> {
     readonly queries: FunctionCalls<F, "query">;
     readonly mutations: FunctionCalls<F, "mutation">;
 }
-export interface FunctionDefinition<K extends FunctionKind, A extends StandardSchemaV1, O, F extends Functions = EmptyFunctions, D extends AnyRelations = EmptyRelations> {
+export interface FunctionDefinition<K extends FunctionKind, A extends StandardSchemaV1, O, F extends Functions = EmptyFunctions, D extends DatabaseRelations = EmptyDatabaseRelations> {
     readonly kind: K;
     readonly args: A;
     readonly database?: K extends "action" ? never : DatabaseDefinition<D>;
@@ -65,7 +63,7 @@ export interface FunctionDefinition<K extends FunctionKind, A extends StandardSc
         identity: Identity;
     })) => K extends "action" ? O | Promise<O> : O;
 }
-export declare const query: <A extends StandardSchemaV1, O, const D extends AnyRelations = EmptyRelations>(definition: Omit<FunctionDefinition<"query", A, O, EmptyFunctions, D>, "kind"> & {
+export declare const query: <A extends StandardSchemaV1, O, const D extends DatabaseRelations = EmptyDatabaseRelations>(definition: Omit<FunctionDefinition<"query", A, O, EmptyFunctions, D>, "kind"> & {
     handler: FunctionDefinition<"query", A, O, EmptyFunctions, D>["handler"] & ([O] extends [never] ? unknown : O extends PromiseLike<unknown> ? never : unknown);
 }) => Readonly<{
     args: A;
@@ -74,7 +72,7 @@ export declare const query: <A extends StandardSchemaV1, O, const D extends AnyR
     handler: FunctionDefinition<"query", A, O, EmptyFunctions, D>["handler"] & ([O] extends [never] ? unknown : O extends PromiseLike<unknown> ? never : unknown);
     kind: "query";
 }>;
-export declare const mutation: <A extends StandardSchemaV1, O, const D extends AnyRelations = EmptyRelations>(definition: Omit<FunctionDefinition<"mutation", A, O, EmptyFunctions, D>, "kind"> & {
+export declare const mutation: <A extends StandardSchemaV1, O, const D extends DatabaseRelations = EmptyDatabaseRelations>(definition: Omit<FunctionDefinition<"mutation", A, O, EmptyFunctions, D>, "kind"> & {
     handler: FunctionDefinition<"mutation", A, O, EmptyFunctions, D>["handler"] & ([O] extends [never] ? unknown : O extends PromiseLike<unknown> ? never : unknown);
 }) => Readonly<{
     args: A;

package/dist/server.d.ts

@@ -1,11 +1,7 @@
 export { defineServer, query, mutation, action } from "./server/functions";
-export { defineDatabase } from "./database/definition";
-export type { DatabaseDefinition } from "./database/definition";
 export { fn } from "./server/builder";
 export { withInstanceResolvers } from "./server/instances";
-export type { QueryDatabase, MutationDatabase } from "./database/types";
 export type { EmptyFunctions, Identity, FunctionDefinition, AppDefinition, ActionContext, FunctionKind, } from "./server/functions";
-export { table, text, integer, real, boolean, eq, ne, gt, gte, lt, lte, and, or, asc, desc, count, isNull, isNotNull, inArray, } from "./database/schema";
 export { AppError } from "./errors";
 export type { ErrorCode } from "./errors";
 export type { ApplicationModule, RuntimeManifest } from "./server/bundle";

package/dist/server.js

@@ -1,60 +1,20 @@
 import {
   action,
-  and,
-  asc,
-  boolean,
-  count,
-  defineDatabase,
   defineServer,
-  desc,
-  eq,
   fn,
-  gt,
-  gte,
-  inArray,
-  integer,
-  isNotNull,
-  isNull,
-  lt,
-  lte,
   mutation,
-  ne,
-  or,
   query,
-  real,
-  table,
-  text,
   withInstanceResolvers
-} from "./chunk-QDZXHVTU.js";
+} from "./chunk-F4TOPZ5V.js";
 import {
   AppError
 } from "./chunk-7ZQPXG7O.js";
 export {
   AppError,
   action,
-  and,
-  asc,
-  boolean,
-  count,
-  defineDatabase,
   defineServer,
-  desc,
-  eq,
   fn,
-  gt,
-  gte,
-  inArray,
-  integer,
-  isNotNull,
-  isNull,
-  lt,
-  lte,
   mutation,
-  ne,
-  or,
   query,
-  real,
-  table,
-  text,
   withInstanceResolvers
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailorkit/app",
-  "version": "0.1.0-beta.44",
+  "version": "0.1.0-beta.46",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -65,7 +65,7 @@
     "@orpc/client": "2.0.0-beta.40",
     "@orpc/contract": "2.0.0-beta.40",
     "@standard-schema/spec": "^1.1.0",
-    "drizzle-orm": "1.0.0-rc.4-5d5b77c",
+    "@tailorkit/app-db": "0.1.0-beta.46",
     "nanostores": "1.5.5",
     "valibot": "^1.5.0"
   },

package/dist/database/definition.d.ts

@@ -1,8 +0,0 @@
-import type { AnyRelations } from "drizzle-orm/relations";
-export interface DatabaseDefinition<R extends AnyRelations = AnyRelations> {
-    readonly relations: R;
-}
-/** Configure the installation database with Drizzle relations, which also contain its tables. */
-export declare const defineDatabase: <const R extends AnyRelations>(definition: DatabaseDefinition<R>) => Readonly<{
-    relations: R;
-}>;

package/dist/database/schema.d.ts

@@ -1,78 +0,0 @@
-import type { ColumnBuilderBase } from "drizzle-orm";
-export declare const table: <N extends string, C extends Record<string, ColumnBuilderBase>>(name: N, columns: C) => import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
-    name: N;
-    schema: undefined;
-    columns: { [Key in keyof C]: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-        name: string;
-        tableName: N;
-        dataType: C[Key]["_"]["dataType"];
-        data: C[Key]["_"] extends infer T ? T extends C[Key]["_"] ? T extends {
-            $type: infer U;
-        } ? U : T["data"] : never : never;
-        driverParam: C[Key]["_"]["driverParam"];
-        notNull: C[Key]["_"]["notNull"] extends true ? true : false;
-        hasDefault: C[Key]["_"]["hasDefault"] extends true ? true : false;
-        isPrimaryKey: C[Key]["_"] extends infer T_1 ? T_1 extends C[Key]["_"] ? T_1 extends {
-            isPrimaryKey: true;
-        } ? true : false : never : never;
-        isAutoincrement: C[Key]["_"] extends infer T_2 ? T_2 extends C[Key]["_"] ? T_2 extends {
-            isAutoincrement: true;
-        } ? true : false : never : never;
-        hasRuntimeDefault: C[Key]["_"] extends infer T_3 ? T_3 extends C[Key]["_"] ? T_3 extends {
-            hasRuntimeDefault: true;
-        } ? true : false : never : never;
-        enumValues: C[Key]["_"] extends infer T_4 ? T_4 extends C[Key]["_"] ? T_4 extends {
-            enumValues: [string, ...string[]];
-        } ? T_4["enumValues"] : undefined : never : never;
-        baseColumn: C[Key]["_"] extends infer T_5 ? T_5 extends C[Key]["_"] ? T_5 extends {
-            baseBuilder: infer U_1 extends ColumnBuilderBase;
-        } ? import("drizzle-orm/sqlite-core").SQLiteColumn<{
-            name: string;
-            tableName: N;
-            dataType: U_1["_"]["dataType"];
-            data: U_1["_"] extends infer T_6 ? T_6 extends U_1["_"] ? T_6 extends {
-                $type: infer U;
-            } ? U : T_6["data"] : never : never;
-            driverParam: U_1["_"]["driverParam"];
-            notNull: U_1["_"]["notNull"] extends true ? true : false;
-            hasDefault: U_1["_"]["hasDefault"] extends true ? true : false;
-            isPrimaryKey: U_1["_"] extends infer T_7 ? T_7 extends U_1["_"] ? T_7 extends {
-                isPrimaryKey: true;
-            } ? true : false : never : never;
-            isAutoincrement: U_1["_"] extends infer T_8 ? T_8 extends U_1["_"] ? T_8 extends {
-                isAutoincrement: true;
-            } ? true : false : never : never;
-            hasRuntimeDefault: U_1["_"] extends infer T_9 ? T_9 extends U_1["_"] ? T_9 extends {
-                hasRuntimeDefault: true;
-            } ? true : false : never : never;
-            enumValues: U_1["_"] extends infer T_10 ? T_10 extends U_1["_"] ? T_10 extends {
-                enumValues: [string, ...string[]];
-            } ? T_10["enumValues"] : undefined : never : never;
-            baseColumn: U_1["_"] extends infer T_11 ? T_11 extends U_1["_"] ? T_11 extends {
-                baseBuilder: infer U_1 extends ColumnBuilderBase;
-            } ? import("drizzle-orm/sqlite-core").SQLiteColumn</*elided*/ any, {}> : never : never : never;
-            identity: U_1["_"] extends infer T_12 ? T_12 extends U_1["_"] ? T_12 extends {
-                identity: 'always';
-            } ? "always" : T_12 extends {
-                identity: 'byDefault';
-            } ? "byDefault" : undefined : never : never;
-            generated: U_1["_"] extends infer T_13 ? T_13 extends U_1["_"] ? T_13 extends {
-                generated: infer G;
-            } ? unknown extends G ? undefined : G extends undefined ? undefined : G : undefined : never : never;
-        }, {}> : never : never : never;
-        identity: C[Key]["_"] extends infer T_14 ? T_14 extends C[Key]["_"] ? T_14 extends {
-            identity: 'always';
-        } ? "always" : T_14 extends {
-            identity: 'byDefault';
-        } ? "byDefault" : undefined : never : never;
-        generated: C[Key]["_"] extends infer T_15 ? T_15 extends C[Key]["_"] ? T_15 extends {
-            generated: infer G;
-        } ? unknown extends G ? undefined : G extends undefined ? undefined : G : undefined : never : never;
-    }, {}>; };
-    dialect: 'sqlite';
-}>;
-export declare const text: (name?: string) => import("drizzle-orm/sqlite-core").SQLiteTextBuilder<[string, ...string[]]>;
-export declare const integer: (name?: string) => import("drizzle-orm/sqlite-core").SQLiteIntegerBuilder;
-export declare const real: (name?: string) => import("drizzle-orm/sqlite-core").SQLiteRealBuilder;
-export declare const boolean: (name?: string) => import("drizzle-orm/sqlite-core").SQLiteBooleanBuilder;
-export { eq, ne, gt, gte, lt, lte, and, or, asc, desc, count, isNull, isNotNull, inArray, } from "drizzle-orm";

package/dist/database/types.d.ts

@@ -1,8 +0,0 @@
-import type { AnyRelations, EmptyRelations } from "drizzle-orm/relations";
-import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
-type Database<R extends AnyRelations> = BaseSQLiteDatabase<"sync", {
-    changes: number;
-}, Record<string, never>, R>;
-export type QueryDatabase<R extends AnyRelations = EmptyRelations> = Pick<Database<R>, "select" | "selectDistinct" | "query">;
-export type MutationDatabase<R extends AnyRelations = EmptyRelations> = QueryDatabase<R> & Pick<Database<R>, "insert" | "update" | "delete">;
-export {};