@gjermundgaraba/wtf-api 0.13.0 → 0.14.0

package/dist/tasks.d.ts

@@ -16,16 +16,35 @@ export declare const Task: Schema.Struct<{
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
 }>;
 export type Task = typeof Task.Type;
+export declare const TaskPlacement: Schema.TaggedUnion<{
+    readonly Root: Schema.TaggedStruct<"Root", {
+        readonly areaId: Schema.brand<Schema.String, "AreaId">;
+    }>;
+    readonly Under: Schema.TaggedStruct<"Under", {
+        readonly parentTaskId: Schema.brand<Schema.String, "TaskId">;
+    }>;
+}>;
+export type TaskPlacement = typeof TaskPlacement.Type;
 export declare const TaskCreate: Schema.Struct<{
-    readonly areaId: Schema.optionalKey<Schema.brand<Schema.String, "AreaId">>;
-    readonly parentTaskId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
-    readonly beforeId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
+    readonly placement: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Root: Schema.TaggedStruct<"Root", {
+            readonly areaId: Schema.brand<Schema.String, "AreaId">;
+        }>;
+        readonly Under: Schema.TaggedStruct<"Under", {
+            readonly parentTaskId: Schema.brand<Schema.String, "TaskId">;
+        }>;
+    }>>;
+    readonly position: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Before: Schema.TaggedStruct<"Before", {
+            readonly id: Schema.brand<Schema.String, "TaskId">;
+        }>;
+        readonly End: Schema.TaggedStruct<"End", {}>;
+    }>>;
     readonly description: Schema.optionalKey<Schema.String>;
     readonly status: Schema.optionalKey<Schema.Literals<readonly ["inbox", "backlog", "todo", "in_progress", "done", "cancelled"]>>;
     readonly focus: Schema.optionalKey<Schema.Boolean>;
@@ -38,9 +57,20 @@ export declare const TaskCreate: Schema.Struct<{
 export interface TaskCreate extends Schema.Schema.Type<typeof TaskCreate> {
 }
 export declare const TaskUpdate: Schema.Struct<{
-    readonly areaId: Schema.optionalKey<Schema.brand<Schema.String, "AreaId">>;
-    readonly parentTaskId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
-    readonly beforeId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
+    readonly placement: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Root: Schema.TaggedStruct<"Root", {
+            readonly areaId: Schema.brand<Schema.String, "AreaId">;
+        }>;
+        readonly Under: Schema.TaggedStruct<"Under", {
+            readonly parentTaskId: Schema.brand<Schema.String, "TaskId">;
+        }>;
+    }>>;
+    readonly position: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Before: Schema.TaggedStruct<"Before", {
+            readonly id: Schema.brand<Schema.String, "TaskId">;
+        }>;
+        readonly End: Schema.TaggedStruct<"End", {}>;
+    }>>;
     readonly title: Schema.optionalKey<Schema.String>;
     readonly description: Schema.optionalKey<Schema.String>;
     readonly status: Schema.optionalKey<Schema.Literals<readonly ["inbox", "backlog", "todo", "in_progress", "done", "cancelled"]>>;
@@ -86,7 +116,6 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
@@ -105,14 +134,24 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
 }>, readonly (typeof NotFound | typeof StorageError)[], true, typeof Action.Anyone, undefined, undefined>, Action.Action<"tasks_create", Schema.Struct<{
-    readonly areaId: Schema.optionalKey<Schema.brand<Schema.String, "AreaId">>;
-    readonly parentTaskId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
-    readonly beforeId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
+    readonly placement: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Root: Schema.TaggedStruct<"Root", {
+            readonly areaId: Schema.brand<Schema.String, "AreaId">;
+        }>;
+        readonly Under: Schema.TaggedStruct<"Under", {
+            readonly parentTaskId: Schema.brand<Schema.String, "TaskId">;
+        }>;
+    }>>;
+    readonly position: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Before: Schema.TaggedStruct<"Before", {
+            readonly id: Schema.brand<Schema.String, "TaskId">;
+        }>;
+        readonly End: Schema.TaggedStruct<"End", {}>;
+    }>>;
     readonly description: Schema.optionalKey<Schema.String>;
     readonly status: Schema.optionalKey<Schema.Literals<readonly ["inbox", "backlog", "todo", "in_progress", "done", "cancelled"]>>;
     readonly focus: Schema.optionalKey<Schema.Boolean>;
