@dawnlit/outlook-bridge 2.0.0 → 2.2.0

package/dist/mac/cleanup.js

@@ -6,43 +6,19 @@ exports.purgeDeletedItems = purgeDeletedItems;
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
 const mail_1 = require("../mail");
-const OUTCOME_STATUSES = ['deleted', 'would-delete', 'refused', 'failed'];
-/**
- * Walk a folder's `container` chain to the top as the list `chainNames`,
- * nearest first. Requires `theFolder`.
- *
- * This is what extends the Inbox/Sent Items refusal to their SUBFOLDERS. The
- * chain's last element is the folder directly under the account, and an account
- * can't hold two top-level folders of one name, so comparing that name is exact.
- */
-function folderChainSnippet(indent) {
-    return `${indent}set chainNames to {}
-${indent}set cur to theFolder
-${indent}set guard to 0
-${indent}repeat while cur is not missing value and guard < 25
-${indent}    -- The account's root folder has a name of missing value, and coercing
-${indent}    -- that yields the STRING "missing value" — so test before coercing.
-${indent}    set rawName to missing value
-${indent}    try
-${indent}        set rawName to name of cur
-${indent}    end try
-${indent}    if rawName is missing value then exit repeat
-${indent}    set nm to rawName as string
-${indent}    if nm is "" then exit repeat
-${indent}    set end of chainNames to nm
-${indent}    set nextUp to missing value
-${indent}    try
-${indent}        set nextUp to container of cur
-${indent}    end try
-${indent}    set cur to nextUp
-${indent}    set guard to guard + 1
-${indent}end repeat`;
-}
 /**
  * Delete mail by message id from anywhere in the account, into Deleted Items.
- * Inbox and Sent Items (and their subfolders) are refused unless
- * `allowProtected`; `dryRun` reports without deleting; every outcome names the
- * subject and folder of the item that actually resolved.
+ * The same four things hold the line as on Windows:
+ *  - An id that resolves outside this account is refused, whatever
+ *    `allowProtected` says. A message id resolves against the whole
+ *    application, and the Inbox/Sent check below only knows this account's
+ *    folders by name, so another mailbox's mail would otherwise pass it.
+ *  - Inbox and Sent Items (and their subfolders) are refused unless
+ *    `allowProtected`.
+ *  - `dryRun` reports without deleting.
+ *  - Every outcome names the subject and folder of the item that actually
+ *    resolved — the folder only once the item is known to be this account's,
+ *    since the path is built from this account's address.
  */
 async function deleteOutlookEmails(request) {
     const { valid, invalid } = (0, scripts_1.partitionMessageIds)(request.entryIds);
@@ -55,21 +31,23 @@ async function deleteOutlookEmails(request) {
     }));
     if (valid.length > 0) {
         const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+        // The protected roots' names, read off this account: the roots are the
+        // ones Windows protects, from the one list both read.
+        const readProtectedNames = mail_1.PROTECTED_ROOTS
+            .map(rootId => `${(0, scripts_1.rootFolderSnippet)(acct, scripts_1.MAC_ROOT_TERMS[rootId], 'protectedFolder')}
+    set end of protectedNames to (name of protectedFolder) as string`)
+            .join('\n');
         const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
 ${(0, scripts_1.accountLookupSnippet)(acct)}
-${(0, scripts_1.rootFolderSnippet)(acct, 'inbox', 'inboxFolder')}
-${(0, scripts_1.rootFolderSnippet)(acct, 'sent items', 'sentFolder')}
-    set inboxName to (name of inboxFolder) as string
-    set sentName to (name of sentFolder) as string
+${(0, scripts_1.accountRootIdSnippet)(acct)}
+    set protectedNames to {}
+${readProtectedNames}
     set out to ""
     repeat with theId in ${(0, run_1.asIdList)(valid)}
         set subj to ""
         set pathText to ""
         try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
+${(0, scripts_1.messageByIdSnippet)('            ')}
             if theMsg is missing value then error "no item with that message id in this Outlook"
             try
                 set subj to (subject of theMsg) as string
@@ -79,10 +57,12 @@ ${(0, scripts_1.rootFolderSnippet)(acct, 'sent items', 'sentFolder')}
                 set theFolder to folder of theMsg
             end try
             if theFolder is missing value then error "item has no parent folder - refusing to delete"
-${folderChainSnippet('            ')}
+${(0, scripts_1.folderChainSnippet)('            ')}
+${(0, scripts_1.ownMailGuardSnippet)(request.account, 'delete', '            ')}
             set pathText to my sanitizeList(my reverseList(chainNames))
+            -- The chain's top is what extends the refusal to Inbox and Sent Items SUBFOLDERS.
             set rootName to item (count of chainNames) of chainNames
-            set isProtected to (rootName is inboxName) or (rootName is sentName)
+            set isProtected to (protectedNames contains rootName)
             if isProtected and not ${(0, run_1.asBool)(request.allowProtected)} then
                 set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'pathText', '"refused"', (0, run_1.asString)(mail_1.PROTECTED_MAIL_REASON)])}
             else if ${(0, run_1.asBool)(request.dryRun)} then
@@ -112,18 +92,12 @@ end reverseList`, 'scan');
                 entryId: (0, run_1.field)(parts, 0),
                 subject: (0, run_1.field)(parts, 1).trim(),
                 folderPath: segments.length ? (0, scripts_1.macFolderPath)(request.account, segments[0], segments.slice(1)) : '',
-                status: OUTCOME_STATUSES.find(s => s === (0, run_1.field)(parts, 3)) ?? 'failed',
+                status: (0, mail_1.deleteStatus)((0, run_1.field)(parts, 3)),
                 reason: (0, run_1.field)(parts, 4),
             });
         }
     }
-    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 folder is
@@ -142,12 +116,13 @@ ${(0, scripts_1.rootFolderSnippet)(acct, 'deleted items', 'trashFolder')}
     on error
         set timeList to {}
     end try
+    set hasTimes to ((count of timeList) is (count of idList))
     set olderThanDays to ${(0, run_1.asInt)(request.olderThanDays)}
     set cutoff to (current date) - (olderThanDays * days)
     set out to ""
     repeat with i from 1 to (count of idList)
         set stamp to missing value
-        if (count of timeList) is (count of idList) then set stamp to item i of timeList
+        if hasTimes then set stamp to item i of timeList
         set keepIt to false
         if olderThanDays > 0 and stamp is not missing value and stamp is greater than cutoff then set keepIt to true
         set out to out & ${(0, run_1.asRow)(['(item i of idList as string)', '(keepIt as string)'])}
@@ -168,10 +143,7 @@ end tell`, 'scan');
     set failedCount to 0
     repeat with theId in ${(0, run_1.asIdList)(doomed.map(row => row.id))}
         try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
+${(0, scripts_1.messageByIdSnippet)('            ')}
             if theMsg is missing value then error "gone"
             permanently delete theMsg
             set purgedCount to purgedCount + 1

