dzql 0.6.19 → 0.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dzql",
-  "version": "0.6.19",
+  "version": "0.6.21",
   "description": "Database-first real-time framework with TypeScript support",
   "repository": {
     "type": "git",

package/src/cli/codegen/sql.ts

@@ -583,6 +583,31 @@ export function generateGetFunction(name: string, entityIR: EntityIR): string {
   // Build SELECT expression excluding hidden fields
   const selectExpr = buildVisibleJsonb(name, entityIR.columns, hidden);
 
+  // FK expansion for GET (only direct FKs where {key}_id column exists)
+  // Reverse FK expansion (one-to-many) should be handled by subscribables for complex queries
+  const includes: Record<string, IncludeIR> = entityIR.includes || {};
+  const includeKeys = Object.keys(includes);
+  const fkExpansion = includeKeys.map(key => {
+    const config: IncludeIR = includes[key];
+    const targetEntity = config.entity;
+    const fkField = `${key}_id`; // Convention: author -> author_id
+
+    // Only expand direct FKs (key_id column exists on this entity)
+    const hasFkColumn = entityIR.columns.some((c: ColumnInfo) => c.name === fkField);
+
+    if (hasFkColumn) {
+      // Direct FK: single object expansion (e.g., author_id -> author object)
+      return `
+  -- FK: Add ${key} to result (from ${fkField})
+  IF (v_result->>'${fkField}') IS NOT NULL THEN
+    v_result := v_result || jsonb_build_object('${key}',
+      (SELECT to_jsonb(t.*) FROM ${targetEntity} t WHERE t.id = (v_result->>'${fkField}')::int));
+  END IF;`;
+    }
+    // Skip reverse FKs - use subscribables for complex document graphs
+    return '';
+  }).filter(s => s).join('\n');
+
   // M2M expansion for GET
   const m2m: Record<string, ManyToManyIR> = entityIR.manyToMany || {};
   const m2mKeys = Object.keys(m2m);
@@ -625,6 +650,7 @@ BEGIN
   IF v_result IS NULL THEN
     RETURN NULL;
   END IF;
+${fkExpansion}
 ${m2mExpansion}
 
   RETURN v_result;

package/src/cli/index.ts

@@ -67,8 +67,14 @@ async function main() {
 
       // Phase 3: Generate SQL
       const coreSQL = generateCoreSQL();
+
+      // Topologically sort entities by FK dependencies
+      // Entities must be created before entities that reference them
+      const sortedEntityNames = topologicalSortEntities(ir.entities);
+
       const entitySQL: string[] = [];
-      for (const [name, entityIR] of Object.entries(ir.entities)) {
+      for (const name of sortedEntityNames) {
+        const entityIR = ir.entities[name];
         entitySQL.push(generateSchemaSQL(name, entityIR));
         // Skip CRUD generation for unmanaged entities (e.g., junction tables)
         if (entityIR.managed !== false) {
@@ -171,3 +177,71 @@ async function main() {
 }
 
 main();
+
+/**
+ * Topologically sort entities based on FK dependencies.
+ * Entities that are referenced by others come first.
+ * Uses Kahn's algorithm for topological sorting.
+ */
+function topologicalSortEntities(entities: Record<string, any>): string[] {
+  const entityNames = Object.keys(entities);
+
+  // Build dependency graph: entity -> entities it depends on (references)
+  const dependencies: Record<string, Set<string>> = {};
+  const dependents: Record<string, Set<string>> = {};
+
+  for (const name of entityNames) {
+    dependencies[name] = new Set();
+    dependents[name] = new Set();
+  }
+
+  // Parse REFERENCES from column types
+  for (const name of entityNames) {
+    const entity = entities[name];
+    for (const col of entity.columns || []) {
+      const match = col.type?.match(/REFERENCES\s+(\w+)/i);
+      if (match) {
+        const referencedEntity = match[1];
+        // Only track dependencies to entities we're managing
+        if (entityNames.includes(referencedEntity)) {
+          dependencies[name].add(referencedEntity);
+          dependents[referencedEntity].add(name);
+        }
+      }
+    }
+  }
+
+  // Kahn's algorithm
+  const result: string[] = [];
+  const noIncoming: string[] = [];
+
+  // Find entities with no dependencies (no incoming edges)
+  for (const name of entityNames) {
+    if (dependencies[name].size === 0) {
+      noIncoming.push(name);
+    }
+  }
+
+  while (noIncoming.length > 0) {
+    const node = noIncoming.shift()!;
+    result.push(node);
+
+    // Remove this node from the graph
+    for (const dependent of dependents[node]) {
+      dependencies[dependent].delete(node);
+      if (dependencies[dependent].size === 0) {
+        noIncoming.push(dependent);
+      }
+    }
+  }
+
+  // Check for cycles
+  if (result.length !== entityNames.length) {
+    const remaining = entityNames.filter(n => !result.includes(n));
+    console.warn(`[Compiler] Warning: Circular FK dependencies detected among: ${remaining.join(', ')}`);
+    // Add remaining entities anyway (they may have circular refs)
+    result.push(...remaining);
+  }
+
+  return result;
+}