@spinajs/intl 1.2.103 → 1.2.112

package/lib/index.d.ts

@@ -1,11 +1,12 @@
-import { SyncModule } from '@spinajs/di';
+import { AsyncModule } from '@spinajs/di';
 import { Configuration } from '@spinajs/configuration';
 import { Log } from '@spinajs/log';
+export * from './sources';
 export interface IPhraseWithOptions {
     phrase: string;
     locale: string;
 }
-export declare abstract class Intl extends SyncModule {
+export declare abstract class Intl extends AsyncModule {
     private _currentLocale;
     /**
      * Currently selected locale
@@ -18,7 +19,7 @@ export declare abstract class Intl extends SyncModule {
     /**
      * Map with avaible translations, keyed by locale name
      */
-    Locales: Map<string, any>;
+    Locales: {};
     /**
      * I18n localization function. Returns localized string.
      * If no translation is avaible at current selected language, then fallback to
@@ -58,13 +59,13 @@ export declare class SpineJsInternationalizationFromJson extends Intl {
     /**
      * Map with avaible translations, keyed by locale name
      */
-    Locales: Map<string, any>;
+    Locales: {};
     /**
      * Logger for this module
      */
     protected Log: Log;
     protected Configuration: Configuration;
-    resolve(): void;
+    resolveAsync(): Promise<void>;
     /**
      * I18n localization function. Returns localized string.
      * If no translation is avaible at current selected language, then fallback to

package/lib/index.js

@@ -28,6 +28,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -37,21 +40,20 @@ const di_1 = require("@spinajs/di");
 const configuration_1 = require("@spinajs/configuration");
 const log_1 = require("@spinajs/log");
 const exceptions_1 = require("@spinajs/exceptions");
-const fs = __importStar(require("fs"));
-const glob = __importStar(require("glob"));
 const _ = __importStar(require("lodash"));
-const path_1 = require("path");
 const util = __importStar(require("util"));
 const MakePlural = __importStar(require("make-plural"));
 const InvervalParser = __importStar(require("math-interval-parser"));
+const TranslatioSources = __importStar(require("./sources"));
+__exportStar(require("./sources"), exports);
 const globalAny = global;
-class Intl extends di_1.SyncModule {
+class Intl extends di_1.AsyncModule {
     constructor() {
         super(...arguments);
         /**
          * Map with avaible translations, keyed by locale name
          */
-        this.Locales = new Map();
+        this.Locales = {};
     }
     /**
      * Currently selected locale
@@ -80,39 +82,16 @@ let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJ
         /**
          * Map with avaible translations, keyed by locale name
          */
-        this.Locales = new Map();
+        this.Locales = {};
     }
     // tslint:disable-next-line: variable-name
