@juzi/wechaty 1.0.23 → 1.0.26

package/dist/esm/src/user-modules/tag-group.d.ts

@@ -18,49 +18,84 @@
  *
  */
 import type * as PUPPET from '@juzi/wechaty-puppet';
+import type { TagGroupQueryFilter } from '@juzi/wechaty-puppet/dist/esm/src/schemas/tag.js';
 import type { Constructor } from 'clone-class';
 import type { TagInterface } from './tag.js';
-declare const TagGroupMixin_base: ((abstract new (...args: any[]) => {
+declare const MixinBase: ((abstract new (...args: any[]) => {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
 }) & {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
-}) & {
-    new (): {};
-};
-declare class TagGroupMixin extends TagGroupMixin_base {
-    readonly payload: PUPPET.payloads.TagGroup;
+}) & ((abstract new (...args: any[]) => {}) & {
+    _pool?: Map<string, TagGroupImplInterface> | undefined;
+    readonly pool: Map<string, TagGroupImplInterface>;
+    load<L extends import("clone-class/dist/esm/src/constructor.js").ClassInterface<{}> & {
+        new (...args: any[]): TagGroupImplInterface;
+        prototype: TagGroupImplInterface;
+    } & import("../user-mixins/poolify.js").PoolifyMixin<TagGroupImplInterface>>(this: L, id: string): TagGroupImplInterface;
+}) & ObjectConstructor;
+declare class TagGroupMixin extends MixinBase {
+    readonly id: string;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload: PUPPET.payloads.TagGroup): TagGroupInterface;
+    payload?: PUPPET.payloads.TagGroup;
     /**
      * @hideconstructor
      */
-    constructor(payload: PUPPET.payloads.TagGroup);
-    id(): string;
+    constructor(id: string);
     name(): string;
-    private static pool;
-    static list(forceSync?: boolean): Promise<TagGroupInterface[]>;
-    static sync(): Promise<void>;
-    static load(tagGroupId: string): TagGroupInterface | undefined;
+    static list(): Promise<TagGroupInterface[]>;
     static createTagGroup(name: string): Promise<TagGroupInterface | void>;
     static deleteTagGroup(tagGroup: TagGroupInterface): Promise<TagGroupInterface | void>;
     tags(): Promise<TagInterface[]>;
+    static find(filter: TagGroupQueryFilter): Promise<TagGroupInterface | undefined>;
+    /**
+     * Force reload data for TagGroup, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tagGroup.sync()
+     */
+    sync(): Promise<void>;
+    /**
+     * @ignore
+     */
+    isReady(): boolean;
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    ready(forceSync?: boolean): Promise<void>;
     toString(): string;
 }
+declare const TagGroupImplBase_base: {
+    new (...args: any[]): {};
+    valid: (o: any) => o is TagGroupImplInterface;
+    validInstance: (target: any) => target is TagGroupMixin;
+    validInterface: (target: any) => target is TagGroupImplInterface;
+} & typeof TagGroupMixin;
+declare class TagGroupImplBase extends TagGroupImplBase_base {
+}
+interface TagGroupImplInterface extends TagGroupImplBase {
+}
+declare type TagGroupProtectedProperty = 'ready';
+declare type TagGroupInterface = Omit<TagGroupImplInterface, TagGroupProtectedProperty>;
 declare const TagGroupImpl_base: {
     new (...args: any[]): {};
     valid: (o: any) => o is TagGroupInterface;
-    validInstance: (target: any) => target is TagGroupMixin;
+    validInstance: (target: any) => target is TagGroupImplBase;
     validInterface: (target: any) => target is TagGroupInterface;
-} & typeof TagGroupMixin;
+} & typeof TagGroupImplBase;
 declare class TagGroupImpl extends TagGroupImpl_base {
 }
-interface TagGroupInterface extends TagGroupImpl {
-}
-declare type TagGroupConstructor = Constructor<TagGroupInterface, typeof TagGroupImpl>;
-export type { TagGroupConstructor, TagGroupInterface, };
+declare type TagGroupConstructor = Constructor<TagGroupImplInterface, Omit<typeof TagGroupImpl, 'load'>>;
+export type { TagGroupConstructor, TagGroupProtectedProperty, TagGroupInterface, };
 export { TagGroupImpl, };
 //# sourceMappingURL=tag-group.d.ts.map

