alinea 2.0.0-preview.0 → 2.0.0-preview.2

package/dist/dashboard/atoms/root.js

@@ -7,16 +7,19 @@ import {
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/atoms/root.ts
-import { Entry } from "alinea/core/Entry";
 import { Permission } from "alinea/core/Role";
 import { getRoot, getType, getWorkspace } from "alinea/core/Internal";
-import { Type } from "alinea/core/Type";
 import {
   createExplorerAtoms
 } from "alinea/dashboard/atoms/explorer";
 import { LucideFile } from "../icons.js";
 import { viewAtoms } from "./config.js";
 import { configAtom, graphAtom } from "./core.js";
+import {
+  loadTreeChildren,
+  MissingEntryError,
+  treeEntryAtoms
+} from "./entry.js";
 import { shaAtom } from "./graph.js";
 import { pageAtom } from "./nav.js";
 import { policyAtom } from "./user.js";
@@ -31,27 +34,21 @@ var emptyTreeSnapshot = {
   items: [],
   selectedKeys: /* @__PURE__ */ new Set()
 };
-var treeItemSelect = {
-  id: Entry.id,
-  title: Entry.title,
-  type: Entry.type,
-  status: Entry.status,
-  main: Entry.main,
-  locale: Entry.locale,
-  parentId: Entry.parentId,
-  parents: Entry.parents
-};
-function preferredLocaleEntries(items, locale) {
-  const translated = new Set(
-    items.filter((item) => item.locale === locale).map((item) => item.id)
-  );
-  const untranslated = /* @__PURE__ */ new Set();
-  return items.filter((item) => {
-    if (translated.has(item.id)) return item.locale === locale;
-    if (untranslated.has(item.id)) return false;
-    untranslated.add(item.id);
-    return true;
-  });
+function rootTreeItem(config, entry, parentType) {
+  return {
+    id: entry.id,
+    title: entry.title,
+    type: entry.type,
+    status: entry.status,
+    main: entry.main,
+    locale: entry.locale,
+    parentId: entry.parentId,
+    parents: entry.parents,
+    hasChildren: entry.hasChildren,
+    dragDisabled: Boolean(
+      parentType && getType(config.schema[parentType]).orderChildrenBy
+    )
+  };
 }
 var TreeAtoms = class {
   expandedKeys;
@@ -70,108 +67,76 @@ var TreeAtoms = class {
     });
   }
   #source = atom(async (get) => {
-    get(shaAtom);
-    const data = get(this.#root.data);
     const config = get(configAtom);
-    const graph = get(graphAtom);
-    const policy = get(policyAtom);
-    const visibleTypes = Object.entries(config.schema).filter(([, type]) => !Type.isHidden(type)).map(([name]) => name);
     const selectedKeys = new Set([...get(this.#selectedKeys)].map(String));
     const selectedId = [...selectedKeys][0];
-    const requestedExpanded = get(this.expandedKeys);
-    const metadataIds = new Set(requestedExpanded);
-    if (selectedId) metadataIds.add(selectedId);
-    const metadata = metadataIds.size === 0 ? [] : await graph.find({
-      workspace: this.#root.workspace,
-      root: this.#root.key,
-      id: { in: [...metadataIds] },
-      filter: { _type: { in: visibleTypes } },
-      status: "preferDraft",
-      select: treeItemSelect
-    });
-    const metadataById = new Map(
-      preferredLocaleEntries(
-        metadata.filter((entry) => policy.canRead(entry)),
-        this.#locale
-      ).map((entry) => [entry.id, entry])
-    );
-    const selected = selectedId ? metadataById.get(selectedId) : void 0;
+    const selectedModel = selectedId ? treeEntryAtoms(selectedId) : void 0;
+    let selected;
+    try {
+      selected = selectedModel ? await get(selectedModel.summary(this.#locale)) : void 0;
+    } catch (error) {
+      if (!(error instanceof MissingEntryError)) throw error;
+      selected = void 0;
+    }
+    const parents = selectedModel && selected ? await get(selectedModel.parents) : [];
+    const models = new Map(parents.map((parent) => [parent.id, parent]));
+    if (selectedModel) models.set(selectedModel.id, selectedModel);
     const collapsed = get(this.collapsedKeys);
     const collapsedKeys = collapsed.selectedId === selectedId ? collapsed.keys : /* @__PURE__ */ new Set();
-    const expandedKeys = new Set(requestedExpanded);
+    const expandedKeys = new Set(get(this.expandedKeys));
     for (const parentId of selected?.parents ?? [])
       if (!collapsedKeys.has(parentId)) expandedKeys.add(parentId);
-    const parentIds = /* @__PURE__ */ new Set([null, ...expandedKeys]);
-    const missingParentIds = [...parentIds].filter(
-      (id) => id !== null && !metadataById.has(id)
-    );
-    if (missingParentIds.length > 0) {
-      const parents = await graph.find({
-        workspace: this.#root.workspace,
-        root: this.#root.key,
-        id: { in: missingParentIds },
-        filter: { _type: { in: visibleTypes } },
-        status: "preferDraft",
-        select: treeItemSelect
-      });
-      for (const parent of preferredLocaleEntries(
-        parents.filter((entry) => policy.canRead(entry)),
-        this.#locale
-      ))
-        metadataById.set(parent.id, parent);
-    }
-    const childLists = await Promise.all(
-      [...parentIds].map(async (parentId) => {
-        const parent = parentId === null ? void 0 : metadataById.get(parentId);
-        const entries2 = await graph.find({
-          workspace: this.#root.workspace,
-          root: this.#root.key,
-          parentId,
-          filter: { _type: { in: visibleTypes } },
-          status: "preferDraft",
-          orderBy: parent ? getType(config.schema[parent.type]).orderChildrenBy : data.orderChildrenBy,
-          select: treeItemSelect
-        });
-        return preferredLocaleEntries(
-          entries2.filter((entry) => policy.canRead(entry)),
-          this.#locale
-        );
-      })
+    const missingModels = await Promise.all(
+      [...expandedKeys].filter((id) => !models.has(id)).map((id) => get(treeEntryAtoms(id).ready))
     );
-    const loadedEntries = childLists.flat();
-    const possibleChildren = loadedEntries.length === 0 ? [] : await graph.find({
-      workspace: this.#root.workspace,
-      root: this.#root.key,
-      parentId: { in: loadedEntries.map((entry) => entry.id) },
-      filter: { _type: { in: visibleTypes } },
-      status: "preferDraft",
-      select: treeItemSelect
+    for (const model of missingModels) models.set(model.id, model);
+    const expandedModels = [...expandedKeys].flatMap((id) => {
+      const model = models.get(id);
+      return model ? [model] : [];
     });
-    const entriesWithChildren = new Set(
-      preferredLocaleEntries(
-        possibleChildren.filter((entry) => policy.canRead(entry)),
-        this.#locale
-      ).flatMap((entry) => entry.parentId ? [entry.parentId] : [])
+    const [rootModels, childLevels, parentEntries] = await Promise.all([
+      get(this.#root.treeEntries(this.#locale)),
+      Promise.all(
+        expandedModels.map((model) => get(model.children(this.#locale)))
+      ),
+      Promise.all(expandedModels.map((model) => get(model.raw(this.#locale))))
+    ]);
+    const levels = [rootModels, ...childLevels];
+    const parentTypes = [
+      null,
+      ...parentEntries.map((entry) => entry.type)
+    ];
+    const levelItems = await Promise.all(
+      levels.map(
+        (level, index) => Promise.all(
+          level.map(
+            async (model) => rootTreeItem(
+              config,
+              await get(model.summary(this.#locale)),
+              parentTypes[index] ?? null
+            )
+          )
+        )
+      )
     );
     const entries = /* @__PURE__ */ new Map();
     const children = /* @__PURE__ */ new Map();
-    for (const entry of loadedEntries) {
-      const parent = entry.parentId ? metadataById.get(entry.parentId) : void 0;
-      entries.set(entry.id, {
-        ...entry,
-        dragDisabled: Boolean(
-          parent && getType(config.schema[parent.type]).orderChildrenBy
-        ),
-        hasChildren: entriesWithChildren.has(entry.id)
-      });
-      const ids = children.get(entry.parentId) ?? [];
-      ids.push(entry.id);
-      children.set(entry.parentId, ids);
+    const parentIds = [
+      null,
+      ...expandedModels.map((model) => model.id)
+    ];
+    for (const [index, level] of levelItems.entries()) {
+      const parentId = parentIds[index] ?? null;
+      children.set(
+        parentId,
+        level.map((entry) => entry.id)
+      );
+      for (const entry of level) entries.set(entry.id, entry);
     }
     function nested(parentId) {
       return (children.get(parentId) ?? []).map((id) => ({
         id,
-        children: nested(id)
+        children: expandedKeys.has(id) ? nested(id) : []
       }));
     }
     return {
@@ -184,62 +149,24 @@ var TreeAtoms = class {
   items = atom((get) => [...get(this.#state)?.entries.values() ?? []]);
   #itemSource = dispense(
     (id) => atom(async (get) => {
-      const loaded = (await get(this.#source)).entries.get(id);
-      if (loaded) return loaded;
+      const model = treeEntryAtoms(id);
+      const entry = await get(model.summary(this.#locale));
       const config = get(configAtom);
-      const graph = get(graphAtom);
-      const policy = get(policyAtom);
-      const visibleTypes = Object.entries(config.schema).filter(([, type]) => !Type.isHidden(type)).map(([name]) => name);
-      const matches = await graph.find({
-        workspace: this.#root.workspace,
-        root: this.#root.key,
-        id,
-        filter: { _type: { in: visibleTypes } },
-        status: "preferDraft",
-        select: treeItemSelect
-      });
-      const entry = preferredLocaleEntries(
-        matches.filter((match) => policy.canRead(match)),
-        this.#locale
-      )[0];
-      if (!entry) throw new Error(`Tree item "${id}" not found`);
-      const parent = entry.parentId ? await graph.first({
-        workspace: this.#root.workspace,
-        root: this.#root.key,
-        id: entry.parentId,
-        status: "preferDraft",
-        select: { type: Entry.type }
-      }) : void 0;
-      const children = await graph.find({
-        workspace: this.#root.workspace,
-        root: this.#root.key,
-        parentId: id,
-        filter: { _type: { in: visibleTypes } },
-        status: "preferDraft",
-        select: treeItemSelect
-      });
-      return {
-        ...entry,
-        dragDisabled: Boolean(
-          parent && getType(config.schema[parent.type]).orderChildrenBy
-        ),
-        hasChildren: preferredLocaleEntries(
-          children.filter((child) => policy.canRead(child)),
-          this.#locale
-        ).length > 0
-      };
+      const parent = entry.parentId ? await get(treeEntryAtoms(entry.parentId).raw(this.#locale)) : void 0;
+      return rootTreeItem(config, entry, parent?.type ?? null);
     })
   );
+  children = dispense((id) => treeEntryAtoms(id).children(this.#locale));
   #itemState = dispense(
     (id) => unwrap(this.#itemSource(id), (previous) => previous)
   );
   item = dispense(
     (id) => atom((get) => {
+      const item = get(this.#itemState(id));
+      if (item) return item;
       const loaded = get(this.#state)?.entries.get(id);
       if (loaded) return loaded;
-      const item = get(this.#itemState(id));
-      if (!item) throw get(this.#itemSource(id));
-      return item;
+      throw get(this.#itemSource(id));
     })
   );
   selectedItem = atom((get) => {
@@ -251,7 +178,7 @@ var TreeAtoms = class {
     get(this.snapshot);
     const source = await get(this.#source);
     await Promise.all(
-      [...source.entries].map(([id]) => get(this.#itemSource(id)))
+      [...source.entries.keys()].map((id) => get(this.#itemSource(id)))
     );
     return source.snapshot;
   });
@@ -323,6 +250,18 @@ var RootAtoms = class {
       } : void 0
     );
   }
+  treeEntries = dispense(
+    (locale) => atom(async (get) => {
+      get(shaAtom);
+      const data = get(this.data);
+      return loadTreeChildren(
+        get,
+        { workspace: this.workspace, root: this.key, parentId: null },
+        locale,
+        data.orderChildrenBy
+      );
+    })
+  );
   children = dispense(
     (parentId) => createExplorerAtoms(
       {
@@ -334,7 +273,7 @@ var RootAtoms = class {
         defaultOrderBy: parentId === null ? atom((get) => get(this.data).orderChildrenBy) : void 0,
         enableNavigation: true,
         rootData: this.data,
-        selectedLocaleAtom: parentId === null ? this.#explorerLocale : void 0,
+        selectedLocaleAtom: this.#explorerLocale,
         treeItems: (locale) => this.tree(locale).items,
         selectionBehavior: "toggle",
         selectionMode: "multiple"

package/dist/dashboard/hooks.d.ts

@@ -9,7 +9,7 @@ import type { User } from 'alinea/core/User';
 import type { WorkspaceInternal } from 'alinea/core/Workspace';
 import { Type } from 'alinea';
 import type { ComponentType, Dispatch, PropsWithChildren, SetStateAction } from 'react';
-import { type EditorModel, type EditorNode, EntryEditor } from './atoms/editor.js';
+import { type EditorModel, type EditorNode, EntryEditor, type ResolvedEditorImage } from './atoms/editor.js';
 import type { EntryAtoms, EntryLocaleAtoms } from './atoms/entry.js';
 import type { Page } from './atoms/nav.js';
 import type { RootAtoms } from './atoms/root.js';
@@ -17,6 +17,7 @@ import type { ReactiveNode } from './atoms/ReactiveNode.js';
 interface EntryContextValue {
     entry: EntryAtoms;
     localeData: EntryLocaleAtoms;
+    richTextImages: ReadonlyMap<string, ResolvedEditorImage>;
     selectedEntry: EntryRecord<Record<string, unknown>>;
 }
 export interface DashboardOptions {
@@ -84,9 +85,10 @@ export declare function useDashboardContext(): DashboardContextValue;
 export interface EntryScopeProps {
     entry: EntryAtoms;
     localeData: EntryLocaleAtoms;
+    richTextImages: ReadonlyMap<string, ResolvedEditorImage>;
     selectedEntry: EntryRecord<Record<string, unknown>>;
 }
-export declare function EntryScope({ children, entry, localeData, selectedEntry }: PropsWithChildren<EntryScopeProps>): import("react").FunctionComponentElement<import("react").ProviderProps<EntryContextValue | null>>;
+export declare function EntryScope({ children, entry, localeData, richTextImages, selectedEntry }: PropsWithChildren<EntryScopeProps>): import("react").FunctionComponentElement<import("react").ProviderProps<EntryContextValue | null>>;
 export declare function useEntryAtoms(): EntryContextValue;
 export declare function useOptionalEntryAtoms(): EntryContextValue | null;
 /**

package/dist/dashboard/hooks.js

@@ -22,7 +22,9 @@ import {
   localAtom,
   viewsAtom
 } from "./atoms/core.js";
-import { EntryEditor } from "./atoms/editor.js";
+import {
+  EntryEditor
+} from "./atoms/editor.js";
 import { previewMetadataAtom } from "./atoms/preview.js";
 import { policyAtom, userAtom } from "./atoms/user.js";
 var entryContext = createContext(null);
@@ -99,11 +101,12 @@ function EntryScope({
   children,
   entry,
   localeData,
+  richTextImages,
   selectedEntry
 }) {
   const value = useMemo(
-    () => ({ entry, localeData, selectedEntry }),
-    [entry, localeData, selectedEntry]
+    () => ({ entry, localeData, richTextImages, selectedEntry }),
+    [entry, localeData, richTextImages, selectedEntry]
   );
   return createElement(entryContext.Provider, { value }, children);
 }
@@ -137,9 +140,10 @@ function useNodeEditor(node, type) {
       node,
       parent instanceof EntryEditor ? parent : void 0,
       activeVersion ?? void 0,
-      policy
+      policy,
+      scope?.richTextImages
     );
-  }, [activeVersion, node, parent, policy, type]);
+  }, [activeVersion, node, parent, policy, scope?.richTextImages, type]);
   return editor;
 }
 function useFieldNode(field) {

package/dist/dashboard/icons.d.ts

@@ -107,6 +107,7 @@ export declare function IcRoundMoreHoriz(props: SVGProps<SVGSVGElement>): import
 export declare function IcRoundMoreVert(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
 export declare function IcRoundNorthEast(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
 export declare function IcRoundNumbers(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
+export declare function IcRoundOpenInFull(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
 export declare function IcRoundOpenInNew(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
 export declare function IcRoundPanorama(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;
 export declare function IcRoundPermMedia(props: SVGProps<SVGSVGElement>): import("react").JSX.Element;

package/dist/dashboard/icons.js

@@ -1631,6 +1631,15 @@ function IcRoundNumbers(props) {
     }
   ) });
 }
+function IcRoundOpenInFull(props) {
+  return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M21 8.59V4c0-.55-.45-1-1-1h-4.59c-.89 0-1.34 1.08-.71 1.71l1.59 1.59l-10 10l-1.59-1.59c-.62-.63-1.7-.19-1.7.7V20c0 .55.45 1 1 1h4.59c.89 0 1.34-1.08.71-1.71L7.71 17.7l10-10l1.59 1.59c.62.63 1.7.19 1.7-.7"
+    }
+  ) });
+}
 function IcRoundOpenInNew(props) {
   return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
     "path",
@@ -2615,6 +2624,7 @@ export {
   IcRoundNorthEast,
   IcRoundNotes,
   IcRoundNumbers,
+  IcRoundOpenInFull,
   IcRoundOpenInNew,
   IcRoundPanorama,
   IcRoundPermMedia,

package/dist/field/check/CheckField.view.js

@@ -9,9 +9,9 @@ import { useField, useFieldError, useFieldOptions } from "alinea/dashboard/hooks
 
 // src/field/check/CheckField.module.css
 var CheckField_default = {
+  "checkline": "alinea-checkline",
   "checkline-required": "alinea-checkline-required",
-  "checklineRequired": "alinea-checkline-required",
-  "checkline": "alinea-checkline"
+  "checklineRequired": "alinea-checkline-required"
 };
 
 // src/field/check/CheckField.view.tsx

package/dist/field/code/CodeField.view.js

@@ -64,27 +64,27 @@ import { Fragment, useId } from "react";
 
 // src/field/code/CodeField.module.css
 var CodeField_default = {
-  "CodeEditorInput-number": "alinea-CodeEditorInput-number",
-  "CodeEditorInputNumber": "alinea-CodeEditorInput-number",
+  "CodeEditorInput": "alinea-CodeEditorInput",
+  "CodeEditorInput-pre": "alinea-CodeEditorInput-pre",
+  "CodeEditorInputPre": "alinea-CodeEditorInput-pre",
+  "CodeEditorInput-keyword": "alinea-CodeEditorInput-keyword",
+  "CodeEditorInputKeyword": "alinea-CodeEditorInput-keyword",
   "CodeEditorInput-string": "alinea-CodeEditorInput-string",
   "CodeEditorInputString": "alinea-CodeEditorInput-string",
+  "CodeEditorInput-number": "alinea-CodeEditorInput-number",
+  "CodeEditorInputNumber": "alinea-CodeEditorInput-number",
+  "CodeEditorInput-editor": "alinea-CodeEditorInput-editor",
+  "CodeEditorInputEditor": "alinea-CodeEditorInput-editor",
   "CodeEditorInput-regex": "alinea-CodeEditorInput-regex",
   "CodeEditorInputRegex": "alinea-CodeEditorInput-regex",
   "CodeEditorInput-punctuation": "alinea-CodeEditorInput-punctuation",
   "CodeEditorInputPunctuation": "alinea-CodeEditorInput-punctuation",
+  "CodeEditorInput-comment": "alinea-CodeEditorInput-comment",
+  "CodeEditorInputComment": "alinea-CodeEditorInput-comment",
   "CodeEditorInput-identifier": "alinea-CodeEditorInput-identifier",
   "CodeEditorInputIdentifier": "alinea-CodeEditorInput-identifier",
-  "CodeEditorInput": "alinea-CodeEditorInput",
-  "CodeEditorInput-pre": "alinea-CodeEditorInput-pre",
-  "CodeEditorInputPre": "alinea-CodeEditorInput-pre",
-  "CodeEditorInput-keyword": "alinea-CodeEditorInput-keyword",
-  "CodeEditorInputKeyword": "alinea-CodeEditorInput-keyword",
   "CodeEditorInput-textarea": "alinea-CodeEditorInput-textarea",
-  "CodeEditorInputTextarea": "alinea-CodeEditorInput-textarea",
-  "CodeEditorInput-comment": "alinea-CodeEditorInput-comment",
-  "CodeEditorInputComment": "alinea-CodeEditorInput-comment",
-  "CodeEditorInput-editor": "alinea-CodeEditorInput-editor",
-  "CodeEditorInputEditor": "alinea-CodeEditorInput-editor"
+  "CodeEditorInputTextarea": "alinea-CodeEditorInput-textarea"
 };
 
 // src/field/code/CodeField.view.tsx

package/dist/field/date/DateField.view.js

@@ -1,6 +1,16 @@
+import "../../chunks/chunk-VXZM6V4P.js";
+import "../../chunks/chunk-O7XWTMCB.js";
+import "../../chunks/chunk-RKDPDEF7.js";
+import "../../chunks/chunk-NIVGVRDS.js";
 import {
   $58246871e4652552$export$6b862160d295c8e
 } from "../../chunks/chunk-IYAQC63Y.js";
+import "../../chunks/chunk-SJBZFMQ2.js";
+import "../../chunks/chunk-6V4TAD2N.js";
+import {
+  $2eb8e6d23f3d0cb0$export$a54013f0d02a8f82
+} from "../../chunks/chunk-S4AU6SRS.js";
+import "../../chunks/chunk-AC4U3IMS.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/field/date/DateField.view.tsx
@@ -16,7 +26,7 @@ function DateFieldView({ field }) {
     if (!value) return null;
     return $58246871e4652552$export$6b862160d295c8e(value);
   }, [value]);
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx($2eb8e6d23f3d0cb0$export$a54013f0d02a8f82, { locale: "en-GB", children: /* @__PURE__ */ jsx(
     DatePicker,
     {
       description: options.help,
@@ -28,7 +38,7 @@ function DateFieldView({ field }) {
       onChange: (next) => setValue(next?.toString() || ""),
       value: parsedValue
     }
-  );
+  ) });
 }
 export {
   DateFieldView

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

@@ -14,8 +14,8 @@ export interface FileLink<InferredFields = undefined> extends EntryReference {
 }
 export declare namespace FileLink {
     const title: import("../../core/Expr").Expr<string>;
-    const url: import("../hidden").HiddenField<string>;
-    const href: import("../hidden").HiddenField<string>;
+    const url: import("../../core/Expr").Expr<string>;
+    const href: import("../../core/Expr").Expr<string>;
     const extension: import("../hidden").HiddenField<string>;
     const size: import("../hidden").HiddenField<number>;
 }

package/dist/field/link/FileLink.js

@@ -12,14 +12,16 @@ import { entryPicker } from "alinea/picker/entry";
 var FileLink;
 ((FileLink2) => {
   FileLink2.title = Entry.title;
-  FileLink2.url = MediaFile.location;
-  FileLink2.href = MediaFile.location;
+  FileLink2.url = Entry.url;
+  FileLink2.href = Entry.url;
   FileLink2.extension = MediaFile.extension;
   FileLink2.size = MediaFile.size;
 })(FileLink || (FileLink = {}));
 var fileCondition = {
   _type: "MediaFile",
-  extension: { notIn: imageExtensions }
+  extension: {
+    notIn: [...imageExtensions, ...imageExtensions.map((e) => e.toUpperCase())]
+  }
 };
 function filePicker(multiple, options) {
   return entryPicker({

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

@@ -27,7 +27,7 @@ export interface ImageLink<InferredFields = undefined> extends EntryReference {
 export declare namespace ImageLink {
     const title: import("../../core/Expr").Expr<string>;
     const alt: import("../../core/media/MediaAltField").MediaAltField;
-    const src: import("../hidden").HiddenField<string>;
+    const src: import("../../core/Expr").Expr<string>;
     const extension: import("../hidden").HiddenField<string>;
     const size: import("../hidden").HiddenField<number>;
     const hash: import("../hidden").HiddenField<string>;

package/dist/field/link/ImageLink.js

@@ -13,7 +13,7 @@ var ImageLink;
 ((ImageLink2) => {
   ImageLink2.title = Entry.title;
   ImageLink2.alt = MediaFile.alt;
-  ImageLink2.src = MediaFile.location;
+  ImageLink2.src = Entry.url;
   ImageLink2.extension = MediaFile.extension;
   ImageLink2.size = MediaFile.size;
   ImageLink2.hash = MediaFile.hash;

package/dist/field/link/Link.js

@@ -20,7 +20,7 @@ function link(label, options = {}) {
         selection: EntryLink
       }),
       url: urlPicker(options),
-      file: filePicker(false, options)
+      file: filePicker(false, { ...options, location: void 0 })
     }
   });
 }
@@ -35,7 +35,7 @@ function link(label, options = {}) {
           selection: EntryLink
         }),
         url: urlPicker(options),
-        file: filePicker(true, options)
+        file: filePicker(true, { ...options, location: void 0 })
       }
     });
   }