5etools-utils 0.13.6 → 0.13.8

package/lib/BrewCleaner.js

@@ -126,7 +126,10 @@ class _BrewFileTester {
 export class BrewCleaner {
 	static _IS_FAIL_SLOW = !!process.env.FAIL_SLOW;
 
-	static _RE_INVALID_WINDOWS_CHARS = /[<>:"/\\|?*]/;
+	// Exclude:
+	//  - Characters which are invalid in Windows filenames
+	//  - Characters which have significance in a URL
+	static _RE_INVALID_CHARS = /[<>:"/\\|?*#%@]/;
 
 	static _cleanFolder (folder) {
 		const ALL_ERRORS = [];
@@ -135,7 +138,7 @@ export class BrewCleaner {
 		for (const file of files) {
 			let contents = Uf.readJsonSync(file);
 
-			if (this._RE_INVALID_WINDOWS_CHARS.test(file.split("/").slice(1).join("/"))) {
+			if (this._RE_INVALID_CHARS.test(file.split("/").slice(1).join("/"))) {
 				ALL_ERRORS.push(`${file} contained invalid characters!`);
 				if (!this._IS_FAIL_SLOW) break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.13.6",
+	"version": "0.13.8",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",

package/schema/brew/util-foundry.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "util-foundry.json",
 	"title": "Util: Foundry",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"$defs": {
 		"entryDataObject": {
 			"description": "Additional \"5etools-type\" data to be stored on the entry.",
@@ -113,11 +113,285 @@
 			},
 			"minProperties": 1
 		},
-		"_foundryActivityObject_utility": {
+		"_foundryActivityObject_base": {
+			"type": "object",
+			"properties": {
+				"consumption": {
+					"type": "object",
+					"properties": {
+						"targets": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"target": {
+										"oneOf": [
+											{
+												"type": "string"
+											},
+											{
+												"type": "object",
+												"properties": {
+													"prop": {
+														"type": "string"
+													},
+													"uid": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"prop",
+													"uid"
+												],
+												"additionalProperties": false
+											}
+										]
+									}
+								}
+							}
+						}
+					}
+				},
+				"effects": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"foundryId": {
+								"$ref": "#/$defs/foundryIdShort"
+							}
+						},
+						"required": [
+							"foundryId"
+						]
+					}
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"_foundryActivityObject_damage": {
 			"type": "object",
 			"properties": {
+				"consumption": {
+					"type": "object",
+					"properties": {
+						"targets": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"target": {
+										"oneOf": [
+											{
+												"type": "string"
+											},
+											{
+												"type": "object",
+												"properties": {
+													"prop": {
+														"type": "string"
+													},
+													"uid": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"prop",
+													"uid"
+												],
+												"additionalProperties": false
+											}
+										]
+									}
+								}
+							}
+						}
+					}
+				},
+				"effects": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"foundryId": {
+								"$ref": "#/$defs/foundryIdShort"
+							}
+						},
+						"required": [
+							"foundryId"
+						]
+					}
+				},
 				"type": {
-					"const": "utility"
+					"const": "damage"
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"_foundryActivityObject_save": {
+			"type": "object",
+			"properties": {
+				"consumption": {
+					"type": "object",
+					"properties": {
+						"targets": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"target": {
+										"oneOf": [
+											{
+												"type": "string"
+											},
+											{
+												"type": "object",
+												"properties": {
+													"prop": {
+														"type": "string"
+													},
+													"uid": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"prop",
+													"uid"
+												],
+												"additionalProperties": false
+											}
+										]
+									}
+								}
+							}
+						}
+					}
+				},
+				"effects": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"foundryId": {
+								"$ref": "#/$defs/foundryIdShort"
+							}
+						},
+						"required": [
+							"foundryId"
+						]
+					}
+				},
+				"type": {
+					"const": "save"
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"_foundryActivityObject_heal": {
+			"type": "object",
+			"properties": {
+				"consumption": {
+					"type": "object",
+					"properties": {
+						"targets": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"target": {
+										"oneOf": [
+											{
+												"type": "string"
+											},
+											{
+												"type": "object",
+												"properties": {
+													"prop": {
+														"type": "string"
+													},
+													"uid": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"prop",
+													"uid"
+												],
+												"additionalProperties": false
+											}
+										]
+									}
+								}
+							}
+						}
+					}
+				},
+				"effects": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"foundryId": {
+								"$ref": "#/$defs/foundryIdShort"
+							}
+						},
+						"required": [
+							"foundryId"
+						]
+					}
+				},
+				"type": {
+					"const": "heal"
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"_foundryActivityObject_utility": {
+			"type": "object",
+			"properties": {
+				"consumption": {
+					"type": "object",
+					"properties": {
+						"targets": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"target": {
+										"oneOf": [
+											{
+												"type": "string"
+											},
+											{
+												"type": "object",
+												"properties": {
+													"prop": {
+														"type": "string"
+													},
+													"uid": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"prop",
+													"uid"
+												],
+												"additionalProperties": false
+											}
+										]
+									}
+								}
+							}
+						}
+					}
 				},
 				"effects": {
 					"type": "array",
@@ -132,6 +406,9 @@
 							"foundryId"
 						]
 					}
+				},
+				"type": {
+					"const": "utility"
 				}
 			},
 			"required": [
@@ -140,6 +417,15 @@
 		},
 		"foundryActivityObject": {
 			"anyOf": [
+				{
+					"$ref": "#/$defs/_foundryActivityObject_damage"
+				},
+				{
+					"$ref": "#/$defs/_foundryActivityObject_save"
+				},
+				{
+					"$ref": "#/$defs/_foundryActivityObject_heal"
+				},
 				{
 					"$ref": "#/$defs/_foundryActivityObject_utility"
 				}
@@ -158,6 +444,9 @@
 				"img": {
 					"type": "string"
 				},
+				"description": {
+					"type": "string"
+				},
 				"changes": {
 					"type": "array",
 					"items": {
@@ -279,6 +568,20 @@
 							]
 						}
 					]
+				},
+				{
+					"description": "An effect with no functional changes, but descriptive text. Should only be used for effects which cannot be otherwise automated.",
+					"allOf": [
+						{
+							"$ref": "#/$defs/_foundryEffectObject"
+						},
+						{
+							"type": "object",
+							"required": [
+								"description"
+							]
+						}
+					]
 				}
 			]
 		},