mnfst 0.5.204 → 0.5.206

package/lib/manifest.appwrite.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.204';
+const MANIFEST_BUILD_VERSION = '0.5.206';
 
 /* Manifest Data Sources - Appwrite Integration */
 
@@ -841,12 +841,15 @@ const ALLOWED_VARIABLES = [
 ];
 
 // Get auth store value safely
+// Path is relative to the auth store itself (e.g. "currentTeam.$id", not "auth.currentTeam.$id").
+// Supports optional-chaining syntax ("currentTeam?.$id") by normalizing "?." to "." — a
+// missing intermediate value already returns null via the loop below.
 function getAuthValue(path) {
     try {
         const store = Alpine.store('auth');
         if (!store) return null;
 
-        const parts = path.split('.');
+        const parts = path.replace(/\?\./g, '.').split('.');
         let value = store;
 
         for (const part of parts) {
@@ -893,7 +896,9 @@ function interpolateVariable(value) {
 
     // Check if it's a variable reference
     if (value.startsWith('$auth.')) {
-        const path = value.substring(1); // Remove leading $
+        // Strip the '$auth.' prefix (not just '$') — Alpine.store('auth') IS the auth
+        // object, so a path starting with another 'auth' segment would never resolve.
+        const path = value.substring('$auth.'.length);
         return getAuthValue(path);
     } else if (value === '$locale.current') {
         return getLocaleValue();
@@ -914,6 +919,12 @@ function isVariable(str) {
     return str.includes('.') || ALLOWED_VARIABLES.includes(str);
 }
 
+// Thrown by interpolateQuery/interpolateObject when a whitelisted $auth.
+// variable hasn't resolved yet (auth store not settled) — buildQueries
+// catches this and returns NOT_READY rather than sending a query with a
+// null/undefined arg (Appwrite 400s on that) to the network.
+const NOT_READY = Symbol('manifest-data-not-ready');
+
 // Interpolate variables in query array
 function interpolateQuery(query) {
     if (!Array.isArray(query) || query.length === 0) {
@@ -925,7 +936,9 @@ function interpolateQuery(query) {
         if (typeof arg === 'string' && isVariable(arg)) {
             // Check if it's in the whitelist
             if (ALLOWED_VARIABLES.includes(arg)) {
-                return interpolateVariable(arg);
+                const value = interpolateVariable(arg);
+                if (value === null || value === undefined) throw NOT_READY;
+                return value;
             } else {
                 console.warn(`[Manifest Data] Variable "${arg}" is not in whitelist. Allowed:`, ALLOWED_VARIABLES);
                 // SECURITY: Return empty string for non-whitelisted variables to prevent injection
@@ -952,7 +965,9 @@ function interpolateObject(obj) {
     for (const [key, value] of Object.entries(obj)) {
         if (typeof value === 'string' && isVariable(value)) {
             if (ALLOWED_VARIABLES.includes(value)) {
-                result[key] = interpolateVariable(value);
+                const resolved = interpolateVariable(value);
+                if (resolved === null || resolved === undefined) throw NOT_READY;
+                result[key] = resolved;
             } else {
                 console.warn(`[Manifest Data] Variable "${value}" is not in whitelist`);
                 // SECURITY: Return empty string for non-whitelisted variables to prevent injection
@@ -969,15 +984,57 @@ function interpolateObject(obj) {
     return result;
 }
 
-// Build queries with scope injection
+// Default scope column names, overridable per data source via `scopeColumn`
+const DEFAULT_SCOPE_COLUMNS = { team: 'teamId', user: 'userId' };
+
+// Event-driven wait for the auth store's initial hydration — resolves immediately
+// once already settled, otherwise waits for manifest:auth:initialized (capped so a
+// misconfigured/absent auth plugin can't hang a read forever).
+const AUTH_INIT_WAIT_MS = 3000;
+function waitForAuthInit(authStore) {
+    if (!authStore || (authStore._initialized && authStore.isAuthenticated !== undefined)) {
+        return Promise.resolve();
+    }
+    if (typeof window === 'undefined') return Promise.resolve();
+    return new Promise(resolve => {
+        let done = false;
+        const timer = setTimeout(finish, AUTH_INIT_WAIT_MS);
+        function finish() {
+            if (done) return;
+            done = true;
+            clearTimeout(timer);
+            window.removeEventListener('manifest:auth:initialized', finish);
+            resolve();
+        }
+        window.addEventListener('manifest:auth:initialized', finish);
+    });
+}
+
+// Build queries with scope injection. Returns null ("not ready") instead of a
+// query array when a $auth. arg or a required scope value hasn't resolved yet
+// — callers must skip the read (never send a null/undefined/empty-equal arg to
+// Appwrite) and retry once auth settles (manifest:auth:initialized/teams-loaded/login).
 // SECURITY: Scope queries are ALWAYS prepended to user queries to prevent bypass
-async function buildQueries(queriesConfig, scope) {
+// scopeColumns: { team, user } column names to filter/write on (default teamId/userId)
+async function buildQueries(queriesConfig, scope, scopeColumns) {
+    const cols = { ...DEFAULT_SCOPE_COLUMNS, ...(scopeColumns || {}) };
     if (!queriesConfig || !Array.isArray(queriesConfig)) {
         return [];
     }
 
+    // Wait for auth to settle before interpolating — a $auth. reference in a raw
+    // user query (queries.default) needs this regardless of whether `scope` is set.
+    const authStore = typeof Alpine !== 'undefined' ? Alpine.store('auth') : null;
+    await waitForAuthInit(authStore);
+
     // Interpolate user-provided queries
-    const userQueries = queriesConfig.map(query => interpolateQuery(query));
+    let userQueries;
+    try {
+        userQueries = queriesConfig.map(query => interpolateQuery(query));
+    } catch (e) {
+        if (e === NOT_READY) return null;
+        throw e;
+    }
 
     // SECURITY: Build scope queries FIRST (they will be prepended)
     // This ensures scope restrictions cannot be bypassed by user queries
@@ -999,17 +1056,6 @@ async function buildQueries(queriesConfig, scope) {
     const hasTeamScope = scopeArray.includes('team');
     const hasTeamsScope = scopeArray.includes('teams');
 
-    // Wait for auth store to be initialized (shared for all scopes)
-    const authStore = typeof Alpine !== 'undefined' ? Alpine.store('auth') : null;
-    if (authStore && (!authStore._initialized || authStore.isAuthenticated === undefined)) {
-        let attempts = 0;
-        const maxAttempts = 10; // Wait up to 500ms (10 * 50ms)
-        while (attempts < maxAttempts && (!authStore._initialized || authStore.isAuthenticated === undefined)) {
-            await new Promise(resolve => setTimeout(resolve, 50));
-            attempts++;
-        }
-    }
-
     // Special case: ["user", "team"] or ["user", "teams"] or ["teams", "user"] or ["team", "user"] - use OR logic
     // Show projects that belong to user OR current team OR any of their teams
     // Note: "team" (singular) means currentTeam, "teams" (plural) means all teams in user's teams array
@@ -1024,7 +1070,7 @@ async function buildQueries(queriesConfig, scope) {
         if (isAuthenticated && user) {
             const userId = getAuthValue('userId') || getAuthValue('user.$id') || getAuthValue('user.id') || user.$id || user.id;
             if (userId) {
-                orQueries.push(['equal', 'userId', userId]);
+                orQueries.push(['equal', cols.user, userId]);
             } else {
             }
         } else {
@@ -1053,7 +1099,7 @@ async function buildQueries(queriesConfig, scope) {
         teamIds = [...new Set(teamIds)];
 
         teamIds.forEach(teamId => {
-            orQueries.push(['equal', 'teamId', teamId]);
+            orQueries.push(['equal', cols.team, teamId]);
         });
 
         if (orQueries.length > 0) {
@@ -1063,8 +1109,9 @@ async function buildQueries(queriesConfig, scope) {
                 scopeQueries.push(['or', orQueries]);
             }
         } else {
-            // No user or teams - return no results
-            scopeQueries.push(['equal', 'userId', '']);
+            // No user or teams resolved — not ready (or genuinely unauthenticated):
+            // skip the read rather than send an empty-equal; caller retries on an auth event.
+            return null;
         }
     } else {
         // Handle user scope (when not combined with teams)
@@ -1073,23 +1120,21 @@ async function buildQueries(queriesConfig, scope) {
             const user = authStore?.user;
 
             if (!isAuthenticated || !user) {
-                // User is not authenticated - return no results
-                scopeQueries.push(['equal', 'userId', '']);
-                // SECURITY: Return early with scope query to prevent any data access
-                return scopeQueries;
+                // Not (yet) authenticated — skip the read; caller retries on manifest:auth:login
+                return null;
             }
 
             // Get user ID value
             const userId = getAuthValue('userId') || getAuthValue('user.$id') || getAuthValue('user.id') || user.$id || user.id;
             if (userId) {
-                scopeQueries.push(['equal', 'userId', userId]);
+                scopeQueries.push(['equal', cols.user, userId]);
             } else {
-                // User is authenticated but userId not found - return no results
-                scopeQueries.push(['equal', 'userId', '']);
+                // Authenticated but userId not found — not ready
                 if (!window.__manifestDataDebugLogged) {
                     window.__manifestDataDebugLogged = true;
                     debugAuthStore();
                 }
+                return null;
             }
         }
 
@@ -1102,10 +1147,10 @@ async function buildQueries(queriesConfig, scope) {
                 authStore?.currentTeam?.id;
 
             if (teamId) {
-                scopeQueries.push(['equal', 'teamId', teamId]);
+                scopeQueries.push(['equal', cols.team, teamId]);
             } else {
-                // No team ID found - return no results
-                scopeQueries.push(['equal', 'teamId', '']);
+                // No current team (yet) — skip the read; caller retries on manifest:auth:teams-loaded
+                return null;
             }
         } else if (hasTeamsScope) {
             // Multi-team scope - use all teams user belongs to
@@ -1118,16 +1163,16 @@ async function buildQueries(queriesConfig, scope) {
             if (teamIds.length > 0) {
                 if (teamIds.length === 1) {
                     // Single team - use equal for efficiency
-                    scopeQueries.push(['equal', 'teamId', teamIds[0]]);
+                    scopeQueries.push(['equal', cols.team, teamIds[0]]);
                 } else {
                     // Multiple teams - use Query.or() with multiple Query.equal() calls
                     // Build: Query.or([Query.equal('teamId', id1), Query.equal('teamId', id2), ...])
-                    const equalQueries = teamIds.map(id => ['equal', 'teamId', id]);
+                    const equalQueries = teamIds.map(id => ['equal', cols.team, id]);
                     scopeQueries.push(['or', equalQueries]);
                 }
             } else {
-                // No teams found - return no results
-                scopeQueries.push(['equal', 'teamId', '']);
+                // No teams (yet) — skip the read; caller retries on manifest:auth:teams-loaded
+                return null;
             }
         }
     }
@@ -1205,8 +1250,11 @@ function toAppwriteQuery(queryArray) {
 }
 
 // Build Appwrite queries from configuration
-async function buildAppwriteQueries(queriesConfig, scope) {
-    const queries = await buildQueries(queriesConfig, scope);
+// scopeColumns: { team, user } column names (default teamId/userId) — see manifest.data.config.js getScopeColumns
+// Returns null ("not ready") straight through — see buildQueries.
+async function buildAppwriteQueries(queriesConfig, scope, scopeColumns) {
+    const queries = await buildQueries(queriesConfig, scope, scopeColumns);
+    if (queries === null) return null;
     return queries
         .map(query => toAppwriteQuery(query))
         .filter(query => query !== null);
@@ -1217,10 +1265,12 @@ window.ManifestDataQueries = {
     interpolateVariable,
     interpolateQuery,
     interpolateObject,
+    getAuthValue,
     buildQueries,
     buildAppwriteQueries,
     toAppwriteQuery,
-    ALLOWED_VARIABLES
+    ALLOWED_VARIABLES,
+    DEFAULT_SCOPE_COLUMNS
 };
 
 

package/lib/manifest.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.204';
+const MANIFEST_BUILD_VERSION = '0.5.206';
 
 /* Manifest Data Sources - Configuration */
 
@@ -224,6 +224,24 @@ function getScope(dataSource) {
     return dataSource?.scope || null;
 }
 
+// Get scope column names for a data source (for query building + write-side auto-inject).
+// dataSource.scopeColumn can be a string (applies to both team/user) or
+// { team: "workspaceId", user: "ownerId" } to name them independently.
+// Defaults to teamId/userId when unset.
+function getScopeColumns(dataSource) {
+    const raw = dataSource?.scopeColumn;
+    if (raw && typeof raw === 'object') {
+        return {
+            team: raw.team || 'teamId',
+            user: raw.user || 'userId'
+        };
+    }
+    if (typeof raw === 'string' && raw) {
+        return { team: raw, user: raw };
+    }
+    return { team: 'teamId', user: 'userId' };
+}
+
 // Get auto-injection config from data source
 // Controls whether userId/teamId are automatically injected on create
 function getAutoInjectConfig(dataSource) {
@@ -251,6 +269,7 @@ window.ManifestDataConfig = {
     getAppwriteTableId,
     getAppwriteBucketId,
     getScope,
+    getScopeColumns,
     getQueries,
     getAutoInjectConfig
 };
@@ -4486,10 +4505,15 @@ function attachArrayMethods(array, dataSourceName, reloadDataSource) {
                     throw new Error(`[Manifest Data] Pagination is only supported for Appwrite data sources`);
                 }
                 const scope = window.ManifestDataConfig.getScope(dataSource);
+                const scopeColumns = window.ManifestDataConfig.getScopeColumns(dataSource);
                 const queriesConfig = window.ManifestDataConfig.getQueries(dataSource);
                 const baseQueries = queriesConfig
-                    ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope)
-                    : await window.ManifestDataQueries.buildAppwriteQueries([], scope);
+                    ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope, scopeColumns)
+                    : await window.ManifestDataQueries.buildAppwriteQueries([], scope, scopeColumns);
+
+                if (baseQueries === null) {
+                    throw new Error(`[Manifest Data] "${dataSourceName}" pagination: auth not ready yet — retry after auth settles`);
+                }
 
                 if (methodName === '$first') {
                     const limit = args[0] || 10;
@@ -4832,10 +4856,15 @@ function createArrayProxyWithRoute(arrayTarget, dataSourceName = null, reloadDat
 
                         // Get base queries (from manifest or scope)
                         const scope = window.ManifestDataConfig.getScope(dataSource);
+                        const scopeColumns = window.ManifestDataConfig.getScopeColumns(dataSource);
                         const queriesConfig = window.ManifestDataConfig.getQueries(dataSource);
                         const baseQueries = queriesConfig
-                            ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope)
-                            : await window.ManifestDataQueries.buildAppwriteQueries([], scope);
+                            ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope, scopeColumns)
+                            : await window.ManifestDataQueries.buildAppwriteQueries([], scope, scopeColumns);
+
+                        if (baseQueries === null) {
+                            throw new Error(`[Manifest Data] "${dataSourceName}" pagination: auth not ready yet — retry after auth settles`);
+                        }
 
                         if (key === '$first') {
                             const limit = args[0] || 10;
@@ -7498,13 +7527,14 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
             const tableId = window.ManifestDataConfig.getAppwriteTableId(dataSource);
             const bucketId = window.ManifestDataConfig.getAppwriteBucketId(dataSource);
             const scope = window.ManifestDataConfig.getScope(dataSource);
+            const scopeColumns = window.ManifestDataConfig.getScopeColumns(dataSource);
 
             // Handle table operations (TablesDB)
             if (tableId) {
                 if (method === '$create') {
                     const [data, rowId] = args;
 
-                    // Auto-inject userId and/or teamId based on scope and config
+                    // Auto-inject userId and/or teamId (or their configured scopeColumn) based on scope and config
                     const autoInject = window.ManifestDataConfig.getAutoInjectConfig(dataSource);
                     let enrichedData = { ...data };
                     const authStore = typeof Alpine !== 'undefined' ? Alpine.store('auth') : null;
@@ -7517,16 +7547,16 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
                     // Inject userId if user scope is active and enabled
                     if (autoInject.userId && hasUserScope && authStore?.isAuthenticated && authStore?.user) {
                         const userId = authStore?.user?.$id || authStore?.user?.id || authStore?.userId;
-                        if (userId && !enrichedData.userId) {
-                            enrichedData.userId = userId;
+                        if (userId && !enrichedData[scopeColumns.user]) {
+                            enrichedData[scopeColumns.user] = userId;
                         }
                     }
 
                     // Inject teamId if team scope is active and enabled
                     if (autoInject.teamId && hasTeamScope) {
                         const teamId = authStore?.currentTeam?.$id || authStore?.currentTeam?.id;
-                        if (teamId && !enrichedData.teamId) {
-                            enrichedData.teamId = teamId;
+                        if (teamId && !enrichedData[scopeColumns.team]) {
+                            enrichedData[scopeColumns.team] = teamId;
                         }
                     }
 
@@ -7838,8 +7868,12 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
                     const [queries] = args;
                     const appwriteQueries = await window.ManifestDataQueries.buildAppwriteQueries(
                         queries || [],
-                        scope
+                        scope,
+                        scopeColumns
                     );
+                    if (appwriteQueries === null) {
+                        throw new Error(`[Manifest Data] "${dataSourceName}" $query: auth not ready yet — retry after auth settles`);
+                    }
                     // Dedupe key: source + serialized queries (never across different queries)
                     const key = `${dataSourceName}:$query:${JSON.stringify(appwriteQueries.map(q => String(q)))}`;
                     const { runDeduped, landRows } = window.ManifestDataStore || {};
@@ -8963,10 +8997,15 @@ function createPaginationMethod(methodName, dataSourceName) {
 
         // Base queries from manifest or scope
         const scope = window.ManifestDataConfig.getScope(dataSource);
+        const scopeColumns = window.ManifestDataConfig.getScopeColumns(dataSource);
         const queriesConfig = window.ManifestDataConfig.getQueries(dataSource);
         const baseQueries = queriesConfig
-            ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope)
-            : await window.ManifestDataQueries.buildAppwriteQueries([], scope);
+            ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope, scopeColumns)
+            : await window.ManifestDataQueries.buildAppwriteQueries([], scope, scopeColumns);
+
+        if (baseQueries === null) {
+            throw new Error(`[Manifest Data] "${dataSourceName}" pagination: auth not ready yet — retry after auth settles`);
+        }
 
         if (methodName === '$first') {
             const limit = args[0] || 10;
@@ -11257,6 +11296,25 @@ function registerFilesDirective() {
 
 /* Manifest Data Sources - Main Initialization */
 
+// A scoped query that isn't ready yet (buildAppwriteQueries returned null — see
+// manifest.data.queries.js) skips the network read and waits here instead of
+// sending a broken/empty-equal query. Retries once when auth settles further;
+// dedup by key so a source pending across repeated loads doesn't stack listeners.
+const pendingAuthRetries = new Set();
+const AUTH_RETRY_EVENTS = ['manifest:auth:initialized', 'manifest:auth:teams-loaded', 'manifest:auth:login'];
+function scheduleAuthRetry(dataSourceName, locale) {
+    if (typeof window === 'undefined') return;
+    const key = `${dataSourceName}:${locale}`;
+    if (pendingAuthRetries.has(key)) return;
+    pendingAuthRetries.add(key);
+    const retry = () => {
+        pendingAuthRetries.delete(key);
+        AUTH_RETRY_EVENTS.forEach(type => window.removeEventListener(type, retry));
+        loadDataSource(dataSourceName, locale, { reload: true });
+    };
+    AUTH_RETRY_EVENTS.forEach(type => window.addEventListener(type, retry));
+}
+
 // Client-side scope filter: Appwrite returns all accessible files, so narrow to
 // the current team to match database team-scope behavior.
 async function filterFilesByScope(files, scope) {
@@ -11459,7 +11517,7 @@ function markEventProcessed(eventKey) {
 }
 
 // Handle real-time events for database tables
-async function handleTableRealtimeEvent(dataSourceName, databaseId, tableId, scope, eventType, payload) {
+async function handleTableRealtimeEvent(dataSourceName, databaseId, tableId, scope, scopeColumns, eventType, payload) {
 
     // Deduplicate events
     const eventKey = getEventKey(eventType, payload);
@@ -11486,7 +11544,7 @@ async function handleTableRealtimeEvent(dataSourceName, databaseId, tableId, sco
     if (eventType === 'create') {
         const row = payload?.$id ? payload : (payload?.row || payload);
         if (row && row.$id) {
-            const rowMatchesScope = await checkRowMatchesScope(row, scope);
+            const rowMatchesScope = await checkRowMatchesScope(row, scope, scopeColumns);
             if (rowMatchesScope) {
                 landRows(dataSourceName, [row], { mode: 'append' });
             }
@@ -11497,7 +11555,7 @@ async function handleTableRealtimeEvent(dataSourceName, databaseId, tableId, sco
         const row = payload?.$id ? payload : (payload?.row || payload);
         if (row && row.$id) {
             const existingRow = currentRows.find(r => r.$id === row.$id);
-            const rowMatchesScope = await checkRowMatchesScope(row, scope);
+            const rowMatchesScope = await checkRowMatchesScope(row, scope, scopeColumns);
             if (!rowMatchesScope) {
                 // Row no longer matches scope, remove it
                 if (existingRow) landRemove(dataSourceName, [row.$id]);
@@ -11585,11 +11643,12 @@ async function handleTableRealtimeEvent(dataSourceName, databaseId, tableId, sco
 }
 
 // Check if a database row matches the current scope
-async function checkRowMatchesScope(row, scope) {
+async function checkRowMatchesScope(row, scope, scopeColumns) {
     if (!scope || !row) {
         return true; // No scope, allow it
     }
 
+    const cols = scopeColumns || { team: 'teamId', user: 'userId' };
     const authStore = typeof Alpine !== 'undefined' ? Alpine.store('auth') : null;
     if (!authStore) {
         return true;
@@ -11604,7 +11663,7 @@ async function checkRowMatchesScope(row, scope) {
     if (hasUserScope) {
         const user = authStore.user;
         const userId = user?.$id || user?.id;
-        if (userId && row.userId === userId) {
+        if (userId && row[cols.user] === userId) {
             return true; // Matches user scope
         }
     }
@@ -11612,7 +11671,7 @@ async function checkRowMatchesScope(row, scope) {
     // Check team scope (singular - currentTeam)
     if (hasTeamScope) {
         const currentTeamId = authStore.currentTeam?.$id || authStore.currentTeam?.id;
-        if (currentTeamId && row.teamId === currentTeamId) {
+        if (currentTeamId && row[cols.team] === currentTeamId) {
             return true; // Matches current team scope
         }
     }
@@ -11621,7 +11680,7 @@ async function checkRowMatchesScope(row, scope) {
     if (hasTeamsScope) {
         const teams = authStore.teams || [];
         const teamIds = teams.map(t => t.$id || t.id).filter(id => id);
-        if (teamIds.includes(row.teamId)) {
+        if (teamIds.includes(row[cols.team])) {
             return true; // Matches one of user's teams
         }
     }
@@ -11826,13 +11885,20 @@ async function loadDataSource(dataSourceName, locale = 'en', options = {}) {
                 const tableId = window.ManifestDataConfig.getAppwriteTableId(dataSource);
                 // bucketId already defined above
                 const scope = window.ManifestDataConfig.getScope(dataSource);
+                const scopeColumns = window.ManifestDataConfig.getScopeColumns(dataSource);
                 const queriesConfig = window.ManifestDataConfig.getQueries(dataSource);
 
                 if (tableId) {
                     // Load from Appwrite table (TablesDB)
                     const queries = queriesConfig
-                        ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope)
-                        : await window.ManifestDataQueries.buildAppwriteQueries([], scope);
+                        ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, scope, scopeColumns)
+                        : await window.ManifestDataQueries.buildAppwriteQueries([], scope, scopeColumns);
+
+                    // Not ready (auth/scope unresolved): skip this read, stay pending, retry on an auth event
+                    if (queries === null) {
+                        scheduleAuthRetry(dataSourceName, locale);
+                        return null;
+                    }
 
                     // Log auth state for debugging
                     const authStore = typeof Alpine !== 'undefined' ? Alpine.store('auth') : null;
@@ -11853,7 +11919,7 @@ async function loadDataSource(dataSourceName, locale = 'en', options = {}) {
                             scope,
                             async (eventType, payload) => {
                                 // Handle real-time events
-                                await handleTableRealtimeEvent(dataSourceName, appwriteConfig.databaseId, tableId, scope, eventType, payload);
+                                await handleTableRealtimeEvent(dataSourceName, appwriteConfig.databaseId, tableId, scope, scopeColumns, eventType, payload);
                             }
                         );
                     }
@@ -11866,6 +11932,12 @@ async function loadDataSource(dataSourceName, locale = 'en', options = {}) {
                         ? await window.ManifestDataQueries.buildAppwriteQueries(queriesConfig.default || queriesConfig, null)
                         : await window.ManifestDataQueries.buildAppwriteQueries([], null);
 
+                    // Not ready (a $auth. arg in queriesConfig unresolved): skip, retry on an auth event
+                    if (queries === null) {
+                        scheduleAuthRetry(dataSourceName, locale);
+                        return null;
+                    }
+
                     let files = await window.ManifestDataAppwrite.listBucketFiles(bucketId, queries);
 
                     // Ensure files is always an array

package/lib/manifest.integrity.json

@@ -1,6 +1,6 @@
 {
   "manifest.appwrite.auth.js": "sha384-HMJmRXnvdDBWyuteXL+DTxWM2llSCdjl4EDamEI7iHNAVlqeOCE4GDTm8ZHipPRj",
-  "manifest.appwrite.data.js": "sha384-4mU2U/aADGu/axzp+8iGdn2Ckz0vpnPb6dLVkbkU+SN2MKE8Td8Ayj+jsIa4lnfg",
+  "manifest.appwrite.data.js": "sha384-YtuOZdT1+3S78f3Jdl+/ftV5SJOQ/8Cu3hF5e3Iy+MH1lDCGXeYFC0BtLgo9/Usc",
   "manifest.appwrite.presences.js": "sha384-JyVDWFT69b7Svq8J8p9tNWe2v9PZNQBY5UyhtOl1vnuHFAX0CRQ3MA9SiKq5wzNh",
   "manifest.bindings.js": "sha384-lPtMf8Ykaic9gNVZKq8Scia1881ZeMAyxer3WCIkUNwwrgzGBWto1OXADUwjvORF",
   "manifest.charts.js": "sha384-qQrjhWkIDi4oU5uQrpy8DdlMjY+gfiivBuX6mssNiFdkawgkVBvKneGgp+nd3PYJ",
@@ -11,7 +11,7 @@
   "manifest.combobox.js": "sha384-SN3XHumoebxcduFQqx5zt65/Cd10y8nuf9Gkco6UnsZ42sadRd+gvVLfWPdkkuPH",
   "manifest.components.js": "sha384-DLGSqCbnGkS87AWJ8GpKoAFP4nCosgC5SFSg6C10hH/nWu/MxI+0ntHlnFEfs++u",
   "manifest.computed.js": "sha384-GYML/e81gQfN+iDbqhPUgny8bINCyL+SrbTofoGk4hlCnLLjv51mCv42JMqq+ku5",
-  "manifest.data.js": "sha384-xbpINo3TIpOj+PcdJ3bjNLFq+OFJWn7+F7RIRYOzrk9SJj9cmZpUfe5LLI+NS3j8",
+  "manifest.data.js": "sha384-zd6Q2sXFE38RWMcTdOZxpUrKSlLlldK5y6EtvT07CmwJBV8MudA//TU4ciFVixUo",
   "manifest.datepicker.js": "sha384-8vTJYkLqqvgXgm1w1becuaRR/jUEpiLBjBJ6RsRbUr+ZkypvspD6EsssuDrX4SQq",
   "manifest.defer.js": "sha384-wXa60M2OHigi5rBurXQ7Oa8eyr5WTKs7EUn2GOru62KMdfs/LDyNegxCc9MNJFSe",
   "manifest.device.js": "sha384-g+txmrEszYtuOvRelTp/c1wSNR2AtllVI9rx5NPPD7DzhVUnMNughonZykv2xlBW",
@@ -28,14 +28,14 @@
   "manifest.slides.js": "sha384-3uRTkyK9XPLmnxI2+igZlpi4EyPlU/7IHj5j3BZJJ2KN455vXyk99fiXV3feO/XY",
   "manifest.status.js": "sha384-nwvUSbT+gpRMqhYx6MeBYswUMH72rY92mjgxv0vrSG7Ht7l83XYpEB6fCTbXjjfK",
   "manifest.svg.js": "sha384-qr/8H9+2cIhSXNbRWRtIdrDlTOxKlNJqwEefHvCYoiBNW/kKhPTFa109Orv/EBnb",
-  "manifest.sw.js": "sha384-8hvTjUEMILGzSsus1RfsHDgkpre+UFp7pr7vN0gCtw1fzTrvPauDokRuuoGur6pt",
+  "manifest.sw.js": "sha384-89AE0R7+SBoRt43gWDCzHht8dVsqVsO1QbE4qx2UOgKDqcIHXW3O6Jt8fki0AqsM",
   "manifest.tabs.js": "sha384-OIIcyaQnGS0eNYk4zgAFEDboNYect7THvUd9D0V6nqCeDOxQcoiqLrBEmmWVTTet",
   "manifest.tailwind.js": "sha384-r/Jvqb+Piz21jUts10BbVAJoKkShOdJRVFpywyi4HPIi/OfOJq5CtPyWAPbdkMgt",
   "manifest.text.edit.js": "sha384-pfhc4IPKNJokj6ldlgD+KwGLN4UoM21CNeVf2sVq/34X1Un2PUhEuyTg5itmtsXS",
   "manifest.toasts.js": "sha384-/OV32LLMJl0Iw8NoNQJ+5lgntLxjIJq/YNj5JAKS/+nUhVx4MMB9h1FOqP7zuj2M",
   "manifest.tooltips.js": "sha384-uXVVQADl6pY2Pj9i/UaSclZN7dzbKhLkmevv7Ad0+wXR8LgqodALNFrc5jZJjlwm",
   "manifest.url.parameters.js": "sha384-J2aSVBOPsoqsbafHndrWLHEDpKb4AKJAoQnVmKA4gZh5P/8HHjFWHO/lkusmG84l",
-  "manifest.utilities.js": "sha384-3PdKl/ARgpezheDE9thLyrN3sEuacROPmBALAuo/SKGHDHDBqQzXBD6ilvoMn95F",
+  "manifest.utilities.js": "sha384-UMTRSgpNYGjdhQoGtu/gT7btTdrUkKfOzAnFi0NU70/d6jdQtu6RgDqiVwYxkxrp",
   "manifest.virtual.js": "sha384-YwwmAsZNddajnAkLhBWtrK8edHMJOhD7cJkQi3qmm5o1Thg0wbtDU0dsfrCHKTIQ",
   "manifest.js": "sha384-jH0veyUdnBMoGwHxgUQ9Yjs0UneDMI/fYIsg1U58YPZwriKJ6Rv/aoA7RbLepoGa"
 }

package/lib/manifest.schema.json

@@ -144,6 +144,20 @@
                                     { "type": "array", "items": { "type": "string", "enum": ["user", "team"] } }
                                 ]
                             },
+                            "scopeColumn": {
+                                "description": "Column name(s) `scope` filters/writes on. Default teamId/userId. A string sets both; an object sets them independently.",
+                                "oneOf": [
+                                    { "type": "string" },
+                                    {
+                                        "type": "object",
+                                        "properties": {
+                                            "team": { "type": "string" },
+                                            "user": { "type": "string" }
+                                        },
+                                        "additionalProperties": false
+                                    }
+                                ]
+                            },
                             "autoInjectUserId": { "type": "boolean" },
                             "autoInjectTeamId": { "type": "boolean" },
                             "queries": {

package/lib/manifest.sw.js

@@ -16,7 +16,7 @@
 
 // Build stamps the published version here; unstamped (dev) falls back to the
 // registration URL's `v`, then 'dev'.
-const BUILD_VERSION = '0.5.204';
+const BUILD_VERSION = '0.5.206';
 const CACHE_PREFIX = 'mnfst-sw:';
 const META_CACHE = CACHE_PREFIX + 'meta';
 const SWR_CAP = 200;

package/lib/manifest.utilities.js

@@ -1490,8 +1490,12 @@ TailwindCompiler.prototype.scanStaticClasses = async function () {
 
 // Extract classes from HTML content
 TailwindCompiler.prototype.extractClassesFromHTML = function (html, classSet) {
-    // Match class attributes: class="..." or class='...'
-    const classRegex = /class=["']([^"']+)["']/g;
+    // Literal class="..."/class='...' only — lookbehind excludes `:class=`
+    // (Alpine binding), whose "class=" substring would otherwise match and
+    // truncate at the literal's first internal quote, leaking a stray '{'.
+    // Whitespace-only split below keeps every token Tailwind would accept
+    // (variants, arbitrary values, leading '-', '!'); only x-/$ tokens drop.
+    const classRegex = /(?<![:\w])class=["']([^"']+)["']/g;
     let match;
 
     while ((match = classRegex.exec(html)) !== null) {
@@ -3386,6 +3390,15 @@ TailwindCompiler.prototype.extractSelectorsFromCssText = function (cssText) {
     const len = cssText.length;
     let i = 0;
     while (i < len) {
+        if (cssText[i] === ' ' || cssText[i] === '\n' || cssText[i] === '\r' || cssText[i] === '\t') { i++; continue; }   // else an @-rule after a newline reads as a selector
+        // Skip inter-rule whitespace first — without this, whitespace before an
+        // `@layer`/`@media` (e.g. after a preceding `@layer base, ...;` statement
+        // or sibling rule) leaves `i` off the '@', so the block below never fires
+        // and the whole nested block is swallowed whole as one bogus selector,
+        // losing every class inside it (real Tailwind/compileUtilities output is
+        // always `@layer theme {...}` followed by `@layer utilities {...}`).
+        while (i < len && /\s/.test(cssText[i])) i++;
+        if (i >= len) break;
         if (cssText[i] === '/' && cssText[i + 1] === '*') {
             const end = cssText.indexOf('*/', i + 2);
             i = end === -1 ? len : end + 2;
@@ -3525,6 +3538,13 @@ TailwindCompiler.prototype.stripCoveredRulesFromCss = function (cssText) {
         const len = text.length;
         let i = 0;
         while (i < len) {
+            if (text[i] === ' ' || text[i] === '\n' || text[i] === '\r' || text[i] === '\t') { out.push(text[i]); i++; continue; }
+            // Skip (but preserve) inter-rule whitespace before checking for an
+            // at-rule — see extractSelectorsFromCssText for why this matters.
+            const wsStart = i;
+            while (i < len && /\s/.test(text[i])) i++;
+            if (i > wsStart) out.push(text.slice(wsStart, i));
+            if (i >= len) break;
             if (text[i] === '/' && text[i + 1] === '*') {
                 const end = text.indexOf('*/', i + 2);
                 const stop = end === -1 ? len : end + 2;

package/lib/manifest.utilities.node.mjs

@@ -924,8 +924,12 @@ TailwindCompiler.prototype.scanStaticClasses = async function () {
 
 // Extract classes from HTML content
 TailwindCompiler.prototype.extractClassesFromHTML = function (html, classSet) {
-    // Match class attributes: class="..." or class='...'
-    const classRegex = /class=["']([^"']+)["']/g;
+    // Literal class="..."/class='...' only — lookbehind excludes `:class=`
+    // (Alpine binding), whose "class=" substring would otherwise match and
+    // truncate at the literal's first internal quote, leaking a stray '{'.
+    // Whitespace-only split below keeps every token Tailwind would accept
+    // (variants, arbitrary values, leading '-', '!'); only x-/$ tokens drop.
+    const classRegex = /(?<![:\w])class=["']([^"']+)["']/g;
     let match;
 
     while ((match = classRegex.exec(html)) !== null) {
@@ -3028,7 +3032,10 @@ export async function compileUtilities({ classes = [], themeCss = '', baseCss =
     const manifestLayer = allUtilities ? `@layer utilities {\n${allUtilities}\n}` : '';
     const tailwindLayer = await compileTailwindPass(uniqueClasses, tailwind);
 
-    return [manifestLayer, tailwindLayer].filter(Boolean).join('\n\n');
+    const body = [manifestLayer, tailwindLayer].filter(Boolean).join('\n\n');
+    if (!body) return '';
+    // Layer order preamble: wins over a later `base` reset regardless of load order.
+    return `@layer base, components, utilities;\n\n${body}`;
 }
 
 // `class:token=` (per-class conditional binding) and the `:class="..."`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mnfst",
-    "version": "0.5.204",
+    "version": "0.5.206",
     "private": false,
     "workspaces": [
         "templates/starter",