@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/mac/cleanup.js

@@ -7,61 +7,13 @@ const run_1 = require("./run");
 const scripts_1 = require("./scripts");
 const mail_1 = require("../mail");
 /**
- * Walk a folder's `container` chain to the top, as the list `chainNames`
- * (nearest first). Requires `theFolder`.
- *
- * This is what makes the Inbox/Sent Items refusal cover their SUBFOLDERS too: a
- * filed subfolder is still received mail. The chain's last element is the folder
- * directly under the account, and an account cannot hold two top-level folders
- * of one name, so comparing that name is exact rather than a guess.
+ * 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.
  */
-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 own root folder has a 'name' of missing value, and coercing
-${indent}    -- that yields the STRING "missing value" — which sailed past an empty
-${indent}    -- check and became the chain's root, so nothing was ever recognised as
-${indent}    -- living under the Inbox. 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. `delete` files each
- * item in Deleted Items, so this is recoverable — purgeDeletedItems is what
- * destroys.
- *
- * ⚠️ This is the one tool here that can reach received mail. Three things hold
- * the line, exactly as on Windows:
- *
- *  - **Inbox and Sent Items are refused by default, INCLUDING their subfolders** —
- *    a filed subfolder is still received mail. `allowProtected` lifts that, and is
- *    the caller explicitly taking responsibility.
- *  - **`dryRun` resolves and reports without deleting**, so the exact subjects and
- *    folders can be shown to the user before anything happens. Use it first.
- *  - **Every outcome echoes the subject and folderPath** of the item actually
- *    resolved, so a wrong id is visible after the fact rather than silent.
- */
-async function deleteOutlookEmails(emailAccount, entryIds, options = {}) {
-    const { allowProtected = false, dryRun = false } = options;
-    if (entryIds.length === 0) {
-        return { dryRun, deleted: 0, refused: 0, failed: 0, items: [] };
-    }
-    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(entryIds);
+async function deleteOutlookEmails(request) {
+    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(request.entryIds);
     const items = invalid.map(bad => ({
         entryId: bad.entryId,
         subject: '',
@@ -70,12 +22,15 @@ async function deleteOutlookEmails(emailAccount, entryIds, options = {}) {
         reason: bad.error,
     }));
     if (valid.length > 0) {
-        const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set inboxName to (name of (inbox of targetAcct)) as string
-    set sentName to (name of (sent items of targetAcct)) as string
+        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.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
     set out to ""
-    repeat with theId in {${valid.join(', ')}}
+    repeat with theId in ${(0, run_1.asIdList)(valid)}
         set subj to ""
         set pathText to ""
         try
@@ -92,19 +47,14 @@ ${(0, scripts_1.accountLookupSnippet)(emailAccount)}
                 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)('            ')}
             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)
-            if isProtected and not ${allowProtected} then
-                set out to out & ${(0, run_1.asRow)([
-            '(theId as string)',
-            'subj',
-            'pathText',
-            '"refused"',
-            `"${(0, run_1.asEscape)(mail_1.PROTECTED_MAIL_REASON)}"`,
-        ])}
-            else if ${dryRun} then
+            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
                 set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'pathText', '"would-delete"', '""'])}
             else
                 delete theMsg
@@ -123,75 +73,63 @@ on reverseList(lst)
         set end of out to item i of lst
     end repeat
     return out
-end reverseList`;
-        for (const record of (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 300000))) {
+end reverseList`, 'scan');
+        for (const record of (0, run_1.splitRecords)(raw)) {
             const parts = (0, run_1.splitFields)(record);
             const segments = (0, run_1.splitList)((0, run_1.field)(parts, 2));
             items.push({
                 entryId: (0, run_1.field)(parts, 0),
                 subject: (0, run_1.field)(parts, 1).trim(),
-                folderPath: segments.length
-                    ? (0, scripts_1.macFolderPath)(emailAccount, segments[0], segments.slice(1))
-                    : '',
-                status: ((0, run_1.field)(parts, 3) || 'failed'),
+                folderPath: segments.length ? (0, scripts_1.macFolderPath)(request.account, segments[0], segments.slice(1)) : '',
+                status: (0, mail_1.deleteStatus)((0, run_1.field)(parts, 3)),
                 reason: (0, run_1.field)(parts, 4),
             });
         }
     }