package/dist/mac/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/mac/cleanup.ts"],"names":[],"mappings":"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","sourcesContent":["// Deleting mail, and emptying what was already deleted.\nimport {\n    asBool,\n    asIdList,\n    asInt,\n    asRow,\n    asString,\n    boolField,\n    field,\n    intField,\n    runOsaScript,\n    splitFields,\n    splitList,\n    splitRecords,\n    summaryFields\n} from './run';\nimport {\n    accountLookupSnippet,\n    macFolderPath,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet\n} from './scripts';\nimport { PROTECTED_MAIL_REASON } from '../mail';\nimport type { DeleteEmailsRequest, PurgeRequest } from '../backend';\nimport type { DeleteMailOutcome, DeleteMailResult, PurgeDeletedItemsResult } from '../types';\n\nconst OUTCOME_STATUSES: readonly DeleteMailOutcome['status'][] = ['deleted', 'would-delete', 'refused', 'failed'];\n\n/**\n * Walk a folder's `container` chain to the top as the list `chainNames`,\n * nearest first. Requires `theFolder`.\n *\n * This is what extends the Inbox/Sent Items refusal to their SUBFOLDERS. The\n * chain's last element is the folder directly under the account, and an account\n * can't hold two top-level folders of one name, so comparing that name is exact.\n */\nfunction folderChainSnippet(indent: string): string {\n    return `${indent}set chainNames to {}\n${indent}set cur to theFolder\n${indent}set guard to 0\n${indent}repeat while cur is not missing value and guard < 25\n${indent}    -- The account's root folder has a name of missing value, and coercing\n${indent}    -- that yields the STRING \"missing value\" — so test before coercing.\n${indent}    set rawName to missing value\n${indent}    try\n${indent}        set rawName to name of cur\n${indent}    end try\n${indent}    if rawName is missing value then exit repeat\n${indent}    set nm to rawName as string\n${indent}    if nm is \"\" then exit repeat\n${indent}    set end of chainNames to nm\n${indent}    set nextUp to missing value\n${indent}    try\n${indent}        set nextUp to container of cur\n${indent}    end try\n${indent}    set cur to nextUp\n${indent}    set guard to guard + 1\n${indent}end repeat`;\n}\n\n/**\n * Delete mail by message id from anywhere in the account, into Deleted Items.\n * Inbox and Sent Items (and their subfolders) are refused unless\n * `allowProtected`; `dryRun` reports without deleting; every outcome names the\n * subject and folder of the item that actually resolved.\n */\nexport async function deleteOutlookEmails(request: DeleteEmailsRequest): Promise<DeleteMailResult> {\n    const {valid, invalid} = partitionMessageIds(request.entryIds);\n    const items: DeleteMailOutcome[] = invalid.map(bad => ({\n        entryId: bad.entryId,\n        subject: '',\n        folderPath: '',\n        status: 'failed',\n        reason: bad.error,\n    }));\n    if (valid.length > 0) {\n        const acct = await resolveMacAccount(request.account);\n        const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'inbox', 'inboxFolder')}\n${rootFolderSnippet(acct, 'sent items', 'sentFolder')}\n    set inboxName to (name of inboxFolder) as string\n    set sentName to (name of sentFolder) as string\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        set pathText to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"no item with that message id in this Outlook\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n            set theFolder to missing value\n            try\n                set theFolder to folder of theMsg\n            end try\n            if theFolder is missing value then error \"item has no parent folder - refusing to delete\"\n${folderChainSnippet('            ')}\n            set pathText to my sanitizeList(my reverseList(chainNames))\n            set rootName to item (count of chainNames) of chainNames\n            set isProtected to (rootName is inboxName) or (rootName is sentName)\n            if isProtected and not ${asBool(request.allowProtected)} then\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"refused\"', asString(PROTECTED_MAIL_REASON)])}\n            else if ${asBool(request.dryRun)} then\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"would-delete\"', '\"\"'])}\n            else\n                delete theMsg\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"deleted\"', '\"\"'])}\n            end if\n        on error errText\n            set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"failed\"', 'errText'])}\n        end try\n    end repeat\n    return out\nend tell\n\non reverseList(lst)\n    set out to {}\n    repeat with i from (count of lst) to 1 by -1\n        set end of out to item i of lst\n    end repeat\n    return out\nend reverseList`, 'scan');\n\n        for (const record of splitRecords(raw)) {\n            const parts = splitFields(record);\n            const segments = splitList(field(parts, 2));\n            items.push({\n                entryId: field(parts, 0),\n                subject: field(parts, 1).trim(),\n                folderPath: segments.length ? macFolderPath(request.account, segments[0], segments.slice(1)) : '',\n                status: OUTCOME_STATUSES.find(s => s === field(parts, 3)) ?? 'failed',\n                reason: field(parts, 4),\n            });\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 folder is\n * indexed first and items destroyed by id afterwards, so deleting can't shift\n * the collection out from under the walk.\n */\nexport async function purgeDeletedItems(request: PurgeRequest): Promise<PurgeDeletedItemsResult> {\n    const folderPath = macFolderPath(request.account, 'Deleted Items', []);\n    const acct = await resolveMacAccount(request.account);\n    const index = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'deleted items', 'trashFolder')}\n    set idList to id of every message of trashFolder\n    try\n        set timeList to time received of every message of trashFolder\n    on error\n        set timeList to {}\n    end try\n    set olderThanDays to ${asInt(request.olderThanDays)}\n    set cutoff to (current date) - (olderThanDays * days)\n    set out to \"\"\n    repeat with i from 1 to (count of idList)\n        set stamp to missing value\n        if (count of timeList) is (count of idList) then set stamp to item i of timeList\n        set keepIt to false\n        if olderThanDays > 0 and stamp is not missing value and stamp is greater than cutoff then set keepIt to true\n        set out to out & ${asRow(['(item i of idList as string)', '(keepIt as string)'])}\n    end repeat\n    return out\nend tell`, 'scan');\n\n    const rows = splitRecords(index).map(record => {\n        const parts = splitFields(record);\n        return {id: field(parts, 0), keep: boolField(parts, 1)};\n    });\n    const doomed = rows.filter(row => !row.keep);\n    const kept = rows.length - doomed.length;\n    if (request.dryRun || doomed.length === 0) {\n        return {folderPath, dryRun: request.dryRun, matched: doomed.length, purged: 0, kept, failed: 0};\n    }\n\n    const summary = summaryFields(await runOsaScript(`tell application \"Microsoft Outlook\"\n    set purgedCount to 0\n    set failedCount to 0\n    repeat with theId in ${asIdList(doomed.map(row => row.id))}\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"gone\"\n            permanently delete theMsg\n            set purgedCount to purgedCount + 1\n        on error\n            set failedCount to failedCount + 1\n        end try\n    end repeat\n    return ${asRow(['(purgedCount as string)', '(failedCount as string)'])}\nend tell`, 'purge'));\n    return {\n        folderPath,\n        dryRun: request.dryRun,\n        matched: doomed.length,\n        purged: intField(summary, 0),\n        kept,\n        failed: intField(summary, 1),\n    };\n}\n"]}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/mac/cleanup.ts"],"names":[],"mappings":"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","sourcesContent":["// Deleting mail, and emptying what was already deleted.\nimport {\n    asBool,\n    asIdList,\n    asInt,\n    asRow,\n    asString,\n    boolField,\n    field,\n    intField,\n    runOsaScript,\n    splitFields,\n    splitList,\n    splitRecords,\n    summaryFields,\n} from './run';\nimport {\n    accountLookupSnippet,\n    accountRootIdSnippet,\n    folderChainSnippet,\n    MAC_ROOT_TERMS,\n    macFolderPath,\n    messageByIdSnippet,\n    ownMailGuardSnippet,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport { deleteMailResult, deleteStatus, 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 message id from anywhere in the account, into Deleted Items.\n * The same four things hold the line as on Windows:\n *  - An id that resolves outside this account is refused, whatever\n *    `allowProtected` says. A message id resolves against the whole\n *    application, and the Inbox/Sent check below only knows this account's\n *    folders by name, so another mailbox's mail would otherwise pass it.\n *  - Inbox and Sent Items (and their subfolders) are refused unless\n *    `allowProtected`.\n *  - `dryRun` reports without deleting.\n *  - Every outcome names the subject and folder of the item that actually\n *    resolved — the folder only once the item is known to be this account's,\n *    since the path is built from this account's address.\n */\nexport async function deleteOutlookEmails(request: DeleteEmailsRequest): Promise<DeleteMailResult> {\n    const { valid, invalid } = partitionMessageIds(request.entryIds);\n    const items: DeleteMailOutcome[] = invalid.map(bad => ({\n        entryId: bad.entryId,\n        subject: '',\n        folderPath: '',\n        status: 'failed',\n        reason: bad.error,\n    }));\n    if (valid.length > 0) {\n        const acct = await resolveMacAccount(request.account);\n        // The protected roots' names, read off this account: the roots are the\n        // ones Windows protects, from the one list both read.\n        const readProtectedNames = PROTECTED_ROOTS\n            .map(rootId => `${rootFolderSnippet(acct, MAC_ROOT_TERMS[rootId], 'protectedFolder')}\n    set end of protectedNames to (name of protectedFolder) as string`)\n            .join('\\n');\n        const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${accountRootIdSnippet(acct)}\n    set protectedNames to {}\n${readProtectedNames}\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        set pathText to \"\"\n        try\n${messageByIdSnippet('            ')}\n            if theMsg is missing value then error \"no item with that message id in this Outlook\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n            set theFolder to missing value\n            try\n                set theFolder to folder of theMsg\n            end try\n            if theFolder is missing value then error \"item has no parent folder - refusing to delete\"\n${folderChainSnippet('            ')}\n${ownMailGuardSnippet(request.account, 'delete', '            ')}\n            set pathText to my sanitizeList(my reverseList(chainNames))\n            -- The chain's top is what extends the refusal to Inbox and Sent Items SUBFOLDERS.\n            set rootName to item (count of chainNames) of chainNames\n            set isProtected to (protectedNames contains rootName)\n            if isProtected and not ${asBool(request.allowProtected)} then\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"refused\"', asString(PROTECTED_MAIL_REASON)])}\n            else if ${asBool(request.dryRun)} then\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"would-delete\"', '\"\"'])}\n            else\n                delete theMsg\n                set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"deleted\"', '\"\"'])}\n            end if\n        on error errText\n            set out to out & ${asRow(['(theId as string)', 'subj', 'pathText', '\"failed\"', 'errText'])}\n        end try\n    end repeat\n    return out\nend tell\n\non reverseList(lst)\n    set out to {}\n    repeat with i from (count of lst) to 1 by -1\n        set end of out to item i of lst\n    end repeat\n    return out\nend reverseList`, 'scan');\n\n        for (const record of splitRecords(raw)) {\n            const parts = splitFields(record);\n            const segments = splitList(field(parts, 2));\n            items.push({\n                entryId: field(parts, 0),\n                subject: field(parts, 1).trim(),\n                folderPath: segments.length ? macFolderPath(request.account, segments[0], segments.slice(1)) : '',\n                status: deleteStatus(field(parts, 3)),\n                reason: field(parts, 4),\n            });\n        }\n    }\n    return deleteMailResult(request.dryRun, items);\n}\n\n/**\n * Permanently remove items from the account's Deleted Items. The folder is\n * indexed first and items destroyed by id afterwards, so deleting can't shift\n * the collection out from under the walk.\n */\nexport async function purgeDeletedItems(request: PurgeRequest): Promise<PurgeDeletedItemsResult> {\n    const folderPath = macFolderPath(request.account, 'Deleted Items', []);\n    const acct = await resolveMacAccount(request.account);\n    const index = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'deleted items', 'trashFolder')}\n    set idList to id of every message of trashFolder\n    try\n        set timeList to time received of every message of trashFolder\n    on error\n        set timeList to {}\n    end try\n    set hasTimes to ((count of timeList) is (count of idList))\n    set olderThanDays to ${asInt(request.olderThanDays)}\n    set cutoff to (current date) - (olderThanDays * days)\n    set out to \"\"\n    repeat with i from 1 to (count of idList)\n        set stamp to missing value\n        if hasTimes then set stamp to item i of timeList\n        set keepIt to false\n        if olderThanDays > 0 and stamp is not missing value and stamp is greater than cutoff then set keepIt to true\n        set out to out & ${asRow(['(item i of idList as string)', '(keepIt as string)'])}\n    end repeat\n    return out\nend tell`, 'scan');\n\n    const rows = splitRecords(index).map(record => {\n        const parts = splitFields(record);\n        return { id: field(parts, 0), keep: boolField(parts, 1) };\n    });\n    const doomed = rows.filter(row => !row.keep);\n    const kept = rows.length - doomed.length;\n    if (request.dryRun || doomed.length === 0) {\n        return { folderPath, dryRun: request.dryRun, matched: doomed.length, purged: 0, kept, failed: 0 };\n    }\n\n    const summary = summaryFields(await runOsaScript(`tell application \"Microsoft Outlook\"\n    set purgedCount to 0\n    set failedCount to 0\n    repeat with theId in ${asIdList(doomed.map(row => row.id))}\n        try\n${messageByIdSnippet('            ')}\n            if theMsg is missing value then error \"gone\"\n            permanently delete theMsg\n            set purgedCount to purgedCount + 1\n        on error\n            set failedCount to failedCount + 1\n        end try\n    end repeat\n    return ${asRow(['(purgedCount as string)', '(failedCount as string)'])}\nend tell`, 'purge'));\n    return {\n        folderPath,\n        dryRun: request.dryRun,\n        matched: doomed.length,\n        purged: intField(summary, 0),\n        kept,\n        failed: intField(summary, 1),\n    };\n}\n"]}

