opkg 0.9.0 → 0.9.2

package/packages/core/dist/core/save/save-conflict-analyzer.d.ts

@@ -0,0 +1,120 @@
+import type { SaveCandidate, SaveCandidateGroup, ResolutionStrategy } from './save-types.js';
+/**
+ * Conflict analysis and resolution strategy determination
+ *
+ * This module classifies candidate groups and determines the appropriate resolution
+ * strategy based on the number and similarity of workspace candidates.
+ *
+ * @module save-conflict-analyzer
+ */
+/**
+ * ConflictAnalysisType classifies the conflict scenario for a candidate group
+ *
+ * - `no-action-needed`: No workspace candidates exist (nothing to save)
+ * - `no-change-needed`: Workspace content is identical to source (skip save)
+ * - `auto-write`: Single or all-identical workspace candidates (auto-resolve)
+ * - `needs-resolution`: Multiple differing workspace candidates (user choice required)
+ */
+export type ConflictAnalysisType = 'no-action-needed' | 'no-change-needed' | 'auto-write' | 'needs-resolution';
+/**
+ * ConflictAnalysis represents the complete analysis of a candidate group
+ *
+ * Contains all metadata needed to determine how to handle the group,
+ * including conflict type, candidate counts, and recommended strategy.
+ */
+export interface ConflictAnalysis {
+    /** The registry path being analyzed */
+    registryPath: string;
+    /** Classification of conflict scenario */
+    type: ConflictAnalysisType;
+    /** Total number of workspace candidates (before deduplication) */
+    workspaceCandidateCount: number;
+    /** Deduplicated workspace candidates (unique by content hash) */
+    uniqueWorkspaceCandidates: SaveCandidate[];
+    /** Whether a local (source) candidate exists */
+    hasLocalCandidate: boolean;
+    /** Whether source content matches workspace (when single workspace candidate) */
+    localMatchesWorkspace: boolean;
+    /** Whether this is a root package file (AGENTS.md, etc.) */
+    isRootFile: boolean;
+    /** Whether any workspace candidates are platform-specific */
+    hasPlatformCandidates: boolean;
+    /** Recommended resolution strategy based on analysis */
+    recommendedStrategy: ResolutionStrategy;
+}
+/**
+ * Analyze a candidate group and determine resolution strategy
+ *
+ * This is the primary entry point for conflict analysis. It examines the
+ * workspace candidates in a group and determines:
+ * 1. What type of conflict (if any) exists
+ * 2. Whether the change can be auto-resolved
+ * 3. What resolution strategy should be used
+ *
+ * **Decision Flow**:
+ * ```
+ * No workspace candidates → no-action-needed (skip)
+ * Single workspace, matches source → no-change-needed (skip)
+ * Single workspace, differs from source → auto-write (write-single)
+ * Multiple identical workspace → auto-write (write-single after dedup)
+ * Multiple differing, force=true → needs-resolution (force-newest)
+ * Multiple differing, force=false → needs-resolution (interactive)
+ * ```
+ *
+ * @param group - The candidate group to analyze
+ * @param force - Whether force mode is enabled (auto-select newest)
+ * @param workspaceRoot - Workspace root for conversion context
+ * @returns Complete conflict analysis with recommended strategy
+ */
+export declare function analyzeGroup(group: SaveCandidateGroup, force: boolean, workspaceRoot: string): Promise<ConflictAnalysis>;
+/**
+ * Deduplicate candidates by converted content hash (sync version for backward compatibility)
+ *
+ * This is a simplified synchronous version that doesn't handle merge extraction.
+ * Used by existing tests. For production code, use the merge-aware async version
+ * via analyzeGroup.
+ *
+ * @deprecated For backward compatibility with tests only.
+ * @param candidates - Array of candidates to deduplicate
+ * @returns Array of candidates with unique raw content hashes
+ */
+export declare function deduplicateCandidates(candidates: SaveCandidate[]): SaveCandidate[];
+/**
+ * Check if workspace content differs from local source
+ *
+ * Returns true if any workspace candidate has different content than the local source.
+ * This is a simple helper for determining if a save operation would change anything.
+ *
+ * @param local - The local (source) candidate, or undefined if none exists
+ * @param workspace - Array of workspace candidates
+ * @returns True if any workspace content differs from local
+ */
+export declare function hasContentDifference(local: SaveCandidate | undefined, workspace: SaveCandidate[]): boolean;
+/**
+ * Get the newest candidate by modification time
+ *
+ * Returns the candidate with the most recent mtime. Used for auto-selecting
+ * in force mode when multiple differing candidates exist.
+ *
+ * **Tie-breaking**: If multiple candidates have the same mtime (unlikely but possible),
+ * the first one in the array is returned. Consider adding secondary sort by displayPath
+ * for deterministic behavior.
+ *
+ * @param candidates - Array of candidates to search
+ * @returns The candidate with the highest mtime
+ * @throws Error if candidates array is empty
+ */
+export declare function getNewestCandidate(candidates: SaveCandidate[]): SaveCandidate;
+/**
+ * Sort candidates by modification time (newest first) with tie-breaking
+ *
+ * Used to establish a consistent ordering for conflict resolution prompts.
+ * Sorts by mtime descending, with displayPath as alphabetical tie-breaker.
+ *
+ * **Immutable**: Returns a new sorted array; does not modify the input.
+ *
+ * @param candidates - Array of candidates to sort
+ * @returns New array sorted by mtime (newest first), then displayPath (A-Z)
+ */
+export declare function sortCandidatesByMtime(candidates: SaveCandidate[]): SaveCandidate[];
+//# sourceMappingURL=save-conflict-analyzer.d.ts.map

