alinea 1.0.4 → 1.0.6

package/dist/backend/Database.js

@@ -622,8 +622,8 @@ ${JSON.stringify(mutation)}`
         }
       }
       if (fix && v0Ids.size > 0) {
-        const entries3 = await tx.select().from(EntryRow);
-        for (const entry of entries3) {
+        const entries2 = await tx.select().from(EntryRow);
+        for (const entry of entries2) {
           const file = entryFile(this.config, entry);
           entry.data = JSON.parse(JSON.stringify(entry.data), (key, value) => {
             if (key === "_entry")
@@ -704,20 +704,22 @@ ${JSON.stringify(mutation)}`
       if (noChanges)
         return;
       await _Database.index(tx);
-      const isInserted = sql`(${EntryRow.id}, ${coalesce(
-        EntryRow.locale,
-        sql`'null'`
-      )}, ${EntryRow.status}) in ${values(...inserted)}`;
-      const entries2 = await tx.select().from(EntryRow).where(isInserted);
-      for (const entry of entries2) {
-        const rowHash = await createRowHash(entry);
-        await tx.update(EntryRow).set({
-          rowHash
-        }).where(
-          eq(EntryRow.id, entry.id),
-          is(EntryRow.locale, entry.locale),
-          eq(EntryRow.status, entry.status)
-        );
+      if (inserted.length > 0) {
+        const isInserted = sql`(${EntryRow.id}, ${coalesce(
+          EntryRow.locale,
+          sql`'null'`
+        )}, ${EntryRow.status}) in ${values(...inserted)}`;
+        const entries2 = await tx.select().from(EntryRow).where(isInserted);
+        for (const entry of entries2) {
+          const rowHash = await createRowHash(entry);
+          await tx.update(EntryRow).set({
+            rowHash
+          }).where(
+            eq(EntryRow.id, entry.id),
+            is(EntryRow.locale, entry.locale),
+            eq(EntryRow.status, entry.status)
+          );
+        }
       }
       await this.writeMeta(tx, commitHash);
     });

package/dist/backend/resolver/EntryResolver.js

