@byline/db-postgres 3.0.2 → 3.1.1

package/dist/modules/storage/storage-queries.d.ts

@@ -100,8 +100,9 @@ export declare class DocumentQueries implements IDocumentQueries {
     /**
      * Batch-fetch the version-locale availability sets from the
      * `byline_document_version_locales` ledger. For each version returns the
-     * concrete locales its content is complete in (`availableLocales`, sorted),
-     * or `localeAgnostic: true` when the version carries only the `'all'`
+     * concrete locales its content is complete in (`availableLocales`, in
+     * configured content-locale order), or `localeAgnostic: true` when the
+     * version carries only the `'all'`
      * sentinel (no localized content → renders identically in every locale).
      * Drives the `_availableVersionLocales` read metadata. One indexed query per call.
      */
@@ -109,8 +110,9 @@ export declare class DocumentQueries implements IDocumentQueries {
     /**
      * Batch-fetch the editorial advertised-locale sets from
      * `byline_document_available_locales` (document-grain). For each logical
-     * document returns the sorted set of locales the editor has elected to
-     * advertise. Surfaced on reads as `availableLocales` — the deliberate
+     * document returns the set of locales the editor has elected to advertise,
+     * in configured content-locale order. Surfaced on reads as
+     * `availableLocales` — the deliberate
      * counterpart to the version-grain `_availableVersionLocales` ledger fact;
      * the public advertised set is their intersection. One indexed query per
      * call. See docs/I18N.md.
@@ -216,6 +218,20 @@ export declare class DocumentQueries implements IDocumentQueries {
         created_at: Date;
         updated_at: Date;
     } | null>;
+    /**
+     * getCurrentPath — resolve a document's canonical (source-locale) path.
+     *
+     * Reuses `pathProjection` against `current_documents`, passing
+     * `requestedLocale: undefined` so the projection's fallback floor — the
+     * document's own `source_locale` (COALESCE-guarded to the default content
+     * locale for not-yet-anchored rows) — supplies the canonical path. Used by
+     * the lifecycle to populate `path` on the status-change / unpublish hook
+     * contexts. Returns `null` when no path row (or document) exists.
+     */
+    getCurrentPath({ collection_id, document_id, }: {
+        collection_id: string;
+        document_id: string;
+    }): Promise<string | null>;
     /**
      * getDocumentById — gets the current version of a document by its logical document ID.
      *

package/dist/modules/storage/storage-queries.js

@@ -9,7 +9,7 @@
 // constructs query/command classes before initBylineCore() wires up the Pino
 // logger. A future refactor could inject the logger at construction time by
 // either deferring adapter construction or accepting a lazy logger parameter.
-import { ERR_DATABASE, ERR_NOT_FOUND, getLogger } from '@byline/core';
+import { ERR_DATABASE, ERR_NOT_FOUND, getLogger, orderByContentLocale } from '@byline/core';
 import { and, desc, eq, inArray, isNotNull, sql } from 'drizzle-orm';
 import { collections, currentDocumentsView, currentPublishedDocumentsView, documentAvailableLocales, documentPaths, documents, documentVersionLocales, documentVersions, metaStore, } from '../../database/schema/index.js';
 import { extractFlattenedFieldValue, restoreFieldSetData } from './storage-restore.js';
@@ -133,8 +133,9 @@ export class DocumentQueries {
     /**
      * Batch-fetch the version-locale availability sets from the
      * `byline_document_version_locales` ledger. For each version returns the
-     * concrete locales its content is complete in (`availableLocales`, sorted),
-     * or `localeAgnostic: true` when the version carries only the `'all'`
+     * concrete locales its content is complete in (`availableLocales`, in
+     * configured content-locale order), or `localeAgnostic: true` when the
+     * version carries only the `'all'`
      * sentinel (no localized content → renders identically in every locale).
      * Drives the `_availableVersionLocales` read metadata. One indexed query per call.
      */
@@ -160,15 +161,20 @@ export class DocumentQueries {
             else
                 entry.availableLocales.push(row.locale);
         }
-        for (const entry of result.values())
-            entry.availableLocales.sort();
+        // Stable, config-driven order — `_availableVersionLocales` is a set
+        // consumed via membership, so this just keeps its array order canonical
+        // (matching `availableLocales`). Falls back to a–z when no config.
+        for (const entry of result.values()) {
+            entry.availableLocales = orderByContentLocale(entry.availableLocales);
+        }
         return result;
     }
     /**
      * Batch-fetch the editorial advertised-locale sets from
      * `byline_document_available_locales` (document-grain). For each logical
-     * document returns the sorted set of locales the editor has elected to
-     * advertise. Surfaced on reads as `availableLocales` — the deliberate
+     * document returns the set of locales the editor has elected to advertise,
+     * in configured content-locale order. Surfaced on reads as
+     * `availableLocales` — the deliberate
      * counterpart to the version-grain `_availableVersionLocales` ledger fact;
      * the public advertised set is their intersection. One indexed query per
      * call. See docs/I18N.md.
@@ -192,8 +198,12 @@ export class DocumentQueries {
             }
             arr.push(row.locale);
         }
-        for (const arr of result.values())
-            arr.sort();
+        // Project `availableLocales` in configured content-locale order (the set
+        // is order-insensitive). Read-time only — nothing persisted changes, and
+        // unknown/removed codes sort last rather than throwing. Falls back to a–z
+        // when no server config is registered (e.g. isolated storage tests).
+        for (const [did, arr] of result)
+            result.set(did, orderByContentLocale(arr));
         return result;
     }
     /**
@@ -439,6 +449,26 @@ export class DocumentQueries {
             updated_at: row.updated_at ?? new Date(),
         };
     }
+    /**
+     * getCurrentPath — resolve a document's canonical (source-locale) path.
+     *
+     * Reuses `pathProjection` against `current_documents`, passing
+     * `requestedLocale: undefined` so the projection's fallback floor — the
+     * document's own `source_locale` (COALESCE-guarded to the default content
+     * locale for not-yet-anchored rows) — supplies the canonical path. Used by
+     * the lifecycle to populate `path` on the status-change / unpublish hook
+     * contexts. Returns `null` when no path row (or document) exists.
+     */
+    async getCurrentPath({ collection_id, document_id, }) {
+        const [row] = await this.db
+            .select({
+            path: this.pathProjection(sql `${currentDocumentsView.document_id}`, undefined, sql `${currentDocumentsView.source_locale}`),
+        })
+            .from(currentDocumentsView)
+            .where(and(eq(currentDocumentsView.collection_id, collection_id), eq(currentDocumentsView.document_id, document_id)))
+            .limit(1);
+        return row?.path ?? null;
+    }
     /**
      * getDocumentById — gets the current version of a document by its logical document ID.
      *

package/dist/modules/storage/tests/storage-document-paths.test.js

@@ -181,4 +181,81 @@ describe('byline_document_paths integration', () => {
         });
         expect(result).toBe(null);
     });
+    describe('getCurrentPath', () => {
+        it('resolves a document’s canonical path under its default source locale', async () => {
+            const canonicalPath = `current-path-${Date.now()}`;
+            const created = await commandBuilders.documents.createDocumentVersion({
+                collectionId: testCollection.id,
+                collectionVersion: 1,
+                collectionConfig: PathsCollectionConfig,
+                action: 'create',
+                documentData: { title: 'Has Path' },
+                path: canonicalPath,
+                locale: 'all',
+                status: 'draft',
+            });
+            const documentId = created.document.document_id;
+            const path = await queryBuilders.documents.getCurrentPath({
+                collection_id: testCollection.id,
+                document_id: documentId,
+            });
+            expect(path).toBe(canonicalPath);
+        });
+        it('follows the source-locale anchor after a document is re-anchored', async () => {
+            const canonicalPath = `reanchor-path-${Date.now()}`;
+            // Create locale-agnostic content (ledger carries the 'all' sentinel) so
+            // the document is "complete" in any target and re-anchoring is eligible.
+            const created = await commandBuilders.documents.createDocumentVersion({
+                collectionId: testCollection.id,
+                collectionVersion: 1,
+                collectionConfig: PathsCollectionConfig,
+                action: 'create',
+                documentData: { title: 'Re-anchor me' },
+                path: canonicalPath,
+                locale: 'all',
+                status: 'draft',
+            });
+            const documentId = created.document.document_id;
+            // Flip the document's source locale from the default ('en') to 'fr'.
+            // reAnchorDocument moves the path row onto the new source locale,
+            // keeping the slug. getCurrentPath passes requestedLocale: undefined, so
+            // its fallback floor is COALESCE(source_locale, default) — it must now
+            // resolve via the 'fr' anchor, not the global default 'en'.
+            const result = await commandBuilders.documents.reAnchorDocument({
+                documentId,
+                targetLocale: 'fr',
+            });
+            expect(result.status).toBe('reanchored');
+            const path = await queryBuilders.documents.getCurrentPath({
+                collection_id: testCollection.id,
+                document_id: documentId,
+            });
+            expect(path).toBe(canonicalPath);
+        });
+        it('returns null when the document has no path row', async () => {
+            // Create a version without a `path` — no document_paths row is written.
+            const created = await commandBuilders.documents.createDocumentVersion({
+                collectionId: testCollection.id,
+                collectionVersion: 1,
+                collectionConfig: PathsCollectionConfig,
+                action: 'create',
+                documentData: { title: 'No Path' },
+                locale: 'all',
+                status: 'draft',
+            });
+            const documentId = created.document.document_id;
+            const path = await queryBuilders.documents.getCurrentPath({
+                collection_id: testCollection.id,
+                document_id: documentId,
+            });
+            expect(path).toBe(null);
+        });
+        it('returns null for a non-existent document', async () => {
+            const path = await queryBuilders.documents.getCurrentPath({
+                collection_id: testCollection.id,
+                document_id: crypto.randomUUID(),
+            });
+            expect(path).toBe(null);
+        });
+    });
 });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/db-postgres",
   "private": false,
   "license": "MPL-2.0",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -57,9 +57,9 @@
     "pg": "^8.21.0",
     "uuid": "^14.0.0",
     "zod": "^4.4.3",
-    "@byline/admin": "3.0.2",
-    "@byline/auth": "3.0.2",
-    "@byline/core": "3.0.2"
+    "@byline/auth": "3.1.1",
+    "@byline/core": "3.1.1",
+    "@byline/admin": "3.1.1"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.15",