package/dist/mac/drafts.d.ts

@@ -12,6 +12,8 @@ export declare function deleteOutlookDrafts(request: EntryIdsRequest): Promise<D
 /**
  * Send every draft belonging to the account. The ids are snapshotted before the
  * first send: sending moves an item out of Drafts, and mutating the collection
- * mid-enumeration would skip every other one.
+ * mid-enumeration would skip every other one. A draft in the folder that is set
+ * to send from another account is not this account's, so it is skipped, as on
+ * Windows, rather than sent from that account.
  */
 export declare function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult>;

package/dist/mac/drafts.js

@@ -20,13 +20,6 @@ const scripts_1 = require("./scripts");
 /** The account's drafts, newest first. Bodies are previewed, never returned whole. */
 async function listOutlookDrafts(request) {
     const acct = await (0, scripts_1.resolveMacAccount)(request.account);
-    const preview = request.previewChars > 0
-        ? `        set bodyText to ""
-        try
-            set bodyText to (plain text content of theMsg) as string
-        end try
-        if (length of bodyText) > ${(0, run_1.asInt)(request.previewChars)} then set bodyText to text 1 thru ${(0, run_1.asInt)(request.previewChars)} of bodyText`
-        : '        set bodyText to ""';
     const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
 ${(0, scripts_1.accountLookupSnippet)(acct)}
 ${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
@@ -56,7 +49,7 @@ ${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
                 end try
             end repeat
         end try
-${preview}
+${(0, scripts_1.bodyTextSnippet)('        ', request.previewChars)}
         set attCount to 0
         try
             set attCount to count of attachments of theMsg
@@ -65,7 +58,8 @@ ${preview}
         try
             set modAt to my isoDate(modification date of theMsg)
         end try
-        set out to out & ${(0, run_1.asRow)(['(id of theMsg as string)', 'subj', 'my joinList(toNames, ", ")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}
+${boundElsewhereSnippet(request.account, '        ')}
+        if not boundElsewhere then set out to out & ${(0, run_1.asRow)(['(id of theMsg as string)', 'subj', 'my joinList(toNames, ", ")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}
     end repeat
     return out
 end tell`, 'standard');
@@ -92,6 +86,19 @@ end tell`, 'standard');
         drafts: drafts.slice(0, request.limit),
     };
 }
+/**
+ * Set `boundElsewhere` to whether `theMsg`, a message in the account's Drafts
+ * folder, is set to send from some OTHER account. An unbound draft there is the
+ * account's own. Listing, sending all and the per-id guard all apply this one
+ * rule, as Windows' Test-DraftMatches is applied to all three.
+ */
+function boundElsewhereSnippet(emailAccount, indent) {
+    return `${indent}set boundTo to ""
+${indent}try
+${indent}    set boundTo to (email address of (account of theMsg)) as string
+${indent}end try
+${indent}set boundElsewhere to (boundTo is not "" and boundTo is not ${(0, run_1.asString)(emailAccount)})`;
+}
 /**
  * The AppleScript that proves `theMsg` is one of this account's drafts before
  * `verb` happens to it: it sits in the account's Drafts folder, and it is bound
@@ -103,11 +110,8 @@ function ownDraftGuard(emailAccount, verb) {
                 set inFolder to (name of (folder of theMsg)) as string
             end try
             if inFolder is not draftsName or draftIds does not contain (id of theMsg) then error "item is not in this account's Drafts folder - refusing to ${verb}"
-            set boundTo to ""
-            try
-                set boundTo to (email address of (account of theMsg)) as string
-            end try
-            if boundTo is not "" and boundTo is not ${(0, run_1.asString)(emailAccount)} then error "draft is not bound to this account - refusing to ${verb}"`;
+${boundElsewhereSnippet(emailAccount, '            ')}
+            if boundElsewhere then error "draft is not bound to this account - refusing to ${verb}"`;
 }
 /** Run `verb` over named drafts of the account, each proved to be its own first. */
 async function actOnDrafts(request, verb) {
@@ -125,10 +129,7 @@ ${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
     repeat with theId in ${(0, run_1.asIdList)(valid)}
         set subj to ""
         try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
+${(0, scripts_1.messageByIdSnippet)('            ')}
             if theMsg is missing value then error "no such item in this account's Drafts folder"
             try
                 set subj to (subject of theMsg) as string
@@ -137,22 +138,13 @@ ${ownDraftGuard(request.account, verb)}
             ${verb} theMsg
             set doneCount to doneCount + 1
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
     return ${(0, run_1.asRow)(['(doneCount as string)'])} & out
 end tell`, 'scan');
-    const records = (0, run_1.splitRecords)(raw);
-    return {
-        done: (0, run_1.intField)((0, run_1.splitFields)(records[0] ?? ''), 0),
-        failed: [
-            ...invalid,
-            ...records.slice(1).map(record => {
-                const parts = (0, run_1.splitFields)(record);
-                return { entryId: (0, run_1.field)(parts, 0), subject: (0, run_1.field)(parts, 1), error: (0, run_1.field)(parts, 2) };
-            }),
-        ],
-    };
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
+    return { done: (0, run_1.intField)(summary, 0), failed: [...invalid, ...failed] };
 }
 /** Send the named drafts. */
 async function sendDrafts(request) {
@@ -170,7 +162,9 @@ async function deleteOutlookDrafts(request) {
 /**
  * Send every draft belonging to the account. The ids are snapshotted before the
  * first send: sending moves an item out of Drafts, and mutating the collection
- * mid-enumeration would skip every other one.
+ * mid-enumeration would skip every other one. A draft in the folder that is set
+ * to send from another account is not this account's, so it is skipped, as on
+ * Windows, rather than sent from that account.
  */
 async function sendAllDrafts(request) {
     const acct = await (0, scripts_1.resolveMacAccount)(request.account);
@@ -183,29 +177,23 @@ ${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
     repeat with theId in wanted
         set subj to ""
         try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
+${(0, scripts_1.messageByIdSnippet)('            ')}
             if theMsg is missing value then error "draft is no longer in the Drafts folder"
-            try
-                set subj to (subject of theMsg) as string
-            end try
-            send theMsg
-            set sentCount to sentCount + 1
+${boundElsewhereSnippet(request.account, '            ')}
+            if not boundElsewhere then
+                try
+                    set subj to (subject of theMsg) as string
+                end try
+                send theMsg
+                set sentCount to sentCount + 1
+            end if
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
     return ${(0, run_1.asRow)(['(sentCount as string)'])} & out
 end tell`, 'scan');
-    const records = (0, run_1.splitRecords)(raw);
-    return {
-        sent: (0, run_1.intField)((0, run_1.splitFields)(records[0] ?? ''), 0),
-        failed: records.slice(1).map(record => {
-            const parts = (0, run_1.splitFields)(record);
-            return { entryId: (0, run_1.field)(parts, 0), subject: (0, run_1.field)(parts, 1), error: (0, run_1.field)(parts, 2) };
-        }),
-    };
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
+    return { sent: (0, run_1.intField)(summary, 0), failed };
 }
 //# sourceMappingURL=drafts.js.map

package/dist/mac/drafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/mac/drafts.ts"],"names":[],"mappings":"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","sourcesContent":["// Drafts: which ones belong to an account, and listing, sending or deleting them.\n//\n// Where Windows scans two Drafts folders and proves each item's sending\n// account, macOS resolves the one Drafts folder belonging to the account —\n// through the account object, or by the folder's own id for a mailbox the\n// dictionary won't name (see profile.ts) — so a draft found there belongs to\n// the account by construction.\n//\n// What the folder can't vouch for is an item's own binding, which is why the\n// guards compare against the requested address as a literal rather than asking\n// `targetAcct`: there may be no account object to ask.\nimport {\n    asIdList,\n    asInt,\n    asRow,\n    asString,\n    field,\n    intField,\n    runOsaScript,\n    splitFields,\n    splitList,\n    splitRecords\n} from './run';\nimport {\n    accountLookupSnippet,\n    macFolderPath,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet\n} from './scripts';\nimport type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';\nimport type { DeleteDraftsResult, ItemFailure, ListDraftsResult, SendDraftsResult } from '../types';\n\n/** The account's drafts, newest first. Bodies are previewed, never returned whole. */\nexport async function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const preview = request.previewChars > 0\n        ? `        set bodyText to \"\"\n        try\n            set bodyText to (plain text content of theMsg) as string\n        end try\n        if (length of bodyText) > ${asInt(request.previewChars)} then set bodyText to text 1 thru ${asInt(request.previewChars)} of bodyText`\n        : '        set bodyText to \"\"';\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set out to \"\"\n    repeat with theMsg in (messages of draftsFolder)\n        set subj to \"\"\n        try\n            set subj to (subject of theMsg) as string\n        end try\n        set toNames to {}\n        set toAddrs to {}\n        try\n            repeat with r in (every to recipient of theMsg)\n                try\n                    set ea to email address of r\n                    set oneAddr to \"\"\n                    set oneName to \"\"\n                    try\n                        set oneAddr to (address of ea) as string\n                    end try\n                    try\n                        set oneName to (name of ea) as string\n                    end try\n                    if oneName is \"\" then set oneName to oneAddr\n                    if oneName is not \"\" then set end of toNames to oneName\n                    if oneAddr is not \"\" then set end of toAddrs to oneAddr\n                end try\n            end repeat\n        end try\n${preview}\n        set attCount to 0\n        try\n            set attCount to count of attachments of theMsg\n        end try\n        set modAt to \"\"\n        try\n            set modAt to my isoDate(modification date of theMsg)\n        end try\n        set out to out & ${asRow(['(id of theMsg as string)', 'subj', 'my joinList(toNames, \", \")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}\n    end repeat\n    return out\nend tell`, 'standard');\n\n    const folderPath = macFolderPath(request.account, 'Drafts', []);\n    const drafts = splitRecords(raw).map(record => {\n        const parts = splitFields(record);\n        return {\n            entryId: field(parts, 0),\n            subject: field(parts, 1),\n            to: field(parts, 2),\n            toEmails: splitList(field(parts, 3)),\n            bodyPreview: field(parts, 4).replace(/\\s+/g, ' ').trim(),\n            hasAttachments: intField(parts, 5) > 0,\n            lastModified: field(parts, 6),\n            folderPath,\n        };\n    });\n    drafts.sort((a, b) => b.lastModified.localeCompare(a.lastModified));\n    return {\n        account: request.account,\n        foldersScanned: [folderPath],\n        count: drafts.length,\n        truncated: drafts.length > request.limit,\n        drafts: drafts.slice(0, request.limit),\n    };\n}\n\n/**\n * The AppleScript that proves `theMsg` is one of this account's drafts before\n * `verb` happens to it: it sits in the account's Drafts folder, and it is bound\n * to this account or to none.\n */\nfunction ownDraftGuard(emailAccount: string, verb: 'send' | 'delete'): string {\n    return `            set inFolder to \"\"\n            try\n                set inFolder to (name of (folder of theMsg)) as string\n            end try\n            if inFolder is not draftsName or draftIds does not contain (id of theMsg) then error \"item is not in this account's Drafts folder - refusing to ${verb}\"\n            set boundTo to \"\"\n            try\n                set boundTo to (email address of (account of theMsg)) as string\n            end try\n            if boundTo is not \"\" and boundTo is not ${asString(emailAccount)} then error \"draft is not bound to this account - refusing to ${verb}\"`;\n}\n\n/** Run `verb` over named drafts of the account, each proved to be its own first. */\nasync function actOnDrafts(request: EntryIdsRequest, verb: 'send' | 'delete'): Promise<{\n    done: number;\n    failed: ItemFailure[]\n}> {\n    const {valid, invalid} = partitionMessageIds(request.entryIds);\n    if (valid.length === 0) return {done: 0, failed: invalid};\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set draftsName to (name of draftsFolder) as string\n    set draftIds to id of every message of draftsFolder\n    set doneCount to 0\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"no such item in this account's Drafts folder\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n${ownDraftGuard(request.account, verb)}\n            ${verb} theMsg\n            set doneCount to doneCount + 1\n        on error errText\n            set out to out & ${asRow(['(theId as string)', 'subj', 'errText'])}\n        end try\n    end repeat\n    return ${asRow(['(doneCount as string)'])} & out\nend tell`, 'scan');\n    const records = splitRecords(raw);\n    return {\n        done: intField(splitFields(records[0] ?? ''), 0),\n        failed: [\n            ...invalid,\n            ...records.slice(1).map(record => {\n                const parts = splitFields(record);\n                return {entryId: field(parts, 0), subject: field(parts, 1), error: field(parts, 2)};\n            }),\n        ],\n    };\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 * Delete the named drafts. `delete` files an item in Deleted Items, so a\n * mistaken call stays recoverable.\n */\nexport async function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult> {\n    const {done, failed} = await actOnDrafts(request, 'delete');\n    return {deleted: done, failed};\n}\n\n/**\n * Send every draft belonging to the account. The ids are snapshotted before the\n * first send: sending moves an item out of Drafts, and mutating the collection\n * mid-enumeration would skip every other one.\n */\nexport async function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set wanted to id of every message of draftsFolder\n    set sentCount to 0\n    set out to \"\"\n    repeat with theId in wanted\n        set subj to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"draft is no longer in the Drafts folder\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n            send theMsg\n            set sentCount to sentCount + 1\n        on error errText\n            set out to out & ${asRow(['(theId as string)', 'subj', 'errText'])}\n        end try\n    end repeat\n    return ${asRow(['(sentCount as string)'])} & out\nend tell`, 'scan');\n    const records = splitRecords(raw);\n    return {\n        sent: intField(splitFields(records[0] ?? ''), 0),\n        failed: records.slice(1).map(record => {\n            const parts = splitFields(record);\n            return {entryId: field(parts, 0), subject: field(parts, 1), error: field(parts, 2)};\n        }),\n    };\n}\n"]}
+{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/mac/drafts.ts"],"names":[],"mappings":"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","sourcesContent":["// Drafts: which ones belong to an account, and listing, sending or deleting them.\n//\n// Where Windows scans two Drafts folders and proves each item's sending\n// account, macOS resolves the one Drafts folder belonging to the account —\n// through the account object, or by the folder's own id for a mailbox the\n// dictionary won't name (see profile.ts) — so a draft found there belongs to\n// the account by construction.\n//\n// What the folder can't vouch for is an item's own binding, which is why the\n// guards compare against the requested address as a literal rather than asking\n// `targetAcct`: there may be no account object to ask.\nimport {\n    asIdList,\n    asRow,\n    asString,\n    field,\n    intField,\n    ITEM_FAILURE_ROW,\n    runOsaScript,\n    splitBatch,\n    splitFields,\n    splitList,\n    splitRecords,\n} from './run';\nimport {\n    accountLookupSnippet,\n    bodyTextSnippet,\n    macFolderPath,\n    messageByIdSnippet,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';\nimport type { DeleteDraftsResult, ItemFailure, ListDraftsResult, SendDraftsResult } from '../types';\n\n/** The account's drafts, newest first. Bodies are previewed, never returned whole. */\nexport async function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set out to \"\"\n    repeat with theMsg in (messages of draftsFolder)\n        set subj to \"\"\n        try\n            set subj to (subject of theMsg) as string\n        end try\n        set toNames to {}\n        set toAddrs to {}\n        try\n            repeat with r in (every to recipient of theMsg)\n                try\n                    set ea to email address of r\n                    set oneAddr to \"\"\n                    set oneName to \"\"\n                    try\n                        set oneAddr to (address of ea) as string\n                    end try\n                    try\n                        set oneName to (name of ea) as string\n                    end try\n                    if oneName is \"\" then set oneName to oneAddr\n                    if oneName is not \"\" then set end of toNames to oneName\n                    if oneAddr is not \"\" then set end of toAddrs to oneAddr\n                end try\n            end repeat\n        end try\n${bodyTextSnippet('        ', request.previewChars)}\n        set attCount to 0\n        try\n            set attCount to count of attachments of theMsg\n        end try\n        set modAt to \"\"\n        try\n            set modAt to my isoDate(modification date of theMsg)\n        end try\n${boundElsewhereSnippet(request.account, '        ')}\n        if not boundElsewhere then set out to out & ${asRow(['(id of theMsg as string)', 'subj', 'my joinList(toNames, \", \")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}\n    end repeat\n    return out\nend tell`, 'standard');\n\n    const folderPath = macFolderPath(request.account, 'Drafts', []);\n    const drafts = splitRecords(raw).map(record => {\n        const parts = splitFields(record);\n        return {\n            entryId: field(parts, 0),\n            subject: field(parts, 1),\n            to: field(parts, 2),\n            toEmails: splitList(field(parts, 3)),\n            bodyPreview: field(parts, 4).replace(/\\s+/g, ' ').trim(),\n            hasAttachments: intField(parts, 5) > 0,\n            lastModified: field(parts, 6),\n            folderPath,\n        };\n    });\n    drafts.sort((a, b) => b.lastModified.localeCompare(a.lastModified));\n    return {\n        account: request.account,\n        foldersScanned: [folderPath],\n        count: drafts.length,\n        truncated: drafts.length > request.limit,\n        drafts: drafts.slice(0, request.limit),\n    };\n}\n\n/**\n * Set `boundElsewhere` to whether `theMsg`, a message in the account's Drafts\n * folder, is set to send from some OTHER account. An unbound draft there is the\n * account's own. Listing, sending all and the per-id guard all apply this one\n * rule, as Windows' Test-DraftMatches is applied to all three.\n */\nfunction boundElsewhereSnippet(emailAccount: string, indent: string): string {\n    return `${indent}set boundTo to \"\"\n${indent}try\n${indent}    set boundTo to (email address of (account of theMsg)) as string\n${indent}end try\n${indent}set boundElsewhere to (boundTo is not \"\" and boundTo is not ${asString(emailAccount)})`;\n}\n\n/**\n * The AppleScript that proves `theMsg` is one of this account's drafts before\n * `verb` happens to it: it sits in the account's Drafts folder, and it is bound\n * to this account or to none.\n */\nfunction ownDraftGuard(emailAccount: string, verb: 'send' | 'delete'): string {\n    return `            set inFolder to \"\"\n            try\n                set inFolder to (name of (folder of theMsg)) as string\n            end try\n            if inFolder is not draftsName or draftIds does not contain (id of theMsg) then error \"item is not in this account's Drafts folder - refusing to ${verb}\"\n${boundElsewhereSnippet(emailAccount, '            ')}\n            if boundElsewhere then error \"draft is not bound to this account - refusing to ${verb}\"`;\n}\n\n/** Run `verb` over 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 { valid, invalid } = partitionMessageIds(request.entryIds);\n    if (valid.length === 0) return { done: 0, failed: invalid };\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set draftsName to (name of draftsFolder) as string\n    set draftIds to id of every message of draftsFolder\n    set doneCount to 0\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        try\n${messageByIdSnippet('            ')}\n            if theMsg is missing value then error \"no such item in this account's Drafts folder\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n${ownDraftGuard(request.account, verb)}\n            ${verb} theMsg\n            set doneCount to doneCount + 1\n        on error errText\n            set out to out & ${ITEM_FAILURE_ROW}\n        end try\n    end repeat\n    return ${asRow(['(doneCount as string)'])} & out\nend tell`, 'scan');\n    const { summary, failed } = splitBatch(raw);\n    return { done: intField(summary, 0), failed: [...invalid, ...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 * Delete the named drafts. `delete` files an item in Deleted Items, so a\n * mistaken call stays recoverable.\n */\nexport async function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult> {\n    const { done, failed } = await actOnDrafts(request, 'delete');\n    return { deleted: done, failed };\n}\n\n/**\n * Send every draft belonging to the account. The ids are snapshotted before the\n * first send: sending moves an item out of Drafts, and mutating the collection\n * mid-enumeration would skip every other one. A draft in the folder that is set\n * to send from another account is not this account's, so it is skipped, as on\n * Windows, rather than sent from that account.\n */\nexport async function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set wanted to id of every message of draftsFolder\n    set sentCount to 0\n    set out to \"\"\n    repeat with theId in wanted\n        set subj to \"\"\n        try\n${messageByIdSnippet('            ')}\n            if theMsg is missing value then error \"draft is no longer in the Drafts folder\"\n${boundElsewhereSnippet(request.account, '            ')}\n            if not boundElsewhere then\n                try\n                    set subj to (subject of theMsg) as string\n                end try\n                send theMsg\n                set sentCount to sentCount + 1\n            end if\n        on error errText\n            set out to out & ${ITEM_FAILURE_ROW}\n        end try\n    end repeat\n    return ${asRow(['(sentCount as string)'])} & out\nend tell`, 'scan');\n    const { summary, failed } = splitBatch(raw);\n    return { sent: intField(summary, 0), failed };\n}\n"]}

package/dist/mac/folders.d.ts

@@ -10,8 +10,15 @@ export declare function listInboxFolders(request: ListFoldersRequest): Promise<I
  * File emails into a folder of the account. Moving rewrites each message's id.
  *
  * Outlook for Mac's `move` reports success even where it silently does nothing,
- * so the destination's count is compared before and after: a run where every
- * move "succeeded" yet the folder never grew fails rather than reporting mail
- * that was never filed.
+ * so each move is confirmed by the destination growing, and one that didn't
+ * fails as its own item. A count compared once around the whole batch would let
+ * one real move cover for silent failures, and give no per-item results when it
+ * tripped. A message already in the destination counts as moved without being
+ * moved, as Windows' Move() to its own folder does.
+ *
+ * Only the account's own mail is moved. A message id resolves against the whole
+ * application, so each one is first shown to sit in this account — as Windows
+ * resolves every id in the account's store — and one that doesn't fails as its
+ * own item rather than being filed out of another mailbox.
  */
 export declare function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult>;

package/dist/mac/folders.js

@@ -56,9 +56,16 @@ return my walkFolders(inb, 1, ${(0, run_1.asInt)(request.maxDepth)}, "")`, 'stan
  * File emails into a folder of the account. Moving rewrites each message's id.
  *
  * Outlook for Mac's `move` reports success even where it silently does nothing,
- * so the destination's count is compared before and after: a run where every
- * move "succeeded" yet the folder never grew fails rather than reporting mail
- * that was never filed.
+ * so each move is confirmed by the destination growing, and one that didn't
+ * fails as its own item. A count compared once around the whole batch would let
+ * one real move cover for silent failures, and give no per-item results when it
+ * tripped. A message already in the destination counts as moved without being
+ * moved, as Windows' Move() to its own folder does.
+ *
+ * Only the account's own mail is moved. A message id resolves against the whole
+ * application, so each one is first shown to sit in this account — as Windows
+ * resolves every id in the account's store — and one that doesn't fails as its
+ * own item rather than being filed out of another mailbox.
  */
 async function moveOutlookEmails(request) {
     const folderPath = (0, scripts_1.macFolderPath)(request.account, request.folder.rootLabel, request.folder.segments);
@@ -68,46 +75,47 @@ async function moveOutlookEmails(request) {
     const acct = await (0, scripts_1.resolveMacAccount)(request.account);
     const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
 ${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.accountRootIdSnippet)(acct)}
 ${(0, scripts_1.mailScopeSnippet)(acct, request.folder, request.folderLabel, request.createIfMissing)}
-    set countBefore to count of messages of scopeFolder
+    set scopeId to id of scopeFolder
     set movedCount to 0
     set out to ""
     repeat with theId in ${(0, run_1.asIdList)(valid)}
         set subj to ""
         try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
+${(0, scripts_1.messageByIdSnippet)('            ')}
             if theMsg is missing value then error "no message with that id in this Outlook"
             try
                 set subj to (subject of theMsg) as string
             end try
-            move theMsg to scopeFolder
+            set theFolder to missing value
+            try
+                set theFolder to folder of theMsg
+            end try
+${(0, scripts_1.folderChainSnippet)('            ')}
+${(0, scripts_1.ownMailGuardSnippet)(request.account, 'move', '            ')}
+            set fromId to missing value
+            try
+                set fromId to id of theFolder
+            end try
+            if fromId is not scopeId then
+                set countBefore to count of messages of scopeFolder
+                move theMsg to scopeFolder
+                if (count of messages of scopeFolder) is not greater than countBefore then error "Outlook reported the move but '" & (name of scopeFolder) & "' did not grow - not filed"
+            end if
             set movedCount to movedCount + 1
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
-    set countAfter to count of messages of scopeFolder
-    if movedCount > 0 and countAfter is not greater than countBefore then
-        error "Outlook reported " & (movedCount as string) & " move(s) but '" & (name of scopeFolder) & "' did not grow - nothing was filed."
-    end if
     return ${(0, run_1.asRow)(['(movedCount as string)', '(scopeCreated as string)'])} & out
 end tell`, 'scan');
-    const records = (0, run_1.splitRecords)(raw);
-    const summary = (0, run_1.splitFields)(records[0] ?? '');
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
     return {
         folderPath,
         folderCreated: (0, run_1.boolField)(summary, 1),
         moved: (0, run_1.intField)(summary, 0),
-        failed: [
-            ...invalid,
-            ...records.slice(1).map(record => {
-                const parts = (0, run_1.splitFields)(record);
-                return { entryId: (0, run_1.field)(parts, 0), subject: (0, run_1.field)(parts, 1), error: (0, run_1.field)(parts, 2) };
-            }),
-        ],
+        failed: [...invalid, ...failed],
     };
 }
 //# sourceMappingURL=folders.js.map

package/dist/mac/folders.js.map

@@ -1 +1 @@
-{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/mac/folders.ts"],"names":[],"mappings":"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","sourcesContent":["// Listing the folders under an Inbox, and filing mail into one.\nimport {\n    AS_LIST_SEP,\n    asIdList,\n    asInt,\n    asRow,\n    boolField,\n    field,\n    intField,\n    runOsaScript,\n    splitFields,\n    splitList,\n    splitRecords\n} from './run';\nimport {\n    accountLookupSnippet,\n    macFolderPath,\n    mailScopeSnippet,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport type { ListFoldersRequest, MoveRequest } from '../backend';\nimport type { InboxFolderInfo, MoveEmailsResult } from '../types';\n\n/**\n * The folders under an account's Inbox with their message counts. Path segments\n * travel joined by the LIST separator and are assembled into a folder path in\n * TypeScript, rather than pushed through two layers of backslash escaping.\n */\nexport async function listInboxFolders(request: ListFoldersRequest): Promise<InboxFolderInfo[]> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`on walkFolders(theFolder, level, maxLevel, prefix)\n    set out to \"\"\n    tell application \"Microsoft Outlook\"\n        set subs to mail folders of theFolder\n    end tell\n    repeat with f in subs\n        set nm to \"\"\n        set cnt to 0\n        tell application \"Microsoft Outlook\"\n            try\n                set nm to (name of f) as string\n            end try\n            try\n                set cnt to (count of messages of f)\n            end try\n        end tell\n        set thisPath to prefix & nm\n        set out to out & ${asRow(['nm', 'thisPath', '(cnt as string)', '(level as string)'])}\n        if level < maxLevel then\n            set out to out & (my walkFolders(f, level + 1, maxLevel, thisPath & ${AS_LIST_SEP}))\n        end if\n    end repeat\n    return out\nend walkFolders\n\ntell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'inbox', 'inb')}\nend tell\nreturn my walkFolders(inb, 1, ${asInt(request.maxDepth)}, \"\")`, 'standard');\n    return splitRecords(raw).map(record => {\n        const parts = splitFields(record);\n        return {\n            name: field(parts, 0),\n            folderPath: macFolderPath(request.account, 'Inbox', splitList(field(parts, 1))),\n            itemCount: intField(parts, 2),\n            depth: intField(parts, 3, 1),\n        };\n    });\n}\n\n/**\n * File emails into a folder of the account. Moving rewrites each message's id.\n *\n * Outlook for Mac's `move` reports success even where it silently does nothing,\n * so the destination's count is compared before and after: a run where every\n * move \"succeeded\" yet the folder never grew fails rather than reporting mail\n * that was never filed.\n */\nexport async function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult> {\n    const folderPath = macFolderPath(request.account, request.folder.rootLabel, request.folder.segments);\n    const {valid, invalid} = partitionMessageIds(request.entryIds);\n    if (valid.length === 0) return {folderPath, folderCreated: false, moved: 0, failed: invalid};\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${mailScopeSnippet(acct, request.folder, request.folderLabel, request.createIfMissing)}\n    set countBefore to count of messages of scopeFolder\n    set movedCount to 0\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"no message with that id in this Outlook\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n            move theMsg to scopeFolder\n            set movedCount to movedCount + 1\n        on error errText\n            set out to out & ${asRow(['(theId as string)', 'subj', 'errText'])}\n        end try\n    end repeat\n    set countAfter to count of messages of scopeFolder\n    if movedCount > 0 and countAfter is not greater than countBefore then\n        error \"Outlook reported \" & (movedCount as string) & \" move(s) but '\" & (name of scopeFolder) & \"' did not grow - nothing was filed.\"\n    end if\n    return ${asRow(['(movedCount as string)', '(scopeCreated as string)'])} & out\nend tell`, 'scan');\n    const records = splitRecords(raw);\n    const summary = splitFields(records[0] ?? '');\n    return {\n        folderPath,\n        folderCreated: boolField(summary, 1),\n        moved: intField(summary, 0),\n        failed: [\n            ...invalid,\n            ...records.slice(1).map(record => {\n                const parts = splitFields(record);\n                return {entryId: field(parts, 0), subject: field(parts, 1), error: field(parts, 2)};\n            }),\n        ],\n    };\n}\n"]}
+{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/mac/folders.ts"],"names":[],"mappings":"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","sourcesContent":["// Listing the folders under an Inbox, and filing mail into one.\nimport {\n    AS_LIST_SEP,\n    asIdList,\n    asInt,\n    asRow,\n    boolField,\n    field,\n    intField,\n    ITEM_FAILURE_ROW,\n    runOsaScript,\n    splitBatch,\n    splitFields,\n    splitList,\n    splitRecords,\n} from './run';\nimport {\n    accountLookupSnippet,\n    accountRootIdSnippet,\n    folderChainSnippet,\n    macFolderPath,\n    mailScopeSnippet,\n    messageByIdSnippet,\n    ownMailGuardSnippet,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport type { ListFoldersRequest, MoveRequest } from '../backend';\nimport type { InboxFolderInfo, MoveEmailsResult } from '../types';\n\n/**\n * The folders under an account's Inbox with their message counts. Path segments\n * travel joined by the LIST separator and are assembled into a folder path in\n * TypeScript, rather than pushed through two layers of backslash escaping.\n */\nexport async function listInboxFolders(request: ListFoldersRequest): Promise<InboxFolderInfo[]> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`on walkFolders(theFolder, level, maxLevel, prefix)\n    set out to \"\"\n    tell application \"Microsoft Outlook\"\n        set subs to mail folders of theFolder\n    end tell\n    repeat with f in subs\n        set nm to \"\"\n        set cnt to 0\n        tell application \"Microsoft Outlook\"\n            try\n                set nm to (name of f) as string\n            end try\n            try\n                set cnt to (count of messages of f)\n            end try\n        end tell\n        set thisPath to prefix & nm\n        set out to out & ${asRow(['nm', 'thisPath', '(cnt as string)', '(level as string)'])}\n        if level < maxLevel then\n            set out to out & (my walkFolders(f, level + 1, maxLevel, thisPath & ${AS_LIST_SEP}))\n        end if\n    end repeat\n    return out\nend walkFolders\n\ntell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'inbox', 'inb')}\nend tell\nreturn my walkFolders(inb, 1, ${asInt(request.maxDepth)}, \"\")`, 'standard');\n    return splitRecords(raw).map(record => {\n        const parts = splitFields(record);\n        return {\n            name: field(parts, 0),\n            folderPath: macFolderPath(request.account, 'Inbox', splitList(field(parts, 1))),\n            itemCount: intField(parts, 2),\n            depth: intField(parts, 3, 1),\n        };\n    });\n}\n\n/**\n * File emails into a folder of the account. Moving rewrites each message's id.\n *\n * Outlook for Mac's `move` reports success even where it silently does nothing,\n * so each move is confirmed by the destination growing, and one that didn't\n * fails as its own item. A count compared once around the whole batch would let\n * one real move cover for silent failures, and give no per-item results when it\n * tripped. A message already in the destination counts as moved without being\n * moved, as Windows' Move() to its own folder does.\n *\n * Only the account's own mail is moved. A message id resolves against the whole\n * application, so each one is first shown to sit in this account — as Windows\n * resolves every id in the account's store — and one that doesn't fails as its\n * own item rather than being filed out of another mailbox.\n */\nexport async function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult> {\n    const folderPath = macFolderPath(request.account, request.folder.rootLabel, request.folder.segments);\n    const { valid, invalid } = partitionMessageIds(request.entryIds);\n    if (valid.length === 0) return { folderPath, folderCreated: false, moved: 0, failed: invalid };\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${accountRootIdSnippet(acct)}\n${mailScopeSnippet(acct, request.folder, request.folderLabel, request.createIfMissing)}\n    set scopeId to id of scopeFolder\n    set movedCount to 0\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        try\n${messageByIdSnippet('            ')}\n            if theMsg is missing value then error \"no message with that id in this Outlook\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n            set theFolder to missing value\n            try\n                set theFolder to folder of theMsg\n            end try\n${folderChainSnippet('            ')}\n${ownMailGuardSnippet(request.account, 'move', '            ')}\n            set fromId to missing value\n            try\n                set fromId to id of theFolder\n            end try\n            if fromId is not scopeId then\n                set countBefore to count of messages of scopeFolder\n                move theMsg to scopeFolder\n                if (count of messages of scopeFolder) is not greater than countBefore then error \"Outlook reported the move but '\" & (name of scopeFolder) & \"' did not grow - not filed\"\n            end if\n            set movedCount to movedCount + 1\n        on error errText\n            set out to out & ${ITEM_FAILURE_ROW}\n        end try\n    end repeat\n    return ${asRow(['(movedCount as string)', '(scopeCreated as string)'])} & out\nend tell`, 'scan');\n    const { summary, failed } = splitBatch(raw);\n    return {\n        folderPath,\n        folderCreated: boolField(summary, 1),\n        moved: intField(summary, 0),\n        failed: [...invalid, ...failed],\n    };\n}\n"]}

package/dist/mac/profile.d.ts

@@ -4,6 +4,18 @@ export interface ProfileAccount {
     /** AppleScript folder id per root term — the keys of `ROOT_SPECIAL_TYPES`. */
     folderIds: Record<string, number>;
 }
+/**
+ * Why Outlook's profile can't be read, when macOS privacy control is the
+ * reason: the sentence to act on, naming the app to grant access to. null when
+ * the profile can be read, or simply isn't there — New Outlook, or no Outlook
+ * profile on this Mac.
+ *
+ * Everything else in this module stays silent on purpose, which is right for an
+ * enrichment pass and wrong when the pass was the only way to see a mailbox:
+ * the caller then hears "no accounts" or "not found" about a mailbox in plain
+ * sight in Outlook. The callers that would say that ask here first.
+ */
+export declare function profileRefusal(): Promise<string | null>;
 /**
  * Every mail account the profile knows, whether or not AppleScript can see it.
  *