@revealui/core 0.2.1 → 0.3.0

package/dist/relationships/analyzer.js

@@ -1,3 +1,4 @@
+import { defaultLogger } from '../instance/logger.js';
 /**
  * Analyzes a collection or global configuration and extracts all relationship fields
  * with their storage metadata for proper query building.
@@ -46,6 +47,13 @@ export function getRelationshipFields(config, collectionSlug) {
         }
     }
     traverseFields(config.fields);
+    // Validate extracted metadata to catch configuration errors early
+    const validation = validateRelationshipMetadata(relationships);
+    if (!validation.valid) {
+        for (const error of validation.errors) {
+            defaultLogger.warn(`[RelationshipAnalyzer] ${error}`);
+        }
+    }
     return relationships;
 }
 /**

package/dist/relationships/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/relationships/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/relationships/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/relationships/populate-core.d.ts

@@ -0,0 +1,57 @@
+/**
+ * Population Core — Pure Types & Utilities
+ *
+ * This module contains types and pure utility functions for relationship
+ * population that have NO imports from the afterRead chain, breaking the
+ * circular dependency: population → populate-helpers → afterRead → population.
+ */
+/** Relationship field types supported by population */
+export interface PopulateRelationshipField {
+    type: 'relationship' | 'upload' | 'join';
+    name: string;
+    relationTo?: string | string[];
+    collection?: string | string[];
+    hasMany?: boolean;
+    maxDepth?: number;
+    localized?: boolean;
+}
+/** Information extracted about a relationship */
+export interface RelationInfo {
+    /** The collection slug this relationship points to */
+    relationName: string | undefined;
+    /** The ID(s) to populate */
+    id: unknown;
+    /** The related collection config if available */
+    relatedCollection: unknown;
+}
+/** Location information for updating a document with populated values */
+export interface UpdateLocation {
+    index?: number;
+    key?: string;
+}
+/**
+ * Extract relationship information from field and data
+ *
+ * Handles polymorphic relationships, join tables, and direct FK relationships.
+ */
+export declare function extractRelationInfo(field: PopulateRelationshipField, data: unknown, req: {
+    revealui?: {
+        collections?: Record<string, unknown>;
+    };
+}): RelationInfo;
+/**
+ * Check if a relationship should be populated based on depth
+ */
+export declare function shouldPopulateRelationship(currentDepth: number, depth: number): boolean;
+/**
+ * Update document with populated relationship value
+ *
+ * Handles various field configurations: arrays, localized fields, join tables, etc.
+ */
+export declare function updateDocumentWithPopulatedValue(args: {
+    dataReference: Record<string, unknown>;
+    field: PopulateRelationshipField;
+    relationshipValue: unknown;
+    location: UpdateLocation;
+}): void;
+//# sourceMappingURL=populate-core.d.ts.map

package/dist/relationships/populate-core.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate-core.d.ts","sourceRoot":"","sources":["../../src/relationships/populate-core.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,uDAAuD;AACvD,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,sDAAsD;IACtD,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,4BAA4B;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,iDAAiD;IACjD,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,yEAAyE;AACzE,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,yBAAyB,EAChC,IAAI,EAAE,OAAO,EACb,GAAG,EAAE;IACH,QAAQ,CAAC,EAAE;QACT,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACvC,CAAC;CACH,GACA,YAAY,CAwCd;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,IAAI,EAAE;IACrD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,KAAK,EAAE,yBAAyB,CAAC;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;CAC1B,GAAG,IAAI,CAsDP"}

package/dist/relationships/populate-core.js