@@ -549,7 +549,7 @@ var EntryResolver = class {
     const singleResult = this.isSingleResult(query);
     const transact = async (tx) => {
       const rows = await dbQuery.all(tx);
-      const linkResolver = new LinkResolver(this, tx, ctx.status);
+      const linkResolver = new LinkResolver(this, tx, ctx);
       const result = singleResult ? rows[0] ?? null : rows;
       if (result)
         await this.post({ linkResolver }, result, query);

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

@@ -1,14 +1,14 @@
 import type { InferProjection, Projection } from 'alinea/core/Graph';
-import { Status } from 'alinea/core/Graph';
 import DataLoader from 'dataloader';
 import { Store } from '../Store.js';
 import type { EntryResolver } from './EntryResolver.js';
+import { ResolveContext } from './ResolveContext.js';
 export declare class LinkResolver {
     resolver: EntryResolver;
     store: Store;
-    status: Status;
+    private ctx;
     loaders: Map<Projection, DataLoader<string, object, string>>;
-    constructor(resolver: EntryResolver, store: Store, status: Status);
+    constructor(resolver: EntryResolver, store: Store, ctx: ResolveContext);
     load(projection: Projection): DataLoader<string, object, string>;
     resolveLinks<P extends Projection>(projection: P, entryIds: ReadonlyArray<string>): Promise<Array<InferProjection<P> | undefined>>;
 }

package/dist/backend/resolver/LinkResolver.js

@@ -10,17 +10,20 @@ var import_dataloader = __toESM(require_dataloader(), 1);
 import { Entry } from "alinea/core/Entry";
 import { ResolveContext } from "./ResolveContext.js";
 var LinkResolver = class {
-  constructor(resolver, store, status) {
+  constructor(resolver, store, ctx) {
     this.resolver = resolver;
     this.store = store;
-    this.status = status;
+    this.ctx = ctx;
   }
   loaders = /* @__PURE__ */ new Map();
   load(projection) {
     return new import_dataloader.default(
       async (ids) => {
         const query = this.resolver.query(
-          new ResolveContext({ status: this.status }),
+          new ResolveContext({
+            locale: this.ctx.locale,
+            status: this.ctx.status
+          }),
           {
             select: {
               entryId: Entry.id,
@@ -46,8 +49,8 @@ var LinkResolver = class {
     function skipErrors(results) {
       return results.map((result) => {
         if (result instanceof Error) {
-          console.error(result);
-          return void 0;
+          Error.captureStackTrace(result);
+          throw result;
         }
         return result;
       });

package/dist/chunks/{chunk-MCCVEGL3.js → chunk-MAYW4CMH.js}

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

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-MCCVEGL3.js";
+} from "../chunks/chunk-MAYW4CMH.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-MCCVEGL3.js";
+} from "../chunks/chunk-MAYW4CMH.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-MCCVEGL3.js";
+} from "../chunks/chunk-MAYW4CMH.js";
 import {
   PLazy
 } from "../chunks/chunk-IKINPSS5.js";

package/dist/core/shape/RichTextShape.js

@@ -409,7 +409,7 @@ var RichTextShape = class {
       if (mark[Mark.type] !== "link")
         return;
       const entryId = mark[LinkMark.entry];
-      if (entryId)
+      if (typeof entryId === "string")
         links.set(mark, entryId);
     });
     async function loadLinks() {

package/dist/dashboard/util/PersistentStore.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../../chunks/chunk-MCCVEGL3.js";
+} from "../../chunks/chunk-MAYW4CMH.js";
 import {
   create as create2
 } from "../../chunks/chunk-IOTY7UTU.js";

package/dist/field/link/EntryLink.js

@@ -22,7 +22,9 @@ function entry(label, options = {}) {
     pickers: {
       entry: entryPicker({
         ...options,
-        withNavigation: Boolean(options.location || !options.condition),
+        withNavigation: Boolean(
+          options.location || !options.condition && !options.pickChildren
+        ),
         title: "Select a page",
         max: 1,
         selection: EntryLink
@@ -37,7 +39,9 @@ function entry(label, options = {}) {
       pickers: {
         entry: entryPicker({
           ...options,
-          withNavigation: !options.condition,
+          withNavigation: Boolean(
+            options.location || !options.condition && !options.pickChildren
+          ),
           title: "Select a page",
           selection: EntryLink
         })

package/dist/picker/entry/EntryPicker.browser.js

@@ -16,6 +16,7 @@ import { Workspace } from "alinea/core/Workspace";
 import { workspaceMediaDir } from "alinea/core/util/EntryFilenames";
 import { entries } from "alinea/core/util/Objects";
 import { useConfig } from "alinea/dashboard/hook/UseConfig";
+import { useEntryEditor } from "alinea/dashboard/hook/UseEntryEditor";
 import { useFocusList } from "alinea/dashboard/hook/UseFocusList";
 import { useGraph } from "alinea/dashboard/hook/UseGraph";
 import { useLocale } from "alinea/dashboard/hook/UseLocale";
@@ -81,11 +82,13 @@ function EntryPickerModal({
 }) {
   const config = useConfig();
   const graph = useGraph();
+  const editor = useEntryEditor();
   const {
     title,
     defaultView,
     location,
     max,
+    pickChildren,
     condition,
     withNavigation = true,
     showMedia
@@ -102,6 +105,7 @@ function EntryPickerModal({
   const locale = useLocale();
   const [destination, setDestination] = useState({
     workspace: currentWorkspace,
+    parentId: pickChildren ? editor?.entryId : void 0,
     root: showMedia ? Workspace.defaultMediaRoot(config.workspaces[currentWorkspace]) : currentRoot,
     ...location,
     locale
@@ -145,7 +149,7 @@ function EntryPickerModal({
   );
   const query = useMemo(() => {
     const terms = search.replace(/,/g, " ").split(" ").filter(Boolean);
-    if (!withNavigation && condition) {
+    if (!withNavigation && condition && !pickChildren) {
       return {
         select: Entry,
         search: terms,

package/dist/picker/entry/EntryPicker.d.ts

@@ -9,10 +9,14 @@ import { EntryReference } from './EntryReference.js';
 export interface EntryPickerOptions<Definition = {}> {
     selection: Projection;
     defaultView?: 'row' | 'thumb';
+    /** Show entries from a specific workspace/root */
     location?: {
         workspace: string;
         root: string;
     };
+    /** Choose from direct children of the currently edited entry */
+    pickChildren?: boolean;
+    /** Filter entries by a condition */
     condition?: Filter<EntryFields & Entry>;
     withNavigation?: boolean;
     showMedia?: boolean;

package/package.json

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