@byline/db-mysql 6.8.0 → 6.9.0

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

@@ -23,6 +23,7 @@
  * `implements IDocumentQueries`.
  */
 import type { CollectionDefinition, DocumentFilter, FieldFilterOperator, FieldSort, FlattenedStore, ICollectionQueries, IDocumentQueries, LocaleVisibility, MissingLocalePolicy, ReadMode } from '@byline/core';
+import { type UnavailableBlock } from '@byline/core';
 import type { MySql2Database } from 'drizzle-orm/mysql2';
 import { DocumentPublishScheduleQueries } from './publish-schedules.js';
 import type * as schema from '../../database/schema/index.js';
@@ -334,6 +335,7 @@ export declare class DocumentQueries implements IDocumentQueries {
         availableLocales: string[];
         _availableVersionLocales: string[];
         _localeAgnostic: boolean;
+        unavailableBlocks?: UnavailableBlock[] | undefined;
         restoreWarnings?: string[] | undefined;
     } | {
         document_version_id: string;
@@ -377,11 +379,8 @@ export declare class DocumentQueries implements IDocumentQueries {
         availableLocales: string[];
         _availableVersionLocales: string[];
         _localeAgnostic: boolean;
+        unavailableBlocks?: UnavailableBlock[] | undefined;
     } | {
-        resolved_locale?: undefined;
-        availableLocales?: undefined;
-        _availableVersionLocales?: undefined;
-        _localeAgnostic?: undefined;
         document_version_id: string;
         document_id: string;
         path: string;

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

@@ -512,7 +512,7 @@ export class DocumentQueries {
      * _id and _type for blocks and array items inline. Pure JS/core-delegate
      * code — ports unchanged from pg.
      */
-    reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, lenient = false, onMissingLocale, sourceLocale, localeContext) {
+    reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, lenient = false, onMissingLocale, sourceLocale, localeContext, identity) {
         const flattenedData = unifiedFieldValues.map((row) => extractFlattenedFieldValue(row));
         if (metaRows) {
             for (const meta of metaRows) {
@@ -561,14 +561,20 @@ export class DocumentQueries {
                 rows = flattenedData.filter((row) => row.locale === 'all' || row.field_type === 'meta');
             }
         }
-        const { data, warnings } = restoreFieldSetData(definition.fields, rows, resolveLocale);
+        const { data, warnings, unavailableBlocks } = restoreFieldSetData(definition.fields, rows, resolveLocale, identity ? { collectionPath: definition.path, ...identity } : undefined);
         if (!lenient && warnings.length > 0) {
             throw ERR_DATABASE({
                 message: `document reconstruction failed with ${warnings.length} warnings`,
                 details: { warnings },
             }).log(getLogger());
         }
-        return { fields: data, warnings, resolvedLocale, localeAgnostic: ledger.localeAgnostic };
+        return {
+            fields: data,
+            warnings,
+            unavailableBlocks,
+            resolvedLocale,
+            localeAgnostic: ledger.localeAgnostic,
+        };
     }
     /**
      * getCurrentVersionMetadata — narrow metadata fetch for the current version.
@@ -686,7 +692,7 @@ export class DocumentQueries {
                 .where(eq(metaStore.document_version_id, document.id));
             const availability = (await this.getAvailableLocalesByVersion([document.id])).get(document.id);
             const advertised = (await this.getAdvertisedLocalesByDocument([document.document_id])).get(document.document_id);
-            const { fields, warnings, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, lenient, onMissingLocale, document.source_locale, { visibility: localeVisibility, ledger: availability, availableLocales: advertised });
+            const { fields, warnings, unavailableBlocks, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, lenient, onMissingLocale, document.source_locale, { visibility: localeVisibility, ledger: availability, availableLocales: advertised }, { documentId: document.document_id, versionId: document.id });
             return {
                 document_version_id: document.id,
                 document_id: document.document_id,
@@ -702,6 +708,7 @@ export class DocumentQueries {
                 availableLocales: advertised ?? [],
                 _availableVersionLocales: availability?.availableLocales ?? [],
                 _localeAgnostic: localeAgnostic,
+                ...(unavailableBlocks.length > 0 ? { unavailableBlocks } : {}),
                 ...(lenient && warnings.length > 0 ? { restoreWarnings: warnings } : {}),
             };
         }
@@ -781,7 +788,7 @@ export class DocumentQueries {
                 .where(eq(metaStore.document_version_id, document.id));
             const availability = (await this.getAvailableLocalesByVersion([document.id])).get(document.id);
             const advertised = (await this.getAdvertisedLocalesByDocument([document.document_id])).get(document.document_id);
-            const { fields, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, false, onMissingLocale, document.source_locale, { visibility: localeVisibility, ledger: availability, availableLocales: advertised });
+            const { fields, unavailableBlocks, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, false, onMissingLocale, document.source_locale, { visibility: localeVisibility, ledger: availability, availableLocales: advertised }, { documentId: document.document_id, versionId: document.id });
             return {
                 document_version_id: document.id,
                 document_id: document.document_id,
@@ -797,6 +804,7 @@ export class DocumentQueries {
                 availableLocales: advertised ?? [],
                 _availableVersionLocales: availability?.availableLocales ?? [],
                 _localeAgnostic: localeAgnostic,
+                ...(unavailableBlocks.length > 0 ? { unavailableBlocks } : {}),
             };
         }
         const fieldValues = this.convertUnionRowToFlattenedStores(unifiedFieldValues);
@@ -853,7 +861,7 @@ export class DocumentQueries {
             .from(metaStore)
             .where(eq(metaStore.document_version_id, document.id));
         const ledger = (await this.getAvailableLocalesByVersion([document.id])).get(document.id);
-        const { fields, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, false, undefined, document.source_locale, { ledger });
+        const { fields, unavailableBlocks, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(unifiedFieldValues, definition, locale, metaRows, false, undefined, document.source_locale, { ledger }, { documentId: document.document_id, versionId: document.id });
         return {
             document_version_id: document.id,
             document_id: document.document_id,
@@ -865,6 +873,7 @@ export class DocumentQueries {
             fields,
             resolved_locale: resolvedLocale,
             _localeAgnostic: localeAgnostic,
+            ...(unavailableBlocks.length > 0 ? { unavailableBlocks } : {}),
         };
     }
     /**
@@ -1429,11 +1438,11 @@ export class DocumentQueries {
         for (const doc of docs) {
             const versionFieldValues = fieldValuesByVersion.get(doc.id) || [];
             const docMetaRows = (metaByVersion.get(doc.id) ?? []);
-            const { fields, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(versionFieldValues, definition, locale, docMetaRows, false, onMissingLocale, doc.source_locale, {
+            const { fields, unavailableBlocks, resolvedLocale, localeAgnostic } = this.reconstructFromUnifiedRows(versionFieldValues, definition, locale, docMetaRows, false, onMissingLocale, doc.source_locale, {
                 visibility: localeVisibility,
                 ledger: versionLedgers?.get(doc.id),
                 availableLocales: documentAdvertised?.get(doc.document_id),
-            });
+            }, { documentId: doc.document_id, versionId: doc.id });
             // When specific fields were requested, trim the reconstructed object
             // to only those fields. Store-level filtering avoids querying unused
             // tables, but fields sharing a store (e.g. price + views in numeric)
@@ -1454,6 +1463,7 @@ export class DocumentQueries {
                 fields: trimmedFields,
                 resolved_locale: resolvedLocale,
                 _localeAgnostic: localeAgnostic,
+                ...(unavailableBlocks.length > 0 ? { unavailableBlocks } : {}),
             };
             result.push(documentWithFields);
         }

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

@@ -216,7 +216,7 @@ describe('fallback locale selection under a changed default (mysql, live databas
             const listed = documents.find((d) => d.document_id === id);
             expect(byPath?.fields.title).toBe(byId?.fields.title);
             expect(listed?.fields.title).toBe(byId?.fields.title);
-            expect(byPath?.resolved_locale).toBe(byId?.resolved_locale);
+            expect(byPath && 'resolved_locale' in byPath ? byPath.resolved_locale : undefined).toBe(byId?.resolved_locale);
             expect(listed?.resolved_locale).toBe(byId?.resolved_locale);
         }
     });
@@ -326,7 +326,7 @@ describe('fallback locale selection under a changed default (mysql, live databas
         });
         expect(byPath?.document_id).toBe(id);
         expect(byPath?.fields.title, 'the incomplete translation is not delivered').toBe('Slug EN');
-        expect(byPath?.resolved_locale).toBe('en');
+        expect(byPath && 'resolved_locale' in byPath ? byPath.resolved_locale : undefined).toBe('en');
     });
     it('a projected list falls back to the document source, not the changed default', async () => {
         const richText = (text) => ({

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/db-mysql",
   "private": false,
   "license": "MPL-2.0",
-  "version": "6.8.0",
+  "version": "6.9.0",
   "engines": {
     "node": ">=22.22.2"
   },
@@ -47,16 +47,16 @@
     "dist"
   ],
   "dependencies": {
-    "@byline/admin": "6.8.0",
-    "@byline/core": "6.8.0",
+    "@byline/admin": "6.9.0",
+    "@byline/core": "6.9.0",
     "drizzle-orm": "^0.45.4",
     "mysql2": "^3.24.6",
     "uuid": "^14.0.3"
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.15",
-    "@byline/auth": "6.8.0",
-    "@byline/client": "6.8.0",
+    "@byline/auth": "6.9.0",
+    "@byline/client": "6.9.0",
     "@byline/db-conformance": "0.0.10",
     "@types/node": "^26.6.5",
     "chokidar": "^5.0.0",