package/packages/core/dist/core/save/save-conflict-analyzer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-conflict-analyzer.d.ts","sourceRoot":"","sources":["../../../src/core/save/save-conflict-analyzer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE7F;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAC5B,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,kBAAkB,CAAC;AAEvB;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IAErB,0CAA0C;IAC1C,IAAI,EAAE,oBAAoB,CAAC;IAE3B,kEAAkE;IAClE,uBAAuB,EAAE,MAAM,CAAC;IAEhC,iEAAiE;IACjE,yBAAyB,EAAE,aAAa,EAAE,CAAC;IAE3C,gDAAgD;IAChD,iBAAiB,EAAE,OAAO,CAAC;IAE3B,iFAAiF;IACjF,qBAAqB,EAAE,OAAO,CAAC;IAE/B,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IAEpB,6DAA6D;IAC7D,qBAAqB,EAAE,OAAO,CAAC;IAE/B,wDAAwD;IACxD,mBAAmB,EAAE,kBAAkB,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,kBAAkB,EACzB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAoH3B;AAsGD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,aAAa,EAAE,GAC1B,aAAa,EAAE,CAejB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,SAAS,EAAE,aAAa,EAAE,GACzB,OAAO,CAMT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,aAAa,EAAE,GAC1B,aAAa,CA0Bf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,aAAa,EAAE,GAC1B,aAAa,EAAE,CAUjB"}

package/packages/core/dist/core/save/save-conflict-analyzer.js

