@dawnlit/outlook-bridge 2.0.0 → 2.2.0

package/dist/windows/cleanup.js

@@ -5,18 +5,19 @@ exports.purgeDeletedItems = purgeDeletedItems;
 // Deleting mail, and emptying what was already deleted.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const json_1 = require("../shared/json");
+const json_1 = require("./json");
 const mail_1 = require("../mail");
-/** Folders whose contents are received or sent mail rather than working state. */
-const PROTECTED_FOLDER_IDS = [mail_1.FolderId.Inbox, mail_1.FolderId.SentMail];
-const OUTCOME_STATUSES = ['deleted', 'would-delete', 'refused', 'failed'];
 /**
  * Delete mail by entry id from anywhere in the account. Delete() moves each item
  * to Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.
  *
  * This is the one operation that can reach received mail, and an entry id is an
  * unsafe key for it: a stale or wrong id can resolve to a DIFFERENT message.
- * Three things hold the line:
+ * Four things hold the line:
+ *  - An id that resolves outside this account's store is refused. The bare
+ *    lookup falls back to the default store, and the Inbox/Sent check below
+ *    only knows this account's folders, so another mailbox's received mail
+ *    would otherwise pass it.
  *  - Inbox and Sent Items are refused, INCLUDING their subfolders (a filed
  *    folder is still received mail), unless `allowProtected`.
  *  - `dryRun` resolves and reports without deleting, so the exact subjects and
@@ -30,7 +31,7 @@ $allowProtected = ${(0, run_1.psBool)(request.allowProtected)}
 $dryRun = ${(0, run_1.psBool)(request.dryRun)}
 $protectedReason = ${(0, run_1.psString)(mail_1.PROTECTED_MAIL_REASON)}
 $protectedIds = @{}
-foreach ($role in @(${PROTECTED_FOLDER_IDS.map(run_1.psInt).join(', ')})) {
+foreach ($role in @(${mail_1.PROTECTED_ROOTS.map(run_1.psInt).join(', ')})) {
     try { $protectedIds[[string]$store.GetDefaultFolder($role).EntryID] = $true } catch {}
 }
 function Test-UnderProtectedFolder($folder) {
@@ -46,6 +47,14 @@ function Test-UnderProtectedFolder($folder) {
     }
     return $false
 }
+function Test-InAccountStore($folder) {
+    $folderStoreId = $null
+    try { $folderStoreId = [string]$folder.StoreID } catch {}
+    if (-not $folderStoreId) { return $false }
+    if ($folderStoreId -ieq $storeId) { return $true }
+    # One store can be named by two id strings; MAPI decides whether they match.
+    try { return [bool]$ns.CompareEntryIDs($folderStoreId, $storeId) } catch { return $false }
+}
 $items = @()
 foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
     $subject = ''
@@ -60,6 +69,7 @@ foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
         try { $parent = $it.Parent } catch {}
         if ($parent -eq $null) { throw "item has no parent folder - refusing to delete" }
         try { $folderPath = [string]$parent.FolderPath } catch {}
+        if (-not (Test-InAccountStore $parent)) { throw "item is in another mailbox, not this account - refusing to delete" }
         if ((Test-UnderProtectedFolder $parent) -and -not $allowProtected) {
             $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = $protectedReason }
         } elseif ($dryRun) {
@@ -76,22 +86,15 @@ ConvertTo-Json -Depth 3 -InputObject @($items)
 `, 'scan');
     const items = (0, json_1.toArray)(output).map(row => {
         const e = (0, json_1.record)(row);
-        const status = OUTCOME_STATUSES.find(s => s === (0, json_1.str)(e.status)) ?? 'failed';
         return {
             entryId: (0, json_1.str)(e.entryId),
             subject: (0, json_1.str)(e.subject),
             folderPath: (0, json_1.str)(e.folderPath),
-            status,
+            status: (0, mail_1.deleteStatus)((0, json_1.str)(e.status)),
             reason: (0, json_1.str)(e.reason),
         };
     });
-    return {
-        dryRun: request.dryRun,
-        deleted: items.filter(i => i.status === 'deleted').length,
-        refused: items.filter(i => i.status === 'refused').length,
-        failed: items.filter(i => i.status === 'failed').length,
-        items,
-    };
+    return (0, mail_1.deleteMailResult)(request.dryRun, items);
 }
 /**
  * Permanently remove items from the account's Deleted Items. The ONE irreversible

package/dist/windows/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/windows/cleanup.ts"],"names":[],"mappings":"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","sourcesContent":["// Deleting mail, and emptying what was already deleted.\nimport { psArray, psBool, psInt, psString, runPowerShellJson } from './run';\nimport { accountScript, cutoffScript, DELIVERY_STORE_PS } from './scripts';\nimport { num, record, str, toArray } from '../shared/json';\nimport { FolderId, PROTECTED_MAIL_REASON } from '../mail';\nimport type { DeleteEmailsRequest, PurgeRequest } from '../backend';\nimport type { DeleteMailOutcome, DeleteMailResult, PurgeDeletedItemsResult } from '../types';\n\n/** Folders whose contents are received or sent mail rather than working state. */\nconst PROTECTED_FOLDER_IDS = [FolderId.Inbox, FolderId.SentMail];\n\nconst OUTCOME_STATUSES: readonly DeleteMailOutcome['status'][] = ['deleted', 'would-delete', 'refused', 'failed'];\n\n/**\n * Delete mail by entry id from anywhere in the account. Delete() moves each item\n * to Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.\n *\n * This is the one operation that can reach received mail, and an entry id is an\n * unsafe key for it: a stale or wrong id can resolve to a DIFFERENT message.\n * Three things hold the line:\n *  - Inbox and Sent Items are refused, INCLUDING their subfolders (a filed\n *    folder is still received mail), unless `allowProtected`.\n *  - `dryRun` resolves and reports without deleting, so the exact subjects and\n *    folders can be checked before anything happens.\n *  - Every outcome echoes the subject and folder of the item actually resolved.\n */\nexport async function deleteOutlookEmails(request: DeleteEmailsRequest): Promise<DeleteMailResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$allowProtected = ${psBool(request.allowProtected)}\n$dryRun = ${psBool(request.dryRun)}\n$protectedReason = ${psString(PROTECTED_MAIL_REASON)}\n$protectedIds = @{}\nforeach ($role in @(${PROTECTED_FOLDER_IDS.map(psInt).join(', ')})) {\n    try { $protectedIds[[string]$store.GetDefaultFolder($role).EntryID] = $true } catch {}\n}\nfunction Test-UnderProtectedFolder($folder) {\n    $current = $folder\n    for ($guard = 0; $current -ne $null -and $guard -lt 25; $guard++) {\n        $folderId = $null\n        try { $folderId = [string]$current.EntryID } catch {}\n        if (-not $folderId) { return $false }\n        if ($protectedIds.ContainsKey($folderId)) { return $true }\n        $parent = $null\n        try { $parent = $current.Parent } catch {}\n        $current = $parent\n    }\n    return $false\n}\n$items = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    $folderPath = ''\n    try {\n        $it = $null\n        try { $it = $ns.GetItemFromID($id, $store.StoreID) } catch { $it = $null }\n        if ($it -eq $null) { try { $it = $ns.GetItemFromID($id) } catch { $it = $null } }\n        if ($it -eq $null) { throw \"no item with that entry id in this account\" }\n        try { $subject = [string]$it.Subject } catch {}\n        $parent = $null\n        try { $parent = $it.Parent } catch {}\n        if ($parent -eq $null) { throw \"item has no parent folder - refusing to delete\" }\n        try { $folderPath = [string]$parent.FolderPath } catch {}\n        if ((Test-UnderProtectedFolder $parent) -and -not $allowProtected) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = $protectedReason }\n        } elseif ($dryRun) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'would-delete'; reason = '' }\n        } else {\n            $it.Delete()\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'deleted'; reason = '' }\n        }\n    } catch {\n        $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'failed'; reason = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Depth 3 -InputObject @($items)\n`, 'scan');\n    const items: DeleteMailOutcome[] = toArray(output).map(row => {\n        const e = record(row);\n        const status = OUTCOME_STATUSES.find(s => s === str(e.status)) ?? 'failed';\n        return {\n            entryId: str(e.entryId),\n            subject: str(e.subject),\n            folderPath: str(e.folderPath),\n            status,\n            reason: str(e.reason),\n        };\n    });\n    return {\n        dryRun: request.dryRun,\n        deleted: items.filter(i => i.status === 'deleted').length,\n        refused: items.filter(i => i.status === 'refused').length,\n        failed: items.filter(i => i.status === 'failed').length,\n        items,\n    };\n}\n\n/**\n * Permanently remove items from the account's Deleted Items. The ONE irreversible\n * operation here, which is why it is folder-scoped rather than keyed on ids: it\n * can only ever destroy what was already thrown away.\n *\n * Walks backwards, since deleting shifts the collection and a forward walk would\n * skip every other item.\n */\nexport async function purgeDeletedItems(request: PurgeRequest): Promise<PurgeDeletedItemsResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$folder = $store.GetDefaultFolder(${psInt(FolderId.DeletedItems)})\n$olderThanDays = ${psInt(request.olderThanDays)}\n$dryRun = ${psBool(request.dryRun)}\n${cutoffScript(request.olderThanDays)}\n$matched = 0\n$purged = 0\n$kept = 0\n$failed = 0\n# Bound once: each $folder.Items is a COM call that builds a fresh collection.\n$folderItems = $folder.Items\nfor ($i = $folderItems.Count; $i -ge 1; $i--) {\n    $it = $null\n    try { $it = $folderItems.Item($i) } catch { continue }\n    $stamp = $null\n    foreach ($property in @('ReceivedTime', 'LastModificationTime', 'CreationTime')) {\n        try { $stamp = $it.$property; if ($stamp -ne $null) { break } } catch {}\n    }\n    if ($olderThanDays -gt 0 -and $stamp -ne $null -and $stamp -gt $cutoff) { $kept++; continue }\n    $matched++\n    if ($dryRun) { continue }\n    try { $it.Delete(); $purged++ } catch { $failed++ }\n}\nConvertTo-Json -Compress -InputObject ([PSCustomObject]@{\n    folderPath = [string]$folder.FolderPath\n    matched    = $matched\n    purged     = $purged\n    kept       = $kept\n    failed     = $failed\n})\n`, 'purge');\n    const e = record(output);\n    return {\n        folderPath: str(e.folderPath),\n        dryRun: request.dryRun,\n        matched: num(e.matched),\n        purged: num(e.purged),\n        kept: num(e.kept),\n        failed: num(e.failed),\n    };\n}\n"]}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/windows/cleanup.ts"],"names":[],"mappings":";;AAyBA,kDAuEC;AAUD,8CA0CC;AApJD,wDAAwD;AACxD,+BAA4E;AAC5E,uCAA2E;AAC3E,iCAAmD;AACnD,kCAA2G;AAI3G;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAA4B;IAClE,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;oBACC,IAAA,YAAM,EAAC,OAAO,CAAC,cAAc,CAAC;YACtC,IAAA,YAAM,EAAC,OAAO,CAAC,MAAM,CAAC;qBACb,IAAA,cAAQ,EAAC,4BAAqB,CAAC;;sBAE9B,sBAAe,CAAC,GAAG,CAAC,WAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;kBAyBzC,IAAA,aAAO,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B1C,EAAE,MAAM,CAAC,CAAC;IACP,MAAM,KAAK,GAAwB,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;QACtB,OAAO;YACH,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;YACvB,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;YACvB,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;YAC7B,MAAM,EAAE,IAAA,mBAAY,EAAC,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;SACxB,CAAC;IACN,CAAC,CAAC,CAAC;IACH,OAAO,IAAA,uBAAgB,EAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAqB;IACzD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;oCACiB,IAAA,WAAK,EAAC,eAAQ,CAAC,YAAY,CAAC;mBAC7C,IAAA,WAAK,EAAC,OAAO,CAAC,aAAa,CAAC;YACnC,IAAA,YAAM,EAAC,OAAO,CAAC,MAAM,CAAC;EAChC,IAAA,sBAAY,EAAC,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BpC,EAAE,OAAO,CAAC,CAAC;IACR,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO;QACH,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;QAC7B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,IAAI,CAAC;QACjB,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;KACxB,CAAC;AACN,CAAC","sourcesContent":["// Deleting mail, and emptying what was already deleted.\nimport { psArray, psBool, psInt, psString, runPowerShellJson } from './run';\nimport { accountScript, cutoffScript, DELIVERY_STORE_PS } from './scripts';\nimport { num, record, str, toArray } from './json';\nimport { deleteMailResult, deleteStatus, FolderId, PROTECTED_MAIL_REASON, PROTECTED_ROOTS } from '../mail';\nimport type { DeleteEmailsRequest, PurgeRequest } from '../backend';\nimport type { DeleteMailOutcome, DeleteMailResult, PurgeDeletedItemsResult } from '../types';\n\n/**\n * Delete mail by entry id from anywhere in the account. Delete() moves each item\n * to Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.\n *\n * This is the one operation that can reach received mail, and an entry id is an\n * unsafe key for it: a stale or wrong id can resolve to a DIFFERENT message.\n * Four things hold the line:\n *  - An id that resolves outside this account's store is refused. The bare\n *    lookup falls back to the default store, and the Inbox/Sent check below\n *    only knows this account's folders, so another mailbox's received mail\n *    would otherwise pass it.\n *  - Inbox and Sent Items are refused, INCLUDING their subfolders (a filed\n *    folder is still received mail), unless `allowProtected`.\n *  - `dryRun` resolves and reports without deleting, so the exact subjects and\n *    folders can be checked before anything happens.\n *  - Every outcome echoes the subject and folder of the item actually resolved.\n */\nexport async function deleteOutlookEmails(request: DeleteEmailsRequest): Promise<DeleteMailResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$allowProtected = ${psBool(request.allowProtected)}\n$dryRun = ${psBool(request.dryRun)}\n$protectedReason = ${psString(PROTECTED_MAIL_REASON)}\n$protectedIds = @{}\nforeach ($role in @(${PROTECTED_ROOTS.map(psInt).join(', ')})) {\n    try { $protectedIds[[string]$store.GetDefaultFolder($role).EntryID] = $true } catch {}\n}\nfunction Test-UnderProtectedFolder($folder) {\n    $current = $folder\n    for ($guard = 0; $current -ne $null -and $guard -lt 25; $guard++) {\n        $folderId = $null\n        try { $folderId = [string]$current.EntryID } catch {}\n        if (-not $folderId) { return $false }\n        if ($protectedIds.ContainsKey($folderId)) { return $true }\n        $parent = $null\n        try { $parent = $current.Parent } catch {}\n        $current = $parent\n    }\n    return $false\n}\nfunction Test-InAccountStore($folder) {\n    $folderStoreId = $null\n    try { $folderStoreId = [string]$folder.StoreID } catch {}\n    if (-not $folderStoreId) { return $false }\n    if ($folderStoreId -ieq $storeId) { return $true }\n    # One store can be named by two id strings; MAPI decides whether they match.\n    try { return [bool]$ns.CompareEntryIDs($folderStoreId, $storeId) } catch { return $false }\n}\n$items = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    $folderPath = ''\n    try {\n        $it = $null\n        try { $it = $ns.GetItemFromID($id, $store.StoreID) } catch { $it = $null }\n        if ($it -eq $null) { try { $it = $ns.GetItemFromID($id) } catch { $it = $null } }\n        if ($it -eq $null) { throw \"no item with that entry id in this account\" }\n        try { $subject = [string]$it.Subject } catch {}\n        $parent = $null\n        try { $parent = $it.Parent } catch {}\n        if ($parent -eq $null) { throw \"item has no parent folder - refusing to delete\" }\n        try { $folderPath = [string]$parent.FolderPath } catch {}\n        if (-not (Test-InAccountStore $parent)) { throw \"item is in another mailbox, not this account - refusing to delete\" }\n        if ((Test-UnderProtectedFolder $parent) -and -not $allowProtected) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = $protectedReason }\n        } elseif ($dryRun) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'would-delete'; reason = '' }\n        } else {\n            $it.Delete()\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'deleted'; reason = '' }\n        }\n    } catch {\n        $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'failed'; reason = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Depth 3 -InputObject @($items)\n`, 'scan');\n    const items: DeleteMailOutcome[] = toArray(output).map(row => {\n        const e = record(row);\n        return {\n            entryId: str(e.entryId),\n            subject: str(e.subject),\n            folderPath: str(e.folderPath),\n            status: deleteStatus(str(e.status)),\n            reason: str(e.reason),\n        };\n    });\n    return deleteMailResult(request.dryRun, items);\n}\n\n/**\n * Permanently remove items from the account's Deleted Items. The ONE irreversible\n * operation here, which is why it is folder-scoped rather than keyed on ids: it\n * can only ever destroy what was already thrown away.\n *\n * Walks backwards, since deleting shifts the collection and a forward walk would\n * skip every other item.\n */\nexport async function purgeDeletedItems(request: PurgeRequest): Promise<PurgeDeletedItemsResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$folder = $store.GetDefaultFolder(${psInt(FolderId.DeletedItems)})\n$olderThanDays = ${psInt(request.olderThanDays)}\n$dryRun = ${psBool(request.dryRun)}\n${cutoffScript(request.olderThanDays)}\n$matched = 0\n$purged = 0\n$kept = 0\n$failed = 0\n# Bound once: each $folder.Items is a COM call that builds a fresh collection.\n$folderItems = $folder.Items\nfor ($i = $folderItems.Count; $i -ge 1; $i--) {\n    $it = $null\n    try { $it = $folderItems.Item($i) } catch { continue }\n    $stamp = $null\n    foreach ($property in @('ReceivedTime', 'LastModificationTime', 'CreationTime')) {\n        try { $stamp = $it.$property; if ($stamp -ne $null) { break } } catch {}\n    }\n    if ($olderThanDays -gt 0 -and $stamp -ne $null -and $stamp -gt $cutoff) { $kept++; continue }\n    $matched++\n    if ($dryRun) { continue }\n    try { $it.Delete(); $purged++ } catch { $failed++ }\n}\nConvertTo-Json -Compress -InputObject ([PSCustomObject]@{\n    folderPath = [string]$folder.FolderPath\n    matched    = $matched\n    purged     = $purged\n    kept       = $kept\n    failed     = $failed\n})\n`, 'purge');\n    const e = record(output);\n    return {\n        folderPath: str(e.folderPath),\n        dryRun: request.dryRun,\n        matched: num(e.matched),\n        purged: num(e.purged),\n        kept: num(e.kept),\n        failed: num(e.failed),\n    };\n}\n"]}