-    return {
-        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 folder. This is the
- * ONE genuinely irreversible operation here — nothing recovers from it — which
- * is why it is folder-scoped rather than keyed on a message id: it can only ever
- * destroy what the user already threw away.
- *
- * `olderThanDays` keeps recent items (0 = purge everything). The folder is
- * indexed first and destroyed by id afterwards, so deleting can't shift the
- * collection out from under the walk.
+ * Permanently remove items from the account's Deleted Items. The folder is
+ * indexed first and items destroyed by id afterwards, so deleting can't shift
+ * the collection out from under the walk.
  */
-async function purgeDeletedItems(emailAccount, olderThanDays = 0, dryRun = false) {
-    const days = Math.max(0, Math.floor(olderThanDays));
-    const folderPath = (0, scripts_1.macFolderPath)(emailAccount, 'Deleted Items', []);
-    const indexScript = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set trashFolder to deleted items of targetAcct
+async function purgeDeletedItems(request) {
+    const folderPath = (0, scripts_1.macFolderPath)(request.account, 'Deleted Items', []);
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const index = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'deleted items', 'trashFolder')}
     set idList to id of every message of trashFolder
     try
         set timeList to time received of every message of trashFolder
     on error
         set timeList to {}
     end try
-    set cutoff to (current date) - (${days} * days)
+    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
         set keepIt to false
-        if ${days} > 0 and stamp is not missing value and stamp is greater than cutoff then set keepIt to true
+        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)'])}
     end repeat
     return out
-end tell`;
-    const rows = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(indexScript, 300000)).map(record => {
+end tell`, 'scan');
+    const rows = (0, run_1.splitRecords)(index).map(record => {
         const parts = (0, run_1.splitFields)(record);
         return { id: (0, run_1.field)(parts, 0), keep: (0, run_1.boolField)(parts, 1) };
     });
     const doomed = rows.filter(row => !row.keep);
     const kept = rows.length - doomed.length;
-    if (dryRun || doomed.length === 0) {
-        return { folderPath, dryRun, matched: doomed.length, purged: 0, kept, failed: 0 };
+    if (request.dryRun || doomed.length === 0) {
+        return { folderPath, dryRun: request.dryRun, matched: doomed.length, purged: 0, kept, failed: 0 };
     }
-    const purgeScript = `tell application "Microsoft Outlook"
+    const summary = (0, run_1.summaryFields)(await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
     set purgedCount to 0
     set failedCount to 0
-    repeat with theId in {${doomed.map(row => row.id).join(', ')}}
+    repeat with theId in ${(0, run_1.asIdList)(doomed.map(row => row.id))}
         try
             set theMsg to missing value
             try
@@ -205,11 +143,10 @@ end tell`;
         end try
     end repeat
     return ${(0, run_1.asRow)(['(purgedCount as string)', '(failedCount as string)'])}
-end tell`;
-    const summary = (0, run_1.summaryFields)(await (0, run_1.runOsaScript)(purgeScript, 600000));
+end tell`, 'purge'));
     return {
         folderPath,
-        dryRun,
+        dryRun: request.dryRun,
         matched: doomed.length,
         purged: (0, run_1.intField)(summary, 0),
         kept,

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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"}
+{"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    folderChainSnippet,\n    macFolderPath,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport { deleteMailResult, deleteStatus, PROTECTED_MAIL_REASON } 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 * 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            -- 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 (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: 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 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"]}

package/dist/mac/drafts.d.ts

@@ -1,38 +1,19 @@
-import type { DeleteDraftsResult, ListDraftsResult, SendAllDraftsResult, SendDraftsResult } from '../types';
+import type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';
+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. */
+export declare function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult>;
 /**
- * List the mail drafts belonging to `emailAccount`, newest first.
- *
- * Bodies are previewed, never returned whole — a templated reply body runs to
- * tens of thousands of characters and a folder's worth would blow the cap.
+ * Delete the named drafts. `delete` files an item in Deleted Items, so a
+ * mistaken call stays recoverable.
  */
-export declare function listOutlookDrafts(emailAccount: string, limit?: number, previewChars?: number): Promise<ListDraftsResult>;
+export declare function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult>;
 /**
- * Send the mail drafts that belong to `emailAccount`.
- *
- * 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
- * — the same trap the Windows implementation avoids by snapshotting item refs.
+ * 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. 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(emailAccount: string): Promise<SendAllDraftsResult>;
-/**
- * Delete mail drafts by message id. `delete` files the item in Deleted Items
- * rather than destroying it, so a mistaken call stays recoverable from there —
- * matching the Windows contract.
- *
- * Every id must resolve to a message sitting in THIS account's Drafts folder
- * before anything is deleted; an id pointing at ordinary mail, or at another
- * account's draft, is refused and reported. Without that gate this would be a
- * general-purpose "delete any email by id" tool, which is not what it is for.
- */
-export declare function deleteOutlookDrafts(emailAccount: string, entryIds: string[]): Promise<DeleteDraftsResult>;
-/**
- * Send a chosen subset of `emailAccount`'s drafts by message id — e.g. after
- * `listOutlookDrafts` and a user review pass — instead of `sendAllDrafts`'s
- * account-wide sweep.
- *
- * Same ownership gate as `deleteOutlookDrafts`: every id must resolve to a
- * message sitting in THIS account's Drafts folder before anything is sent. An
- * id pointing at ordinary mail, or at another account's draft, is refused and
- * reported rather than sent.
- */
-export declare function sendDrafts(emailAccount: string, entryIds: string[]): Promise<SendDraftsResult>;
+export declare function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult>;