@@ -0,0 +1,305 @@
+import { FILE_PATTERNS } from '../../constants/index.js';
+import { convertSourceToWorkspace, ensureComparableHash } from './save-conversion-helper.js';
+import { extractContentByKeys } from './save-merge-extractor.js';
+import { logger } from '../../utils/logger.js';
+/**
+ * Analyze a candidate group and determine resolution strategy
+ *
+ * This is the primary entry point for conflict analysis. It examines the
+ * workspace candidates in a group and determines:
+ * 1. What type of conflict (if any) exists
+ * 2. Whether the change can be auto-resolved
+ * 3. What resolution strategy should be used
+ *
+ * **Decision Flow**:
+ * ```
+ * No workspace candidates → no-action-needed (skip)
+ * Single workspace, matches source → no-change-needed (skip)
+ * Single workspace, differs from source → auto-write (write-single)
+ * Multiple identical workspace → auto-write (write-single after dedup)
+ * Multiple differing, force=true → needs-resolution (force-newest)
+ * Multiple differing, force=false → needs-resolution (interactive)
+ * ```
+ *
+ * @param group - The candidate group to analyze
+ * @param force - Whether force mode is enabled (auto-select newest)
+ * @param workspaceRoot - Workspace root for conversion context
+ * @returns Complete conflict analysis with recommended strategy
+ */
+export async function analyzeGroup(group, force, workspaceRoot) {
+    const registryPath = group.registryPath;
+    const hasLocal = !!group.local;
+    const workspaceCandidates = group.workspace;
+    const workspaceCandidateCount = workspaceCandidates.length;
+    // Check if this is a root file (AGENTS.md or similar)
+    // Root files may have special handling in some contexts
+    const isRootFile = registryPath === FILE_PATTERNS.AGENTS_MD ||
+        registryPath === FILE_PATTERNS.CLAUDE_MD ||
+        registryPath === FILE_PATTERNS.GEMINI_MD ||
+        registryPath === FILE_PATTERNS.QWEN_MD ||
+        registryPath === FILE_PATTERNS.WARP_MD ||
+        workspaceCandidates.some(c => c.isRootFile);
+    // Check if any candidates are platform-specific
+    // Platform-specific candidates may need separate handling
+    const hasPlatformCandidates = workspaceCandidates.some(c => c.platform && c.platform !== 'ai');
+    // Early exit: No workspace candidates means nothing to save
+    if (workspaceCandidateCount === 0) {
+        return {
+            registryPath,
+            type: 'no-action-needed',
+            workspaceCandidateCount: 0,
+            uniqueWorkspaceCandidates: [],
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: false,
+            isRootFile,
+            hasPlatformCandidates: false,
+            recommendedStrategy: 'skip'
+        };
+    }
+    // Deduplicate workspace candidates by converted content hash (merge-aware)
+    // Multiple workspace files with identical content (after conversion/extraction) are treated as one
+    const uniqueWorkspace = await deduplicateCandidatesWithMerge(workspaceCandidates, workspaceRoot);
+    // Check if workspace content is identical to source (after conversion)
+    // Only applicable when there's exactly one unique workspace candidate
+    const localMatchesWorkspace = hasLocal && uniqueWorkspace.length === 1
+        ? await checkConvertedParity(uniqueWorkspace[0], group.local, workspaceRoot)
+        : false;
+    if (hasLocal && uniqueWorkspace.length > 1) {
+        const parityResults = await Promise.all(uniqueWorkspace.map(async (candidate) => ({
+            workspacePath: candidate.displayPath,
+            platform: candidate.platform || 'none',
+            matchesLocal: await checkConvertedParity(candidate, group.local, workspaceRoot)
+        })));
+        if (parityResults.every(result => result.matchesLocal)) {
+            return {
+                registryPath,
+                type: 'no-change-needed',
+                workspaceCandidateCount,
+                uniqueWorkspaceCandidates: uniqueWorkspace,
+                hasLocalCandidate: hasLocal,
+                localMatchesWorkspace: true,
+                isRootFile,
+                hasPlatformCandidates,
+                recommendedStrategy: 'skip'
+            };
+        }
+    }
+    // No change needed: workspace content is identical to source
+    if (localMatchesWorkspace) {
+        return {
+            registryPath,
+            type: 'no-change-needed',
+            workspaceCandidateCount,
+            uniqueWorkspaceCandidates: uniqueWorkspace,
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: true,
+            isRootFile,
+            hasPlatformCandidates,
+            recommendedStrategy: 'skip'
+        };
+    }
+    // Single unique workspace candidate (or all identical) - can auto-write
+    if (uniqueWorkspace.length === 1) {
+        return {
+            registryPath,
+            type: 'auto-write',
+            workspaceCandidateCount,
+            uniqueWorkspaceCandidates: uniqueWorkspace,
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: false,
+            isRootFile,
+            hasPlatformCandidates,
+            recommendedStrategy: 'write-single'
+        };
+    }
+    // Multiple differing workspace candidates - needs resolution
+    // In force mode, auto-select newest; otherwise require user interaction
+    const recommendedStrategy = force ? 'force-newest' : 'interactive';
+    return {
+        registryPath,
+        type: 'needs-resolution',
+        workspaceCandidateCount,
+        uniqueWorkspaceCandidates: uniqueWorkspace,
+        hasLocalCandidate: hasLocal,
+        localMatchesWorkspace: false,
+        isRootFile,
+        hasPlatformCandidates,
+        recommendedStrategy
+    };
+}
+/**
+ * Check if workspace candidate matches local candidate after conversion
+ *
+ * Helper function for conversion-aware and merge-aware parity checking.
+ * For merged files, extracts package contribution before comparing.
+ * For platform-specific files, converts workspace content to universal format before comparing.
+ *
+ * @param workspace - Workspace candidate
+ * @param local - Local (source) candidate
+ * @param workspaceRoot - Workspace root for conversion
+ * @returns True if converted hashes match
+ */
+async function checkConvertedParity(workspace, local, workspaceRoot) {
+    const workspaceHash = await ensureComparableHash(workspace, workspaceRoot);
+    if (workspace.mergeStrategy && workspace.mergeKeys && workspace.mergeKeys.length > 0) {
+        if (workspace.platform && workspace.platform !== 'ai') {
+            const forward = await convertSourceToWorkspace(local.content, workspace.platform, local.registryPath, workspace.displayPath, workspaceRoot);
+            if (forward.success && forward.convertedContent) {
+                const localConvertedExtract = await extractContentByKeys(forward.convertedContent, workspace.mergeKeys);
+                if (localConvertedExtract.success && localConvertedExtract.extractedHash) {
+                    return workspaceHash === localConvertedExtract.extractedHash;
+                }
+            }
+        }
+        const localExtract = await extractContentByKeys(local.content, workspace.mergeKeys);
+        if (localExtract.success && localExtract.extractedHash) {
+            return workspaceHash === localExtract.extractedHash;
+        }
+        return workspaceHash === local.contentHash;
+    }
+    return workspaceHash === local.contentHash;
+}
+/**
+ * Deduplicate candidates by converted content hash (merge-aware)
+ *
+ * Returns only candidates with unique content after conversion to universal format.
+ * For merged files, extracts package contribution before deduplication.
+ * This enables proper deduplication of platform-specific files that are semantically identical.
+ *
+ * **Example**:
+ * ```
+ * Input: [
+ *   { hash: "abc", path: ".cursor/mcp.json", platform: "cursor" },
+ *   { hash: "def", path: ".claude/.mcp.json", platform: "claude" },  // different raw hash
+ *   { hash: "ghi", path: ".windsurf/mcp.json", platform: "windsurf" }
+ * ]
+ * After conversion to universal format, cursor and claude both convert to same hash "xyz"
+ * Output: [
+ *   { hash: "abc", path: ".cursor/mcp.json", platform: "cursor" },  // first occurrence
+ *   { hash: "ghi", path: ".windsurf/mcp.json", platform: "windsurf" }
+ * ]
+ * ```
+ *
+ * @param candidates - Array of candidates to deduplicate
+ * @param workspaceRoot - Workspace root for conversion context
+ * @returns Array of candidates with unique converted content hashes
+ */
+async function deduplicateCandidatesWithMerge(candidates, workspaceRoot) {
+    const seen = new Set();
+    const unique = [];
+    for (const candidate of candidates) {
+        const hash = await ensureComparableHash(candidate, workspaceRoot);
+        logger.debug(`Dedup check for ${candidate.displayPath}: hash=${hash}, ` +
+            `rawHash=${candidate.contentHash}, seen=${seen.has(hash)}`);
+        if (seen.has(hash)) {
+            logger.debug(`  Skipping duplicate: ${candidate.displayPath}`);
+            continue;
+        }
+        seen.add(hash);
+        unique.push(candidate);
+    }
+    logger.debug(`Deduplication: ${candidates.length} → ${unique.length} unique candidates`);
+    return unique;
+}
+/**
+ * Deduplicate candidates by converted content hash (sync version for backward compatibility)
+ *
+ * This is a simplified synchronous version that doesn't handle merge extraction.
+ * Used by existing tests. For production code, use the merge-aware async version
+ * via analyzeGroup.
+ *
+ * @deprecated For backward compatibility with tests only.
+ * @param candidates - Array of candidates to deduplicate
+ * @returns Array of candidates with unique raw content hashes
+ */
+export function deduplicateCandidates(candidates) {
+    const seen = new Set();
+    const unique = [];
+    for (const candidate of candidates) {
+        const hash = candidate.contentHash;
+        if (seen.has(hash)) {
+            continue;
+        }
+        seen.add(hash);
+        unique.push(candidate);
+    }
+    return unique;
+}
+/**
+ * Check if workspace content differs from local source
+ *
+ * Returns true if any workspace candidate has different content than the local source.
+ * This is a simple helper for determining if a save operation would change anything.
+ *
+ * @param local - The local (source) candidate, or undefined if none exists
+ * @param workspace - Array of workspace candidates
+ * @returns True if any workspace content differs from local
+ */
+export function hasContentDifference(local, workspace) {
+    if (!local)
+        return true; // No local means creation, which is a difference
+    if (workspace.length === 0)
+        return false; // No workspace means no change
+    // Check if any workspace candidate differs from local
+    return workspace.some(w => w.contentHash !== local.contentHash);
+}
+/**
+ * Get the newest candidate by modification time
+ *
+ * Returns the candidate with the most recent mtime. Used for auto-selecting
+ * in force mode when multiple differing candidates exist.
+ *
+ * **Tie-breaking**: If multiple candidates have the same mtime (unlikely but possible),
+ * the first one in the array is returned. Consider adding secondary sort by displayPath
+ * for deterministic behavior.
+ *
+ * @param candidates - Array of candidates to search
+ * @returns The candidate with the highest mtime
+ * @throws Error if candidates array is empty
+ */
+export function getNewestCandidate(candidates) {
+    if (candidates.length === 0) {
+        throw new Error('Cannot get newest candidate from empty array');
+    }
+    if (candidates.length === 1) {
+        return candidates[0];
+    }
+    // Find candidate with maximum mtime
+    let newest = candidates[0];
+    for (let i = 1; i < candidates.length; i++) {
+        const current = candidates[i];
+        // Compare mtime first
+        if (current.mtime > newest.mtime) {
+            newest = current;
+        }
+        else if (current.mtime === newest.mtime) {
+            // Tie-breaker: use alphabetical order by displayPath
+            if (current.displayPath < newest.displayPath) {
+                newest = current;
+            }
+        }
+    }
+    return newest;
+}
+/**
+ * Sort candidates by modification time (newest first) with tie-breaking
+ *
+ * Used to establish a consistent ordering for conflict resolution prompts.
+ * Sorts by mtime descending, with displayPath as alphabetical tie-breaker.
+ *
+ * **Immutable**: Returns a new sorted array; does not modify the input.
+ *
+ * @param candidates - Array of candidates to sort
+ * @returns New array sorted by mtime (newest first), then displayPath (A-Z)
+ */
+export function sortCandidatesByMtime(candidates) {
+    return [...candidates].sort((a, b) => {
+        // Primary sort: mtime descending (newest first)
+        if (b.mtime !== a.mtime) {
+            return b.mtime - a.mtime;
+        }
+        // Tie-breaker: displayPath ascending (alphabetical)
+        return a.displayPath.localeCompare(b.displayPath);
+    });
+}
+//# sourceMappingURL=save-conflict-analyzer.js.map