package/dist/windows/drafts.d.ts

@@ -2,7 +2,7 @@ import type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../back
 import type { DeleteDraftsResult, ListDraftsResult, SendDraftsResult } from '../types';
 /** The account's drafts, newest first. Bodies are previewed, never returned whole. */
 export declare function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult>;
-/** Send the named drafts, each proved to be this account's first. */
+/** Send the named drafts. */
 export declare function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult>;
 /**
  * Send every draft belonging to the account.
@@ -13,9 +13,9 @@ export declare function sendDrafts(request: EntryIdsRequest): Promise<SendDrafts
  */
 export declare function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult>;
 /**
- * Delete the named drafts, each proved to be this account's first. Outlook's
- * Delete() moves an item to Deleted Items, so a mistake stays recoverable.
- * Without the proof this would be a general "delete any email by id" call,
+ * Delete the named drafts. Outlook's Delete() moves an item to Deleted Items,
+ * so a mistake stays recoverable. Without the proof that each is this
+ * account's draft, this would be a general "delete any email by id" call,
  * which is not what it is for.
  */
 export declare function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult>;

package/dist/windows/drafts.js

@@ -7,7 +7,7 @@ exports.deleteOutlookDrafts = deleteOutlookDrafts;
 // Drafts: which ones belong to an account, and listing, sending or deleting them.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const json_1 = require("../shared/json");
