@zajno/common 2.0.5 → 2.0.7

package/README.md

@@ -27,12 +27,14 @@ Prior to v2 some part of this library were depending on [MobX](https://mobx.js.o
 
 It can be used a git submodule if you're brave enough, but it's possible to use it as npm package (kinda) as well. In your project:
 
-1. Install from NPM
+1. Install from NPM w/ yarn
 
 ```
 yarn add @zajno/common
 ```
 
+[`tslib`](https://www.npmjs.com/package/tslib) is the only peer dependency.
+
 2. In your code, use each module separately:
 
 ```typescript
@@ -43,6 +45,8 @@ import logger, { ILogger } from '@zajno/common/logger';
 
 Previously one had to import from like `@zajno/common/lib/logger` since compiling had been doing at `postinstall` time so Typescript with its config was a peer dependency. Currently it's not the case and this packages is provided with build artifacts (js + d.ts + source maps); so no need to include `/lib` part in imports anymore.
 
+Although install time has been decreased, the main downside is that sources are built being targeted on [ES2019 & CommonJS](./tsconfig.json#L13-L14) (for now!). This might be not always suitable and/or optimal for all build setups.
+
 ## Local development
 
 If you plan to update the sources while using it in your project, we'd recommend using [`yalc`](https://www.npmjs.com/package/yalc). It does some magic to allow both using it in your project and updating it.
@@ -63,4 +67,4 @@ The flow will look like the following. [1] – operations made on this project,
 ## Challenges & TODOs
 
 1. This library should be and will be updated frequently. When and how to integrate these changes? For small projects that would not be required, but for long-running ones the strategy would be essential.
-2. It needs [more] tests.
+2. It needs (more) tests.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",
@@ -16,10 +16,10 @@
     "build": "tsc -P tsconfig.build.json",
     "build:clean": "rimraf ./lib && yarn build",
     "build:w": "yarn build --watch",
-    "publish:local": "yalc push --replace --update",
+    "publish:local": "yarn build-for-publish && yarn copy-for-publish && cd lib && yalc push --replace --update",
+    "publish:from-lib": "yarn build-for-publish && yarn copy-for-publish && cd lib && yarn publish",
     "build-for-publish": "yarn build:clean && yarn lint && yarn test",
     "copy-for-publish": "cpy package.json LICENSE README.md lib/",
-    "publish-from-lib": "yarn build-for-publish && yarn copy-for-publish && cd lib && yarn publish",
     "lint": "eslint \"src/**/*.ts?(x)\"",
     "test": "yarn jest --clearCache && yarn jest"
   },

package/structures/promiseCache.d.ts

@@ -0,0 +1,46 @@
+export declare type DeferredGetter<T> = {
+    readonly current: T;
+    readonly promise: Promise<T>;
+    readonly busy: boolean;
+};
+export declare namespace DeferredGetter {
+    const Empty: DeferredGetter<null>;
+}
+export declare class PromiseCache<T, K = string> {
+    readonly fetcher: (id: K) => Promise<T>;
+    readonly keyAdapter?: K extends string ? null : (k: K) => string;
+    readonly keyParser?: K extends string ? null : (id: string) => K;
+    protected readonly _itemsCache: Record<string, T>;
+    protected readonly _itemsStatus: Record<string, boolean>;
+    private readonly _fetchCache;
+    private _logger;
+    protected _busyCount: number;
+    constructor(fetcher: (id: K) => Promise<T>, keyAdapter?: K extends string ? null : (k: K) => string, keyParser?: K extends string ? null : (id: string) => K);
+    get busyCount(): number;
+    private _pk;
+    useLogger(name?: string): this;
+    getDeferred(key: K): DeferredGetter<T>;
+    getIsBusy(id: K): boolean;
+    getCurrent(id: K, initiateFetch?: boolean): T;
+    get(id: K): Promise<T>;
+    protected _doFetchAsync: (id: K, key: string) => Promise<T>;
+    invalidate(id: K): void;
+    updateValueDirectly(id: K, value: T): void;
+    hasKey(id: K): boolean;
+    keys(): string[];
+    keysParsed(): K[];
+    protected _set(key: string, item: T, promise: Promise<T>, busy: boolean): void;
+    /** @override */
+    protected setStatus(key: string, status: boolean): void;
+    /** @override */
+    protected setPromise(key: string, promise: Promise<T>): void;
+    /** @override */
+    protected onBeforeFetch(_key: string): void;
+    /** @override */
+    protected prepareResult(res: Awaited<T>): Awaited<T>;
+    /** @override */
+    protected storeResult(key: string, res: Awaited<T>): void;
+    /** @override */
+    protected onFetchComplete(key: string): void;
+}
+//# sourceMappingURL=promiseCache.d.ts.map

package/structures/promiseCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promiseCache.d.ts","sourceRoot":"","sources":["../../src/structures/promiseCache.ts"],"names":[],"mappings":"AAEA,oBAAY,cAAc,CAAC,CAAC,IAAI;IAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,yBAAiB,cAAc,CAAC;IAErB,MAAM,KAAK,sBAKO,CAAC;CAC7B;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM;IAW/B,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM;IAChE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC;IAXpE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAO;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAO;IAE/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAAiB;IAChC,SAAS,CAAC,UAAU,SAAK;gBAGZ,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAC9B,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,EACvD,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC;IAKpE,IAAW,SAAS,WAA8B;IAElD,OAAO,CAAC,GAAG;IAgBX,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAKvB,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAStC,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO;IAKzB,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,aAAa,UAAO,GAAG,CAAC;IAU1C,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAuBtB,SAAS,CAAC,aAAa,OAAc,CAAC,OAAO,MAAM,gBAajD;IAEF,UAAU,CAAC,EAAE,EAAE,CAAC;IAKhB,mBAAmB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;IAKnC,MAAM,CAAC,EAAE,EAAE,CAAC;IAKZ,IAAI;IAIJ,UAAU;IAQV,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO;IAMvE,gBAAgB;IAChB,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,gBAAgB;IAChB,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAIrD,gBAAgB;IAChB,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAIpC,gBAAgB;IAChB,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAIvC,gBAAgB;IAChB,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAIlD,gBAAgB;IAChB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM;CAKxC"}

package/structures/promiseCache.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromiseCache = exports.DeferredGetter = void 0;
+const logger_1 = require("../logger");
+var DeferredGetter;
+(function (DeferredGetter) {
+    const _resolvedPromise = Promise.resolve(undefined);
+    DeferredGetter.Empty = {
+        get current() { return undefined; },
+        get promise() { return _resolvedPromise; },
+        get busy() { return undefined; },
+        isEmpty: true,
+    };
+})(DeferredGetter = exports.DeferredGetter || (exports.DeferredGetter = {}));
+class PromiseCache {
+    constructor(fetcher, keyAdapter, keyParser) {
+        this.fetcher = fetcher;
+        this.keyAdapter = keyAdapter;
+        this.keyParser = keyParser;
+        this._itemsCache = {};
+        this._itemsStatus = {};
+        this._fetchCache = {};
+        this._logger = null;
+        this._busyCount = 0;
+        this._doFetchAsync = async (id, key) => {
+            var _a;
+            try {
+                this.onBeforeFetch(key);
+                let res = await this.fetcher(id);
+                if (this._fetchCache[key]) {
+                    (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(key, 'item\'s <promise> resolved to', res);
+                    res = this.prepareResult(res);
+                    this.storeResult(key, res);
+                }
+                return res;
+            }
+            finally {
+                this.onFetchComplete(key);
+            }
+        };
+        //
+    }
+    get busyCount() { return this._busyCount; }
+    _pk(k) {
+        if (k == null) {
+            throw new Error('PromiseCache: null keys are not supported');
+        }
+        if (typeof k === 'string') {
+            return k;
+        }
+        if (!this.keyAdapter) {
+            throw new Error('Provide key adapter for non-string keys');
+        }
+        return this.keyAdapter(k);
+    }
+    useLogger(name) {
+        this._logger = (0, logger_1.createLogger)(`[PromiseCache:${name || '?'}]`);
+        return this;
+    }
+    getDeferred(key) {
+        const self = this;
+        return {
+            get current() { return self.getCurrent(key); },
+            get promise() { return self.get(key); },
+            get busy() { return self.getIsBusy(key); },
+        };
+    }
+    getIsBusy(id) {
+        const key = this._pk(id);
+        return this._itemsStatus[key];
+    }
+    getCurrent(id, initiateFetch = true) {
+        var _a;
+        const key = this._pk(id);
+        const item = this._itemsCache[key];
+        if (initiateFetch) {
+            this.get(id);
+        }
+        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(key, 'getCurrent returns', item);
+        return item;
+    }
+    get(id) {
+        var _a, _b;
+        const key = this._pk(id);
+        const item = this._itemsCache[key];
+        if (item !== undefined) {
+            (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(key, 'item resolved to', item);
+            return Promise.resolve(item);
+        }
+        let promise = this._fetchCache[key];
+        if (promise) {
+            (_b = this._logger) === null || _b === void 0 ? void 0 : _b.log(key, 'item resolved to <promise>');
+            return promise;
+        }
+        this.setStatus(key, true);
+        promise = this._doFetchAsync(id, key);
+        this.setPromise(key, promise);
+        return promise;
+    }
+    invalidate(id) {
+        const key = this._pk(id);
+        this._set(key, undefined, undefined, undefined);
+    }
+    updateValueDirectly(id, value) {
+        const key = this._pk(id);
+        this._set(key, value, undefined, undefined);
+    }
+    hasKey(id) {
+        const key = this._pk(id);
+        return this._itemsCache[key] !== undefined || this._itemsStatus[key] !== undefined;
+    }
+    keys() {
+        return Object.keys(this._itemsCache);
+    }
+    keysParsed() {
+        if (!this.keyParser) {
+            return null;
+        }
+        return this.keys().map(this.keyParser);
+    }
+    _set(key, item, promise, busy) {
+        _setX(key, this._fetchCache, promise);
+        _setX(key, this._itemsStatus, busy);
+        _setX(key, this._itemsCache, item);
+    }
+    /** @override */
+    setStatus(key, status) {
+        this._itemsStatus[key] = status;
+    }
+    /** @override */
+    setPromise(key, promise) {
+        this._fetchCache[key] = promise;
+    }
+    /** @override */
+    onBeforeFetch(_key) {
+        ++this._busyCount;
+    }
+    /** @override */
+    prepareResult(res) {
+        return res || null;
+    }
+    /** @override */
+    storeResult(key, res) {
+        this._itemsCache[key] = res;
+    }
+    /** @override */
+    onFetchComplete(key) {
+        --this._busyCount;
+        delete this._fetchCache[key];
+        this._itemsStatus[key] = false;
+    }
+}
+exports.PromiseCache = PromiseCache;
+function _setX(key, obj, val) {
+    if (val === undefined) {
+        delete obj[key];
+    }
+    else {
+        obj[key] = val;
+    }
+}
+//# sourceMappingURL=promiseCache.js.map

package/structures/promiseCache.js.map

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

package/structures/subscribersMap.d.ts

@@ -0,0 +1,23 @@
+import { IDisposable } from '../functions/disposer';
+declare type Unsub = () => void;
+export declare class SubscribersMap implements IDisposable {
+    readonly subscribe: null | ((key: string) => Promise<Unsub[]>);
+    readonly name?: string;
+    /** Unsusbcribers map: key => unsub fn */
+    private readonly _map;
+    /** Timeouts map: key => timeout handle */
+    private readonly _timeouts;
+    private readonly _logger;
+    protected _count: number;
+    constructor(subscribe: null | ((key: string) => Promise<Unsub[]>), name?: string);
+    get count(): number;
+    getIsObserving(key: string): boolean;
+    getHasObserveTimeout(key: string): boolean;
+    enable(key: string, enable: boolean, clearAfter?: number, existingUnsubs?: Unsub[]): Promise<void>;
+    private refreshTimeout;
+    protected setCount(v: number): void;
+    clear(): void;
+    dispose(): void;
+}
+export {};
+//# sourceMappingURL=subscribersMap.d.ts.map

package/structures/subscribersMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscribersMap.d.ts","sourceRoot":"","sources":["../../src/structures/subscribersMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEtE,aAAK,KAAK,GAAG,MAAM,IAAI,CAAC;AAExB,qBAAa,cAAe,YAAW,WAAW;IASlC,QAAQ,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IARlG,yCAAyC;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IACtD,0CAA0C;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,SAAS,CAAC,MAAM,SAAK;gBAEA,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAW,IAAI,CAAC,EAAE,MAAM;IAIlG,IAAW,KAAK,WAA0B;IAEnC,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAI1B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAE,MAAa,EAAE,cAAc,GAAE,KAAK,EAAS;IAuC3G,OAAO,CAAC,cAAc;IAkBtB,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM;IAIrB,KAAK;IAeL,OAAO;CAGjB"}

package/structures/subscribersMap.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscribersMap = void 0;
+const logger_1 = require("../logger");
+const disposer_1 = require("../functions/disposer");
+class SubscribersMap {
+    constructor(subscribe, name) {
+        this.subscribe = subscribe;
+        this.name = name;
+        /** Unsusbcribers map: key => unsub fn */
+        this._map = new Map();
+        /** Timeouts map: key => timeout handle */
+        this._timeouts = new Map();
+        this._logger = null;
+        this._count = 0;
+        this._logger = (0, logger_1.createLogger)(`[Observers:${this.name || '?'}]`);
+    }
+    get count() { return this._count; }
+    getIsObserving(key) {
+        return this._map.has(key);
+    }
+    getHasObserveTimeout(key) {
+        return this.getIsObserving(key) && this._timeouts.has(key);
+    }
+    async enable(key, enable, clearAfter = null, existingUnsubs = null) {
+        if (enable === this.getIsObserving(key)) {
+            this.refreshTimeout(key, enable, clearAfter, true);
+            return;
+        }
+        if (enable) {
+            this._logger.log('Adding observer for key =', key, clearAfter ? `, clearAfter = ${clearAfter}` : '');
+            // this marker will help to determine whether unsubscribe was requested while we were in process of subscribing
+            let disabed = false;
+            const marker = () => { disabed = true; };
+            this._map.set(key, marker);
+            if (!this.subscribe && !existingUnsubs) {
+                throw new Error('Neither subscribe function nor existingUnsubs has been configured');
+            }
+            const unsubs = existingUnsubs || await this.subscribe(key);
+            const result = (0, disposer_1.combineDisposers)(...unsubs);
+            if (disabed) { // unsubscribe was requested
+                result();
+            }
+            else {
+                this._map.set(key, result);
+                this.setCount(this._count + 1);
+                this.refreshTimeout(key, true, clearAfter);
+            }
+        }
+        else {
+            this._logger.log('Removing observer for key =', key);
+            this.refreshTimeout(key, false);
+            const unsub = this._map.get(key);
+            this._map.delete(key);
+            unsub();
+            this.setCount(this._count - 1);
+        }
+    }
+    refreshTimeout(key, enable, timeout, refresh = false) {
+        const current = this._timeouts.get(key);
+        if (current) {
+            clearTimeout(current);
+            this._timeouts.delete(key);
+        }
+        if (enable && refresh && current == null) {
+            // DO NOT setup new timeout because it's not intended to clear subscribtion if it was previously enabled for long term
+            return;
+        }
+        if (enable && timeout) {
+            const t = setTimeout(() => this.enable(key, false), timeout);
+            this._timeouts.set(key, t);
+        }
+    }
+    setCount(v) {
+        this._count = v;
+    }
+    clear() {
+        // Clear timeouts
+        for (const t of this._timeouts.values()) {
+            clearTimeout(t);
+        }
+        this._timeouts.clear();
+        // Invoke unsubscribers
+        for (const u of this._map.values()) {
+            u();
+        }
+        this._map.clear();
+        this.setCount(0);
+    }
+    dispose() {
+        this.clear();
+    }
+}
+exports.SubscribersMap = SubscribersMap;
+//# sourceMappingURL=subscribersMap.js.map

package/structures/subscribersMap.js.map

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

package/types/index.d.ts

@@ -12,4 +12,5 @@ export declare type NestedPick<T, K extends any[]> = K extends Array<never> ? T
 export declare type Mutable<T> = {
     -readonly [P in keyof T]: T[P];
 };
+export declare type LengthArray<T, N extends number, R extends T[] = []> = number extends N ? T[] : R['length'] extends N ? R : LengthArray<T, N, [T, ...R]>;
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAE7B,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC;AAEjD,oBAAY,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACxC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK;CAC7C,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpE,oBAAY,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,GAC7D,CAAC,GACD;KACG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CAC1E,CAAC;AAEN,oBAAY,OAAO,CAAC,CAAC,IAAI;IACrB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAE7B,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC;AAEjD,oBAAY,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACxC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK;CAC7C,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpE,oBAAY,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,GAC7D,CAAC,GACD;KACG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CAC1E,CAAC;AAEN,oBAAY,OAAO,CAAC,CAAC,IAAI;IACrB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAGF,oBAAY,WAAW,CACf,CAAC,EACD,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAClB,MAAM,SAAS,CAAC,GACd,CAAC,EAAE,GACH,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GACrB,CAAC,GACD,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC"}