alinea 1.0.0-preview.7 → 1.0.0

package/dist/backend/Database.js

@@ -1,10 +1,10 @@
 import {
   coalesce,
   count
-} from "../chunks/chunk-JUAFAVQT.js";
+} from "../chunks/chunk-BRXE6PQG.js";
 import {
   Builder
-} from "../chunks/chunk-YZAKZYR7.js";
+} from "../chunks/chunk-B2RMSUW7.js";
 import {
   and,
   asc,
@@ -18,7 +18,7 @@ import {
 } from "../chunks/chunk-LCBVZEPF.js";
 import {
   alias
-} from "../chunks/chunk-74QQ64O4.js";
+} from "../chunks/chunk-RY572IJL.js";
 import "../chunks/chunk-6YSLV4QG.js";
 import {
   sql

package/dist/backend/api/CreateBackend.js

@@ -10,8 +10,8 @@ import {
   sqliteDialect,
   sqliteDiff,
   txGenerator
-} from "../../chunks/chunk-XENGTWCT.js";
-import "../../chunks/chunk-YZAKZYR7.js";
+} from "../../chunks/chunk-SGEH5FCM.js";
+import "../../chunks/chunk-B2RMSUW7.js";
 import {
   and,
   asc,
@@ -30,7 +30,7 @@ import {
 import {
   Functions,
   table
-} from "../../chunks/chunk-74QQ64O4.js";
+} from "../../chunks/chunk-RY572IJL.js";
 import {
   input
 } from "../../chunks/chunk-6YSLV4QG.js";

package/dist/backend/api/DatabaseApi.js

@@ -12,7 +12,7 @@ import {
 import "../../chunks/chunk-U7HSJRGD.js";
 import {
   table
-} from "../../chunks/chunk-74QQ64O4.js";
+} from "../../chunks/chunk-RY572IJL.js";
 import "../../chunks/chunk-6YSLV4QG.js";
 import "../../chunks/chunk-NXCD6SNE.js";
 import {

package/dist/backend/db/AlineaMeta.js

@@ -4,7 +4,7 @@ import {
 import "../../chunks/chunk-U7HSJRGD.js";
 import {
   table
-} from "../../chunks/chunk-74QQ64O4.js";
+} from "../../chunks/chunk-RY572IJL.js";
 import "../../chunks/chunk-6YSLV4QG.js";
 import "../../chunks/chunk-NXCD6SNE.js";
 import "../../chunks/chunk-U5RRZUYZ.js";

package/dist/backend/resolver/EntryResolver.d.ts

@@ -40,7 +40,8 @@ export declare class EntryResolver {
     conditionEntryFields(ctx: ResolveContext, query: QuerySettings): Sql<boolean>;
     conditionSearch(Table: typeof EntryRow, searchTerms: string | Array<string> | undefined): Sql<boolean>;
     conditionTypes(ctx: ResolveContext, types: Type | Array<Type>): Sql<boolean>;
-    conditionFilter(ctx: ResolveContext, filter: Filter): Sql<boolean>;
+    conditionFilter(ctx: ResolveContext, getField: (ctx: ResolveContext, name: string) => Sql, filter: Filter): Sql<boolean>;
+    getField(ctx: ResolveContext, name: string): any;
     query(ctx: ResolveContext, query: RelatedQuery<Projection>): Select<any>;
     isSingleResult(query: RelatedQuery): boolean;
     postField(ctx: PostContext, interim: Interim, field: Field): Promise<void>;

package/dist/backend/resolver/EntryResolver.js

@@ -2,7 +2,7 @@ import {
   bm25,
   count,
   snippet
-} from "../../chunks/chunk-JUAFAVQT.js";
+} from "../../chunks/chunk-BRXE6PQG.js";
 import {
   any,
   array,
@@ -12,12 +12,13 @@ import {
   Builder,
   Select,
   selection
-} from "../../chunks/chunk-YZAKZYR7.js";
+} from "../../chunks/chunk-B2RMSUW7.js";
 import {
   and,
   asc,
   desc,
   eq,
+  exists,
   gt,
   gte,
   inArray,
@@ -31,8 +32,10 @@ import {
   or
 } from "../../chunks/chunk-LCBVZEPF.js";
 import {
-  alias
-} from "../../chunks/chunk-74QQ64O4.js";
+  Functions,
+  alias,
+  jsonExpr
+} from "../../chunks/chunk-RY572IJL.js";
 import {
   input
 } from "../../chunks/chunk-6YSLV4QG.js";
@@ -352,7 +355,7 @@ var EntryResolver = class {
   conditionEntryFields(ctx, query) {
     const workspace = query.workspace && typeof query.workspace === "object" && hasWorkspace(query.workspace) ? this.scope.nameOf(query.workspace) : query.workspace;
     const root = query.root && typeof query.root === "object" && hasRoot(query.root) ? this.scope.nameOf(query.root) : query.root;
-    return this.conditionFilter(ctx, {
+    return this.conditionFilter(ctx, this.getField.bind(this), {
       _id: query.id,
       _parentId: query.parentId,
       _path: query.path,
@@ -374,29 +377,18 @@ var EntryResolver = class {
     }
     return eq(ctx.Table.type, this.scope.nameOf(types));
   }
-  conditionFilter(ctx, filter) {
+  conditionFilter(ctx, getField, filter) {
     const isOrFilter = orFilter.check(filter);
     if (isOrFilter)
       return or(
-        ...filter.or.filter(Boolean).map((filter2) => this.conditionFilter(ctx, filter2))
+        ...filter.or.filter(Boolean).map((filter2) => this.conditionFilter(ctx, getField, filter2))
       );
     const isAndFilter = andFilter.check(filter);
     if (isAndFilter)
       return and(
-        ...filter.and.filter(Boolean).map((filter2) => this.conditionFilter(ctx, filter2))
+        ...filter.and.filter(Boolean).map((filter2) => this.conditionFilter(ctx, getField, filter2))
       );
-    function filterField(ctx2, name) {
-      if (name.startsWith("_")) {
-        const entryProp = name.slice(1);
-        const key = entryProp;
-        if (!(key in ctx2.Table))
-          throw new Error(`Unknown field: "${name}"`);
-        return ctx2.Table[key];
-      }
-      return ctx2.Table.data[name];
-    }
-    const conditions = entries(filter).flatMap(function mapCondition([key, value]) {
-      const field = filterField(ctx, key);
+    const mapCondition = ([field, value]) => {
       if (typeof value !== "object" || !value)
         return value === void 0 ? [] : [value === null ? isNull(field) : eq(field, value)];
       return entries(value).map(([op, value2]) => {
@@ -423,21 +415,54 @@ var EntryResolver = class {
             if (Array.isArray(value2))
               return or(
                 ...value2.map((c) => {
-                  return and(...mapCondition([key, c]));
+                  return and(...mapCondition([field, c]));
                 })
               );
-            return and(...mapCondition([key, value2]));
+            return and(...mapCondition([field, value2]));
           case "in":
             return inArray(field, value2);
           case "notIn":
             return not(inArray(field, value2));
+          case "has":
+            return this.conditionFilter(
+              ctx,
+              (_, name) => {
+                return field[name];
+              },
+              value2
+            );
+          case "includes":
+            const expr = jsonExpr(sql`value`);
+            const condition = this.conditionFilter(
+              ctx,
+              (_, name) => {
+                return expr[name];
+              },
+              value2
+            );
+            return exists(
+              builder.select(sql`1`).from(Functions.json_each(field)).where(condition)
+            );
           default:
             throw new Error(`Unknown filter operator: "${op}"`);
         }
       });
-    });
+    };
+    const conditions = entries(filter).map(([key, value]) => {
+      return [getField(ctx, key), value];
+    }).flatMap(mapCondition);
     return and(...conditions);
   }
+  getField(ctx, name) {
+    if (name.startsWith("_")) {
+      const entryProp = name.slice(1);
+      const key = entryProp;
+      if (!(key in ctx.Table))
+        throw new Error(`Unknown field: "${name}"`);
+      return ctx.Table[key];
+    }
+    return ctx.Table.data[name];
+  }
   query(ctx, query) {
     const { type, filter, skip, take, orderBy, groupBy, first, search } = query;
     ctx = ctx.increaseDepth().none;
@@ -452,7 +477,7 @@ var EntryResolver = class {
       this.conditionStatus(ctx.Table, ctx.status),
       querySource(query) === "translations" ? void 0 : this.conditionLocale(ctx.Table, ctx.locale),
       this.conditionSearch(ctx.Table, search),
-      filter && this.conditionFilter(ctx, filter)
+      filter && this.conditionFilter(ctx, this.getField.bind(this), filter)
     );
     if (skip)
       q = q.offset(skip);

package/dist/backend/resolver/ResolveContext.js

@@ -1,6 +1,6 @@
 import {
   alias
-} from "../../chunks/chunk-74QQ64O4.js";
+} from "../../chunks/chunk-RY572IJL.js";
 import "../../chunks/chunk-6YSLV4QG.js";
 import "../../chunks/chunk-NXCD6SNE.js";
 import "../../chunks/chunk-U5RRZUYZ.js";

package/dist/backend/store/CreateStore.js

@@ -1,10 +1,10 @@
 import {
   connect
-} from "../../chunks/chunk-XENGTWCT.js";
-import "../../chunks/chunk-YZAKZYR7.js";
+} from "../../chunks/chunk-SGEH5FCM.js";
+import "../../chunks/chunk-B2RMSUW7.js";
 import "../../chunks/chunk-LCBVZEPF.js";
 import "../../chunks/chunk-U7HSJRGD.js";
-import "../../chunks/chunk-74QQ64O4.js";
+import "../../chunks/chunk-RY572IJL.js";
 import "../../chunks/chunk-6YSLV4QG.js";
 import "../../chunks/chunk-NXCD6SNE.js";
 import "../../chunks/chunk-U5RRZUYZ.js";

package/dist/backend/test/Example.d.ts

@@ -12,15 +12,15 @@ export declare function createExample(): import("alinea/core/CMS").CMS<{
             externalLink: import("alinea/field/link/LinkField").LinkField<import("alinea/types").UrlReference, import("alinea/types").UrlLink<{}>>;
             entry: import("alinea/field/link/LinkField").LinkField<import("alinea/types").EntryReference, import("alinea/types").EntryLink<undefined>>;
             entryWithCondition: import("alinea/field/link/LinkField").LinkField<import("alinea/types").EntryReference, import("alinea/types").EntryLink<undefined>>;
-            linkMultiple: import("alinea/field/link/LinkField").LinksField<import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{}>>;
+            linkMultiple: import("alinea/field/link/LinkField").LinksField<(import("alinea/types").EntryReference | import("alinea/types").UrlReference) & import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{}>>;
             image: import("alinea/field/link").ImageField<undefined>;
             images: import("alinea/field/link").ImagesField<undefined>;
             file: import("alinea/field/link/LinkField").LinkField<import("alinea/types").EntryReference, import("alinea/types").EntryLink<undefined>>;
-            withFields: import("alinea/field/link/LinkField").LinkField<import("alinea/core/Reference").Reference, import("alinea/types").Link<{
+            withFields: import("alinea/field/link/LinkField").LinkField<(import("alinea/types").EntryReference | import("alinea/types").UrlReference) & import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{
                 fieldA: string;
                 fieldB: string;
             }>>;
-            multipleWithFields: import("alinea/field/link/LinkField").LinksField<import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{
+            multipleWithFields: import("alinea/field/link/LinkField").LinksField<(import("alinea/types").EntryReference | import("alinea/types").UrlReference) & import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{
                 fieldA: string;
                 fieldB: string;
             }>>;
@@ -88,6 +88,18 @@ export declare function createExample(): import("alinea/core/CMS").CMS<{
         }>;
         Page: import("alinea/core/Type").Type<import("alinea/core/Document").Document & {
             name: import("alinea/field/path").PathField & import("alinea/field/text").TextField;
+            entryLink: import("alinea/field/link/LinkField").LinksField<(import("alinea/types").EntryReference | import("alinea/types").UrlReference) & import("alinea/core/shape/ListShape").ListRow, import("alinea/types").Link<{}>>;
+            list: import("alinea/core").ListField<{
+                _type: "item";
+                itemId: string;
+            } & import("alinea/core/shape/ListShape").ListRow, {
+                _type: "item";
+                itemId: string;
+            } & import("alinea/core/shape/ListShape").ListRow, import("alinea/field/list").ListOptions<{
+                item: import("alinea/core/Type").Type<{
+                    itemId: import("alinea/field/text").TextField;
+                }>;
+            }>>;
             name2: import("alinea/field/text").TextField;
             title: import("alinea/field/text").TextField;
             path: import("alinea/field/path").PathField;

package/dist/backend/test/Example.js

@@ -36,7 +36,17 @@ function createExample() {
       ...tabs(
         tab("Tab 1", {
           fields: {
-            name: path("Name")
+            name: path("Name"),
+            entryLink: link.multiple("Entry link"),
+            list: list("List field", {
+              schema: {
+                item: type("Item", {
+                  fields: {
+                    itemId: text("Item id")
+                  }
+                })
+              }
+            })
           }
         }),
         tab("Tab 2", {

package/dist/chunks/{chunk-YZAKZYR7.js → chunk-B2RMSUW7.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-LCBVZEPF.js";
 import {
   Field
-} from "./chunk-74QQ64O4.js";
+} from "./chunk-RY572IJL.js";
 import {
   input
 } from "./chunk-6YSLV4QG.js";

package/dist/chunks/{chunk-JUAFAVQT.js → chunk-BRXE6PQG.js}

@@ -1,6 +1,6 @@
 import {
   Functions
-} from "./chunk-74QQ64O4.js";
+} from "./chunk-RY572IJL.js";
 import {
   sql
 } from "./chunk-NXCD6SNE.js";

package/dist/chunks/{chunk-R7QXZRY5.js → chunk-COTVTUVE.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "1.0.0-preview.7",
+  version: "1.0.0",
   description: "Headless git-based CMS",
   repository: {
     type: "git",

package/dist/chunks/{chunk-74QQ64O4.js → chunk-RY572IJL.js}

@@ -88,18 +88,6 @@ function index() {
   return new Index({ fields: [] });
 }
 
-// node_modules/rado/dist/core/expr/Field.js
-var Field = class {
-  [internalField];
-  [internalSql];
-  constructor(targetName, fieldName, options = {}) {
-    const field = { targetName, fieldName };
-    this[internalField] = field;
-    const expr = sql.field(field).as(fieldName).mapWith(options);
-    this[internalSql] = expr;
-  }
-};
-
 // node_modules/rado/dist/core/expr/Json.js
 var INDEX_PROPERTY = /^\d+$/;
 function jsonExpr(e) {
@@ -143,6 +131,18 @@ function jsonArray(...args) {
   );
 }
 
+// node_modules/rado/dist/core/expr/Field.js
+var Field = class {
+  [internalField];
+  [internalSql];
+  constructor(targetName, fieldName, options = {}) {
+    const field = { targetName, fieldName };
+    this[internalField] = field;
+    const expr = sql.field(field).as(fieldName).mapWith(options);
+    this[internalSql] = expr;
+  }
+};
+
 // node_modules/rado/dist/core/Table.js
 var { assign, fromEntries, entries, keys } = Object;
 var TableData = class {
@@ -268,6 +268,7 @@ export {
   Functions,
   Field,
   index,
+  jsonExpr,
   jsonAggregateArray,
   jsonArray,
   table,

package/dist/chunks/{chunk-XENGTWCT.js → chunk-SGEH5FCM.js}

@@ -1,7 +1,7 @@
 import {
   Builder,
   QueryBatch
-} from "./chunk-YZAKZYR7.js";
+} from "./chunk-B2RMSUW7.js";
 import {
   eq
 } from "./chunk-LCBVZEPF.js";
@@ -13,7 +13,7 @@ import {
   jsonAggregateArray,
   jsonArray,
   table
-} from "./chunk-74QQ64O4.js";
+} from "./chunk-RY572IJL.js";
 import {
   Sql,
   getData,

package/dist/chunks/{sql.js-JXAW5YFN.js → sql.js-MYDVXO2C.js}

@@ -1,10 +1,10 @@
 import {
   connect
-} from "./chunk-XENGTWCT.js";
-import "./chunk-YZAKZYR7.js";
+} from "./chunk-SGEH5FCM.js";
+import "./chunk-B2RMSUW7.js";
 import "./chunk-LCBVZEPF.js";
 import "./chunk-U7HSJRGD.js";
-import "./chunk-74QQ64O4.js";
+import "./chunk-RY572IJL.js";
 import "./chunk-6YSLV4QG.js";
 import "./chunk-NXCD6SNE.js";
 import "./chunk-U5RRZUYZ.js";

package/dist/cli/Generate.js

@@ -40,7 +40,7 @@ async function generatePackage(context, cms) {
 async function createDb() {
   const { default: sqlite } = await import("@alinea/sqlite-wasm");
   const { Database } = await sqlite();
-  const { connect } = await import("../chunks/sql.js-JXAW5YFN.js");
+  const { connect } = await import("../chunks/sql.js-MYDVXO2C.js");
   const db = new Database();
   const store = connect(db);
   return [store, () => db.export()];

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-R7QXZRY5.js";
+} from "../chunks/chunk-COTVTUVE.js";
 import "../chunks/chunk-U5RRZUYZ.js";
 
 // src/cli/Serve.ts

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-R7QXZRY5.js";
+} from "../chunks/chunk-COTVTUVE.js";
 import "../chunks/chunk-U5RRZUYZ.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cloud/CloudBackend.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-R7QXZRY5.js";
+} from "../chunks/chunk-COTVTUVE.js";
 import {
   PLazy
 } from "../chunks/chunk-IKINPSS5.js";

package/dist/core/EntryRow.js

@@ -11,7 +11,7 @@ import {
   Functions,
   index,
   table
-} from "../chunks/chunk-74QQ64O4.js";
+} from "../chunks/chunk-RY572IJL.js";
 import {
   input
 } from "../chunks/chunk-6YSLV4QG.js";

package/dist/core/EntrySearch.js

@@ -5,7 +5,7 @@ import {
 import "../chunks/chunk-U7HSJRGD.js";
 import {
   table
-} from "../chunks/chunk-74QQ64O4.js";
+} from "../chunks/chunk-RY572IJL.js";
 import "../chunks/chunk-6YSLV4QG.js";
 import "../chunks/chunk-NXCD6SNE.js";
 import "../chunks/chunk-U5RRZUYZ.js";

package/dist/core/Filter.d.ts

@@ -1,26 +1,31 @@
-import { Expr } from './Expr.js';
 type Primitive = string | number | boolean | null;
-type InferValue<T> = T extends Expr<infer V> ? V : T;
-export type Condition<V> = {
-    is?: V;
-    isNot?: V;
-    in?: ReadonlyArray<V>;
-    notIn?: ReadonlyArray<V>;
-    gt?: V;
-    gte?: V;
-    lt?: V;
-    lte?: V;
+interface Ops<Value> {
+    is?: Value;
+    isNot?: Value;
+    in?: ReadonlyArray<Value>;
+    notIn?: ReadonlyArray<Value>;
+    gt?: Value;
+    gte?: Value;
+    lt?: Value;
+    lte?: Value;
     startsWith?: string;
-    or?: Condition<V>;
-} | V;
+    or?: Condition<Value>;
+}
+interface ObjectOps<Fields> {
+    has?: Filter<Fields>;
+}
+interface ArrayOps<Fields> {
+    includes?: Filter<Fields>;
+}
+type FieldOps<Fields> = {
+    [K in keyof Fields]?: Condition<Fields[K]>;
+};
+export type Condition<Value> = Value extends Primitive ? Ops<Value> | Value : Value extends Array<any> ? ArrayOps<Value[0]> : ObjectOps<Value>;
 type AndCondition<Fields> = {
     and: Array<Filter<Fields> | undefined>;
 };
 type OrCondition<Fields> = {
     or: Array<Filter<Fields> | undefined>;
 };
-type FieldCondition<Fields> = {
-    [K in keyof Fields as InferValue<Fields[K]> extends Primitive ? K : never]?: Condition<InferValue<Fields[K]>>;
-};
-export type Filter<Fields = unknown> = AndCondition<Fields> | OrCondition<Fields> | FieldCondition<Fields>;
+export type Filter<Fields = unknown> = AndCondition<Fields> | OrCondition<Fields> | FieldOps<Fields>;
 export {};

package/dist/core/Graph.d.ts

@@ -3,7 +3,7 @@ import { Config } from './Config.js';
 import { EntryFields } from './EntryFields.js';
 import { Expr } from './Expr.js';
 import { Condition, Filter } from './Filter.js';
-import { Infer } from './Infer.js';
+import { Infer, StoredRow } from './Infer.js';
 import { Page } from './Page.js';
 import { PreviewRequest } from './Preview.js';
 import { Resolver } from './Resolver.js';
@@ -11,7 +11,7 @@ import { Type } from './Type.js';
 import { Expand } from './util/Types.js';
 export type Location = Root | Workspace | Page | Array<string>;
 type EmptyObject = Record<PropertyKey, never>;
-type FieldsOf<Types> = Types extends Type<infer V> ? V : Types extends Array<any> ? Types[number] : unknown;
+type FieldsOf<Types> = StoredRow<Types extends Type<infer V> ? V : Types extends Array<any> ? Types[number] : unknown>;
 export interface RelatedQuery<Selection = unknown, Types = unknown> extends GraphQuery<Selection, Types> {
     translations?: EmptyObject | {
         includeSelf: boolean | undefined;
@@ -65,11 +65,8 @@ export interface Order {
 type InferSelection<Selection> = Selection extends Expr<infer V> ? V : {
     [K in keyof Selection]: Selection[K] extends Type<infer V> ? Type.Infer<V> : Selection[K] extends Expr<infer V> ? V : Selection[K] extends GraphQuery & IsRelated ? Expand<AnyQueryResult<Selection[K]>> : InferSelection<Selection[K]>;
 };
-type InferResult<Selection, Types, Include> = Selection extends Expr<infer Value> ? Value : Selection extends undefined ? Types extends undefined ? EntryFields & (Include extends undefined ? {} : InferSelection<Include>) : Infer<Types> & EntryFields & (Include extends undefined ? {} : InferSelection<Include>) : InferSelection<Selection>;
-type CountQueryResult<Selection, Types, Include> = number;
-type GetQueryResult<Selection, Types, Include> = Expand<InferResult<Selection, Types, Include>>;
-type FirstQueryResult<Selection, Types, Include> = Expand<InferResult<Selection, Types, Include>> | null;
-type FindQueryResult<Selection, Types, Include> = Expand<Array<InferResult<Selection, Types, Include>>>;
+type InferResult<Selection, Types, Include> = Selection extends Expr<infer Value> ? Value : Selection extends undefined ? Types extends undefined ? EntryFields & (Include extends undefined ? {} : InferSelection<Include>) : Infer<Types> & (Include extends undefined ? {} : InferSelection<Include>) : InferSelection<Selection>;
+type QueryResult<Selection, Types, Include> = Expand<InferResult<Selection, Types, Include>>;
 interface CountQuery<Selection, Types, Include> extends GraphQuery<Selection, Types, Include> {
     count: true;
 }
@@ -85,7 +82,7 @@ type FirstQuery<Selection, Types, Include> = (GraphQuery<Selection, Types, Inclu
 interface GetQuery<Selection, Types, Include> extends GraphQuery<Selection, Types, Include> {
     get: true;
 }
-export type AnyQueryResult<Query extends GraphQuery> = Query extends CountQuery<infer S, infer T, infer I> ? CountQueryResult<S, T, I> : Query extends FirstQuery<infer S, infer T, infer I> ? FirstQueryResult<S, T, I> : Query extends GetQuery<infer S, infer T, infer I> ? GetQueryResult<S, T, I> : Query extends GraphQuery<infer S, infer T, infer I> ? FindQueryResult<S, T, I> : unknown;
+export type AnyQueryResult<Query extends GraphQuery> = Query extends CountQuery<any, any, any> ? number : Query extends FirstQuery<infer S, infer T, infer I> ? QueryResult<S, T, I> | null : Query extends GetQuery<infer S, infer T, infer I> ? QueryResult<S, T, I> : Query extends GraphQuery<infer S, infer T, infer I> ? Array<QueryResult<S, T, I>> : unknown;
 export type Status = 
 /** Only published entries */
 'published'
@@ -167,10 +164,10 @@ export declare class Graph {
     #private;
     config: Config;
     constructor(config: Config, resolver: Resolver);
-    find<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<FindQueryResult<Selection, Type, Include>>;
-    first<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<FirstQueryResult<Selection, Type, Include>>;
-    get<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<GetQueryResult<Selection, Type, Include>>;
-    count<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<CountQueryResult<Selection, Type, Include>>;
+    find<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<Array<QueryResult<Selection, Type, Include>>>;
+    first<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<QueryResult<Selection, Type, Include> | null>;
+    get<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<QueryResult<Selection, Type, Include>>;
+    count<Selection extends SelectionGuard = undefined, const Type extends TypeGuard = undefined, Include extends IncludeGuard = undefined>(query: GraphQuery<Selection, Type, Include>): Promise<number>;
 }
 export declare function querySource(query: unknown): "translations" | "children" | "parents" | "siblings" | "parent" | "next" | "previous" | undefined;
 export {};

package/dist/core/Infer.d.ts

@@ -1,16 +1,14 @@
 import { Expand, UnionOfValues } from 'alinea/core/util/Types';
+import { EntryFields } from './EntryFields.js';
 import { Expr } from './Expr.js';
 import { Field } from './Field.js';
 import { Type } from './Type.js';
 type QueryList<T> = Expand<UnionOfValues<{
     [K in keyof T]: {
         _type: K;
-    } & QueryRow<T[K]>;
+    } & Type.Infer<T[K]>;
 }>>;
-export type QueryRow<Definition> = {
-    [K in keyof Definition as Definition[K] extends Expr<any> ? K : never]: Definition[K] extends Expr<infer T> ? T : never;
-};
-export type InferQueryValue<T> = T extends Array<Type<infer X>> ? InferQueryValue<X> : T extends Type<infer Fields> ? QueryRow<Fields> : T extends Expr<infer QueryValue> ? QueryValue : T extends Record<string, Type> ? QueryList<T> : never;
+export type InferQueryValue<T> = T extends Array<Type<infer X>> ? InferQueryValue<X> : T extends Type<infer Fields> ? Type.Infer<Fields> & EntryFields : T extends Expr<infer QueryValue> ? QueryValue : T extends Record<string, Type> ? QueryList<T> : never;
 type StoredList<T> = Expand<UnionOfValues<{
     [K in keyof T]: {
         _type: K;

package/dist/dashboard/util/PersistentStore.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../../chunks/chunk-R7QXZRY5.js";
+} from "../../chunks/chunk-COTVTUVE.js";
 import {
   create as create2
 } from "../../chunks/chunk-IOTY7UTU.js";
@@ -9,11 +9,11 @@ import {
 } from "../../chunks/chunk-BRTZLYIM.js";
 import {
   connect
-} from "../../chunks/chunk-XENGTWCT.js";
-import "../../chunks/chunk-YZAKZYR7.js";
+} from "../../chunks/chunk-SGEH5FCM.js";
+import "../../chunks/chunk-B2RMSUW7.js";
 import "../../chunks/chunk-LCBVZEPF.js";
 import "../../chunks/chunk-U7HSJRGD.js";
-import "../../chunks/chunk-74QQ64O4.js";
+import "../../chunks/chunk-RY572IJL.js";
 import "../../chunks/chunk-6YSLV4QG.js";
 import "../../chunks/chunk-NXCD6SNE.js";
 import "../../chunks/chunk-U5RRZUYZ.js";

package/dist/field/link/Link.d.ts

@@ -1,17 +1,20 @@
 import type { WithoutLabel } from 'alinea/core/Field';
 import { Label } from 'alinea/core/Label';
-import { Reference } from 'alinea/core/Reference';
 import { Type } from 'alinea/core/Type';
 import type { ListRow } from 'alinea/core/shape/ListShape';
 import { FileLink } from 'alinea/field/link/FileLink';
 import { LinkField, LinkFieldOptions } from 'alinea/field/link/LinkField';
+import { EntryReference } from 'alinea/picker/entry/EntryReference';
+import { UrlReference } from 'alinea/picker/url';
 import { EntryLink } from './EntryLink.js';
 import { UrlLink } from './UrlLink.js';
 export type Link<InferredFields> = EntryLink<InferredFields> | UrlLink<InferredFields> | FileLink<InferredFields>;
 export interface LinkOptions<Definition, Row> extends LinkFieldOptions<Row> {
     fields?: Definition | Type<Definition>;
 }
-export declare function link<Fields>(label: Label, options?: WithoutLabel<LinkOptions<Fields, Reference>>): LinkField<Reference, Link<Type.Infer<Fields>>>;
+type LinkRow = (EntryReference | UrlReference) & ListRow;
+export declare function link<Fields>(label: Label, options?: WithoutLabel<LinkOptions<Fields, LinkRow>>): LinkField<LinkRow, Link<Type.Infer<Fields>>>;
 export declare namespace link {
-    function multiple<Fields>(label: Label, options?: WithoutLabel<LinkOptions<Fields, Array<ListRow>>>): import("alinea/field/link/LinkField").LinksField<ListRow, Link<{ [K_1 in keyof Fields as Fields[K_1] extends import("alinea/core/Expr").Expr<any> ? K_1 : never]: Fields[K_1] extends import("alinea/core/Expr").Expr<infer T_1> ? T_1 : never; } extends infer T ? { [K in keyof T]: { [K_1 in keyof Fields as Fields[K_1] extends import("alinea/core/Expr").Expr<any> ? K_1 : never]: Fields[K_1] extends import("alinea/core/Expr").Expr<infer T_1> ? T_1 : never; }[K]; } : never>>;
+    function multiple<Fields>(label: Label, options?: WithoutLabel<LinkOptions<Fields, Array<LinkRow>>>): import("alinea/field/link/LinkField").LinksField<LinkRow, Link<{ [K_1 in keyof Fields as Fields[K_1] extends import("alinea/core/Expr").Expr<any> ? K_1 : never]: Fields[K_1] extends import("alinea/core/Expr").Expr<infer T_1> ? T_1 : never; } extends infer T ? { [K in keyof T]: { [K_1 in keyof Fields as Fields[K_1] extends import("alinea/core/Expr").Expr<any> ? K_1 : never]: Fields[K_1] extends import("alinea/core/Expr").Expr<infer T_1> ? T_1 : never; }[K]; } : never>>;
 }
+export {};

package/dist/query.d.ts

@@ -17,7 +17,7 @@ export declare function children<Selection extends SelectionGuard = undefined, T
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -48,7 +48,7 @@ export declare function parents<Selection extends SelectionGuard = undefined, Ty
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -79,7 +79,7 @@ export declare function translations<Selection extends SelectionGuard = undefine
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -108,7 +108,7 @@ export declare function parent<Selection extends SelectionGuard = undefined, Typ
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -135,7 +135,7 @@ export declare function next<Selection extends SelectionGuard = undefined, Type
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -162,7 +162,7 @@ export declare function previous<Selection extends SelectionGuard = undefined, T
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;
@@ -191,7 +191,7 @@ export declare function siblings<Selection extends SelectionGuard = undefined, T
     type?: Type | undefined;
     select?: Selection | undefined;
     include?: Include | undefined;
-    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & (Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown)> | undefined;
+    filter?: import("alinea/core/Filter").Filter<import("alinea/core/EntryFields").EntryFields & import("alinea/core/Infer").StoredRow<Type extends import("alinea/core/Type").Type<infer V> ? V : Type extends any[] ? Type[number] : unknown>> | undefined;
     first?: true;
     get?: true;
     count?: true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "bin": "./dist/cli.js",
   "name": "alinea",
-  "version": "1.0.0-preview.7",
+  "version": "1.0.0",
   "description": "Headless git-based CMS",
   "repository": {
     "type": "git",