+const json_1 = require("./json");
 const mail_1 = require("../mail");
 /**
  * Resolve the Drafts folders belonging to one account into `$scan`, and define
@@ -96,7 +96,7 @@ foreach ($entry in $scan) {
             if ($preview.Length -gt $previewChars) { $preview = $preview.Substring(0, $previewChars) }
         }
         $modified = ''
-        try { $modified = $it.LastModificationTime.ToString('yyyy-MM-dd HH:mm') } catch {}
+        try { $modified = ${(0, scripts_1.stampPs)('$it.LastModificationTime')} } catch {}
         $hasAttachments = $false
         try { $hasAttachments = ($it.Attachments.Count -gt 0) } catch {}
         $rows += [PSCustomObject]@{
@@ -143,26 +143,31 @@ ConvertTo-Json -Depth 4 -InputObject ([PSCustomObject]@{
         }),
     };
 }
-/** Send the named drafts, each proved to be this account's first. */
-async function sendDrafts(request) {
+/** Run `verb` over the named drafts of the account, each proved to be its own first. */
+async function actOnDrafts(request, verb) {
     const output = await (0, run_1.runPowerShellJson)(`${draftsScript(request.account)}
-$sent = 0
+$done = 0
 $failed = @()
 foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
     $subject = ''
     try {
-        $draft = Resolve-OwnDraft $id 'send'
+        $draft = Resolve-OwnDraft $id '${verb}'
         try { $subject = [string]$draft.Subject } catch {}
-        $draft.Send()
-        $sent++
+        $draft.${verb === 'send' ? 'Send' : 'Delete'}()
+        $done++
     } catch {
-        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }
+        ${(0, json_1.itemFailurePs)('$id')}
     }
 }
-ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent; failed = @($failed) })
+ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ done = $done; failed = @($failed) })
 `, 'scan');
     const e = (0, json_1.record)(output);
-    return { sent: (0, json_1.num)(e.sent), failed: (0, json_1.itemFailures)(e.failed) };
+    return { done: (0, json_1.num)(e.done), failed: (0, json_1.itemFailures)(e.failed) };
+}
+/** Send the named drafts. */
+async function sendDrafts(request) {
+    const { done, failed } = await actOnDrafts(request, 'send');
+    return { sent: done, failed };
 }
 /**
  * Send every draft belonging to the account.
@@ -190,7 +195,7 @@ foreach ($draft in $drafts) {
         $draft.Send()
         $sent++
     } catch {
-        $failed += [PSCustomObject]@{ entryId = $entryId; subject = $subject; error = $_.Exception.Message }
+        ${(0, json_1.itemFailurePs)('$entryId')}
     }
 }
 ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent; failed = @($failed) })
@@ -199,29 +204,13 @@ ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent;
     return { sent: (0, json_1.num)(e.sent), failed: (0, json_1.itemFailures)(e.failed) };
 }
 /**
- * Delete the named drafts, each proved to be this account's first. Outlook's
- * Delete() moves an item to Deleted Items, so a mistake stays recoverable.
- * Without the proof this would be a general "delete any email by id" call,
+ * Delete the named drafts. Outlook's Delete() moves an item to Deleted Items,
+ * so a mistake stays recoverable. Without the proof that each is this
+ * account's draft, this would be a general "delete any email by id" call,
  * which is not what it is for.
  */
 async function deleteOutlookDrafts(request) {
-    const output = await (0, run_1.runPowerShellJson)(`${draftsScript(request.account)}
-$deleted = 0
-$failed = @()
-foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
-    $subject = ''
-    try {
-        $draft = Resolve-OwnDraft $id 'delete'
-        try { $subject = [string]$draft.Subject } catch {}
-        $draft.Delete()
-        $deleted++
-    } catch {
-        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }
-    }
-}
-ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ deleted = $deleted; failed = @($failed) })
-`, 'scan');
-    const e = (0, json_1.record)(output);
-    return { deleted: (0, json_1.num)(e.deleted), failed: (0, json_1.itemFailures)(e.failed) };
+    const { done, failed } = await actOnDrafts(request, 'delete');
+    return { deleted: done, failed };
 }
 //# sourceMappingURL=drafts.js.map

package/dist/windows/drafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/windows/drafts.ts"],"names":[],"mappings":"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","sourcesContent":["// Drafts: which ones belong to an account, and listing, sending or deleting them.\nimport { psArray, psInt, runPowerShellJson } from './run';\nimport { accountScript, DELIVERY_STORE_PS } from './scripts';\nimport { bool, itemFailures, num, record, str, strList, toArray } from '../shared/json';\nimport { FolderId } from '../mail';\nimport type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';\nimport type { DeleteDraftsResult, ListDraftsResult, SendDraftsResult } from '../types';\n\n/**\n * Resolve the Drafts folders belonging to one account into `$scan`, and define\n * `Test-DraftMatches` over them. Emitted into every drafts script, so listing,\n * sending and deleting can never disagree about which drafts are this account's.\n *\n * Two Drafts folders can hold one account's drafts, so both are scanned:\n *  - the account's OWN store's Drafts, where a draft composed in that mailbox\n *    lands. A draft there with no explicit sending account still belongs to it.\n *  - the DEFAULT store's Drafts, where a program's `Save()` files a draft\n *    whatever account it sends from. Only drafts stamped with this account\n *    match there; an unstamped one belongs to the default account.\n * When the two are the same folder it is scanned once, under the first rule.\n *\n * Non-mail items (meeting requests, reports) never match.\n */\nconst DRAFTS_SCAN_PS = `\n$scan = @()\n$seenFolders = @{}\n$homeDrafts = $null\ntry { $homeDrafts = $store.GetDefaultFolder(${psInt(FolderId.Drafts)}) } catch {}\nif ($homeDrafts -ne $null) {\n    $seenFolders[\"$($homeDrafts.StoreID)|$($homeDrafts.EntryID)\"] = $true\n    $scan += [PSCustomObject]@{ folder = $homeDrafts; includeUnstamped = $true }\n}\n$defaultDrafts = $null\ntry { $defaultDrafts = $ns.GetDefaultFolder(${psInt(FolderId.Drafts)}) } catch {}\nif ($defaultDrafts -ne $null -and -not $seenFolders.ContainsKey(\"$($defaultDrafts.StoreID)|$($defaultDrafts.EntryID)\")) {\n    $scan += [PSCustomObject]@{ folder = $defaultDrafts; includeUnstamped = $false }\n}\nfunction Test-DraftMatches($item, [bool]$includeUnstamped) {\n    if ($item.Class -ne 43) { return $false }  # olMail only\n    $sender = $null\n    try { $sender = $item.SendUsingAccount } catch {}\n    if ($sender -eq $null) { return $includeUnstamped }\n    return ([string]$sender.SmtpAddress -ieq $target)\n}\n# An id is acted on only once it is PROVED to be one of this account's drafts:\n# resolved in one of the scanned folders' stores, sitting in that folder, and\n# bound to this account (or unbound, in its own store).\n$draftFolderRules = @{}\nforeach ($entry in $scan) { $draftFolderRules[[string]$entry.folder.EntryID] = $entry.includeUnstamped }\nfunction Resolve-OwnDraft([string]$id, [string]$verb) {\n    $draft = $null\n    foreach ($entry in $scan) {\n        try { $draft = $ns.GetItemFromID($id, $entry.folder.StoreID) } catch { $draft = $null }\n        if ($draft -ne $null) { break }\n    }\n    if ($draft -eq $null) { throw \"no such item in this account's Drafts folders\" }\n    $parentId = ''\n    try { $parentId = [string]$draft.Parent.EntryID } catch {}\n    if (-not $draftFolderRules.ContainsKey($parentId)) { throw \"item is not in this account's Drafts folder - refusing to $verb\" }\n    if (-not (Test-DraftMatches $draft $draftFolderRules[$parentId])) { throw \"draft is not bound to $target - refusing to $verb\" }\n    return $draft\n}\n`;\n\nfunction draftsScript(account: string): string {\n    return accountScript(account) + DELIVERY_STORE_PS + DRAFTS_SCAN_PS;\n}\n\n/** The account's drafts, newest first. Bodies are previewed, never returned whole. */\nexport async function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$previewChars = ${psInt(request.previewChars)}\n$limit = ${psInt(request.limit)}\n$rows = @()\n$folderPaths = @()\nforeach ($entry in $scan) {\n    $folderPath = ''\n    try { $folderPath = [string]$entry.folder.FolderPath } catch {}\n    $folderPaths += $folderPath\n    foreach ($it in $entry.folder.Items) {\n        if (-not (Test-DraftMatches $it $entry.includeUnstamped)) { continue }\n        $addresses = @()\n        try {\n            foreach ($r in $it.Recipients) {\n                $address = ''\n                try { $address = [string]$r.Address } catch {}\n                # An unresolved Exchange entry has a DN for an address; its name reads better.\n                if ($address.StartsWith('/')) { try { $address = [string]$r.Name } catch {} }\n                if ($address) { $addresses += $address }\n            }\n        } catch {}\n        $preview = ''\n        if ($previewChars -gt 0) {\n            try { $preview = ([string]$it.Body -replace '\\\\s+', ' ').Trim() } catch {}\n            if ($preview.Length -gt $previewChars) { $preview = $preview.Substring(0, $previewChars) }\n        }\n        $modified = ''\n        try { $modified = $it.LastModificationTime.ToString('yyyy-MM-dd HH:mm') } catch {}\n        $hasAttachments = $false\n        try { $hasAttachments = ($it.Attachments.Count -gt 0) } catch {}\n        $rows += [PSCustomObject]@{\n            entryId        = [string]$it.EntryID\n            subject        = [string]$it.Subject\n            to             = [string]$it.To\n            toEmails       = @($addresses)\n            bodyPreview    = $preview\n            hasAttachments = $hasAttachments\n            lastModified   = $modified\n            folderPath     = $folderPath\n        }\n    }\n}\n$sorted = @($rows | Sort-Object -Property lastModified -Descending)\n$total = $sorted.Count\nif ($total -gt $limit) { $sorted = @($sorted[0..($limit - 1)]) }\nConvertTo-Json -Depth 4 -InputObject ([PSCustomObject]@{\n    account        = $target\n    foldersScanned = @($folderPaths)\n    count          = $total\n    truncated      = ($total -gt $limit)\n    drafts         = @($sorted)\n})\n`, 'scan');\n    const e = record(output);\n    return {\n        account: str(e.account) || request.account,\n        foldersScanned: toArray(e.foldersScanned).map(str),\n        count: num(e.count),\n        truncated: bool(e.truncated),\n        drafts: toArray(e.drafts).map(row => {\n            const d = record(row);\n            return {\n                entryId: str(d.entryId),\n                subject: str(d.subject),\n                to: str(d.to),\n                toEmails: strList(d.toEmails),\n                bodyPreview: str(d.bodyPreview),\n                hasAttachments: bool(d.hasAttachments),\n                lastModified: str(d.lastModified),\n                folderPath: str(d.folderPath),\n            };\n        }),\n    };\n}\n\n/** Send the named drafts, each proved to be this account's first. */\nexport async function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$sent = 0\n$failed = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    try {\n        $draft = Resolve-OwnDraft $id 'send'\n        try { $subject = [string]$draft.Subject } catch {}\n        $draft.Send()\n        $sent++\n    } catch {\n        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent; failed = @($failed) })\n`, 'scan');\n    const e = record(output);\n    return {sent: num(e.sent), failed: itemFailures(e.failed)};\n}\n\n/**\n * Send every draft belonging to the account.\n *\n * The matching items are snapshotted before the first send: sending moves an\n * item out of Drafts, and sending during a live enumeration would skip every\n * other one.\n */\nexport async function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$drafts = @()\nforeach ($entry in $scan) {\n    foreach ($it in $entry.folder.Items) {\n        if (Test-DraftMatches $it $entry.includeUnstamped) { $drafts += $it }\n    }\n}\n$sent = 0\n$failed = @()\nforeach ($draft in $drafts) {\n    $entryId = ''\n    $subject = ''\n    try { $entryId = [string]$draft.EntryID } catch {}\n    try { $subject = [string]$draft.Subject } catch {}\n    try {\n        $draft.Send()\n        $sent++\n    } catch {\n        $failed += [PSCustomObject]@{ entryId = $entryId; subject = $subject; error = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent; failed = @($failed) })\n`, 'scan');\n    const e = record(output);\n    return {sent: num(e.sent), failed: itemFailures(e.failed)};\n}\n\n/**\n * Delete the named drafts, each proved to be this account's first. Outlook's\n * Delete() moves an item to Deleted Items, so a mistake stays recoverable.\n * Without the proof this would be a general \"delete any email by id\" call,\n * which is not what it is for.\n */\nexport async function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$deleted = 0\n$failed = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    try {\n        $draft = Resolve-OwnDraft $id 'delete'\n        try { $subject = [string]$draft.Subject } catch {}\n        $draft.Delete()\n        $deleted++\n    } catch {\n        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ deleted = $deleted; failed = @($failed) })\n`, 'scan');\n    const e = record(output);\n    return {deleted: num(e.deleted), failed: itemFailures(e.failed)};\n}\n"]}
+{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/windows/drafts.ts"],"names":[],"mappings":"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","sourcesContent":["// Drafts: which ones belong to an account, and listing, sending or deleting them.\nimport { psArray, psInt, runPowerShellJson } from './run';\nimport { accountScript, DELIVERY_STORE_PS, stampPs } from './scripts';\nimport { bool, itemFailurePs, itemFailures, num, record, str, strList, toArray } from './json';\nimport { FolderId } from '../mail';\nimport type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';\nimport type { DeleteDraftsResult, ItemFailure, ListDraftsResult, SendDraftsResult } from '../types';\n\n/**\n * Resolve the Drafts folders belonging to one account into `$scan`, and define\n * `Test-DraftMatches` over them. Emitted into every drafts script, so listing,\n * sending and deleting can never disagree about which drafts are this account's.\n *\n * Two Drafts folders can hold one account's drafts, so both are scanned:\n *  - the account's OWN store's Drafts, where a draft composed in that mailbox\n *    lands. A draft there with no explicit sending account still belongs to it.\n *  - the DEFAULT store's Drafts, where a program's `Save()` files a draft\n *    whatever account it sends from. Only drafts stamped with this account\n *    match there; an unstamped one belongs to the default account.\n * When the two are the same folder it is scanned once, under the first rule.\n *\n * Non-mail items (meeting requests, reports) never match.\n */\nconst DRAFTS_SCAN_PS = `\n$scan = @()\n$seenFolders = @{}\n$homeDrafts = $null\ntry { $homeDrafts = $store.GetDefaultFolder(${psInt(FolderId.Drafts)}) } catch {}\nif ($homeDrafts -ne $null) {\n    $seenFolders[\"$($homeDrafts.StoreID)|$($homeDrafts.EntryID)\"] = $true\n    $scan += [PSCustomObject]@{ folder = $homeDrafts; includeUnstamped = $true }\n}\n$defaultDrafts = $null\ntry { $defaultDrafts = $ns.GetDefaultFolder(${psInt(FolderId.Drafts)}) } catch {}\nif ($defaultDrafts -ne $null -and -not $seenFolders.ContainsKey(\"$($defaultDrafts.StoreID)|$($defaultDrafts.EntryID)\")) {\n    $scan += [PSCustomObject]@{ folder = $defaultDrafts; includeUnstamped = $false }\n}\nfunction Test-DraftMatches($item, [bool]$includeUnstamped) {\n    if ($item.Class -ne 43) { return $false }  # olMail only\n    $sender = $null\n    try { $sender = $item.SendUsingAccount } catch {}\n    if ($sender -eq $null) { return $includeUnstamped }\n    return ([string]$sender.SmtpAddress -ieq $target)\n}\n# An id is acted on only once it is PROVED to be one of this account's drafts:\n# resolved in one of the scanned folders' stores, sitting in that folder, and\n# bound to this account (or unbound, in its own store).\n$draftFolderRules = @{}\nforeach ($entry in $scan) { $draftFolderRules[[string]$entry.folder.EntryID] = $entry.includeUnstamped }\nfunction Resolve-OwnDraft([string]$id, [string]$verb) {\n    $draft = $null\n    foreach ($entry in $scan) {\n        try { $draft = $ns.GetItemFromID($id, $entry.folder.StoreID) } catch { $draft = $null }\n        if ($draft -ne $null) { break }\n    }\n    if ($draft -eq $null) { throw \"no such item in this account's Drafts folders\" }\n    $parentId = ''\n    try { $parentId = [string]$draft.Parent.EntryID } catch {}\n    if (-not $draftFolderRules.ContainsKey($parentId)) { throw \"item is not in this account's Drafts folder - refusing to $verb\" }\n    if (-not (Test-DraftMatches $draft $draftFolderRules[$parentId])) { throw \"draft is not bound to $target - refusing to $verb\" }\n    return $draft\n}\n`;\n\nfunction draftsScript(account: string): string {\n    return accountScript(account) + DELIVERY_STORE_PS + DRAFTS_SCAN_PS;\n}\n\n/** The account's drafts, newest first. Bodies are previewed, never returned whole. */\nexport async function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$previewChars = ${psInt(request.previewChars)}\n$limit = ${psInt(request.limit)}\n$rows = @()\n$folderPaths = @()\nforeach ($entry in $scan) {\n    $folderPath = ''\n    try { $folderPath = [string]$entry.folder.FolderPath } catch {}\n    $folderPaths += $folderPath\n    foreach ($it in $entry.folder.Items) {\n        if (-not (Test-DraftMatches $it $entry.includeUnstamped)) { continue }\n        $addresses = @()\n        try {\n            foreach ($r in $it.Recipients) {\n                $address = ''\n                try { $address = [string]$r.Address } catch {}\n                # An unresolved Exchange entry has a DN for an address; its name reads better.\n                if ($address.StartsWith('/')) { try { $address = [string]$r.Name } catch {} }\n                if ($address) { $addresses += $address }\n            }\n        } catch {}\n        $preview = ''\n        if ($previewChars -gt 0) {\n            try { $preview = ([string]$it.Body -replace '\\\\s+', ' ').Trim() } catch {}\n            if ($preview.Length -gt $previewChars) { $preview = $preview.Substring(0, $previewChars) }\n        }\n        $modified = ''\n        try { $modified = ${stampPs('$it.LastModificationTime')} } catch {}\n        $hasAttachments = $false\n        try { $hasAttachments = ($it.Attachments.Count -gt 0) } catch {}\n        $rows += [PSCustomObject]@{\n            entryId        = [string]$it.EntryID\n            subject        = [string]$it.Subject\n            to             = [string]$it.To\n            toEmails       = @($addresses)\n            bodyPreview    = $preview\n            hasAttachments = $hasAttachments\n            lastModified   = $modified\n            folderPath     = $folderPath\n        }\n    }\n}\n$sorted = @($rows | Sort-Object -Property lastModified -Descending)\n$total = $sorted.Count\nif ($total -gt $limit) { $sorted = @($sorted[0..($limit - 1)]) }\nConvertTo-Json -Depth 4 -InputObject ([PSCustomObject]@{\n    account        = $target\n    foldersScanned = @($folderPaths)\n    count          = $total\n    truncated      = ($total -gt $limit)\n    drafts         = @($sorted)\n})\n`, 'scan');\n    const e = record(output);\n    return {\n        account: str(e.account) || request.account,\n        foldersScanned: toArray(e.foldersScanned).map(str),\n        count: num(e.count),\n        truncated: bool(e.truncated),\n        drafts: toArray(e.drafts).map(row => {\n            const d = record(row);\n            return {\n                entryId: str(d.entryId),\n                subject: str(d.subject),\n                to: str(d.to),\n                toEmails: strList(d.toEmails),\n                bodyPreview: str(d.bodyPreview),\n                hasAttachments: bool(d.hasAttachments),\n                lastModified: str(d.lastModified),\n                folderPath: str(d.folderPath),\n            };\n        }),\n    };\n}\n\n/** Run `verb` over the named drafts of the account, each proved to be its own first. */\nasync function actOnDrafts(\n    request: EntryIdsRequest,\n    verb: 'send' | 'delete',\n): Promise<{ done: number; failed: ItemFailure[] }> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$done = 0\n$failed = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    try {\n        $draft = Resolve-OwnDraft $id '${verb}'\n        try { $subject = [string]$draft.Subject } catch {}\n        $draft.${verb === 'send' ? 'Send' : 'Delete'}()\n        $done++\n    } catch {\n        ${itemFailurePs('$id')}\n    }\n}\nConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ done = $done; failed = @($failed) })\n`, 'scan');\n    const e = record(output);\n    return { done: num(e.done), failed: itemFailures(e.failed) };\n}\n\n/** Send the named drafts. */\nexport async function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult> {\n    const { done, failed } = await actOnDrafts(request, 'send');\n    return { sent: done, failed };\n}\n\n/**\n * Send every draft belonging to the account.\n *\n * The matching items are snapshotted before the first send: sending moves an\n * item out of Drafts, and sending during a live enumeration would skip every\n * other one.\n */\nexport async function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult> {\n    const output = await runPowerShellJson(`${draftsScript(request.account)}\n$drafts = @()\nforeach ($entry in $scan) {\n    foreach ($it in $entry.folder.Items) {\n        if (Test-DraftMatches $it $entry.includeUnstamped) { $drafts += $it }\n    }\n}\n$sent = 0\n$failed = @()\nforeach ($draft in $drafts) {\n    $entryId = ''\n    $subject = ''\n    try { $entryId = [string]$draft.EntryID } catch {}\n    try { $subject = [string]$draft.Subject } catch {}\n    try {\n        $draft.Send()\n        $sent++\n    } catch {\n        ${itemFailurePs('$entryId')}\n    }\n}\nConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{ sent = $sent; failed = @($failed) })\n`, 'scan');\n    const e = record(output);\n    return { sent: num(e.sent), failed: itemFailures(e.failed) };\n}\n\n/**\n * Delete the named drafts. Outlook's Delete() moves an item to Deleted Items,\n * so a mistake stays recoverable. Without the proof that each is this\n * account's draft, this would be a general \"delete any email by id\" call,\n * which is not what it is for.\n */\nexport async function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult> {\n    const { done, failed } = await actOnDrafts(request, 'delete');\n    return { deleted: done, failed };\n}\n"]}

package/dist/windows/folders.js

@@ -5,7 +5,7 @@ exports.moveOutlookEmails = moveOutlookEmails;
 // Listing the folders under an Inbox, and filing mail into one.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const json_1 = require("../shared/json");
+const json_1 = require("./json");
 const mail_1 = require("../mail");
 /** The folders under an account's Inbox, depth-first. */
 async function listInboxFolders(request) {
@@ -60,7 +60,7 @@ foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
         [void]$it.Move($scope)
         $moved++
     } catch {
-        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }
+        ${(0, json_1.itemFailurePs)('$id')}
     }
 }
 ConvertTo-Json -Depth 3 -InputObject ([PSCustomObject]@{

package/dist/windows/folders.js.map

@@ -1 +1 @@
-{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/windows/folders.ts"],"names":[],"mappings":";;AASA,4CA+BC;AAQD,8CA+BC;AA/ED,gEAAgE;AAChE,+BAA0D;AAC1D,uCAA8E;AAC9E,yCAA+E;AAC/E,kCAAmC;AAInC,yDAAyD;AAClD,KAAK,UAAU,gBAAgB,CAAC,OAA2B;IAC9D,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;mCACgB,IAAA,WAAK,EAAC,eAAQ,CAAC,KAAK,CAAC;cAC1C,IAAA,WAAK,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;CAiBpC,EAAE,UAAU,CAAC,CAAC;IACX,OAAO,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;QACtB,OAAO;YACH,IAAI,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,IAAI,CAAC;YACjB,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,SAAS,CAAC;YAC3B,KAAK,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;SAC3B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAoB;IACxD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;EACjB,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC;;;kBAG7D,IAAA,aAAO,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;CAiB1C,EAAE,MAAM,CAAC,CAAC;IACP,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO;QACH,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;QAC7B,aAAa,EAAE,IAAA,WAAI,EAAC,CAAC,CAAC,aAAa,CAAC;QACpC,KAAK,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,KAAK,CAAC;QACnB,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,MAAM,CAAC;KACjC,CAAC;AACN,CAAC","sourcesContent":["// Listing the folders under an Inbox, and filing mail into one.\nimport { psArray, psInt, runPowerShellJson } from './run';\nimport { accountScript, DELIVERY_STORE_PS, mailScopeScript } from './scripts';\nimport { bool, itemFailures, num, record, str, toArray } from '../shared/json';\nimport { FolderId } from '../mail';\nimport type { ListFoldersRequest, MoveRequest } from '../backend';\nimport type { InboxFolderInfo, MoveEmailsResult } from '../types';\n\n/** The folders under an account's Inbox, depth-first. */\nexport async function listInboxFolders(request: ListFoldersRequest): Promise<InboxFolderInfo[]> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$inbox = $store.GetDefaultFolder(${psInt(FolderId.Inbox)})\n$maxDepth = ${psInt(request.maxDepth)}\n$rows = New-Object System.Collections.ArrayList\nfunction Add-Folders($folder, [int]$level) {\n    foreach ($f in $folder.Folders) {\n        $itemCount = 0\n        try { $itemCount = [int]$f.Items.Count } catch {}\n        [void]$rows.Add([PSCustomObject]@{\n            name       = [string]$f.Name\n            folderPath = [string]$f.FolderPath\n            itemCount  = $itemCount\n            depth      = $level\n        })\n        if ($level -lt $maxDepth) { Add-Folders $f ($level + 1) }\n    }\n}\nAdd-Folders $inbox 1\nConvertTo-Json -Depth 3 -InputObject @($rows)\n`, 'standard');\n    return toArray(output).map(row => {\n        const e = record(row);\n        return {\n            name: str(e.name),\n            folderPath: str(e.folderPath),\n            itemCount: num(e.itemCount),\n            depth: num(e.depth) || 1,\n        };\n    });\n}\n\n/**\n * File emails into a folder of the account: one under the Inbox, or a\n * well-known one by name. Moving to Deleted Items is how mail is deleted\n * recoverably. Moving rewrites each item's entry id, so the ids passed in are\n * dead afterwards.\n */\nexport async function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n${mailScopeScript(request.folder, request.folderLabel, request.createIfMissing)}\n$moved = 0\n$failed = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    try {\n        $it = $ns.GetItemFromID($id, $store.StoreID)\n        try { $subject = [string]$it.Subject } catch {}\n        [void]$it.Move($scope)\n        $moved++\n    } catch {\n        $failed += [PSCustomObject]@{ entryId = $id; subject = $subject; error = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Depth 3 -InputObject ([PSCustomObject]@{\n    folderPath    = [string]$scope.FolderPath\n    folderCreated = $scopeCreated\n    moved         = $moved\n    failed        = @($failed)\n})\n`, 'scan');\n    const e = record(output);\n    return {\n        folderPath: str(e.folderPath),\n        folderCreated: bool(e.folderCreated),\n        moved: num(e.moved),\n        failed: itemFailures(e.failed),\n    };\n}\n"]}
+{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/windows/folders.ts"],"names":[],"mappings":";;AASA,4CA+BC;AAQD,8CA+BC;AA/ED,gEAAgE;AAChE,+BAA0D;AAC1D,uCAA8E;AAC9E,iCAAsF;AACtF,kCAAmC;AAInC,yDAAyD;AAClD,KAAK,UAAU,gBAAgB,CAAC,OAA2B;IAC9D,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;mCACgB,IAAA,WAAK,EAAC,eAAQ,CAAC,KAAK,CAAC;cAC1C,IAAA,WAAK,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;CAiBpC,EAAE,UAAU,CAAC,CAAC;IACX,OAAO,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;QACtB,OAAO;YACH,IAAI,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,IAAI,CAAC;YACjB,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,SAAS,CAAC;YAC3B,KAAK,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;SAC3B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAoB;IACxD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;EACjB,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC;;;kBAG7D,IAAA,aAAO,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;UAQjC,IAAA,oBAAa,EAAC,KAAK,CAAC;;;;;;;;;CAS7B,EAAE,MAAM,CAAC,CAAC;IACP,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO;QACH,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;QAC7B,aAAa,EAAE,IAAA,WAAI,EAAC,CAAC,CAAC,aAAa,CAAC;QACpC,KAAK,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,KAAK,CAAC;QACnB,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,MAAM,CAAC;KACjC,CAAC;AACN,CAAC","sourcesContent":["// Listing the folders under an Inbox, and filing mail into one.\nimport { psArray, psInt, runPowerShellJson } from './run';\nimport { accountScript, DELIVERY_STORE_PS, mailScopeScript } from './scripts';\nimport { bool, itemFailurePs, itemFailures, num, record, str, toArray } from './json';\nimport { FolderId } from '../mail';\nimport type { ListFoldersRequest, MoveRequest } from '../backend';\nimport type { InboxFolderInfo, MoveEmailsResult } from '../types';\n\n/** The folders under an account's Inbox, depth-first. */\nexport async function listInboxFolders(request: ListFoldersRequest): Promise<InboxFolderInfo[]> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$inbox = $store.GetDefaultFolder(${psInt(FolderId.Inbox)})\n$maxDepth = ${psInt(request.maxDepth)}\n$rows = New-Object System.Collections.ArrayList\nfunction Add-Folders($folder, [int]$level) {\n    foreach ($f in $folder.Folders) {\n        $itemCount = 0\n        try { $itemCount = [int]$f.Items.Count } catch {}\n        [void]$rows.Add([PSCustomObject]@{\n            name       = [string]$f.Name\n            folderPath = [string]$f.FolderPath\n            itemCount  = $itemCount\n            depth      = $level\n        })\n        if ($level -lt $maxDepth) { Add-Folders $f ($level + 1) }\n    }\n}\nAdd-Folders $inbox 1\nConvertTo-Json -Depth 3 -InputObject @($rows)\n`, 'standard');\n    return toArray(output).map(row => {\n        const e = record(row);\n        return {\n            name: str(e.name),\n            folderPath: str(e.folderPath),\n            itemCount: num(e.itemCount),\n            depth: num(e.depth) || 1,\n        };\n    });\n}\n\n/**\n * File emails into a folder of the account: one under the Inbox, or a\n * well-known one by name. Moving to Deleted Items is how mail is deleted\n * recoverably. Moving rewrites each item's entry id, so the ids passed in are\n * dead afterwards.\n */\nexport async function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n${mailScopeScript(request.folder, request.folderLabel, request.createIfMissing)}\n$moved = 0\n$failed = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    try {\n        $it = $ns.GetItemFromID($id, $store.StoreID)\n        try { $subject = [string]$it.Subject } catch {}\n        [void]$it.Move($scope)\n        $moved++\n    } catch {\n        ${itemFailurePs('$id')}\n    }\n}\nConvertTo-Json -Depth 3 -InputObject ([PSCustomObject]@{\n    folderPath    = [string]$scope.FolderPath\n    folderCreated = $scopeCreated\n    moved         = $moved\n    failed        = @($failed)\n})\n`, 'scan');\n    const e = record(output);\n    return {\n        folderPath: str(e.folderPath),\n        folderCreated: bool(e.folderCreated),\n        moved: num(e.moved),\n        failed: itemFailures(e.failed),\n    };\n}\n"]}

package/dist/{shared → windows}/json.d.ts

@@ -1,3 +1,4 @@
+import type { ItemFailure } from '../types';
 /** One value as a list: an array stays, null and undefined become empty, anything else wraps. */
 export declare function toArray(value: unknown): unknown[];
 /** A value as a plain object, for reading fields off one row. */
@@ -9,9 +10,13 @@ export declare function bool(value: unknown): boolean;
 export declare function strList(value: unknown): string[];
 /** A base64 field decoded as UTF-8 — how scripts pass bodies that must survive intact. */
 export declare function base64Text(value: unknown): string;
-/** A list of per-item failures, as the scripts report them. */
-export declare function itemFailures(value: unknown): {
-    entryId: string;
-    subject: string;
-    error: string;
-}[];
+/**
+ * The PowerShell that appends one item's failure to `$failed`, inside the
+ * `catch` of a per-item loop: the row `itemFailures` reads back, written once
+ * so no script can name its fields differently. `idVariable` holds the item's
+ * id. `$subject` must be reset before each item's `try`, or a failure reports
+ * the previous item's subject.
+ */
+export declare function itemFailurePs(idVariable: '$id' | '$entryId'): string;
+/** A list of per-item failures, as `itemFailurePs` writes them. */
+export declare function itemFailures(value: unknown): ItemFailure[];

package/dist/{shared → windows}/json.js

@@ -1,10 +1,4 @@
 "use strict";
-// Coercing the JSON a PowerShell script prints into the package's types.
-//
-// ConvertTo-Json has two habits a caller must never see: it unwraps a
-// single-element array into a bare object, and it renders an empty one as
-// nothing at all. Every list crossing that boundary goes through `toArray`, and
-// every scalar through a coercion that survives a missing property.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toArray = toArray;
 exports.record = record;
@@ -13,6 +7,7 @@ exports.num = num;
 exports.bool = bool;
 exports.strList = strList;
 exports.base64Text = base64Text;
+exports.itemFailurePs = itemFailurePs;
 exports.itemFailures = itemFailures;
 /** One value as a list: an array stays, null and undefined become empty, anything else wraps. */
 function toArray(value) {
@@ -41,7 +36,17 @@ function strList(value) {
 function base64Text(value) {
     return Buffer.from(str(value), 'base64').toString('utf8');
 }
-/** A list of per-item failures, as the scripts report them. */
+/**
+ * The PowerShell that appends one item's failure to `$failed`, inside the
+ * `catch` of a per-item loop: the row `itemFailures` reads back, written once
+ * so no script can name its fields differently. `idVariable` holds the item's
+ * id. `$subject` must be reset before each item's `try`, or a failure reports
+ * the previous item's subject.
+ */
+function itemFailurePs(idVariable) {
+    return `$failed += [PSCustomObject]@{ entryId = ${idVariable}; subject = $subject; error = $_.Exception.Message }`;
+}
+/** A list of per-item failures, as `itemFailurePs` writes them. */
 function itemFailures(value) {
     return toArray(value).map(row => {
         const e = record(row);

package/dist/windows/json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/windows/json.ts"],"names":[],"mappings":";;AAUA,0BAEC;AAGD,wBAIC;AAED,kBAEC;AAED,kBAEC;AAED,oBAEC;AAGD,0BAEC;AAGD,gCAEC;AASD,sCAEC;AAGD,oCAKC;AAnDD,iGAAiG;AACjG,SAAgB,OAAO,CAAC,KAAc;IAClC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAED,iEAAiE;AACjE,SAAgB,MAAM,CAAC,KAAc;IACjC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACvE,CAAC,CAAC,KAAgC;QAClC,CAAC,CAAC,EAAE,CAAC;AACb,CAAC;AAED,SAAgB,GAAG,CAAC,KAAc;IAC9B,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9C,CAAC;AAED,SAAgB,GAAG,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAgB,IAAI,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,IAAI,CAAC;AAC1B,CAAC;AAED,mCAAmC;AACnC,SAAgB,OAAO,CAAC,KAAc;IAClC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACnD,CAAC;AAED,0FAA0F;AAC1F,SAAgB,UAAU,CAAC,KAAc;IACrC,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,UAA8B;IACxD,OAAO,2CAA2C,UAAU,sDAAsD,CAAC;AACvH,CAAC;AAED,mEAAmE;AACnE,SAAgB,YAAY,CAAC,KAAc;IACvC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["// Coercing the JSON a PowerShell script prints into the package's types — the\n// Windows counterpart of the record framing in mac/run.ts.\n//\n// ConvertTo-Json has two habits a caller must never see: it unwraps a\n// single-element array into a bare object, and it renders an empty one as\n// nothing at all. Every list crossing that boundary goes through `toArray`, and\n// every scalar through a coercion that survives a missing property.\nimport type { ItemFailure } from '../types';\n\n/** One value as a list: an array stays, null and undefined become empty, anything else wraps. */\nexport function toArray(value: unknown): unknown[] {\n    return Array.isArray(value) ? value : value == null ? [] : [value];\n}\n\n/** A value as a plain object, for reading fields off one row. */\nexport function record(value: unknown): Record<string, unknown> {\n    return value !== null && typeof value === 'object' && !Array.isArray(value)\n        ? value as Record<string, unknown>\n        : {};\n}\n\nexport function str(value: unknown): string {\n    return value == null ? '' : String(value);\n}\n\nexport function num(value: unknown): number {\n    return typeof value === 'number' && Number.isFinite(value) ? value : 0;\n}\n\nexport function bool(value: unknown): boolean {\n    return value === true;\n}\n\n/** A list of non-empty strings. */\nexport function strList(value: unknown): string[] {\n    return toArray(value).map(str).filter(Boolean);\n}\n\n/** A base64 field decoded as UTF-8 — how scripts pass bodies that must survive intact. */\nexport function base64Text(value: unknown): string {\n    return Buffer.from(str(value), 'base64').toString('utf8');\n}\n\n/**\n * The PowerShell that appends one item's failure to `$failed`, inside the\n * `catch` of a per-item loop: the row `itemFailures` reads back, written once\n * so no script can name its fields differently. `idVariable` holds the item's\n * id. `$subject` must be reset before each item's `try`, or a failure reports\n * the previous item's subject.\n */\nexport function itemFailurePs(idVariable: '$id' | '$entryId'): string {\n    return `$failed += [PSCustomObject]@{ entryId = ${idVariable}; subject = $subject; error = $_.Exception.Message }`;\n}\n\n/** A list of per-item failures, as `itemFailurePs` writes them. */\nexport function itemFailures(value: unknown): ItemFailure[] {\n    return toArray(value).map(row => {\n        const e = record(row);\n        return { entryId: str(e.entryId), subject: str(e.subject), error: str(e.error) };\n    });\n}\n"]}

package/dist/windows/read.js

@@ -9,7 +9,7 @@ exports.openOutlookEmail = openOutlookEmail;
 // selected in the running Outlook.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const json_1 = require("../shared/json");
+const json_1 = require("./json");
 const mail_1 = require("../mail");
 const errors_1 = require("../errors");
 /**
@@ -28,6 +28,12 @@ function dateProperty(rootId) {
  * escaping in two languages intact.
  */
 const BODY_B64_PS = `[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes([string]$bodyRaw))`;
+/**
+ * The item's attachment file names as `$attachmentNames`, unnamed ones
+ * included: a name's position is its attachment's. Requires `$item`.
+ */
+const ATTACHMENT_NAMES_PS = `$attachmentNames = @()
+try { foreach ($att in $item.Attachments) { $attachmentNames += [string]$att.FileName } } catch {}`;
 /** Recent mail from the Inbox root or one folder, newest first. */
 async function readInboxEmails(request) {
     const dateProp = dateProperty(request.folder.rootId);
@@ -37,7 +43,7 @@ ${scripts_1.NAMED_STORE_PS}
 ${(0, scripts_1.mailScopeScript)(request.folder, request.folderLabel)}
 $scopePath = [string]$scope.FolderPath
 ${(0, scripts_1.cutoffScript)(request.daysBack)}
-${(0, scripts_1.itemsSinceScript)('scope', dateProp, 'filtered')}
+${(0, scripts_1.itemsSinceScript)('scope', dateProp)}
 $filtered.Sort('[${dateProp}]', $true)
 $limit = ${(0, run_1.psInt)(request.limit)}
 $previewChars = ${(0, run_1.psInt)(request.previewChars)}
@@ -57,8 +63,7 @@ for ($i = 1; $i -le $count -and $rows.Count -lt $limit; $i++) {
         try { $bodyText = [string]$item.Body } catch {}
         $preview = if ($bodyText.Length -gt $previewChars) { $bodyText.Substring(0, $previewChars) } else { $bodyText }
     }
-    $attachmentNames = @()
-    try { foreach ($att in $item.Attachments) { $attachmentNames += [string]$att.FileName } } catch {}
+${ATTACHMENT_NAMES_PS}
     $who = ''
     $whoEmail = ''
     if (${(0, run_1.psBool)(outgoing)}) {
@@ -76,7 +81,7 @@ for ($i = 1; $i -le $count -and $rows.Count -lt $limit; $i++) {
         subject         = ([string]$item.Subject).Trim()
         senderName      = $who
         senderEmail     = $whoEmail
-        receivedTime    = if ($stamp -ne $null) { $stamp.ToString('yyyy-MM-dd HH:mm') } else { '' }
+        receivedTime    = if ($stamp -ne $null) { ${(0, scripts_1.stampPs)('$stamp')} } else { '' }
         bodyPreview     = $preview
         attachmentNames = @($attachmentNames)
     }
@@ -118,11 +123,10 @@ if ($class -ne 43 -and $class -ne 46) {
 }
 $bodyRaw = ''
 try { $bodyRaw = [string]$item.Body } catch {}
-$attachmentNames = @()
-try { foreach ($att in $item.Attachments) { $attachmentNames += [string]$att.FileName } } catch {}
+${ATTACHMENT_NAMES_PS}
 ${scripts_1.SENDER_SMTP_PS}
 $received = ''
-try { $received = $item.ReceivedTime.ToString('yyyy-MM-dd HH:mm') } catch {}
+try { $received = ${(0, scripts_1.stampPs)('$item.ReceivedTime')} } catch {}
 ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{
     entryId         = [string]$item.EntryID
     subject         = ([string]$item.Subject).Trim()
@@ -226,7 +230,7 @@ $seen = @{}
 for ($fx = 0; $fx -lt $folders.Count; $fx++) {
     if (-not $inScope[$fx]) { continue }
     $folder = $folders[$fx]
-    ${(0, scripts_1.itemsSinceScript)('folder', 'ReceivedTime', 'filtered').trim()}
+    ${(0, scripts_1.itemsSinceScript)('folder', 'ReceivedTime').trim()}
     if ($subjectDasl) {
         try {
             $candidate = $filtered.Restrict($subjectQuery)
@@ -254,8 +258,7 @@ for ($fx = 0; $fx -lt $folders.Count; $fx++) {
         $received = $null
         try { $received = $item.ReceivedTime } catch {}
         if ($received -ne $null -and $received -lt $cutoff) { continue }
-        $attachmentNames = @()
-        try { foreach ($att in $item.Attachments) { $attachmentNames += [string]$att.FileName } } catch {}
+${ATTACHMENT_NAMES_PS}
         if ($requireAttachment -and $attachmentNames.Count -eq 0) { continue }
         $bodyRaw = ''
         if ($includeBody) { try { $bodyRaw = [string]$item.Body } catch {} }
@@ -266,7 +269,7 @@ ${scripts_1.SENDER_SMTP_PS}
             subject         = $subject
             senderName      = [string]$item.SenderName
             senderEmail     = $senderSmtp
-            receivedTime    = if ($received -ne $null) { $received.ToString('yyyy-MM-dd HH:mm') } else { '' }
+            receivedTime    = if ($received -ne $null) { ${(0, scripts_1.stampPs)('$received')} } else { '' }
             body            = ${BODY_B64_PS}
             attachmentNames = @($attachmentNames)
             folderPath      = $folderPath
@@ -311,15 +314,16 @@ if ($item -eq $null) {
 if ([string]$item.MessageClass -notlike 'IPM.Note*') {
     throw "${(0, errors_1.failureTag)('INVALID_REQUEST')}The item selected in Outlook is not an email."
 }
-$attachmentNames = @()
-try { foreach ($att in $item.Attachments) { $attachmentNames += [string]$att.FileName } } catch {}
+${ATTACHMENT_NAMES_PS}
 $bodyRaw = ''
 try { $bodyRaw = [string]$item.Body } catch {}
 $storeId = ''
 try { $storeId = [string]$item.Parent.Store.StoreID } catch {}
+$folderPath = ''
+try { $folderPath = [string]$item.Parent.FolderPath } catch {}
 ${scripts_1.SENDER_SMTP_PS}
 $received = ''
-try { $received = $item.ReceivedTime.ToString('yyyy-MM-dd HH:mm') } catch {}
+try { $received = ${(0, scripts_1.stampPs)('$item.ReceivedTime')} } catch {}
 ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{
     entryId         = [string]$item.EntryID
     storeId         = $storeId
@@ -329,6 +333,7 @@ ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{
     receivedTime    = $received
     body            = ${BODY_B64_PS}
     attachmentNames = @($attachmentNames)
+    folderPath      = $folderPath
 })
 `, 'quick');
     const e = (0, json_1.record)(output);
@@ -340,7 +345,9 @@ ConvertTo-Json -Compress -Depth 3 -InputObject ([PSCustomObject]@{
         senderEmail: (0, json_1.str)(e.senderEmail),
         receivedTime: (0, json_1.str)(e.receivedTime),
         body: (0, json_1.base64Text)(e.body),
-        attachmentNames: (0, json_1.strList)(e.attachmentNames),
+        // Unnamed attachments keep their place, as in every other reader here.
+        attachmentNames: (0, json_1.toArray)(e.attachmentNames).map(json_1.str),
+        folderPath: (0, json_1.str)(e.folderPath),
     };
 }
 /**