@@ -0,0 +1,116 @@
+/**
+ * Population Core — Pure Types & Utilities
+ *
+ * This module contains types and pure utility functions for relationship
+ * population that have NO imports from the afterRead chain, breaking the
+ * circular dependency: population → populate-helpers → afterRead → population.
+ */
+/**
+ * Extract relationship information from field and data
+ *
+ * Handles polymorphic relationships, join tables, and direct FK relationships.
+ */
+export function extractRelationInfo(field, data, req) {
+    const dataRecord = data;
+    // Determine relation name based on field type
+    let relationName;
+    if (field.type === 'join') {
+        relationName = Array.isArray(field.collection)
+            ? dataRecord.relationTo
+            : field.collection;
+    }
+    else {
+        relationName = Array.isArray(field.relationTo)
+            ? dataRecord.relationTo
+            : field.relationTo;
+    }
+    // Get related collection config
+    const relatedCollection = relationName && req.revealui?.collections ? req.revealui.collections[relationName] : undefined;
+    // Extract ID based on field configuration
+    let id;
+    if (field.type === 'join' && Array.isArray(field.collection)) {
+        id = dataRecord.value;
+    }
+    else if (field.type !== 'join' && Array.isArray(field.relationTo)) {
+        id = dataRecord.value;
+    }
+    else {
+        id = data;
+    }
+    // Normalize ID to string or number
+    if (typeof id !== 'string' &&
+        typeof id !== 'number' &&
+        typeof id?.toString === 'function' &&
+        typeof id !== 'object') {
+        id = id.toString();
+    }
+    return { relationName, id, relatedCollection };
+}
+/**
+ * Check if a relationship should be populated based on depth
+ */
+export function shouldPopulateRelationship(currentDepth, depth) {
+    return depth > 0 && currentDepth <= depth;
+}
+/**
+ * Update document with populated relationship value
+ *
+ * Handles various field configurations: arrays, localized fields, join tables, etc.
+ */
+export function updateDocumentWithPopulatedValue(args) {
+    const { dataReference, field, relationshipValue, location } = args;
+    const { index, key } = location;
+    // Case 1: Localized array field (has both index and key)
+    if (typeof index === 'number' && typeof key === 'string') {
+        const fieldRecord = dataReference[field.name];
+        const localeRecords = fieldRecord[key];
+        const localeEntry = localeRecords[index];
+        if (field.type !== 'join' && Array.isArray(field.relationTo)) {
+            localeEntry.value = relationshipValue;
+        }
+        else if (field.type === 'join' && Array.isArray(field.collection)) {
+            localeEntry.value = relationshipValue;
+        }
+        else {
+            localeRecords[index] = relationshipValue;
+        }
+        return;
+    }
+    // Case 2: Array field or localized field (has index or key, but not both)
+    if (typeof index === 'number' || typeof key === 'string') {
+        const fieldRecord = dataReference[field.name];
+        const target = (index ?? key);
+        if (field.type === 'join') {
+            if (!Array.isArray(field.collection)) {
+                const docs = fieldRecord.docs;
+                docs[target] = relationshipValue;
+            }
+            else {
+                const docs = fieldRecord.docs;
+                const docEntry = docs[target];
+                docEntry.value = relationshipValue;
+            }
+        }
+        else if (Array.isArray(field.relationTo)) {
+            const entries = fieldRecord;
+            const entry = entries[target];
+            entry.value = relationshipValue;
+        }
+        else {
+            fieldRecord[target] = relationshipValue;
+        }
+        return;
+    }
+    // Case 3: Single value (no index or key)
+    if (field.type !== 'join' && Array.isArray(field.relationTo)) {
+        const fieldRecord = dataReference[field.name];
+        fieldRecord.value = relationshipValue;
+    }
+    else if (field.type === 'join' && Array.isArray(field.collection)) {
+        const fieldRecord = dataReference[field.name];
+        fieldRecord.value = relationshipValue;
+    }
+    else {
+        dataReference[field.name] = relationshipValue;
+    }
+}

package/dist/relationships/populate-helpers.d.ts

@@ -3,41 +3,13 @@
  *
  * Extracted from the monolithic populate() function to improve
  * maintainability, testability, and clarity.
