opentasks 0.0.1 → 0.0.2

package/dist/core/merge-driver.js

@@ -0,0 +1,258 @@
+/**
+ * Custom JSONL Merge Driver for OpenTasks (Phase 3)
+ *
+ * Three-way merge for graph.jsonl files with field-level resolution.
+ * Registered as a git merge driver via .gitattributes.
+ */
+import * as fs from 'node:fs';
+import { execSync } from 'node:child_process';
+/**
+ * Parse a JSONL file into a Map keyed by ID
+ *
+ * For entries with the same ID, keeps the one with the latest updated_at.
+ */
+export function parseJsonlToMap(filePath) {
+    const map = new Map();
+    let content;
+    try {
+        content = fs.readFileSync(filePath, 'utf-8');
+    }
+    catch {
+        return map;
+    }
+    for (const line of content.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            const obj = JSON.parse(trimmed);
+            const id = obj.id;
+            if (!id)
+                continue;
+            const existing = map.get(id);
+            if (!existing || obj.updated_at > existing.updated_at) {
+                map.set(id, obj);
+            }
+        }
+        catch {
+            // Skip malformed lines
+        }
+    }
+    return map;
+}
+/**
+ * Write a map of entries back to a JSONL file
+ */
+export function writeJsonlFromMap(filePath, entries) {
+    const lines = [];
+    // Write nodes first (non x- prefix), then edges (x- prefix)
+    const nodes = [];
+    const edges = [];
+    for (const entry of entries.values()) {
+        if (entry.id.startsWith('x-')) {
+            edges.push(entry);
+        }
+        else {
+            nodes.push(entry);
+        }
+    }
+    for (const entry of [...nodes, ...edges]) {
+        lines.push(JSON.stringify(entry));
+    }
+    fs.writeFileSync(filePath, lines.join('\n') + (lines.length > 0 ? '\n' : ''), 'utf-8');
+}
+/**
+ * Deep equality check for JSON values
+ */
+export function deepEqual(a, b) {
+    if (a === b)
+        return true;
+    if (a === null || b === null)
+        return false;
+    if (a === undefined || b === undefined)
+        return a === b;
+    if (typeof a !== typeof b)
+        return false;
+    if (Array.isArray(a)) {
+        if (!Array.isArray(b))
+            return false;
+        if (a.length !== b.length)
+            return false;
+        return a.every((val, i) => deepEqual(val, b[i]));
+    }
+    if (typeof a === 'object') {
+        const aObj = a;
+        const bObj = b;
+        const aKeys = Object.keys(aObj);
+        const bKeys = Object.keys(bObj);
+        if (aKeys.length !== bKeys.length)
+            return false;
+        return aKeys.every((key) => deepEqual(aObj[key], bObj[key]));
+    }
+    return false;
+}
+/**
+ * Pick entry with newer timestamp
+ */
+function pickByNewerTimestamp(a, b) {
+    const aTime = a.updated_at || a.created_at || '';
+    const bTime = b.updated_at || b.created_at || '';
+    return aTime >= bTime ? a : b;
+}
+/**
+ * Field-level three-way merge
+ *
+ * For each field:
+ * - Both sides agree → use that value
+ * - Only one side changed → use the changed value
+ * - Both changed differently → last-writer-wins by updated_at
+ */
+export function fieldLevelMerge(base, ours, theirs) {
+    const result = { ...base };
+    const allKeys = new Set([...Object.keys(base), ...Object.keys(ours), ...Object.keys(theirs)]);
+    for (const key of allKeys) {
+        const bVal = base[key];
+        const oVal = ours[key];
+        const tVal = theirs[key];
+        if (deepEqual(oVal, tVal)) {
+            // Both agree — take either
+            if (oVal !== undefined) {
+                result[key] = oVal;
+            }
+            else {
+                delete result[key];
+            }
+        }
+        else if (deepEqual(bVal, oVal)) {
+            // Only theirs changed
+            if (tVal !== undefined) {
+                result[key] = tVal;
+            }
+            else {
+                delete result[key];
+            }
+        }
+        else if (deepEqual(bVal, tVal)) {
+            // Only ours changed
+            if (oVal !== undefined) {
+                result[key] = oVal;
+            }
+            else {
+                delete result[key];
+            }
+        }
+        else {
+            // Both changed differently — last writer wins
+            const oursTime = ours.updated_at || '';
+            const theirsTime = theirs.updated_at || '';
+            const winner = oursTime >= theirsTime ? oVal : tVal;
+            if (winner !== undefined) {
+                result[key] = winner;
+            }
+            else {
+                delete result[key];
+            }
+        }
+    }
+    // Ensure updated_at is the latest
+    const times = [ours.updated_at, theirs.updated_at].filter(Boolean);
+    if (times.length > 0) {
+        result.updated_at = times.sort().pop();
+    }
+    return result;
+}
+/**
+ * Three-way merge of JSONL files
+ *
+ * @param basePath - Base version (common ancestor)
+ * @param oursPath - Our version (current branch)
+ * @param theirsPath - Their version (merging branch)
+ * @returns 0 on success, 1 on conflict (should not happen with this algorithm)
+ */
+export function mergeJsonl(basePath, oursPath, theirsPath) {
+    const base = parseJsonlToMap(basePath);
+    const ours = parseJsonlToMap(oursPath);
+    const theirs = parseJsonlToMap(theirsPath);
+    const result = new Map();
+    const allIds = new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);
+    for (const id of allIds) {
+        const b = base.get(id);
+        const o = ours.get(id);
+        const t = theirs.get(id);
+        // Both sides agree — take either
+        if (deepEqual(o, t)) {
+            if (o)
+                result.set(id, o);
+            continue;
+        }
+        // Only theirs changed — take theirs
+        if (deepEqual(b, o)) {
+            if (t)
+                result.set(id, t);
+            continue;
+        }
+        // Only ours changed — take ours
+        if (deepEqual(b, t)) {
+            if (o)
+                result.set(id, o);
+            continue;
+        }
+        // Both added same ID with different content
+        if (!b && o && t) {
+            result.set(id, pickByNewerTimestamp(o, t));
+            continue;
+        }
+        // True conflict: both modified differently
+        if (b && o && t) {
+            result.set(id, fieldLevelMerge(b, o, t));
+            continue;
+        }
+        // One side deleted, other modified — keep modification
+        if (!o && t) {
+            result.set(id, t);
+            continue;
+        }
+        if (o && !t) {
+            result.set(id, o);
+            continue;
+        }
+    }
+    // Write merged result to ours path (git convention)
+    writeJsonlFromMap(oursPath, result);
+    return 0;
+}
+/**
+ * Install the merge driver in git config and .gitattributes
+ *
+ * @param worktreePath - Path to the worktree root
+ */
+export function installMergeDriver(worktreePath) {
+    // 1. Add to .gitattributes
+    const attrPath = `${worktreePath}/.gitattributes`;
+    let attrContent = '';
+    try {
+        attrContent = fs.readFileSync(attrPath, 'utf-8');
+    }
+    catch {
+        // File doesn't exist yet
+    }
+    if (!attrContent.includes('merge=opentasks')) {
+        const addition = '\n# OpenTasks merge driver for graph.jsonl\n' + '.opentasks/graph.jsonl merge=opentasks\n';
+        fs.writeFileSync(attrPath, attrContent + addition, 'utf-8');
+    }
+    // 2. Configure merge driver in git config
+    try {
+        execSync('git config merge.opentasks.name "OpenTasks JSONL merge driver"', {
+            cwd: worktreePath,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        execSync('git config merge.opentasks.driver "opentasks merge-driver %O %A %B %L %P"', {
+            cwd: worktreePath,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    catch {
+        // Non-fatal: git config might not be available
+    }
+}
+//# sourceMappingURL=merge-driver.js.map

package/dist/core/merge-driver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-driver.js","sourceRoot":"","sources":["../../src/core/merge-driver.ts"],"names":[],"mappings":"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"}

package/dist/core/redirects.d.ts

@@ -0,0 +1,91 @@
+/**
+ * Redirect Rules System for OpenTasks (Phase 2)
+ *
+ * Routes operations to configured target locations based on
+ * pattern matching and priority.
+ */
+import type { Connection } from './connections.js';
+import type { LocationIdentity } from './location.js';
+import { type ResolvedLocationTarget } from './uri.js';
+import { type RedirectContext } from './conditional-redirects.js';
+/**
+ * Operations that can be redirected
+ */
+export type RedirectOperation = 'read' | 'write';
+/**
+ * Redirect rule configuration
+ */
+export interface RedirectRule {
+    /** Operations this rule applies to */
+    operations: RedirectOperation[];
+    /** Glob pattern for node IDs (e.g., "*", "i-*", "s-*") */
+    pattern: string;
+    /** Target location (opentasks:// URI or location hash) */
+    target: string;
+    /** Priority: lower = higher priority (default: 100) */
+    priority: number;
+    /** Fallback behavior when target is unreachable */
+    fallback: 'local' | 'error';
+}
+/**
+ * Result of redirect resolution
+ */
+export interface RedirectResult {
+    /** Whether a redirect was found */
+    redirected: boolean;
+    /** The matching rule (if redirected) */
+    rule?: RedirectRule;
+    /** Resolved target location (if redirected) */
+    targetLocation?: ResolvedLocationTarget;
+}
+/**
+ * Simple glob matcher for node ID patterns
+ *
+ * Supports:
+ *   "*"    - matches anything
+ *   "i-*"  - matches IDs starting with "i-"
+ *   "s-*"  - matches IDs starting with "s-"
+ *   exact  - exact match
+ */
+export declare function matchPattern(pattern: string, nodeId: string): boolean;
+/**
+ * Find the first matching redirect rule for an operation
+ *
+ * Rules are sorted by priority (ascending, lower = higher priority).
+ * First match wins.
+ *
+ * @param operation - The operation type ('read' or 'write')
+ * @param nodeId - The node ID being operated on
+ * @param rules - Available redirect rules
+ * @returns The matching rule or null
+ */
+export declare function findRedirectRule(operation: RedirectOperation, nodeId: string, rules: RedirectRule[]): RedirectRule | null;
+/**
+ * Resolve a redirect rule to a target location
+ *
+ * @param rule - The redirect rule to resolve
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @param depth - Current redirect depth (for loop prevention)
+ * @returns Resolved location target or null on failure
+ */
+export declare function resolveRedirect(rule: RedirectRule, connections: Connection[], currentLocation: LocationIdentity, currentOpentasksPath: string, depth?: number): ResolvedLocationTarget | null;
+/**
+ * Resolve a complete redirect for an operation
+ *
+ * When a RedirectContext is provided, rules are evaluated as
+ * ConditionalRedirectRules (conditions on role/branch). Without
+ * context, only base pattern matching is used.
+ *
+ * @param operation - The operation type
+ * @param nodeId - The node ID
+ * @param rules - Redirect rules (may include `when` conditions)
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @param context - Optional redirect context for condition evaluation
+ * @returns Redirect result
+ */
+export declare function resolveOperationRedirect(operation: RedirectOperation, nodeId: string, rules: RedirectRule[], connections: Connection[], currentLocation: LocationIdentity, currentOpentasksPath: string, context?: RedirectContext): RedirectResult;
+//# sourceMappingURL=redirects.d.ts.map

package/dist/core/redirects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirects.d.ts","sourceRoot":"","sources":["../../src/core/redirects.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAyB,KAAK,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAC9E,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,OAAO,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,sCAAsC;IACtC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,mCAAmC;IACnC,UAAU,EAAE,OAAO,CAAC;IACpB,wCAAwC;IACxC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,sBAAsB,CAAC;CACzC;AAOD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CASrE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,EAAE,GACpB,YAAY,GAAG,IAAI,CAWrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,eAAe,EAAE,gBAAgB,EACjC,oBAAoB,EAAE,MAAM,EAC5B,KAAK,GAAE,MAAU,GAChB,sBAAsB,GAAG,IAAI,CAU/B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,EAAE,EACrB,WAAW,EAAE,UAAU,EAAE,EACzB,eAAe,EAAE,gBAAgB,EACjC,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,eAAe,GACxB,cAAc,CA2BhB"}

package/dist/core/redirects.js

@@ -0,0 +1,113 @@
+/**
+ * Redirect Rules System for OpenTasks (Phase 2)
+ *
+ * Routes operations to configured target locations based on
+ * pattern matching and priority.
+ */
+import { resolveLocationTarget } from './uri.js';
+import { findConditionalRedirectRule, } from './conditional-redirects.js';
+/**
+ * Maximum redirect depth to prevent infinite loops
+ */
+const MAX_REDIRECT_DEPTH = 3;
+/**
+ * Simple glob matcher for node ID patterns
+ *
+ * Supports:
+ *   "*"    - matches anything
+ *   "i-*"  - matches IDs starting with "i-"
+ *   "s-*"  - matches IDs starting with "s-"
+ *   exact  - exact match
+ */
+export function matchPattern(pattern, nodeId) {
+    if (pattern === '*')
+        return true;
+    if (pattern.endsWith('*')) {
+        const prefix = pattern.slice(0, -1);
+        return nodeId.startsWith(prefix);
+    }
+    return pattern === nodeId;
+}
+/**
+ * Find the first matching redirect rule for an operation
+ *
+ * Rules are sorted by priority (ascending, lower = higher priority).
+ * First match wins.
+ *
+ * @param operation - The operation type ('read' or 'write')
+ * @param nodeId - The node ID being operated on
+ * @param rules - Available redirect rules
+ * @returns The matching rule or null
+ */
+export function findRedirectRule(operation, nodeId, rules) {
+    // Sort by priority (ascending)
+    const sorted = [...rules].sort((a, b) => a.priority - b.priority);
+    for (const rule of sorted) {
+        if (!rule.operations.includes(operation))
+            continue;
+        if (!matchPattern(rule.pattern, nodeId))
+            continue;
+        return rule;
+    }
+    return null;
+}
+/**
+ * Resolve a redirect rule to a target location
+ *
+ * @param rule - The redirect rule to resolve
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @param depth - Current redirect depth (for loop prevention)
+ * @returns Resolved location target or null on failure
+ */
+export function resolveRedirect(rule, connections, currentLocation, currentOpentasksPath, depth = 0) {
+    if (depth >= MAX_REDIRECT_DEPTH) {
+        throw new Error(`Redirect depth exceeded maximum of ${MAX_REDIRECT_DEPTH} hops`);
+    }
+    try {
+        return resolveLocationTarget(rule.target, connections, currentLocation, currentOpentasksPath);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve a complete redirect for an operation
+ *
+ * When a RedirectContext is provided, rules are evaluated as
+ * ConditionalRedirectRules (conditions on role/branch). Without
+ * context, only base pattern matching is used.
+ *
+ * @param operation - The operation type
+ * @param nodeId - The node ID
+ * @param rules - Redirect rules (may include `when` conditions)
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @param context - Optional redirect context for condition evaluation
+ * @returns Redirect result
+ */
+export function resolveOperationRedirect(operation, nodeId, rules, connections, currentLocation, currentOpentasksPath, context) {
+    const rule = context
+        ? findConditionalRedirectRule(operation, nodeId, rules, context)
+        : findRedirectRule(operation, nodeId, rules);
+    if (!rule) {
+        return { redirected: false };
+    }
+    const targetLocation = resolveRedirect(rule, connections, currentLocation, currentOpentasksPath);
+    if (!targetLocation) {
+        // Target unreachable — apply fallback
+        if (rule.fallback === 'error') {
+            throw new Error(`Redirect target unreachable for rule (pattern: ${rule.pattern}, target: ${rule.target})`);
+        }
+        // fallback === 'local' — operate locally
+        return { redirected: false };
+    }
+    return {
+        redirected: true,
+        rule,
+        targetLocation,
+    };
+}
+//# sourceMappingURL=redirects.js.map

package/dist/core/redirects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirects.js","sourceRoot":"","sources":["../../src/core/redirects.ts"],"names":[],"mappings":"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"}

package/dist/core/uri.d.ts

@@ -0,0 +1,105 @@
+/**
+ * OpenTasks URI scheme parser and resolver (Phase 2)
+ *
+ * Handles opentasks:// URIs for cross-location node references.
+ *
+ * URI formats:
+ *   opentasks://k7m2x9p4/i-x7k9           - By location hash (preferred)
+ *   opentasks://./i-x7k9                    - Current location
+ *   opentasks:///abs/path/.opentasks/s-g8h9 - Absolute path (fallback)
+ */
+import type { Connection } from './connections.js';
+import type { LocationIdentity } from './location.js';
+/**
+ * Parsed opentasks:// URI
+ */
+export interface ParsedOpentasksUri {
+    scheme: 'opentasks';
+    /** Location hash (e.g., "k7m2x9p4") */
+    locationHash?: string;
+    /** Relative path (e.g., "./") */
+    relativePath?: string;
+    /** Absolute path (e.g., "/abs/path/.opentasks/") */
+    absolutePath?: string;
+    /** Node ID (e.g., "i-x7k9") */
+    nodeId: string;
+}
+/**
+ * Resolved location target (without node ID)
+ *
+ * Used by the redirect system and daemon routing where
+ * only the location needs to be resolved, not a specific node.
+ */
+export interface ResolvedLocationTarget {
+    /** Path to the .opentasks directory */
+    opentasksPath: string;
+    /** Location hash */
+    hash: string;
+    /** Whether this is the current location */
+    isLocal: boolean;
+}
+/**
+ * Resolved location result (with node ID)
+ */
+export interface ResolvedLocation extends ResolvedLocationTarget {
+    /** Node ID to access */
+    nodeId: string;
+}
+/**
+ * Parse an opentasks:// URI
+ *
+ * @param uri - The URI to parse
+ * @returns Parsed URI or null if invalid
+ */
+export declare function parseOpentasksUri(uri: string): ParsedOpentasksUri | null;
+/**
+ * Check if a string is an opentasks:// URI
+ */
+export declare function isOpentasksUri(uri: string): boolean;
+/**
+ * Resolve a location target to a location (without node ID)
+ *
+ * Accepts a location specifier in any of these forms:
+ *   - Bare hash: "k7m2x9p4"
+ *   - Current-location shorthand: "."
+ *   - Hash-based URI: "opentasks://k7m2x9p4/" or "opentasks://k7m2x9p4/node-id"
+ *   - Absolute path URI: "opentasks:///abs/path/.opentasks/"
+ *
+ * Used by the redirect system, daemon routing, and worktree lookup.
+ *
+ * @param target - Location specifier (hash, ".", or opentasks:// URI)
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @returns Resolved location target or throws on error
+ */
+export declare function resolveLocationTarget(target: string, connections: Connection[], currentLocation: LocationIdentity, currentOpentasksPath: string): ResolvedLocationTarget;
+/**
+ * Resolve an opentasks:// URI to a location and node ID
+ *
+ * Delegates to resolveLocationTarget for the location part,
+ * then attaches the node ID from the URI.
+ *
+ * @param uri - The URI to resolve
+ * @param connections - Available connections
+ * @param currentLocation - Current location identity
+ * @param currentOpentasksPath - Path to current .opentasks directory
+ * @returns Resolved location or throws on error
+ */
+export declare function resolveOpentasksUri(uri: string, connections: Connection[], currentLocation: LocationIdentity, currentOpentasksPath: string): ResolvedLocation;
+/**
+ * Build an opentasks:// URI from components
+ *
+ * @param locationHash - Location hash
+ * @param nodeId - Node ID
+ * @returns Formatted URI string
+ */
+export declare function buildOpentasksUri(locationHash: string, nodeId: string): string;
+/**
+ * Build a current-location opentasks:// URI
+ *
+ * @param nodeId - Node ID
+ * @returns Formatted URI string
+ */
+export declare function buildLocalUri(nodeId: string): string;
+//# sourceMappingURL=uri.d.ts.map

package/dist/core/uri.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../src/core/uri.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGtD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACrC,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,sBAAsB;IAC9D,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAqDxE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,UAAU,EAAE,EACzB,eAAe,EAAE,gBAAgB,EACjC,oBAAoB,EAAE,MAAM,GAC3B,sBAAsB,CAoDxB;AAuBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,UAAU,EAAE,EACzB,eAAe,EAAE,gBAAgB,EACjC,oBAAoB,EAAE,MAAM,GAC3B,gBAAgB,CAYlB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD"}