- ${results.join(``)}
Successes: ${successes}
Crits: ${critsOnly}`; + + + if (rollMode === CONST.DICE_ROLL_MODES.BLIND) { + ui.notifications.warn(`Cannot make a blind roll from the macro, rolling with mode "Private GM Roll" instead`); + rollMode = CONST.DICE_ROLL_MODES.PRIVATE; + } + + const chatData = ChatMessage.applyRollMode( + { + title: `Dice Pool`, + content, + }, + rollMode, + ); + + await ChatMessage.implementation.create(chatData); +} + +rollDice() \ No newline at end of file diff --git a/scripts/prepareManifest.mjs b/scripts/prepareManifest.mjs deleted file mode 100644 index 34f4236..0000000 --- a/scripts/prepareManifest.mjs +++ /dev/null @@ -1,45 +0,0 @@ -/* -The intent of this script is to do all of the modifications of the -manifest file that we need to do in order to release the system. -This can include removing dev-only fields/attributes that end -users will never, and should never, care about nor need. -*/ -import { readFile, writeFile } from "fs/promises"; - -const MANIFEST_PATH = `system.json`; - -const { - DOWNLOAD_URL, - LATEST_URL, -} = process.env; - -let manifest; -try { - manifest = JSON.parse(await readFile(MANIFEST_PATH, `utf-8`)); - console.log(`Manifest loaded from disk`); -} catch { - console.error(`Failed to parse manifest file.`); - process.exit(1); -}; - -console.log(`Updating download/manifest URLs`) -manifest.download = DOWNLOAD_URL; -manifest.manifest = LATEST_URL; - -// Filter out dev-only resources -if (manifest.esmodules) { - console.log(`Removing dev-only esmodules`); - manifest.esmodules = manifest.esmodules.filter( - filepath => !filepath.startsWith(`dev/`) - ); -}; - -// Remove dev flags -console.log(`Cleaning up flags`); -delete manifest.flags?.hotReload; -if (Object.keys(manifest.flags).length === 0) { - delete manifest.flags; -}; - -await writeFile(MANIFEST_PATH, JSON.stringify(manifest, undefined, `\t`)); -console.log(`Manifest written back to disk`); diff --git a/scripts/tagExists.mjs b/scripts/tagExists.mjs deleted file mode 100644 index 2ddcdbd..0000000 --- a/scripts/tagExists.mjs +++ /dev/null @@ -1,38 +0,0 @@ -import axios from "axios"; - -const { - TAG_NAME, - FORGEJO_API_URL: API_URL, - FORGEJO_REPOSITORY: REPO, - FORGEJO_TOKEN: TOKEN, -} = process.env; - - -async function main() { - - if (!TAG_NAME) { - console.log(`Tag name must not be blank`); - process.exit(1); - }; - - const requestURL = `${API_URL}/repos/${REPO}/tags/${TAG_NAME}`; - - const response = await axios.get( - requestURL, - { - headers: { Authorization: `token ${TOKEN}` }, - validateStatus: () => true, - }, - ); - - // We actually *want* an error when the tag exists, instead of when - // it doesn't - if (response.status === 200) { - console.log(`Tag with name "${TAG_NAME}" already exists`); - process.exit(1); - }; - - console.log(`Tag with name "${TAG_NAME}" not found, proceeding`); -}; - -main(); diff --git a/scripts/uploadToS3.mjs b/scripts/uploadToS3.mjs deleted file mode 100644 index 50c1444..0000000 --- a/scripts/uploadToS3.mjs +++ /dev/null @@ -1,65 +0,0 @@ -import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3'; -import { createReadStream } from "fs"; - -const requiredEnvVariables = [ - `TAG`, `FILE`, - `FORGEJO_REPOSITORY`, - `S3_BUCKET`, `S3_REGION`, `S3_KEY`, `S3_SECRET`, `S3_ENDPOINT`, -]; - -async function main() { - - // Assert all of the required env variables are present - const missing = []; - for (const envVar of requiredEnvVariables) { - if (!(envVar in process.env)) { - missing.push(envVar); - }; - }; - if (missing.length > 0) { - console.error(`Missing the following required environment variables: ${missing.join(`, `)}`); - process.exit(1); - }; - - const { - TAG, - S3_ENDPOINT, - S3_REGION, - S3_KEY, - S3_SECRET, - S3_BUCKET, - FILE, - FORGEJO_REPOSITORY: REPO, - } = process.env; - - const s3Client = new S3Client({ - endpoint: S3_ENDPOINT, - forcePathStyle: false, - region: S3_REGION, - credentials: { - accessKeyId: S3_KEY, - secretAccessKey: S3_SECRET - }, - }); - - const name = FILE.split(`/`).at(-1); - - const params = { - Bucket: S3_BUCKET, - Key: `${REPO}/${TAG}/${name}`, - Body: createReadStream(FILE), - ACL: "public-read", - METADATA: { - "x-repo-version": TAG, - }, - }; - - try { - const response = await s3Client.send(new PutObjectCommand(params)); - console.log("Upload successful"); - } catch (err) { - console.error("Upload to s3 failed"); - }; -}; - -main(); \ No newline at end of file diff --git a/src/components/_index.mjs b/src/components/_index.mjs new file mode 100644 index 0000000..44133d9 --- /dev/null +++ b/src/components/_index.mjs @@ -0,0 +1,32 @@ +import { SystemIcon } from "./icon.mjs"; +import { SystemIncrementer } from "./incrementer.mjs"; +import { SystemRange } from "./range.mjs"; + +/** + * A list of element classes to register, expects all of them to have a static + * property of "elementName" that is the namespaced name that the component will + * be registered under. Any elements that are formAssociated have their name added + * to the "CONFIG.CACHE.componentListeners" array and should be listened to for + * "change" events in sheets. + */ +const components = [ + SystemIcon, + SystemIncrementer, + SystemRange, +]; + +export function registerCustomComponents() { + (CONFIG.CACHE ??= {}).componentListeners ??= []; + for (const component of components) { + if (!window.customElements.get(component.elementName)) { + console.debug(`${game.system.id} | Registering component "${component.elementName}"`); + window.customElements.define( + component.elementName, + component, + ); + if (component.formAssociated) { + CONFIG.CACHE.componentListeners.push(component.elementName); + } + }; + }; +}; diff --git a/module/apps/elements/svgLoader.mjs b/src/components/icon.mjs similarity index 63% rename from module/apps/elements/svgLoader.mjs rename to src/components/icon.mjs index a209ccd..430076d 100644 --- a/module/apps/elements/svgLoader.mjs +++ b/src/components/icon.mjs @@ -1,18 +1,16 @@ -import { filePath } from "../../consts.mjs"; -import { Logger } from "../../utils/Logger.mjs"; -import { StyledShadowElement } from "./StyledShadowElement.mjs"; +import { StyledShadowElement } from "./mixins/Styles.mjs"; /** Attributes: @property {string} name - The name of the icon, takes precedence over the path @property {string} path - The path of the icon file */ -export class TafSVGLoader extends StyledShadowElement(HTMLElement) { - static elementName = `taf-svg`; +export class SystemIcon extends StyledShadowElement(HTMLElement) { + static elementName = `dd-icon`; static formAssociated = false; /* Stuff for the mixin to use */ - static _stylePath = `svg-loader.css`; + static _stylePath = ``; static _cache = new Map(); @@ -22,8 +20,12 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { /** @type {null | string} */ _path; + /* Stored IDs for all of the hooks that are in this component */ + #svgHmr; + constructor() { super(); + // this._shadow = this.attachShadow({ mode: `open`, delegatesFocus: true }); this.#container = document.createElement(`div`); this._shadow.appendChild(this.#container); @@ -32,7 +34,7 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { _mounted = false; async connectedCallback() { super.connectedCallback(); - if (this._mounted) { return }; + if (this._mounted) { return } this._name = this.getAttribute(`name`); this._path = this.getAttribute(`path`); @@ -54,7 +56,7 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { */ let content; if (this._name) { - content = await this.#getIcon(filePath(`assets/${this._name}.svg`)); + content = await this.#getIcon(`./systems/dotdungeon/assets/${this._name}.svg`); }; if (this._path && !content) { @@ -65,12 +67,28 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { this.#container.appendChild(content.cloneNode(true)); }; + /* + This is so that when we get an HMR event from Foundry we can appropriately + handle it using our logic to update the component and the icon cache. + */ + if (game.settings.get(game.system.id, `devMode`)) { + this.#svgHmr = Hooks.on(`${game.system.id}-hmr:svg`, (iconName, data) => { + if (this._name === iconName || this._path?.endsWith(data.path)) { + const svg = this.#parseSVG(data.content); + this.constructor._cache.set(iconName, svg); + this.#container.replaceChildren(svg.cloneNode(true)); + }; + }); + }; + this._mounted = true; }; disconnectedCallback() { super.disconnectedCallback(); - if (!this._mounted) { return }; + if (!this._mounted) { return } + + Hooks.off(`${game.system.id}-hmr:svg`, this.#svgHmr); this._mounted = false; }; @@ -78,7 +96,7 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { async #getIcon(path) { // Cache hit! if (this.constructor._cache.has(path)) { - Logger.debug(`Image ${path} cache hit`); + Logger.debug(`Icon ${path} cache hit`); return this.constructor._cache.get(path); }; @@ -92,7 +110,7 @@ export class TafSVGLoader extends StyledShadowElement(HTMLElement) { return; }; - Logger.debug(`Adding image ${path} to the cache`); + Logger.debug(`Adding icon ${path} to the cache`); const svg = this.#parseSVG(await r.text()); this.constructor._cache.set(path, svg); return svg; diff --git a/src/components/incrementer.mjs b/src/components/incrementer.mjs new file mode 100644 index 0000000..cde1cec --- /dev/null +++ b/src/components/incrementer.mjs @@ -0,0 +1,153 @@ +import { StyledShadowElement } from "./mixins/Styles.mjs"; +import { SystemIcon } from "./icon.mjs"; + +/** +Attributes: +@property {string} name - The path to the value to update +@property {number} value - The actual value of the input +@property {number} min - The minimum value of the input +@property {number} max - The maximum value of the input +@property {number?} smallStep - The step size used for the buttons and arrow keys +@property {number?} largeStep - The step size used for the buttons + Ctrl and page up / down + +Styling: +- `--height`: Controls the height of the element + the width of the buttons (default: 1.25rem) +- `--width`: Controls the width of the number input (default 50px) +*/ +export class SystemIncrementer extends StyledShadowElement(HTMLElement) { + static elementName = `dd-incrementer`; + static formAssociated = true; + + static _stylePath = `v1/components/incrementer.scss`; + + _internals; + #input; + + _min; + _max; + _smallStep; + _largeStep; + + constructor() { + super(); + + // Form internals + this._internals = this.attachInternals(); + this._internals.role = `spinbutton`; + }; + + get form() { + return this._internals.form; + } + + get name() { + return this.getAttribute(`name`); + } + set name(value) { + this.setAttribute(`name`, value); + } + + get value() { + return this.getAttribute(`value`); + }; + set value(value) { + this.setAttribute(`value`, value); + }; + + get type() { + return `number`; + } + + connectedCallback() { + super.connectedCallback(); + this.replaceChildren(); + + // Attribute parsing / registration + const value = this.getAttribute(`value`); + this._min = parseInt(this.getAttribute(`min`) ?? 0); + this._max = parseInt(this.getAttribute(`max`) ?? 0); + this._smallStep = parseInt(this.getAttribute(`smallStep`) ?? 1); + this._largeStep = parseInt(this.getAttribute(`largeStep`) ?? 5); + + this._internals.ariaValueMin = this._min; + this._internals.ariaValueMax = this._max; + + const container = document.createElement(`div`); + + // The input that the user can see / modify + const input = document.createElement(`input`); + this.#input = input; + input.type = `number`; + input.ariaHidden = true; + input.min = this.getAttribute(`min`); + input.max = this.getAttribute(`max`); + input.addEventListener(`change`, this.#updateValue.bind(this)); + input.value = value; + + // plus button + const increment = document.createElement(SystemIcon.elementName); + increment.setAttribute(`name`, `ui/plus`); + increment.setAttribute(`var:size`, `0.75rem`); + increment.setAttribute(`var:fill`, `currentColor`); + increment.ariaHidden = true; + increment.classList.value = `increment`; + increment.addEventListener(`mousedown`, this.#increment.bind(this)); + + // minus button + const decrement = document.createElement(SystemIcon.elementName); + decrement.setAttribute(`name`, `ui/minus`); + decrement.setAttribute(`var:size`, `0.75rem`); + decrement.setAttribute(`var:fill`, `currentColor`); + decrement.ariaHidden = true; + decrement.classList.value = `decrement`; + decrement.addEventListener(`mousedown`, this.#decrement.bind(this)); + + // Construct the DOM + container.appendChild(decrement); + container.appendChild(input); + container.appendChild(increment); + this._shadow.appendChild(container); + + /* + This converts all of the namespace prefixed properties on the element to + CSS variables so that they don't all need to be provided by doing style="" + */ + for (const attrVar of this.attributes) { + if (attrVar.name?.startsWith(`var:`)) { + const prop = attrVar.name.replace(`var:`, ``); + this.style.setProperty(`--` + prop, attrVar.value); + }; + }; + }; + + #updateValue() { + let value = parseInt(this.#input.value); + if (this.getAttribute(`min`)) { + value = Math.max(this._min, value); + } + if (this.getAttribute(`max`)) { + value = Math.min(this._max, value); + } + this.#input.value = value; + this.value = value; + this.dispatchEvent(new Event(`change`, { bubbles: true })); + }; + + /** @param {Event} $e */ + #increment($e) { + $e.preventDefault(); + let value = parseInt(this.#input.value); + value += $e.ctrlKey ? this._largeStep : this._smallStep; + this.#input.value = value; + this.#updateValue(); + }; + + /** @param {Event} $e */ + #decrement($e) { + $e.preventDefault(); + let value = parseInt(this.#input.value); + value -= $e.ctrlKey ? this._largeStep : this._smallStep; + this.#input.value = value; + this.#updateValue(); + }; +}; diff --git a/module/apps/elements/StyledShadowElement.mjs b/src/components/mixins/Styles.mjs similarity index 53% rename from module/apps/elements/StyledShadowElement.mjs rename to src/components/mixins/Styles.mjs index 4929868..b76dd29 100644 --- a/module/apps/elements/StyledShadowElement.mjs +++ b/src/components/mixins/Styles.mjs @@ -1,5 +1,3 @@ -import { filePath } from "../../consts.mjs"; - /** * @param {HTMLElement} Base */ @@ -13,9 +11,9 @@ export function StyledShadowElement(Base) { /** * The stringified CSS to use - * @type {Map
-
-
-
diff --git a/templates/Ask/inputs.hbs b/templates/Ask/inputs.hbs
deleted file mode 100644
index 36c1ea9..0000000
--- a/templates/Ask/inputs.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-
- {{#if description}}
-
diff --git a/templates/Ask/inputs/checkbox.hbs b/templates/Ask/inputs/checkbox.hbs
deleted file mode 100644
index ce8fd88..0000000
--- a/templates/Ask/inputs/checkbox.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-- {{ description }} -
- {{/if}} - {{#each inputs as | i |}} - {{> (concat (systemFilePath "templates/Ask/inputs/" ) i.type ".hbs") i}} - {{/each}} -
-
-
-
diff --git a/templates/Ask/inputs/details.hbs b/templates/Ask/inputs/details.hbs
deleted file mode 100644
index f84af5d..0000000
--- a/templates/Ask/inputs/details.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-- {{{ details }}} -
diff --git a/templates/Ask/inputs/divider.hbs b/templates/Ask/inputs/divider.hbs deleted file mode 100644 index e123ba7..0000000 --- a/templates/Ask/inputs/divider.hbs +++ /dev/null @@ -1 +0,0 @@ -diff --git a/templates/Ask/inputs/error.hbs b/templates/Ask/inputs/error.hbs deleted file mode 100644 index 6fb1086..0000000 --- a/templates/Ask/inputs/error.hbs +++ /dev/null @@ -1,3 +0,0 @@ -
- {{ details }} -
\ No newline at end of file diff --git a/templates/Ask/inputs/input.hbs b/templates/Ask/inputs/input.hbs deleted file mode 100644 index 98922df..0000000 --- a/templates/Ask/inputs/input.hbs +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-
diff --git a/templates/Ask/inputs/select.hbs b/templates/Ask/inputs/select.hbs
deleted file mode 100644
index 9d64e34..0000000
--- a/templates/Ask/inputs/select.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/templates/AttributeManager/attribute-list.hbs b/templates/AttributeManager/attribute-list.hbs
deleted file mode 100644
index 5899acb..0000000
--- a/templates/AttributeManager/attribute-list.hbs
+++ /dev/null
@@ -1,41 +0,0 @@
-
- {{#each attrs as |attr|}}
-
diff --git a/templates/AttributeManager/controls.hbs b/templates/AttributeManager/controls.hbs
deleted file mode 100644
index 59dbb9b..0000000
--- a/templates/AttributeManager/controls.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- {{else}}
- No attributes yet
- {{/each}} -
-
-
-
diff --git a/templates/Dialogs/ask.hbs b/templates/Dialogs/ask.hbs
new file mode 100644
index 0000000..a37f56e
--- /dev/null
+++ b/templates/Dialogs/ask.hbs
@@ -0,0 +1,27 @@
+
+
diff --git a/templates/Player/v1/main.hbs b/templates/Player/v1/main.hbs
new file mode 100644
index 0000000..64e24d8
--- /dev/null
+++ b/templates/Player/v1/main.hbs
@@ -0,0 +1,29 @@
+
diff --git a/templates/PlayerSheet/attributes.hbs b/templates/PlayerSheet/attributes.hbs
deleted file mode 100644
index c52b575..0000000
--- a/templates/PlayerSheet/attributes.hbs
+++ /dev/null
@@ -1,34 +0,0 @@
-{{#if hasAttributes}}
- + {{ question }} +
+ {{#each inputs as | i | }} +
+
+
+ {{#if i.details}}
+
+ {{/each}}
++ {{{ i.details }}} +
+ {{/if}} +
- {{#each attrs as | attr |}}
-
- {{/each}}
-
-{{else}}
-
-{{/if}}
diff --git a/templates/PlayerSheet/content.hbs b/templates/PlayerSheet/content.hbs
deleted file mode 100644
index c7b547d..0000000
--- a/templates/PlayerSheet/content.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-
- {{#if editable}}
-
- {{{ enriched.system.content }}}
-
- {{else}}
- {{{ enriched.system.content }}}
- {{/if}}
-
\ No newline at end of file
diff --git a/templates/PlayerSheet/header.hbs b/templates/PlayerSheet/header.hbs
deleted file mode 100644
index 3e5daf3..0000000
--- a/templates/PlayerSheet/header.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
diff --git a/templates/QueryStatus/users.hbs b/templates/QueryStatus/users.hbs
deleted file mode 100644
index e0c7922..0000000
--- a/templates/QueryStatus/users.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
--
- {{#each users as | user |}}
-
-
- -- {{#if (eq user.status "finished")}} -- {{ user.name }} -- {{#if (eq user.status "waiting")}} - - {{else if (eq user.status "disconnected")}} -
- {{else if (eq user.status "unprompted")}} - - {{/if}} - - {{#each user.answers as | answer |}} -- {{/if}} -- - {{ @key }} - - - {{ answer }} - -- {{/each}} -
- {{/each}}
-
- {{> "templates/sheets/document-sheet-config.hbs" }}
-
diff --git a/templates/TAFDocumentSheetConfig/system.hbs b/templates/TAFDocumentSheetConfig/system.hbs
deleted file mode 100644
index a39e0c8..0000000
--- a/templates/TAFDocumentSheetConfig/system.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
diff --git a/templates/query-response.hbs b/templates/query-response.hbs
deleted file mode 100644
index 9a62311..0000000
--- a/templates/query-response.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-{{#if answers}}
- | {{ localize "taf.misc.Key" }} | -{{ localize "taf.misc.Value" }} | -
| {{ @key }} | -{{ answer }} | -