spooder 4.4.1 → 4.4.3

package/README.md

@@ -734,7 +734,7 @@ server.route('/api/endpoint', async (req, url) => {
 As you can see this is quite verbose and adds a lot of boilerplate to your handlers. `validate_req_json` can be used to simplify this.
 
 ```ts
-server.route('/api/endpoint', validate_req_json(async (json, req, url) => {
+server.route('/api/endpoint', validate_req_json(async (req, url, json) => {
 	// do something with json.
 	return 200;
 }));
@@ -1029,7 +1029,7 @@ await safe(() => {
 ## API > Content
 
 <a id="api-content-parse-template"></a>
-### 🔧 `parse_template(template: string, replacements: Replacements, drop_missing: boolean): string`
+### 🔧 `parse_template(template: string, replacements: Replacements, drop_missing: boolean): Promise<string>`
 
 Replace placeholders in a template string with values from a replacement object.
 
@@ -1052,7 +1052,7 @@ const replacements = {
 	content: 'This is a test.'
 };
 
-const html = parse_template(template, replacements);
+const html = await parse_template(template, replacements);
 ```
 
 ```html
@@ -1071,7 +1071,7 @@ const html = parse_template(template, replacements);
 By default, placeholders that do not appear in the replacement object will be left as-is. Set `drop_missing` to `true` to remove them.
 
 ```ts
-parse_template(template, replacements, true);
+await parse_template(template, replacements, true);
 ```
 
 ```html
@@ -1087,14 +1087,14 @@ parse_template(template, replacements, true);
 </html>
 ```
 
-`parse_template` supports passing a function instead of a replacement object. This function will be called for each placeholder and the return value will be used as the replacement.
+`parse_template` supports passing a function instead of a replacement object. This function will be called for each placeholder and the return value will be used as the replacement. This function can be a Promise/async function.
 
 ```ts
 const replacer = (placeholder: string) => {
 	return placeholder.toUpperCase();
 };
 
-parse_template('Hello {$world}', replacer);
+await parse_template('Hello {$world}', replacer);
 ```
 
 ```html
@@ -1126,7 +1126,7 @@ const replacements = {
 	foo: ['red', 'green', 'blue']
 };
 
-const html = parse_template(template, replacements);
+const html = await parse_template(template, replacements);
 ```
 
 ```html
@@ -1147,7 +1147,7 @@ In the following example, `missing` does not exist, so `test` is not substituted
 ```
 
 ```ts
-parse_template(..., {
+await parse_template(..., {
 	test: 'world'
 });
 ```

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "4.4.1",
+	"version": "4.4.3",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/api.ts

@@ -119,9 +119,10 @@ export async function safe(target_fn: Callable) {
 }
 
 type ReplacerFn = (key: string) => string | Array<string> | undefined;
-type Replacements = Record<string, string | Array<string>> | ReplacerFn;
+type AsyncReplaceFn = (key: string) => Promise<string | Array<string> | undefined>;
+type Replacements = Record<string, string | Array<string>> | ReplacerFn | AsyncReplaceFn;
 
-export function parse_template(template: string, replacements: Replacements, drop_missing = false): string {
+export async function parse_template(template: string, replacements: Replacements, drop_missing = false): Promise<string> {
 	let result = '';
 	let buffer = '';
 	let buffer_active = false;
@@ -142,7 +143,7 @@ export function parse_template(template: string, replacements: Replacements, dro
 			if (buffer.startsWith('for:')) {
 				const loop_key = buffer.substring(4);
 
-				const loop_entries = is_replacer_fn ? replacements(loop_key) : replacements[loop_key];
+				const loop_entries = is_replacer_fn ? await replacements(loop_key) : replacements[loop_key];
 				const loop_content_start_index = i + 1;
 				const loop_close_index = template.indexOf('{/for}', loop_content_start_index);
 				
@@ -154,7 +155,7 @@ export function parse_template(template: string, replacements: Replacements, dro
 					if (loop_entries !== undefined) {
 						for (const loop_entry of loop_entries) {
 							const inner_content = loop_content.replaceAll('%s', loop_entry);
-							result += parse_template(inner_content, replacements, drop_missing);
+							result += await parse_template(inner_content, replacements, drop_missing);
 						}
 					} else {
 						if (!drop_missing)
@@ -163,7 +164,7 @@ export function parse_template(template: string, replacements: Replacements, dro
 					i += loop_content.length + 6;
 				}
 			} else {
-				const replacement = is_replacer_fn ? replacements(buffer) : replacements[buffer];
+				const replacement = is_replacer_fn ? await replacements(buffer) : replacements[buffer];
 				if (replacement !== undefined)
 					result += replacement;
 				else if (!drop_missing)
@@ -462,10 +463,10 @@ type Resolvable<T> = T | Promise<T>;
 type PromiseType<T extends Promise<any>> = T extends Promise<infer U> ? U : never;
 
 // The following types cover JSON serializable objects/classes.
-type JsonPrimitive = string | number | boolean | null;
-type JsonArray = JsonSerializable[];
+export type JsonPrimitive = string | number | boolean | null;
+export type JsonArray = JsonSerializable[];
 
-interface JsonObject {
+export interface JsonObject {
 	[key: string]: JsonSerializable;
 }