@real1ty-obsidian-plugins/utils 2.4.0 → 2.6.0

package/src/file/property-utils.ts

@@ -0,0 +1,114 @@
+import { normalizePath } from "obsidian";
+
+import { formatWikiLink, parsePropertyLinks } from "./link-parser";
+
+/**
+ * Adds a link to a property, avoiding duplicates using normalized path comparison.
+ * Prevents cycles and duplicate relationships by comparing normalized paths.
+ *
+ * **Important**: linkPath should be WITHOUT .md extension (wikilink format).
+ *
+ * @param currentValue - The current property value (can be string, string[], or undefined)
+ * @param linkPath - The file path to add (without .md extension, e.g., "folder/file")
+ * @returns New array with link added, or same array if link already exists
+ *
+ * @example
+ * ```ts
+ * addLinkToProperty(undefined, "MyNote") // ["[[MyNote]]"]
+ * addLinkToProperty("[[Note1]]", "Note2") // ["[[Note1]]", "[[Note2]]"]
+ * addLinkToProperty(["[[Note1]]"], "Note2") // ["[[Note1]]", "[[Note2]]"]
+ * addLinkToProperty(["[[Note1]]"], "Note1") // ["[[Note1]]"] (no change - duplicate prevented)
+ * addLinkToProperty(["[[Folder/Note]]"], "folder/note") // ["[[Folder/Note]]", "[[folder/note|note]]"] (case-sensitive, different entry)
+ * ```
+ */
+export function addLinkToProperty(
+	currentValue: string | string[] | undefined,
+	linkPath: string
+): string[] {
+	// Handle undefined or null
+	if (currentValue === undefined || currentValue === null) {
+		return [formatWikiLink(linkPath)];
+	}
+
+	// Normalize to array
+	const currentArray = Array.isArray(currentValue) ? currentValue : [currentValue];
+
+	const existingPaths = parsePropertyLinks(currentArray);
+
+	// Normalize paths for comparison to prevent duplicates with different casing or separators
+	const normalizedLinkPath = normalizePath(linkPath);
+
+	const normalizedExistingPaths = existingPaths.map((p) => normalizePath(p));
+
+	// Only add if not already present (using normalized path comparison)
+	if (!normalizedExistingPaths.includes(normalizedLinkPath)) {
+		return [...currentArray, formatWikiLink(linkPath)];
+	}
+
+	return currentArray;
+}
+
+/**
+ * Removes a link from a property using normalized path comparison.
+ *
+ * @param currentValue - The current property value (can be string, string[], or undefined)
+ * @param linkPath - The file path to remove (without .md extension)
+ * @returns New array with link removed (can be empty)
+ *
+ * @example
+ * ```ts
+ * removeLinkFromProperty(["[[Note1]]", "[[Note2]]"], "Note1") // ["[[Note2]]"]
+ * removeLinkFromProperty(["[[Note1]]"], "Note1") // []
+ * removeLinkFromProperty("[[Note1]]", "Note1") // []
+ * removeLinkFromProperty(undefined, "Note1") // []
+ * removeLinkFromProperty(["[[Folder/Note]]"], "Folder/Note") // [] (case-sensitive removal)
+ * ```
+ */
+export function removeLinkFromProperty(
+	currentValue: string | string[] | undefined,
+	linkPath: string
+): string[] {
+	if (currentValue === undefined || currentValue === null) {
+		return [];
+	}
+
+	// Normalize to array
+	const currentArray = Array.isArray(currentValue) ? currentValue : [currentValue];
+
+	const normalizedLinkPath = normalizePath(linkPath);
+
+	return currentArray.filter((item) => {
+		const parsed = parsePropertyLinks([item])[0];
+
+		if (!parsed) return true; // Keep invalid entries
+
+		return normalizePath(parsed) !== normalizedLinkPath;
+	});
+}
+
+/**
+ * Checks if a link exists in a property using normalized path comparison.
+ *
+ * @param currentValue - The current property value (can be string, string[], or undefined)
+ * @param linkPath - The file path to check (without .md extension)
+ * @returns True if the link exists
+ *
+ * @example
+ * ```ts
+ * hasLinkInProperty(["[[Note1]]", "[[Note2]]"], "Note1") // true
+ * hasLinkInProperty("[[Note1]]", "Note1") // true
+ * hasLinkInProperty([], "Note1") // false
+ * hasLinkInProperty(undefined, "Note1") // false
+ * hasLinkInProperty(["[[Folder/Note]]"], "Folder/Note") // true (case-sensitive match)
+ * ```
+ */
+export function hasLinkInProperty(
+	currentValue: string | string[] | undefined,
+	linkPath: string
+): boolean {
+	const existingPaths = parsePropertyLinks(currentValue);
+
+	const normalizedLinkPath = normalizePath(linkPath);
+
+	return existingPaths.some((path) => normalizePath(path) === normalizedLinkPath);
+}