- */
-import type { RevealRequest, TypedFallbackLocale } from '../types/index.js';
-/** Relationship field types supported by population */
-export interface PopulateRelationshipField {
-    type: 'relationship' | 'upload' | 'join';
-    name: string;
-    relationTo?: string | string[];
-    collection?: string | string[];
-    hasMany?: boolean;
-    maxDepth?: number;
-    localized?: boolean;
-}
-/** Information extracted about a relationship */
-export interface RelationInfo {
-    /** The collection slug this relationship points to */
-    relationName: string | undefined;
-    /** The ID(s) to populate */
-    id: unknown;
-    /** The related collection config if available */
-    relatedCollection: unknown;
-}
-/**
- * Extract relationship information from field and data
  *
- * Handles polymorphic relationships, join tables, and direct FK relationships.
- */
-export declare function extractRelationInfo(field: PopulateRelationshipField, data: unknown, req: {
-    revealui?: {
-        collections?: Record<string, unknown>;
-    };
-}): RelationInfo;
-/**
- * Check if a relationship should be populated based on depth
+ * Pure types and utilities live in populate-core.ts (no afterRead imports).
+ * This module re-exports them and adds helpers that depend on afterRead.
  */
-export declare function shouldPopulateRelationship(currentDepth: number, depth: number): boolean;
+import type { RevealRequest, TypedFallbackLocale } from '../types/index.js';
+export type { PopulateRelationshipField, RelationInfo, UpdateLocation } from './populate-core.js';
+export { extractRelationInfo, shouldPopulateRelationship, updateDocumentWithPopulatedValue, } from './populate-core.js';
 /**
  * Load a related document using the dataLoader
  *
@@ -83,22 +55,4 @@ export declare function applyNestedPopulation(args: {
     showHiddenFields: boolean;
     req: RevealRequest;
 }): Promise<unknown>;
-/**
- * Location information for updating a document with populated values
- */
-export interface UpdateLocation {
-    index?: number;
-    key?: string;
-}
-/**
- * Update document with populated relationship value
- *
- * Handles various field configurations: arrays, localized fields, join tables, etc.
- */
-export declare function updateDocumentWithPopulatedValue(args: {
-    dataReference: Record<string, unknown>;
-    field: PopulateRelationshipField;
-    relationshipValue: unknown;
-    location: UpdateLocation;
-}): void;
 //# sourceMappingURL=populate-helpers.d.ts.map

package/dist/relationships/populate-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate-helpers.d.ts","sourceRoot":"","sources":["../../src/relationships/populate-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"populate-helpers.d.ts","sourceRoot":"","sources":["../../src/relationships/populate-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAIV,aAAa,EAGb,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAG3B,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClG,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,gCAAgC,GACjC,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,EAAE,EAAE,OAAO,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,mBAAmB,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE;QACH,UAAU,CAAC,EAAE;YACX,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;SAC1C,CAAC;KACH,CAAC;CACH,GAAG,OAAO,CAAC,OAAO,CAAC,CA8DnB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,OAAO,CAAC;IACb,gBAAgB,EAAE;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,mBAAmB,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,aAAa,CAAC;CACpB,GAAG,OAAO,CAAC,OAAO,CAAC,CA+CnB"}

package/dist/relationships/populate-helpers.js

@@ -3,56 +3,13 @@
  *
  * Extracted from the monolithic populate() function to improve
  * maintainability, testability, and clarity.
+ *
+ * Pure types and utilities live in populate-core.ts (no afterRead imports).
+ * This module re-exports them and adds helpers that depend on afterRead.
  */
 import { createDataloaderCacheKey } from '../dataloader.js';
 import { afterRead } from '../fields/hooks/afterRead/index.js';
