@astrosheep/keiyaku 4.1.0 → 4.1.2

package/build/src/cli/commands/task-invoke.js

@@ -1,4 +1,5 @@
-import { Tasks, observeTaskDetails, } from "../../task/index.js";
+import { Tasks, } from "../../task/index.js";
+import { observeTaskDetails } from "../../task/operations.js";
 import { injectedBodyRequests, requestBodyTask } from "../../akuma/requests.js";
 import { decodeTaskMutationRequest } from "../../task/mutation.js";
 import { resolveTaskNamespaceContext, writeTaskNamespaceContext } from "../../task/context.js";
@@ -27,16 +28,25 @@ function values(command, name) {
     const item = command.flags[name];
     return Array.isArray(item) ? item : undefined;
 }
-function namespace(raw) { return raw === undefined ? undefined : raw === "/" ? [] : raw.split("/"); }
+function namespace(raw) {
+    return raw === undefined ? undefined : raw === "/" ? [] : raw.split("/");
+}
 function priority(raw) {
     if (raw === undefined)
         return undefined;
     const number = Number(raw);
     return number;
 }
-function state(raw) { return raw; }
-function ids(items) { return items; }
-function limit(command) { const raw = value(command, "limit"); return raw === undefined ? undefined : Number(raw); }
+function state(raw) {
+    return raw;
+}
+function ids(items) {
+    return items;
+}
+function limit(command) {
+    const raw = value(command, "limit");
+    return raw === undefined ? undefined : Number(raw);
+}
 async function invokeAdd(tasks, command, input, current) {
     const selectedNamespace = namespace(value(command, "namespace")) ?? current;
     const actor = input.actor;
@@ -51,10 +61,16 @@ async function invokeAdd(tasks, command, input, current) {
     const needs = ids(values(command, "needs")), parent = value(command, "parent");
     const supersedes = ids(values(command, "supersedes")), relates = ids(values(command, "relates"));
     return tasks.add({
-        title: command.positionals[0], ...(selectedNamespace === undefined ? {} : { namespace: selectedNamespace }),
-        ...(body === undefined ? {} : { body }), ...(note === undefined ? {} : { note }), ...(initialState === undefined ? {} : { state: initialState }), ...(selectedPriority === undefined ? {} : { priority: selectedPriority }),
-        ...(needs === undefined ? {} : { needs }), ...(parent === undefined ? {} : { parent: parent }),
-        ...(supersedes === undefined ? {} : { supersedes }), ...(relates === undefined ? {} : { relates }),
+        title: command.positionals[0],
+        ...(selectedNamespace === undefined ? {} : { namespace: selectedNamespace }),
+        ...(body === undefined ? {} : { body }),
+        ...(note === undefined ? {} : { note }),
+        ...(initialState === undefined ? {} : { state: initialState }),
+        ...(selectedPriority === undefined ? {} : { priority: selectedPriority }),
+        ...(needs === undefined ? {} : { needs }),
+        ...(parent === undefined ? {} : { parent: parent }),
+        ...(supersedes === undefined ? {} : { supersedes }),
+        ...(relates === undefined ? {} : { relates }),
         ...(actor === undefined ? {} : { actor }),
     });
 }
@@ -67,32 +83,53 @@ async function invokeUpdate(tasks, command, readStdin) {
     const dropSupersedes = ids(values(command, "drop-supersedes")), addRelates = ids(values(command, "relates"));
     const dropRelates = ids(values(command, "drop-relates"));
     return tasks.task({ id: command.positionals[0] }).update({
-        ...(title === undefined ? {} : { title }), ...(body === undefined ? {} : { body }), ...(appendBody === undefined ? {} : { appendBody }), ...(note === undefined ? {} : { note }),
-        ...(selectedPriority === undefined ? {} : { priority: selectedPriority }), ...(addNeeds === undefined ? {} : { addNeeds }),
-        ...(dropNeeds === undefined ? {} : { dropNeeds }), ...(command.flags["no-parent"] === true ? { parent: null } : parent === undefined ? {} : { parent: parent }),
-        ...(addSupersedes === undefined ? {} : { addSupersedes }), ...(dropSupersedes === undefined ? {} : { dropSupersedes }),
-        ...(addRelates === undefined ? {} : { addRelates }), ...(dropRelates === undefined ? {} : { dropRelates }),
+        ...(title === undefined ? {} : { title }),
+        ...(body === undefined ? {} : { body }),
+        ...(appendBody === undefined ? {} : { appendBody }),
+        ...(note === undefined ? {} : { note }),
+        ...(selectedPriority === undefined ? {} : { priority: selectedPriority }),
+        ...(addNeeds === undefined ? {} : { addNeeds }),
+        ...(dropNeeds === undefined ? {} : { dropNeeds }),
+        ...(command.flags["no-parent"] === true
+            ? { parent: null }
+            : parent === undefined
+                ? {}
+                : { parent: parent }),
+        ...(addSupersedes === undefined ? {} : { addSupersedes }),
+        ...(dropSupersedes === undefined ? {} : { dropSupersedes }),
+        ...(addRelates === undefined ? {} : { addRelates }),
+        ...(dropRelates === undefined ? {} : { dropRelates }),
     });
 }
 async function addMutationRequest(command, input, current) {
     const selectedNamespace = namespace(value(command, "namespace")) ?? current;
     if (command.stdin === "document")
-        return { action: "task.addDocument", input: {
+        return {
+            action: "task.addDocument",
+            input: {
                 markdown: await input.readStdin(),
                 namespace: selectedNamespace,
-            } };
+            },
+        };
     const body = value(command, "body"), note = value(command, "note");
     const initialState = state(value(command, "state")), selectedPriority = priority(value(command, "priority"));
     const needs = ids(values(command, "needs")), parent = value(command, "parent");
     const supersedes = ids(values(command, "supersedes")), relates = ids(values(command, "relates"));
-    return { action: "task.add", input: {
-            title: command.positionals[0], namespace: selectedNamespace,
-            ...(body === undefined ? {} : { body }), ...(note === undefined ? {} : { note }),
+    return {
+        action: "task.add",
+        input: {
+            title: command.positionals[0],
+            namespace: selectedNamespace,
+            ...(body === undefined ? {} : { body }),
+            ...(note === undefined ? {} : { note }),
             ...(initialState === undefined ? {} : { state: initialState }),
             ...(selectedPriority === undefined ? {} : { priority: selectedPriority }),
-            ...(needs === undefined ? {} : { needs }), ...(parent === undefined ? {} : { parent: parent }),
-            ...(supersedes === undefined ? {} : { supersedes }), ...(relates === undefined ? {} : { relates }),
-        } };
+            ...(needs === undefined ? {} : { needs }),
+            ...(parent === undefined ? {} : { parent: parent }),
+            ...(supersedes === undefined ? {} : { supersedes }),
+            ...(relates === undefined ? {} : { relates }),
+        },
+    };
 }
 async function updateMutationRequest(command, input) {
     const body = command.stdin === "body" ? await input.readStdin() : value(command, "body");
@@ -103,28 +140,54 @@ async function updateMutationRequest(command, input) {
     const parent = value(command, "parent"), addSupersedes = ids(values(command, "supersedes"));
     const dropSupersedes = ids(values(command, "drop-supersedes")), addRelates = ids(values(command, "relates"));
     const dropRelates = ids(values(command, "drop-relates"));
-    return { action: "task.update", id: command.positionals[0], input: {
-            ...(title === undefined ? {} : { title }), ...(body === undefined ? {} : { body }),
-            ...(appendBody === undefined ? {} : { appendBody }), ...(note === undefined ? {} : { note }),
+    return {
+        action: "task.update",
+        id: command.positionals[0],
+        input: {
+            ...(title === undefined ? {} : { title }),
+            ...(body === undefined ? {} : { body }),
+            ...(appendBody === undefined ? {} : { appendBody }),
+            ...(note === undefined ? {} : { note }),
             ...(selectedPriority === undefined ? {} : { priority: selectedPriority }),
-            ...(addNeeds === undefined ? {} : { addNeeds }), ...(dropNeeds === undefined ? {} : { dropNeeds }),
-            ...(command.flags["no-parent"] === true ? { parent: null }
-                : parent === undefined ? {} : { parent: parent }),
+            ...(addNeeds === undefined ? {} : { addNeeds }),
+            ...(dropNeeds === undefined ? {} : { dropNeeds }),
+            ...(command.flags["no-parent"] === true
+                ? { parent: null }
+                : parent === undefined
+                    ? {}
+                    : { parent: parent }),
             ...(addSupersedes === undefined ? {} : { addSupersedes }),
             ...(dropSupersedes === undefined ? {} : { dropSupersedes }),
-            ...(addRelates === undefined ? {} : { addRelates }), ...(dropRelates === undefined ? {} : { dropRelates }),
-        } };
+            ...(addRelates === undefined ? {} : { addRelates }),
+            ...(dropRelates === undefined ? {} : { dropRelates }),
+        },
+    };
 }
 function lifecycleMutationRequest(command) {
     const id = command.positionals[0];
     switch (command.action) {
-        case "start": return { action: "task.start", id };
-        case "stop": return { action: "task.stop", id };
-        case "resume": return { action: "task.resume", id };
-        case "hold": return { action: "task.hold", ids: command.positionals };
-        case "done": return { action: "task.done", ids: command.positionals, ...(value(command, "note") === undefined ? {} : { note: value(command, "note") }) };
-        case "drop": return { action: "task.drop", ids: command.positionals, ...(value(command, "note") === undefined ? {} : { note: value(command, "note") }) };
-        default: throw new Error(`task action cannot forward: ${command.action}`);
+        case "start":
+            return { action: "task.start", id };
+        case "stop":
+            return { action: "task.stop", id };
+        case "resume":
+            return { action: "task.resume", id };
+        case "hold":
+            return { action: "task.hold", ids: command.positionals };
+        case "done":
+            return {
+                action: "task.done",
+                ids: command.positionals,
+                ...(value(command, "note") === undefined ? {} : { note: value(command, "note") }),
+            };
+        case "drop":
+            return {
+                action: "task.drop",
+                ids: command.positionals,
+                ...(value(command, "note") === undefined ? {} : { note: value(command, "note") }),
+            };
+        default:
+            throw new Error(`task action cannot forward: ${command.action}`);
     }
 }
 async function mutationRequest(command, input, current) {
@@ -139,15 +202,24 @@ async function mutationRequest(command, input, current) {
 function validatedMutationRequest(request) {
     switch (request.action) {
         case "task.add":
-        case "task.addDocument": return decodeTaskMutationRequest(request.action, { input: request.input });
-        case "task.compose": return decodeTaskMutationRequest(request.action, { markdown: request.markdown, namespace: request.namespace });
-        case "task.update": return decodeTaskMutationRequest(request.action, { id: request.id, input: request.input });
+        case "task.addDocument":
+            return decodeTaskMutationRequest(request.action, { input: request.input });
+        case "task.compose":
+            return decodeTaskMutationRequest(request.action, { markdown: request.markdown, namespace: request.namespace });
+        case "task.update":
+            return decodeTaskMutationRequest(request.action, { id: request.id, input: request.input });
         case "task.start":
         case "task.stop":
-        case "task.resume": return decodeTaskMutationRequest(request.action, { id: request.id });
-        case "task.hold": return decodeTaskMutationRequest(request.action, { ids: request.ids });
+        case "task.resume":
+            return decodeTaskMutationRequest(request.action, { id: request.id });
+        case "task.hold":
+            return decodeTaskMutationRequest(request.action, { ids: request.ids });
         case "task.done":
-        case "task.drop": return decodeTaskMutationRequest(request.action, { ids: request.ids, ...(request.note === undefined ? {} : { note: request.note }) });
+        case "task.drop":
+            return decodeTaskMutationRequest(request.action, {
+                ids: request.ids,
+                ...(request.note === undefined ? {} : { note: request.note }),
+            });
     }
 }
 function readScope(command, current) {
@@ -163,23 +235,52 @@ async function invokeRead(tasks, command, current) {
                 return observed;
             return command.output === "json" || observed.value.length > 1 ? observed.value : observed.value[0];
         }
-        case "ls": return tasks.list({ selection: command.flags.all === true ? "all" : command.flags.closed === true ? "closed" : "active", ...readScope(command, current), ...(limit(command) === undefined ? {} : { limit: limit(command) }) });
-        case "ready": return tasks.ready({ ...readScope(command, current), ...(value(command, "parent") === undefined ? {} : { parent: value(command, "parent") }), ...(limit(command) === undefined ? {} : { limit: limit(command) }) });
-        case "blocked": return tasks.blocked({ ...readScope(command, current), ...(value(command, "parent") === undefined ? {} : { parent: value(command, "parent") }), ...(limit(command) === undefined ? {} : { limit: limit(command) }) });
-        case "query": return tasks.query({ ...(command.where === undefined ? {} : { where: command.where }), ...readScope(command, current), ...(value(command, "sort") === undefined ? {} : { sort: value(command, "sort") }), ...(limit(command) === undefined ? {} : { limit: limit(command) }) });
-        case "tree": return tasks.task({ id }).tree();
-        case "doctor": return tasks.doctor();
-        default: throw new Error(`task action is not a read: ${command.action}`);
+        case "ls":
+            return tasks.list({
+                selection: command.flags.all === true ? "all" : command.flags.closed === true ? "closed" : "active",
+                ...readScope(command, current),
+                ...(limit(command) === undefined ? {} : { limit: limit(command) }),
+            });
+        case "ready":
+            return tasks.ready({
+                ...readScope(command, current),
+                ...(value(command, "parent") === undefined ? {} : { parent: value(command, "parent") }),
+                ...(limit(command) === undefined ? {} : { limit: limit(command) }),
+            });
+        case "blocked":
+            return tasks.blocked({
+                ...readScope(command, current),
+                ...(value(command, "parent") === undefined ? {} : { parent: value(command, "parent") }),
+                ...(limit(command) === undefined ? {} : { limit: limit(command) }),
+            });
+        case "query":
+            return tasks.query({
+                ...(command.where === undefined ? {} : { where: command.where }),
+                ...readScope(command, current),
+                ...(value(command, "sort") === undefined ? {} : { sort: value(command, "sort") }),
+                ...(limit(command) === undefined ? {} : { limit: limit(command) }),
+            });
+        case "tree":
+            return tasks.task({ id }).tree();
+        case "doctor":
+            return tasks.doctor();
+        default:
+            throw new Error(`task action is not a read: ${command.action}`);
     }
 }
 function isWorldObservation(command) {
-    return command.action === "ls" || command.action === "ready" || command.action === "blocked"
-        || command.action === "query" || command.action === "doctor";
+    return (command.action === "ls" ||
+        command.action === "ready" ||
+        command.action === "blocked" ||
+        command.action === "query" ||
+        command.action === "doctor");
+}
+function diagnostic(error) {
+    return error instanceof Error ? error.message : String(error);
 }
-function diagnostic(error) { return error instanceof Error ? error.message : String(error); }
 async function observeWorldRead(tasks, command, current) {
     try {
-        return { kind: "present", value: await invokeRead(tasks, command, current) };
+        return { kind: "present", value: (await invokeRead(tasks, command, current)) };
     }
     catch (error) {
         return { kind: "failed", failure: { message: diagnostic(error) } };
@@ -210,10 +311,14 @@ async function invokeLocalMutation(tasks, command, input, current) {
         return await invokeUpdate(tasks, command, input.readStdin);
     const id = command.positionals[0];
     switch (command.action) {
-        case "start": return tasks.task({ id }).start();
-        case "stop": return tasks.task({ id }).stop();
-        case "resume": return tasks.task({ id }).resume();
-        case "hold": return tasks.batch({ verb: "hold", ids: command.positionals });
+        case "start":
+            return tasks.task({ id }).start();
+        case "stop":
+            return tasks.task({ id }).stop();
+        case "resume":
+            return tasks.task({ id }).resume();
+        case "hold":
+            return tasks.batch({ verb: "hold", ids: command.positionals });
         case "done": {
             const note = value(command, "note");
             return tasks.batch({ verb: "done", ids: command.positionals, ...(note === undefined ? {} : { note }) });
@@ -228,25 +333,40 @@ async function invokeLocalMutation(tasks, command, input, current) {
                 await writeTaskNamespaceContext(input.context.directory, selected);
             return { kind: "accepted", value: selected ?? current ?? [] };
         }
-        case "compose": return tasks.compose({ markdown: await input.readStdin(), namespace: current ?? [], ...(input.actor === undefined ? {} : { actor: input.actor }) });
-        default: throw new Error(`task action has no invocation: ${command.action}`);
+        case "compose":
+            return tasks.compose({
+                markdown: await input.readStdin(),
+                namespace: current ?? [],
+                ...(input.actor === undefined ? {} : { actor: input.actor }),
+            });
+        default:
+            throw new Error(`task action has no invocation: ${command.action}`);
     }
 }
 function establishesWorld(command) {
-    return command.action === "add" || command.action === "compose"
-        || (command.action === "namespace" && command.positionals.length > 0);
+    return (command.action === "add" ||
+        command.action === "compose" ||
+        (command.action === "namespace" && command.positionals.length > 0));
 }
 function forwardsMutation(command) {
-    return command.action !== "show" && command.action !== "tree"
-        && command.action !== "namespace" && !isWorldObservation(command);
+    return (command.action !== "show" &&
+        command.action !== "tree" &&
+        command.action !== "namespace" &&
+        !isWorldObservation(command));
 }
 export async function invokeTask(command, input) {
     const world = input.world ?? (establishesWorld(command) ? await input.establish() : null);
     if (world === null)
         return missingWorld(command);
     const tasks = Tasks.of(world);
-    const contextSensitive = command.action === "namespace" || command.action === "add" || command.action === "compose"
-        || ((command.action === "ls" || command.action === "ready" || command.action === "blocked" || command.action === "query") && command.flags.world !== true);
+    const contextSensitive = command.action === "namespace" ||
+        command.action === "add" ||
+        command.action === "compose" ||
+        ((command.action === "ls" ||
+            command.action === "ready" ||
+            command.action === "blocked" ||
+            command.action === "query") &&
+            command.flags.world !== true);
     let current;
     if (contextSensitive) {
         const resolved = await resolveTaskNamespaceContext(input.context);
@@ -257,7 +377,7 @@ export async function invokeTask(command, input) {
     const requests = injectedBodyRequests();
     if (requests !== null && forwardsMutation(command)) {
         const request = validatedMutationRequest(await mutationRequest(command, input, current ?? []));
-        return await requestBodyTask({ directory: requests, world, request });
+        return (await requestBodyTask({ directory: requests, world, request }));
     }
     return await invokeLocalMutation(tasks, command, input, current);
 }

package/build/src/cli/commands/task-query.js

@@ -1,9 +1,11 @@
 import { MAX_TASK_LIMIT, TASK_RELATION_PREDICATE_FIELDS, normalizeTaskQuery, } from "../../task/query.js";
-function syntax(message, offset) { throw new Error(`${message} at column ${offset + 1}`); }
+function syntax(message, offset) {
+    throw new Error(`${message} at column ${offset + 1}`);
+}
 function scanString(source, offset) {
     let index = offset + 1;
     let value = "";
-    while (index < source.length && source[index] !== "\"") {
+    while (index < source.length && source[index] !== '"') {
         const character = source[index];
         if (character !== "\\") {
             value += character;
@@ -13,12 +15,12 @@ function scanString(source, offset) {
         const escaped = source[index + 1];
         if (escaped === undefined)
             syntax("unterminated string", offset);
-        if (escaped !== "\\" && escaped !== "\"")
-            syntax("only \\\\ and \\\" escapes are supported", index);
+        if (escaped !== "\\" && escaped !== '"')
+            syntax('only \\\\ and \\" escapes are supported', index);
         value += escaped;
         index += 2;
     }
-    if (source[index] !== "\"")
+    if (source[index] !== '"')
         syntax("unterminated string", offset);
     return { token: { kind: "string", value, offset }, next: index + 1 };
 }
@@ -59,7 +61,7 @@ function lex(source) {
             index += 1;
             continue;
         }
-        if (character === "\"") {
+        if (character === '"') {
             const scanned = scanString(source, offset);
             tokens.push(scanned.token);
             index = scanned.next;
@@ -84,7 +86,11 @@ function canonicalTaskId(token, field) {
     return token.value;
 }
 function state(token) {
-    if (token.value !== "open" && token.value !== "in_progress" && token.value !== "on_hold" && token.value !== "done" && token.value !== "drop") {
+    if (token.value !== "open" &&
+        token.value !== "in_progress" &&
+        token.value !== "on_hold" &&
+        token.value !== "done" &&
+        token.value !== "drop") {
         return syntax(`invalid state ${JSON.stringify(token.value)}`, token.offset);
     }
     return token.value;
@@ -155,9 +161,17 @@ class Parser {
     constructor(tokens) {
         this.tokens = tokens;
     }
-    current() { return this.tokens[this.index]; }
-    take() { const token = this.current(); this.index += 1; return token; }
-    word(value) { return this.current().kind === "word" && this.current().value === value; }
+    current() {
+        return this.tokens[this.index];
+    }
+    take() {
+        const token = this.current();
+        this.index += 1;
+        return token;
+    }
+    word(value) {
+        return this.current().kind === "word" && this.current().value === value;
+    }
     parse() {
         const value = this.or();
         if (this.current().kind !== "end")
@@ -215,20 +229,30 @@ class Parser {
     }
     typedPredicate(field, operator, value) {
         switch (field.value) {
-            case "state": return { field: "state", operator: equalityOperator(operator, "state"), value: state(value) };
-            case "priority": return { field: "priority", operator: orderedOperator(operator, "priority"), value: priority(value) };
-            case "title": return parseTextPredicate("title", operator, value);
-            case "id": return parseTextPredicate("id", operator, value);
-            case "parent": return {
-                field: "parent",
-                operator: equalityOperator(operator, "parent"),
-                value: value.value === "none" ? null : canonicalTaskId(value, "parent"),
-            };
-            case "ready": return parseBooleanPredicate("ready", operator, value);
-            case "blocked": return parseBooleanPredicate("blocked", operator, value);
-            case "created": return parseTimestampPredicate("created", operator, value);
-            case "updated": return parseTimestampPredicate("updated", operator, value);
-            default: return parseRelationPredicate(field, operator, value);
+            case "state":
+                return { field: "state", operator: equalityOperator(operator, "state"), value: state(value) };
+            case "priority":
+                return { field: "priority", operator: orderedOperator(operator, "priority"), value: priority(value) };
+            case "title":
+                return parseTextPredicate("title", operator, value);
+            case "id":
+                return parseTextPredicate("id", operator, value);
+            case "parent":
+                return {
+                    field: "parent",
+                    operator: equalityOperator(operator, "parent"),
+                    value: value.value === "none" ? null : canonicalTaskId(value, "parent"),
+                };
+            case "ready":
+                return parseBooleanPredicate("ready", operator, value);
+            case "blocked":
+                return parseBooleanPredicate("blocked", operator, value);
+            case "created":
+                return parseTimestampPredicate("created", operator, value);
+            case "updated":
+                return parseTimestampPredicate("updated", operator, value);
+            default:
+                return parseRelationPredicate(field, operator, value);
         }
     }
 }