mnfst 0.5.263 → 0.5.265

package/lib/manifest.appwrite.auth.js

@@ -2707,40 +2707,19 @@ async function resolvePersonalTeamName(nameConfig) {
             // Remove '$x.' prefix and resolve path
             const path = nameConfig.substring(3);
 
-            // Use Alpine's $x magic method if available
-            if (typeof Alpine !== 'undefined' && Alpine.magic && Alpine.magic('x')) {
-                const $x = Alpine.magic('x');
-                // Split path and navigate through $x proxy
+            // Data store, not the $x proxy: unloaded paths must read as null, not a loading proxy
+            const dataStore = Alpine.store('data');
+            if (dataStore) {
                 const parts = path.split('.');
-                let value = $x;
+                let value = dataStore;
                 for (const part of parts) {
                     if (value && typeof value === 'object' && part in value) {
                         value = value[part];
-                        // If value is a Promise, wait for it
-                        if (value && typeof value.then === 'function') {
-                            value = await value;
-                        }
                     } else {
-                        // Data source may not be loaded yet - silently return null
                         return null;
                     }
                 }
                 return value || null;
-            } else {
-                // Fallback: try data store directly
-                const dataStore = Alpine.store('data');
-                if (dataStore) {
-                    const parts = path.split('.');
-                    let value = dataStore;
-                    for (const part of parts) {
-                        if (value && typeof value === 'object' && part in value) {
-                            value = value[part];
-                        } else {
-                            return null;
-                        }
-                    }
-                    return value || null;
-                }
             }
         } catch (error) {
             // Data source may not be loaded yet - silently return null

package/lib/manifest.appwrite.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.263';
+const MANIFEST_BUILD_VERSION = '0.5.265';
 
 /* Manifest Data Sources - Appwrite Integration */
 

package/lib/manifest.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.263';
+const MANIFEST_BUILD_VERSION = '0.5.265';
 
 /* Manifest Data Sources - Configuration */
 
@@ -6735,12 +6735,19 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
         : [];
 
     let loading = false;
+    let reloadQueued = false;
     let error = null;
     let unsubscribeCallbacks = [];
 
+    const tableRows = () => window.Alpine?.store?.('data')?.[tableName];
+
     // Load files function
     const loadFiles = async () => {
-        if (loading) return;
+        // A request during a load may carry newer data than that load read
+        if (loading) {
+            reloadQueued = true;
+            return;
+        }
 
         loading = true;
         error = null;
@@ -6802,9 +6809,9 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
             files.push(...loadedFiles);
 
             // Sync lastSeenFileIds so the watch effect doesn't false-positive
-            const $x = window.Alpine?.magic?.('x')?.();
-            if ($x && $x[tableName] && Array.isArray($x[tableName])) {
-                const entry = $x[tableName].find(item => item.$id === entryId);
+            const rows = tableRows();
+            if (Array.isArray(rows)) {
+                const entry = rows.find(item => item.$id === entryId);
                 if (entry) {
                     const currentFileIds = entry[columnName || 'fileIds'] || [];
                     lastSeenFileIds = JSON.stringify(currentFileIds);
@@ -6815,6 +6822,10 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
             error = err.message || String(err);
         } finally {
             loading = false;
+            if (reloadQueued) {
+                reloadQueued = false;
+                loadFiles();
+            }
         }
     };
 
@@ -6840,10 +6851,10 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
                 // Use requestAnimationFrame for immediate execution
                 requestAnimationFrame(() => {
                     // Check if file is linked to this entry
-                    const $x = window.Alpine?.magic?.('x')?.();
-                    if ($x && $x[tableName]) {
-                        const entry = Array.isArray($x[tableName])
-                            ? $x[tableName].find(item => item.$id === entryId)
+                    const rows = tableRows();
+                    if (rows) {
+                        const entry = Array.isArray(rows)
+                            ? rows.find(item => item.$id === entryId)
                             : null;
                         if (entry && entry[columnName || 'fileIds']?.includes(e.detail.fileId)) {
                             loadFiles();
@@ -6881,14 +6892,15 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
 
     // Watch table data for fileIds changes; tracked per entry to avoid false positives
     let lastSeenFileIds = null;
+    let lastReconciledFileIds = null;
 
     const watchTableData = () => {
         if (typeof Alpine === 'undefined') return;
 
         const unwatch = Alpine.effect(() => {
-            const $x = window.Alpine?.magic?.('x')?.();
-            if ($x && $x[tableName] && Array.isArray($x[tableName])) {
-                const entry = $x[tableName].find(item => item.$id === entryId);
+            const rows = tableRows();
+            if (Array.isArray(rows)) {
+                const entry = rows.find(item => item.$id === entryId);
                 if (entry) {
                     const currentFileIds = entry[columnName || 'fileIds'] || [];
                     const currentFileIdsStr = JSON.stringify(currentFileIds);
@@ -6900,9 +6912,9 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
 
                         loadFiles().then(() => {
                             // Re-verify fileIds in case they changed during load
-                            const $xAfter = window.Alpine?.magic?.('x')?.();
-                            if ($xAfter && $xAfter[tableName] && Array.isArray($xAfter[tableName])) {
-                                const entryAfter = $xAfter[tableName].find(item => item.$id === entryId);
+                            const rowsAfter = tableRows();
+                            if (Array.isArray(rowsAfter)) {
+                                const entryAfter = rowsAfter.find(item => item.$id === entryId);
                                 if (entryAfter) {
                                     const fileIdsAfter = entryAfter[columnName || 'fileIds'] || [];
                                     lastSeenFileIds = JSON.stringify(fileIdsAfter);
@@ -6920,7 +6932,9 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
                     const fileIdsMatch = currentFileIds.length === filesFileIds.length &&
                         currentFileIds.every(id => filesFileIds.includes(id));
 
-                    if (!fileIdsMatch && !loading && lastSeenFileIds !== null) {
+                    // Once per fileIds value: an id the bucket no longer lists never matches
+                    if (!fileIdsMatch && !loading && lastSeenFileIds !== null && lastReconciledFileIds !== currentFileIdsStr) {
+                        lastReconciledFileIds = currentFileIdsStr;
                         lastSeenFileIds = JSON.stringify(currentFileIds);
                         loadFiles().catch(err => {
                             console.error('[Manifest Data] Failed to reload files after sync check:', err);
@@ -6939,7 +6953,7 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
     subscribeToEvents();
     watchTableData();
 
-    loadFiles();
+    if (!loading) loadFiles();
 
     const manager = {
         files,
@@ -6947,6 +6961,7 @@ function createReactiveFileManager(tableName, entryId, bucketName, columnName) {
         error: () => error,
         reload: loadFiles,
         destroy: () => {
+            reloadQueued = false;
             unsubscribeCallbacks.forEach(cb => cb());
             reactiveFileManagers.delete(key);
         }
@@ -7171,9 +7186,26 @@ async function getFilesForEntry(tableName, entryId, bucketId, fileIdsColumn = 'f
     return entryFiles;
 }
 
+// Link/unlink rewrite the whole fileIds value, so one entry's writes run one at a time
+const entryFileWrites = new Map();
+function queueEntryFileWrite(tableName, entryId, fileIdsColumn, write) {
+    const key = `${tableName}:${entryId}:${fileIdsColumn}`;
+    const result = (entryFileWrites.get(key) || Promise.resolve()).then(write);
+    const tail = result.catch(() => { });
+    entryFileWrites.set(key, tail);
+    tail.then(() => {
+        if (entryFileWrites.get(key) === tail) entryFileWrites.delete(key);
+    });
+    return result;
+}
+
 // Link a file to a table entry by adding the file ID to the entry's fileIds array
 // Generic function - works with any table and any scope
-async function linkFileToEntry(tableName, entryId, fileId, fileIdsColumn = 'fileIds') {
+function linkFileToEntry(tableName, entryId, fileId, fileIdsColumn = 'fileIds') {
+    return queueEntryFileWrite(tableName, entryId, fileIdsColumn, () => writeFileLink(tableName, entryId, fileId, fileIdsColumn));
+}
+
+async function writeFileLink(tableName, entryId, fileId, fileIdsColumn) {
     const manifest = await window.ManifestDataConfig.ensureManifest();
     const tableDataSource = manifest?.data?.[tableName];
 
@@ -7188,36 +7220,23 @@ async function linkFileToEntry(tableName, entryId, fileId, fileIdsColumn = 'file
         throw new Error(`[Manifest Data] Invalid Appwrite configuration for "${tableName}"`);
     }
 
-    // Read store first for latest optimistic updates (concurrent uploads race otherwise)
-    let fileIds = null;
-    const store = typeof Alpine !== 'undefined' && Alpine.store ? Alpine.store('data') : null;
-    if (store && store[tableName] && Array.isArray(store[tableName])) {
-        const storeEntry = store[tableName].find(e => e.$id === entryId);
-        if (storeEntry && storeEntry[fileIdsColumn] !== undefined) {
-            fileIds = storeEntry[fileIdsColumn];
-        }
-    }
-
-    // If store doesn't have it, read from database
-    if (fileIds === null) {
-        const entry = await window.ManifestDataAppwrite.getTableRow(
-            appwriteConfig.databaseId,
-            tableId,
-            entryId
-        );
-
-        if (!entry) {
-            throw new Error(`[Manifest Data] Entry "${entryId}" not found in table "${tableName}"`);
-        }
+    // Server row, not the store: a late realtime echo or reload can move the store behind committed writes
+    const entry = await window.ManifestDataAppwrite.getTableRow(
+        appwriteConfig.databaseId,
+        tableId,
+        entryId
+    );
 
-        // Get or initialize fileIds array (using configurable column name)
-        // Check if the column exists (if it's undefined, the column might not exist in the table schema)
-        fileIds = entry[fileIdsColumn];
-        if (fileIds === undefined) {
-            // Column doesn't exist - throw a helpful error
-            throw new Error(`[Manifest Data] The "${fileIdsColumn}" column does not exist in the "${tableName}" table. Please add a "${fileIdsColumn}" column (type: string array) to the table in Appwrite.`);
-        }
+    if (!entry) {
+        throw new Error(`[Manifest Data] Entry "${entryId}" not found in table "${tableName}"`);
+    }
 
+    // Get or initialize fileIds array (using configurable column name)
+    // Check if the column exists (if it's undefined, the column might not exist in the table schema)
+    let fileIds = entry[fileIdsColumn];
+    if (fileIds === undefined) {
+        // Column doesn't exist - throw a helpful error
+        throw new Error(`[Manifest Data] The "${fileIdsColumn}" column does not exist in the "${tableName}" table. Please add a "${fileIdsColumn}" column (type: string array) to the table in Appwrite.`);
     }
 
     if (!Array.isArray(fileIds)) {
@@ -7383,7 +7402,11 @@ async function unlinkFileFromAllEntries(fileId) {
 
 // Unlink a file from a table entry by removing the file ID from the entry's fileIds array
 // Generic function - works with any table and any scope
-async function unlinkFileFromEntry(tableName, entryId, fileId, fileIdsColumn = 'fileIds') {
+function unlinkFileFromEntry(tableName, entryId, fileId, fileIdsColumn = 'fileIds') {
+    return queueEntryFileWrite(tableName, entryId, fileIdsColumn, () => writeFileUnlink(tableName, entryId, fileId, fileIdsColumn));
+}
+
+async function writeFileUnlink(tableName, entryId, fileId, fileIdsColumn) {
     const manifest = await window.ManifestDataConfig.ensureManifest();
     const tableDataSource = manifest?.data?.[tableName];
 
@@ -7677,7 +7700,8 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
 
     // Core handler (named so $duplicate etc. can recurse)
     const handleMethod = async function (method, ...args) {
-        clearErrorState();
+        const sourceUnloaded = args[3]?.sourceUnloaded === true;
+        if (!sourceUnloaded) clearErrorState();
 
         try {
             const manifest = await window.ManifestDataConfig?.ensureManifest?.();
@@ -8222,12 +8246,12 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
                         finalPermissions = Array.isArray(permissions) ? permissions : [permissions];
                     }
 
-                    // Ensure onProgress is undefined (not null) if not provided, as it's a callback
-                    const validOnProgress = (onProgress === undefined || onProgress === null) ? undefined : onProgress;
+                    // The 4th arg may be $upload's options object, not a callback
+                    const validOnProgress = typeof onProgress === 'function' ? onProgress : undefined;
 
                     // Use optimistic update via mutation system
-                    const addEntryToStore = window.ManifestDataMutations?.addEntryToStore;
-                    const removeEntryFromStore = window.ManifestDataMutations?.removeEntryFromStore;
+                    const addEntryToStore = sourceUnloaded ? null : window.ManifestDataMutations?.addEntryToStore;
+                    const removeEntryFromStore = sourceUnloaded ? null : window.ManifestDataMutations?.removeEntryFromStore;
                     const writeOptions = { generation: window.ManifestDataStore?.sourceGeneration?.(dataSourceName) };
                     const manifest = await window.ManifestDataConfig.ensureManifest();
                     const dataSource = manifest?.data?.[dataSourceName];
@@ -8368,9 +8392,17 @@ function createAppwriteMethodsHandler(dataSourceName, reloadDataSource) {
                         }
                     }
 
+                    // The source may have landed during the upload, from a list without this file
+                    if (sourceUnloaded && window.ManifestDataStore?.getRawData?.(dataSourceName) != null) {
+                        const landed = window.ManifestDataStore.getRawData(dataSourceName);
+                        if (!Array.isArray(landed) || !landed.some(row => row.$id === result.$id)) {
+                            window.ManifestDataMutations?.addEntryToStore?.(dataSourceName, result, writeOptions);
+                        }
+                    }
+
                     // We already have the real file from the API response, so no
                     // background reload; scope filtering (if any) is handled by realtime.
-                    if (!addEntryToStore) {
+                    if (!addEntryToStore && !sourceUnloaded) {
                         // Fallback: reload lands through loadDataSource (coalesced landing)
                         if (window.ManifestDataStore?.dataSourceCache) {
                             const cacheKey = `${dataSourceName}:en`;
@@ -9083,14 +9115,15 @@ function createUploadMethod(dataSourceName, reloadDataSource) {
             throw new Error(`[Manifest Data] Storage bucket "${resolvedBucketName}" not found in manifest`);
         }
 
-        // Get $x to access bucket methods
-        const $x = window.Alpine?.magic?.('x')?.();
-        if (!$x || !$x[resolvedBucketName] || typeof $x[resolvedBucketName].$create !== 'function') {
+        // Direct handler: $x[bucket] has no $create until that source has been read
+        const createHandler = window.ManifestDataProxiesAppwrite?.createAppwriteMethodsHandler;
+        if (!createHandler) {
             throw new Error(`[Manifest Data] Bucket "${resolvedBucketName}" is not available`);
         }
+        const bucketMethods = createHandler(resolvedBucketName, reloadDataSource);
 
         // Get helper functions for uploading state
-        const { setUploadingFile, clearUploadingFile } = window.ManifestDataStore || {};
+        const { setUploadingFile, clearUploadingFile, getRawData } = window.ManifestDataStore || {};
 
         // Generate temporary file IDs for tracking upload state
         const fileIds = files.map(file => {
@@ -9108,13 +9141,21 @@ function createUploadMethod(dataSourceName, reloadDataSource) {
         }
 
         try {
+            // First load before any write: a row pushed into an unread store would block it
+            if (getRawData?.(resolvedBucketName) == null) {
+                await reloadDataSource(resolvedBucketName);
+            }
+            // Still unread (load failed or was denied): upload without a store row, keeping its error and a later load
+            const sourceUnloaded = getRawData?.(resolvedBucketName) == null;
+
             // Upload files (single or multiple)
             const uploadPromises = files.map((file, index) => {
                 const tempFileId = fileIds[index];
-                return $x[resolvedBucketName].$create(file, tempFileId, null, {
+                return bucketMethods('$create', file, tempFileId, null, {
                     entryId: entryId,
                     table: dataSourceName,
-                    fileIdsColumn: resolvedColumnName
+                    fileIdsColumn: resolvedColumnName,
+                    sourceUnloaded
                 }).then(result => {
                     // Clear uploading state for this file
                     if (clearUploadingFile) {
@@ -9236,25 +9277,14 @@ if (typeof window !== 'undefined') {
                     }
                 }
 
-                // 2. Alpine magic method
-                try {
-                    const magicFn = window.Alpine?.magic?.('x');
-                    if (magicFn && typeof magicFn === 'function') {
-                        const proxy = magicFn();
-                        if (proxy) return proxy;
-                    }
-                } catch (e) {
-                    // Not ready — continue to fallback
-                }
-
-                // 3. Loading proxy (lets code run while Alpine initializes)
+                // 2. Loading proxy (lets code run while Alpine initializes)
                 const createLoadingProxy = window.ManifestDataProxiesCore?.createLoadingProxy;
                 if (createLoadingProxy) {
                     const loadingProxy = createLoadingProxy();
                     if (loadingProxy) return loadingProxy;
                 }
 
-                // 4. Cached self-chaining proxy (same instance keeps chaining safe)
+                // 3. Cached self-chaining proxy (same instance keeps chaining safe)
                 if (!cachedFallbackProxy) {
                     cachedFallbackProxy = new Proxy({}, {
                         get(target, prop) {

package/lib/manifest.export.js

@@ -368,11 +368,18 @@ function initializeExportPlugin() {
 
     // ------- Tabular exports (CSV, JSON) --------------------------------
 
+    function readXMagic() {
+        const A = window.Alpine;
+        if (!A) return undefined;
+        const expr = 'typeof $x !== "undefined" ? $x : undefined';
+        return window.ManifestUI?._eval ? window.ManifestUI._eval(expr) : A.evaluate(document.body, expr);
+    }
+
     function resolveDataset(opts) {
         if (Array.isArray(opts.data)) return opts.data;
         if (opts.data && typeof opts.data === 'object') return opts.data;
         if (opts.source) {
-            const x = window.$x || (window.Alpine && window.Alpine.magic && window.Alpine.magic('x'));
+            const x = window.$x || readXMagic();
             if (x && x[opts.source] != null) return x[opts.source];
         }
         throw new Error('csv/json export needs `source: "<name>"` or `data: <value>`');

package/lib/manifest.integrity.json

@@ -1,6 +1,6 @@
 {
-  "manifest.appwrite.auth.js": "sha384-9WNhIeSEzxxJm+yP7cV41kV2xyzyXgFCNpThqiREcNbb6tnIW6O7VRZPL2jwy9Nk",
-  "manifest.appwrite.data.js": "sha384-2JOzhWYTxSjkkp8XJzegFVTCejbHLDH2giMvKPjRg60GoYUhd4LSzLbxFwNhC6OV",
+  "manifest.appwrite.auth.js": "sha384-gWLSeVPqCLMiUZB8MU7GqMg3x2yULFUsp8nTTZrPp/9Dlkix42rBn9yIimvwrHqZ",
+  "manifest.appwrite.data.js": "sha384-oVT9VZ8V80FW+0U0YH7DhoNUzzvpgzerUIo0Ns4mMlOVuMFnihi52+RcuvOErLZ5",
   "manifest.appwrite.presences.js": "sha384-/CagPsgWhO1sWEevCNGJmZ/ezRK9YCjLjvF7hxNSM4gVlJmEVtfSLfF7wnsRq441",
   "manifest.bindings.js": "sha384-lPtMf8Ykaic9gNVZKq8Scia1881ZeMAyxer3WCIkUNwwrgzGBWto1OXADUwjvORF",
   "manifest.charts.js": "sha384-AFbP7mQnigy7DU1s+YE30yKTeQAKfgNazhbfSNbfd9ZpLgeulZKaPi/fAq3gJHDO",
@@ -11,16 +11,16 @@
   "manifest.combobox.js": "sha384-/lJo6vaxKjgnBSRs/dzkhK1dzGk3GBw8FISoNJZB70mwAVwu1k5veZyBXjOb4keS",
   "manifest.components.js": "sha384-BUFA8h+G5Plr82sV7bKzO42pPoiRZwRQcKj1lt2ROFiKjjlkayU/vmkAFqEsdBA+",
   "manifest.computed.js": "sha384-GYML/e81gQfN+iDbqhPUgny8bINCyL+SrbTofoGk4hlCnLLjv51mCv42JMqq+ku5",
-  "manifest.data.js": "sha384-B+rsxpC/ediBoMP0LeEwKgb7WEARzBmndGmnl2jOs4KrdnnzhTfzN4sJtwcnF0KK",
+  "manifest.data.js": "sha384-IGqPG+nOy9bH2l+gNGLF7GL4iYGl+h6N+CWy2Z15ddE13qluCtm2g4DTTOXqoX3L",
   "manifest.datepicker.js": "sha384-EzlMwvIxlla/0BuyhAEqxN0M8TGcWIWgEIg840V0akKQQK1uY648wPWMkobvtq/o",
   "manifest.defer.js": "sha384-5cHzFTbx+cZmGpk9FuiUtW3ciC9NvvHwJeHP7xL5yiZVp9PhMWVdQ7L9y6ju2yoo",
   "manifest.device.js": "sha384-YeQaS56L8IILqrQNBSeAOLwIh5DuAOrE60cYLK1+46qJtUrXlAvqGe2j5mbV4Vq7",
   "manifest.dropdowns.js": "sha384-TlFrYVWTXvpUmGnYaAk2til4lu0p6w5YcmWWEzZAokzd2qlmoyRLLXXVuYAK/AlR",
   "manifest.edit.js": "sha384-MOgQNdNLeHijhR0u2W6ntoOulKFglsATCFDqkinesOU15tHoILk/JNzHKkGi5dUG",
-  "manifest.export.js": "sha384-Rx6XvqBZc4apzP/FwcDr6yIln4/zNa08Q4ZqBZcEqUz1aNZQfl4h0+Ae7mqCQyuG",
+  "manifest.export.js": "sha384-C4W5LrGQFnSILRWoWOCliajUK6rAzNW+EliogRx72vD1cUOYScSdfzHNbjSWv5XU",
   "manifest.icons.js": "sha384-kKOINpX70YzNO3FvkV6umrmO3f0KIu0DNbwB+ej55a7y/lhU7v/myQtXL0bwCTbt",
   "manifest.localization.js": "sha384-EImsIw8Z3l13V5eH9ZJF/yfsOfIvR1oPRNSArANkPji7V8O3IRf6zMwsNiAGj3Hk",
-  "manifest.markdown.js": "sha384-heyDR40LXHaAmAuA+fa381uFwShk1oAqpFFY6E2Qq4T3VN0TQfRqyc++MF40K5Hj",
+  "manifest.markdown.js": "sha384-SQqvC175/Ai3yLNjWNK1EOwrxVpoCrZVFSfzA5wg2btrQPQmNNQk3ICGeBY6f502",
   "manifest.native.js": "sha384-YeQaS56L8IILqrQNBSeAOLwIh5DuAOrE60cYLK1+46qJtUrXlAvqGe2j5mbV4Vq7",
   "manifest.payments.js": "sha384-8pofk2zhxtapPMpwnFyTelPMrYhShNhDCE722uQh/EYFvZFuPLmSdgunqsarVQjv",
   "manifest.rich.text.js": "sha384-ZBV9jXmu2nmprEHicddRE/m7nR4RPZtVc969Jte0+EJYBcVph7itkjcgN/61PyeC",
@@ -28,13 +28,13 @@
   "manifest.slides.js": "sha384-3uRTkyK9XPLmnxI2+igZlpi4EyPlU/7IHj5j3BZJJ2KN455vXyk99fiXV3feO/XY",
   "manifest.status.js": "sha384-ofu7nBnVIGZ1U1o2R9d2H3V8aEMPUCVbl5FO3gIToXqi0oa36fTviEdh5UU7Kitw",
   "manifest.svg.js": "sha384-qr/8H9+2cIhSXNbRWRtIdrDlTOxKlNJqwEefHvCYoiBNW/kKhPTFa109Orv/EBnb",
-  "manifest.sw.js": "sha384-dQrAW1WMCbGqwao0ppVom/krl9e/eFQPHpUq0UPEkmZowgFu7E73FWwdFwpvc6YP",
+  "manifest.sw.js": "sha384-kIFn/uTJ/LaTK10m44lza6qt+jfnLRyWFdmo/A5aNUD7G7V3KUxZPXUFLwnuiw2N",
   "manifest.tabs.js": "sha384-otU09H7jnawVKQdLAYpMCd3jx00tgyPVr42D2hLIBzN5dG4se505YesavdnMqEi1",
   "manifest.tailwind.js": "sha384-yuP3LEvWU+QVjxjkZ0YhErtC9RrGmhOmHjjFjhS9obqZbp5/KTIEnSR0CXDvHE0B",
   "manifest.toasts.js": "sha384-3zkWxzw693pxg3QDFsoYCA3CqYaLKmBaMArULXODD66Utolpewl0OAeTB92aWUVv",
   "manifest.tooltips.js": "sha384-hXGp5j0s6p2kGZY/hqLPEbaUv68ca63kFCjYiZqK3DcC12mpHTBy1vz3kuApyf4p",
   "manifest.url.parameters.js": "sha384-J2aSVBOPsoqsbafHndrWLHEDpKb4AKJAoQnVmKA4gZh5P/8HHjFWHO/lkusmG84l",
   "manifest.utilities.js": "sha384-h17EquaRtNcEW0yfhk7R+a+2+CzTlBxPuFryO6i9NV/OiIRMihREoyzQ77QawoQ7",
-  "manifest.virtual.js": "sha384-ZDNoF9QVhVcVpkjIK6NH15S6I5c6OBshiJpXSOYjNsIB+298I0a7g3aFO+jyq4Vb",
+  "manifest.virtual.js": "sha384-ru/eYigBWgJHcHCP0yGKRaF1FNsKisWN61LBWaH16+8ZIh5H8fWtP3aMe0s9/mrg",
   "manifest.js": "sha384-qMp2SeZUWYE/Lth8sguzlCAzXxn72gBDBPYUZ1iDlQVvzYuCc8/NPgw1gUJR88u1"
 }

package/lib/manifest.markdown.js

@@ -869,8 +869,7 @@ async function initializeMarkdownPlugin() {
                             }
 
                             // Check if $x magic method is available
-                            const xMagic = window.Alpine?.magic?.('x');
-                            const hasXMagic = typeof xMagic === 'function';
+                            const hasXMagic = typeof window._$xProxyFactory === 'function';
 
                             // If magic method isn't ready, wait briefly but don't block forever
                             if (!hasXMagic && retryCount < 5) {

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.263';
+const BUILD_VERSION = '0.5.265';
 const CACHE_PREFIX = 'mnfst-sw:';
 const META_CACHE = CACHE_PREFIX + 'meta';
 // Sized to hold a full precache.json warm-up (PRECACHE_MAX_ENTRIES server-side)

package/lib/manifest.virtual.js

@@ -241,6 +241,7 @@ function initializeVirtualPlugin() {
 
             const visible = new Set();
             const keys = [];
+            const items = [];
             for (let i = startItem; i < endItem; i++) {
                 const item = data[i];
                 if (item == null) continue;
@@ -248,15 +249,35 @@ function initializeVirtualPlugin() {
                 if (key == null) continue;
                 visible.add(key);
                 keys.push(key);
-                let entry = rendered.get(key);
-                if (!entry) entry = mountRow(item, key);
-                else if (entry.scope[itemName] !== item) entry.scope[itemName] = item;  // rebind by key
-                host.insertBefore(entry.node, botSpacer);        // keep DOM order = data order
+                items.push(item);
             }
             for (const [key, entry] of rendered) {
                 if (!visible.has(key)) removeRow(key, entry);
             }
 
+            // Keep DOM order = data order, moving only rows out of place
+            const rowNodes = new Set();
+            for (const entry of rendered.values()) rowNodes.add(entry.node);
+            // Next row in the host; skips what a row root rendered (x-if clones), survives a row's init detaching it
+            const nextRow = (n) => {
+                while (n && n !== botSpacer && n.parentNode === host && !rowNodes.has(n)) n = n.nextSibling;
+                return n && n.parentNode === host ? n : botSpacer;
+            };
+            let cursor = nextRow(topSpacer.nextSibling);
+            for (let i = 0; i < keys.length; i++) {
+                if (cursor.parentNode !== host) cursor = botSpacer;
+                let entry = rendered.get(keys[i]);
+                if (!entry) {
+                    entry = mountRow(items[i], keys[i], cursor);
+                    rowNodes.add(entry.node);
+                    if (entry.node.parentNode !== host) host.insertBefore(entry.node, cursor);  // root replaced itself in init
+                    continue;
+                }
+                if (entry.scope[itemName] !== items[i]) entry.scope[itemName] = items[i];  // rebind by key
+                if (entry.node === cursor) cursor = nextRow(cursor.nextSibling);
+                else host.insertBefore(entry.node, cursor);
+            }
+
             // Measure anything not yet measured, then reconcile offsets once.
             scheduleMeasure(keys);
         }
@@ -306,10 +327,10 @@ function initializeVirtualPlugin() {
             scheduleMeasure(keys);
         }
 
-        function mountRow(item, key) {
+        function mountRow(item, key, before = anchor) {
             const tpl = template.content.firstElementChild;
             const node = tpl.cloneNode(true);
-            host.insertBefore(node, anchor);                     // connect before init
+            host.insertBefore(node, before);                     // connect before init
             const scope = Alpine.reactive({ [itemName]: item });
             const removeScope = Alpine.addScopeToNode(node, scope);
             Alpine.initTree(node);
@@ -422,11 +443,12 @@ function initializeVirtualPlugin() {
 
         // ---- Scroll / resize ----
 
+        let destroyed = false;
         let scrollScheduled = false;
         const onScroll = () => {
             if (scrollScheduled) return;
             scrollScheduled = true;
-            requestAnimationFrame(() => { scrollScheduled = false; render(); });
+            requestAnimationFrame(() => { scrollScheduled = false; if (!destroyed) render(); });
         };
         scrollEl.addEventListener('scroll', onScroll, { passive: true });
 
@@ -440,6 +462,7 @@ function initializeVirtualPlugin() {
         if (!kind && !isMasonry && host !== scrollEl) ro.observe(host);   // only until a hidden host is classified
 
         cleanup(() => {
+            destroyed = true;
             scrollEl.removeEventListener('scroll', onScroll);
             ro.disconnect();
             clearTimeout(resizeTimer);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mnfst",
-    "version": "0.5.263",
+    "version": "0.5.265",
     "private": false,
     "workspaces": [
         "templates/starter",
@@ -47,6 +47,8 @@
         "test:e2e:sdk": "node tests/e2e/payments.sdk.e2e.mjs",
         "test:e2e:sw": "node tests/e2e/sw.e2e.mjs",
         "test:e2e:settle": "node tests/e2e/render-settle.e2e.mjs",
+        "test:e2e:magic": "node tests/e2e/magic-one-arg.e2e.mjs",
+        "test:e2e:upload": "node tests/e2e/upload-first-load.e2e.mjs",
         "lint": "echo 'No linting configured'",
         "release:docs": "node scripts/release-bump.mjs packages/docs && cd packages/docs && npm publish --auth-type=web",
         "release:check": "node scripts/release-check.mjs"