-/**
- * Extract relationship information from field and data
- *
- * Handles polymorphic relationships, join tables, and direct FK relationships.
- */
-export function extractRelationInfo(field, data, req) {
-    const dataRecord = data;
-    // Determine relation name based on field type
-    let relationName;
-    if (field.type === 'join') {
-        relationName = Array.isArray(field.collection)
-            ? dataRecord.relationTo
-            : field.collection;
-    }
-    else {
-        relationName = Array.isArray(field.relationTo)
-            ? dataRecord.relationTo
-            : field.relationTo;
-    }
-    // Get related collection config
-    const relatedCollection = relationName && req.revealui?.collections ? req.revealui.collections[relationName] : undefined;
-    // Extract ID based on field configuration
-    let id;
-    if (field.type === 'join' && Array.isArray(field.collection)) {
-        id = dataRecord.value;
-    }
-    else if (field.type !== 'join' && Array.isArray(field.relationTo)) {
-        id = dataRecord.value;
-    }
-    else {
-        id = data;
-    }
-    // Normalize ID to string or number
-    if (typeof id !== 'string' &&
-        typeof id !== 'number' &&
-        typeof id?.toString === 'function' &&
-        typeof id !== 'object') {
-        id = id.toString();
-    }
-    return { relationName, id, relatedCollection };
-}
-/**
- * Check if a relationship should be populated based on depth
- */
-export function shouldPopulateRelationship(currentDepth, depth) {
-    return depth > 0 && currentDepth <= depth;
-}
+export { extractRelationInfo, shouldPopulateRelationship, updateDocumentWithPopulatedValue, } from './populate-core.js';
 /**
  * Load a related document using the dataLoader
  *
@@ -123,65 +80,3 @@ export async function applyNestedPopulation(args) {
         showHiddenFields,
     });
 }
-/**
- * Update document with populated relationship value
- *
- * Handles various field configurations: arrays, localized fields, join tables, etc.
- */
-export function updateDocumentWithPopulatedValue(args) {
-    const { dataReference, field, relationshipValue, location } = args;
-    const { index, key } = location;
-    // Case 1: Localized array field (has both index and key)
-    if (typeof index === 'number' && typeof key === 'string') {
-        const fieldRecord = dataReference[field.name];
-        const localeRecords = fieldRecord[key];
-        const localeEntry = localeRecords[index];
-        if (field.type !== 'join' && Array.isArray(field.relationTo)) {
-            localeEntry.value = relationshipValue;
-        }
-        else if (field.type === 'join' && Array.isArray(field.collection)) {
-            localeEntry.value = relationshipValue;
-        }
-        else {
-            localeRecords[index] = relationshipValue;
-        }
-        return;
-    }
-    // Case 2: Array field or localized field (has index or key, but not both)
-    if (typeof index === 'number' || typeof key === 'string') {
-        const fieldRecord = dataReference[field.name];
-        const target = (index ?? key);
-        if (field.type === 'join') {
-            if (!Array.isArray(field.collection)) {
-                const docs = fieldRecord.docs;
-                docs[target] = relationshipValue;
-            }
-            else {
-                const docs = fieldRecord.docs;
-                const docEntry = docs[target];
-                docEntry.value = relationshipValue;
-            }
-        }
-        else if (Array.isArray(field.relationTo)) {
-            const entries = fieldRecord;
-            const entry = entries[target];
-            entry.value = relationshipValue;
-        }
-        else {
-            fieldRecord[target] = relationshipValue;
-        }
-        return;
-    }
-    // Case 3: Single value (no index or key)
-    if (field.type !== 'join' && Array.isArray(field.relationTo)) {
-        const fieldRecord = dataReference[field.name];
-        fieldRecord.value = relationshipValue;
-    }
-    else if (field.type === 'join' && Array.isArray(field.collection)) {
-        const fieldRecord = dataReference[field.name];
-        fieldRecord.value = relationshipValue;
-    }
-    else {
-        dataReference[field.name] = relationshipValue;
-    }
-}

package/dist/relationships/population.d.ts

@@ -1,4 +1,5 @@
 import type { PopulateType, TypedFallbackLocale } from '../types/index.js';