-    resolve() {
+    async resolveAsync() {
         this.CurrentLocale = this.Configuration.get('intl.defaultLocale', 'en');
-        const localeDirs = this.Configuration.get('system.dirs.locales', []);
-        localeDirs
-            .filter((d) => fs.existsSync(d))
-            .map((d) => glob.sync(`${d}/**/*.json`))
-            .reduce((prev, current) => {
-            return prev.concat(_.flattenDeep(current));
-        }, [])
-            .map((f) => (0, path_1.normalize)((0, path_1.resolve)(f)))
-            .map((f) => {
-            this.Log.trace(`Found localisation file at ${f}`);
-            return f;
-        })
-            .forEach((f) => {
-            const lang = (0, path_1.basename)(f, '.json');
-            let data;
-            try {
-                data = JSON.parse(fs.readFileSync(f, 'utf-8'));
-            }
-            catch (ex) {
-                this.Log.warn(ex, `Cannot load localisation data from file ${f} for lang ${lang}`);
-                return;
-            }
-            if (!data) {
-                this.Log.warn(`No localisation data at ${f} for lang ${lang}`);
-                return;
-            }
-            this.Locales.set(lang, _.merge(data, this.Locales.get(lang) && {}));
-        });
+        const sources = await di_1.DI.resolve(Array.ofType(TranslatioSources.TranslationSource));
+        for (const s of sources) {
+            const translations = await s.load();
+            this.Locales = _.merge(translations, this.Locales);
+        }
     }
     /**
      * I18n localization function. Returns localized string.
@@ -129,11 +108,11 @@ let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJ
         if (!text)
             return '';
         if (_.isString(text)) {
-            locTable = this.Locales.get(this.CurrentLocale);
+            locTable = this.Locales[this.CurrentLocale];
             toLocalize = text;
         }
         else {
-            locTable = (_a = this.Locales.get(text.locale)) !== null && _a !== void 0 ? _a : this.Locales.get(this.CurrentLocale);
+            locTable = (_a = this.Locales[text.locale]) !== null && _a !== void 0 ? _a : this.Locales[this.CurrentLocale];
             toLocalize = text.phrase;
         }
         if (!locTable) {
@@ -158,15 +137,15 @@ let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJ
             return '';
         if (_.isString(text)) {
             locale = this.CurrentLocale;
-            locTable = this.Locales.get(this.CurrentLocale);
+            locTable = this.Locales[this.CurrentLocale];
             toLocalize = text;
         }
         else {
             locale = (_a = text.locale) !== null && _a !== void 0 ? _a : this.CurrentLocale;
-            locTable = (_b = this.Locales.get(text.locale)) !== null && _b !== void 0 ? _b : this.Locales.get(this.CurrentLocale);
+            locTable = (_b = this.Locales[text.locale]) !== null && _b !== void 0 ? _b : this.Locales[this.CurrentLocale];
             toLocalize = text.phrase;
         }
-        if (/%/.test(toLocalize) && this.Locales.has(locale)) {
+        if (/%/.test(toLocalize) && this.Locales[locale]) {
             const phrase = locTable[toLocalize];
             const pluralVerb = MakePlural[locale](count);
             if (phrase[pluralVerb]) {
@@ -224,7 +203,7 @@ let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJ
         if (!text)
             return [];
         const extract = _.property(text);
-        return Array.from(this.Locales.values()).map((v) => {
+        return Array.from(Object.values(this.Locales)).map((v) => {
             return extract(v);
         });
     }
@@ -237,7 +216,7 @@ let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJ
         if (!text)
             return [];
         const extract = _.property(text);
-        return Array.from(this.Locales.values()).map((v, locale) => {
+        return Array.from(Object.values(this.Locales)).map((v, locale) => {
             return { [locale]: extract(v) };
         });
     }

package/lib/index.js.map

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

package/lib/{intl/src/sources.d.ts → sources.d.ts}

@@ -1,4 +1,4 @@
-import { ILog } from './../../log-common/src/index';
+import { ILog } from '@spinajs/log';
 import { Configuration } from '@spinajs/configuration';
 export declare abstract class TranslationSource {
     protected Configuration: Configuration;

package/lib/sources.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/intl",
-  "version": "1.2.103",
+  "version": "1.2.112",
   "description": "internationalization for spinajs framework",
   "main": "lib/index.js",
   "private": false,
@@ -48,5 +48,5 @@
     "make-plural": "^6.0.1",
     "math-interval-parser": "^2.0.1"
   },
-  "gitHead": "18a08cf4cd3e4d2c728d2d372e3a42ddde071be8"
+  "gitHead": "a301403049bb83a6651a117ec5d6339390987a5b"
 }

package/lib/intl/src/config/locales.d.ts

@@ -1,12 +0,0 @@
-/**
- * Localisation configuration, structure like in
- * https://github.com/mashpie/i18n-node
- */
-declare const config: {
-    validation: {
-        defaultLocale: string;
-        locales: string[];
-        queryParameter: string;
-    };
-};
-export default config;

package/lib/intl/src/config/locales.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Localisation configuration, structure like in
- * https://github.com/mashpie/i18n-node
- */
-const config = {
-    validation: {
-        defaultLocale: 'en',
-        // supported locales
-        locales: ['en'],
-        // query parameter to switch locale (ie. /home?lang=ch) - defaults to NULL
-        queryParameter: 'lang',
-    },
-};
-exports.default = config;
-//# sourceMappingURL=locales.js.map

package/lib/intl/src/config/locales.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"locales.js","sourceRoot":"","sources":["../../../../src/config/locales.ts"],"names":[],"mappings":";;AAAA;;;GAGG;AACH,MAAM,MAAM,GAAG;IACb,UAAU,EAAE;QACV,aAAa,EAAE,IAAI;QAEnB,oBAAoB;QACpB,OAAO,EAAE,CAAC,IAAI,CAAC;QAEf,0EAA0E;QAC1E,cAAc,EAAE,MAAM;KACvB;CACF,CAAC;AAEF,kBAAe,MAAM,CAAC"}

package/lib/intl/src/index.d.ts

