spooder 4.3.0 → 4.3.1

package/README.md

@@ -1066,24 +1066,6 @@ const html = parse_template(template, replacements);
 </html>
 ```
 
-Object properties are supported by using the dot syntax.
-
-```ts
-const template = `<span>{$foo.bar}</span>`;
-
-const replacements = {
-	foo: {
-		bar: 'Hello, world!';
-	}
-};
-
-const html = parse_template(template, replacements);
-```
-
-```html
-<span>Hello, world!</span>
-```
-
 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
@@ -1125,15 +1107,16 @@ parse_template('Hello {$world}', replacer);
 	</body>
 </html>
 ```
+
 `parse_template` supports looping arrays with the following syntax.
 
 ```html
-{$for:foo as bar}My colour is {$bar}{/for}
+{$for:foo}My colour is %s{/for}
 ```
 ```ts
 const template = `
 	<ul>
-		{$for:foo as bar}<li>{$bar}</li>{/for}
+		{$for:foo}<li>%s</li>{/for}
 	</ul>
 `;
 
@@ -1152,39 +1135,24 @@ const html = parse_template(template, replacements);
 </ul>
 ```
 
-Loops also support object properties using the dot syntax.
+All placeholders inside a `{$for:}` loop are substituted, but only if the loop variable exists.
 
-```html
-{$for:foo as bar}My colour is {$bar.baz}{/for}
-```
-```ts
-const template = `
-	<ul>
-		{$for:foo as bar}<li>My colour is {$bar.baz}</li>{/for}
-	</ul>
-`;
-```
-
-If/else statements are supported in templates, which include blocks based on the existence/truthiness of a property.
+In the following example, `missing` does not exist, so `test` is not substituted inside the loop, but `test` is still substituted outside the loop.
 
 ```html
-{$if:is_on_earth}
-	Hello, world!
-{else}
-	Hello, Mars!
-{/if}
+<div>Hello {$test}!</div>
+{$for:missing}<div>Loop {$test}</div>{/for}
 ```
 
-This also works with nested properties and loops.
+```ts
+parse_template(..., {
+	test: 'world'
+});
+```
 
 ```html
-{$for:countries as country}
-	{$if:country.is_in_europe}
-		Europe: {$country.name}
-	{else}
-		Not Europe: {$country.name}
-	{/if}
-{/for}
+<div>Hello world!</div>
+{$for}Loop <div>{$test}</div>{/for}
 ```
 
 <a id="api-content-generate-hash-subs"></a>

package/package.json

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

package/src/api.ts

@@ -108,8 +108,8 @@ export async function safe(target_fn: Callable) {
 	}
 }
 
-type ReplacerFn = (key: string) => string | Array<any> | Record<string, any> | undefined;
-type Replacements = Record<string, string | Array<any> | Record<string, any>> | ReplacerFn;
+type ReplacerFn = (key: string) => string | Array<string> | undefined;
+type Replacements = Record<string, string | Array<string>> | ReplacerFn;
 
 export function parse_template(template: string, replacements: Replacements, drop_missing = false): string {
 	let result = '';
@@ -118,28 +118,6 @@ export function parse_template(template: string, replacements: Replacements, dro
 
 	const is_replacer_fn = typeof replacements === 'function';
 
-	function getValue(key: string): any {
-		const var_parts = key.split('.');
-		let value: any = is_replacer_fn ? replacements(var_parts[0]) : replacements[var_parts[0]];
-		
-		for (let j = 1; j < var_parts.length; j++) {
-			if (value && typeof value === 'object') {
-				value = value[var_parts[j]];
-			} else {
-				value = undefined;
-				break;
-			}
-		}
-		return value;
-	}
-
-	function parseBlock(content: string, local_replacements: Replacements): string {
-		return parse_template(content, {
-			...replacements,
-			...local_replacements
-		}, drop_missing);
-	}
-
 	const template_length = template.length;
 	for (let i = 0; i < template_length; i++) {
 		const char = template[i];
@@ -152,8 +130,9 @@ export function parse_template(template: string, replacements: Replacements, dro
 			buffer_active = false;
 
 			if (buffer.startsWith('for:')) {
-				const [loop_key, loop_var] = buffer.substring(4).split(' as ');
-				const loop_entries = getValue(loop_key);
+				const loop_key = buffer.substring(4);
+
+				const loop_entries = is_replacer_fn ? replacements(loop_key) : replacements[loop_key];
 				const loop_content_start_index = i + 1;
 				const loop_close_index = template.indexOf('{/for}', loop_content_start_index);
 				
@@ -162,48 +141,19 @@ export function parse_template(template: string, replacements: Replacements, dro
 						result += '{$' + buffer + '}';
 				} else {
 					const loop_content = template.substring(loop_content_start_index, loop_close_index);
-					if (Array.isArray(loop_entries)) {
-						for (const loop_entry of loop_entries)
-							result += parseBlock(loop_content, { [loop_var]: loop_entry });
+					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);
+						}
 					} else {
 						if (!drop_missing)
 							result += '{$' + buffer + '}' + loop_content + '{/for}';
 					}
-					i = loop_close_index + 5; // Move past {/for}
-				}
-			} else if (buffer.startsWith('if:')) {
-				const condition_key = buffer.substring(3);
-				const condition_value = getValue(condition_key);
-				const if_content_start_index = i + 1;
-				const if_close_index = template.indexOf('{/if}', if_content_start_index);
-				
-				if (if_close_index === -1) {
-					if (!drop_missing)
-						result += '{$' + buffer + '}';
-				} else {
-					const if_content = template.substring(if_content_start_index, if_close_index);
-					const else_index = if_content.indexOf('{else}');
-					
-					if (else_index === -1) {
-						// No else block
-						if (condition_value) {
-							result += parseBlock(if_content, {});
-						}
-					} else {
-						// Has else block
-						const true_content = if_content.substring(0, else_index);
-						const false_content = if_content.substring(else_index + 6); // +6 to move past {else}
-						
-						if (condition_value)
-							result += parseBlock(true_content, {});
-						else
-							result += parseBlock(false_content, {});
-					}
-					i = if_close_index + 4; // Move past {/if}
+					i += loop_content.length + 6;
 				}
 			} else {
-				const replacement = getValue(buffer);
-
+				const replacement = is_replacer_fn ? replacements(buffer) : replacements[buffer];
 				if (replacement !== undefined)
 					result += replacement;
 				else if (!drop_missing)