@zooique/memora 0.1.0 → 0.2.0

package/dist/llm/provider.js

@@ -6,8 +6,12 @@ export class LlmProvider {
     /**
      * 是否支持结构化输出（response_format json_schema）
      *
-     * 默认 false，子类可覆盖。AgentLoop 在构建工具调用时检查此标记，
-     * 不支持时自动降级为纯文本 tool_call 模式。
+     * 默认 false，子类可覆盖。用于非 tool_call 场景的结构化输出约束
+     * （如归档摘要强制 JSON、配置建议提取等）。调用方在构造 ChatOptions
+     * 时显式传入 response_format，Provider 应将其透传到请求 body。
+     *
+     * 注意：response_format 不能与 tools 同时使用（OpenAI 协议限制），
+     * tool_calls 走独立的 SSE delta 流式协议，无需此约束。
      */
     supportsStructuredOutput = false;
 }

package/dist/llm/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/llm/provider.ts"],"names":[],"mappings":"AA2EA;;;GAGG;AACH,MAAM,OAAgB,WAAW;IAG/B;;;;;OAKG;IACM,wBAAwB,GAAY,KAAK,CAAC;CAOpD"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/llm/provider.ts"],"names":[],"mappings":"AAoFA;;;GAGG;AACH,MAAM,OAAgB,WAAW;IAG/B;;;;;;;;;OASG;IACM,wBAAwB,GAAY,KAAK,CAAC;CAOpD"}

package/dist/logging/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logging/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,8BAA8B,CAAC;AAsPnE;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,OAapB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAqB9D"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logging/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,8BAA8B,CAAC;AA8PnE;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,OAapB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CA4B9D"}

package/dist/logging/logger.js

@@ -1,4 +1,3 @@
-import { statSync, truncateSync } from 'node:fs';
 import { toError } from '../utils/toError.js';
 // 桥接 utils 层 loggerHolder：utils 运行时不依赖 logging/，
 // 由本模块在加载和 setLogger 时反向注入 logger 实例。