@@ -1,99 +0,0 @@
-import { AsyncModule } from '@spinajs/di';
-import { Configuration } from '@spinajs/configuration';
-import { Log } from '@spinajs/log';
-export { TranslationSource } from './sources';
-export interface IPhraseWithOptions {
-    phrase: string;
-    locale: string;
-}
-export declare abstract class Intl extends AsyncModule {
-    private _currentLocale;
-    /**
-     * Currently selected locale
-     */
-    get CurrentLocale(): string;
-    /**
-     * Currently selected locale
-     */
-    set CurrentLocale(value: string);
-    /**
-     * Map with avaible translations, keyed by locale name
-     */
-    Locales: {};
-    /**
-     * I18n localization function. Returns localized string.
-     * If no translation is avaible at current selected language, then fallback to
-     * default language, if still no translation exists, original text is returned
-     *
-     * @param text - text to localize.
-     * @param args - argument passed to formatted text
-     */
-    abstract __(text: string | IPhraseWithOptions, ...args: any[]): string;
-    /**
-     * Plurals translation of a single phrase. Singular and plural forms will get added to locales if unknown.
-     * Returns translated parsed and substituted string based on last count parameter.
-     *
-     * @param text  - text to localize
-     * @param count - number of items/things
-     * @example use like `__n("%s cats", 1) returns `1 cat`
-     */
-    abstract __n(text: string | IPhraseWithOptions, count: number): string;
-    /**
-     * Returns a list of translations for a given phrase in each language.
-     *
-     * @param text  - text to translate
-     */
-    abstract __l(text: string): string[];
-    /**
-     * Returns a hashed list of translations for a given phrase in each language.
-     *
-     * @param text  - text to translate
-     */
-    abstract __h(text: string): any[];
-}
-/**
- * Basic internationalization support. Text phrases are read from json files specified
- * in system.dirs.locales
- */
-export declare class SpineJsInternationalizationFromJson extends Intl {
-    /**
-     * Map with avaible translations, keyed by locale name
-     */
-    Locales: {};
-    /**
-     * Logger for this module
-     */
-    protected Log: Log;
-    protected Configuration: Configuration;
-    resolveAsync(): Promise<void>;
-    /**
-     * I18n localization function. Returns localized string.
-     * If no translation is avaible at current selected language, then fallback to
-     * default language, if still no translation exists, original text is returned
-     *
-     * @param text  - text to localize.
-     * @param args  - argument passed to formatted text
-     */
-    __(text: string | IPhraseWithOptions, ...args: any[]): string;
-    /**
-     * Plurals translation of a single phrase.
-     * Returns translated, parsed and substituted string based on count parameter.
-     *
-     * @param text  - text to localize
-     * @param count - number of items/things
-     * @example use like `__n("%s cats", 1) returns '1 cat'`
-     */
-    __n(text: string | IPhraseWithOptions, count: number): string;
-    /**
-     * Returns a list of translations for a given phrase in each language.
-     *
-     * @param text - text to translate
-     */
-    __l(text: string): string[];
-    /**
-     * Returns a hashed list of translations for a given phrase in each language.
-     *
-     * @param text - text to translate
-     */
-    __h(text: string): any[];
-}

package/lib/intl/src/index.js