package/dist/esm/src/user-modules/tag-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag-group.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAO9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;;;;;;;;AAE5C,cAAM,aAAc,SAAQ,kBAAoB;aAiB5B,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;IAfnD;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,iBAAiB;IAMpE;;OAEG;gBAEe,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;IAMnD,EAAE,IAAK,MAAM;IAIb,IAAI,IAAK,MAAM;IAIf,OAAO,CAAC,MAAM,CAAC,IAAI,CAA0B;WAEhC,IAAI,CAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;WAkBtD,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAMnC,MAAM,CAAC,IAAI,CAAE,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;WAWlD,cAAc,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;WAgBhE,cAAc,CAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAYtF,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7B,QAAQ;CAIlB;;;;;;;AAED,cAAM,YAAa,SAAQ,iBAAmD;CAAI;AAClF,UAAU,iBAAkB,SAAQ,YAAY;CAAI;AAEpD,aAAK,mBAAmB,GAAG,WAAW,CACpC,iBAAiB,EACjB,OAAO,YAAY,CACpB,CAAA;AAED,YAAY,EACV,mBAAmB,EACnB,iBAAiB,GAClB,CAAA;AACD,OAAO,EACL,YAAY,GACb,CAAA"}
+{"version":3,"file":"tag-group.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAA;AAE3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,aAAc,SAAQ,SAAS;aAcjB,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAElC;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM;WAIF,IAAI,IAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC;WA2BrC,cAAc,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;WAehE,cAAc,CAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAWtF,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;WA0BzB,IAAI,CAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IA0BvF;;;;;;OAMG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACH,OAAO,IAAK,OAAO;IAInB;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBP,QAAQ;CAIlB;;;;;;;AAED,cAAM,gBAAiB,SAAQ,qBAAuD;CAAI;AAC1F,UAAU,qBAAsB,SAAQ,gBAAgB;CAAI;AAE5D,aAAK,yBAAyB,GAC1B,OAAO,CAAA;AAEX,aAAK,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,CAAA;;;;;;;AAC/E,cAAM,YAAa,SAAQ,iBAAsD;CAAI;AAErF,aAAK,mBAAmB,GAAG,WAAW,CACpC,qBAAqB,EACrB,IAAI,CAAC,OAAO,YAAY,EAAE,MAAM,CAAC,CAClC,CAAA;AAED,YAAY,EACV,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,GAClB,CAAA;AACD,OAAO,EACL,YAAY,GACb,CAAA"}

package/dist/esm/src/user-modules/tag-group.js

@@ -1,41 +1,43 @@
+import { concurrencyExecuter } from 'rx-queue';
 import { log } from '../config.js';
+import { poolifyMixin } from '../user-mixins/poolify.js';
 import { validationMixin } from '../user-mixins/validation.js';