package/dist/core/evaluator-base.d.ts

@@ -1,52 +0,0 @@
-import type { BehaviorSubject } from "rxjs";
-export interface BaseRule {
-    id: string;
-    expression: string;
-    enabled: boolean;
-}
-/**
- * Generic base class for evaluating JavaScript expressions against frontmatter objects.
- * Provides reactive compilation of rules via RxJS subscription and safe evaluation.
- */
-export declare abstract class BaseEvaluator<TRule extends BaseRule, TSettings> {
-    protected compiledRules: Array<TRule & {
-        fn: (frontmatter: Record<string, unknown>) => boolean;
-    }>;
-    private settingsSubscription;
-    constructor(settingsStore: BehaviorSubject<TSettings>);
-    /**
-     * Extract rules from settings object. Must be implemented by subclasses.
-     */
-    protected abstract extractRules(settings: TSettings): TRule[];
-    /**
-     * Compile rules into executable functions with error handling.
-     */
-    private compileRules;
-    /**
-     * Evaluate a single rule against frontmatter. Returns the result or undefined if error.
-     */
-    protected evaluateRule(rule: TRule & {
-        fn: (frontmatter: Record<string, unknown>) => boolean;
-    }, frontmatter: Record<string, unknown>): boolean | undefined;
-    /**
-     * Convert evaluation result to boolean - only explicit true is considered truthy.
-     */
-    protected isTruthy(result: boolean | undefined): boolean;
-    /**
-     * Clean up subscriptions and compiled rules.
-     */
-    destroy(): void;
-    /**
-     * Get the number of active (compiled) rules.
-     */
-    getActiveRuleCount(): number;
-    /**
-     * Get information about all rules including their validity.
-     */
-    getRuleInfo(): Array<{
-        expression: string;
-        isValid: boolean;
-        enabled: boolean;
-    }>;
-}
-//# sourceMappingURL=evaluator-base.d.ts.map

package/dist/core/evaluator-base.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"evaluator-base.d.ts","sourceRoot":"","sources":["../../src/core/evaluator-base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,MAAM,CAAC;AAE1D,MAAM,WAAW,QAAQ;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,8BAAsB,aAAa,CAAC,KAAK,SAAS,QAAQ,EAAE,SAAS;IACpE,SAAS,CAAC,aAAa,EAAE,KAAK,CAC7B,KAAK,GAAG;QAAE,EAAE,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAA;KAAE,CACjE,CAAM;IACP,OAAO,CAAC,oBAAoB,CAA6B;gBAE7C,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC;IAUrD;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,GAAG,KAAK,EAAE;IAE7D;;OAEG;IACH,OAAO,CAAC,YAAY;IA6BpB;;OAEG;IACH,SAAS,CAAC,YAAY,CACrB,IAAI,EAAE,KAAK,GAAG;QAAE,EAAE,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAA;KAAE,EACvE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,OAAO,GAAG,SAAS;IAStB;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO;IAIxD;;OAEG;IACH,OAAO,IAAI,IAAI;IAQf;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;OAEG;IACH,WAAW,IAAI,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAShF"}

package/dist/core/evaluator-base.js