@@ -1,272 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpineJsInternationalizationFromJson = exports.Intl = exports.TranslationSource = void 0;
-const di_1 = require("@spinajs/di");
-const configuration_1 = require("@spinajs/configuration");
-const log_1 = require("@spinajs/log");
-const exceptions_1 = require("@spinajs/exceptions");
-const _ = __importStar(require("lodash"));
-const util = __importStar(require("util"));
-const MakePlural = __importStar(require("make-plural"));
-const InvervalParser = __importStar(require("math-interval-parser"));
-const TranslatioSources = __importStar(require("./sources"));
-var sources_1 = require("./sources");
-Object.defineProperty(exports, "TranslationSource", { enumerable: true, get: function () { return sources_1.TranslationSource; } });
-const globalAny = global;
-class Intl extends di_1.AsyncModule {
-    constructor() {
-        super(...arguments);
-        /**
-         * Map with avaible translations, keyed by locale name
-         */
-        this.Locales = {};
-    }
-    /**
-     * Currently selected locale
-     */
-    get CurrentLocale() {
-        return this._currentLocale;
-    }
-    /**
-     * Currently selected locale
-     */
-    set CurrentLocale(value) {
-        if (!value) {
-            throw new exceptions_1.InvalidArgument('value cannot be empty or null');
-        }
-        this._currentLocale = value;
-    }
-}
-exports.Intl = Intl;
-/**
- * Basic internationalization support. Text phrases are read from json files specified
- * in system.dirs.locales
- */
-let SpineJsInternationalizationFromJson = class SpineJsInternationalizationFromJson extends Intl {
-    constructor() {
-        super(...arguments);
-        /**
-         * Map with avaible translations, keyed by locale name
-         */
-        this.Locales = {};
-    }
-    // tslint:disable-next-line: variable-name
-    async resolveAsync() {
-        this.CurrentLocale = this.Configuration.get('intl.defaultLocale', 'en');
-        const sources = await di_1.DI.resolve(Array.ofType(TranslatioSources.TranslationSource));
-        for (const s of sources) {
-            const translations = await s.load();
-            this.Locales = _.merge(translations, this.Locales);
-        }
-    }
-    /**
-     * I18n localization function. Returns localized string.
-     * If no translation is avaible at current selected language, then fallback to
-     * default language, if still no translation exists, original text is returned
-     *
-     * @param text  - text to localize.
-     * @param args  - argument passed to formatted text
-     */
-    __(text, ...args) {
-        var _a, _b;
-        let locTable;
-        let toLocalize;
-        if (!text)
-            return '';
-        if (_.isString(text)) {
-            locTable = this.Locales[this.CurrentLocale];
-            toLocalize = text;
-        }
-        else {
-            locTable = (_a = this.Locales[text.locale]) !== null && _a !== void 0 ? _a : this.Locales[this.CurrentLocale];
-            toLocalize = text.phrase;
-        }
-        if (!locTable) {
-            return util.format(toLocalize, ...args);
-        }
-        return util.format((_b = locTable[toLocalize]) !== null && _b !== void 0 ? _b : toLocalize, ...args);
-    }
-    /**
-     * Plurals translation of a single phrase.
-     * Returns translated, parsed and substituted string based on count parameter.
-     *
-     * @param text  - text to localize
-     * @param count - number of items/things
-     * @example use like `__n("%s cats", 1) returns '1 cat'`
-     */
-    __n(text, count) {
-        var _a, _b;
-        let locTable;
-        let toLocalize;
-        let locale;
-        if (!text)
-            return '';
-        if (_.isString(text)) {
-            locale = this.CurrentLocale;
-            locTable = this.Locales[this.CurrentLocale];
-            toLocalize = text;
-        }
-        else {
-            locale = (_a = text.locale) !== null && _a !== void 0 ? _a : this.CurrentLocale;
-            locTable = (_b = this.Locales[text.locale]) !== null && _b !== void 0 ? _b : this.Locales[this.CurrentLocale];
-            toLocalize = text.phrase;
-        }
-        if (/%/.test(toLocalize) && this.Locales[locale]) {
-            const phrase = locTable[toLocalize];
-            const pluralVerb = MakePlural[locale](count);
-            if (phrase[pluralVerb]) {
-                return util.format(phrase[pluralVerb], count);
-            }
-            else if (phrase.other) {
-                return util.format(_getInterval(phrase.other, count), count);
-            }
-            return this.__(text, count);
-        }
-        return this.__(text, count);
-        function _getInterval(text, count) {
-            let toReturn = text;
-            const phrases = text.split(/\|/);
-            phrases.some((phrase) => {
-                const matches = phrase.match(/^\s*([\(\)\[\]\d,]+)?\s*(.*)$/);
-                if (matches[1] && _matchInterval(count, matches[1])) {
-                    toReturn = matches[2];
-                    return true;
-                }
-                else {
-                    toReturn = phrase;
-                }
-            });
-            return toReturn;
-            /**
-             * test a number to match mathematical interval expressions
-             * [0,2] - 0 to 2 (including, matches: 0, 1, 2)
-             * ]0,3[ - 0 to 3 (excluding, matches: 1, 2)
-             * [1]   - 1 (matches: 1)
-             * [20,] - all numbers ≥20 (matches: 20, 21, 22, ...)
-             * [,20] - all numbers ≤20 (matches: 20, 21, 22, ...)
-             */
-            function _matchInterval(c, eq) {
-                const interval = InvervalParser.default(eq);
-                if (interval) {
-                    if (interval.from.value === c) {
-                        return interval.from.included;
-                    }
-                    if (interval.to.value === c) {
-                        return interval.from.included;
-                    }
-                    return Math.min(interval.from.value, c) === interval.from.value && Math.max(interval.to.value, c) === interval.to.value;
-                }
-                return false;
-            }
-        }
-    }
-    /**
-     * Returns a list of translations for a given phrase in each language.
-     *
-     * @param text - text to translate
-     */
-    __l(text) {
-        if (!text)
-            return [];
-        const extract = _.property(text);
-        return Array.from(Object.values(this.Locales)).map((v) => {
-            return extract(v);
-        });
-    }
-    /**
-     * Returns a hashed list of translations for a given phrase in each language.
-     *
-     * @param text - text to translate
-     */
-    __h(text) {
-        if (!text)
-            return [];
-        const extract = _.property(text);
-        return Array.from(Object.values(this.Locales)).map((v, locale) => {
-            return { [locale]: extract(v) };
-        });
-    }
-};
-__decorate([
-    (0, log_1.Logger)('Intl'),
-    __metadata("design:type", log_1.Log)
-], SpineJsInternationalizationFromJson.prototype, "Log", void 0);
-__decorate([
-    (0, di_1.Autoinject)(),
-    __metadata("design:type", configuration_1.Configuration)
-], SpineJsInternationalizationFromJson.prototype, "Configuration", void 0);
-SpineJsInternationalizationFromJson = __decorate([
-    (0, di_1.Injectable)(Intl)
-], SpineJsInternationalizationFromJson);
-exports.SpineJsInternationalizationFromJson = SpineJsInternationalizationFromJson;
-/**
- * I18n localization function. Returns localized string.
- * If no translation is avaible at current selected language, then fallback to
- * default language, if still no translation exists, original text is returned
- *
- * @param text  - text to localize.
- * @param locale  - selected locale, if not specified - default locale is selected
- */
-globalAny.__ = (text, ...args) => {
-    return di_1.DI.get(Intl).__(text, ...args);
-};
-/**
- * Plurals translation of a single phrase. Singular and plural forms will get added to locales if unknown.
- * Returns translated parsed and substituted string based on last count parameter.
- *
- * @param text  - text to localize
- * @param count  - number of items/things
- * @example use like `__n("%s cats", 1) returns `1 cat`
- */
-globalAny.__n = (text, count) => {
-    return di_1.DI.get(Intl).__n(text, count);
-};
-/**
- * Returns a list of translations for a given phrase in each language.
- *
- * @param text  - text to translate
- */
-globalAny.__l = (text) => {
-    return di_1.DI.get(Intl).__l(text);
-};
-/**
- * Returns a hashed list of translations for a given phrase in each language.
- *
- * @param text  - text to translate
- */
-globalAny.__h = (text) => {
-    return di_1.DI.get(Intl).__h(text);
-};
-//# sourceMappingURL=index.js.map

