lib prompt test passes.

src/lib/prompt.test.ts

@@ -11,7 +11,11 @@ import {
     Category,
     removeFromComposition,
     increaseNuggetScore,
-    decreaseNuggetScore, changeOperationOp, nuggetToText, operationToText, textComposition,
+    decreaseNuggetScore,
+    changeOperationOp,
+    nuggetToText,
+    operationToText,
+    $textComposition,
     $slottedComposition,
     Operation,
     Nugget,
@@ -37,7 +41,11 @@ const mockComposition: CompositionType = [
     },
 ];
 
-beforeAll(() => {
+beforeEach(() => {
+  // clear out the library and composition
+  $library.set([]);
+  $composition.set([]);
+  // insert the items
   mockLibrary.forEach(item => {
         addItemToLibrary(item);
         insertIntoComposition(item);
@@ -65,13 +73,17 @@ test("removeFromComposition", () => {
 });
 
 test("increaseNuggetScore", () => {
-    increaseNuggetScore(mockComposition[0].id, 2);
-    expect((mockComposition[0] as Nugget).score).toBe(2);
+    const comp = $composition.get();
+    increaseNuggetScore(comp[0].id, 2);
+    const comp2 = $composition.get();
+    expect((comp2[0] as Nugget).score).toBe(2);
 });
 
 test("decreaseNuggetScore", () => {
-    decreaseNuggetScore(mockComposition[0].id, 2);
-    expect((mockComposition[0] as Nugget).score).toBe(-2);
+    const comp = $composition.get();
+    decreaseNuggetScore(comp[1].id, -2);
+    const comp2 = $composition.get();
+    expect((comp2[1] as Nugget).score).toBe(-2);
 });
 
 test("changeOperationOp", () => {
@@ -80,27 +92,31 @@ test("changeOperationOp", () => {
 });
 
 test("nuggetToText", () => {
-    expect(nuggetToText({ id: randomUUID(), item: mockLibrary[0], score: 0 })).toBe("(Prompt1)");
+    expect(nuggetToText({ id: randomUUID(), item: mockLibrary[0], score: 0 })).toBe("Prompt1");
 });
 
 test("operationToText", () => {
     expect(operationToText({
         id: randomUUID(), op: Op.AND, items: [
             { id: randomUUID(), item: mockLibrary[0], score: 0 },
-            { id: randomUUID(), item: mockLibrary[1], score: 0 },
+            { id: randomUUID(), item: mockLibrary[1], score: 2 },
         ]
-    })).toBe("(Prompt1, Prompt2).concat()");
+    })).toBe("(Prompt1, Prompt2++).and()");
 });
 
 test("textComposition", () => {
-    expect(textComposition).toBe("(Prompt1)(Prompt2)(Prompt3)(Prompt4)(Prompt1, Prompt2).concat()");
+    $composition.set(mockComposition);
+    expect($textComposition.get()).toBe("Prompt1, Prompt2, Prompt3, Prompt4, (Prompt1, Prompt2).and()");
 });
 
 test("$slottedComposition", () => {
-    expect($slottedComposition).toEqual([
-        [mockComposition[0], mockComposition[1], mockComposition[2], mockComposition[3]],
-        [],
-        [],
-        [],
+    $composition.set(mockComposition);
+    const comp = $composition.get();
+    const slotted = $slottedComposition.get();
+    expect(slotted).toEqual([
+        [comp[0], comp[4]],
+        [comp[1]],
+        [comp[2]],
+        [comp[3]],
     ]);
 });

src/lib/prompt.tsx

@@ -53,7 +53,7 @@ export function addItemToLibrary(item: LibraryItem) {
 }
 
 export function removeItemFromLibrary(item: LibraryItem) {
-    $library.set($library.get().filter(i => i.id != item.id));
+    $library.set($library.get().filter(i => (i.id !== item.id)));
 }
 
 export const $composition = atom<Composition>([])
@@ -67,25 +67,26 @@ export function insertIntoComposition(item: LibraryItem) {
 
 export function removeFromComposition(item: PromptItem) {
     $composition.set([
-        ...$composition.get().filter(i => i.id === item.id)
+        ...$composition.get().filter(i => (i.id !== item.id))
     ]);
 }
 
-export function increaseNuggetScore(nuggetId: Id, amount: number = 1) {
-    $composition.set([
-        ...$composition.get().map(item => {
-            return (item.id == nuggetId && "score" in item) ? { ...item, score: item.score + amount } : item;
+function nuggetDelta(nuggetId : Id, delta : number) {
+    $composition.set($composition.get().map(item => {
+        if ((item.id === nuggetId) && ("score" in item)) {
+            const o = {...item, score: item.score + delta};
+            return o;
         }
-        ),
-    ]);
+        return item;
+    }
+    ));
 }
-export function decreaseNuggetScore(nuggetId: Id, amount: number = 1) {
-    $composition.set([
-        ...$composition.get().map(item => {
-            return (item.id == nuggetId && "score" in item) ? { ...item, score: item.score - amount } : item;
-        }
-        ),
-    ]);
+
+export function increaseNuggetScore(nuggetId: Id, amount: number = 1) {
+    return nuggetDelta(nuggetId, amount)
+}
+export function decreaseNuggetScore(nuggetId: Id, amount: number = -1) {
+    return nuggetDelta(nuggetId, amount);
 }
 
 export function changeOperationOp(operationId: Id, op: Op) {
@@ -98,17 +99,28 @@ export function changeOperationOp(operationId: Id, op: Op) {
 }
 
 export function nuggetToText(nugget: Nugget) {
-    const sign = (nugget.score > 0 ? '+' : (nugget.score < 0 ? '-' : ''))
-    return "(" + nugget.item.prompt + ")" + (new Array(nugget.score)).map(i => sign).join("");
+    const absScore = Math.abs(nugget.score);
+    const neg = nugget.score < 0;
+    const pos = nugget.score > 0;
+    const sign = pos ? "+" : (neg ? "-" : "");
+    const prompt = nugget.item.prompt;
+
+    const signs = new Array(absScore).fill(sign).join("")
+
+    if (prompt.includes(" ")) {
+        return "(" + nugget.item.prompt + ")" + signs;
+    }
+    return nugget.item.prompt + signs;
+
 }
 
 export function operationToText(operation: Operation): string {
     return "(" + operation.items.map(nuggetToText).join(", ") + ")." + operation.op + "()";
 }
 
-export const textComposition = computed($composition, (composition) => {
+export const $textComposition = computed($composition, (composition) => {
     const JOINER = ", ";
-    composition.map(item => {
+    return composition.map(item => {
         return "op" in item ? operationToText(item) : nuggetToText(item);
     }).join(JOINER);
 });
@@ -128,9 +140,15 @@ export const $slottedComposition = computed($composition, (composition) => {
             if (!nugget.items.length)
                 return null;
             const cat = nugget.items[0].item.category;
+            if (!slotted[catI(cat)]) {
+                slotted[catI(cat)] = [];
+            }
             slotted[catI(cat)].push(nugget);
         } else {
             const cat = nugget.item.category;
+            if (!slotted[catI(cat)]) {
+                slotted[catI(cat)] = [];
+            }
             slotted[catI(cat)].push(nugget);
         }
     })