@@ -1,84 +0,0 @@
-/**
- * Generic base class for evaluating JavaScript expressions against frontmatter objects.
- * Provides reactive compilation of rules via RxJS subscription and safe evaluation.
- */
-export class BaseEvaluator {
-    constructor(settingsStore) {
-        this.compiledRules = [];
-        this.settingsSubscription = null;
-        const initialRules = this.extractRules(settingsStore.value);
-        this.compileRules(initialRules);
-        this.settingsSubscription = settingsStore.subscribe((settings) => {
-            const newRules = this.extractRules(settings);
-            this.compileRules(newRules);
-        });
-    }
-    /**
-     * Compile rules into executable functions with error handling.
-     */
-    compileRules(rules) {
-        this.compiledRules = [];
-        for (const rule of rules) {
-            if (!rule.enabled || !rule.expression.trim())
-                continue;
-            try {
-                const cleanExpression = rule.expression.trim();
-                // Create a function that takes 'fm' (frontmatter) as parameter
-                // and evaluates the expression in that context
-                const fn = new Function("fm", `return (${cleanExpression});`);
-                // Test the function with a dummy object to catch syntax errors early
-                fn({});
-                this.compiledRules.push(Object.assign(Object.assign({}, rule), { expression: cleanExpression, fn }));
-            }
-            catch (error) {
-                console.warn(`Invalid rule expression "${rule.expression}":`, error);
-            }
-        }
-    }
-    /**
-     * Evaluate a single rule against frontmatter. Returns the result or undefined if error.
-     */
-    evaluateRule(rule, frontmatter) {
-        try {
-            return rule.fn(frontmatter);
-        }
-        catch (error) {
-            console.warn(`Error evaluating rule "${rule.expression}":`, error);
-            return undefined;
-        }
-    }
-    /**
-     * Convert evaluation result to boolean - only explicit true is considered truthy.
-     */
-    isTruthy(result) {
-        return result === true;
-    }
-    /**
-     * Clean up subscriptions and compiled rules.
-     */
-    destroy() {
-        if (this.settingsSubscription) {
-            this.settingsSubscription.unsubscribe();
-            this.settingsSubscription = null;
-        }
-        this.compiledRules = [];
-    }
-    /**
-     * Get the number of active (compiled) rules.
-     */
-    getActiveRuleCount() {
-        return this.compiledRules.length;
-    }
-    /**
-     * Get information about all rules including their validity.
-     */
-    getRuleInfo() {
-        const validExpressions = new Set(this.compiledRules.map((r) => r.expression));
-        return this.compiledRules.map((rule) => ({
-            expression: rule.expression,
-            isValid: validExpressions.has(rule.expression),
-            enabled: rule.enabled,
-        }));
-    }
-}
-//# sourceMappingURL=evaluator-base.js.map