@@ -146,7 +145,7 @@ async function tryCreatePinoLogger() {
     try {
         const pino = (await import('pino')).default;
         const { resolve } = await import('node:path');
-        const { mkdirSync, createWriteStream } = await import('node:fs');
+        const { mkdirSync, createWriteStream, statSync, truncateSync } = await import('node:fs');
         const { expandHome } = await import('../utils/path.js');
         const dataDir = process.env['MEMORA_DATA_DIR'] ?? '~/.memora';
         const resolvedDataDir = resolve(expandHome(dataDir));
@@ -157,7 +156,7 @@ async function tryCreatePinoLogger() {
             streams.push({ level: 'info', stream: process.stderr });
         }
         // 文件流（结构化 JSON，方便后续分析）
-        // SEC-06: 日志轮转保护——超过 10MB 时截断重写，防止长期运行生成巨大文件
+        // 日志轮转保护——超过 10MB 时截断重写，防止长期运行生成巨大文件
         if (fileEnabled) {
             try {
                 const logsDir = resolve(resolvedDataDir, 'logs');
@@ -214,7 +213,16 @@ let _loggerInjected = false;
 // 同步初始化 utils 层 logger 桥接（确保 utils 在 pino 异步加载前就有 console fallback）
 setUtilsLogger(_logger);
 // 模块加载时异步尝试升级到 pino（不阻塞模块导入）
+// 竞态守卫：then 回调内检查 _loggerInjected，避免覆盖宿主已注入的 logger
+// 场景：模块加载 → setLogger(custom) 同步执行 → tryCreatePinoLogger 异步 resolve
+// 此时若不加守卫，pino 会覆盖 custom，宿主 logger 静默丢失
 void tryCreatePinoLogger().then((pinoLogger) => {
+    // 守卫：宿主已通过 setLogger 注入自定义 logger，不再覆盖
+    if (_loggerInjected) {
+        // 仍同步桥接到 utils 层（utils 可能尚未收到宿主 logger）
+        setUtilsLogger(_logger);
+        return;
+    }
     if (pinoLogger) {
         _logger = pinoLogger;
         _logger.info({ level, prod: isProd, fileEnabled }, 'logger 启动（pino）');
@@ -265,15 +273,23 @@ export function setLogger(newLogger) {
         _logger = newLogger;
     }
     else {
-        // 恢复默认：尝试 pino，否则 console
+        // 恢复默认：同步先恢复到 console fallback，异步再尝试升级到 pino
+        // 与模块加载时一致（先 console，再异步 pino），避免 setLogger(undefined) 后 _logger 仍指向旧实例
         _loggerInjected = false;
+        _logger = createConsoleLogger();
+        setUtilsLogger(_logger);
+        // 竞态守卫：若回调执行前宿主再次调用 setLogger(custom)，
+        // _loggerInjected 会被置为 true，此时不应覆盖
         void tryCreatePinoLogger().then((pinoLogger) => {
-            _logger = pinoLogger ?? createConsoleLogger();
-            // 桥接注入到 utils 层
-            setUtilsLogger(_logger);
+            // 守卫：恢复过程中宿主又注入了新 logger，不再覆盖
+            if (_loggerInjected)
+                return;
+            if (pinoLogger) {
+                _logger = pinoLogger;
+                // 桥接注入到 utils 层
+                setUtilsLogger(_logger);
+            }
         });
     }
-    // 同步桥接注入到 utils 层（覆盖异步路径，确保 setLogger 后立即生效）
-    setUtilsLogger(_logger);
 }
 //# sourceMappingURL=logger.js.map

package/dist/logging/logger.js.map

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

package/dist/memory/hybridMerge.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 双通道融合排序 — 共享给 recall() 和 searchHybrid()
+ *
+ * 设计动机：
+ * recall.ts 和 memoryInspector.ts 共用"向量通道 + 关键词通道合并排序"逻辑，
+ * 集中到此模块实现单点维护。常量（RECALL_LIMIT_MULTIPLIER /
+ * VECTOR_SCORE_WEIGHT / MEMORY_SCORE_WEIGHT）与算法同源，
+ * agent 直接从本模块导入，不再绕道 recall.ts，遵守"agent 不依赖 memory
+ * 内部常量"分层原则。
+ *
+ * 收益：
+ *   - 算法单点维护（排序权重调整只需改一处）
+ *   - 常量与算法同源，agent 直接从 hybridMerge 导入，不再绕道 recall.ts
+ *
+ * 详见 ADR-004 · 记忆统一模型 + architecture_philosophy_rules.md §6 增量召回
+ */
+import type { Memory } from '../memory/types.js';
+/** 语义搜索召回倍率（在最终 limit 基础上多召回一些，供后续融合排序） */
+export declare const RECALL_LIMIT_MULTIPLIER = 2;
+/** 综合排序时语义相似度权重 */
+export declare const VECTOR_SCORE_WEIGHT = 0.6;
+/** 综合排序时记忆 score 权重 */
+export declare const MEMORY_SCORE_WEIGHT = 0.4;
+/**
+ * 双通道合并结果条目
+ *
+ * 一条记忆在合并 Map 中的状态：memory + 它在向量通道的相似度分数。
+ * vectorScore = 0 表示该记忆仅来自关键词通道（未命中向量索引）。
+ */
+export interface HybridMergeEntry {
+    /** 记忆对象 */
+    memory: Memory;
+    /** 向量相似度分数（0~1，仅关键词命中时为 0） */
+    vectorScore: number;
+}
+/**
+ * 双通道融合排序的纯函数
+ *
+ * 算法：按 vectorScore * VECTOR_SCORE_WEIGHT + memory.score * MEMORY_SCORE_WEIGHT 降序排列，
+ * 取前 limit 条。
+ *
+ * 输入：已去重的合并 Map 的 values（或任何可迭代的 HybridMergeEntry）
+ * 输出：排序后的数组（前 limit 条）
+ *
+ * 共享消费者：
+ *   - recall.ts recall() — 召回时融合排序（+ boost + 写回存储）
+ *   - memoryInspector.ts searchHybrid() — 搜索时融合排序（→ AgentSearchHit）
+ *
+ * @param entries - 双通道合并后的条目（调用方负责去重）
+ * @param limit - 返回数量上限
+ * @returns 排序后的 HybridMergeEntry 数组
+ */
+export declare function hybridMerge(entries: Iterable<HybridMergeEntry>, limit: number): HybridMergeEntry[];
+//# sourceMappingURL=hybridMerge.d.ts.map

package/dist/memory/hybridMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hybridMerge.d.ts","sourceRoot":"","sources":["../../src/memory/hybridMerge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,2CAA2C;AAC3C,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,mBAAmB;AACnB,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,uBAAuB;AACvB,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAIvC;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EACnC,KAAK,EAAE,MAAM,GACZ,gBAAgB,EAAE,CASpB"}

package/dist/memory/hybridMerge.js

@@ -0,0 +1,36 @@
+// ─── 融合排序常量 ─────────────────────────────────────
+/** 语义搜索召回倍率（在最终 limit 基础上多召回一些，供后续融合排序） */
+export const RECALL_LIMIT_MULTIPLIER = 2;
+/** 综合排序时语义相似度权重 */
+export const VECTOR_SCORE_WEIGHT = 0.6;
+/** 综合排序时记忆 score 权重 */
+export const MEMORY_SCORE_WEIGHT = 0.4;
+// ─── 融合排序纯函数 ───────────────────────────────────
+/**
+ * 双通道融合排序的纯函数
+ *
+ * 算法：按 vectorScore * VECTOR_SCORE_WEIGHT + memory.score * MEMORY_SCORE_WEIGHT 降序排列，
+ * 取前 limit 条。
+ *
+ * 输入：已去重的合并 Map 的 values（或任何可迭代的 HybridMergeEntry）
+ * 输出：排序后的数组（前 limit 条）
+ *
+ * 共享消费者：
+ *   - recall.ts recall() — 召回时融合排序（+ boost + 写回存储）
+ *   - memoryInspector.ts searchHybrid() — 搜索时融合排序（→ AgentSearchHit）
+ *
+ * @param entries - 双通道合并后的条目（调用方负责去重）
+ * @param limit - 返回数量上限
+ * @returns 排序后的 HybridMergeEntry 数组
+ */
+export function hybridMerge(entries, limit) {
+    return [...entries]
+        .sort((a, b) => {
+        // 综合分数 = 向量相似度 * 0.6 + 记忆 score * 0.4
+        const scoreA = a.vectorScore * VECTOR_SCORE_WEIGHT + a.memory.score * MEMORY_SCORE_WEIGHT;
+        const scoreB = b.vectorScore * VECTOR_SCORE_WEIGHT + b.memory.score * MEMORY_SCORE_WEIGHT;
+        return scoreB - scoreA;
+    })
+        .slice(0, limit);
+}
+//# sourceMappingURL=hybridMerge.js.map

package/dist/memory/hybridMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hybridMerge.js","sourceRoot":"","sources":["../../src/memory/hybridMerge.ts"],"names":[],"mappings":"AAkBA,mDAAmD;AAEnD,2CAA2C;AAC3C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,mBAAmB;AACnB,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEvC,uBAAuB;AACvB,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAiBvC,kDAAkD;AAElD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,WAAW,CACzB,OAAmC,EACnC,KAAa;IAEb,OAAO,CAAC,GAAG,OAAO,CAAC;SAChB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,sCAAsC;QACtC,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,GAAG,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC1F,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,GAAG,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC1F,OAAO,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACrB,CAAC"}

package/dist/memory/inMemoryStorage.d.ts

@@ -15,74 +15,149 @@ import type { Memory } from '../memory/types.js';
  * 内存存储实现
  *
  * 使用 Map 存储记忆，核心操作 O(1)~O(log n)。
- * P2-2 优化：维护 source→count 增量缓存，stats()/sourceHealth() 无需全量遍历。
+ * 优化：维护 source→count 增量缓存，stats()/sourceHealth() 无需全量遍历。
  */
 export declare class InMemoryStorage implements IMemoryStorage {
     /** 记忆存储（id → Memory） */
     private memories;
-    /** P2-2 source→count 增量缓存（upsert/delete 时维护，getAllSources 时直接读取） */
+    /** source→count 增量缓存（upsert/delete 时维护，getAllSources 时直接读取） */
     private sourceCountCache;
     /**
      * 插入或更新记忆
      *
      * 自动校验 source 字段，对疑似 typo 发出警告日志。
-     * P2-2 增量维护 sourceCountCache：更新时旧 source 减 1、新 source 加 1。
+     * 增量维护 sourceCountCache（仅统计活跃记忆）：
+     *   - 新增活跃记忆：source 计数 +1
+     *   - 更新同 source 同活跃态：计数不变
+     *   - 更新换 source：旧 source -1、新 source +1
+     * 软删除状态转换维护：
+     *   - 活跃 → 软删除：source 计数 -1
+     *   - 软删除 → 活跃：source 计数 +1
+     *
+     * 软删除校验：
+     *   若 existing 已软删除（deletedAt !== undefined）且 newMemory 为活跃态
+     *   （deletedAt === undefined），抛出错误阻止"通过 upsert 复活软删除记忆"。
+     *   调用方必须先显式 restore(id) 恢复记忆后再 upsert。
+     *   例外：newMemory 显式带 deletedAt（如测试场景篡改 deletedAt）允许通过，
+     *   因为此时调用方明确意图是覆盖软删除状态而非"复活"。
+     *
+     * 采用 delta 方式：先扣除 existing 的活跃贡献，再加回 newMemory 的活跃贡献。
+     * 该方式可统一处理 source 变更 + 软删除状态变更的所有组合，避免分支爆炸。
      */
     upsert(memory: Memory): void;
     /**
-     * 删除记忆
+     * 软删除记忆
+     *
+     * 写入 deletedAt 时间戳，不物理移除 Map 条目。
+     * - 召回/搜索/列表/统计自动过滤已软删除的记忆
+     * - 可通过 restore(id) 恢复
+     * - 回收站保留期过后由 purgeExpired(before) 物理清理
      *
-     * P2-2 增量维护 sourceCountCache：删除时对应 source 减 1。
+     * 对已软删除的记忆调用为 no-op。
+     * 增量维护 sourceCountCache：软删除时对应 source 减 1。
      */
     delete(id: string): void;
     /**
-     * 按 ID 获取单条记忆
+     * 恢复软删除的记忆
+     *
+     * 清除 deletedAt 字段，使记忆重新出现在召回/搜索/列表中。
+     * 对活跃记忆调用为 no-op。
+     * 增量维护 sourceCountCache：恢复时对应 source 加 1。
+     */
+    restore(id: string): void;
+    /**
+     * 物理删除记忆
+     *
+     * 从 Map 中彻底移除，不可恢复。
+     * 用于回收站的"彻底删除"操作，或测试环境的强制清理。
+     *
+     * 注意：若记忆为活跃态（未软删除），purge 也会减 1 计数，
+     * 但正常流程应先软删除再 purge，此时计数已在 delete() 中扣除。
+     */
+    purge(id: string): void;
+    /**
+     * 列出回收站中的软删除记忆
+     *
+     * 按 deletedAt 降序（最近删除的在前），便于回收站 UI 展示。
+     * 返回浅拷贝，避免调用方修改污染存储内部对象。
+     *
+     * @param limit - 返回数量上限（默认 50）
+     * @returns 软删除记忆列表（副本）
+     */
+    listDeleted(limit?: number): Memory[];
+    /**
+     * 按 ID 获取单条软删除记忆
+     *
+     * 用于 restore/purge 操作前的存在性校验，避免 listDeleted 默认 50 上限
+     * 导致回收站超量时操作失效。
+     *
+     * @param id 记忆唯一标识
+     * @returns 软删除记忆（浅拷贝），不存在或未软删除时返回 null
+     */
+    getDeletedById(id: string): Memory | null;
+    /**
+     * 清理过期的软删除记忆
+     *
+     * 物理删除所有 deletedAt 早于 before 的记忆。
+     * 由宿主项目的定时器调用（默认 30 天保留期）。
+     *
+     * @param before - 时间阈值，deletedAt 早于此值的记忆将被物理删除
+     * @returns 被清理的记忆数量
+     */
+    purgeExpired(before: Date): number;
+    /**
+     * 按 ID 获取单条活跃记忆（已软删除的返回 null）
      *
      * 返回浅拷贝，避免调用方修改污染存储内部对象（接口契约：读取隔离）
      */
     getById(id: string): Memory | null;
     /**
-     * 按来源标签获取记忆
+     * 按来源标签获取活跃记忆（自动过滤已软删除的）
      *
      * 返回浅拷贝数组，避免调用方修改污染存储内部对象。
      *
      * @param source - 来源标签（如 'persona'、'rule'、'insight'）
-     * @returns 该来源的所有记忆（副本），按 score 降序排列
+     * @returns 该来源的所有活跃记忆（副本），按 score 降序排列
      */
     getBySource(source: string): Memory[];
     /**
-     * 文本搜索（内存版）
+     * 文本搜索活跃记忆（自动过滤已软删除的，内存版）
      *
      * 使用 segmentText() 规范分词，与 SqliteStorage 行为一致。
      * 搜索 content 和 name 字段，按 score 降序排列。
      *
      * @param query - 搜索查询文本
      * @param limit - 返回数量上限（默认 10）
-     * @returns 匹配的记忆列表
+     * @returns 匹配的活跃记忆列表
      */
     search(query: string, limit?: number): Memory[];
     /**
-     * 统计记忆总数
+     * 统计活跃记忆总数（不含已软删除的）
+     *
+     * 优化：直接累加 sourceCountCache 的所有值，O(sources) 复杂度。
+     * 因 sourceCountCache 仅维护活跃记忆计数，求和即为活跃总数。
      */
     count(): number;
     /**
      * 按来源标签统计记忆数量
      *
-     * P2-2 优化：直接读取 sourceCountCache，O(1) 复杂度（与 getAllSources 一致）
+     * 优化：直接读取 sourceCountCache，O(1) 复杂度
+     * （getAllSources 为 O(sources)，因需拷贝 Map，二者复杂度不同）
      * 原实现 O(n) 遍历所有记忆，与增量缓存设计不一致
      */
     countBySource(source: string): number;
     /**
-     * 衰减指定来源的记忆 score
+     * 衰减指定来源的活跃记忆 score（跳过已软删除的）
      *
-     * 遍历所有匹配 source 的记忆，按时间衰减。
+     * 遍历所有匹配 source 的活跃记忆，按时间衰减。
      * 生产环境宿主（SqliteStorage）应重写为 SQL UPDATE 批量操作。
      */
     decayScores(sources: string[], now: Date): number;
     /**
      * 获取所有 source 标签及其记忆数量
      *
-     * P2-2 优化：直接读取增量维护的 sourceCountCache，O(1) 复杂度。
+     * 优化：直接读取增量维护的 sourceCountCache。
+     * 复杂度为 O(sources)（拷贝 Map），相比全量遍历 O(n) 仍有显著优化。
      */
     getAllSources(): Map<string, number>;
     /**

package/dist/memory/inMemoryStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inMemoryStorage.d.ts","sourceRoot":"","sources":["../../src/memory/inMemoryStorage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAMhD;;;;;GAKG;AACH,qBAAa,eAAgB,YAAW,cAAc;IACpD,wBAAwB;IACxB,OAAO,CAAC,QAAQ,CAAkC;IAElD,oEAAoE;IACpE,OAAO,CAAC,gBAAgB,CAAkC;IAE1D;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAqB5B;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAQxB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKlC;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAOrC;;;;;;;;;OASG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,MAAM,EAAE;IAiC3C;;OAEG;IACH,KAAK,IAAI,MAAM;IAIf;;;;;OAKG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIrC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,GAAG,MAAM;IAWjD;;;;OAIG;IACH,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIpC;;OAEG;IACH,KAAK,IAAI,IAAI;IAQb,mBAAmB;IACnB,OAAO,CAAC,oBAAoB;IAI5B,8BAA8B;IAC9B,OAAO,CAAC,oBAAoB;CAS7B"}
+{"version":3,"file":"inMemoryStorage.d.ts","sourceRoot":"","sources":["../../src/memory/inMemoryStorage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAQhD;;;;;GAKG;AACH,qBAAa,eAAgB,YAAW,cAAc;IACpD,wBAAwB;IACxB,OAAO,CAAC,QAAQ,CAAkC;IAElD,+DAA+D;IAC/D,OAAO,CAAC,gBAAgB,CAAkC;IAE1D;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA2C5B;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWxB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWzB;;;;;;;;OAQG;IACH,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAUvB;;;;;;;;OAQG;IACH,WAAW,CAAC,KAAK,SAAK,GAAG,MAAM,EAAE;IAWjC;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAOzC;;;;;;;;OAQG;IACH,YAAY,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM;IAalC;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAOlC;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAOrC;;;;;;;;;OASG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,MAAM,EAAE;IAoC3C;;;;;OAKG;IACH,KAAK,IAAI,MAAM;IAMf;;;;;;OAMG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIrC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,GAAG,MAAM;IAajD;;;;;OAKG;IACH,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIpC;;OAEG;IACH,KAAK,IAAI,IAAI;IAQb,mBAAmB;IACnB,OAAO,CAAC,oBAAoB;IAI5B,8BAA8B;IAC9B,OAAO,CAAC,oBAAoB;CAS7B"}