@dyrected/core 2.5.8 → 2.5.10

package/dist/index.cjs

@@ -1008,10 +1008,11 @@ function parseSqlWhere(where, getJsonField, placeholder = "?") {
   function buildClause(w) {
     const parts = [];
     for (const [field, value] of Object.entries(w)) {
-      if (field === "OR" && Array.isArray(value)) {
+      const upperField = field.toUpperCase();
+      if (upperField === "OR" && Array.isArray(value)) {
         const sub = value.map((v) => `(${buildClause(v)})`).join(" OR ");
         parts.push(`(${sub})`);
-      } else if (field === "AND" && Array.isArray(value)) {
+      } else if (upperField === "AND" && Array.isArray(value)) {
         const sub = value.map((v) => `(${buildClause(v)})`).join(" AND ");
         parts.push(`(${sub})`);
       } else {
@@ -1070,9 +1071,10 @@ function parseMongoWhere(where) {
   function buildClause(w) {
     const conditions = [];
     for (const [field, value] of Object.entries(w)) {
-      if (field === "OR" && Array.isArray(value)) {
+      const upperField = field.toUpperCase();
+      if (upperField === "OR" && Array.isArray(value)) {
         conditions.push({ $or: value.map(buildClause) });
-      } else if (field === "AND" && Array.isArray(value)) {
+      } else if (upperField === "AND" && Array.isArray(value)) {
         conditions.push({ $and: value.map(buildClause) });
       } else {
         conditions.push(buildOperator(field, value));
@@ -1090,6 +1092,49 @@ var import_hono = require("hono");
 var import_cors = require("hono/cors");
 var import_request_id = require("hono/request-id");
 
+// src/services/defaults.service.ts
+var DefaultsService = class {
+  /**
+   * Recursively apply default values to a data object based on field definitions.
+   */
+  static apply(fields, data = {}) {
+    const result = { ...data || {} };
+    fields.forEach((field) => {
+      if (field.type === "join") return;
+      if (field.type === "row" && field.fields) {
+        Object.assign(result, this.apply(field.fields, data));
+        return;
+      }
+      if (!field.name) return;
+      let value = result[field.name];
+      if ((value === void 0 || value === null) && field.renameTo) {
+        const legacyValue = result[field.renameTo];
+        if (legacyValue !== void 0 && legacyValue !== null) {
+          value = legacyValue;
+          result[field.name] = legacyValue;
+        }
+      }
+      if (value === void 0 || value === null) {
+        if (field.defaultValue !== void 0) {
+          result[field.name] = field.defaultValue;
+        } else {
+          if (field.type === "boolean") result[field.name] = false;
+          else if (field.type === "array") result[field.name] = [];
+          else if (field.type === "multiSelect") result[field.name] = [];
+          else if (field.type === "object") {
+            result[field.name] = this.apply(field.fields || [], {});
+          }
+        }
+      } else if (field.type === "object" && field.fields) {
+        result[field.name] = this.apply(field.fields, value);
+      } else if (field.type === "array" && field.fields && Array.isArray(value)) {
+        result[field.name] = value.map((item) => this.apply(field.fields, item));
+      }
+    });
+    return result;
+  }
+};
+
 // src/services/population.service.ts
 var PopulationService = class {
   db;
@@ -1102,7 +1147,7 @@ var PopulationService = class {
    * Recursively populate relationship fields in a document or array of documents.
    */
   async populate(args) {
-    const { data, fields, currentDepth, maxDepth } = args;
+    const { data, fields, currentDepth = 0, maxDepth = 10 } = args;
     if (currentDepth >= maxDepth || !data) {
       return data;
     }
@@ -1131,8 +1176,9 @@ var PopulationService = class {
                 doc = await this.db.findOne({ collection: field.relationTo, id });
               }
               if (!doc || typeof doc !== "object") return id;
+              const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
               return this.populate({
-                data: doc,
+                data: docWithDefaults,
                 fields: relatedCollection.fields,
                 currentDepth: currentDepth + 1,
                 maxDepth
@@ -1145,12 +1191,35 @@ var PopulationService = class {
             doc = await this.db.findOne({ collection: field.relationTo, id: value });
           }
           if (doc && typeof doc === "object") {
+            const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
             populatedDoc[field.name] = await this.populate({
-              data: doc,
+              data: docWithDefaults,
+              fields: relatedCollection.fields,
+              currentDepth: currentDepth + 1,
+              maxDepth
+            });
+          }
+        }
+      }
+      if (field.type === "url" && value && typeof value === "object" && value.type === "internal" && value.relationTo && value.value) {
+        const relatedCollection = this.collections.find((c) => c.slug === value.relationTo);
+        if (relatedCollection) {
+          const doc = await this.db.findOne({ collection: value.relationTo, id: value.value });
+          if (doc && typeof doc === "object") {
+            const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
+            const populatedDocValue = await this.populate({
+              data: docWithDefaults,
               fields: relatedCollection.fields,
               currentDepth: currentDepth + 1,
               maxDepth
             });
+            const identifier = docWithDefaults.slug || docWithDefaults.id;
+            const resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            populatedDoc[field.name] = {
+              ...value,
+              url: resolvedUrl,
+              doc: populatedDocValue
+            };
           }
         }
       }
@@ -1198,49 +1267,6 @@ var PopulationService = class {
   }
 };
 
-// src/services/defaults.service.ts
-var DefaultsService = class {
-  /**
-   * Recursively apply default values to a data object based on field definitions.
-   */
-  static apply(fields, data = {}) {
-    const result = { ...data || {} };
-    fields.forEach((field) => {
-      if (field.type === "join") return;
-      if (field.type === "row" && field.fields) {
-        Object.assign(result, this.apply(field.fields, data));
-        return;
-      }
-      if (!field.name) return;
-      let value = result[field.name];
-      if ((value === void 0 || value === null) && field.renameTo) {
-        const legacyValue = result[field.renameTo];
-        if (legacyValue !== void 0 && legacyValue !== null) {
-          value = legacyValue;
-          result[field.name] = legacyValue;
-        }
-      }
-      if (value === void 0 || value === null) {
-        if (field.defaultValue !== void 0) {
-          result[field.name] = field.defaultValue;
-        } else {
-          if (field.type === "boolean") result[field.name] = false;
-          else if (field.type === "array") result[field.name] = [];
-          else if (field.type === "multiSelect") result[field.name] = [];
-          else if (field.type === "object") {
-            result[field.name] = this.apply(field.fields || [], {});
-          }
-        }
-      } else if (field.type === "object" && field.fields) {
-        result[field.name] = this.apply(field.fields, value);
-      } else if (field.type === "array" && field.fields && Array.isArray(value)) {
-        result[field.name] = value.map((item) => this.apply(field.fields, item));
-      }
-    });
-    return result;
-  }
-};
-
 // src/services/audit.service.ts
 var AuditService = class {
   /**
@@ -1281,7 +1307,7 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const limit = Number(c.req.query("limit")) || 10;
     const page = Number(c.req.query("page")) || 1;
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 2;
     const sort = c.req.query("sort") || void 0;
     let where = void 0;
     const whereRaw = c.req.query("where");
@@ -1323,7 +1349,7 @@ var CollectionController = class {
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const id = c.req.param("id");
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     if (!id) return c.json({ message: "Missing ID" }, 400);
     const doc = await db.findOne({ collection: this.collection.slug, id });
     if (!doc) return c.json({ message: "Not Found" }, 404);
@@ -1544,7 +1570,7 @@ var GlobalController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     let data = await db.getGlobal({ slug: this.global.slug });
     const isEmpty = !data || Object.keys(data).length === 0;
     if (isEmpty && this.global.initialData) {
@@ -1558,7 +1584,7 @@ var GlobalController = class {
       const populatedData = await populationService.populate({
         data: dataWithDefaults,
         fields: this.global.fields,
-        currentDepth: 1,
+        currentDepth: 0,
         maxDepth: depth
       });
       return c.json(populatedData);

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-DZt5nslu.cjs';
-export { A as AccessFunction, a as AdminConfig, B as Block, b as DatabaseAdapter, c as DyrectedContext, F as Field, d as FieldHook, e as FieldType, f as FileData, H as HookFunction, I as ImageService, P as PaginatedResult, S as StorageAdapter, U as UploadConfig, g as createDyrectedApp } from './app-DZt5nslu.cjs';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-Dk3SzV1a.cjs';
+export { A as AccessFunction, a as AdminConfig, B as Block, b as DatabaseAdapter, c as DyrectedContext, F as Field, d as FieldHook, e as FieldType, f as FileData, H as HookFunction, I as ImageService, P as PaginatedResult, S as StorageAdapter, U as UploadConfig, g as createDyrectedApp } from './app-Dk3SzV1a.cjs';
 import 'hono/types';
 import 'hono';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-DZt5nslu.js';
-export { A as AccessFunction, a as AdminConfig, B as Block, b as DatabaseAdapter, c as DyrectedContext, F as Field, d as FieldHook, e as FieldType, f as FileData, H as HookFunction, I as ImageService, P as PaginatedResult, S as StorageAdapter, U as UploadConfig, g as createDyrectedApp } from './app-DZt5nslu.js';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-Dk3SzV1a.js';
+export { A as AccessFunction, a as AdminConfig, B as Block, b as DatabaseAdapter, c as DyrectedContext, F as Field, d as FieldHook, e as FieldType, f as FileData, H as HookFunction, I as ImageService, P as PaginatedResult, S as StorageAdapter, U as UploadConfig, g as createDyrectedApp } from './app-Dk3SzV1a.js';
 import 'hono/types';
 import 'hono';
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createDyrectedApp,
   normalizeConfig
-} from "./chunk-TIJHR54M.js";
+} from "./chunk-3VUH2MNW.js";
 
 // src/utils/setup-prompt.ts
 function buildEnvironmentSection(frameworkLabel, isSelfHosted, config) {
@@ -902,10 +902,11 @@ function parseSqlWhere(where, getJsonField, placeholder = "?") {
   function buildClause(w) {
     const parts = [];
     for (const [field, value] of Object.entries(w)) {
-      if (field === "OR" && Array.isArray(value)) {
+      const upperField = field.toUpperCase();
+      if (upperField === "OR" && Array.isArray(value)) {
         const sub = value.map((v) => `(${buildClause(v)})`).join(" OR ");
         parts.push(`(${sub})`);
-      } else if (field === "AND" && Array.isArray(value)) {
+      } else if (upperField === "AND" && Array.isArray(value)) {
         const sub = value.map((v) => `(${buildClause(v)})`).join(" AND ");
         parts.push(`(${sub})`);
       } else {
@@ -964,9 +965,10 @@ function parseMongoWhere(where) {
   function buildClause(w) {
     const conditions = [];
     for (const [field, value] of Object.entries(w)) {
-      if (field === "OR" && Array.isArray(value)) {
+      const upperField = field.toUpperCase();
+      if (upperField === "OR" && Array.isArray(value)) {
         conditions.push({ $or: value.map(buildClause) });
-      } else if (field === "AND" && Array.isArray(value)) {
+      } else if (upperField === "AND" && Array.isArray(value)) {
         conditions.push({ $and: value.map(buildClause) });
       } else {
         conditions.push(buildOperator(field, value));

package/dist/server.cjs

@@ -45,6 +45,49 @@ var import_hono = require("hono");
 var import_cors = require("hono/cors");
 var import_request_id = require("hono/request-id");
 
+// src/services/defaults.service.ts
+var DefaultsService = class {
+  /**
+   * Recursively apply default values to a data object based on field definitions.
+   */
+  static apply(fields, data = {}) {
+    const result = { ...data || {} };
+    fields.forEach((field) => {
+      if (field.type === "join") return;
+      if (field.type === "row" && field.fields) {
+        Object.assign(result, this.apply(field.fields, data));
+        return;
+      }
+      if (!field.name) return;
+      let value = result[field.name];
+      if ((value === void 0 || value === null) && field.renameTo) {
+        const legacyValue = result[field.renameTo];
+        if (legacyValue !== void 0 && legacyValue !== null) {
+          value = legacyValue;
+          result[field.name] = legacyValue;
+        }
+      }
+      if (value === void 0 || value === null) {
+        if (field.defaultValue !== void 0) {
+          result[field.name] = field.defaultValue;
+        } else {
+          if (field.type === "boolean") result[field.name] = false;
+          else if (field.type === "array") result[field.name] = [];
+          else if (field.type === "multiSelect") result[field.name] = [];
+          else if (field.type === "object") {
+            result[field.name] = this.apply(field.fields || [], {});
+          }
+        }
+      } else if (field.type === "object" && field.fields) {
+        result[field.name] = this.apply(field.fields, value);
+      } else if (field.type === "array" && field.fields && Array.isArray(value)) {
+        result[field.name] = value.map((item) => this.apply(field.fields, item));
+      }
+    });
+    return result;
+  }
+};
+
 // src/services/population.service.ts
 var PopulationService = class {
   db;
@@ -57,7 +100,7 @@ var PopulationService = class {
    * Recursively populate relationship fields in a document or array of documents.
    */
   async populate(args) {
-    const { data, fields, currentDepth, maxDepth } = args;
+    const { data, fields, currentDepth = 0, maxDepth = 10 } = args;
     if (currentDepth >= maxDepth || !data) {
       return data;
     }
@@ -86,8 +129,9 @@ var PopulationService = class {
                 doc = await this.db.findOne({ collection: field.relationTo, id });
               }
               if (!doc || typeof doc !== "object") return id;
+              const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
               return this.populate({
-                data: doc,
+                data: docWithDefaults,
                 fields: relatedCollection.fields,
                 currentDepth: currentDepth + 1,
                 maxDepth
@@ -100,12 +144,35 @@ var PopulationService = class {
             doc = await this.db.findOne({ collection: field.relationTo, id: value });
           }
           if (doc && typeof doc === "object") {
+            const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
             populatedDoc[field.name] = await this.populate({
-              data: doc,
+              data: docWithDefaults,
+              fields: relatedCollection.fields,
+              currentDepth: currentDepth + 1,
+              maxDepth
+            });
+          }
+        }
+      }
+      if (field.type === "url" && value && typeof value === "object" && value.type === "internal" && value.relationTo && value.value) {
+        const relatedCollection = this.collections.find((c) => c.slug === value.relationTo);
+        if (relatedCollection) {
+          const doc = await this.db.findOne({ collection: value.relationTo, id: value.value });
+          if (doc && typeof doc === "object") {
+            const docWithDefaults = DefaultsService.apply(relatedCollection.fields, doc);
+            const populatedDocValue = await this.populate({
+              data: docWithDefaults,
               fields: relatedCollection.fields,
               currentDepth: currentDepth + 1,
               maxDepth
             });
+            const identifier = docWithDefaults.slug || docWithDefaults.id;
+            const resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            populatedDoc[field.name] = {
+              ...value,
+              url: resolvedUrl,
+              doc: populatedDocValue
+            };
           }
         }
       }
@@ -153,49 +220,6 @@ var PopulationService = class {
   }
 };
 
-// src/services/defaults.service.ts
-var DefaultsService = class {
-  /**
-   * Recursively apply default values to a data object based on field definitions.
-   */
-  static apply(fields, data = {}) {
-    const result = { ...data || {} };
-    fields.forEach((field) => {
-      if (field.type === "join") return;
-      if (field.type === "row" && field.fields) {
-        Object.assign(result, this.apply(field.fields, data));
-        return;
-      }
-      if (!field.name) return;
-      let value = result[field.name];
-      if ((value === void 0 || value === null) && field.renameTo) {
-        const legacyValue = result[field.renameTo];
-        if (legacyValue !== void 0 && legacyValue !== null) {
-          value = legacyValue;
-          result[field.name] = legacyValue;
-        }
-      }
-      if (value === void 0 || value === null) {
-        if (field.defaultValue !== void 0) {
-          result[field.name] = field.defaultValue;
-        } else {
-          if (field.type === "boolean") result[field.name] = false;
-          else if (field.type === "array") result[field.name] = [];
-          else if (field.type === "multiSelect") result[field.name] = [];
-          else if (field.type === "object") {
-            result[field.name] = this.apply(field.fields || [], {});
-          }
-        }
-      } else if (field.type === "object" && field.fields) {
-        result[field.name] = this.apply(field.fields, value);
-      } else if (field.type === "array" && field.fields && Array.isArray(value)) {
-        result[field.name] = value.map((item) => this.apply(field.fields, item));
-      }
-    });
-    return result;
-  }
-};
-
 // src/services/audit.service.ts
 var AuditService = class {
   /**
@@ -236,7 +260,7 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const limit = Number(c.req.query("limit")) || 10;
     const page = Number(c.req.query("page")) || 1;
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 2;
     const sort = c.req.query("sort") || void 0;
     let where = void 0;
     const whereRaw = c.req.query("where");
@@ -278,7 +302,7 @@ var CollectionController = class {
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const id = c.req.param("id");
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     if (!id) return c.json({ message: "Missing ID" }, 400);
     const doc = await db.findOne({ collection: this.collection.slug, id });
     if (!doc) return c.json({ message: "Not Found" }, 404);
@@ -499,7 +523,7 @@ var GlobalController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
-    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
+    const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     let data = await db.getGlobal({ slug: this.global.slug });
     const isEmpty = !data || Object.keys(data).length === 0;
     if (isEmpty && this.global.initialData) {
@@ -513,7 +537,7 @@ var GlobalController = class {
       const populatedData = await populationService.populate({
         data: dataWithDefaults,
         fields: this.global.fields,
-        currentDepth: 1,
+        currentDepth: 0,
         maxDepth: depth
       });
       return c.json(populatedData);

package/dist/server.d.cts

@@ -1,5 +1,5 @@
-import { c as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-DZt5nslu.cjs';
-export { g as createDyrectedApp } from './app-DZt5nslu.cjs';
+import { c as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-Dk3SzV1a.cjs';
+export { g as createDyrectedApp } from './app-Dk3SzV1a.cjs';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import * as hono_utils_http_status from 'hono/utils/http-status';

package/dist/server.d.ts

@@ -1,5 +1,5 @@
-import { c as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-DZt5nslu.js';
-export { g as createDyrectedApp } from './app-DZt5nslu.js';
+import { c as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-Dk3SzV1a.js';
+export { g as createDyrectedApp } from './app-Dk3SzV1a.js';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import * as hono_utils_http_status from 'hono/utils/http-status';

package/dist/server.js

@@ -6,7 +6,7 @@ import {
   PreviewController,
   createDyrectedApp,
   registerRoutes
-} from "./chunk-TIJHR54M.js";
+} from "./chunk-3VUH2MNW.js";
 export {
   AuthController,
   CollectionController,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/core",
-  "version": "2.5.8",
+  "version": "2.5.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",