+import type { PopulateRelationshipField } from './populate-core.js';
 interface PopulateRequest {
     revealui?: {
         collections?: Record<string, {
@@ -15,15 +16,6 @@ interface PopulateRequest {
         find?: (options: unknown) => Promise<unknown>;
     };
 }
-interface PopulateRelationshipField {
-    type: 'relationship' | 'upload' | 'join';
-    name: string;
-    relationTo?: string | string[];
-    collection?: string | string[];
-    hasMany?: boolean;
-    maxDepth?: number;
-    localized?: boolean;
-}
 type PromiseArgs = {
     currentDepth: number;
     depth: number;

package/dist/relationships/population.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"population.d.ts","sourceRoot":"","sources":["../../src/relationships/population.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAiB,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGzF,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE;QACT,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,MAAM,CAAC,EAAE;gBAAE,eAAe,CAAC,EAAE,OAAO,CAAA;aAAE,CAAA;SAAE,CAAC,CAAA;QACxE,MAAM,CAAC,EAAE;YAAE,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,CAAA;KACrC,CAAA;IACD,UAAU,CAAC,EAAE;QACX,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;KAC9C,CAAA;CACF;AAGD,UAAU,yBAAyB;IACjC,IAAI,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAA;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAkID,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,cAAc,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,yBAAyB,CAAA;IAChC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAA;IACrB,cAAc,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,EAAE,eAAe,CAAA;IACpB,gBAAgB,EAAE,OAAO,CAAA;IACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAU,0IAYjD,WAAW,KAAG,OAAO,CAAC,IAAI,CAoI5B,CAAA"}
+{"version":3,"file":"population.d.ts","sourceRoot":"","sources":["../../src/relationships/population.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAiB,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC1F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAapE,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE;QACT,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,MAAM,CAAC,EAAE;gBAAE,eAAe,CAAC,EAAE,OAAO,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE;YAAE,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,CAAC;KACtC,CAAC;IACF,UAAU,CAAC,EAAE;QACX,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/C,CAAC;CACH;AAkHD,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,mBAAmB,CAAC;IACpC,KAAK,EAAE,yBAAyB,CAAC;IACjC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,eAAe,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAU,0IAYjD,WAAW,KAAG,OAAO,CAAC,IAAI,CAoI5B,CAAC"}

package/dist/relationships/population.js

@@ -1,13 +1,18 @@
+// External type imports
 import { fieldHasMaxDepth, fieldShouldBeLocalized, fieldSupportsMany, } from '../fields/config/types.js';
+// Pure utilities from populate-core (no circular dependency)
+import { extractRelationInfo, shouldPopulateRelationship, updateDocumentWithPopulatedValue, } from './populate-core.js';
+// Helpers that depend on afterRead (static import — safe because populate-core
+// broke the cycle: population no longer imports from populate-helpers for the
+// functions that afterRead/promise.ts needs)
+import { applyNestedPopulation, loadRelatedDocument } from './populate-helpers.js';
 /**
  * Populate a single relationship field
  *
  * Refactored from the original monolithic function for better maintainability.
- * Uses helper functions from populate-helpers.ts for clarity and testability.
+ * Uses helper functions from populate-core.ts and populate-helpers.ts.
  */
 const populate = async ({ currentDepth, data, dataReference, depth, draft, fallbackLocale, field, index, key, locale, overrideAccess, populateArg, req, showHiddenFields, }) => {
-    // Import helpers (dynamic to avoid circular dependencies)
-    const { extractRelationInfo, shouldPopulateRelationship, loadRelatedDocument, applyNestedPopulation, updateDocumentWithPopulatedValue, } = await import('./populate-helpers.js');
     // Step 1: Extract relationship information
     const { relationName, id, relatedCollection } = extractRelationInfo(field, data, req);
     if (!relatedCollection) {

package/dist/revealui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revealui.d.ts","sourceRoot":"","sources":["../src/revealui.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"revealui.d.ts","sourceRoot":"","sources":["../src/revealui.ts"],"names":[],"mappings":"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"}

package/dist/richtext/exports/client/rcc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rcc.d.ts","sourceRoot":"","sources":["../../../../src/richtext/exports/client/rcc.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAA0B,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAQ/E,OAAO,EAQL,KAAK,qBAAqB,EAE1B,KAAK,qBAAqB,EAE3B,MAAM,SAAS,CAAA;AAChB,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,OAAO,CAAA;AA2B1C,UAAU,mBAAoB,SAAQ,qBAAqB;IACzD,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IAC9E,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,EAC5B,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE;QACJ,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,OAAO,CAAC,EAAE,MAAM,CAAA;KACjB,EACD,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;CACxB;AAwPD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EAC9C,OAAO,CAAC,EAAE,sBAAsB,GAC/B,GAAG,CAAC,OAAO,GAAG,IAAI,CAMpB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,EAC9B,IAAI,EACJ,SAAS,EACT,GAAG,OAAO,EACX,EAAE;IACD,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,sBAAsB,GAAG,GAAG,CAAC,OAAO,GAAG,IAAI,CAO9C"}
+{"version":3,"file":"rcc.d.ts","sourceRoot":"","sources":["../../../../src/richtext/exports/client/rcc.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAA0B,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIhF,OAAO,EAQL,KAAK,qBAAqB,EAE1B,KAAK,qBAAqB,EAE3B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,OAAO,CAAC;AA2B3C,UAAU,mBAAoB,SAAQ,qBAAqB;IACzD,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;IAC/E,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,EAC5B,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE;QACJ,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;CACzB;AA0PD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EAC9C,OAAO,CAAC,EAAE,sBAAsB,GAC/B,GAAG,CAAC,OAAO,GAAG,IAAI,CAMpB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,EAC9B,IAAI,EACJ,SAAS,EACT,GAAG,OAAO,EACX,EAAE;IACD,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,sBAAsB,GAAG,GAAG,CAAC,OAAO,GAAG,IAAI,CAO9C"}

package/dist/richtext/exports/client/rcc.js

@@ -43,7 +43,7 @@ function serializeTextNode(node, index) {
 function serializeChildren(children, options) {
     if (!children || children.length === 0)
         return null;
-    return _jsx(Fragment, { children: children.map((child, index) => serializeNode(child, index, options)) });
+    return (_jsx(Fragment, { children: children.map((child, index) => serializeNode(child, index, options)) }));
 }
 function serializeNode(node, index, options) {
     if (!node)

package/dist/richtext/exports/server/rsc.d.ts

@@ -7,6 +7,23 @@
 import type { SerializedEditorState, SerializedLexicalNode } from 'lexical';
 import { type JSX } from 'react';
 export type { SerializedEditorState };
+/**
+ * Check whether a URL is safe to render in an href attribute.
+ *
+ * Blocks javascript:, vbscript:, data: (except data:image/ for images),
+ * and other dangerous protocols. Handles case-insensitive matching and
+ * leading whitespace tricks.
+ *
+ * @param url - The URL to validate
+ * @param context - Whether this URL is for a link href or image src
+ * @returns true if the URL is safe to render
+ */
+export declare function isSafeUrl(url: string, context?: 'link' | 'image'): boolean;
+/**
+ * Sanitize a URL for use in an href or src attribute.
+ * Returns '#' if the URL is not safe.
+ */
+export declare function sanitizeUrl(url: string, context?: 'link' | 'image'): string;
 interface SerializedElementNode extends SerializedLexicalNode {
     type: string;
     children?: SerializedLexicalNode[];

package/dist/richtext/exports/server/rsc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../../src/richtext/exports/server/rsc.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../../src/richtext/exports/server/rsc.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,OAAO,CAAC;AAG3C,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAkBtC;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,GAAG,OAAgB,GAAG,OAAO,CA8BlF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,GAAG,OAAgB,GAAG,MAAM,CAEnF;AAyBD,UAAU,qBAAsB,SAAQ,qBAAqB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,IAAI,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,kBAAmB,SAAQ,qBAAqB;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;QACjC,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,GAAG,CAAC,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7C,CAAC;CACH;AAmBD,UAAU,mBAAoB,SAAQ,qBAAqB;IACzD,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,0BAA0B,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACrE,SAAQ,qBAAqB;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,CAAC,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;AAMD,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAMD,UAAU,gBAAgB;IACxB,4BAA4B;IAC5B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;IAC/E,2BAA2B;IAC3B,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,EAC5B,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,CAAC;IACjB,4BAA4B;IAC5B,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE;QACJ,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;CACzB;AAqSD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EAC9C,OAAO,CAAC,EAAE,gBAAgB,GACzB,GAAG,CAAC,OAAO,GAAG,IAAI,CAMpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,GAC7C,OAAO,CAAC,MAAM,CAAC,CA2CjB;AAMD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,wBAAwB,kDAYhF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,yBAAyB,kDAYlF;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;IAC/E,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,EAC5B,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE;QACJ,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,KAAK,EAAE,MAAM,KACV,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;CACzB;AAED,wBAAgB,eAAe,CAAC,EAC9B,IAAI,EACJ,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,GACZ,EAAE,oBAAoB,kDAgBtB;AAED,eAAe,eAAe,CAAC"}

package/dist/richtext/exports/server/rsc.js

@@ -1,6 +1,62 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment } from 'react';
 // ============================================
+// URL SANITIZATION
+// ============================================
+/**
+ * Protocols that are safe to render in href/src attributes.
+ * Anything not matching these will be replaced with '#'.
+ */
+const SAFE_LINK_PROTOCOLS = /^(?:https?:|mailto:|tel:|#|\/)/i;
+/**
+ * Data URIs that are safe for image src attributes (base64 images only).
+ * data:text/html and similar are blocked.
+ */
+const SAFE_IMAGE_DATA_URI = /^data:image\//i;
+/**
+ * Check whether a URL is safe to render in an href attribute.
+ *
+ * Blocks javascript:, vbscript:, data: (except data:image/ for images),
+ * and other dangerous protocols. Handles case-insensitive matching and
+ * leading whitespace tricks.
+ *
+ * @param url - The URL to validate
+ * @param context - Whether this URL is for a link href or image src
+ * @returns true if the URL is safe to render
+ */
+export function isSafeUrl(url, context = 'link') {
+    // Trim whitespace (catches " javascript:" trick)
+    const trimmed = url.trim();
+    if (trimmed === '' || trimmed === '#') {
+        return true;
+    }
+    // For image context, allow data:image/ URIs (base64 images)
+    if (context === 'image' && SAFE_IMAGE_DATA_URI.test(trimmed)) {
+        return true;
+    }
+    // Block all data: URIs for links (and non-image data: for images)
+    if (/^data:/i.test(trimmed)) {
+        return false;
+    }
+    // Block javascript: and vbscript: protocols (case-insensitive)
+    if (/^(?:javascript|vbscript):/i.test(trimmed)) {
+        return false;
+    }
+    // Relative paths, anchors, and safe protocols are allowed
+    if (SAFE_LINK_PROTOCOLS.test(trimmed) || !trimmed.includes(':')) {
+        return true;
+    }
+    // Unknown protocol — block it
+    return false;
+}
+/**
+ * Sanitize a URL for use in an href or src attribute.
+ * Returns '#' if the URL is not safe.
+ */
+export function sanitizeUrl(url, context = 'link') {
+    return isSafeUrl(url, context) ? url.trim() : '#';
+}
+// ============================================
 // TEXT FORMAT CONSTANTS
 // ============================================
 const IS_BOLD = 1;
@@ -45,7 +101,7 @@ function serializeTextNode(node, index) {
 function serializeChildren(children, options) {
     if (!children || children.length === 0)
         return null;
-    return _jsx(Fragment, { children: children.map((child, index) => serializeNode(child, index, options)) });
+    return (_jsx(Fragment, { children: children.map((child, index) => serializeNode(child, index, options)) }));
 }
 /**
  * Serialize a single Lexical node to React elements
@@ -105,8 +161,8 @@ function serializeNode(node, index, options) {
         if (options?.renderLink) {
             return options.renderLink(linkNode, children, index);
         }
-        // Default link rendering
-        const href = linkNode.fields?.url || '#';
+        // Default link rendering with URL sanitization
+        const href = sanitizeUrl(linkNode.fields?.url || '#', 'link');
         const target = linkNode.fields?.newTab ? '_blank' : undefined;
         const rel = linkNode.fields?.newTab ? 'noopener noreferrer' : undefined;
         return (_jsx("a", { href: href, target: target, rel: rel, children: children }, index));
@@ -115,12 +171,12 @@ function serializeNode(node, index, options) {
     if (node.type === 'autolink') {
         const children = serializeChildren(n.children, options);
         const autoLinkNode = node;
-        return (_jsx("a", { href: autoLinkNode.url || '#', children: children }, index));
+        return (_jsx("a", { href: sanitizeUrl(autoLinkNode.url || '#', 'link'), children: children }, index));
     }
     // Image (from upload feature)
     if (node.type === 'image') {
         const imageNode = node;
-        const src = imageNode.fields?.src || '';
+        const src = sanitizeUrl(imageNode.fields?.src || '', 'image');
         const alt = imageNode.fields?.alt || '';
         const width = imageNode.fields?.width;
         const height = imageNode.fields?.height;