-import { wechatifyMixinBase, } from '../user-mixins/wechatify.js';
-class TagGroupMixin extends wechatifyMixinBase() {
-    payload;
+import { wechatifyMixin, } from '../user-mixins/wechatify.js';
+const MixinBase = wechatifyMixin(poolifyMixin(Object)());
+class TagGroupMixin extends MixinBase {
+    id;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload) {
-        log.verbose('TagGroup', 'create()');
-        return new this(payload);
-    }
+    payload;
     /**
      * @hideconstructor
      */
-    constructor(payload) {
+    constructor(id) {
         super();
-        this.payload = payload;
+        this.id = id;
         log.silly('TagGroup', 'constructor()');
     }
-    id() {
-        return this.payload.id;
-    }
     name() {
-        return this.payload.name;
+        return (this.payload && this.payload.name) || '';
     }
-    static pool = [];
-    static async list(forceSync = false) {
-        log.verbose('TagGroup', 'list(%s)', forceSync);
-        if (this.pool.length > 0 && !forceSync) {
-            return this.pool;
-        }
+    static async list() {
+        log.verbose('TagGroup', 'list()');
         try {
-            const payloads = await this.wechaty.puppet.tagGroupList();
-            this.pool = payloads.map(payload => new this(payload));
-            return this.pool;
+            const tagGroupIds = await this.wechaty.puppet.tagGroupList();
+            const idToTagGroup = async (id) => this.find({ id }).catch(e => this.wechaty.emitError(e));
+            const CONCURRENCY = 17;
+            const tagGroupIterator = concurrencyExecuter(CONCURRENCY)(idToTagGroup)(tagGroupIds);
+            const tagGroupList = [];
+            for await (const tagGroup of tagGroupIterator) {
+                if (tagGroup) {
+                    tagGroupList.push(tagGroup);
+                }
+            }
+            return tagGroupList;
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -43,26 +45,12 @@ class TagGroupMixin extends wechatifyMixinBase() {
             return [];
         }
     }
-    static async sync() {
-        log.verbose('TagGroup', 'sync()');
-        await this.list(true);
-    }
-    static load(tagGroupId) {
-        log.verbose('TagGroup', 'load(%s)', tagGroupId);
-        for (const item of this.pool) {
-            if (item.id() === tagGroupId) {
-                return item;
-            }
-        }
-        return undefined;
-    }
     static async createTagGroup(name) {
         log.verbose('TagGroup', 'createTagGroup(%s, %s)', name);
         try {
-            const payload = await this.wechaty.puppet.tagGroupAdd(name);
-            if (payload) {
-                const newTagGroup = new this(payload);
-                this.pool.push(newTagGroup);
+            const groupId = await this.wechaty.puppet.tagGroupAdd(name);
+            if (groupId) {
+                const newTagGroup = await this.find({ id: groupId });
                 return newTagGroup;
             }
         }
@@ -74,8 +62,7 @@ class TagGroupMixin extends wechatifyMixinBase() {
     static async deleteTagGroup(tagGroup) {
         log.verbose('TagGroup', 'deleteTagGroup(%s)', tagGroup);
         try {
-            await this.wechaty.puppet.tagGroupDelete(tagGroup.id());
-            this.pool.splice(this.pool.indexOf(tagGroup), 1);
+            await this.wechaty.puppet.tagGroupDelete(tagGroup.id);
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -83,13 +70,95 @@ class TagGroupMixin extends wechatifyMixinBase() {
         }
     }
     async tags() {
-        return (await this.wechaty.Tag.list()).filter(tag => tag.groupId() === this.id());
+        log.verbose('TagGroup', 'tags(%s)', this);
+        try {
+            const tagIdList = await this.wechaty.puppet.tagGroupTagList(this.id);
+            const idToTag = async (tagId) => this.wechaty.Tag.find({ id: tagId }).catch(e => this.wechaty.emitError(e));
+            const CONCURRENCY = 17;
+            const tagIterator = concurrencyExecuter(CONCURRENCY)(idToTag)(tagIdList);
+            const tagList = [];
+            for await (const tag of tagIterator) {
+                if (tag) {
+                    tagList.push(tag);
+                }
+            }
+            return tagList;
+        }
+        catch (e) {
+            this.wechaty.emitError(e);
+            log.error('TagGroup', 'list() exception: %s', e.message);
+            return [];
+        }
+    }
+    static async find(filter) {
+        log.silly('TagGroup', 'find(%s)', JSON.stringify(filter));
+        if (filter.id) {
+            const tagGroup = this.wechaty.TagGroup.load(filter.id);
+            try {
+                await tagGroup.ready();
+            }
+            catch (e) {
+                this.wechaty.emitError(e);
+                return undefined;
+            }
+            return tagGroup;
+        }
+        if (filter.name) {
+            const tagGroups = (await this.wechaty.TagGroup.list()).filter(tagGroup => tagGroup.name() === filter.name);
+            if (tagGroups.length > 0) {
+                return tagGroups[0];
+            }
+        }
+        return undefined;
+        // TODO: use a puppet method to find tag, like how contact and room do it
+    }
+    /**
+     * Force reload data for TagGroup, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tagGroup.sync()
+     */
+    async sync() {
+        await this.wechaty.puppet.tagGroupPayloadDirty(this.id);
+        await this.ready(true);
+    }
+    /**
+     * @ignore
+     */
+    isReady() {
+        return !!(this.payload);
+    }
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    async ready(forceSync = false) {
+        log.silly('TagGroup', 'ready() @ %s with TagGroup="%s"', this.wechaty.puppet, this.id);
+        if (!forceSync && this.isReady()) { // already ready
+            log.silly('TagGroup', 'ready() isReady() true');
+            return;
+        }
+        try {
+            this.payload = await this.wechaty.puppet.tagGroupPayload(this.id);
+        }
+        catch (e) {
+            this.wechaty.emitError(e);
+            log.verbose('TagGroup', 'ready() this.wechaty.puppet.tagGroupPayload(%s) exception: %s', this.id, e.message);
+            throw e;
+        }
     }
     toString() {
-        return `<TagGroup#${this.name() || this.id()}>`;
+        return `<TagGroup#${this.name() || this.id}>`;
     }
 }
-class TagGroupImpl extends validationMixin(TagGroupMixin)() {
+class TagGroupImplBase extends validationMixin(TagGroupMixin)() {
+}
+class TagGroupImpl extends validationMixin(TagGroupImplBase)() {
 }
 export { TagGroupImpl, };
 //# sourceMappingURL=tag-group.js.map

package/dist/esm/src/user-modules/tag-group.js.map

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

package/dist/esm/src/user-modules/tag.d.ts

@@ -17,56 +17,90 @@
  *   limitations under the License.
  *
  */
-import type * as PUPPET from '@juzi/wechaty-puppet';
-import type { TagIdentifier } from '@juzi/wechaty-puppet/filters';
+import * as PUPPET from '@juzi/wechaty-puppet';
+import type { TagQueryFilter } from '@juzi/wechaty-puppet/dist/esm/src/schemas/tag.js';
 import type { Constructor } from 'clone-class';
 import type { ContactInterface } from './contact.js';
 import type { TagGroupInterface } from './tag-group.js';
-declare const TagMixin_base: ((abstract new (...args: any[]) => {
+declare const MixinBase: ((abstract new (...args: any[]) => {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
 }) & {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
-}) & {
-    new (): {};
-};
-declare class TagMixin extends TagMixin_base {
-    readonly payload: PUPPET.payloads.Tag;
+}) & ((abstract new (...args: any[]) => {}) & {
+    _pool?: Map<string, TagImplInterface> | undefined;
+    readonly pool: Map<string, TagImplInterface>;
+    load<L extends import("clone-class/dist/esm/src/constructor.js").ClassInterface<{}> & {
+        new (...args: any[]): TagImplInterface;
+        prototype: TagImplInterface;
+    } & import("../user-mixins/poolify.js").PoolifyMixin<TagImplInterface>>(this: L, id: string): TagImplInterface;
+}) & ObjectConstructor;
+declare class TagMixin extends MixinBase {
+    readonly id: string;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload: PUPPET.payloads.Tag): TagInterface;
+    payload?: PUPPET.payloads.Tag;
     /**
      * @hideconstructor
      */
-    constructor(payload: PUPPET.payloads.Tag);
-    id(): string;
+    constructor(id: string);
     type(): PUPPET.types.Tag;
-    groupId(): string;
     name(): string;
-    group(): TagGroupInterface | undefined;
-    private static pool;
-    static list(forceSync?: boolean): Promise<TagInterface[]>;
-    static sync(): Promise<void>;
-    static load(tag: TagIdentifier): TagInterface | undefined;
+    groupId(): string;
+    group(): Promise<TagGroupInterface | undefined>;
+    static list(): Promise<TagInterface[]>;
+    static find(filter: TagQueryFilter): Promise<TagInterface | undefined>;
+    /**
+     * Force reload data for Tag, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tag.sync()
+     */
+    sync(): Promise<void>;
+    /**
+     * @ignore
+     */
+    isReady(): boolean;
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    ready(forceSync?: boolean): Promise<void>;
     contactList(): Promise<ContactInterface[]>;
     tag(contacts: ContactInterface | ContactInterface[]): Promise<void>;
     static createTag(name: string, tagGroup?: TagGroupInterface): Promise<TagInterface | void>;
     static deleteTag(tagInstance: TagInterface): Promise<void>;
     toString(): string;
 }
+declare const TagImplBase_base: {
+    new (...args: any[]): {};
+    valid: (o: any) => o is TagImplInterface;
+    validInstance: (target: any) => target is TagMixin;
+    validInterface: (target: any) => target is TagImplInterface;
+} & typeof TagMixin;
+declare class TagImplBase extends TagImplBase_base {
+}
+interface TagImplInterface extends TagImplBase {
+}
+declare type TagProtectedProperty = 'ready';
+declare type TagInterface = Omit<TagImplInterface, TagProtectedProperty>;
 declare const TagImpl_base: {
     new (...args: any[]): {};
     valid: (o: any) => o is TagInterface;
-    validInstance: (target: any) => target is TagMixin;
+    validInstance: (target: any) => target is TagImplBase;
     validInterface: (target: any) => target is TagInterface;
-} & typeof TagMixin;
+} & typeof TagImplBase;
 declare class TagImpl extends TagImpl_base {
 }
-interface TagInterface extends TagImpl {
-}
-declare type TagConstructor = Constructor<TagInterface, typeof TagImpl>;
-export type { TagConstructor, TagInterface, };
+declare type TagConstructor = Constructor<TagImplInterface, Omit<typeof TagImpl, 'load'>>;
+export type { TagConstructor, TagProtectedProperty, TagInterface, };
 export { TagImpl, };
 //# sourceMappingURL=tag.d.ts.map

package/dist/esm/src/user-modules/tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAO9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;;;;;;;;AAEvD,cAAM,QAAS,SAAQ,aAAoB;aAiBvB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG;IAf9C;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,YAAY;IAM1D;;OAEG;gBAEe,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG;IAM9C,EAAE,IAAK,MAAM;IAIb,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,OAAO,IAAK,MAAM;IAIlB,IAAI,IAAK,MAAM;IAIf,KAAK,IAAK,iBAAiB,GAAG,SAAS;IAIvC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAqB;WAE3B,IAAI,CAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;WAkBjD,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAMnC,MAAM,CAAC,IAAI,CAAE,GAAG,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS;IAWpD,WAAW,IAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAS3C,GAAG,CAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;WAa7D,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;WAgBpF,SAAS,CAAE,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,QAAQ;CAIlB;;;;;;;AAED,cAAM,OAAQ,SAAQ,YAAyC;CAAG;AAClE,UAAU,YAAa,SAAQ,OAAO;CAAG;AAEzC,aAAK,cAAc,GAAG,WAAW,CAC/B,YAAY,EACZ,OAAO,OAAO,CACf,CAAA;AAED,YAAY,EACV,cAAc,EACd,YAAY,GACb,CAAA;AACD,OAAO,EACL,OAAO,GACR,CAAA"}
+{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAA;AAEtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,QAAS,SAAQ,SAAS;aAcZ,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAA;IAE7B;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,IAAI,IAAK,MAAM;IAIf,OAAO,IAAK,MAAM;IAIZ,KAAK,IAAK,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;WAIzC,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;WA2BhC,IAAI,CAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IA0B7E;;;;;;OAMG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACH,OAAO,IAAK,OAAO;IAInB;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAqBV,WAAW,IAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQ3C,GAAG,CAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;WAY7D,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;WAepF,SAAS,CAAE,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxD,QAAQ;CAIlB;;;;;;;AAED,cAAM,WAAY,SAAQ,gBAA6C;CAAG;AAC1E,UAAU,gBAAiB,SAAQ,WAAW;CAAG;AAEjD,aAAK,oBAAoB,GACrB,OAAO,CAAA;AAEX,aAAK,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;;;;;;;AAChE,cAAM,OAAQ,SAAQ,YAA4C;CAAG;AAErE,aAAK,cAAc,GAAG,WAAW,CAC/B,gBAAgB,EAChB,IAAI,CAAC,OAAO,OAAO,EAAE,MAAM,CAAC,CAC7B,CAAA;AAED,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,YAAY,GACb,CAAA;AACD,OAAO,EACL,OAAO,GACR,CAAA"}