package/dist/core/evaluator-base.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"evaluator-base.js","sourceRoot":"","sources":["../../src/core/evaluator-base.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,OAAgB,aAAa;IAMlC,YAAY,aAAyC;QAL3C,kBAAa,GAEnB,EAAE,CAAC;QACC,yBAAoB,GAAwB,IAAI,CAAC;QAGxD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAEhC,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACJ,CAAC;IAOD;;OAEG;IACK,YAAY,CAAC,KAAc;QAClC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;gBAAE,SAAS;YAEvD,IAAI,CAAC;gBACJ,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAE/C,+DAA+D;gBAC/D,+CAA+C;gBAC/C,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,WAAW,eAAe,IAAI,CAEhD,CAAC;gBAEb,qEAAqE;gBACrE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEP,IAAI,CAAC,aAAa,CAAC,IAAI,iCACnB,IAAI,KACP,UAAU,EAAE,eAAe,EAC3B,EAAE,IACD,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,UAAU,IAAI,EAAE,KAAK,CAAC,CAAC;YACtE,CAAC;QACF,CAAC;IACF,CAAC;IAED;;OAEG;IACO,YAAY,CACrB,IAAuE,EACvE,WAAoC;QAEpC,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,UAAU,IAAI,EAAE,KAAK,CAAC,CAAC;YACnE,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;IAED;;OAEG;IACO,QAAQ,CAAC,MAA2B;QAC7C,OAAO,MAAM,KAAK,IAAI,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,OAAO;QACN,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,kBAAkB;QACjB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,WAAW;QACV,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAE9E,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9C,OAAO,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC,CAAC,CAAC;IACL,CAAC;CACD","sourcesContent":["import type { BehaviorSubject, Subscription } from \"rxjs\";\n\nexport interface BaseRule {\n\tid: string;\n\texpression: string;\n\tenabled: boolean;\n}\n\n/**\n * Generic base class for evaluating JavaScript expressions against frontmatter objects.\n * Provides reactive compilation of rules via RxJS subscription and safe evaluation.\n */\nexport abstract class BaseEvaluator<TRule extends BaseRule, TSettings> {\n\tprotected compiledRules: Array<\n\t\tTRule & { fn: (frontmatter: Record<string, unknown>) => boolean }\n\t> = [];\n\tprivate settingsSubscription: Subscription | null = null;\n\n\tconstructor(settingsStore: BehaviorSubject<TSettings>) {\n\t\tconst initialRules = this.extractRules(settingsStore.value);\n\t\tthis.compileRules(initialRules);\n\n\t\tthis.settingsSubscription = settingsStore.subscribe((settings) => {\n\t\t\tconst newRules = this.extractRules(settings);\n\t\t\tthis.compileRules(newRules);\n\t\t});\n\t}\n\n\t/**\n\t * Extract rules from settings object. Must be implemented by subclasses.\n\t */\n\tprotected abstract extractRules(settings: TSettings): TRule[];\n\n\t/**\n\t * Compile rules into executable functions with error handling.\n\t */\n\tprivate compileRules(rules: TRule[]): void {\n\t\tthis.compiledRules = [];\n\n\t\tfor (const rule of rules) {\n\t\t\tif (!rule.enabled || !rule.expression.trim()) continue;\n\n\t\t\ttry {\n\t\t\t\tconst cleanExpression = rule.expression.trim();\n\n\t\t\t\t// Create a function that takes 'fm' (frontmatter) as parameter\n\t\t\t\t// and evaluates the expression in that context\n\t\t\t\tconst fn = new Function(\"fm\", `return (${cleanExpression});`) as (\n\t\t\t\t\tfrontmatter: Record<string, unknown>\n\t\t\t\t) => boolean;\n\n\t\t\t\t// Test the function with a dummy object to catch syntax errors early\n\t\t\t\tfn({});\n\n\t\t\t\tthis.compiledRules.push({\n\t\t\t\t\t...rule,\n\t\t\t\t\texpression: cleanExpression,\n\t\t\t\t\tfn,\n\t\t\t\t});\n\t\t\t} catch (error) {\n\t\t\t\tconsole.warn(`Invalid rule expression \"${rule.expression}\":`, error);\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Evaluate a single rule against frontmatter. Returns the result or undefined if error.\n\t */\n\tprotected evaluateRule(\n\t\trule: TRule & { fn: (frontmatter: Record<string, unknown>) => boolean },\n\t\tfrontmatter: Record<string, unknown>\n\t): boolean | undefined {\n\t\ttry {\n\t\t\treturn rule.fn(frontmatter);\n\t\t} catch (error) {\n\t\t\tconsole.warn(`Error evaluating rule \"${rule.expression}\":`, error);\n\t\t\treturn undefined;\n\t\t}\n\t}\n\n\t/**\n\t * Convert evaluation result to boolean - only explicit true is considered truthy.\n\t */\n\tprotected isTruthy(result: boolean | undefined): boolean {\n\t\treturn result === true;\n\t}\n\n\t/**\n\t * Clean up subscriptions and compiled rules.\n\t */\n\tdestroy(): void {\n\t\tif (this.settingsSubscription) {\n\t\t\tthis.settingsSubscription.unsubscribe();\n\t\t\tthis.settingsSubscription = null;\n\t\t}\n\t\tthis.compiledRules = [];\n\t}\n\n\t/**\n\t * Get the number of active (compiled) rules.\n\t */\n\tgetActiveRuleCount(): number {\n\t\treturn this.compiledRules.length;\n\t}\n\n\t/**\n\t * Get information about all rules including their validity.\n\t */\n\tgetRuleInfo(): Array<{ expression: string; isValid: boolean; enabled: boolean }> {\n\t\tconst validExpressions = new Set(this.compiledRules.map((r) => r.expression));\n\n\t\treturn this.compiledRules.map((rule) => ({\n\t\t\texpression: rule.expression,\n\t\t\tisValid: validExpressions.has(rule.expression),\n\t\t\tenabled: rule.enabled,\n\t\t}));\n\t}\n}\n"]}