package/lib/intl/src/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAsE;AACtE,0DAAuD;AACvD,sCAA2C;AAC3C,oDAAsD;AACtD,0CAA4B;AAC5B,2CAA6B;AAC7B,wDAA0C;AAC1C,qEAAuD;AACvD,6DAA+C;AAE/C,qCAA8C;AAArC,4GAAA,iBAAiB,OAAA;AAE1B,MAAM,SAAS,GAAQ,MAAM,CAAC;AAO9B,MAAsB,IAAK,SAAQ,gBAAW;IAA9C;;QAqBE;;WAEG;QACI,YAAO,GAAG,EAAE,CAAC;IAmCtB,CAAC;IAxDC;;OAEG;IACH,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,IAAW,aAAa,CAAC,KAAa;QACpC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,4BAAe,CAAC,+BAA+B,CAAC,CAAC;SAC5D;QAED,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC9B,CAAC;CAwCF;AA3DD,oBA2DC;AAED;;;GAGG;AAEH,IAAa,mCAAmC,GAAhD,MAAa,mCAAoC,SAAQ,IAAI;IAA7D;;QACE;;WAEG;QACI,YAAO,GAAG,EAAE,CAAC;IAqKtB,CAAC;IA1JC,0CAA0C;IACnC,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG,MAAM,OAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEpF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACvB,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACpD;IACH,CAAC;IAED;;;;;;;OAOG;IACI,EAAE,CAAC,IAAiC,EAAE,GAAG,IAAW;;QACzD,IAAI,QAAQ,CAAC;QACb,IAAI,UAAU,CAAC;QAEf,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACpB,QAAQ,GAAI,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrD,UAAU,GAAG,IAAI,CAAC;SACnB;aAAM;YACL,QAAQ,GAAG,MAAC,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,MAAM,CAAC,mCAAK,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3F,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;SAC1B;QAED,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;SACzC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,MAAA,QAAQ,CAAC,UAAU,CAAC,mCAAI,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IAClE,CAAC;IAED;;;;;;;OAOG;IACI,GAAG,CAAC,IAAiC,EAAE,KAAa;;QACzD,IAAI,QAAQ,CAAC;QACb,IAAI,UAAU,CAAC;QACf,IAAI,MAAM,CAAC;QAEX,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACpB,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAC5B,QAAQ,GAAI,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrD,UAAU,GAAG,IAAI,CAAC;SACnB;aAAM;YACL,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,IAAI,CAAC,aAAa,CAAC;YAC3C,QAAQ,GAAG,MAAC,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,MAAM,CAAC,mCAAK,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3F,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;SAC1B;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAK,IAAI,CAAC,OAAe,CAAC,MAAM,CAAC,EAAE;YACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YACpC,MAAM,UAAU,GAAI,UAAkB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;YAEtD,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE;gBACtB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;aAC/C;iBAAM,IAAI,MAAM,CAAC,KAAK,EAAE;gBACvB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;aAC9D;YAED,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE5B,SAAS,YAAY,CAAC,IAAY,EAAE,KAAa;YAC/C,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAE9D,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;oBACnD,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBACtB,OAAO,IAAI,CAAC;iBACb;qBAAM;oBACL,QAAQ,GAAG,MAAM,CAAC;iBACnB;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC;YAEhB;;;;;;;eAOG;YACH,SAAS,cAAc,CAAC,CAAS,EAAE,EAAU;gBAC3C,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE;wBAC7B,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;qBAC/B;oBAED,IAAI,QAAQ,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,EAAE;wBAC3B,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;qBAC/B;oBAED,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC;iBACzH;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAC,IAAY;QACrB,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACvD,OAAO,OAAO,CAAC,CAAC,CAAW,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAC,IAAY;QACrB,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAC/D,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA/JC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;gEAAC;AAGnB;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;0EAAC;AAb5B,mCAAmC;IAD/C,IAAA,eAAU,EAAC,IAAI,CAAC;GACJ,mCAAmC,CAyK/C;AAzKY,kFAAmC;AA2KhD;;;;;;;GAOG;AACH,SAAS,CAAC,EAAE,GAAG,CAAC,IAAiC,EAAE,GAAG,IAAW,EAAE,EAAE;IACnE,OAAO,OAAE,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,SAAS,CAAC,GAAG,GAAG,CAAC,IAAiC,EAAE,KAAa,EAAE,EAAE;IACnE,OAAO,OAAE,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF;;;;GAIG;AACH,SAAS,CAAC,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/B,OAAO,OAAE,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF;;;;GAIG;AACH,SAAS,CAAC,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/B,OAAO,OAAE,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC"}