package/packages/core/dist/core/save/save-conflict-analyzer.js.map

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

package/packages/core/dist/core/save/save-conversion-helper.d.ts

@@ -0,0 +1,84 @@
+/**
+ * Save Conversion Helper Module
+ *
+ * Provides conversion utilities for transforming workspace platform-specific files
+ * to universal format before comparison. This enables semantic equality checks that
+ * account for format differences defined in platforms.jsonc.
+ *
+ * Key responsibilities:
+ * - Apply platform import flows to convert workspace → universal
+ * - Calculate hashes of converted content for comparison
+ * - Cache conversion results to avoid duplicate work
+ * - Handle conversion failures gracefully with fallback
+ *
+ * @module save-conversion-helper
+ */
+import type { SaveCandidate } from './save-types.js';
+import type { Platform } from '../platforms.js';
+export declare function initSharedTempDir(): Promise<void>;
+export declare function cleanupSharedTempDir(): Promise<void>;
+export declare function allocateTempSubdir(): Promise<string>;
+/**
+ * Conversion result with success status
+ */
+export interface ConversionResult {
+    success: boolean;
+    convertedContent?: string;
+    convertedHash?: string;
+    error?: string;
+}
+/**
+ * Calculate hash of workspace candidate after conversion to universal format
+ *
+ * This is the main entry point for conversion-aware hash calculation.
+ * It applies platform import flows to convert workspace content to universal format,
+ * then calculates the hash for comparison.
+ *
+ * @param candidate - Workspace candidate to convert
+ * @param workspaceRoot - Absolute path to workspace root
+ * @returns Hash of converted content (or original hash if conversion not applicable/fails)
+ */
+export declare function calculateConvertedHash(candidate: SaveCandidate, workspaceRoot: string): Promise<string>;
+/**
+ * Convert workspace platform-specific content to universal format
+ *
+ * Applies platform import flows to transform workspace content.
+ * Import flows represent workspace → package transformations.
+ *
+ * @param workspaceContent - Content from workspace file
+ * @param platform - Platform the content is from (e.g., 'cursor', 'claude')
+ * @param registryPath - Universal registry path (e.g., 'mcp.jsonc', 'agents/test.md')
+ * @param workspaceRoot - Absolute path to workspace root
+ * @returns Conversion result with converted content and hash
+ */
+export declare function convertWorkspaceToUniversal(workspaceContent: string, platform: Platform, registryPath: string, workspaceRoot: string): Promise<ConversionResult>;
+/**
+ * Convert source (universal) content to workspace platform-specific format
+ *
+ * Applies platform export flows to transform universal content to workspace format.
+ * This is used for forward parity checking: verifying that workspace file matches
+ * what would be produced by exporting the source.
+ *
+ * @param sourceContent - Content from universal source file
+ * @param platform - Target platform (e.g., 'cursor', 'claude')
+ * @param sourceRegistryPath - Source registry path (e.g., 'mcp.json')
+ * @param workspacePath - Expected workspace path (e.g., '.cursor/mcp.json')
+ * @param workspaceRoot - Absolute path to workspace root
+ * @returns Conversion result with converted content and hash
+ */
+export declare function convertSourceToWorkspace(sourceContent: string, platform: Platform, sourceRegistryPath: string, workspacePath: string, workspaceRoot: string): Promise<ConversionResult>;
+/**
+ * Compute and cache the comparable hash for a candidate.
+ *
+ * For merged files, extracts the package contribution first.
+ * For platform-specific files, converts to universal format.
+ * The result is cached on `candidate.comparableHash` for reuse.
+ */
+export declare function ensureComparableHash(candidate: SaveCandidate, workspaceRoot: string): Promise<string>;
+/**
+ * Clear the conversion cache
+ *
+ * Should be called at the end of save pipeline to free memory.
+ */
+export declare function clearConversionCache(): void;
+//# sourceMappingURL=save-conversion-helper.d.ts.map

package/packages/core/dist/core/save/save-conversion-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-conversion-helper.d.ts","sourceRoot":"","sources":["../../../src/core/save/save-conversion-helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAYH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIvD;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAU1D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQ1D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAgBD;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,aAAa,EACxB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAmCjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,2BAA2B,CAC/C,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAgI3B;AAuKD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,QAAQ,EAClB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAqH3B;AAmDD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,aAAa,EACxB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}