alinea 1.7.0 → 2.0.0-preview.1

package/dist/core/field/UnionField.js

@@ -1,22 +1,71 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/field/UnionField.ts
 import { Field } from "../Field.js";
 import { Schema } from "../Schema.js";
-import {
-  UnionShape
-} from "../shape/UnionShape.js";
+import { Type } from "../Type.js";
+import { UnionRow } from "../UnionRow.js";
+import { entries } from "../util/Objects.js";
 var UnionField = class extends Field {
-  constructor(schema, shapes, meta) {
+  constructor(schema, meta) {
+    const customQueryValue = meta.queryValue;
+    const customReferences = meta.references;
     super({
-      shape: new UnionShape(
-        meta.options.label,
-        shapes,
-        meta.options.initialValue,
-        meta.postProcess
-      ),
       referencedViews: schema ? Schema.referencedViews(schema) : [],
-      ...meta
+      ...meta,
+      defaultValue() {
+        return meta.options.initialValue ?? {};
+      },
+      withInitialValue(value) {
+        if (!value) return value;
+        const type = schema[value[UnionRow.type]];
+        if (!type) return value;
+        return Type.withInitialValue(type, value);
+      },
+      async applyLinks(value, loader) {
+        if (!value) return;
+        const type = schema?.[value[UnionRow.type]];
+        if (type) await Type.applyLinks(type, value, loader);
+      },
+      searchableText(value) {
+        if (!value) return "";
+        const type = schema?.[value[UnionRow.type]];
+        return type ? Type.searchableText(type, value) : "";
+      },
+      references(value, context) {
+        const result = customReferences?.(value, context) ?? [];
+        if (!value) return result;
+        const type = schema?.[value[UnionRow.type]];
+        if (type) result.push(...Type.references(type, value, context.path));
+        return result;
+      },
+      anchors(value, context) {
+        const result = [];
+        if (!value) return result;
+        const type = schema?.[value[UnionRow.type]];
+        if (type) result.push(...Type.anchors(type, value, context.path));
+        return result;
+      },
+      normalizeAnchors(value, context) {
+        if (!value) return value;
+        const type = schema?.[value[UnionRow.type]];
+        if (!type) return value;
+        return Type.normalizeAnchors(type, value, context);
+      },
+      async queryValue(value, loader) {
+        if (!value) return value;
+        const type = schema?.[value[UnionRow.type]];
+        if (type) {
+          const record = value;
+          await Promise.all(
+            entries(Type.fields(type)).map(async ([key, field]) => {
+              record[key] = await Field.queryValue(field, record[key], loader);
+            })
+          );
+        }
+        if (customQueryValue) return customQueryValue(value, loader);
+        return value;
+      }
     });
   }
 };

package/dist/core/media/CreatePreview.browser.js

@@ -1,15 +1,15 @@
+import {
+  I,
+  m
+} from "../../chunks/chunk-LB3UYTOL.js";
 import {
   rgbaToThumbHash,
   thumbHashToAverageRGBA
 } from "../../chunks/chunk-GWZU2AWQ.js";
-import {
-  I,
-  m
-} from "../../chunks/chunk-76QF5YTJ.js";
 import {
   __commonJS,
   __toESM
-} from "../../chunks/chunk-NZLE2WMY.js";
+} from "../../chunks/chunk-CQ52GEHY.js";
 
 // node_modules/smartcrop/smartcrop.js
 var require_smartcrop = __commonJS({

package/dist/core/media/CreatePreview.js

@@ -1,21 +1,26 @@
+import {
+  I,
+  m
+} from "../../chunks/chunk-LB3UYTOL.js";
 import {
   rgbaToThumbHash,
   thumbHashToAverageRGBA
 } from "../../chunks/chunk-GWZU2AWQ.js";
-import {
-  I,
-  m
-} from "../../chunks/chunk-76QF5YTJ.js";
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/CreatePreview.ts
 import { base64 } from "../util/Encoding.js";
 async function createPreview(blob) {
-  const { default: sharp } = await import("sharp").catch(() => {
-    throw new Error(
-      `To create image previews server side you need to install the 'sharp' package`
-    );
-  });
+  const { default: sharp } = await import(
+    /* @vite-ignore */
+    "sharp"
+  ).catch(
+    () => {
+      throw new Error(
+        `To create image previews server side you need to install the 'sharp' package`
+      );
+    }
+  );
   const image = sharp(await blob.arrayBuffer());
   const metadata = await image.metadata();
   const width = metadata.width ?? 0;

package/dist/core/media/IsImage.js

@@ -1,4 +1,4 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/IsImage.ts
 var imageExtensions = [

package/dist/core/media/MediaAltField.d.ts

@@ -0,0 +1,9 @@
+import type { FieldOptions, WithoutLabel } from 'alinea/core/Field';
+import { ScalarField } from 'alinea/core/field/ScalarField';
+import type { TextOptions } from 'alinea/field/text/TextField';
+export type MediaAltValue = string | Record<string, string> | undefined;
+export interface MediaAltOptions extends Omit<TextOptions, 'initialValue' | 'validate'>, FieldOptions<MediaAltValue> {
+}
+export declare class MediaAltField extends ScalarField<MediaAltValue, MediaAltOptions> {
+}
+export declare function mediaAlt(label: string, options?: WithoutLabel<MediaAltOptions>): MediaAltField;

package/dist/core/media/MediaAltField.js

@@ -0,0 +1,17 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/core/media/MediaAltField.ts
+import { ScalarField } from "alinea/core/field/ScalarField";
+import { viewKeys } from "alinea/dashboard/ViewKeys";
+var MediaAltField = class extends ScalarField {
+};
+function mediaAlt(label, options = {}) {
+  return new MediaAltField({
+    options: { label, ...options },
+    view: viewKeys.MediaAltInput
+  });
+}
+export {
+  MediaAltField,
+  mediaAlt
+};

package/dist/core/media/MediaLocation.d.ts

@@ -1 +1,43 @@
+import type { Config } from '../Config.js';
 export declare const MEDIA_LOCATION = "@alinea.location";
+export interface MediaUrlMeta {
+    /** The media entry path without its extension. */
+    path: string;
+    /** The paths of parent media directories. */
+    parentPaths: Array<string>;
+    /** The file extension, including its leading dot. */
+    extension: string;
+    /** The location stored in the media entry, excluding mediaDir. */
+    location: string;
+    workspace: string;
+    root: string;
+}
+export interface MediaUrlResolver {
+    (meta: MediaUrlMeta): string;
+}
+export interface MediaPublicUrlMeta extends Omit<MediaUrlMeta, 'parentPaths'> {
+    /** @deprecated Pass parentPaths directly when available. */
+    entryUrl?: string;
+    parentPaths?: Array<string>;
+}
+export interface MediaEntryUrlMeta {
+    defaultUrl: string;
+    parentPaths: Array<string>;
+    path: string;
+    workspace: string;
+    root: string;
+    data: Record<string, unknown>;
+}
+/** Maps media entry locations between storage and public URLs. */
+export declare namespace MediaLocation {
+    /** The workspace directory where media files are physically stored. */
+    function directory(config: Config, workspace: string): string;
+    /** Convert an entry-relative media location to its physical storage path. */
+    function storagePath(config: Config, workspace: string, location: string): string;
+    /** Remove the workspace storage directory from a prepared upload location. */
+    function entryLocation(config: Config, workspace: string, location: string): string;
+    /** Resolve the public URL used to serve a media entry. */
+    function publicUrl(config: Config, meta: MediaPublicUrlMeta): string;
+    /** Resolve a media entry URL, falling back to its regular entry URL. */
+    function entryUrl(config: Config, meta: MediaEntryUrlMeta): string;
+}

package/dist/core/media/MediaLocation.js

@@ -1,7 +1,59 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/MediaLocation.ts
+import { Workspace } from "../Workspace.js";
+import { join, normalize } from "../util/Paths.js";
+import { joinPaths } from "../util/Urls.js";
 var MEDIA_LOCATION = "@alinea.location";
+var MediaLocation;
+((MediaLocation2) => {
+  function directory(config, workspace) {
+    return Workspace.data(config.workspaces[workspace]).mediaDir ?? "";
+  }
+  MediaLocation2.directory = directory;
+  function storagePath(config, workspace, location) {
+    return join(directory(config, workspace), location);
+  }
+  MediaLocation2.storagePath = storagePath;
+  function entryLocation(config, workspace, location) {
+    const mediaDir = directory(config, workspace);
+    if (!mediaDir) return location;
+    const prefix = normalize(mediaDir).replace(/\/$/, "");
+    if (location === prefix) return "";
+    return location.startsWith(`${prefix}/`) ? location.slice(prefix.length) : location;
+  }
+  MediaLocation2.entryLocation = entryLocation;
+  function publicUrl(config, meta) {
+    const { entryUrl: entryUrl2, parentPaths, ...media } = meta;
+    const { location, workspace } = meta;
+    const { mediaUrl } = Workspace.data(config.workspaces[workspace]);
+    if (!mediaUrl) return location;
+    if (typeof mediaUrl === "function") {
+      return mediaUrl({
+        ...media,
+        parentPaths: parentPaths ?? entryUrl2?.split("/").filter(Boolean).slice(0, -1) ?? []
+      });
+    }
+    return joinPaths(mediaUrl, location);
+  }
+  MediaLocation2.publicUrl = publicUrl;
+  function entryUrl(config, meta) {
+    const { data, defaultUrl, parentPaths, path, root, workspace } = meta;
+    const { extension, location } = data;
+    if (typeof extension !== "string" || typeof location !== "string")
+      return defaultUrl;
+    return publicUrl(config, {
+      extension,
+      location,
+      parentPaths,
+      path,
+      root,
+      workspace
+    });
+  }
+  MediaLocation2.entryUrl = entryUrl;
+})(MediaLocation || (MediaLocation = {}));
 export {
-  MEDIA_LOCATION
+  MEDIA_LOCATION,
+  MediaLocation
 };

package/dist/core/media/MediaRoot.d.ts

@@ -1,4 +1,4 @@
 import type { Page } from '../Page.js';
-import { type Root } from '../Root.js';
+import { type Root, RootOptions } from '../Root.js';
 export type MediaRoot<Children extends Record<string, Page>> = Root<Children>;
-export declare function createMediaRoot<Children extends Record<string, Page>>(children?: Children): MediaRoot<Children>;
+export declare function createMediaRoot<Children extends Record<string, Page>>(options?: RootOptions<Children>): MediaRoot<Children>;

package/dist/core/media/MediaRoot.js

@@ -1,19 +1,20 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/MediaRoot.ts
-import { viewKeys } from "alinea/dashboard/editor/ViewKeys";
-import { IcRoundPermMedia } from "alinea/ui/icons/IcRoundPermMedia";
+import { LucideImage } from "alinea/dashboard/icons";
 import { root } from "../Root.js";
-function createMediaRoot(children = {}) {
-  return root("Media", {
-    icon: IcRoundPermMedia,
+function createMediaRoot(options) {
+  const rootOptions = {
+    icon: LucideImage,
     contains: ["MediaLibrary"],
-    view: viewKeys.MediaExplorer,
+    ...options,
     isMediaRoot: true,
-    children: {
-      ...children
-    }
-  });
+    i18n: void 0,
+    // We move i18n into a separate property to persist it,
+    // but don't treat media files as localised
+    _media: { i18n: options?.i18n }
+  };
+  return root("Media", rootOptions);
 }
 export {
   createMediaRoot

package/dist/core/media/MediaTypes.d.ts

@@ -1,25 +1,31 @@
 import { type Type } from '../Type.js';
 export type MediaLibrary = Type.Infer<typeof MediaLibrary>;
 export declare const MediaLibrary: Type<{
-    title: import("alinea/field/hidden").HiddenField<string>;
-    path: import("alinea/field/hidden").HiddenField<string>;
+    title: import("alinea/field/text/TextField").TextField;
+    path: import("alinea/field/path/PathField").PathField;
 }>;
 export type MediaFile = Type.Infer<typeof MediaFile>;
 export declare const MediaFile: Type<{
-    title: import("alinea/field/text.js").TextField;
-    path: import("alinea/field/hidden").HiddenField<string>;
-    location: import("alinea/field/hidden").HiddenField<string>;
-    previewUrl: import("alinea/field/hidden").HiddenField<string>;
-    extension: import("alinea/field/hidden").HiddenField<string>;
-    size: import("alinea/field/hidden").HiddenField<number>;
-    hash: import("alinea/field/hidden").HiddenField<string>;
-    width: import("alinea/field/hidden").HiddenField<number>;
-    height: import("alinea/field/hidden").HiddenField<number>;
-    preview: import("alinea/field/hidden").HiddenField<string>;
-    averageColor: import("alinea/field/hidden").HiddenField<string>;
-    focus: import("alinea/field/hidden").HiddenField<{
+    title: import("alinea/field/text/TextField").TextField;
+    path: import("alinea/field/path/PathField").PathField;
+    metadata: import("alinea/field/object/ObjectField").ObjectField<{
+        aliases: import("alinea/field/metadata/MetadataAliases").AliasesField;
+    }> & {
+        aliases: import("alinea/field/metadata/MetadataAliases").AliasesField;
+    };
+    location: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    previewUrl: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    extension: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    size: import("alinea/field/hidden/HiddenField").HiddenField<number>;
+    hash: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    alt: import("./MediaAltField.js").MediaAltField;
+    width: import("alinea/field/hidden/HiddenField").HiddenField<number>;
+    height: import("alinea/field/hidden/HiddenField").HiddenField<number>;
+    preview: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    averageColor: import("alinea/field/hidden/HiddenField").HiddenField<string>;
+    focus: import("alinea/field/hidden/HiddenField").HiddenField<{
         x: number;
         y: number;
     }>;
-    thumbHash: import("alinea/field/hidden").HiddenField<string>;
+    thumbHash: import("alinea/field/hidden/HiddenField").HiddenField<string>;
 }>;

package/dist/core/media/MediaTypes.js

@@ -1,35 +1,63 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/MediaTypes.ts
-import { viewKeys } from "alinea/dashboard/editor/ViewKeys";
-import { hidden } from "alinea/field/hidden";
+import { IcRoundPermMedia } from "alinea/dashboard/icons";
+import { hidden } from "alinea/field/hidden/HiddenField";
+import { aliases } from "alinea/field/metadata/MetadataAliases";
+import { object } from "alinea/field/object/ObjectField";
+import { path } from "alinea/field/path/PathField";
 import { text } from "alinea/field/text/TextField";
-import { IcRoundPermMedia } from "alinea/ui/icons/IcRoundPermMedia";
 import { type } from "../Type.js";
+import { mediaAlt } from "./MediaAltField.js";
+import { MediaLocation } from "./MediaLocation.js";
 var MediaLibrary = type("Media directory", {
-  view: viewKeys.MediaExplorer,
   icon: IcRoundPermMedia,
-  contains: ["MediaLibrary"],
+  contains: ["MediaLibrary", "MediaFile"],
+  defaultView: "overview",
   fields: {
-    title: hidden("Title"),
-    path: hidden("Path")
+    title: text("Title", { required: true }),
+    path: path("Path")
   }
 });
 var MediaFile = type("Media file", {
-  view: viewKeys.MediaFile,
-  summaryRow: viewKeys.FileSummaryRow,
-  summaryThumb: viewKeys.FileSummaryThumb,
   hidden: true,
+  entryUrl({ config, data, defaultUrl, parentPaths, path: path2, root, workspace }) {
+    return MediaLocation.entryUrl(config, {
+      data,
+      defaultUrl,
+      parentPaths,
+      path: path2,
+      root,
+      workspace
+    });
+  },
   fields: {
     title: text("Title"),
-    path: hidden("Path"),
+    path: path("Path"),
+    metadata: object("Metadata", {
+      fields: {
+        aliases: aliases()
+      }
+    }),
     location: hidden("Location"),
     previewUrl: hidden("Preview URL"),
-    extension: hidden("Extension"),
-    size: hidden("File size"),
+    extension: hidden("Extension", {
+      overview: true
+    }),
+    size: hidden("File size", {
+      overview: true
+    }),
     hash: hidden("Hash"),
-    width: hidden("Image width"),
-    height: hidden("Image height"),
+    alt: mediaAlt("Alt text", {
+      multiline: true,
+      help: "Describe the image for screen readers and SEO"
+    }),
+    width: hidden("Image width", {
+      overview: true
+    }),
+    height: hidden("Image height", {
+      overview: true
+    }),
     preview: hidden("Preview"),
     averageColor: hidden("Average color"),
     focus: hidden("Focus"),

package/dist/core/media/Summary.d.ts

@@ -8,17 +8,17 @@ export declare function summarySelection(schema: Schema): {
     title: import("../Expr.js").Expr<string>;
     path: import("../Expr.js").Expr<string>;
     url: import("../Expr.js").Expr<string>;
-    extension: import("alinea/field/hidden.js").HiddenField<string>;
-    size: import("alinea/field/hidden.js").HiddenField<number>;
-    preview: import("alinea/field/hidden.js").HiddenField<string>;
-    thumbHash: import("alinea/field/hidden.js").HiddenField<string>;
-    averageColor: import("alinea/field/hidden.js").HiddenField<string>;
-    focus: import("alinea/field/hidden.js").HiddenField<{
+    extension: import("../../field/hidden.js").HiddenField<string>;
+    size: import("../../field/hidden.js").HiddenField<number>;
+    preview: import("../../field/hidden.js").HiddenField<string>;
+    thumbHash: import("../../field/hidden.js").HiddenField<string>;
+    averageColor: import("../../field/hidden.js").HiddenField<string>;
+    focus: import("../../field/hidden.js").HiddenField<{
         x: number;
         y: number;
     }>;
-    width: import("alinea/field/hidden.js").HiddenField<number>;
-    height: import("alinea/field/hidden.js").HiddenField<number>;
+    width: import("../../field/hidden.js").HiddenField<number>;
+    height: import("../../field/hidden.js").HiddenField<number>;
     parents: {
         edge: 'parents';
         select: {

package/dist/core/media/Summary.js

@@ -1,4 +1,4 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/media/Summary.ts
 import { Entry } from "../Entry.js";

package/dist/core/media/UploadLimits.d.ts

@@ -0,0 +1 @@
+export declare function assertUploadSize(fileName: string, size: number | undefined, maxUploadSize: number | undefined): void;

package/dist/core/media/UploadLimits.js

@@ -0,0 +1,20 @@
+import {
+  prettyBytes
+} from "../../chunks/chunk-HRTN3UQ6.js";
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/core/media/UploadLimits.ts
+import { ErrorCode, HttpError } from "../HttpError.js";
+function assertUploadSize(fileName, size, maxUploadSize) {
+  if (maxUploadSize === void 0 || size === void 0) return;
+  if (size <= maxUploadSize) return;
+  throw new HttpError(
+    ErrorCode.PayloadTooLarge,
+    `File "${fileName}" is ${prettyBytes(
+      size
+    )}, which exceeds the configured limit of ${prettyBytes(maxUploadSize)}`
+  );
+}
+export {
+  assertUploadSize
+};

package/dist/core/pages/Snippet.js

@@ -1,4 +1,4 @@
-import "../../chunks/chunk-NZLE2WMY.js";
+import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/core/pages/Snippet.ts
 import { Expr } from "../Expr.js";

package/dist/core/shape/ListShape.d.ts

@@ -1,47 +1 @@
-import type { LinkResolver } from 'alinea/core/db/LinkResolver';
-import * as Y from 'yjs';
-import type { Label } from '../Label.js';
-import type { Shape } from '../Shape.js';
-import type { PostProcess } from '../pages/PostProcess.js';
-import { RecordShape } from './RecordShape.js';
-export interface ListRow {
-    _id: string;
-    _type: string;
-    _index: string;
-}
-export declare namespace ListRow {
-    const id = "_id";
-    const index = "_index";
-    const type = "_type";
-}
-export interface ListMutator<Row> {
-    replace(id: string, row: Row): void;
-    push(row: Omit<Row, '_id' | '_index'>, insertAt?: number): void;
-    remove(id: string): void;
-    move(oldIndex: number, newIndex: number): void;
-    read(id: string): Row | undefined;
-}
-export declare class ListShape<Row extends ListRow> implements Shape<Array<Row>, ListMutator<Row>> {
-    label: Label;
-    initialValue?: Array<Row> | undefined;
-    protected postProcess?: PostProcess<Array<Row>> | undefined;
-    shapes: Record<string, RecordShape>;
-    constructor(label: Label, shapes: Record<string, RecordShape>, initialValue?: Array<Row> | undefined, postProcess?: PostProcess<Array<Row>> | undefined);
-    create(): Row[];
-    toV1(value: any): Row[];
-    private normalizeRow;
-    toY(value: Array<Row>): Y.Map<unknown>;
-    fromY(map: Y.Map<any>): Array<Row>;
-    applyY(value: Row[], parent: Y.Map<any>, key: string): void;
-    init(parent: Y.Map<any>, key: string): void;
-    watch(parent: Y.Map<any>, key: string): (fun: () => void) => () => void;
-    mutator(parent: Y.Map<any>, key: string): {
-        replace: (id: string, row: Row) => void;
-        push: (row: Omit<Row, '_id' | '_index'>, insertAt?: number) => void;
-        remove(id: string): void;
-        move: (oldIndex: number, newIndex: number) => void;
-        read: (id: string) => Row | undefined;
-    };
-    applyLinks(value: Array<Row>, loader: LinkResolver): Promise<void>;
-    searchableText(value: Array<Row>): string;
-}
+export * from 'alinea/core/ListRow';