Compare commits

..
7 changed files with 133 additions and 104 deletions
-2
View File
@@ -1,2 +0,0 @@
# Authoring journals, resolver checkouts, and provisional reports are not source.
/.quixos/
+1 -1
View File
@@ -1,4 +1,4 @@
{
"monorepoCommit": "099bb9f5d64bce50b20b6cb51d5333f009b8d418",
"monorepoCommit": "15b93e42825a3f8055f6305999a12c5b1cc73330",
"sourcePath": "quixos-instance/workspaces/todo"
}
+23
View File
@@ -0,0 +1,23 @@
{
"resources": [
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-named.git","commit":"0000000000000000000000000000000000000010","directory":"../../interfaces/named"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-task-data.git","commit":"0000000000000000000000000000000000000011","directory":"../../interfaces/task-data"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-project-tasks.git","commit":"0000000000000000000000000000000000000012","directory":"../../interfaces/project-tasks"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-project-actions.git","commit":"0000000000000000000000000000000000000013","directory":"../../interfaces/project-actions"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-task-actions.git","commit":"0000000000000000000000000000000000000014","directory":"../../interfaces/task-actions"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-display-label.git","commit":"0000000000000000000000000000000000000015","directory":"../../interfaces/display-label"},
{"kind":"interface","repository":"https://repos.quixos.org/quixos-todo/interface-task-count.git","commit":"0000000000000000000000000000000000000016","directory":"../../interfaces/task-count"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-createable.git","commit":"0000000000000000000000000000000000000017","directory":"../../interfaces/web-studio-createable"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-react-component.git","commit":"0000000000000000000000000000000000000018","directory":"../../interfaces/web-studio-react-component"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-has-react-component.git","commit":"0000000000000000000000000000000000000019","directory":"../../interfaces/web-studio-has-react-component"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-canvas.git","commit":"0000000000000000000000000000000000000024","directory":"../../interfaces/web-studio-canvas"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-canvas-placement.git","commit":"0000000000000000000000000000000000000025","directory":"../../interfaces/web-studio-canvas-placement"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-placeable.git","commit":"0000000000000000000000000000000000000026","directory":"../../interfaces/web-studio-placeable"},
{"kind":"interface","repository":"https://repos.quixos.org/org-quixos-web-studio/interface-searchable.git","commit":"0000000000000000000000000000000000000027","directory":"../../interfaces/web-studio-searchable"},
{"kind":"package","repository":"https://repos.quixos.org/quixos-todo/package-todo-runtime.git","commit":"0000000000000000000000000000000000000020","directory":"../../packages/todo-runtime"},
{"kind":"package","repository":"https://repos.quixos.org/quixos-todo/package-project-runtime.git","commit":"0000000000000000000000000000000000000021","directory":"../../packages/project-runtime"},
{"kind":"package","repository":"https://repos.quixos.org/quixos-todo/package-project-react-runtime.git","commit":"0000000000000000000000000000000000000022","directory":"../../packages/project-react-runtime"},
{"kind":"package","repository":"https://repos.quixos.org/quixos-todo/package-todo-react-runtime.git","commit":"0000000000000000000000000000000000000023","directory":"../../packages/todo-react-runtime"},
{"kind":"package","repository":"https://repos.quixos.org/org-quixos-web-studio/package-canvas-runtime.git","commit":"0000000000000000000000000000000000000028","directory":"../../packages/web-studio-canvas-runtime"}
]
}
+14 -14
View File
@@ -1,58 +1,58 @@
quixos-lock fragment version 1 {
interface Named source {
repository "https://repos.quixos.org/quixos-templates/interface-named.git";
commit "59debb4a72353ea1740fe15252a52cd1086882bd";
commit "eb37f96b090db2c5e2dda1f4238fdd4154b29ca0";
}
interface TaskData source {
repository "https://repos.quixos.org/quixos-templates/interface-task-data.git";
commit "18b334a3a35cb68f27788444aaf530d9e8052df7";
commit "a8c1ff231af191947875a3920883153512d36b97";
}
interface ProjectTasks source {
repository "https://repos.quixos.org/quixos-templates/interface-project-tasks.git";
commit "73f0b11bf0f2b5f808b68a803b6fdd3ce4aaac91";
commit "6744ffed19ecd855ebbac17a095c5096ddee2d7b";
}
interface ProjectActions source {
repository "https://repos.quixos.org/quixos-templates/interface-project-actions.git";
commit "34622aefe0d247b4c6399cacf708b59228958e77";
commit "8c77890a400271afd17040e22f34394da025e429";
}
interface TaskActions source {
repository "https://repos.quixos.org/quixos-templates/interface-task-actions.git";
commit "adc050ab2342e3a3621a7bb20494877d6d619044";
commit "9b32a2af1398b7032a1128c1b46f42e23318447d";
}
interface DisplayLabel source {
repository "https://repos.quixos.org/quixos-templates/interface-display-label.git";
commit "9eef4f2adc6fe56b8a0307ab0ecc03ce82954407";
commit "f31e8647f4a16e347d506ab3920f4490669c7072";
}
interface TaskCount source {
repository "https://repos.quixos.org/quixos-templates/interface-task-count.git";
commit "8cd42235124527eef5c70849796cbfa2d53fdd4a";
commit "c47837e79ebbb8a603375b800f8dc2d8fe4abf2d";
}
interface WebStudioCreateable source {
repository "https://repos.quixos.org/quixos-templates/interface-createable.git";
commit "18d1850eec4e18653e625597a067534fefe6a942";
commit "ffbd0d9f9e9218ab162b6f1ad3c561cb8ef7d4a3";
}
interface WebStudioReactComponent source {
repository "https://repos.quixos.org/quixos-templates/interface-react-component.git";
commit "86df8dee6497fb8a2dcf18b625e42bf8875bfb02";
commit "db8f715baf20fb313cba757aa1bb58a0711453c7";
}
interface WebStudioHasReactComponent source {
repository "https://repos.quixos.org/quixos-templates/interface-has-react-component.git";
commit "d8f7bc84c583a02f2b967207ea818217eaf285dc";
commit "e212078ea635d1908c012c79ff12370e1809a77f";
}
interface WebStudioCanvas source {
repository "https://repos.quixos.org/quixos-templates/interface-canvas.git";
commit "95b138787ce750fc8d4353edcf46d0b028dd8867";
commit "93e94d73fef8ea87751a03bfead892321d2ac1a2";
}
interface WebStudioCanvasPlacement source {
repository "https://repos.quixos.org/quixos-templates/interface-canvas-placement.git";
commit "025985f6ea9b15aee58aa0270ad43f0df2d97afb";
commit "9a0d63173ee5c406f0a95ddd3309fbc169c4d133";
}
interface WebStudioPlaceable source {
repository "https://repos.quixos.org/quixos-templates/interface-placeable.git";
commit "c01a24021c94d0ab52e49e7c12db6ee5d0ac82cd";
commit "63e91dfee37afea76447f062f49f9173566a089d";
}
interface WebStudioSearchable source {
repository "https://repos.quixos.org/quixos-templates/interface-searchable.git";
commit "a5757c10489fef0341a5544318192b1e665cdfe2";
commit "e497b8e7d3fe4a281e2035566cce593055eefe25";
}
}
+5 -5
View File
@@ -1,22 +1,22 @@
quixos-lock fragment version 1 {
package TodoRuntime source {
repository "https://repos.quixos.org/quixos-templates/package-todo-runtime.git";
commit "bfa88a247c16004fefa0c1a16329c8c8261ae8f3";
commit "786bc8568e4aa33a398341b4055d0d74953a53ad";
}
package ProjectRuntime source {
repository "https://repos.quixos.org/quixos-templates/package-project-runtime.git";
commit "b328ad1cdb5a7e93b81f82c12b8041db986b66f3";
commit "08c516d865749baa27f6cbb205c65740d9fe1039";
}
package ProjectReactRuntime source {
repository "https://repos.quixos.org/quixos-templates/package-project-react-runtime.git";
commit "97314842eb3a87252ffcb5eabd63792ef321ed3e";
commit "f038a1a5f83e8b17a2baba950cc8684dfb792a93";
}
package TodoReactRuntime source {
repository "https://repos.quixos.org/quixos-templates/package-todo-react-runtime.git";
commit "7c85c6d63068b86bbe99ebd05d520453743ee678";
commit "74aca20aac85090f9279e684657cc58657f8cfc6";
}
package WebStudioCanvasRuntime source {
repository "https://repos.quixos.org/quixos-templates/package-canvas-runtime.git";
commit "f1ace3cf10611ad00b3883b4aab554bcb62c54ad";
commit "70811032d72b23c309bce4955b2c3e95adbf5a1c";
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
quixos-lock version 1 {
quixos source {
repository "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git";
commit "099bb9f5d64bce50b20b6cb51d5333f009b8d418";
commit "15b93e42825a3f8055f6305999a12c5b1cc73330";
}
import "locks/interfaces.lock";
import "locks/packages.lock";
+89 -81
View File
@@ -27,27 +27,44 @@ workspace Todo id "workspace:todo" revision "workspace:todo@capabilities-v1" com
import package TodoReactRuntime;
import package WebStudioCanvasRuntime;
shared state ProjectName id "slot:project:name" on Project : string policy optimistic-register default "Untitled project";
shared state TaskTitle id "slot:task:title" on Task : string policy optimistic-register default "Untitled task";
shared state TaskStatus id "slot:task:status" on Task : string policy optimistic-register default "OPEN";
shared state TaskPriority id "slot:task:priority" on Task : string policy optimistic-register default "NORMAL";
shared state TaskNotes id "slot:task:notes" on Task : string policy crdt(string) default "";
shared state TaskDueDate id "slot:task:due-date" on Task : string policy optimistic-register default "";
shared state TaskEnergy id "slot:task:energy" on Task : string policy optimistic-register default "MEDIUM";
shared state WebStudioCanvasName id "slot:org.quixos.web-studio.canvas:name" on WebStudioCanvas : string policy optimistic-register default "Hearth";
shared state WebStudioPlacementPosition id "slot:org.quixos.web-studio.canvas-placement:position" on WebStudioCanvasPlacement : message "org.quixos.web-studio.CanvasPosition" policy optimistic-register default {"x":0,"y":0};
shared state WebStudioPlacementSize id "slot:org.quixos.web-studio.canvas-placement:size" on WebStudioCanvasPlacement : message "org.quixos.web-studio.CanvasSize" policy optimistic-register default {"width":420,"height":320};
shared state WebStudioPlacementZ id "slot:org.quixos.web-studio.canvas-placement:z" on WebStudioCanvasPlacement : int32 policy optimistic-register default 0;
shared edge ProjectTaskEdge id "edge:project:tasks" {
atom Project projection tasks id "projection:project:tasks" many-unique ordered;
atom Task projection project id "projection:task:project" optional-one;
}
shared edge ProjectComponentEdge id "edge:project:web-studio-component" {
atom ProjectReactComponent projection subject id "projection:project-component:subject" exactly-one;
atom Project projection component id "projection:project:component" optional-one;
}
shared edge TaskComponentEdge id "edge:task:web-studio-component" {
atom TaskReactComponent projection subject id "projection:task-component:subject" exactly-one;
atom Task projection component id "projection:task:component" optional-one;
}
shared edge WebStudioCanvasPlacementEdge id "edge:org.quixos.web-studio:canvas-placements" {
atom WebStudioCanvasPlacement projection canvas id "projection:org.quixos.web-studio.canvas-placement:canvas" exactly-one;
interface WebStudioCanvas projection placements id "projection:org.quixos.web-studio.canvas:placements" many-unique ordered;
}
shared edge WebStudioPlacementSubjectEdge id "edge:org.quixos.web-studio:placement-subject" {
atom WebStudioCanvasPlacement projection subject id "projection:org.quixos.web-studio.canvas-placement:subject" exactly-one;
interface WebStudioPlaceable projection placements id "projection:org.quixos.web-studio.placeable:placements" many-unique ordered;
}
conform WebStudioCanvas as WebStudioCanvas id "conformance:todo:WebStudioCanvas:WebStudioCanvas" {
private state WebStudioCanvasName id "slot:org.quixos.web-studio.canvas:name" on WebStudioCanvas : string policy optimistic-register default "Hearth";
conform WebStudioCanvas as WebStudioCanvas {
bind name.get to state WebStudioCanvasName.read;
bind name.set to state WebStudioCanvasName.write;
bind placements.resolve to edge WebStudioCanvasPlacementEdge.placements.resolve;
}
conform WebStudioCanvasPlacement as WebStudioCanvasPlacement id "conformance:todo:WebStudioCanvasPlacement:WebStudioCanvasPlacement" {
private state WebStudioPlacementPosition id "slot:org.quixos.web-studio.canvas-placement:position" on WebStudioCanvasPlacement : message "org.quixos.web-studio.CanvasPosition" policy optimistic-register default {"x":0,"y":0};
private state WebStudioPlacementSize id "slot:org.quixos.web-studio.canvas-placement:size" on WebStudioCanvasPlacement : message "org.quixos.web-studio.CanvasSize" policy optimistic-register default {"width":420,"height":320};
private state WebStudioPlacementZ id "slot:org.quixos.web-studio.canvas-placement:z" on WebStudioCanvasPlacement : int32 policy optimistic-register default 0;
private edge WebStudioCanvasPlacementEdge id "edge:org.quixos.web-studio:canvas-placements" {
atom WebStudioCanvasPlacement projection canvas id "projection:org.quixos.web-studio.canvas-placement:canvas" exactly-one;
interface WebStudioCanvas projection placements id "projection:org.quixos.web-studio.canvas:placements" many-unique ordered public-traversal;
}
private edge WebStudioPlacementSubjectEdge id "edge:org.quixos.web-studio:placement-subject" {
atom WebStudioCanvasPlacement projection subject id "projection:org.quixos.web-studio.canvas-placement:subject" exactly-one;
interface WebStudioPlaceable projection placements id "projection:org.quixos.web-studio.placeable:placements" many-unique ordered public-traversal;
}
conform WebStudioCanvasPlacement as WebStudioCanvasPlacement {
bind position.get to state WebStudioPlacementPosition.read;
bind position.set to state WebStudioPlacementPosition.write;
bind size.get to state WebStudioPlacementSize.read;
@@ -62,14 +79,11 @@ workspace Todo id "workspace:todo" revision "workspace:todo@capabilities-v1" com
bind canvas.disconnect to edge WebStudioCanvasPlacementEdge.canvas.disconnect;
}
conform Project as WebStudioCreateable id "conformance:todo:Project:WebStudioCreateable" {
}
conform Project as WebStudioPlaceable id "conformance:todo:Project:WebStudioPlaceable" {
conform Project as WebStudioCreateable {}
conform Project as WebStudioPlaceable {
bind placements.resolve to edge WebStudioPlacementSubjectEdge.placements.resolve;
}
conform Project as WebStudioSearchable id "conformance:todo:Project:WebStudioSearchable" {
conform Project as WebStudioSearchable {
bind document.get to package ProjectRuntime.searchDocumentGet with {
named to interface Named;
tasks to interface ProjectTasks;
@@ -80,50 +94,35 @@ workspace Todo id "workspace:todo" revision "workspace:todo@capabilities-v1" com
};
bind document.watch-stop to package ProjectRuntime.searchDocumentWatchStop;
}
conform Project as WebStudioHasReactComponent id "conformance:todo:Project:WebStudioHasReactComponent" {
private edge ProjectComponentEdge id "edge:project:web-studio-component" {
atom ProjectReactComponent projection subject id "projection:project-component:subject" exactly-one public-traversal;
atom Project projection component id "projection:project:component" optional-one;
}
conform Project as WebStudioHasReactComponent {
bind component.resolve to edge ProjectComponentEdge.component.resolve;
materialize component if absent using constructor ProjectReactComponent via edge ProjectComponentEdge.subject;
}
conform Project as Named id "conformance:todo:Project:Named" {
private state ProjectName id "slot:project:name" on Project : string policy optimistic-register default "Untitled project";
conform Project as Named {
bind name.get to state ProjectName.read;
bind name.set to state ProjectName.write;
}
conform Project as ProjectTasks id "conformance:todo:Project:ProjectTasks" {
private edge ProjectTaskEdge id "edge:project:tasks" {
atom Project projection tasks id "projection:project:tasks" many-unique ordered;
atom Task projection project id "projection:task:project" optional-one;
}
conform Project as ProjectTasks {
bind tasks.resolve to edge ProjectTaskEdge.tasks.resolve;
bind tasks.connect to edge ProjectTaskEdge.tasks.connect;
bind tasks.disconnect to edge ProjectTaskEdge.tasks.disconnect;
}
conform Project as ProjectActions id "conformance:todo:Project:ProjectActions" {
conform Project as ProjectActions {
bind addTask.call to package ProjectRuntime.addTask with {
tasks to interface ProjectTasks;
tasks to edge ProjectTaskEdge.tasks;
task to constructor Task;
};
}
conform Project as TaskCount id "conformance:todo:Project:TaskCount" {
conform Project as TaskCount {
bind count.get to package ProjectRuntime.taskCountGet with {
tasks to interface ProjectTasks;
tasks to edge ProjectTaskEdge.tasks;
};
bind count.watch-start to package ProjectRuntime.taskCountWatch with {
tasks to interface ProjectTasks;
tasks to edge ProjectTaskEdge.tasks;
};
bind count.watch-stop to package ProjectRuntime.taskCountWatchStop;
}
conform ProjectReactComponent as WebStudioReactComponent id "conformance:todo:ProjectReactComponent:WebStudioReactComponent" {
conform ProjectReactComponent as WebStudioReactComponent {
bind source.get to package ProjectReactRuntime.sourceGet;
bind props.get to package ProjectReactRuntime.propsGet with {
named to interface Named via edge ProjectComponentEdge.subject;
@@ -136,37 +135,29 @@ workspace Todo id "workspace:todo" revision "workspace:todo@capabilities-v1" com
bind props.watch-stop to package ProjectReactRuntime.propsWatchStop;
}
conform Task as WebStudioHasReactComponent id "conformance:todo:Task:WebStudioHasReactComponent" {
private edge TaskComponentEdge id "edge:task:web-studio-component" {
atom TaskReactComponent projection subject id "projection:task-component:subject" exactly-one public-traversal;
atom Task projection component id "projection:task:component" optional-one;
}
conform Task as WebStudioHasReactComponent {
bind component.resolve to edge TaskComponentEdge.component.resolve;
materialize component if absent using constructor TaskReactComponent via edge TaskComponentEdge.subject;
}
conform Task as WebStudioPlaceable id "conformance:todo:Task:WebStudioPlaceable" {
conform Task as WebStudioPlaceable {
bind placements.resolve to edge WebStudioPlacementSubjectEdge.placements.resolve;
}
conform Task as WebStudioSearchable id "conformance:todo:Task:WebStudioSearchable" {
conform Task as WebStudioSearchable {
bind document.get to package TodoRuntime.searchDocumentGet with {
data to interface TaskData;
title to state TaskTitle;
status to state TaskStatus;
priority to state TaskPriority;
dueDate to state TaskDueDate;
};
bind document.watch-start to package TodoRuntime.searchDocumentWatch with {
data to interface TaskData;
title to state TaskTitle;
status to state TaskStatus;
priority to state TaskPriority;
dueDate to state TaskDueDate;
};
bind document.watch-stop to package TodoRuntime.searchDocumentWatchStop;
}
conform Task as TaskData id "conformance:todo:Task:TaskData" {
private state TaskTitle id "slot:task:title" on Task : string policy optimistic-register default "Untitled task";
private state TaskStatus id "slot:task:status" on Task : string policy optimistic-register default "OPEN";
private state TaskPriority id "slot:task:priority" on Task : string policy optimistic-register default "NORMAL";
private state TaskNotes id "slot:task:notes" on Task : string policy crdt(string) default "";
private state TaskDueDate id "slot:task:due-date" on Task : string policy optimistic-register default "";
private state TaskEnergy id "slot:task:energy" on Task : string policy optimistic-register default "MEDIUM";
conform Task as TaskData {
bind title.get to state TaskTitle.read;
bind title.set to state TaskTitle.write;
bind status.get to state TaskStatus.read;
@@ -180,48 +171,65 @@ workspace Todo id "workspace:todo" revision "workspace:todo@capabilities-v1" com
bind energy.get to state TaskEnergy.read;
bind energy.set to state TaskEnergy.write;
}
conform Task as TaskActions id "conformance:todo:Task:TaskActions" {
conform Task as TaskActions {
bind complete.call to package TodoRuntime.complete with {
data to interface TaskData;
status to state TaskStatus;
};
bind reopen.call to package TodoRuntime.reopen with {
data to interface TaskData;
status to state TaskStatus;
};
bind archive.call to package TodoRuntime.archive with {
data to interface TaskData;
status to state TaskStatus;
};
}
conform Task as DisplayLabel id "conformance:todo:Task:DisplayLabel" {
conform Task as DisplayLabel {
bind label.get to package TodoRuntime.displayLabelGet with {
data to interface TaskData;
title to state TaskTitle;
status to state TaskStatus;
priority to state TaskPriority;
};
bind label.watch-start to package TodoRuntime.displayLabelWatch with {
data to interface TaskData;
title to state TaskTitle;
status to state TaskStatus;
priority to state TaskPriority;
};
bind label.watch-stop to package TodoRuntime.displayLabelWatchStop;
}
conform TaskReactComponent as WebStudioReactComponent id "conformance:todo:TaskReactComponent:WebStudioReactComponent" {
conform TaskReactComponent as WebStudioReactComponent {
bind source.get to package TodoReactRuntime.sourceGet;
bind props.get to package TodoReactRuntime.propsGet with {
data to interface TaskData via edge TaskComponentEdge.subject;
subject to edge TaskComponentEdge.subject;
title to state TaskTitle via edge TaskComponentEdge.subject;
status to state TaskStatus via edge TaskComponentEdge.subject;
priority to state TaskPriority via edge TaskComponentEdge.subject;
notes to state TaskNotes via edge TaskComponentEdge.subject;
dueDate to state TaskDueDate via edge TaskComponentEdge.subject;
energy to state TaskEnergy via edge TaskComponentEdge.subject;
};
bind props.watch-start to package TodoReactRuntime.propsWatch with {
data to interface TaskData via edge TaskComponentEdge.subject;
subject to edge TaskComponentEdge.subject;
title to state TaskTitle via edge TaskComponentEdge.subject;
status to state TaskStatus via edge TaskComponentEdge.subject;
priority to state TaskPriority via edge TaskComponentEdge.subject;
notes to state TaskNotes via edge TaskComponentEdge.subject;
dueDate to state TaskDueDate via edge TaskComponentEdge.subject;
energy to state TaskEnergy via edge TaskComponentEdge.subject;
};
bind props.watch-stop to package TodoReactRuntime.propsWatchStop;
}
constructor Project to ProjectRuntime.createProject;
constructor Task to TodoRuntime.createTask with {
data to interface TaskData;
title to state TaskTitle;
};
constructor ProjectReactComponent to ProjectReactRuntime.createComponent;
constructor TaskReactComponent to TodoReactRuntime.createComponent;
constructor WebStudioCanvas to WebStudioCanvasRuntime.createCanvas;
constructor WebStudioCanvasPlacement to WebStudioCanvasRuntime.createPlacement with {
placement to interface WebStudioCanvasPlacement;
position to state WebStudioPlacementPosition;
size to state WebStudioPlacementSize;
z to state WebStudioPlacementZ;
canvas to edge WebStudioCanvasPlacementEdge.canvas;
subject to edge WebStudioPlacementSubjectEdge.subject;
};
}