@@ -134,14 +173,24 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
 }>, readonly (typeof NotFound | typeof PlacementRefused | typeof NoArea | typeof StorageError)[], false, typeof Action.Anyone, undefined, undefined>, Action.Action<"tasks_update", Schema.Struct<{
-    readonly areaId: Schema.optionalKey<Schema.brand<Schema.String, "AreaId">>;
-    readonly parentTaskId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
-    readonly beforeId: Schema.optionalKey<Schema.NullOr<Schema.brand<Schema.String, "TaskId">>>;
+    readonly placement: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Root: Schema.TaggedStruct<"Root", {
+            readonly areaId: Schema.brand<Schema.String, "AreaId">;
+        }>;
+        readonly Under: Schema.TaggedStruct<"Under", {
+            readonly parentTaskId: Schema.brand<Schema.String, "TaskId">;
+        }>;
+    }>>;
+    readonly position: Schema.optionalKey<Schema.TaggedUnion<{
+        readonly Before: Schema.TaggedStruct<"Before", {
+            readonly id: Schema.brand<Schema.String, "TaskId">;
+        }>;
+        readonly End: Schema.TaggedStruct<"End", {}>;
+    }>>;
     readonly title: Schema.optionalKey<Schema.String>;
     readonly description: Schema.optionalKey<Schema.String>;
     readonly status: Schema.optionalKey<Schema.Literals<readonly ["inbox", "backlog", "todo", "in_progress", "done", "cancelled"]>>;
