Merge branch 'main' into cwegrzyn/issue46-Make-entity-folders-configu…

…rable

esbuild.config.js

@@ -1,3 +1,4 @@
+import { typecheckPlugin } from "@jgoz/esbuild-plugin-typecheck";
 import builtins from "builtin-modules";
 import esbuild from "esbuild";
 import process from "process";
@@ -10,8 +11,6 @@ if you want to view the source, please visit the github repository of this plugi
 
 const prod = process.argv[2] === "production";
 
-const ASSETS = ["styles.css", "manifest.json"];
-
 const context = await esbuild.context({
   banner: {
     js: banner,
@@ -40,6 +39,7 @@ const context = await esbuild.context({
   sourcemap: prod ? false : "inline",
   treeShaking: true,
   outfile: prod ? "main.js" : "test-vault/.obsidian/plugins/forged/main.js",
+  plugins: [typecheckPlugin({ watch: !prod })],
 });
 
 const cssCtx = await esbuild.context({

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "forged",
   "name": "Forged Plugin",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "minAppVersion": "0.15.0",
   "description": "Ironsworn/Starforged gameplay plugin",
   "author": "Chris Wegrzyn",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forged",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "",
   "main": "main.js",
   "type": "module",
@@ -24,6 +24,7 @@
     "@codemirror/view": "^6.26.3",
     "@datasworn/core": "0.0.10",
     "@datasworn/starforged": "0.0.10",
+    "@jgoz/esbuild-plugin-typecheck": "^4.0.0",
     "@nrsk/sigma": "^3.8.0",
     "@popperjs/core": "^2.11.8",
     "@swc/core": "^1.5.7",

src/characters/lens.test.ts

@@ -505,7 +505,6 @@ describe("Special Tracks", () => {
     ).toMatchObject({
       Quests_Progress: 6,
       Quests_XPEarned: 2,
-      Quests_TrackImage: "[[track-6]]",
     });
   });
 

src/characters/lens.ts

@@ -81,12 +81,10 @@ function camelCase(str: string): string {
 
 function legacyTrack(specialTrackRule: SpecialTrackRule) {
   const formattedLabel = camelCase(specialTrackRule.label);
-  const trackImageKey = `${formattedLabel}_TrackImage`;
   const progressKey = `${formattedLabel}_Progress`;
   const xpEarnedKey = `${formattedLabel}_XPEarned`;
   return {
     schema: {
-      [trackImageKey]: z.string().optional(),
       [progressKey]: z.number().int().nonnegative(),
       [xpEarnedKey]: z.number().int().nonnegative(),
     },

src/index.ts

@@ -34,6 +34,7 @@ import { OracleModal } from "oracles/oracle-modal";
 import { MoveModal } from "moves/move-modal";
 import { ViewPlugin, ViewUpdate } from "@codemirror/view";
 import registerTrackBlock from "tracks/track-block";
+import registerClockBlock from "tracks/clock-block";
 
 export default class ForgedPlugin extends Plugin {
   settings!: ForgedPluginSettings;
@@ -220,6 +221,7 @@ export default class ForgedPlugin extends Plugin {
     registerOracleBlock(this, this.datastore);
     registerMechanicsBlock(this);
     registerTrackBlock(this);
+    registerClockBlock(this);
   }
 
   async activateView() {

src/mechanics/node-builders.ts

@@ -1,5 +1,7 @@
 import * as kdl from "kdljs";
+import { Document, Node } from "kdljs";
 import { RollWrapper } from "model/rolls";
+import { MoveDescription, moveIsAction, moveIsProgress } from "moves/desc";
 import { oracleNameWithParents } from "oracles/render";
 import { Clock } from "tracks/clock";
 import { ClockFileAdapter } from "tracks/clock-file";
@@ -51,3 +53,66 @@ export function createOracleNode(roll: RollWrapper, prompt?: string): kdl.Node {
     ],
   });
 }
+export function generateMechanicsNode(move: MoveDescription): Document {
+  const children: Node[] = [];
+  if (moveIsAction(move)) {
+    const adds = (move.adds ?? []).reduce((acc, { amount }) => acc + amount, 0);
+
+    // Add "add" nodes for each non-zero add
+    children.push(
+      ...(move.adds ?? [])
+        .filter(({ amount }) => amount != 0)
+        .map(({ amount, desc }) =>
+          node("add", { values: [amount, ...(desc ? [desc] : [])] }),
+        ),
+    );
+
+    // Main roll node
+    children.push(
+      node("roll", {
+        values: [move.stat],
+        properties: {
+          action: move.action,
+          stat: move.statVal,
+          adds,
+          vs1: move.challenge1,
+          vs2: move.challenge2,
+        },
+      }),
+    );
+
+    // Momentum burn
+    if (move.burn) {
+      children.push(
+        node("burn", {
+          properties: { from: move.burn.orig, to: move.burn.reset },
+        }),
+      );
+    }
+  } else if (moveIsProgress(move)) {
+    children.push(
+      node("progress-roll", {
+        properties: {
+          // TODO: what about progress track id?
+          // TODO: use a ticks prop instead... or at least use a helper to get this
+          score: Math.floor(move.progressTicks / 4),
+          vs1: move.challenge1,
+          vs2: move.challenge2,
+        },
+      }),
+    );
+  } else {
+    throw new Error("what kind of move is this?");
+  }
+
+  const doc: Document = [
+    node("move", {
+      values: [generateMoveLink(move)],
+      children,
+    }),
+  ];
+  return doc;
+}
+function generateMoveLink(move: MoveDescription): string {
+  return move.id ? `[${move.name}](move:${move.id})` : move.name;
+}

src/moves/action/format.ts

@@ -1,70 +1,7 @@
-import { Document, Node } from "kdljs";
 import { createOrAppendMechanics } from "mechanics/editor";
+import { generateMechanicsNode } from "mechanics/node-builders";
 import { Editor } from "obsidian";
-import { node } from "../../utils/kdl";
-import { MoveDescription, moveIsAction, moveIsProgress } from "../desc";
-
-function generateMechanicsNode(move: MoveDescription): Document {
-  const children: Node[] = [];
-  if (moveIsAction(move)) {
-    const adds = (move.adds ?? []).reduce((acc, { amount }) => acc + amount, 0);
-
-    // Add "add" nodes for each non-zero add
-    children.push(
-      ...(move.adds ?? [])
-        .filter(({ amount }) => amount != 0)
-        .map(({ amount, desc }) =>
-          node("add", { values: [amount, ...(desc ? [desc] : [])] }),
-        ),
-    );
-
-    // Main roll node
-    children.push(
-      node("roll", {
-        values: [move.stat],
-        properties: {
-          action: move.action,
-          stat: move.statVal,
-          adds,
-          vs1: move.challenge1,
-          vs2: move.challenge2,
-        },
-      }),
-    );
-
-    // Momentum burn
-    if (move.burn) {
-      children.push(
-        node("burn", {
-          properties: { from: move.burn.orig, to: move.burn.reset },
-        }),
-      );
-    }
-  } else if (moveIsProgress(move)) {
-    children.push(
-      node("progress-roll", {
-        properties: {
-          // TODO: what about progress track id?
-          // TODO: use a ticks prop instead... or at least use a helper to get this
-          score: Math.floor(move.progressTicks / 4),
-          vs1: move.challenge1,
-          vs2: move.challenge2,
-        },
-      }),
-    );
-  } else {
-    throw new Error("what kind of move is this?");
-  }
-
-  // TODO: move name vs move id
-  const doc: Document = [
-    node("move", {
-      values: [move.name],
-      children,
-    }),
-  ];
-  return doc;
-}
+import { MoveDescription } from "../desc";
 
 export function renderMechanics(editor: Editor, move: MoveDescription): void {
   createOrAppendMechanics(editor, generateMechanicsNode(move));

src/moves/action/index.ts

@@ -12,7 +12,6 @@ import {
   type MarkdownView,
 } from "obsidian";
 import { MeterCommon } from "rules/ruleset";
-import { makeSafeForId } from "utils/strings";
 import {
   MeterWithLens,
   MeterWithoutLens,
@@ -66,10 +65,11 @@ const ROLL_TYPES: Record<Datasworn.Move["roll_type"], string> = {
   special_track: "Special track roll",
 };
 
-const promptForMove = async (
+async function promptForMove(
   app: App,
-  moves: Datasworn.Move[],
-): Promise<Datasworn.Move> => {
+  context: ActionContext,
+): Promise<Datasworn.Move> {
+  const moves = [...context.moves].sort((a, b) => a.name.localeCompare(b.name));
   const choice = await CustomSuggestModal.selectWithUserEntry(
     app,
     moves,
@@ -102,7 +102,7 @@ const promptForMove = async (
   const baseMove = {
     roll_type,
     type: "move",
-    _id: `adhoc/moves/custom/${makeSafeForId(choice.custom)}`,
+    _id: "",
     name: choice.custom,
     _source: {
       title: "Adhoc",
@@ -157,14 +157,16 @@ const promptForMove = async (
         },
       } satisfies Datasworn.MoveSpecialTrack;
   }
-};
+}
+
 function processActionMove(
   move: Datasworn.Move,
   stat: string,
   statVal: number,
   adds: ActionMoveAdd[],
 ): ActionMoveDescription {
   return {
+    id: move._id,
     name: move.name,
     action: randomInt(1, 6),
     stat,
@@ -180,6 +182,7 @@ function processProgressMove(
   tracker: ProgressTrackWriterContext,
 ): ProgressMoveDescription {
   return {
+    id: move._id,
     name: move.name,
     progressTrack: `[[${tracker.location}]]`,
     progressTicks: tracker.track.progress,
@@ -200,6 +203,7 @@ export async function runMoveCommand(
   plugin: ForgedPlugin,
   editor: Editor,
   view: MarkdownView,
+  chosenMove?: Datasworn.Move,
 ): Promise<void> {
   if (view.file?.path == null) {
     console.error("No file for view. Why?");
@@ -212,11 +216,9 @@ export async function runMoveCommand(
     return;
   }
 
-  const allMoves = [...context.moves].sort((a, b) =>
-    a.name.localeCompare(b.name),
-  );
-
-  const move = await promptForMove(plugin.app, allMoves);
+  // Use the provided move, or prompt the user for a move appropriate to the current action context.
+  const move: Datasworn.Move =
+    chosenMove ?? (await promptForMove(plugin.app, context));
 
   let moveDescription: MoveDescription;
   switch (move.roll_type) {

src/moves/desc.ts

@@ -29,6 +29,7 @@ export type ActionMoveAdd = z.output<typeof ActionMoveAddSchema>;
 
 export const ActionMoveDescriptionSchemaV2 =
   ActionMoveDescriptionSchemaV1.extend({
+    id: z.string().optional(),
     adds: z.array(ActionMoveAddSchema).default([]),
   });
 
@@ -41,6 +42,7 @@ export type ActionMoveDescription = ActionMoveDescriptionV2;
 export type BurnDescriptor = z.infer<typeof BurnDescriptorSchema>;
 
 const ProgressMoveDescriptionSchema = z.object({
+  id: z.string().optional(),
   name: z.string(),
   progressTrack: z.string(),
   progressTicks: z.number(),
@@ -52,17 +54,26 @@ export type ProgressMoveDescription = z.infer<
   typeof ProgressMoveDescriptionSchema
 >;
 
+export const NoRollMoveDescriptionSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+});
+
+export type NoRollMoveDescription = z.infer<typeof NoRollMoveDescriptionSchema>;
+
 export const AllMoveDescriptionSchemas = z.union([
   ActionMoveDescriptionSchemaV2,
   ProgressMoveDescriptionSchema,
   ActionMoveDescriptionSchemaV1,
+  // NoRollMoveDescriptionSchema,
 ]);
 
 export type AllMoveDescriptions = z.infer<typeof AllMoveDescriptionSchemas>;
 
 export const MoveDescriptionSchema = z.union([
   ActionMoveDescriptionSchemaV2,
   ProgressMoveDescriptionSchema,
+  // NoRollMoveDescriptionSchema,
 ]);
 
 export type MoveDescription = z.infer<typeof MoveDescriptionSchema>;