package/src/core/evaluator-base.ts

@@ -1,118 +0,0 @@
-import type { BehaviorSubject, Subscription } from "rxjs";
-
-export interface BaseRule {
-	id: string;
-	expression: string;
-	enabled: boolean;
-}
-
-/**
- * Generic base class for evaluating JavaScript expressions against frontmatter objects.
- * Provides reactive compilation of rules via RxJS subscription and safe evaluation.
- */
-export abstract class BaseEvaluator<TRule extends BaseRule, TSettings> {
-	protected compiledRules: Array<
-		TRule & { fn: (frontmatter: Record<string, unknown>) => boolean }
-	> = [];
-	private settingsSubscription: Subscription | null = null;
-
-	constructor(settingsStore: BehaviorSubject<TSettings>) {
-		const initialRules = this.extractRules(settingsStore.value);
-		this.compileRules(initialRules);
-
-		this.settingsSubscription = settingsStore.subscribe((settings) => {
-			const newRules = this.extractRules(settings);
-			this.compileRules(newRules);
-		});
-	}
-
-	/**
-	 * Extract rules from settings object. Must be implemented by subclasses.
-	 */
-	protected abstract extractRules(settings: TSettings): TRule[];
-
-	/**
-	 * Compile rules into executable functions with error handling.
-	 */
-	private compileRules(rules: TRule[]): void {
-		this.compiledRules = [];
-
-		for (const rule of rules) {
-			if (!rule.enabled || !rule.expression.trim()) continue;
-
-			try {
-				const cleanExpression = rule.expression.trim();
-
-				// Create a function that takes 'fm' (frontmatter) as parameter
-				// and evaluates the expression in that context
-				const fn = new Function("fm", `return (${cleanExpression});`) as (
-					frontmatter: Record<string, unknown>
-				) => boolean;
-
-				// Test the function with a dummy object to catch syntax errors early
-				fn({});
-
-				this.compiledRules.push({
-					...rule,
-					expression: cleanExpression,
-					fn,
-				});
-			} catch (error) {
-				console.warn(`Invalid rule expression "${rule.expression}":`, error);
-			}
-		}
-	}
-
-	/**
-	 * Evaluate a single rule against frontmatter. Returns the result or undefined if error.
-	 */
-	protected evaluateRule(
-		rule: TRule & { fn: (frontmatter: Record<string, unknown>) => boolean },
-		frontmatter: Record<string, unknown>
-	): boolean | undefined {
-		try {
-			return rule.fn(frontmatter);
-		} catch (error) {
-			console.warn(`Error evaluating rule "${rule.expression}":`, error);
-			return undefined;
-		}
-	}
-
-	/**
-	 * Convert evaluation result to boolean - only explicit true is considered truthy.
-	 */
-	protected isTruthy(result: boolean | undefined): boolean {
-		return result === true;
-	}
-
-	/**
-	 * Clean up subscriptions and compiled rules.
-	 */
-	destroy(): void {
-		if (this.settingsSubscription) {
-			this.settingsSubscription.unsubscribe();
-			this.settingsSubscription = null;
-		}
-		this.compiledRules = [];
-	}
-
-	/**
-	 * Get the number of active (compiled) rules.
-	 */
-	getActiveRuleCount(): number {
-		return this.compiledRules.length;
-	}
-
-	/**
-	 * Get information about all rules including their validity.
-	 */
-	getRuleInfo(): Array<{ expression: string; isValid: boolean; enabled: boolean }> {
-		const validExpressions = new Set(this.compiledRules.map((r) => r.expression));
-
-		return this.compiledRules.map((rule) => ({
-			expression: rule.expression,
-			isValid: validExpressions.has(rule.expression),
-			enabled: rule.enabled,
-		}));
-	}
-}