@@ -164,7 +213,6 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
@@ -183,7 +231,6 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;
@@ -202,7 +249,6 @@ export declare const TaskActions: readonly [Action.Action<"tasks_list", Schema.S
     readonly parentTaskId: Schema.NullOr<Schema.brand<Schema.String, "TaskId">>;
     readonly goalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
     readonly inheritedGoalIds: Schema.$Array<Schema.brand<Schema.String, "GoalId">>;
-    readonly sortKey: Schema.String;
     readonly createdAt: Schema.String;
     readonly updatedAt: Schema.String;
     readonly archivedAt: Schema.NullOr<Schema.String>;

package/dist/tasks.js

@@ -1,6 +1,6 @@
 import * as Action from "@gjermundgaraba/effect-actions/Action";
 import { Schema } from "effect";
-import { AreaId, CalendarDate, Description, GoalId, NoArea, NotFound, PlacementRefused, StorageError, TaskId, Title, } from "./shared.js";
+import { AreaId, CalendarDate, Description, GoalId, NoArea, NotFound, PlacementRefused, StorageError, TaskId, TaskPosition, Title, } from "./shared.js";
 export const TaskStatus = Schema.Literals([
     "inbox",
     "backlog",
@@ -25,15 +25,19 @@ export const Task = Schema.Struct({
     ...content,
     goalIds: Schema.Array(GoalId),
     inheritedGoalIds: Schema.Array(GoalId),
-    sortKey: Schema.String,
     createdAt: Schema.String,
     updatedAt: Schema.String,
     archivedAt: Schema.NullOr(Schema.String),
 });
-const placement = {
-    areaId: Schema.optionalKey(AreaId),
-    parentTaskId: Schema.optionalKey(Schema.NullOr(TaskId)),
-    beforeId: Schema.optionalKey(Schema.NullOr(TaskId)),
+export const TaskPlacement = Schema.TaggedUnion({
+    Root: { areaId: AreaId },
+    Under: { parentTaskId: TaskId },
+}).annotate({
+    description: "Where a task sits: at the Root of the area whose id is given, or Under the parent task whose id is given, in that parent's area.",
+});
+const place = {
+    placement: Schema.optionalKey(TaskPlacement),
+    position: Schema.optionalKey(TaskPosition),
 };
 const edits = {
     title: Schema.optionalKey(Title),
@@ -48,9 +52,9 @@ const edits = {
 export const TaskCreate = Schema.Struct({
     ...edits,
     title: Title,
-    ...placement,
+    ...place,
 });
-export const TaskUpdate = Schema.Struct({ id: TaskId, ...edits, ...placement });
+export const TaskUpdate = Schema.Struct({ id: TaskId, ...edits, ...place });
 export const TaskList = Schema.Struct({
     areaId: Schema.optionalKey(AreaId),
     statuses: Schema.optionalKey(Schema.Array(TaskStatus)),
@@ -79,7 +83,7 @@ export const TaskActions = [
     Action.make("tasks_create", {
         caller: Action.Anyone,
         error: [NotFound, PlacementRefused, NoArea, StorageError],
-        description: "Capture a task, defaulting to inbox in the first area. A parent supplies its area and must not be archived. goalIds links it to goals in any area; it also serves every goal its ancestors link, listed in inheritedGoalIds.",
+        description: "Capture a task, defaulting to inbox. placement Root captures it at an area's root; Under captures it under a parent task, in the parent's area, and the parent must not be archived. Omitted placement captures it at the first area's root, refused with NoArea while no area exists. position orders it among its siblings; omitted, it goes at the End. goalIds links it to goals in any area; it also serves every goal its ancestors link, listed in inheritedGoalIds.",
         readOnly: false,
         input: TaskCreate,
         success: Task,
@@ -87,7 +91,7 @@ export const TaskActions = [
     Action.make("tasks_update", {
         caller: Action.Anyone,
         error: [NotFound, PlacementRefused, StorageError],
-        description: "Update task content, goal links, and placement atomically, carrying its subtree to the destination area. goalIds replaces the task's own links, to goals in any area, archived ones included; inheritedGoalIds is derived from its ancestors and changes when they or its place change. Null clears wakeOn, dueOn, or owedTo. Omitted parentTaskId preserves it, except that a move to another areaId lands at that area's root; null means area root. A parent supplies its area; an explicit area must agree with an explicit parent. Omitted beforeId preserves order within the same siblings and appends when changing groups; null explicitly appends. A task that is not archived cannot move under an archived parent.",
+        description: "Update task content, goal links, and place atomically, carrying its subtree to the destination area. goalIds replaces the task's own links, to goals in any area, archived ones included; inheritedGoalIds is derived from its ancestors and changes when they or its place change. Null clears wakeOn, dueOn, or owedTo. placement Root moves it to an area's root; Under moves it under a parent task and into that parent's area. Omitted placement keeps it where it is. position orders it among its siblings; omitted, it keeps its order when placement names its current group, and goes at the End of a new group. A task cannot move under itself or its own subtree, and a task that is not archived cannot move under an archived parent.",
         readOnly: false,
         input: TaskUpdate,
         success: Task,

package/dist/values.d.ts

@@ -8,7 +8,8 @@ export type Values = typeof Values.Type;
 export declare const ValuesUpdate: Schema.Struct<{
     readonly text: Schema.String;
 }>;
-export type ValuesUpdate = typeof ValuesUpdate.Type;
+export interface ValuesUpdate extends Schema.Schema.Type<typeof ValuesUpdate> {
+}
 export declare const ValuesActions: readonly [Action.Action<"values_get", Schema.$Record<Schema.String, Schema.Never>, Schema.Struct<{
     readonly text: Schema.String;
 }>, readonly (typeof StorageError)[], true, typeof Action.Anyone, undefined, undefined>, Action.Action<"values_update", Schema.Struct<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjermundgaraba/wtf-api",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "The wtf wire contract: the area, goal and task actions, their inputs, records and errors, for a typed HTTP or MCP client.",
   "license": "MIT",
   "repository": {