dzql 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dzql",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "PostgreSQL-powered framework with zero boilerplate CRUD operations and real-time WebSocket synchronization",
   "type": "module",
   "main": "src/server/index.js",

package/src/compiler/codegen/graph-rules-codegen.js

@@ -39,24 +39,43 @@ export class GraphRulesCodegen {
     const operation = trigger.replace('on_', '');  // on_create -> create
     const functionName = `_graph_${this.tableName}_${trigger}`;
 
-    const actionBlocks = [];
+    const ruleBlocks = [];
 
     // Process each rule
     for (const [ruleName, ruleConfig] of Object.entries(rules)) {
       const description = ruleConfig.description || ruleName;
+      const condition = ruleConfig.condition;
       const actions = Array.isArray(ruleConfig.actions)
         ? ruleConfig.actions
         : (ruleConfig.actions ? [ruleConfig.actions] : []);
 
+      const actionBlocks = [];
       for (const action of actions) {
         const actionSQL = this._generateAction(action, ruleName, description);
         if (actionSQL) {
           actionBlocks.push(actionSQL);
         }
       }
+
+      if (actionBlocks.length === 0) {
+        continue;  // Skip rules with no actions
+      }
+
+      // Wrap actions in condition IF block if condition is present
+      if (condition) {
+        const conditionSQL = this._generateCondition(condition, operation);
+        const ruleBlock = `  -- Rule: ${ruleName}
+  IF ${conditionSQL} THEN
+${actionBlocks.join('\n\n')}
+  END IF;`;
+        ruleBlocks.push(ruleBlock);
+      } else {
+        // No condition - add actions directly
+        ruleBlocks.push(...actionBlocks);
+      }
     }
 
-    if (actionBlocks.length === 0) {
+    if (ruleBlocks.length === 0) {
       return null;  // No actions, no function
     }
 
@@ -72,7 +91,7 @@ CREATE OR REPLACE FUNCTION ${functionName}(
   ${params}
 ) RETURNS VOID AS $$
 BEGIN
-${actionBlocks.join('\n\n')}
+${ruleBlocks.join('\n\n')}
 END;
 $$ LANGUAGE plpgsql SECURITY DEFINER;`;
   }
@@ -100,6 +119,9 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
       case 'execute':
         return this._generateExecuteAction(action, comment);
 
+      case 'notify':
+        return this._generateNotifyAction(action, comment);
+
       default:
         console.warn('Unknown action type:', action.type);
         return null;
@@ -211,6 +233,140 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
   PERFORM ${functionName}(${paramSQL});`;
   }
 
+  /**
+   * Generate NOTIFY action
+   * Creates an event that will be broadcast to specified users
+   * @private
+   */
+  _generateNotifyAction(action, comment) {
+    const users = action.users || [];
+    const message = action.message || '';
+    const data = action.data || {};
+
+    // Build user ID array resolution
+    let userIdSQL = 'ARRAY[]::INT[]';
+
+    if (users.length > 0) {
+      // Users can be paths like "@post_id->posts.author_id" or direct field refs like "@author_id"
+      const userPaths = [];
+
+      for (const userPath of users) {
+        if (userPath.startsWith('@') && !userPath.includes('->')) {
+          // Simple field reference: @author_id
+          const fieldName = userPath.substring(1);
+          userPaths.push(`(p_record->>'${fieldName}')::int`);
+        } else if (userPath.startsWith('@') && userPath.includes('->')) {
+          // Complex path: @post_id->posts.author_id - use runtime resolver
+          userPaths.push(`dzql.resolve_notification_path('${this.tableName}', p_record, '${userPath}')`);
+        } else {
+          // Literal user ID
+          userPaths.push(`${userPath}`);
+        }
+      }
+
+      if (userPaths.length === 1 && !userPaths[0].includes('resolve_notification_path')) {
+        // Single simple field - wrap in array
+        userIdSQL = `ARRAY[${userPaths[0]}]`;
+      } else if (userPaths.length === 1) {
+        // Single path resolution (already returns array)
+        userIdSQL = userPaths[0];
+      } else {
+        // Multiple paths - need to combine arrays
+        userIdSQL = `(${userPaths.map(p =>
+          p.includes('resolve_notification_path')
+            ? p
+            : `ARRAY[${p}]`
+        ).join(' || ')})`;
+      }
+    }
+
+    // Build notification data object
+    const dataFields = [];
+    dataFields.push(`'type', 'graph_rule_notification'`);
+    dataFields.push(`'table', '${this.tableName}'`);
+
+    if (message) {
+      dataFields.push(`'message', ${this._resolveValue(message)}`);
+    }
+
+    // Add custom data fields
+    for (const [key, value] of Object.entries(data)) {
+      dataFields.push(`'${key}', ${this._resolveValue(value)}`);
+    }
+
+    const dataSQL = dataFields.length > 0
+      ? `jsonb_build_object(${dataFields.join(', ')})`
+      : "'{}'::jsonb";
+
+    return `${comment}
+  -- Create notification event
+  INSERT INTO dzql.events (
+    table_name,
+    op,
+    pk,
+    data,
+    user_id,
+    notify_users
+  ) VALUES (
+    '${this.tableName}',
+    'notify',
+    jsonb_build_object('id', (p_record->>'id')::int),
+    ${dataSQL},
+    p_user_id,
+    ${userIdSQL}
+  );`;
+  }
+
+  /**
+   * Generate condition SQL from condition string
+   * Supports @before.field, @after.field, @user_id, @id
+   * @private
+   */
+  _generateCondition(condition, operation) {
+    let conditionSQL = condition;
+
+    // Replace @before.field references (for update/delete)
+    conditionSQL = conditionSQL.replace(/@before\.(\w+)/g, (match, field) => {
+      return `(p_old_record->>'${field}')`;
+    });
+
+    // Replace @after.field references (for update)
+    conditionSQL = conditionSQL.replace(/@after\.(\w+)/g, (match, field) => {
+      if (operation === 'update') {
+        return `(p_new_record->>'${field}')`;
+      } else {
+        return `(p_record->>'${field}')`;
+      }
+    });
+
+    // Replace @field references (current record)
+    conditionSQL = conditionSQL.replace(/@(\w+)(?!\w)/g, (match, field) => {
+      if (field === 'user_id') {
+        return 'p_user_id';
+      } else if (field === 'id') {
+        // Use appropriate record based on operation
+        if (operation === 'update') {
+          return `(p_new_record->>'id')`;
+        } else if (operation === 'delete') {
+          return `(p_old_record->>'id')`;
+        } else {
+          return `(p_record->>'id')`;
+        }
+      } else {
+        // Field from current record
+        if (operation === 'update') {
+          return `(p_new_record->>'${field}')`;
+        } else if (operation === 'delete') {
+          return `(p_old_record->>'${field}')`;
+        } else {
+          return `(p_record->>'${field}')`;
+        }
+      }
+    });
+
+    return conditionSQL;
+  }
+
   /**
    * Resolve a value (variable reference or literal)
    * @private

package/src/compiler/codegen/operation-codegen.js

@@ -729,10 +729,11 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
   }
 
   /**
-   * Resolve a variable default (@user_id, @now, @today) to SQL expression
+   * Resolve a variable default (@user_id, @now, @today, @field_name) to SQL expression
    * @private
    */
   _resolveDefaultVariable(variable, fieldName) {
+    // Handle built-in variables
     switch (variable) {
       case '@user_id':
         return 'p_user_id';
@@ -740,9 +741,16 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
         return `to_char(NOW(), 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`;
       case '@today':
         return `to_char(CURRENT_DATE, 'YYYY-MM-DD')`;
-      default:
-        throw new Error(`Unknown field default variable: ${variable} for field ${fieldName}`);
     }
+
+    // Handle field references: @other_field
+    if (variable.startsWith('@')) {
+      const referencedField = variable.substring(1);
+      // Reference to another field in the data being inserted
+      return `(p_data->>'${referencedField}')`;
+    }
+
+    throw new Error(`Unknown field default variable: ${variable} for field ${fieldName}`);
   }
 
   /**

package/src/compiler/codegen/permission-codegen.js

@@ -228,7 +228,11 @@ $$ LANGUAGE plpgsql STABLE SECURITY DEFINER;`;
 
     // Add temporal condition
     if (temporal) {
-      conditions.push(`${targetTable}.valid_to IS NULL`);
+      // Add temporal filtering for {active} marker
+      // Assumes standard field names: valid_from and valid_to
+      // This matches the interpreter's behavior in resolve_path_segment (002_functions.sql:316)
+      conditions.push(`${targetTable}.valid_from <= NOW()`);
+      conditions.push(`(${targetTable}.valid_to > NOW() OR ${targetTable}.valid_to IS NULL)`);
     }
 
     // Add user_id check (final target)

package/src/server/db.js

@@ -173,50 +173,14 @@ export async function setupListeners(callback) {
   }
 }
 
-// Cache for mode detection (null = not checked, true = compiled, false = runtime)
-let isCompiledMode = null;
-
-// Auto-detect if we're in compiled or runtime mode
-async function detectMode() {
-  if (isCompiledMode !== null) {
-    return isCompiledMode;
-  }
-
-  try {
-    // Check if dzql.generic_exec exists
-    const result = await sql`
-      SELECT 1 FROM pg_proc
-      WHERE proname = 'generic_exec'
-      AND pronamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'dzql')
-      LIMIT 1
-    `;
-    isCompiledMode = result.length === 0; // If no results, it's compiled mode
-    dbLogger.trace(isCompiledMode ? 'Detected compiled mode' : 'Detected runtime mode');
-  } catch (error) {
-    // If there's an error checking, assume runtime mode
-    isCompiledMode = false;
-    dbLogger.trace('Error detecting mode, assuming runtime mode');
-  }
-
-  return isCompiledMode;
-}
-
-// DZQL Generic Operations
+// DZQL Generic Operations - Try compiled functions first, fall back to generic_exec
 export async function callDZQLOperation(operation, entity, args, userId) {
   dbLogger.trace(`DZQL ${operation}.${entity} for user ${userId}`);
 
-  const compiled = await detectMode();
-
-  if (!compiled) {
-    // Runtime mode - use generic_exec
-    const result = await sql`
-      SELECT dzql.generic_exec(${operation}, ${entity}, ${args}, ${userId}) as result
-    `;
-    return result[0].result;
-  } else {
-    // Compiled mode - call compiled function directly
-    const compiledFunctionName = `${operation}_${entity}`;
+  const compiledFunctionName = `${operation}_${entity}`;
 
+  try {
+    // Try compiled function first
     // Different operations have different signatures:
     // - search: search_entity(p_user_id, p_filters, p_search, p_sort, p_page, p_limit)
     // - get: get_entity(p_user_id, p_id, p_on_date)
@@ -259,6 +223,22 @@ export async function callDZQLOperation(operation, entity, args, userId) {
     } else {
       throw new Error(`Unknown operation: ${operation}`);
     }
+  } catch (error) {
+    // Only fall back if the COMPILED function itself doesn't exist
+    // Don't fall back for other "does not exist" errors (e.g., missing tables, downstream functions)
+    const isMissingCompiledFunction =
+      (error.message?.includes('does not exist') || error.code === '42883') &&
+      error.message?.includes(compiledFunctionName);
+
+    if (isMissingCompiledFunction) {
+      dbLogger.trace(`Compiled function ${compiledFunctionName} not found, trying generic_exec`);
+      const result = await sql`
+        SELECT dzql.generic_exec(${operation}, ${entity}, ${args}, ${userId}) as result
+      `;
+      return result[0].result;
+    }
+    // Re-throw other errors
+    throw error;
   }
 }
 

package/src/server/index.js

@@ -31,12 +31,12 @@ async function processSubscriptionUpdates(event, broadcast) {
   for (const [subscribableName, subs] of subscriptionsByName.entries()) {
     try {
       // Ask PostgreSQL which subscription instances are affected
-      const result = await db.query(
+      const result = await sql.unsafe(
         `SELECT ${subscribableName}_affected_documents($1, $2, $3, $4) as affected`,
         [table, op, before, after]
       );
 
-      const affectedParamSets = result.rows[0]?.affected;
+      const affectedParamSets = result[0]?.affected;
 
       if (!affectedParamSets || affectedParamSets.length === 0) {
         continue; // This subscribable not affected
@@ -51,12 +51,12 @@ async function processSubscriptionUpdates(event, broadcast) {
           if (paramsMatch(sub.params, affectedParams)) {
             try {
               // Re-execute query to get updated data
-              const updated = await db.query(
+              const updated = await sql.unsafe(
                 `SELECT get_${subscribableName}($1, $2) as data`,
                 [sub.params, sub.user_id]
               );
 
-              const data = updated.rows[0]?.data;
+              const data = updated[0]?.data;
 
               // Send update to specific connection
               const message = JSON.stringify({

package/src/server/namespace.js

@@ -9,9 +9,10 @@ import { sql, db } from "./db.js";
 const DEFAULT_USER_ID = 1;
 
 /**
- * Discover available entities from dzql.entities table
+ * Discover available entities from dzql.entities table or compiled functions
  */
 async function discoverEntities() {
+  // First try dzql.entities table (runtime mode)
   const result = await sql`
     SELECT table_name, label_field, searchable_fields
     FROM dzql.entities
@@ -19,13 +20,36 @@ async function discoverEntities() {
   `;
 
   const entities = {};
-  for (const row of result) {
-    const searchFields = row.searchable_fields?.join(", ") || "none";
-    entities[row.table_name] = {
-      label: row.label_field,
-      searchable: row.searchable_fields || [],
-      description: `Entity: ${row.table_name} (label: ${row.label_field}, searchable: ${searchFields})`,
-    };
+
+  if (result.length > 0) {
+    // Runtime mode - use dzql.entities table
+    for (const row of result) {
+      const searchFields = row.searchable_fields?.join(", ") || "none";
+      entities[row.table_name] = {
+        label: row.label_field,
+        searchable: row.searchable_fields || [],
+        description: `Entity: ${row.table_name} (label: ${row.label_field}, searchable: ${searchFields})`,
+      };
+    }
+  } else {
+    // Compiled mode - discover from function names
+    const functions = await sql`
+      SELECT DISTINCT substring(proname from 'search_(.+)') as entity_name
+      FROM pg_proc
+      WHERE pronamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+      AND proname LIKE 'search_%'
+      AND substring(proname from 'search_(.+)') IS NOT NULL
+      ORDER BY entity_name
+    `;
+
+    for (const row of functions) {
+      const entityName = row.entity_name;
+      entities[entityName] = {
+        label: 'id',  // Default, since we can't know from functions alone
+        searchable: [],
+        description: `Entity: ${entityName} (compiled mode)`,
+      };
+    }
   }
 
   return entities;

package/src/server/ws.js

@@ -4,6 +4,7 @@ import {
   callUserFunction,
   getUserProfile,
   db,
+  sql,
 } from "./db.js";
 import { wsLogger, authLogger } from "./logger.js";
 import {
@@ -317,12 +318,12 @@ export function createRPCHandler(customHandlers = {}) {
 
         try {
           // Execute initial query (this also checks permissions)
-          const queryResult = await db.query(
+          const queryResult = await sql.unsafe(
             `SELECT get_${subscribableName}($1, $2) as data`,
             [params, ws.data.user_id]
           );
 
-          const data = queryResult.rows[0]?.data;
+          const data = queryResult[0]?.data;
 
           // Register subscription in memory
           const subscriptionId = registerSubscription(

package/src/client/stores/README.md

@@ -1,95 +0,0 @@
-# DZQL Canonical Pinia Stores
-
-**The official, AI-friendly Pinia stores for DZQL Vue.js applications.**
-
-## Why These Stores Exist
-
-When building DZQL apps, developers (and AI assistants) often struggle with:
-
-1. **Three-phase lifecycle** - connecting → login → ready
-2. **WebSocket connection management** - reconnection, error handling
-3. **Authentication flow** - token storage, profile management  
-4. **Router integration** - navigation, state synchronization
-5. **Inconsistent patterns** - every project does it differently
-
-These canonical stores solve all of these problems with a **simple, consistent pattern** that AI can easily understand and replicate.
-
-## The Stores
-
-### `useWsStore` - WebSocket & Auth
-
-Manages:
-- WebSocket connection (with auto-reconnect)
-- User authentication (login/register/logout)
-- Connection state tracking
-- Three-phase app lifecycle
-
-### `useAppStore` - Application State
-
-Manages:
-- App initialization
-- Router integration
-- Entity metadata caching
-- Navigation helpers
-- UI state (sidebars, panels)
-
-## Quick Example
-
-```vue
-<script setup>
-import { computed } from 'vue'
-import { useWsStore, useAppStore } from 'dzql/client/stores'
-
-const wsStore = useWsStore()
-const appStore = useAppStore()
-
-const state = computed(() => wsStore.appState)
-const ws = wsStore.getWs()
-
-// Use DZQL API
-const venues = await ws.api.search.venues({ limit: 50 })
-</script>
-
-<template>
-  <!-- Three-phase lifecycle -->
-  <div v-if="state === 'connecting'">Connecting...</div>
-  <LoginView v-else-if="state === 'login'" />
-  <MainApp v-else-if="state === 'ready'" />
-</template>
-```
-
-## Documentation
-
-- **[Quick Start](../../../docs/reference/client.md)** - Get running in 5 minutes
-- **[Complete Guide](../../../docs/guides/client-stores.md)** - Full API reference and patterns
-
-## Files
-
-- `useWsStore.js` - WebSocket connection and authentication
-- `useAppStore.js` - Application state and navigation
-- `index.js` - Exports both stores
-
-## For AI Assistants
-
-When helping users with DZQL apps:
-
-1. **Always use these stores** - Don't create custom connection logic
-2. **Follow the three-phase lifecycle** - connecting → login → ready
-3. **Use computed for reactive state** - `const profile = computed(() => wsStore.profile)`
-4. **Get WS instance for API calls** - `const ws = wsStore.getWs()`
-
-**Example prompt for AI:**
-
-> "I'm using the canonical DZQL stores from `dzql/client/stores`. The pattern is:
-> 1. useWsStore for WebSocket connection (three phases: connecting, login, ready)
-> 2. useAppStore for app state and navigation
-> 3. Access DZQL API via `wsStore.getWs().api.get.venues({ id: 1 })`
-> Please follow this pattern."
-
-## Version
-
-These stores are available in DZQL v0.1.6+
-
-## License
-
-MIT