package/lib/intl/src/sources.js.map

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

package/lib/log-common/src/index.d.ts

@@ -1,179 +0,0 @@
-import { SyncModule } from "@spinajs/di";
-export declare enum LogLevel {
-    Security = 999,
-    Fatal = 6,
-    Error = 5,
-    Warn = 4,
-    Success = 3,
-    Info = 2,
-    Debug = 1,
-    Trace = 0
-}
-export declare const StrToLogLevel: {
-    trace: LogLevel;
-    debug: LogLevel;
-    info: LogLevel;
-    success: LogLevel;
-    warn: LogLevel;
-    error: LogLevel;
-    fatal: LogLevel;
-    security: LogLevel;
-};
-export declare const LogLevelStrings: {
-    1: string;
-    5: string;
-    6: string;
-    2: string;
-    999: string;
-    3: string;
-    0: string;
-    4: string;
-};
-export interface ILogRule {
-    name: string;
-    level: "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "security" | "success";
-    target: string | string[];
-}
-export interface ITargetsOption {
-    name: string;
-    type: string;
-    options?: ICommonTargetOptions;
-}
-export interface ILogOptions {
-    targets: ITargetsOption[];
-    rules: ILogRule[];
-    variables?: Record<string, unknown>;
-}
-export interface ICommonTargetOptions {
-    /**
-     * Message layout. You can use variables
-     *
-     * Default message layout is: datetime level message (logger)
-     */
-    layout: string;
-    /**
-     * Target name
-     */
-    name: string;
-    /**
-     * Target type
-     */
-    type: string;
-    /**
-     * Is logger enabled
-     */
-    enabled: boolean;
-}
-export interface IColoredConsoleTargetOptions extends ICommonTargetOptions {
-    /**
-     * Color theme for console message. Best leave it for default.
-     */
-    theme: {
-        security: string | string[];
-        fatal: string | string[];
-        error: string | string[];
-        warn: string | string[];
-        success: string | string[];
-        info: string | string[];
-        debug: string | string[];
-        trace: string | string[];
-    };
-}
-export interface IFileTargetOptions extends ICommonTargetOptions {
-    options: {
-        /**
-         * path whre log is stored. It is allowed to use variables to create path eg. date / time etc.
-         */
-        path: string;
-        /**
-         * Archive path for logs eg. when size is exceeded. Is is allowed to use variables eg. date / time etc.
-         *
-         * Default is none. When not set archive files are stored in same folder as logs.
-         */
-        archivePath: string;
-        /**
-         * Maximum log file size, if exceeded it is moved to archive, and new log file is created
-         *
-         * Default is 1mb
-         */
-        maxSize: number;
-        /**
-         * Should compress log file when moved to archive
-         *
-         * Default is false
-         */
-        compress: boolean;
-        /**
-         * Should rotate log file eg. new  file every new day.
-         * You should use cron like definition eg. at 1am every day: 0 1 * * *
-         * When rotate event occurs, old file is moved to archive, and new one is created
-         *
-         * Default is not set
-         */
-        rotate: string;
-        /**
-         * How mutch archive files should be preserved before deletion. Default is 0
-         * Eg. to store max 5 archive files, set it to 5. Oldest by modification time are deleted.
-         */
-        maxArchiveFiles: number;
-    };
-}
-export interface ILogStaticVariables {
-    error: Error | undefined;
-    level: string;
-    logger: string;
-    message: string;
-}
-export interface ILogVariable {
-    [key: string]: unknown | (() => unknown);
-}
-export interface ILogEntry {
-    Level: LogLevel;
-    Variables: LogVariables;
-}
-export declare abstract class LogTarget<T extends ICommonTargetOptions> extends SyncModule {
-    HasError: boolean;
-    Error: Error | null | unknown;
-    Options: T;
-    constructor(options: T);
-    abstract write(data: ILogEntry): void;
-}
-export interface ILogTargetDesc {
-    instance: LogTarget<ICommonTargetOptions>;
-    options?: ITargetsOption;
-    rule: ILogRule;
-}
-export interface ILog {
-    Targets: ILogTargetDesc[];
-    trace(message: string, ...args: any[]): void;
-    trace(err: Error, message: string, ...args: any[]): void;
-    trace(err: Error | string, message: string | any[], ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    debug(err: Error, message: string, ...args: any[]): void;
-    debug(err: Error | string, message: string | any[], ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    info(err: Error, message: string, ...args: any[]): void;
-    info(err: Error | string, message: string | any[], ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    warn(err: Error, message: string, ...args: any[]): void;
-    warn(err: Error | string, message: string | any[], ...args: any[]): void;
-    error(message: string, ...args: any[]): void;
-    error(err: Error, message: string, ...args: any[]): void;
-    error(err: Error | string, message: string | any[], ...args: any[]): void;
-    fatal(message: string, ...args: any[]): void;
-    fatal(err: Error, message: string, ...args: any[]): void;
-    fatal(err: Error | string, message: string | any[], ...args: any[]): void;
-    security(message: string, ...args: any[]): void;
-    security(err: Error, message: string, ...args: any[]): void;
-    security(err: Error | string, message: string | any[], ...args: any[]): void;
-    success(message: string, ...args: any[]): void;
-    success(err: Error, message: string, ...args: any[]): void;
-    success(err: Error | string, message: string | any[], ...args: any[]): void;
-    child(name: string, variables?: LogVariables): ILog;
-    write(entry: ILogEntry): Promise<PromiseSettledResult<void>[]>;
-    addVariable(name: string, value: unknown): void;
-    timeStart(name: string): void;
-    timeEnd(name: string): number;
-}
-export declare type LogVariables = ILogStaticVariables & ILogVariable;
-export declare function createLogMessageObject(err: Error | string, message: string | any[], level: LogLevel, logger: string, variables: any, ...args: any[]): ILogEntry;

package/lib/log-common/src/index.js

@@ -1,88 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogMessageObject = exports.LogTarget = exports.LogLevelStrings = exports.StrToLogLevel = exports.LogLevel = void 0;
-const di_1 = require("@spinajs/di");
-const lodash_1 = __importDefault(require("lodash"));
-const util = __importStar(require("util"));
-var LogLevel;
-(function (LogLevel) {
-    LogLevel[LogLevel["Security"] = 999] = "Security";
-    LogLevel[LogLevel["Fatal"] = 6] = "Fatal";
-    LogLevel[LogLevel["Error"] = 5] = "Error";
-    LogLevel[LogLevel["Warn"] = 4] = "Warn";
-    LogLevel[LogLevel["Success"] = 3] = "Success";
-    LogLevel[LogLevel["Info"] = 2] = "Info";
-    LogLevel[LogLevel["Debug"] = 1] = "Debug";
-    LogLevel[LogLevel["Trace"] = 0] = "Trace";
-})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
-exports.StrToLogLevel = {
-    trace: LogLevel.Trace,
-    debug: LogLevel.Debug,
-    info: LogLevel.Info,
-    success: LogLevel.Success,
-    warn: LogLevel.Warn,
-    error: LogLevel.Error,
-    fatal: LogLevel.Fatal,
-    security: LogLevel.Security,
-};
-exports.LogLevelStrings = {
-    [LogLevel.Debug]: "debug",
-    [LogLevel.Error]: "error",
-    [LogLevel.Fatal]: "fatal",
-    [LogLevel.Info]: "info",
-    [LogLevel.Security]: "security",
-    [LogLevel.Success]: "success",
-    [LogLevel.Trace]: "trace",
-    [LogLevel.Warn]: "warn",
-};
-class LogTarget extends di_1.SyncModule {
-    constructor(options) {
-        super();
-        this.HasError = false;
-        this.Error = null;
-        if (options) {
-            this.Options = lodash_1.default.merge(lodash_1.default.merge(this.Options, {
-                enabled: true,
-                layout: "${datetime} ${level} ${message} ${error} (${logger})",
-            }), options);
-        }
-    }
-}
-exports.LogTarget = LogTarget;
-function createLogMessageObject(err, message, level, logger, variables, ...args) {
-    const sMsg = err instanceof Error ? message : err;
-    const tMsg = args.length !== 0 ? util.format(sMsg, ...args) : sMsg;
-    const lName = logger !== null && logger !== void 0 ? logger : message;
-    return {
-        Level: level,
-        Variables: Object.assign({ error: err instanceof Error ? err : undefined, level: exports.LogLevelStrings[`${level}`].toUpperCase(), logger: lName, message: tMsg }, variables),
-    };
-}
-exports.createLogMessageObject = createLogMessageObject;
-//# sourceMappingURL=index.js.map

package/lib/log-common/src/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../log-common/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAyC;AACzC,oDAAuB;AACvB,2CAA6B;AAE7B,IAAY,QAgBX;AAhBD,WAAY,QAAQ;IAClB,iDAAc,CAAA;IAEd,yCAAS,CAAA;IAET,yCAAS,CAAA;IAET,uCAAQ,CAAA;IAER,6CAAW,CAAA;IAEX,uCAAQ,CAAA;IAER,yCAAS,CAAA;IAET,yCAAS,CAAA;AACX,CAAC,EAhBW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAgBnB;AAEY,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;IACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;CAC5B,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IACvB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU;IAC/B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;CACxB,CAAC;AAiIF,MAAsB,SAEpB,SAAQ,eAAU;IAKlB,YAAY,OAAU;QACpB,KAAK,EAAE,CAAC;QALH,aAAQ,GAAG,KAAK,CAAC;QACjB,UAAK,GAA2B,IAAI,CAAC;QAM1C,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,OAAO,GAAG,gBAAC,CAAC,KAAK,CACpB,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;gBACpB,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,sDAAsD;aAC/D,CAAC,EACF,OAAO,CACR,CAAC;SACH;IACH,CAAC;CAGF;AAtBD,8BAsBC;AAsDD,SAAgB,sBAAsB,CACpC,GAAmB,EACnB,OAAuB,EACvB,KAAe,EACf,MAAc,EACd,SAAc,EACd,GAAG,IAAW;IAEd,MAAM,IAAI,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAE,OAAkB,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,MAAM,KAAK,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CAAC;IAEhC,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,SAAS,kBACP,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAC7C,KAAK,EAAE,uBAAe,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,EAChD,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,IACV,SAAS,CACb;KACF,CAAC;AACJ,CAAC;AAtBD,wDAsBC"}